Merge branch 'master' into unbanbydiscord
This commit is contained in:
@@ -18,15 +18,16 @@ public class LightlessModule : InteractionModuleBase
|
||||
private readonly IServiceProvider _services;
|
||||
private readonly IConfigurationService<ServicesConfiguration> _lightlessServicesConfiguration;
|
||||
private readonly IConnectionMultiplexer _connectionMultiplexer;
|
||||
|
||||
private readonly ServerTokenGenerator _serverTokenGenerator;
|
||||
public LightlessModule(ILogger<LightlessModule> logger, IServiceProvider services,
|
||||
IConfigurationService<ServicesConfiguration> lightlessServicesConfiguration,
|
||||
IConnectionMultiplexer connectionMultiplexer)
|
||||
IConnectionMultiplexer connectionMultiplexer, ServerTokenGenerator serverTokenGenerator)
|
||||
{
|
||||
_logger = logger;
|
||||
_services = services;
|
||||
_lightlessServicesConfiguration = lightlessServicesConfiguration;
|
||||
_connectionMultiplexer = connectionMultiplexer;
|
||||
_serverTokenGenerator = serverTokenGenerator;
|
||||
}
|
||||
|
||||
[SlashCommand("userinfo", "Shows you your user information")]
|
||||
@@ -103,10 +104,13 @@ public class LightlessModule : InteractionModuleBase
|
||||
try
|
||||
{
|
||||
using HttpClient c = new HttpClient();
|
||||
_logger.LogInformation("Sending message to main server with {}", scope);
|
||||
await c.PostAsJsonAsync(new Uri(_lightlessServicesConfiguration.GetValue<Uri>
|
||||
(nameof(ServicesConfiguration.MainServerAddress)), "/msgc/sendMessage"), new ClientMessage(messageType, message, uid ?? string.Empty))
|
||||
.ConfigureAwait(false);
|
||||
|
||||
c.DefaultRequestHeaders.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", _serverTokenGenerator.Token);
|
||||
|
||||
await c.PostAsJsonAsync(
|
||||
new Uri(_lightlessServicesConfiguration.GetValue<Uri>(nameof(ServicesConfiguration.MainServerAddress)), "/msgc/sendMessage"),
|
||||
new ClientMessage(messageType, message, uid ?? string.Empty)
|
||||
).ConfigureAwait(false);
|
||||
|
||||
var discordChannelForMessages = _lightlessServicesConfiguration.GetValueOrDefault<ulong?>(nameof(ServicesConfiguration.DiscordChannelForMessages), null);
|
||||
if (uid == null && discordChannelForMessages != null)
|
||||
|
||||
Reference in New Issue
Block a user