diff options
| author | Saturnino Abril <saturnino.abril@gmail.com> | 2018-05-25 22:52:17 +0800 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2018-05-25 07:52:17 -0700 |
| commit | 58abb4204e2e5d7c82312ed18a3d4d1a3a5f1962 (patch) | |
| tree | 9ee08a603c5ffa403f1c6b31c31ae0b69500e83d /app/import.go | |
| parent | 94b2eca2d1b6d9c75cc2ed702ccfa38b58a9cf86 (diff) | |
| download | chat-58abb4204e2e5d7c82312ed18a3d4d1a3a5f1962.tar.gz chat-58abb4204e2e5d7c82312ed18a3d4d1a3a5f1962.tar.bz2 chat-58abb4204e2e5d7c82312ed18a3d4d1a3a5f1962.zip | |
[MM-10645] Remove desktop duration notify props (#8851)
* remove desktop duration notify props
Signed-off-by: Saturnino Abril <saturnino.abril@gmail.com>
* fix test
Signed-off-by: Saturnino Abril <saturnino.abril@gmail.com>
Diffstat (limited to 'app/import.go')
| -rw-r--r-- | app/import.go | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/app/import.go b/app/import.go index fc0bfafa6..8075497a0 100644 --- a/app/import.go +++ b/app/import.go @@ -79,9 +79,8 @@ type UserImportData struct { } type UserNotifyPropsImportData struct { - Desktop *string `json:"desktop"` - DesktopDuration *string `json:"desktop_duration"` - DesktopSound *string `json:"desktop_sound"` + Desktop *string `json:"desktop"` + DesktopSound *string `json:"desktop_sound"` Email *string `json:"email"` @@ -608,13 +607,6 @@ func (a *App) ImportUser(data *UserImportData, dryRun bool) *model.AppError { } } - if data.NotifyProps.DesktopDuration != nil { - if value, ok := user.NotifyProps[model.DESKTOP_DURATION_NOTIFY_PROP]; !ok || value != *data.NotifyProps.DesktopDuration { - user.AddNotifyProp(model.DESKTOP_DURATION_NOTIFY_PROP, *data.NotifyProps.DesktopDuration) - hasNotifyPropsChanged = true - } - } - if data.NotifyProps.DesktopSound != nil { if value, ok := user.NotifyProps[model.DESKTOP_SOUND_NOTIFY_PROP]; !ok || value != *data.NotifyProps.DesktopSound { user.AddNotifyProp(model.DESKTOP_SOUND_NOTIFY_PROP, *data.NotifyProps.DesktopSound) @@ -969,10 +961,6 @@ func validateUserImportData(data *UserImportData) *model.AppError { return model.NewAppError("BulkImport", "app.import.validate_user_import_data.notify_props_desktop_invalid.error", nil, "", http.StatusBadRequest) } - if data.NotifyProps.DesktopDuration != nil && !model.IsValidNumberString(*data.NotifyProps.DesktopDuration) { - return model.NewAppError("BulkImport", "app.import.validate_user_import_data.notify_props_desktop_duration_invalid.error", nil, "", http.StatusBadRequest) - } - if data.NotifyProps.DesktopSound != nil && !model.IsValidTrueOrFalseString(*data.NotifyProps.DesktopSound) { return model.NewAppError("BulkImport", "app.import.validate_user_import_data.notify_props_desktop_sound_invalid.error", nil, "", http.StatusBadRequest) } |