Merge branch 'imputnet:main' into main

api/src/config.js

@@ -26,7 +26,7 @@ const env = {
     rateLimitMax: (process.env.RATELIMIT_MAX && parseInt(process.env.RATELIMIT_MAX)) || 20,
 
     durationLimit: (process.env.DURATION_LIMIT && parseInt(process.env.DURATION_LIMIT)) || 10800,
-    streamLifespan: 90,
+    streamLifespan: (process.env.TUNNEL_LIFESPAN && parseInt(process.env.TUNNEL_LIFESPAN)) || 90,
 
     processingPriority: process.platform !== 'win32'
         && process.env.PROCESSING_PRIORITY

api/src/processing/service-config.js

@@ -137,7 +137,8 @@ export const services = {
             ":user/status/:id/video/:index",
             ":user/status/:id/photo/:index",
             ":user/status/:id/mediaviewer",
-            ":user/status/:id/mediaViewer"
+            ":user/status/:id/mediaViewer",
+            "i/bookmarks?post_id=:id"
         ],
         subdomains: ["mobile"],
         altDomains: ["x.com", "vxtwitter.com", "fixvx.com"],

api/src/processing/url.js

@@ -120,6 +120,11 @@ function cleanURL(url) {
                 limitQuery('p')
             }
             break;
+        case "twitter":
+            if (url.searchParams.get('post_id')) {
+                limitQuery('post_id')
+            }
+            break;
     }
 
     if (stripQuery) {

api/src/util/tests.json

@@ -192,6 +192,24 @@
                 "code": 400,
                 "status": "error"
             }
+        },
+        {
+            "name": "bookmarked video",
+            "url": "https://twitter.com/i/bookmarks?post_id=1828099210220294314",
+            "params": {},
+            "expected": {
+                "code": 200,
+                "status": "redirect"
+            }
+        },
+        {
+            "name": "bookmarked photo",
+            "url": "https://twitter.com/i/bookmarks?post_id=1837430141179289876",
+            "params": {},
+            "expected": {
+                "code": 200,
+                "status": "redirect"
+            }
         }
     ],
     "soundcloud": [

docs/run-an-instance.md

@@ -71,6 +71,7 @@ sudo service nscd start
 | `RATELIMIT_WINDOW`    | `60`      | `120`                   | rate limit time window in **seconds**. |
 | `RATELIMIT_MAX`       | `20`      | `30`                    | max requests per time window. requests above this amount will be blocked for the rate limit window duration. |
 | `DURATION_LIMIT`      | `10800`   | `18000`                 | max allowed video duration in **seconds**. |
+| `TUNNEL_LIFESPAN`     | `90`      | `120`                   | the duration for which tunnel info is stored in ram, **in seconds**. |
 
 \* the higher the nice value, the lower the priority. [read more here](https://en.wikipedia.org/wiki/Nice_(Unix)).
 

web/i18n/en/about/credits.md

@@ -3,6 +3,7 @@
     import { t } from "$lib/i18n/translations";
 
     import SectionHeading from "$components/misc/SectionHeading.svelte";
+    import BetaTesters from "$components/misc/BetaTesters.svelte";
 </script>
 
 <section id="testers">
@@ -13,17 +14,7 @@
 
 huge shoutout to our thing breakers for testing updates early and making sure they're stable.
 they also helped us ship cobalt 10!
-- codfish246
-- [damir](https://otomir23.me/)
-- Hunter
-- [hyperdefined](https://hyper.lol/)
-- [KwiatekMiki](https://kwiatekmiki.com/)
-- [Lao](https://lao.ooo/)
-- lostdusty
-- [noblereign](https://fursona.directory/@frost)
-- [Spax](https://spax.zone/)
-- [synzr](https://synzr.space/)
-- [vimae](https://mae.wtf/)
+<BetaTesters />
 
 all links are external and lead to their personal websites or social media.
 </section>

web/src/components/misc/BetaTesters.svelte

@@ -0,0 +1,32 @@
+<script lang="ts">
+    import OuterLink from "./OuterLink.svelte";
+
+    type Tester = { name: string, url?: string };
+    const credits: Tester[] = [
+        { name: "codfish246" },
+        { name: "damir", url: "https://otomir23.me/" },
+        { name: "Hunter" },
+        { name: "hyperdefined", url: "https://hyper.lol/" },
+        { name: "KwiatekMiki", url: "https://kwiatekmiki.com/" },
+        { name: "Lao", url: "https://lao.ooo/" },
+        { name: "lostdusty", url: "https://lostdusty.dev.br/" },
+        { name: "noblereign", url: "https://fursona.directory/@frost" },
+        { name: "Spax", url: "https://spax.zone/" },
+        { name: "synzr", url: "https://synzr.space/" },
+        { name: "vimae", url: "https://mae.wtf/" }
+    ];
+</script>
+
+<ul>
+    {#each credits as { name, url }}
+        <li>
+            {#if url}
+                <OuterLink href={url}>
+                    {name}
+                </OuterLink>
+            {:else}
+                {name}
+            {/if}
+        </li>
+    {/each}
+</ul>

web/src/routes/+layout.svelte

@@ -203,7 +203,7 @@
         --input-border: #383838;
 
         --toggle-bg: var(--input-border);
-        --toggle-bg-enabled: #777777;
+        --toggle-bg-enabled: #8a8a8a;
 
         --sidebar-mobile-gradient: linear-gradient(
             90deg,
@@ -501,6 +501,11 @@
         padding-top: 0;
     }
 
+    :global(::selection) {
+        color: var(--primary);
+        background: var(--secondary);
+    }
+
     @media screen and (max-width: 535px) {
         :global(.long-text-noto),
         :global(.long-text-noto *:not(h1, h2, h3, h4, h5, h6)) {