mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-03-03 17:03:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Review comments

Browse source
This commit is contained in:
Neil Alexander 2022-09-01 09:01:05 +01:00
parent 5d5033fa1c
commit 41a7d96cd6
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
appservice/consumers/roomserver.go
View file

@ -196,7 +196,7 @@ func (s *OutputRoomEventConsumer) sendEvents(
case http.StatusOK: case http.StatusOK:
state.backoff = 0 state.backoff = 0
default: default:
_ = state.backoffAndPause(err) return state.backoffAndPause(err)
} }
return nil return nil
} }
@ -269,11 +269,18 @@ func (s *OutputRoomEventConsumer) appserviceJoinedAtEvent(ctx context.Context, e
// e.g. the event came over federation but we do not have the full state persisted. // e.g. the event came over federation but we do not have the full state persisted.
if err := s.rsAPI.QueryMembershipsForRoom(ctx, membershipReq, membershipRes); err == nil { if err := s.rsAPI.QueryMembershipsForRoom(ctx, membershipReq, membershipRes); err == nil {
for _, ev := range membershipRes.JoinEvents { for _, ev := range membershipRes.JoinEvents {
var membership gomatrixserverlib.MemberContent switch {
if err = json.Unmarshal(ev.Content, &membership); err != nil || ev.StateKey == nil { case ev.StateKey == nil:
continue
case ev.Type != gomatrixserverlib.MRoomMember:
continue continue
} }
if appservice.IsInterestedInUserID(*ev.StateKey) { var membership gomatrixserverlib.MemberContent
err = json.Unmarshal(ev.Content, &membership)
switch {
case err != nil:
continue
case membership.Membership == gomatrixserverlib.Join:
return true return true
} }
} }