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 branch 'master' of https://github.com/tgstation/tgstation-server into 598-TestChatTagging

Browse Source
This commit is contained in:
Jordan Brown
2018-09-22 16:28:38 -04:00
parent e7d47baa0a 606c7bcf33
commit da302aeda5
2 changed files with 4 additions and 3 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
+3 -3
View File
@@ -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
@@ -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 />