Merge remote-tracking branch 'upstream/dev'

This commit is contained in:
thororen1234 2024-05-27 21:15:25 -04:00
commit 9fbfcb019a
10 changed files with 174 additions and 26 deletions

View file

@ -816,7 +816,7 @@ export default definePlugin({
},
canUseEmote(e: Emoji, channelId: string) {
if (e.type === "UNICODE") return true;
if (e.type === 0) return true;
if (e.available === false) return false;
const isUnusableRoleSubEmoji = RoleSubscriptionEmojiUtils.isUnusableRoleSubscriptionEmojiOriginal ?? RoleSubscriptionEmojiUtils.isUnusableRoleSubscriptionEmoji;