forks/miniflux
1
0
Fork 0
Code Releases Activity

Improve feed and user API updates with optional values

Browse source
This commit is contained in:
Frédéric Guillot 2018-06-23 16:16:54 -07:00
parent cd77ebd742
commit 7039df9af1
12 changed files with 685 additions and 508 deletions
Download patch file Download diff file Expand all files Collapse all files

27
model/user.go
View file

@ -74,33 +74,6 @@ func (u User) ValidatePassword() error {
return nil
}
// Merge update the current user with another user.
func (u *User) Merge(override *User) {
if override.Username != "" && u.Username != override.Username {
u.Username = override.Username
}
if override.Password != "" && u.Password != override.Password {
u.Password = override.Password
}
if u.IsAdmin != override.IsAdmin {
u.IsAdmin = override.IsAdmin
}
if override.Theme != "" && u.Theme != override.Theme {
u.Theme = override.Theme
}
if override.Language != "" && u.Language != override.Language {
u.Language = override.Language
}
if override.Timezone != "" && u.Timezone != override.Timezone {
u.Timezone = override.Timezone
}
}
// UseTimezone converts last login date to the given timezone.
func (u *User) UseTimezone(tz string) {
if u.LastLoginAt != nil {