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>
321 lines
7.3 KiB
Go
321 lines
7.3 KiB
Go
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
|
// See LICENSE.txt for license information.
|
|
|
|
package web
|
|
|
|
import (
|
|
"net/http"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"github.com/gorilla/mux"
|
|
"github.com/mattermost/mattermost-server/v5/model"
|
|
)
|
|
|
|
const (
|
|
PAGE_DEFAULT = 0
|
|
PER_PAGE_DEFAULT = 60
|
|
PER_PAGE_MAXIMUM = 200
|
|
LOGS_PER_PAGE_DEFAULT = 10000
|
|
LOGS_PER_PAGE_MAXIMUM = 10000
|
|
LIMIT_DEFAULT = 60
|
|
LIMIT_MAXIMUM = 200
|
|
)
|
|
|
|
type Params struct {
|
|
UserId string
|
|
TeamId string
|
|
InviteId string
|
|
TokenId string
|
|
ChannelId string
|
|
PostId string
|
|
FileId string
|
|
Filename string
|
|
PluginId string
|
|
CommandId string
|
|
HookId string
|
|
ReportId string
|
|
EmojiId string
|
|
AppId string
|
|
Email string
|
|
Username string
|
|
TeamName string
|
|
ChannelName string
|
|
PreferenceName string
|
|
EmojiName string
|
|
Category string
|
|
Service string
|
|
JobId string
|
|
JobType string
|
|
ActionId string
|
|
RoleId string
|
|
RoleName string
|
|
SchemeId string
|
|
Scope string
|
|
GroupId string
|
|
Page int
|
|
PerPage int
|
|
LogsPerPage int
|
|
Permanent bool
|
|
RemoteId string
|
|
SyncableId string
|
|
SyncableType model.GroupSyncableType
|
|
BotUserId string
|
|
Q string
|
|
IsLinked *bool
|
|
IsConfigured *bool
|
|
NotAssociatedToTeam string
|
|
NotAssociatedToChannel string
|
|
Paginate *bool
|
|
IncludeMemberCount bool
|
|
NotAssociatedToGroup string
|
|
ExcludeDefaultChannels bool
|
|
LimitAfter int
|
|
LimitBefore int
|
|
GroupIDs string
|
|
IncludeTotalCount bool
|
|
IncludeDeleted bool
|
|
FilterAllowReference bool
|
|
FilterParentTeamPermitted bool
|
|
CategoryId string
|
|
}
|
|
|
|
func ParamsFromRequest(r *http.Request) *Params {
|
|
params := &Params{}
|
|
|
|
props := mux.Vars(r)
|
|
query := r.URL.Query()
|
|
|
|
if val, ok := props["user_id"]; ok {
|
|
params.UserId = val
|
|
}
|
|
|
|
if val, ok := props["team_id"]; ok {
|
|
params.TeamId = val
|
|
}
|
|
|
|
if val, ok := props["category_id"]; ok {
|
|
params.CategoryId = val
|
|
}
|
|
|
|
if val, ok := props["invite_id"]; ok {
|
|
params.InviteId = val
|
|
}
|
|
|
|
if val, ok := props["token_id"]; ok {
|
|
params.TokenId = val
|
|
}
|
|
|
|
if val, ok := props["channel_id"]; ok {
|
|
params.ChannelId = val
|
|
} else {
|
|
params.ChannelId = query.Get("channel_id")
|
|
}
|
|
|
|
if val, ok := props["post_id"]; ok {
|
|
params.PostId = val
|
|
}
|
|
|
|
if val, ok := props["file_id"]; ok {
|
|
params.FileId = val
|
|
}
|
|
|
|
params.Filename = query.Get("filename")
|
|
|
|
if val, ok := props["plugin_id"]; ok {
|
|
params.PluginId = val
|
|
}
|
|
|
|
if val, ok := props["command_id"]; ok {
|
|
params.CommandId = val
|
|
}
|
|
|
|
if val, ok := props["hook_id"]; ok {
|
|
params.HookId = val
|
|
}
|
|
|
|
if val, ok := props["report_id"]; ok {
|
|
params.ReportId = val
|
|
}
|
|
|
|
if val, ok := props["emoji_id"]; ok {
|
|
params.EmojiId = val
|
|
}
|
|
|
|
if val, ok := props["app_id"]; ok {
|
|
params.AppId = val
|
|
}
|
|
|
|
if val, ok := props["email"]; ok {
|
|
params.Email = val
|
|
}
|
|
|
|
if val, ok := props["username"]; ok {
|
|
params.Username = val
|
|
}
|
|
|
|
if val, ok := props["team_name"]; ok {
|
|
params.TeamName = strings.ToLower(val)
|
|
}
|
|
|
|
if val, ok := props["channel_name"]; ok {
|
|
params.ChannelName = strings.ToLower(val)
|
|
}
|
|
|
|
if val, ok := props["category"]; ok {
|
|
params.Category = val
|
|
}
|
|
|
|
if val, ok := props["service"]; ok {
|
|
params.Service = val
|
|
}
|
|
|
|
if val, ok := props["preference_name"]; ok {
|
|
params.PreferenceName = val
|
|
}
|
|
|
|
if val, ok := props["emoji_name"]; ok {
|
|
params.EmojiName = val
|
|
}
|
|
|
|
if val, ok := props["job_id"]; ok {
|
|
params.JobId = val
|
|
}
|
|
|
|
if val, ok := props["job_type"]; ok {
|
|
params.JobType = val
|
|
}
|
|
|
|
if val, ok := props["action_id"]; ok {
|
|
params.ActionId = val
|
|
}
|
|
|
|
if val, ok := props["role_id"]; ok {
|
|
params.RoleId = val
|
|
}
|
|
|
|
if val, ok := props["role_name"]; ok {
|
|
params.RoleName = val
|
|
}
|
|
|
|
if val, ok := props["scheme_id"]; ok {
|
|
params.SchemeId = val
|
|
}
|
|
|
|
if val, ok := props["group_id"]; ok {
|
|
params.GroupId = val
|
|
}
|
|
|
|
if val, ok := props["remote_id"]; ok {
|
|
params.RemoteId = val
|
|
}
|
|
|
|
params.Scope = query.Get("scope")
|
|
|
|
if val, err := strconv.Atoi(query.Get("page")); err != nil || val < 0 {
|
|
params.Page = PAGE_DEFAULT
|
|
} else {
|
|
params.Page = val
|
|
}
|
|
|
|
if val, err := strconv.ParseBool(query.Get("permanent")); err == nil {
|
|
params.Permanent = val
|
|
}
|
|
|
|
if val, err := strconv.Atoi(query.Get("per_page")); err != nil || val < 0 {
|
|
params.PerPage = PER_PAGE_DEFAULT
|
|
} else if val > PER_PAGE_MAXIMUM {
|
|
params.PerPage = PER_PAGE_MAXIMUM
|
|
} else {
|
|
params.PerPage = val
|
|
}
|
|
|
|
if val, err := strconv.Atoi(query.Get("logs_per_page")); err != nil || val < 0 {
|
|
params.LogsPerPage = LOGS_PER_PAGE_DEFAULT
|
|
} else if val > LOGS_PER_PAGE_MAXIMUM {
|
|
params.LogsPerPage = LOGS_PER_PAGE_MAXIMUM
|
|
} else {
|
|
params.LogsPerPage = val
|
|
}
|
|
|
|
if val, err := strconv.Atoi(query.Get("limit_after")); err != nil || val < 0 {
|
|
params.LimitAfter = LIMIT_DEFAULT
|
|
} else if val > LIMIT_MAXIMUM {
|
|
params.LimitAfter = LIMIT_MAXIMUM
|
|
} else {
|
|
params.LimitAfter = val
|
|
}
|
|
|
|
if val, err := strconv.Atoi(query.Get("limit_before")); err != nil || val < 0 {
|
|
params.LimitBefore = LIMIT_DEFAULT
|
|
} else if val > LIMIT_MAXIMUM {
|
|
params.LimitBefore = LIMIT_MAXIMUM
|
|
} else {
|
|
params.LimitBefore = val
|
|
}
|
|
|
|
if val, ok := props["syncable_id"]; ok {
|
|
params.SyncableId = val
|
|
}
|
|
|
|
if val, ok := props["syncable_type"]; ok {
|
|
switch val {
|
|
case "teams":
|
|
params.SyncableType = model.GroupSyncableTypeTeam
|
|
case "channels":
|
|
params.SyncableType = model.GroupSyncableTypeChannel
|
|
}
|
|
}
|
|
|
|
if val, ok := props["bot_user_id"]; ok {
|
|
params.BotUserId = val
|
|
}
|
|
|
|
params.Q = query.Get("q")
|
|
|
|
if val, err := strconv.ParseBool(query.Get("is_linked")); err == nil {
|
|
params.IsLinked = &val
|
|
}
|
|
|
|
if val, err := strconv.ParseBool(query.Get("is_configured")); err == nil {
|
|
params.IsConfigured = &val
|
|
}
|
|
|
|
params.NotAssociatedToTeam = query.Get("not_associated_to_team")
|
|
params.NotAssociatedToChannel = query.Get("not_associated_to_channel")
|
|
|
|
if val, err := strconv.ParseBool(query.Get("filter_allow_reference")); err == nil {
|
|
params.FilterAllowReference = val
|
|
}
|
|
|
|
if val, err := strconv.ParseBool(query.Get("filter_parent_team_permitted")); err == nil {
|
|
params.FilterParentTeamPermitted = val
|
|
}
|
|
|
|
if val, err := strconv.ParseBool(query.Get("paginate")); err == nil {
|
|
params.Paginate = &val
|
|
}
|
|
|
|
if val, err := strconv.ParseBool(query.Get("include_member_count")); err == nil {
|
|
params.IncludeMemberCount = val
|
|
}
|
|
|
|
params.NotAssociatedToGroup = query.Get("not_associated_to_group")
|
|
|
|
if val, err := strconv.ParseBool(query.Get("exclude_default_channels")); err == nil {
|
|
params.ExcludeDefaultChannels = val
|
|
}
|
|
|
|
params.GroupIDs = query.Get("group_ids")
|
|
|
|
if val, err := strconv.ParseBool(query.Get("include_total_count")); err == nil {
|
|
params.IncludeTotalCount = val
|
|
}
|
|
|
|
if val, err := strconv.ParseBool(query.Get("include_deleted")); err == nil {
|
|
params.IncludeDeleted = val
|
|
}
|
|
|
|
return params
|
|
}
|