From 018804a4a4aae263c681ad490db76f58e7975533 Mon Sep 17 00:00:00 2001 From: nkanaev Date: Fri, 10 Jul 2026 18:41:56 +0100 Subject: [PATCH] go fmt --- src/assets/assetsfs.go | 2 +- src/parser/rss_test.go | 8 +++--- src/storage/model/model.go | 2 -- src/storage/tests/item_performance_test.go | 2 +- src/storage/tests/item_test.go | 32 +++++++++++----------- src/worker/client.go | 2 +- 6 files changed, 23 insertions(+), 25 deletions(-) diff --git a/src/assets/assetsfs.go b/src/assets/assetsfs.go index e59d76c..165e8ea 100644 --- a/src/assets/assetsfs.go +++ b/src/assets/assetsfs.go @@ -15,7 +15,7 @@ var static embed.FS var templates embed.FS func Templates() *template.Template { - return template.Must(template.ParseFS(templates, "templates/*.html")) + return template.Must(template.ParseFS(templates, "templates/*.html")) } func StaticFS() fs.FS { diff --git a/src/parser/rss_test.go b/src/parser/rss_test.go index 097afd2..d6b321b 100644 --- a/src/parser/rss_test.go +++ b/src/parser/rss_test.go @@ -377,12 +377,12 @@ func TestRSSDefaultNamespace(t *testing.T) { `)) want := &Feed{ - Title: "Feed", + Title: "Feed", Items: []Item{ { - GUID: "https://example.com/news/1", - URL: "https://example.com/news/1", - Title: "Title 1", + GUID: "https://example.com/news/1", + URL: "https://example.com/news/1", + Title: "Title 1", }, }, } diff --git a/src/storage/model/model.go b/src/storage/model/model.go index 94465bd..b402aec 100644 --- a/src/storage/model/model.go +++ b/src/storage/model/model.go @@ -44,7 +44,6 @@ const ( STARRED ItemStatus = 2 ) - var StatusRepresentations = map[ItemStatus]string{ UNREAD: "unread", READ: "read", @@ -120,7 +119,6 @@ type FeedStat struct { StarredCount int64 `json:"starred"` } - type Settings struct { Filter string `json:"filter"` Feed string `json:"feed"` diff --git a/src/storage/tests/item_performance_test.go b/src/storage/tests/item_performance_test.go index d5502c1..41a3a5a 100644 --- a/src/storage/tests/item_performance_test.go +++ b/src/storage/tests/item_performance_test.go @@ -255,7 +255,7 @@ func BenchmarkMarkItemsRead_ByFolder(b *testing.B) { FeedLink: fmt.Sprintf("http://f%d.xml", k), FolderID: &folder.Id, }) - for i := 0; i < 1_000_000 / 5; i++ { + for i := 0; i < 1_000_000/5; i++ { all = append(all, model.Item{ GUID: fmt.Sprintf("f%d-i%d", k, i), FeedId: feed.Id, diff --git a/src/storage/tests/item_test.go b/src/storage/tests/item_test.go index b559319..6bd0f24 100644 --- a/src/storage/tests/item_test.go +++ b/src/storage/tests/item_test.go @@ -37,15 +37,15 @@ type testItemScope struct { feed11, feed12 *model.Feed feed21, feed01 *model.Feed folder1, folder2 *model.Folder - items map[string]model.Item + items map[string]model.Item } func MustGet[K comparable, V any](m map[K]V, key K) V { - value, ok := m[key] - if !ok { - panic(fmt.Sprintf("key %v not found in map", key)) - } - return value + value, ok := m[key] + if !ok { + panic(fmt.Sprintf("key %v not found in map", key)) + } + return value } func testItemsSetup(db storage.Storage) testItemScope { @@ -61,10 +61,10 @@ func testItemsSetup(db storage.Storage) testItemScope { items := map[string]model.Item{ // feed11 "item111": { - GUID: "item111", + GUID: "item111", FeedId: feed11.Id, - Title: "title111", - Date: now.Add(time.Hour * 24 * 1), + Title: "title111", + Date: now.Add(time.Hour * 24 * 1), }, "item112": { GUID: "item112", @@ -82,10 +82,10 @@ func testItemsSetup(db storage.Storage) testItemScope { }, // starred // feed12 "item121": { - GUID: "item121", + GUID: "item121", FeedId: feed12.Id, - Title: "title121", - Date: now.Add(time.Hour * 24 * 4), + Title: "title121", + Date: now.Add(time.Hour * 24 * 4), }, "item122": { GUID: "item122", @@ -111,10 +111,10 @@ func testItemsSetup(db storage.Storage) testItemScope { }, // starred // feed01 "item011": { - GUID: "item011", + GUID: "item011", FeedId: feed01.Id, - Title: "title011", - Date: now.Add(time.Hour * 24 * 8), + Title: "title011", + Date: now.Add(time.Hour * 24 * 8), }, "item012": { GUID: "item012", @@ -141,7 +141,7 @@ func testItemsSetup(db storage.Storage) testItemScope { feed01: feed01, folder1: folder1, folder2: folder2, - items: items, + items: items, } } diff --git a/src/worker/client.go b/src/worker/client.go index 6565afb..fea4561 100644 --- a/src/worker/client.go +++ b/src/worker/client.go @@ -43,7 +43,7 @@ func init() { Timeout: 10 * time.Second, }).DialContext, DisableKeepAlives: true, - ForceAttemptHTTP2: true, + ForceAttemptHTTP2: true, TLSHandshakeTimeout: time.Second * 10, } httpClient := &http.Client{