diff --git a/InAppNotifications/InAppNotifications.plugin.js b/InAppNotifications/InAppNotifications.plugin.js index ff3ce44..aab2c63 100644 --- a/InAppNotifications/InAppNotifications.plugin.js +++ b/InAppNotifications/InAppNotifications.plugin.js @@ -3,7 +3,7 @@ * @source https://github.com/QWERTxD/BetterDiscordPlugins/blob/main/InAppNotifications/InAppNotifications.plugin.js * @updateUrl https://raw.githubusercontent.com/QWERTxD/BetterDiscordPlugins/main/InAppNotifications/InAppNotifications.plugin.js * @website https://github.com/QWERTxD/BetterDiscordPlugins/tree/main/InAppNotifications - * @version 1.1.4 + * @version 1.1.5 */ const request = require("request"); const fs = require("fs"); @@ -30,7 +30,7 @@ const config = { "title": "Discriminators", "type": "added", "items": [ - "Modified how usernames and display names are displayed in notifications.", + "Fixed for new discord update", ] } ], @@ -993,15 +993,17 @@ const config = { message.guild_id || "@me" ); if (MuteStore.allowAllMessages(channel)) return true; - const SomethingHereShrug = isMentioned.isRawMessageMentioned( - { - rawMessage: message, - userId: UserStore.getCurrentUser().id, - suppressEveryone, - suppressRoles + const currentUserId = UserStore.getCurrentUser().id; + const mentionedUsers = message.mentions.map(user => user.id); + const messageRoles = message.mention_roles; + let roleMentioned = false; + if (message.mention_roles) { + const currentUserRoles = GuildMemberStore.getSelfMember(message.guild_id).roles; + roleMentioned = (currentUserRoles.some(i => messageRoles.includes(i))); } - ); - return SomethingHereShrug + return mentionedUsers.includes(currentUserId) || + (!suppressEveryone && message.mention_everyone) || + (!suppressRoles && message.mention_roles.length > 0 && roleMentioned); } checkSettings(message, channel) {