From 8113f28fb0f9525d958862048a765101979b7e96 Mon Sep 17 00:00:00 2001 From: Frisk Date: Tue, 13 Oct 2020 18:06:24 +0200 Subject: [PATCH] Fix #30 --- src/bot.py | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/bot.py b/src/bot.py index 20229b2..cad011f 100644 --- a/src/bot.py +++ b/src/bot.py @@ -380,10 +380,22 @@ async def discussion_handler(): comment_events.append(post["forumId"]) comment_pages: dict = {} if comment_events: - comment_pages = await local_wiki.safe_request( - "{wiki}wikia.php?controller=FeedsAndPosts&method=getArticleNamesAndUsernames&stablePageIds={pages}&format=json".format( - wiki=db_wiki["wiki"], pages=",".join(comment_events) - ), RateLimiter(), "articleNames") + try: + comment_pages = await local_wiki.safe_request( + "{wiki}wikia.php?controller=FeedsAndPosts&method=getArticleNamesAndUsernames&stablePageIds={pages}&format=json".format( + wiki=db_wiki["wiki"], pages=",".join(comment_events) + ), RateLimiter(), "articleNames") + except aiohttp.ClientResponseError: # Fandom can be funny sometimes... See #30 + comment_pages = None + except: + if command_line_args.debug: + logger.exception("Exception on Feeds article comment request") + shutdown(loop=asyncio.get_event_loop()) + else: + logger.exception("Exception on Feeds article comment request") + await generic_msg_sender_exception_logger(traceback.format_exc(), + "Exception on Feeds article comment request", + Post=str(post)[0:1000], Wiki=db_wiki["wiki"]) for post in discussion_feed: # Yeah, second loop since the comments require an extra request if post["id"] > db_wiki["postid"]: for target in targets.items():