From 78dc40b95e161982d73ba7f3d292aab832ec478c Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sat, 22 Sep 2018 13:23:09 -0400 Subject: [PATCH 1/2] Fix DiscordProvider thinking all channels are private channels --- .../Components/Chat/Providers/DiscordProvider.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs b/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs index 3ee2e682ad..b94d3078b2 100644 --- a/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs +++ b/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs @@ -92,7 +92,7 @@ namespace Tgstation.Server.Host.Components.Chat.Providers Channel = new Channel { RealId = e.Channel.Id, - IsPrivate = true, + IsPrivate = pm, ConnectionName = pm ? e.Author.Username : (e.Channel as ITextChannel)?.Guild.Name ?? "UNKNOWN", FriendlyName = e.Channel.Name //isAdmin and Tag populated by manager From d60616916c84efa248f9f4776fc54a079d153848 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sat, 22 Sep 2018 14:34:49 -0400 Subject: [PATCH 2/2] Fix chat mapping IDs --- src/Tgstation.Server.Host/Components/Chat/Chat.cs | 1 + .../Components/Chat/Providers/DiscordProvider.cs | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Tgstation.Server.Host/Components/Chat/Chat.cs b/src/Tgstation.Server.Host/Components/Chat/Chat.cs index 456b882168..af7da0a334 100644 --- a/src/Tgstation.Server.Host/Components/Chat/Chat.cs +++ b/src/Tgstation.Server.Host/Components/Chat/Chat.cs @@ -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; } diff --git a/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs b/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs index b94d3078b2..f11834a7cc 100644 --- a/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs +++ b/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs @@ -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>(enumerator.ToList()); + return Task.FromResult>(enumerator); } ///