Skip to content

Commit 70f0ef0

Browse files
ErisaErisa
committed
Upgrade DSharpPlus to 5.0.0-nightly-02356
1 parent 89b2e68 commit 70f0ef0

20 files changed

+97
-89
lines changed

‎Cliptok.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313

1414
<ItemGroup>
1515
<PackageReference Include="Abyssal.HumanDateParser" Version="2.0.0-20191113.1" />
16-
<PackageReference Include="DSharpPlus" Version="5.0.0-nightly-02351" />
17-
<PackageReference Include="DSharpPlus.CommandsNext" Version="5.0.0-nightly-02351" />
18-
<PackageReference Include="DSharpPlus.SlashCommands" Version="5.0.0-nightly-02351" />
16+
<PackageReference Include="DSharpPlus" Version="5.0.0-nightly-02356" />
17+
<PackageReference Include="DSharpPlus.CommandsNext" Version="5.0.0-nightly-02356" />
18+
<PackageReference Include="DSharpPlus.SlashCommands" Version="5.0.0-nightly-02356" />
1919
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
2020
<PackageReference Include="Serilog" Version="4.0.1" />
2121
<PackageReference Include="Serilog.Expressions" Version="5.0.0" />

‎CommandChecks/HomeServerPerms.cs

+18-18
Original file line numberDiff line numberDiff line change
@@ -23,43 +23,43 @@ public enum ServerPermLevel
2323
Owner = int.MaxValue
2424
}
2525

