IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Create propery SC when InviteRemoteToChannel and channel should be shared. (#26469)

Browse Source
This commit is contained in:
Doug Lauder 2024-03-18 10:54:23 -04:00 committed by GitHub
parent 79b1e9d200
commit 1cb936b0b7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/channels/app/platform/shared_channel_notifier.go
View File

@ -95,7 +95,7 @@ func handleContentSync(ps *PlatformService, syncService SharedChannelServiceIFac
for _, remote := range remotes { for _, remote := range remotes {
// invite remote to channel (will share the channel if not already shared) // invite remote to channel (will share the channel if not already shared)
if err := syncService.InviteRemoteToChannel(channel.Id, remote.RemoteId, remote.CreatorId, true); err != nil { if err := syncService.InviteRemoteToChannel(channel.Id, remote.RemoteId, remote.CreatorId, true); err != nil {
return fmt.Errorf("cannot invite remote to channel %s: %w", channel.Id, err) return fmt.Errorf("cannot invite remote %s to channel %s: %w", remote.RemoteId, channel.Id, err)
} }
shouldNotify = true shouldNotify = true
} }

8
server/platform/services/sharedchannel/service_api.go
View File

@ -117,7 +117,13 @@ func (scs *Service) InviteRemoteToChannel(channelID, remoteID, userID string, sh
// set the channel `shared` flag if needed // set the channel `shared` flag if needed
if shareIfNotShared { if shareIfNotShared {
if _, err = scs.ShareChannel(&model.SharedChannel{ChannelId: channelID, CreatorId: userID}); err != nil { sc := &model.SharedChannel{
ChannelId: channelID,
CreatorId: userID,
Home: true,
RemoteId: remoteID,
}
if _, err = scs.ShareChannel(sc); err != nil {
return model.NewAppError("InviteRemoteToChannel", "api.command_share.share_channel.error", return model.NewAppError("InviteRemoteToChannel", "api.command_share.share_channel.error",
map[string]any{"Error": err.Error()}, "", http.StatusBadRequest) map[string]any{"Error": err.Error()}, "", http.StatusBadRequest)
} }