aboutsummaryrefslogtreecommitdiff
path: root/src/lib/common/HighlightManager.ts
diff options
context:
space:
mode:
authorIRONM00N <64110067+IRONM00N@users.noreply.github.com>2022-02-25 23:03:02 -0500
committerIRONM00N <64110067+IRONM00N@users.noreply.github.com>2022-02-25 23:03:02 -0500
commit866cd2c23eaa3918d01806556ea71f6c7b378ca7 (patch)
tree1d4f4ca50bb15996ad60ad36ec2cea2bc6b8ef4c /src/lib/common/HighlightManager.ts
parent1d6e64d5c43e4398e7c0488f114acba2c8a55164 (diff)
downloadtanzanite-866cd2c23eaa3918d01806556ea71f6c7b378ca7.tar.gz
tanzanite-866cd2c23eaa3918d01806556ea71f6c7b378ca7.tar.bz2
tanzanite-866cd2c23eaa3918d01806556ea71f6c7b378ca7.zip
fix: misc
Diffstat (limited to 'src/lib/common/HighlightManager.ts')
-rw-r--r--src/lib/common/HighlightManager.ts22
1 files changed, 20 insertions, 2 deletions
diff --git a/src/lib/common/HighlightManager.ts b/src/lib/common/HighlightManager.ts
index 6194255..83506bc 100644
--- a/src/lib/common/HighlightManager.ts
+++ b/src/lib/common/HighlightManager.ts
@@ -24,7 +24,15 @@ export class HighlightManager {
*/
public readonly userBlocks = new Collection<
/* guild */ Snowflake,
- Collection</* word */ Snowflake, /* users */ Set<Snowflake>>
+ Collection</* user */ Snowflake, /* users */ Set<Snowflake>>
+ >();
+
+ /**
+ * Channels that users have blocked
+ */
+ public readonly channelBlocks = new Collection<
+ /* guild */ Snowflake,
+ Collection</* user */ Snowflake, /* channels */ Set<Snowflake>>
>();
/**
@@ -66,7 +74,17 @@ export class HighlightManager {
for (const [word, users] of guildCache.entries()) {
if (this.isMatch(message.content, word)) {
for (const user of users) {
- if (!ret.has(user)) ret.set(user, word);
+ if (!ret.has(user)) {
+ if (!message.channel.permissionsFor(user)?.has('ViewChannel')) continue;
+
+ const blockedUsers = this.userBlocks.get(message.guildId)?.get(user) ?? new Set();
+ if (blockedUsers.has(message.author.id)) continue;
+
+ const blockedChannels = this.channelBlocks.get(message.guildId)?.get(user) ?? new Set();
+ if (blockedChannels.has(message.channel.id)) continue;
+
+ ret.set(user, word);
+ }
}
}
}