diff --git a/server/channels/app/platform/shared_channel_notifier.go b/server/channels/app/platform/shared_channel_notifier.go index 1ae93e2c0a..e93b410ff0 100644 --- a/server/channels/app/platform/shared_channel_notifier.go +++ b/server/channels/app/platform/shared_channel_notifier.go @@ -95,7 +95,7 @@ func handleContentSync(ps *PlatformService, syncService SharedChannelServiceIFac for _, remote := range remotes { // 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 { - 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 } diff --git a/server/platform/services/sharedchannel/service_api.go b/server/platform/services/sharedchannel/service_api.go index 6b425808a9..937ec2b29d 100644 --- a/server/platform/services/sharedchannel/service_api.go +++ b/server/platform/services/sharedchannel/service_api.go @@ -117,7 +117,13 @@ func (scs *Service) InviteRemoteToChannel(channelID, remoteID, userID string, sh // set the channel `shared` flag if needed 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", map[string]any{"Error": err.Error()}, "", http.StatusBadRequest) }