Merge remote-tracking branch 'upstream/dev'

This commit is contained in:
thororen1234 2024-06-26 14:18:27 -04:00
commit 742265f306
28 changed files with 419 additions and 366 deletions

View file

@ -155,6 +155,8 @@ export default definePlugin({
},
getBadges(props: { userId: string; user?: User; guildId: string; }) {
if (!props) return [];
try {
props.userId ??= props.user?.id!;