Refactor caching logic and add support for a new feature

2026-01-21 21:08:26 -05:00
parent 838051c880
commit d321d96fef
6 changed files with 128 additions and 94 deletions
--- a/reddit/fetcher.go
+++ b/reddit/fetcher.go
@@ -50,99 +50,113 @@ func Fetch(ctx context.Context) {
 			return
 		default:

-			val, err := rc.Get(redis.CacheKey)
-			if err != nil {
-				l.Error("Error fetching from Redis: ", err)
-				break
+			doFetch(rc, l, false, size)
+
+			if os.Getenv("NSFW_MODE") == "true" {
+				doFetch(rc, l, true, size)
 			}
-
-			if val != "" {
-				l.Info("Reddit image fetched from cache...")
-
-				break
-			}
-
-			l.Info("Fetching latest image from Reddit...")
-
-			latestImageVal, err := GetLatestImage(func(u string) (*http.Response, error) {
-
-				request := &http.Request{
-					Method: http.MethodGet,
-					Header: http.Header{
-						"User-Agent": []string{"Mozilla/5.0 (compatible; RedditBot/1.0; +https://www.reddit.com/wiki/redditauth)"},
-					},
-					URL: &url.URL{
-						Scheme: "https",
-						Host:   "www.reddit.com",
-						Path:   strings.TrimPrefix(u, "https://www.reddit.com"),
-					},
-				}
-
-				httpClient := &http.Client{
-					Timeout: 10 * time.Second,
-				}
-
-				response, e := httpClient.Do(request)
-
-				if e != nil {
-					l.Error("Error fetching image from Reddit: ", e)
-					return nil, e
-				}
-
-				if response.StatusCode != http.StatusOK {
-					l.Error("Error fetching image from Reddit: ", response.Status)
-					return nil, &echo.HTTPError{
-						Code:    response.StatusCode,
-						Message: "Error fetching image from Reddit",
-					}
-				}
-
-				return response, nil
-			})
-
-			if err != nil {
-				l.Error("Error getting latest image URL: ", err)
-				break
-			}
-
-			response, err := http.Get(latestImageVal)
-			if err != nil {
-				l.Error("Error fetching image from Reddit: ", err)
-
-				break
-			}
-
-			if response.StatusCode != http.StatusOK {
-				l.Error("Error fetching image from Reddit: ", response.Status)
-
-				break
-			}
-
-			imageDataBytes, err := io.ReadAll(response.Body)
-			if err != nil {
-				l.Error("Error reading image data: ", err)
-				_ = response.Body.Close()
-				break
-			}
-
-			_ = response.Body.Close()
-
-			imageData := string(imageDataBytes)
-			resized, err := resize.Shrink(imageData, uint(size), 70)
-
-			if err != nil {
-				l.Error("Error resizing image: ", err)
-				break
-			}
-
-			err = rc.Set(redis.CacheKey, resized, 10*time.Minute)
-			if err != nil {
-				l.Warn("could not cache image")
-			}
-
-			l.Info("Reddit image fetched and resized successfully, cached for 10 minutes.")
 		}

 		time.Sleep(10 * time.Minute)
 	}
 }
+
+func doFetch(rc *redis.Redis, l echo.Logger, nsfw bool, size int) {
+	val, err := rc.Get(rc.GetCacheKey(nsfw))
+	if err != nil {
+		l.Error("Error fetching from Redis: ", err)
+		return
+	}
+
+	if val != "" {
+		l.Info("Reddit image fetched from cache...")
+
+		return
+	}
+
+	l.Info("Fetching latest image from Reddit...")
+
+	latestImageVal, err := GetLatestImage(func() (*http.Response, error) {
+
+		jsonUrl := wallpaperURL
+		nsfwMode := os.Getenv("NSFW_MODE")
+		if nsfwMode == "true" {
+			jsonUrl = nsfwWallpaperURL
+		}
+
+		request := &http.Request{
+			Method: http.MethodGet,
+			Header: http.Header{
+				"User-Agent": []string{"Mozilla/5.0 (compatible; RedditBot/1.0; +https://www.reddit.com/wiki/redditauth)"},
+			},
+			URL: &url.URL{
+				Scheme: "https",
+				Host:   "www.reddit.com",
+				Path:   strings.TrimPrefix(jsonUrl, "https://www.reddit.com"),
+			},
+		}
+
+		httpClient := &http.Client{
+			Timeout: 10 * time.Second,
+		}
+
+		response, e := httpClient.Do(request)
+
+		if e != nil {
+			l.Error("Error fetching image from Reddit: ", e)
+			return nil, e
+		}
+
+		if response.StatusCode != http.StatusOK {
+			l.Error("Error fetching image from Reddit: ", response.Status)
+			return nil, &echo.HTTPError{
+				Code:    response.StatusCode,
+				Message: "Error fetching image from Reddit",
+			}
+		}
+
+		return response, nil
+	})
+
+	if err != nil {
+		l.Error("Error getting latest image URL: ", err)
+		return
+	}
+
+	response, err := http.Get(latestImageVal)
+	if err != nil {
+		l.Error("Error fetching image from Reddit: ", err)
+
+		return
+	}
+
+	if response.StatusCode != http.StatusOK {
+		l.Error("Error fetching image from Reddit: ", response.Status)
+
+		return
+	}
+
+	imageDataBytes, err := io.ReadAll(response.Body)
+	if err != nil {
+		l.Error("Error reading image data: ", err)
+		_ = response.Body.Close()
+		return
+	}
+
+	_ = response.Body.Close()
+
+	imageData := string(imageDataBytes)
+	resized, err := resize.Shrink(imageData, uint(size), 70)
+
+	if err != nil {
+		l.Error("Error resizing image: ", err)
+		return
+	}
+
+	err = rc.Set(rc.GetCacheKey(nsfw), resized, 10*time.Minute)
+	if err != nil {
+		l.Warn("could not cache image")
+	}
+
+	l.Info("Reddit image fetched and resized successfully, cached for 10 minutes.")
+}