cadence/out-of-your-element
cadence/out-of-your-element
2
6
Fork 1
Code Issues 12 Pull requests Releases 17 Activity

do not report TYPING_START

Browse source
This commit is contained in:
Cadence Ember 2023-09-19 01:23:32 +12:00
parent 79bd0254f0
commit a8f387c161
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
d2m/event-dispatcher.js
View file

@ -37,6 +37,8 @@ module.exports = {
console.error(`while handling this ${gatewayMessage.t} gateway event:`) console.error(`while handling this ${gatewayMessage.t} gateway event:`)
console.dir(gatewayMessage.d, {depth: null}) console.dir(gatewayMessage.d, {depth: null})
if (gatewayMessage.t === "TYPING_START") return
if (Date.now() - lastReportedEvent < 5000) return if (Date.now() - lastReportedEvent < 5000) return
lastReportedEvent = Date.now() lastReportedEvent = Date.now()
@ -81,7 +83,7 @@ module.exports = {
async checkMissedMessages(client, guild) { async checkMissedMessages(client, guild) {
if (guild.unavailable) return if (guild.unavailable) return
const bridgedChannels = select("channel_room", "channel_id").pluck().all() const bridgedChannels = select("channel_room", "channel_id").pluck().all()
const prepared = select("event_message", "1", "WHERE message_id = ?").pluck() const prepared = select("event_message", "event_id", "WHERE message_id = ?").pluck()
for (const channel of guild.channels.concat(guild.threads)) { for (const channel of guild.channels.concat(guild.threads)) {
if (!bridgedChannels.includes(channel.id)) continue if (!bridgedChannels.includes(channel.id)) continue
if (!channel.last_message_id) continue if (!channel.last_message_id) continue
@ -158,7 +160,7 @@ module.exports = {
*/ */
async onMessageCreate(client, message) { async onMessageCreate(client, message) {
if (message.webhook_id) { if (message.webhook_id) {
const row = select("webhook", "1", "WHERE webhook_id = ?").pluck().get(message.webhook_id) const row = select("webhook", "webhook_id", "WHERE webhook_id = ?").pluck().get(message.webhook_id)
if (row) { if (row) {
// The message was sent by the bridge's own webhook on discord. We don't want to reflect this back, so just drop it. // The message was sent by the bridge's own webhook on discord. We don't want to reflect this back, so just drop it.
return return
@ -230,5 +232,15 @@ module.exports = {
// Discord does not send typing stopped events, so typing only stops if the timeout is reached or if the user sends their message. // Discord does not send typing stopped events, so typing only stops if the timeout is reached or if the user sends their message.
// (We have to manually stop typing on Matrix-side when the message is sent. This is part of the send action.) // (We have to manually stop typing on Matrix-side when the message is sent. This is part of the send action.)
await api.sendTyping(roomID, true, mxid, 10000) await api.sendTyping(roomID, true, mxid, 10000)
},
/**
* @param {import("./discord-client")} client
* @param {import("discord-api-types/v10").GatewayGuildEmojisUpdateDispatchData | import("discord-api-types/v10").GatewayGuildStickersUpdateDispatchData} data
*/
async onExpressionsUpdate(client, data) {
const spaceID = select("guild_space", "space_id", "WHERE guild_id = ?").pluck().get(guild.id)
if (!spaceID) return
await createSpace.syncSpaceExpressions(spaceID, data)
} }
} }