From f6e9887ddbe43f2d5fa8a73b4d145a8a823260f8 Mon Sep 17 00:00:00 2001 From: Cynthia Foxwell Date: Wed, 7 May 2025 20:48:28 -0600 Subject: [PATCH] discord ios fix --- src/routes/activityspoof.nim | 4 ++-- src/routes/media.nim | 3 +++ src/views/mastoapi.nim | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/routes/activityspoof.nim b/src/routes/activityspoof.nim index 424326c..c5ca98e 100644 --- a/src/routes/activityspoof.nim +++ b/src/routes/activityspoof.nim @@ -126,7 +126,7 @@ proc createActivityPubRouter*(cfg: Config) = let videoObj = get(tweet.video) vars = videoObj.variants.filterIt(it.contentType == mp4) - videoUrl = vars[^1].url + videoUrl = vars[^1].url.replace("https://video.twimg.com", getUrlPrefix(cfg) & "/tvid").replace(".mp4", "") videoPreview = getUrlPrefix(cfg) & getPicUrl(videoObj.thumb) var mediaObj = newJObject() var description = videoObj.title @@ -148,7 +148,7 @@ proc createActivityPubRouter*(cfg: Config) = elif tweet.gif.isSome(): let gif = get(tweet.gif) - gifUrl = https & gif.url + gifUrl = (https & gif.url).replace("https://video.twimg.com", getUrlPrefix(cfg) & "/tvid").replace(".mp4", "") gifPreview = getUrlPrefix(cfg) & getPicUrl(gif.thumb) var mediaObj = newJObject() diff --git a/src/routes/media.nim b/src/routes/media.nim index eacd1f8..6d22878 100644 --- a/src/routes/media.nim +++ b/src/routes/media.nim @@ -141,3 +141,6 @@ proc createMediaRouter*(cfg: Config) = content = proxifyVideo(vid, cookiePref(proxyVideos)) resp content, m3u8Mime + + get re"^\/tvid\/(.+)$": + redirect("https://video.twimg.com/" & request.matches[0] & ".mp4") diff --git a/src/views/mastoapi.nim b/src/views/mastoapi.nim index 65f3cb3..7d0ebbb 100644 --- a/src/views/mastoapi.nim +++ b/src/views/mastoapi.nim @@ -93,7 +93,7 @@ proc getActivityStream*(tweet: Tweet, cfg: Config, prefs: Prefs): JsonNode = var mediaObj = newJObject() mediaObj["type"] = %"Link" mediaObj["mediaType"] = %"video/mp4" - mediaObj["href"] = %vars[^1].url + mediaObj["href"] = %(vars[^1].url.replace("https://video.twimg.com", getUrlPrefix(cfg) & "/tvid").replace(".mp4", "")) url.add(mediaObj) var wrapper = newJObject() @@ -122,7 +122,7 @@ proc getActivityStream*(tweet: Tweet, cfg: Config, prefs: Prefs): JsonNode = var mediaObj = newJObject() mediaObj["type"] = %"Link" mediaObj["mediaType"] = %"video/mp4" - mediaObj["href"] = %gifUrl + mediaObj["href"] = %(gifUrl.replace("https://video.twimg.com", getUrlPrefix(cfg) & "/tvid").replace(".mp4", "")) url.add(mediaObj) var wrapper = newJObject()