- commit
- 350d563
- parent
- 32a6c64
- author
- Eric Bower
- date
- 2022-12-15 02:36:07 +0000 UTC
feeds.sh (#2) * feat(feeds): init
+21,
-0
1@@ -92,3 +92,24 @@ IMGS_PROTOCOL=http
2 IMGS_ALLOW_REGISTER=1
3 IMGS_STORAGE_DIR=.storage
4 IMGS_DEBUG=1
5+
6+SENDGRID_API_KEY=
7+FEEDS_V4=
8+FEEDS_V6=
9+FEEDS_HTTP_V4=$FEEDS_V4:80
10+FEEDS_HTTP_V6=[$FEEDS_V6]:80
11+FEEDS_HTTPS_V4=$FEEDS_V4:443
12+FEEDS_HTTPS_V6=[$FEEDS_V6]:443
13+FEEDS_SSH_V4=$FEEDS_V4:22
14+FEEDS_SSH_V6=[$FEEDS_V6]:22
15+FEEDS_HOST=
16+FEEDS_SSH_PORT=2222
17+FEEDS_WEB_PORT=3000
18+FEEDS_PROM_PORT=9222
19+FEEDS_DOMAIN=feeds.dev.pico.sh:3004
20+FEEDS_EMAIL=hello@pico.sh
21+FEEDS_SUBDOMAINS=1
22+FEEDS_CUSTOMDOMAINS=1
23+FEEDS_PROTOCOL=http
24+FEEDS_ALLOW_REGISTER=1
25+FEEDS_DEBUG=1
+6,
-0
1@@ -84,6 +84,12 @@ jobs:
2 app: imgs
3 platforms: ${{ env.PLATFORMS }}
4 registry: ${{ env.REGISTRY }}
5+ - name: Run docker build for imgs
6+ uses: ./.github/actions/build
7+ with:
8+ app: feeds
9+ platforms: ${{ env.PLATFORMS }}
10+ registry: ${{ env.REGISTRY }}
11 build-caddy:
12 runs-on: ubuntu-22.04
13 needs: test
M
Makefile
+3,
-2
1@@ -12,6 +12,7 @@ css:
2 cp ./smol.css prose/public/main.css
3 cp ./smol.css pastes/public/main.css
4 cp ./smol.css imgs/public/main.css
5+ cp ./smol.css feeds/public/main.css
6
7 cp ./syntax.css pastes/public/syntax.css
8 cp ./syntax.css prose/public/syntax.css
9@@ -35,7 +36,7 @@ bp-%: bp-setup
10 $(DOCKER_BUILDX_BUILD) --build-arg "APP=$*" -t "ghcr.io/picosh/pico/$*-web:$(DOCKER_TAG)" --target release-web .
11 .PHONY: bp-%
12
13-bp-all: bp-prose bp-lists bp-pastes bp-imgs
14+bp-all: bp-prose bp-lists bp-pastes bp-imgs bp-feeds
15 .PHONY: bp-all
16
17 build-%:
18@@ -43,7 +44,7 @@ build-%:
19 go build -o "build/$*-ssh" "./cmd/$*/ssh"
20 .PHONY: build-%
21
22-build: build-prose build-lists build-pastes build-imgs
23+build: build-prose build-lists build-pastes build-imgs build-feeds
24 .PHONY: build
25
26 format:
+120,
-0
1@@ -0,0 +1,120 @@
2+package main
3+
4+import (
5+ "context"
6+ "fmt"
7+ "os"
8+ "os/signal"
9+ "syscall"
10+ "time"
11+
12+ "github.com/charmbracelet/promwish"
13+ "github.com/charmbracelet/wish"
14+ bm "github.com/charmbracelet/wish/bubbletea"
15+ lm "github.com/charmbracelet/wish/logging"
16+ "github.com/gliderlabs/ssh"
17+ "github.com/picosh/pico/db/postgres"
18+ "github.com/picosh/pico/feeds"
19+ "github.com/picosh/pico/filehandlers"
20+ "github.com/picosh/pico/imgs/storage"
21+ "github.com/picosh/pico/shared"
22+ "github.com/picosh/pico/wish/cms"
23+ "github.com/picosh/pico/wish/list"
24+ "github.com/picosh/pico/wish/pipe"
25+ "github.com/picosh/pico/wish/proxy"
26+ "github.com/picosh/pico/wish/send/auth"
27+ wishrsync "github.com/picosh/pico/wish/send/rsync"
28+ "github.com/picosh/pico/wish/send/scp"
29+ "github.com/picosh/pico/wish/send/sftp"
30+)
31+
32+type SSHServer struct{}
33+
34+func (me *SSHServer) authHandler(ctx ssh.Context, key ssh.PublicKey) bool {
35+ return true
36+}
37+
38+func createRouter(handler *filehandlers.ScpUploadHandler) proxy.Router {
39+ return func(sh ssh.Handler, s ssh.Session) []wish.Middleware {
40+ return []wish.Middleware{
41+ pipe.Middleware(handler, ".txt"),
42+ list.Middleware(handler),
43+ scp.Middleware(handler),
44+ wishrsync.Middleware(handler),
45+ auth.Middleware(handler),
46+ bm.Middleware(cms.Middleware(&handler.Cfg.ConfigCms, handler.Cfg)),
47+ lm.Middleware(),
48+ }
49+ }
50+}
51+
52+func withProxy(handler *filehandlers.ScpUploadHandler, otherMiddleware ...wish.Middleware) ssh.Option {
53+ return func(server *ssh.Server) error {
54+ err := sftp.SSHOption(handler)(server)
55+ if err != nil {
56+ return err
57+ }
58+
59+ return proxy.WithProxy(createRouter(handler), otherMiddleware...)(server)
60+ }
61+}
62+
63+func main() {
64+ host := shared.GetEnv("LISTS_HOST", "0.0.0.0")
65+ port := shared.GetEnv("LISTS_SSH_PORT", "2222")
66+ promPort := shared.GetEnv("LISTS_PROM_PORT", "9222")
67+ cfg := feeds.NewConfigSite()
68+ logger := cfg.Logger
69+ dbh := postgres.NewDB(&cfg.ConfigCms)
70+ defer dbh.Close()
71+
72+ hooks := &feeds.FeedHooks{
73+ Cfg: cfg,
74+ Db: dbh,
75+ }
76+
77+ var st storage.ObjectStorage
78+ var err error
79+ if cfg.MinioURL == "" {
80+ st, err = storage.NewStorageFS(cfg.StorageDir)
81+ } else {
82+ st, err = storage.NewStorageMinio(cfg.MinioURL, cfg.MinioUser, cfg.MinioPass)
83+ }
84+
85+ if err != nil {
86+ logger.Fatal(err)
87+ }
88+
89+ handler := filehandlers.NewScpPostHandler(dbh, cfg, hooks, st)
90+
91+ sshServer := &SSHServer{}
92+ s, err := wish.NewServer(
93+ wish.WithAddress(fmt.Sprintf("%s:%s", host, port)),
94+ wish.WithHostKeyPath("ssh_data/term_info_ed25519"),
95+ wish.WithPublicKeyAuth(sshServer.authHandler),
96+ withProxy(
97+ handler,
98+ promwish.Middleware(fmt.Sprintf("%s:%s", host, promPort), "feeds-ssh"),
99+ ),
100+ )
101+ if err != nil {
102+ logger.Fatal(err)
103+ }
104+
105+ done := make(chan os.Signal, 1)
106+ signal.Notify(done, os.Interrupt, syscall.SIGINT, syscall.SIGTERM)
107+ logger.Infof("Starting SSH server on %s:%s", host, port)
108+ go func() {
109+ if err = s.ListenAndServe(); err != nil {
110+ logger.Fatal(err)
111+ }
112+ }()
113+
114+ <-done
115+ logger.Info("Stopping SSH server")
116+ ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
117+ defer func() { cancel() }()
118+ if err := s.Shutdown(ctx); err != nil {
119+ logger.Fatal(err)
120+ }
121+}
+7,
-0
1@@ -0,0 +1,7 @@
2+package main
3+
4+import "github.com/picosh/pico/feeds"
5+
6+func main() {
7+ feeds.StartApiServer()
8+}
+9,
-5
1@@ -10,7 +10,6 @@ import (
2 "github.com/picosh/pico/db"
3 "github.com/picosh/pico/db/postgres"
4 "github.com/picosh/pico/imgs"
5- "github.com/picosh/pico/lists"
6 "github.com/picosh/pico/shared"
7 "github.com/picosh/pico/wish/cms/config"
8 "go.uber.org/zap"
9@@ -117,15 +116,20 @@ func main() {
10 }
11 }
12 } else if post.Space == "lists" {
13- parsed := lists.ParseText(post.Text, linkify)
14+ linkify := imgs.NewImgsLinkify(post.Username)
15+ parsed := shared.ListParseText(post.Text, linkify)
16+ if err != nil {
17+ logger.Error(err)
18+ continue
19+ }
20
21- if parsed.MetaData.PublishAt != nil && !parsed.MetaData.PublishAt.IsZero() {
22- err = updateDates(tx, post.ID, parsed.MetaData.PublishAt)
23+ if parsed.PublishAt != nil && !parsed.PublishAt.IsZero() {
24+ err = updateDates(tx, post.ID, parsed.PublishAt)
25 if err != nil {
26 logger.Error(err)
27 continue
28 }
29- if !parsed.MetaData.PublishAt.Equal(*post.PublishAt) {
30+ if !parsed.PublishAt.Equal(*post.PublishAt) {
31 datesFixed = append(datesFixed, post.ID)
32 }
33 }
M
db/db.go
+2,
-1
1@@ -27,7 +27,8 @@ type User struct {
2 }
3
4 type PostData struct {
5- ImgPath string `json:"img_path"`
6+ ImgPath string `json:"img_path"`
7+ LastDigest *time.Time `json:"last_digest"`
8 }
9
10 // Make the Attrs struct implement the driver.Valuer interface. This method
+20,
-0
1@@ -94,3 +94,23 @@ services:
2 - ./data/imgs-ssh/data:/app/ssh_data
3 ports:
4 - "2223:2222"
5+ feeds-web:
6+ build:
7+ args:
8+ APP: feeds
9+ target: release-web
10+ env_file:
11+ - .env.example
12+ ports:
13+ - "3004:3000"
14+ feeds-ssh:
15+ build:
16+ args:
17+ APP: feeds
18+ target: release-ssh
19+ env_file:
20+ - .env.example
21+ volumes:
22+ - ./data/feeds-ssh/data:/app/ssh_data
23+ ports:
24+ - "2224:2222"
+48,
-0
1@@ -204,6 +204,48 @@ services:
2 ports:
3 - "${IMGS_SSH_V4:-22}:2222"
4 - "${IMGS_SSH_V6:-[::1]:22}:2222"
5+ feeds-caddy:
6+ image: ghcr.io/picosh/pico/caddy:latest
7+ restart: always
8+ networks:
9+ - feeds
10+ env_file:
11+ - .env.prod
12+ environment:
13+ APP_DOMAIN: ${FEEDS_DOMAIN:-feeds.sh}
14+ APP_EMAIL: ${FEEDS_EMAIL:-hello@pico.sh}
15+ volumes:
16+ - ./caddy/Caddyfile:/etc/caddy/Caddyfile
17+ - ./data/feeds-caddy/data:/data
18+ - ./data/feeds-caddy/config:/config
19+ ports:
20+ - "${FEEDS_HTTPS_V4:-443}:443"
21+ - "${FEEDS_HTTP_V4:-80}:80"
22+ - "${FEEDS_HTTPS_V6:-[::1]:443}:443"
23+ - "${FEEDS_HTTP_V6:-[::1]:80}:80"
24+ profiles:
25+ - feeds
26+ - caddy
27+ - all
28+ feeds-web:
29+ networks:
30+ feeds:
31+ aliases:
32+ - web
33+ env_file:
34+ - .env.prod
35+ feeds-ssh:
36+ networks:
37+ feeds:
38+ aliases:
39+ - ssh
40+ env_file:
41+ - .env.prod
42+ volumes:
43+ - ./data/feeds-ssh/data:/app/ssh_data
44+ ports:
45+ - "${FEEDS_SSH_V4:-22}:2222"
46+ - "${FEEDS_SSH_V6:-[::1]:22}:2222"
47
48 networks:
49 default:
50@@ -235,3 +277,9 @@ networks:
51 ipam:
52 config:
53 - subnet: 172.21.0.0/16
54+ feeds:
55+ driver_opts:
56+ com.docker.network.bridge.name: feeds
57+ ipam:
58+ config:
59+ - subnet: 172.22.0.0/16
+14,
-0
1@@ -69,3 +69,17 @@ services:
2 - imgs
3 - services
4 - all
5+ feeds-web:
6+ image: ghcr.io/picosh/pico/feeds-web:latest
7+ restart: always
8+ profiles:
9+ - feeds
10+ - services
11+ - all
12+ feeds-ssh:
13+ image: ghcr.io/picosh/pico/feeds-ssh:latest
14+ restart: always
15+ profiles:
16+ - feeds
17+ - services
18+ - all
+80,
-0
1@@ -0,0 +1,80 @@
2+package feeds
3+
4+import (
5+ "fmt"
6+ "net/http"
7+
8+ "github.com/picosh/pico/db/postgres"
9+ "github.com/picosh/pico/imgs/storage"
10+ "github.com/picosh/pico/shared"
11+)
12+
13+func createStaticRoutes() []shared.Route {
14+ return []shared.Route{
15+ shared.NewRoute("GET", "/main.css", shared.ServeFile("main.css", "text/css")),
16+ shared.NewRoute("GET", "/card.png", shared.ServeFile("card.png", "image/png")),
17+ shared.NewRoute("GET", "/favicon-16x16.png", shared.ServeFile("favicon-16x16.png", "image/png")),
18+ shared.NewRoute("GET", "/favicon-32x32.png", shared.ServeFile("favicon-32x32.png", "image/png")),
19+ shared.NewRoute("GET", "/apple-touch-icon.png", shared.ServeFile("apple-touch-icon.png", "image/png")),
20+ shared.NewRoute("GET", "/favicon.ico", shared.ServeFile("favicon.ico", "image/x-icon")),
21+ shared.NewRoute("GET", "/robots.txt", shared.ServeFile("robots.txt", "text/plain")),
22+ }
23+}
24+
25+func createMainRoutes(staticRoutes []shared.Route) []shared.Route {
26+ routes := []shared.Route{
27+ shared.NewRoute("GET", "/", shared.CreatePageHandler("html/marketing.page.tmpl")),
28+ shared.NewRoute("GET", "/ops", shared.CreatePageHandler("html/ops.page.tmpl")),
29+ shared.NewRoute("GET", "/privacy", shared.CreatePageHandler("html/privacy.page.tmpl")),
30+ shared.NewRoute("GET", "/help", shared.CreatePageHandler("html/help.page.tmpl")),
31+ shared.NewRoute("GET", "/check", shared.CheckHandler),
32+ }
33+
34+ routes = append(
35+ routes,
36+ staticRoutes...,
37+ )
38+
39+ return routes
40+}
41+
42+func StartApiServer() {
43+ cfg := NewConfigSite()
44+ db := postgres.NewDB(&cfg.ConfigCms)
45+ defer db.Close()
46+ logger := cfg.Logger
47+
48+ var st storage.ObjectStorage
49+ var err error
50+ if cfg.MinioURL == "" {
51+ st, err = storage.NewStorageFS(cfg.StorageDir)
52+ } else {
53+ st, err = storage.NewStorageMinio(cfg.MinioURL, cfg.MinioUser, cfg.MinioPass)
54+ }
55+ if err != nil {
56+ logger.Fatal(err)
57+ }
58+
59+ // cron daily digest
60+ fetcher := NewFetcher(db, cfg)
61+ go fetcher.Loop()
62+
63+ staticRoutes := createStaticRoutes()
64+
65+ if cfg.Debug {
66+ staticRoutes = shared.CreatePProfRoutes(staticRoutes)
67+ }
68+
69+ mainRoutes := createMainRoutes(staticRoutes)
70+
71+ handler := shared.CreateServe(mainRoutes, []shared.Route{}, cfg, db, st, logger)
72+ router := http.HandlerFunc(handler)
73+
74+ portStr := fmt.Sprintf(":%s", cfg.Port)
75+ logger.Infof("Starting server on port %s", cfg.Port)
76+ logger.Infof("Subdomains enabled: %t", cfg.SubdomainsEnabled)
77+ logger.Infof("Domain: %s", cfg.Domain)
78+ logger.Infof("Email: %s", cfg.Email)
79+
80+ logger.Fatal(http.ListenAndServe(portStr, router))
81+}
+55,
-0
1@@ -0,0 +1,55 @@
2+package feeds
3+
4+import (
5+ "fmt"
6+
7+ "github.com/picosh/pico/shared"
8+ "github.com/picosh/pico/wish/cms/config"
9+)
10+
11+func NewConfigSite() *shared.ConfigSite {
12+ debug := shared.GetEnv("FEEDS_DEBUG", "0")
13+ domain := shared.GetEnv("FEEDS_DOMAIN", "feeds.sh")
14+ email := shared.GetEnv("FEEDS_EMAIL", "hello@feeds.sh")
15+ subdomains := shared.GetEnv("FEEDS_SUBDOMAINS", "0")
16+ customdomains := shared.GetEnv("FEEDS_CUSTOMDOMAINS", "0")
17+ port := shared.GetEnv("FEEDS_WEB_PORT", "3000")
18+ protocol := shared.GetEnv("FEEDS_PROTOCOL", "https")
19+ allowRegister := shared.GetEnv("FEEDS_ALLOW_REGISTER", "1")
20+ storageDir := shared.GetEnv("IMGS_STORAGE_DIR", ".storage")
21+ minioURL := shared.GetEnv("MINIO_URL", "")
22+ minioUser := shared.GetEnv("MINIO_ROOT_USER", "")
23+ minioPass := shared.GetEnv("MINIO_ROOT_PASSWORD", "")
24+ dbURL := shared.GetEnv("DATABASE_URL", "")
25+ sendgridKey := shared.GetEnv("SENDGRID_API_KEY", "")
26+
27+ intro := "To get started, enter a username and email.\n"
28+ intro += "Then upload a file containing a list of rss feeds (e.g. ~/feeds.txt)\n"
29+ intro += "Finally, send your file to us:\n\n"
30+ intro += fmt.Sprintf("scp ~/feeds.txt %s:/", domain)
31+
32+ return &shared.ConfigSite{
33+ Debug: debug == "1",
34+ SubdomainsEnabled: subdomains == "1",
35+ CustomdomainsEnabled: customdomains == "1",
36+ SendgridKey: sendgridKey,
37+ ConfigCms: config.ConfigCms{
38+ Domain: domain,
39+ Email: email,
40+ Port: port,
41+ Protocol: protocol,
42+ DbURL: dbURL,
43+ StorageDir: storageDir,
44+ MinioURL: minioURL,
45+ MinioUser: minioUser,
46+ MinioPass: minioPass,
47+ Description: "an rss-to-email digest service for hackers",
48+ IntroText: intro,
49+ Space: "feeds",
50+ AllowedExt: []string{".txt"},
51+ HiddenPosts: []string{"_header.txt", "_readme.txt"},
52+ Logger: shared.CreateLogger(),
53+ AllowRegister: allowRegister == "1",
54+ },
55+ }
56+}
+272,
-0
1@@ -0,0 +1,272 @@
2+package feeds
3+
4+import (
5+ "errors"
6+ "fmt"
7+ "strings"
8+ "text/template"
9+ "time"
10+
11+ "github.com/mmcdole/gofeed"
12+ "github.com/picosh/pico/db"
13+ "github.com/picosh/pico/shared"
14+ "github.com/sendgrid/sendgrid-go"
15+ "github.com/sendgrid/sendgrid-go/helpers/mail"
16+)
17+
18+var ErrNoRecentArticles = errors.New("no recent articles")
19+
20+type FeedItem struct {
21+ Title string
22+ Link string
23+ Description string
24+}
25+
26+type Feed struct {
27+ Title string
28+ Link string
29+ Description string
30+ Items []*FeedItem
31+}
32+
33+type DigestFeed struct {
34+ Feeds []*Feed
35+}
36+
37+type Fetcher struct {
38+ cfg *shared.ConfigSite
39+ db db.DB
40+}
41+
42+func NewFetcher(dbpool db.DB, cfg *shared.ConfigSite) *Fetcher {
43+ return &Fetcher{
44+ db: dbpool,
45+ cfg: cfg,
46+ }
47+}
48+
49+func digestOptionToTime(date time.Time, interval string) time.Time {
50+ day := 24 * time.Hour
51+ if interval == "10min" {
52+ date.Add(10 * time.Minute)
53+ } else if interval == "1hour" {
54+ date.Add(1 * time.Hour)
55+ } else if interval == "12hour" {
56+ date.Add(12 * time.Hour)
57+ } else if interval == "1day" || interval == "" {
58+ date.Add(day)
59+ } else if interval == "7day" {
60+ date.Add(7 * day)
61+ } else if interval == "30day" {
62+ date.Add(30 * day)
63+ }
64+ return date
65+}
66+
67+func (f *Fetcher) Validate(lastDigest *time.Time, parsed *shared.ListParsedText) error {
68+ if lastDigest == nil {
69+ return nil
70+ }
71+
72+ digestAt := digestOptionToTime(*lastDigest, parsed.DigestInterval)
73+ now := time.Now().UTC()
74+ if digestAt.Before(now) {
75+ return fmt.Errorf("(%s) not time to digest, skipping", digestAt)
76+ }
77+ return nil
78+}
79+
80+func (f *Fetcher) RunPost(user *db.User, post *db.Post) error {
81+ f.cfg.Logger.Infof("(%s) running feed post (%s)", user.Name, post.Filename)
82+ parsed := shared.ListParseText(post.Text, shared.NewNullLinkify())
83+ err := f.Validate(post.Data.LastDigest, parsed)
84+ if err != nil {
85+ f.cfg.Logger.Info(err.Error())
86+ return nil
87+ }
88+
89+ urls := []string{}
90+ for _, item := range parsed.Items {
91+ url := ""
92+ if item.IsText {
93+ url = item.Value
94+ } else if item.IsURL {
95+ url = string(item.URL)
96+ }
97+
98+ if url == "" {
99+ continue
100+ }
101+
102+ urls = append(urls, url)
103+ }
104+
105+ txt, err := f.FetchAll(urls, post.Data.LastDigest)
106+ if err != nil {
107+ return err
108+ }
109+
110+ err = f.SendEmail(user.Name, parsed.Email, txt)
111+ if err != nil {
112+ return err
113+ }
114+
115+ now := time.Now().UTC()
116+ post.Data.LastDigest = &now
117+ _, err = f.db.UpdatePost(post)
118+ return err
119+}
120+
121+func (f *Fetcher) RunUser(user *db.User) error {
122+ f.cfg.Logger.Infof("(%s) grabbing all feed posts", user.Name)
123+ posts, err := f.db.FindPostsForUser(&db.Pager{Num: 1000}, user.ID, "feeds")
124+ if err != nil {
125+ return err
126+ }
127+
128+ for _, post := range posts.Data {
129+ err = f.RunPost(user, post)
130+ if err != nil {
131+ f.cfg.Logger.Infof(err.Error())
132+ }
133+ }
134+
135+ return nil
136+}
137+
138+func (f *Fetcher) Fetch(fp *gofeed.Parser, url string, lastDigest *time.Time) (*Feed, error) {
139+ feed, err := fp.ParseURL(url)
140+ if err != nil {
141+ return nil, err
142+ }
143+
144+ feedTmpl := &Feed{
145+ Title: feed.Title,
146+ Description: feed.Description,
147+ Link: feed.Link,
148+ }
149+ items := []*FeedItem{}
150+ // we only want to return feed items published since the last digest time we fetched
151+ for _, item := range feed.Items {
152+ if lastDigest == nil || item.PublishedParsed.Before(*lastDigest) {
153+ continue
154+ }
155+
156+ items = append(items, &FeedItem{
157+ Title: item.Title,
158+ Link: item.Link,
159+ Description: item.Description,
160+ })
161+ }
162+
163+ if len(items) == 0 {
164+ return nil, fmt.Errorf("(%s) %w, skipping", feed.FeedLink, ErrNoRecentArticles)
165+ }
166+
167+ feedTmpl.Items = items
168+ return feedTmpl, nil
169+}
170+
171+func (f *Fetcher) Print(feedTmpl *DigestFeed) (string, error) {
172+ ts, err := template.ParseFiles(
173+ f.cfg.StaticPath("html/digest.page.tmpl"),
174+ )
175+
176+ if err != nil {
177+ return "", err
178+ }
179+
180+ w := new(strings.Builder)
181+ err = ts.Execute(w, feedTmpl)
182+ if err != nil {
183+ return "", err
184+ }
185+
186+ return w.String(), nil
187+}
188+
189+func (f *Fetcher) FetchAll(urls []string, lastDigest *time.Time) (string, error) {
190+ fp := gofeed.NewParser()
191+ feeds := &DigestFeed{}
192+
193+ for _, url := range urls {
194+ feedTmpl, err := f.Fetch(fp, url, lastDigest)
195+ if err != nil {
196+ if errors.Is(err, ErrNoRecentArticles) {
197+ f.cfg.Logger.Info(err)
198+ } else {
199+ f.cfg.Logger.Error(err)
200+ }
201+ continue
202+ }
203+ feeds.Feeds = append(feeds.Feeds, feedTmpl)
204+ }
205+
206+ str, err := f.Print(feeds)
207+ if err != nil {
208+ return "", nil
209+ }
210+
211+ return str, nil
212+}
213+
214+func (f *Fetcher) SendEmail(username, email, msg string) error {
215+ if email == "" {
216+ return fmt.Errorf("(%s) does not have an email associated with their account", username)
217+ }
218+
219+ from := mail.NewEmail("team pico", f.cfg.Email)
220+ subject := "feeds.sh daily digest"
221+ to := mail.NewEmail(username, email)
222+
223+ plainTextContent := msg
224+ htmlContent := msg
225+
226+ message := mail.NewSingleEmail(from, subject, to, plainTextContent, htmlContent)
227+ client := sendgrid.NewSendClient(f.cfg.SendgridKey)
228+
229+ f.cfg.Logger.Infof("(%s) sending email digest", username)
230+ response, err := client.Send(message)
231+ if err != nil {
232+ return err
233+ }
234+
235+ f.cfg.Logger.Infof(
236+ "(%s) successfully sent email digest (x-message-id: %s)",
237+ email,
238+ response.Headers["X-Message-Id"][0],
239+ )
240+
241+ return nil
242+}
243+
244+func (f *Fetcher) Run() error {
245+ users, err := f.db.FindUsers()
246+ if err != nil {
247+ return err
248+ }
249+
250+ for _, user := range users {
251+ err := f.RunUser(user)
252+ if err != nil {
253+ f.cfg.Logger.Error(err)
254+ continue
255+ }
256+ }
257+
258+ return nil
259+}
260+
261+func (f *Fetcher) Loop() {
262+ for {
263+ f.cfg.Logger.Info("running digest emailer")
264+
265+ err := f.Run()
266+ if err != nil {
267+ f.cfg.Logger.Error(err)
268+ }
269+
270+ f.cfg.Logger.Info("digest emailer finished, waiting 10 mins")
271+ time.Sleep(10 * time.Minute)
272+ }
273+}
+18,
-0
1@@ -0,0 +1,18 @@
2+{{define "base"}}
3+<!doctype html>
4+<html lang="en">
5+ <head>
6+ <meta charset='utf-8'>
7+ <meta name="viewport" content="width=device-width, initial-scale=1" />
8+ <title>{{template "title" .}}</title>
9+
10+ <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
11+
12+ <meta name="keywords" content="rss, email, notification, service" />
13+ {{template "meta" .}}
14+
15+ <link rel="stylesheet" href="/main.css" />
16+ </head>
17+ <body {{template "attrs" .}}>{{template "body" .}}</body>
18+</html>
19+{{end}}
+15,
-0
1@@ -0,0 +1,15 @@
2+feeds.sh daily digest
3+
4+{{range .Feeds}}
5+ {{.Title}}
6+ {{.Link}}
7+ {{.Description}}
8+
9+ {{range .Items}}
10+ {{.Title}}
11+ {{.Link}}
12+ {{end}}
13+
14+ ---
15+
16+{{end}}
+137,
-0
1@@ -0,0 +1,137 @@
2+{{template "base" .}}
3+
4+{{define "title"}}help -- {{.Site.Domain}}{{end}}
5+
6+{{define "meta"}}
7+<meta name="description" content="questions and answers" />
8+{{end}}
9+
10+{{define "attrs"}}{{end}}
11+
12+{{define "body"}}
13+<header>
14+ <h1 class="text-2xl">Need help?</h1>
15+ <p>Here are some common questions on using this platform that we would like to answer.</p>
16+</header>
17+<main>
18+ <section id="permission-denied">
19+ <h2 class="text-xl">
20+ <a href="#permission-denied" rel="nofollow noopener">#</a>
21+ I get a permission denied when trying to SSH
22+ </h2>
23+ <p>
24+ Unfortunately SHA-2 RSA keys are <strong>not</strong> currently supported.
25+ </p>
26+ <p>
27+ Unfortunately, due to a shortcoming in Go’s x/crypto/ssh package, Soft Serve does
28+ not currently support access via new SSH RSA keys: only the old SHA-1 ones will work.
29+ Until we sort this out you’ll either need an SHA-1 RSA key or a key with another
30+ algorithm, e.g. Ed25519. Not sure what type of keys you have? You can check with the
31+ following:
32+ </p>
33+ <pre>$ find ~/.ssh/id_*.pub -exec ssh-keygen -l -f {} \;</pre>
34+ <p>If you’re curious about the inner workings of this problem have a look at:</p>
35+ <ul>
36+ <li><a href="https://github.com/golang/go/issues/37278">golang/go#37278</a></li>
37+ <li><a href="https://go-review.googlesource.com/c/crypto/+/220037">go-review</a></li>
38+ <li><a href="https://github.com/golang/crypto/pull/197">golang/crypto#197</a></li>
39+ </ul>
40+ </section>
41+
42+ <section id="ssh-key">
43+ <h2 class="text-xl">
44+ <a href="#ssh-key" rel="nofollow noopener">#</a>
45+ Generating a new SSH key
46+ </h2>
47+ <p>
48+ <a href="https://docs.github.com/en/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent">Github reference</a>
49+ </p>
50+ <pre>ssh-keygen -t ed25519 -C "your_email@example.com"</pre>
51+ <ol>
52+ <li>When you're prompted to "Enter a file in which to save the key," press Enter. This accepts the default file location.</li>
53+ <li>At the prompt, type a secure passphrase.</li>
54+ </ol>
55+ </section>
56+
57+ <section id="digest-interval">
58+ <h2 class="text-xl">
59+ <a href="#digest-interval" rel="nofollow noopener">#</a>
60+ Diget interval options
61+ </h2>
62+ <ul>
63+ <li>10min</li>
64+ <li>1hour</li>
65+ <li>12hour</li>
66+ <li>1day</li>
67+ <li>7day</li>
68+ <li>30day</li>
69+ </ul>
70+ </section>
71+
72+ <section id="multiple-feeds">
73+ <h2 class="text-xl">
74+ <a href="#multiple-feeds" rel="nofollow noopener">#</a>
75+ Can I create multiple feed lists?
76+ </h2>
77+ <p>
78+ You are free to upload as many feed lists as you like,
79+ referencing different email and digest intervals.
80+ </p>
81+ </section>
82+
83+ <section id="post-update">
84+ <h2 class="text-xl">
85+ <a href="#post-update" rel="nofollow noopener">#</a>
86+ How do I update a list?
87+ </h2>
88+ <p>
89+ Updating a list requires that you update the source document and then run the <code>scp</code>
90+ command again. If the filename remains the same, then the list will be updated.
91+ </p>
92+ </section>
93+
94+ <section id="post-delete">
95+ <h2 class="text-xl">
96+ <a href="#post-delete" rel="nofollow noopener">#</a>
97+ How do I delete a list?
98+ </h2>
99+ <p>
100+ Because <code>scp</code> does not natively support deleting files, I didn't want to bake
101+ that behavior into my ssh server.
102+ </p>
103+
104+ <p>
105+ However, if a user wants to delete a post they can delete the contents of the file and
106+ then upload it to our server. If the file contains 0 bytes, we will remove the post.
107+ For example, if you want to delete <code>delete.txt</code> you could:
108+ </p>
109+
110+ <pre>
111+cp /dev/null delete.txt
112+scp ./delete.txt {{.Site.Domain}}:/</pre>
113+
114+ <p>
115+ Alternatively, you can go to <code>ssh {{.Site.Domain}}</code> and select "Manage posts."
116+ Then you can highlight the post you want to delete and then press "X." It will ask for
117+ confirmation before actually removing the list.
118+ </p>
119+ </section>
120+
121+ <section id="multiple-accounts">
122+ <h2 class="text-xl">
123+ <a href="#multiple-accounts" rel="nofollow noopener">#</a>
124+ Can I create multiple accounts?
125+ </h2>
126+ <p>
127+ Yes! You can either a) create a new keypair and use that for authentication
128+ or b) use the same keypair and ssh into our CMS using our special username
129+ <code>ssh new@{{.Site.Domain}}</code>.
130+ </p>
131+ <p>
132+ Please note that if you use the same keypair for multiple accounts, you will need to
133+ always specify the user when logging into our CMS.
134+ </p>
135+ </section>
136+</main>
137+{{template "marketing-footer" .}}
138+{{end}}
1@@ -0,0 +1,14 @@
2+{{define "marketing-footer"}}
3+<footer>
4+ <hr />
5+ <p class="font-italic">Built and maintained by <a href="https://pico.sh">pico.sh</a>.</p>
6+ <div>
7+ <a href="/">home</a> |
8+ <a href="/spec">spec</a> |
9+ <a href="/ops">ops</a> |
10+ <a href="/help">help</a> |
11+ <a href="/rss">rss</a> |
12+ <a href="https://github.com/picosh/pico">source</a>
13+ </div>
14+</footer>
15+{{end}}
+99,
-0
1@@ -0,0 +1,99 @@
2+{{template "base" .}}
3+
4+{{define "title"}}{{.Site.Domain}} -- an rss email notification service{{end}}
5+
6+{{define "meta"}}
7+<meta name="description" content="an rss email notification service" />
8+
9+<meta property="og:type" content="website">
10+<meta property="og:site_name" content="{{.Site.Domain}}">
11+<meta property="og:url" content="https://{{.Site.Domain}}">
12+<meta property="og:title" content="{{.Site.Domain}}">
13+<meta property="og:description" content="an rss email notification service">
14+
15+<meta name="twitter:card" content="summary" />
16+<meta property="twitter:url" content="https://{{.Site.Domain}}">
17+<meta property="twitter:title" content="{{.Site.Domain}}">
18+<meta property="twitter:description" content="an rss email notification service">
19+<meta name="twitter:image" content="https://{{.Site.Domain}}/card.png" />
20+<meta name="twitter:image:src" content="https://{{.Site.Domain}}/card.png" />
21+
22+<meta property="og:image:width" content="300" />
23+<meta property="og:image:height" content="300" />
24+<meta itemprop="image" content="https://{{.Site.Domain}}/card.png" />
25+<meta property="og:image" content="https://{{.Site.Domain}}/card.png" />
26+{{end}}
27+
28+{{define "attrs"}}{{end}}
29+
30+{{define "body"}}
31+<header class="text-center">
32+ <h1 class="text-2xl font-bold">{{.Site.Domain}} [beta]</h1>
33+ <p class="text-lg">An rss email notification service</p>
34+ <hr />
35+</header>
36+
37+<main>
38+ <section>
39+ <h2 class="text-lg font-bold">Create your account with Public-Key Cryptography</h2>
40+ <p>We don't want your email address.</p>
41+ <p>To get started, simply ssh into our content management system:</p>
42+ <pre>ssh new@{{.Site.Domain}}</pre>
43+ <div class="text-sm font-italic note">
44+ note: <code>new</code> is a special username that will always send you to account
45+ creation.
46+ </div>
47+ <div class="text-sm font-italic note">
48+ note: getting permission denied? <a href="/help#permission-denied">read this</a>
49+ </div>
50+ <p>
51+ After that, set a username and email and then you're ready!
52+ </p>
53+ </section>
54+
55+ <section>
56+ <h2 class="text-lg font-bold">Subscribe to feeds</h2>
57+ <p>
58+ Use <a href="https://lists.sh/spec">lists.sh/spec</a> to create a txt file
59+ named <code>daily.txt</code> (as an example).
60+ </p>
61+ <p>
62+ Then add your email, the digest interval, and the rss feeds for which you
63+ want to receive email notifications.
64+ </p>
65+ <pre>=: email rss@myemail.com
66+=: digest_interval 1day
67+=> https://hey.prose.sh/rss
68+=> https://hey.lists.sh/rss
69+=> https://erock.prose.sh/rss
70+</pre>
71+ <p>
72+ Then copy the file to our server
73+ </p>
74+ <pre>scp daily.txt {{.Site.Domain}}:/</pre>
75+ <p>Using this example, we will send a daily digest of new posts to the email specified.</p>
76+ </section>
77+
78+ <section>
79+ <h2 class="text-lg font-bold">Plain text format</h2>
80+ <p>A simple specification that is flexible and with no frills.</p>
81+ <p><a href="https://lists.sh/spec">specification</a></p>
82+ </section>
83+
84+ <section>
85+ <h2 class="text-lg font-bold">Features</h2>
86+ <ul>
87+ <li>Receive daily email digests</li>
88+ </ul>
89+ </section>
90+
91+ <section>
92+ <h2 class="text-lg font-bold">Roadmap</h2>
93+ <ol>
94+ <li>Web rss reader</li>
95+ </ol>
96+ </section>
97+</main>
98+
99+{{template "marketing-footer" .}}
100+{{end}}
+144,
-0
1@@ -0,0 +1,144 @@
2+{{template "base" .}}
3+
4+{{define "title"}}operations -- {{.Site.Domain}}{{end}}
5+
6+{{define "meta"}}
7+<meta name="description" content="{{.Site.Domain}} operations" />
8+{{end}}
9+
10+{{define "attrs"}}{{end}}
11+
12+{{define "body"}}
13+<header>
14+ <h1 class="text-2xl">Operations</h1>
15+ <ul>
16+ <li><a href="/privacy">privacy</a></li>
17+ </ul>
18+</header>
19+<main>
20+ <section>
21+ <h2 class="text-xl">Purpose</h2>
22+ <p>
23+ {{.Site.Domain}} exists to allow people to receive daily digests for their rss feeds.
24+ </p>
25+ </section>
26+ <section>
27+ <h2 class="text-xl">Ethics</h2>
28+ <p>We are committed to:</p>
29+ <ul>
30+ <li>No browser-based tracking of visitor behavior.</li>
31+ <li>No attempt to identify users.</li>
32+ <li>Never sell any user or visitor data.</li>
33+ <li>No ads — ever.</li>
34+ </ul>
35+ </section>
36+ <section>
37+ <h2 class="text-xl">Code of Content Publication</h2>
38+ <p>
39+ Content in {{.Site.Domain}} blogs is unfiltered and unmonitored. Users are free to publish any
40+ combination of words and pixels except for: content of animosity or disparagement of an
41+ individual or a group on account of a group characteristic such as race, color, national
42+ origin, sex, disability, religion, or sexual orientation, which will be taken down
43+ immediately.
44+ </p>
45+ <p>
46+ If one notices something along those lines in a blog please let us know at
47+ <a href="mailto:{{.Site.Email}}">{{.Site.Email}}</a>.
48+ </p>
49+ </section>
50+ <section>
51+ <h2 class="text-xl">Liability</h2>
52+ <p>
53+ The user expressly understands and agrees that Eric Bower, the operator of this website
54+ shall not be liable, in law or in equity, to them or to any third party for any direct,
55+ indirect, incidental, lost profits, special, consequential, punitive or exemplary damages.
56+ </p>
57+ </section>
58+ <section>
59+ <h2 class="text-xl">Analytics</h2>
60+ <p>
61+ We are committed to zero browser-based tracking or trying to identify visitors. This
62+ means we do not try to understand the user based on cookies or IP address. We do not
63+ store personally identifiable information.
64+ </p>
65+ <p>
66+ However, in order to provide a better service, we do have some analytics on posts.
67+ List of metrics we track for posts:
68+ </p>
69+ <ul>
70+ <li>anonymous view counts</li>
71+ </ul>
72+ <p>
73+ We might also inspect the headers of HTTP requests to determine some tertiary information
74+ about the request. For example we might inspect the <code>User-Agent</code> or
75+ <code>Referer</code> to filter out requests from bots.
76+ </p>
77+ </section>
78+ <section>
79+ <h2 class="text-xl">Account Terms</h2>
80+ <p>
81+ <ul>
82+ <li>
83+ The user is responsible for all content posted and all actions performed with
84+ their account.
85+ </li>
86+ <li>
87+ We reserve the right to disable or delete a user's account for any reason at
88+ any time. We have this clause because, statistically speaking, there will be
89+ people trying to do something nefarious.
90+ </li>
91+ </ul>
92+ </p>
93+ </section>
94+ <section>
95+ <h2 class="text-xl">Service Availability</h2>
96+ <p>
97+ We provide the {{.Site.Domain}} service on an "as is" and "as available" basis. We do not offer
98+ service-level agreements but do take uptime seriously.
99+ </p>
100+ </section>
101+ <section>
102+ <h2 class="text-xl">Contact and Support</h2>
103+ <p>
104+ Email us at <a href="mailto:support@{{.Site.Domain}}">support@{{.Site.Domain}}</a>
105+ with any questions.
106+ </p>
107+ </section>
108+ <section>
109+ <h2 class="text-xl">Acknowledgments</h2>
110+ <p>
111+ {{.Site.Domain}} was inspired by <a href="https://mataroa.blog">Mataroa Blog</a>
112+ and <a href="https://bearblog.dev/">Bear Blog</a>.
113+ </p>
114+ <p>
115+ {{.Site.Domain}} is built with many open source technologies.
116+ </p>
117+ <p>
118+ In particular we would like to thank:
119+ </p>
120+ <ul>
121+ <li>
122+ <span>The </span>
123+ <a href="https://charm.sh">charm.sh</a>
124+ <span> community</span>
125+ </li>
126+ <li>
127+ <span>The </span>
128+ <a href="https://go.dev">golang</a>
129+ <span> community</span>
130+ </li>
131+ <li>
132+ <span>The </span>
133+ <a href="https://www.postgresql.org/">postgresql</a>
134+ <span> community</span>
135+ </li>
136+ <li>
137+ <span>The </span>
138+ <a href="https://github.com/caddyserver/caddy">caddy</a>
139+ <span> community</span>
140+ </li>
141+ </ul>
142+ </section>
143+</main>
144+{{template "marketing-footer" .}}
145+{{end}}
+54,
-0
1@@ -0,0 +1,54 @@
2+{{template "base" .}}
3+
4+{{define "title"}}privacy -- {{.Site.Domain}}{{end}}
5+
6+{{define "meta"}}
7+<meta name="description" content="{{.Site.Domain}} privacy policy" />
8+{{end}}
9+
10+{{define "attrs"}}{{end}}
11+
12+{{define "body"}}
13+<header>
14+ <h1 class="text-2xl">Privacy</h1>
15+ <p>Details on our privacy and security approach.</p>
16+</header>
17+<main>
18+ <section>
19+ <h2 class="text-xl">Account Data</h2>
20+ <p>
21+ In order to have a functional account at {{.Site.Domain}}, we need to store
22+ your public key. That is the only piece of information we record for a user.
23+ </p>
24+ <p>
25+ Because we use public-key cryptography, our security posture is a battle-tested
26+ and proven technique for authentication.
27+ </p>
28+ </section>
29+
30+ <section>
31+ <h2 class="text-xl">Third parties</h2>
32+ <p>
33+ We have a strong commitment to never share any user data with any third-parties.
34+ </p>
35+ </section>
36+
37+ <section>
38+ <h2 class="text-xl">Service Providers</h2>
39+ <ul>
40+ <li>
41+ <span>We host our server on </span>
42+ <a href="https://www.oracle.com/cloud/">oracle cloud</a>
43+ </li>
44+ </ul>
45+ </section>
46+
47+ <section>
48+ <h2 class="text-xl">Cookies</h2>
49+ <p>
50+ We do not use any cookies, not even account authentication.
51+ </p>
52+ </section>
53+</main>
54+{{template "marketing-footer" .}}
55+{{end}}
+0,
-0
+0,
-0
+0,
-0
+0,
-0
+363,
-0
1@@ -0,0 +1,363 @@
2+*,
3+::before,
4+::after {
5+ box-sizing: border-box;
6+}
7+
8+::-moz-focus-inner {
9+ border-style: none;
10+ padding: 0;
11+}
12+:-moz-focusring {
13+ outline: 1px dotted ButtonText;
14+}
15+:-moz-ui-invalid {
16+ box-shadow: none;
17+}
18+
19+@media (prefers-color-scheme: light) {
20+ :root {
21+ --white: #6a737d;
22+ --code: #fff8d3;
23+ --code-border: #f0d547;
24+ --pre: #f6f8fa;
25+ --bg-color: #fff;
26+ --text-color: #24292f;
27+ --link-color: #005cc5;
28+ --visited: #6f42c1;
29+ --blockquote: #005cc5;
30+ --blockquote-bg: #fff;
31+ --hover: #d73a49;
32+ --grey: #ccc;
33+ }
34+}
35+
36+@media (prefers-color-scheme: dark) {
37+ :root {
38+ --white: #f2f2f2;
39+ --code: #414558;
40+ --code-border: #252525;
41+ --pre: #252525;
42+ --bg-color: #282a36;
43+ --text-color: #f2f2f2;
44+ --link-color: #8be9fd;
45+ --visited: #bd93f9;
46+ --blockquote: #bd93f9;
47+ --blockquote-bg: #414558;
48+ --hover: #ff80bf;
49+ --grey: #414558;
50+ }
51+}
52+
53+html {
54+ background-color: var(--bg-color);
55+ color: var(--text-color);
56+ line-height: 1.5;
57+ font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen,
58+ Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", Arial,
59+ sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
60+ -webkit-text-size-adjust: 100%;
61+ -moz-tab-size: 4;
62+ tab-size: 4;
63+ font-size: 17px;
64+}
65+
66+body {
67+ margin: 0 auto;
68+ max-width: 42rem;
69+}
70+
71+img {
72+ max-width: 100%;
73+ height: auto;
74+}
75+
76+b,
77+strong {
78+ font-weight: bold;
79+}
80+
81+code,
82+kbd,
83+samp,
84+pre {
85+ font-family: ui-monospace, SFMono-Regular, Consolas, "Liberation Mono", Menlo,
86+ monospace;
87+ font-size: 0.8rem;
88+}
89+
90+code,
91+kbd,
92+samp {
93+ background-color: var(--code);
94+ border: 1px solid var(--code-border);
95+}
96+
97+pre > code {
98+ background-color: inherit;
99+ padding: 0;
100+ border: none;
101+}
102+
103+code {
104+ border-radius: 0.3rem;
105+ padding: 0.15rem 0.2rem 0.05rem;
106+}
107+
108+pre {
109+ border-radius: 5px;
110+ padding: 1rem;
111+ margin: 1rem 0;
112+ overflow-x: auto;
113+ background-color: var(--pre) !important;
114+}
115+
116+small {
117+ font-size: 0.8rem;
118+}
119+
120+summary {
121+ display: list-item;
122+}
123+
124+h1,
125+h2,
126+h3 {
127+ margin: 0;
128+ padding: 0.6rem 0 0 0;
129+ border: 0;
130+ font-style: normal;
131+ font-weight: inherit;
132+ font-size: inherit;
133+}
134+
135+hr {
136+ color: inherit;
137+ border: 0;
138+ margin: 0;
139+ height: 1px;
140+ background: var(--grey);
141+ margin: 2rem auto;
142+ text-align: center;
143+}
144+
145+a {
146+ text-decoration: underline;
147+ color: var(--link-color);
148+}
149+
150+a:hover,
151+a:visited:hover {
152+ color: var(--hover);
153+}
154+
155+a:visited {
156+ color: var(--visited);
157+}
158+
159+a.link-grey {
160+ text-decoration: underline;
161+ color: var(--white);
162+}
163+
164+a.link-grey:visited {
165+ color: var(--white);
166+}
167+
168+section {
169+ margin-bottom: 1.4rem;
170+}
171+
172+section:last-child {
173+ margin-bottom: 0;
174+}
175+
176+header {
177+ margin: 1rem auto;
178+}
179+
180+p {
181+ margin: 1rem 0;
182+}
183+
184+article {
185+ overflow-wrap: break-word;
186+}
187+
188+blockquote {
189+ border-left: 5px solid var(--blockquote);
190+ background-color: var(--blockquote-bg);
191+ padding: 0.8rem;
192+ margin: 1rem 0;
193+}
194+
195+blockquote > p {
196+ margin: 0;
197+}
198+
199+ul,
200+ol {
201+ padding: 0 0 0 2rem;
202+ list-style-position: outside;
203+}
204+
205+ul[style*="list-style-type: none;"] {
206+ padding: 0;
207+}
208+
209+li {
210+ margin: 0.5rem 0;
211+}
212+
213+li > pre {
214+ padding: 0;
215+}
216+
217+footer {
218+ text-align: center;
219+ margin-bottom: 4rem;
220+}
221+
222+dt {
223+ font-weight: bold;
224+}
225+
226+dd {
227+ margin-left: 0;
228+}
229+
230+dd:not(:last-child) {
231+ margin-bottom: 0.5rem;
232+}
233+
234+figure {
235+ margin: 0;
236+}
237+
238+.post-date {
239+ width: 130px;
240+}
241+
242+.text-grey {
243+ color: var(--grey);
244+}
245+
246+.text-2xl {
247+ font-size: 1.85rem;
248+ line-height: 1.15;
249+}
250+
251+.text-xl {
252+ font-size: 1.55rem;
253+ line-height: 1.15;
254+}
255+
256+.text-lg {
257+ font-size: 1.35rem;
258+ line-height: 1.15;
259+}
260+
261+.text-sm {
262+ font-size: 0.875rem;
263+}
264+
265+.text-center {
266+ text-align: center;
267+}
268+
269+.font-bold {
270+ font-weight: bold;
271+}
272+
273+.font-italic {
274+ font-style: italic;
275+}
276+
277+.inline {
278+ display: inline;
279+}
280+
281+.flex {
282+ display: flex;
283+}
284+
285+.items-center {
286+ align-items: center;
287+}
288+
289+.m-0 {
290+ margin: 0;
291+}
292+
293+.mb {
294+ margin-bottom: 0.5rem;
295+}
296+
297+.mr {
298+ margin-right: 0.5rem;
299+}
300+
301+.ml {
302+ margin-left: 0.5rem;
303+}
304+
305+.my {
306+ margin-top: 0.5rem;
307+ margin-bottom: 0.5rem;
308+}
309+
310+.mx {
311+ margin-left: 0.5rem;
312+ margin-right: 0.5rem;
313+}
314+
315+.mx-2 {
316+ margin-left: 1rem;
317+ margin-right: 1rem;
318+}
319+
320+.justify-between {
321+ justify-content: space-between;
322+}
323+
324+.flex-1 {
325+ flex: 1;
326+}
327+
328+.layout-aside {
329+ max-width: 50rem;
330+}
331+
332+.layout-aside aside {
333+ width: 200px;
334+}
335+
336+.layout-aside img {
337+ border-radius: 5px;
338+}
339+
340+#readme {
341+ display: none;
342+}
343+
344+@media only screen and (max-width: 600px) {
345+ body {
346+ padding: 1rem;
347+ }
348+
349+ header {
350+ margin: 0;
351+ }
352+
353+ .layout-aside main {
354+ flex-direction: column;
355+ }
356+
357+ aside {
358+ display: none;
359+ }
360+
361+ #readme {
362+ display: block;
363+ }
364+}
+2,
-0
1@@ -0,0 +1,2 @@
2+User-agent: *
3+Allow: /
+63,
-0
1@@ -0,0 +1,63 @@
2+package feeds
3+
4+import (
5+ "fmt"
6+ "strings"
7+ "time"
8+
9+ "github.com/picosh/pico/db"
10+ "github.com/picosh/pico/filehandlers"
11+ "github.com/picosh/pico/imgs"
12+ "github.com/picosh/pico/shared"
13+ "golang.org/x/exp/slices"
14+)
15+
16+type FeedHooks struct {
17+ Cfg *shared.ConfigSite
18+ Db db.DB
19+}
20+
21+func (p *FeedHooks) FileValidate(data *filehandlers.PostMetaData) (bool, error) {
22+ if !shared.IsTextFile(string(data.Text)) {
23+ err := fmt.Errorf(
24+ "WARNING: (%s) invalid file must be plain text (utf-8), skipping",
25+ data.Filename,
26+ )
27+ return false, err
28+ }
29+
30+ if !shared.IsExtAllowed(data.Filename, p.Cfg.AllowedExt) {
31+ extStr := strings.Join(p.Cfg.AllowedExt, ",")
32+ err := fmt.Errorf(
33+ "WARNING: (%s) invalid file, format must be (%s), skipping",
34+ data.Filename,
35+ extStr,
36+ )
37+ return false, err
38+ }
39+
40+ return true, nil
41+}
42+
43+func (p *FeedHooks) FileMeta(data *filehandlers.PostMetaData) error {
44+ linkify := imgs.NewImgsLinkify(data.Username)
45+ parsedText := shared.ListParseText(string(data.Text), linkify)
46+
47+ if parsedText.Title == "" {
48+ data.Title = shared.ToUpper(data.Slug)
49+ } else {
50+ data.Title = parsedText.Title
51+ }
52+
53+ data.Description = parsedText.Description
54+ data.Tags = parsedText.Tags
55+
56+ data.Hidden = slices.Contains(p.Cfg.HiddenPosts, data.Filename)
57+
58+ if data.Data.LastDigest == nil {
59+ now := time.Now()
60+ data.Data.LastDigest = &now
61+ }
62+
63+ return nil
64+}
M
go.mod
+6,
-0
1@@ -19,9 +19,11 @@ require (
2 github.com/matryer/is v1.4.0
3 github.com/microcosm-cc/bluemonday v1.0.21
4 github.com/minio/minio-go/v7 v7.0.45
5+ github.com/mmcdole/gofeed v1.1.3
6 github.com/muesli/reflow v0.3.0
7 github.com/neurosnap/go-exif-remove v0.0.0-20221010134343-50d1e3c35577
8 github.com/pkg/sftp v1.13.5
9+ github.com/sendgrid/sendgrid-go v3.12.0+incompatible
10 github.com/yuin/goldmark v1.5.3
11 github.com/yuin/goldmark-highlighting v0.0.0-20220208100518-594be1970594
12 github.com/yuin/goldmark-meta v1.1.0
13@@ -32,6 +34,8 @@ require (
14
15 require (
16 github.com/DavidGamba/go-getoptions v0.26.0 // indirect
17+ github.com/PuerkitoBio/goquery v1.5.1 // indirect
18+ github.com/andybalholm/cascadia v1.1.0 // indirect
19 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
20 github.com/atotto/clipboard v0.1.4 // indirect
21 github.com/aymanbagabas/go-osc52 v1.2.1 // indirect
22@@ -70,6 +74,7 @@ require (
23 github.com/minio/md5-simd v1.1.2 // indirect
24 github.com/minio/sha256-simd v1.0.0 // indirect
25 github.com/mitchellh/go-homedir v1.1.0 // indirect
26+ github.com/mmcdole/goxpp v0.0.0-20181012175147-0068e33feabf // indirect
27 github.com/mmcloughlin/md4 v0.1.2 // indirect
28 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
29 github.com/modern-go/reflect2 v1.0.2 // indirect
30@@ -83,6 +88,7 @@ require (
31 github.com/prometheus/procfs v0.8.0 // indirect
32 github.com/rivo/uniseg v0.4.3 // indirect
33 github.com/rs/xid v1.4.0 // indirect
34+ github.com/sendgrid/rest v2.6.9+incompatible // indirect
35 github.com/sirupsen/logrus v1.9.0 // indirect
36 go.uber.org/atomic v1.10.0 // indirect
37 go.uber.org/multierr v1.8.0 // indirect
M
go.sum
+18,
-464
1@@ -1,49 +1,12 @@
2-cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
3-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
4-cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
5-cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
6-cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
7-cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
8-cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
9-cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
10-cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
11-cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
12-cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
13-cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
14-cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
15-cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
16-cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
17-cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
18-cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
19-cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
20-cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
21-cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
22-cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
23-cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
24-cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
25-cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
26-cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
27-cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
28-cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
29-cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
30-cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
31-cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
32-cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
33-cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
34-dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
35 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
36-github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
37-github.com/DavidGamba/go-getoptions v0.25.3 h1:lSPcMkwWvVZU05C+Uz4DKnKN5wz4bcD1QvJ/QHCRexo=
38-github.com/DavidGamba/go-getoptions v0.25.3/go.mod h1:qLaLSYeQ8sUVOfKuu5JT5qKKS3OCwyhkYSJnoG+ggmo=
39 github.com/DavidGamba/go-getoptions v0.26.0 h1:3Hy0o6xTYs9icM5uPNqqck5PyZm5lZWRIDH/n5SV2uw=
40 github.com/DavidGamba/go-getoptions v0.26.0/go.mod h1:qLaLSYeQ8sUVOfKuu5JT5qKKS3OCwyhkYSJnoG+ggmo=
41+github.com/PuerkitoBio/goquery v1.5.1 h1:PSPBGne8NIUWw+/7vFBV+kG2J/5MOjbzc7154OaKCSE=
42+github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
43 github.com/alecthomas/chroma v0.10.0 h1:7XDcGkCQopCNKjZHfYrNLraA+M7e0fMiJ/Mfikbfjek=
44 github.com/alecthomas/chroma v0.10.0/go.mod h1:jtJATyUxlIORhUOFNA9NZDWGAQ8wpxQQqNSB4rjA/1s=
45-github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
46-github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
47-github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
48-github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
49-github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
50+github.com/andybalholm/cascadia v1.1.0 h1:BuuO6sSfQNFRu1LppgbD25Hr2vLYW25JvxHs5zzsLTo=
51+github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
52 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
53 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
54 github.com/antoniomika/go-rsync-receiver v0.0.0-20220901010427-e6494124f0c8 h1:gR27C6N8s5b+ciBRymi0zhUx8TylKFO755z6yrBuMiI=
55@@ -58,49 +21,30 @@ github.com/aymanbagabas/go-osc52 v1.2.1/go.mod h1:zT8H+Rk4VSabYN90pWyugflM3ZhpTZ
56 github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
57 github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
58 github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
59-github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
60-github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
61 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
62 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
63 github.com/caarlos0/sshmarshal v0.1.0 h1:zTCZrDORFfWh526Tsb7vCm3+Yg/SfW/Ub8aQDeosk0I=
64 github.com/caarlos0/sshmarshal v0.1.0/go.mod h1:7Pd/0mmq9x/JCzKauogNjSQEhivBclCQHfr9dlpDIyA=
65-github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
66-github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
67-github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
68-github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
69 github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
70 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
71-github.com/charmbracelet/bubbles v0.13.0 h1:zP/ROH3wJEBqZWKIsD50ZKKlx3ydLInq3LdD/Nrlb8w=
72-github.com/charmbracelet/bubbles v0.13.0/go.mod h1:bbeTiXwPww4M031aGi8UK2HT9RDWoiNibae+1yCMtcc=
73 github.com/charmbracelet/bubbles v0.14.0 h1:DJfCwnARfWjZLvMglhSQzo76UZ2gucuHPy9jLWX45Og=
74 github.com/charmbracelet/bubbles v0.14.0/go.mod h1:bbeTiXwPww4M031aGi8UK2HT9RDWoiNibae+1yCMtcc=
75 github.com/charmbracelet/bubbletea v0.21.0/go.mod h1:GgmJMec61d08zXsOhqRC/AiOx4K4pmz+VIcRIm1FKr4=
76-github.com/charmbracelet/bubbletea v0.22.1 h1:z66q0LWdJNOWEH9zadiAIXp2GN1AWrwNXU8obVY9X24=
77-github.com/charmbracelet/bubbletea v0.22.1/go.mod h1:8/7hVvbPN6ZZPkczLiB8YpLkLJ0n7DMho5Wvfd2X1C0=
78 github.com/charmbracelet/bubbletea v0.23.1 h1:CYdteX1wCiCzKNUlwm25ZHBIc1GXlYFyUIte8WPvhck=
79 github.com/charmbracelet/bubbletea v0.23.1/go.mod h1:JAfGK/3/pPKHTnAS8JIE2u9f61BjWTQY57RbT25aMXU=
80 github.com/charmbracelet/harmonica v0.2.0/go.mod h1:KSri/1RMQOZLbw7AHqgcBycp8pgJnQMYYT8QZRqZ1Ao=
81 github.com/charmbracelet/keygen v0.3.0 h1:mXpsQcH7DDlST5TddmXNXjS0L7ECk4/kLQYyBcsan2Y=
82 github.com/charmbracelet/keygen v0.3.0/go.mod h1:1ukgO8806O25lUZ5s0IrNur+RlwTBERlezdgW71F5rM=
83-github.com/charmbracelet/lipgloss v0.5.0 h1:lulQHuVeodSgDez+3rGiuxlPVXSnhth442DATR2/8t8=
84 github.com/charmbracelet/lipgloss v0.5.0/go.mod h1:EZLha/HbzEt7cYqdFPovlqy5FZPj0xFhg5SaqxScmgs=
85 github.com/charmbracelet/lipgloss v0.6.0 h1:1StyZB9vBSOyuZxQUcUwGr17JmojPNm87inij9N3wJY=
86 github.com/charmbracelet/lipgloss v0.6.0/go.mod h1:tHh2wr34xcHjC2HCXIlGSG1jaDF0S0atAUvBMP6Ppuk=
87-github.com/charmbracelet/promwish v0.2.0 h1:oM8xEx3Rzzm3h5fA6HTMyzqHq4UB0KdpFPVvIHB75kY=
88-github.com/charmbracelet/promwish v0.2.0/go.mod h1:wzjxGnC6kf6SxzIf77+UWKA+meovSYPjFDc9yIlfiY0=
89 github.com/charmbracelet/promwish v0.3.0 h1:qRIwx1GgPwIXanf868lEPZ4pQ6NT0ltaZJw+lkiok20=
90 github.com/charmbracelet/promwish v0.3.0/go.mod h1:Qxm2h8DDuCR4SLoOM4+O1O67gKCsM5GovAHT7makJvU=
91-github.com/charmbracelet/wish v0.5.0 h1:FkkdNBFqrLABR1ciNrAL2KCxoyWfKhXnIGZw6GfAtPg=
92-github.com/charmbracelet/wish v0.5.0/go.mod h1:5GAn5SrDSZ7cgKjnC+3kDmiIo7I6k4/AYiRzC4+tpCk=
93 github.com/charmbracelet/wish v0.7.0 h1:rdfacCWaKCQpCMPbOKfi68GYqsb+9CnUzN1Ov/INZJ0=
94 github.com/charmbracelet/wish v0.7.0/go.mod h1:16EQz7k3hEgPkPENghcpEddvlrmucIudE0jnczKr+k4=
95-github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
96-github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
97-github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
98-github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
99-github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
100 github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw=
101 github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U=
102+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
103 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
104 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
105 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
106@@ -110,14 +54,10 @@ github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44am
107 github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
108 github.com/dlclark/regexp2 v1.7.0 h1:7lJfhqlPssTb1WQx4yvTHN0uElPEv52sbaECrAQxjAo=
109 github.com/dlclark/regexp2 v1.7.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
110-github.com/dsoprea/go-exif v0.0.0-20221003173339-dae547f073ed h1:2WqGwQ1z5GL8D64CGvUKD4LEO9FbITymvNrrYKXb9Bc=
111-github.com/dsoprea/go-exif v0.0.0-20221003173339-dae547f073ed/go.mod h1:lOaOt7+UEppOgyvRy749v3do836U/hw0YVJNjoyPaEs=
112 github.com/dsoprea/go-exif v0.0.0-20221012082141-d21ac8e2de85 h1:+wKSjK8wh5Ybb63Fx1QvTSIfWU/n1nmqEzZy+82pqbQ=
113 github.com/dsoprea/go-exif v0.0.0-20221012082141-d21ac8e2de85/go.mod h1:lOaOt7+UEppOgyvRy749v3do836U/hw0YVJNjoyPaEs=
114 github.com/dsoprea/go-exif/v2 v2.0.0-20200321225314-640175a69fe4/go.mod h1:Lm2lMM2zx8p4a34ZemkaUV95AnMl4ZvLbCUbwOvLC2E=
115 github.com/dsoprea/go-exif/v2 v2.0.0-20200604193436-ca8584a0e1c4/go.mod h1:9EXlPeHfblFFnwu5UOqmP2eoZfJyAZ2Ri/Vki33ajO0=
116-github.com/dsoprea/go-exif/v2 v2.0.0-20221003173339-dae547f073ed h1:3gxncZYV3qAHC5NLCzdSI4Oamc3jn7m2vheHx29nXbE=
117-github.com/dsoprea/go-exif/v2 v2.0.0-20221003173339-dae547f073ed/go.mod h1:oKrjk2kb3rAR5NbtSTLUMvMSbc+k8ZosI3MaVH47noc=
118 github.com/dsoprea/go-exif/v2 v2.0.0-20221012082141-d21ac8e2de85 h1:sgMOHQHMiddteUitH9QYgaRTwAcqqr5X9z5j4yNXDuY=
119 github.com/dsoprea/go-exif/v2 v2.0.0-20221012082141-d21ac8e2de85/go.mod h1:oKrjk2kb3rAR5NbtSTLUMvMSbc+k8ZosI3MaVH47noc=
120 github.com/dsoprea/go-exif/v3 v3.0.0-20200717053412-08f1b6708903/go.mod h1:0nsO1ce0mh5czxGeLo4+OCZ/C6Eo6ZlMWsz7rH/Gxv8=
121@@ -140,12 +80,6 @@ github.com/dsoprea/go-utility v0.0.0-20221003172846-a3e1774ef349/go.mod h1:KVK+/
122 github.com/dsoprea/go-utility/v2 v2.0.0-20200717064901-2fccff4aa15e/go.mod h1:uAzdkPTub5Y9yQwXe8W4m2XuP0tK4a9Q/dantD0+uaU=
123 github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
124 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
125-github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
126-github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
127-github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
128-github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
129-github.com/gliderlabs/ssh v0.3.4 h1:+AXBtim7MTKaLVPgvE+3mhewYRawNLTd+jEEz/wExZw=
130-github.com/gliderlabs/ssh v0.3.4/go.mod h1:ZSS+CUoKHDrqVakTfTWUlKSr9MtMFkC4UvtQKD7O914=
131 github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY=
132 github.com/gliderlabs/ssh v0.3.5/go.mod h1:8XB4KraRrX39qHhT6yxPsHedjA08I/uBVwj4xC+/+z4=
133 github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
134@@ -153,121 +87,43 @@ github.com/go-errors/errors v1.0.2/go.mod h1:psDX2osz5VnTOnFWbDeWwS7yejl+uV3FEWE
135 github.com/go-errors/errors v1.1.1/go.mod h1:psDX2osz5VnTOnFWbDeWwS7yejl+uV3FEWEp4lssFEs=
136 github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
137 github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
138-github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
139-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
140-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
141-github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
142-github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
143-github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
144-github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
145-github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
146-github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
147-github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
148-github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
149-github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
150 github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b/go.mod h1:aUCEOzzezBEjDBbFBoSiya/gduyIiWYRP6CnSFIV8AM=
151 github.com/go-xmlfmt/xmlfmt v1.1.2 h1:Nea7b4icn8s57fTx1M5AI4qQT5HEM3rVUO8MuE6g80U=
152 github.com/go-xmlfmt/xmlfmt v1.1.2/go.mod h1:aUCEOzzezBEjDBbFBoSiya/gduyIiWYRP6CnSFIV8AM=
153-github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
154 github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI=
155 github.com/golang/geo v0.0.0-20200319012246-673a6f80352d/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI=
156 github.com/golang/geo v0.0.0-20210211234256-740aa86cb551 h1:gtexQ/VGyN+VVFRXSFiguSNcXmS6rkKT+X7FdIrTtfo=
157 github.com/golang/geo v0.0.0-20210211234256-740aa86cb551/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI=
158-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
159-github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
160-github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
161-github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
162-github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
163-github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
164-github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
165-github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
166-github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
167-github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
168-github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
169 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
170-github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
171-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
172-github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
173-github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
174 github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
175-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
176-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
177-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
178-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
179-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
180-github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
181-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
182-github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
183 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
184 github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
185 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
186-github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
187-github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
188-github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
189-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
190-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
191-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
192-github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
193-github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
194-github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
195-github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
196 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
197 github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
198 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
199-github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
200-github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
201-github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
202-github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
203-github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
204-github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
205-github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
206-github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
207-github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
208-github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
209 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
210 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
211 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
212 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
213-github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
214-github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
215 github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY=
216 github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c=
217 github.com/gorilla/feeds v1.1.1 h1:HwKXxqzcRNg9to+BbvJog4+f3s/xzvtZXICcQGutYfY=
218 github.com/gorilla/feeds v1.1.1/go.mod h1:Nk0jZrvPFZX1OBe5NPiddPw7CfwF6Q9eqzaBbaightA=
219-github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
220-github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
221-github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
222 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
223-github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
224-github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
225 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
226-github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
227 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
228 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
229-github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
230-github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
231-github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
232-github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
233-github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
234-github.com/klauspost/compress v1.15.9 h1:wKRjX6JRtDdrE9qwa4b/Cip7ACOshUI4smpCQanqjSY=
235-github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU=
236 github.com/klauspost/compress v1.15.13 h1:NFn1Wr8cfnenSJSA46lLq4wHCcBzKTSjnBIexDMMOV0=
237 github.com/klauspost/compress v1.15.13/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM=
238 github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
239 github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
240-github.com/klauspost/cpuid/v2 v2.1.1 h1:t0wUqjowdm8ezddV5k0tLWVklVuvLJpoHeb4WBdydm0=
241-github.com/klauspost/cpuid/v2 v2.1.1/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
242 github.com/klauspost/cpuid/v2 v2.2.2 h1:xPMwiykqNK9VK0NYC3+jTMYv9I6Vl3YdjZgPZKG3zO0=
243 github.com/klauspost/cpuid/v2 v2.2.2/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
244-github.com/kolesa-team/go-webp v1.0.1 h1:Btojkbzr6tt10zJ40xlbSfJeHFiNn0aR7H03QUqmMoI=
245-github.com/kolesa-team/go-webp v1.0.1/go.mod h1:oMvdivD6K+Q5qIIkVC2w4k2ZUnI1H+MyP7inwgWq9aA=
246 github.com/kolesa-team/go-webp v1.0.2 h1:XCrWqxI7tNOI3dr0YufD9TUb+54vBDogg9KsHH7q5Lc=
247 github.com/kolesa-team/go-webp v1.0.2/go.mod h1:oMvdivD6K+Q5qIIkVC2w4k2ZUnI1H+MyP7inwgWq9aA=
248-github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
249-github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
250 github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8=
251 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
252-github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
253 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
254 github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
255 github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
256@@ -276,8 +132,6 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
257 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
258 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
259 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
260-github.com/lib/pq v1.10.6 h1:jbk+ZieJ0D7EVGJYpL9QTz7/YW6UHbmdnZWYyK5cdBs=
261-github.com/lib/pq v1.10.6/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
262 github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw=
263 github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
264 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
265@@ -291,40 +145,34 @@ github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2J
266 github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88=
267 github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
268 github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
269-github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU=
270 github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
271 github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
272 github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
273-github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
274-github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
275 github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
276 github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
277-github.com/microcosm-cc/bluemonday v1.0.19 h1:OI7hoF5FY4pFz2VA//RN8TfM0YJ2dJcl4P4APrCWy6c=
278-github.com/microcosm-cc/bluemonday v1.0.19/go.mod h1:QNzV2UbLK2/53oIIwTOyLUSABMkjZ4tqiyC1g/DyqxE=
279 github.com/microcosm-cc/bluemonday v1.0.21 h1:dNH3e4PSyE4vNX+KlRGHT5KrSvjeUkoNPwEORjffHJg=
280 github.com/microcosm-cc/bluemonday v1.0.21/go.mod h1:ytNkv4RrDrLJ2pqlsSI46O6IVXmZOBBD4SaJyDwwTkM=
281 github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
282 github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
283-github.com/minio/minio-go/v7 v7.0.35 h1:JuPPxWLdxQmNLSaS8AWZnO5HBadeI1xg6FGrEELQEVU=
284-github.com/minio/minio-go/v7 v7.0.35/go.mod h1:nCrRzjoSUQh8hgKKtu3Y708OLvRLtuASMg2/nvmbarw=
285 github.com/minio/minio-go/v7 v7.0.45 h1:g4IeM9M9pW/Lo8AGGNOjBZYlvmtlE1N5TQEYWXRWzIs=
286 github.com/minio/minio-go/v7 v7.0.45/go.mod h1:nCrRzjoSUQh8hgKKtu3Y708OLvRLtuASMg2/nvmbarw=
287 github.com/minio/sha256-simd v1.0.0 h1:v1ta+49hkWZyvaKwrQB8elexRqm6Y0aMLjCNsrYxo6g=
288 github.com/minio/sha256-simd v1.0.0/go.mod h1:OuYzVNI5vcoYIAmbIvHPl3N3jUzVedXbKy5RFepssQM=
289 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
290 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
291+github.com/mmcdole/gofeed v1.1.3 h1:pdrvMb18jMSLidGp8j0pLvc9IGziX4vbmvVqmLH6z8o=
292+github.com/mmcdole/gofeed v1.1.3/go.mod h1:QQO3maftbOu+hiVOGOZDRLymqGQCos4zxbA4j89gMrE=
293+github.com/mmcdole/goxpp v0.0.0-20181012175147-0068e33feabf h1:sWGE2v+hO0Nd4yFU/S/mDBM5plIU8v/Qhfz41hkDIAI=
294+github.com/mmcdole/goxpp v0.0.0-20181012175147-0068e33feabf/go.mod h1:pasqhqstspkosTneA62Nc+2p9SOBBYAPbnmRRWPQ0V8=
295 github.com/mmcloughlin/md4 v0.1.2 h1:kGYl+iNbxhyz4u76ka9a+0TXP9KWt/LmnM0QhZwhcBo=
296 github.com/mmcloughlin/md4 v0.1.2/go.mod h1:AAxFX59fddW0IguqNzWlf1lazh1+rXeIt/Bj49cqDTQ=
297 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
298 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
299 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
300 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
301-github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
302 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
303 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
304 github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b/go.mod h1:fQuZ0gauxyBcmsdE3ZT4NasjaRdxmbCS0jRHsrWu3Ho=
305-github.com/muesli/ansi v0.0.0-20211031195517-c9f0611b6c70 h1:kMlmsLSbjkikxQJ1IPwaM+7LJ9ltFu/fi8CRzvSnQmA=
306-github.com/muesli/ansi v0.0.0-20211031195517-c9f0611b6c70/go.mod h1:fQuZ0gauxyBcmsdE3ZT4NasjaRdxmbCS0jRHsrWu3Ho=
307 github.com/muesli/ansi v0.0.0-20221106050444-61f0cd9a192a h1:jlDOeO5TU0pYlbc/y6PFguab5IjANI0Knrpg3u/ton4=
308 github.com/muesli/ansi v0.0.0-20221106050444-61f0cd9a192a/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo=
309 github.com/muesli/cancelreader v0.2.0/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo=
310@@ -335,86 +183,49 @@ github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s=
311 github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8=
312 github.com/muesli/termenv v0.11.1-0.20220204035834-5ac8409525e0/go.mod h1:Bd5NYQ7pd+SrtBSrSNoBBmXlcY8+Xj4BMJgh8qcZrvs=
313 github.com/muesli/termenv v0.11.1-0.20220212125758-44cd13922739/go.mod h1:Bd5NYQ7pd+SrtBSrSNoBBmXlcY8+Xj4BMJgh8qcZrvs=
314-github.com/muesli/termenv v0.12.0 h1:KuQRUE3PgxRFWhq4gHvZtPSLCGDqM5q/cYr1pZ39ytc=
315-github.com/muesli/termenv v0.12.0/go.mod h1:WCCv32tusQ/EEZ5S8oUIIrC/nIuBcxCVqlN4Xfkv+7A=
316 github.com/muesli/termenv v0.13.0 h1:wK20DRpJdDX8b7Ek2QfhvqhRQFZ237RGRO0RQ/Iqdy0=
317 github.com/muesli/termenv v0.13.0/go.mod h1:sP1+uffeLaEYpyOTb8pLCUctGcGLnoFjSn4YJK5e2bc=
318-github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
319-github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
320 github.com/neurosnap/go-exif-remove v0.0.0-20221010134343-50d1e3c35577 h1:hVmVNttSLNloGsbFKVXAUHonXTd8KKrv30U/8UkloKI=
321 github.com/neurosnap/go-exif-remove v0.0.0-20221010134343-50d1e3c35577/go.mod h1:G3Cu1AW+dmRLDFpOi8eUAfc3cGoRHUjTkGjeRcndgl4=
322 github.com/neurosnap/go-jpeg-image-structure v0.0.0-20221010133817-70b1c1ff679e h1:76Dng5ms0fR+26doKZAvNqhi2UPfnLxGfPIDEr+BBlM=
323 github.com/neurosnap/go-jpeg-image-structure v0.0.0-20221010133817-70b1c1ff679e/go.mod h1:nZBDA7+RD63GDJwjZmxhxac65MJqiCIHUUUvdYOsFkk=
324-github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
325 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
326-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
327-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
328-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
329 github.com/pkg/sftp v1.13.5 h1:a3RLUqkyjYRtBTZJZ1VRrKbN3zhuPLlUc3sphVz81go=
330 github.com/pkg/sftp v1.13.5/go.mod h1:wHDZ0IZX6JcBYRK1TH9bcVq8G7TLpVHYIGJRFnmPfxg=
331 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
332 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
333-github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
334-github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
335-github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
336-github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
337-github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
338-github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU=
339-github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ=
340 github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw=
341 github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y=
342-github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
343-github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
344-github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
345-github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M=
346-github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
347 github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4=
348 github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w=
349-github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
350-github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
351-github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
352-github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
353-github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE=
354-github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA=
355 github.com/prometheus/common v0.38.0 h1:VTQitp6mXTdUoCmDMugDVOJ1opi6ADftKfp/yeqTR/E=
356 github.com/prometheus/common v0.38.0/go.mod h1:MBXfmBQZrK5XpbCkjofnXs96LD2QQ7fEq4C0xjC/yec=
357-github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
358-github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
359-github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
360-github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
361-github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
362 github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo=
363 github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4=
364 github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
365 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
366-github.com/rivo/uniseg v0.3.4 h1:3Z3Eu6FGHZWSfNKJTOUiPatWwfc7DzJRU04jFUqJODw=
367-github.com/rivo/uniseg v0.3.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
368 github.com/rivo/uniseg v0.4.3 h1:utMvzDsuh3suAEnhH0RdHmoPbU648o6CvXxTx4SBMOw=
369 github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
370-github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
371 github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k=
372 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
373 github.com/rs/xid v1.4.0 h1:qd7wPTDkN6KQx2VmMBLrpHkiyQwgFXRnkOLacUiaSNY=
374 github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
375+github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
376 github.com/sahilm/fuzzy v0.1.0/go.mod h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8ZK9Y=
377 github.com/scylladb/termtables v0.0.0-20191203121021-c4c0b6d42ff4/go.mod h1:C1a7PQSMz9NShzorzCiG2fk9+xuCgLkPeCvMHYR2OWg=
378-github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
379-github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
380-github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
381+github.com/sendgrid/rest v2.6.9+incompatible h1:1EyIcsNdn9KIisLW50MKwmSRSK+ekueiEMJ7NEoxJo0=
382+github.com/sendgrid/rest v2.6.9+incompatible/go.mod h1:kXX7q3jZtJXK5c5qK83bSGMdV6tsOE70KbHoqJls4lE=
383+github.com/sendgrid/sendgrid-go v3.12.0+incompatible h1:/N2vx18Fg1KmQOh6zESc5FJB8pYwt5QFBDflYPh1KVg=
384+github.com/sendgrid/sendgrid-go v3.12.0+incompatible/go.mod h1:QRQt+LX/NmgVEvmdRw0VT/QgUn499+iza2FnDca9fg8=
385+github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
386 github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
387 github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
388 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
389-github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
390-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
391 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
392-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
393 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
394 github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
395-github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
396-github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
397-github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
398+github.com/urfave/cli v1.22.3/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
399 github.com/yuin/goldmark v1.4.5/go.mod h1:rmuwmfZ0+bvzB24eSC//bk1R1Zp3hM0OXYv/G2LIilg=
400-github.com/yuin/goldmark v1.4.13 h1:fVcFKWvrslecOb/tg+Cc05dkeYx540o0FuFt3nUVDoE=
401 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
402 github.com/yuin/goldmark v1.5.3 h1:3HUJmBFbQW9fhQOzMgseU134xfi6hU+mjWywx5Ty+/M=
403 github.com/yuin/goldmark v1.5.3/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
404@@ -422,173 +233,53 @@ github.com/yuin/goldmark-highlighting v0.0.0-20220208100518-594be1970594 h1:yHfZ
405 github.com/yuin/goldmark-highlighting v0.0.0-20220208100518-594be1970594/go.mod h1:U9ihbh+1ZN7fR5Se3daSPoz1CGF9IYtSvWwVQtnzGHU=
406 github.com/yuin/goldmark-meta v1.1.0 h1:pWw+JLHGZe8Rk0EGsMVssiNb/AaPMHfSRszZeUeiOUc=
407 github.com/yuin/goldmark-meta v1.1.0/go.mod h1:U4spWENafuA7Zyg+Lj5RqK/MF+ovMYtBvXi1lBb2VP0=
408-go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
409-go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
410-go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
411-go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
412-go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
413 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
414 go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
415 go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
416 go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
417 go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8=
418 go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
419-go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY=
420-go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY=
421 go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
422 go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
423-golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
424 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
425-golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
426-golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
427-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
428-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
429-golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
430 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
431 golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
432 golang.org/x/crypto v0.0.0-20220826181053-bd7e27e6170d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
433-golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 h1:Y/gsMcFOcR+6S6f3YeMKl5g+dZMEWqcz5Czj/GWYbkM=
434-golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
435 golang.org/x/crypto v0.4.0 h1:UVQgzMY87xqpKNgb+kDsll2Igd33HszWHFLmpaRMq/8=
436 golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80=
437-golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
438-golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
439-golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
440-golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
441-golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
442-golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
443-golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
444-golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
445-golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
446-golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
447-golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 h1:tnebWN09GYg9OLPss1KXj8txwZc6X6uMr6VFdcGNbHw=
448-golang.org/x/exp v0.0.0-20220827204233-334a2380cb91/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
449 golang.org/x/exp v0.0.0-20221211140036-ad323defaf05 h1:T8EldfGCcveFMewH5xAYxxoX3PSQMrsechlUGVFlQBU=
450 golang.org/x/exp v0.0.0-20221211140036-ad323defaf05/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
451-golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
452-golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
453 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
454 golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
455-golang.org/x/image v0.0.0-20220722155232-062f8c9fd539 h1:/eM0PCrQI2xd471rI+snWuu251/+/jpBpZqir2mPdnU=
456-golang.org/x/image v0.0.0-20220722155232-062f8c9fd539/go.mod h1:doUCurBvlfPMKfmIpRIywoHmhN3VyhnoFDbvIEWF4hY=
457 golang.org/x/image v0.2.0 h1:/DcQ0w3VHKCC5p0/P2B0JpAZ9Z++V2KOo2fyU89CXBQ=
458 golang.org/x/image v0.2.0/go.mod h1:la7oBXb9w3YFjBqaAwtynVioc1ZvOnNteUNrifGNmAI=
459-golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
460-golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
461-golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
462-golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
463-golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
464-golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
465-golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
466-golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
467-golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
468-golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
469-golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
470-golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
471-golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
472-golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
473-golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
474-golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
475-golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
476-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
477 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
478-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
479-golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
480-golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
481-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
482-golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
483-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
484-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
485-golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
486-golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
487-golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
488-golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
489+golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
490 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
491-golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
492-golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
493 golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
494-golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
495 golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
496-golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
497-golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
498 golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
499 golang.org/x/net v0.0.0-20200320220750-118fecf932d8/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
500-golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
501 golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
502-golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
503 golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
504 golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
505-golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
506-golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
507-golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
508 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
509-golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
510 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
511-golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
512-golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
513 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
514 golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
515-golang.org/x/net v0.0.0-20221004154528-8021a29435af h1:wv66FM3rLZGPdxpYL+ApnDe2HzHcTFta3z5nsc13wI4=
516-golang.org/x/net v0.0.0-20221004154528-8021a29435af/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
517 golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU=
518 golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
519-golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
520-golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
521-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
522-golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
523-golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
524-golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
525-golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
526-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
527-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
528 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
529-golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
530 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
531-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
532-golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
533-golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
534-golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
535 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
536-golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
537-golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
538-golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
539 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
540-golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
541-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
542-golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
543-golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
544-golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
545-golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
546-golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
547-golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
548-golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
549-golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
550-golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
551-golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
552-golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
553-golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
554-golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
555-golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
556-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
557-golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
558 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
559-golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
560-golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
561-golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
562-golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
563-golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
564-golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
565-golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
566-golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
567 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
568 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
569 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
570-golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
571 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
572-golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
573 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
574 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
575-golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
576 golang.org/x/sys v0.0.0-20220204135822-1c1b9b1eba6a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
577 golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
578 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
579@@ -598,163 +289,36 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
580 golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
581 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
582 golang.org/x/sys v0.0.0-20220825204002-c680a09ffe64/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
583-golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 h1:v6hYoSR9T5oet+pMXwUWkbiVqx/63mlHjefrHmxwfeY=
584-golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
585 golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
586 golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
587 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
588 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
589-golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 h1:Q5284mrmYTpACcm+eAKjKJH48BBwSyfJqmmGDTtT8Vc=
590 golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
591 golang.org/x/term v0.3.0 h1:qoo4akIqOcDME5bhc/NgxUdovd6BSS2uMsVjB56q1xI=
592 golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
593-golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
594 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
595-golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
596 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
597 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
598 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
599-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
600 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
601 golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM=
602 golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
603-golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
604-golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
605-golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
606 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
607-golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
608-golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
609-golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
610-golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
611-golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
612-golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
613-golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
614-golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
615-golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
616-golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
617-golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
618-golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
619-golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
620-golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
621-golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
622-golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
623 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
624-golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
625-golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
626-golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
627-golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
628-golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
629-golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
630-golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
631-golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
632-golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
633-golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
634-golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
635-golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
636-golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
637-golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
638-golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
639-golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
640-golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
641-golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
642-golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
643-golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
644-golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
645-golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
646 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
647 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
648-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
649 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
650-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
651-google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
652-google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
653-google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
654-google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
655-google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
656-google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
657-google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
658-google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
659-google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
660-google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
661-google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
662-google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
663-google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
664-google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
665-google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
666-google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
667-google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
668-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
669-google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
670-google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
671-google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
672-google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
673-google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
674-google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
675-google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
676-google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
677-google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
678-google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
679-google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
680-google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
681-google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
682-google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
683-google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
684-google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
685-google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
686-google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
687-google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
688-google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
689-google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
690-google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
691-google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
692-google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
693-google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
694-google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
695-google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
696-google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
697-google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
698-google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
699-google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
700-google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
701-google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
702-google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
703-google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
704-google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
705-google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
706-google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
707-google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
708-google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
709-google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
710-google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
711-google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
712-google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
713-google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
714-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
715-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
716-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
717-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
718-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
719-google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
720-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
721-google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
722-google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
723-google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
724 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
725 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
726 google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
727 google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
728-gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
729 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
730 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
731-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
732-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
733+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
734 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
735 gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
736 gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
737-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
738 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
739-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
740-gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
741 gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
742 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
743 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
744@@ -762,13 +326,3 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
745 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
746 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
747 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
748-honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
749-honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
750-honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
751-honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
752-honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
753-honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
754-honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
755-rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
756-rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
757-rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
+31,
-31
1@@ -63,7 +63,7 @@ type PostPageData struct {
2 Username string
3 BlogName string
4 ListType string
5- Items []*ListItem
6+ Items []*shared.ListItem
7 PublishAtISO string
8 PublishAt string
9 Tags []string
10@@ -77,7 +77,7 @@ type TransparencyPageData struct {
11 type HeaderTxt struct {
12 Title string
13 Bio string
14- Nav []*ListItem
15+ Nav []*shared.ListItem
16 Layout string
17 HasItems bool
18 }
19@@ -85,7 +85,7 @@ type HeaderTxt struct {
20 type ReadmeTxt struct {
21 HasItems bool
22 ListType string
23- Items []*ListItem
24+ Items []*shared.ListItem
25 }
26
27 func getPostsForUser(r *http.Request, user *db.User, tag string, num int) ([]*db.Post, error) {
28@@ -161,17 +161,17 @@ func blogHandler(w http.ResponseWriter, r *http.Request) {
29 header, err := dbpool.FindPostWithFilename("_header.txt", user.ID, cfg.Space)
30 if err == nil {
31 linkify := imgs.NewImgsLinkify(username)
32- parsedText := ParseText(header.Text, linkify)
33- if parsedText.MetaData.Title != "" {
34- headerTxt.Title = parsedText.MetaData.Title
35+ parsedText := shared.ListParseText(header.Text, linkify)
36+ if parsedText.Title != "" {
37+ headerTxt.Title = parsedText.Title
38 }
39
40- if parsedText.MetaData.Description != "" {
41- headerTxt.Bio = parsedText.MetaData.Description
42+ if parsedText.Description != "" {
43+ headerTxt.Bio = parsedText.Description
44 }
45
46- if parsedText.MetaData.Layout != "" {
47- headerTxt.Layout = parsedText.MetaData.Layout
48+ if parsedText.Layout != "" {
49+ headerTxt.Layout = parsedText.Layout
50 }
51
52 headerTxt.Nav = parsedText.Items
53@@ -184,9 +184,9 @@ func blogHandler(w http.ResponseWriter, r *http.Request) {
54 readme, err := dbpool.FindPostWithFilename("_readme.txt", user.ID, cfg.Space)
55 if err == nil {
56 linkify := imgs.NewImgsLinkify(username)
57- parsedText := ParseText(readme.Text, linkify)
58+ parsedText := shared.ListParseText(readme.Text, linkify)
59 readmeTxt.Items = parsedText.Items
60- readmeTxt.ListType = parsedText.MetaData.ListType
61+ readmeTxt.ListType = parsedText.ListType
62 if len(readmeTxt.Items) > 0 {
63 readmeTxt.HasItems = true
64 }
65@@ -301,23 +301,23 @@ func postHandler(w http.ResponseWriter, r *http.Request) {
66 blogName := GetBlogName(username)
67 linkify := imgs.NewImgsLinkify(username)
68 if header != nil {
69- headerParsed := ParseText(header.Text, linkify)
70- if headerParsed.MetaData.Title != "" {
71- blogName = headerParsed.MetaData.Title
72+ headerParsed := shared.ListParseText(header.Text, linkify)
73+ if headerParsed.Title != "" {
74+ blogName = headerParsed.Title
75 }
76 }
77
78 var data PostPageData
79 post, err := dbpool.FindPostWithSlug(slug, user.ID, cfg.Space)
80 if err == nil {
81- parsedText := ParseText(post.Text, linkify)
82+ parsedText := shared.ListParseText(post.Text, linkify)
83
84 // we need the blog name from the readme unfortunately
85 readme, err := dbpool.FindPostWithFilename("_readme.txt", user.ID, cfg.Space)
86 if err == nil {
87- readmeParsed := ParseText(readme.Text, linkify)
88- if readmeParsed.MetaData.Title != "" {
89- blogName = readmeParsed.MetaData.Title
90+ readmeParsed := shared.ListParseText(readme.Text, linkify)
91+ if readmeParsed.Title != "" {
92+ blogName = readmeParsed.Title
93 }
94 }
95
96@@ -335,14 +335,14 @@ func postHandler(w http.ResponseWriter, r *http.Request) {
97 URL: template.URL(cfg.PostURL(post.Username, post.Slug)),
98 BlogURL: template.URL(cfg.BlogURL(username)),
99 Description: post.Description,
100- ListType: parsedText.MetaData.ListType,
101+ ListType: parsedText.ListType,
102 Title: shared.FilenameToTitle(post.Filename, post.Title),
103 PublishAt: post.PublishAt.Format("02 Jan, 2006"),
104 PublishAtISO: post.PublishAt.Format(time.RFC3339),
105 Username: username,
106 BlogName: blogName,
107 Items: parsedText.Items,
108- Tags: parsedText.MetaData.Tags,
109+ Tags: parsedText.Tags,
110 }
111 } else {
112 logger.Infof("post not found %s/%s", username, slug)
113@@ -357,7 +357,7 @@ func postHandler(w http.ResponseWriter, r *http.Request) {
114 PublishAtISO: time.Now().Format(time.RFC3339),
115 Username: username,
116 BlogName: blogName,
117- Items: []*ListItem{
118+ Items: []*shared.ListItem{
119 {
120 Value: "oops! we can't seem to find this post.",
121 IsText: true,
122@@ -532,13 +532,13 @@ func rssBlogHandler(w http.ResponseWriter, r *http.Request) {
123 header, err := dbpool.FindPostWithFilename("_header.txt", user.ID, cfg.Space)
124 if err == nil {
125 linkify := imgs.NewImgsLinkify(username)
126- parsedText := ParseText(header.Text, linkify)
127- if parsedText.MetaData.Title != "" {
128- headerTxt.Title = parsedText.MetaData.Title
129+ parsedText := shared.ListParseText(header.Text, linkify)
130+ if parsedText.Title != "" {
131+ headerTxt.Title = parsedText.Title
132 }
133
134- if parsedText.MetaData.Description != "" {
135- headerTxt.Bio = parsedText.MetaData.Description
136+ if parsedText.Description != "" {
137+ headerTxt.Bio = parsedText.Description
138 }
139 }
140
141@@ -556,10 +556,10 @@ func rssBlogHandler(w http.ResponseWriter, r *http.Request) {
142 continue
143 }
144 linkify := imgs.NewImgsLinkify(username)
145- parsed := ParseText(post.Text, linkify)
146+ parsed := shared.ListParseText(post.Text, linkify)
147 var tpl bytes.Buffer
148 data := &PostPageData{
149- ListType: parsed.MetaData.ListType,
150+ ListType: parsed.ListType,
151 Items: parsed.Items,
152 }
153 if err := ts.Execute(&tpl, data); err != nil {
154@@ -631,10 +631,10 @@ func rssHandler(w http.ResponseWriter, r *http.Request) {
155 var feedItems []*feeds.Item
156 for _, post := range pager.Data {
157 linkify := imgs.NewImgsLinkify(post.Username)
158- parsed := ParseText(post.Text, linkify)
159+ parsed := shared.ListParseText(post.Text, linkify)
160 var tpl bytes.Buffer
161 data := &PostPageData{
162- ListType: parsed.MetaData.ListType,
163+ ListType: parsed.ListType,
164 Items: parsed.Items,
165 }
166 if err := ts.Execute(&tpl, data); err != nil {
+7,
-7
1@@ -40,19 +40,19 @@ func (p *ListHooks) FileValidate(data *filehandlers.PostMetaData) (bool, error)
2
3 func (p *ListHooks) FileMeta(data *filehandlers.PostMetaData) error {
4 linkify := imgs.NewImgsLinkify(data.Username)
5- parsedText := ParseText(string(data.Text), linkify)
6+ parsedText := shared.ListParseText(string(data.Text), linkify)
7
8- if parsedText.MetaData.Title == "" {
9+ if parsedText.Title == "" {
10 data.Title = shared.ToUpper(data.Slug)
11 } else {
12- data.Title = parsedText.MetaData.Title
13+ data.Title = parsedText.Title
14 }
15
16- data.Description = parsedText.MetaData.Description
17- data.Tags = parsedText.MetaData.Tags
18+ data.Description = parsedText.Description
19+ data.Tags = parsedText.Tags
20
21- if parsedText.MetaData.PublishAt != nil && !parsedText.MetaData.PublishAt.IsZero() {
22- data.PublishAt = parsedText.MetaData.PublishAt
23+ if parsedText.PublishAt != nil && !parsedText.PublishAt.IsZero() {
24+ data.PublishAt = parsedText.PublishAt
25 }
26
27 data.Hidden = slices.Contains(p.Cfg.HiddenPosts, data.Filename)
1@@ -29,6 +29,7 @@ type ConfigSite struct {
2 Debug bool
3 SubdomainsEnabled bool
4 CustomdomainsEnabled bool
5+ SendgridKey string
6 }
7
8 type CreateURL struct {
1@@ -39,10 +39,6 @@ type Ratio struct {
2 Height int
3 }
4
5-type Linkify interface {
6- Create(fname string) string
7-}
8-
9 func CreateImgURL(linkify Linkify) func([]byte) []byte {
10 return func(url []byte) []byte {
11 if url[0] == '/' {
1@@ -0,0 +1,15 @@
2+package shared
3+
4+type Linkify interface {
5+ Create(fname string) string
6+}
7+
8+type NullLinkify struct{}
9+
10+func (n *NullLinkify) Create(s string) string {
11+ return ""
12+}
13+
14+func NewNullLinkify() *NullLinkify {
15+ return &NullLinkify{}
16+}
1@@ -1,21 +1,30 @@
2-package lists
3+package shared
4
5 import (
6 "fmt"
7 "html/template"
8+ "log"
9 "regexp"
10 "strings"
11 "time"
12
13 "github.com/araddon/dateparse"
14- "github.com/picosh/pico/shared"
15+ "golang.org/x/exp/slices"
16 )
17
18 var reIndent = regexp.MustCompile(`^[[:blank:]]+`)
19+var DigestIntervalOpts = []string{
20+ "10min",
21+ "1hour",
22+ "12hour",
23+ "1day",
24+ "7day",
25+ "30day",
26+}
27
28-type ParsedText struct {
29+type ListParsedText struct {
30 Items []*ListItem
31- *MetaData
32+ *ListMetaData
33 }
34
35 type ListItem struct {
36@@ -32,13 +41,15 @@ type ListItem struct {
37 Indent int
38 }
39
40-type MetaData struct {
41- PublishAt *time.Time
42- Title string
43- Description string
44- Layout string
45- Tags []string
46- ListType string // https://developer.mozilla.org/en-US/docs/Web/CSS/list-style-type
47+type ListMetaData struct {
48+ PublishAt *time.Time
49+ Title string
50+ Description string
51+ Layout string
52+ Tags []string
53+ ListType string // https://developer.mozilla.org/en-US/docs/Web/CSS/list-style-type
54+ DigestInterval string
55+ Email string
56 }
57
58 var urlToken = "=>"
59@@ -85,7 +96,7 @@ func PublishAtDate(date string) (*time.Time, error) {
60 return &t, err
61 }
62
63-func TokenToMetaField(meta *MetaData, token *SplitToken) {
64+func TokenToMetaField(meta *ListMetaData, token *SplitToken) error {
65 if token.Key == "publish_at" {
66 publishAt, err := PublishAtDate(token.Value)
67 if err == nil {
68@@ -105,7 +116,20 @@ func TokenToMetaField(meta *MetaData, token *SplitToken) {
69 }
70 } else if token.Key == "layout" {
71 meta.Layout = token.Value
72+ } else if token.Key == "digest_interval" {
73+ if !slices.Contains(DigestIntervalOpts, token.Value) {
74+ return fmt.Errorf(
75+ "(%s) is not a valid option, choose from [%s]",
76+ token.Value,
77+ strings.Join(DigestIntervalOpts, ","),
78+ )
79+ }
80+ meta.DigestInterval = token.Value
81+ } else if token.Key == "email" {
82+ meta.Email = token.Value
83 }
84+
85+ return nil
86 }
87
88 func KeyAsValue(token *SplitToken) string {
89@@ -115,7 +139,7 @@ func KeyAsValue(token *SplitToken) string {
90 return token.Value
91 }
92
93-func parseItem(meta *MetaData, li *ListItem, prevItem *ListItem, pre bool, mod int, linkify shared.Linkify) (bool, bool, int) {
94+func parseItem(meta *ListMetaData, li *ListItem, prevItem *ListItem, pre bool, mod int, linkify Linkify) (bool, bool, int) {
95 skip := false
96
97 if strings.HasPrefix(li.Value, preToken) {
98@@ -144,17 +168,20 @@ func parseItem(meta *MetaData, li *ListItem, prevItem *ListItem, pre bool, mod i
99 split := TextToSplitToken(strings.Replace(li.Value, imgToken, "", 1))
100 key := split.Key
101 if strings.HasPrefix(key, "/") {
102- frag := shared.SanitizeFileExt(key)
103+ frag := SanitizeFileExt(key)
104 key = linkify.Create(frag)
105 } else if strings.HasPrefix(key, "./") {
106- name := shared.SanitizeFileExt(key[1:])
107+ name := SanitizeFileExt(key[1:])
108 key = linkify.Create(name)
109 }
110 li.URL = template.URL(key)
111 li.Value = KeyAsValue(split)
112 } else if strings.HasPrefix(li.Value, varToken) {
113 split := TextToSplitToken(strings.Replace(li.Value, varToken, "", 1))
114- TokenToMetaField(meta, split)
115+ err := TokenToMetaField(meta, split)
116+ if err != nil {
117+ log.Println(err)
118+ }
119 } else if strings.HasPrefix(li.Value, headerTwoToken) {
120 li.IsHeaderTwo = true
121 li.Value = strings.Replace(li.Value, headerTwoToken, "", 1)
122@@ -185,10 +212,10 @@ func parseItem(meta *MetaData, li *ListItem, prevItem *ListItem, pre bool, mod i
123 return pre, skip, mod
124 }
125
126-func ParseText(text string, linkify shared.Linkify) *ParsedText {
127+func ListParseText(text string, linkify Linkify) *ListParsedText {
128 textItems := SplitByNewline(text)
129 items := []*ListItem{}
130- meta := MetaData{
131+ meta := ListMetaData{
132 ListType: "disc",
133 Tags: []string{},
134 Layout: "default",
135@@ -218,8 +245,8 @@ func ParseText(text string, linkify shared.Linkify) *ParsedText {
136 }
137 }
138
139- return &ParsedText{
140- Items: items,
141- MetaData: &meta,
142+ return &ListParsedText{
143+ Items: items,
144+ ListMetaData: &meta,
145 }
146 }
+1,
-0
1@@ -75,6 +75,7 @@ func (m Model) bioView() string {
2 } else {
3 username = m.styles.Subtle.Render("(none set)")
4 }
5+
6 return common.KeyValueView(
7 "Username", username,
8 "Blog URL", m.urls.BlogURL(username),