From 7039df9af1de1aea72e90d4aa9fa6a37d21e1be0 Mon Sep 17 00:00:00 2001 From: Frédéric Guillot Date: Sat, 23 Jun 2018 16:16:54 -0700 Subject: Improve feed and user API updates with optional values --- model/user.go | 27 --------------------------- 1 file changed, 27 deletions(-) (limited to 'model/user.go') diff --git a/model/user.go b/model/user.go index d2283f1..6a985e3 100644 --- a/model/user.go +++ b/model/user.go @@ -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 { -- cgit v1.2.3