minster586/nadekobot
1
0
Fork 0
mirror of https://gitlab.com/Kwoth/nadekobot.git synced 2025-11-03 16:24:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v4' into v5

Browse Source
This commit is contained in:
Kwoth
2023-07-03 05:02:56 +02:00
parent b34cd534c3 ce5e04b398
commit be1d14d095
11 changed files with 66 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Nadeko.Bot.Modules.Administration/ServerLog/ServerLogCommandService.cs
View File

@@ -149,9 +149,11 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
{
try
{
if (sch.HasValue || sch.Value is not IGuildChannel ch)
if (!sch.HasValue)
return;
var ch = sch.Value;
if (!GuildLogSettings.TryGetValue(ch.Guild.Id, out var logSetting)
|| logSetting.ThreadDeletedId is null)
return;
@@ -164,7 +166,7 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
await logChannel.EmbedAsync(_eb.Create()
.WithOkColor()
.WithTitle("🆕 " + title)
.WithTitle("🗑 " + title)
.WithDescription($"{ch.Name} | {ch.Id}")
.WithFooter(CurrentTime(ch.Guild)));
}
@@ -176,15 +178,12 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
return Task.CompletedTask;
}
private Task _client_ThreadCreated(SocketThreadChannel sch)
private Task _client_ThreadCreated(SocketThreadChannel ch)
{
_ = Task.Run(async () =>
{
try
{
if (sch.Guild is not IGuildChannel ch)
return;
if (!GuildLogSettings.TryGetValue(ch.Guild.Id, out var logSetting)
|| logSetting.ThreadCreatedId is null)
return;
@@ -455,6 +454,12 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
case LogType.UserWarned:
channelId = logSetting.LogWarnsId = logSetting.LogWarnsId is null ? cid : default;
break;
case LogType.ThreadDeleted:
channelId = logSetting.ThreadDeletedId = logSetting.ThreadDeletedId is null ? cid : default;
break;
case LogType.ThreadCreated:
channelId = logSetting.ThreadCreatedId = logSetting.ThreadCreatedId is null ? cid : default;
break;
}
uow.SaveChanges();
@@ -1266,6 +1271,12 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
case LogType.UserWarned:
id = logSetting.LogWarnsId;
break;
case LogType.ThreadCreated:
id = logSetting.ThreadCreatedId;
break;
case LogType.ThreadDeleted:
id = logSetting.ThreadDeletedId;
break;
}
if (id is null or 0)

6
src/Nadeko.Bot.Modules.Administration/ServerLog/ServerLogCommands.cs
View File

@@ -143,6 +143,12 @@ public partial class Administration
return l.LogVoicePresenceTTSId;
case LogType.UserMuted:
return l.UserMutedId;
case LogType.UserWarned:
return l.LogWarnsId;
case LogType.ThreadDeleted:
return l.ThreadDeletedId;
case LogType.ThreadCreated:
return l.ThreadCreatedId;
default:
return null;
}