Update formatting of matrix info command
This commit is contained in:
parent
ddb211f8f3
commit
78a17b2de9
1 changed files with 9 additions and 6 deletions
|
@ -7,7 +7,8 @@ const {discord, sync, db, select, from} = require("../../passthrough")
|
||||||
const api = sync.require("../../matrix/api")
|
const api = sync.require("../../matrix/api")
|
||||||
|
|
||||||
/** @param {DiscordTypes.APIContextMenuGuildInteraction} interaction */
|
/** @param {DiscordTypes.APIContextMenuGuildInteraction} interaction */
|
||||||
async function interact({id, token, data}) {
|
/** @param {DiscordTypes.APIMessageApplicationCommandGuildInteraction} interaction */
|
||||||
|
async function interact({id, token, guild_id, channel, data}) {
|
||||||
const message = from("event_message").join("message_channel", "message_id").join("channel_room", "channel_id")
|
const message = from("event_message").join("message_channel", "message_id").join("channel_room", "channel_id")
|
||||||
.select("name", "nick", "source", "room_id", "event_id").where({message_id: data.target_id}).get()
|
.select("name", "nick", "source", "room_id", "event_id").where({message_id: data.target_id}).get()
|
||||||
|
|
||||||
|
@ -21,12 +22,15 @@ async function interact({id, token, data}) {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const idInfo = `\n-# Room ID: \`${message.room_id}\`\n-# Event ID: \`${message.event_id}\``
|
||||||
|
|
||||||
if (message.source === 1) { // from Discord
|
if (message.source === 1) { // from Discord
|
||||||
|
const userID = data.resolved.messages[data.target_id].author.id
|
||||||
return discord.snow.interaction.createInteractionResponse(id, token, {
|
return discord.snow.interaction.createInteractionResponse(id, token, {
|
||||||
type: DiscordTypes.InteractionResponseType.ChannelMessageWithSource,
|
type: DiscordTypes.InteractionResponseType.ChannelMessageWithSource,
|
||||||
data: {
|
data: {
|
||||||
content: `This message was bridged to [${message.nick || message.name}](<https://matrix.to/#/${message.room_id}/${message.event_id}>) on Matrix.`
|
content: `Bridged <@${userID}> https://discord.com/channels/${guild_id}/${channel.id}/${data.target_id} on Discord to [${message.nick || message.name}](<https://matrix.to/#/${message.room_id}/${message.event_id}>) on Matrix.`
|
||||||
+ `\n-# Room ID: \`${message.room_id}\`\n-# Event ID: \`${message.event_id}\``,
|
+ idInfo,
|
||||||
flags: DiscordTypes.MessageFlags.Ephemeral
|
flags: DiscordTypes.MessageFlags.Ephemeral
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
@ -37,9 +41,8 @@ async function interact({id, token, data}) {
|
||||||
return discord.snow.interaction.createInteractionResponse(id, token, {
|
return discord.snow.interaction.createInteractionResponse(id, token, {
|
||||||
type: DiscordTypes.InteractionResponseType.ChannelMessageWithSource,
|
type: DiscordTypes.InteractionResponseType.ChannelMessageWithSource,
|
||||||
data: {
|
data: {
|
||||||
content: `This message was bridged from [${message.nick || message.name}](<https://matrix.to/#/${message.room_id}/${message.event_id}>) on Matrix.`
|
content: `Bridged [${event.sender}](<https://matrix.to/#/${event.sender}>)'s message in [${message.nick || message.name}](<https://matrix.to/#/${message.room_id}/${message.event_id}>) on Matrix to https://discord.com/channels/${guild_id}/${channel.id}/${data.target_id} on Discord.`
|
||||||
+ `\nIt was originally sent by [${event.sender}](<https://matrix.to/#/${event.sender}>).`
|
+ idInfo,
|
||||||
+ `\n-# Room ID: \`${message.room_id}\`\n-# Event ID: \`${message.event_id}\``,
|
|
||||||
flags: DiscordTypes.MessageFlags.Ephemeral
|
flags: DiscordTypes.MessageFlags.Ephemeral
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in a new issue