Update dependencies and modules #169
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -269,3 +269,5 @@ __pycache__/ | |
|
|
||
| Floofbot/config.yaml | ||
| /Floofbot/floofData.db | ||
| /Floofbot/config.yaml | ||
| /Floofbot/app.config | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -253,8 +253,9 @@ public Task MessageUpdated(Cacheable<IMessage, ulong> before, SocketMessage afte | |
| }); | ||
| return Task.CompletedTask; | ||
| } | ||
| public Task MessageDeleted(Cacheable<IMessage, ulong> before, Cacheable<IMessageChannel, ulong> channel) | ||
| { | ||
| IMessageChannel chan = channel.Value; | ||
| var _ = Task.Run(async () => | ||
| { | ||
| try | ||
|
|
@@ -267,23 +268,25 @@ public Task MessageDeleted(Cacheable<IMessage, ulong> before, ISocketMessageChan | |
| if (message.Author.IsBot) | ||
| return; | ||
|
|
||
| if (chan == null) | ||
| return; | ||
|
|
||
| IGuildChannel messageChannel = message.Channel as IGuildChannel; | ||
| IGuild guild = messageChannel.Guild; | ||
|
|
||
| if ((IsToggled(guild)) == false) // not toggled on | ||
| return; | ||
|
|
||
|
|
||
| Discord.ITextChannel logChannel = await GetChannel(guild, "MessageDeletedChannel"); | ||
| if (logChannel == null) | ||
| return; | ||
|
|
||
| var embed = new EmbedBuilder(); | ||
|
|
||
| embed.WithTitle($"⚠️ Message Deleted | {message.Author.Username}#{message.Author.Discriminator}") | ||
| .WithColor(Color.Gold) | ||
| .WithDescription($"{message.Author.Mention} ({message.Author.Id}) has had their message deleted in {MentionUtils.MentionChannel(chan.Id)}!") | ||
| .WithCurrentTimestamp() | ||
| .WithFooter($"user_message_deleted user_messagelog {message.Author.Id}"); | ||
| if (message.Content.Length > 0) | ||
|
|
@@ -437,8 +440,10 @@ public Task UserUnbanned(IUser user, IGuild guild) | |
| return Task.CompletedTask; | ||
|
|
||
| } | ||
| public Task UserJoined(SocketGuildUser sUser) | ||
| { | ||
| SocketGuild guild = sUser.Guild; | ||
| IGuildUser user = guild.GetUser(sUser.Id); | ||
| var _ = Task.Run(async () => | ||
| { | ||
| try | ||
|
|
@@ -482,7 +487,7 @@ public Task UserJoined(IGuildUser user) | |
| }); | ||
| return Task.CompletedTask; | ||
| } | ||
| public Task UserLeft(SocketGuild guild, SocketUser user) | ||
| { | ||
| var _ = Task.Run(async () => | ||
| { | ||
|
|
@@ -491,27 +496,18 @@ public Task UserLeft(IGuildUser user) | |
| if (user.IsBot) | ||
| return; | ||
|
|
||
|
|
||
| if ((IsToggled(guild)) == false) | ||
| return; | ||
|
|
||
| Discord.ITextChannel channel = await GetChannel(guild, "UserLeftChannel"); | ||
| if (channel == null) | ||
| return; | ||
|
|
||
| var embed = new EmbedBuilder(); | ||
| embed.WithTitle($"❌ User Left | {user.Username}#{user.Discriminator}") | ||
| .WithColor(Color.Red) | ||
| .WithDescription($"{user.Mention} | ``{user.Id}``"); | ||
|
There was a problem hiding this comment. So what happened to There was a problem hiding this comment. Because it's changed from guilduser to socketuser, this no longer knows the join date as the user isn't associated with a guild, couldn't think of alternative solution but to remove it There was a problem hiding this comment. This is really late, but you can actually get the |
||
| embed.WithFooter($"user_leave user_joinlog {user.Id}") | ||
| .WithCurrentTimestamp(); | ||
|
|
||
|
|
@@ -603,8 +599,9 @@ public Task UserUpdated(SocketUser before, SocketUser userAfter) | |
|
|
||
| } | ||
|
|
||
| public Task GuildMemberUpdated(Cacheable<SocketGuildUser, ulong> _before, SocketGuildUser after) | ||
| { | ||
| SocketGuildUser before = _before.Value; | ||
| var _ = Task.Run(async () => | ||
| { | ||
| try | ||
|
|
@@ -656,6 +653,8 @@ public Task GuildMemberUpdated(SocketGuildUser before, SocketGuildUser after) | |
| } | ||
| else if (before.Roles.Count != after.Roles.Count) | ||
| { | ||
| await _userRoleRetentionService.LogUserRoles(before as IGuildUser); | ||
|
|
||
| List<SocketRole> beforeRoles = new List<SocketRole>(before.Roles); | ||
| List<SocketRole> afterRoles = new List<SocketRole>(after.Roles); | ||
| List<SocketRole> roleDifference = new List<SocketRole>(); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@iShauny i opened #174. ptal.