Merge branch 'main' into proxyswitch-add

docs/content/command-list.md

@@ -150,6 +150,7 @@ You can have a space after `pk;`, e.g. `pk;system` and `pk; system` will do the
 - `pk;config pad IDs [left|right|off]` - Toggles whether to pad (add a space) 5-character IDs in lists.
 - `pk;config proxy switch [new|add|off]` - Toggles whether to log a switch whenever you proxy as a different member (or add member to recent switch in add mode).
 - `pk;config name format [format]` - Changes your system's username formatting.
+- `pk;config server name format [format]` - Changes your system's username formatting for the current server.
 
 ## Server owner commands
 *(all commands here require Manage Server permission)*

docs/content/faq.md

@@ -24,7 +24,7 @@ You can suggest features in the [support server](https://discord.gg/PczBt78)'s `
 We also track feature requests through [Github Issues](https://github.com/PluralKit/PluralKit/issues). Feel free to open issue reports or feature requests there as well.
 
 ### How can I support the bot's development?
-I (the bot author, [Ske](https://twitter.com/floofstrid)) have a Patreon. The income from there goes towards server hosting, domains, infrastructure, my Monster Energy addiction, et cetera. There are no benefits. There might never be any. But nevertheless, it can be found here: [https://www.patreon.com/floofstrid](https://www.patreon.com/floofstrid)
+We accept donations on [Patreon](https://patreon.com/pluralkit/) (recurring) and [Buy Me A Coffee](https://buymeacoffee.com/pluralkit/) (one-time). Any funds donated here will be used to pay for server hosting and (if anything is left over) development work.
 
 ### Can I recover my system if I lose access to my Discord account?
 Yes, through one of two methods. Both require you to do preparations **before** you lose the account. 

docs/content/staff/compatibility.md

@@ -21,6 +21,7 @@ This requires you to have the *Manage Server* permission on the server.
 
 ### Supported bots
 At the moment, log cleanup works with the following bots:
+- Annabelle (precise in embed format, fuzzy in inline format)
 - [Auttaja](https://auttaja.io/) (precise)
 - [blargbot](https://blargbot.xyz/) (precise)
 - [Carl-bot](https://carl.gg/) (precise)
@@ -34,6 +35,7 @@ At the moment, log cleanup works with the following bots:
 - [Mantaro](https://mantaro.site/) (precise)
 - [Pancake](https://pancake.gg/) (fuzzy)
 - [SafetyAtLast](https://www.safetyatlast.net/) (fuzzy)
+- [Sapphire](https://sapph.xyz/) (precise, only in default format)
 - [Skyra](https://www.skyra.pw/) (precise)
 - [UnbelievaBoat](https://unbelievaboat.com/) (precise)
 - Vanessa (fuzzy)

docs/content/tips-and-tricks.md

@@ -82,6 +82,7 @@ You cannot look up private members or groups of another system.
 |pk;edit|-prepend|-p|Prepend the new content to the old message instead of overwriting it|
 |pk;edit|-nospace|-ns|Append/prepend without adding a space|
 |pk;edit|-clear-embed|-ce|Remove embeds from a message|
+|pk;edit|-clear-attachments|-ca|Remove attachments from a message|
 |pk;edit|-regex|-x|Edit using a C# Regex formatted like s\|X\|Y or s\|X\|Y\|F, where \| is any character, X is a Regex, Y is a substitution string, and F is a set of Regex flags|
 |pk;switch edit and pk;switch add|-append|-a|Append members to the current switch or make a new switch with members appended|
 |pk;switch edit and pk;switch add|-prepend|-p|Prepend members to the current switch or make a new switch with members prepended|

docs/content/user-guide.md

@@ -382,7 +382,7 @@ You can now set some proxy tags:
 
     pk;member John proxy John:text
 
-Now, oth of the following will work without needing to add multiple versions of the proxy tag:
+Now, both of the following will work without needing to add multiple versions of the proxy tag:
 
     John: Hello!
     JOHN: Hello!
@@ -394,6 +394,10 @@ The default proxy username formatting is "{name} {tag}", but you can customize t
     pk;config nameformat {tag} {name}
     pk;config nameformat {name}@{tag}
 
+You can also do this on a per-server basis:
+
+    pk;config servernameformat {tag} {name}
+    pk;config servernameformat {name}@{tag}
 
 ## Interacting with proxied messages