26-
public static ServerPermLevel GetPermLevel(DiscordMember target)
26+
public static async Task<ServerPermLevel> GetPermLevelAsync(DiscordMember target)
2727
{
2828
if (target.Guild.Id != Program.cfgjson.ServerID)
2929
return ServerPermLevel.Nothing;
3030

3131
// Torch approved of this.
3232
if (target.IsOwner)
3333
return ServerPermLevel.Owner;
34-
else if (target.Roles.Contains(target.Guild.GetRole(Program.cfgjson.AdminRole)))
34+
else if (target.Roles.Contains(await target.Guild.GetRoleAsync(Program.cfgjson.AdminRole)))
3535
return ServerPermLevel.Admin;
36-
else if (target.Roles.Contains(target.Guild.GetRole(Program.cfgjson.ModRole)))
36+
else if (target.Roles.Contains(await target.Guild.GetRoleAsync(Program.cfgjson.ModRole)))
3737
return ServerPermLevel.Moderator;
38-
else if (target.Roles.Contains(target.Guild.GetRole(Program.cfgjson.MutedRole)))
38+
else if (target.Roles.Contains(await target.Guild.GetRoleAsync(Program.cfgjson.MutedRole)))
3939
return ServerPermLevel.Muted;
40-
else if (target.Roles.Contains(target.Guild.GetRole(Program.cfgjson.TrialModRole)))
40+
else if (target.Roles.Contains(await target.Guild.GetRoleAsync(Program.cfgjson.TrialModRole)))
4141
return ServerPermLevel.TrialModerator;
42-
else if (target.Roles.Contains(target.Guild.GetRole(Program.cfgjson.TqsRoleId)))
42+
else if (target.Roles.Contains(await target.Guild.GetRoleAsync(Program.cfgjson.TqsRoleId)))
4343
return ServerPermLevel.TechnicalQueriesSlayer;
44-
else if (target.Roles.Contains(target.Guild.GetRole(Program.cfgjson.TierRoles[9])))
44+
else if (target.Roles.Contains(await target.Guild.GetRoleAsync(Program.cfgjson.TierRoles[9])))
4545
return ServerPermLevel.TierX;
46-
else if (target.Roles.Contains(target.Guild.GetRole(Program.cfgjson.TierRoles[8])))
46+
else if (target.Roles.Contains(await target.Guild.GetRoleAsync(Program.cfgjson.TierRoles[8])))
4747
return ServerPermLevel.TierS;
48-
else if (target.Roles.Contains(target.Guild.GetRole(Program.cfgjson.TierRoles[7])))
48+
else if (target.Roles.Contains(await target.Guild.GetRoleAsync(Program.cfgjson.TierRoles[7])))
4949
return ServerPermLevel.Tier8;
50-
else if (target.Roles.Contains(target.Guild.GetRole(Program.cfgjson.TierRoles[6])))
50+
else if (target.Roles.Contains(await target.Guild.GetRoleAsync(Program.cfgjson.TierRoles[6])))
5151
return ServerPermLevel.Tier7;
52-
else if (target.Roles.Contains(target.Guild.GetRole(Program.cfgjson.TierRoles[5])))
52+
else if (target.Roles.Contains(await target.Guild.GetRoleAsync(Program.cfgjson.TierRoles[5])))
5353
return ServerPermLevel.Tier6;
54-
else if (target.Roles.Contains(target.Guild.GetRole(Program.cfgjson.TierRoles[4])))
54+
else if (target.Roles.Contains(await target.Guild.GetRoleAsync(Program.cfgjson.TierRoles[4])))
5555
return ServerPermLevel.Tier5;
56-
else if (target.Roles.Contains(target.Guild.GetRole(Program.cfgjson.TierRoles[3])))
56+
else if (target.Roles.Contains(await target.Guild.GetRoleAsync(Program.cfgjson.TierRoles[3])))
5757
return ServerPermLevel.Tier4;
58-
else if (target.Roles.Contains(target.Guild.GetRole(Program.cfgjson.TierRoles[2])))
58+
else if (target.Roles.Contains(await target.Guild.GetRoleAsync(Program.cfgjson.TierRoles[2])))
5959
return ServerPermLevel.Tier3;
60-
else if (target.Roles.Contains(target.Guild.GetRole(Program.cfgjson.TierRoles[1])))
60+
else if (target.Roles.Contains(await target.Guild.GetRoleAsync(Program.cfgjson.TierRoles[1])))
6161
return ServerPermLevel.Tier2;
62-
else if (target.Roles.Contains(target.Guild.GetRole(Program.cfgjson.TierRoles[0])))
62+
else if (target.Roles.Contains(await target.Guild.GetRoleAsync(Program.cfgjson.TierRoles[0])))
6363
return ServerPermLevel.Tier1;
6464
else
6565
return ServerPermLevel.Nothing;
@@ -108,7 +108,7 @@ public override async Task<bool> ExecuteCheckAsync(CommandContext ctx, bool help
108108
member = ctx.Member;
109109
}
110110

111-
var level = GetPermLevel(member);
111+
var level = await GetPermLevelAsync(member);
112112
if (level >= TargetLvl)
113113
return true;
114114

@@ -146,7 +146,7 @@ public override async Task<bool> ExecuteChecksAsync(InteractionContext ctx)
146146
if (ctx.Guild.Id != Program.cfgjson.ServerID)
147147
return false;
148148

149-
var level = GetPermLevel(ctx.Member);
149+
var level = await GetPermLevelAsync(ctx.Member);
150150
if (level >= TargetLvl)
151151
return true;
152152
else

‎Commands/Announcements.cs

+10-10
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public async Task EditAnnounce(
1717

1818
if (Program.cfgjson.AnnouncementRoles.ContainsKey(roleName))
1919
{
20-
discordRole = ctx.Guild.GetRole(Program.cfgjson.AnnouncementRoles[roleName]);
20+
discordRole = await ctx.Guild.GetRoleAsync(Program.cfgjson.AnnouncementRoles[roleName]);
2121
await discordRole.ModifyAsync(mentionable: true);
2222
try
2323
{
@@ -47,7 +47,7 @@ public async Task AnnounceCmd(CommandContext ctx, [Description("'canary', 'dev',
4747

4848
if (Program.cfgjson.AnnouncementRoles.ContainsKey(roleName))
4949
{
50-
discordRole = ctx.Guild.GetRole(Program.cfgjson.AnnouncementRoles[roleName]);
50+
discordRole = await ctx.Guild.GetRoleAsync(Program.cfgjson.AnnouncementRoles[roleName]);
5151
await discordRole.ModifyAsync(mentionable: true);
5252
try
5353
{
@@ -62,8 +62,8 @@ public async Task AnnounceCmd(CommandContext ctx, [Description("'canary', 'dev',
6262
}
6363
else if (roleName == "rpbeta")
6464
{
65-
var rpRole = ctx.Guild.GetRole(Program.cfgjson.AnnouncementRoles["rp"]);
66-
var betaRole = ctx.Guild.GetRole(Program.cfgjson.AnnouncementRoles["beta"]);
65+
var rpRole = await ctx.Guild.GetRoleAsync(Program.cfgjson.AnnouncementRoles["rp"]);
66+
var betaRole = await ctx.Guild.GetRoleAsync(Program.cfgjson.AnnouncementRoles["beta"]);
6767

6868
await rpRole.ModifyAsync(mentionable: true);
6969
await betaRole.ModifyAsync(mentionable: true);
@@ -84,8 +84,8 @@ public async Task AnnounceCmd(CommandContext ctx, [Description("'canary', 'dev',
8484
// this is rushed pending an actual solution
8585
else if (roleName == "rpbeta10")
8686
{
87-
var rpRole = ctx.Guild.GetRole(Program.cfgjson.AnnouncementRoles["rp10"]);
88-
var betaRole = ctx.Guild.GetRole(Program.cfgjson.AnnouncementRoles["beta10"]);
87+
var rpRole = await ctx.Guild.GetRoleAsync(Program.cfgjson.AnnouncementRoles["rp10"]);
88+
var betaRole = await ctx.Guild.GetRoleAsync(Program.cfgjson.AnnouncementRoles["beta10"]);
8989

9090
await rpRole.ModifyAsync(mentionable: true);
9191
await betaRole.ModifyAsync(mentionable: true);
@@ -105,8 +105,8 @@ public async Task AnnounceCmd(CommandContext ctx, [Description("'canary', 'dev',
105105
}
106106
else if (roleName == "betadev")
107107
{
108-
var betaRole = ctx.Guild.GetRole(Program.cfgjson.AnnouncementRoles["beta"]);
109-
var devRole = ctx.Guild.GetRole(Program.cfgjson.AnnouncementRoles["dev"]);
108+
var betaRole = await ctx.Guild.GetRoleAsync(Program.cfgjson.AnnouncementRoles["beta"]);
109+
var devRole = await ctx.Guild.GetRoleAsync(Program.cfgjson.AnnouncementRoles["dev"]);
110110

111111
await betaRole.ModifyAsync(mentionable: true);
112112
await devRole.ModifyAsync(mentionable: true);
@@ -126,8 +126,8 @@ public async Task AnnounceCmd(CommandContext ctx, [Description("'canary', 'dev',
126126
}
127127
else if (roleName == "candev")
128128
{
129-
var canaryRole = ctx.Guild.GetRole(Program.cfgjson.AnnouncementRoles["canary"]);
130-
var devRole = ctx.Guild.GetRole(Program.cfgjson.AnnouncementRoles["dev"]);
129+
var canaryRole = await ctx.Guild.GetRoleAsync(Program.cfgjson.AnnouncementRoles["canary"]);
130+
var devRole = await ctx.Guild.GetRoleAsync(Program.cfgjson.AnnouncementRoles["dev"]);
131131

132132
await canaryRole.ModifyAsync(mentionable: true);
133133
await devRole.ModifyAsync(mentionable: true);

‎Commands/InteractionCommands/AnnouncementInteractions.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public async Task AnnounceBuildSlashCommand(InteractionContext ctx,
7676
roleKey1 = insiderChannel1.ToLower();
7777
}
7878

79-
DiscordRole insiderRole1 = ctx.Guild.GetRole(Program.cfgjson.AnnouncementRoles[roleKey1]);
79+
DiscordRole insiderRole1 = await ctx.Guild.GetRoleAsync(Program.cfgjson.AnnouncementRoles[roleKey1]);
8080
DiscordRole insiderRole2 = default;
8181

8282
StringBuilder channelString = new();
@@ -120,7 +120,7 @@ public async Task AnnounceBuildSlashCommand(InteractionContext ctx,
120120
roleKey2 = insiderChannel2.ToLower();
121121
}
122122

123-
insiderRole2 = ctx.Guild.GetRole(Program.cfgjson.AnnouncementRoles[roleKey2]);
123+
insiderRole2 = await ctx.Guild.GetRoleAsync(Program.cfgjson.AnnouncementRoles[roleKey2]);
124124
}
125125

126126
string pingMsgBareString = $"{insiderRole1.Mention}{(insiderChannel2 != "" ? $" {insiderRole2.Mention}\n" : " - ")}Hi Insiders!\n\n" +

‎Commands/InteractionCommands/BanInteractions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public async Task BanSlashCommand(InteractionContext ctx,
3636
try
3737
{
3838
targetMember = await ctx.Guild.GetMemberAsync(user.Id);
39-
if (GetPermLevel(ctx.Member) == ServerPermLevel.TrialModerator && (GetPermLevel(targetMember) >= ServerPermLevel.TrialModerator))
39+
if ((await GetPermLevelAsync(ctx.Member)) == ServerPermLevel.TrialModerator && ((await GetPermLevelAsync(targetMember)) >= ServerPermLevel.TrialModerator))
4040
{
4141
webhookOut.Content = $"{Program.cfgjson.Emoji.Error} As a Trial Moderator you cannot perform moderation actions on other staff members.";
4242
await ctx.EditResponseAsync(webhookOut);

‎Commands/InteractionCommands/ClearInteractions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public async Task ClearSlashCommand(InteractionContext ctx,
135135
continue;
136136
}
137137

138-
if (GetPermLevel(member) >= ServerPermLevel.TrialModerator)
138+
if ((await GetPermLevelAsync(member)) >= ServerPermLevel.TrialModerator)
139139
{
140140
messagesToClear.Remove(message);
141141
}

‎Commands/InteractionCommands/MuteInteractions.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public async Task MuteSlashCommand(
2323
// is this worth logging?
2424
}
2525

26-
if (targetMember != default && GetPermLevel(ctx.Member) == ServerPermLevel.TrialModerator && (GetPermLevel(targetMember) >= ServerPermLevel.TrialModerator || targetMember.IsBot))
26+
if (targetMember != default && (await GetPermLevelAsync(ctx.Member)) == ServerPermLevel.TrialModerator && ((await GetPermLevelAsync(targetMember)) >= ServerPermLevel.TrialModerator || targetMember.IsBot))
2727
{
2828
await ctx.Channel.SendMessageAsync($"{Program.cfgjson.Emoji.Error} {ctx.User.Mention}, as a Trial Moderator you cannot perform moderation actions on other staff members or bots.");
2929
return;
@@ -62,7 +62,7 @@ public async Task UnmuteSlashCommand(
6262
reason = $"[Manual unmute by {DiscordHelpers.UniqueUsername(ctx.User)}]: {reason}";
6363

6464
// todo: store per-guild
65-
DiscordRole mutedRole = ctx.Guild.GetRole(Program.cfgjson.MutedRole);
65+
DiscordRole mutedRole = await ctx.Guild.GetRoleAsync(Program.cfgjson.MutedRole);
6666

6767
DiscordMember member = default;
6868
try
@@ -113,8 +113,8 @@ public async Task TqsMuteSlashCommand(
113113

114114
// Check if the user is already muted; disallow TQS-mute if so
115115

116-
DiscordRole mutedRole = ctx.Guild.GetRole(Program.cfgjson.MutedRole);
117-
DiscordRole tqsMutedRole = ctx.Guild.GetRole(Program.cfgjson.TqsMutedRole);
116+
DiscordRole mutedRole = await ctx.Guild.GetRoleAsync(Program.cfgjson.MutedRole);
117+
DiscordRole tqsMutedRole = await ctx.Guild.GetRoleAsync(Program.cfgjson.TqsMutedRole);
118118

119119
// Get member
120120
DiscordMember targetMember = default;
@@ -134,7 +134,7 @@ public async Task TqsMuteSlashCommand(
134134
}
135135

136136
// Check if user to be muted is staff or TQS, and disallow if so
137-
if (targetMember != default && GetPermLevel(ctx.Member) == ServerPermLevel.TechnicalQueriesSlayer && (GetPermLevel(targetMember) >= ServerPermLevel.TechnicalQueriesSlayer || targetMember.IsBot))
137+
if (targetMember != default && (await GetPermLevelAsync(ctx.Member)) == ServerPermLevel.TechnicalQueriesSlayer && ((await GetPermLevelAsync(targetMember)) >= ServerPermLevel.TechnicalQueriesSlayer || targetMember.IsBot))
138138
{
139139
await ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent($"{Program.cfgjson.Emoji.Error} {ctx.User.Mention}, you cannot mute other TQS or staff members."));
140140
return;

‎Commands/InteractionCommands/RoleInteractions.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public async Task GrantRole(
4141
_ => throw new NotSupportedException()
4242
};
4343

44-
var roleData = ctx.Guild.GetRole(roleId);
44+
var roleData = await ctx.Guild.GetRoleAsync(roleId);
4545

4646
await member.GrantRoleAsync(roleData, $"/roles grant used by {DiscordHelpers.UniqueUsername(ctx.User)}");
4747
await ctx.RespondAsync($"{Program.cfgjson.Emoji.Success} The role {roleData.Mention} has been successfully granted!", ephemeral: true, mentions: false);
@@ -75,7 +75,7 @@ public async Task RemoveRole(
7575
_ => throw new NotSupportedException()
7676
};
7777

78-
var roleData = ctx.Guild.GetRole(roleId);
78+
var roleData = await ctx.Guild.GetRoleAsync(roleId);
7979

8080
await member.RevokeRoleAsync(roleData, $"/roles remove used by {DiscordHelpers.UniqueUsername(ctx.User)}");
8181
await ctx.RespondAsync($"{Program.cfgjson.Emoji.Success} The role {roleData.Mention} has been successfully removed!", ephemeral: true, mentions: false);

‎Commands/InteractionCommands/WarningInteractions.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public async Task WarnSlashCommand(InteractionContext ctx,
2626
try
2727
{
2828
targetMember = await ctx.Guild.GetMemberAsync(user.Id);
29-
if (GetPermLevel(ctx.Member) == ServerPermLevel.TrialModerator && (GetPermLevel(targetMember) >= ServerPermLevel.TrialModerator || targetMember.IsBot))
29+
if ((await GetPermLevelAsync(ctx.Member)) == ServerPermLevel.TrialModerator && ((await GetPermLevelAsync(targetMember)) >= ServerPermLevel.TrialModerator || targetMember.IsBot))
3030
{
3131
webhookOut = new DiscordWebhookBuilder().WithContent($"{Program.cfgjson.Emoji.Error} As a Trial Moderator you cannot perform moderation actions on other staff members or bots.");
3232
await ctx.EditResponseAsync(webhookOut);
@@ -239,7 +239,7 @@ public async Task DelwarnSlashCommand(InteractionContext ctx,
239239
{
240240
await ctx.RespondAsync($"{Program.cfgjson.Emoji.Error} That's a note, not a warning! Try using `/note delete` instead, or make sure you've got the right warning ID.", ephemeral: true);
241241
}
242-
else if (GetPermLevel(ctx.Member) == ServerPermLevel.TrialModerator && warning.ModUserId != ctx.User.Id && warning.ModUserId != ctx.Client.CurrentUser.Id)
242+
else if ((await GetPermLevelAsync(ctx.Member)) == ServerPermLevel.TrialModerator && warning.ModUserId != ctx.User.Id && warning.ModUserId != ctx.Client.CurrentUser.Id)
243243
{
244244
await ctx.RespondAsync($"{Program.cfgjson.Emoji.Error} {ctx.User.Mention}, as a Trial Moderator you cannot edit or delete warnings that aren't issued by you or the bot!", ephemeral: true);
245245
}
@@ -307,7 +307,7 @@ public async Task EditWarnSlashCommand(InteractionContext ctx,
307307
{
308308
await ctx.RespondAsync($"{Program.cfgjson.Emoji.Error} That's a note, not a warning! Try using `/note edit` instead, or make sure you've got the right warning ID.", ephemeral: true);
309309
}
310-
else if (GetPermLevel(ctx.Member) == ServerPermLevel.TrialModerator && warningObject.ModUserId != ctx.User.Id && warningObject.ModUserId != ctx.Client.CurrentUser.Id)
310+
else if ((await GetPermLevelAsync(ctx.Member)) == ServerPermLevel.TrialModerator && warningObject.ModUserId != ctx.User.Id && warningObject.ModUserId != ctx.Client.CurrentUser.Id)
311311
{
312312
await ctx.RespondAsync($"{Program.cfgjson.Emoji.Error} {ctx.User.Mention}, as a Trial Moderator you cannot edit or delete warnings that aren't issued by you or the bot!", ephemeral: true);
313313
}

0 commit comments

Comments
 (0)