cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-29 16:11:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #705 from Cyberboss/MoreDiscordBS

Browse Source 
Fix chat mapping IDs
This commit is contained in:
Jordan Brown
2018-09-22 14:50:54 -04:00
committed by GitHub
parent 2678ab3012 d60616916c
commit 606c7bcf33
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Components/Chat/Chat.cs
+1
View File
@@ -207,6 +207,7 @@ namespace Tgstation.Server.Host.Components.Chat
{
//need to add tag and isAdminChannel
var mapping = enumerable.First().Value;
message.User.Channel.Id = mapping.Channel.Id;
message.User.Channel.Tag = mapping.Channel.Tag;
message.User.Channel.IsAdmin = mapping.Channel.IsAdmin;
}
src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs
+2 -2
View File
@@ -182,7 +182,7 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
};
};
var enumerator = channels.Select(x => GetChannelForChatChannel(x)).Where(x => x != null);
var enumerator = channels.Select(x => GetChannelForChatChannel(x)).Where(x => x != null).ToList();
lock (this)
{
@@ -190,7 +190,7 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
mappedChannels.AddRange(enumerator.Select(x => x.RealId));
}
return Task.FromResult<IReadOnlyList<Channel>>(enumerator.ToList());
return Task.FromResult<IReadOnlyList<Channel>>(enumerator);
}
/// <inheritdoc />