mirror of
https://github.com/mattermost/mattermost.git
synced 2026-05-25 19:12:15 -04:00
0afef7760c
* feat: include connection id in the plugin context * refactor: group ConnectionId next to SessionId in plugin Context Addresses review feedback to keep related identifier fields adjacent. * fix(files): forward Connection-Id on file uploads to plugin hooks The webapp uploadFile XHR didn't attach the Connection-Id header, so FileWillBeUploaded plugin hooks always received an empty ConnectionId. Read it from the websocket selector and set it on the request, matching how drafts and channel bookmarks already do it. Adds a server-side test asserting the connection id propagates through pluginContext. * fix(lint): reorder file_actions imports to satisfy import/order * Document ConnectionId on request.Context
57 lines
1.8 KiB
Go
57 lines
1.8 KiB
Go
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
|
// See LICENSE.txt for license information.
|
|
|
|
package model
|
|
|
|
import (
|
|
"github.com/mattermost/mattermost/server/public/shared/i18n"
|
|
)
|
|
|
|
type CommandArgs struct {
|
|
UserId string `json:"user_id"`
|
|
ChannelId string `json:"channel_id"`
|
|
TeamId string `json:"team_id"`
|
|
RootId string `json:"root_id"`
|
|
ParentId string `json:"parent_id"`
|
|
TriggerId string `json:"trigger_id,omitempty"`
|
|
ConnectionId string `json:"connection_id,omitempty"`
|
|
Command string `json:"command"`
|
|
SiteURL string `json:"-"`
|
|
T i18n.TranslateFunc `json:"-"`
|
|
UserMentions UserMentionMap `json:"-"`
|
|
ChannelMentions ChannelMentionMap `json:"-"`
|
|
}
|
|
|
|
func (o *CommandArgs) Auditable() map[string]any {
|
|
return map[string]any{
|
|
"user_id": o.UserId,
|
|
"channel_id": o.ChannelId,
|
|
"team_id": o.TeamId,
|
|
"root_id": o.RootId,
|
|
"parent_id": o.ParentId,
|
|
"trigger_id": o.TriggerId,
|
|
"connection_id": o.ConnectionId,
|
|
"command": o.Command,
|
|
"site_url": o.SiteURL,
|
|
}
|
|
}
|
|
|
|
// AddUserMention adds or overrides an entry in UserMentions with name username
|
|
// and identifier userId
|
|
func (o *CommandArgs) AddUserMention(username, userId string) {
|
|
if o.UserMentions == nil {
|
|
o.UserMentions = make(UserMentionMap)
|
|
}
|
|
|
|
o.UserMentions[username] = userId
|
|
}
|
|
|
|
// AddChannelMention adds or overrides an entry in ChannelMentions with name
|
|
// channelName and identifier channelId
|
|
func (o *CommandArgs) AddChannelMention(channelName, channelId string) {
|
|
if o.ChannelMentions == nil {
|
|
o.ChannelMentions = make(ChannelMentionMap)
|
|
}
|
|
|
|
o.ChannelMentions[channelName] = channelId
|
|
}
|