Fluffy/Lynxie
1
0
Fork 0
mirror of https://github.com/Fluffy-Bean/Lynxie.git synced 2025-05-14 08:02:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/main'

Browse source 
# Conflicts:
#	lynxie/config.py
This commit is contained in:
Michał Gdula 2023-09-11 23:25:10 +01:00
commit 42a41509c5
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lynxie/commands/e621.py
View file

@ -86,7 +86,8 @@ class E621(commands.Cog):
) )
embed.add_field( embed.add_field(
name="Tags", name="Tags",
value=", ".join(response["posts"][0]["tags"]["general"]) or "No tags provided.", value=", ".join(response["posts"][0]["tags"]["general"])
or "No tags provided.",
inline=False, inline=False,
) )

4
lynxie/commands/image.py
View file

@ -19,10 +19,10 @@ class Img(commands.Cog):
async def get_image_attachments(ctx): async def get_image_attachments(ctx):
if ctx.message.attachments: if ctx.message.attachments:
return ctx.message.attachments[0] return ctx.message.attachments[0]
elif ctx.message.reference: if ctx.message.reference:
if ctx.message.reference.resolved.attachments: if ctx.message.reference.resolved.attachments:
return ctx.message.reference.resolved.attachments[0] return ctx.message.reference.resolved.attachments[0]
elif ( if (
ctx.message.reference.resolved.embeds ctx.message.reference.resolved.embeds
and ctx.message.reference.resolved.embeds[0].image and ctx.message.reference.resolved.embeds[0].image
): ):

3
lynxie/config.py
View file

@ -12,12 +12,11 @@ DISCORD_TOKEN = (
or None or None
) )
DISCORD_GUILD_ID = Object(id=1040757387033849976) DISCORD_GUILD_ID = Object(id=1040757387033849976)
LYNXIE_PREFIX = "?"
DATA_PATH = os.path.join("lynxie", "data") DATA_PATH = os.path.join("lynxie", "data")
ASSETS_PATH = os.path.join("lynxie", "assets") ASSETS_PATH = os.path.join("lynxie", "assets")
DATABASE_URI = f"sqlite:///" + os.path.join(DATA_PATH, "lynxie.db") DATABASE_URI = f"sqlite:///" + os.path.join(DATA_PATH, "lynxie.db")