From 6cb9b3b758e0df26c9544233bcafbede35b53d6b Mon Sep 17 00:00:00 2001 From: simon987 Date: Sat, 11 Apr 2020 15:01:20 -0400 Subject: [PATCH] link tweaks --- core.go | 20 +------------------- link.go | 27 +++++++++++++++++++++++++-- 2 files changed, 26 insertions(+), 21 deletions(-) diff --git a/core.go b/core.go index b42ea63..58808f2 100644 --- a/core.go +++ b/core.go @@ -26,9 +26,7 @@ var ImageSuffixes = []string{ ".bmp", ".webp", } -var ImageBlackList = []string{ - -} +var ImageBlackList = []string{} var Rdb *redis.Client var Pgdb *pgx.ConnPool @@ -97,22 +95,6 @@ func isHttpOk(code int) bool { return code >= 200 && code < 300 } -func IsImageLink(link string) bool { - u, err := url.Parse(link) - if err != nil { - return false - } - - path := strings.ToLower(u.Path) - for _, suffix := range ImageSuffixes { - if strings.HasSuffix(path, suffix) { - return true - } - } - - return false -} - func FetchJson(link string, v interface{}, raw *[]byte, headers ...[]string) error { body, err := Fetch(link, headers...) diff --git a/link.go b/link.go index f6f7d1b..718c3b0 100644 --- a/link.go +++ b/link.go @@ -2,7 +2,9 @@ package imhashdb import ( "go.uber.org/zap" + "net/url" "regexp" + "strings" "time" ) @@ -14,15 +16,36 @@ type ImgurImgResp struct { } type ImgurImg struct { - Link string `json:"link"` + Link string `json:"link"` } type ImgurAlbumResp struct { Data struct { - Images []ImgurImg `json:"images"` + Images []ImgurImg `json:"images"` } `json:"data"` } +func IsImageLink(link string) bool { + + if strings.HasPrefix(link, "https://i.reddituploads.com") { + return true + } + + u, err := url.Parse(link) + if err != nil { + return false + } + + path := strings.ToLower(u.Path) + for _, suffix := range ImageSuffixes { + if strings.HasSuffix(path, suffix) { + return true + } + } + + return false +} + func handleImgurLink(link string, meta *[]Meta) []string { if ReImgurImg.MatchString(link) {