Compare commits

...

2 commits

Author SHA1 Message Date
9f6c955b63
Update progress in readme
All checks were successful
continuous-integration/drone/push Build is passing
2020-11-09 01:12:09 +13:00
f4b13dbde4
Send own typing status 2020-11-09 01:11:28 +13:00
5 changed files with 69 additions and 3 deletions

View file

@ -55,7 +55,6 @@ early in development. These important features still need to be
implemented:
- Unreads
- Typing indicators
- Emojis
- Reactions
- Encryption

View file

@ -5,24 +5,85 @@ const {chat} = require("./chat.js")
const input = q("#c-chat-textarea")
class TypingManager {
constructor() {
this.time = 20000 // how long to appear to type for
this.margin = 5000 // how long before the end of the timeout to send the request again
/** The room that we're typing in. We can semantically only type in one room at a time. */
this.typingRoom = null
this.timeout = null
}
request(id, typing) {
const url = new URL(`${lsm.get("domain")}/_matrix/client/r0/rooms/${id}/typing/${lsm.get("mx_user_id")}`)
url.searchParams.set("access_token", lsm.get("access_token"))
const body = {typing}
if (typing) body.timeout = this.time
fetch(url.toString(), {
method: "PUT",
body: JSON.stringify(body)
})
}
schedule(id) {
this.request(id, true)
this.timeout = setTimeout(() => {
this.schedule(id)
}, this.time - this.margin)
}
update(id) {
if (id) { // typing somewhere
if (this.typingRoom === id) return // already typing, don't do anything
// state
this.typingRoom = id
// mark and schedule
this.schedule(id)
// add self to typing list now instead of waiting a round trip
const typing = store.rooms.get(id).value().timeline.typing
typing.edit(list => list.concat(lsm.get("mx_user_id")))
} else { // stopped typing
if (this.typingRoom) {
clearTimeout(this.timeout)
this.request(this.typingRoom, false)
}
this.typingRoom = null
}
}
}
const typingManager = new TypingManager()
store.activeRoom.subscribe("changeSelf", () => {
// stop typing. you semantically can't type in a room you're not in.
typingManager.update(null)
// focus input box
if (store.activeRoom.exists()) {
input.focus()
}
})
input.addEventListener("keydown", event => {
if (!store.activeRoom.exists()) return
// send message?
if (event.key === "Enter" && !event.shiftKey && !event.ctrlKey) {
event.preventDefault()
const body = input.value
send(input.value)
input.value = ""
fixHeight()
return
}
})
input.addEventListener("input", () => {
fixHeight()
// set typing
if (input.value) {
typingManager.update(store.activeRoom.value().id)
} else {
typingManager.update(null)
}
})
function fixHeight() {

View file

@ -30,7 +30,7 @@ class SubscribeValue extends Subscribable {
edit(f) {
if (this.exists()) {
f(this.data)
this.data = f(this.data)
this.set(this.data)
} else {
throw new Error("Tried to edit a SubscribeValue that had no value")

View file

@ -1,5 +1,6 @@
const {ElemJS, ejs, q} = require("./basic")
const {store} = require("./store/store")
const lsm = require("./lsm")
/**
* Maximum number of typing users to display all names for.
@ -26,6 +27,7 @@ class Typing extends ElemJS {
changeRoom() {
if (this.typingUnsubscribe) {
this.typingUnsubscribe()
this.typingUnsubscribe = null
}
if (!store.activeRoom.exists()) return
const room = store.activeRoom.value()
@ -36,8 +38,11 @@ class Typing extends ElemJS {
render() {
if (!store.activeRoom.exists()) return
const room = store.activeRoom.value()
const users = room.timeline.typing.value()
let users = [...room.timeline.typing.value()]
// don't show own typing status
users = users.filter(u => u !== lsm.get("mx_user_id"))
if (users.length === 0) {
// nobody is typing
this.removeClass("c-typing--typing")
} else {
let message = ""

View file

@ -92,6 +92,7 @@
background-color: c.$darkest
padding: 8px
border: 1px solid c.$divider
white-space: pre-wrap
code
background-color: c.$darker