|
|
@@ -86,10 +86,11 @@ func (s *Storage) CreateUser(userCreationRequest *model.UserCreationRequest) (*m
|
|
|
openid_connect_id,
|
|
|
display_mode,
|
|
|
entry_order,
|
|
|
- default_reading_speed,
|
|
|
- cjk_reading_speed,
|
|
|
- default_home_page,
|
|
|
- categories_sorting_order
|
|
|
+ default_reading_speed,
|
|
|
+ cjk_reading_speed,
|
|
|
+ default_home_page,
|
|
|
+ categories_sorting_order,
|
|
|
+ mark_read_on_view
|
|
|
`
|
|
|
|
|
|
tx, err := s.db.Begin()
|
|
|
@@ -127,6 +128,7 @@ func (s *Storage) CreateUser(userCreationRequest *model.UserCreationRequest) (*m
|
|
|
&user.CJKReadingSpeed,
|
|
|
&user.DefaultHomePage,
|
|
|
&user.CategoriesSortingOrder,
|
|
|
+ &user.MarkReadOnView,
|
|
|
)
|
|
|
if err != nil {
|
|
|
tx.Rollback()
|
|
|
@@ -182,9 +184,10 @@ func (s *Storage) UpdateUser(user *model.User) error {
|
|
|
default_reading_speed=$18,
|
|
|
cjk_reading_speed=$19,
|
|
|
default_home_page=$20,
|
|
|
- categories_sorting_order=$21
|
|
|
+ categories_sorting_order=$21,
|
|
|
+ mark_read_on_view=$22
|
|
|
WHERE
|
|
|
- id=$22
|
|
|
+ id=$23
|
|
|
`
|
|
|
|
|
|
_, err = s.db.Exec(
|
|
|
@@ -210,6 +213,7 @@ func (s *Storage) UpdateUser(user *model.User) error {
|
|
|
user.CJKReadingSpeed,
|
|
|
user.DefaultHomePage,
|
|
|
user.CategoriesSortingOrder,
|
|
|
+ user.MarkReadOnView,
|
|
|
user.ID,
|
|
|
)
|
|
|
if err != nil {
|
|
|
@@ -237,9 +241,10 @@ func (s *Storage) UpdateUser(user *model.User) error {
|
|
|
default_reading_speed=$17,
|
|
|
cjk_reading_speed=$18,
|
|
|
default_home_page=$19,
|
|
|
- categories_sorting_order=$20
|
|
|
+ categories_sorting_order=$20,
|
|
|
+ mark_read_on_view=$21
|
|
|
WHERE
|
|
|
- id=$21
|
|
|
+ id=$22
|
|
|
`
|
|
|
|
|
|
_, err := s.db.Exec(
|
|
|
@@ -264,6 +269,7 @@ func (s *Storage) UpdateUser(user *model.User) error {
|
|
|
user.CJKReadingSpeed,
|
|
|
user.DefaultHomePage,
|
|
|
user.CategoriesSortingOrder,
|
|
|
+ user.MarkReadOnView,
|
|
|
user.ID,
|
|
|
)
|
|
|
|
|
|
@@ -310,7 +316,8 @@ func (s *Storage) UserByID(userID int64) (*model.User, error) {
|
|
|
default_reading_speed,
|
|
|
cjk_reading_speed,
|
|
|
default_home_page,
|
|
|
- categories_sorting_order
|
|
|
+ categories_sorting_order,
|
|
|
+ mark_read_on_view
|
|
|
FROM
|
|
|
users
|
|
|
WHERE
|
|
|
@@ -344,7 +351,8 @@ func (s *Storage) UserByUsername(username string) (*model.User, error) {
|
|
|
default_reading_speed,
|
|
|
cjk_reading_speed,
|
|
|
default_home_page,
|
|
|
- categories_sorting_order
|
|
|
+ categories_sorting_order,
|
|
|
+ mark_read_on_view
|
|
|
FROM
|
|
|
users
|
|
|
WHERE
|
|
|
@@ -378,7 +386,8 @@ func (s *Storage) UserByField(field, value string) (*model.User, error) {
|
|
|
default_reading_speed,
|
|
|
cjk_reading_speed,
|
|
|
default_home_page,
|
|
|
- categories_sorting_order
|
|
|
+ categories_sorting_order,
|
|
|
+ mark_read_on_view
|
|
|
FROM
|
|
|
users
|
|
|
WHERE
|
|
|
@@ -419,7 +428,8 @@ func (s *Storage) UserByAPIKey(token string) (*model.User, error) {
|
|
|
u.default_reading_speed,
|
|
|
u.cjk_reading_speed,
|
|
|
u.default_home_page,
|
|
|
- u.categories_sorting_order
|
|
|
+ u.categories_sorting_order,
|
|
|
+ u.mark_read_on_view
|
|
|
FROM
|
|
|
users u
|
|
|
LEFT JOIN
|
|
|
@@ -455,6 +465,7 @@ func (s *Storage) fetchUser(query string, args ...interface{}) (*model.User, err
|
|
|
&user.CJKReadingSpeed,
|
|
|
&user.DefaultHomePage,
|
|
|
&user.CategoriesSortingOrder,
|
|
|
+ &user.MarkReadOnView,
|
|
|
)
|
|
|
|
|
|
if err == sql.ErrNoRows {
|
|
|
@@ -551,7 +562,8 @@ func (s *Storage) Users() (model.Users, error) {
|
|
|
default_reading_speed,
|
|
|
cjk_reading_speed,
|
|
|
default_home_page,
|
|
|
- categories_sorting_order
|
|
|
+ categories_sorting_order,
|
|
|
+ mark_read_on_view
|
|
|
FROM
|
|
|
users
|
|
|
ORDER BY username ASC
|
|
|
@@ -588,6 +600,7 @@ func (s *Storage) Users() (model.Users, error) {
|
|
|
&user.CJKReadingSpeed,
|
|
|
&user.DefaultHomePage,
|
|
|
&user.CategoriesSortingOrder,
|
|
|
+ &user.MarkReadOnView,
|
|
|
)
|
|
|
|
|
|
if err != nil {
|