Update RemoveBlockedMessages.plugin.js
This commit is contained in:
parent
d9d71bb695
commit
3e89a85402
|
@ -14,7 +14,7 @@ module.exports = (_ => {
|
||||||
"info": {
|
"info": {
|
||||||
"name": "RemoveBlockedMessages",
|
"name": "RemoveBlockedMessages",
|
||||||
"author": "DevilBro",
|
"author": "DevilBro",
|
||||||
"version": "1.2.0",
|
"version": "1.2.1",
|
||||||
"description": "Completely removes blocked messages"
|
"description": "Completely removes blocked messages"
|
||||||
},
|
},
|
||||||
"changeLog": {
|
"changeLog": {
|
||||||
|
@ -22,7 +22,7 @@ module.exports = (_ => {
|
||||||
"Remove Reactions": "Now decreases the count for reactions if one of them is by a blocked user and hides it if the reaction is 0"
|
"Remove Reactions": "Now decreases the count for reactions if one of them is by a blocked user and hides it if the reaction is 0"
|
||||||
},
|
},
|
||||||
"fixed": {
|
"fixed": {
|
||||||
"Update Reactions": "Fixed issue where reaction sometimes wouldn't get updated"
|
"Update Reactions": "Fixed issue where reaction sometimes wouldn't show up at all"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -275,7 +275,7 @@ module.exports = (_ => {
|
||||||
for (let i in e.returnvalue.props.children[0]) {
|
for (let i in e.returnvalue.props.children[0]) {
|
||||||
let reaction = e.returnvalue.props.children[0][i];
|
let reaction = e.returnvalue.props.children[0][i];
|
||||||
let emojiId = reaction.props.emoji.name || reaction.props.emoji.id;
|
let emojiId = reaction.props.emoji.name || reaction.props.emoji.id;
|
||||||
if (cachedReactions[reaction.props.message.id][emojiId] && cachedReactions[reaction.props.message.id][emojiId].relationshipCount == relationshipCount && cachedReactions[reaction.props.message.id][emojiId].oldTotalCount == BDFDB.ArrayUtils.sum(reaction.props.message.reactions.map(n => n.count))) {
|
if (cachedReactions[reaction.props.message.id][emojiId] && cachedReactions[reaction.props.message.id][emojiId].relationshipCount == relationshipCount && cachedReactions[reaction.props.message.id][emojiId].oldCount == reaction.props.message.reactions.find(n => n.emoji.name && n.emoji.name == emojiId || n.emoji.id == emojiId)?.count || 0) {
|
||||||
reaction.props.count = cachedReactions[reaction.props.message.id][emojiId].reactions.length;
|
reaction.props.count = cachedReactions[reaction.props.message.id][emojiId].reactions.length;
|
||||||
if (reaction.props.count < 1) e.returnvalue.props.children[0][i] = null;
|
if (reaction.props.count < 1) e.returnvalue.props.children[0][i] = null;
|
||||||
}
|
}
|
||||||
|
@ -286,7 +286,7 @@ module.exports = (_ => {
|
||||||
reaction.props.count = reaction.props.reactions.length;
|
reaction.props.count = reaction.props.reactions.length;
|
||||||
if (cachedReactions && cachedReactions[reaction.props.message.id]) cachedReactions[reaction.props.message.id][emojiId] = {
|
if (cachedReactions && cachedReactions[reaction.props.message.id]) cachedReactions[reaction.props.message.id][emojiId] = {
|
||||||
relationshipCount: relationshipCount,
|
relationshipCount: relationshipCount,
|
||||||
oldTotalCount: BDFDB.ArrayUtils.sum(reaction.props.message.reactions.map(n => n.count)),
|
oldCount: reaction.props.message.reactions.find(n => n.emoji.name && n.emoji.name == emojiId || n.emoji.id == emojiId)?.count || 0,
|
||||||
reactions: reaction.props.reactions
|
reactions: reaction.props.reactions
|
||||||
};
|
};
|
||||||
BDFDB.TimeUtils.clear(updateTimeout);
|
BDFDB.TimeUtils.clear(updateTimeout);
|
||||||
|
@ -300,33 +300,6 @@ module.exports = (_ => {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
processReactiona (e) {
|
|
||||||
if (!settings.removeReactions) return;
|
|
||||||
if (!e.returnvalue) {
|
|
||||||
let emojiId = e.instance.props.emoji.name || e.instance.props.emoji.id;
|
|
||||||
if (e.instance.props.reactions && e.instance.props.reactions.length) {
|
|
||||||
e.instance.props.reactions = e.instance.props.reactions.filter(n => !n || !BDFDB.LibraryModules.FriendUtils.isBlocked(n.id));
|
|
||||||
e.instance.props.count = e.instance.props.reactions.length;
|
|
||||||
if (cachedReactions && cachedReactions[e.instance.props.message.id]) cachedReactions[e.instance.props.message.id][emojiId] = e.instance.props.count;
|
|
||||||
}
|
|
||||||
else if (!e.instance.props.reactions) {
|
|
||||||
if (cachedChannelId != e.instance.props.message.channel_id) {
|
|
||||||
cachedReactions = {};
|
|
||||||
cachedChannelId = e.instance.props.message.channel_id;
|
|
||||||
}
|
|
||||||
if (!cachedReactions[e.instance.props.message.id]) cachedReactions[e.instance.props.message.id] = {};
|
|
||||||
if (cachedReactions[e.instance.props.message.id][emojiId] !== undefined) e.instance.props.count = cachedReactions[e.instance.props.message.id][emojiId];
|
|
||||||
|
|
||||||
e.instance.props.reactions = [];
|
|
||||||
BDFDB.LibraryModules.ReactionUtils.getReactions(e.instance.props.message.channel_id, e.instance.props.message.id, e.instance.props.emoji).then(reactions => {
|
|
||||||
e.instance.props.reactions = reactions;
|
|
||||||
BDFDB.ReactUtils.forceUpdate(e.instance);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (!e.instance.props.count) return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
processReactorsComponent (e) {
|
processReactorsComponent (e) {
|
||||||
if (settings.removeReactions && BDFDB.ArrayUtils.is(e.instance.props.reactors)) e.instance.props.reactors = e.instance.props.reactors.filter(n => !n || !BDFDB.LibraryModules.FriendUtils.isBlocked(n.id));
|
if (settings.removeReactions && BDFDB.ArrayUtils.is(e.instance.props.reactors)) e.instance.props.reactors = e.instance.props.reactors.filter(n => !n || !BDFDB.LibraryModules.FriendUtils.isBlocked(n.id));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue