From 8cb25249241d67edbecda84454b52e65fb2a744a Mon Sep 17 00:00:00 2001
From: orangix <uleo8b8g@anonaddy.me>
Date: Fri, 16 Jan 2026 22:55:45 +0100
Subject: [PATCH] drop RIMGU_ environment variables

---
 utils/config.go | 61 +++++++++++++++++++------------------------------
 1 file changed, 24 insertions(+), 37 deletions(-)

diff --git a/utils/config.go b/utils/config.go
index 1f08640..6526e39 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -21,51 +21,38 @@ type config struct {
 
 var Config config
 
+func envString(name, def string) string {
+	env := os.Getenv(name)
+	if env != "" {
+		return env
+	}
+	return def
+}
+func envBool(name string) bool {
+	return os.Getenv(name) == "true" || os.Getenv(name) == "1"
+}
+
 func LoadConfig() {
-	port := "3000"
-	if os.Getenv("PORT") != "" {
-		port = os.Getenv("PORT")
-	}
-	if os.Getenv("RIMGU_PORT") != "" {
-		port = os.Getenv("RIMGU_PORT")
-	}
-
-	addr := "0.0.0.0"
-	if os.Getenv("ADDRESS") != "" {
-		addr = os.Getenv("ADDRESS")
-	}
-	if os.Getenv("RIMGU_ADDRESS") != "" {
-		addr = os.Getenv("RIMGU_ADDRESS")
-	}
-
-	imgurId := "546c25a59c58ad7"
-	if os.Getenv("IMGUR_CLIENT_ID") != "" {
-		imgurId = os.Getenv("IMGUR_CLIENT_ID")
-	}
-	if os.Getenv("RIMGU_IMGUR_CLIENT_ID") != "" {
-		imgurId = os.Getenv("RIMGU_IMGUR_CLIENT_ID")
-	}
-
 	Config = config{
-		Port:              port,
-		Addr:              addr,
-		ImgurId:           imgurId,
-		ProtocolDetection: os.Getenv("PROTOCOL_DETECTION") == "true" || os.Getenv("PROTOCOL_DETECTION") == "1",
-		Secure:            os.Getenv("SECURE") == "true" || os.Getenv("SECURE") == "1",
-		FiberPrefork:      os.Getenv("FIBER_PREFORK") == "true" || os.Getenv("FIBER_PREFORK") == "1",
-		ForceWebp:         os.Getenv("FORCE_WEBP") == "true" || os.Getenv("FORCE_WEBP") == "1",
+		Port:              envString("PORT", "3000"),
+		Addr:              envString("ADDR", "0.0.0.0"),
+		ImgurId:           envString("IMGUR_CLIENT_ID", "546c25a59c58ad7"),
+		ProtocolDetection: envBool("PROTOCOL_DETECTION"),
+		Secure:            envBool("SECURE"),
+		FiberPrefork:      envBool("FIBER_PREFORK"),
+		ForceWebp:         envBool("FORCE_WEBP"),
 		Privacy: map[string]interface{}{
 			"set":           os.Getenv("PRIVACY_NOT_COLLECTED") != "",
 			"policy":        os.Getenv("PRIVACY_POLICY"),
 			"message":       os.Getenv("PRIVACY_MESSAGE"),
 			"country":       os.Getenv("PRIVACY_COUNTRY"),
 			"provider":      os.Getenv("PRIVACY_PROVIDER"),
-			"cloudflare":    os.Getenv("PRIVACY_CLOUDFLARE") == "true" || os.Getenv("PRIVACY_CLOUDFLARE") == "1",
-			"not_collected": os.Getenv("PRIVACY_NOT_COLLECTED") == "true" || os.Getenv("PRIVACY_NOT_COLLECTED") == "1",
-			"ip":            os.Getenv("PRIVACY_IP") == "true" || os.Getenv("PRIVACY_IP") == "1",
-			"url":           os.Getenv("PRIVACY_URL") == "true" || os.Getenv("PRIVACY_URL") == "1",
-			"device":        os.Getenv("PRIVACY_DEVICE") == "true" || os.Getenv("PRIVACY_DEVICE") == "1",
-			"diagnostics":   os.Getenv("PRIVACY_DIAGNOSTICS") == "true" || os.Getenv("PRIVACY_DIAGNOSTICS") == "1",
+			"cloudflare":    envBool("PRIVACY_CLOUDFLARE"),
+			"not_collected": envBool("PRIVACY_NOT_COLLECTED"),
+			"ip":            envBool("PRIVACY_IP"),
+			"url":           envBool("PRIVACY_URL"),
+			"device":        envBool("PRIVACY_DEVICE"),
+			"diagnostics":   envBool("PRIVACY_DIAGNOSTICS"),
 		},
 	}
 }