use discord js built in cache, and update cache when user join or leave guild
This commit is contained in:
parent
8633a7538d
commit
bea6ed2fe2
2 changed files with 217 additions and 184 deletions
|
|
@ -43,29 +43,36 @@ class DiscordClient extends Client {
|
||||||
async broadcast(message) {
|
async broadcast(message) {
|
||||||
const msg = await this.formatMessageForForward(message);
|
const msg = await this.formatMessageForForward(message);
|
||||||
|
|
||||||
const mentioned_user = this.getMentionedUsers(message.text);
|
const mentioned_users = this.getMentionedUsers(message.text);
|
||||||
|
|
||||||
const userToChanMap = new Map();
|
const mentionned_users_info = new Map();
|
||||||
mentioned_user.forEach((user) =>
|
mentioned_users.forEach((user) =>
|
||||||
userToChanMap.set(user, this.findUserChannels(user))
|
mentionned_users_info.set(
|
||||||
|
user,
|
||||||
|
this.getUserInfoFromMention(user.replace("@", "")),
|
||||||
|
),
|
||||||
);
|
);
|
||||||
|
|
||||||
for (const chan of this.trackedChannelsIds) {
|
for (const chan of this.trackedChannelsIds) {
|
||||||
const chan_msg = new Message();
|
const chan_msg = new Message();
|
||||||
chan_msg.copy(msg);
|
chan_msg.copy(msg);
|
||||||
|
|
||||||
for (let [user, user_chans] of userToChanMap) {
|
for (let [user, user_info] of mentionned_users_info) {
|
||||||
if (
|
if (
|
||||||
user_chans.includes(chan) &&
|
user_info.channels.includes(chan) &&
|
||||||
!user_chans.includes(chan_msg.channel)
|
!user_info.channels.includes(chan_msg.channel)
|
||||||
) {
|
) {
|
||||||
const user_id = this.getUserIdOfUserInChan(
|
this.log(
|
||||||
chan,
|
"replaced with",
|
||||||
user.replace("@", "")
|
"<@" + (user_info.id ? user_info.id : user) + ">",
|
||||||
|
);
|
||||||
|
// mentionned user is in the channel we are sending to, and not in the channel we are sending from
|
||||||
|
chan_msg.text = chan_msg.text.replace(
|
||||||
|
user,
|
||||||
|
"<@" + (user_info.id ? user_info.id : user) + ">",
|
||||||
);
|
);
|
||||||
chan_msg.text = chan_msg.text.replace(user, "<@" + user_id + ">");
|
|
||||||
|
|
||||||
userToChanMap.delete(user);
|
mentionned_users_info.delete(user);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -87,7 +94,8 @@ class DiscordClient extends Client {
|
||||||
getUserIdOfUserInChan(chan, username) {
|
getUserIdOfUserInChan(chan, username) {
|
||||||
return this.channelsGuilds
|
return this.channelsGuilds
|
||||||
.get(chan)
|
.get(chan)
|
||||||
.members.cache.find((member) => member.user.username === username).id;
|
.members.cache.find((member) => member.user.username === username)
|
||||||
|
?.id;
|
||||||
}
|
}
|
||||||
|
|
||||||
getMentionedUsers(text) {
|
getMentionedUsers(text) {
|
||||||
|
|
@ -98,21 +106,27 @@ class DiscordClient extends Client {
|
||||||
return matches.map((str) => str[0].trim());
|
return matches.map((str) => str[0].trim());
|
||||||
}
|
}
|
||||||
|
|
||||||
findUserChannels(user_name) {
|
getUserInfoFromMention(user_name) {
|
||||||
const channels = [];
|
const info = {
|
||||||
for (const [guildId, membersMap] of this.guildsMembers) {
|
channels: [],
|
||||||
for (const [memberId, member] of membersMap) {
|
id: null,
|
||||||
|
};
|
||||||
|
for (const [chan, guild] of this.channelsGuilds) {
|
||||||
|
for (const [member_id, member] of guild.members.cache) {
|
||||||
|
this.log(member);
|
||||||
if (member.user.username === user_name) {
|
if (member.user.username === user_name) {
|
||||||
// Found the user, now find a readable channel
|
// maybe also check against global name and displayname
|
||||||
|
info.id = member.user.id;
|
||||||
|
// Found the user, now find readable channels
|
||||||
for (const [channelId, channel] of this.trackedChannels) {
|
for (const [channelId, channel] of this.trackedChannels) {
|
||||||
if (this.memberCanReadChannel(memberId, channel)) {
|
if (this.memberCanReadChannel(member, channel)) {
|
||||||
channels.push(channelId);
|
info.channels.push(channelId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return channels;
|
return info;
|
||||||
}
|
}
|
||||||
|
|
||||||
sendTextInChannel(text, chan) {
|
sendTextInChannel(text, chan) {
|
||||||
|
|
@ -121,19 +135,16 @@ class DiscordClient extends Client {
|
||||||
?.send(text)
|
?.send(text)
|
||||||
.then(() => {})
|
.then(() => {})
|
||||||
.catch((error) =>
|
.catch((error) =>
|
||||||
this.log("when trying to send message in ", chan, " got ", error)
|
this.log(
|
||||||
|
"when trying to send message in ",
|
||||||
|
chan,
|
||||||
|
" got ",
|
||||||
|
error,
|
||||||
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
memberCanReadChannel(userId, channel) {
|
memberCanReadChannel(member, channel) {
|
||||||
const guildId = this.channelsGuilds.get(channel.id);
|
|
||||||
const member = this.guildsMembers.get(guildId).get(userId);
|
|
||||||
|
|
||||||
if (!member.guild) {
|
|
||||||
console.log("Member not part of a guild");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
const permissions = channel.permissionsFor(member);
|
const permissions = channel.permissionsFor(member);
|
||||||
return permissions && permissions.has("ViewChannel");
|
return permissions && permissions.has("ViewChannel");
|
||||||
}
|
}
|
||||||
|
|
@ -150,7 +161,10 @@ class DiscordClient extends Client {
|
||||||
channelToGuildMap.set(channel.id, channel.guild);
|
channelToGuildMap.set(channel.id, channel.guild);
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error(`Error fetching channel with ID ${channelId}:`, error);
|
console.error(
|
||||||
|
`Error fetching channel with ID ${channelId}:`,
|
||||||
|
error,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -178,13 +192,24 @@ class DiscordClient extends Client {
|
||||||
|
|
||||||
guildsMembersMap.set(guildId, membersMap);
|
guildsMembersMap.set(guildId, membersMap);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error(`Error fetching members for guild ${guildId}:`, error);
|
console.error(
|
||||||
|
`Error fetching members for guild ${guildId}:`,
|
||||||
|
error,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return guildsMembersMap;
|
return guildsMembersMap;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async refreshMembersCache() {
|
||||||
|
for (const [channel, guild] of this.channelsGuilds) {
|
||||||
|
guild.members.fetch().then((members) => {
|
||||||
|
this.log("members cache loaded for ", guild.name);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
start() {
|
start() {
|
||||||
return new Promise(async (resolve, reject) => {
|
return new Promise(async (resolve, reject) => {
|
||||||
try {
|
try {
|
||||||
|
|
@ -196,15 +221,26 @@ class DiscordClient extends Client {
|
||||||
}
|
}
|
||||||
|
|
||||||
this.channelsGuilds = await this.mapChannelIdsToGuild(
|
this.channelsGuilds = await this.mapChannelIdsToGuild(
|
||||||
this.trackedChannelsIds
|
this.trackedChannelsIds,
|
||||||
);
|
|
||||||
this.guildsMembers = await this.getGuildsMembers(
|
|
||||||
Array.from(this.channelsGuilds.values())
|
|
||||||
);
|
);
|
||||||
|
|
||||||
|
this.refreshMembersCache();
|
||||||
|
|
||||||
for (const chanId of this.trackedChannelsIds) {
|
for (const chanId of this.trackedChannelsIds) {
|
||||||
this.trackedChannels.set(chanId, await this.channels.fetch(chanId));
|
this.trackedChannels.set(
|
||||||
|
chanId,
|
||||||
|
await this.channels.fetch(chanId),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
this.on("guildMemberAdd", (member) => {
|
||||||
|
this.refreshMembersCache();
|
||||||
|
});
|
||||||
|
|
||||||
|
this.on("guildMemberRemove", (member) => {
|
||||||
|
this.refreshMembersCache();
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,5 @@
|
||||||
{
|
{
|
||||||
"verbose": true,
|
"verbose": true,
|
||||||
"discordChannels": [
|
"discordChannels": ["1161739009614151751", "727212463988146206"],
|
||||||
"1161739009614151751",
|
|
||||||
"727212463988146206"
|
|
||||||
],
|
|
||||||
"ircChannels": ["#urlab"]
|
"ircChannels": ["#urlab"]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue