From: John Runyon Date: Wed, 4 Oct 2023 06:57:46 +0000 (-0600) Subject: nitterize - farm out to urls to fetch titles for generated nitter links X-Git-Url: https://jfr.im/git/erebus.git/commitdiff_plain/9de26fbb4055b091d75b71ebdfef8e7fdec3c648 nitterize - farm out to urls to fetch titles for generated nitter links since it ignores twitter now (and twitter's titles are useless) also, updated urls to factor some existing code into a function so nitterize can call it --- diff --git a/modules/nitterize.py b/modules/nitterize.py index 07fa67d..07695a3 100644 --- a/modules/nitterize.py +++ b/modules/nitterize.py @@ -10,7 +10,7 @@ modinfo = { 'author': 'Erebus Team', 'license': 'public domain', 'compatible': [0], # compatible module API versions - 'depends': [], # other modules required to work properly? + 'depends': ['urls'], # other modules required to work properly? 'softdeps': [], # modules which are preferred but not required } @@ -35,7 +35,9 @@ def privmsg_hook(bot, line): for mo in re_findtwitter.finditer(msg): replaced += re_findtwitter.sub(bot.parent.cfg.get('nitterize', 'instance', 'https://nitter.net') + r"\1", mo.group(0)) + " " if replaced: - bot.msg(chan, "%s" % (replaced)) + bot.msg(chan, replaced) + titles = lib.mod('urls').process_line(replaced) + lib.mod('urls').send_response(bot, chan, titles) @lib.hook(glevel=lib.STAFF, needchan=False) @lib.argsEQ(1) diff --git a/modules/urls.py b/modules/urls.py index fabd7ab..4067077 100644 --- a/modules/urls.py +++ b/modules/urls.py @@ -126,6 +126,9 @@ def privmsg_hook(bot, textline): line = '' responses = process_line(line) + send_response(bot, chan, responses) + +def send_response(bot, chan, responses): if len(responses) > 0: if lib.parent.cfg.getboolean('urls', 'multiline'): for r in responses: