feat: add shortener processing for exchange /a/:id conventions

* feat: instances.json file

* feat: rename admins to operators

* feat: onion array of instances

* feat: i2p section

* fix: rename to operators

* docs: ao hub link in readme

* Merge branch 'main' into feature/instance-hub

.github/ISSUE_TEMPLATE/bug_report.md

@@ -2,34 +2,32 @@
 name: Bug report
 about: 'Create a report to help us improve'
 title: ''
-labels: ''
+labels: 'bug'
 assignees: ''
-
 ---
 
 Please make sure you're on the latest version before submitting.
 
-
 # What's Happening?
-<!-- Describe here -->
 
+<!-- Describe here -->
 
 ## How to reproduce:
-<!-- Describe here -->
 
+<!-- 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

@@ -0,0 +1,15 @@
+---
+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

@@ -1,12 +0,0 @@
----
-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.hyperreal.coffee",
-            "regions": ["United States"],
-            "operators": ["https://hyperreal.coffee"]
+            "url": "https://anonoverflow.nirn.quest",
+            "regions": ["Canada"],
+            "operators": ["https://nirn.quest", "https://hyperreal.coffee"]
         },
         {
             "url": "https://overflow.sudovanilla.com",
@@ -124,6 +124,26 @@
             "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"]
         }
     ],
 
@@ -152,6 +172,18 @@
             "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/"
+            ]
         }
     ],
 
@@ -165,6 +197,11 @@
             "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

@@ -55,6 +55,23 @@ 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")))
@@ -64,15 +81,6 @@ 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)
 

src/routes/shortened.go

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