james/yarr
4
0
Fork 0
mirror of https://github.com/nkanaev/yarr.git synced 2026-06-24 09:05:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd: modernize -fix ./cmd/...

Browse Source
This commit is contained in:
nkanaev
2026-04-27 20:44:24 +01:00
parent 7a5f8a5e41
commit 49c704037b
15 changed files with 53 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/storage/feed_test.go
View File

@@ -24,7 +24,7 @@ func TestCreateFeedSameLink(t *testing.T) {
t.Fatal("expected feed")
}
for i := 0; i < 10; i++ {
for range 10 {
db.CreateFeed("title", "", "", "http://example2.com/feed.xml", nil)
}

4
src/storage/item.go
View File

@@ -169,9 +169,9 @@ func (s *Storage) CreateItems(items []Item) bool {
return true
}
func listQueryPredicate(filter ItemFilter, newestFirst bool) (string, []interface{}) {
func listQueryPredicate(filter ItemFilter, newestFirst bool) (string, []any) {
cond := make([]string, 0)
args := make([]interface{}, 0)
args := make([]any, 0)
if filter.FolderID != nil {
cond = append(cond, "i.feed_id in (select id from feeds where folder_id = :folder_id)")
args = append(args, sql.Named("folder_id", *filter.FolderID))

14
src/storage/settings.go
View File

@@ -6,8 +6,8 @@ import (
"log"
)
func settingsDefaults() map[string]interface{} {
return map[string]interface{}{
func settingsDefaults() map[string]any {
return map[string]any{
"filter": "",
"feed": "",
"feed_list_width": 300,
@@ -20,7 +20,7 @@ func settingsDefaults() map[string]interface{} {
}
}
func (s *Storage) GetSettingsValue(key string) interface{} {
func (s *Storage) GetSettingsValue(key string) any {
row := s.db.QueryRow(`select val from settings where key=:key`, sql.Named("key", key))
if row == nil {
return settingsDefaults()[key]
@@ -30,7 +30,7 @@ func (s *Storage) GetSettingsValue(key string) interface{} {
if len(val) == 0 {
return nil
}
var valDecoded interface{}
var valDecoded any
if err := json.Unmarshal([]byte(val), &valDecoded); err != nil {
log.Print(err)
return nil
@@ -48,7 +48,7 @@ func (s *Storage) GetSettingsValueInt64(key string) int64 {
return 0
}
func (s *Storage) GetSettings() map[string]interface{} {
func (s *Storage) GetSettings() map[string]any {
result := settingsDefaults()
rows, err := s.db.Query(`select key, val from settings;`)
if err != nil {
@@ -58,7 +58,7 @@ func (s *Storage) GetSettings() map[string]interface{} {
for rows.Next() {
var key string
var val []byte
var valDecoded interface{}
var valDecoded any
rows.Scan(&key, &val)
if err = json.Unmarshal([]byte(val), &valDecoded); err != nil {
@@ -70,7 +70,7 @@ func (s *Storage) GetSettings() map[string]interface{} {
return result
}
func (s *Storage) UpdateSettings(kv map[string]interface{}) bool {
func (s *Storage) UpdateSettings(kv map[string]any) bool {
defaults := settingsDefaults()
for key, val := range kv {
if defaults[key] == nil {