liz/PluralKit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix error on DMing with no permission

Browse Source
This commit is contained in:
Ske
2021-03-18 11:38:28 +01:00
parent 4ee0c13d62
commit 3196f60093
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
PluralKit.Bot/Commands/ImportExport.cs
View File

@@ -5,6 +5,7 @@ using System.Net.Http;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using Myriad.Extensions;
using Myriad.Rest.Exceptions; using Myriad.Rest.Exceptions;
using Myriad.Rest.Types; using Myriad.Rest.Types;
using Myriad.Rest.Types.Requests; using Myriad.Rest.Types.Requests;
@@ -143,7 +144,7 @@ namespace PluralKit.Bot
try try
{ {
var dm = await ctx.Rest.CreateDm(ctx.Author.Id); var dm = await ctx.Cache.GetOrCreateDmChannel(ctx.Rest, ctx.Author.Id);
var msg = await ctx.Rest.CreateMessage(dm.Id, var msg = await ctx.Rest.CreateMessage(dm.Id,
new MessageRequest {Content = $"{Emojis.Success} Here you go!"}, new MessageRequest {Content = $"{Emojis.Success} Here you go!"},
@@ -154,7 +155,7 @@ namespace PluralKit.Bot
if (ctx.Channel.Type != Channel.ChannelType.Dm) if (ctx.Channel.Type != Channel.ChannelType.Dm)
await ctx.Reply($"{Emojis.Success} Check your DMs!"); await ctx.Reply($"{Emojis.Success} Check your DMs!");
} }
catch (UnauthorizedException) catch (ForbiddenException)
{ {
// If user has DMs closed, tell 'em to open them // If user has DMs closed, tell 'em to open them
await ctx.Reply( await ctx.Reply(

4
PluralKit.Bot/Commands/Token.cs
View File

@@ -40,7 +40,7 @@ namespace PluralKit.Bot
if (ctx.Channel.Type != Channel.ChannelType.Dm) if (ctx.Channel.Type != Channel.ChannelType.Dm)
await ctx.Reply($"{Emojis.Success} Check your DMs!"); await ctx.Reply($"{Emojis.Success} Check your DMs!");
} }
catch (UnauthorizedException) catch (ForbiddenException)
{ {
// Can't check for permission errors beforehand, so have to handle here :/ // Can't check for permission errors beforehand, so have to handle here :/
if (ctx.Channel.Type != Channel.ChannelType.Dm) if (ctx.Channel.Type != Channel.ChannelType.Dm)
@@ -84,7 +84,7 @@ namespace PluralKit.Bot
if (ctx.Channel.Type != Channel.ChannelType.Dm) if (ctx.Channel.Type != Channel.ChannelType.Dm)
await ctx.Reply($"{Emojis.Success} Check your DMs!"); await ctx.Reply($"{Emojis.Success} Check your DMs!");
} }
catch (UnauthorizedException) catch (ForbiddenException)
{ {
// Can't check for permission errors beforehand, so have to handle here :/ // Can't check for permission errors beforehand, so have to handle here :/
if (ctx.Channel.Type != Channel.ChannelType.Dm) if (ctx.Channel.Type != Channel.ChannelType.Dm)

4
PluralKit.Bot/Handlers/ReactionAdded.cs
View File

@@ -170,7 +170,7 @@ namespace PluralKit.Bot
Embed = await _embeds.CreateMessageInfoEmbed(msg) Embed = await _embeds.CreateMessageInfoEmbed(msg)
}); });
} }
catch (UnauthorizedException) { } // No permissions to DM, can't check for this :( catch (ForbiddenException) { } // No permissions to DM, can't check for this :(
await TryRemoveOriginalReaction(evt); await TryRemoveOriginalReaction(evt);
} }
@@ -210,7 +210,7 @@ namespace PluralKit.Bot
}); });
await _rest.CreateMessage(dm.Id, new MessageRequest {Content = $"<@{msg.Message.Sender}>".AsCode()}); await _rest.CreateMessage(dm.Id, new MessageRequest {Content = $"<@{msg.Message.Sender}>".AsCode()});
} }
catch (UnauthorizedException) { } catch (ForbiddenException) { }
} }
await TryRemoveOriginalReaction(evt); await TryRemoveOriginalReaction(evt);