mirror of
https://github.com/Vendicated/Vencord.git
synced 2024-09-20 06:30:35 +00:00
Merge 53192c42f5
into 6cce8a8bc4
This commit is contained in:
commit
6e59346e7a
1 changed files with 34 additions and 4 deletions
|
@ -21,6 +21,7 @@ import { Devs } from "@utils/constants";
|
||||||
import { Logger } from "@utils/Logger";
|
import { Logger } from "@utils/Logger";
|
||||||
import definePlugin, { OptionType } from "@utils/types";
|
import definePlugin, { OptionType } from "@utils/types";
|
||||||
import { findByPropsLazy } from "@webpack";
|
import { findByPropsLazy } from "@webpack";
|
||||||
|
import { MessageStore } from "@webpack/common";
|
||||||
import { Message } from "discord-types/general";
|
import { Message } from "discord-types/general";
|
||||||
|
|
||||||
const RelationshipStore = findByPropsLazy("getRelationships", "isBlocked");
|
const RelationshipStore = findByPropsLazy("getRelationships", "isBlocked");
|
||||||
|
@ -28,7 +29,7 @@ const RelationshipStore = findByPropsLazy("getRelationships", "isBlocked");
|
||||||
export default definePlugin({
|
export default definePlugin({
|
||||||
name: "NoBlockedMessages",
|
name: "NoBlockedMessages",
|
||||||
description: "Hides all blocked messages from chat completely.",
|
description: "Hides all blocked messages from chat completely.",
|
||||||
authors: [Devs.rushii, Devs.Samu],
|
authors: [Devs.rushii, Devs.Samu, Devs.F53],
|
||||||
patches: [
|
patches: [
|
||||||
{
|
{
|
||||||
find: "Messages.BLOCKED_MESSAGES_HIDE",
|
find: "Messages.BLOCKED_MESSAGES_HIDE",
|
||||||
|
@ -48,10 +49,17 @@ export default definePlugin({
|
||||||
replacement: [
|
replacement: [
|
||||||
{
|
{
|
||||||
match: /(?<=MESSAGE_CREATE:function\((\i)\){)/,
|
match: /(?<=MESSAGE_CREATE:function\((\i)\){)/,
|
||||||
replace: (_, props) => `if($self.isBlocked(${props}.message))return;`
|
replace: (_, props) => `if($self.isBlocked(${props}.message)||$self.isReplyToBlocked(${props}.message))return;`
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}))
|
})),
|
||||||
|
{
|
||||||
|
find: ".messageListItem",
|
||||||
|
replacement: {
|
||||||
|
match: /(?<=\i=)(?=\(0,(\i)\.jsx)/,
|
||||||
|
replace: "!$self.isReplyToBlocked(arguments[0].message)&&"
|
||||||
|
}
|
||||||
|
}
|
||||||
],
|
],
|
||||||
options: {
|
options: {
|
||||||
ignoreBlockedMessages: {
|
ignoreBlockedMessages: {
|
||||||
|
@ -60,9 +68,31 @@ export default definePlugin({
|
||||||
default: false,
|
default: false,
|
||||||
restartNeeded: true,
|
restartNeeded: true,
|
||||||
},
|
},
|
||||||
|
hideRepliesToBlockedMessages: {
|
||||||
|
description: "Hide replies to messages made by users you've blocked",
|
||||||
|
type: OptionType.BOOLEAN,
|
||||||
|
default: false,
|
||||||
|
restartNeeded: false,
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
isBlocked(message: Message) {
|
isReplyToBlocked(message: Message) {
|
||||||
|
if (!Settings.plugins.NoBlockedMessages.hideRepliesToBlockedMessages || !message)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const { messageReference } = message;
|
||||||
|
if (!messageReference) return false;
|
||||||
|
|
||||||
|
const replyMessage = MessageStore.getMessage(messageReference.channel_id, messageReference.message_id);
|
||||||
|
return this.isBlocked(replyMessage);
|
||||||
|
} catch (e) {
|
||||||
|
new Logger("NoBlockedMessages").error("Failed to check if user is blocked:", e);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
isBlocked(message: Message | undefined) {
|
||||||
|
if (!message) return false;
|
||||||
try {
|
try {
|
||||||
return RelationshipStore.isBlocked(message.author.id);
|
return RelationshipStore.isBlocked(message.author.id);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
|
Loading…
Reference in a new issue