From 869d0c84ed39c918e9d6cea37d7c01a6db5d6bce Mon Sep 17 00:00:00 2001 From: Jan-Lukas Else Date: Tue, 19 Dec 2023 12:15:30 +0100 Subject: [PATCH] Rewrite Micropub endpoint using indielib --- app.go | 2 + editor.go | 28 +- go.mod | 48 +-- go.sum | 512 +++--------------------- httpRouters.go | 5 +- micropub.go | 996 +++++++++++++++++++---------------------------- micropubMedia.go | 85 ---- micropub_test.go | 261 ++++++++++++- postsFuncs.go | 60 ++- utils.go | 4 - utils_test.go | 5 +- 11 files changed, 795 insertions(+), 1211 deletions(-) delete mode 100644 micropubMedia.go diff --git a/app.go b/app.go index 4c1844f..3d0386a 100644 --- a/app.go +++ b/app.go @@ -78,6 +78,8 @@ type goBlog struct { // Microformats mfInit sync.Once mfCache *ristretto.Cache + // Micropub + mpImpl *micropubImplementation // Minify min minify.Minifier // Plugins diff --git a/editor.go b/editor.go index 904b8df..5a59f79 100644 --- a/editor.go +++ b/editor.go @@ -14,6 +14,7 @@ import ( "go.goblog.app/app/pkgs/bufferpool" "go.goblog.app/app/pkgs/contenttype" "go.goblog.app/app/pkgs/htmlbuilder" + "go.hacdias.com/indielib/micropub" "gopkg.in/yaml.v3" ws "nhooyr.io/websocket" ) @@ -97,26 +98,30 @@ func (a *goBlog) serveEditorPost(w http.ResponseWriter, r *http.Request) { Data: &editorRenderData{ presetParams: parsePresetPostParamsFromQuery(r), updatePostUrl: a.fullPostURL(post), - updatePostContent: a.postToMfItem(post).Properties.Content[0], + updatePostContent: post.contentWithParams(), }, }) case "createpost", "updatepost": reqBody := map[string]any{} if action == "updatepost" { - reqBody["action"] = actionUpdate + reqBody["action"] = micropub.ActionUpdate reqBody["url"] = r.FormValue("url") reqBody["replace"] = map[string][]string{"content": {r.FormValue("content")}} } else { + blog, _ := a.getBlog(r) reqBody["type"] = []string{"h-entry"} - reqBody["properties"] = map[string][]string{"content": {r.FormValue("content")}} + reqBody["properties"] = map[string][]string{"content": {r.FormValue("content")}, "blog": {blog}} } req, _ := requests.URL("").BodyJSON(reqBody).Request(r.Context()) - a.editorMicropubPost(w, req, false) + a.editorMicropubPost(w, req, false, "") case "upload": - a.editorMicropubPost(w, r, true) + a.editorMicropubPost(w, r, true, "") case "delete", "undelete": - req, _ := requests.URL("").Method(http.MethodPost).ContentType(contenttype.WWWForm).Param("action", action).Param("url", r.FormValue("url")).Request(r.Context()) - a.editorMicropubPost(w, req, false) + req, _ := requests.URL(""). + Method(http.MethodPost). + BodyForm(url.Values{"action": {action}, "url": {r.FormValue("url")}}). + Request(r.Context()) + a.editorMicropubPost(w, req, false, r.FormValue("url")) case "tts": parsedURL, err := url.Parse(r.FormValue("url")) if err != nil { @@ -153,12 +158,12 @@ func (a *goBlog) serveEditorPost(w http.ResponseWriter, r *http.Request) { } } -func (a *goBlog) editorMicropubPost(w http.ResponseWriter, r *http.Request, media bool) { +func (a *goBlog) editorMicropubPost(w http.ResponseWriter, r *http.Request, media bool, redirectSuccess string) { recorder := httptest.NewRecorder() if media { - addAllScopes(http.HandlerFunc(a.serveMicropubMedia)).ServeHTTP(recorder, r) + addAllScopes(a.getMicropubImplementation().getMediaHandler()).ServeHTTP(recorder, r) } else { - addAllScopes(http.HandlerFunc(a.serveMicropubPost)).ServeHTTP(recorder, r) + addAllScopes(a.getMicropubImplementation().getHandler()).ServeHTTP(recorder, r) } result := recorder.Result() if location := result.Header.Get("Location"); location != "" { @@ -166,7 +171,8 @@ func (a *goBlog) editorMicropubPost(w http.ResponseWriter, r *http.Request, medi return } if result.StatusCode >= 200 && result.StatusCode < 400 { - http.Redirect(w, r, editorPath, http.StatusFound) + redirectPath := defaultIfEmpty(redirectSuccess, editorPath) + http.Redirect(w, r, redirectPath, http.StatusFound) return } w.WriteHeader(result.StatusCode) diff --git a/go.mod b/go.mod index 5c368c7..8474bff 100644 --- a/go.mod +++ b/go.mod @@ -8,9 +8,9 @@ require ( git.jlel.se/jlelse/goldmark-mark v0.0.0-20210522162520-9788c89266a4 git.jlel.se/jlelse/template-strings v0.0.0-20220211095702-c012e3b5045b github.com/PuerkitoBio/goquery v1.8.1 - github.com/alecthomas/chroma/v2 v2.10.0 + github.com/alecthomas/chroma/v2 v2.12.0 github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de - github.com/c2h5oh/datasize v0.0.0-20220606134207-859f65c6625b + github.com/c2h5oh/datasize v0.0.0-20231215233829-aa82cc1e6500 github.com/carlmjohnson/requests v0.23.5 // master github.com/cretz/bine v0.2.1-0.20221201125941-b9d31d9c7866 @@ -20,13 +20,13 @@ require ( github.com/dmulholl/mp3lib v1.0.0 github.com/elnormous/contenttype v1.0.4 github.com/emersion/go-smtp v0.19.0 - github.com/go-ap/activitypub v0.0.0-20231105151936-af32623a589b - github.com/go-ap/client v0.0.0-20231105152939-03833203c71e + github.com/go-ap/activitypub v0.0.0-20231114162308-e219254dc5c9 + github.com/go-ap/client v0.0.0-20231114162455-f09cf9766e95 github.com/go-ap/jsonld v0.0.0-20221030091449-f2a191312c73 github.com/go-chi/chi/v5 v5.0.10 github.com/go-fed/httpsig v1.1.0 github.com/go-telegram-bot-api/telegram-bot-api/v5 v5.5.1 - github.com/google/uuid v1.4.0 + github.com/google/uuid v1.5.0 github.com/gorilla/handlers v1.5.2 github.com/gorilla/sessions v1.2.2 github.com/gorilla/websocket v1.5.1 @@ -34,24 +34,24 @@ require ( github.com/jlelse/feeds v1.3.0 github.com/justinas/alice v1.2.0 github.com/kaorimatz/go-opml v0.0.0-20210201121027-bc8e2852d7f9 - github.com/klauspost/compress v1.17.2 + github.com/klauspost/compress v1.17.4 github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible github.com/lopezator/migrator v0.3.1 - github.com/mattn/go-sqlite3 v1.14.18 + github.com/mattn/go-sqlite3 v1.14.19 github.com/mergestat/timediff v0.0.3 github.com/microcosm-cc/bluemonday v1.0.26 github.com/mmcdole/gofeed v1.2.1 github.com/paulmach/go.geojson v1.5.0 github.com/posener/wstest v1.2.0 github.com/pquerna/otp v1.4.0 - github.com/samber/lo v1.38.1 + github.com/samber/lo v1.39.0 github.com/schollz/sqlite3dump v1.3.1 github.com/snabb/sitemap v1.0.4 github.com/sourcegraph/conc v0.3.0 - github.com/spf13/cast v1.5.1 - github.com/spf13/viper v1.17.0 + github.com/spf13/cast v1.6.0 + github.com/spf13/viper v1.18.2 github.com/stretchr/testify v1.8.4 - github.com/tdewolff/minify/v2 v2.20.6 + github.com/tdewolff/minify/v2 v2.20.10 github.com/tkrajina/gpxgo v1.3.1 github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80 github.com/traefik/yaegi v0.15.1 @@ -59,13 +59,13 @@ require ( github.com/xhit/go-simple-mail/v2 v2.16.0 github.com/yuin/goldmark v1.6.0 github.com/yuin/goldmark-emoji v1.0.2 - go.hacdias.com/indielib v0.1.0 - golang.org/x/crypto v0.15.0 - golang.org/x/net v0.18.0 + go.hacdias.com/indielib v0.2.2 + golang.org/x/crypto v0.17.0 + golang.org/x/net v0.19.0 golang.org/x/sync v0.5.0 golang.org/x/text v0.14.0 gopkg.in/yaml.v3 v3.0.1 - maunium.net/go/mautrix v0.16.1 + maunium.net/go/mautrix v0.16.2 nhooyr.io/websocket v1.8.10 willnorris.com/go/microformats v1.2.0 ) @@ -84,7 +84,7 @@ require ( github.com/felixge/httpsnoop v1.0.4 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/go-ap/errors v0.0.0-20231003111023-183eef4b31b7 // indirect - github.com/golang/glog v1.1.2 // indirect + github.com/golang/glog v1.2.0 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/gorilla/css v1.0.1 // indirect github.com/gorilla/securecookie v1.1.2 // indirect @@ -101,30 +101,30 @@ require ( github.com/mmcdole/goxpp v1.1.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/pelletier/go-toml/v2 v2.1.0 // indirect + github.com/pelletier/go-toml/v2 v2.1.1 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/rs/xid v1.5.0 // indirect github.com/rs/zerolog v1.31.0 // indirect - github.com/sagikazarmark/locafero v0.3.0 // indirect + github.com/sagikazarmark/locafero v0.4.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect github.com/snabb/diagio v1.0.4 // indirect - github.com/spf13/afero v1.10.0 // indirect + github.com/spf13/afero v1.11.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/subosito/gotenv v1.6.0 // indirect - github.com/tdewolff/parse/v2 v2.7.4 // indirect + github.com/tdewolff/parse/v2 v2.7.7 // indirect github.com/tidwall/gjson v1.17.0 // indirect github.com/tidwall/match v1.1.1 // indirect github.com/tidwall/pretty v1.2.1 // indirect github.com/tidwall/sjson v1.2.5 // indirect github.com/toorop/go-dkim v0.0.0-20201103131630-e1cd1a0a5208 // indirect github.com/valyala/fastjson v1.6.4 // indirect - go.mau.fi/util v0.2.0 // indirect + go.mau.fi/util v0.2.1 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect + golang.org/x/exp v0.0.0-20231214170342-aacd6d4b4611 // indirect golang.org/x/image v0.14.0 // indirect - golang.org/x/oauth2 v0.14.0 // indirect - golang.org/x/sys v0.14.0 // indirect + golang.org/x/oauth2 v0.15.0 // indirect + golang.org/x/sys v0.15.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/go.sum b/go.sum index c95c253..79ff2c1 100644 --- a/go.sum +++ b/go.sum @@ -1,41 +1,3 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= -cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= -cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= -cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= -cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= -cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= -cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= -cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= -cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= -cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= -cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= -cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= -cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= -cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= -cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= -cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= -cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY= -cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= -cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= -cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= -cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= -cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= -cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= -cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= -cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= -cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= -cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= -cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= -cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= -cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= -cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= -cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= -cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= -cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= -dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= git.jlel.se/jlelse/go-geouri v0.0.0-20210525190615-a9c1d50f42d6 h1:d7k1NKd9fr+Eq7EtUrqUly+HDqDzpx9T9v8Gl2jJvpo= git.jlel.se/jlelse/go-geouri v0.0.0-20210525190615-a9c1d50f42d6/go.mod h1:eKL81ZHiGWZ4cdv9MI0ADmPiG9p0C+ajkSldNTr2ftQ= git.jlel.se/jlelse/go-shutdowner v0.0.0-20210707065515-773db8099c30 h1:+U313KydOatQ5y9ea0X+kfJA/0wiO+iHkLty/yLMJ/0= @@ -48,14 +10,12 @@ git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078 h1:cliQ4H git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078/go.mod h1:g/V2Hjas6Z1UHUp4yIx6bATpNzJ7DYtD0FG3+xARWxs= git.sr.ht/~mariusor/lw v0.0.0-20230317075520-07e173563bf8 h1:D5suqGJOxwGY8H4tqm9Kz8txsiFqiHeaSU9ww1Djfg8= git.sr.ht/~mariusor/lw v0.0.0-20230317075520-07e173563bf8/go.mod h1:qGYsPqQVVmTZb54m50roPeXPlabiTOpcmco8LFefWzY= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/PuerkitoBio/goquery v1.8.1 h1:uQxhNlArOIdbrH1tr0UXwdVFgDcZDrZVdcpygAcwmWM= github.com/PuerkitoBio/goquery v1.8.1/go.mod h1:Q8ICL1kNUJ2sXGoAhPGUdYDJvgQgHzJsnnd3H7Ho5jQ= github.com/alecthomas/assert/v2 v2.2.1 h1:XivOgYcduV98QCahG8T5XTezV5bylXe+lBxLG2K2ink= github.com/alecthomas/assert/v2 v2.2.1/go.mod h1:pXcQ2Asjp247dahGEmsZ6ru0UVwnkhktn7S0bBDLxvQ= -github.com/alecthomas/chroma/v2 v2.10.0 h1:T2iQOCCt4pRmRMfL55gTodMtc7cU0y7lc1Jb8/mK/64= -github.com/alecthomas/chroma/v2 v2.10.0/go.mod h1:4TQu7gdfuPjSh76j78ietmqh9LiurGF0EpseFXdKMBw= +github.com/alecthomas/chroma/v2 v2.12.0 h1:Wh8qLEgMMsN7mgyG8/qIpegky2Hvzr4By6gEF7cmWgw= +github.com/alecthomas/chroma/v2 v2.12.0/go.mod h1:4TQu7gdfuPjSh76j78ietmqh9LiurGF0EpseFXdKMBw= github.com/alecthomas/repr v0.2.0 h1:HAzS41CIzNW5syS8Mf9UwXhNH1J9aix/BvDRf1Ml2Yk= github.com/alecthomas/repr v0.2.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= github.com/andybalholm/cascadia v1.3.1/go.mod h1:R4bJ1UQfqADjvDa4P6HZHLh/3OxWWEqc0Sk8XGwHqvA= @@ -68,21 +28,13 @@ github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd3 github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/boombuler/barcode v1.0.1 h1:NDBbPmhS+EqABEs5Kg3n/5ZNjy73Pz7SIV+KCeqyXcs= github.com/boombuler/barcode v1.0.1/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= -github.com/c2h5oh/datasize v0.0.0-20220606134207-859f65c6625b h1:6+ZFm0flnudZzdSE0JxlhR2hKnGPcNB35BjQf4RYQDY= -github.com/c2h5oh/datasize v0.0.0-20220606134207-859f65c6625b/go.mod h1:S/7n9copUssQ56c7aAgHqftWO4LTf4xY6CGWt8Bc+3M= +github.com/c2h5oh/datasize v0.0.0-20231215233829-aa82cc1e6500 h1:6lhrsTEnloDPXyeZBvSYvQf8u86jbKehZPVDDlkgDl4= +github.com/c2h5oh/datasize v0.0.0-20231215233829-aa82cc1e6500/go.mod h1:S/7n9copUssQ56c7aAgHqftWO4LTf4xY6CGWt8Bc+3M= github.com/carlmjohnson/requests v0.23.5 h1:NPANcAofwwSuC6SIMwlgmHry2V3pLrSqRiSBKYbNHHA= github.com/carlmjohnson/requests v0.23.5/go.mod h1:zG9P28thdRnN61aD7iECFhH5iGGKX2jIjKQD9kqYH+o= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cretz/bine v0.2.1-0.20221201125941-b9d31d9c7866 h1:8Cji9JDEuYibvDQrWHvc42r9/HxjlD2kahN67LECXFk= @@ -113,22 +65,16 @@ github.com/emersion/go-sasl v0.0.0-20231106173351-e73c9f7bad43 h1:hH4PQfOndHDlpz github.com/emersion/go-sasl v0.0.0-20231106173351-e73c9f7bad43/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ= github.com/emersion/go-smtp v0.19.0 h1:iVCDtR2/JY3RpKoaZ7u6I/sb52S3EzfNHO1fAWVHgng= github.com/emersion/go-smtp v0.19.0/go.mod h1:qm27SGYgoIPRot6ubfQ/GpiPy/g3PaZAVRxiO/sDUgQ= -github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= -github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= -github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= +github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= +github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= -github.com/go-ap/activitypub v0.0.0-20231105151936-af32623a589b h1:GfKvTbxH5+QFIwxsjQ8CwSej27eAiub6LtHbCMuBbtg= -github.com/go-ap/activitypub v0.0.0-20231105151936-af32623a589b/go.mod h1:cJ9Ye0ZNSMN7RzZDBRY3E+8M3Bpf/R1JX22Ir9yX6WI= -github.com/go-ap/client v0.0.0-20231105152939-03833203c71e h1:+z73ZRHDC7eRUMh71XeA6XBa5/7h+P+zE0oNu2bsJGs= -github.com/go-ap/client v0.0.0-20231105152939-03833203c71e/go.mod h1:c7Z/wKoEPOkAryE3FNlnQp/grTnUYXBAQhQ4R/2rQBE= +github.com/go-ap/activitypub v0.0.0-20231114162308-e219254dc5c9 h1:j2TrkUG/NATGi/EQS+MvEoF79CxiRUmT16ErFroNcKI= +github.com/go-ap/activitypub v0.0.0-20231114162308-e219254dc5c9/go.mod h1:cJ9Ye0ZNSMN7RzZDBRY3E+8M3Bpf/R1JX22Ir9yX6WI= +github.com/go-ap/client v0.0.0-20231114162455-f09cf9766e95 h1:UGGaB04tIy+8Xc+s9JaDaGKm82PxvVuIYvSz10YYnY8= +github.com/go-ap/client v0.0.0-20231114162455-f09cf9766e95/go.mod h1:xJSKNB6hrexShawrxII5pE9pR31IVjCKdeq5eDDutVk= github.com/go-ap/errors v0.0.0-20231003111023-183eef4b31b7 h1:I2nuhyVI/48VXoRCCZR2hYBgnSXa+EuDJf/VyX06TC0= github.com/go-ap/errors v0.0.0-20231003111023-183eef4b31b7/go.mod h1:5x8a6P/dhmMGFxWLcyYlyOuJ2lRNaHGhRv+yu8BaTSI= github.com/go-ap/jsonld v0.0.0-20221030091449-f2a191312c73 h1:GMKIYXyXPGIp+hYiWOhfqK4A023HdgisDT4YGgf99mw= @@ -137,9 +83,6 @@ github.com/go-chi/chi/v5 v5.0.10 h1:rLz5avzKpjqxrYwXNfmjkrYYXOyLJd37pz53UFHC6vk= github.com/go-chi/chi/v5 v5.0.10/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= github.com/go-fed/httpsig v1.1.0 h1:9M+hb0jkEICD8/cAiNqEB66R87tTINszBRTjwjQzWcI= github.com/go-fed/httpsig v1.1.0/go.mod h1:RCMrTZvN1bJYtofsG4rd5NaO5obxQ5xBkdiS7xsT7bM= -github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA= github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-telegram-bot-api/telegram-bot-api/v5 v5.5.1 h1:wG8n/XJQ07TmjbITcGiUaOtXxdrINDz1b0J1w0SzqDc= @@ -148,74 +91,21 @@ github.com/go-test/deep v1.1.0 h1:WOcxcdHcvdgThNXjw0t76K42FXTU7HpNQWHpA2HHNlg= github.com/go-test/deep v1.1.0/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/glog v1.1.2 h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo= -github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ= -github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= -github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/glog v1.2.0 h1:uCdmnmatrKCgMBlM4rMuJZWOkPDqdbZPnrMXDY4gI68= +github.com/golang/glog v1.2.0/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= -github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4= -github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= -github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= +github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= +github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0= github.com/gorilla/handlers v1.5.2 h1:cLTUSsNkgcwhgRqvCNmdbRWG0A3N4F+M2nWKdScwyEE= @@ -232,14 +122,10 @@ github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= -github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= -github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8= github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= github.com/jackc/pgconn v1.11.0 h1:HiHArx4yFbwl91X3qqIHtUFoiIfLNJXCQRsnzkiwwaQ= @@ -267,21 +153,14 @@ github.com/jonboulle/clockwork v0.3.0 h1:9BSCMi8C+0qdApAp4auwX0RkLGUjs956h0EkuQy github.com/jonboulle/clockwork v0.3.0/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= -github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/justinas/alice v1.2.0 h1:+MHSA/vccVCF4Uq37S42jwlkvI2Xzl7zTPCN5BnZNVo= github.com/justinas/alice v1.2.0/go.mod h1:fN5HRH/reO/zrUflLfTN43t3vXvKzvZIENsNEe7i7qA= github.com/kaorimatz/go-opml v0.0.0-20210201121027-bc8e2852d7f9 h1:+9REu9CK9D1AQ6C/PXXwGRcoKdT04cuHR5JgGD4DKqc= github.com/kaorimatz/go-opml v0.0.0-20210201121027-bc8e2852d7f9/go.mod h1:OvY5ZBrAC9kOvM2PZs9Lw0BH+5K7tjrT6T7SFhn27OA= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.2 h1:RlWWUY/Dr4fL8qk9YG7DTZ7PDgME2V4csBXA8L/ixi4= -github.com/klauspost/compress v1.17.2/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= -github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= +github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= @@ -305,8 +184,8 @@ github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk= github.com/mattn/go-sqlite3 v1.14.3/go.mod h1:WVKg1VTActs4Qso6iwGbiFih2UIHo0ENGwNd0Lj+XmI= github.com/mattn/go-sqlite3 v1.14.7/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= -github.com/mattn/go-sqlite3 v1.14.18 h1:JL0eqdCOq6DJVNPSvArO/bIV9/P7fbGrV00LZHc+5aI= -github.com/mattn/go-sqlite3 v1.14.18/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= +github.com/mattn/go-sqlite3 v1.14.19 h1:fhGleo2h1p8tVChob4I9HpmVFIAkKGpiukdrgQbWfGI= +github.com/mattn/go-sqlite3 v1.14.19/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= github.com/mergestat/timediff v0.0.3 h1:ucCNh4/ZrTPjFZ081PccNbhx9spymCJkFxSzgVuPU+Y= github.com/mergestat/timediff v0.0.3/go.mod h1:yvMUaRu2oetc+9IbPLYBJviz6sA7xz8OXMDfhBl7YSI= github.com/microcosm-cc/bluemonday v1.0.26 h1:xbqSvqzQMeEHCqMi64VAs4d8uy6Mequs3rQ0k/Khz58= @@ -324,12 +203,11 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/paulmach/go.geojson v1.5.0 h1:7mhpMK89SQdHFcEGomT7/LuJhwhEgfmpWYVlVmLEdQw= github.com/paulmach/go.geojson v1.5.0/go.mod h1:DgdUy2rRVDDVgKqrjMe2vZAHMfhDTrjVKt3LmHIXGbU= -github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= -github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= +github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= +github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -337,21 +215,19 @@ github.com/posener/wstest v1.2.0 h1:PAY0cRybxOjh0yqSDCrlAGUwtx+GNKpuUfid/08pv48= github.com/posener/wstest v1.2.0/go.mod h1:GkplCx9zskpudjrMp23LyZHrSonab0aZzh2x0ACGRbU= github.com/pquerna/otp v1.4.0 h1:wZvl1TIVxKRThZIBiwOOHOGP/1+nZyWBil9Y2XNEDzg= github.com/pquerna/otp v1.4.0/go.mod h1:dkJfzwRKNiegxyNb54X/3fLwhCynbMspSyWKnvi1AEg= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= -github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rs/xid v1.5.0 h1:mKX4bl4iPYJtEIxp6CYiUuLQ/8DYMoz0PUdtGgMFRVc= github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/zerolog v1.31.0 h1:FcTR3NnLWW+NnTwwhFWiJSZr4ECLpqCm6QsEnyvbV4A= github.com/rs/zerolog v1.31.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= -github.com/sagikazarmark/locafero v0.3.0 h1:zT7VEGWC2DTflmccN/5T1etyKvxSxpHsjb9cJvm4SvQ= -github.com/sagikazarmark/locafero v0.3.0/go.mod h1:w+v7UsPNFwzF1cHuOajOOzoq4U7v/ig1mpRjqV+Bu1U= +github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ= +github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4= github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE= github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= -github.com/samber/lo v1.38.1 h1:j2XEAqXKb09Am4ebOg31SpvzUTTs6EN3VfgeLUhPdXM= -github.com/samber/lo v1.38.1/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA= +github.com/samber/lo v1.39.0 h1:4gTz1wUhNYLhFSKl6O+8peW0v2F4BCY034GRpU9WnuA= +github.com/samber/lo v1.39.0/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA= github.com/schollz/sqlite3dump v1.3.1 h1:QXizJ7XEJ7hggjqjZ3YRtF3+javm8zKtzNByYtEkPRA= github.com/schollz/sqlite3dump v1.3.1/go.mod h1:mzSTjZpJH4zAb1FN3iNlhWPbbdyeBpOaTW0hukyMHyI= github.com/scylladb/termtables v0.0.0-20191203121021-c4c0b6d42ff4/go.mod h1:C1a7PQSMz9NShzorzCiG2fk9+xuCgLkPeCvMHYR2OWg= @@ -361,21 +237,21 @@ github.com/snabb/sitemap v1.0.4 h1:BC6cPW5jXLsKWtlYQKD2s1W58CarvNzqOmdl680uQPw= github.com/snabb/sitemap v1.0.4/go.mod h1:815/fxQQ8Tt7Eqwe8Lcat4ax73zuHyPxWBZySnbaxkc= github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= -github.com/spf13/afero v1.10.0 h1:EaGW2JJh15aKOejeuJ+wpFSHnbd7GE6Wvp3TsNhb6LY= -github.com/spf13/afero v1.10.0/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= -github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA= -github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48= +github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= +github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY= +github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0= +github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.17.0 h1:I5txKw7MJasPL/BrfkbA0Jyo/oELqVmux4pR/UxOMfI= -github.com/spf13/viper v1.17.0/go.mod h1:BmMMMLQXSbcHK6KAOiFLz0l5JHrU89OdIRHvsk0+yVI= +github.com/spf13/viper v1.18.2 h1:LUXCnvUvSM6FXAsj6nnfc8Q2tp1dIgUfY9Kc8GsSOiQ= +github.com/spf13/viper v1.18.2/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMVB+yk= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -383,10 +259,10 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= -github.com/tdewolff/minify/v2 v2.20.6 h1:R4+Iw1ZqJxrqH52WWHtCpukMuhmO/EasY8YlDiSxphw= -github.com/tdewolff/minify/v2 v2.20.6/go.mod h1:9t0EY9xySGt1vrP8iscmJfywQwDCQyQBYN6ge+9GwP0= -github.com/tdewolff/parse/v2 v2.7.4 h1:zrUn2CFg9+5llbUZcsycctFlNRyV1D5gFBZRxuGzdzk= -github.com/tdewolff/parse/v2 v2.7.4/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= +github.com/tdewolff/minify/v2 v2.20.10 h1:iz9IkdRqD2pyneib/AvTas23RRG5TnuUFNcNVKmL/jU= +github.com/tdewolff/minify/v2 v2.20.10/go.mod h1:xSJ9fXIfyuEMex88JT4jl8GvXnl/RzWNdqD96AqKlX0= +github.com/tdewolff/parse/v2 v2.7.7 h1:V+50eFDH7Piw4IBwH8D8FtYeYbZp3T4SCtIvmBSIMyc= +github.com/tdewolff/parse/v2 v2.7.7/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA= github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52 h1:gAQliwn+zJrkjAHVcBEYW/RFvd2St4yYimisvozAYlA= github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= @@ -414,181 +290,57 @@ github.com/vcraescu/go-paginator/v2 v2.0.0/go.mod h1:qsrC8+/YgRL0LfurxeY3gCAtsN7 github.com/wsxiaoys/terminal v0.0.0-20160513160801-0940f3fc43a0/go.mod h1:IXCdmsXIht47RaVFLEdVnh1t+pgYtTAhQGj73kz+2DM= github.com/xhit/go-simple-mail/v2 v2.16.0 h1:ouGy/Ww4kuaqu2E2UrDw7SvLaziWTB60ICLkIkNVccA= github.com/xhit/go-simple-mail/v2 v2.16.0/go.mod h1:b7P5ygho6SYE+VIqpxA6QkYfv4teeyG4MKqB3utRu98= -github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.7/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yuin/goldmark v1.6.0 h1:boZcn2GTjpsynOsC0iJHnBWa4Bi0qzfJjthwauItG68= github.com/yuin/goldmark v1.6.0/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yuin/goldmark-emoji v1.0.2 h1:c/RgTShNgHTtc6xdz2KKI74jJr6rWi7FPgnP9GAsO5s= github.com/yuin/goldmark-emoji v1.0.2/go.mod h1:RhP/RWpexdp+KHs7ghKnifRoIs/Bq4nDS7tRbCkOwKY= -go.hacdias.com/indielib v0.1.0 h1:culufO8/RgTEEQMJmK4HnwAS2qZF7nfvHOBWPjJ9R+o= -go.hacdias.com/indielib v0.1.0/go.mod h1:zR/7VfuqHQSOmWB3S5fO5p7YQPaThnR5vYt33yMP05c= -go.mau.fi/util v0.2.0 h1:AMGBEdg9Ya/smb/09dljo9wBwKr432EpfjDWF7aFQg0= -go.mau.fi/util v0.2.0/go.mod h1:AxuJUMCxpzgJ5eV9JbPWKRH8aAJJidxetNdUj7qcb84= -go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= -go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= -go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= +go.hacdias.com/indielib v0.2.2 h1:7af8W+BX+gs30n8SgStERfPvaN8E6bY+lSY4i0KNMww= +go.hacdias.com/indielib v0.2.2/go.mod h1:zR/7VfuqHQSOmWB3S5fO5p7YQPaThnR5vYt33yMP05c= +go.mau.fi/util v0.2.1 h1:eazulhFE/UmjOFtPrGg6zkF5YfAyiDzQb8ihLMbsPWw= +go.mau.fi/util v0.2.1/go.mod h1:MjlzCQEMzJ+G8RsPawHzpLB8rwTo3aPIjG5FzBvQT/c= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA= -golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= -golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= -golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= -golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= -golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ= -golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE= -golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= -golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= +golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= +golang.org/x/exp v0.0.0-20231214170342-aacd6d4b4611 h1:qCEDpW1G+vcj3Y7Fy52pEM1AWm3abj8WimGYejI3SC4= +golang.org/x/exp v0.0.0-20231214170342-aacd6d4b4611/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI= golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.14.0 h1:tNgSxAFe3jC4uYqvZdTr84SZoM1KfwdC9SKIFrLjFn4= golang.org/x/image v0.14.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= -golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= -golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= -golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= -golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= -golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210916014120-12bc252f5db8/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211020060615-d418f374d309/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= -golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg= -golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.14.0 h1:P0Vrf/2538nmC0H+pEQ3MNFRRnVR7RlqyVw+bvm26z0= -golang.org/x/oauth2 v0.14.0/go.mod h1:lAtNWgaWfL4cm7j2OV8TxGi9Qb7ECORx8DktCY74OwM= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= +golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= +golang.org/x/oauth2 v0.15.0 h1:s8pnnxNVzjWyrvYdFUQq5llS1PX2zhPXmccZv99h7uQ= +golang.org/x/oauth2 v0.15.0/go.mod h1:q48ptWNTY5XWf+JNten23lcvHpLJ0ZSxF5ttTHKVCAM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE= golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -598,20 +350,16 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= -golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= -golang.org/x/term v0.14.0 h1:LGK9IlZ8T9jvdy6cTdfKUCltatMFOehAQo9SRC46UQ8= -golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww= -golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4= +golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= @@ -619,162 +367,22 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190603231351-8aaa1484dc10/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= -golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= -golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= -google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= -google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= -google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= -google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= -google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= -google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= -google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= -google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= -google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= -google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= -google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= -google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= -google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -784,22 +392,12 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/driver/sqlite v1.1.3/go.mod h1:AKDgRWk8lcSQSw+9kxCJnX/yySj8G3rdwYlU57cB45c= gorm.io/gorm v1.20.1/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw= gorm.io/gorm v1.20.6/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= maunium.net/go/maulogger/v2 v2.4.1 h1:N7zSdd0mZkB2m2JtFUsiGTQQAdP0YeFWT7YMc80yAL8= maunium.net/go/maulogger/v2 v2.4.1/go.mod h1:omPuYwYBILeVQobz8uO3XC8DIRuEb5rXYlQSuqrbCho= -maunium.net/go/mautrix v0.16.1 h1:Wb3CvOCe8A/NLsFeZYxKrgXKiqeZUQEBD1zqm7n/kWk= -maunium.net/go/mautrix v0.16.1/go.mod h1:2Jf15tulVtr6LxoiRL4smRXwpkGWUNfBFhwh/aXDBuk= +maunium.net/go/mautrix v0.16.2 h1:a6GUJXNWsTEOO8VE4dROBfCIfPp50mqaqzv7KPzChvg= +maunium.net/go/mautrix v0.16.2/go.mod h1:YL4l4rZB46/vj/ifRMEjcibbvHjgxHftOF1SgmruLu4= nhooyr.io/websocket v1.8.10 h1:mv4p+MnGrLDcPlBoWsvPP7XCzTYMXP9F9eIGoKbgx7Q= nhooyr.io/websocket v1.8.10/go.mod h1:rN9OFWIUwuxg4fR5tELlYC04bXYowCP9GX47ivo2l+c= -rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= -rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= -rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= willnorris.com/go/microformats v1.2.0 h1:73pzJCLJM69kYE5qsLI9OOC/7sImNVOzya9EQ0+1wmM= willnorris.com/go/microformats v1.2.0/go.mod h1:RrlwCSvib4qz+JICKiN7rON4phzQ3HAT7j6s4O2cZj4= willnorris.com/go/webmention v0.0.0-20220108183051-4a23794272f0 h1:V5+O+YZHchEwu6ZmPcqT1dQ+mHgE356Q+w9SVOQ+QZg= diff --git a/httpRouters.go b/httpRouters.go index b036e96..4d6ba4f 100644 --- a/httpRouters.go +++ b/httpRouters.go @@ -16,9 +16,8 @@ func (a *goBlog) loginRouter(r chi.Router) { // Micropub func (a *goBlog) micropubRouter(r chi.Router) { r.Use(a.checkIndieAuth) - r.Get("/", a.serveMicropubQuery) - r.With(bodylimit.BodyLimit(10*bodylimit.MB)).Post("/", a.serveMicropubPost) - r.With(bodylimit.BodyLimit(30*bodylimit.MB)).Post(micropubMediaSubPath, a.serveMicropubMedia) + r.Handle("/", a.getMicropubImplementation().getHandler()) + r.Handle(micropubMediaSubPath, a.getMicropubImplementation().getMediaHandler()) } // IndieAuth diff --git a/micropub.go b/micropub.go index f00eb34..7a1fe89 100644 --- a/micropub.go +++ b/micropub.go @@ -1,360 +1,337 @@ package main import ( - "encoding/json" + "crypto/sha256" "errors" "fmt" + "io" "mime" + "mime/multipart" "net/http" - "net/url" + urlpkg "net/url" + "path/filepath" + "reflect" "regexp" "strings" "github.com/samber/lo" "github.com/spf13/cast" - "go.goblog.app/app/pkgs/contenttype" + "go.goblog.app/app/pkgs/bodylimit" + "go.hacdias.com/indielib/micropub" "gopkg.in/yaml.v3" ) -const micropubPath = "/micropub" - -func (a *goBlog) serveMicropubQuery(w http.ResponseWriter, r *http.Request) { - var result any - switch query := r.URL.Query(); query.Get("q") { - case "config": - channels := a.getMicropubChannelsMap() - result = map[string]any{ - "channels": channels, - "media-endpoint": a.getFullAddress(micropubPath + micropubMediaSubPath), - "visibility": []postVisibility{visibilityPublic, visibilityUnlisted, visibilityPrivate}, - } - case "source": - if urlString := query.Get("url"); urlString != "" { - u, err := url.Parse(query.Get("url")) - if err != nil { - a.serveError(w, r, err.Error(), http.StatusBadRequest) - return - } - p, err := a.getPost(u.Path) - if err != nil { - a.serveError(w, r, err.Error(), http.StatusBadRequest) - return - } - result = a.postToMfItem(p) - } else { - posts, err := a.getPosts(&postsRequestConfig{ - limit: stringToInt(query.Get("limit")), - offset: stringToInt(query.Get("offset")), - }) - if err != nil { - a.serveError(w, r, err.Error(), http.StatusInternalServerError) - return - } - list := map[string][]*microformatItem{} - for _, p := range posts { - list["items"] = append(list["items"], a.postToMfItem(p)) - } - result = list - } - case "category": - allCategories := []string{} - for blog := range a.cfg.Blogs { - values, err := a.db.allTaxonomyValues(blog, a.cfg.Micropub.CategoryParam) - if err != nil { - a.serveError(w, r, err.Error(), http.StatusInternalServerError) - return - } - allCategories = append(allCategories, values...) - } - result = map[string]any{"categories": allCategories} - case "channel": - channels := a.getMicropubChannelsMap() - result = map[string]any{"channels": channels} - default: - a.serve404(w, r) - return +func (a *goBlog) getMicropubImplementation() *micropubImplementation { + if a.mpImpl == nil { + a.mpImpl = µpubImplementation{a: a} } - a.respondWithMinifiedJson(w, result) + return a.mpImpl } -func (a *goBlog) getMicropubChannelsMap() []map[string]any { - channels := []map[string]any{} - for b, bc := range a.cfg.Blogs { - channels = append(channels, map[string]any{ - "name": fmt.Sprintf("%s: %s", b, bc.Title), - "uid": b, - }) - for s, sc := range bc.Sections { - channels = append(channels, map[string]any{ - "name": fmt.Sprintf("%s/%s: %s", b, s, sc.Name), - "uid": fmt.Sprintf("%s/%s", b, s), - }) - } - } - return channels -} - -func (a *goBlog) serveMicropubPost(w http.ResponseWriter, r *http.Request) { - blog, _ := a.getBlog(r) - p := &post{Blog: blog} - switch mt, _, _ := mime.ParseMediaType(r.Header.Get(contentType)); mt { - case contenttype.WWWForm, contenttype.MultipartForm: - _ = r.ParseMultipartForm(0) - if r.Form == nil { - a.serveError(w, r, "Failed to parse form", http.StatusBadRequest) - return - } - if action := micropubAction(r.Form.Get("action")); action != "" { - switch action { - case actionDelete: - a.micropubDelete(w, r, r.Form.Get("url")) - case actionUndelete: - a.micropubUndelete(w, r, r.Form.Get("url")) - default: - a.serveError(w, r, "Action not supported", http.StatusNotImplemented) - } - return - } - a.micropubCreatePostFromForm(w, r, p) - case contenttype.JSON: - parsedMfItem := µformatItem{} - err := json.NewDecoder(r.Body).Decode(parsedMfItem) - if err != nil { - a.serveError(w, r, err.Error(), http.StatusBadRequest) - return - } - if parsedMfItem.Action != "" { - switch parsedMfItem.Action { - case actionDelete: - a.micropubDelete(w, r, parsedMfItem.URL) - case actionUndelete: - a.micropubUndelete(w, r, parsedMfItem.URL) - case actionUpdate: - a.micropubUpdate(w, r, parsedMfItem.URL, parsedMfItem) - default: - a.serveError(w, r, "Action not supported", http.StatusNotImplemented) - } - return - } - a.micropubCreatePostFromJson(w, r, p, parsedMfItem) - default: - a.serveError(w, r, "wrong content type", http.StatusBadRequest) - } -} - -func (a *goBlog) micropubParseValuePostParamsValueMap(entry *post, values map[string][]string) error { - if h, ok := values["h"]; ok && (len(h) != 1 || h[0] != "entry") { - return errors.New("only entry type is supported so far") - } - delete(values, "h") - entry.Parameters = map[string][]string{} - if content, ok := values["content"]; ok && len(content) > 0 { - entry.Content = content[0] - delete(values, "content") - } - if published, ok := values["published"]; ok && len(published) > 0 { - entry.Published = published[0] - delete(values, "published") - } - if updated, ok := values["updated"]; ok && len(updated) > 0 { - entry.Updated = updated[0] - delete(values, "updated") - } - if slug, ok := values["mp-slug"]; ok && len(slug) > 0 { - entry.Slug = slug[0] - delete(values, "mp-slug") - } - if channel, ok := values["mp-channel"]; ok && len(channel) > 0 { - entry.setChannel(channel[0]) - delete(values, "mp-channel") - } - // Status - if status, ok := values["post-status"]; ok && len(status) > 0 { - statusStr := status[0] - entry.Status = micropubStatus(statusStr) - delete(values, "post-status") - } - // Visibility - if visibility, ok := values["visibility"]; ok && len(visibility) > 0 { - visibilityStr := visibility[0] - entry.Visibility = micropubVisibility(visibilityStr) - delete(values, "visibility") - } - // Parameter - if name, ok := values["name"]; ok { - entry.Parameters["title"] = name - delete(values, "name") - } - if category, ok := values["category"]; ok { - entry.Parameters[a.cfg.Micropub.CategoryParam] = category - delete(values, "category") - } else if categories, ok := values["category[]"]; ok { - entry.Parameters[a.cfg.Micropub.CategoryParam] = categories - delete(values, "category[]") - } - if inReplyTo, ok := values["in-reply-to"]; ok { - entry.Parameters[a.cfg.Micropub.ReplyParam] = inReplyTo - delete(values, "in-reply-to") - } - if likeOf, ok := values["like-of"]; ok { - entry.Parameters[a.cfg.Micropub.LikeParam] = likeOf - delete(values, "like-of") - } - if bookmarkOf, ok := values["bookmark-of"]; ok { - entry.Parameters[a.cfg.Micropub.BookmarkParam] = bookmarkOf - delete(values, "bookmark-of") - } - if audio, ok := values["audio"]; ok { - entry.Parameters[a.cfg.Micropub.AudioParam] = audio - delete(values, "audio") - } else if audio, ok := values["audio[]"]; ok { - entry.Parameters[a.cfg.Micropub.AudioParam] = audio - delete(values, "audio[]") - } - if photo, ok := values["photo"]; ok { - entry.Parameters[a.cfg.Micropub.PhotoParam] = photo - delete(values, "photo") - } else if photos, ok := values["photo[]"]; ok { - entry.Parameters[a.cfg.Micropub.PhotoParam] = photos - delete(values, "photo[]") - } - if photoAlt, ok := values["mp-photo-alt"]; ok { - entry.Parameters[a.cfg.Micropub.PhotoDescriptionParam] = photoAlt - delete(values, "mp-photo-alt") - } else if photoAlts, ok := values["mp-photo-alt[]"]; ok { - entry.Parameters[a.cfg.Micropub.PhotoDescriptionParam] = photoAlts - delete(values, "mp-photo-alt[]") - } - if location, ok := values["location"]; ok { - entry.Parameters[a.cfg.Micropub.LocationParam] = location - delete(values, "location") - } - for n, p := range values { - entry.Parameters[n] = append(entry.Parameters[n], p...) - } - return nil -} - -type micropubAction string - const ( - actionUpdate micropubAction = "update" - actionDelete micropubAction = "delete" - actionUndelete micropubAction = "undelete" + micropubPath = "/micropub" + micropubMediaSubPath = "/media" ) -type microformatItem struct { - Type []string `json:"type,omitempty"` - URL string `json:"url,omitempty"` - Action micropubAction `json:"action,omitempty"` - Properties *microformatProperties `json:"properties,omitempty"` - Replace map[string][]any `json:"replace,omitempty"` - Add map[string][]any `json:"add,omitempty"` - Delete any `json:"delete,omitempty"` +type micropubImplementation struct { + a *goBlog + h http.Handler + mh http.Handler } -type microformatProperties struct { - Name []string `json:"name,omitempty"` - Published []string `json:"published,omitempty"` - Updated []string `json:"updated,omitempty"` - PostStatus []string `json:"post-status,omitempty"` - Visibility []string `json:"visibility,omitempty"` - Category []string `json:"category,omitempty"` - Content []string `json:"content,omitempty"` - URL []string `json:"url,omitempty"` - InReplyTo []string `json:"in-reply-to,omitempty"` - LikeOf []string `json:"like-of,omitempty"` - BookmarkOf []string `json:"bookmark-of,omitempty"` - MpSlug []string `json:"mp-slug,omitempty"` - Photo []any `json:"photo,omitempty"` - Audio []string `json:"audio,omitempty"` - MpChannel []string `json:"mp-channel,omitempty"` -} - -func (a *goBlog) micropubParsePostParamsMfItem(entry *post, mf *microformatItem) error { - if len(mf.Type) != 1 || mf.Type[0] != "h-entry" { - return errors.New("only entry type is supported so far") +func (s *micropubImplementation) getHandler() http.Handler { + if s.h == nil { + s.h = micropub.NewHandler( + s, + micropub.WithMediaEndpoint(s.a.getFullAddress(micropubPath+micropubMediaSubPath)), + micropub.WithGetCategories(s.getCategories), + micropub.WithGetChannels(s.getChannels), + micropub.WithGetVisibility(s.getVisibility), + ) } + return s.h +} + +func (s *micropubImplementation) getCategories() []string { + allCategories := []string{} + for blog := range s.a.cfg.Blogs { + values, _ := s.a.db.allTaxonomyValues(blog, s.a.cfg.Micropub.CategoryParam) + allCategories = append(allCategories, values...) + } + return lo.Uniq(allCategories) +} + +func (s *micropubImplementation) getChannels() []micropub.Channel { + allChannels := []micropub.Channel{} + for b, bc := range s.a.cfg.Blogs { + allChannels = append(allChannels, micropub.Channel{ + Name: fmt.Sprintf("%s: %s", b, bc.Title), + UID: b, + }) + for s, sc := range bc.Sections { + allChannels = append(allChannels, micropub.Channel{ + Name: fmt.Sprintf("%s/%s: %s", b, s, sc.Name), + UID: fmt.Sprintf("%s/%s", b, s), + }) + } + } + return allChannels +} + +func (s *micropubImplementation) getVisibility() []string { + return []string{string(visibilityPrivate), string(visibilityUnlisted), string(visibilityPublic)} +} + +func (s *micropubImplementation) getMediaHandler() http.Handler { + if s.mh == nil { + s.mh = micropub.NewMediaHandler( + s.UploadMedia, + s.HasScope, + micropub.WithMaxMemory(0), + micropub.WithMaxMediaSize(30*bodylimit.MB), + ) + } + return s.mh +} + +func (s *micropubImplementation) HasScope(r *http.Request, scope string) bool { + return strings.Contains(r.Context().Value(indieAuthScope).(string), scope) +} + +func (s *micropubImplementation) Source(urlStr string) (map[string]any, error) { + url, err := urlpkg.Parse(urlStr) + if err != nil { + return nil, fmt.Errorf("%w: %w", micropub.ErrBadRequest, err) + } + p, err := s.a.getPost(url.Path) + if err != nil { + return nil, fmt.Errorf("%w: %w", micropub.ErrBadRequest, err) + } + return s.a.postToMfMap(p), nil +} + +func (s *micropubImplementation) SourceMany(limit, offset int) ([]map[string]any, error) { + posts, err := s.a.getPosts(&postsRequestConfig{ + limit: limit, + offset: offset, + }) + if err != nil { + return nil, fmt.Errorf("%w: %w", micropub.ErrBadRequest, err) + } + list := []map[string]any{} + for _, p := range posts { + list = append(list, s.a.postToMfMap(p)) + } + return list, nil +} + +func (s *micropubImplementation) Create(req *micropub.Request) (string, error) { + if req.Type != "h-entry" { + return "", fmt.Errorf("%w: only h-entry supported", micropub.ErrNotImplemented) + } + entry := &post{} entry.Parameters = map[string][]string{} - if mf.Properties == nil { - return nil + allValues := lo.Assign(req.Properties, req.Commands) + // Parameters with special care + for photoNo, photo := range allValues["photo"] { + pp := s.a.cfg.Micropub.PhotoParam + pdp := s.a.cfg.Micropub.PhotoDescriptionParam + if photoLink, isPhotoLink := photo.(string); isPhotoLink { + entry.Parameters[pp] = append(entry.Parameters[pp], photoLink) + if len(allValues["photo-alt"]) > photoNo && allValues["photo-alt"][photoNo] != nil { + entry.Parameters[pdp] = append(entry.Parameters[pdp], cast.ToString(allValues["photo-alt"][photoNo])) + } else { + entry.Parameters[pdp] = append(entry.Parameters[pdp], "") + } + } else if photoObject, isPhotoObject := photo.(map[string]any); isPhotoObject { + entry.Parameters[pp] = append(entry.Parameters[pp], cast.ToString(photoObject["value"])) + entry.Parameters[pdp] = append(entry.Parameters[pdp], cast.ToString(photoObject["alt"])) + } } - // Content - if len(mf.Properties.Content) > 0 && mf.Properties.Content[0] != "" { - entry.Content = mf.Properties.Content[0] + delete(allValues, "photo") + delete(allValues, "photo-alt") + delete(allValues, "file") // Micropublish.net fix + // Rest of parameters + for key, values := range allValues { + values := cast.ToStringSlice(values) + if len(values) == 0 { + continue + } + switch key { + case "content": + entry.Content = values[0] + case "published": + entry.Published = values[0] + case "updated": + entry.Updated = values[0] + case "slug": + entry.Slug = values[0] + case "channel": + entry.setChannel(values[0]) + case "post-status": + entry.Status = micropubStatus(values[0]) + case "visibility": + entry.Visibility = micropubVisibility(values[0]) + default: + entry.Parameters[s.mapToParameterName(key)] = values + } } - if len(mf.Properties.Published) > 0 { - entry.Published = mf.Properties.Published[0] + if err := s.a.extractParamsFromContent(entry); err != nil { + return "", fmt.Errorf("%w: %w", micropub.ErrBadRequest, err) } - if len(mf.Properties.Updated) > 0 { - entry.Updated = mf.Properties.Updated[0] + if err := s.a.createPost(entry); err != nil { + return "", fmt.Errorf("%w: %w", micropub.ErrBadRequest, err) } - if len(mf.Properties.MpSlug) > 0 { - entry.Slug = mf.Properties.MpSlug[0] + return s.a.fullPostURL(entry), nil +} + +func (s *micropubImplementation) Update(req *micropub.Request) (string, error) { + // Get post + url, err := urlpkg.Parse(req.URL) + if err != nil { + return "", fmt.Errorf("%w: %w", micropub.ErrBadRequest, err) } - if len(mf.Properties.MpChannel) > 0 { - entry.setChannel(mf.Properties.MpChannel[0]) + postPath := defaultIfEmpty(url.Path, "/") + entry, err := s.a.getPost(postPath) + if err != nil { + return "", fmt.Errorf("%w: %w", micropub.ErrBadRequest, err) } - // Status - if len(mf.Properties.PostStatus) > 0 { - status := mf.Properties.PostStatus[0] - entry.Status = micropubStatus(status) + // Check if post is marked as deleted + if entry.Deleted() { + return "", fmt.Errorf("%w: post is marked as deleted, undelete it first", micropub.ErrBadRequest) } - // Visibility - if len(mf.Properties.Visibility) > 0 { - visibility := mf.Properties.Visibility[0] - entry.Visibility = micropubVisibility(visibility) + // Update post + oldPath := entry.Path + oldStatus := entry.Status + oldVisibility := entry.Visibility + if entry.Parameters == nil { + entry.Parameters = map[string][]string{} } - // Parameter - if len(mf.Properties.Name) > 0 { - entry.Parameters["title"] = mf.Properties.Name + // Update properties + properties := s.a.postMfProperties(entry, false) + properties, err = micropubUpdateMfProperties(properties, req.Updates) + if err != nil { + return "", fmt.Errorf("failed to update properties: %w", err) } - if len(mf.Properties.Category) > 0 { - entry.Parameters[a.cfg.Micropub.CategoryParam] = mf.Properties.Category + s.updatePostPropertiesFromMf(entry, properties) + err = s.a.extractParamsFromContent(entry) + if err != nil { + return "", fmt.Errorf("%w: %w", micropub.ErrBadRequest, err) } - if len(mf.Properties.InReplyTo) > 0 { - entry.Parameters[a.cfg.Micropub.ReplyParam] = mf.Properties.InReplyTo + err = s.a.replacePost(entry, oldPath, oldStatus, oldVisibility) + if err != nil { + return "", fmt.Errorf("%w: %w", micropub.ErrBadRequest, err) } - if len(mf.Properties.LikeOf) > 0 { - entry.Parameters[a.cfg.Micropub.LikeParam] = mf.Properties.LikeOf + return s.a.fullPostURL(entry), nil +} + +func (s *micropubImplementation) Delete(urlStr string) error { + url, err := urlpkg.Parse(urlStr) + if err != nil { + return fmt.Errorf("%w: %w", micropub.ErrBadRequest, err) } - if len(mf.Properties.BookmarkOf) > 0 { - entry.Parameters[a.cfg.Micropub.BookmarkParam] = mf.Properties.BookmarkOf + if err := s.a.deletePost(url.Path); err != nil { + return fmt.Errorf("%w: %w", micropub.ErrBadRequest, err) } - if len(mf.Properties.Audio) > 0 { - entry.Parameters[a.cfg.Micropub.AudioParam] = mf.Properties.Audio + return nil +} + +func (s *micropubImplementation) Undelete(urlStr string) error { + url, err := urlpkg.Parse(urlStr) + if err != nil { + return fmt.Errorf("%w: %w", micropub.ErrBadRequest, err) } - if len(mf.Properties.Photo) > 0 { - for _, photo := range mf.Properties.Photo { - if theString, justString := photo.(string); justString { - entry.Parameters[a.cfg.Micropub.PhotoParam] = append(entry.Parameters[a.cfg.Micropub.PhotoParam], theString) - entry.Parameters[a.cfg.Micropub.PhotoDescriptionParam] = append(entry.Parameters[a.cfg.Micropub.PhotoDescriptionParam], "") - } else if thePhoto, isPhoto := photo.(map[string]any); isPhoto { - entry.Parameters[a.cfg.Micropub.PhotoParam] = append(entry.Parameters[a.cfg.Micropub.PhotoParam], cast.ToString(thePhoto["value"])) - entry.Parameters[a.cfg.Micropub.PhotoDescriptionParam] = append(entry.Parameters[a.cfg.Micropub.PhotoDescriptionParam], cast.ToString(thePhoto["alt"])) + if err := s.a.undeletePost(url.Path); err != nil { + return fmt.Errorf("%w: %w", micropub.ErrBadRequest, err) + } + return nil +} + +func (s *micropubImplementation) UploadMedia(file multipart.File, header *multipart.FileHeader) (string, error) { + // Generate sha256 hash for file + hash := sha256.New() + _, err := io.Copy(hash, file) + if err != nil { + return "", fmt.Errorf("%w: failed to get file hash", micropub.ErrBadRequest) + } + // Get file extension + fileExtension := filepath.Ext(header.Filename) + if fileExtension == "" { + // Find correct file extension if original filename does not contain one + mimeType := header.Header.Get(contentType) + if len(mimeType) > 0 { + allExtensions, _ := mime.ExtensionsByType(mimeType) + if len(allExtensions) > 0 { + fileExtension = allExtensions[0] } } } - return nil + // Generate the file name + fileName := fmt.Sprintf("%x%s", hash.Sum(nil), fileExtension) + // Save file + _, err = file.Seek(0, io.SeekStart) + if err != nil { + return "", fmt.Errorf("%w: failed to read multipart file", micropub.ErrBadRequest) + } + location, err := s.a.saveMediaFile(fileName, file) + if err != nil { + return "", fmt.Errorf("%w: failed to save original file", micropub.ErrBadRequest) + } + // Try to compress file (only when not in private mode) + if !s.a.isPrivate() { + compressedLocation, compressionErr := s.a.compressMediaFile(location) + if compressionErr != nil { + return "", fmt.Errorf("%w: failed to compress file: %w", micropub.ErrBadRequest, compressionErr) + } + // Overwrite location + if compressedLocation != "" { + location = compressedLocation + } + } + return location, nil +} + +func (s *micropubImplementation) mapToParameterName(key string) string { + switch key { + case "name": + return "title" + case "category": + return s.a.cfg.Micropub.CategoryParam + case "in-reply-to": + return s.a.cfg.Micropub.ReplyParam + case "like-of": + return s.a.cfg.Micropub.LikeParam + case "bookmark-of": + return s.a.cfg.Micropub.BookmarkParam + case "audio": + return s.a.cfg.Micropub.AudioParam + case "location": + return s.a.cfg.Micropub.LocationParam + default: + return key + } } func (a *goBlog) extractParamsFromContent(p *post) error { + // Ensure parameters map is initialized if p.Parameters == nil { p.Parameters = map[string][]string{} } + + // Normalize line endings in content p.Content = regexp.MustCompile("\r\n").ReplaceAllString(p.Content, "\n") + + // Check for frontmatter if split := strings.Split(p.Content, "---\n"); len(split) >= 3 && strings.TrimSpace(split[0]) == "" { - // Contains frontmatter + // Extract frontmatter fm := split[1] meta := map[string]any{} - err := yaml.Unmarshal([]byte(fm), &meta) - if err != nil { + if err := yaml.Unmarshal([]byte(fm), &meta); err != nil { return err } - // Find section and copy frontmatter to params + + // Copy frontmatter to parameters for key, value := range meta { - // Delete existing content - replace - p.Parameters[key] = []string{} if a, ok := value.([]any); ok { for _, ae := range a { p.Parameters[key] = append(p.Parameters[key], cast.ToString(ae)) @@ -363,314 +340,49 @@ func (a *goBlog) extractParamsFromContent(p *post) error { p.Parameters[key] = append(p.Parameters[key], cast.ToString(value)) } } + // Remove frontmatter from content p.Content = strings.Join(split[2:], "---\n") } - // Check settings - if blog := p.Parameters["blog"]; len(blog) == 1 && blog[0] != "" { - p.Blog = blog[0] - delete(p.Parameters, "blog") - } - if path := p.Parameters["path"]; len(path) == 1 { - p.Path = path[0] - delete(p.Parameters, "path") - } - if section := p.Parameters["section"]; len(section) == 1 { - p.Section = section[0] - delete(p.Parameters, "section") - } - if slug := p.Parameters["slug"]; len(slug) == 1 { - p.Slug = slug[0] - delete(p.Parameters, "slug") - } - if published := p.Parameters["published"]; len(published) == 1 { - p.Published = published[0] - delete(p.Parameters, "published") - } - if updated := p.Parameters["updated"]; len(updated) == 1 { - p.Updated = updated[0] - delete(p.Parameters, "updated") - } - if status := p.Parameters["status"]; len(status) == 1 { - p.Status = postStatus(status[0]) - delete(p.Parameters, "status") - } - if visibility := p.Parameters["visibility"]; len(visibility) == 1 { - p.Visibility = postVisibility(visibility[0]) - delete(p.Parameters, "visibility") - } - if priority := p.Parameters["priority"]; len(priority) == 1 { - p.Priority = cast.ToInt(priority[0]) - delete(p.Parameters, "priority") + + // Extract specific parameters + extractParam := func(paramName string, field any) { + if values, ok := p.Parameters[paramName]; len(values) == 1 && ok { + if stringPointer, ok := field.(*string); ok { + *stringPointer = values[0] + } else if stringFunc, ok := field.(func(string)); ok { + stringFunc(values[0]) + } + delete(p.Parameters, paramName) + } } + + extractParam("blog", &p.Blog) + extractParam("path", &p.Path) + extractParam("section", &p.Section) + extractParam("slug", &p.Slug) + extractParam("published", &p.Published) + extractParam("updated", &p.Updated) + extractParam("status", func(status string) { p.Status = postStatus(status) }) + extractParam("visibility", func(visibility string) { p.Visibility = postVisibility(visibility) }) + extractParam("priority", func(priority string) { p.Priority = cast.ToInt(priority) }) + // Add images not in content - images := p.Parameters[a.cfg.Micropub.PhotoParam] - imageAlts := p.Parameters[a.cfg.Micropub.PhotoDescriptionParam] + images, imageAlts := p.Parameters[a.cfg.Micropub.PhotoParam], p.Parameters[a.cfg.Micropub.PhotoDescriptionParam] useAlts := len(images) == len(imageAlts) for i, image := range images { if !strings.Contains(p.Content, image) { - if useAlts && len(imageAlts[i]) > 0 { - p.Content += "\n\n![" + imageAlts[i] + "](" + image + " \"" + imageAlts[i] + "\")" + if useAlts && imageAlts[i] != "" { + p.Content += fmt.Sprintf("\n\n![%s](%s \"%s\")", imageAlts[i], image, imageAlts[i]) } else { - p.Content += "\n\n![](" + image + ")" + p.Content += fmt.Sprintf("\n\n![](%s)", image) } } } + return nil } -func (a *goBlog) micropubCreatePostFromForm(w http.ResponseWriter, r *http.Request, p *post) { - err := a.micropubParseValuePostParamsValueMap(p, r.Form) - if err != nil { - a.serveError(w, r, err.Error(), http.StatusBadRequest) - return - } - a.micropubCreate(w, r, p) -} - -func (a *goBlog) micropubCreatePostFromJson(w http.ResponseWriter, r *http.Request, p *post, parsedMfItem *microformatItem) { - err := a.micropubParsePostParamsMfItem(p, parsedMfItem) - if err != nil { - a.serveError(w, r, err.Error(), http.StatusBadRequest) - return - } - a.micropubCreate(w, r, p) -} - -func (a *goBlog) micropubCheckScope(w http.ResponseWriter, r *http.Request, required string) bool { - if !strings.Contains(r.Context().Value(indieAuthScope).(string), required) { - a.serveError(w, r, required+" scope missing", http.StatusForbidden) - return false - } - return true -} - -func (a *goBlog) micropubCreate(w http.ResponseWriter, r *http.Request, p *post) { - if !a.micropubCheckScope(w, r, "create") { - return - } - if err := a.extractParamsFromContent(p); err != nil { - a.serveError(w, r, err.Error(), http.StatusBadRequest) - return - } - if err := a.createPost(p); err != nil { - a.serveError(w, r, err.Error(), http.StatusBadRequest) - return - } - http.Redirect(w, r, a.fullPostURL(p), http.StatusAccepted) -} - -func (a *goBlog) micropubDelete(w http.ResponseWriter, r *http.Request, u string) { - if !a.micropubCheckScope(w, r, "delete") { - return - } - uu, err := url.Parse(u) - if err != nil { - a.serveError(w, r, err.Error(), http.StatusBadRequest) - return - } - if err := a.deletePost(uu.Path); err != nil { - a.serveError(w, r, err.Error(), http.StatusBadRequest) - return - } - http.Redirect(w, r, uu.String(), http.StatusNoContent) -} - -func (a *goBlog) micropubUndelete(w http.ResponseWriter, r *http.Request, u string) { - if !a.micropubCheckScope(w, r, "undelete") { - return - } - uu, err := url.Parse(u) - if err != nil { - a.serveError(w, r, err.Error(), http.StatusBadRequest) - return - } - if err := a.undeletePost(uu.Path); err != nil { - a.serveError(w, r, err.Error(), http.StatusBadRequest) - return - } - http.Redirect(w, r, uu.String(), http.StatusNoContent) -} - -func (a *goBlog) micropubUpdate(w http.ResponseWriter, r *http.Request, u string, mf *microformatItem) { - if !a.micropubCheckScope(w, r, "update") { - return - } - uu, err := url.Parse(u) - if err != nil { - a.serveError(w, r, err.Error(), http.StatusBadRequest) - return - } - ppath := uu.Path - if ppath == "" { - // Probably homepage "/" - ppath = "/" - } - p, err := a.getPost(ppath) - if err != nil { - a.serveError(w, r, err.Error(), http.StatusBadRequest) - return - } - // Check if post is marked as deleted - if p.Deleted() { - a.serveError(w, r, "post is marked as deleted, undelete it first", http.StatusBadRequest) - return - } - // Update post - oldPath := p.Path - oldStatus := p.Status - oldVisibility := p.Visibility - a.micropubUpdateReplace(p, mf.Replace) - a.micropubUpdateAdd(p, mf.Add) - a.micropubUpdateDelete(p, mf.Delete) - err = a.extractParamsFromContent(p) - if err != nil { - a.serveError(w, r, err.Error(), http.StatusInternalServerError) - return - } - err = a.replacePost(p, oldPath, oldStatus, oldVisibility) - if err != nil { - a.serveError(w, r, err.Error(), http.StatusInternalServerError) - return - } - http.Redirect(w, r, a.fullPostURL(p), http.StatusNoContent) -} - -func (a *goBlog) micropubUpdateReplace(p *post, replace map[string][]any) { - if content, ok := replace["content"]; ok && len(content) > 0 { - p.Content = cast.ToStringSlice(content)[0] - } - if published, ok := replace["published"]; ok && len(published) > 0 { - p.Published = cast.ToStringSlice(published)[0] - } - if updated, ok := replace["updated"]; ok && len(updated) > 0 { - p.Updated = cast.ToStringSlice(updated)[0] - } - // Status - if status, ok := replace["post-status"]; ok && len(status) > 0 { - statusStr := cast.ToStringSlice(status)[0] - p.Status = micropubStatus(statusStr) - } - // Visibility - if visibility, ok := replace["visibility"]; ok && len(visibility) > 0 { - visibilityStr := cast.ToStringSlice(visibility)[0] - p.Visibility = micropubVisibility(visibilityStr) - } - // Parameters - if name, ok := replace["name"]; ok && name != nil { - p.Parameters["title"] = cast.ToStringSlice(name) - } - if category, ok := replace["category"]; ok && category != nil { - p.Parameters[a.cfg.Micropub.CategoryParam] = cast.ToStringSlice(category) - } - if reply, ok := replace["in-reply-to"]; ok && reply != nil { - p.Parameters[a.cfg.Micropub.ReplyParam] = cast.ToStringSlice(reply) - } - if like, ok := replace["like-of"]; ok && like != nil { - p.Parameters[a.cfg.Micropub.LikeParam] = cast.ToStringSlice(like) - } - if bookmark, ok := replace["bookmark-of"]; ok && bookmark != nil { - p.Parameters[a.cfg.Micropub.BookmarkParam] = cast.ToStringSlice(bookmark) - } - if audio, ok := replace["audio"]; ok && audio != nil { - p.Parameters[a.cfg.Micropub.AudioParam] = cast.ToStringSlice(audio) - } - // TODO: photos -} - -func (a *goBlog) micropubUpdateAdd(p *post, add map[string][]any) { - for key, value := range add { - switch key { - case "content": - p.Content += strings.TrimSpace(strings.Join(cast.ToStringSlice(value), " ")) - case "published": - p.Published = strings.TrimSpace(strings.Join(cast.ToStringSlice(value), " ")) - case "updated": - p.Updated = strings.TrimSpace(strings.Join(cast.ToStringSlice(value), " ")) - case "category": - p.Parameters[a.cfg.Micropub.CategoryParam] = append(p.Parameters[a.cfg.Micropub.CategoryParam], cast.ToStringSlice(value)...) - case "in-reply-to": - p.Parameters[a.cfg.Micropub.ReplyParam] = cast.ToStringSlice(value) - case "like-of": - p.Parameters[a.cfg.Micropub.LikeParam] = cast.ToStringSlice(value) - case "bookmark-of": - p.Parameters[a.cfg.Micropub.BookmarkParam] = cast.ToStringSlice(value) - case "audio": - p.Parameters[a.cfg.Micropub.AudioParam] = append(p.Parameters[a.cfg.Micropub.AudioParam], cast.ToStringSlice(value)...) - // TODO: photo - } - } -} - -func (a *goBlog) micropubUpdateDelete(p *post, del any) { - if del == nil { - return - } - deleteProperties, ok := del.([]any) - if ok { - // Completely remove properties - for _, prop := range deleteProperties { - switch prop { - case "content": - p.Content = "" - case "published": - p.Published = "" - case "updated": - p.Updated = "" - case "category": - delete(p.Parameters, a.cfg.Micropub.CategoryParam) - case "in-reply-to": - delete(p.Parameters, a.cfg.Micropub.ReplyParam) - delete(p.Parameters, a.cfg.Micropub.ReplyTitleParam) - delete(p.Parameters, a.cfg.Micropub.ReplyContextParam) - case "like-of": - delete(p.Parameters, a.cfg.Micropub.LikeParam) - delete(p.Parameters, a.cfg.Micropub.LikeTitleParam) - delete(p.Parameters, a.cfg.Micropub.LikeContextParam) - case "bookmark-of": - delete(p.Parameters, a.cfg.Micropub.BookmarkParam) - case "audio": - delete(p.Parameters, a.cfg.Micropub.AudioParam) - case "photo": - delete(p.Parameters, a.cfg.Micropub.PhotoParam) - delete(p.Parameters, a.cfg.Micropub.PhotoDescriptionParam) - } - } - // Return - return - } - toDelete, ok := del.(map[string]any) - if ok { - // Only delete parts of properties - for key, values := range toDelete { - switch key { - // Properties to completely delete - case "content": - p.Content = "" - case "published": - p.Published = "" - case "updated": - p.Updated = "" - case "in-reply-to": - delete(p.Parameters, a.cfg.Micropub.ReplyParam) - delete(p.Parameters, a.cfg.Micropub.ReplyTitleParam) - case "like-of": - delete(p.Parameters, a.cfg.Micropub.LikeParam) - delete(p.Parameters, a.cfg.Micropub.LikeTitleParam) - case "bookmark-of": - delete(p.Parameters, a.cfg.Micropub.BookmarkParam) - // Properties to delete part of - // TODO: Support partial deletes of more properties - case "category": - delValues := cast.ToStringSlice(values) - p.Parameters[a.cfg.Micropub.CategoryParam] = lo.Filter(p.Parameters[a.cfg.Micropub.CategoryParam], func(s string, _ int) bool { - return !lo.Contains(delValues, s) - }) - } - } - } -} - func micropubStatus(status string) postStatus { switch status { case "draft": @@ -690,3 +402,97 @@ func micropubVisibility(visibility string) postVisibility { return visibilityPublic } } + +func micropubUpdateMfProperties(properties map[string][]any, req micropub.RequestUpdate) (map[string][]any, error) { + if req.Replace != nil { + for key, value := range req.Replace { + properties[key] = value + } + } + + if req.Add != nil { + for key, value := range req.Add { + if _, ok := properties[key]; !ok { + properties[key] = []any{} + } + properties[key] = append(properties[key], value...) + } + } + + if req.Delete != nil { + if reflect.TypeOf(req.Delete).Kind() == reflect.Slice { + toDelete, ok := req.Delete.([]any) + if !ok { + return nil, errors.New("invalid delete array") + } + for _, key := range toDelete { + delete(properties, cast.ToString(key)) + } + } else { + toDelete, ok := req.Delete.(map[string]any) + if !ok { + return nil, fmt.Errorf("invalid delete object: expected map[string]any, got: %s", reflect.TypeOf(req.Delete)) + } + for key, v := range toDelete { + value, ok := v.([]any) + if !ok { + // Wrong type, ignore + continue + } + if _, ok := properties[key]; !ok { + // Parameter not present, ignore delete + continue + } + properties[key] = lo.Filter(properties[key], func(ss any, _ int) bool { + for _, s := range value { + if s == ss { + return false + } + } + return true + }) + } + } + } + return properties, nil +} + +func (s *micropubImplementation) updatePostPropertiesFromMf(p *post, properties map[string][]any) { + if properties == nil || p == nil { + return + } + + // Ignore the following properties + delete(properties, "post-status") + delete(properties, "photo") + delete(properties, "photo-alt") + + // Helper function + getFirstStringFromArray := func(arr any) string { + if strArr, ok := arr.([]any); ok && len(strArr) > 0 { + if str, ok := strArr[0].(string); ok { + return str + } + } + return "" + } + + // Set other properties + p.Content = getFirstStringFromArray(properties["content"]) + delete(properties, "content") + p.Published = getFirstStringFromArray(properties["published"]) + delete(properties, "published") + p.Updated = getFirstStringFromArray(properties["updated"]) + delete(properties, "updated") + p.Slug = getFirstStringFromArray(properties["mp-slug"]) + delete(properties, "mp-slug") + p.setChannel(getFirstStringFromArray(properties["mp-channel"])) + delete(properties, "mp-channel") + p.Visibility = postVisibility(defaultIfEmpty(getFirstStringFromArray(properties["visibility"]), string(p.Visibility))) + delete(properties, "visibility") + + for key, value := range properties { + p.Parameters[s.mapToParameterName(key)] = cast.ToStringSlice(value) + } + +} diff --git a/micropubMedia.go b/micropubMedia.go deleted file mode 100644 index 94890d6..0000000 --- a/micropubMedia.go +++ /dev/null @@ -1,85 +0,0 @@ -package main - -import ( - "crypto/sha256" - "fmt" - "io" - "mime" - "net/http" - "path/filepath" - "strings" - - "go.goblog.app/app/pkgs/contenttype" -) - -const micropubMediaSubPath = "/media" - -func (a *goBlog) serveMicropubMedia(w http.ResponseWriter, r *http.Request) { - // Check scope - if !a.micropubCheckScope(w, r, "media") { - return - } - // Check if request is multipart - if ct := r.Header.Get(contentType); !strings.Contains(ct, contenttype.MultipartForm) { - a.serveError(w, r, "wrong content-type", http.StatusBadRequest) - return - } - // Parse multipart form - err := r.ParseMultipartForm(0) - if err != nil { - a.serveError(w, r, "failed to parse multipart form", http.StatusBadRequest) - return - } - // Get file - file, header, err := r.FormFile("file") - if err != nil { - a.serveError(w, r, "failed to get multipart file", http.StatusBadRequest) - return - } - defer file.Close() - // Generate sha256 hash for file - hash := sha256.New() - _, err = io.Copy(hash, file) - if err != nil { - a.serveError(w, r, "failed to get file hash", http.StatusBadRequest) - return - } - // Get file extension - fileExtension := filepath.Ext(header.Filename) - if fileExtension == "" { - // Find correct file extension if original filename does not contain one - mimeType := header.Header.Get(contentType) - if len(mimeType) > 0 { - allExtensions, _ := mime.ExtensionsByType(mimeType) - if len(allExtensions) > 0 { - fileExtension = allExtensions[0] - } - } - } - // Generate the file name - fileName := fmt.Sprintf("%x%s", hash.Sum(nil), fileExtension) - // Save file - _, err = file.Seek(0, io.SeekStart) - if err != nil { - a.serveError(w, r, "failed to read multipart file", http.StatusInternalServerError) - return - } - location, err := a.saveMediaFile(fileName, file) - if err != nil { - a.serveError(w, r, "failed to save original file", http.StatusInternalServerError) - return - } - // Try to compress file (only when not in private mode) - if !a.isPrivate() { - compressedLocation, compressionErr := a.compressMediaFile(location) - if compressionErr != nil { - a.serveError(w, r, "failed to compress file: "+compressionErr.Error(), http.StatusInternalServerError) - return - } - // Overwrite location - if compressedLocation != "" { - location = compressedLocation - } - } - http.Redirect(w, r, location, http.StatusCreated) -} diff --git a/micropub_test.go b/micropub_test.go index b2eb2af..efa3318 100644 --- a/micropub_test.go +++ b/micropub_test.go @@ -1,12 +1,18 @@ package main import ( + "context" "net/http" "net/http/httptest" + "net/url" + "strings" "testing" + "github.com/carlmjohnson/requests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.goblog.app/app/pkgs/contenttype" + "go.hacdias.com/indielib/micropub" ) func Test_micropubQuery(t *testing.T) { @@ -14,11 +20,7 @@ func Test_micropubQuery(t *testing.T) { app := &goBlog{ cfg: createDefaultTestConfig(t), } - _ = app.initConfig(false) - _ = app.initCache() - app.initMarkdown() - app.initSessions() // Create a test post with tags err := app.createPost(&post{ @@ -39,27 +41,27 @@ func Test_micropubQuery(t *testing.T) { testCases := []testCase{ { query: "config", - want: "{\"channels\":[{\"name\":\"default: My Blog\",\"uid\":\"default\"},{\"name\":\"default/posts: posts\",\"uid\":\"default/posts\"}],\"media-endpoint\":\"http://localhost:8080/micropub/media\",\"visibility\":[\"public\",\"unlisted\",\"private\"]}", + want: "{\"categories\":[\"test\",\"test2\"],\"channels\":[{\"uid\":\"default\",\"name\":\"default: My Blog\"},{\"uid\":\"default/posts\",\"name\":\"default/posts: posts\"}],\"media-endpoint\":\"http://localhost:8080/micropub/media\",\"visibility\":[\"private\",\"unlisted\",\"public\"]}\n", wantStatus: http.StatusOK, }, { query: "source&url=http://localhost:8080/test/post", - want: "{\"type\":[\"h-entry\"],\"properties\":{\"published\":[\"\"],\"updated\":[\"\"],\"post-status\":[\"published\"],\"visibility\":[\"public\"],\"category\":[\"test\",\"test2\"],\"content\":[\"---\\nblog: default\\npath: /test/post\\npriority: 0\\npublished: \\\"\\\"\\nsection: \\\"\\\"\\nstatus: published\\ntags:\\n - test\\n - test2\\nupdated: \\\"\\\"\\nvisibility: public\\n---\\nTest post\"],\"url\":[\"http://localhost:8080/test/post\"],\"mp-slug\":[\"\"],\"mp-channel\":[\"default\"]}}", + want: "{\"properties\":{\"category\":[\"test\",\"test2\"],\"content\":[\"---\\nblog: default\\npath: /test/post\\npriority: 0\\npublished: \\\"\\\"\\nsection: \\\"\\\"\\nstatus: published\\ntags:\\n - test\\n - test2\\nupdated: \\\"\\\"\\nvisibility: public\\n---\\nTest post\"],\"mp-channel\":[\"default\"],\"mp-slug\":[\"\"],\"post-status\":[\"published\"],\"published\":[\"\"],\"updated\":[\"\"],\"url\":[\"http://localhost:8080/test/post\"],\"visibility\":[\"public\"]},\"type\":[\"h-entry\"]}\n", wantStatus: http.StatusOK, }, { query: "source", - want: "{\"items\":[{\"type\":[\"h-entry\"],\"properties\":{\"published\":[\"\"],\"updated\":[\"\"],\"post-status\":[\"published\"],\"visibility\":[\"public\"],\"category\":[\"test\",\"test2\"],\"content\":[\"---\\nblog: default\\npath: /test/post\\npriority: 0\\npublished: \\\"\\\"\\nsection: \\\"\\\"\\nstatus: published\\ntags:\\n - test\\n - test2\\nupdated: \\\"\\\"\\nvisibility: public\\n---\\nTest post\"],\"url\":[\"http://localhost:8080/test/post\"],\"mp-slug\":[\"\"],\"mp-channel\":[\"default\"]}}]}", + want: "{\"items\":[{\"properties\":{\"category\":[\"test\",\"test2\"],\"content\":[\"---\\nblog: default\\npath: /test/post\\npriority: 0\\npublished: \\\"\\\"\\nsection: \\\"\\\"\\nstatus: published\\ntags:\\n - test\\n - test2\\nupdated: \\\"\\\"\\nvisibility: public\\n---\\nTest post\"],\"mp-channel\":[\"default\"],\"mp-slug\":[\"\"],\"post-status\":[\"published\"],\"published\":[\"\"],\"updated\":[\"\"],\"url\":[\"http://localhost:8080/test/post\"],\"visibility\":[\"public\"]},\"type\":[\"h-entry\"]}]}\n", wantStatus: http.StatusOK, }, { query: "category", - want: "{\"categories\":[\"test\",\"test2\"]}", + want: "{\"categories\":[\"test\",\"test2\"]}\n", wantStatus: http.StatusOK, }, { query: "channel", - want: "{\"channels\":[{\"name\":\"default: My Blog\",\"uid\":\"default\"},{\"name\":\"default/posts: posts\",\"uid\":\"default/posts\"}]}", + want: "{\"channels\":[{\"uid\":\"default\",\"name\":\"default: My Blog\"},{\"uid\":\"default/posts\",\"name\":\"default/posts: posts\"}]}\n", wantStatus: http.StatusOK, }, { @@ -72,7 +74,7 @@ func Test_micropubQuery(t *testing.T) { req := httptest.NewRequest(http.MethodGet, "http://localhost:8080/micropub?q="+tc.query, nil) rec := httptest.NewRecorder() - app.serveMicropubQuery(rec, req) + app.getMicropubImplementation().getHandler().ServeHTTP(rec, req) rec.Flush() assert.Equal(t, tc.wantStatus, rec.Code) @@ -82,3 +84,242 @@ func Test_micropubQuery(t *testing.T) { } } + +func Test_micropubCreate(t *testing.T) { + app := &goBlog{ + cfg: createDefaultTestConfig(t), + } + _ = app.initConfig(false) + + // Modify settings for easier testing + bc := app.cfg.Blogs[app.cfg.DefaultBlog] + sc := bc.Sections[bc.DefaultSection] + sc.PathTemplate = `{{printf "/%v" .Slug}}` + + handler := addAllScopes(app.getMicropubImplementation().getHandler()) + + t.Run("Normal (JSON)", func(t *testing.T) { + postPath := "/create1" + reqBody := `{"type":["h-entry"],"properties":{"content":["Test post"],"mp-slug":["create1"],"category":["Cool"]}}` + + recorder := httptest.NewRecorder() + req, _ := requests.New().Post().BodyReader(strings.NewReader(reqBody)).ContentType(contenttype.JSONUTF8).Request(context.Background()) + handler.ServeHTTP(recorder, req) + + result := recorder.Result() + require.Equal(t, http.StatusAccepted, result.StatusCode) + require.Equal(t, "http://localhost:8080"+postPath, result.Header.Get("Location")) + + p, err := app.getPost(postPath) + require.NoError(t, err) + + assert.Equal(t, "Test post", p.Content) + assert.Equal(t, []string{"Cool"}, p.Parameters["tags"]) + }) + + t.Run("Photo (JSON)", func(t *testing.T) { + postPath := "/create2" + reqBody := `{"type":["h-entry"],"properties":{"mp-slug":["create2"],"photo":["https://photos.example.com/123.jpg"]}}` + + recorder := httptest.NewRecorder() + req, _ := requests.New().Post().BodyReader(strings.NewReader(reqBody)).ContentType(contenttype.JSONUTF8).Request(context.Background()) + handler.ServeHTTP(recorder, req) + + result := recorder.Result() + require.Equal(t, http.StatusAccepted, result.StatusCode) + require.Equal(t, "http://localhost:8080"+postPath, result.Header.Get("Location")) + + p, err := app.getPost(postPath) + require.NoError(t, err) + + assert.Equal(t, "\n![](https://photos.example.com/123.jpg)", p.Content) + assert.Equal(t, []string{"https://photos.example.com/123.jpg"}, p.Parameters["images"]) + }) + + t.Run("Photo with alternative text (JSON)", func(t *testing.T) { + postPath := "/create3" + reqBody := `{"type":["h-entry"],"properties":{"mp-slug":["create3"],"photo":[{ + "value": "https://photos.example.com/123.jpg", + "alt": "This is a photo" + }]}}` + + recorder := httptest.NewRecorder() + req, _ := requests.New().Post().BodyReader(strings.NewReader(reqBody)).ContentType(contenttype.JSONUTF8).Request(context.Background()) + handler.ServeHTTP(recorder, req) + + result := recorder.Result() + require.Equal(t, http.StatusAccepted, result.StatusCode) + require.Equal(t, "http://localhost:8080"+postPath, result.Header.Get("Location")) + + p, err := app.getPost(postPath) + require.NoError(t, err) + + assert.Equal(t, "\n![This is a photo](https://photos.example.com/123.jpg \"This is a photo\")", p.Content) + assert.Equal(t, []string{"https://photos.example.com/123.jpg"}, p.Parameters["images"]) + assert.Equal(t, []string{"This is a photo"}, p.Parameters["imagealts"]) + }) + + t.Run("Photo with alternative text (Form)", func(t *testing.T) { + postPath := "/create4" + + bodyForm := url.Values{} + bodyForm["h"] = []string{"entry"} + bodyForm["mp-slug"] = []string{"create4"} + bodyForm["photo"] = []string{"https://photos.example.com/123.jpg"} + bodyForm["mp-photo-alt"] = []string{"This is a photo"} + + recorder := httptest.NewRecorder() + req, _ := requests.New().Post().BodyForm(bodyForm).Request(context.Background()) + handler.ServeHTTP(recorder, req) + + result := recorder.Result() + require.Equal(t, http.StatusAccepted, result.StatusCode) + require.Equal(t, "http://localhost:8080"+postPath, result.Header.Get("Location")) + + p, err := app.getPost(postPath) + require.NoError(t, err) + + assert.Equal(t, "\n![This is a photo](https://photos.example.com/123.jpg \"This is a photo\")", p.Content) + assert.Equal(t, []string{"https://photos.example.com/123.jpg"}, p.Parameters["images"]) + assert.Equal(t, []string{"This is a photo"}, p.Parameters["imagealts"]) + }) + + t.Run("Custom parameter (Form)", func(t *testing.T) { + postPath := "/create5" + + bodyForm := url.Values{} + bodyForm["h"] = []string{"entry"} + bodyForm["mp-slug"] = []string{"create5"} + bodyForm["random"] = []string{"Abc", "Def"} + + recorder := httptest.NewRecorder() + req, _ := requests.New().Post().BodyForm(bodyForm).Request(context.Background()) + handler.ServeHTTP(recorder, req) + + result := recorder.Result() + require.Equal(t, http.StatusAccepted, result.StatusCode) + require.Equal(t, "http://localhost:8080"+postPath, result.Header.Get("Location")) + + p, err := app.getPost(postPath) + require.NoError(t, err) + + assert.Equal(t, []string{"Abc", "Def"}, p.Parameters["random"]) + }) +} + +func Test_micropubUpdate(t *testing.T) { + app := &goBlog{ + cfg: createDefaultTestConfig(t), + } + _ = app.initConfig(false) + + t.Run("Delete", func(t *testing.T) { + postPath := "/delete1" + + err := app.createPost(&post{ + Path: postPath, + Content: "Test post", + Parameters: map[string][]string{ + "tags": {"test", "test2"}, + "random": {"abc", "def"}, + }, + }) + require.NoError(t, err) + + _, err = app.getMicropubImplementation().Update(µpub.Request{ + URL: app.cfg.Server.PublicAddress + postPath, + Updates: micropub.RequestUpdate{ + Delete: map[string]any{ + // Should filter the parameters + "category": []any{"test"}, + // Should do nothing, because it's a custom parameter and thus ignored + "random": []any{"def"}, + // Should do nothing + "content": []any{}, + }, + }, + }) + require.NoError(t, err) + + p, err := app.getPost(postPath) + require.NoError(t, err) + + assert.Equal(t, []string{"test2"}, p.Parameters["tags"]) + assert.Equal(t, []string{"abc", "def"}, p.Parameters["random"]) + assert.Equal(t, "Test post", p.Content) + }) + + t.Run("Replace", func(t *testing.T) { + postPath := "/replace1" + + err := app.createPost(&post{ + Path: postPath, + Content: "Test post", + Status: statusPublished, + Visibility: visibilityPublic, + Parameters: map[string][]string{ + "tags": {"test", "test2"}, + "random": {"abc", "def"}, + }, + }) + require.NoError(t, err) + + _, err = app.getMicropubImplementation().Update(µpub.Request{ + URL: app.cfg.Server.PublicAddress + postPath, + Updates: micropub.RequestUpdate{ + Replace: map[string][]any{ + "category": {"test"}, + "random": {"def"}, + "content": {"New test"}, + "post-status": {"published-deleted"}, + "visibility": {"unlisted"}, + }, + }, + }) + require.NoError(t, err) + + p, err := app.getPost(postPath) + require.NoError(t, err) + + assert.Equal(t, []string{"test"}, p.Parameters["tags"]) + assert.Equal(t, []string{"def"}, p.Parameters["random"]) + assert.Equal(t, "New test", p.Content) + assert.Equal(t, statusPublished, p.Status) + assert.Nil(t, p.Parameters["post-status"]) + assert.Equal(t, visibilityUnlisted, p.Visibility) + }) + + t.Run("Add", func(t *testing.T) { + postPath := "/add1" + + err := app.createPost(&post{ + Path: postPath, + Content: "Test post", + Parameters: map[string][]string{ + "tags": {"test"}, + }, + }) + require.NoError(t, err) + + _, err = app.getMicropubImplementation().Update(µpub.Request{ + URL: app.cfg.Server.PublicAddress + postPath, + Updates: micropub.RequestUpdate{ + Add: map[string][]any{ + "category": {"test2"}, + "random": {"abc"}, + "content": {"Add", "Bbb"}, + "post-status": {"published"}, + }, + }, + }) + require.NoError(t, err) + + p, err := app.getPost(postPath) + require.NoError(t, err) + + assert.Equal(t, []string{"test", "test2"}, p.Parameters["tags"]) + assert.Equal(t, []string{"abc"}, p.Parameters["random"]) + assert.Equal(t, "Test post", p.Content) + assert.Nil(t, p.Parameters["post-status"]) + }) +} diff --git a/postsFuncs.go b/postsFuncs.go index ca7e5a8..4dd7859 100644 --- a/postsFuncs.go +++ b/postsFuncs.go @@ -164,8 +164,16 @@ func (p *post) isPublicPublishedSectionPost() bool { return p.isPublishedSectionPost() && p.Visibility == visibilityPublic } -func (a *goBlog) postToMfItem(p *post) *microformatItem { +func (a *goBlog) postToMfMap(p *post) map[string]any { + return map[string]any{ + "type": []string{"h-entry"}, + "properties": a.postMfProperties(p, true), + } +} + +func (a *goBlog) postMfProperties(p *post, contentWithParams bool) map[string][]any { var mfStatus, mfVisibility string + switch p.Status { case statusDraft: mfStatus = "draft" @@ -174,6 +182,7 @@ func (a *goBlog) postToMfItem(p *post) *microformatItem { case statusPublishedDeleted, statusDraftDeleted, statusScheduledDeleted: mfStatus = "deleted" } + switch p.Visibility { case visibilityPublic: mfVisibility = "public" @@ -182,26 +191,37 @@ func (a *goBlog) postToMfItem(p *post) *microformatItem { case visibilityPrivate: mfVisibility = "private" } - return µformatItem{ - Type: []string{"h-entry"}, - Properties: µformatProperties{ - Name: p.Parameters["title"], - Published: []string{p.Published}, - Updated: []string{p.Updated}, - PostStatus: []string{mfStatus}, - Visibility: []string{mfVisibility}, - Category: p.Parameters[a.cfg.Micropub.CategoryParam], - Content: []string{p.contentWithParams()}, - URL: []string{a.fullPostURL(p)}, - InReplyTo: p.Parameters[a.cfg.Micropub.ReplyParam], - LikeOf: p.Parameters[a.cfg.Micropub.LikeParam], - BookmarkOf: p.Parameters[a.cfg.Micropub.BookmarkParam], - MpSlug: []string{p.Slug}, - Audio: p.Parameters[a.cfg.Micropub.AudioParam], - MpChannel: []string{p.getChannel()}, - // TODO: Photos - }, + + properties := map[string][]any{} + addIfNotEmpty := func(key string, value []string) { + if len(value) > 0 { + properties[key] = []any{} + for _, val := range value { + properties[key] = append(properties[key], val) + } + } } + addIfNotEmpty("name", p.Parameters["title"]) + addIfNotEmpty("published", []string{p.Published}) + addIfNotEmpty("updated", []string{p.Updated}) + addIfNotEmpty("post-status", []string{mfStatus}) + addIfNotEmpty("visibility", []string{mfVisibility}) + addIfNotEmpty("category", p.Parameters[a.cfg.Micropub.CategoryParam]) + if contentWithParams { + addIfNotEmpty("content", []string{p.contentWithParams()}) + } else { + addIfNotEmpty("content", []string{p.Content}) + } + addIfNotEmpty("url", []string{a.fullPostURL(p)}) + addIfNotEmpty("in-reply-to", p.Parameters[a.cfg.Micropub.ReplyParam]) + addIfNotEmpty("like-of", p.Parameters[a.cfg.Micropub.LikeParam]) + addIfNotEmpty("bookmark-of", p.Parameters[a.cfg.Micropub.BookmarkParam]) + addIfNotEmpty("mp-slug", []string{p.Slug}) + addIfNotEmpty("audio", p.Parameters[a.cfg.Micropub.AudioParam]) + addIfNotEmpty("mp-channel", []string{p.getChannel()}) + addIfNotEmpty("location", p.Parameters[a.cfg.Micropub.LocationParam]) + + return properties } func (a *goBlog) showFull(p *post) bool { diff --git a/utils.go b/utils.go index 815c054..e58682b 100644 --- a/utils.go +++ b/utils.go @@ -74,10 +74,6 @@ func isAbsoluteURL(s string) bool { return true } -func allLinksFromHTMLString(html, baseURL string) ([]string, error) { - return allLinksFromHTML(strings.NewReader(html), baseURL) -} - func allLinksFromHTML(r io.Reader, baseURL string) ([]string, error) { doc, err := goquery.NewDocumentFromReader(r) if err != nil { diff --git a/utils_test.go b/utils_test.go index 3076978..62ab440 100644 --- a/utils_test.go +++ b/utils_test.go @@ -1,6 +1,7 @@ package main import ( + "strings" "testing" "github.com/stretchr/testify/assert" @@ -63,12 +64,12 @@ func Benchmark_charCount(b *testing.B) { } } -func Test_allLinksFromHTMLString(t *testing.T) { +func Test_allLinksFromHTML(t *testing.T) { baseUrl := "https://example.net/post/abc" html := `TestTestTestTest` expected := []string{"https://example.net/post/relative1", "https://example.net/relative2", "https://example.com"} - result, err := allLinksFromHTMLString(html, baseUrl) + result, err := allLinksFromHTML(strings.NewReader(html), baseUrl) require.NoError(t, err) assert.Equal(t, expected, result) }