Implement typing over federation (#949)

Also fix a pet peeve of mine: not putting units on things!!!

Manually tested on p2p and works well, with some fudge factor delay.

2 files changed, 4 insertions, 4 deletions

diff --git a/eduserver/api/input.go b/eduserver/api/input.go
index c95acaf1..ad3f1ed5 100644
--- a/eduserver/api/input.go
+++ b/eduserver/api/input.go
@@ -30,8 +30,8 @@ type InputTypingEvent struct {
 	RoomID string `json:"room_id"`
 	// Typing is true if the user is typing, false if they have stopped.
 	Typing bool `json:"typing"`
-	// Timeout is the interval for which the user should be marked as typing.
-	Timeout int64 `json:"timeout"`
+	// Timeout is the interval in milliseconds for which the user should be marked as typing.
+	TimeoutMS int64 `json:"timeout"`
 	// OriginServerTS when the server received the update.
 	OriginServerTS gomatrixserverlib.Timestamp `json:"origin_server_ts"`
 }
diff --git a/eduserver/input/input.go b/eduserver/input/input.go
index e0cc6922..84590945 100644
--- a/eduserver/input/input.go
+++ b/eduserver/input/input.go
@@ -46,7 +46,7 @@ func (t *EDUServerInputAPI) InputTypingEvent(
 	if ite.Typing {
 		// user is typing, update our current state of users typing.
 		expireTime := ite.OriginServerTS.Time().Add(
-			time.Duration(ite.Timeout) * time.Millisecond,
+			time.Duration(ite.TimeoutMS) * time.Millisecond,
 		)
 		t.Cache.AddTypingUser(ite.UserID, ite.RoomID, &expireTime)
 	} else {
@@ -69,7 +69,7 @@ func (t *EDUServerInputAPI) sendEvent(ite *api.InputTypingEvent) error {
 
 	if ev.Typing {
 		expireTime := ite.OriginServerTS.Time().Add(
-			time.Duration(ite.Timeout) * time.Millisecond,
+			time.Duration(ite.TimeoutMS) * time.Millisecond,
 		)
 		ote.ExpireTime = &expireTime
 	}