Fix docker files and update tailwind (#216)

- Update tailwind to 4.1.5
- Remove `version` in docker-compose.yml
- Fix CSS build in dockerfile

closes #202

Reviewed-on: https://codeberg.org/rimgo/rimgo/pulls/216
Co-authored-by: video-prize-ranch <cb.8a3w5@simplelogin.co>
Co-committed-by: video-prize-ranch <cb.8a3w5@simplelogin.co>

.air.toml

@@ -0,0 +1,42 @@
+# Config file for [Air](https://github.com/cosmtrek/air) in TOML format
+
+# Working directory
+# . or absolute path, please note that the directories following must be under root.
+root = "."
+tmp_dir = "tmp"
+
+[build]
+full_bin = "ENV=dev go run main.go"
+# Watch these filename extensions.
+include_ext = ["go", "hbs"]
+# Ignore these filename extensions or directories.
+exclude_dir = ["tmp", "vendor", "static"]
+# Watch these directories if you specified.
+include_dir = []
+# Exclude files.
+exclude_file = []
+# This log file places in your tmp_dir.
+log = "air.log"
+# It's not necessary to trigger build each time file changes if it's too frequent.
+delay = 1000 # ms
+# Stop running old binary when build errors occur.
+stop_on_error = true
+# Send Interrupt signal before killing process (windows does not support this feature)
+send_interrupt = false
+# Delay after sending Interrupt signal
+kill_delay = 500 # ms
+
+[log]
+# Show log time
+time = false
+
+[color]
+# Customize each part's color. If no color found, use the raw app log.
+main = "magenta"
+watcher = "cyan"
+build = "yellow"
+runner = "green"
+
+[misc]
+# Delete tmp directory on exit
+clean_on_exit = true

.dockerignore

@@ -1,3 +1,3 @@
-node_modules
-samples
-dist
+.env
+tmp
+static/app.css

.env.example

@@ -0,0 +1,36 @@
+ADDRESS=0.0.0.0
+PORT=3000
+FIBER_PREFORK=false
+IMGUR_CLIENT_ID=546c25a59c58ad7
+SECURE=true
+
+# Instance privacy
+# For more information, see https://codeberg.org/librarian/librarian/wiki/Instance-privacy
+# Required to be on the instance list.
+
+# Link to a privacy policy (optional)
+PRIVACY_POLICY=
+# Explain how this data is used/why it is collected (optional)
+PRIVACY_MESSAGE=
+# Country where instance is located. Leave blank if running on Tor without clearnet.
+PRIVACY_COUNTRY=
+# Hosting provider or ISP name. Leave blank if running on Tor without clearnet.
+PRIVACY_PROVIDER=
+# Set to true if you use Cloudflare (using Cloudflare only as DNS (gray cloud icon), set to false)
+PRIVACY_CLOUDFLARE=false
+
+# These settings are for NGINX without data collection disabled.
+# Instructions for other reverse proxies and to disable data collection:
+# https://codeberg.org/librarian/librarian/wiki/Instance-privacy
+
+# Set to true if no data is collected. (overrides all other options)
+PRIVACY_NOT_COLLECTED=false
+# IP address
+PRIVACY_IP=true
+# Request URL
+PRIVACY_URL=true
+# Device Type (User agent)
+PRIVACY_DEVICE=true
+# If the data collection is only collected when there is an error and only stored for
+# a short amount of time while diagnosing an issue.
+PRIVACY_DIAGNOSTICS=false

.gitignore

@@ -1,2 +1,5 @@
-dist
-node_modules
+.env
+tmp
+static/app.css
+dist/
+node_modules

.gitlab-ci.yml

@@ -1,21 +0,0 @@
-variables:
-  REPO_NAME: codeberg.org/video-prize-ranch/rimgo
-  DOCKER_HOST: tcp://docker:2375
-
-build:
-  image: docker:20
-  stage: deploy
-  services:
-    - name: docker:20-dind
-      command: ["--experimental"]
-  before_script:
-    - mkdir -p ~/.docker/cli-plugins
-    - wget -O ~/.docker/cli-plugins/docker-buildx https://github.com/docker/buildx/releases/download/v0.8.1/buildx-v0.8.1.linux-amd64
-    - chmod +x ~/.docker/cli-plugins/docker-buildx
-    - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-  script:
-    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    - docker context create mybuilder
-    - docker buildx create --use --name mybuilder mybuilder
-    - docker pull $CI_REGISTRY_IMAGE:latest || true
-    - docker buildx build --cache-from $CI_REGISTRY_IMAGE:latest --platform linux/amd64,linux/arm64 --push -t $CI_REGISTRY_IMAGE:latest .

.goreleaser.yaml

@@ -0,0 +1,55 @@
+version: 2
+before:
+  hooks:
+    - pnpm run build
+    - go mod tidy
+project_name: rimgo
+builds:
+  - env:
+      - CGO_ENABLED=0
+    goos:
+      - linux
+      - windows
+      - darwin
+    goarch:
+      - amd64
+      - arm64
+    ldflags:
+      - -X codeberg.org/rimgo/rimgo/pages.VersionInfo={{.Version}}
+archives:
+  - formats: tar.gz
+    name_template: >-
+      {{ .ProjectName }}-{{ .Os }}-{{ .Arch }}{{- if .Arm }}v{{ .Arm }}{{ end }}
+    format_overrides:
+    - goos: windows
+      formats: zip
+checksum:
+  name_template: 'checksums.txt'
+kos:
+  - repositories:
+      - codeberg.org/rimgo/rimgo
+      - codeberg.org/video-prize-ranch/rimgo
+    tags:
+      - '{{.Version}}'
+      - latest
+    bare: true
+    preserve_import_paths: false
+    platforms:
+      - linux/amd64
+      - linux/arm64
+    sbom: none
+gitea_urls:
+  api: https://codeberg.org/api/v1
+  download: https://codeberg.org
+release:
+  gitea:
+    owner: rimgo
+    name: rimgo
+  name_template: "{{.ProjectName}} v{{.Version}}"
+  disable: false
+  mode: append
+
+# The lines beneath this are called `modelines`. See `:help modeline`
+# Feel free to remove those if you don't want/use them.
+# yaml-language-server: $schema=https://goreleaser.com/static/schema.json
+# vim: set ts=2 sw=2 tw=0 fo=cnqoj

Dockerfile

@@ -1,13 +1,16 @@
-FROM golang:alpine AS build
+FROM --platform=$BUILDPLATFORM golang:alpine AS build
+
+ARG TARGETARCH
 
 WORKDIR /src
-RUN apk --no-cache add git ca-certificates
-RUN git clone https://codeberg.org/video-prize-ranch/rimgo .
+RUN apk --no-cache add ca-certificates git nodejs pnpm
+COPY . .
 
+RUN pnpm install && pnpm run build
 RUN go mod download
-RUN CGO_ENABLED=0 go build
+RUN GOOS=linux GOARCH=$TARGETARCH CGO_ENABLED=0 go build -ldflags "-X codeberg.org/rimgo/rimgo/pages.VersionInfo=$(date '+%Y-%m-%d')-$(git rev-list --abbrev-commit -1 HEAD)"
 
-FROM scratch as bin
+FROM scratch AS bin
 
 WORKDIR /app
 COPY --from=build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/

Justfile

@@ -0,0 +1,14 @@
+build:
+  pnpm run build
+  CGO_ENABLED=0 go build -o rimgo -ldflags "-X codeberg.org/rimgo/rimgo/pages.VersionInfo=$(date '+%Y-%m-%d')-$(git rev-list --abbrev-commit -1 HEAD)"
+
+dev-css:
+  pnpm run watch
+
+dev:
+  go run github.com/air-verse/air@latest -c .air.toml
+
+tag-vpr:
+  podman pull codeberg.org/rimgo/rimgo:latest
+  podman image tag codeberg.org/rimgo/rimgo:latest codeberg.org/video-prize-ranch/rimgo:latest
+  podman push codeberg.org/video-prize-ranch/rimgo:latest

README.md

@@ -1,137 +1,86 @@
-<img src="https://codeberg.org/video-prize-ranch/rimgo/raw/branch/main/static/img/rimgo.svg" width="96" height="96" />
+<img alt="" src="https://codeberg.org/rimgo/rimgo/raw/branch/main/static/img/rimgo.svg" width="96" height="96" />
 
 # rimgo
-An alternative frontend for Imgur. Based on [rimgu](https://codeberg.org/3np/rimgu) and rewritten in Go.
+An alternative frontend for Imgur. Originally based on [rimgu](https://codeberg.org/3np/rimgu).
 
 <a href="https://www.gnu.org/licenses/agpl-3.0.en.html">
-  <img alt="License: AGPLv3" src="https://shields.io/badge/License-AGPL%20v3-blue.svg">
+  <img alt="License: AGPLv3" src="https://shields.io/badge/License-AGPL%20v3-blue.svg" height="20px">
 </a>
 <a href="https://matrix.to/#/#rimgo:nitro.chat">
-  <img alt="Matrix" src="https://img.shields.io/badge/chat-matrix-blue">
-</a>
-<a href="https://gitlab.com/overtime-zone-wildfowl/rimgo">
-  <img alt="CI" src="https://gitlab.com/overtime-zone-wildfowl/rimgo/badges/main/pipeline.svg">
+  <img alt="Matrix" src="https://img.shields.io/badge/chat-matrix-blue" height="20px">
 </a>
 
-It's read-only and works without JavaScript. Images and albums can be viewed without wasting resources from downloading and running tracking scripts. No sign-up nags.
+## Table of Contents
+- [Features](#features)
+- [Comparison](#comparison)
+  - [Speed](#speed)
+  - [Privacy](#privacy)
+- [Usage](#usage)
+- [Instances](#instances)
+  - [Clearnet](#clearnet)
+  - [Tor](#tor)
+- [Contributing](#contributing)
+- [License](#license)
+
+### Documentation
+
+Our new documentation is now available at [https://rimgo.codeberg.page/docs/](https://rimgo.codeberg.page/docs/)!
+
+- [Install](https://rimgo.codeberg.page/docs/getting-started/install/)
+- [Configuration](https://rimgo.codeberg.page/docs/usage/configuration/)
+- [Redirection](https://rimgo.codeberg.page/docs/usage/configuration/)
+- [Instance privacy](https://rimgo.codeberg.page/docs/usage/instance-privacy/)
 
 ## Features
+- Lightweight
+- No JavaScript
+- No ads or tracking
+- No sign up or app install prompts
+- Bandwidth efficient - automatically uses newer image formats (if enabled)
 
-- URL-compatible with i.imgur.com - just replace the domain in the URL
-- Images and videos (~~gifv~~, mp4)
-- Galleries with comments
-- Albums
-- User page
-- Tag page
+## Comparison
+Comparing rimgo to Imgur.
 
-Some things left to implement (contributions welcome!):
+### Speed
+Tested using [Google PageSpeed Insights](https://pagespeed.web.dev/).
 
-- [x] Streaming (currently media is downloaded in full in rimgu before it's returned)
-- [ ] Localization/internationalization
-- [x] Pretty CSS styling (responsive?)
-- [ ] Support for other popular image sites
-- [x] Filtering and exploration on user/tags pages
-- [x] Responsive scaling of videos on user/tags pages
-- [x] Logo
+| | [rimgo](https://pagespeed.web.dev/report?url=https%3A%2F%2Fi.bcow.xyz%2Fgallery%2FgYiQLWy) | [Imgur](https://pagespeed.web.dev/report?url=https%3A%2F%2Fimgur.com%2Fgallery%2FgYiQLWy) |
+| ------------------- | ------- | --------- |
+| Performance         | 91      | 28        |
+| Request count       | 29      | 340       |
+| Resource Size       | 218 KiB | 2,542 KiB |
+| Time to Interactive | 1.6s    | 23.8s     |
 
-Things that are considered out of scope:
+### Privacy
+Imgur collects information about your device and uses tracking cookies for advertising, this is mentioned in their [privacy policy](https://imgur.com/privacy/). [Blacklight](https://themarkup.org/blacklight) found 31 trackers and 87 third-party cookies.
 
-* Uploading, commenting, voting, etc - rimgo is read-only.
-* Authentication, serving HTTPS, rate limiting, etc - Use a reverse proxy or load balancer like Caddy, Traefik, or NGINX.
-* Anything requiring JavaScript or the client directly interacting with upstream servers.
+See what cookies and trackers Imgur uses and where your data gets sent: https://themarkup.org/blacklight?url=imgur.com
+
+## Usage
+Replace imgur.com or i.imgur.com with the instance domain. For i.stack.imgur.com, replace i.stack.imgur.com with the instance domain and add stack/ before the media ID. You can use a browser extension to do this [automatically](#automatically-redirect-links).
+
+Imgur: `https://imgur.com/gallery/j2sOQkJ` -> `https://rimgo.bcow.xyz/gallery/j2sOQkJ`
+Stack Overflow: `https://i.stack.imgur.com/KnO3v.jpg?s=64&g=1` -> `https://rimgo.bcow.xyz/stack/KnO3v.jpg?s=64&g=1`
+
+To automatically redirect Imgur links, see [Redirection](https://rimgo.codeberg.page/docs/usage/redirection/).
 
 ## Instances
 
-Open an issue to have your instance listed here!
-
-### Clearnet
-
-| URL                                                        | Country | Cloudflare |
-| :--------------------------------------------------------- | :------ | :--------- |
-| [i.bcow.xyz](https://i.bcow.xyz) (official)                | 🇨🇦 CA   |            |
-| [rimgo.pussthecat.org](https://rimgo.pussthecat.org)       | 🇩🇪 DE   |            |
-| [img.riverside.rocks](https://img.riverside.rocks)         | 🇺🇸 US   |            |
-| [rimgo.totaldarkness.net](https://rimgo.totaldarkness.net) | 🇨🇦 CA   |            |
-| [rimgo.bus-hit.me](https://rimgo.bus-hit.me)               | 🇨🇦 CA   |            |
-| [rimgo.esmailelbob.xyz](https://rimgo.esmailelbob.xyz)     | 🇨🇦 CA   |            |
-| [rimgo.lunar.icu](https://rimgo.lunar.icu)                 | 🇩🇪 DE   | 😢         |
-| [i.actionsack.com](https://i.actionsack.com)               | 🇺🇸 US   | 😢         |
-
-### Tor
-
-| URL | Country |
-| :-- | :------ |
-| [l4d4owboqr6xcmd6lf64gbegel62kbudu3x3jnldz2mx6mhn3bsv3zyd.onion](http://l4d4owboqr6xcmd6lf64gbegel62kbudu3x3jnldz2mx6mhn3bsv3zyd.onion/) | N/A |
-| [jx3dpcwedpzu2mh54obk5gvl64i2ln7pt5mrzd75s4jnndkqwzaim7ad.onion](http://jx3dpcwedpzu2mh54obk5gvl64i2ln7pt5mrzd75s4jnndkqwzaim7ad.onion) | 🇺🇸 US |
-| [rimgo.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion](http://rimgo.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion) | 🇨🇦 CA |
-| [be7udfhmnzqyt7cxysg6c4pbawarvaofjjywp35nhd5qamewdfxl6sid.onion](http://be7udfhmnzqyt7cxysg6c4pbawarvaofjjywp35nhd5qamewdfxl6sid.onion) | 🇦🇺 AU |
-
-### I2P
-
-| URL | Country |
-| :-- | :------ |
-| [xazdnfgtzmcbcxhmcbbvr4uodd6jtn4fdiayasghywdn227xsmoa.b32.i2p](http://xazdnfgtzmcbcxhmcbbvr4uodd6jtn4fdiayasghywdn227xsmoa.b32.i2p) | 🇦🇺 AU |
+Available at https://rimgo.codeberg.page/ or https://codeberg.org/rimgo/instances
 
 ## Install
-rimgo can run on any platform Go compiles on.
 
-### Docker
-Install Docker and docker-compose, then clone this repository.
-```
-git clone https://codeberg.org/video-prize-ranch/rimgo
-cd rimgo
-```
-
-Edit the `docker-compose.yml` file using your favorite text editor.
-```
-nvim docker-compose.yml
-```
-
-You can now run rimgo.
-```
-sudo docker-compose up -d
-```
-
-### Build from source
-
-#### Requirements
-* Go v1.16 or later
-
-Clone the repository and `cd` into it.
-```
-git clone https://codeberg.org/video-prize-ranch/rimgo
-cd rimgo
-```
-
-Build rimgo.
-```
-go build
-```
-
-Edit the config file using your preferred editor.
-```
-nvim config.yml
-```
-
-You can now run rimgo.
-```
-./rimgo
-```
+See [Install](https://rimgo.codeberg.page/docs/getting-started/install/).
 
 ## Configuration
 
-rimgo can be configured using environment variables.
-
-### Environment variables
-
-| Name            | Default         |
-|-----------------|-----------------|
-| PORT            | 3000            |
-| ADDRESS         | 0.0.0.0         |
-| IMGUR_CLIENT_ID | 546c25a59c58ad7 |
+See [Configuration](https://rimgo.codeberg.page/docs/usage/configuration/).
 
 ## Contributing
+Pull requests are welcome! If you have any questions or bug reports, open an [issue](https://codeberg.org/rimgo/rimgo/issues/new). Please remember to follow our [Code of Conduct](https://rimgo.codeberg.page/docs/code-of-conduct/)!
 
-PRs are welcome! You can also send patches to `cb.8a3w5@simplelogin.co` but pull requests are preferred.
+## License
+This software is released under the AGPL-3.0 license. If you make any modifications to the code and distribute it (including use on a network server), you must publicly distribute your changes and release them under the AGPL-3.0.
 
-This software is released under the AGPL 3.0 license. In short, this means that if you make any modifications to the code and then publish the result (e.g. by hosting the result on a web server), you must publicly distribute your changes and declare that they also use AGPL 3.0.
+## Legal notice
+rimgo does not allow uploads or host any content, media. All content on any rimgo instances is from Imgur™. Imgur is a trademark of Imgur, Inc. Any issues with content on rimgo should be be reported to Imgur. rimgo is not affiliated with Imgur, Inc.

api/album.go

@@ -1,114 +1,117 @@
 package api
 
 import (
-	"io"
-	"net/http"
 	"strings"
 	"time"
 
-	"codeberg.org/video-prize-ranch/rimgo/types"
-	"codeberg.org/video-prize-ranch/rimgo/utils"
-	"github.com/patrickmn/go-cache"
+	"codeberg.org/rimgo/rimgo/utils"
+	"github.com/microcosm-cc/bluemonday"
 	"github.com/tidwall/gjson"
 )
 
-var albumCache = cache.New(1*time.Hour, 15*time.Minute)
+type Album struct {
+	Id                  string
+	Title               string
+	Views               int64
+	Upvotes             int64
+	Downvotes           int64
+	SharedWithCommunity bool
+	CreatedAt           string
+	UpdatedAt           string
+	Comments            int64
+	User                User
+	Media               []Media
+	Tags                []Tag
+}
 
-func FetchAlbum(albumID string) (types.Album, error) {
-	cacheData, found := albumCache.Get(albumID + "-album")
+type Media struct {
+	Id          string
+	Name        string
+	Title       string
+	Description string
+	Url         string
+	Type        string
+	MimeType    string
+}
+
+func (client *Client) FetchAlbum(albumID string) (Album, error) {
+	cacheData, found := client.Cache.Get(albumID + "-album")
 	if found {
-		return cacheData.(types.Album), nil
+		return cacheData.(Album), nil
 	}
 
-	res, err := http.Get("https://api.imgur.com/post/v1/albums/" + albumID + "?client_id=" + utils.Config["imgurId"].(string) + "&include=media%2Caccount")
+	data, err := utils.GetJSON("https://api.imgur.com/post/v1/albums/" + albumID + "?client_id=" + client.ClientID + "&include=media%2Caccount")
 	if err != nil {
-		return types.Album{}, err
+		return Album{}, err
 	}
 
-	body, err := io.ReadAll(res.Body)
+	album, err := parseAlbum(data)
 	if err != nil {
-		return types.Album{}, err
+		return Album{}, err
 	}
 
-	data := gjson.Parse(string(body))
-
-	album := types.Album{}
-	if data.Get("shared_with_community").Bool() || res.StatusCode == 404 {
-		album, err = FetchPosts(albumID)
-	} else {
-		album, err = ParseAlbum(data)
-	}
-
-	albumCache.Set(albumID + "-album", album, cache.DefaultExpiration)
+	client.Cache.Set(albumID+"-album", album, 1*time.Hour)
 	return album, err
 }
 
-func FetchPosts(albumID string) (types.Album, error) {
-	cacheData, found := albumCache.Get(albumID + "-posts")
+func (client *Client) FetchPosts(albumID string) (Album, error) {
+	cacheData, found := client.Cache.Get(albumID + "-posts")
 	if found {
-		return cacheData.(types.Album), nil
+		return cacheData.(Album), nil
 	}
 
-	res, err := http.Get("https://api.imgur.com/post/v1/posts/" + albumID + "?client_id=" + utils.Config["imgurId"].(string) + "&include=media%2Caccount%2Ctags")
+	data, err := utils.GetJSON("https://api.imgur.com/post/v1/posts/" + albumID + "?client_id=" + client.ClientID + "&include=media%2Caccount%2Ctags")
 	if err != nil {
-		return types.Album{}, err
+		return Album{}, err
 	}
 
-	body, err := io.ReadAll(res.Body)
+	album, err := parseAlbum(data)
 	if err != nil {
-		return types.Album{}, err
+		return Album{}, err
 	}
 
-	data := gjson.Parse(string(body))
-	album, err := ParseAlbum(data)
-	if err != nil {
-		return types.Album{}, err
-	}
-
-	albumCache.Set(albumID + "-posts", album, cache.DefaultExpiration)
+	client.Cache.Set(albumID+"-posts", album, 1*time.Hour)
 	return album, nil
 }
 
-func FetchMedia(mediaID string) (types.Album, error) {
-	cacheData, found := albumCache.Get(mediaID + "-media")
+func (client *Client) FetchMedia(mediaID string) (Album, error) {
+	cacheData, found := client.Cache.Get(mediaID + "-media")
 	if found {
-		return cacheData.(types.Album), nil
-	}
-	
-	res, err := http.Get("https://api.imgur.com/post/v1/media/" + mediaID + "?client_id=" + utils.Config["imgurId"].(string) + "&include=media%2Caccount")
-	if err != nil {
-		return types.Album{}, err
+		return cacheData.(Album), nil
 	}
 
-	body, err := io.ReadAll(res.Body)
+	data, err := utils.GetJSON("https://api.imgur.com/post/v1/media/" + mediaID + "?client_id=" + client.ClientID + "&include=media%2Caccount")
 	if err != nil {
-		return types.Album{}, err
+		return Album{}, err
 	}
 
-	data := gjson.Parse(string(body))
-	album, err := ParseAlbum(data)
+	album, err := parseAlbum(data)
 	if err != nil {
-		return types.Album{}, err
+		return Album{}, err
 	}
 
-	albumCache.Set(mediaID + "-media", album, cache.DefaultExpiration)
+	client.Cache.Set(mediaID+"-media", album, 1*time.Hour)
 	return album, nil
 }
 
-func ParseAlbum(data gjson.Result) (types.Album, error) {
-	media := make([]types.Media, 0)
+func parseAlbum(data gjson.Result) (Album, error) {
+	media := make([]Media, 0)
 	data.Get("media").ForEach(
 		func(key gjson.Result, value gjson.Result) bool {
 			url := value.Get("url").String()
 			url = strings.ReplaceAll(url, "https://i.imgur.com", "")
 
-			media = append(media, types.Media{
+			description := value.Get("metadata.description").String()
+			description = strings.ReplaceAll(description, "\n", "<br>")
+			description = bluemonday.UGCPolicy().Sanitize(description)
+
+			media = append(media, Media{
 				Id:          value.Get("id").String(),
 				Name:        value.Get("name").String(),
 				MimeType:    value.Get("mime_type").String(),
 				Type:        value.Get("type").String(),
 				Title:       value.Get("metadata.title").String(),
-				Description: value.Get("metadata.description").String(),
+				Description: description,
 				Url:         url,
 			})
 
@@ -116,13 +119,14 @@ func ParseAlbum(data gjson.Result) (types.Album, error) {
 		},
 	)
 
-	tags := make([]types.Tag, 0)
+	tags := make([]Tag, 0)
 	data.Get("tags").ForEach(
 		func(key gjson.Result, value gjson.Result) bool {
-			tags = append(tags, types.Tag{
-				Tag: value.Get("tag").String(),
-				Display: value.Get("display").String(),
-				Background: "/" + value.Get("background_id").String() + ".webp",
+			tags = append(tags, Tag{
+				Tag:          value.Get("tag").String(),
+				Display:      value.Get("display").String(),
+				Background:   "/" + value.Get("background_id").String() + ".webp",
+				BackgroundId: value.Get("background_id").String(),
 			})
 			return true
 		},
@@ -130,10 +134,10 @@ func ParseAlbum(data gjson.Result) (types.Album, error) {
 
 	createdAt, err := utils.FormatDate(data.Get("created_at").String())
 	if err != nil {
-		return types.Album{}, err
+		return Album{}, err
 	}
 
-	album := types.Album{
+	album := Album{
 		Id:                  data.Get("id").String(),
 		Title:               data.Get("title").String(),
 		SharedWithCommunity: data.Get("shared_with_community").Bool(),
@@ -143,15 +147,15 @@ func ParseAlbum(data gjson.Result) (types.Album, error) {
 		Comments:            data.Get("comment_count").Int(),
 		CreatedAt:           createdAt,
 		Media:               media,
-		Tags:								 tags,
+		Tags:                tags,
 	}
 
 	account := data.Get("account")
 	if account.Raw != "" {
-		album.User = types.User{
-			Id: account.Get("id").Int(),
+		album.User = User{
+			Id:       account.Get("id").Int(),
 			Username: account.Get("username").String(),
-			Avatar: strings.ReplaceAll(account.Get("avatar_url").String(), "https://i.imgur.com", ""),
+			Avatar:   strings.ReplaceAll(account.Get("avatar_url").String(), "https://i.imgur.com", ""),
 		}
 	}
 

api/client.go

@@ -0,0 +1,21 @@
+package api
+
+import (
+	"time"
+
+	"github.com/patrickmn/go-cache"
+)
+
+type Client struct {
+    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
+}

api/comments.go

@@ -1,48 +1,54 @@
 package api
 
 import (
-	"io"
-	"net/http"
+	"regexp"
 	"strings"
 	"sync"
 	"time"
 
-	"codeberg.org/video-prize-ranch/rimgo/types"
-	"codeberg.org/video-prize-ranch/rimgo/utils"
+	"codeberg.org/rimgo/rimgo/utils"
 	"github.com/dustin/go-humanize"
+	"github.com/microcosm-cc/bluemonday"
 	"github.com/patrickmn/go-cache"
 	"github.com/tidwall/gjson"
+	"gitlab.com/golang-commonmark/linkify"
 )
 
-var commentCache = cache.New(15*time.Minute, 15*time.Minute)
+type Comment struct {
+	Comments  []Comment
+	User      User
+	Post      Submission
+	Id        string
+	Comment   string
+	Upvotes   int64
+	Downvotes int64
+	Platform  string
+	CreatedAt string
+	RelTime   string
+	UpdatedAt string
+	DeletedAt string
+}
 
-func FetchComments(galleryID string) ([]types.Comment, error) {
-	cacheData, found := commentCache.Get(galleryID)
+func (client *Client) FetchComments(galleryID string) ([]Comment, error) {
+	cacheData, found := client.Cache.Get(galleryID + "-comments")
 	if found {
-		return cacheData.([]types.Comment), nil
+		return cacheData.([]Comment), nil
 	}
 
-	res, err := http.Get("https://api.imgur.com/comment/v1/comments?client_id=" + utils.Config["imgurId"].(string) + "&filter[post]=eq:" + galleryID + "&include=account,adconfig&per_page=30&sort=best")
+	data, err := utils.GetJSON("https://api.imgur.com/comment/v1/comments?client_id=" + client.ClientID + "&filter[post]=eq:" + galleryID + "&include=account,adconfig&per_page=30&sort=best")
 	if err != nil {
-		return []types.Comment{}, err
+		return []Comment{}, nil
 	}
 
-	body, err := io.ReadAll(res.Body)
-	if err != nil {
-		return []types.Comment{}, err
-	}
-
-	data := gjson.Parse(string(body))
-
 	wg := sync.WaitGroup{}
-	comments := make([]types.Comment, 0)
+	comments := make([]Comment, 0)
 	data.Get("data").ForEach(
 		func(key, value gjson.Result) bool {
 			wg.Add(1)
 
 			go func() {
 				defer wg.Done()
-				comments = append(comments, ParseComment(value))
+				comments = append(comments, parseComment(value))
 			}()
 
 			return true
@@ -50,11 +56,18 @@ func FetchComments(galleryID string) ([]types.Comment, error) {
 	)
 	wg.Wait()
 
-	commentCache.Set(galleryID, comments, cache.DefaultExpiration)
+	client.Cache.Set(galleryID+"-comments", comments, cache.DefaultExpiration)
 	return comments, nil
 }
 
-func ParseComment(data gjson.Result) types.Comment {
+var imgurRe = regexp.MustCompile(`https?://imgur\.com/(gallery|a)?/(.*)`)
+var imgurRe2 = regexp.MustCompile(`https?://imgur\.com/(.*)`)
+var imgRe = regexp.MustCompile(`https?://i\.imgur\.com/(.*)\.(png|gif|jpe?g|webp)`)
+var vidRe = regexp.MustCompile(`https?://i\.imgur\.com/(.*)\.(mp4|webm)`)
+var vidFormatRe = regexp.MustCompile(`\.(mp4|webm)`)
+var iImgurRe = regexp.MustCompile(`https?://i\.imgur\.com`)
+
+func parseComment(data gjson.Result) Comment {
 	createdTime, _ := time.Parse("2006-01-02T15:04:05Z", data.Get("created_at").String())
 	createdAt := createdTime.Format("January 2, 2006 3:04 PM")
 	updatedAt, _ := utils.FormatDate(data.Get("updated_at").String())
@@ -63,14 +76,14 @@ func ParseComment(data gjson.Result) types.Comment {
 	userAvatar := strings.ReplaceAll(data.Get("account.avatar").String(), "https://i.imgur.com", "")
 
 	wg := sync.WaitGroup{}
-	comments := make([]types.Comment, 0)
+	comments := make([]Comment, 0)
 	data.Get("comments").ForEach(
 		func(key, value gjson.Result) bool {
 			wg.Add(1)
 
 			go func() {
 				defer wg.Done()
-				comments = append(comments, ParseComment(value))
+				comments = append(comments, parseComment(value))
 			}()
 
 			return true
@@ -78,20 +91,54 @@ func ParseComment(data gjson.Result) types.Comment {
 	)
 	wg.Wait()
 
-	return types.Comment{
+	comment := data.Get("comment").String()
+
+	comment = strings.ReplaceAll(comment, "\n", "<br>")
+
+	for _, match := range imgRe.FindAllString(comment, -1) {
+		img := iImgurRe.ReplaceAllString(match, "")
+		img = `<img src="` + img + `" class="comment__media" loading="lazy"/>`
+		comment = strings.Replace(comment, match, img, 1)
+	}
+	for _, match := range vidRe.FindAllString(comment, -1) {
+		vid := iImgurRe.ReplaceAllString(match, "")
+		vid = `<video class="comment__media" controls loop preload="none" poster="` + vidFormatRe.ReplaceAllString(vid, ".webp") + `"><source type="` + strings.Split(vid, ".")[1] + `" src="` + vid + `" /></video>`
+		comment = strings.Replace(comment, match, vid, 1)
+	}
+	for _, l := range linkify.Links(comment) {
+		origLink := comment[l.Start:l.End]
+		link := `<a href="` + origLink + `">` + origLink + `</a>`
+		comment = strings.Replace(comment, origLink, link, 1)
+	}
+	comment = imgurRe.ReplaceAllString(comment, "/$1/$2")
+	comment = imgurRe2.ReplaceAllString(comment, "/$1")
+
+	p := bluemonday.UGCPolicy()
+	p.AllowImages()
+	p.AllowElements("video", "source")
+	p.AllowAttrs("src", "tvpe").OnElements("source")
+	p.AllowAttrs("controls", "loop", "preload", "poster").OnElements("video")
+	p.AllowAttrs("class", "loading").OnElements("img", "video")
+	p.RequireNoReferrerOnLinks(true)
+	p.RequireNoFollowOnLinks(true)
+	p.RequireCrossOriginAnonymous(true)
+	comment = p.Sanitize(comment)
+
+	return Comment{
 		Comments: comments,
-		User: types.User{
+		User: User{
 			Id:       data.Get("account.id").Int(),
 			Username: data.Get("account.username").String(),
 			Avatar:   userAvatar,
 		},
+		Post:      parseSubmission(data.Get("post")),
 		Id:        data.Get("id").String(),
-		Comment:   data.Get("comment").String(),
+		Comment:   comment,
 		Upvotes:   data.Get("upvote_count").Int(),
 		Downvotes: data.Get("downvote_count").Int(),
 		Platform:  data.Get("platform").String(),
 		CreatedAt: createdAt,
-		RelTime: 	 humanize.Time(createdTime),
+		RelTime:   humanize.Time(createdTime),
 		UpdatedAt: updatedAt,
 		DeletedAt: deletedAt,
 	}

api/search.go

@@ -0,0 +1,72 @@
+package api
+
+import (
+	"fmt"
+	"net/http"
+	"net/url"
+	"strings"
+
+	"codeberg.org/rimgo/rimgo/utils"
+	"github.com/PuerkitoBio/goquery"
+)
+
+type SearchResult struct {
+	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)
+	if err != nil {
+		return []SearchResult{}, err
+	}
+	utils.SetReqHeaders(req)
+
+	res, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return []SearchResult{}, err
+	}
+	defer res.Body.Close()
+	if res.StatusCode != 200 {
+    return []SearchResult{}, fmt.Errorf("invalid status code, got %d", res.StatusCode)
+  }
+
+	doc, err := goquery.NewDocumentFromReader(res.Body)
+  if err != nil {
+    return []SearchResult{}, err
+  }
+
+	results := []SearchResult{}
+  doc.Find(".post-list").Each(func(i int, s *goquery.Selection) {
+		url, _ := s.Find("a").Attr("href")
+		imageUrl, _ := s.Find("img").Attr("src")
+
+		postInfo := strings.Split(s.Find(".post-info").Text(), "·")
+		points := strings.TrimSpace(postInfo[0])
+		points = strings.TrimSuffix(points, " points")
+		views := strings.TrimSpace(postInfo[1])
+		views = strings.TrimSuffix(views, " views")
+
+		result := SearchResult{
+			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]),
+		}
+
+		results = append(results, result)
+	})
+
+	return results, nil
+}

api/tag.go

@@ -1,33 +1,41 @@
 package api
 
 import (
-	"io/ioutil"
+	"io"
 	"net/http"
+	"net/url"
 	"strings"
-	"sync"
-	"time"
 
-	"codeberg.org/video-prize-ranch/rimgo/types"
-	"codeberg.org/video-prize-ranch/rimgo/utils"
 	"github.com/patrickmn/go-cache"
 	"github.com/tidwall/gjson"
 )
 
-var tagCache = cache.New(15*time.Minute, 15*time.Minute)
+type Tag struct {
+	Tag          string
+	Display      string
+	Sort         string
+	PostCount    int64
+	Posts        []Submission
+	Background   string
+	BackgroundId string
+}
 
-func FetchTag(tag string, sort string, page string) (types.Tag, error) {
-	cacheData, found := tagCache.Get(tag + sort + page)
+func (client *Client) FetchTag(tag string, sort string, page string) (Tag, error) {
+	// Dots are automatically removed on Imgur, so more cache hits
+	tag = strings.ReplaceAll(tag, ".", "")
+
+	cacheData, found := client.Cache.Get(tag + sort + page + "-tag")
 	if found {
-		return cacheData.(types.Tag), nil
+		return cacheData.(Tag), nil
 	}
 
 	req, err := http.NewRequest("GET", "https://api.imgur.com/post/v1/posts/t/"+tag, nil)
 	if err != nil {
-		return types.Tag{}, err
+		return Tag{}, err
 	}
 
 	q := req.URL.Query()
-	q.Add("client_id", utils.Config["imgurId"].(string))
+	q.Add("client_id", client.ClientID)
 	q.Add("include", "cover")
 	q.Add("page", page)
 
@@ -49,57 +57,54 @@ func FetchTag(tag string, sort string, page string) (types.Tag, error) {
 
 	res, err := http.DefaultClient.Do(req)
 	if err != nil {
-		return types.Tag{}, err
+		return Tag{}, err
 	}
 
-	body, err := ioutil.ReadAll(res.Body)
+	body, err := io.ReadAll(res.Body)
 	if err != nil {
-		return types.Tag{}, err
+		return Tag{}, err
 	}
 
 	data := gjson.Parse(string(body))
 
-	wg := sync.WaitGroup{}
-	posts := make([]types.Submission, 0)
+	posts := make([]Submission, 0)
 	data.Get("posts").ForEach(
 		func(key, value gjson.Result) bool {
-			wg.Add(1)
+			url, _ := url.Parse(strings.ReplaceAll(value.Get("url").String(), "https://imgur.com", ""))
+			q := url.Query()
+			q.Add("tag", tag+"."+sort+"."+page+"."+key.String())
+			url.RawQuery = q.Encode()
 
-			go func() {
-				defer wg.Done()
-				posts = append(posts, types.Submission{
-					Id:    value.Get("id").String(),
-					Title: value.Get("title").String(),
-					Link:  strings.ReplaceAll(value.Get("url").String(), "https://imgur.com", ""),
-					Cover: types.Media{
-						Id:  value.Get("cover_id").String(),
-						Type: value.Get("cover.type").String(),
-						Url: strings.ReplaceAll(value.Get("cover.url").String(), "https://i.imgur.com", ""),
-					},
-					Points:    value.Get("point_count").Int(),
-					Upvotes:   value.Get("upvote_count").Int(),
-					Downvotes: value.Get("downvote_count").Int(),
-					Comments:  value.Get("comment_count").Int(),
-					Views:     value.Get("view_count").Int(),
-					IsAlbum:   value.Get("is_album").Bool(),
-				})
-			}()
+			posts = append(posts, Submission{
+				Id:    value.Get("id").String(),
+				Title: value.Get("title").String(),
+				Link:  url.String(),
+				Cover: Media{
+					Id:   value.Get("cover_id").String(),
+					Type: value.Get("cover.type").String(),
+					Url:  strings.ReplaceAll(value.Get("cover.url").String(), "https://i.imgur.com", ""),
+				},
+				Points:    value.Get("point_count").Int(),
+				Upvotes:   value.Get("upvote_count").Int(),
+				Downvotes: value.Get("downvote_count").Int(),
+				Comments:  value.Get("comment_count").Int(),
+				Views:     value.Get("view_count").Int(),
+				IsAlbum:   value.Get("is_album").Bool(),
+			})
 
 			return true
 		},
 	)
 
-	wg.Wait()
-
-	tagData := types.Tag{
-		Tag: tag,
-		Display: data.Get("display").String(),
-		Sort: sort,
-		PostCount: data.Get("post_count").Int(),
-		Posts: posts,
+	tagData := Tag{
+		Tag:        tag,
+		Display:    data.Get("display").String(),
+		Sort:       sort,
+		PostCount:  data.Get("post_count").Int(),
+		Posts:      posts,
 		Background: "/" + data.Get("background_id").String() + ".webp",
 	}
 
-	tagCache.Set(tag, tagData, cache.DefaultExpiration)
+	client.Cache.Set(tag+sort+page+"-tag", tagData, 4*cache.DefaultExpiration)
 	return tagData, nil
 }

api/trending.go

@@ -0,0 +1,107 @@
+package api
+
+import (
+	"fmt"
+	"io"
+	"net/http"
+	"strings"
+	"sync"
+
+	"codeberg.org/rimgo/rimgo/utils"
+	"github.com/patrickmn/go-cache"
+	"github.com/tidwall/gjson"
+)
+
+func (client *Client) FetchTrending(section, sort, page string) ([]Submission, error) {
+	cacheData, found := client.Cache.Get(fmt.Sprintf("trending-%s-%s-%s", section, sort, page))
+	if found {
+		return cacheData.([]Submission), nil
+	}
+
+	req, err := http.NewRequest("GET", "https://api.imgur.com/post/v1/posts", nil)
+	if err != nil {
+		return []Submission{}, err
+	}
+	utils.SetReqHeaders(req)
+
+	q := req.URL.Query()
+	q.Add("client_id", client.ClientID)
+	q.Add("include", "cover")
+	q.Add("page", page)
+
+	switch sort {
+	case "newest":
+		q.Add("filter[window]", "week")
+		q.Add("sort", "-time")
+	case "best":
+		q.Add("filter[window]", "all")
+		q.Add("sort", "-top")
+	case "popular":
+		fallthrough
+	default:
+		q.Add("filter[window]", "week")
+		q.Add("sort", "-viral")
+		sort = "popular"
+	}
+	switch section {
+	case "hot":
+		q.Add("filter[section]", "eq:hot")
+	case "new":
+		q.Add("filter[section]", "eq:new")
+	case "top":
+		q.Add("filter[section]", "eq:top")
+		q.Add("filter[window]", "day")
+	default:
+		q.Add("filter[section]", "eq:hot")
+		section = "hot"
+	}
+
+	req.URL.RawQuery = q.Encode()
+
+	res, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return []Submission{}, err
+	}
+
+	body, err := io.ReadAll(res.Body)
+	if err != nil {
+		return []Submission{}, err
+	}
+
+	data := gjson.Parse(string(body))
+
+	wg := sync.WaitGroup{}
+	posts := make([]Submission, 0)
+	data.ForEach(
+		func(key, value gjson.Result) bool {
+			wg.Add(1)
+
+			go func() {
+				defer wg.Done()
+				posts = append(posts, Submission{
+					Id:    value.Get("id").String(),
+					Title: value.Get("title").String(),
+					Link:  strings.ReplaceAll(value.Get("url").String(), "https://imgur.com", ""),
+					Cover: Media{
+						Id:   value.Get("cover_id").String(),
+						Type: value.Get("cover.type").String(),
+						Url:  strings.ReplaceAll(value.Get("cover.url").String(), "https://i.imgur.com", ""),
+					},
+					Points:    value.Get("point_count").Int(),
+					Upvotes:   value.Get("upvote_count").Int(),
+					Downvotes: value.Get("downvote_count").Int(),
+					Comments:  value.Get("comment_count").Int(),
+					Views:     value.Get("view_count").Int(),
+					IsAlbum:   value.Get("is_album").Bool(),
+				})
+			}()
+
+			return true
+		},
+	)
+
+	wg.Wait()
+
+	client.Cache.Set(fmt.Sprintf("trending-%s-%s-%s", section, sort, page), posts, cache.DefaultExpiration)
+	return posts, nil
+}

api/user.go

@@ -7,35 +7,55 @@ import (
 	"sync"
 	"time"
 
-	"codeberg.org/video-prize-ranch/rimgo/types"
-	"codeberg.org/video-prize-ranch/rimgo/utils"
+	"codeberg.org/rimgo/rimgo/utils"
 	"github.com/patrickmn/go-cache"
 	"github.com/tidwall/gjson"
 )
 
-var userCache = cache.New(30*time.Minute, 15*time.Minute)
+type User struct {
+	Id        int64
+	Bio       string
+	Username  string
+	Points    int64
+	Cover     string
+	Avatar    string
+	CreatedAt string
+}
 
-func FetchUser(username string) (types.User, error) {
-	cacheData, found := userCache.Get(username)
+type Submission struct {
+	Id        string
+	Title     string
+	Link      string
+	Cover     Media
+	Points    int64
+	Upvotes   int64
+	Downvotes int64
+	Comments  int64
+	Views     int64
+	IsAlbum   bool
+}
+
+func (client *Client) FetchUser(username string) (User, error) {
+	cacheData, found := client.Cache.Get(username + "-user")
 	if found {
-		return cacheData.(types.User), nil
+		return cacheData.(User), nil
 	}
 
-	res, err := http.Get("https://api.imgur.com/account/v1/accounts/" + username + "?client_id=" + utils.Config["imgurId"].(string))
+	res, err := http.Get("https://api.imgur.com/account/v1/accounts/" + username + "?client_id=" + utils.Config.ImgurId)
 	if err != nil {
-		return types.User{}, err
+		return User{}, err
 	}
 
 	body, err := io.ReadAll(res.Body)
 	if err != nil {
-		return types.User{}, err
+		return User{}, err
 	}
 
 	data := gjson.Parse(string(body))
 
 	createdTime, _ := time.Parse(time.RFC3339, data.Get("created_at").String())
 
-	user := types.User{
+	user := User{
 		Id:        data.Get("id").Int(),
 		Bio:       data.Get("bio").String(),
 		Username:  data.Get("username").String(),
@@ -45,29 +65,22 @@ func FetchUser(username string) (types.User, error) {
 		CreatedAt: createdTime.Format("January 2, 2006"),
 	}
 
-	userCache.Set(username, user, 1*time.Hour)
+	client.Cache.Set(username+"-user", user, 1*time.Hour)
 	return user, nil
 }
 
-func FetchSubmissions(username string, sort string, page string) ([]types.Submission, error) {
-	cacheData, found := userCache.Get(username + "-submissions")
+func (client *Client) FetchSubmissions(username string, sort string, page string) ([]Submission, error) {
+	cacheData, found := client.Cache.Get(username + "-submissions-" + sort + page)
 	if found {
-		return cacheData.([]types.Submission), nil
+		return cacheData.([]Submission), nil
 	}
 
-	res, err := http.Get("https://api.imgur.com/3/account/" + username + "/submissions/" + page + "/" + sort + "?album_previews=1&client_id=" + utils.Config["imgurId"].(string))
+	data, err := utils.GetJSON("https://api.imgur.com/3/account/" + username + "/submissions/" + page + "/" + sort + "?album_previews=1&client_id=" + utils.Config.ImgurId)
 	if err != nil {
-		return []types.Submission{}, err
+		return []Submission{}, err
 	}
 
-	body, err := io.ReadAll(res.Body)
-	if err != nil {
-		return []types.Submission{}, err
-	}
-
-	data := gjson.Parse(string(body))
-
-	submissions := []types.Submission{}
+	submissions := []Submission{}
 
 	wg := sync.WaitGroup{}
 	data.Get("data").ForEach(
@@ -77,38 +90,7 @@ func FetchSubmissions(username string, sort string, page string) ([]types.Submis
 			go func() {
 				defer wg.Done()
 
-				coverData := value.Get("images.#(id==\"" + value.Get("cover").String() + "\")")
-				cover := types.Media{}
-				if coverData.Exists() {
-					cover = types.Media{
-						Id:          coverData.Get("id").String(),
-						Description: coverData.Get("description").String(),
-						Type:        strings.Split(coverData.Get("type").String(), "/")[0],
-						Url:         strings.ReplaceAll(coverData.Get("link").String(), "https://i.imgur.com", ""),
-					}
-				} else {
-					cover = types.Media{
-						Id:          value.Get("id").String(),
-						Description: value.Get("description").String(),
-						Type:        strings.Split(value.Get("type").String(), "/")[0],
-						Url:         strings.ReplaceAll(value.Get("link").String(), "https://i.imgur.com", ""),
-					}
-				}
-
-				id := value.Get("id").String()
-
-				submissions = append(submissions, types.Submission{
-					Id:    id,
-					Link:  "/a/" + id,
-					Title: value.Get("title").String(),
-					Cover: cover,
-					Points:    value.Get("points").Int(),
-					Upvotes:   value.Get("ups").Int(),
-					Downvotes: value.Get("downs").Int(),
-					Comments:  value.Get("comment_count").Int(),
-					Views:     value.Get("views").Int(),
-					IsAlbum:   value.Get("is_album").Bool(),
-				})
+				submissions = append(submissions, parseSubmission(value))
 			}()
 
 			return true
@@ -116,6 +98,151 @@ func FetchSubmissions(username string, sort string, page string) ([]types.Submis
 	)
 	wg.Wait()
 
-	userCache.Set(username + "-submissions", submissions, 15*time.Minute)
+	client.Cache.Set(username+"-submissions-"+sort+page, submissions, 15*time.Minute)
 	return submissions, nil
 }
+
+func (client *Client) FetchUserFavorites(username string, sort string, page string) ([]Submission, error) {
+	cacheData, found := client.Cache.Get(username + "-favorites-" + sort + page)
+	if found {
+		return cacheData.([]Submission), nil
+	}
+
+	req, err := http.NewRequest("GET", "https://api.imgur.com/3/account/"+username+"/gallery_favorites/"+page+"/"+sort, nil)
+	if err != nil {
+		return []Submission{}, err
+	}
+	utils.SetReqHeaders(req)
+	q := req.URL.Query()
+	q.Add("client_id", client.ClientID)
+	req.URL.RawQuery = q.Encode()
+
+	res, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return []Submission{}, err
+	}
+
+	body, err := io.ReadAll(res.Body)
+	if err != nil {
+		return []Submission{}, err
+	}
+
+	data := gjson.Parse(string(body))
+
+	submissions := []Submission{}
+
+	wg := sync.WaitGroup{}
+	data.Get("data").ForEach(
+		func(key, value gjson.Result) bool {
+			wg.Add(1)
+
+			go func() {
+				defer wg.Done()
+
+				submissions = append(submissions, parseSubmission(value))
+			}()
+
+			return true
+		},
+	)
+	wg.Wait()
+
+	client.Cache.Set(username+"-favorites-"+sort+page, submissions, 15*time.Minute)
+	return submissions, nil
+}
+
+func (client *Client) FetchUserComments(username string) ([]Comment, error) {
+	cacheData, found := client.Cache.Get(username + "-usercomments")
+	if found {
+		return cacheData.([]Comment), nil
+	}
+
+	req, err := http.NewRequest("GET", "https://api.imgur.com/comment/v1/comments", nil)
+	if err != nil {
+		return []Comment{}, err
+	}
+	utils.SetReqHeaders(req)
+
+	q := req.URL.Query()
+	q.Add("client_id", client.ClientID)
+	q.Add("filter[account]", "eq:"+username)
+	q.Add("include", "account,post")
+	q.Add("sort", "new")
+
+	req.URL.RawQuery = q.Encode()
+
+	res, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return []Comment{}, err
+	}
+
+	body, err := io.ReadAll(res.Body)
+	if err != nil {
+		return []Comment{}, err
+	}
+
+	data := gjson.Parse(string(body))
+
+	comments := make([]Comment, 0)
+	data.Get("data").ForEach(
+		func(key, value gjson.Result) bool {
+			comments = append(comments, parseComment(value))
+			return true
+		},
+	)
+
+	client.Cache.Set(username+"-usercomments", comments, cache.DefaultExpiration)
+	return comments, nil
+}
+
+func parseSubmission(value gjson.Result) Submission {
+	var cover Media
+	c := value.Get("cover")
+	coverData := value.Get("images.#(id==\"" + c.String() + "\")")
+	switch {
+	case c.Type == gjson.String && coverData.Exists():
+		cover = Media{
+			Id:          coverData.Get("id").String(),
+			Description: coverData.Get("description").String(),
+			Type:        strings.Split(coverData.Get("type").String(), "/")[0],
+			Url:         strings.ReplaceAll(coverData.Get("link").String(), "https://i.imgur.com", ""),
+		}
+	// This case is when fetching comments
+	case c.Type != gjson.Null:
+		cover = Media{
+			Id:  c.Get("id").String(),
+			Url: strings.ReplaceAll(c.Get("url").String(), "https://i.imgur.com", ""),
+		}
+		// Replace with thumbnails here because it's easier.
+		if strings.HasSuffix(cover.Url, ".mp4") {
+			cover.Url = cover.Url[:len(cover.Url)-3] + "webp"
+		}
+	default:
+		cover = Media{
+			Id:          value.Get("id").String(),
+			Description: value.Get("description").String(),
+			Type:        strings.Split(value.Get("type").String(), "/")[0],
+			Url:         strings.ReplaceAll(value.Get("link").String(), "https://i.imgur.com", ""),
+		}
+	}
+
+	id := value.Get("id").String()
+
+	link := "/a/" + id
+	if value.Get("in_gallery").Bool() {
+		link = "/gallery/" + id
+	}
+
+	return Submission{
+		Id:        id,
+		Link:      link,
+		Title:     value.Get("title").String(),
+		Cover:     cover,
+		Points:    value.Get("points").Int(),
+		Upvotes:   value.Get("ups").Int(),
+		Downvotes: value.Get("downs").Int(),
+		Comments:  value.Get("comment_count").Int(),
+		Views:     value.Get("views").Int(),
+		IsAlbum:   value.Get("is_album").Bool(),
+	}
+}

docker-compose.yml

@@ -1,12 +1,15 @@
-version: '3'
-
 services:
   rimgo:
-    #image: registry.gitlab.com/overtime-zone-wildfowl/rimgo # Uncomment to use image, official image
+    image: codeberg.org/rimgo/rimgo # Official image
     #image: quay.io/pussthecatorg/rimgo # Unofficial image
-    build: .
+    #build: . # Uncomment to build from source
     ports:
       - 3000:3000
-    volumes:
-      - ./config.yml:/app/config.yml
     restart: unless-stopped
+    user: 65534:65534 # equivalent to `nobody`
+    read_only: true
+    security_opt:
+      - no-new-privileges
+    cap_drop:
+      - ALL
+    env_file: .env

go.mod

@@ -1,23 +1,45 @@
-module codeberg.org/video-prize-ranch/rimgo
+module codeberg.org/rimgo/rimgo
 
-go 1.17
+go 1.23
+
+toolchain go1.23.5
 
 require (
-	github.com/dustin/go-humanize v1.0.0
-	github.com/gofiber/fiber/v2 v2.32.0
-	github.com/gofiber/template v1.6.27
+	github.com/PuerkitoBio/goquery v1.10.1
+	github.com/dustin/go-humanize v1.0.1
+	github.com/gofiber/fiber/v2 v2.52.6
+	github.com/gofiber/template/handlebars/v2 v2.1.11
+	github.com/gorilla/feeds v1.2.0
+	github.com/joho/godotenv v1.5.1
+	github.com/mailgun/raymond/v2 v2.0.48
+	github.com/microcosm-cc/bluemonday v1.0.27
 	github.com/patrickmn/go-cache v2.1.0+incompatible
-	github.com/tidwall/gjson v1.14.1
+	github.com/tidwall/gjson v1.18.0
+	gitlab.com/golang-commonmark/linkify v0.0.0-20200225224916-64bca66f6ad3
 )
 
 require (
-	github.com/andybalholm/brotli v1.0.4 // indirect
-	github.com/aymerick/raymond v2.0.2+incompatible // indirect
-	github.com/klauspost/compress v1.15.1 // indirect
+	github.com/andybalholm/brotli v1.1.1 // indirect
+	github.com/andybalholm/cascadia v1.3.3 // indirect
+	github.com/aymerick/douceur v0.2.0 // indirect
+	github.com/gofiber/template v1.8.3 // indirect
+	github.com/gofiber/utils v1.1.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/gorilla/css v1.0.1 // indirect
+	github.com/klauspost/compress v1.17.11 // indirect
+	github.com/mattn/go-colorable v0.1.14 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-runewidth v0.0.16 // indirect
+	github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c // indirect
+	github.com/rivo/uniseg v0.4.7 // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
-	github.com/tidwall/pretty v1.2.0 // indirect
+	github.com/tidwall/pretty v1.2.1 // indirect
+	github.com/tinylib/msgp v1.2.5 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
-	github.com/valyala/fasthttp v1.35.0 // indirect
+	github.com/valyala/fasthttp v1.58.0 // indirect
 	github.com/valyala/tcplisten v1.0.0 // indirect
-	golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 // indirect
+	golang.org/x/net v0.34.0 // indirect
+	golang.org/x/sys v0.29.0 // indirect
+	golang.org/x/text v0.21.0 // indirect
 )

go.sum

@@ -1,820 +1,162 @@
-cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
-cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
-cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
-cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
-cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
-cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
-cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
-cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
-cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
-cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
-cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
-cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
-cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
-cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI=
-cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk=
-cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg=
-cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8=
-cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0=
-cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY=
-cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM=
-cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY=
-cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ=
-cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI=
-cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4=
-cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc=
-cloud.google.com/go v0.98.0/go.mod h1:ua6Ush4NALrHk5QXDWnjvZHN93OuF0HfuEPq9I1X0cM=
-cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA=
-cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
-cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
-cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
-cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
-cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
-cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
-cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
-cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
-cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY=
-cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
-cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
-cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
-cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
-cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
-cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
-cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
-cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
-cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
-dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno=
-github.com/CloudyKit/jet/v6 v6.1.0/go.mod h1:d3ypHeIRNo2+XyqnGA8s+aphtcVpjP5hPwP/Lzo7Ro4=
-github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
-github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY=
-github.com/Joker/jade v1.1.3/go.mod h1:T+2WLyt7VH6Lp0TRxQrUYEs64nRc83wkMQrfeIQKduM=
-github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY=
-github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
-github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
-github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
-github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
-github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc=
-github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
-github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
-github.com/aymerick/raymond v2.0.2+incompatible h1:VEp3GpgdAnv9B2GFyTvqgcKvY+mfKMjPOA3SbKLtnU0=
-github.com/aymerick/raymond v2.0.2+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g=
-github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
-github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
-github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
-github.com/cbroglie/mustache v1.3.1/go.mod h1:SS1FTIghy0sjse4DUVGV1k/40B1qE1XkD9DtDsHo9iM=
-github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
-github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
-github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
-github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
-github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
-github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
-github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
-github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
-github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
-github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/PuerkitoBio/goquery v1.10.1 h1:Y8JGYUkXWTGRB6Ars3+j3kN0xg1YqqlwvdTV8WTFQcU=
+github.com/PuerkitoBio/goquery v1.10.1/go.mod h1:IYiHrOMps66ag56LEH7QYDDupKXyo5A8qrjIx3ZtujY=
+github.com/andybalholm/brotli v1.1.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7XdTA=
+github.com/andybalholm/brotli v1.1.1/go.mod h1:05ib4cKhjx3OQYUY22hTVd34Bc8upXjOLL2rKwwZBoA=
+github.com/andybalholm/cascadia v1.3.3 h1:AG2YHrzJIm4BZ19iwJ/DAua6Btl3IwJX+VI4kktS1LM=
+github.com/andybalholm/cascadia v1.3.3/go.mod h1:xNd9bqTn98Ln4DwST8/nG+H0yuB8Hmgu1YHNnWw0GeA=
+github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
+github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
-github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
-github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM=
-github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
-github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
-github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
-github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ=
-github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws=
-github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
-github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
-github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
-github.com/flosch/pongo2/v4 v4.0.2/go.mod h1:B5ObFANs/36VwxxlgKpdchIJHMvHB562PW+BWPhwZD8=
-github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
-github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
-github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
-github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
-github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/gofiber/fiber/v2 v2.29.0 h1:wopU1kXxdD9XxvQqYd1vSWMGu2PiZN0yy+DojygTRRA=
-github.com/gofiber/fiber/v2 v2.29.0/go.mod h1:1Ega6O199a3Y7yDGuM9FyXDPYQfv+7/y48wl6WCwUF4=
-github.com/gofiber/fiber/v2 v2.32.0 h1:lpgcGEq1UENv27uVuOaufAhU8wUKnX8yb9L7559Neec=
-github.com/gofiber/fiber/v2 v2.32.0/go.mod h1:CMy5ZLiXkn6qwthrl03YMyW1NLfj0rhxz2LKl4t7ZTY=
-github.com/gofiber/template v1.6.25 h1:wAh92yCfP2XQvxBRK8VchbjAJnNz/y+p4uD94WBs1MI=
-github.com/gofiber/template v1.6.25/go.mod h1:/hE+mSK1VTEK9YVX1ySE2ix12xOXdgi28nrsVaRq2u4=
-github.com/gofiber/template v1.6.27 h1:gjQuNY3zgV1JtOezX0kIffOOlHHj7XWeFMntOVYYTrE=
-github.com/gofiber/template v1.6.27/go.mod h1:R4tRVdtOAhuPpXKoVeJUM8wU6N8ewT3XXPSa5Bx8KJU=
-github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
-github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
-github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8=
-github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
-github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
-github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
-github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=
-github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
-github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
-github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0=
-github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM=
-github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
-github.com/hashicorp/consul/api v1.11.0/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M=
-github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms=
-github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
-github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
-github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
-github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
-github.com/hashicorp/go-hclog v1.0.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
-github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
-github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
-github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
-github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
-github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
-github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
-github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
-github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
-github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
-github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
-github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
-github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
-github.com/hashicorp/mdns v1.0.1/go.mod h1:4gW7WsVCke5TE7EPeYliwHlRUyBtfCwuFwuMg2DmyNY=
-github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc=
-github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE=
-github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE=
-github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk=
-github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4=
-github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
-github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
-github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
-github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
-github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
-github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/compress v1.15.0 h1:xqfchp4whNFxn5A4XFyyYtitiWI8Hy5EW59jEwcyL6U=
-github.com/klauspost/compress v1.15.0/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
-github.com/klauspost/compress v1.15.1 h1:y9FcTHGyrebwfP0ZZqFiaxTaiDnUrGkJkI+f583BL1A=
-github.com/klauspost/compress v1.15.1/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
-github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
+github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
+github.com/gofiber/fiber/v2 v2.52.6 h1:Rfp+ILPiYSvvVuIPvxrBns+HJp8qGLDnLJawAu27XVI=
+github.com/gofiber/fiber/v2 v2.52.6/go.mod h1:YEcBbO/FB+5M1IZNBP9FO3J9281zgPAreiI1oqg8nDw=
+github.com/gofiber/template v1.8.3 h1:hzHdvMwMo/T2kouz2pPCA0zGiLCeMnoGsQZBTSYgZxc=
+github.com/gofiber/template v1.8.3/go.mod h1:bs/2n0pSNPOkRa5VJ8zTIvedcI/lEYxzV3+YPXdBvq8=
+github.com/gofiber/template/handlebars/v2 v2.1.11 h1:pgPF+DKuIvCl3z/Kj1u6VA/8hLBljH2Rg6LwVFBm7aM=
+github.com/gofiber/template/handlebars/v2 v2.1.11/go.mod h1:AbKfYOgH+ngxaYXtLzafy4AKLAQ2NrJYbvtWaOX82I4=
+github.com/gofiber/utils v1.1.0 h1:vdEBpn7AzIUJRhe+CiTOJdUcTg4Q9RK+pEa0KPbLdrM=
+github.com/gofiber/utils v1.1.0/go.mod h1:poZpsnhBykfnY1Mc0KeEa6mSHrS3dV0+oBWyeQmb2e0=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8=
+github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0=
+github.com/gorilla/feeds v1.2.0 h1:O6pBiXJ5JHhPvqy53NsjKOThq+dNFm8+DFrxBEdzSCc=
+github.com/gorilla/feeds v1.2.0/go.mod h1:WMib8uJP3BbY+X8Szd1rA5Pzhdfh+HCCAYT2z7Fza6Y=
+github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
+github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
+github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
+github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w=
-github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
-github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
-github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
-github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
-github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
-github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
-github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mattn/go-slim v0.0.0-20200618151855-bde33eecb5ee/go.mod h1:ma9TUJeni8LGZMJvOwbAv/FOwiwqIMQN570LnpqCBSM=
-github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
-github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
-github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
-github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI=
-github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
-github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
-github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
+github.com/mailgun/raymond/v2 v2.0.48 h1:5dmlB680ZkFG2RN/0lvTAghrSxIESeu9/2aeDqACtjw=
+github.com/mailgun/raymond/v2 v2.0.48/go.mod h1:lsgvL50kgt1ylcFJYZiULi5fjPBkkhNfj4KA0W54Z18=
+github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
+github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
+github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/microcosm-cc/bluemonday v1.0.27 h1:MpEUotklkwCSLeH+Qdx1VJgNqLlpY2KXwXFM08ygZfk=
+github.com/microcosm-cc/bluemonday v1.0.27/go.mod h1:jFi9vgW+H7c3V0lb6nR74Ib/DIB5OBs92Dimizgw2cA=
 github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
-github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
-github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI=
+github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c h1:dAMKvw0MlJT1GshSTtih8C2gDs04w8dReiOGXrGLNoY=
+github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c/go.mod h1:RqIHx9QI14HlwKwm98g9Re5prTQ6LdeRQn+gXJFxsJM=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
-github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
-github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
-github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
-github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
-github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
-github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
-github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
-github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
-github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
-github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43MRiaGWX1Nig=
-github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
-github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
-github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
-github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4=
-github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
-github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
-github.com/spf13/cobra v1.3.0/go.mod h1:BrRVncBjOJa/eUcVVm9CE+oC6as8k+VYr4NY7WCi9V4=
-github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
-github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/viper v1.10.0/go.mod h1:SoyBPwAtKDzypXNDFKN5kzH7ppppbGZtls1UpIy5AsM=
+github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
+github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
+github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
+github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
+github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
+github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
+github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
-github.com/tidwall/gjson v1.14.0 h1:6aeJ0bzojgWLa82gDQHcx3S0Lr/O51I9bJ5nv6JFx5w=
-github.com/tidwall/gjson v1.14.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
-github.com/tidwall/gjson v1.14.1 h1:iymTbGkQBhveq21bEvAQ81I0LEBork8BFe1CUZXdyuo=
-github.com/tidwall/gjson v1.14.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=
+github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
 github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
 github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
-github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
 github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
-github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
+github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
+github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
+github.com/tinylib/msgp v1.2.5 h1:WeQg1whrXRFiZusidTQqzETkRpGjFjcIhW6uqWH09po=
+github.com/tinylib/msgp v1.2.5/go.mod h1:ykjzy2wzgrlvpDCRc4LA8UXy6D8bzMSuAF3WD57Gok0=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
-github.com/valyala/fasthttp v1.34.0 h1:d3AAQJ2DRcxJYHm7OXNXtXt2as1vMDfxeIcFvhmGGm4=
-github.com/valyala/fasthttp v1.34.0/go.mod h1:epZA5N+7pY6ZaEKRmstzOuYJx9HI8DI1oaCGZpdH4h0=
-github.com/valyala/fasthttp v1.35.0 h1:wwkR8mZn2NbigFsaw2Zj5r+xkmzjbrA/lyTmiSlal/Y=
-github.com/valyala/fasthttp v1.35.0/go.mod h1:t/G+3rLek+CyY9bnIE+YlMRddxVAAGjhxndDB4i4C0I=
+github.com/valyala/fasthttp v1.58.0 h1:GGB2dWxSbEprU9j0iMJHgdKYJVDyjrOwF9RE59PbRuE=
+github.com/valyala/fasthttp v1.58.0/go.mod h1:SYXvHHaFp7QZHGKSHmoMipInhrI5StHrhDTYVEjK/Kw=
 github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8=
 github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc=
-github.com/yosssi/ace v0.0.5/go.mod h1:ALfIzm2vT7t5ZE7uoIZqF3TQ7SAOyupFZnkrF5id+K0=
-github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
-go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
-go.etcd.io/etcd/client/v2 v2.305.1/go.mod h1:pMEacxZW7o8pg4CrFE7pquyCJJzZvkvdD2RibOCCCGs=
-go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
-go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
-go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
-go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
-go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
-go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
-go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
-golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU=
+github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+gitlab.com/golang-commonmark/linkify v0.0.0-20200225224916-64bca66f6ad3 h1:1Coh5BsUBlXoEJmIEaNzVAWrtg9k7/eJzailMQr1grw=
+gitlab.com/golang-commonmark/linkify v0.0.0-20200225224916-64bca66f6ad3/go.mod h1:Gn+LZmCrhPECMD3SOKlE+BOHwhOYD9j7WT9NUtkCrC8=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
-golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
-golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
-golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
-golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
-golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
-golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
-golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
-golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
-golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
-golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
-golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190327091125-710a502c58a2/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
-golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
+golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
+golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
+golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8=
-golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
+golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
+golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
+golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
+golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9 h1:nhht2DYV/Sn3qOayu8lM+cU1ii9sTLUeBQwQQfUHtrs=
-golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 h1:xHms4gcpe1YE7A3yIllJXP16CMAGuqwO2lX1mTyyRRc=
-golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
+golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
+golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
+golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
+golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
-golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
-golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
-golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
-golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
-golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
-golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
+golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
-google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
-google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
-google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
-google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
-google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
-google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
-google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
-google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
-google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE=
-google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
-google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU=
-google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94=
-google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo=
-google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4=
-google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw=
-google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU=
-google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k=
-google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE=
-google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE=
-google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI=
-google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU=
-google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I=
-google.golang.org/api v0.62.0/go.mod h1:dKmwPCydfsad4qCH08MSdgWjfHOyfpd4VtDGgRFdavw=
-google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
-google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
-google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
-google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
-google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
-google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A=
-google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A=
-google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
-google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
-google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
-google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24=
-google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k=
-google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k=
-google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48=
-google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48=
-google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w=
-google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211008145708-270636b82663/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211028162531-8db9c33dc351/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211129164237-f09f9a12af12/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211203200212-54befc351ae9/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
-google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
-google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
-google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
-google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
-google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
-google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
-google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
-google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
-google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
-google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
-google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
-google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
-google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
-google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
-google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
-google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
-google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
-honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
-rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
-rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

instances.json

@@ -1,15 +1,162 @@
 [
-  "i.bcow.xyz",
-  "rimgo.pussthecat.org",
-  "img.riverside.rocks",
-  "rimgo.totaldarkness.net",
-  "rimgo.bus-hit.me",
-  "rimgo.esmailelbob.xyz",
-  "rimgo.lunar.icu",
-  "i.actionsack.com",
-  "l4d4owboqr6xcmd6lf64gbegel62kbudu3x3jnldz2mx6mhn3bsv3zyd.onion",
-  "jx3dpcwedpzu2mh54obk5gvl64i2ln7pt5mrzd75s4jnndkqwzaim7ad.onion",
-  "rimgo.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion",
-  "be7udfhmnzqyt7cxysg6c4pbawarvaofjjywp35nhd5qamewdfxl6sid.onion",
-  "xazdnfgtzmcbcxhmcbbvr4uodd6jtn4fdiayasghywdn227xsmoa.b32.i2p"
+  {
+    "url": "https://rimgo.pussthecat.org",
+    "countries": [
+      "de"
+    ],
+    "cloudflare": false
+  },
+  {
+    "url": "https://rimgo.totaldarkness.net",
+    "countries": [
+      "ca"
+    ],
+    "cloudflare": false
+  },
+  {
+    "url": "https://rimgo.bus-hit.me",
+    "countries": [
+      "ca"
+    ],
+    "cloudflare": false
+  },
+  {
+    "url": "https://imgur.artemislena.eu",
+    "onion": "http://imgur.lpoaj7z2zkajuhgnlltpeqh3zyq7wk2iyeggqaduhgxhyajtdt2j7wad.onion",
+    "countries": [
+      "de"
+    ],
+    "cloudflare": false
+  },
+  {
+    "url": "https://imgur.010032.xyz",
+    "countries": [
+      "kr"
+    ],
+    "cloudflare": false
+  },
+  {
+    "url": "https://i.habedieeh.re",
+    "onion": "http://i.habeehrhadazsw3izbrbilqajalfyqqln54mrja3iwpqxgcuxnus7eid.onion",
+    "i2p": [
+      "rimgo.i2p",
+      "rimgov7l2tqyrm5txrtvhtnfyrzkc5d7ipafofavchbnnyog4r3q.b32.i2p"
+    ],
+    "countries": [
+      "ca"
+    ],
+    "cloudflare": false
+  },
+  {
+    "url": "https://rimgo.hostux.net",
+    "countries": [
+      "fr"
+    ],
+    "cloudflare": false
+  },
+  {
+    "url": "https://ri.zzls.xyz",
+    "onion": "http://rimgo.zzlsghu6mvvwyy75mvga6gaf4znbp3erk5xwfzedb4gg6qqh2j6rlvid.onion",
+    "i2p": [
+      "rimgo.zzls.i2p",
+      "p57356k2xwhxrg2lxrjajcftkrptv4zejeeblzfgkcvpzuetkz2a.b32.i2p"
+    ],
+    "countries": [
+      "cl"
+    ],
+    "cloudflare": false
+  },
+  {
+    "url": "https://rimgo.lunar.icu",
+    "countries": [
+      "de"
+    ],
+    "cloudflare": true
+  },
+  {
+    "url": "https://rimgo.kling.gg",
+    "onion": "http://tdn7zoxctmsopey77mp4eg2gazaudyhgbuyytf4zpk5u7lknlxlgbnid.onion",
+    "i2p": "http://ovzamsts5czfx3jasbbhbccyyl2z7qmdngtlqxdh4oi7abhdz3ia.b32.i2p",
+    "countries": [
+      "nl"
+    ],
+    "cloudflare": false
+  },
+  {
+    "url": "https://rimgo.eu.projectsegfau.lt",
+    "countries": [
+      "fr"
+    ],
+    "cloudflare": false
+  },
+  {
+    "url": "https://rimgo.us.projectsegfau.lt",
+    "countries": [
+      "us"
+    ],
+    "cloudflare": false
+  },
+  {
+    "url": "https://rimgo.in.projectsegfau.lt",
+    "countries": [
+      "in"
+    ],
+    "cloudflare": false
+  },
+  {
+    "url": "https://rimgo.fascinated.cc",
+    "countries": [
+      "us"
+    ],
+    "cloudflare": false
+  },
+  {
+    "url": "https://rimgo.whateveritworks.org",
+    "countries": [
+      "de"
+    ],
+    "cloudflare": true
+  },
+  {
+    "url": "https://rimgo.nohost.network",
+    "countries": [
+      "mx"
+    ],
+    "cloudflare": false
+  },
+  {
+    "url": "https://rimgo.catsarch.com",
+    "countries": [
+      "us"
+    ],
+    "cloudflare": false
+  },
+  {
+    "url": "https://rimgo.frontendfriendly.xyz",
+    "countries": [
+      "de"
+    ],
+    "cloudflare": false
+  },
+  {
+    "url": "https://rimgo.drgns.space",
+    "countries": [
+      "us"
+    ],
+    "cloudflare": false
+  },
+  {
+    "url": "https://rimgo.quantenzitrone.eu",
+    "countries": [
+      "cz"
+    ],
+    "cloudflare": false
+  },
+  {
+    "url": "https://rimgo.frylo.net",
+    "countries": [
+      "nl"
+    ],
+    "cloudflare": false
+  }
 ]

main.go

@@ -1,34 +1,108 @@
 package main
 
 import (
+	"flag"
+	"fmt"
 	"net/http"
+	"os"
+	"time"
 
-	"codeberg.org/video-prize-ranch/rimgo/pages"
-	"codeberg.org/video-prize-ranch/rimgo/static"
-	"codeberg.org/video-prize-ranch/rimgo/utils"
-	"codeberg.org/video-prize-ranch/rimgo/views"
+	"codeberg.org/rimgo/rimgo/pages"
+	"codeberg.org/rimgo/rimgo/static"
+	"codeberg.org/rimgo/rimgo/utils"
+	"codeberg.org/rimgo/rimgo/views"
+	"github.com/mailgun/raymond/v2"
 	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/middleware/cache"
 	"github.com/gofiber/fiber/v2/middleware/filesystem"
 	"github.com/gofiber/fiber/v2/middleware/recover"
-	"github.com/gofiber/template/handlebars"
+	"github.com/gofiber/template/handlebars/v2"
+	"github.com/joho/godotenv"
 )
 
 func main() {
+	envPath := flag.String("c", ".env", "Path to env file")
+	godotenv.Load(*envPath)
 	utils.LoadConfig()
 
-	engine := handlebars.NewFileSystem(http.FS(views.GetFiles()), ".hbs")
-	app := fiber.New(fiber.Config{
-		Views:             engine,
-		Prefork:           utils.Config["fiberPrefork"].(bool),
-		UnescapePath:      true,
-		StreamRequestBody: true,
+	pages.InitializeApiClient()
+
+	views := http.FS(views.GetFiles())
+	if os.Getenv("ENV") == "dev" {
+		views = http.Dir("./views")
+	}
+	engine := handlebars.NewFileSystem(views, ".hbs")
+
+	engine.AddFunc("noteq", func(a interface{}, b interface{}, options *raymond.Options) interface{} {
+		if raymond.Str(a) != raymond.Str(b) {
+			return options.Fn()
+		}
+		return ""
 	})
 
-	app.Use(recover.New())
-	app.Use("/static", filesystem.New(filesystem.Config{
-		Root: http.FS(static.GetFiles()),
+	app := fiber.New(fiber.Config{
+		Views:             engine,
+		Prefork:           utils.Config.FiberPrefork,
+		UnescapePath:      true,
+		StreamRequestBody: true,
+		ErrorHandler: func(ctx *fiber.Ctx, err error) error {
+			code := fiber.StatusInternalServerError
+
+			if e, ok := err.(*fiber.Error); ok {
+				code = e.Code
+			}
+
+			return utils.RenderError(ctx, code)
+		},
+	})
+
+	app.Use(recover.New(recover.Config{
+		EnableStackTrace: true,
+		StackTraceHandler: func(c *fiber.Ctx, e interface{}) {
+			fmt.Println(e)
+		},
 	}))
 
+	if os.Getenv("ENV") == "dev" {
+		app.Use("/static", filesystem.New(filesystem.Config{
+			Root: http.Dir("./static"),
+		}))
+		app.Get("/errors/429", func(c *fiber.Ctx) error {
+			return c.Render("errors/429", nil)
+		})
+		app.Get("/errors/429/img", func(c *fiber.Ctx) error {
+			return c.Redirect("/static/img/error-429.png")
+		})
+		app.Get("/errors/404", func(c *fiber.Ctx) error {
+			return c.Render("errors/404", nil)
+		})
+		app.Get("/errors/404/img", func(c *fiber.Ctx) error {
+			return c.Redirect("/static/img/error-404.png")
+		})
+		app.Get("/errors/error", func(c *fiber.Ctx) error {
+			return c.Render("errors/error", fiber.Map{
+				"err": "Test error",
+			})
+		})
+		app.Get("/errors/error/img", func(c *fiber.Ctx) error {
+			return c.Redirect("/static/img/error-generic.png")
+		})
+	} else {
+		app.Use("/static", filesystem.New(filesystem.Config{
+			MaxAge: 2592000,
+			Root:   http.FS(static.GetFiles()),
+		}))
+		app.Use(cache.New(cache.Config{
+			Expiration: 30 * time.Minute,
+			MaxBytes:   25000000,
+			KeyGenerator: func(c *fiber.Ctx) string {
+				return c.OriginalURL()
+			},
+			CacheControl:         true,
+			StoreResponseHeaders: true,
+		}))
+	}
+
 	app.Get("/robots.txt", func(c *fiber.Ctx) error {
 		file, _ := static.GetFiles().ReadFile("robots.txt")
 		_, err := c.Write(file)
@@ -41,16 +115,33 @@ func main() {
 	})
 
 	app.Get("/", pages.HandleFrontpage)
-	app.Get("/:postID.gifv", pages.HandleEmbed)
-	app.Get("/:baseName.:extension", pages.HandleMedia)
-	app.Get("/:postID", pages.HandlePost)
-	app.Get("/a/:galleryID", pages.HandleGallery)
+	app.Get("/about", pages.HandleAbout)
+	app.Get("/privacy", pages.HandlePrivacy)
+	app.Get("/search", pages.HandleSearch)
+	app.Get("/trending.:type", pages.HandleTrendingRSS)
+	app.Get("/trending", pages.HandleTrending)
+	app.Get("/a/:postID", pages.HandlePost)
+	app.Get("/a/:postID/embed", pages.HandleEmbed)
+	app.Get("/t/:tag.:type", pages.HandleTagRSS)
 	app.Get("/t/:tag", pages.HandleTag)
-	app.Get("/user/:userID", pages.HandleUser)
+	app.Get("/t/:tag/:postID", pages.HandlePost)
 	app.Get("/r/:sub/:postID", pages.HandlePost)
+	app.Get("/user/:userID.:type", pages.HandleUserRSS)
+	app.Get("/user/:userID", pages.HandleUser)
+	app.Get("/user/:userID/favorites", pages.HandleUserFavorites)
+	app.Get("/user/:userID/comments", pages.HandleUserComments)
 	app.Get("/user/:userID/cover", pages.HandleUserCover)
 	app.Get("/user/:userID/avatar", pages.HandleUserAvatar)
-	app.Get("/gallery/:galleryID", pages.HandleGallery)
+	app.Get("/gallery/:postID", pages.HandlePost)
+	app.Get("/gallery/:postID/embed", pages.HandleEmbed)
+	app.Get("/:postID.gifv", pages.HandleGifv)
+	app.Get("/:baseName.:extension", pages.HandleMedia)
+	app.Get("/stack/:baseName.:extension", pages.HandleMedia)
+	app.Get("/:postID", pages.HandlePost)
+	app.Get("/:postID/embed", pages.HandleEmbed)
 
-	app.Listen(":" + utils.Config["port"].(string))
+	err := app.Listen(utils.Config.Addr + ":" + utils.Config.Port)
+	if err != nil {
+		fmt.Println(err)
+	}
 }

package.json

@@ -0,0 +1,10 @@
+{
+	"devDependencies": {
+		"@tailwindcss/cli": "^4.1.5",
+		"tailwindcss": "^4.1.5"
+	},
+	"scripts": {
+		"build": "tailwindcss -i static/tailwind.css -o static/app.css",
+		"watch": "tailwindcss -i static/tailwind.css -o static/app.css --watch"
+	}
+}

pages/about.go

@@ -0,0 +1,22 @@
+package pages
+
+import (
+	"os"
+
+	"codeberg.org/rimgo/rimgo/utils"
+	"github.com/gofiber/fiber/v2"
+)
+
+
+func HandleAbout(c *fiber.Ctx) error {
+	utils.SetHeaders(c)
+	c.Set("X-Frame-Options", "DENY")
+	c.Set("Cache-Control", "public,max-age=31557600")
+	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(),
+		"force_webp": os.Getenv("FORCE_WEBP"),
+	})
+}

pages/apiClient.go

@@ -0,0 +1,12 @@
+package pages
+
+import (
+	"codeberg.org/rimgo/rimgo/api"
+	"codeberg.org/rimgo/rimgo/utils"
+)
+
+var ApiClient *api.Client
+
+func InitializeApiClient() {
+    ApiClient = api.NewClient(utils.Config.ImgurId)
+}

pages/embed.go

@@ -1,16 +1,48 @@
 package pages
 
 import (
-	"codeberg.org/video-prize-ranch/rimgo/utils"
+	"strings"
+
+	"codeberg.org/rimgo/rimgo/api"
+	"codeberg.org/rimgo/rimgo/utils"
 	"github.com/gofiber/fiber/v2"
 )
 
 func HandleEmbed(c *fiber.Ctx) error {
 	utils.SetHeaders(c)
 	c.Set("Cache-Control", "public,max-age=31557600")
-	c.Set("Content-Security-Policy", "default-src 'none'; media-src 'self'; style-src 'self'; img-src 'self'; font-src 'self'; block-all-mixed-content")
+	c.Set("Content-Security-Policy", "default-src 'none'; base-uri 'none'; form-action 'none'; media-src 'self'; style-src 'self'; img-src 'self'; block-all-mixed-content")
+
+	post, err := api.Album{}, error(nil)
+	switch {
+	case strings.HasPrefix(c.Path(), "/a"):
+		post, err = ApiClient.FetchAlbum(c.Params("postID"))
+	case strings.HasPrefix(c.Path(), "/gallery"):
+		post, err = ApiClient.FetchPosts(c.Params("postID"))
+	default:
+		post, err = ApiClient.FetchMedia(c.Params("postID"))
+	}
+	if err != nil && err.Error() == "ratelimited by imgur" {
+		return utils.RenderError(c, 429)
+	}
+	if err != nil && post.Id == "" && strings.Contains(err.Error(), "404") {
+		return utils.RenderError(c, 404)
+	}
+ 	if err != nil {
+		return err
+	}
 
 	return c.Render("embed", fiber.Map{
+		"post": post,
+	})
+}
+
+func HandleGifv(c *fiber.Ctx) error {
+	utils.SetHeaders(c)
+	c.Set("Cache-Control", "public,max-age=31557600")
+	c.Set("Content-Security-Policy", "default-src 'none'; base-uri 'none'; form-action 'none'; media-src 'self'; style-src 'self'; img-src 'self'; block-all-mixed-content")
+
+	return c.Render("gifv", fiber.Map{
 		"id": c.Params("postID"),
 	})
 }

pages/frontpage.go

@@ -1,17 +1,20 @@
 package pages
 
 import (
-	"codeberg.org/video-prize-ranch/rimgo/utils"
+	"codeberg.org/rimgo/rimgo/utils"
 	"github.com/gofiber/fiber/v2"
 )
 
+var VersionInfo string
+
 func HandleFrontpage(c *fiber.Ctx) error {
 	utils.SetHeaders(c)
+	c.Set("X-Frame-Options", "DENY")
 	c.Set("Cache-Control", "public,max-age=31557600")
-	c.Set("Content-Security-Policy", "default-src 'none'; style-src 'self'; img-src 'self'; font-src 'self'; manifest-src 'self'; block-all-mixed-content")
+	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("frontpage", fiber.Map{
-		"proto": c.Protocol(),
-		"domain": c.Hostname(),
+		"config":  utils.Config,
+		"version": VersionInfo,
 	})
 }

pages/gallery.go

@@ -1,34 +0,0 @@
-package pages
-
-import (
-	"codeberg.org/video-prize-ranch/rimgo/api"
-	"codeberg.org/video-prize-ranch/rimgo/types"
-	"codeberg.org/video-prize-ranch/rimgo/utils"
-	"github.com/gofiber/fiber/v2"
-)
-
-func HandleGallery(c *fiber.Ctx) error {
-	utils.SetHeaders(c)
-	c.Set("Content-Security-Policy", "default-src 'none'; media-src 'self'; style-src 'unsafe-inline' 'self'; img-src 'self'; font-src 'self'; manifest-src 'self'; block-all-mixed-content")
-
-	album, err := api.FetchAlbum(c.Params("galleryID"))
-	if err != nil {
-		return err
-	}
-
-	comments := []types.Comment{}
-	if album.SharedWithCommunity {
-		c.Set("Cache-Control", "public,max-age=604800")
-		comments, err = api.FetchComments(c.Params("galleryID"))
-		if err != nil {
-			return err
-		}
-	} else {
-		c.Set("Cache-Control", "public,max-age=31557600")
-	}
-
-	return c.Render("post", fiber.Map{
-		"post":    album,
-		"comments": comments,
-	})
-}

pages/media.go

@@ -2,37 +2,76 @@ package pages
 
 import (
 	"net/http"
-	"strconv"
+	"os"
+	"strings"
 
-	"codeberg.org/video-prize-ranch/rimgo/utils"
+	"codeberg.org/rimgo/rimgo/utils"
 	"github.com/gofiber/fiber/v2"
 )
 
 func HandleMedia(c *fiber.Ctx) error {
 	c.Set("Cache-Control", "public,max-age=31557600")
-	return handleMedia(c, "https://i.imgur.com/" + c.Params("baseName") + "." + c.Params("extension"))
+	c.Set("Content-Security-Policy", "default-src 'none'; style-src 'self'; img-src 'self'")
+	if strings.HasPrefix(c.Path(), "/stack") {
+		return handleMedia(c, "https://i.stack.imgur.com/"+strings.ReplaceAll(c.Params("baseName"), "stack/", "")+"."+c.Params("extension"))
+	} else {
+		return handleMedia(c, "https://i.imgur.com/"+c.Params("baseName")+"."+c.Params("extension"))
+	}
 }
 
 func HandleUserCover(c *fiber.Ctx) error {
 	c.Set("Cache-Control", "public,max-age=604800")
-	return handleMedia(c, "https://imgur.com/user/" + c.Params("userID")  + "/cover?maxwidth=2560")
-};
+	c.Set("Content-Security-Policy", "default-src 'none'")
+	return handleMedia(c, "https://imgur.com/user/"+c.Params("userID")+"/cover?maxwidth=2560")
+}
 
 func HandleUserAvatar(c *fiber.Ctx) error {
 	c.Set("Cache-Control", "public,max-age=604800")
-	return handleMedia(c, "https://imgur.com/user/" + c.Params("userID")  + "/avatar")
-};
+	c.Set("Content-Security-Policy", "default-src 'none'")
+	return handleMedia(c, "https://imgur.com/user/"+c.Params("userID")+"/avatar")
+}
 
 func handleMedia(c *fiber.Ctx, url string) error {
 	utils.SetHeaders(c)
-	c.Set("Content-Security-Policy", "default-src 'none'; media-src 'self'; style-src 'self'; img-src 'self'; font-src 'self'; manifest-src 'self'; block-all-mixed-content")
 
-	res, err := http.Get(url)
+	if os.Getenv("FORCE_WEBP") == "1" && 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")
+	}
+
+	if strings.HasPrefix(c.Path(), "/stack") && strings.Contains(c.OriginalURL(), "?") {
+		url = url + "?" + strings.Split(c.OriginalURL(), "?")[1]
+	}
+
+	req, err := http.NewRequest("GET", url, nil)
 	if err != nil {
 		return err
 	}
 
-	c.Set("Content-Type", res.Header.Get("Content-Type"));
-	contentLen, _ := strconv.Atoi(res.Header.Get("Content-Length"))
-	return c.SendStream(res.Body, contentLen)
-}
+	utils.SetReqHeaders(req)
+
+	if c.Get("Range") != "" {
+		req.Header.Set("Range", c.Get("Range"))
+	}
+
+	res, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return err
+	}
+
+	if res.StatusCode == 404 || strings.Contains(res.Request.URL.String(), "error/404") {
+		return utils.RenderError(c, 404)
+	} else if res.StatusCode == 429 {
+		return utils.RenderError(c, 429)
+	}
+
+	c.Set("Accept-Ranges", "bytes")
+	c.Set("Content-Type", res.Header.Get("Content-Type"))
+	c.Set("Content-Length", res.Header.Get("Content-Length"))
+	if res.Header.Get("Content-Range") != "" {
+		c.Set("Content-Range", res.Header.Get("Content-Range"))
+	}
+
+	return c.SendStream(res.Body)
+}

pages/post.go

@@ -1,36 +1,72 @@
 package pages
 
 import (
+	"crypto/rand"
 	"fmt"
+	"strconv"
+	"strings"
 
-	"codeberg.org/video-prize-ranch/rimgo/api"
-	"codeberg.org/video-prize-ranch/rimgo/types"
-	"codeberg.org/video-prize-ranch/rimgo/utils"
+	"codeberg.org/rimgo/rimgo/api"
+	"codeberg.org/rimgo/rimgo/utils"
 	"github.com/gofiber/fiber/v2"
 )
 
+// Cursed function
+func nextInTag(client *api.Client, tagname, sort, page, I string) string {
+	i, err := strconv.Atoi(I)
+	if err != nil || i < 0 {
+		return ""
+	}
+	tag, err := client.FetchTag(tagname, sort, page)
+	if err != nil {
+		return ""
+	}
+	if i >= len(tag.Posts)-1 {
+		pageNumber, _ := strconv.Atoi(page)
+		tagn, err := client.FetchTag(tagname, sort, strconv.Itoa(pageNumber+1))
+		// Check length - Imgur will not return an error if there are no more posts and you request the next page
+		if err != nil || len(tagn.Posts) < 1 {
+			return ""
+		}
+		return tagn.Posts[0].Link
+	}
+	return tag.Posts[i+1].Link
+}
+
 func HandlePost(c *fiber.Ctx) error {
 	utils.SetHeaders(c)
-	c.Set("Content-Security-Policy", "default-src 'none'; media-src 'self'; style-src 'self'; img-src 'self'; font-src 'self'; manifest-src 'self'; block-all-mixed-content")
+	c.Set("X-Frame-Options", "DENY")
 
-	post, err := api.FetchPosts(c.Params("postID"))
-	if post.Id == "" {
-		post, err = api.FetchPosts(c.Params("postID"))
-		if post.Id == "" {
-			post, err = api.FetchMedia(c.Params("postID"))
-			if post.Id == "" {
-				return fmt.Errorf("404 page not found")				
-			}
-		}
+	postId := c.Params("postID")
+	if strings.Contains(postId, "-") {
+		postId = postId[len(postId)-7:]
 	}
- 	if err != nil {
+
+	post, err := api.Album{}, error(nil)
+	switch {
+	case strings.HasPrefix(c.Path(), "/a"):
+		post, err = ApiClient.FetchAlbum(postId)
+	case strings.HasPrefix(c.Path(), "/gallery"):
+		post, err = ApiClient.FetchPosts(postId)
+	case strings.HasPrefix(c.Path(), "/t"):
+		post, err = ApiClient.FetchPosts(postId)
+	default:
+		post, err = ApiClient.FetchMedia(postId)
+	}
+	if err != nil && err.Error() == "ratelimited by imgur" {
+		return utils.RenderError(c, 429)
+	}
+	if err != nil && post.Id == "" && strings.Contains(err.Error(), "404") {
+		return utils.RenderError(c, 404)
+	}
+	if err != nil {
 		return err
 	}
 
-	comments := []types.Comment{}
+	comments := []api.Comment{}
 	if post.SharedWithCommunity {
 		c.Set("Cache-Control", "public,max-age=604800")
-		comments, err = api.FetchComments(c.Params("postID"))
+		comments, err = ApiClient.FetchComments(postId)
 		if err != nil {
 			return err
 		}
@@ -38,8 +74,27 @@ func HandlePost(c *fiber.Ctx) error {
 		c.Set("Cache-Control", "public,max-age=31557600")
 	}
 
+	nonce := ""
+	csp := "default-src 'none'; frame-ancestors 'none'; base-uri 'none'; form-action 'self'; media-src 'self'; img-src 'self'; manifest-src 'self'; block-all-mixed-content; style-src 'self'"
+	if len(post.Tags) != 0 {
+		b := make([]byte, 8)
+		rand.Read(b)
+		nonce = fmt.Sprintf("%x", b)
+		csp = csp + " 'nonce-" + nonce + "'"
+	}
+	c.Set("Content-Security-Policy", csp)
+
+	var next string
+	tagParam := strings.Split(c.Query("tag"), ".")
+	if len(tagParam) == 4 {
+		tag, sort, page, index := tagParam[0], tagParam[1], tagParam[2], tagParam[3]
+		next = nextInTag(ApiClient, tag, sort, page, index)
+	}
+
 	return c.Render("post", fiber.Map{
-		"post":    post,
+		"post":     post,
+		"next":     next,
 		"comments": comments,
+		"nonce":    nonce,
 	})
-}
+}

pages/privacy.go

@@ -0,0 +1,18 @@
+package pages
+
+import (
+	"github.com/gofiber/fiber/v2"
+
+	"codeberg.org/rimgo/rimgo/utils"
+)
+
+func HandlePrivacy(c *fiber.Ctx) error {
+	utils.SetHeaders(c)
+	c.Set("X-Frame-Options", "DENY")
+	c.Set("Content-Security-Policy", "default-src 'none'; form-action 'self'; style-src 'self'; img-src 'self'; manifest-src 'self'; block-all-mixed-content")
+
+	return c.Render("privacy", fiber.Map{
+		"config":  utils.Config,
+		"version": VersionInfo,
+	})
+}

pages/rss.go

@@ -0,0 +1,136 @@
+package pages
+
+import (
+	"time"
+
+	"codeberg.org/rimgo/rimgo/api"
+	"codeberg.org/rimgo/rimgo/utils"
+	"github.com/gofiber/fiber/v2"
+	"github.com/gorilla/feeds"
+)
+
+func HandleTagRSS(c *fiber.Ctx) error {
+	utils.SetHeaders(c)
+
+	tag, err := ApiClient.FetchTag(c.Params("tag"), c.Query("sort"), "1")
+	if err != nil && err.Error() == "ratelimited by imgur" {
+		return c.Status(429).SendString("rate limited by imgur")
+	}
+	if err != nil {
+		return err
+	}
+	if tag.Display == "" {
+		return c.Status(404).SendString("tag not found")
+	}
+
+	instance := utils.GetInstanceUrl(c)
+
+	feed := &feeds.Feed{
+		Title:   tag.Display + " on Imgur",
+		Link:    &feeds.Link{Href: instance + "/t/" + c.Params("tag")},
+		Created: time.Now(),
+	}
+
+	return handleFeed(c, instance, feed, tag.Posts)
+}
+
+func HandleTrendingRSS(c *fiber.Ctx) error {
+	utils.SetHeaders(c)
+
+	section := c.Query("section")
+	switch section {
+	case "hot", "new", "top":
+	default:
+		section = "hot"
+	}
+	sort := c.Query("sort")
+	switch sort {
+	case "newest", "best", "popular":
+	default:
+		sort = "popular"
+	}
+
+	results, err := ApiClient.FetchTrending(section, sort, "1")
+	if err != nil {
+		return err
+	}
+
+	instance := utils.GetInstanceUrl(c)
+
+	feed := &feeds.Feed{
+		Title:   "Trending on Imgur",
+		Link:    &feeds.Link{Href: instance + "/trending"},
+		Created: time.Now(),
+	}
+
+	return handleFeed(c, instance, feed, results)
+}
+
+func HandleUserRSS(c *fiber.Ctx) error {
+	utils.SetHeaders(c)
+
+	user := c.Params("userID")
+
+	submissions, err := ApiClient.FetchSubmissions(user, "newest", "1")
+	if err != nil && err.Error() == "ratelimited by imgur" {
+		c.Status(429)
+		return utils.RenderError(c, 429)
+	}
+	if err != nil {
+		return err
+	}
+
+	instance := utils.GetInstanceUrl(c)
+
+	feed := &feeds.Feed{
+		Title:   user + " on Imgur",
+		Link:    &feeds.Link{Href: instance + "/user/" + user},
+		Created: time.Now(),
+	}
+
+	return handleFeed(c, instance, feed, submissions)
+}
+
+func handleFeed(c *fiber.Ctx, instance string, feed *feeds.Feed, posts []api.Submission) error {
+	feed.Items = []*feeds.Item{}
+
+	for _, post := range posts {
+		link := instance + post.Link
+
+		item := &feeds.Item{
+			Title:       post.Title,
+			Link:        &feeds.Link{Href: link},
+			Description: "<a href=\"" + link + "\"><img width=\"480\" src=\"" + instance + "/" + post.Cover.Id + ".jpeg" + "\"></a>",
+		}
+
+		if post.Cover.Type == "video" {
+			item.Description = "🎞️ Video<br><br>" + item.Description
+		}
+
+		feed.Items = append(feed.Items, item)
+	}
+
+	c.Type(c.Params("type"))
+	switch c.Params("type") {
+	case "atom":
+		body, err := feed.ToAtom()
+		if err != nil {
+			return err
+		}
+		return c.SendString(body)
+	case "json":
+		body, err := feed.ToJSON()
+		if err != nil {
+			return err
+		}
+		return c.JSON(body)
+	case "rss":
+		body, err := feed.ToRss()
+		if err != nil {
+			return err
+		}
+		return c.SendString(body)
+	default:
+		return c.Status(400).SendString("invalid type")
+	}
+}

pages/search.go

@@ -0,0 +1,44 @@
+package pages
+
+import (
+	"strconv"
+
+	"codeberg.org/rimgo/rimgo/utils"
+	"github.com/gofiber/fiber/v2"
+)
+
+func HandleSearch(c *fiber.Ctx) error {
+	utils.SetHeaders(c)
+	c.Set("X-Frame-Options", "DENY")
+	c.Set("Cache-Control", "public,max-age=604800")
+	c.Set("Content-Security-Policy", "default-src 'none'; frame-ancestors 'none'; base-uri 'none'; form-action 'self'; style-src 'unsafe-inline' 'self'; media-src 'self'; img-src 'self'; manifest-src 'self'; block-all-mixed-content")
+
+	query := c.Query("q")
+
+	if utils.ImgurRe.MatchString(query) {
+		return c.Redirect(utils.ImgurRe.ReplaceAllString(query, ""))
+	}
+
+	page := "0"
+	if c.Query("page") != "" {
+		page = c.Query("page")
+	}
+
+	pageNumber, err := strconv.Atoi(c.Query("page"))
+	if err != nil {
+		pageNumber = 0
+	}
+
+	results, err := ApiClient.Search(query, page)
+	if err != nil {
+		return err
+	}
+
+	return c.Render("search", fiber.Map{
+		"query":			 query,
+		"results":     results,
+		"page":        pageNumber,
+		"nextPage":    pageNumber + 1,
+		"prevPage":    pageNumber - 1,
+	})
+}

pages/tag.go

@@ -3,15 +3,15 @@ package pages
 import (
 	"strconv"
 
-	"codeberg.org/video-prize-ranch/rimgo/api"
-	"codeberg.org/video-prize-ranch/rimgo/utils"
+	"codeberg.org/rimgo/rimgo/utils"
 	"github.com/gofiber/fiber/v2"
 )
 
 func HandleTag(c *fiber.Ctx) error {
 	utils.SetHeaders(c)
+	c.Set("X-Frame-Options", "DENY")
 	c.Set("Cache-Control", "public,max-age=604800")
-	c.Set("Content-Security-Policy", "default-src 'none'; style-src 'unsafe-inline' 'self'; img-src 'self'; font-src 'self'; manifest-src 'self'; block-all-mixed-content")
+	c.Set("Content-Security-Policy", "default-src 'none'; frame-ancestors 'none'; base-uri 'none'; form-action 'self'; style-src 'unsafe-inline' 'self'; media-src 'self'; img-src 'self'; manifest-src 'self'; block-all-mixed-content")
 
 	page := "1"
 	if c.Query("page") != "" {
@@ -23,21 +23,21 @@ func HandleTag(c *fiber.Ctx) error {
 		pageNumber = 0
 	}
 
-	displayPrevPage := true
-	if page == "1" {
-		displayPrevPage = false
+	tag, err := ApiClient.FetchTag(c.Params("tag"), c.Query("sort"), page)
+	if err != nil && err.Error() == "ratelimited by imgur" {
+		return utils.RenderError(c, 429)
 	}
-
-	tag, err := api.FetchTag(c.Params("tag"), c.Query("sort"), page)
 	if err != nil {
 		return err
 	}
+	if tag.Display == "" {
+		return utils.RenderError(c, 404)
+	}
 
 	return c.Render("tag", fiber.Map{
-		"tag":         tag,
-		"page":        page,
-		"displayPrev": displayPrevPage,
-		"nextPage":    pageNumber + 1,
-		"prevPage":    pageNumber - 1,
+		"tag":      tag,
+		"page":     page,
+		"nextPage": pageNumber + 1,
+		"prevPage": pageNumber - 1,
 	})
 }

pages/trending.go

@@ -0,0 +1,52 @@
+package pages
+
+import (
+	"strconv"
+
+	"codeberg.org/rimgo/rimgo/utils"
+	"github.com/gofiber/fiber/v2"
+)
+
+func HandleTrending(c *fiber.Ctx) error {
+	utils.SetHeaders(c)
+	c.Set("X-Frame-Options", "DENY")
+	c.Set("Cache-Control", "public,max-age=604800")
+	c.Set("Content-Security-Policy", "default-src 'none'; frame-ancestors 'none'; base-uri 'none'; form-action 'self'; style-src 'unsafe-inline' 'self'; media-src 'self'; img-src 'self'; manifest-src 'self'; block-all-mixed-content")
+
+	page := "1"
+	if c.Query("page") != "" {
+		page = c.Query("page")
+	}
+
+	pageNumber, err := strconv.Atoi(c.Query("page"))
+	if err != nil {
+		pageNumber = 1
+	}
+
+	section := c.Query("section")
+	switch section {
+	case "hot", "new", "top":
+	default:
+		section = "hot"
+	}
+	sort := c.Query("sort")
+	switch sort {
+	case "newest", "best", "popular":
+	default:
+		sort = "popular"
+	}
+
+	results, err := ApiClient.FetchTrending(section, sort, page)
+	if err != nil {
+		return err
+	}
+
+	return c.Render("trending", fiber.Map{
+		"results":     results,
+		"section":     section,
+		"sort":        sort,
+		"page":        pageNumber,
+		"nextPage":    pageNumber + 1,
+		"prevPage":    pageNumber - 1,
+	})
+}

pages/user.go

@@ -2,18 +2,16 @@ package pages
 
 import (
 	"strconv"
-	"sync"
 
-	"codeberg.org/video-prize-ranch/rimgo/api"
-	"codeberg.org/video-prize-ranch/rimgo/types"
-	"codeberg.org/video-prize-ranch/rimgo/utils"
+	"codeberg.org/rimgo/rimgo/utils"
 	"github.com/gofiber/fiber/v2"
 )
 
 func HandleUser(c *fiber.Ctx) error {
 	utils.SetHeaders(c)
+	c.Set("X-Frame-Options", "DENY")
 	c.Set("Cache-Control", "public,max-age=604800")
-	c.Set("Content-Security-Policy", "default-src 'none'; media-src 'self'; style-src 'unsafe-inline' 'self'; img-src 'self'; font-src 'self'; manifest-src 'self'; block-all-mixed-content")
+	c.Set("Content-Security-Policy", "default-src 'none'; frame-ancestors 'none'; base-uri 'none'; form-action 'self'; media-src 'self'; style-src 'unsafe-inline' 'self'; img-src 'self'; manifest-src 'self'; block-all-mixed-content")
 
 	page := "0"
 	if c.Query("page") != "" {
@@ -25,32 +23,107 @@ func HandleUser(c *fiber.Ctx) error {
 		pageNumber = 0
 	}
 
-	wg := sync.WaitGroup{}
-	wg.Add(2)
-	user, err := types.User{}, error(nil)
-	go func() {
-		defer wg.Done()
-		user, err = api.FetchUser(c.Params("userID"))
-	}()
+	user, err := ApiClient.FetchUser(c.Params("userID"))
+	if err != nil && err.Error() == "ratelimited by imgur" {
+		return utils.RenderError(c, 429)
+	}
+	if err != nil {
+		return err
+	}
+	if user.Username == "" {
+		return utils.RenderError(c, 404)
+	}
+
+	submissions, err := ApiClient.FetchSubmissions(c.Params("userID"), "newest", page)
+	if err != nil && err.Error() == "ratelimited by imgur" {
+		c.Status(429)
+		return utils.RenderError(c, 429)
+	}
 	if err != nil {
 		return err
 	}
 
-	submissions, err := []types.Submission{}, error(nil)
-	go func() {
-		defer wg.Done()
-		submissions, err = api.FetchSubmissions(c.Params("userID"), "newest", page)
-	}()
-	if err != nil {
-		return err
-	}
-
-	wg.Wait()
 	return c.Render("user", fiber.Map{
 		"user":        user,
 		"submissions": submissions,
 		"page":        page,
-		"nextPage": 	 pageNumber + 1,
-		"prevPage": 	 pageNumber - 1,
+		"nextPage":    pageNumber + 1,
+		"prevPage":    pageNumber - 1,
+	})
+}
+
+func HandleUserComments(c *fiber.Ctx) error {
+	utils.SetHeaders(c)
+	c.Set("X-Frame-Options", "DENY")
+	c.Set("Cache-Control", "public,max-age=604800")
+	c.Set("Content-Security-Policy", "default-src 'none'; frame-ancestors 'none'; base-uri 'none'; form-action 'self'; media-src 'self'; style-src 'unsafe-inline' 'self'; img-src 'self'; manifest-src 'self'; block-all-mixed-content")
+
+	user, err := ApiClient.FetchUser(c.Params("userID"))
+	if err != nil && err.Error() == "ratelimited by imgur" {
+		return utils.RenderError(c, 429)
+	}
+	if err != nil {
+		return err
+	}
+	if user.Username == "" {
+		return utils.RenderError(c, 404)
+	}
+
+	comments, err := ApiClient.FetchUserComments(c.Params("userID"))
+	if err != nil && err.Error() == "ratelimited by imgur" {
+		c.Status(429)
+		return utils.RenderError(c, 429)
+	}
+	if err != nil {
+		return err
+	}
+
+	return c.Render("userComments", fiber.Map{
+		"user":     user,
+		"comments": comments,
+	})
+}
+
+func HandleUserFavorites(c *fiber.Ctx) error {
+	utils.SetHeaders(c)
+	c.Set("X-Frame-Options", "DENY")
+	c.Set("Cache-Control", "public,max-age=604800")
+	c.Set("Content-Security-Policy", "default-src 'none'; frame-ancestors 'none'; base-uri 'none'; form-action 'self'; media-src 'self'; style-src 'unsafe-inline' 'self'; img-src 'self'; manifest-src 'self'; block-all-mixed-content")
+
+	page := "0"
+	if c.Query("page") != "" {
+		page = c.Query("page")
+	}
+
+	pageNumber, err := strconv.Atoi(c.Query("page"))
+	if err != nil {
+		pageNumber = 0
+	}
+
+	user, err := ApiClient.FetchUser(c.Params("userID"))
+	if err != nil && err.Error() == "ratelimited by imgur" {
+		return utils.RenderError(c, 429)
+	}
+	if err != nil {
+		return err
+	}
+	if user.Username == "" {
+		return utils.RenderError(c, 404)
+	}
+
+	favorites, err := ApiClient.FetchUserFavorites(c.Params("userID"), "newest", page)
+	if err != nil && err.Error() == "ratelimited by imgur" {
+		return utils.RenderError(c, 429)
+	}
+	if err != nil {
+		return err
+	}
+
+	return c.Render("userFavorites", fiber.Map{
+		"user":      user,
+		"favorites": favorites,
+		"page":      page,
+		"nextPage":  pageNumber + 1,
+		"prevPage":  pageNumber - 1,
 	})
 }

pnpm-lock.yaml

@@ -0,0 +1,547 @@
+lockfileVersion: '9.0'
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
+
+importers:
+
+  .:
+    devDependencies:
+      '@tailwindcss/cli':
+        specifier: ^4.1.5
+        version: 4.1.5
+      tailwindcss:
+        specifier: ^4.1.5
+        version: 4.1.5
+
+packages:
+
+  '@parcel/watcher-android-arm64@2.5.1':
+    resolution: {integrity: sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm64]
+    os: [android]
+
+  '@parcel/watcher-darwin-arm64@2.5.1':
+    resolution: {integrity: sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@parcel/watcher-darwin-x64@2.5.1':
+    resolution: {integrity: sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@parcel/watcher-freebsd-x64@2.5.1':
+    resolution: {integrity: sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@parcel/watcher-linux-arm-glibc@2.5.1':
+    resolution: {integrity: sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm]
+    os: [linux]
+
+  '@parcel/watcher-linux-arm-musl@2.5.1':
+    resolution: {integrity: sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm]
+    os: [linux]
+
+  '@parcel/watcher-linux-arm64-glibc@2.5.1':
+    resolution: {integrity: sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@parcel/watcher-linux-arm64-musl@2.5.1':
+    resolution: {integrity: sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@parcel/watcher-linux-x64-glibc@2.5.1':
+    resolution: {integrity: sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [x64]
+    os: [linux]
+
+  '@parcel/watcher-linux-x64-musl@2.5.1':
+    resolution: {integrity: sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [x64]
+    os: [linux]
+
+  '@parcel/watcher-win32-arm64@2.5.1':
+    resolution: {integrity: sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@parcel/watcher-win32-ia32@2.5.1':
+    resolution: {integrity: sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [ia32]
+    os: [win32]
+
+  '@parcel/watcher-win32-x64@2.5.1':
+    resolution: {integrity: sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [x64]
+    os: [win32]
+
+  '@parcel/watcher@2.5.1':
+    resolution: {integrity: sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==}
+    engines: {node: '>= 10.0.0'}
+
+  '@tailwindcss/cli@4.1.5':
+    resolution: {integrity: sha512-Kr567rDwDjY1VUnfqh5/+DCpRf4B8lPs5O9flP4kri7n4AM2aubrIxGSh5GN8s+awUKw/U4+6kNlEnZbBNfUeg==}
+    hasBin: true
+
+  '@tailwindcss/node@4.1.5':
+    resolution: {integrity: sha512-CBhSWo0vLnWhXIvpD0qsPephiaUYfHUX3U9anwDaHZAeuGpTiB3XmsxPAN6qX7bFhipyGBqOa1QYQVVhkOUGxg==}
+
+  '@tailwindcss/oxide-android-arm64@4.1.5':
+    resolution: {integrity: sha512-LVvM0GirXHED02j7hSECm8l9GGJ1RfgpWCW+DRn5TvSaxVsv28gRtoL4aWKGnXqwvI3zu1GABeDNDVZeDPOQrw==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [android]
+
+  '@tailwindcss/oxide-darwin-arm64@4.1.5':
+    resolution: {integrity: sha512-//TfCA3pNrgnw4rRJOqavW7XUk8gsg9ddi8cwcsWXp99tzdBAZW0WXrD8wDyNbqjW316Pk2hiN/NJx/KWHl8oA==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@tailwindcss/oxide-darwin-x64@4.1.5':
+    resolution: {integrity: sha512-XQorp3Q6/WzRd9OalgHgaqgEbjP3qjHrlSUb5k1EuS1Z9NE9+BbzSORraO+ecW432cbCN7RVGGL/lSnHxcd+7Q==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@tailwindcss/oxide-freebsd-x64@4.1.5':
+    resolution: {integrity: sha512-bPrLWbxo8gAo97ZmrCbOdtlz/Dkuy8NK97aFbVpkJ2nJ2Jo/rsCbu0TlGx8joCuA3q6vMWTSn01JY46iwG+clg==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@tailwindcss/oxide-linux-arm-gnueabihf@4.1.5':
+    resolution: {integrity: sha512-1gtQJY9JzMAhgAfvd/ZaVOjh/Ju/nCoAsvOVJenWZfs05wb8zq+GOTnZALWGqKIYEtyNpCzvMk+ocGpxwdvaVg==}
+    engines: {node: '>= 10'}
+    cpu: [arm]
+    os: [linux]
+
+  '@tailwindcss/oxide-linux-arm64-gnu@4.1.5':
+    resolution: {integrity: sha512-dtlaHU2v7MtdxBXoqhxwsWjav7oim7Whc6S9wq/i/uUMTWAzq/gijq1InSgn2yTnh43kR+SFvcSyEF0GCNu1PQ==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@tailwindcss/oxide-linux-arm64-musl@4.1.5':
+    resolution: {integrity: sha512-fg0F6nAeYcJ3CriqDT1iVrqALMwD37+sLzXs8Rjy8Z1ZHshJoYceodfyUwGJEsQoTyWbliFNRs2wMQNXtT7MVA==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@tailwindcss/oxide-linux-x64-gnu@4.1.5':
+    resolution: {integrity: sha512-SO+F2YEIAHa1AITwc8oPwMOWhgorPzzcbhWEb+4oLi953h45FklDmM8dPSZ7hNHpIk9p/SCZKUYn35t5fjGtHA==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [linux]
+
+  '@tailwindcss/oxide-linux-x64-musl@4.1.5':
+    resolution: {integrity: sha512-6UbBBplywkk/R+PqqioskUeXfKcBht3KU7juTi1UszJLx0KPXUo10v2Ok04iBJIaDPkIFkUOVboXms5Yxvaz+g==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [linux]
+
+  '@tailwindcss/oxide-wasm32-wasi@4.1.5':
+    resolution: {integrity: sha512-hwALf2K9FHuiXTPqmo1KeOb83fTRNbe9r/Ixv9ZNQ/R24yw8Ge1HOWDDgTdtzntIaIUJG5dfXCf4g9AD4RiyhQ==}
+    engines: {node: '>=14.0.0'}
+    cpu: [wasm32]
+    bundledDependencies:
+      - '@napi-rs/wasm-runtime'
+      - '@emnapi/core'
+      - '@emnapi/runtime'
+      - '@tybys/wasm-util'
+      - '@emnapi/wasi-threads'
+      - tslib
+
+  '@tailwindcss/oxide-win32-arm64-msvc@4.1.5':
+    resolution: {integrity: sha512-oDKncffWzaovJbkuR7/OTNFRJQVdiw/n8HnzaCItrNQUeQgjy7oUiYpsm9HUBgpmvmDpSSbGaCa2Evzvk3eFmA==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@tailwindcss/oxide-win32-x64-msvc@4.1.5':
+    resolution: {integrity: sha512-WiR4dtyrFdbb+ov0LK+7XsFOsG+0xs0PKZKkt41KDn9jYpO7baE3bXiudPVkTqUEwNfiglCygQHl2jklvSBi7Q==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [win32]
+
+  '@tailwindcss/oxide@4.1.5':
+    resolution: {integrity: sha512-1n4br1znquEvyW/QuqMKQZlBen+jxAbvyduU87RS8R3tUSvByAkcaMTkJepNIrTlYhD+U25K4iiCIxE6BGdRYA==}
+    engines: {node: '>= 10'}
+
+  braces@3.0.3:
+    resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
+    engines: {node: '>=8'}
+
+  detect-libc@1.0.3:
+    resolution: {integrity: sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==}
+    engines: {node: '>=0.10'}
+    hasBin: true
+
+  detect-libc@2.0.4:
+    resolution: {integrity: sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==}
+    engines: {node: '>=8'}
+
+  enhanced-resolve@5.18.1:
+    resolution: {integrity: sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==}
+    engines: {node: '>=10.13.0'}
+
+  fill-range@7.1.1:
+    resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==}
+    engines: {node: '>=8'}
+
+  graceful-fs@4.2.11:
+    resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
+
+  is-extglob@2.1.1:
+    resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
+    engines: {node: '>=0.10.0'}
+
+  is-glob@4.0.3:
+    resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
+    engines: {node: '>=0.10.0'}
+
+  is-number@7.0.0:
+    resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
+    engines: {node: '>=0.12.0'}
+
+  jiti@2.4.2:
+    resolution: {integrity: sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==}
+    hasBin: true
+
+  lightningcss-darwin-arm64@1.29.2:
+    resolution: {integrity: sha512-cK/eMabSViKn/PG8U/a7aCorpeKLMlK0bQeNHmdb7qUnBkNPnL+oV5DjJUo0kqWsJUapZsM4jCfYItbqBDvlcA==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [arm64]
+    os: [darwin]
+
+  lightningcss-darwin-x64@1.29.2:
+    resolution: {integrity: sha512-j5qYxamyQw4kDXX5hnnCKMf3mLlHvG44f24Qyi2965/Ycz829MYqjrVg2H8BidybHBp9kom4D7DR5VqCKDXS0w==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [x64]
+    os: [darwin]
+
+  lightningcss-freebsd-x64@1.29.2:
+    resolution: {integrity: sha512-wDk7M2tM78Ii8ek9YjnY8MjV5f5JN2qNVO+/0BAGZRvXKtQrBC4/cn4ssQIpKIPP44YXw6gFdpUF+Ps+RGsCwg==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [x64]
+    os: [freebsd]
+
+  lightningcss-linux-arm-gnueabihf@1.29.2:
+    resolution: {integrity: sha512-IRUrOrAF2Z+KExdExe3Rz7NSTuuJ2HvCGlMKoquK5pjvo2JY4Rybr+NrKnq0U0hZnx5AnGsuFHjGnNT14w26sg==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [arm]
+    os: [linux]
+
+  lightningcss-linux-arm64-gnu@1.29.2:
+    resolution: {integrity: sha512-KKCpOlmhdjvUTX/mBuaKemp0oeDIBBLFiU5Fnqxh1/DZ4JPZi4evEH7TKoSBFOSOV3J7iEmmBaw/8dpiUvRKlQ==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [arm64]
+    os: [linux]
+
+  lightningcss-linux-arm64-musl@1.29.2:
+    resolution: {integrity: sha512-Q64eM1bPlOOUgxFmoPUefqzY1yV3ctFPE6d/Vt7WzLW4rKTv7MyYNky+FWxRpLkNASTnKQUaiMJ87zNODIrrKQ==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [arm64]
+    os: [linux]
+
+  lightningcss-linux-x64-gnu@1.29.2:
+    resolution: {integrity: sha512-0v6idDCPG6epLXtBH/RPkHvYx74CVziHo6TMYga8O2EiQApnUPZsbR9nFNrg2cgBzk1AYqEd95TlrsL7nYABQg==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [x64]
+    os: [linux]
+
+  lightningcss-linux-x64-musl@1.29.2:
+    resolution: {integrity: sha512-rMpz2yawkgGT8RULc5S4WiZopVMOFWjiItBT7aSfDX4NQav6M44rhn5hjtkKzB+wMTRlLLqxkeYEtQ3dd9696w==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [x64]
+    os: [linux]
+
+  lightningcss-win32-arm64-msvc@1.29.2:
+    resolution: {integrity: sha512-nL7zRW6evGQqYVu/bKGK+zShyz8OVzsCotFgc7judbt6wnB2KbiKKJwBE4SGoDBQ1O94RjW4asrCjQL4i8Fhbw==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [arm64]
+    os: [win32]
+
+  lightningcss-win32-x64-msvc@1.29.2:
+    resolution: {integrity: sha512-EdIUW3B2vLuHmv7urfzMI/h2fmlnOQBk1xlsDxkN1tCWKjNFjfLhGxYk8C8mzpSfr+A6jFFIi8fU6LbQGsRWjA==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [x64]
+    os: [win32]
+
+  lightningcss@1.29.2:
+    resolution: {integrity: sha512-6b6gd/RUXKaw5keVdSEtqFVdzWnU5jMxTUjA2bVcMNPLwSQ08Sv/UodBVtETLCn7k4S1Ibxwh7k68IwLZPgKaA==}
+    engines: {node: '>= 12.0.0'}
+
+  micromatch@4.0.8:
+    resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==}
+    engines: {node: '>=8.6'}
+
+  mri@1.2.0:
+    resolution: {integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==}
+    engines: {node: '>=4'}
+
+  node-addon-api@7.1.1:
+    resolution: {integrity: sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==}
+
+  picocolors@1.1.1:
+    resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
+
+  picomatch@2.3.1:
+    resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
+    engines: {node: '>=8.6'}
+
+  tailwindcss@4.1.5:
+    resolution: {integrity: sha512-nYtSPfWGDiWgCkwQG/m+aX83XCwf62sBgg3bIlNiiOcggnS1x3uVRDAuyelBFL+vJdOPPCGElxv9DjHJjRHiVA==}
+
+  tapable@2.2.1:
+    resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==}
+    engines: {node: '>=6'}
+
+  to-regex-range@5.0.1:
+    resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
+    engines: {node: '>=8.0'}
+
+snapshots:
+
+  '@parcel/watcher-android-arm64@2.5.1':
+    optional: true
+
+  '@parcel/watcher-darwin-arm64@2.5.1':
+    optional: true
+
+  '@parcel/watcher-darwin-x64@2.5.1':
+    optional: true
+
+  '@parcel/watcher-freebsd-x64@2.5.1':
+    optional: true
+
+  '@parcel/watcher-linux-arm-glibc@2.5.1':
+    optional: true
+
+  '@parcel/watcher-linux-arm-musl@2.5.1':
+    optional: true
+
+  '@parcel/watcher-linux-arm64-glibc@2.5.1':
+    optional: true
+
+  '@parcel/watcher-linux-arm64-musl@2.5.1':
+    optional: true
+
+  '@parcel/watcher-linux-x64-glibc@2.5.1':
+    optional: true
+
+  '@parcel/watcher-linux-x64-musl@2.5.1':
+    optional: true
+
+  '@parcel/watcher-win32-arm64@2.5.1':
+    optional: true
+
+  '@parcel/watcher-win32-ia32@2.5.1':
+    optional: true
+
+  '@parcel/watcher-win32-x64@2.5.1':
+    optional: true
+
+  '@parcel/watcher@2.5.1':
+    dependencies:
+      detect-libc: 1.0.3
+      is-glob: 4.0.3
+      micromatch: 4.0.8
+      node-addon-api: 7.1.1
+    optionalDependencies:
+      '@parcel/watcher-android-arm64': 2.5.1
+      '@parcel/watcher-darwin-arm64': 2.5.1
+      '@parcel/watcher-darwin-x64': 2.5.1
+      '@parcel/watcher-freebsd-x64': 2.5.1
+      '@parcel/watcher-linux-arm-glibc': 2.5.1
+      '@parcel/watcher-linux-arm-musl': 2.5.1
+      '@parcel/watcher-linux-arm64-glibc': 2.5.1
+      '@parcel/watcher-linux-arm64-musl': 2.5.1
+      '@parcel/watcher-linux-x64-glibc': 2.5.1
+      '@parcel/watcher-linux-x64-musl': 2.5.1
+      '@parcel/watcher-win32-arm64': 2.5.1
+      '@parcel/watcher-win32-ia32': 2.5.1
+      '@parcel/watcher-win32-x64': 2.5.1
+
+  '@tailwindcss/cli@4.1.5':
+    dependencies:
+      '@parcel/watcher': 2.5.1
+      '@tailwindcss/node': 4.1.5
+      '@tailwindcss/oxide': 4.1.5
+      enhanced-resolve: 5.18.1
+      mri: 1.2.0
+      picocolors: 1.1.1
+      tailwindcss: 4.1.5
+
+  '@tailwindcss/node@4.1.5':
+    dependencies:
+      enhanced-resolve: 5.18.1
+      jiti: 2.4.2
+      lightningcss: 1.29.2
+      tailwindcss: 4.1.5
+
+  '@tailwindcss/oxide-android-arm64@4.1.5':
+    optional: true
+
+  '@tailwindcss/oxide-darwin-arm64@4.1.5':
+    optional: true
+
+  '@tailwindcss/oxide-darwin-x64@4.1.5':
+    optional: true
+
+  '@tailwindcss/oxide-freebsd-x64@4.1.5':
+    optional: true
+
+  '@tailwindcss/oxide-linux-arm-gnueabihf@4.1.5':
+    optional: true
+
+  '@tailwindcss/oxide-linux-arm64-gnu@4.1.5':
+    optional: true
+
+  '@tailwindcss/oxide-linux-arm64-musl@4.1.5':
+    optional: true
+
+  '@tailwindcss/oxide-linux-x64-gnu@4.1.5':
+    optional: true
+
+  '@tailwindcss/oxide-linux-x64-musl@4.1.5':
+    optional: true
+
+  '@tailwindcss/oxide-wasm32-wasi@4.1.5':
+    optional: true
+
+  '@tailwindcss/oxide-win32-arm64-msvc@4.1.5':
+    optional: true
+
+  '@tailwindcss/oxide-win32-x64-msvc@4.1.5':
+    optional: true
+
+  '@tailwindcss/oxide@4.1.5':
+    optionalDependencies:
+      '@tailwindcss/oxide-android-arm64': 4.1.5
+      '@tailwindcss/oxide-darwin-arm64': 4.1.5
+      '@tailwindcss/oxide-darwin-x64': 4.1.5
+      '@tailwindcss/oxide-freebsd-x64': 4.1.5
+      '@tailwindcss/oxide-linux-arm-gnueabihf': 4.1.5
+      '@tailwindcss/oxide-linux-arm64-gnu': 4.1.5
+      '@tailwindcss/oxide-linux-arm64-musl': 4.1.5
+      '@tailwindcss/oxide-linux-x64-gnu': 4.1.5
+      '@tailwindcss/oxide-linux-x64-musl': 4.1.5
+      '@tailwindcss/oxide-wasm32-wasi': 4.1.5
+      '@tailwindcss/oxide-win32-arm64-msvc': 4.1.5
+      '@tailwindcss/oxide-win32-x64-msvc': 4.1.5
+
+  braces@3.0.3:
+    dependencies:
+      fill-range: 7.1.1
+
+  detect-libc@1.0.3: {}
+
+  detect-libc@2.0.4: {}
+
+  enhanced-resolve@5.18.1:
+    dependencies:
+      graceful-fs: 4.2.11
+      tapable: 2.2.1
+
+  fill-range@7.1.1:
+    dependencies:
+      to-regex-range: 5.0.1
+
+  graceful-fs@4.2.11: {}
+
+  is-extglob@2.1.1: {}
+
+  is-glob@4.0.3:
+    dependencies:
+      is-extglob: 2.1.1
+
+  is-number@7.0.0: {}
+
+  jiti@2.4.2: {}
+
+  lightningcss-darwin-arm64@1.29.2:
+    optional: true
+
+  lightningcss-darwin-x64@1.29.2:
+    optional: true
+
+  lightningcss-freebsd-x64@1.29.2:
+    optional: true
+
+  lightningcss-linux-arm-gnueabihf@1.29.2:
+    optional: true
+
+  lightningcss-linux-arm64-gnu@1.29.2:
+    optional: true
+
+  lightningcss-linux-arm64-musl@1.29.2:
+    optional: true
+
+  lightningcss-linux-x64-gnu@1.29.2:
+    optional: true
+
+  lightningcss-linux-x64-musl@1.29.2:
+    optional: true
+
+  lightningcss-win32-arm64-msvc@1.29.2:
+    optional: true
+
+  lightningcss-win32-x64-msvc@1.29.2:
+    optional: true
+
+  lightningcss@1.29.2:
+    dependencies:
+      detect-libc: 2.0.4
+    optionalDependencies:
+      lightningcss-darwin-arm64: 1.29.2
+      lightningcss-darwin-x64: 1.29.2
+      lightningcss-freebsd-x64: 1.29.2
+      lightningcss-linux-arm-gnueabihf: 1.29.2
+      lightningcss-linux-arm64-gnu: 1.29.2
+      lightningcss-linux-arm64-musl: 1.29.2
+      lightningcss-linux-x64-gnu: 1.29.2
+      lightningcss-linux-x64-musl: 1.29.2
+      lightningcss-win32-arm64-msvc: 1.29.2
+      lightningcss-win32-x64-msvc: 1.29.2
+
+  micromatch@4.0.8:
+    dependencies:
+      braces: 3.0.3
+      picomatch: 2.3.1
+
+  mri@1.2.0: {}
+
+  node-addon-api@7.1.1: {}
+
+  picocolors@1.1.1: {}
+
+  picomatch@2.3.1: {}
+
+  tailwindcss@4.1.5: {}
+
+  tapable@2.2.1: {}
+
+  to-regex-range@5.0.1:
+    dependencies:
+      is-number: 7.0.0

static/css/album.css

@@ -1,59 +0,0 @@
-h1 {
-  margin: 0;
-}
-
-p {
-  margin: 0.5em 0;
-}
-
-video,
-img {
-  max-width: 100%;
-}
-
-.pfp {
-  border-radius: 100%;
-}
-
-.imageMeta__wrapper,
-.imageMeta__item,
-.imageMeta {
-  display: flex;
-  gap: 12px;
-  align-items: center;
-}
-
-.imageMeta__item {
-  gap: 4px;
-}
-
-.imageMeta__wrapper {
-  gap: 1rem;
-}
-
-.user {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  gap: 5px;
-}
-
-.tags {
-  display: flex;
-  gap: 10px;
-  flex-flow: wrap;
-}
-
-.tag {
-  border-radius: 10px;
-  padding: 7px;
-  background-color: rgba(0, 0, 0, 0.15);
-  background-blend-mode: multiply;
-  min-width: 110px;
-}
-
-.tag__display {
-  font-weight: 700;
-  color: #fff;
-  text-align: center;
-}

static/css/base.css

@@ -1,98 +0,0 @@
-a {
-  color: #E0E0E0;
-  font-weight: 600;
-  text-decoration: none;
-}
-
-a > h2 {
-  color: white;
-}
-
-h2, p {
-  margin: 0;
-}
-
-body {
-  background-color: #212121;
-  color: white;
-  font-size: 18px;
-  font-family: -apple-system, BlinkMacSystemFont, avenir next, avenir, segoe ui, helvetica neue, helvetica, Ubuntu, roboto, noto, arial, sans-serif; 
-}
-
-nav {
-  display: flex;
-  align-items: center;
-}
-
-.center {
-  display: flex;
-  justify-content: center;
-}
-
-.logo {
-  filter: invert(1) hue-rotate(180deg);
-}
-
-main {
-  margin: 0 24vw;
-}
-
-.posts {
-  margin-top: 1em;
-  display: grid;
-  grid-template-columns: repeat(auto-fill, minmax(280px, 1fr));
-  grid-auto-rows: 1fr;
-  gap: 1rem;
-}
-
-.post {
-  border-radius: 12px;
-  background-color: #3b3b3b;
-  font-weight: 400;
-}
-
-.posts img,
-.posts video:not(:fullscreen) {
-  object-fit: cover;
-  aspect-ratio: 1;
-}
-
-.post__title {
-  margin: 0 6px;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  overflow: hidden;
-}
-
-.post__meta {
-  padding: 6px;
-  display: flex;
-  gap: 10px;
-}
-
-.post__meta .material-icons-outlined {
-  font-size: 1rem;
-}
-
-.pageSelector {
-  display: flex;
-  justify-content: space-between;
-  margin-top: 1em;
-}
-
-footer {
-  display: flex;
-  justify-content: center;
-  flex-direction: row;
-  gap: 10px;
-}
-
-@media only screen and (max-width: 812px) {
-  main {
-    margin: 0 !important;
-  }
-  footer {
-    flex-direction: column;
-    text-align: center;
-  }
-}

static/css/comments.css

@@ -1,68 +0,0 @@
-.comment {
-  display: flex;
-  flex-direction: column;
-  gap: 0.5em;
-}
-
-.comments {
-  gap: 0.25em;
-  display: flex;
-  flex-direction: column;
-}
-
-.replies {
-  margin-left: 20px;
-  border-left: 2px #424242 solid;
-  padding-left: 8px;
-}
-
-#comments__expandBtn {
-  display: none;
-}
-
-.comments__expandBtn__label {
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  align-items: center;
-  cursor: pointer;
-  user-select: none;
-  text-decoration: none;
-  color: #fff
-}
-
-.comments__expandBtn__icon {
-  font-size: 24px;
-}
-
-#comments__expandBtn ~ .comments__expandBtn__label > span::after {
-  content: "expand_more";
-}
-
-#comments__expandBtn:checked ~ .comments__expandBtn__label > span::after {
-  content: "expand_less";
-}
-
-#comments__expandBtn:checked ~ .comments {
-  display: none;
-}
-
-.comment__media {
-  display: inline;
-}
-
-.comment__updatedDate {
-  font-size: 0.8em;
-}
-
-.comment__user {
-  display: flex;
-  gap: 6px;
-  align-items: center;
-}
-
-.comment__user__username {
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  overflow: hidden;
-}

static/css/embed.css

@@ -2,12 +2,53 @@
   filter: invert(180deg), hue-rotate(180deg);
 }
 
-.postLink {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
+body {
+  overflow: hidden;
 }
 
-.rimgoLink {
+.mediaWrapper {
+  display: flex;
+  justify-content: center;
+}
+
+.media {
+  display: flex;
+  overflow: auto;
+  gap: 1rem;
+  align-items: center;
+  height: 90vh;
+}
+
+.media img, .media video {
+  height: 100%;
+}
+
+.media--gifv {
+  width: 100vw;
+  overflow: unset;
+  justify-content: center;
+}
+
+.media--gifv video {
   width: 100%;
+}
+
+.views {
+  gap: 4px;
+}
+
+.postDetails {
+  display: flex;
+  gap: 1rem;
+}
+
+h3 {
+  font-size: 1em;
+}
+
+.postMeta {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: 9vh;
 }

static/css/frontpage.css

@@ -1,11 +0,0 @@
-code {
-  background-color: #424242;
-  padding: 2px;
-  border-radius: 4px;
-  font-size: 0.9em;
-}
-
-summary {
-  cursor: pointer;
-  user-select: none;
-}

static/css/tag.css

@@ -1,28 +0,0 @@
-main {
-  margin: 0 12vw;
-}
-
-.tagMeta {
-  padding: 2em;
-  border-radius: 12px;
-}
-
-.tagMeta__info {
-  display: flex;
-  flex-direction: column;
-  gap: 10px;
-  text-align: center;
-  justify-content: center;
-  align-items: center;
-}
-
-.tagMeta__sort {
-  display: flex;
-  flex-direction: column;
-  gap: 4px;
-}
-
-.tagMeta__sort a {
-  font-weight: 400;
-  color: #fff;
-}

static/css/user.css

@@ -1,22 +0,0 @@
-main {
-  margin: 0 12vw;
-}
-
-.userMeta {
-  padding: 2em;
-  border-radius: 12px;
-}
-
-.userMeta__upper {
-  display: flex;
-  gap: 10px;
-  align-items: center;
-}
-
-.userMeta__upper__bio {
-  margin-top: 1em;
-}
-
-.pfp {
-  border-radius: 100%;
-}

static/favicon/site.webmanifest

@@ -1,6 +1,7 @@
 {
     "name": "rimgo",
     "short_name": "rimgo",
+    "start_url": "/",
     "icons": [
         {
             "src": "/static/favicon/android-chrome-192x192.png",

static/fonts/Material-Icons-Outlined.css

@@ -1,22 +0,0 @@
-/* fallback */
-@font-face {
-  font-family: 'Material Icons Outlined';
-  font-style: normal;
-  font-weight: 400;
-  src: url(Material-Icons-Outlined.woff2) format('woff2');
-}
-
-.material-icons-outlined {
-  font-family: 'Material Icons Outlined';
-  font-weight: normal;
-  font-style: normal;
-  line-height: 1;
-  letter-spacing: normal;
-  text-transform: none;
-  display: inline-block;
-  white-space: nowrap;
-  word-wrap: normal;
-  direction: ltr;
-  -moz-font-feature-settings: 'liga';
-  -moz-osx-font-smoothing: grayscale;
-}

static/icons/PhArrowFatDown.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 256 256"><path fill="currentColor" d="M231.39 132.94A8 8 0 0 0 224 128h-40V48a16 16 0 0 0-16-16H88a16 16 0 0 0-16 16v80H32a8 8 0 0 0-5.66 13.66l96 96a8 8 0 0 0 11.32 0l96-96a8 8 0 0 0 1.73-8.72ZM128 220.69L51.31 144H80a8 8 0 0 0 8-8V48h80v88a8 8 0 0 0 8 8h28.69Z"/></svg>

static/icons/PhArrowFatUp.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 256 256"><path fill="currentColor" d="m229.66 114.34l-96-96a8 8 0 0 0-11.32 0l-96 96A8 8 0 0 0 32 128h40v80a16 16 0 0 0 16 16h80a16 16 0 0 0 16-16v-80h40a8 8 0 0 0 5.66-13.66ZM176 112a8 8 0 0 0-8 8v88H88v-88a8 8 0 0 0-8-8H51.31L128 35.31L204.69 112Z"/></svg>

static/icons/PhArrowUpRight.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 256 256"><path fill="currentColor" d="M200 64v104a8 8 0 0 1-16 0V83.31L69.66 197.66a8 8 0 0 1-11.32-11.32L172.69 72H88a8 8 0 0 1 0-16h104a8 8 0 0 1 8 8Z"/></svg>

static/icons/PhChat.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 256 256"><path fill="currentColor" d="M216 48H40a16 16 0 0 0-16 16v160a15.84 15.84 0 0 0 9.25 14.5A16.05 16.05 0 0 0 40 240a15.89 15.89 0 0 0 10.25-3.78a.69.69 0 0 0 .13-.11L82.5 208H216a16 16 0 0 0 16-16V64a16 16 0 0 0-16-16ZM40 224Zm176-32H82.5a16 16 0 0 0-10.3 3.75l-.12.11L40 224V64h176Z"/></svg>

static/icons/PhCheckCircle.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 256 256"><path fill="currentColor" d="M173.66 98.34a8 8 0 0 1 0 11.32l-56 56a8 8 0 0 1-11.32 0l-24-24a8 8 0 0 1 11.32-11.32L112 148.69l50.34-50.35a8 8 0 0 1 11.32 0ZM232 128A104 104 0 1 1 128 24a104.11 104.11 0 0 1 104 104Zm-16 0a88 88 0 1 0-88 88a88.1 88.1 0 0 0 88-88Z"/></svg>

static/icons/PhDevices.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 256 256"><path fill="currentColor" d="M224 72h-16v-8a24 24 0 0 0-24-24H40a24 24 0 0 0-24 24v96a24 24 0 0 0 24 24h112v8a24 24 0 0 0 24 24h48a24 24 0 0 0 24-24V96a24 24 0 0 0-24-24ZM40 168a8 8 0 0 1-8-8V64a8 8 0 0 1 8-8h144a8 8 0 0 1 8 8v8h-16a24 24 0 0 0-24 24v72Zm192 24a8 8 0 0 1-8 8h-48a8 8 0 0 1-8-8V96a8 8 0 0 1 8-8h48a8 8 0 0 1 8 8Zm-96 16a8 8 0 0 1-8 8H88a8 8 0 0 1 0-16h40a8 8 0 0 1 8 8Zm80-96a8 8 0 0 1-8 8h-16a8 8 0 0 1 0-16h16a8 8 0 0 1 8 8Z"/></svg>

static/icons/PhEye.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 256 256"><path fill="currentColor" d="M247.31 124.76c-.35-.79-8.82-19.58-27.65-38.41C194.57 61.26 162.88 48 128 48S61.43 61.26 36.34 86.35C17.51 105.18 9 124 8.69 124.76a8 8 0 0 0 0 6.5c.35.79 8.82 19.57 27.65 38.4C61.43 194.74 93.12 208 128 208s66.57-13.26 91.66-38.34c18.83-18.83 27.3-37.61 27.65-38.4a8 8 0 0 0 0-6.5ZM128 192c-30.78 0-57.67-11.19-79.93-33.25A133.47 133.47 0 0 1 25 128a133.33 133.33 0 0 1 23.07-30.75C70.33 75.19 97.22 64 128 64s57.67 11.19 79.93 33.25A133.46 133.46 0 0 1 231.05 128c-7.21 13.46-38.62 64-103.05 64Zm0-112a48 48 0 1 0 48 48a48.05 48.05 0 0 0-48-48Zm0 80a32 32 0 1 1 32-32a32 32 0 0 1-32 32Z"/></svg>

static/icons/PhGlobe.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 256 256"><path fill="currentColor" d="M128 24a104 104 0 1 0 104 104A104.11 104.11 0 0 0 128 24Zm-26.37 144h52.74C149 186.34 140 202.87 128 215.89c-12-13.02-21-29.55-26.37-47.89ZM98 152a145.72 145.72 0 0 1 0-48h60a145.72 145.72 0 0 1 0 48Zm-58-24a87.61 87.61 0 0 1 3.33-24h38.46a161.79 161.79 0 0 0 0 48H43.33A87.61 87.61 0 0 1 40 128Zm114.37-40h-52.74C107 69.66 116 53.13 128 40.11c12 13.02 21 29.55 26.37 47.89Zm19.84 16h38.46a88.15 88.15 0 0 1 0 48h-38.46a161.79 161.79 0 0 0 0-48Zm32.16-16h-35.43a142.39 142.39 0 0 0-20.26-45a88.37 88.37 0 0 1 55.69 45ZM105.32 43a142.39 142.39 0 0 0-20.26 45H49.63a88.37 88.37 0 0 1 55.69-45ZM49.63 168h35.43a142.39 142.39 0 0 0 20.26 45a88.37 88.37 0 0 1-55.69-45Zm101.05 45a142.39 142.39 0 0 0 20.26-45h35.43a88.37 88.37 0 0 1-55.69 45Z"/></svg>

static/icons/PhLink.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 256 256"><path fill="currentColor" d="M137.54 186.36a8 8 0 0 1 0 11.31l-9.94 10a56 56 0 0 1-79.22-79.27l24.12-24.12a56 56 0 0 1 76.81-2.28a8 8 0 1 1-10.64 12a40 40 0 0 0-54.85 1.63L59.7 139.72a40 40 0 0 0 56.58 56.58l9.94-9.94a8 8 0 0 1 11.32 0Zm70.08-138a56.08 56.08 0 0 0-79.22 0l-9.94 9.95a8 8 0 0 0 11.32 11.31l9.94-9.94a40 40 0 0 1 56.58 56.58l-24.12 24.14a40 40 0 0 1-54.85 1.6a8 8 0 1 0-10.64 12a56 56 0 0 0 76.81-2.26l24.12-24.12a56.08 56.08 0 0 0 0-79.24Z"/></svg>

static/icons/PhMagnifyingGlass.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 256 256"><path fill="currentColor" d="m229.66 218.34l-50.07-50.06a88.11 88.11 0 1 0-11.31 11.31l50.06 50.07a8 8 0 0 0 11.32-11.32ZM40 112a72 72 0 1 1 72 72a72.08 72.08 0 0 1-72-72Z"/></svg>

static/icons/PhRss.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 256 256"><path fill="currentColor" d="M106.91 149.09A71.53 71.53 0 0 1 128 200a8 8 0 0 1-16 0a56 56 0 0 0-56-56a8 8 0 0 1 0-16a71.53 71.53 0 0 1 50.91 21.09M56 80a8 8 0 0 0 0 16a104 104 0 0 1 104 104a8 8 0 0 0 16 0A120 120 0 0 0 56 80m118.79 1.21A166.9 166.9 0 0 0 56 32a8 8 0 0 0 0 16a151 151 0 0 1 107.48 44.52A151 151 0 0 1 208 200a8 8 0 0 0 16 0a166.9 166.9 0 0 0-49.21-118.79M60 184a12 12 0 1 0 12 12a12 12 0 0 0-12-12"/></svg>

static/icons/PhWarning.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 256 256"><path fill="currentColor" d="M236.8 188.09L149.35 36.22a24.76 24.76 0 0 0-42.7 0L19.2 188.09a23.51 23.51 0 0 0 0 23.72A24.35 24.35 0 0 0 40.55 224h174.9a24.35 24.35 0 0 0 21.33-12.19a23.51 23.51 0 0 0 .02-23.72Zm-13.87 15.71a8.5 8.5 0 0 1-7.48 4.2H40.55a8.5 8.5 0 0 1-7.48-4.2a7.59 7.59 0 0 1 0-7.72l87.45-151.87a8.75 8.75 0 0 1 15 0l87.45 151.87a7.59 7.59 0 0 1-.04 7.72ZM120 144v-40a8 8 0 0 1 16 0v40a8 8 0 0 1-16 0Zm20 36a12 12 0 1 1-12-12a12 12 0 0 1 12 12Z"/></svg>

static/icons/PhWarningCircle.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 256 256"><path fill="currentColor" d="M128 24a104 104 0 1 0 104 104A104.11 104.11 0 0 0 128 24Zm0 192a88 88 0 1 1 88-88a88.1 88.1 0 0 1-88 88Zm-8-80V80a8 8 0 0 1 16 0v56a8 8 0 0 1-16 0Zm20 36a12 12 0 1 1-12-12a12 12 0 0 1 12 12Z"/></svg>

static/icons/PhWrench.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 256 256"><path fill="currentColor" d="M226.76 69a8 8 0 0 0-12.84-2.88l-40.3 37.19l-17.23-3.7l-3.7-17.23l37.19-40.3A8 8 0 0 0 187 29.24A72 72 0 0 0 88 96a72.34 72.34 0 0 0 6 28.94L33.79 177c-.15.12-.29.26-.43.39a32 32 0 0 0 45.26 45.26c.13-.13.27-.28.39-.42L131.06 162A72 72 0 0 0 232 96a71.56 71.56 0 0 0-5.24-27ZM160 152a56.14 56.14 0 0 1-27.07-7a8 8 0 0 0-9.92 1.77l-55.9 64.74a16 16 0 0 1-22.62-22.62L109.18 133a8 8 0 0 0 1.77-9.93a56 56 0 0 1 58.36-82.31l-31.2 33.81a8 8 0 0 0-1.94 7.1l5.66 26.33a8 8 0 0 0 6.14 6.14l26.35 5.66a8 8 0 0 0 7.1-1.94l33.81-31.2A56.06 56.06 0 0 1 160 152Z"/></svg>

static/tailwind.css

@@ -0,0 +1,72 @@
+@import "tailwindcss" source("../views");
+
+body {
+  margin: 0 24vw;
+}
+
+p a {
+  @apply break-words underline
+}
+
+.posts {
+  margin-top: 1em;
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(280px, 1fr));
+  grid-auto-rows: 1fr;
+  gap: 1rem;
+}
+
+.posts img:not(.icon),
+.posts video:not(:fullscreen) {
+  object-fit: cover;
+  aspect-ratio: 1;
+}
+
+#comments__expandBtn {
+  display: none;
+}
+
+.comments__expandBtn__label {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  cursor: pointer;
+  user-select: none;
+  text-decoration: none;
+  color: #fff
+}
+
+.comments__expandBtn__icon {
+  font-size: 24px;
+}
+
+#comments__expandBtn ~ .comments__expandBtn__label > span::after {
+  content: "⌄";
+}
+
+#comments__expandBtn:checked ~ .comments__expandBtn__label > span::after {
+  content: "⌃";
+}
+
+#comments__expandBtn:checked ~ .comments {
+  display: none;
+}
+
+.comment__media {
+  height: 12em;
+  display: block;
+  margin: 0.5em 0;
+}
+
+@media only screen and (max-width: 1280px) {
+  body {
+    margin: 0 8vw;
+  }
+}
+
+@media only screen and (max-width: 812px) {
+  body {
+    margin: 0 4vw;
+  }
+}

types/Album.go

@@ -1,16 +0,0 @@
-package types
-
-type Album struct {
-	Id                  string
-	Title               string
-	Views               int64
-	Upvotes             int64
-	Downvotes           int64
-	SharedWithCommunity bool
-	CreatedAt           string
-	UpdatedAt           string
-	Comments            int64
-	User								User
-	Media               []Media
-	Tags								[]Tag
-}

types/Comment.go

@@ -1,15 +0,0 @@
-package types
-
-type Comment struct {
-	Comments  []Comment
-	User			User
-	Id        string
-	Comment   string
-	Upvotes   int64
-	Downvotes int64
-	Platform  string
-	CreatedAt string
-	RelTime		string
-	UpdatedAt string
-	DeletedAt string
-}

types/Media.go

@@ -1,11 +0,0 @@
-package types
-
-type Media struct {
-	Id          string
-	Name        string
-	Title       string
-	Description string
-	Url         string
-	Type				string
-	MimeType		string
-}

types/Submission.go

@@ -1,14 +0,0 @@
-package types
-
-type Submission struct {
-	Id        string
-	Title     string
-	Link      string
-	Cover     Media
-	Points    int64
-	Upvotes   int64
-	Downvotes int64
-	Comments  int64
-	Views     int64
-	IsAlbum   bool
-}

types/Tag.go

@@ -1,10 +0,0 @@
-package types
-
-type Tag struct {
-	Tag	        string
-	Display			string
-	Sort				string
-	PostCount	  int64
-	Posts				[]Submission
-	Background  string
-}

types/User.go

@@ -1,11 +0,0 @@
-package types
-
-type User struct {
-	Id        int64
-	Bio       string
-	Username  string
-	Points    int64
-	Cover     string
-	Avatar    string
-	CreatedAt string
-}

utils/config.go

@@ -1,8 +1,23 @@
 package utils
 
-import "os"
+import (
+	"os"
+	"time"
+)
 
-var Config map[string]interface{}
+type config struct {
+	Port            string
+	Addr            string
+	ImgurId         string
+	Secure          bool
+	FiberPrefork    bool
+	ImageCache      bool
+	CleanupInterval time.Duration
+	CacheDir        string
+	Privacy         map[string]interface{}
+}
+
+var Config config
 
 func LoadConfig() {
 	port := "3000"
@@ -13,11 +28,6 @@ func LoadConfig() {
 		port = os.Getenv("RIMGU_PORT")
 	}
 
-	fiberPrefork := false
-	if os.Getenv("FIBER_PREFORK") == "true" {
-		fiberPrefork = true
-	}
-
 	addr := "0.0.0.0"
 	if os.Getenv("ADDRESS") != "" {
 		addr = os.Getenv("ADDRESS")
@@ -34,10 +44,24 @@ func LoadConfig() {
 		imgurId = os.Getenv("RIMGU_IMGUR_CLIENT_ID")
 	}
 
-	Config = map[string]interface{}{
-		"port": port,
-		"addr": addr,
-		"imgurId": imgurId,
-		"fiberPrefork": fiberPrefork,
+	Config = config{
+		Port:         port,
+		Addr:         addr,
+		ImgurId:      imgurId,
+		Secure:       os.Getenv("SECURE") == "true",
+		FiberPrefork: os.Getenv("FIBER_PREFORK") == "true",
+		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",
+			"not_collected": os.Getenv("PRIVACY_NOT_COLLECTED") == "true",
+			"ip":            os.Getenv("PRIVACY_IP") == "true",
+			"url":           os.Getenv("PRIVACY_URL") == "true",
+			"device":        os.Getenv("PRIVACY_DEVICE") == "true",
+			"diagnostics":   os.Getenv("PRIVACY_DIAGNOSTICS") == "true",
+		},
 	}
-}
+}

utils/error.go

@@ -0,0 +1,25 @@
+package utils
+
+import (
+	"strconv"
+	"strings"
+
+	"codeberg.org/rimgo/rimgo/static"
+	"github.com/gofiber/fiber/v2"
+)
+
+func RenderError(c *fiber.Ctx, code int) error {
+	if !strings.Contains(c.Get("Accept"), "html") && c.Params("extension") != "" {
+		codeStr := "generic"
+		if code != 0 {
+			codeStr = strconv.Itoa(code)
+		}
+		img, _ := static.GetFiles().ReadFile("img/error-" + codeStr + ".png")
+		c.Set("Content-Type", "image/png")
+		return c.Status(code).Send(img)
+	} else {
+		return c.Status(code).Render("errors/" + strconv.Itoa(code), fiber.Map{
+			"path": c.Path(),
+		})
+	}
+}

utils/getUrl.go

@@ -0,0 +1,11 @@
+package utils
+
+import "github.com/gofiber/fiber/v2"
+
+func GetInstanceUrl(c *fiber.Ctx) string {
+	proto := "https://"
+	if !Config.Secure {
+		proto = "http://"
+	}
+	return proto + c.Hostname()
+}

utils/regex.go

@@ -0,0 +1,5 @@
+package utils
+
+import "regexp"
+
+var ImgurRe = regexp.MustCompile(`https?://(i\.)?imgur\.com`)

utils/request.go

@@ -0,0 +1,46 @@
+package utils
+
+import (
+	"fmt"
+	"io"
+	"net/http"
+	"strconv"
+
+	"github.com/tidwall/gjson"
+)
+
+func GetJSON(url string) (gjson.Result, error) {
+	req, err := http.NewRequest("GET", url, nil)
+	if err != nil {
+		return gjson.Result{}, err
+	}
+
+	SetReqHeaders(req)
+
+	client := http.Client{}
+	res, err := client.Do(req)
+	if err != nil {
+		return gjson.Result{}, err
+	}
+	rateLimitRemaining := res.Header.Get("X-RateLimit-UserRemaining")
+	if rateLimitRemaining != "" {
+		ratelimit, _ := strconv.Atoi(rateLimitRemaining)
+		if ratelimit <= 0 {
+			return gjson.Result{}, fmt.Errorf("ratelimited by imgur")
+		}
+	}
+
+	body, err := io.ReadAll(res.Body)
+	if err != nil {
+		return gjson.Result{}, err
+	}
+
+	switch (res.StatusCode) {
+	case 200:
+		return gjson.Parse(string(body)), nil
+	case 429:
+		return gjson.Result{}, fmt.Errorf("ratelimited by imgur")
+	default:
+		return gjson.Result{}, fmt.Errorf("received status %s, expected 200 OK.\n%s", res.Status, string(body))
+	}
+}

utils/setHeaders.go

@@ -1,12 +1,28 @@
 package utils
 
-import "github.com/gofiber/fiber/v2"
+import (
+	"net/http"
+
+	"github.com/gofiber/fiber/v2"
+)
 
 func SetHeaders(c *fiber.Ctx) {
-	c.Set("X-Frame-Options", "DENY")
 	c.Set("Referrer-Policy", "no-referrer")
 	c.Set("X-Content-Type-Options", "nosniff")
 	c.Set("X-Robots-Tag", "noindex, noimageindex, nofollow")
 	c.Set("Strict-Transport-Security", "max-age=31557600")
 	c.Set("Permissions-Policy", "accelerometer=(), ambient-light-sensor=(), autoplay=(), battery=(), camera=(), cross-origin-isolated=(), display-capture=(), document-domain=(), encrypted-media=(), execution-while-not-rendered=(), execution-while-out-of-viewport=(), fullscreen=(self), geolocation=(), gyroscope=(), interest-cohort=(), magnetometer=(), microphone=(), midi=(), navigation-override=(), payment=(), picture-in-picture=(), publickey-credentials-get=(), screen-wake-lock=(), sync-xhr=(), usb=(), web-share=(), xr-spatial-tracking=()")
+}
+
+func SetReqHeaders(req *http.Request) {
+	req.Header.Set("Accept", "*/*")
+	req.Header.Set("Accept-Language", "en-US,en;q=0.5")
+	req.Header.Set("Cache-Control", "no-cache")
+	req.Header.Set("Connection", "keep-alive")
+	req.Header.Set("Origin", "https://imgur.com")
+	req.Header.Set("Pragma", "no-cache")
+	req.Header.Set("Sec-Fetch-Dest", "empty")
+	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")
 }

views/about.hbs

@@ -0,0 +1,110 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <title>About - rimgo</title>
+
+  {{> partials/head }}
+</head>
+
+<body class="font-sans text-lg bg-slate-800 text-white">
+  {{> partials/nav }}
+
+  <section class="my-4 w-full flex flex-col items-center">
+    {{> partials/searchBar }}
+  </section>
+  
+
+  <main class="my-8">
+    <p>An alternative frontend for Imgur. Originally based on <a href="https://codeberg.org/3np/rimgu" rel="noreferrer">rimgu</a>.</p>
+
+    <h2 class="font-bold text-2xl my-2">Features</h2>
+    <ul class="list-disc ml-4">
+      <li>Lightweight</li>
+      <li>No JavaScript</li>
+      <li>No ads or tracking</li>
+      <li>No sign up or app install prompts</li>
+      <li>Bandwidth efficient - automatically uses newer image formats (if enabled)</li>
+    </ul>
+
+    <h2 class="font-bold text-2xl my-2">Comparison</h2>
+    <p>Comparing rimgo to Imgur.</p>
+
+    <h3 class="font-bold text-xl my-2">Speed</h3>
+    <p>Tested using <a href="https://pagespeed.web.dev/" rel="nofollow noreferrer">Google PageSpeed Insights</a>.</p>
+    <table>
+      <tr>
+        <td></td>
+        <td><a href="https://pagespeed.web.dev/report?url=https%3A%2F%2Fi.bcow.xyz%2Fgallery%2FgYiQLWy" rel="nofollow noreferrer">rimgo</a></td>
+        <td><a href="https://pagespeed.web.dev/report?url=https%3A%2F%2Fimgur.com%2Fgallery%2FgYiQLWy" rel="nofollow noreferrer">Imgur</a></td>
+      </tr>
+      <tr>
+        <td>Performance</td>
+        <td>91</td>
+        <td>28</td>
+      </tr>
+      <tr>
+        <td>Request count</td>
+        <td>29</td>
+        <td>340</td>
+      </tr>
+      <tr>
+        <td>Resource Size</td>
+        <td>218 KiB</td>
+        <td>2,542 KiB</td>
+      </tr>
+      <tr>
+        <td>Time to Interactive</td>
+        <td>1.6s</td>
+        <td>23.8s</td>
+      </tr>
+    </table>
+
+    <h3 class="font-bold text-xl my-2">Privacy</h3>
+    <p>Imgur collects information about your device and uses tracking cookies for advertising, this is mentioned in their <a href="https://imgur.com/privacy/" rel="nofollow noreferrer">privacy policy</a>. <a href="https://themarkup.org/blacklight" rel="nofollow noreferrer">Blacklight</a> found 31 trackers and 87 third-party cookies.</p>
+    <p>See what cookies and trackers Imgur uses and where your data gets sent: <a href="https://themarkup.org/blacklight?url=imgur.com" rel="nofollow noreferrer">https://themarkup.org/blacklight?url=imgur.com</a></p>
+
+    <h2 class="font-bold text-2xl my-2">Usage</h2>
+    <p>Just replace imgur.com or i.imgur.com with <code>{{domain}}</code> (add stack/ before the media ID for i.stack.imgur.com). You can setup automatic redirects using <a href="https://github.com/libredirect/libredirect" rel="nofollow noreferrer">LibRedirect</a> (recommended) or <a href="https://github.com/einaregilsson/Redirector" rel="nofollow noreferrer">Redirector</a>.</p>
+
+    {{#if force_webp}}
+    <p>To download images as their original filetype, add <code>?no_webp=1</code> to the end of the image URL.</p>
+    {{/if}}
+
+    <h2 class="font-bold text-2xl my-2">Automatically redirect links</h2>
+    
+    <h3 class="font-bold text-xl my-2">LibRedirect</h3>
+    <p>Use <a href="https://github.com/libredirect/libredirect" rel="nofollow noreferrer">LibRedirect</a> to automatically redirect Imgur links to rimgo!</p>
+
+    <h3 class="font-bold text-xl my-2">GreaseMonkey script</h3>
+    <p>There is a script to redirect Imgur links to rimgo. <a rel="noreferrer" href="https://codeberg.org/zortazert/GreaseMonkey-Redirect/src/branch/main/imgur-to-rimgo.user.js">https://codeberg.org/zortazert/GreaseMonkey-Redirect/src/branch/main/imgur-to-rimgo.user.js</a></p>
+
+    <h3 class="font-bold text-xl my-2">Redirector</h3>
+    <p>You can use the <a href="https://github.com/einaregilsson/Redirector" rel="nofollow noreferrer">Redirector</a> extension to redirect Imgur links to rimgo with the configuration below:</p>
+    <ul class="list-disc ml-4">
+      <li>Description: Imgur -> rimgo</li>
+      <li>Example URL: https://imgur.com/a/H8M4rcp</li>
+      <li>Include pattern: <code>^https?://i?.?imgur.com(/.*)?$</code></li>
+      <li>Redirect to: <code>{{proto}}://{{domain}}$1</code></li>
+      <li>Pattern type: Regular Expression</li>
+      <li>Advanced Options > Apply to: Check Images</li>
+    </ul>
+    <br/>
+    <p>For Stack Overflow Images:</p>
+    <ul class="list-disc ml-4">
+      <li>Description: Stack Overflow Imgur -> rimgo</li>
+      <li>Example URL: https://i.stack.imgur.com/BTKqD.png?s=128&g=1</li>
+      <li>Include pattern: <code>^https?://i\.stack\.imgur\.com(/.*)?$</code></li>
+      <li>Redirect to: <code>{{proto}}://{{domain}}/stack$1</code></li>
+      <li>Pattern type: Regular Expression</li>
+      <li>Advanced Options > Apply to: Check Images</li>
+    </ul>
+
+    <h2 class="font-bold text-2xl my-2">Notice</h2>
+    <p>All images and media are from Imgur. rimgo does not allow uploads or comments. Any issues with content should be reported to Imgur.</p>
+  </main>
+
+  {{> partials/footer }}
+</body>
+
+</html>

views/embed.hbs

@@ -8,18 +8,40 @@
 </head>
 
 <body>
-  <video loop poster="/{{id}}.webp" autoplay width="100%">
-    <source src="/{{id}}.webm" type="video/webm" />
-    <source src="/{{id}}.mp4" type="video/mp4" />
-  </video>
-  <div class="postLink">
-    <a href="/{{id}}">
-      <img src="/static/img/rimgo.svg" width="32px" height="32px" class="logo">
-    </a>
-    <a href="/{{id}}" class="rimgoLink">
-      rimgo
-    </a>
-    <a href="/{{id}}.mp4?download=1">download</a>
+  <div class="mediaWrapper">
+    <div class="media">
+    {{#each post.Media}}
+    {{#equal this.Type "image"}}
+    <img src="{{this.Url}}" loading="lazy">
+    {{/equal}}
+    {{#equal this.Type "video"}}
+    <video controls loop>
+      <source type="{{this.MimeType}}" src="{{this.Url}}" />
+    </video>
+    {{/equal}}
+    {{/each}}
+    </div>
+  </div>
+  <div class="postMeta">
+    <div class="postDetails">
+      {{#if post.TItle}}
+      <a href="/{{post.Id}}">
+        <h3>{{post.Title}}</h3>
+      </a>
+      {{/if}}
+      <div class="views flex flex-center">
+        <img class="icon" src="/static/icons/eye.svg" alt="Views">
+        <p>{{post.Views}}</p>
+      </div>
+    </div>
+    <div class="flex flex-center">
+      <a href="/{{post.Id}}">
+        <img src="/static/img/rimgo.svg" width="32px" height="32px" class="logo">
+      </a>
+      <a href="/{{post.Id}}">
+        rimgo
+      </a>
+    </div>
   </div>
 </body>
 

views/errors/404.hbs

@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <title>Not Found - rimgo</title>
+
+  {{> partials/head }}
+</head>
+
+<body class="font-sans text-lg bg-slate-800 text-white">
+  {{> partials/nav }}
+
+  <main>
+    <h2 class="text-2xl font-bold">Not Found</h2>
+    <p>Click <a href="/">here</a> to return to home.</p>
+  </main>
+
+  {{> partials/footer }}  
+</body>
+
+</html>

views/errors/429.hbs

@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <title>Rate limited by Imgur - rimgo</title>
+  
+  {{> partials/head }}
+</head>
+
+<body class="font-sans text-lg bg-slate-800 text-white">
+  {{> partials/nav }}
+
+  <main>
+    <h2 class="text-2xl font-bold">Rate limited by Imgur</h2>
+    <p>This instance has been temporarily blocked by Imgur. <a href="https://rimgo.codeberg.page/#{{ path }}">Try using another instance ></a></p>
+  </main>
+
+  {{> partials/footer }}
+</body>
+
+</html>

views/errors/error.hbs

@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <title>Error - rimgo</title>
+  
+  {{> partials/head }}
+</head>
+
+<body class="font-sans text-lg bg-slate-800 text-white">
+  {{> partials/nav }}
+
+  <main class="flex flex-col">
+    <h2 class="text-2xl font-bold">An error occurred</h2>
+    <p>You may have found a bug in rimgo. If this is a bug, open an issue on <a href="https://codeberg.org/video-prize-ranch/rimgo/issues/new">Codeberg</a>.</p>
+    <code class="mt-4 p-2 bg-slate-600 rounded-md">{{err}}</code>
+  </main>
+
+  {{> partials/footer }}
+</body>
+
+</html>

views/frontpage.hbs

@@ -5,60 +5,49 @@
   <title>rimgo</title>
 
   {{> partials/head }}
-
-  <link rel="stylesheet" href="/static/css/frontpage.css" />
-
 </head>
 
-<body>
-  {{> partials/header }}
-
-  <main>
-    <p>An alternative frontend for Imgur. Based on <a href="https://codeberg.org/3np/rimgu">rimgu</a> and rewritten in
-      Go.</p>
-
-    <p>It's read-only and works without JavaScript. Images and albums can be viewed without wasting resources from
-      downloading and running tracking scripts. No sign-up nags.</p>
-
-    <h3>Try it!</h3>
-
-    <ul>
-      <li><a href="/a/H8M4rcp">Album</a></li>
-      <li><a href="/gallery/gYiQLWy">Gallery</a></li>
-      <li><a href="/gallery/cTRwaJU">Video</a></li>
-    </ul>
-
-    <h2>Features</h2>
-
-    <ul>
-      <li>URL-compatible with i.imgur.com - just replace the domain in the URL</li>
-      <li>Images and videos (gifv, mp4)</li>
-      <li>Albums</li>
-      <li>Streaming</li>
-      <li>Pretty CSS styling (responsive!)</li>
-      <li>Logo</li>
-    </ul>
-
-    <h2>Usage</h2>
-
-    <p>Just replace imgur.com or i.imgur.com with <code>{{domain}}</code>! You can setup automatic redirects using <a
-        href="https://github.com/libredirect/libredirect">LibRedirect</a> (recommended) or <a href="https://github.com/einaregilsson/Redirector">Redirector</a>.</p>
-
-    <br>
-    <details>
-      <summary>
-        Redirector configuration
-      </summary>
-      <ul>
-          <li>Description: Imgur -> rimgo</li>
-          <li>Example URL: https://imgur.com/a/H8M4rcp</li>
-          <li>Include pattern: <code>^https?://i?.?imgur.com(/.*)?$</code></li>
-          <li>Redirect to: <code>{{proto}}://{{domain}}$2</code></li>
-          <li>Pattern type: Regular Expression</li>
-        </ul>
-    </details>
+<body class="font-sans text-lg bg-slate-800 text-white">
+  {{> partials/nav }}
+  
+  <header class="my-8 p-8 rounded-xl flex flex-col gap-4 items-center justify-center bg-gradient-to-r from-blue-400 to-emerald-400">
+    <h2 class="font-bold text-white text-2xl">The fast, private image viewer for Imgur.</h2>
+    {{> partials/searchBar }}
+    <a class="flex gap-1 items-center" href="/trending">Or see what's trending <img class="invert" src="/static/icons/PhArrowUpRight.svg" alt="" height="18" width="18" /></a>
+  </header>
+  
+  <main class="my-8">
+    <h2 class="font-bold text-2xl">What is rimgo?</h2>
+    <p>
+      rimgo is an alternative frontend for Imgur. 
+      Originally based on <a href="https://codeberg.org/3np/rimgu" rel="noreferrer">rimgu</a>.
+      It's a way to access Imgur without the ads, tracking, and other garbage.
+      rimgo is not affiliated with Imgur, all content is proxied from Imgur.
+    </p>
+    <br/>
+    <h3 class="font-bold text-xl">Legal notice</h3>
+    <p>rimgo does not allow uploads or host any content, media. All content on any rimgo instances is from Imgur™. Imgur is a trademark of Imgur, Inc. Any issues with content on rimgo should be be reported to Imgur. rimgo is not affiliated with Imgur, Inc.</p>
   </main>
-
+  
+  <h2 class="font-bold text-2xl">This instance</h2>
+  <section class="my-4 lg:m-4 flex flex-col lg:flex-row gap-4 items-center">
+    {{> partials/privacy }}
+    <div class="self-start">
+      <h2 class="text-xl my-2 font-bold">Additional information</h2>
+      <ul>
+        <li>Version: {{version}}</li>
+        <li>Country: {{config.Privacy.country}}</li>
+        <li>Provider: {{config.Privacy.provider}}</li>
+        {{#if config.Privacy.cloudflare}}
+        <li>Using Cloudflare?: Yes</li>
+        {{else}}
+        <li>Using Cloudflare?: No</li>
+        {{/if}}
+      </ul>
+    </div>
+  </section>
+  <p><a href="/privacy">Learn more about instance privacy ></a></p>
+  
   {{> partials/footer }}
 </body>
 

views/gifv.hbs

@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  {{> partials/head }}
+
+  <link rel="stylesheet" href="/static/css/embed.css" />
+</head>
+
+<body>
+  <div class="mediaWrapper">
+    <div class="media media--gifv">
+      <video loop poster="/{{id}}.webp" autoplay controls>
+        <source src="/{{id}}.webm" type="video/webm" />
+        <source src="/{{id}}.mp4" type="video/mp4" />
+      </video>
+    </div>
+  </div>
+  <div class="postMeta">
+    <a href="/{{id}}.mp4" download="{{id}}.mp4">download</a>
+    <div class="flex flex-center">
+      <a href="/{{post.Id}}">
+        <img src="/static/img/rimgo.svg" width="32px" height="32px" class="logo">
+      </a>
+      <a href="/{{post.Id}}">
+        rimgo
+      </a>
+    </div>
+  </div>
+</body>
+
+</html>

views/partials/comment.hbs

@@ -1,25 +1,32 @@
-<div class="comment">
-  <div class="comment__user">
-    <img src="{{this.User.Avatar}}" class="pfp" width="24" height="24" loading="lazy">
+<div class="flex flex-col gap-2">
+  <div class="flex gap-2 items-center">
+    {{#noteq this.User.Username "[deleted]"}}
+    <img src="{{this.User.Avatar}}" class="rounded-full" width="24" height="24" loading="lazy">
     <a href="/user/{{this.User.Username}}">
-      <p class="comment__user__username"><b>{{this.User.Username}}</b></p>
+      <p class="whitespace-nowrap text-ellipsis overflow-hidden"><b>{{this.User.Username}}</b></p>
     </a>
+    {{/noteq}}
+    {{#equal this.User.Username "[deleted]"}}
+    <p class="whitespace-nowrap text-ellipsis overflow-hidden"><b>[deleted]</b></p>
+    {{/equal}}
   </div>
   <div>
-    {{{this.Comment}}}
-    <p>
+    <p>{{{this.Comment}}}</p>
+    <div class="flex gap-2">
       <span title="{{this.CreatedAt}}">{{this.RelTime}}</span>
       {{#if this.DeletedAt}}
-      <span class="comment__updatedDate">(deleted {{this.DeletedAt}})</span>
+      <span class="text-md">(deleted {{this.DeletedAt}})</span>
       {{/if}}
-       | 
-      <span class="material-icons-outlined">thumb_up</span> {{this.Upvotes}}
-      <span class="material-icons-outlined">thumb_down</span> {{this.Downvotes}}
-    </p>
+      |
+      <img class="invert icon" src="/static/icons/PhArrowFatUp.svg" alt="Likes" width="24px" height="24px"> {{this.Upvotes}}
+      <img class="invert icon" src="/static/icons/PhArrowFatDown.svg" alt="Dislikes" width="24px" height="24px"> {{this.Downvotes}}
+    </div>
   </div>
-  <div class="replies">
+  {{#if this.Comments}}
+  <div class="ml-4 p-2 border-solid border-l-2 border-slate-400">
     {{#each this.Comments}}
     {{> partials/comment }}
     {{/each}}
   </div>
+  {{/if}}
 </div>

views/partials/contextComment.hbs

@@ -0,0 +1,22 @@
+<a href="{{Post.Link}}">
+  <div class="sm:grid gap-4 w-full" style="grid-template-columns: 120px 1fr;">
+    <img class="object-cover block w-full h-[300px] sm:w-[120px] sm:h-[140px] rounded-lg rounded-b-none sm:rounded-b-lg" src="{{this.Post.Cover.Url}}" alt="">
+    <div class="flex flex-col gap-2 bg-slate-600 p-4 rounded-lg rounded-t-none sm:rounded-t-lg w-full">
+      <div class="flex flex-col h-full">
+        <p class="md-container">{{{this.Comment}}}</p>
+        <div class="grow"></div>
+        <div class="flex gap-2">
+          <span title="{{this.CreatedAt}}">{{this.RelTime}}</span>
+          {{#if this.DeletedAt}}
+          <span class="text-md">(deleted {{this.DeletedAt}})</span>
+          {{/if}}
+          |
+          <img class="invert icon" src="/static/icons/PhArrowFatUp.svg" alt="Likes" width="24px" height="24px">
+          {{this.Upvotes}}
+          <img class="invert icon" src="/static/icons/PhArrowFatDown.svg" alt="Dislikes" width="24px" height="24px">
+          {{this.Downvotes}}
+        </div>
+      </div>
+    </div>
+  </div>
+</a>

views/partials/footer.hbs

@@ -1,10 +1,14 @@
-<br><br><br>
-
-<footer>
-  <!--<a href="/privacy">
-    <span class="material-icons-outlined">visibility</span> Privacy
-  </a>-->
-  <a href="https://codeberg.org/video-prize-ranch/rimgo" rel="noreferrer">
-    <span class="material-icons-outlined">code</span> Source Code
-  </a>
+<footer class="mt-24 mb-12">
+  <div class="mb-1 flex gap-4 font-bold">
+    <a href="/">
+      <div class="flex">
+        <img src="/static/img/rimgo.svg" class="invert hue-rotate-180" width="32" height="32" />
+        <h1 class="text-md font-extrabold">rimgo</h1>
+      </div>
+    </a>
+    <a href="https://codeberg.org/rimgo/rimgo">Source Code</a>
+    <a href="/about">About</a>
+    <a href="/privacy">Privacy</a>
+  </div>
+  <p class="text-md text-slate-200">rimgo does not allow uploads or host any content. Issues with content should be reported to Imgur.</p>
 </footer>

views/partials/head.hbs

@@ -12,5 +12,4 @@
 <meta name="msapplication-config" content="/static/favicon/browserconfig.xml">
 <meta name="theme-color" content="#ffffff">
 
-<link rel="stylesheet" href="/static/fonts/Material-Icons-Outlined.css" />
-<link rel="stylesheet" href="/static/css/base.css"/>
+<link rel="stylesheet" href="/static/app.css" />

views/partials/header.hbs

@@ -1,8 +0,0 @@
-<nav>
-  <a href="/">
-    <img src="/static/img/rimgo.svg" width="64" height="64" class="logo">
-  </a>
-  <a href="/">
-    <h2>rimgo</h2>
-  </a>
-</nav>

views/partials/nav.hbs

@@ -0,0 +1,6 @@
+<a href="/">
+  <nav class="m-4 flex items-center justify-center">
+    <img src="/static/img/rimgo.svg" class="invert hue-rotate-180" width="72" height="72" />
+    <h1 class="font-extrabold text-3xl">rimgo</h1>
+  </nav>
+</a>

views/partials/post.hbs

@@ -1,5 +1,5 @@
 <a href="{{Link}}">
-  <div class="post">
+  <div class="bg-slate-600 rounded-lg">
     {{#equal Cover.Type "video"}}
     <video controls loop poster="/{{Cover.Id}}.webp" preload="none" width="100%" height="100%">
       <source src="{{Cover.Url}}" type="video/mp4" />
@@ -8,25 +8,20 @@
     {{#equal Cover.Type "image"}}
     <img src="{{Cover.Url}}" loading="lazy" width="100%" height="100%">
     {{/equal}}
-    <p class="post__title">{{Title}}</p>
-    <div class="post__meta">
-      <p>
-        <span class="material-icons-outlined">
-          arrow_upward
-        </span>
+    <p class="m-2 text-ellipsis whitespace-nowrap overflow-hidden">{{Title}}</p>
+    <div class="flex gap-2 p-2">
+      <div class="flex gap-1">
+        <img class="invert icon" src="/static/icons/PhArrowFatUp.svg" alt="Points" width="18px" height="18px">
         {{Points}}
-      </p>
-      <p>
-        <span class="material-icons-outlined">
-          comment
-        </span>
+      </div>
+      <div class="flex gap-1">
+        <img class="invert icon" src="/static/icons/PhChat.svg" alt="Comments" width="18px" height="18px">
         {{Comments}}
-      <p>
-        <span class="material-icons-outlined">
-          visibility
-        </span>
+      </div>
+      <div class="flex gap-1">
+        <img class="invert icon" src="/static/icons/PhEye.svg" alt="Views" width="18px" height="18px">
         {{Views}}
-      </p>
+      </div>
     </div>
   </div>
 </a>

views/partials/privacy.hbs

@@ -0,0 +1,48 @@
+{{#if config.Privacy.not_collected}}
+    <div class="flex flex-col items-center w-full lg:w-1/2 p-4 bg-slate-600 rounded-lg">
+      <img class="invert" src="/static/icons/PhCheckCircle.svg" alt="" height="36" width="36" />
+      <h2 class="font-bold text-xl">Data not collected</h2>
+      <p class="text-lg">This instance does not collect any data.</p>
+    </div>
+    {{/if}}
+    {{#unless config.Privacy.set}}
+    <div class="flex flex-col items-center w-full lg:w-1/2 p-4 bg-slate-600 rounded-lg">
+      <img class="invert" src="/static/icons/PhWarning.svg" alt="" height="36" width="36" />
+      <h2 class="font-bold text-xl">No details provided</h2>
+      <p class="text-lg">The operator of this instance will be required to provide privacy details to be added to the instance list.</p>
+    </div>
+    {{else}}
+    {{#unless config.Privacy.not_collected}}
+    <div class="flex flex-col items-center w-full lg:w-1/2 p-4 bg-slate-600 rounded-lg">
+      <img class="invert" src="/static/icons/PhWarningCircle.svg" alt="" height="36" width="36" />
+      <h2 class="font-bold text-xl">Data collected</h2>
+      <p class="text-lg">The following data may be collected:</p>
+      <ul class="flex flex-col">
+        {{#if config.Privacy.ip}}
+        <li class="flex gap-1">
+          <img class="invert" src="/static/icons/PhGlobe.svg" alt="" width="24px" height="24px" />
+          Internet address (IP Address)
+        </li>
+        {{/if}}
+        {{#if config.Privacy.url}}
+        <li class="flex gap-1">
+          <img class="invert" src="/static/icons/PhLink.svg" alt="" width="24px" height="24px" />
+          Page viewed (Request URL)
+        </li>
+        {{/if}}
+        {{#if config.Privacy.device}}
+        <li class="flex gap-1">
+          <img class="invert" src="/static/icons/PhDevices.svg" alt="" width="24px" height="24px" />
+          Device Type (User agent)
+        </li>
+        {{/if}}
+        {{#if config.Privacy.diagnostics}}
+        <li class="flex gap-1">
+          <img class="invert" src="/static/icons/PhWrench.svg" alt="" width="24px" height="24px" />
+          Diagnostics
+        </li>
+        {{/if}}
+      </ul>
+    </div>
+    {{/unless}}
+    {{/unless}}

views/partials/result.hbs

@@ -0,0 +1,26 @@
+<div class="bg-slate-600 rounded-lg">
+  <a href="{{Url}}">
+    <img src="{{ImageUrl}}?no_webp=1" loading="lazy" width="100%" height="100%">
+  </a>
+  <p class="m-2 text-ellipsis whitespace-nowrap overflow-hidden">
+    <a href="{{Url}}" title="{{Title}}">{{Title}}</a><br />
+    {{#if User}}
+    by <a href="/user/{{User}}" title="{{User}}">{{User}}</a>
+    {{else}}
+    <br />
+    {{/if}}
+  </p>
+  <div class="flex gap-2 p-2">
+    <p title="{{RelTime}}" class="text-ellipsis whitespace-nowrap overflow-hidden">
+      {{RelTime}}
+    </p>
+    <div class="flex gap-1">
+      <img class="invert icon" src="/static/icons/PhArrowFatUp.svg" alt="Points" width="18px" height="18px">
+      {{Points}}
+    </div>
+    <div class="flex gap-1">
+      <img class="invert icon" src="/static/icons/PhEye.svg" alt="Views" width="18px" height="18px">
+      {{Views}}
+    </div>
+  </div>
+</div>

views/partials/searchBar.hbs

@@ -0,0 +1,6 @@
+<form method="GET" action="/search" class="flex gap-2 w-full lg:w-1/2">
+  <input class="p-2 rounded-lg bg-slate-600 w-full" name="q" type="text" placeholder="Search or paste a link" {{#if query}}value="{{query}}"{{/if}}/>
+  <button type="submit" class="p-2 rounded-lg bg-slate-600">
+    <img class="invert icon" src="/static/icons/PhMagnifyingGlass.svg" alt="Search" width="24px" height="24px">
+  </button>
+</form>

views/post.hbs

@@ -4,103 +4,123 @@
 <head>
   <title>
     {{#if post.Title}}
-    {{post.Title}} - 
+    {{post.Title}} -
     {{/if}}
     rimgo
-    </title>
+  </title>
 
   {{> partials/head }}
-
-  <link rel="stylesheet" href="/static/fonts/Material-Icons-Outlined.css" />
-  <link rel="stylesheet" href="/static/css/album.css" />
-  <link rel="stylesheet" href="/static/css/comments.css" />
-
 </head>
 
-<body>
-  {{> partials/header }}
+<body class="font-sans text-lg bg-slate-800 text-white">
+  {{> partials/nav }}
+
+  <section class="my-4 w-full flex flex-col items-center">
+    {{> partials/searchBar }}
+  </section>
+
+  <header>
+    <h1 class="text-3xl font-bold">{{post.Title}}</h1>
+    <p>{{post.CreatedAt}}</p>
+  </header>
 
   <main>
-    <h1>{{post.Title}}</h1>
-
-    <p>{{post.CreatedAt}}</p>
-
-    <div class="imageMeta__wrapper">
-      {{#if post.User.Username}}
-      <div class="user">
-        <a href="/user/{{post.User.Username}}">
-          <img src="{{post.User.Avatar}}" class="pfp" width="36" height="36" loading="lazy" />
-        </a>
-        <a href="/user/{{post.User.Username}}">
+    <div class="flex flex-col sm:flex-row my-4 w-full justify-between">
+      <div class="flex flex-col gap-2 md:flex-row md:gap-4 md:items-center">
+        {{#if post.User.Username}}
+        <a href="/user/{{post.User.Username}}" class="flex gap-2 items-center">
+          <img src="{{post.User.Avatar}}" class="rounded-full" width="36" height="36" />
           <p>
             <b>{{post.User.Username}}</b>
           </p>
         </a>
-      </div>
-      {{/if}}
-      <div class="imageMeta">
-        <div class="imageMeta__item">
-          <span class="material-icons-outlined" title="Views">visibility</span>
-          <p>{{post.Views}}</p>
-        </div>
-        {{#if post.SharedWithCommunity}}
-        <p><span class="material-icons-outlined" title="Likes">thumb_up</span> {{post.Upvotes}}</p>
-        <p><span class="material-icons-outlined" title="Dislilkes">thumb_down</span> {{post.Downvotes}}</p>
         {{/if}}
+        <div class="flex gap-2 items-center">
+          <div class="flex flex-center gap-2">
+            <img class="icon invert" src="/static/icons/PhEye.svg" alt="Views" width="24px" height="24px">
+            <p>{{post.Views}}</p>
+          </div>
+          {{#if post.SharedWithCommunity}}
+          <div class="flex flex-center gap-2">
+            <img class="icon invert" src="/static/icons/PhArrowFatUp.svg" alt="Likes" width="24px" height="24px">
+            <p>{{post.Upvotes}}</p>
+          </div>
+          <div class="flex flex-center gap-2">
+            <img class="icon invert" src="/static/icons/PhArrowFatDown.svg" alt="Dislikes" width="24px" height="24px">
+            <p>{{post.Downvotes}}</p>
+          </div>
+          {{/if}}
+        </div>
       </div>
+      {{#noteq next ""}}
+      <a href="{{next}}" class="self-end">
+        <button class="p-2 rounded-lg bg-slate-600">Next &gt;</button>
+      </a>
+      {{/noteq}}
     </div>
 
-    {{#each post.Media}}
-    {{#if this.Title}}
-    <h4>{{this.Title}}</h4>
-    {{/if}}
-    {{#if this.Description}}
-    <p>{{this.Description}}</p>
-    {{/if}}
+    <div class="flex flex-center flex-col break-words">
+      {{#each post.Media}}
+      {{#if this.Title}}
+      <h4 class="font-bold">{{this.Title}}</h4>
+      {{/if}}
 
-    <div class="center">
       {{#equal this.Type "image"}}
-      <img src="{{this.Url}}" loading="lazy">
+      <img class="my-2 max-h-96 object-contain" src="{{this.Url}}" loading="lazy">
       {{/equal}}
       {{#equal this.Type "video"}}
-      <video controls loop>
+      <video class="my-2 max-h-96 object-contain" controls loop>
         <source type="{{this.MimeType}}" src="{{this.Url}}" />
       </video>
       {{/equal}}
+
+      {{#if this.Description}}
+      <p>{{{this.Description}}}</p>
+      {{/if}}
+      {{/each}}
     </div>
 
-    <br>
-    {{/each}}
-
     {{#if post.tags}}
-    <div class="tags">
+    <div class="flex gap-2 my-2 flex-wrap">
+      <style nonce="{{nonce}}">
+        {{#each post.tags}}
+          .{{this.BackgroundId}} { background-image: url('{{this.Background}}') }
+        {{/each}}
+      </style>
       {{#each post.tags}}
       <a href="/t/{{this.Tag}}">
-        <div class="tag" style="background-image: url('{{this.Background}}');">
-          <p class="tag__display">{{this.Display}}</p>
+        <div class="rounded-md p-4 min-w-[110px] bg-slate-500 {{this.BackgroundId}}">
+          <p class="font-bold text-white text-center">
+            {{#if tag.Display}}
+            {{this.Display}}
+            {{else}}
+            {{this.Tag}}
+            {{/if}}
+          </p>
         </div>
       </a>
       {{/each}}
     </div>
     {{/if}}
+  </main>
 
+  <section>
     {{#if comments}}
     <div>
-      <hr>
-      <input id="comments__expandBtn" type="checkbox">
-      <label class="comments__expandBtn__label" for="comments__expandBtn">
-        <h3>Comments ({{post.Comments}})</h3>
-        <span class="comments__expandBtn__icon material-icons-outlined"></span>
+      <input id="comments__expandBtn" type="checkbox" checked>
+      <label class="comments__expandBtn__label my-2 py-4 border-solid border-t-2 border-slate-400"
+        for="comments__expandBtn">
+        <h3 class="text-xl font-bold">Comments ({{post.Comments}})</h3>
+        <span class="text-xl font-bold"></span>
       </label>
-      <div class="comments">
+      <div class="comments flex flex-col gap-2">
         {{#each comments}}
         {{> partials/comment }}
         {{/each}}
       </div>
     </div>
-    <hr>
     {{/if}}
-  </main>
+  </section>
 
   {{> partials/footer }}
 </body>

views/privacy.hbs

@@ -0,0 +1,78 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <title>Privacy - rimgo</title>
+
+  {{> partials/head }}
+</head>
+
+<body class="font-sans text-lg bg-slate-800 text-white">
+  {{> partials/nav }}
+
+  <section class="my-4 w-full flex flex-col items-center">
+    {{> partials/searchBar }}
+  </section>
+  
+  <header>
+    <h1 class="text-3xl font-bold">Instance Privacy</h1>
+    {{#if config.Privacy.policy}}
+    <p>The instance operator has indicated their instance's privacy practices below. For more information, see the
+      instance operator's <a href="{{config.Privacy.policy}}">privacy policy</a>.</p>
+    {{else}}
+    <p>The instance operator has indicated their instance's privacy practices below.</p>
+    {{/if}}
+
+    {{#if config.Privacy.message}}
+    <p class="my-4">{{{config.Privacy.message}}}</p>
+    {{/if}}
+  </header>
+  
+  <main class="flex justify-center w-full">
+    {{> partials/privacy }}
+  </main>
+  
+  <section>
+    <h2 class="text-2xl my-4 font-bold">What is instance privacy?</h2>
+    <p>Instance privacy aims to bring transparency to the data collected by frontends and encourage privacy friendly practices. There is often no privacy policy and users are forced to trust that the instance operator is not collecting data. However, there is a possibility that the instance operator can put false information so we encourage looking at other factors when selecting an instance.</p>
+    <ul class="flex flex-col list-outside list-disc mt-2 ml-4">
+      <li>
+        <img class="inline invert" src="/static/icons/PhGlobe.svg" alt="" width="24px" height="24px" />
+        Internet address (IP Address) - This is an address that is given to your computer or internet connection.
+        This can be used to find your city or region and internet provider but can change depending on your connection.
+      </li>
+      <li>
+        <img class="inline invert" src="/static/icons/PhLink.svg" alt="" width="24px" height="24px" />
+        Page viewed (Request URL) - This is what page you are viewing.
+      </li>
+      <li>
+        <img class="inline invert" src="/static/icons/PhDevices.svg" alt="" width="24px" height="24px" />
+        Device Type (User agent) - This is what browser, device, and operating system you are using.
+        Advanced users can change this with an extension or browser setting.
+      </li>
+      <li>
+        <img class="inline invert" src="/static/icons/PhWrench.svg" alt="" width="24px" height="24px" />
+        Diagnostics - When this data is only collected when there is an error or only a short amount of time while
+        diagnosing an issue.
+      </li>
+    </ul>
+  </section>
+    
+  <section>
+    <h2 class="text-2xl my-4 font-bold">Additional information</h2>
+    <ul>
+      <li>Version: {{version}}</li>
+      <li>Country: {{config.Privacy.country}}</li>
+      <li>Provider: {{config.Privacy.provider}}</li>
+      {{#if config.Privacy.cloudflare}}
+      <li>Using Cloudflare?: Yes</li>
+      {{else}}
+      <li>Using Cloudflare?: No</li>
+      {{/if}}
+    </ul>
+  </section>
+
+  {{> 'partials/footer' }}
+</body>
+
+</html>

views/search.hbs

@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <title>{{query}} - rimgo</title>
+
+  {{> partials/head }}
+</head>
+
+<body class="font-sans text-lg bg-slate-800 text-white">
+  {{> partials/nav }}
+
+  <section class="my-4 w-full flex flex-col items-center">
+    {{> partials/searchBar }}
+  </section>
+  
+  <main>
+    <div class="posts">
+      {{#each results}}
+      {{> partials/result }}
+      {{/each}}
+    </div>
+
+    <div class="flex justify-between mt-4 font-bold">
+      {{#noteq page "0"}}
+      <a href="/search?q={{query}}&page={{prevPage}}">Previous page</a>
+      {{/noteq}}
+      <p>Page {{nextPage}}</p>
+      <a href="/search?q={{query}}&page={{nextPage}}">Next page</a>
+    </div>
+  </main>
+
+  {{> partials/footer }}
+</body>
+
+</html>

views/tag.hbs

@@ -5,50 +5,59 @@
   <title>{{tag.Display}} - rimgo</title>
 
   {{> partials/head }}
-
-  <link rel="stylesheet" href="/static/fonts/Material-Icons-Outlined.css" />
-  <link rel="stylesheet" href="/static/css/base.css" />
-  <link rel="stylesheet" href="/static/css/tag.css" />
+  <link href="/t/{{tag.Tag}}.rss" rel="alternate" title={{tag.Display}} type="application/rss+xml"
+  <link href="/t/{{tag.Tag}}.atom" rel="alternate" title={{tag.Display}} type="application/atom+xml">
+  <link href="/t/{{tag.Tag}}.json" rel="alternate" title={{tag.Display}} type="application/feed+json">
 </head>
 
-<body>
-  {{> partials/header }}
+<body class="font-sans text-lg bg-slate-800 text-white">
+  {{> partials/nav }}
+
+  <section class="my-4 w-full flex flex-col items-center">
+    {{> partials/searchBar }}
+  </section>
+
+  <header class="p-4 rounded-xl text-white mb-4" style="background-image: url('{{tag.Background}}');">
+    <div class="flex flex-col items-center justify-center text-center">
+      <div class="flex gap-2 items-center">
+        <h2 class="text-2xl font-bold">{{tag.Display}}</h2>
+        <a href="/t/{{tag.Tag}}.rss" label="RSS">
+          <img src="/static/icons/PhRss.svg" width="24px" height="24px" class="invert" />
+        </a>
+      </div>
+      <p>{{tag.PostCount}} posts</p>
+    </div>
+    <div class="flex flex-col">
+      {{#equal tag.Sort "popular"}}
+      <a href="?sort=popular"><b>Popular</b></a>
+      <a href="?sort=newest">Newest</a>
+      <a href="?sort=best">Best</a>
+      {{/equal}}
+      {{#equal tag.Sort "newest"}}
+      <a href="?sort=popular">Popular</a>
+      <a href="?sort=newest"><b>Newest</b></a>
+      <a href="?sort=best">Best</a>
+      {{/equal}}
+      {{#equal tag.Sort "best"}}
+      <a href="?sort=popular">Popular</a>
+      <a href="?sort=newest">Newest</a>
+      <a href="?sort=best"><b>Best</b></a>
+      {{/equal}}
+    </div>
+  </header>
 
   <main>
-    <div class="tagMeta" style="background-image: url('{{tag.Background}}');">
-      <div class="tagMeta__info">
-        <h2>{{tag.Display}}</h2>
-        <p>{{tag.PostCount}} posts</p>
-      </div>
-      <div class="tagMeta__sort">
-        {{#equal tag.Sort "popular"}}
-        <a href="?sort=popular"><b>Popular</b></a>
-        <a href="?sort=newest">Newest</a>
-        <a href="?sort=best">Best</a>
-        {{/equal}}
-        {{#equal tag.Sort "newest"}}
-        <a href="?sort=popular">Popular</a>
-        <a href="?sort=newest"><b>Newest</b></a>
-        <a href="?sort=best">Best</a>
-        {{/equal}}
-        {{#equal tag.Sort "best"}}
-        <a href="?sort=popular">Popular</a>
-        <a href="?sort=newest">Newest</a>
-        <a href="?sort=best"><b>Best</b></a>
-        {{/equal}}
-      </div>
-    </div>
-
     <div class="posts">
       {{#each tag.Posts}}
       {{> partials/post }}
       {{/each}}
     </div>
 
-    <div class="pageSelector">
-      {{#if displayPrev}}
+    <div class="flex justify-between mt-4 font-bold">
+      {{#noteq page "1"}}
       <a href="{{channel.RelUrl}}?page={{prevPage}}">Previous page</a>
-      {{/if}}
+      {{/noteq}}
+      <p>Page {{nextPage}}</p>
       <a href="{{channel.RelUrl}}?page={{nextPage}}">Next page</a>
     </div>
   </main>

views/trending.hbs

@@ -0,0 +1,85 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <title>Trending - rimgo</title>
+
+  {{> partials/head }}
+  <link href="/trending.rss" rel="alternate" title="Trending" type="application/rss+xml">
+  <link href="/trending.atom" rel="alternate" title="Trending" type="application/atom+xml">
+  <link href="/trending.json" rel="alternate" title="Trending" type="application/feed+json">
+</head>
+
+<body class="font-sans text-lg bg-slate-800 text-white">
+  {{> partials/nav }}
+
+  <section class="my-4 w-full flex flex-col items-center">
+    {{> partials/searchBar }}
+  </section>
+
+  <header class="p-4 rounded-xl text-white mb-4 bg-gradient-to-r from-blue-400 to-emerald-400">
+    <div class="flex items-center justify-center text-center gap-2">
+      <h2 class="text-2xl font-extrabold">Trending</h2>
+      <a href="/trending.rss" label="RSS">
+        <img src="/static/icons/PhRss.svg" width="24px" height="24px" class="invert" />
+      </a>
+    </div>
+    <div class="flex flex-col sm:flex-row sm:justify-between">
+      <div class="flex flex-col">
+        {{#equal section "hot"}}
+        <a href="?section=hot&sort={{sort}}"><b>Hot</b></a>
+        <a href="?section=new&sort={{sort}}">New</a>
+        <a href="?section=top&sort={{sort}}">Top</a>
+        {{/equal}}
+        {{#equal section "new"}}
+        <a href="?section=hot&sort={{sort}}">Hot</a>
+        <a href="?section=new&sort={{sort}}"><b>New</b></a>
+        <a href="?section=top&sort={{sort}}">Top</a>
+        {{/equal}}
+        {{#equal section "top"}}
+        <a href="?section=hot&sort={{sort}}">Hot</a>
+        <a href="?section=new&sort={{sort}}">New</a>
+        <a href="?section=top&sort={{sort}}"><b>Top</b></a>
+        {{/equal}}
+      </div>
+      <hr class="sm:hidden my-2" />
+      <div class="flex flex-col sm:items-end">
+        {{#equal sort "popular"}}
+        <a href="?section={{section}}&sort=popular"><b>Popular</b></a>
+        <a href="?section={{section}}&sort=newest">Newest</a>
+        <a href="?section={{section}}&sort=best">Best</a>
+        {{/equal}}
+        {{#equal sort "newest"}}
+        <a href="?section={{section}}&sort=popular">Popular</a>
+        <a href="?section={{section}}&sort=newest"><b>Newest</b></a>
+        <a href="?section={{section}}&sort=best">Best</a>
+        {{/equal}}
+        {{#equal sort "best"}}
+        <a href="?section={{section}}&sort=popular">Popular</a>
+        <a href="?section={{section}}&sort=newest">Newest</a>
+        <a href="?section={{section}}&sort=best"><b>Best</b></a>
+        {{/equal}}
+      </div>
+    </div>
+  </header>
+
+  <main>
+    <div class="posts">
+      {{#each results}}
+      {{> partials/post }}
+      {{/each}}
+    </div>
+
+    <div class="flex justify-between mt-4 font-bold">
+      {{#noteq page "1"}}
+      <a href="/trending?section={{section}}&sort={{sort}}&page={{prevPage}}">Previous page</a>
+      {{/noteq}}
+      <p>Page {{page}}</p>
+      <a href="/trending?section={{section}}&sort={{sort}}&page={{nextPage}}">Next page</a>
+    </div>
+  </main>
+
+  {{> partials/footer }}
+</body>
+
+</html>

views/user.hbs

@@ -5,34 +5,48 @@
   <title>{{user.Username}} - rimgo</title>
 
   {{> partials/head }}
-
-  <link rel="stylesheet" href="/static/fonts/Material-Icons-Outlined.css" />
-  <link rel="stylesheet" href="/static/css/user.css" />
-
+  <link href="/user/{{user.Username}}.rss" rel="alternate" title={{user.Username}} type="application/rss+xml">
+  <link href="/user/{{user.Username}}.atom" rel="alternate" title={{user.Username}} type="application/atom+xml">
+  <link href="/user/{{user.Username}}.json" rel="alternate" title={{user.Username}} type="application/feed+json">
 </head>
 
-<body>
-  {{> partials/header }}
+<body class="font-sans text-lg bg-slate-800 text-white">
+  {{> partials/nav }}
+
+  <section class="my-4 w-full flex flex-col items-center">
+    {{> partials/searchBar }}
+  </section>
+  
+  <header class="p-4 rounded-xl text-white mb-4" style="background-image: url('{{user.Cover}}');">
+    <div class="flex flex-col sm:flex-row items-center gap-2">
+      <img class="rounded-full" src="{{user.Avatar}}" width="72" height="72">
+      <div class="items-center sm:items-start text-center sm:text-left">
+        <div class="flex flex-row gap-2 items-center">
+          <h2 class="font-bold text-2xl">{{user.Username}}</h2>
+          <a href="/user/{{user.Username}}.rss" label="RSS">
+            <img src="/static/icons/PhRss.svg" width="24px" height="24px" class="invert" />
+          </a>
+        </div>
+        <p>{{user.Points}} pts · {{user.CreatedAt}}</p>
+      </div>
+      <hr class="sm:border-0 grow">
+      <div class="flex flex-col items-center sm:items-end">
+        <a href="/user/{{user.Username}}"><b>Submissions</b></a>
+        <a href="/user/{{user.Username}}/favorites">Favorites</a>
+        <a href="/user/{{user.Username}}/comments">Comments</a>
+      </div>
+    </div>
+    <p class="mt-2">{{user.Bio}}</p>
+  </header>
 
   <main>
-    <div class="userMeta" style="background-image: url('{{user.Cover}}');">
-      <div class="userMeta__upper">
-        <img class="pfp" src="{{user.Avatar}}" width="72" height="72">
-        <div>
-          <h2>{{user.Username}}</h2>
-          <p>{{user.Points}} pts · {{user.CreatedAt}}</p>
-        </div>
-      </div>
-      <p class="userMeta__upper__bio">{{user.Bio}}</p>
-    </div>
-
     <div class="posts">
       {{#each submissions}}
       {{> partials/post }}
       {{/each}}
     </div>
 
-    <div class="pageSelector">
+    <div class="mt-4 font-bold">
       {{#equal page "0" }}
       {{else}}
       <a href="{{channel.RelUrl}}?page={{prevPage}}">Previous page</a>

views/userComments.hbs

@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <title>{{user.Username}}'s comments - rimgo</title>
+
+  {{> partials/head }}
+</head>
+
+<body class="font-sans text-lg bg-slate-800 text-white">
+  {{> partials/nav }}
+
+  <section class="my-4 w-full flex flex-col items-center">
+    {{> partials/searchBar }}
+  </section>
+  
+  <header class="p-4 rounded-xl text-white mb-4" style="background-image: url('{{user.Cover}}');">
+    <div class="flex flex-col sm:flex-row items-center gap-2">
+      <img class="rounded-full" src="{{user.Avatar}}" width="72" height="72">
+      <div class="items-center sm:items-start text-center sm:text-left">
+        <h2 class="font-bold text-2xl">{{user.Username}}</h2>
+        <p>{{user.Points}} pts · {{user.CreatedAt}}</p>
+      </div>
+      <hr class="sm:border-0 grow">
+      <div class="flex flex-col items-center sm:items-end">
+        <a href="/user/{{user.Username}}">Submissions</a>
+        <a href="/user/{{user.Username}}/favorites">Favorites</a>
+        <a href="/user/{{user.Username}}/comments"><b>Comments</b></a>
+      </div>
+    </div>
+    <p class="mt-2">{{user.Bio}}</p>
+  </header>
+
+  <main>
+    <div class="comments flex flex-col gap-4">
+      {{#each comments}}
+      {{> partials/contextComment }}
+      {{/each}}
+    </div>
+  </main>
+
+  {{> partials/footer }}
+</body>
+
+</html>