fix: error embed not shown

punparin · Aug 19, 2022 · a58d3bd · a58d3bd
1 parent afa24ea
commit a58d3bd
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 12 deletions.
diff --git a/src/Finder.py b/src/Finder.py
@@ -89,48 +89,55 @@ def find_cards(self, input_name):
         es_card = self.find_fuzzy_card_from_name(input_name)
 
         if es_card is None:
-            return Embed(
+            return [Embed(
                 title="Name not found",
                 description="Unable to find {0}".format(input_name),
                 color=0xE4443A
-                )
+                )]
+
+        elif "jp_name" not in es_card["_source"]:
+            return [Embed(
+                title="Japanese Name not found",
+                description="Unable to find {0}".format(input_name),
+                color=0xE4443A
+                )]
 
         en_name = es_card["_source"]["name"]
         jp_name = es_card["_source"]["jp_name"]
         img_id = es_card["_source"]["id"]
 
         if jp_name == "":
-            return Embed(
+            return [Embed(
                 title="Japanese name not found",
                 description="Unable to find {0} in japanese".format(input_name),
                 color=0xE4443A
-                )
+                )]
 
         bigweb_card_info = CardInfo("Bigweb", en_name, jp_name, img_id)
         yuyutei_card_info = CardInfo("YUYUTEI", en_name, jp_name, img_id)
 
         try:
             bigweb_solomon_response = self.get_cards("bigweb", jp_name)
         except SolomonAPIError as err:
-            return Embed(
+            return [Embed(
                 title="Error from Solomon API",
                 description=err,
                 color=0xE4443A
-                )
+                )]
 
         try:
             yuyutei_solomon_response = self.get_cards("yuyutei", jp_name)
         except SolomonAPIError as err:
-            return Embed(
+            return [Embed(
                 title="Error from Solomon API",
                 description=err,
                 color=0xE4443A
-                )
+                )]
 
         bigweb_card_info = self.merge_solomon_response_to_card_info(bigweb_card_info, bigweb_solomon_response)
         bigweb_embed = self.get_embed_from_card_info(bigweb_card_info)
 
         yuyutei_card_info = self.merge_solomon_response_to_card_info(yuyutei_card_info, yuyutei_solomon_response)
         yuyutei_embed = self.get_embed_from_card_info(yuyutei_card_info)
 
-        return bigweb_embed, yuyutei_embed
+        return [bigweb_embed, yuyutei_embed]
diff --git a/src/Solomon.py b/src/Solomon.py
@@ -22,7 +22,14 @@ async def on_message(self, message):
         if not isMatched:
             return
 
-        bigweb_embed, yuyutei_embed = finder.find_cards(content)
+        embed = finder.find_cards(content)
 
-        await message.channel.send(embed=bigweb_embed)
-        await message.channel.send(embed=yuyutei_embed)
+        if len(embed) < 2:
+            error_embed = embed[0]
+
+            await message.channel.send(embed=error_embed)
+        else:
+            bigweb_embed, yuyutei_embed = embed[0], embed[1]
+
+            await message.channel.send(embed=bigweb_embed)
+            await message.channel.send(embed=yuyutei_embed)