mirror of
https://github.com/TeamOctolings/Octobot.git
synced 2025-04-20 00:43:36 +03:00
Fix CI alerts again
This commit is contained in:
parent
1f45a605d7
commit
558e05156c
5 changed files with 22 additions and 4 deletions
|
@ -57,6 +57,7 @@ public static class Boyfriend {
|
|||
timer.Interval = 1000;
|
||||
timer.AutoReset = true;
|
||||
timer.Elapsed += TickAllGuildsAsync;
|
||||
if (ActivityList.Length is 0) timer.Dispose(); // CodeQL moment
|
||||
timer.Start();
|
||||
|
||||
while (ActivityList.Length > 0)
|
||||
|
@ -143,7 +144,7 @@ public static class Boyfriend {
|
|||
await Utils.UnmuteMemberAsync(data, Client.CurrentUser.ToString(), guild.GetUser(mData.Id),
|
||||
Messages.PunishmentExpired);
|
||||
|
||||
foreach (var reminder in mData.Reminders) {
|
||||
foreach (var reminder in mData.Reminders.Where(rem => DateTimeOffset.Now >= rem.RemindAt)) {
|
||||
var channel = guild.GetTextChannel(reminder.ReminderChannel);
|
||||
if (channel is null) {
|
||||
await Utils.SendDirectMessage(Client.GetUser(mData.Id), reminder.ReminderText);
|
||||
|
@ -151,6 +152,8 @@ public static class Boyfriend {
|
|||
}
|
||||
|
||||
await channel.SendMessageAsync($"<@{mData.Id}> {Utils.Wrap(reminder.ReminderText)}");
|
||||
|
||||
mData.Reminders.Remove(reminder);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -135,7 +135,17 @@ public sealed class SettingsCommand : ICommand {
|
|||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
if (selectedSetting is "MuteRole") data.MuteRole = guild.GetRole(mention);
|
||||
switch (selectedSetting) {
|
||||
case "MuteRole":
|
||||
data.MuteRole = guild.GetRole(mention);
|
||||
break;
|
||||
case "PublicFeedbackChannel":
|
||||
data.PublicFeedbackChannel = guild.GetTextChannel(mention);
|
||||
break;
|
||||
case "PrivateFeedbackChannel":
|
||||
data.PrivateFeedbackChannel = guild.GetTextChannel(mention);
|
||||
break;
|
||||
}
|
||||
|
||||
config[selectedSetting] = value;
|
||||
}
|
||||
|
|
|
@ -14,7 +14,7 @@ public sealed class UnbanCommand : ICommand {
|
|||
if (reason is not null) await UnbanUserAsync(cmd, id.Value, reason);
|
||||
}
|
||||
|
||||
public static async Task UnbanUserAsync(CommandProcessor cmd, ulong id, string reason) {
|
||||
private static async Task UnbanUserAsync(CommandProcessor cmd, ulong id, string reason) {
|
||||
var requestOptions = Utils.GetRequestOptions($"({cmd.Context.User}) {reason}");
|
||||
await cmd.Context.Guild.RemoveBanAsync(id, requestOptions);
|
||||
|
||||
|
|
|
@ -17,12 +17,18 @@ public static class EventHandler {
|
|||
Client.MessageUpdated += MessageUpdatedEvent;
|
||||
Client.UserJoined += UserJoinedEvent;
|
||||
Client.UserLeft += UserLeftEvent;
|
||||
Client.GuildMemberUpdated += RolesUpdatedEvent;
|
||||
Client.GuildScheduledEventCreated += ScheduledEventCreatedEvent;
|
||||
Client.GuildScheduledEventCancelled += ScheduledEventCancelledEvent;
|
||||
Client.GuildScheduledEventStarted += ScheduledEventStartedEvent;
|
||||
Client.GuildScheduledEventCompleted += ScheduledEventCompletedEvent;
|
||||
}
|
||||
|
||||
private static Task RolesUpdatedEvent(Cacheable<SocketGuildUser, ulong> oldUser, SocketGuildUser newUser) {
|
||||
GuildData.Get(newUser.Guild).MemberData[newUser.Id].Roles = ((IGuildUser)newUser).RoleIds.ToList();
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
private static Task ReadyEvent() {
|
||||
if (!_sendReadyMessages) return Task.CompletedTask;
|
||||
var i = Random.Shared.Next(3);
|
||||
|
|
|
@ -2,7 +2,6 @@ namespace Boyfriend;
|
|||
|
||||
public static class ReplyEmojis {
|
||||
public const string Success = ":white_check_mark:";
|
||||
public const string Warning = ":warning:";
|
||||
public const string Error = ":x:";
|
||||
public const string MissingArgument = ":keyboard:";
|
||||
public const string InvalidArgument = ":construction:";
|
||||
|
|
Loading…
Add table
Reference in a new issue