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

Merge pull request #1410 from tgstation/DiscordFixes [TGSDeploy]

Browse Source 
Discord fixes (5.2.2)
This commit is contained in:
Jordan Dominion
2022-10-10 16:13:03 -04:00
committed by GitHub
parent f79da8fd78 4ff2f78332
commit 4f43133638
6 changed files with 35 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/Version.props
+1 -1
View File
@@ -3,7 +3,7 @@
<!-- Integration tests will ensure they match across the board -->
<Import Project="ControlPanelVersion.props" />
<PropertyGroup>
<TgsCoreVersion>5.2.1</TgsCoreVersion>
<TgsCoreVersion>5.2.2</TgsCoreVersion>
<TgsConfigVersion>4.4.0</TgsConfigVersion>
<TgsApiVersion>9.7.0</TgsApiVersion>
<TgsApiLibraryVersion>10.1.0</TgsApiLibraryVersion>
src/Tgstation.Server.Host/Components/Chat/ChatManager.cs
+6 -6
View File
@@ -211,14 +211,14 @@ namespace Tgstation.Server.Host.Components.Chat
.ToList();
}
var newMappings = Enumerable.Zip(newChannels, results, (x, y) => new ChannelMapping
var newMappings = results.Select(tuple => new ChannelMapping
{
IsWatchdogChannel = x.IsWatchdogChannel == true,
IsUpdatesChannel = x.IsUpdatesChannel == true,
IsAdminChannel = x.IsAdminChannel == true,
ProviderChannelId = y.RealId,
IsWatchdogChannel = tuple.Item1.IsWatchdogChannel == true,
IsUpdatesChannel = tuple.Item1.IsUpdatesChannel == true,
IsAdminChannel = tuple.Item1.IsAdminChannel == true,
ProviderChannelId = tuple.Item2.RealId,
ProviderId = connectionId,
Channel = y,
Channel = tuple.Item2,
});
ulong baseId;
src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs
+6 -5
View File
@@ -592,14 +592,14 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
}
/// <inheritdoc />
protected override async Task<IReadOnlyCollection<ChannelRepresentation>> MapChannelsImpl(IEnumerable<Api.Models.ChatChannel> channels, CancellationToken cancellationToken)
protected override async Task<IReadOnlyCollection<Tuple<Api.Models.ChatChannel, ChannelRepresentation>>> MapChannelsImpl(IEnumerable<Api.Models.ChatChannel> channels, CancellationToken cancellationToken)
{
if (channels == null)
throw new ArgumentNullException(nameof(channels));
bool remapRequired = false;
async Task<ChannelRepresentation> GetModelChannelFromDBChannel(Api.Models.ChatChannel channelFromDB)
async Task<Tuple<Api.Models.ChatChannel, ChannelRepresentation>> GetModelChannelFromDBChannel(Api.Models.ChatChannel channelFromDB)
{
if (!channelFromDB.DiscordChannelId.HasValue)
throw new InvalidOperationException("ChatChannel missing DiscordChannelId!");
@@ -623,7 +623,8 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
return null;
}
if (discordChannelResponse.Entity.Type != ChannelType.GuildText)
var channelType = discordChannelResponse.Entity.Type;
if (channelType != ChannelType.GuildText && channelType != ChannelType.GuildAnnouncement)
{
Logger.LogWarning("Cound not map channel {0}! Incorrect type: {1}", channelId, discordChannelResponse.Entity.Type);
return null;
@@ -660,7 +661,7 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
};
Logger.LogTrace("Mapped channel {0}: {1}", channelModel.RealId, channelModel.FriendlyName);
return channelModel;
return Tuple.Create(channelFromDB, channelModel);
}
var tasks = channels
@@ -677,7 +678,7 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
lock (mappedChannels)
{
mappedChannels.Clear();
mappedChannels.AddRange(enumerator.Select(x => x.RealId));
mappedChannels.AddRange(enumerator.Select(x => x.Item2.RealId));
}
if (remapRequired)
src/Tgstation.Server.Host/Components/Chat/Providers/IProvider.cs
+2 -2
View File
@@ -57,8 +57,8 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
/// </summary>
/// <param name="channels">The <see cref="Api.Models.ChatChannel"/>s to map.</param>
/// <param name="cancellationToken">The <see cref="CancellationToken"/> for the operation.</param>
/// <returns>A <see cref="Task{TResult}"/> resulting in a <see cref="IReadOnlyCollection{T}"/> of the <see cref="ChannelRepresentation"/>s representing <paramref name="channels"/>.</returns>
Task<IReadOnlyCollection<ChannelRepresentation>> MapChannels(IEnumerable<Api.Models.ChatChannel> channels, CancellationToken cancellationToken);
/// <returns>A <see cref="Task{TResult}"/> resulting in a <see cref="IReadOnlyCollection{T}"/> of the <see cref="Api.Models.ChatChannel"/>'s <see cref="ChannelRepresentation"/>s representing <paramref name="channels"/>.</returns>
Task<IReadOnlyCollection<Tuple<Api.Models.ChatChannel, ChannelRepresentation>>> MapChannels(IEnumerable<Api.Models.ChatChannel> channels, CancellationToken cancellationToken);
/// <summary>
/// Send a message to the <see cref="IProvider"/>.
src/Tgstation.Server.Host/Components/Chat/Providers/IrcProvider.cs
+15 -13
View File
@@ -252,7 +252,7 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
}
/// <inheritdoc />
protected override Task<IReadOnlyCollection<ChannelRepresentation>> MapChannelsImpl(
protected override Task<IReadOnlyCollection<Tuple<ChatChannel, ChannelRepresentation>>> MapChannelsImpl(
IEnumerable<ChatChannel> channels,
CancellationToken cancellationToken)
=> Task.Factory.StartNew(
@@ -285,10 +285,10 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
else
client.RfcJoin(channelToJoin);
return (IReadOnlyCollection<ChannelRepresentation>)channels
.Select(x =>
return (IReadOnlyCollection<Tuple<ChatChannel, ChannelRepresentation>>)channels
.Select(apiChannel =>
{
var channelName = x.GetIrcChannelName();
var channelName = apiChannel.GetIrcChannelName();
ulong? id = null;
if (!channelIdMap.Any(y =>
{
@@ -302,15 +302,17 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
channelIdMap.Add(id.Value, channelName);
}
return new ChannelRepresentation
{
RealId = id.Value,
IsAdminChannel = x.IsAdminChannel == true,
ConnectionName = address,
FriendlyName = channelIdMap[id.Value],
IsPrivateChannel = false,
Tag = x.Tag,
};
return Tuple.Create(
apiChannel,
new ChannelRepresentation
{
RealId = id.Value,
IsAdminChannel = apiChannel.IsAdminChannel == true,
ConnectionName = address,
FriendlyName = channelIdMap[id.Value],
IsPrivateChannel = false,
Tag = apiChannel.Tag,
});
})
.ToList();
}
src/Tgstation.Server.Host/Components/Chat/Providers/Provider.cs
+5 -3
View File
@@ -117,7 +117,7 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
public void InitialMappingComplete() => initialConnectionTcs.TrySetResult(null);
/// <inheritdoc />
public async Task<IReadOnlyCollection<ChannelRepresentation>> MapChannels(IEnumerable<Api.Models.ChatChannel> channels, CancellationToken cancellationToken)
public async Task<IReadOnlyCollection<Tuple<Api.Models.ChatChannel, ChannelRepresentation>>> MapChannels(IEnumerable<Api.Models.ChatChannel> channels, CancellationToken cancellationToken)
{
try
{
@@ -197,8 +197,10 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
/// </summary>
/// <param name="channels">The <see cref="Api.Models.ChatChannel"/>s to map.</param>
/// <param name="cancellationToken">The <see cref="CancellationToken"/> for the operation.</param>
/// <returns>A <see cref="Task{TResult}"/> resulting in a <see cref="IReadOnlyCollection{T}"/> of the <see cref="ChannelRepresentation"/>s representing <paramref name="channels"/>.</returns>
protected abstract Task<IReadOnlyCollection<ChannelRepresentation>> MapChannelsImpl(IEnumerable<Api.Models.ChatChannel> channels, CancellationToken cancellationToken);
/// <returns>A <see cref="Task{TResult}"/> resulting in a <see cref="IReadOnlyCollection{T}"/> of the <see cref="Api.Models.ChatChannel"/>'s <see cref="ChannelRepresentation"/>s representing <paramref name="channels"/>.</returns>
protected abstract Task<IReadOnlyCollection<Tuple<Api.Models.ChatChannel, ChannelRepresentation>>> MapChannelsImpl(
IEnumerable<Api.Models.ChatChannel> channels,
CancellationToken cancellationToken);
/// <summary>
/// Queues a <paramref name="message"/> for <see cref="NextMessage(CancellationToken)"/>.