update nitter to replace instance

diff --git a/modules/nitterize.py b/modules/nitterize.py
index 02b0590748d8b96851995a3331a9fdec587715e3..e6aa92aabe6f0124ff467db4486b8d0c75c34635 100644 (file)
--- a/modules/nitterize.py
+++ b/modules/nitterize.py
@@ -33,6 +33,11 @@ def privmsg_hook(bot, line):
 
        replaced = ""
        for mo in re_findtwitter.finditer(msg):
-               replaced += re_findtwitter.sub(r"https://nitter.net/\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])

diff --git a/modules/urls.py b/modules/urls.py
index 1dbb65e94490887fd47b74aea0892b23159333ac..4935d68eb704fb14e178de8f0ad912bfa7b61754 100644 (file)
--- a/modules/urls.py
+++ b/modules/urls.py
@@ -317,6 +317,7 @@ url_regex = (
        re.compile(r'https?://(?:[^/\s.]+\.)+[^/\s.]+(?:/\S+)?'),
 )
 other_regexes = (
+       (lambda x: '', (re.compile(r"""https?://(?:www\.)?(?:twitter|x)\.com/""", re.I),)), # skip twitter
 )
 regexes = other_regexes + (
        (goturl, url_regex),