Skip to content

Commit fd2f473

Browse files
FloatingMilkshakeFloatingMilkshake
committed
Retarget to .NET 9 and upgrade DSharpPlus to 5.0.0-nightly-02428
1 parent 914889a commit fd2f473

File tree

11 files changed

+35
-36
lines changed

11 files changed

+35
-36
lines changed

‎Commands/BanCommands.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ public class BanCommands
55
{
66
[Command("ban")]
77
[Description("Ban a user. They will not be able to rejoin unless unbanned.")]
8-
[RequirePermissions(DiscordPermissions.BanMembers)]
8+
[RequirePermissions(DiscordPermission.BanMembers)]
99
public static async Task BanCommand(SlashCommandContext ctx,
1010
[Parameter("user"), Description("The user to ban.")] DiscordUser userToBan,
1111
[Parameter("reason"), Description("The reason for the ban.")] [MinMaxLength(maxLength: 1500)]
@@ -40,7 +40,7 @@ await ctx.FollowupAsync(new DiscordFollowupMessageBuilder()
4040

4141
[Command("unban")]
4242
[Description("Unban a user.")]
43-
[RequirePermissions(DiscordPermissions.BanMembers)]
43+
[RequirePermissions(DiscordPermission.BanMembers)]
4444
public static async Task UnbanCommand(SlashCommandContext ctx,
4545
[Parameter("user"), Description("The user to unban.")] DiscordUser userToUnban)
4646
{

‎Commands/Clear.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ public partial class Clear
77

88
[Command("clear")]
99
[Description("Delete many messages from the current channel.")]
10-
[RequirePermissions(DiscordPermissions.ManageMessages)]
10+
[RequirePermissions(DiscordPermission.ManageMessages)]
1111
public static async Task ClearCommand(SlashCommandContext ctx,
1212
[Parameter("count"), Description("The number of messages to consider for deletion. Required if you don't use the 'up_to' argument.")]
1313
long count = 0,

‎Commands/Kick.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ public class Kick
55
{
66
[Command("kick")]
77
[Description("Kick a user. They can rejoin the server with an invite.")]
8-
[RequirePermissions(DiscordPermissions.KickMembers)]
8+
[RequirePermissions(DiscordPermission.KickMembers)]
99
public static async Task KickCommand(SlashCommandContext ctx,
1010
[Parameter("user"), Description("The user to kick.")] DiscordUser userToKick,
1111
[Parameter("reason"), Description("The reason for the kick.")] [MinMaxLength(maxLength: 1500)]

‎Commands/LockdownCommands.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[Command("lockdown")]
44
[Description("Lock or unlock a channel.")]
55
[RequireGuild]
6-
[RequirePermissions(DiscordPermissions.ManageChannels, DiscordPermissions.ModerateMembers)]
6+
[RequirePermissions(DiscordPermission.ManageChannels, DiscordPermission.ModerateMembers)]
77
public class Lockdown
88
{
99
[Command("lock")]
@@ -21,29 +21,29 @@ public static async Task Lock(SlashCommandContext ctx)
2121
// Add initial overwrites for failsafes (bot & user who called /lockdown), deny everyone else Send Messages
2222
if (invokerExistingAllowedOverwrites is null)
2323
{
24-
await ctx.Channel.AddOverwriteAsync(ctx.Member, DiscordPermissions.SendMessages, DiscordPermissions.None,
24+
await ctx.Channel.AddOverwriteAsync(ctx.Member, DiscordPermission.SendMessages, DiscordPermissions.None,
2525
"Failsafe for lockdown");
2626
}
2727
else
2828
{
2929
await ctx.Channel.AddOverwriteAsync(ctx.Member,
30-
invokerExistingAllowedOverwrites.Allowed | DiscordPermissions.SendMessages,
30+
invokerExistingAllowedOverwrites.Allowed | DiscordPermission.SendMessages,
3131
invokerExistingAllowedOverwrites.Denied, "Failsafe for lockdown");
3232
}
3333

3434
if (botAllowedOverwrites is null)
3535
{
3636
await ctx.Channel.AddOverwriteAsync(await ctx.Guild.GetMemberAsync(ctx.Client.CurrentUser.Id),
37-
DiscordPermissions.SendMessages, DiscordPermissions.None, "Failsafe for lockdown");
37+
DiscordPermission.SendMessages, DiscordPermissions.None, "Failsafe for lockdown");
3838
}
3939
else
4040
{
4141
await ctx.Channel.AddOverwriteAsync(await ctx.Guild.GetMemberAsync(ctx.Client.CurrentUser.Id),
42-
botAllowedOverwrites.Allowed | DiscordPermissions.SendMessages, botAllowedOverwrites.Denied,
42+
botAllowedOverwrites.Allowed | DiscordPermission.SendMessages, botAllowedOverwrites.Denied,
4343
"Failsafe for lockdown");
4444
}
4545

46-
await ctx.Channel.AddOverwriteAsync(ctx.Guild.EveryoneRole, DiscordPermissions.None, DiscordPermissions.SendMessages,
46+
await ctx.Channel.AddOverwriteAsync(ctx.Guild.EveryoneRole, DiscordPermissions.None, DiscordPermission.SendMessages,
4747
"Lockdown");
4848

4949
// Restore overwrites that may have been present before the lockdown
@@ -53,7 +53,7 @@ await ctx.Channel.AddOverwriteAsync(ctx.Guild.EveryoneRole, DiscordPermissions.N
5353
{
5454
if (await overwrite.GetRoleAsync() == ctx.Guild.EveryoneRole)
5555
await ctx.Channel.AddOverwriteAsync(await overwrite.GetRoleAsync(), overwrite.Allowed,
56-
DiscordPermissions.SendMessages | overwrite.Denied,
56+
DiscordPermission.SendMessages | overwrite.Denied,
5757
"Restoring previous overrides for lockdown");
5858
else
5959
await ctx.Channel.AddOverwriteAsync(await overwrite.GetRoleAsync(), overwrite.Allowed,
@@ -89,7 +89,7 @@ public static async Task Unlock(SlashCommandContext ctx)
8989
// Checking <2 because there will always be 1 overwrite for @everyone permissions
9090
if (ctx.Channel.PermissionOverwrites.ToArray().Length < 2
9191
|| ctx.Channel.PermissionOverwrites.Any(o => o.Id == ctx.Guild.EveryoneRole.Id &&
92-
!o.Denied.HasPermission(DiscordPermissions.SendMessages)))
92+
!o.Denied.HasPermission(DiscordPermission.SendMessages)))
9393
{
9494
await ctx.FollowupAsync(new DiscordFollowupMessageBuilder()
9595
.WithContent("This channel is not locked!").AsEphemeral());
@@ -106,7 +106,7 @@ await ctx.FollowupAsync(new DiscordFollowupMessageBuilder()
106106
DiscordOverwriteBuilder newOverwrite = new(ctx.Guild.EveryoneRole)
107107
{
108108
Allowed = permission.Allowed,
109-
Denied = (DiscordPermissions)(permission.Denied - DiscordPermissions.SendMessages)
109+
Denied = (DiscordPermissions)(permission.Denied - DiscordPermission.SendMessages)
110110
};
111111

112112
await ctx.Channel.AddOverwriteAsync(ctx.Guild.EveryoneRole, newOverwrite.Allowed,
@@ -115,12 +115,12 @@ await ctx.Channel.AddOverwriteAsync(ctx.Guild.EveryoneRole, newOverwrite.Allowed
115115
else
116116
{
117117
// Filter to user overrides that have Send Messages allowed (failsafes) so we can remove
118-
if (!permission.Allowed.HasPermission(DiscordPermissions.SendMessages)) continue;
118+
if (!permission.Allowed.HasPermission(DiscordPermission.SendMessages)) continue;
119119

120120
// Remove failsafe Send Message overrides
121121
DiscordOverwriteBuilder newOverwrite = new(await permission.GetMemberAsync())
122122
{
123-
Allowed = (DiscordPermissions)(permission.Allowed - DiscordPermissions.SendMessages),
123+
Allowed = (DiscordPermissions)(permission.Allowed - DiscordPermission.SendMessages),
124124
Denied = permission.Denied
125125
};
126126

‎Commands/Nickname.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ public class Nickname
55
{
66
[Command("nickname")]
77
[Description("Changes my nickname.")]
8-
[RequirePermissions(DiscordPermissions.ChangeNickname, DiscordPermissions.ManageNicknames)]
8+
[RequirePermissions(DiscordPermission.ChangeNickname, DiscordPermission.ManageNicknames)]
99
public static async Task NicknameCommand(SlashCommandContext ctx,
1010
[Parameter("nickname"), Description("What to change my nickname to. Leave this blank to clear it.")] [MinMaxLength(maxLength: 32)]
1111
string nickname = null)

‎Commands/TimeoutCommands.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[Command("timeout")]
44
[Description("Set or clear a timeout for a user.")]
5-
[RequirePermissions(DiscordPermissions.ModerateMembers)]
5+
[RequirePermissions(DiscordPermission.ModerateMembers)]
66
[RequireGuild]
77
public class TimeoutCmds
88
{

‎Dockerfile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
FROM --platform=${BUILDPLATFORM} \
2-
mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build-env
1+
FROM --platform=${BUILDPLATFORM} mcr.microsoft.com/dotnet/sdk:9.0-alpine AS build-env
32
WORKDIR /app
43
COPY *.csproj ./
54
RUN dotnet restore
65
COPY . ./
76
RUN dotnet build -c Release -o out
8-
FROM mcr.microsoft.com/dotnet/runtime:8.0-alpine
7+
FROM mcr.microsoft.com/dotnet/runtime:9.0-alpine
98
LABEL com.centurylinklabs.watchtower.enable="true"
109
WORKDIR /app
1110
COPY --from=build-env /app/out .

‎Events/ErrorEvents.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ await e.Context.RespondAsync(
160160
// Check if bot has perms to send error response and send if so
161161
if (e.Context.Channel
162162
.PermissionsFor(await e.Context.Guild.GetMemberAsync(e.Context.Client.CurrentUser.Id))
163-
.HasPermission(DiscordPermissions.SendMessages))
163+
.HasPermission(DiscordPermission.SendMessages))
164164
await e.Context.RespondAsync(embed.Build()).ConfigureAwait(false);
165165
}
166166

‎Helpers/KeywordTrackingHelpers.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public static async Task KeywordCheck(DiscordMessage message, bool isEdit = fals
131131
return;
132132
}
133133

134-
if (!message.Channel.PermissionsFor(member).HasPermission(DiscordPermissions.AccessChannels) || !message.Channel.PermissionsFor(member).HasPermission(DiscordPermissions.ReadMessageHistory))
134+
if (!message.Channel.PermissionsFor(member).HasPermission(DiscordPermission.ViewChannel) || !message.Channel.PermissionsFor(member).HasPermission(DiscordPermission.ReadMessageHistory))
135135
break;
136136

137137
if (fieldValue.MatchWholeWord)

‎Helpers/UserInfoHelpers.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,31 @@ public static Task<DiscordEmbed> GenerateUserInfoEmbed(DiscordMember member)
1515
{
1616
notablePerms.Add("Server Owner");
1717
}
18-
else if (member.Permissions.HasPermission(DiscordPermissions.Administrator))
18+
else if (member.Permissions.HasPermission(DiscordPermission.Administrator))
1919
{
2020
notablePerms.Add("Administrator");
2121
}
2222
else
2323
{
24-
if (member.Permissions.HasPermission(DiscordPermissions.ManageChannels))
24+
if (member.Permissions.HasPermission(DiscordPermission.ManageChannels))
2525
notablePerms.Add("Manage Channels");
26-
if (member.Permissions.HasPermission(DiscordPermissions.ManageEmojis))
26+
if (member.Permissions.HasPermission(DiscordPermission.ManageGuildExpressions))
2727
notablePerms.Add("Manage Emojis and Stickers");
28-
if (member.Permissions.HasPermission(DiscordPermissions.ManageEvents))
28+
if (member.Permissions.HasPermission(DiscordPermission.ManageEvents))
2929
notablePerms.Add("Manage Events");
30-
if (member.Permissions.HasPermission(DiscordPermissions.ManageGuild))
30+
if (member.Permissions.HasPermission(DiscordPermission.ManageGuild))
3131
notablePerms.Add("Manage Server");
32-
if (member.Permissions.HasPermission(DiscordPermissions.ManageMessages))
32+
if (member.Permissions.HasPermission(DiscordPermission.ManageMessages))
3333
notablePerms.Add("Manage Messages");
34-
if (member.Permissions.HasPermission(DiscordPermissions.ManageNicknames))
34+
if (member.Permissions.HasPermission(DiscordPermission.ManageNicknames))
3535
notablePerms.Add("Manage Nicknames");
36-
if (member.Permissions.HasPermission(DiscordPermissions.ManageRoles))
36+
if (member.Permissions.HasPermission(DiscordPermission.ManageRoles))
3737
notablePerms.Add("Manage Roles");
38-
if (member.Permissions.HasPermission(DiscordPermissions.ManageThreads))
38+
if (member.Permissions.HasPermission(DiscordPermission.ManageThreads))
3939
notablePerms.Add(member.Guild.Features.Contains("COMMUNITY")
4040
? "Manage Threads and Posts"
4141
: "Manage Threads");
42-
if (member.Permissions.HasPermission(DiscordPermissions.ManageWebhooks))
42+
if (member.Permissions.HasPermission(DiscordPermission.ManageWebhooks))
4343
notablePerms.Add("Manage Webhooks");
4444
}
4545

0 commit comments

Comments
 (0)