1
0
Fork 0
mirror of https://github.com/miniflux/v2.git synced 2025-08-06 17:41:00 +00:00

fix(storage): don't truncate title/content fields

As found out by @fguillot in https://github.com/miniflux/v2/pull/3461#issuecomment-3047204354
This commit is contained in:
jvoisin 2025-07-08 16:55:18 +02:00 committed by Frédéric Guillot
parent 32fbb4e882
commit 13ef89f785

View file

@ -78,12 +78,20 @@ func (s *Storage) UpdateEntryTitleAndContent(entry *model.Entry) error {
title=$1, title=$1,
content=$2, content=$2,
reading_time=$3, reading_time=$3,
document_vectors = setweight(to_tsvector($1), 'A') || setweight(to_tsvector($2), 'B') document_vectors = setweight(to_tsvector($4), 'A') || setweight(to_tsvector($5), 'B')
WHERE WHERE
id=$4 AND user_id=$5 id=$6 AND user_id=$7
` `
if _, err := s.db.Exec(query, truncateString(entry.Title), truncateString(entry.Content), entry.ReadingTime, entry.ID, entry.UserID); err != nil { if _, err := s.db.Exec(
query,
entry.Title,
entry.Content,
entry.ReadingTime,
truncateString(entry.Title),
truncateString(entry.Content),
entry.ID,
entry.UserID); err != nil {
return fmt.Errorf(`store: unable to update entry #%d: %v`, entry.ID, err) return fmt.Errorf(`store: unable to update entry #%d: %v`, entry.ID, err)
} }
@ -122,24 +130,26 @@ func (s *Storage) createEntry(tx *sql.Tx, entry *model.Entry) error {
$9, $9,
$10, $10,
now(), now(),
setweight(to_tsvector($1), 'A') || setweight(to_tsvector($6), 'B'), setweight(to_tsvector($11), 'A') || setweight(to_tsvector($12), 'B'),
$11 $13
) )
RETURNING RETURNING
id, status, created_at, changed_at id, status, created_at, changed_at
` `
err := tx.QueryRow( err := tx.QueryRow(
query, query,
truncateString(entry.Title), entry.Title,
entry.Hash, entry.Hash,
entry.URL, entry.URL,
entry.CommentsURL, entry.CommentsURL,
entry.Date, entry.Date,
truncateString(entry.Content), entry.Content,
entry.Author, entry.Author,
entry.UserID, entry.UserID,
entry.FeedID, entry.FeedID,
entry.ReadingTime, entry.ReadingTime,
truncateString(entry.Title),
truncateString(entry.Content),
pq.Array(entry.Tags), pq.Array(entry.Tags),
).Scan( ).Scan(
&entry.ID, &entry.ID,
@ -178,21 +188,23 @@ func (s *Storage) updateEntry(tx *sql.Tx, entry *model.Entry) error {
content=$4, content=$4,
author=$5, author=$5,
reading_time=$6, reading_time=$6,
document_vectors = setweight(to_tsvector($1), 'A') || setweight(to_tsvector($4), 'B'), document_vectors = setweight(to_tsvector($7), 'A') || setweight(to_tsvector($8), 'B'),
tags=$10 tags=$12
WHERE WHERE
user_id=$7 AND feed_id=$8 AND hash=$9 user_id=$9 AND feed_id=$10 AND hash=$11
RETURNING RETURNING
id id
` `
err := tx.QueryRow( err := tx.QueryRow(
query, query,
truncateString(entry.Title), entry.Title,
entry.URL, entry.URL,
entry.CommentsURL, entry.CommentsURL,
truncateString(entry.Content), entry.Content,
entry.Author, entry.Author,
entry.ReadingTime, entry.ReadingTime,
truncateString(entry.Title),
truncateString(entry.Content),
entry.UserID, entry.UserID,
entry.FeedID, entry.FeedID,
entry.Hash, entry.Hash,