Handle AO3 story with unspecified summary

Author: adorabilis

ffembed/ffembed.py

@@ -6,7 +6,7 @@
 from bs4 import BeautifulSoup
 from redbot.core import checks, commands, Config
 
-__version__ = "1.0.14"
+__version__ = "1.0.15"
 
 BaseCog = getattr(commands, "Cog", object)
 
@@ -107,8 +107,8 @@ async def toggle_channel(self, ctx, channel: discord.TextChannel):
 
     def parse_url(self, message):
         url_regex = (
-            r"http[s]?://(?:www.)?(?:(?:m.)?fanfiction.net/s/\d+"
-            r"/?(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),])*|"
+            r"https?://(?:www.)?(?:(?:m.)?fanfiction.net/"
+            r"s/\d+/?(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),])*|"
             r"archiveofourown.org/works/\d+(?:/chapters/\d+)?|"
             r"siye.co.uk/(?:siye/)?viewstory.php\?sid=\d+(?:&chapter=\d+)?)"
         )
@@ -134,7 +134,7 @@ async def fetch_url(self, url):
         return page
 
     def parse_FanFiction(self, page, url):
-        base = "https://fanfiction.net/"
+        base = "https://fanfiction.net"
         div = page.find(id="profile_top")
         thumbnail = div.find("img", attrs={"class": "cimage"})
         author = div.find("a", attrs={"class": "xcontrast_txt"})
@@ -153,10 +153,11 @@ def parse_FanFiction(self, page, url):
         }
 
     def parse_AO3(self, page, url):
-        base = "https://archiveofourown.org/"
+        base = "https://archiveofourown.org"
         author = page.find("a", attrs={"rel": "author"})
         title = page.find("h2", attrs={"class": "title heading"})
-        desc = page.find("div", attrs={"class": "summary module"}).p
+        desc = page.find("div", attrs={"class": "summary module"})
+        desc = "Summary not specified." if desc is None else desc.p.get_text(strip=True)
         date = " ".join(x.get_text() for x in page.find_all(class_="published"))
         words = " ".join(x.get_text() for x in page.find_all(class_="words"))
         chapters = " ".join(x.get_text() for x in page.find_all(class_="chapters"))
@@ -167,12 +168,12 @@ def parse_AO3(self, page, url):
             "author": author.get_text(strip=True),
             "author_link": base + author["href"],
             "title": title.get_text(strip=True),
-            "desc": desc.get_text(strip=True),
+            "desc": desc,
             "footer": f"{date} ∙ {words} ∙ {chapters}",
         }
 
     def parse_SIYE(self, page, url):
-        base = "http://siye.co.uk/"
+        base = "http://siye.co.uk"
         table_cell = page.find_all("td", attrs={"align": "left"})[1].get_text()
         rows = table_cell.strip().split("\n")
         rows = [row for row in rows if ":" in row]  # Handle completed story

ffpicker/ffpicker.py

@@ -9,7 +9,7 @@
 from redbot.core.utils.menus import menu, DEFAULT_CONTROLS
 
 
-__version__ = "1.1.12"
+__version__ = "1.1.13"
 
 BaseCog = getattr(commands, "Cog", object)
 
@@ -106,8 +106,8 @@ async def reset(self, ctx):
 
     def parse_url(self, message):
         url_regex = (
-            r"http[s]?://(?:www.)?(?:(?:m.)?fanfiction.net/s/\d+"
-            r"/?(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),])*|"
+            r"https?://(?:www.)?(?:(?:m.)?fanfiction.net/"
+            r"s/\d+/?(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),])*|"
             r"archiveofourown.org/works/\d+(?:/chapters/\d+)?|"
             r"siye.co.uk/(?:siye/)?viewstory.php\?sid=\d+(?:&chapter=\d+)?)"
         )
@@ -133,7 +133,7 @@ async def fetch_url(self, url):
         return page
 
     def parse_FanFiction(self, page, url):
-        base = "https://fanfiction.net/"
+        base = "https://fanfiction.net"
         div = page.find(id="profile_top")
         thumbnail = div.find("img", attrs={"class": "cimage"})
         author = div.find("a", attrs={"class": "xcontrast_txt"})
@@ -152,10 +152,11 @@ def parse_FanFiction(self, page, url):
         }
 
     def parse_AO3(self, page, url):
-        base = "https://archiveofourown.org/"
+        base = "https://archiveofourown.org"
         author = page.find("a", attrs={"rel": "author"})
         title = page.find("h2", attrs={"class": "title heading"})
-        desc = page.find("div", attrs={"class": "summary module"}).p
+        desc = page.find("div", attrs={"class": "summary module"})
+        desc = "Summary not specified." if desc is None else desc.p.get_text(strip=True)
         date = " ".join(x.get_text() for x in page.find_all(class_="published"))
         words = " ".join(x.get_text() for x in page.find_all(class_="words"))
         chapters = " ".join(x.get_text() for x in page.find_all(class_="chapters"))
@@ -166,12 +167,12 @@ def parse_AO3(self, page, url):
             "author": author.get_text(strip=True),
             "author_link": base + author["href"],
             "title": title.get_text(strip=True),
-            "desc": desc.get_text(strip=True),
+            "desc": desc,
             "footer": f"{date} ∙ {words} ∙ {chapters}",
         }
 
     def parse_SIYE(self, page, url):
-        base = "http://siye.co.uk/"
+        base = "http://siye.co.uk"
         table_cell = page.find_all("td", attrs={"align": "left"})[1].get_text()
         rows = table_cell.strip().split("\n")
         rows = [row for row in rows if ":" in row]  # Handle completed story