Merge remote-tracking branch 'upstream/main' into rust-command-parser

PluralKit.Bot/Errors.cs

@@ -183,4 +183,6 @@ public static class Errors
 
     public static PKError ChannelNotFound(string channelString) =>
         new($"Channel \"{channelString}\" not found or is not in this server.");
+
+    public static PKError InteractionWrongAccount(ulong user) => new($"This prompt is only available for <@{user}>");
 }

PluralKit.Bot/Interactive/BaseInteractive.cs

@@ -5,6 +5,7 @@ using Myriad.Rest.Types.Requests;
 using Myriad.Types;
 
 using NodaTime;
+using PluralKit.Core;
 
 namespace PluralKit.Bot.Interactive;
 
@@ -47,6 +48,11 @@ public abstract class BaseInteractive
             new InteractionApplicationCommandCallbackData { Components = GetComponents() });
     }
 
+    protected async Task Error(InteractionContext ctx, PKError error)
+    {
+        await ctx.Reply(content: $"{Emojis.Error} {error.Message}");
+    }
+
     protected async Task Finish(InteractionContext? ctx = null)
     {
         foreach (var button in _buttons)

PluralKit.Bot/Interactive/YesNoPrompt.cs

@@ -43,7 +43,7 @@ public class YesNoPrompt: BaseInteractive
     {
         if (ctx.User.Id != User)
         {
-            await Update(ctx);
+            await Error(ctx, Errors.InteractionWrongAccount(User ?? 0));
             return;
         }
 

docs/content/staff/permissions.md

@@ -2,21 +2,23 @@
 
 PluralKit requires some channel permissions in order to function properly:
 
-- Message proxying requires the **Manage Messages** and **Manage Webhooks** permissions in a channel.
+- *Everything* PluralKit does aside from the Message Info app command requires **View Channel** permissions in a channel. 
-- Most commands require the **Embed Links**, **Attach Files** and **Add Reactions** permissions to function properly.
+- Message proxying requires the **Manage Messages**, **Manage Webhooks**, and **Send Messages** permissions in a channel.
+- Most commands require the **Embed Links** and **Add Reactions** permissions to function properly.
   - Commands with reaction menus also require **Manage Messages** to remove reactions after clicking.
+  - Commands executed via reactions (for example the :x:, :bell:, and :question: reactions, as well as any commands with reaction menus) need **Read Message History** to be able to see that reactions were added. 
+  - A couple commands (`pk;s color` and `pk;m <name> color`) currently require **Attach Files**. 
 - [Proxy logging](/staff/logging) requires the **Send Messages** permission in the log channel.
 - [Log cleanup](/staff/compatibility/#log-cleanup) requires the **Manage Messages** permission in the log channels.
 
-Denying the **Send Messages** permission will *not* stop the bot from proxying, although it will prevent it from sending command responses. Denying the **Read Messages** permission will, as any other bot, prevent the bot from interacting in that channel at all.
-
 ## Webhook permissions
-Webhooks exist outside of the normal Discord permissions system, and (with a few exceptions) it's not possible to modify their permissions.
+Webhooks exist outside of the normal Discord permissions system, but as of August 2022 they mostly follow the permissions of the webhook owner (in this case, PluralKit).
 
-However, PluralKit will make an attempt to apply the sender account's permissions to proxied messages. For example, role mentions, `@everyone`, and `@here`
+PluralKit will also make an attempt to apply the sender account's permissions to proxied messages. For example, role mentions, `@everyone`, and `@here`
 will only function if the sender account has that permission. The same applies to link embeds.
 
-For external emojis to work in proxied messages, the `@everyone` role must have the "Use External Emojis" permission. If it still doesn't work, check if the permission was denied in channel-specific permission settings.
+For external emojis to work in proxied messages, PluralKit or one of its roles must have the "Use External Emojis" permission. If it still doesn't work, 
+check if the permission was denied in channel-specific permission settings. PluralKit must also be in the server the external emoji belongs to.
 
 ## Troubleshooting
 

docs/content/user-guide.md

@@ -453,7 +453,7 @@ You can
 
 #### Pinging the user who sent it
 If you'd like to "ping" the account behind a proxied message without having to query the message and ping them yourself,
-you can react to the message with the `:bell:` :bell: emoji (or `:bellhop:` :bellhop:, `:exclamation:` :exclamation:, or even `:ping_pong:` :ping_pong:), and PluralKit will ping the relevant member and account in the same channel on your behalf with a link to the message you reacted to.
+you can react to the message with the `:bell:` :bell: emoji (or `:bellhop:` :bellhop_bell:, `:exclamation:` :exclamation:, or even `:ping_pong:` :ping_pong:), and PluralKit will ping the relevant member and account in the same channel on your behalf with a link to the message you reacted to.
 
 ## Autoproxy
 The bot's *autoproxy* feature allows you to have messages be proxied without directly including the proxy tags. Autoproxy can be set up in various ways. There are three autoproxy modes currently implemented: