status-im
/
status-go
mirror of https://github.com/status-im/status-go.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(discord): Handle multiple channels with the same name (#4313)

This commit is contained in:
Boris Melnik 2023-11-17 16:18:18 +03:00 committed by GitHub
parent 7b752ac34c
commit 4ae9c02e57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
protocol/messenger_communities_import_discord.go
View File

@ -1087,6 +1087,9 @@ func (m *Messenger) RequestImportDiscordCommunity(request *requests.ImportDiscor
processedChannelIds := make(map[string]string, 0) processedChannelIds := make(map[string]string, 0)
processedCategoriesIds := make(map[string]string, 0) processedCategoriesIds := make(map[string]string, 0)
// The map with counts of duplicated channel names
uniqueChatNames := make(map[string]int, 0)
for i, importFile := range request.FilesToImport { for i, importFile := range request.FilesToImport {
exportData, errs := m.ExtractDiscordDataFromImportFiles([]string{importFile}) exportData, errs := m.ExtractDiscordDataFromImportFiles([]string{importFile})
@ -1184,12 +1187,20 @@ func (m *Messenger) RequestImportDiscordCommunity(request *requests.ImportDiscor
} }
if !exists { if !exists {
channelUniqueName := channel.Channel.Name
if count, ok := uniqueChatNames[channelUniqueName]; ok {
uniqueChatNames[channelUniqueName] = count + 1
channelUniqueName = fmt.Sprintf("%s_%d", channelUniqueName, uniqueChatNames[channelUniqueName])
} else {
uniqueChatNames[channelUniqueName] = 1
}
communityChat := &protobuf.CommunityChat{ communityChat := &protobuf.CommunityChat{
Permissions: &protobuf.CommunityPermissions{ Permissions: &protobuf.CommunityPermissions{
Access: protobuf.CommunityPermissions_AUTO_ACCEPT, Access: protobuf.CommunityPermissions_AUTO_ACCEPT,
}, },
Identity: &protobuf.ChatIdentity{ Identity: &protobuf.ChatIdentity{
DisplayName: channel.Channel.Name, DisplayName: channelUniqueName,
Emoji: "", Emoji: "",
Description: channel.Channel.Description, Description: channel.Channel.Description,
Color: discordCommunity.Color(), Color: discordCommunity.Color(),