Merge pull request #68 from zaanposni/release/1.19.0

Release/1.19.0
zaanposni · Nov 30, 2024 · 55491e6 · 55491e6
2 parents 6c497c9 + 84378e7
commit 55491e6
Show file tree

Hide file tree

Showing 19 changed files with 322 additions and 126 deletions.
diff --git a/src/imageresizer/src/index.ts b/src/imageresizer/src/index.ts
@@ -46,7 +46,7 @@ app.get("/cdn/:dir/:filename", async (req: Request<{ dir: string; filename: stri
     }
 
     // Validate parameters
-    const validFormats = ["avif", "webp", "jpg"];
+    const validFormats = ["avif", "jpg"];
     const validWidths = ["150", "300", "768", "1024", "original"];
 
     if (width && !validWidths.includes(width.toString())) {
@@ -57,11 +57,11 @@ app.get("/cdn/:dir/:filename", async (req: Request<{ dir: string; filename: stri
 
     if (format && !validFormats.includes(format.toString())) {
         logger.error(`Invalid format parameter: "${format}"`);
-        res.status(400).send("Invalid format parameter, must be one of: avif, webp, jpg");
+        res.status(400).send("Invalid format parameter, must be one of: avif, jpg");
         return;
     }
 
-    const targetFormat = (format as "avif" | "webp" | "jpg") || "jpg";
+    const targetFormat = (format as "avif" | "jpg") || "jpg";
     const targetWidth = width ? (width === "original" ? undefined : parseInt(width.toString())) : undefined;
 
     const originalFilePath = path.join(cdnFiles, filename);

diff --git a/src/nginx/nginx.conf b/src/nginx/nginx.conf
@@ -6,6 +6,37 @@ events { worker_connections 1024; }
 
 http {
     include mime.types;
+
+    gzip on;
+    gzip_disable "msie6";
+
+    gzip_vary on;
+    gzip_proxied any;
+    gzip_comp_level 6;
+    gzip_buffers 16 8k;
+    gzip_http_version 1.1;
+    gzip_min_length 256;
+    gzip_types
+        application/atom+xml
+        application/geo+json
+        application/javascript
+        application/x-javascript
+        application/json
+        application/ld+json
+        application/manifest+json
+        application/rdf+xml
+        application/rss+xml
+        application/xhtml+xml
+        application/xml
+        font/eot
+        font/otf
+        font/ttf
+        image/svg+xml
+        text/css
+        text/javascript
+        text/plain
+        text/xml;
+
     limit_req_zone $http_x_forwarded_for zone=myhigherlimit:10m rate=10r/s;
     limit_req_zone $http_x_forwarded_for zone=mylimit:10m rate=3r/s;
 
@@ -17,16 +48,9 @@ http {
         listen 80;
         listen [::]:80;
 
-        root /var/www/data;
-        index index.html;
-
         access_log /var/log/nginx/access_custom.log compression;
         access_log /dev/stdout compression;
 
-        location ~ /\.ht {
-            deny all;
-        }
-
         location ^~ /cdn/ {
             proxy_set_header X-Forwarded-Proto $scheme;
             proxy_set_header X-Forwarded-For $http_x_forwarded_for;
@@ -43,6 +67,16 @@ http {
             proxy_pass http://frontend:3000;
         }
 
+        location ~ /(brammen\.jpg|chris\.jpg|jay\.jpg|peter\.jpg|sep\.jpg|ps\.png|reddit\-logo\.svg|threads\-logo\.svg|twitch\-logo\.svg)$ {
+            limit_req zone=mylimit burst=50 nodelay;
+
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header X-Forwarded-For $http_x_forwarded_for;
+            proxy_pass http://frontend:3000;
+
+            expires 365d;
+        }
+
         location / {
             limit_req zone=mylimit burst=50 nodelay;
 
@@ -51,4 +85,4 @@ http {
             proxy_pass http://frontend:3000;
         }
     }
-}
+}
diff --git a/src/psaggregator/package-lock.json b/src/psaggregator/package-lock.json
diff --git a/src/psaggregator/package.json b/src/psaggregator/package.json
@@ -1,6 +1,6 @@
 {
     "name": "psaggregator",
-    "version": "1.18.0",
+    "version": "1.19.0",
     "scripts": {
         "dev": "vite dev",
         "build": "vite build",

diff --git a/src/psaggregator/src/lib/components/BigHeader.svelte b/src/psaggregator/src/lib/components/BigHeader.svelte
@@ -8,7 +8,12 @@
     <div class="flex items-center gap-x-4 border-b p-4">
         <div>
             <a href="/">
-                <img src="/ps.png" alt="psaggregator logo, pietsmiet logo turned upside down, green game controller" class="h-8 w-8" />
+                <img
+                    src="/ps.png"
+                    alt="psaggregator logo, pietsmiet logo turned upside down, green game controller"
+                    class="h-8 w-8"
+                    height="100"
+                    width="100" />
             </a>
         </div>
         <div class="flex grow flex-nowrap items-center justify-between">

diff --git a/src/psaggregator/src/lib/components/CDNImage.svelte b/src/psaggregator/src/lib/components/CDNImage.svelte
@@ -11,16 +11,28 @@
     let classes = "";
     export { classes as class };
 
-    function getPreferredImageFormat() {
+    let imageSrc = "";
+
+    function supportsAVIF() {
+        return new Promise((resolve) => {
+            const avifImage =
+                "data:image/avif;base64,AAAAIGZ0eXBhdmlmAAAAAGF2aWZtaWYxbWlhZk1BMUIAAADybWV0YQAAAAAAAAAoaGRscgAAAAAAAAAAcGljdAAAAAAAAAAAAAAAAGxpYmF2aWYAAAAADnBpdG0AAAAAAAEAAAAeaWxvYwAAAABEAAABAAEAAAABAAABGgAAAB0AAAAoaWluZgAAAAAAAQAAABppbmZlAgAAAAABAABhdjAxQ29sb3IAAAAAamlwcnAAAABLaXBjbwAAABRpc3BlAAAAAAAAAAIAAAACAAAAEHBpeGkAAAAAAwgICAAAAAxhdjFDgQ0MAAAAABNjb2xybmNseAACAAIAAYAAAAAXaXBtYQAAAAAAAAABAAEEAQKDBAAAACVtZGF0EgAKCBgANogQEAwgMg8f8D///8WfhwB8+ErK42A=";
+            const img = new Image();
+            img.onload = () => resolve(true);
+            img.onerror = () => resolve(false);
+            img.src = avifImage;
+        });
+    }
+
+    async function getPreferredImageFormat() {
         if (!browser || !window || !window.matchMedia) {
             return "jpg";
         }
 
-        if (window.matchMedia && window.matchMedia("(image-avif)").matches) {
+        if (await supportsAVIF()) {
             return "avif";
-        } else if (window.matchMedia && window.matchMedia("(image-webp)").matches) {
-            return "webp";
         }
+
         return "jpg"; // fallback
     }
 
@@ -50,9 +62,13 @@
         return "300"; // fallback
     }
 
-    $: imageSrc = `${src}?format=${getPreferredImageFormat()}&width=${getPreferredImageSize()}`;
+    async function calculateImageSrc(src: string | null | undefined) {
+        imageSrc = `${src}?format=${await getPreferredImageFormat()}&width=${getPreferredImageSize()}`;
+    }
+
+    $: browser && calculateImageSrc(src);
 </script>
 
-{#if browser}
-    <img src={imageSrc} alt={alt ?? "unknown"} title={title ?? alt ?? "unknown"} {loading} class={style} />
+{#if imageSrc}
+    <img src={imageSrc} alt={alt ?? "unknown"} title={title ?? alt ?? "unknown"} {loading} class={classes} {style} />
 {/if}
diff --git a/src/psaggregator/src/lib/components/InstagramPost.svelte b/src/psaggregator/src/lib/components/InstagramPost.svelte
@@ -6,6 +6,7 @@
     import CdnImage from "./CDNImage.svelte";
 
     export let post: Information & { InformationResource: InformationResource[] };
+    export let loading: "lazy" | "eager" = "lazy";
 
     let video: HTMLVideoElement;
     $: isVideoOnly =
@@ -59,7 +60,13 @@
                 {/each}
             </div>
         {:else if post.imageUri}
-            <CdnImage size="large" class="m-4 rounded-xl md:m-8" src={post.imageUri} alt={"community post attachment"} title={post.text} />
+            <CdnImage
+                size="large"
+                class="m-4 rounded-xl md:m-8"
+                src={post.imageUri}
+                alt={"community post attachment"}
+                title={post.text}
+                {loading} />
         {/if}
     </div>
 </Card.Root>
diff --git a/src/psaggregator/src/lib/components/InstagramStoriesContainer.svelte b/src/psaggregator/src/lib/components/InstagramStoriesContainer.svelte
@@ -184,62 +184,70 @@
 
 <MediaQuery query="(min-width: 768px)" let:matches>
     {#if active}
-        <div class="absolute left-0 top-0 z-10 flex h-full w-full flex-col bg-black">
+        <div
+            class="max-w-screen absolute left-0 top-0 z-10 flex h-screen max-h-screen w-screen flex-col overflow-hidden bg-black pt-12 lg:pt-12">
             <div
-                class="story-container flex h-full w-full flex-col overflow-hidden lg:mx-auto lg:w-1/2"
+                class="story-container max-w-screen flex h-screen max-h-screen w-screen flex-col overflow-hidden lg:mx-auto lg:w-1/2"
                 class:pause={touchStartX}
                 on:touchstart={touchStartHandler}
                 on:touchend={touchEndHandler}>
-                <div class="progress-container flex w-full px-2 pt-4" bind:this={progressContainer}>
-                    {#each stories as story, index}
-                        {@const duration =
-                            story.InformationResource?.length && story.InformationResource[0].videoDuration
-                                ? story.InformationResource[0].videoDuration
-                                : 15}
-                        <div
-                            style="animation-duration: {duration}s"
-                            class:active={currentIndex === index}
-                            class:passed={currentIndex > index}
-                            class="progress"
-                            on:animationend={playNext}
-                            on:click={() => {
-                                playSpecific(index);
-                            }}
-                            on:keydown={void 0}
-                            role="button"
-                            tabindex="0">
-                        </div>
-                    {/each}
-                </div>
-                <div class="mt-2 flex w-full items-center justify-between px-2">
-                    <div class="flex items-center gap-x-2">
-                        <img src="{filterKey}.jpg" alt={filterKey} class="h-12 w-12 rounded-full object-cover" />
-                        <span class="text-sm font-bold text-white">{titleCase(filterKey)}</span>
+                <div class="max-w-screen lg:max-w-1/2 absolute top-12 z-10 w-screen lg:top-0 lg:w-1/2">
+                    <div class="progress-container flex w-full max-w-full px-2 pt-4" bind:this={progressContainer}>
+                        {#each stories as story, index}
+                            {@const duration =
+                                story.InformationResource?.length && story.InformationResource[0].videoDuration
+                                    ? story.InformationResource[0].videoDuration
+                                    : 15}
+                            <div
+                                style="animation-duration: {duration}s"
+                                class:active={currentIndex === index}
+                                class:passed={currentIndex > index}
+                                class="progress"
+                                on:animationend={playNext}
+                                on:click={() => {
+                                    playSpecific(index);
+                                }}
+                                on:keydown={void 0}
+                                role="button"
+                                tabindex="0">
+                            </div>
+                        {/each}
                     </div>
-                    <div class="flex items-center gap-x-2">
-                        {#if selectedStory && selectedStory.InformationResource?.length && selectedStory.InformationResource[0].videoUri}
-                            <button
-                                on:click={(e) => {
-                                    video.muted = !video.muted;
-                                    e.stopPropagation();
-                                }}>
-                                {#if video}
-                                    {#if video.muted}
-                                        <VolumeMute class="h-8 w-8" />
-                                    {:else}
-                                        <VolumeUp class="h-8 w-8" />
+                    <div class="mt-2 flex w-full items-center justify-between px-2">
+                        <div class="flex items-center gap-x-2">
+                            <img
+                                src="{filterKey}.jpg"
+                                alt={filterKey}
+                                class="aspect-square h-12 w-12 rounded-full object-cover"
+                                width="64"
+                                height="64" />
+                            <span class="text-sm font-bold text-white">{titleCase(filterKey)}</span>
+                        </div>
+                        <div class="flex items-center gap-x-2">
+                            {#if selectedStory && selectedStory.InformationResource?.length && selectedStory.InformationResource[0].videoUri}
+                                <button
+                                    on:click={(e) => {
+                                        video.muted = !video.muted;
+                                        e.stopPropagation();
+                                    }}>
+                                    {#if video}
+                                        {#if video.muted}
+                                            <VolumeMute class="h-8 w-8" />
+                                        {:else}
+                                            <VolumeUp class="h-8 w-8" />
+                                        {/if}
                                     {/if}
-                                {/if}
+                                </button>
+                            {/if}
+                            <button on:click={() => (active = false)}>
+                                <CloseLarge class="h-8 w-8" />
                             </button>
-                        {/if}
-                        <button on:click={() => (active = false)}>
-                            <CloseLarge class="h-8 w-8" />
-                        </button>
+                        </div>
                     </div>
                 </div>
                 <div
                     bind:this={storyView}
-                    class="flex h-full w-full items-center justify-center overflow-y-auto py-2 md:py-8"
+                    class="flex w-full justify-center overflow-hidden"
                     on:click={clickImageHandler}
                     on:keydown={void 0}
                     role="button"
@@ -253,14 +261,14 @@
                                 loop
                                 muted
                                 playsinline
-                                class="h-full w-full object-contain"></video>
+                                class="rounded-[20px] object-contain"></video>
                         {:else}
                             <CdnImage
                                 size="full"
                                 src={selectedStory.imageUri}
                                 alt={selectedStory.text}
                                 title={selectedStory.text}
-                                class="h-full w-full object-contain" />
+                                class="rounded-[20px] object-contain" />
                         {/if}
                     {/if}
                 </div>
@@ -278,7 +286,7 @@
             on:keydown={void 0}
             role="button"
             tabindex="0">
-            <img class="h-full w-full rounded-full object-cover" src="{filterKey}.jpg" alt={filterKey} />
+            <img class="h-full w-full rounded-full object-cover" src="{filterKey}.jpg" alt={filterKey} width="64" height="64" />
         </div>
     {/if}
 </MediaQuery>