mirrors/Equicord
1
1
Fork 0
mirror of https://github.com/Equicord/Equicord.git synced 2025-06-09 14:43:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Update NoBlockedMessages Reply

Browse source
This commit is contained in:
thororen1234 2024-11-30 18:19:46 -05:00
parent 1207af83ad
commit 866bd61882
1 changed files with 41 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

74
src/plugins/noBlockedMessages/index.ts
View file

@ -16,7 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import { Settings } from "@api/Settings"; import { definePluginSettings } from "@api/Settings";
import { Devs } from "@utils/constants"; import { Devs } from "@utils/constants";
import { runtimeHashMessageKey } from "@utils/intlHash"; import { runtimeHashMessageKey } from "@utils/intlHash";
import { Logger } from "@utils/Logger"; import { Logger } from "@utils/Logger";
@ -27,6 +27,21 @@ import { Message } from "discord-types/general";
const RelationshipStore = findByPropsLazy("getRelationships", "isBlocked"); const RelationshipStore = findByPropsLazy("getRelationships", "isBlocked");
const settings = definePluginSettings({
ignoreBlockedMessages: {
description: "Completely ignores (recent) incoming messages from blocked users (locally).",
type: OptionType.BOOLEAN,
default: false,
restartNeeded: true,
},
hideRepliesToBlockedMessages: {
description: "Hides replies to blocked messages.",
type: OptionType.BOOLEAN,
default: false,
restartNeeded: false,
},
});
interface MessageDeleteProps { interface MessageDeleteProps {
// Internal intl message for BLOCKED_MESSAGE_COUNT // Internal intl message for BLOCKED_MESSAGE_COUNT
collapsedReason: () => any; collapsedReason: () => any;
@ -35,7 +50,9 @@ interface MessageDeleteProps {
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.Elvyra],
settings,
patches: [ patches: [
{ {
find: "#{intl::BLOCKED_MESSAGES_HIDE}", find: "#{intl::BLOCKED_MESSAGES_HIDE}",
@ -51,49 +68,40 @@ export default definePlugin({
'"ReadStateStore"' '"ReadStateStore"'
].map(find => ({ ].map(find => ({
find, find,
predicate: () => Settings.plugins.NoBlockedMessages.ignoreBlockedMessages === true, predicate: () => settings.store.ignoreBlockedMessages === true,
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", find: "referencedUsernameProfile,referencedAvatarProfile",
replacement: { replacement: [
match: /(?<=\i=)(?=\(0,(\i)\.jsx)/, {
replace: "!$self.isReplyToBlocked(arguments[0].message)&&" match: /CUSTOM_GIFT.*?=(?=\(0,\i.jsx\)\(\i.FocusRing)/,
} replace: "$&!$self.isReplyToBlocked(arguments[0].message)&&",
} }
], ],
options: {
ignoreBlockedMessages: {
description: "Completely ignores (recent) incoming messages from blocked users (locally).",
type: OptionType.BOOLEAN,
default: false,
restartNeeded: true,
}, },
hideRepliesToBlockedMessages: { ],
description: "Hide replies to messages made by users you've blocked",
type: OptionType.BOOLEAN,
default: false,
restartNeeded: false,
}
},
isReplyToBlocked(message: Message) { isReplyToBlocked(message: Message) {
if (!Settings.plugins.NoBlockedMessages.hideRepliesToBlockedMessages) if (!settings.store.hideRepliesToBlockedMessages) return false;
return false; try {
const { messageReference } = message;
if (!messageReference) return false;
const { messageReference } = message; const replyMessage = MessageStore.getMessage(messageReference.channel_id, messageReference.message_id);
if (!messageReference) return false;
const replyMessage = MessageStore.getMessage(messageReference.channel_id, messageReference.message_id); return replyMessage ? this.isBlocked(replyMessage) : false;
return this.isBlocked(replyMessage); } catch (e) {
new Logger("NoBlockedMessages").error("Failed to check if referenced message is blocked:", e);
}
}, },
isBlocked(message: Message | undefined) { isBlocked(message: Message) {
if (!message) return false;
try { try {
return RelationshipStore.isBlocked(message.author.id); return RelationshipStore.isBlocked(message.author.id);
} catch (e) { } catch (e) {
@ -105,7 +113,7 @@ export default definePlugin({
try { try {
return props.collapsedReason() === i18n.t[runtimeHashMessageKey("BLOCKED_MESSAGE_COUNT")](); return props.collapsedReason() === i18n.t[runtimeHashMessageKey("BLOCKED_MESSAGE_COUNT")]();
} catch (e) { } catch (e) {
console.error(e); new Logger("NoBlockedMessages").error("Failed to hide blocked message:", e);
} }
return false; return false;
} }