peter/ekster
1
0
Fork 0
Code Issues 3 Pull Requests Projects 3 Releases 1 Wiki Activity

Fix Count and MarkRead
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Peter Stuifzand 2021-05-13 11:51:46 +02:00
parent 54e55c194e
commit dcff9a4890
WARNING! Although there is a key with this ID in the database it does not verify this commit! This commit is SUSPICIOUS.
GPG Key ID: 374322D56E5209E8
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/timeline/postgres.go
View File

@ -173,18 +173,14 @@ func (p *postgresStream) Count() (int, error) {
return -1, err
}
defer conn.Close()
rows, err := conn.QueryContext(context.Background(), "SELECT COUNT(*) FROM items WHERE channel_id = ?", p.channel)
if err != nil {
return 0, err
row := conn.QueryRowContext(context.Background(), "SELECT COUNT(*) FROM items WHERE channel_id = $1", p.channelID)
if row == nil {
return 0, nil
}
var count int
for rows.Next() {
err = rows.Scan(&count)
if err != nil {
return -1, err
}
break
err = row.Scan(&count)
if err != nil {
return -1, err
}
return count, nil
@ -224,10 +220,10 @@ func (p *postgresStream) MarkRead(uids []string) error {
ctx := context.Background()
conn, err := p.database.Conn(ctx)
if err != nil {
return err
return fmt.Errorf("getting connection: %w", err)
}
defer conn.Close()
_, err = conn.ExecContext(context.Background(), `UPDATE "items" SET is_read = 1 WHERE "uid" IN ($1)`, pq.Array(uids))
_, err = conn.ExecContext(context.Background(), `UPDATE "items" SET is_read = 1 WHERE "uid" = ANY($1)`, pq.Array(uids))
if err != nil {
return fmt.Errorf("while marking as read: %w", err)
}