mirror of
https://github.com/mattermost/mattermost.git
synced 2025-02-25 18:55:24 -06:00
* parent 48256721c4 (#14358)
author Eli Yukelzon <reflog@gmail.com> 1585814774 +0300
committer Eli Yukelzon <reflog@gmail.com> 1589111022 +0300
Sidebar caregories implemented
Apply suggestions from code review
Co-authored-by: Ibrahim Serdar Acikgoz <serdaracikgoz86@gmail.com>
Update store/sqlstore/channel_store.go
Co-authored-by: Ibrahim Serdar Acikgoz <serdaracikgoz86@gmail.com>
Update store/sqlstore/channel_store.go
Co-authored-by: Ibrahim Serdar Acikgoz <serdaracikgoz86@gmail.com>
code review suggestions
status messages
edge case
bugs...
timeout reverse
* MM-25126 Add a separate default sorting method for categories (#14575)
* MM-25158 Add user to initial sidebar categories when joining team (#14570)
* MM-25281 Place new categories in the correct position (#14609)
* MM-25277 Return channels that aren't in a category as part of the Channels/Direct Messages categories (#14601)
* MM-25276 Remove categories when leaving a team (#14600)
* Remove categories when leaving a team
* layers
* corrected cleanup function
* lint
* .
* corrected errors in postgres
* .
* MM-25280 Ensure that the "update category order" API call only contains real category IDs and isn't missing any IDs (#14626)
* Ensure that the "update category order" API call only contains real category IDs and isn't missing any IDs
* tests
* correct status code
* MM-25278 Change "update category" API to return 400 when changing unsupported fields (#14599)
* MM-25279 Change category migration to only populate channels in Favorites (#14627)
* MM-25157 Add API to delete custom categories (#14574)
* MM-25157 Add API to delete custom categories
* get categories fix
* maxorder fix
* Use correct websocket event when deleting category
* Fix tests and remove debug code
* Actually use the right websocket event this time
* test cleanup
* Update test for new category order
Co-authored-by: Eli Yukelzon <reflog@gmail.com>
* MM-24914 Various fixes for sidebar channel handling (#14756)
* Fix checking for channel membership when reordering channels
* Remove unique constraint on SidebarCategories
* Set column sizes for SidebarCategories and SidebarChannels tables
* Allow changing the sorting method for non-DM categories
* Fix nil pointers in error handling
* Fix orphaned channels from other team being returned in Channels category
* Fix non-orphaned channels being duplicated in the Channels category
* Remove unique constraint on SidebarChannels
* Fix category/name of favorites preferences
* Fix testSidebarChannelsMigration
* Rename err to nErr and appErr to err
* Fix channel order returned by GetSidebarCategories on MySQL
* Fix adding/removing favorites preferences
* Remove leftover TODO
* Change SidebarCategoryType enums to use full names (#14786)
* Change SidebarCategoryType enums to use full names
* Fix Channels constant
* Remove leftover debug code
* MM-24914 Fix updateCategory endpoint returning the wrong type (#14795)
* MM-24914 Make some changes to UpdateSidebarCategories (#14806)
* Fix orphaned DMs not always being returned
* MM-24914 Make some changes to UpdateSidebarCategories
* Run updateSidebarCategoryOrderT in a transaction
* Fix deleting SidebarChannels based on order of arguments to UpdateSidebarCategories
* bump for api testing
* bump for api testing
* Change CreateInitialSidebarCategories to return a plain error
* Change MigrateSidebarCategories to return a plain error
* Remove usage of UpdateColumns when updating sidebar categories (#14843)
* Remove usage of UpdateColumns when changing category order
* Add a random test case
* Remove usage of UpdateColumns when updating sidebar categories (#14843)
* Remove usage of UpdateColumns when changing category order
* Add a random test case
* Remove usage of UpdateColumns when updating sidebar categories (#14843)
* Remove usage of UpdateColumns when changing category order
* Add a random test case
* MM-26343 Make CreateInitialSidebarCategories idempotent (#14870)
* Fix bad merge
* Fix another bad merge
* Fix unintentionally removed i18n string
Co-authored-by: Eli Yukelzon <reflog@gmail.com>
125 lines
4.1 KiB
Go
125 lines
4.1 KiB
Go
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
|
// See LICENSE.txt for license information.
|
|
|
|
package model
|
|
|
|
import (
|
|
"encoding/json"
|
|
"io"
|
|
"net/http"
|
|
"regexp"
|
|
"strings"
|
|
"unicode/utf8"
|
|
)
|
|
|
|
const (
|
|
PREFERENCE_CATEGORY_DIRECT_CHANNEL_SHOW = "direct_channel_show"
|
|
PREFERENCE_CATEGORY_GROUP_CHANNEL_SHOW = "group_channel_show"
|
|
PREFERENCE_CATEGORY_TUTORIAL_STEPS = "tutorial_step"
|
|
PREFERENCE_CATEGORY_ADVANCED_SETTINGS = "advanced_settings"
|
|
PREFERENCE_CATEGORY_FLAGGED_POST = "flagged_post"
|
|
PREFERENCE_CATEGORY_FAVORITE_CHANNEL = "favorite_channel"
|
|
PREFERENCE_CATEGORY_SIDEBAR_SETTINGS = "sidebar_settings"
|
|
|
|
PREFERENCE_CATEGORY_DISPLAY_SETTINGS = "display_settings"
|
|
PREFERENCE_NAME_CHANNEL_DISPLAY_MODE = "channel_display_mode"
|
|
PREFERENCE_NAME_COLLAPSE_SETTING = "collapse_previews"
|
|
PREFERENCE_NAME_MESSAGE_DISPLAY = "message_display"
|
|
PREFERENCE_NAME_NAME_FORMAT = "name_format"
|
|
PREFERENCE_NAME_USE_MILITARY_TIME = "use_military_time"
|
|
|
|
PREFERENCE_CATEGORY_THEME = "theme"
|
|
// the name for theme props is the team id
|
|
|
|
PREFERENCE_CATEGORY_AUTHORIZED_OAUTH_APP = "oauth_app"
|
|
// the name for oauth_app is the client_id and value is the current scope
|
|
|
|
PREFERENCE_CATEGORY_LAST = "last"
|
|
PREFERENCE_NAME_LAST_CHANNEL = "channel"
|
|
PREFERENCE_NAME_LAST_TEAM = "team"
|
|
|
|
PREFERENCE_CATEGORY_NOTIFICATIONS = "notifications"
|
|
PREFERENCE_NAME_EMAIL_INTERVAL = "email_interval"
|
|
|
|
PREFERENCE_EMAIL_INTERVAL_NO_BATCHING_SECONDS = "30" // the "immediate" setting is actually 30s
|
|
PREFERENCE_EMAIL_INTERVAL_BATCHING_SECONDS = "900" // fifteen minutes is 900 seconds
|
|
PREFERENCE_EMAIL_INTERVAL_IMMEDIATELY = "immediately"
|
|
PREFERENCE_EMAIL_INTERVAL_FIFTEEN = "fifteen"
|
|
PREFERENCE_EMAIL_INTERVAL_FIFTEEN_AS_SECONDS = "900"
|
|
PREFERENCE_EMAIL_INTERVAL_HOUR = "hour"
|
|
PREFERENCE_EMAIL_INTERVAL_HOUR_AS_SECONDS = "3600"
|
|
)
|
|
|
|
type Preference struct {
|
|
UserId string `json:"user_id"`
|
|
Category string `json:"category"`
|
|
Name string `json:"name"`
|
|
Value string `json:"value"`
|
|
}
|
|
|
|
func (o *Preference) ToJson() string {
|
|
b, _ := json.Marshal(o)
|
|
return string(b)
|
|
}
|
|
|
|
func PreferenceFromJson(data io.Reader) *Preference {
|
|
var o *Preference
|
|
json.NewDecoder(data).Decode(&o)
|
|
return o
|
|
}
|
|
|
|
func (o *Preference) IsValid() *AppError {
|
|
if !IsValidId(o.UserId) {
|
|
return NewAppError("Preference.IsValid", "model.preference.is_valid.id.app_error", nil, "user_id="+o.UserId, http.StatusBadRequest)
|
|
}
|
|
|
|
if len(o.Category) == 0 || len(o.Category) > 32 {
|
|
return NewAppError("Preference.IsValid", "model.preference.is_valid.category.app_error", nil, "category="+o.Category, http.StatusBadRequest)
|
|
}
|
|
|
|
if len(o.Name) > 32 {
|
|
return NewAppError("Preference.IsValid", "model.preference.is_valid.name.app_error", nil, "name="+o.Name, http.StatusBadRequest)
|
|
}
|
|
|
|
if utf8.RuneCountInString(o.Value) > 2000 {
|
|
return NewAppError("Preference.IsValid", "model.preference.is_valid.value.app_error", nil, "value="+o.Value, http.StatusBadRequest)
|
|
}
|
|
|
|
if o.Category == PREFERENCE_CATEGORY_THEME {
|
|
var unused map[string]string
|
|
if err := json.NewDecoder(strings.NewReader(o.Value)).Decode(&unused); err != nil {
|
|
return NewAppError("Preference.IsValid", "model.preference.is_valid.theme.app_error", nil, "value="+o.Value, http.StatusBadRequest)
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (o *Preference) PreUpdate() {
|
|
if o.Category == PREFERENCE_CATEGORY_THEME {
|
|
// decode the value of theme (a map of strings to string) and eliminate any invalid values
|
|
var props map[string]string
|
|
if err := json.NewDecoder(strings.NewReader(o.Value)).Decode(&props); err != nil {
|
|
// just continue, the invalid preference value should get caught by IsValid before saving
|
|
return
|
|
}
|
|
|
|
colorPattern := regexp.MustCompile(`^#[0-9a-fA-F]{3}([0-9a-fA-F]{3})?$`)
|
|
|
|
// blank out any invalid theme values
|
|
for name, value := range props {
|
|
if name == "image" || name == "type" || name == "codeTheme" {
|
|
continue
|
|
}
|
|
|
|
if !colorPattern.MatchString(value) {
|
|
props[name] = "#ffffff"
|
|
}
|
|
}
|
|
|
|
if b, err := json.Marshal(props); err == nil {
|
|
o.Value = string(b)
|
|
}
|
|
}
|
|
}
|