cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-25 22:17:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup ChatManager

Browse Source
This commit is contained in:
Jordan Brown
2022-09-28 18:55:19 -04:00
parent 44cd360818
commit ebaa13ae11
4 changed files with 17 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Components/Chat/ChatManager.cs
+15 -24
View File
@@ -14,7 +14,6 @@ using Tgstation.Server.Host.Components.Chat.Commands;
using Tgstation.Server.Host.Components.Chat.Providers;
using Tgstation.Server.Host.Core;
using Tgstation.Server.Host.Extensions;
using Tgstation.Server.Host.IO;
namespace Tgstation.Server.Host.Components.Chat
{
@@ -33,11 +32,6 @@ namespace Tgstation.Server.Host.Components.Chat
/// </summary>
readonly IProviderFactory providerFactory;
/// <summary>
/// The <see cref="IIOManager"/> for the <see cref="ChatManager"/>.
/// </summary>
readonly IIOManager ioManager;
/// <summary>
/// The <see cref="ICommandFactory"/> for the <see cref="ChatManager"/>.
/// </summary>
@@ -48,11 +42,6 @@ namespace Tgstation.Server.Host.Components.Chat
/// </summary>
readonly IRestartRegistration restartRegistration;
/// <summary>
/// The <see cref="IAsyncDelayer"/> for the <see cref="ChatManager"/>.
/// </summary>
readonly IAsyncDelayer asyncDelayer;
/// <summary>
/// The <see cref="ILoggerFactory"/> for the <see cref="ChatManager"/>.
/// </summary>
@@ -137,21 +126,23 @@ namespace Tgstation.Server.Host.Components.Chat
/// Initializes a new instance of the <see cref="ChatManager"/> class.
/// </summary>
/// <param name="providerFactory">The value of <see cref="providerFactory"/>.</param>
/// <param name="ioManager">The value of <see cref="ioManager"/>.</param>
/// <param name="commandFactory">The value of <see cref="commandFactory"/>.</param>
/// <param name="serverControl">The <see cref="IServerControl"/> to populate <see cref="restartRegistration"/> with.</param>
/// <param name="asyncDelayer">The value of <see cref="asyncDelayer"/>.</param>
/// <param name="loggerFactory">The value of <see cref="loggerFactory"/>.</param>
/// <param name="logger">The value of <see cref="logger"/>.</param>
/// <param name="initialChatBots">The <see cref="IEnumerable{T}"/> used to populate <see cref="activeChatBots"/>.</param>
public ChatManager(IProviderFactory providerFactory, IIOManager ioManager, ICommandFactory commandFactory, IServerControl serverControl, IAsyncDelayer asyncDelayer, ILoggerFactory loggerFactory, ILogger<ChatManager> logger, IEnumerable<Models.ChatBot> initialChatBots)
public ChatManager(
IProviderFactory providerFactory,
ICommandFactory commandFactory,
IServerControl serverControl,
ILoggerFactory loggerFactory,
ILogger<ChatManager> logger,
IEnumerable<Models.ChatBot> initialChatBots)
{
this.providerFactory = providerFactory ?? throw new ArgumentNullException(nameof(providerFactory));
this.ioManager = ioManager ?? throw new ArgumentNullException(nameof(ioManager));
this.commandFactory = commandFactory ?? throw new ArgumentNullException(nameof(commandFactory));
if (serverControl == null)
throw new ArgumentNullException(nameof(serverControl));
this.asyncDelayer = asyncDelayer ?? throw new ArgumentNullException(nameof(asyncDelayer));
this.loggerFactory = loggerFactory ?? throw new ArgumentNullException(nameof(loggerFactory));
this.logger = logger ?? throw new ArgumentNullException(nameof(logger));
activeChatBots = initialChatBots?.ToList() ?? throw new ArgumentNullException(nameof(initialChatBots));
@@ -189,7 +180,7 @@ namespace Tgstation.Server.Host.Components.Chat
if (newChannels == null)
throw new ArgumentNullException(nameof(newChannels));
logger.LogTrace("ChangeChannels {0}...", connectionId);
logger.LogTrace("ChangeChannels {connectionId}...", connectionId);
var provider = await RemoveProviderChannels(connectionId, false, cancellationToken);
if (provider == null)
return;
@@ -244,7 +235,7 @@ namespace Tgstation.Server.Host.Components.Chat
foreach (var newMapping in newMappings)
{
var newId = baseId++;
logger.LogTrace("Mapping channel {0}:{1} as {2}", newMapping.Channel.ConnectionName, newMapping.Channel.FriendlyName, newId);
logger.LogTrace("Mapping channel {connectionName}:{channelFriendlyName} as {newId}", newMapping.Channel.ConnectionName, newMapping.Channel.FriendlyName, newId);
mappedChannels.Add(newId, newMapping);
newMapping.Channel.RealId = newId;
}
@@ -366,7 +357,7 @@ namespace Tgstation.Server.Host.Components.Chat
lock (mappedChannels) // so it doesn't change while we're using it
wdChannels = mappedChannels.Where(x => x.Value.IsUpdatesChannel).Select(x => x.Key).ToList();
logger.LogTrace("Sending deployment message for RevisionInformation: {0}", revisionInformation.Id);
logger.LogTrace("Sending deployment message for RevisionInformation: {revisionInfoId}", revisionInformation.Id);
var callbacks = new List<Func<string, string, Task>>();
@@ -401,7 +392,7 @@ namespace Tgstation.Server.Host.Components.Chat
{
logger.LogWarning(
ex,
"Error sending deploy message to provider {0}!",
"Error sending deploy message to provider {providerId}!",
channelMapping.ProviderId);
}
}));
@@ -510,7 +501,7 @@ namespace Tgstation.Server.Host.Components.Chat
/// <returns>A <see cref="Task{TResult}"/> resulting in the <see cref="IProvider"/> being removed if it exists, <see langword="null"/> otherwise.</returns>
async Task<IProvider> RemoveProviderChannels(long connectionId, bool removeProvider, CancellationToken cancellationToken)
{
logger.LogTrace("RemoveProviderChannels {0}...", connectionId);
logger.LogTrace("RemoveProviderChannels {connectionId}...", connectionId);
IProvider provider;
lock (providers)
{
@@ -616,7 +607,7 @@ namespace Tgstation.Server.Host.Components.Chat
lock (synchronizationLock)
newId = channelIdCounter++;
logger.LogTrace(
"Mapping private channel {0}:{1} as {2}",
"Mapping private channel {connectionName}:{channelFriendlyName} as {newId}",
message.User.Channel.ConnectionName,
message.User.FriendlyName,
newId);
@@ -673,7 +664,7 @@ namespace Tgstation.Server.Host.Components.Chat
return;
logger.LogTrace(
"Start processing command: {0}. User (True provider Id): {1}",
"Start processing command: {message}. User (True provider Id): {profiderId}",
message.Content,
JsonConvert.SerializeObject(message.User));
try
@@ -866,7 +857,7 @@ namespace Tgstation.Server.Host.Components.Chat
/// <returns>A <see cref="Task"/> representing the running operation.</returns>
Task SendMessage(string message, IEnumerable<ulong> channelIds, CancellationToken cancellationToken)
{
logger.LogTrace("Chat send \"{0}\" to channels: {1}", message, String.Join(", ", channelIds));
logger.LogTrace("Chat send \"{message}\" to channels: {channelIdsCommaSeperated}", message, String.Join(", ", channelIds));
return Task.WhenAll(
channelIds.Select(x =>
src/Tgstation.Server.Host/Components/Chat/ChatManagerFactory.cs
-12
View File
@@ -7,7 +7,6 @@ using Microsoft.Extensions.Logging;
using Tgstation.Server.Host.Components.Chat.Commands;
using Tgstation.Server.Host.Components.Chat.Providers;
using Tgstation.Server.Host.Core;
using Tgstation.Server.Host.IO;
namespace Tgstation.Server.Host.Components.Chat
{
@@ -29,41 +28,30 @@ namespace Tgstation.Server.Host.Components.Chat
/// </summary>
readonly IServerControl serverControl;
/// <summary>
/// The <see cref="IAsyncDelayer"/> for the <see cref="ChatManagerFactory"/>.
/// </summary>
readonly IAsyncDelayer asyncDelayer;
/// <summary>
/// Initializes a new instance of the <see cref="ChatManagerFactory"/> class.
/// </summary>
/// <param name="providerFactory">The value of <see cref="providerFactory"/>.</param>
/// <param name="serverControl">The value of <see cref="serverControl"/>.</param>
/// <param name="asyncDelayer">The value of <see cref="asyncDelayer"/>.</param>
/// <param name="loggerFactory">The value of <see cref="loggerFactory"/>.</param>
public ChatManagerFactory(
IProviderFactory providerFactory,
IServerControl serverControl,
IAsyncDelayer asyncDelayer,
ILoggerFactory loggerFactory)
{
this.providerFactory = providerFactory ?? throw new ArgumentNullException(nameof(providerFactory));
this.serverControl = serverControl ?? throw new ArgumentNullException(nameof(serverControl));
this.asyncDelayer = asyncDelayer ?? throw new ArgumentNullException(nameof(asyncDelayer));
this.loggerFactory = loggerFactory ?? throw new ArgumentNullException(nameof(loggerFactory));
}
/// <inheritdoc />
public IChatManager CreateChatManager(
IIOManager ioManager,
ICommandFactory commandFactory,
IEnumerable<Models.ChatBot> initialChatBots)
=> new ChatManager(
providerFactory,
ioManager,
commandFactory,
serverControl,
asyncDelayer,
loggerFactory,
loggerFactory.CreateLogger<ChatManager>(),
initialChatBots.Where(x => x.Enabled.Value));
src/Tgstation.Server.Host/Components/Chat/IChatManagerFactory.cs
+1 -3
View File
@@ -1,7 +1,6 @@
using System.Collections.Generic;
using Tgstation.Server.Host.Components.Chat.Commands;
using Tgstation.Server.Host.IO;
namespace Tgstation.Server.Host.Components.Chat
{
@@ -13,10 +12,9 @@ namespace Tgstation.Server.Host.Components.Chat
/// <summary>
/// Create a <see cref="IChatManager"/>.
/// </summary>
/// <param name="ioManager">The <see cref="IIOManager"/> for the <see cref="IChatManager"/>.</param>
/// <param name="commandFactory">The <see cref="ICommandFactory"/> for the <see cref="IChatManager"/>.</param>
/// <param name="initialChatBots">The initial <see cref="Models.ChatBot"/> for the <see cref="IChatManager"/>.</param>
/// <returns>A new <see cref="IChatManager"/>.</returns>
IChatManager CreateChatManager(IIOManager ioManager, ICommandFactory commandFactory, IEnumerable<Models.ChatBot> initialChatBots);
IChatManager CreateChatManager(ICommandFactory commandFactory, IEnumerable<Models.ChatBot> initialChatBots);
}
}
src/Tgstation.Server.Host/Components/InstanceFactory.cs
+1 -1
View File
@@ -260,7 +260,7 @@ namespace Tgstation.Server.Host.Components
var commandFactory = new CommandFactory(assemblyInformationProvider, byond, repoManager, databaseContextFactory, metadata);
var chatManager = chatFactory.CreateChatManager(instanceIoManager, commandFactory, metadata.ChatSettings);
var chatManager = chatFactory.CreateChatManager(commandFactory, metadata.ChatSettings);
try
{
var sessionControllerFactory = new SessionControllerFactory(