Skip to content

Commit

Permalink
Migrate event handling for D#+ 5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@FloatingMilkshake
FloatingMilkshake committed Jul 2, 2024
1 parent 1796e3d commit 9926362
Show file tree
Hide file tree
Showing 2 changed files with 90 additions and 93 deletions.
137 changes: 67 additions & 70 deletions Events/ChannelEvents.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,102 +4,99 @@ public class ChannelEvents
{
public static async Task ChannelUpdated(DiscordClient _, ChannelUpdatedEventArgs e)
{
Task.Run(async () =>
{
// Sync channel overwrites with db so that they can be restored when a user leaves & rejoins.
// Sync channel overwrites with db so that they can be restored when a user leaves & rejoins.

// Get the current channel overwrites
var currentChannelOverwrites = e.ChannelAfter.PermissionOverwrites;
// Get the current channel overwrites
var currentChannelOverwrites = e.ChannelAfter.PermissionOverwrites;

// Get the db overwrites
var dbOverwrites = await Program.db.HashGetAllAsync("overrides");
// Get the db overwrites
var dbOverwrites = await Program.db.HashGetAllAsync("overrides");

// Compare the two and sync them, prioritizing overwrites on channel over stored overwrites
// Compare the two and sync them, prioritizing overwrites on channel over stored overwrites

foreach (var userOverwrites in dbOverwrites)
{
var overwriteDict = JsonConvert.DeserializeObject<Dictionary<ulong, DiscordOverwrite>>(userOverwrites.Value);
foreach (var userOverwrites in dbOverwrites)
{
var overwriteDict = JsonConvert.DeserializeObject<Dictionary<ulong, DiscordOverwrite>>(userOverwrites.Value);

// If the db overwrites are not in the current channel overwrites, remove them from the db.
// If the db overwrites are not in the current channel overwrites, remove them from the db.

foreach (var overwrite in overwriteDict)
{
// (if overwrite is for a different channel, skip)
if (overwrite.Key != e.ChannelAfter.Id) continue;
foreach (var overwrite in overwriteDict)
{
// (if overwrite is for a different channel, skip)
if (overwrite.Key != e.ChannelAfter.Id) continue;

// (if current overwrite is in the channel, skip)
if (currentChannelOverwrites.Any(a => a == overwrite.Value && e.ChannelAfter.Id == overwrite.Key)) continue;
// (if current overwrite is in the channel, skip)
if (currentChannelOverwrites.Any(a => a == overwrite.Value && e.ChannelAfter.Id == overwrite.Key)) continue;

// If it looks like the member left, do NOT remove their overrides.
// If it looks like the member left, do NOT remove their overrides.

// Delay to allow leave to complete first
await Task.Delay(500);
// Delay to allow leave to complete first
await Task.Delay(500);

// Try to fetch member. If it fails, they are not in the guild. If this is a voice channel, remove the override.
// (if they are not in the guild & this is not a voice channel, skip; otherwise, code below handles removal)
if (!e.Guild.Members.ContainsKey((ulong)userOverwrites.Name) && e.ChannelAfter.Type != DiscordChannelType.Voice)
continue;
// Try to fetch member. If it fails, they are not in the guild. If this is a voice channel, remove the override.
// (if they are not in the guild & this is not a voice channel, skip; otherwise, code below handles removal)
if (!e.Guild.Members.ContainsKey((ulong)userOverwrites.Name) && e.ChannelAfter.Type != DiscordChannelType.Voice)
continue;

// User could be fetched, so they are in the server and their override was removed. Remove from db.
// (or user could not be fetched & this is a voice channel; remove)
// User could be fetched, so they are in the server and their override was removed. Remove from db.
// (or user could not be fetched & this is a voice channel; remove)

var overrides = await Program.db.HashGetAsync("overrides", userOverwrites.Name);
var dict = JsonConvert.DeserializeObject<Dictionary<ulong, DiscordOverwrite>>(overrides);
dict.Remove(e.ChannelAfter.Id);
if (dict.Count > 0)
await Program.db.HashSetAsync("overrides", userOverwrites.Name, JsonConvert.SerializeObject(dict));
else
{
await Program.db.HashDeleteAsync("overrides", userOverwrites.Name);
}
var overrides = await Program.db.HashGetAsync("overrides", userOverwrites.Name);
var dict = JsonConvert.DeserializeObject<Dictionary<ulong, DiscordOverwrite>>(overrides);
dict.Remove(e.ChannelAfter.Id);
if (dict.Count > 0)
await Program.db.HashSetAsync("overrides", userOverwrites.Name, JsonConvert.SerializeObject(dict));
else
{
await Program.db.HashDeleteAsync("overrides", userOverwrites.Name);
}
}
}

foreach (var overwrite in currentChannelOverwrites)
{
// Ignore role overrides because we aren't storing those
if (overwrite.Type == DiscordOverwriteType.Role) continue;
foreach (var overwrite in currentChannelOverwrites)
{
// Ignore role overrides because we aren't storing those
if (overwrite.Type == DiscordOverwriteType.Role) continue;

// If the current channel overwrites are not in the db, add them to the db.
// If the current channel overwrites are not in the db, add them to the db.

if (dbOverwrites
.Select(dbOverwrite => JsonConvert.DeserializeObject<DiscordOverwrite>(dbOverwrite.Value))
.All(dbOverwriteObj => dbOverwriteObj != overwrite))
if (dbOverwrites
.Select(dbOverwrite => JsonConvert.DeserializeObject<DiscordOverwrite>(dbOverwrite.Value))
.All(dbOverwriteObj => dbOverwriteObj != overwrite))
{
if ((await Program.db.HashKeysAsync("overrides")).Any(a => a == overwrite.Id.ToString()))
{
if ((await Program.db.HashKeysAsync("overrides")).Any(a => a == overwrite.Id.ToString()))
{
// User has an overwrite in the db; add this one to their list of overrides without
// touching existing ones
// User has an overwrite in the db; add this one to their list of overrides without
// touching existing ones

var overwrites = await Program.db.HashGetAsync("overrides", overwrite.Id);
var overwrites = await Program.db.HashGetAsync("overrides", overwrite.Id);

if (!string.IsNullOrWhiteSpace(overwrites))
if (!string.IsNullOrWhiteSpace(overwrites))
{
var dict = JsonConvert.DeserializeObject<Dictionary<ulong, DiscordOverwrite>>(overwrites);

if (dict is not null)
{
var dict = JsonConvert.DeserializeObject<Dictionary<ulong, DiscordOverwrite>>(overwrites);

if (dict is not null)
{
dict.Add(e.ChannelAfter.Id, overwrite);

if (dict.Count > 0)
await Program.db.HashSetAsync("overrides", overwrite.Id,
JsonConvert.SerializeObject(dict));
else
await Program.db.HashDeleteAsync("overrides", overwrite.Id);
}
dict.Add(e.ChannelAfter.Id, overwrite);

if (dict.Count > 0)
await Program.db.HashSetAsync("overrides", overwrite.Id,
JsonConvert.SerializeObject(dict));
else
await Program.db.HashDeleteAsync("overrides", overwrite.Id);
}
}
else
{
// User doesn't have any overrides in db, so store new dictionary
}
else
{
// User doesn't have any overrides in db, so store new dictionary

await Program.db.HashSetAsync("overrides",
overwrite.Id, JsonConvert.SerializeObject(new Dictionary<ulong, DiscordOverwrite>
{ { e.ChannelAfter.Id, overwrite } }));
}
await Program.db.HashSetAsync("overrides",
overwrite.Id, JsonConvert.SerializeObject(new Dictionary<ulong, DiscordOverwrite>
{ { e.ChannelAfter.Id, overwrite } }));
}
}
});
}
}
}
}
46 changes: 23 additions & 23 deletions Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,29 @@ static async Task Main(string[] _)
clientConfig.LogUnknownEvents = false;
clientConfig.LogUnknownAuditlogs = false;
});

discordBuilder.ConfigureEventHandlers
(
builder => builder.HandleComponentInteractionCreated(InteractionEvents.ComponentInteractionCreateEvent)
.HandleSessionCreated(ReadyEvent.OnReady)
.HandleMessageCreated(MessageEvent.MessageCreated)
.HandleMessageUpdated(MessageEvent.MessageUpdated)
.HandleMessageDeleted(MessageEvent.MessageDeleted)
.HandleGuildMemberAdded(MemberEvents.GuildMemberAdded)
.HandleGuildMemberRemoved(MemberEvents.GuildMemberRemoved)
.HandleMessageReactionAdded(ReactionEvent.OnReaction)
.HandleGuildMemberUpdated(MemberEvents.GuildMemberUpdated)
.HandleUserUpdated(MemberEvents.UserUpdated)
.HandleThreadCreated(ThreadEvents.Discord_ThreadCreated)
.HandleThreadDeleted(ThreadEvents.Discord_ThreadDeleted)
.HandleThreadListSynced(ThreadEvents.Discord_ThreadListSynced)
.HandleThreadMemberUpdated(ThreadEvents.Discord_ThreadMemberUpdated)
.HandleThreadMembersUpdated(ThreadEvents.Discord_ThreadMembersUpdated)
.HandleHeartbeated(HeartbeatEvent.OnHeartbeat)
.HandleGuildBanRemoved(UnbanEvent.OnUnban)
.HandleVoiceStateUpdated(VoiceEvents.VoiceStateUpdate)
.HandleChannelUpdated(ChannelEvents.ChannelUpdated)
);

discord = discordBuilder.Build();

Expand All @@ -151,29 +174,6 @@ static async Task Main(string[] _)
foreach (var type in slashCommandClasses)
slash.RegisterCommands(type, cfgjson.ServerID); ;

discord.ComponentInteractionCreated += InteractionEvents.ComponentInteractionCreateEvent;
discord.SessionCreated += ReadyEvent.OnReady;
discord.MessageCreated += MessageEvent.MessageCreated;
discord.MessageUpdated += MessageEvent.MessageUpdated;
discord.MessageDeleted += MessageEvent.MessageDeleted;
discord.GuildMemberAdded += MemberEvents.GuildMemberAdded;
discord.GuildMemberRemoved += MemberEvents.GuildMemberRemoved;
discord.MessageReactionAdded += ReactionEvent.OnReaction;
discord.GuildMemberUpdated += MemberEvents.GuildMemberUpdated;
discord.UserUpdated += MemberEvents.UserUpdated;
discord.ThreadCreated += ThreadEvents.Discord_ThreadCreated;
discord.ThreadDeleted += ThreadEvents.Discord_ThreadDeleted;
discord.ThreadListSynced += ThreadEvents.Discord_ThreadListSynced;
discord.ThreadMemberUpdated += ThreadEvents.Discord_ThreadMemberUpdated;
discord.ThreadMembersUpdated += ThreadEvents.Discord_ThreadMembersUpdated;
discord.Heartbeated += HeartbeatEvent.OnHeartbeat;

discord.GuildBanRemoved += UnbanEvent.OnUnban;

discord.VoiceStateUpdated += VoiceEvents.VoiceStateUpdate;

discord.ChannelUpdated += ChannelEvents.ChannelUpdated;

commands = discord.UseCommandsNext(new CommandsNextConfiguration
{
StringPrefixes = cfgjson.Core.Prefixes
Expand Down

0 comments on commit 9926362

Please sign in to comment.