Frisk/RcGcDb
1
0
Fork 0
mirror of https://gitlab.com/chicken-riders/RcGcDb.git synced 2025-02-23 00:54:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Patched two probable issues

Browse source
This commit is contained in:
Frisk 2020-08-12 12:23:10 +02:00
parent 665a073177
commit 1f2fae3da9
No known key found for this signature in database
GPG key ID: 213F7C15068AF8AC
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/bot.py
View file

@ -173,13 +173,13 @@ def calculate_delay_for_group(group_length: int) -> float:
return 0.0 return 0.0
def generate_targets(wiki_url: str) -> defaultdict: def generate_targets(wiki_url: str, additional_requirements: str) -> defaultdict:
"""To minimize the amount of requests, we generate a list of language/display mode combinations to create messages for """To minimize the amount of requests, we generate a list of language/display mode combinations to create messages for
this way we can send the same message to multiple webhooks which have the same wiki and settings without doing another this way we can send the same message to multiple webhooks which have the same wiki and settings without doing another
request to the wiki just to duplicate the message. request to the wiki just to duplicate the message.
""" """
combinations = defaultdict(list) combinations = defaultdict(list)
for webhook in db_cursor.execute('SELECT webhook, lang, display FROM rcgcdw WHERE wiki = ?', (wiki_url,)): for webhook in db_cursor.execute('SELECT webhook, lang, display FROM rcgcdw WHERE wiki = ? {}'.format(additional_requirements), (wiki_url,)):
combination = (webhook["lang"], webhook["display"]) combination = (webhook["lang"], webhook["display"])
combinations[combination].append(webhook["webhook"]) combinations[combination].append(webhook["webhook"])
return combinations return combinations
@ -243,7 +243,7 @@ async def scan_group(group: str):
DBHandler.update_db() DBHandler.update_db()
continue continue
categorize_events = {} categorize_events = {}
targets = generate_targets(queued_wiki.url) targets = generate_targets(queued_wiki.url, "AND rcid != -1 OR rcid IS NULL")
paths = get_paths(queued_wiki.url, recent_changes_resp) paths = get_paths(queued_wiki.url, recent_changes_resp)
new_events = 0 new_events = 0
for change in recent_changes: for change in recent_changes:
@ -321,6 +321,7 @@ async def discussion_handler():
local_wiki = all_wikis[db_wiki["wiki"]] # set a reference to a wiki object from memory local_wiki = all_wikis[db_wiki["wiki"]] # set a reference to a wiki object from memory
except KeyError: except KeyError:
local_wiki = all_wikis[db_wiki["wiki"]] = Wiki() local_wiki = all_wikis[db_wiki["wiki"]] = Wiki()
local_wiki.rc_active = db_wiki["rcid"]
try: try:
feeds_response = await local_wiki.fetch_feeds(db_wiki["wikiid"], session) feeds_response = await local_wiki.fetch_feeds(db_wiki["wikiid"], session)
except (WikiServerError, WikiError): except (WikiServerError, WikiError):
@ -351,7 +352,7 @@ async def discussion_handler():
DBHandler.add(db_wiki["wikiid"], "0", True) DBHandler.add(db_wiki["wikiid"], "0", True)
DBHandler.update_db() DBHandler.update_db()
continue continue
targets = generate_targets(db_wiki["wiki"]) targets = generate_targets(db_wiki["wiki"], "AND NOT wikiid IS NULL")
for post in discussion_feed: for post in discussion_feed:
if post["id"] > db_wiki["postid"]: if post["id"] > db_wiki["postid"]:
for target in targets.items(): for target in targets.items():