diff options
| author |  Jan-Lukas Else <mail@jlelse.de>
| 2024-05-02 16:15:47 +0200 |
|---|---|---|
| committer |  Frédéric Guillot <f@miniflux.net>
| 2024-05-06 15:40:36 -0700 |
| commit | a33b1adf138efbaf442129d501dda198af18390d (patch) | |
| tree | 6dd24c0af76c1a926286d5e0255e10590a23067e /internal/storage | |
| parent | a631bd527d73b5b8d8e85343a1d5fe438e89dad7 (diff) | |
| download | v2-a33b1adf138efbaf442129d501dda198af18390d.tar.gz v2-a33b1adf138efbaf442129d501dda198af18390d.tar.zst v2-a33b1adf138efbaf442129d501dda198af18390d.zip | |
Add description field to feed settings
This adds a new "description" field to the feed settings. This allows to
save custom description regarding a feed. It is also exported and
imported as "description" in OPML.
Diffstat (limited to 'internal/storage')
| -rw-r--r-- | internal/storage/entry_query_builder.go | 2 | ||||
| -rw-r--r-- | internal/storage/feed.go | 12 | ||||
| -rw-r--r-- | internal/storage/feed_query_builder.go | 2 |
3 files changed, 12 insertions, 4 deletions
diff --git a/internal/storage/entry_query_builder.go b/internal/storage/entry_query_builder.go index 9ab26738..6bc475fc 100644 --- a/internal/storage/entry_query_builder.go +++ b/internal/storage/entry_query_builder.go @@ -281,6 +281,7 @@ func (e *EntryQueryBuilder) GetEntries() (model.Entries, error) { f.title as feed_title, f.feed_url, f.site_url, + f.description, f.checked_at, f.category_id, c.title as category_title, @@ -347,6 +348,7 @@ func (e *EntryQueryBuilder) GetEntries() (model.Entries, error) { &entry.Feed.Title, &entry.Feed.FeedURL, &entry.Feed.SiteURL, + &entry.Feed.Description, &entry.Feed.CheckedAt, &entry.Feed.Category.ID, &entry.Feed.Category.Title, diff --git a/internal/storage/feed.go b/internal/storage/feed.go index e7aaf12a..36939d3d 100644 --- a/internal/storage/feed.go +++ b/internal/storage/feed.go @@ -238,10 +238,11 @@ func (s *Storage) CreateFeed(feed *model.Feed) error { url_rewrite_rules, no_media_player, apprise_service_urls, - disable_http2 + disable_http2, + description ) VALUES - ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24, $25) + ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24, $25, $26) RETURNING id ` @@ -272,6 +273,7 @@ func (s *Storage) CreateFeed(feed *model.Feed) error { feed.NoMediaPlayer, feed.AppriseServiceURLs, feed.DisableHTTP2, + feed.Description, ).Scan(&feed.ID) if err != nil { return fmt.Errorf(`store: unable to create feed %q: %v`, feed.FeedURL, err) @@ -344,9 +346,10 @@ func (s *Storage) UpdateFeed(feed *model.Feed) (err error) { url_rewrite_rules=$25, no_media_player=$26, apprise_service_urls=$27, - disable_http2=$28 + disable_http2=$28, + description=$29 WHERE - id=$29 AND user_id=$30 + id=$30 AND user_id=$31 ` _, err = s.db.Exec(query, feed.FeedURL, @@ -377,6 +380,7 @@ func (s *Storage) UpdateFeed(feed *model.Feed) (err error) { feed.NoMediaPlayer, feed.AppriseServiceURLs, feed.DisableHTTP2, + feed.Description, feed.ID, feed.UserID, ) diff --git a/internal/storage/feed_query_builder.go b/internal/storage/feed_query_builder.go index e12107ec..79a752d9 100644 --- a/internal/storage/feed_query_builder.go +++ b/internal/storage/feed_query_builder.go @@ -135,6 +135,7 @@ func (f *FeedQueryBuilder) GetFeeds() (model.Feeds, error) { f.feed_url, f.site_url, f.title, + f.description, f.etag_header, f.last_modified_header, f.user_id, @@ -202,6 +203,7 @@ func (f *FeedQueryBuilder) GetFeeds() (model.Feeds, error) { &feed.FeedURL, &feed.SiteURL, &feed.Title, + &feed.Description, &feed.EtagHeader, &feed.LastModifiedHeader, &feed.UserID, |