perf: compress codecircles into webp

* feat: redirect shortened URLs

* feat: accept shortened URLs in converter

* fix: tell resty not to follow redirect

* fix: remove log

.gitignore

@@ -2,4 +2,4 @@
 docker-compose.yml
 .DS_Store
 *bin
-/tmp
+/tmp

.prettierrc

@@ -0,0 +1,6 @@
+{
+    "trailingComma": "es5",
+    "tabWidth": 4,
+    "semi": false,
+    "singleQuote": true
+}

Dockerfile

@@ -1,19 +1,24 @@
-FROM golang:1.18-alpine
-
-RUN apk add musl-dev
-RUN apk add libc-dev
-RUN apk add gcc
+FROM golang:1.19-alpine as build
 
 WORKDIR /app
 
-COPY go.mod ./
-COPY go.sum ./
+COPY go.mod .
+COPY go.sum .
 
 RUN go mod download
 
-COPY ./ /app
+COPY . .
 
-RUN go build -o /anonymousoverflow
+ENV CGO_ENABLED=0
+
+RUN go build -o anonymousoverflow
+
+FROM scratch
+
+COPY --from=build /app/anonymousoverflow /anonymousoverflow
+COPY templates /templates
+COPY public /public
+COPY --from=build /etc/ssl/certs /etc/ssl/certs
 
 EXPOSE 8080
 

README.md

@@ -14,37 +14,42 @@ This project is super lightweight by design. The UI is simple and the frontend i
 
 ## Clearnet Instances
 
-| Instance URL                                                                    | Region                           | Notes                                                                                            |
-| ------------------------------------------------------------------------------- | -------------------------------- | ------------------------------------------------------------------------------------------------ |
-| [code.whatever.social](https://code.whatever.social)                            | United States & The Netherlands  | Operated by [Whatever Social](https://whatever.social) and [http.james](https://httpjames.space) |
-| [ao.vern.cc](https://ao.vern.cc)                                                | United States                    | Operated by [vern.cc](https://vern.cc)                                                           |
-| [overflow.smnz.de](https://overflow.smnz.de)                                    | Germany                          | Operated by [smnz.de](https://smnz.de)                                                           |
-| [overflow.lunar.icu](https://overflow.lunar.icu)                                | Germany                          | Operated by [lunar.icu](https://lunar.icu/)                                                      |
-| [overflow.adminforge.de](https://overflow.adminforge.de/)                       | Germany                          | Operated by [adminForge](https://adminforge.de/)                                                 |
-| [overflow.hostux.net](https://overflow.hostux.net/)                             | France                           | Operated by [Hostux](https://hostux.net/)                                                        |
-| [overflow.projectsegfau.lt](https://overflow.projectsegfau.lt/)                 | United States, France, India | Operated by [Project Segfault](https://projectsegfau.lt/)                                        |
-| [code.xbdm.fun](https://code.xbdm.fun)                                          | Germany                          | Operated by [xbdm.fun](https://xbdm.fun)                                                         |
-| [overflow.fascinated.cc](https://overflow.fascinated.cc/)                       | Germany                          | Operated by [fascinated.cc](https://fascinated.cc/)                                              |
-| [ao.bloatcat.tk](https://ao.bloatcat.tk)                                        | Iceland                          | Operated by [bloatcat.tk](https://bloatcat.tk)                                                   |
-| [anonoverflow.frontendfriendly.xyz](https://anonoverflow.frontendfriendly.xyz/) | United States                    | Operated by [frontendfriendly.xyz](https://frontendfriendly.xyz/)                                |
-| [ao.owo.si](https://ao.owo.si/)                                                 | Germany                          | Operated by [owo.si](https://owo.si/)                                                            |
-| [overflow.datura.network](https://overflow.datura.network/)                     | Germany                          | Operated by [datura.network](https://datura.network)                                             |
-|                                                                                 |                                  |                                                                                                  |
+| Instance URL                                                                    | Region                          | Notes                                                                                            |
+| ------------------------------------------------------------------------------- | ------------------------------- | ------------------------------------------------------------------------------------------------ |
+| [code.whatever.social](https://code.whatever.social)                            | United States & The Netherlands | Operated by [Whatever Social](https://whatever.social) and [http.james](https://httpjames.space) |
+| [ao.vern.cc](https://ao.vern.cc)                                                | United States                   | Operated by [vern.cc](https://vern.cc)                                                           |
+| [overflow.smnz.de](https://overflow.smnz.de)                                    | Germany                         | Operated by [smnz.de](https://smnz.de)                                                           |
+| [overflow.lunar.icu](https://overflow.lunar.icu)                                | Germany                         | Operated by [lunar.icu](https://lunar.icu/)                                                      |
+| [overflow.adminforge.de](https://overflow.adminforge.de/)                       | Germany                         | Operated by [adminForge](https://adminforge.de/)                                                 |
+| [overflow.hostux.net](https://overflow.hostux.net/)                             | France                          | Operated by [Hostux](https://hostux.net/)                                                        |
+| [overflow.projectsegfau.lt](https://overflow.projectsegfau.lt/)                 | United States, France, India    | Operated by [Project Segfault](https://projectsegfau.lt/)                                        |
+| [code.xbdm.fun](https://code.xbdm.fun)                                          | Germany                         | Operated by [xbdm.fun](https://xbdm.fun)                                                         |
+| [overflow.fascinated.cc](https://overflow.fascinated.cc/)                       | Germany                         | Operated by [fascinated.cc](https://fascinated.cc/)                                              |
+| [ao.bloatcat.tk](https://ao.bloatcat.tk)                                        | Iceland                         | Operated by [bloatcat.tk](https://bloatcat.tk)                                                   |
+| [anonoverflow.frontendfriendly.xyz](https://anonoverflow.frontendfriendly.xyz/) | United States                   | Operated by [frontendfriendly.xyz](https://frontendfriendly.xyz/)                                |
+| [ao.owo.si](https://ao.owo.si/)                                                 | Germany                         | Operated by [owo.si](https://owo.si/)                                                            |
+| [overflow.datura.network](https://overflow.datura.network/)                     | Germany                         | Operated by [datura.network](https://datura.network)                                             |
+| [overflow.freedit.eu](overflow.freedit.eu)                                      | United States                   | Operated by [freedit.eu](https://freedit.eu)                                                     |
+| [ao.ftw.lol](https://ao.ftw.lol)                                                | Germany                         | Operated by [ftw.lol](https://ftw.lol)                                                           |
+| [anonoverflow.hyperreal.coffee](https://anonoverflow.hyperreal.coffee)          | United States                   | Operated by [hyperreal.coffee](https://hyperreal.coffee)                                         |
+| [a.opnxng.com](a.opnxng.com)                                                    | Singapore                       | Operated by [opnxng.com](https://about.opnxng.com)                                               |
+| [overflow.sudovanilla.com](https://overflow.sudovanilla.com)                    | United States                   | Operated by [SudoVanilla](https://sudovanilla.com)|
+
 
 ## Other Instances
 
-| Instance URL                                                                                                                                               | Region                           | Notes                                                     |
-| ---------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------- | --------------------------------------------------------- |
-| [ao.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion](http://ao.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion)              | United States                    | Operated by [vern.cc](https://vern.cc)                    |
-| [vernmzgraj6aaoafmehupvtkkynpaa67rxcdj2kinwiy6konn6rq.b32.i2p](http://vernmzgraj6aaoafmehupvtkkynpaa67rxcdj2kinwiy6konn6rq.b32.i2p)                        | United States                    | Operated by [vern.cc](https://vern.cc)                    |
-| [overflow.pjsfkvpxlinjamtawaksbnnaqs2fc2mtvmozrzckxh7f3kis6yea25ad.onion](http://overflow.pjsfkvpxlinjamtawaksbnnaqs2fc2mtvmozrzckxh7f3kis6yea25ad.onion/) | Luxembourg | Operated by [Project Segfault](https://projectsegfau.lt/) |
-| [overflow.daturab6drmkhyeia4ch5gvfc2f3wgo6bhjrv3pz6n7kxmvoznlkq4yd.onion](http://overflow.daturab6drmkhyeia4ch5gvfc2f3wgo6bhjrv3pz6n7kxmvoznlkq4yd.onion/) | Germany                          | Operated by [datura.network](https://datura.network)      |
-| [ao.pk47sgwhncn5cgidm7bofngmh7lc7ukjdpk5bjwfemmyp27ovl25ikyd.onion](http://ao.pk47sgwhncn5cgidm7bofngmh7lc7ukjdpk5bjwfemmyp27ovl25ikyd.onion/)             | Germany                          | Operated by [owo.si](https://owo.si/)                     |
-| [ay7akchgdh76r4lc62hzd52z6xqoh67loototsetvqxo5o7ngo5q.b32.i2p](http://ay7akchgdh76r4lc62hzd52z6xqoh67loototsetvqxo5o7ngo5q.b32.i2p/)                       | Germany                          | Operated by [owo.si](https://owo.si/)                     |
+| Instance URL                                                                                                                                               | Region        | Notes                                                     |
+| ---------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------- | --------------------------------------------------------- |
+| [ao.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion](http://ao.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion)              | United States | Operated by [vern.cc](https://vern.cc)                    |
+| [vernmzgraj6aaoafmehupvtkkynpaa67rxcdj2kinwiy6konn6rq.b32.i2p](http://vernmzgraj6aaoafmehupvtkkynpaa67rxcdj2kinwiy6konn6rq.b32.i2p)                        | United States | Operated by [vern.cc](https://vern.cc)                    |
+| [overflow.pjsfkvpxlinjamtawaksbnnaqs2fc2mtvmozrzckxh7f3kis6yea25ad.onion](http://overflow.pjsfkvpxlinjamtawaksbnnaqs2fc2mtvmozrzckxh7f3kis6yea25ad.onion/) | Luxembourg    | Operated by [Project Segfault](https://projectsegfau.lt/) |
+| [overflow.daturab6drmkhyeia4ch5gvfc2f3wgo6bhjrv3pz6n7kxmvoznlkq4yd.onion](http://overflow.daturab6drmkhyeia4ch5gvfc2f3wgo6bhjrv3pz6n7kxmvoznlkq4yd.onion/) | Germany       | Operated by [datura.network](https://datura.network)      |
+| [ao.pk47sgwhncn5cgidm7bofngmh7lc7ukjdpk5bjwfemmyp27ovl25ikyd.onion](http://ao.pk47sgwhncn5cgidm7bofngmh7lc7ukjdpk5bjwfemmyp27ovl25ikyd.onion/)             | Germany       | Operated by [owo.si](https://owo.si/)                     |
+| [ay7akchgdh76r4lc62hzd52z6xqoh67loototsetvqxo5o7ngo5q.b32.i2p](http://ay7akchgdh76r4lc62hzd52z6xqoh67loototsetvqxo5o7ngo5q.b32.i2p/)                       | Germany       | Operated by [owo.si](https://owo.si/)                     |
 
 ## Why use AnonymousOverflow over StackOverflow?
 
-- StackOverflow collects a lot of information
+-   StackOverflow collects a lot of information
 
 While it's understandable that StackOverflow collects a lot of technical data for product development, debugging and to serve the best experience to its users, not everyone wants their
 
@@ -52,7 +57,7 @@ While it's understandable that StackOverflow collects a lot of technical data fo
 
 to be collected and stored.
 
-- StackOverflow shares your information with third-parties
+-   StackOverflow shares your information with third-parties
 
 StackOverflow does not sell your information, but it does share it with third-parties, including conglomerates.
 
@@ -61,7 +66,7 @@ StackOverflow does not sell your information, but it does share it with third-pa
 
 Their main website also [contains trackers from Alphabet](https://themarkup.org/blacklight?url=stackoverflow.com).
 
-- Reduced clutter
+-   Reduced clutter
 
 StackOverflow has a cluttered UI that might distract you from the content you're trying to find. AnonymousOverflow simplifies the interface to make it easier to read and navigate.
 
@@ -93,10 +98,10 @@ You can easily convert StackOverflow URLs to AnonymousOverflow ones by adding th
 
 ```js
 javascript: (function () {
-  window.location = window.location
-    .toString()
-    .replace(/stackoverflow\.com/, "code.whatever.social");
-})();
+    window.location = window.location
+        .toString()
+        .replace(/stackoverflow\.com/, 'code.whatever.social')
+})()
 ```
 
 Replace `code.whatever.social` with the domain name of the instance you're using if needed.
@@ -111,8 +116,8 @@ Read the [wiki page](https://github.com/httpjamesm/AnonymousOverflow/wiki/Deploy
 
 ## Attribution
 
-- Icons provided by [heroicons](https://heroicons.com) under the [MIT License](https://choosealicense.com/licenses/mit/)
-- [Gin](https://github.com/gin-gonic/gin) under the [MIT License](https://github.com/gin-gonic/gin/blob/master/LICENSE)
-- [goquery](https://github.com/PuerkitoBio/goquery) under the [BSD 3-Clause License](https://github.com/PuerkitoBio/goquery/blob/master/LICENSE)
-- [resty](https://github.com/go-resty/resty) under the [MIT License](https://github.com/go-resty/resty/blob/master/LICENSE)
-- [Chroma](https://github.com/alecthomas/chroma) under the [MIT License](https://github.com/alecthomas/chroma/blob/master/COPYING)
+-   Icons provided by [heroicons](https://heroicons.com) under the [MIT License](https://choosealicense.com/licenses/mit/)
+-   [Gin](https://github.com/gin-gonic/gin) under the [MIT License](https://github.com/gin-gonic/gin/blob/master/LICENSE)
+-   [goquery](https://github.com/PuerkitoBio/goquery) under the [BSD 3-Clause License](https://github.com/PuerkitoBio/goquery/blob/master/LICENSE)
+-   [resty](https://github.com/go-resty/resty) under the [MIT License](https://github.com/go-resty/resty/blob/master/LICENSE)
+-   [Chroma](https://github.com/alecthomas/chroma) under the [MIT License](https://github.com/alecthomas/chroma/blob/master/COPYING)

config/version.go

@@ -1,3 +1,3 @@
 package config
 
-var Version = "1.8.3"
+var Version = "1.9.0"

main.go

@@ -50,6 +50,8 @@ func main() {
 	r.GET("/", routes.GetHome)
 	r.POST("/", routes.PostHome)
 
+	r.GET("/a/:id", routes.RedirectShortenedOverflowURL)
+
 	r.GET("/questions/:id", func(c *gin.Context) {
 		// redirect user to the question with the title
 		c.Redirect(302, fmt.Sprintf("/questions/%s/placeholder", c.Param("id")))

public/globals.css

@@ -10,7 +10,7 @@
     --link-color: #92adff;
 }
 
-[data-theme="light"] {
+[data-theme='light'] {
     --main-bg: rgb(219, 219, 219);
     --text-color: #000;
     --muted-text-color: #636363;
@@ -26,7 +26,6 @@ a {
     color: var(--link-color);
 }
 
-
 html {
     margin: 0;
     padding: 0;
@@ -45,9 +44,9 @@ html {
 .icon img {
     background: white;
     border-radius: 50%;
-    padding: .25rem;
+    padding: 0.25rem;
 }
 
 details {
     cursor: pointer;
-}
+}

public/question.css

@@ -19,9 +19,17 @@ body {
     box-sizing: border-box;
 }
 
-.parent {
-    max-width: 90%;
-    width: fit-content;
+@media (orientation: landscape) {
+    .parent {
+        max-width: 50%;
+        width: fit-content;
+    }
+}
+@media (orientation: portrait) {
+    .parent {
+        max-width: 90%;
+        width: fit-content;
+    }
 }
 
 .header {
@@ -31,7 +39,7 @@ body {
 
 .card-tags {
     display: flex;
-    gap: .5rem;
+    gap: 0.5rem;
 }
 
 .card-tags .tag {
@@ -94,7 +102,7 @@ img {
     margin-bottom: 1rem;
     background-color: var(--meta-bg);
     color: var(--text-color);
-    
+
     display: flex;
     justify-content: space-between;
     align-items: center;

src/routes/home.go

@@ -35,10 +35,14 @@ func PostHome(c *gin.Context) {
 
 	soLink := body.URL
 
+	// remove the www.
+	soLink = strings.ReplaceAll(soLink, "www.", "")
+
 	// validate URL
 	isStackOverflow := strings.HasPrefix(soLink, "https://stackoverflow.com/questions/")
+	isShortenedStackOverflow := strings.HasPrefix(soLink, "https://stackoverflow.com/a/")
 	isStackExchange := stackExchangeRegex.MatchString(soLink)
-	if !isStackExchange && !isStackOverflow {
+	if !isStackExchange && !isStackOverflow && !isShortenedStackOverflow {
 		c.HTML(400, "home.html", gin.H{
 			"errorMessage": "Invalid stack overflow/exchange URL",
 			"theme":        c.MustGet("theme").(string),
@@ -47,7 +51,7 @@ func PostHome(c *gin.Context) {
 	}
 
 	// if stack overflow, trim https://stackoverflow.com
-	if isStackOverflow {
+	if isStackOverflow || isShortenedStackOverflow {
 		c.Redirect(302, strings.TrimPrefix(soLink, "https://stackoverflow.com"))
 		return
 	}

src/routes/shortened.go

@@ -0,0 +1,44 @@
+package routes
+
+import (
+	"fmt"
+	"net/http"
+	"os"
+
+	"github.com/gin-gonic/gin"
+	"github.com/go-resty/resty/v2"
+)
+
+func RedirectShortenedOverflowURL(c *gin.Context) {
+	id := c.Param("id")
+
+	// fetch the stack overflow URL
+	client := resty.New()
+	client.SetRedirectPolicy(
+		resty.RedirectPolicyFunc(func(req *http.Request, via []*http.Request) error {
+			return http.ErrUseLastResponse
+		}),
+	)
+
+	resp, err := client.R().Get(fmt.Sprintf("https://www.stackoverflow.com/a/%s", id))
+	if err != nil {
+		c.HTML(400, "home.html", gin.H{
+			"errorMessage": "Unable to fetch stack overflow URL",
+			"theme":        c.MustGet("theme").(string),
+		})
+		return
+	}
+
+	if resp.StatusCode() != 302 {
+		c.HTML(400, "home.html", gin.H{
+			"errorMessage": fmt.Sprintf("Unexpected HTTP status from origin: %d", resp.StatusCode()),
+			"theme":        c.MustGet("theme").(string),
+		})
+		return
+	}
+
+	// get the redirect URL
+	location := resp.Header().Get("Location")
+
+	c.Redirect(302, fmt.Sprintf("%s%s", os.Getenv("APP_URL"), location))
+}

src/utils/images.go

@@ -6,6 +6,7 @@ import (
 	"os"
 	"regexp"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/golang-jwt/jwt/v4"
@@ -14,20 +15,28 @@ import (
 var imgTagRegex = regexp.MustCompile(`<img[^>]*\s+src\s*=\s*"(.*?)"[^>]*>`)
 
 func ReplaceImgTags(inHtml string) string {
-	// find all img tags
 	imgTags := imgTagRegex.FindAllString(inHtml, -1)
 
+	var wg sync.WaitGroup
+	var mu sync.Mutex
+
 	for _, imgTag := range imgTags {
-		// parse the src="" attribute
-		srcRegex := regexp.MustCompile(`src\s*=\s*"(.*?)"`)
-		src := srcRegex.FindStringSubmatch(imgTag)[1]
+		wg.Add(1)
+		go func(imgTag string) {
+			defer wg.Done()
+			srcRegex := regexp.MustCompile(`src\s*=\s*"(.*?)"`)
+			src := srcRegex.FindStringSubmatch(imgTag)[1]
 
-		authToken, _ := generateImageProxyAuth(src)
+			authToken, _ := generateImageProxyAuth(src)
 
-		// replace the img tag with a proxied url
-		inHtml = strings.Replace(inHtml, imgTag, fmt.Sprintf(`<img src="%s/proxy?auth=%s">`, os.Getenv("APP_URL"), authToken), 1)
+			mu.Lock()
+			defer mu.Unlock()
+			inHtml = strings.Replace(inHtml, imgTag, fmt.Sprintf(`<img src="%s/proxy?auth=%s">`, os.Getenv("APP_URL"), authToken), 1)
+		}(imgTag)
 	}
 
+	wg.Wait()
+
 	return inHtml
 }
 

templates/home.html

@@ -7,7 +7,7 @@
             http-equiv="Content-Security-Policy"
             content="default-src 'none'; style-src 'self'; script-src 'none'; img-src 'self';"
         />
-        <link rel="icon" href="/static/codecircles.png" />
+        <link rel="icon" href="/static/codecircles.webp" />
         <meta
             name="description"
             content="View StackOverflow threads in privacy and without the clutter."
@@ -19,7 +19,7 @@
             <div class="title">
                 <img
                     class="logo"
-                    src="/static/codecircles.png"
+                    src="/static/codecircles.webp"
                     alt="4 circles with alternating colors between green and white"
                 />
                 <h1>AnonymousOverflow</h1>

templates/question.html

@@ -18,7 +18,7 @@
                 <a href="/" class="logo-link">
                     <img
                         class="logo"
-                        src="/static/codecircles.png"
+                        src="/static/codecircles.webp"
                         alt="4 circles with alternating colors between green and white"
                     />
                 </a>

templates/sharedHead.html

@@ -1,4 +1,4 @@
 <meta name="theme-color" content="#8CFFC1" />
-<meta name="og:image" content="/static/codecircles.png" />
+<meta name="og:image" content="/static/codecircles.webp" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <link rel="stylesheet" href="/static/globals.css" />