implement imgur.io resolving

.vscode/launch.json

@@ -0,0 +1,15 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Launch API",
+            "type": "go",
+            "request": "launch",
+            "mode": "auto",
+            "program": "cmd/api"
+        }
+    ]
+}

CHANGELOG.md

@@ -22,6 +22,7 @@
 - Dev: Improve FrankerFaceZ tests. (#295)
 - Dev: Improve Livestreamfails tests. (#297, #301)
 - Dev: Improve default resolver tests. (#300)
+- Dev: Resolve imgur.io links (#365)
 
 ## 1.2.3
 

internal/logger/context.go

@@ -12,8 +12,10 @@ var (
 )
 
 func FromContext(ctx context.Context) Logger {
-	if v := ctx.Value(contextKey); v != nil {
-		return v.(Logger)
+	if ctx != nil {
+		if v := ctx.Value(contextKey); v != nil {
+			return v.(Logger)
+		}
 	}
 
 	log.Fatal("No logger found in context")

internal/resolvers/default/link_resolver.go

@@ -83,11 +83,12 @@ func (r *LinkResolver) HandleRequest(w http.ResponseWriter, req *http.Request) {
 
 			resolverHits.WithLabelValues(m.Name()).Inc()
 
-			if err != nil {
+			if err != nil || data == nil {
 				log.Errorw("Error in custom resolver, falling back to default",
 					"name", m.Name(),
 					"url", requestUrl,
 					"error", err,
+					"data", data,
 				)
 				break
 			}

internal/resolvers/imgur/resolver.go

@@ -18,6 +18,8 @@ import (
 	"github.com/koffeinsource/go-imgur"
 )
 
+var VALID_IMGUR_DOMAINS = []string{"imgur.com", "imgur.io"}
+
 type ImgurClient interface {
 	GetInfoFromURL(urlString string) (*imgur.GenericInfo, int, error)
 }
@@ -27,7 +29,19 @@ type Resolver struct {
 }
 
 func (r *Resolver) Check(ctx context.Context, url *url.URL) (context.Context, bool) {
-	return ctx, utils.IsSubdomainOf(url, "imgur.com")
+	for _, domain := range VALID_IMGUR_DOMAINS {
+		result := utils.IsSubdomainOf(url, domain)
+		if result {
+			return nil, result
+		}
+
+		result = utils.IsDomain(url, domain)
+		if result {
+			return nil, result
+		}
+	}
+
+	return ctx, false
 }
 
 func (r *Resolver) Run(ctx context.Context, url *url.URL, req *http.Request) (*cache.Response, error) {