Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions pkg/connector/activity.go
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,6 @@ func (gc *GMClient) parseActivity(msg groupme.PushMessage) ([]bridgev2.RemoteEve
}
var data struct {
UserID groupme.ID `json:"user_id"`
Started int64 `json:"started"`
Subject struct {
ID groupme.ID `json:"id"`
ChatID groupme.ID `json:"chat_id"`
Expand Down Expand Up @@ -192,16 +191,12 @@ func (gc *GMClient) parseActivity(msg groupme.PushMessage) ([]bridgev2.RemoteEve
} else if group, ok := strings.CutPrefix(msg.Channel(), "/group/"); ok {
key = gc.portalKeyForGroup(groupme.ID(group))
}
timeout := time.Until(time.UnixMilli(data.Started).Add(5 * time.Second))
if key.ID == "" || timeout <= 0 {
if key.ID == "" {
return nil, true
}
if timeout > 5*time.Second {
timeout = 5 * time.Second
}
events = append(events, &simplevent.Typing{
EventMeta: simplevent.EventMeta{Type: bridgev2.RemoteEventTyping, PortalKey: key, Sender: bridgev2.EventSender{Sender: MakeUserID(data.UserID)}},
Timeout: timeout, Type: bridgev2.TypingTypeText,
Timeout: 5 * time.Second, Type: bridgev2.TypingTypeText,
})
case "read_receipt.create":
subject := data.Subject
Expand Down
2 changes: 1 addition & 1 deletion pkg/connector/typing_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func TestIncomingTypingRoutesAndExpires(t *testing.T) {
{"group", "/group/88", "9", 0, "group:88"},
{"DM", "/direct_message/9_20", "9", 0, "dm:9"},
{"future pulse", "/group/88", "9", -time.Minute, "group:88"},
{"expired", "/group/88", "9", 6 * time.Second, ""},
{"old pulse", "/group/88", "9", 6 * time.Second, "group:88"},
{"self", "/group/88", "20", 0, ""},
{"missing sender", "/group/88", "", 0, ""},
{"wrong DM sender", "/direct_message/9_20", "30", 0, ""},
Expand Down
Loading