|
|
@@ -11,6 +11,8 @@ const
|
|
|
let
|
|
|
twRegex = re"(?<=(?<!\S)https:\/\/|(?<=\s))(www\.|mobile\.)?twitter\.com"
|
|
|
twLinkRegex = re"""<a href="https:\/\/twitter.com([^"]+)">twitter\.com(\S+)</a>"""
|
|
|
+ xRegex = re"(?<=(?<!\S)https:\/\/|(?<=\s))(www\.|mobile\.)?x\.com"
|
|
|
+ xLinkRegex = re"""<a href="https:\/\/x.com([^"]+)">x\.com(\S+)</a>"""
|
|
|
|
|
|
ytRegex = re(r"([A-z.]+\.)?youtu(be\.com|\.be)", {reStudy, reIgnoreCase})
|
|
|
|
|
|
@@ -56,12 +58,18 @@ proc replaceUrls*(body: string; prefs: Prefs; absolute=""): string =
|
|
|
if prefs.replaceYouTube.len > 0 and "youtu" in result:
|
|
|
result = result.replace(ytRegex, prefs.replaceYouTube)
|
|
|
|
|
|
- if prefs.replaceTwitter.len > 0 and ("twitter.com" in body or tco in body):
|
|
|
- result = result.replace(tco, https & prefs.replaceTwitter & "/t.co")
|
|
|
- result = result.replace(cards, prefs.replaceTwitter & "/cards")
|
|
|
- result = result.replace(twRegex, prefs.replaceTwitter)
|
|
|
- result = result.replacef(twLinkRegex, a(
|
|
|
- prefs.replaceTwitter & "$2", href = https & prefs.replaceTwitter & "$1"))
|
|
|
+ if prefs.replaceTwitter.len > 0:
|
|
|
+ if tco in result:
|
|
|
+ result = result.replace(tco, https & prefs.replaceTwitter & "/t.co")
|
|
|
+ if "x.com" in result:
|
|
|
+ result = result.replace(xRegex, prefs.replaceTwitter)
|
|
|
+ result = result.replacef(xLinkRegex, a(
|
|
|
+ prefs.replaceTwitter & "$2", href = https & prefs.replaceTwitter & "$1"))
|
|
|
+ if "twitter.com" in result:
|
|
|
+ result = result.replace(cards, prefs.replaceTwitter & "/cards")
|
|
|
+ result = result.replace(twRegex, prefs.replaceTwitter)
|
|
|
+ result = result.replacef(twLinkRegex, a(
|
|
|
+ prefs.replaceTwitter & "$2", href = https & prefs.replaceTwitter & "$1"))
|
|
|
|
|
|
if prefs.replaceReddit.len > 0 and ("reddit.com" in result or "redd.it" in result):
|
|
|
result = result.replace(rdShortRegex, prefs.replaceReddit & "/comments/")
|