oss/miniflux-v2
oss/miniflux-v2
1
0
Fork 0
mirror of https://github.com/miniflux/v2.git synced 2025-08-01 17:38:37 +00:00
Code Wiki Activity

feat: combine feed icon handlers to use only externalIconID

Browse source
This commit is contained in:
Frédéric Guillot 2025-03-28 14:20:53 -07:00
parent c531be8780
commit e643effefa
16 changed files with 33 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

9
internal/storage/entry_query_builder.go
View file

@ -293,6 +293,7 @@ func (e *EntryQueryBuilder) GetEntries() (model.Entries, error) {
f.hide_globally,
f.no_media_player,
fi.icon_id,
i.external_id AS icon_external_id,
u.timezone
FROM
entries e
@ -302,6 +303,8 @@ func (e *EntryQueryBuilder) GetEntries() (model.Entries, error) {
categories c ON c.id=f.category_id
LEFT JOIN
feed_icons fi ON fi.feed_id=f.id
LEFT JOIN
icons i ON i.id=fi.icon_id
LEFT JOIN
users u ON u.id=e.user_id
WHERE %s %s
@ -323,6 +326,7 @@ func (e *EntryQueryBuilder) GetEntries() (model.Entries, error) {
for rows.Next() {
var iconID sql.NullInt64
var externalIconID sql.NullString
var tz string
entry := model.NewEntry()
@ -361,6 +365,7 @@ func (e *EntryQueryBuilder) GetEntries() (model.Entries, error) {
&entry.Feed.HideGlobally,
&entry.Feed.NoMediaPlayer,
&iconID,
&externalIconID,
&tz,
)
@ -368,8 +373,10 @@ func (e *EntryQueryBuilder) GetEntries() (model.Entries, error) {
return nil, fmt.Errorf("store: unable to fetch entry row: %v", err)
}
if iconID.Valid {
if iconID.Valid && externalIconID.Valid && externalIconID.String != "" {
entry.Feed.Icon.FeedID = entry.FeedID
entry.Feed.Icon.IconID = iconID.Int64
entry.Feed.Icon.ExternalIconID = externalIconID.String
} else {
entry.Feed.Icon.IconID = 0
}

2
internal/storage/icon.go
View file

@ -59,7 +59,7 @@ func (s *Storage) IconByExternalID(externalIconID string) (*model.Icon, error) {
if err == sql.ErrNoRows {
return nil, nil
} else if err != nil {
return nil, fmt.Errorf("store: unable to fetch icon #%s: %w", externalIconID, err)
return nil, fmt.Errorf("store: unable to fetch icon %s: %w", externalIconID, err)
}
return &icon, nil