From 9f93a40bb8d8bd7d0538465f9d4eda79d02e540c Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Mon, 1 Jun 2020 08:11:41 +0300
Subject: Source: Simplify tags name and location parsing

---
 bot/cogs/source.py | 22 ++++++++++++++--------
 bot/cogs/tags.py   |  2 +-
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/bot/cogs/source.py b/bot/cogs/source.py
index a3922297a..e01209c28 100644
--- a/bot/cogs/source.py
+++ b/bot/cogs/source.py
@@ -21,12 +21,8 @@ class SourceConverter(commands.Converter):
 
         tags_cog = ctx.bot.get_cog("Tags")
 
-        if argument.lower() in tags_cog._cache:
-            tag = argument.lower()
-            if tags_cog._cache[tag]["restricted_to"] != "developers":
-                return f"/bot/bot/resources/tags/{tags_cog._cache[tag]['restricted_to']}/{tag}.md"
-            else:
-                return f"/bot/bot/resources/tags/{tag}.md"
+        if tags_cog and argument.lower() in tags_cog._cache:
+            return argument.lower()
 
         cog = ctx.bot.get_cog(argument)
         if cog:
@@ -56,6 +52,12 @@ class BotSource(commands.Cog):
             return
 
         url, location, first_line = self.get_source_link(source_item)
+
+        # There is no URL only when bot can't fetch Tags cog
+        if not url:
+            await ctx.send("Unable to get `Tags` cog.")
+            return
+
         await ctx.send(embed=await self.build_embed(url, source_item, location, first_line))
 
     def get_source_link(self, source_item: SourceType) -> Tuple[str, str, Optional[int]]:
@@ -73,7 +75,11 @@ class BotSource(commands.Cog):
                 src = source_item.callback.__code__
                 filename = src.co_filename
         elif isinstance(source_item, str):
-            filename = source_item
+            tags_cog = self.bot.get_cog("Tags")
+            if not tags_cog:
+                return "", "", None
+
+            filename = tags_cog._cache[source_item]["location"]
         else:
             src = type(source_item)
             filename = inspect.getsourcefile(src)
@@ -106,7 +112,7 @@ class BotSource(commands.Cog):
             aliases_string = f" (or {', '.join(source_object.aliases)})" if source_object.aliases else ""
             title = f"Command: {source_object.qualified_name}{aliases_string}"
         elif isinstance(source_object, str):
-            title = f"Tag: {source_object.split('/')[-1].split('.')[0]}"
+            title = f"Tag: {source_object}"
             description = ""
         else:
             title = f"Cog: {source_object.qualified_name}"
diff --git a/bot/cogs/tags.py b/bot/cogs/tags.py
index 571c0ed28..3d76c5c08 100644
--- a/bot/cogs/tags.py
+++ b/bot/cogs/tags.py
@@ -47,7 +47,7 @@ class Tags(Cog):
                         "description": file.read_text(encoding="utf8"),
                     },
                     "restricted_to": "developers",
-                    "location": str(file)
+                    "location": f"/bot/{file}"
                 }
 
                 # Convert to a list to allow negative indexing.
-- 
cgit v1.2.3