mirror/Vencord
1
0
Fork 0
mirror of https://github.com/Vendicated/Vencord.git synced 2025-02-25 07:48:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed mentioned checks

Browse source
This commit is contained in:
Inbestigator 2024-03-07 17:25:36 -08:00
parent 90c460e9ae
commit 68c1f7a8db
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/plugins/bypassDND/index.tsx
View file

@ -9,7 +9,7 @@ import { DataStore, Notifications } from "@api/index";
import { definePluginSettings } from "@api/Settings"; import { definePluginSettings } from "@api/Settings";
import { Devs } from "@utils/constants"; import { Devs } from "@utils/constants";
import definePlugin, { OptionType } from "@utils/types"; import definePlugin, { OptionType } from "@utils/types";
import { ChannelStore, Menu, NavigationRouter, PresenceStore, PrivateChannelsStore, UserStore } from "@webpack/common"; import { ChannelStore, Menu, MessageStore, NavigationRouter, PresenceStore, PrivateChannelsStore, UserStore } from "@webpack/common";
import { type Channel, type Guild, type Message, type User } from "discord-types/general"; import { type Channel, type Guild, type Message, type User } from "discord-types/general";
interface ContextProps { interface ContextProps {
@ -90,6 +90,7 @@ const ChannelContext: NavContextMenuPatchCallback = (children, { channel }: Cont
const UserContext: NavContextMenuPatchCallback = (children, { user }: ContextProps) => () => { const UserContext: NavContextMenuPatchCallback = (children, { user }: ContextProps) => () => {
const enabled = bypasses.users.includes(user.id); const enabled = bypasses.users.includes(user.id);
if (user.id === UserStore.getCurrentUser().id) return;
children.splice(-1, 0, ( children.splice(-1, 0, (
<Menu.MenuGroup> <Menu.MenuGroup>
<Menu.MenuItem <Menu.MenuItem
@ -182,14 +183,15 @@ export default definePlugin({
const currentUser = UserStore.getCurrentUser(); const currentUser = UserStore.getCurrentUser();
if (message.author.id === currentUser.id) return; if (message.author.id === currentUser.id) return;
if (await PresenceStore.getStatus(currentUser.id) !== "dnd") return; if (await PresenceStore.getStatus(currentUser.id) !== "dnd") return;
if ((bypasses.guilds.includes(guildId) || bypasses.channels.includes(channelId)) && (message.content.includes(`<@${currentUser.id}>`) || message.mentions.some(mention => mention.id === currentUser.id))) { const mentioned = MessageStore.getMessage(channelId, message.id)?.mentioned;
if ((bypasses.guilds.includes(guildId) || bypasses.channels.includes(channelId)) && mentioned) {
await showNotification(message, guildId); await showNotification(message, guildId);
return; return;
} }
if (bypasses.users.includes(message.author.id)) { if (bypasses.users.includes(message.author.id)) {
if (channelId === await PrivateChannelsStore.getOrEnsurePrivateChannel(message.author.id)) { if (channelId === await PrivateChannelsStore.getOrEnsurePrivateChannel(message.author.id)) {
await showNotification(message); await showNotification(message);
} else if ((message.content.includes(`<@${currentUser.id}>`) || message.mentions.some(mention => mention.id === currentUser.id)) && (settings.store.allowOutsideOfDms === true)) { } else if (mentioned && (settings.store.allowOutsideOfDms === true)) {
await showNotification(message, guildId); await showNotification(message, guildId);
} }
} }