diff --git a/api/client.go b/api/client.go index 6b9de21..34737df 100644 --- a/api/client.go +++ b/api/client.go @@ -7,15 +7,15 @@ import ( ) type Client struct { - ClientID string - Cache *cache.Cache + ClientID string + Cache *cache.Cache } -func NewClient(clientId string) (*Client) { - client := Client{ - ClientID: clientId, - Cache: cache.New(15*time.Minute, 15*time.Minute), - } - - return &client -} \ No newline at end of file +func NewClient(clientId string) *Client { + client := Client{ + ClientID: clientId, + Cache: cache.New(15*time.Minute, 15*time.Minute), + } + + return &client +} diff --git a/api/search.go b/api/search.go index f784e37..d591f30 100644 --- a/api/search.go +++ b/api/search.go @@ -11,19 +11,19 @@ import ( ) type SearchResult struct { - Id string - Url string - ImageUrl string - Title string - User string - Points string - Views string - RelTime string + Id string + Url string + ImageUrl string + Title string + User string + Points string + Views string + RelTime string } func (client *Client) Search(query string, page string) ([]SearchResult, error) { query = url.QueryEscape(query) - req, err := http.NewRequest("GET", "https://imgur.com/search/all/page/" + page + "?scrolled&q_size_is_mpx=off&qs=list&q=" + query, nil) + req, err := http.NewRequest("GET", "https://imgur.com/search/all/page/"+page+"?scrolled&q_size_is_mpx=off&qs=list&q="+query, nil) if err != nil { return []SearchResult{}, err } @@ -35,16 +35,16 @@ func (client *Client) Search(query string, page string) ([]SearchResult, error) } defer res.Body.Close() if res.StatusCode != 200 { - return []SearchResult{}, fmt.Errorf("invalid status code, got %d", res.StatusCode) - } + return []SearchResult{}, fmt.Errorf("invalid status code, got %d", res.StatusCode) + } doc, err := goquery.NewDocumentFromReader(res.Body) - if err != nil { - return []SearchResult{}, err - } + if err != nil { + return []SearchResult{}, err + } results := []SearchResult{} - doc.Find(".post-list").Each(func(i int, s *goquery.Selection) { + doc.Find(".post-list").Each(func(i int, s *goquery.Selection) { url, _ := s.Find("a").Attr("href") imageUrl, _ := s.Find("img").Attr("src") @@ -55,18 +55,18 @@ func (client *Client) Search(query string, page string) ([]SearchResult, error) views = strings.TrimSuffix(views, " views") result := SearchResult{ - Id: strings.Split(url, "/")[2], - Url: url, + Id: strings.Split(url, "/")[2], + Url: url, ImageUrl: strings.ReplaceAll(imageUrl, "//i.imgur.com", ""), - Title: s.Find(".search-item-title a").Text(), - User: s.Find(".account").Text(), - Views: views, - Points: points, - RelTime: strings.TrimSpace(postInfo[2]), + Title: s.Find(".search-item-title a").Text(), + User: s.Find(".account").Text(), + Views: views, + Points: points, + RelTime: strings.TrimSpace(postInfo[2]), } results = append(results, result) }) return results, nil -} \ No newline at end of file +} diff --git a/pages/about.go b/pages/about.go index b6dc2f9..7c2d1af 100644 --- a/pages/about.go +++ b/pages/about.go @@ -7,7 +7,6 @@ import ( "github.com/gofiber/fiber/v2" ) - func HandleAbout(c *fiber.Ctx) error { utils.SetHeaders(c) c.Set("X-Frame-Options", "DENY") @@ -15,8 +14,8 @@ func HandleAbout(c *fiber.Ctx) error { c.Set("Content-Security-Policy", "default-src 'none'; frame-ancestors 'none'; base-uri 'none'; form-action 'self'; style-src 'self'; img-src 'self'; manifest-src 'self'; block-all-mixed-content") return c.Render("about", fiber.Map{ - "proto": c.Protocol(), - "domain": c.Hostname(), + "proto": c.Protocol(), + "domain": c.Hostname(), "force_webp": os.Getenv("FORCE_WEBP"), }) -} \ No newline at end of file +} diff --git a/pages/apiClient.go b/pages/apiClient.go index b85b1e6..add22c9 100644 --- a/pages/apiClient.go +++ b/pages/apiClient.go @@ -8,5 +8,5 @@ import ( var ApiClient *api.Client func InitializeApiClient() { - ApiClient = api.NewClient(utils.Config.ImgurId) -} \ No newline at end of file + ApiClient = api.NewClient(utils.Config.ImgurId) +} diff --git a/pages/embed.go b/pages/embed.go index bf25e8b..25f9333 100644 --- a/pages/embed.go +++ b/pages/embed.go @@ -28,7 +28,7 @@ func HandleEmbed(c *fiber.Ctx) error { if err != nil && post.Id == "" && strings.Contains(err.Error(), "404") { return utils.RenderError(c, 404) } - if err != nil { + if err != nil { return err } @@ -45,4 +45,4 @@ func HandleGifv(c *fiber.Ctx) error { return c.Render("gifv", fiber.Map{ "id": c.Params("postID"), }) -} \ No newline at end of file +} diff --git a/pages/frontpage.go b/pages/frontpage.go index fd16cc0..1ba96cd 100644 --- a/pages/frontpage.go +++ b/pages/frontpage.go @@ -17,4 +17,4 @@ func HandleFrontpage(c *fiber.Ctx) error { "config": utils.Config, "version": VersionInfo, }) -} \ No newline at end of file +} diff --git a/pages/media.go b/pages/media.go index 0072bd1..fbd1f91 100644 --- a/pages/media.go +++ b/pages/media.go @@ -35,11 +35,11 @@ func handleMedia(c *fiber.Ctx, url string) error { utils.SetHeaders(c) if utils.Config.ForceWebp && - !strings.HasSuffix(c.Path(), ".webp") && - c.Get("Sec-Fetch-Dest") == "image" && - c.Query("no_webp") == "" && - c.Accepts("image/webp") == "image/webp" && - !strings.HasPrefix(c.Path(), "/stack") { + !strings.HasSuffix(c.Path(), ".webp") && + c.Get("Sec-Fetch-Dest") == "image" && + c.Query("no_webp") == "" && + c.Accepts("image/webp") == "image/webp" && + !strings.HasPrefix(c.Path(), "/stack") { url = strings.ReplaceAll(url, ".png", ".webp") url = strings.ReplaceAll(url, ".jpg", ".webp") url = strings.ReplaceAll(url, ".jpeg", ".webp") diff --git a/pages/search.go b/pages/search.go index 808144d..baad157 100644 --- a/pages/search.go +++ b/pages/search.go @@ -35,10 +35,10 @@ func HandleSearch(c *fiber.Ctx) error { } return c.Render("search", fiber.Map{ - "query": query, - "results": results, - "page": pageNumber, - "nextPage": pageNumber + 1, - "prevPage": pageNumber - 1, + "query": query, + "results": results, + "page": pageNumber, + "nextPage": pageNumber + 1, + "prevPage": pageNumber - 1, }) } diff --git a/pages/trending.go b/pages/trending.go index 4225a61..c44a6d0 100644 --- a/pages/trending.go +++ b/pages/trending.go @@ -42,11 +42,11 @@ func HandleTrending(c *fiber.Ctx) error { } return c.Render("trending", fiber.Map{ - "results": results, - "section": section, - "sort": sort, - "page": pageNumber, - "nextPage": pageNumber + 1, - "prevPage": pageNumber - 1, + "results": results, + "section": section, + "sort": sort, + "page": pageNumber, + "nextPage": pageNumber + 1, + "prevPage": pageNumber - 1, }) } diff --git a/static/embed.go b/static/embed.go index 7b8f574..128d6d6 100644 --- a/static/embed.go +++ b/static/embed.go @@ -7,4 +7,4 @@ var files embed.FS func GetFiles() embed.FS { return files -} \ No newline at end of file +} diff --git a/utils/error.go b/utils/error.go index 4da0629..e6bc8dd 100644 --- a/utils/error.go +++ b/utils/error.go @@ -18,8 +18,8 @@ func RenderError(c *fiber.Ctx, code int) error { c.Set("Content-Type", "image/png") return c.Status(code).Send(img) } else { - return c.Status(code).Render("errors/" + strconv.Itoa(code), fiber.Map{ + return c.Status(code).Render("errors/"+strconv.Itoa(code), fiber.Map{ "path": c.Path(), }) } -} \ No newline at end of file +} diff --git a/utils/formatDate.go b/utils/formatDate.go index 85a014f..38acd14 100644 --- a/utils/formatDate.go +++ b/utils/formatDate.go @@ -9,4 +9,4 @@ func FormatDate(date string) (string, error) { } return time.Format("Jan 2, 2006 3:04 PM"), nil -} \ No newline at end of file +} diff --git a/utils/regex.go b/utils/regex.go index 839dd88..274fb83 100644 --- a/utils/regex.go +++ b/utils/regex.go @@ -2,4 +2,4 @@ package utils import "regexp" -var ImgurRe = regexp.MustCompile(`https?://(i\.)?imgur\.com`) \ No newline at end of file +var ImgurRe = regexp.MustCompile(`https?://(i\.)?imgur\.com`) diff --git a/utils/request.go b/utils/request.go index 181847c..37f627a 100644 --- a/utils/request.go +++ b/utils/request.go @@ -35,7 +35,7 @@ func GetJSON(url string) (gjson.Result, error) { return gjson.Result{}, err } - switch (res.StatusCode) { + switch res.StatusCode { case 200: return gjson.Parse(string(body)), nil case 429: @@ -43,4 +43,4 @@ func GetJSON(url string) (gjson.Result, error) { default: return gjson.Result{}, fmt.Errorf("received status %s, expected 200 OK.\n%s", res.Status, string(body)) } -} \ No newline at end of file +} diff --git a/utils/setHeaders.go b/utils/setHeaders.go index 0130570..a884844 100644 --- a/utils/setHeaders.go +++ b/utils/setHeaders.go @@ -25,4 +25,4 @@ func SetReqHeaders(req *http.Request) { req.Header.Set("Sec-Fetch-Mode", "cors") req.Header.Set("Sec-Fetch-Site", "same-site") req.Header.Set("User-Agent", "Mozilla/5.0 (Windows NT 10.0; rv:102.0) Gecko/20100101 Firefox/102.0") -} \ No newline at end of file +} diff --git a/views/embed.go b/views/embed.go index 2af7829..87b4515 100644 --- a/views/embed.go +++ b/views/embed.go @@ -7,4 +7,4 @@ var files embed.FS func GetFiles() embed.FS { return files -} \ No newline at end of file +}