Chewing_Bever
/
didier
mirror of https://github.com/stijndcl/didier
0
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use meme class

pull/31/head
Stijn De Clercq 2021-01-25 23:30:52 +01:00
parent f2b62c3ce7
commit 77addbc30c
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cogs/fun.py
View File

@ -91,7 +91,7 @@ class Fun(commands.Cog):
return await ctx.send("Controleer je argumenten.") return await ctx.send("Controleer je argumenten.")
# Get the meme info that corresponds to this name # Get the meme info that corresponds to this name
result = memes.getMeme(name) result: memes.Meme = memes.getMeme(name)
# No meme found # No meme found
if result is None: if result is None:
@ -101,15 +101,15 @@ class Fun(commands.Cog):
fields = list(fields) fields = list(fields)
# If there's only one field, the user isn't required to use quotes # If there's only one field, the user isn't required to use quotes
if result[2] == 1: if result.fields == 1:
fields = [" ".join(fields)] fields = [" ".join(fields)]
# Apply mock to mocking spongebob memes # Apply mock to mocking spongebob memes
if result[1] == "mocking spongebob": if result.name == "mocking spongebob":
fields = list(map(mock.mock, fields)) fields = list(map(mock.mock, fields))
# X, X everywhere only takes X as an argument # X, X everywhere only takes X as an argument
if result[1] == "x, x everywhere": if result.name == "x, x everywhere":
fields[0] = " ".join(fields) fields[0] = " ".join(fields)
fields.append(fields[0] + " everywhere") fields.append(fields[0] + " everywhere")
@ -127,7 +127,7 @@ class Fun(commands.Cog):
if req["success"]: if req["success"]:
caption = { caption = {
"template_id": result[0], "template_id": result.meme_id,
"username": os.getenv("IMGFLIPNAME"), "username": os.getenv("IMGFLIPNAME"),
"password": os.getenv("IMGFLIPPASSWORD"), "password": os.getenv("IMGFLIPPASSWORD"),
"boxes[0][text]": boxes[0]["text"], "boxes[0][text]": boxes[0]["text"],

18
functions/database/memes.py
View File

@ -1,3 +1,5 @@
from attr import dataclass
from functions.database import utils from functions.database import utils
@ -18,9 +20,23 @@ def getMeme(name):
cursor = connection.cursor() cursor = connection.cursor()
cursor.execute("SELECT * FROM memes WHERE name like %s", ["%" + name.lower() + "%"]) cursor.execute("SELECT * FROM memes WHERE name like %s", ["%" + name.lower() + "%"])
result = cursor.fetchall() result = cursor.fetchall()
if len(result) == 0: if len(result) == 0:
return None return None
return result[0]
meme = Meme(result[0][0], result[0][1], result[0][2])
return meme
@dataclass
class Meme:
"""
Dataclass to represent a meme in order to avoid having to use [] on tuples all the time
"""
meme_id: int
name: str
fields: int
def getAllMemes(): def getAllMemes():