From 5ca8ccc83bd127fc0e7596159f88dd405d6ee27a Mon Sep 17 00:00:00 2001 From: Frisk Date: Sat, 22 Aug 2020 20:28:02 +0200 Subject: [PATCH] Very small fixes/improvements --- src/bot.py | 8 ++++---- src/wiki.py | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/bot.py b/src/bot.py index a681fe7..1e48162 100644 --- a/src/bot.py +++ b/src/bot.py @@ -374,12 +374,12 @@ async def discussion_handler(): for post in discussion_feed: if post["_embedded"]["thread"][0]["containerType"] == "ARTICLE_COMMENT" and post["id"] > db_wiki["postid"]: comment_events.append(post["forumId"]) - comment_pages = {} - if len(comment_events): + 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) - ), rate_limiter, "articleNames") # rate_limiter is undefined, needs fixing + wiki=db_wiki["wiki"], pages=",".join(comment_events) + ), RateLimiter(), "articleNames") 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(): diff --git a/src/wiki.py b/src/wiki.py index db67c9a..6b31afc 100644 --- a/src/wiki.py +++ b/src/wiki.py @@ -8,6 +8,7 @@ from src.formatters.discussions import feeds_embed_formatter, feeds_compact_form from src.misc import parse_link from src.i18n import langs from src.wiki_ratelimiter import RateLimiter +import sqlite3 import src.discord import asyncio from src.config import settings @@ -225,7 +226,7 @@ async def essential_info(change: dict, changed_categories, local_wiki: Wiki, tar await appearance_mode(identification_string, change, parsed_comment, changed_categories, local_wiki, target, paths, rate_limiter, additional_data=additional_data) -async def essential_feeds(change: dict, comment_pages, db_wiki: tuple, target: tuple): +async def essential_feeds(change: dict, comment_pages: dict, db_wiki: sqlite3.Row, target: tuple): """Prepares essential information for both embed and compact message format.""" appearance_mode = feeds_embed_formatter if target[0][1] > 0 else feeds_compact_formatter identification_string = change["_embedded"]["thread"][0]["containerType"]