Merge ffcbec77b5 into cdff5e9b1c

* Revert "Fix broken video playback by forcing fmp4"

This reverts commit 52db03b73a.

* Fix audio url in video m3u8

* Upgrade hls.js to 1.5.1 and use full version

src/formatters.nim

@@ -20,6 +20,10 @@ let
   # so v.redd.it links will not be replaced.
   # Images aren't supported due to errors from Teddit when the image
   # wasn't first displayed via a post on the Teddit instance.
+  
+  imgurRegex = re"((i|i.stack)\.)?imgur\.(com|io)"
+  
+  mediumRegex = re"([a-zA-Z0-9_.-]+\.)?medium\.com"
 
   wwwRegex = re"https?://(www[0-9]?\.)?"
   m3u8Regex = re"""url="(.+.m3u8)""""
@@ -68,6 +72,12 @@ proc replaceUrls*(body: string; prefs: Prefs; absolute=""): string =
     result = result.replace(rdRegex, prefs.replaceReddit)
     if prefs.replaceReddit in result and "/gallery/" in result:
       result = result.replace("/gallery/", "/comments/")
+      
+  if prefs.replaceImgur.len > 0 and "imgur" in result:
+    result = result.replace(imgurRegex, prefs.replaceImgur)
+  
+  if prefs.replaceMedium.len > 0 and "medium.com" in result:
+    result = result.replace(mediumRegex, prefs.replaceMedium)
 
   if absolute.len > 0 and "href" in result:
     result = result.replace("href=\"/", &"href=\"{absolute}/")
@@ -82,6 +92,8 @@ proc proxifyVideo*(manifest: string; proxy: bool): string =
   for line in manifest.splitLines:
     let url =
       if line.startsWith("#EXT-X-MAP:URI"): line[16 .. ^2]
+      elif line.startsWith("#EXT-X-MEDIA") and "URI=" in line:
+        line[line.find("URI=") + 5 .. -1 + line.find("\"", start= 5 + line.find("URI="))]
       else: line
     if url.startsWith('/'):
       let path = "https://video.twimg.com" & url

src/prefs_impl.nim

@@ -106,6 +106,14 @@ genPrefs:
     replaceReddit(input, ""):
       "Reddit -> Teddit/Libreddit"
       placeholder: "Teddit hostname"
+        
+    replaceImgur(input, ""):
+      "Imgur -> Rimgo"
+      placeholder: "Rimgo hostname"
+        
+    replaceMedium(input, ""):
+      "Medium -> Scribe"
+      placeholder: "Scribe hostname"
 
 iterator allPrefs*(): Pref =
   for k, v in prefList:

src/utils.nim

@@ -31,9 +31,7 @@ proc getHmac*(data: string): string =
 
 proc getVidUrl*(link: string): string =
   if link.len == 0: return
-  let 
-    link = link.replace("cmaf", "fmp4")
-    sig = getHmac(link)
+  let sig = getHmac(link)
   if base64Media:
     &"/video/enc/{sig}/{encode(link, safe=true)}"
   else:

src/views/general.nim

@@ -73,7 +73,7 @@ proc renderHead*(prefs: Prefs; cfg: Config; req: Request; titleText=""; desc="";
       link(rel="alternate", type="application/rss+xml", href=rss, title="RSS feed")
 
     if prefs.hlsPlayback:
-      script(src="/js/hls.light.min.js", `defer`="")
+      script(src="/js/hls.min.js", `defer`="")
       script(src="/js/hlsPlayback.js", `defer`="")
 
     if prefs.infiniteScroll: