shane/AutoMod
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix replies to @unknown from revolt->discord

Browse source
This commit is contained in:
JandereDev 2022-05-02 10:28:11 +02:00
parent b85b332753
commit 21315f490b
No known key found for this signature in database
GPG key ID: 5D5E18ACB990F57A
1 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
bridge/src/revolt/events.ts
View file

@ -4,7 +4,7 @@ import { client as discordClient } from "../discord/client";
import { MessageEmbed, MessagePayload, TextChannel, WebhookClient, WebhookMessageOptions } from "discord.js"; import { MessageEmbed, MessagePayload, TextChannel, WebhookClient, WebhookMessageOptions } from "discord.js";
import GenericEmbed from "../types/GenericEmbed"; import GenericEmbed from "../types/GenericEmbed";
import { SendableEmbed } from "revolt-api"; import { SendableEmbed } from "revolt-api";
import { clipText, discordFetchMessage, revoltFetchUser } from "../util"; import { clipText, discordFetchMessage, revoltFetchMessage, revoltFetchUser } from "../util";
import { smartReplace } from "smart-replace"; import { smartReplace } from "smart-replace";
import { metrics } from "../metrics"; import { metrics } from "../metrics";
import { fetchEmojiList } from "../discord/bridgeEmojis"; import { fetchEmojiList } from "../discord/bridgeEmojis";
@ -165,26 +165,38 @@ client.on('message', async message => {
const embed = new MessageEmbed().setColor('#2f3136'); const embed = new MessageEmbed().setColor('#2f3136');
if (repliedMessages.length == 1) { if (repliedMessages.length == 1) {
const replyMsg = await discordFetchMessage(repliedMessages[0]?.discord.messageId, bridgeCfg.discord); const replyMsg = repliedMessages[0]?.origin == 'discord'
? await discordFetchMessage(repliedMessages[0]?.discord.messageId, bridgeCfg.discord)
: undefined;
const author = replyMsg?.author; const author = replyMsg?.author;
embed.setAuthor({ if (replyMsg) {
name: `@${author?.username ?? 'Unknown'}`, // todo: check if @pinging was enabled for reply embed.setAuthor({
iconURL: author?.displayAvatarURL({ size: 64, dynamic: true }), name: `@${author?.username ?? 'Unknown'}`, // todo: check if @pinging was enabled for reply
url: replyMsg?.url, iconURL: author?.displayAvatarURL({ size: 64, dynamic: true }),
}); url: replyMsg?.url,
});
if (replyMsg?.content) embed.setDescription('>>> ' + clipText(replyMsg.content, 200)); if (replyMsg?.content) embed.setDescription('>>> ' + clipText(replyMsg.content, 200));
} else {
const msg = await revoltFetchMessage(message.reply_ids?.[0], message.channel);
embed.setAuthor({
name: `@${msg?.author?.username ?? 'Unknown'}`,
iconURL: msg?.author?.generateAvatarURL({ size: 64 }),
});
if (msg?.content) embed.setDescription('>>> ' + clipText(msg.content, 200));
}
} else { } else {
const replyMsgs = await Promise.all( const replyMsgs = await Promise.all(
repliedMessages.map(m => discordFetchMessage(m?.discord.messageId, bridgeCfg.discord)) repliedMessages.map(m => m?.origin == 'discord'
? discordFetchMessage(m?.discord.messageId, bridgeCfg.discord)
: revoltFetchMessage(m?.revolt.messageId, message.channel))
); );
embed.setAuthor({ name: repliedMessages.length + ' replies' }); embed.setAuthor({ name: repliedMessages.length + ' replies' });
for (const msg of replyMsgs) { for (const msg of replyMsgs) {
embed.addField( embed.addField(
`@${msg?.author.username ?? 'Unknown'}`, `@${msg?.author?.username ?? 'Unknown'}`,
(msg ? `[Link](${msg.url})\n` : '') + (msg ? `[Link](${msg.url})\n` : '') +
'>>> ' + clipText(msg?.content ?? '\u200b', 100), '>>> ' + clipText(msg?.content ?? '\u200b', 100),
true, true,