minster586/nadekobot
1
0
Fork 0
mirror of https://gitlab.com/Kwoth/nadekobot.git synced 2025-09-11 01:38:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed voice presence logging, closes #338

Browse Source
This commit is contained in:
Kwoth
2022-03-21 19:58:36 +01:00
parent 28720ebcea
commit b079492d38
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/NadekoBot/Bot.cs
View File

@@ -119,8 +119,6 @@ public sealed class Bot
// admin // admin
#if GLOBAL_NADEKO #if GLOBAL_NADEKO
svcs.AddSingleton<ILogCommandService, DummyLogCommandService>(); svcs.AddSingleton<ILogCommandService, DummyLogCommandService>();
#else
svcs.AddSingleton<ILogCommandService, LogCommandService>();
#endif #endif
svcs.AddHttpClient(); svcs.AddHttpClient();

16
src/NadekoBot/Modules/Administration/ServerLog/ServerLogCommandService.cs
View File

@@ -8,6 +8,9 @@ using NadekoBot.Services.Database.Models;
namespace NadekoBot.Modules.Administration; namespace NadekoBot.Modules.Administration;
public sealed class LogCommandService : ILogCommandService, IReadyExecutor public sealed class LogCommandService : ILogCommandService, IReadyExecutor
#if !GLOBAL_NADEKO
, INService // don't load this service on global nadeko
#endif
{ {
public ConcurrentDictionary<ulong, LogSetting> GuildLogSettings { get; } public ConcurrentDictionary<ulong, LogSetting> GuildLogSettings { get; }
@@ -42,9 +45,6 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
_mute = mute; _mute = mute;
_prot = prot; _prot = prot;
_tz = tz; _tz = tz;
#if !GLOBAL_NADEKO
using (var uow = db.GetDbContext()) using (var uow = db.GetDbContext())
{ {
var guildIds = client.Guilds.Select(x => x.Id).ToList(); var guildIds = client.Guilds.Select(x => x.Id).ToList();
@@ -64,7 +64,7 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
_client.UserUnbanned += _client_UserUnbanned; _client.UserUnbanned += _client_UserUnbanned;
_client.UserJoined += _client_UserJoined; _client.UserJoined += _client_UserJoined;
_client.UserLeft += _client_UserLeft; _client.UserLeft += _client_UserLeft;
//_client.UserPresenceUpdated += _client_UserPresenceUpdated; // _client.PresenceUpdated += _client_UserPresenceUpdated;
_client.UserVoiceStateUpdated += _client_UserVoiceStateUpdated; _client.UserVoiceStateUpdated += _client_UserVoiceStateUpdated;
_client.UserVoiceStateUpdated += _client_UserVoiceStateUpdated_TTS; _client.UserVoiceStateUpdated += _client_UserVoiceStateUpdated_TTS;
_client.GuildMemberUpdated += _client_GuildUserUpdated; _client.GuildMemberUpdated += _client_GuildUserUpdated;
@@ -78,12 +78,10 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
_mute.UserUnmuted += MuteCommands_UserUnmuted; _mute.UserUnmuted += MuteCommands_UserUnmuted;
_prot.OnAntiProtectionTriggered += TriggeredAntiProtection; _prot.OnAntiProtectionTriggered += TriggeredAntiProtection;
#endif
} }
public Task OnReadyAsync() public async Task OnReadyAsync()
=> Task.WhenAll(PresenceUpdateTask(), IgnoreMessageIdsClearTask()); => await Task.WhenAll(PresenceUpdateTask(), IgnoreMessageIdsClearTask());
private async Task IgnoreMessageIdsClearTask() private async Task IgnoreMessageIdsClearTask()
{ {
@@ -94,7 +92,6 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
private async Task PresenceUpdateTask() private async Task PresenceUpdateTask()
{ {
#if !GLOBAL_NADEKO
using var timer = new PeriodicTimer(TimeSpan.FromSeconds(15)); using var timer = new PeriodicTimer(TimeSpan.FromSeconds(15));
while (await timer.WaitForNextTickAsync()) while (await timer.WaitForNextTickAsync())
{ {
@@ -120,7 +117,6 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
} }
catch { } catch { }
} }
#endif
} }
public LogSetting? GetGuildLogSettings(ulong guildId) public LogSetting? GetGuildLogSettings(ulong guildId)