Merge upstream zedeus/nitter master into master

.github/workflows/build-docker.yml

@@ -11,16 +11,14 @@ jobs:
   build-docker-amd64:
     runs-on: self-hosted
     steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
+      - uses: actions/checkout@v6
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
         with:
           version: latest
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}

.gitignore

@@ -16,6 +16,8 @@ nitter.conf
 guest_accounts.json*
 sessions.json*
 dump.rdb
+*.bak
+/tools/*.json*
 
 node_modules
 debug_responses

nitter.example.conf

@@ -1,34 +1,42 @@
 [Server]
-hostname = "nitter.net"  # for generating links, change this to your own domain/ip
+hostname = "nitter.net"      # for generating links, change this to your own domain/ip
 title = "nitter"
 address = "0.0.0.0"
 port = 8080
-https = false  # disable to enable cookies when not using https
+https = false                # disable to enable cookies when not using https
 httpMaxConnections = 100
 staticDir = "./public"
 
 [Cache]
-listMinutes = 240  # how long to cache list info (not the tweets, so keep it high)
-rssMinutes = 10  # how long to cache rss queries
-redisHost = "localhost"  # Change to "nitter-redis" if using docker-compose
+listMinutes = 240            # how long to cache list info (not the tweets, so keep it high)
+rssMinutes = 10              # how long to cache rss queries
+redisHost = "localhost"      # Change to "nitter-redis" if using docker-compose
 redisPort = 6379
 redisPassword = ""
-redisConnections = 20  # minimum open connections in pool
+redisConnections = 20        # minimum open connections in pool
 redisMaxConnections = 30
 # new connections are opened when none are available, but if the pool size
 # goes above this, they're closed when released. don't worry about this unless
 # you receive tons of requests per second
 
 [Config]
-hmacKey = "secretkey"  # random key for cryptographic signing of video urls
-base64Media = false  # use base64 encoding for proxied media urls
-enableRSS = true  # set this to false to disable RSS feeds
-enableJsonApi = true # set this to false to disable the JSON API
-enableDebug = false  # enable request logs and debug endpoints (/.sessions)
-proxy = ""  # http/https url, SOCKS proxies are not supported
+hmacKey = "secretkey"        # random key for cryptographic signing of video urls
+base64Media = false          # use base64 encoding for proxied media urls
+enableRSS = true             # master switch, set to false to disable all RSS feeds
+enableRSSUserTweets = true   # /@user/rss
+enableRSSUserReplies = true  # /@user/with_replies/rss
+enableRSSUserMedia = true    # /@user/media/rss
+enableRSSSearch = true       # /search/rss and /@user/search/rss
+enableRSSList = true         # list RSS feeds
+enableJsonApi = true         # set this to false to disable the JSON API
+enableDebug = false          # enable request logs and debug endpoints (/.sessions)
+proxy = ""                   # http/https url, SOCKS proxies are not supported
 proxyAuth = ""
-apiProxy = "" # nitter-proxy host, e.g. localhost:7000
-disableTid = false # enable this if cookie-based auth is failing
+apiProxy = ""                # nitter-proxy host, e.g. localhost:7000
+disableTid = false           # enable this if cookie-based auth is failing
+maxConcurrentReqs = 2        # max requests at a time per session to avoid race conditions
+maxRetries = 1               # max number of retries on rate limit errors
+retryDelayMs = 150           # delay in ms between retries
 
 # Change default preferences here, see src/prefs_impl.nim for a complete list
 [Preferences]

nitter.nimble

@@ -28,7 +28,7 @@ requires "oauth#b8c163b"
 # Tasks
 
 task scss, "Generate css":
-  exec "nimble c --hint[Processing]:off -d:danger -r tools/gencss"
+  exec "nim r --hint[Processing]:off tools/gencss"
 
 task md, "Render md":
-  exec "nimble c --hint[Processing]:off -d:danger -r tools/rendermd"
+  exec "nim r --hint[Processing]:off tools/rendermd"

public/css/fontello.css

@@ -1,12 +1,12 @@
 @font-face {
   font-family: "fontello";
-  src: url("/fonts/fontello.eot?77185648");
+  src: url("/fonts/fontello.eot?49059696");
   src:
-    url("/fonts/fontello.eot?77185648#iefix") format("embedded-opentype"),
-    url("/fonts/fontello.woff2?77185648") format("woff2"),
-    url("/fonts/fontello.woff?77185648") format("woff"),
-    url("/fonts/fontello.ttf?77185648") format("truetype"),
-    url("/fonts/fontello.svg?77185648#fontello") format("svg");
+    url("/fonts/fontello.eot?49059696#iefix") format("embedded-opentype"),
+    url("/fonts/fontello.woff2?49059696") format("woff2"),
+    url("/fonts/fontello.woff?49059696") format("woff"),
+    url("/fonts/fontello.ttf?49059696") format("truetype"),
+    url("/fonts/fontello.svg?49059696#fontello") format("svg");
   font-weight: normal;
   font-style: normal;
 }
@@ -56,6 +56,11 @@
 }
 
 /* '' */
+.icon-group:before {
+  content: "\e804";
+}
+
+/* '' */
 .icon-play:before {
   content: "\e805";
 }
@@ -121,6 +126,11 @@
 }
 
 /* '' */
+.icon-attention:before {
+  content: "\e812";
+}
+
+/* '' */
 .icon-circle:before {
   content: "\f111";
 }

public/js/hlsPlayback.js

@@ -3,6 +3,7 @@
 function playVideo(overlay) {
     const video = overlay.parentElement.querySelector('video');
     const url = video.getAttribute("data-url");
+    const startTime = parseFloat(video.getAttribute("data-start") || "0");
     video.setAttribute("controls", "");
     overlay.style.display = "none";
 
@@ -12,12 +13,13 @@ function playVideo(overlay) {
         hls.attachMedia(video);
         hls.on(Hls.Events.MANIFEST_PARSED, function () {
             hls.loadLevel = hls.levels.length - 1;
-            hls.startLoad();
+            hls.startLoad(startTime);
             video.play();
         });
     } else if (video.canPlayType('application/vnd.apple.mpegurl')) {
         video.src = url;
         video.addEventListener('canplay', function() {
+            if (startTime > 0) video.currentTime = startTime;
             video.play();
         });
     }