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

Make reading speed user-configurable

Browse source
This commit is contained in:
Gabriel Augendre 2021-08-30 16:53:05 +02:00 • committed by Frédéric Guillot
parent 3a0aaddafd
commit 6e50ce3293
31 changed files with 395 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

46
storage/user.go
View file

@ -85,7 +85,9 @@ func (s *Storage) CreateUser(userCreationRequest *model.UserCreationRequest) (*m
google_id,
openid_connect_id,
display_mode,
entry_order
entry_order,
default_reading_speed,
cjk_reading_speed
`
tx, err := s.db.Begin()
@ -118,6 +120,8 @@ func (s *Storage) CreateUser(userCreationRequest *model.UserCreationRequest) (*m
&user.OpenIDConnectID,
&user.DisplayMode,
&user.EntryOrder,
&user.DefaultReadingSpeed,
&user.CJKReadingSpeed,
)
if err != nil {
tx.Rollback()
@ -168,9 +172,11 @@ func (s *Storage) UpdateUser(user *model.User) error {
google_id=$13,
openid_connect_id=$14,
display_mode=$15,
entry_order=$16
entry_order=$16,
default_reading_speed=$17,
cjk_reading_speed=$18
WHERE
id=$17
id=$19
`
_, err = s.db.Exec(
@ -191,6 +197,8 @@ func (s *Storage) UpdateUser(user *model.User) error {
user.OpenIDConnectID,
user.DisplayMode,
user.EntryOrder,
user.DefaultReadingSpeed,
user.CJKReadingSpeed,
user.ID,
)
if err != nil {
@ -213,9 +221,11 @@ func (s *Storage) UpdateUser(user *model.User) error {
google_id=$12,
openid_connect_id=$13,
display_mode=$14,
entry_order=$15
entry_order=$15,
default_reading_speed=$16,
cjk_reading_speed=$17
WHERE
id=$16
id=$18
`
_, err := s.db.Exec(
@ -235,6 +245,8 @@ func (s *Storage) UpdateUser(user *model.User) error {
user.OpenIDConnectID,
user.DisplayMode,
user.EntryOrder,
user.DefaultReadingSpeed,
user.CJKReadingSpeed,
user.ID,
)
@ -276,7 +288,9 @@ func (s *Storage) UserByID(userID int64) (*model.User, error) {
google_id,
openid_connect_id,
display_mode,
entry_order
entry_order,
default_reading_speed,
cjk_reading_speed
FROM
users
WHERE
@ -305,7 +319,9 @@ func (s *Storage) UserByUsername(username string) (*model.User, error) {
google_id,
openid_connect_id,
display_mode,
entry_order
entry_order,
default_reading_speed,
cjk_reading_speed
FROM
users
WHERE
@ -334,7 +350,9 @@ func (s *Storage) UserByField(field, value string) (*model.User, error) {
google_id,
openid_connect_id,
display_mode,
entry_order
entry_order,
default_reading_speed,
cjk_reading_speed
FROM
users
WHERE
@ -370,7 +388,9 @@ func (s *Storage) UserByAPIKey(token string) (*model.User, error) {
u.google_id,
u.openid_connect_id,
u.display_mode,
u.entry_order
u.entry_order,
u.default_reading_speed,
u.cjk_reading_speed
FROM
users u
LEFT JOIN
@ -401,6 +421,8 @@ func (s *Storage) fetchUser(query string, args ...interface{}) (*model.User, err
&user.OpenIDConnectID,
&user.DisplayMode,
&user.EntryOrder,
&user.DefaultReadingSpeed,
&user.CJKReadingSpeed,
)
if err == sql.ErrNoRows {
@ -492,7 +514,9 @@ func (s *Storage) Users() (model.Users, error) {
google_id,
openid_connect_id,
display_mode,
entry_order
entry_order,
default_reading_speed,
cjk_reading_speed
FROM
users
ORDER BY username ASC
@ -524,6 +548,8 @@ func (s *Storage) Users() (model.Users, error) {
&user.OpenIDConnectID,
&user.DisplayMode,
&user.EntryOrder,
&user.DefaultReadingSpeed,
&user.CJKReadingSpeed,
)
if err != nil {