From: John Runyon <redacted>
Date: Thu, 21 Sep 2023 15:32:51 +0000 (-0600)
Subject: update nitter to replace instance
X-Git-Url: https://jfr.im/git/erebus.git/commitdiff_plain/2412ad6e5563a851e545aa03eb7408ba4961987e

update nitter to replace instance
---

diff --git a/modules/nitterize.py b/modules/nitterize.py
index 02b0590..e6aa92a 100644
--- 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 1dbb65e..4935d68 100644
--- 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),