From 7d736f76c44056001cb075f02730f700ab6ab2e7 Mon Sep 17 00:00:00 2001
From: klemek <klemek@outlook.fr>
Date: Mon, 13 Apr 2020 16:22:08 +0200
Subject: [PATCH] added more info to templates

---
 discord_bot/__main__.py | 11 ++++++++---
 meme_otron/meme_db.py   |  1 +
 meme_otron/types.py     | 22 +++++++---------------
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/discord_bot/__main__.py b/discord_bot/__main__.py
index d5ce27b..6ed617c 100644
--- a/discord_bot/__main__.py
+++ b/discord_bot/__main__.py
@@ -83,8 +83,8 @@ async def on_message(message):
             return
         async with message.channel.typing():
             left_wmark_text = None
-            if not direct and len(args) > 1:
-                f"By {message.author.display_name}"
+            if len(args) > 1 and message.author.display_name is not None:
+                left_wmark_text = f"By {message.author.display_name}"
             img = meme_otron.compute(*args, left_wmark_text=left_wmark_text)
             if img is None:
                 await message.channel.send(f"Template `{args[0]}` not found\n"
@@ -95,7 +95,12 @@ async def on_message(message):
                 img.save(output, format="JPEG")
                 response = None
                 if len(args) == 1:
-                    response = f"Template `{args[0]}`:"
+                    meme = db.get_meme(args[0])
+                    response = f"Template `{meme.id}`:"
+                    if len(meme.aliases) > 0:
+                        response += f"\n- Aliases: `{'`, `'.join(meme.aliases)}`"
+                    if meme.info is not None:
+                        response += f"\n- More info: <{meme.info}>"
                 elif not direct:
                     response = f"A meme by {message.author.mention}:"
                 await message.channel.send(response,
diff --git a/meme_otron/meme_db.py b/meme_otron/meme_db.py
index f3a8839..0003cd0 100644
--- a/meme_otron/meme_db.py
+++ b/meme_otron/meme_db.py
@@ -57,6 +57,7 @@ def load_item(i, item):
             meme = Meme(item_id)
         meme.abstract = utils.read_key_safe(item, "abstract", False, types=[bool])
         meme.aliases = utils.read_key_safe(item, "aliases", [], types=[str], is_list=True)
+        meme.info = utils.read_key_safe(item, "info", types=[str])
         meme.text_base = load_text(0, item, meme.text_base)
         if not meme.abstract:
             meme.template = utils.read_key(item, "template", meme.template, types=[str])
diff --git a/meme_otron/types.py b/meme_otron/types.py
index f3f94ae..abd1b85 100644
--- a/meme_otron/types.py
+++ b/meme_otron/types.py
@@ -25,22 +25,14 @@ class Meme:
     TODO
     """
 
-    def __init__(self, meme_id, aliases=None, abstract=False, template=None, text_base=None, texts=None):
+    def __init__(self, meme_id):
         self.id = meme_id
-        if aliases is None:
-            self.aliases = []
-        else:
-            self.aliases = aliases
-        self.abstract = abstract
-        self.template = template
-        if text_base is None:
-            self.text_base = Text()
-        else:
-            self.text_base = text_base
-        if texts is None:
-            self.texts = None
-        else:
-            self.texts = copy.deepcopy(texts)
+        self.aliases = []
+        self.abstract = None
+        self.info = None
+        self.template = None
+        self.text_base = Text()
+        self.texts = None
 
     def clone(self):
         return copy.deepcopy(self)