Merge cdff5e9b1c into b62d73dbd3

* 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

@@ -82,6 +82,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/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: