Merge branch 'main' into feature/instance-hub

.github/ISSUE_TEMPLATE/bug_report.md

@@ -2,32 +2,34 @@
 name: Bug report
 about: 'Create a report to help us improve'
 title: ''
-labels: 'bug'
+labels: ''
 assignees: ''
+
 ---
 
 Please make sure you're on the latest version before submitting.
 
-# What's Happening?
 
+# What's Happening?
 <!-- Describe here -->
 
+
 ## How to reproduce:
-
 <!-- Describe here -->
 
+
 ## Affected Platforms:
 
--   [ ] macOS
--   [ ] Windows
--   [ ] Linux (Specify)
--   [ ] iOS
--   [ ] Android
+- [ ] macOS
+- [ ] Windows
+- [ ] Linux (Specify)
+- [ ] iOS
+- [ ] Android
 
-Version:
+Version: 
 
 ## Browser:
 
--   [ ] Chromium-based (ex: Brave or Chrome)
--   [ ] Webkit-based (ex: Safari)
--   [ ] Gecko-based (ex: Firefox)
+- [ ] Chromium-based (ex: Brave or Chrome)
+- [ ] Webkit-based (ex: Safari)
+- [ ] Gecko-based (ex: Firefox)

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,15 +0,0 @@
----
-name: Feature Request
-about: 'Suggest a specific feature or enhancement'
-title: ''
-labels: 'enhancement'
-assignees: ''
----
-
-# What does the feature entail?
-
-<!-- Describe here -->
-
-# Why is this feature important?
-
-<!-- Describe here -->

.github/ISSUE_TEMPLATE/new_instance.md

@@ -0,0 +1,12 @@
+---
+name: New Instance
+about: 'Add my public instance to the list'
+title: "[INSTANCE] New public instance"
+labels: ''
+assignees: ''
+
+---
+
+Instance URL: 
+Region (Written Out - ex United States): 
+Operated by (Link to your site):

instances.json

@@ -76,9 +76,9 @@
             "operators": ["https://ftw.lol"]
         },
         {
-            "url": "https://anonoverflow.nirn.quest",
-            "regions": ["Canada"],
-            "operators": ["https://nirn.quest", "https://hyperreal.coffee"]
+            "url": "https://anonoverflow.hyperreal.coffee",
+            "regions": ["United States"],
+            "operators": ["https://hyperreal.coffee"]
         },
         {
             "url": "https://overflow.sudovanilla.com",
@@ -124,31 +124,6 @@
             "url": "https://soflow.nerdvpn.de",
             "regions": ["Ukraine"],
             "operators": ["https://github.com/Sommerwiesel"]
-        },
-        {
-            "url": "https://overflow.einfachzocken.eu/",
-            "regions": ["Germany"],
-            "operators": ["https://einfachzocken.eu"]
-        },
-        {
-            "url": "https://overflow.seasi.dev/",
-            "regions": ["Singapore"],
-            "operators": ["https://seasi.dev/"]
-        },
-        {
-            "url": "https://anonymousoverflow.catsarch.com",
-            "regions": ["United States"],
-            "operators": ["https://catsarch.com"]
-        },
-        {
-            "url": "https://overflow.darkness.services/",
-            "regions": ["United States"],
-            "operators": ["https://zzz.darkness.services"]
-        },
-        {
-            "url": "https://anonflow.aketawi.space/",
-            "regions": ["Russia"],
-            "operators": ["https://www.aketawi.space/"]
         }
     ],
 
@@ -177,18 +152,6 @@
             "url": "http://overflow.r4focoma7gu2zdwwcjjad47ysxt634lg73sxmdbkdozanwqslho5ohyd.onion",
             "regions": ["The Netherlands"],
             "operators": ["https://r4fo.com"]
-        },
-        {
-            "url": "http://anonymousoverflow.catsarchywsyuss6jdxlypsw5dc7owd5u5tr6bujxb7o6xw2hipqehyd.onion/",
-            "regions": ["United States"],
-            "operators": ["https://catsarch.com"]
-        },
-        {
-            "url": "http://overflow.darknessrdor43qkl2ngwitj72zdavfz2cead4t5ed72bybgauww5lyd.onion/",
-            "regions": ["United States"],
-            "operators": [
-                "http://darknessrdor43qkl2ngwitj72zdavfz2cead4t5ed72bybgauww5lyd.onion/"
-            ]
         }
     ],
 
@@ -202,11 +165,6 @@
             "url": "http://ay7akchgdh76r4lc62hzd52z6xqoh67loototsetvqxo5o7ngo5q.b32.i2p/",
             "regions": ["Germany"],
             "operators": ["https://owo.si/"]
-        },
-        {
-            "url": "http://ocp7zhdsbl2mjabv5ma5jvbzg2dqzglieayjvyj4j2r7qvsqlboa.b32.i2p/",
-            "regions": ["United States"],
-            "operators": ["https://catsarch.com"]
         }
     ]
 }

main.go

@@ -35,6 +35,7 @@ func main() {
 
 	r.Use(gin.Recovery())
 	r.Use(middleware.XssPreventionHeaders())
+	r.Use(middleware.NoCacheMiddleware())
 	r.Use(middleware.OptionsMiddleware())
 	r.Use(middleware.Ratelimit())
 
@@ -54,23 +55,6 @@ func main() {
 	r.GET("/q/:id", routes.RedirectShortenedOverflowURL)
 	r.GET("/q/:id/:answerId", routes.RedirectShortenedOverflowURL)
 
-	exchangeRouter := r.Group("/exchange/:sub")
-	{
-		exchangeRouter.GET("/questions/:id/:title", routes.ViewQuestion)
-		exchangeRouter.GET("/questions/:id", func(c *gin.Context) {
-			// redirect user to the question with the title
-			c.Redirect(302, fmt.Sprintf("/exchange/%s/questions/%s/placeholder", c.Param("sub"), c.Param("id")))
-		})
-		exchangeRouter.GET("/questions/:id/:title/:answerId", func(c *gin.Context) {
-			// redirect user to the answer with the title
-			c.Redirect(302, fmt.Sprintf("/exchange/%s/questions/%s/%s#%s", c.Param("sub"), c.Param("id"), c.Param("title"), c.Param("answerId")))
-		})
-		exchangeRouter.GET("/q/:id/:answerId", routes.RedirectShortenedOverflowURL)
-		exchangeRouter.GET("/q/:id", routes.RedirectShortenedOverflowURL)
-		exchangeRouter.GET("/a/:id/:answerId", routes.RedirectShortenedOverflowURL)
-		exchangeRouter.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")))
@@ -80,6 +64,15 @@ func main() {
 		// redirect user to the answer with the title
 		c.Redirect(302, fmt.Sprintf("/questions/%s/%s#%s", c.Param("id"), c.Param("title"), c.Param("answerId")))
 	})
+	r.GET("/exchange/:sub/questions/:id/:title", routes.ViewQuestion)
+	r.GET("/exchange/:sub/questions/:id", func(c *gin.Context) {
+		// redirect user to the question with the title
+		c.Redirect(302, fmt.Sprintf("/exchange/%s/questions/%s/placeholder", c.Param("sub"), c.Param("id")))
+	})
+	r.GET("/exchange/:sub/questions/:id/:title/:answerId", func(c *gin.Context) {
+		// redirect user to the answer with the title
+		c.Redirect(302, fmt.Sprintf("/exchange/%s/questions/%s/%s#%s", c.Param("sub"), c.Param("id"), c.Param("title"), c.Param("answerId")))
+	})
 
 	r.GET("/proxy", routes.GetImage)
 

public/globals.css

@@ -11,19 +11,17 @@
     --link-color: #92adff;
 }
 
-@media (prefers-color-scheme: light) {
-    :root {
-        --main-bg: #dbdbdb;
-        --text-color: #000;
-        --muted-text-color: #636363;
-        --code-bg: #36383d;
-        --code-fg: #ffffff;
-        --input-bg: #bcbcbc;
-        --input-bg-hover: #a8a8a8;
-        --meta-bg: #aaa8a8;
-        --divider-color: #b5b5b5;
-        --link-color: #335ad0;
-    }
+[data-theme='light'] {
+    --main-bg: #dbdbdb;
+    --text-color: #000;
+    --muted-text-color: #636363;
+    --code-bg: #36383d;
+    --code-fg: #ffffff;
+    --input-bg: #bcbcbc;
+    --input-bg-hover: #a8a8a8;
+    --meta-bg: #aaa8a8;
+    --divider-color: #b5b5b5;
+    --link-color: #335ad0;
 }
 
 a {
@@ -78,4 +76,4 @@ details {
 
 .fw-nowrap {
     flex-wrap: nowrap;
-}
+}

src/middleware/noCache.go

@@ -0,0 +1,12 @@
+package middleware
+
+import "github.com/gin-gonic/gin"
+
+func NoCacheMiddleware() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		c.Header("Cache-Control", "no-cache, no-store, must-revalidate")
+		c.Header("Pragma", "no-cache")
+		c.Header("Expires", "0")
+		c.Next()
+	}
+}

src/middleware/options.go

@@ -7,6 +7,7 @@ import (
 func OptionsMiddleware() gin.HandlerFunc {
 	return func(c *gin.Context) {
 		c.Set("disable_images", false)
+		c.Set("theme", "dark")
 
 		imagesCookie, err := c.Cookie("disable_images")
 		if err == nil {
@@ -15,6 +16,13 @@ func OptionsMiddleware() gin.HandlerFunc {
 			}
 		}
 
+		themeCookie, err := c.Cookie("theme")
+		if err == nil {
+			if themeCookie == "light" {
+				c.Set("theme", "light")
+			}
+		}
+
 		c.Next()
 	}
 }

src/middleware/ratelimit.go

@@ -47,6 +47,7 @@ func Ratelimit() gin.HandlerFunc {
 		if val.(int) > 30 {
 			c.HTML(429, "home.html", gin.H{
 				"errorMessage": "You have exceeded the request limit. Please try again in a minute.",
+				"theme":        c.MustGet("theme").(string),
 				"version":      config.Version,
 			})
 			c.Abort()

src/routes/home.go

@@ -12,6 +12,7 @@ import (
 func GetHome(c *gin.Context) {
 	c.HTML(200, "home.html", gin.H{
 		"version": config.Version,
+		"theme":   c.MustGet("theme").(string),
 	})
 }
 
@@ -61,6 +62,7 @@ func PostHome(c *gin.Context) {
 	if err := c.ShouldBind(&body); err != nil {
 		c.HTML(400, "home.html", gin.H{
 			"errorMessage": "Invalid request body",
+			"theme":        c.MustGet("theme").(string),
 		})
 		return
 	}
@@ -70,6 +72,7 @@ func PostHome(c *gin.Context) {
 	if translated == "" {
 		c.HTML(400, "home.html", gin.H{
 			"errorMessage": "Invalid stack overflow/exchange URL",
+			"theme":        c.MustGet("theme").(string),
 		})
 		return
 	}

src/routes/options.go

@@ -3,6 +3,8 @@ package routes
 import (
 	"anonymousoverflow/config"
 	"fmt"
+	"os"
+	"strings"
 
 	"github.com/gin-gonic/gin"
 )
@@ -19,8 +21,26 @@ func ChangeOptions(c *gin.Context) {
 		c.SetCookie("disable_images", fmt.Sprintf("%t", !c.MustGet("disable_images").(bool)), 60*60*24*365*10, "/", "", false, true)
 		c.HTML(200, "home.html", gin.H{
 			"successMessage": "Images are now " + text,
+			"theme":          c.MustGet("theme").(string),
 			"version":        config.Version,
 		})
+
+	case "theme":
+		text := "dark"
+		if c.MustGet("theme").(string) == "dark" {
+			text = "light"
+		}
+
+		c.SetCookie("theme", text, 60*60*24*365*10, "/", "", false, true)
+		// get redirect url from query
+		redirectUrl := c.Query("redirect_url")
+
+		if !strings.HasPrefix(redirectUrl, os.Getenv("APP_URL")) {
+			redirectUrl = os.Getenv("APP_URL")
+		}
+
+		c.Redirect(302, redirectUrl)
+
 	default:
 		c.String(400, "400 Bad Request")
 	}

src/routes/question.go

@@ -34,6 +34,7 @@ func ViewQuestion(c *gin.Context) {
 	if _, err := strconv.Atoi(questionId); err != nil {
 		c.HTML(400, "home.html", gin.H{
 			"errorMessage": "Invalid question ID",
+			"theme":        c.MustGet("theme").(string),
 			"version":      config.Version,
 		})
 		return
@@ -59,6 +60,7 @@ func ViewQuestion(c *gin.Context) {
 	if resp.StatusCode() != 200 {
 		c.HTML(500, "home.html", gin.H{
 			"errorMessage": fmt.Sprintf("Received a non-OK status code %d", resp.StatusCode()),
+			"theme":        c.MustGet("theme").(string),
 			"version":      config.Version,
 		})
 		return
@@ -72,6 +74,7 @@ func ViewQuestion(c *gin.Context) {
 	if err != nil {
 		c.HTML(500, "home.html", gin.H{
 			"errorMessage": "Unable to parse question data",
+			"theme":        c.MustGet("theme").(string),
 			"version":      config.Version,
 		})
 		return
@@ -81,6 +84,7 @@ func ViewQuestion(c *gin.Context) {
 	if err != nil {
 		c.HTML(500, "home.html", gin.H{
 			"errorMessage": "Failed to extract question data",
+			"theme":        c.MustGet("theme").(string),
 			"version":      config.Version,
 		})
 		return
@@ -90,6 +94,7 @@ func ViewQuestion(c *gin.Context) {
 	if err != nil {
 		c.HTML(500, "home.html", gin.H{
 			"errorMessage": "Failed to extract answer data",
+			"theme":        c.MustGet("theme").(string),
 			"version":      config.Version,
 		})
 		return
@@ -105,6 +110,7 @@ func ViewQuestion(c *gin.Context) {
 		"question":    newFilteredQuestion,
 		"answers":     answers,
 		"imagePolicy": imagePolicy,
+		"theme":       c.MustGet("theme").(string),
 		"currentUrl":  fmt.Sprintf("%s%s", os.Getenv("APP_URL"), c.Request.URL.Path),
 		"sortValue":   params.SoSortValue,
 		"domain":      domain,
@@ -126,6 +132,7 @@ func parseAndValidateParameters(c *gin.Context) (inputs viewQuestionInputs, err
 	if _, err = strconv.Atoi(questionId); err != nil {
 		c.HTML(400, "home.html", gin.H{
 			"errorMessage": "Invalid question ID",
+			"theme":        c.MustGet("theme").(string),
 			"version":      config.Version,
 		})
 		return
@@ -224,8 +231,6 @@ func extractAnswersData(doc *goquery.Document, domain string) ([]types.FilteredA
 	doc.Find("div.answer").Each(func(i int, s *goquery.Selection) {
 		var answer types.FilteredAnswer
 
-		answer.ID = s.AttrOr("data-answerid", "")
-
 		postLayout := s.Find("div.post-layout").First()
 
 		// Extract upvotes.

src/routes/shortened.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"net/http"
 	"os"
-	"strings"
 
 	"github.com/gin-gonic/gin"
 	"github.com/go-resty/resty/v2"
@@ -13,7 +12,6 @@ import (
 func RedirectShortenedOverflowURL(c *gin.Context) {
 	id := c.Param("id")
 	answerId := c.Param("answerId")
-	sub := c.Param("sub")
 
 	// fetch the stack overflow URL
 	client := resty.New()
@@ -23,16 +21,11 @@ func RedirectShortenedOverflowURL(c *gin.Context) {
 		}),
 	)
 
-	domain := "www.stackoverflow.com"
-	if strings.Contains(sub, ".") {
-		domain = sub
-	} else if sub != "" {
-		domain = fmt.Sprintf("%s.stackexchange.com", sub)
-	}
-	resp, err := client.R().Get(fmt.Sprintf("https://%s/a/%s/%s", domain, id, answerId))
+	resp, err := client.R().Get(fmt.Sprintf("https://www.stackoverflow.com/a/%s/%s", id, answerId))
 	if err != nil {
 		c.HTML(400, "home.html", gin.H{
 			"errorMessage": "Unable to fetch stack overflow URL",
+			"theme":        c.MustGet("theme").(string),
 		})
 		return
 	}
@@ -40,6 +33,7 @@ func RedirectShortenedOverflowURL(c *gin.Context) {
 	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
 	}
@@ -47,10 +41,5 @@ func RedirectShortenedOverflowURL(c *gin.Context) {
 	// get the redirect URL
 	location := resp.Header().Get("Location")
 
-	redirectPrefix := os.Getenv("APP_URL")
-	if sub != "" {
-		redirectPrefix += fmt.Sprintf("/exchange/%s", sub)
-	}
-
-	c.Redirect(302, fmt.Sprintf("%s%s", redirectPrefix, location))
+	c.Redirect(302, fmt.Sprintf("%s%s", os.Getenv("APP_URL"), location))
 }

templates/home.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html data-theme="{{ .theme }}">
 
 <head>
     <title>AnonymousOverflow - Private frontend for StackOverflow</title>
@@ -43,9 +43,10 @@
         <div class="options">
             <div class="icon">
                 <a href="/options/images">
-                    <img src="/static/icons/image.svg" alt="Toggle images" />
+                    <img src="/static/icons/image.svg" alt="Toggle theme" />
                 </a>
             </div>
+            {{ template "themeSwitcher.html" .}}
         </div>
         <p class="footer">
             Brought to you by

templates/question.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html data-theme="{{ .theme }}">
 
 <head>
     <title>{{ .question.Title }} | AnonymousOverflow</title>
@@ -25,6 +25,7 @@
         <a href="/" class="logo-link">
             <img class="logo" src="/static/codecircles.webp" alt="AnonymousOverflow home" />
         </a>
+        {{ template "themeSwitcher.html" . }}
     </div>
     <div class="card">
         <div class="card-header">

templates/themeSwitcher.html

@@ -0,0 +1,6 @@
+<div class="icon">
+    <a href="/options/theme?redirect_url={{ .currentUrl }}">
+        <img src="/static/icons/{{ if eq .theme "dark" }}sun{{
+        else }}moon{{ end }}.svg" alt="Toggle theme" />
+    </a>
+</div>