d->m typing notifications

This commit is contained in:
Cadence Ember 2023-09-17 23:07:33 +12:00
parent 7e3175eb20
commit cab96cbc9e
4 changed files with 33 additions and 0 deletions

View file

@ -34,6 +34,7 @@ async function sendMessage(message, guild) {
let eventPart = 0 // 0 is primary, 1 is supporting let eventPart = 0 // 0 is primary, 1 is supporting
if (events.length) { if (events.length) {
db.prepare("REPLACE INTO message_channel (message_id, channel_id) VALUES (?, ?)").run(message.id, message.channel_id) db.prepare("REPLACE INTO message_channel (message_id, channel_id) VALUES (?, ?)").run(message.id, message.channel_id)
if (senderMxid) api.sendTyping(roomID, false, senderMxid)
} }
for (const event of events) { for (const event of events) {
const eventType = event.$type const eventType = event.$type

View file

@ -117,6 +117,9 @@ const utils = {
} else if (message.t === "MESSAGE_DELETE") { } else if (message.t === "MESSAGE_DELETE") {
await eventDispatcher.onMessageDelete(client, message.d) await eventDispatcher.onMessageDelete(client, message.d)
} else if (message.t === "TYPING_START") {
await eventDispatcher.onTypingStart(client, message.d)
} else if (message.t === "MESSAGE_REACTION_ADD") { } else if (message.t === "MESSAGE_REACTION_ADD") {
await eventDispatcher.onReactionAdd(client, message.d) await eventDispatcher.onReactionAdd(client, message.d)
} }

View file

@ -215,5 +215,20 @@ module.exports = {
*/ */
async onMessageDelete(client, data) { async onMessageDelete(client, data) {
await deleteMessage.deleteMessage(data) await deleteMessage.deleteMessage(data)
},
/**
* @param {import("./discord-client")} client
* @param {import("discord-api-types/v10").GatewayTypingStartDispatchData} data
*/
async onTypingStart(client, data) {
const roomID = db.prepare("SELECT room_id FROM channel_room WHERE channel_id = ?").pluck().get(data.channel_id)
if (!roomID) return
const mxid = db.prepare("SELECT mxid FROM sim INNER JOIN sim_member USING (mxid) WHERE discord_id = ? AND room_id = ?").pluck().get(data.user_id, roomID)
if (!mxid) return
// Each Discord user triggers the notification every 8 seconds as long as they remain typing.
// 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.)
await api.sendTyping(roomID, true, mxid, 10000)
} }
} }

View file

@ -149,6 +149,19 @@ async function redactEvent(roomID, eventID, mxid) {
return root.event_id return root.event_id
} }
/**
* @param {string} roomID
* @param {boolean} isTyping
* @param {string} mxid
* @param {number} [duration] milliseconds
*/
async function sendTyping(roomID, isTyping, mxid, duration) {
await mreq.mreq("PUT", path(`/client/v3/rooms/${roomID}/typing/${mxid}`, mxid), {
typing: isTyping,
duration
})
}
async function profileSetDisplayname(mxid, displayname) { async function profileSetDisplayname(mxid, displayname) {
await mreq.mreq("PUT", path(`/client/v3/profile/${mxid}/displayname`, mxid), { await mreq.mreq("PUT", path(`/client/v3/profile/${mxid}/displayname`, mxid), {
displayname displayname
@ -195,6 +208,7 @@ module.exports.getJoinedMembers = getJoinedMembers
module.exports.sendState = sendState module.exports.sendState = sendState
module.exports.sendEvent = sendEvent module.exports.sendEvent = sendEvent
module.exports.redactEvent = redactEvent module.exports.redactEvent = redactEvent
module.exports.sendTyping = sendTyping
module.exports.profileSetDisplayname = profileSetDisplayname module.exports.profileSetDisplayname = profileSetDisplayname
module.exports.profileSetAvatarUrl = profileSetAvatarUrl module.exports.profileSetAvatarUrl = profileSetAvatarUrl
module.exports.setUserPower = setUserPower module.exports.setUserPower = setUserPower