update nitter to replace instance

[erebus.git] / modules / nitterize.py

diff --git a/modules/nitterize.py b/modules/nitterize.py
index 2b4251f9559e713f424297e731e15836544c9b54..e6aa92aabe6f0124ff467db4486b8d0c75c34635 100644 (file)
--- a/modules/nitterize.py
+++ b/modules/nitterize.py
@@ -22,16 +22,22 @@ modstop = lib.modstop
 
 # module code
 import re
-from collections import namedtuple
-re_findtwitter = re.compile(r"""https?://(?:www\.)?(?:twitter|x)\.com/([-.a-z0-9/]+)""", re.I)
+re_findtwitter = re.compile(r"""https?://(?:www\.)?(?:twitter|x)\.com/([-./_a-z0-9]+)""", re.I)
 
 @lib.hooknum("PRIVMSG")
 def privmsg_hook(bot, line):
        pieces = line.split(None, 3)
        chan = pieces[2]
+       if chan[0] != "#": return
        msg = pieces[3][1:]
+
        replaced = ""
        for mo in re_findtwitter.finditer(msg):
-               replaced += re_findtwitter.sub(r"https://nitter.projectsegfau.lt/\1", mo.group(0)) + " "
+               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))
+
+@lib.hook(glevel=lib.STAFF, needchan=False)
+@lib.argsEQ(1)
+def setnitter(bot, user, chan, realtarget, *args):
+       bot.parent.cfg.set('nitterize', 'instance', args[0])