mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-09 15:13:12 -06:00
Code Issues Packages Projects Releases Wiki Activity

Clean up

Browse source
This commit is contained in:
Neil Alexander 2022-08-17 17:03:12 +01:00
parent 37aba99e0c
commit 398e5c5efa
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
roomserver/internal/query/query.go
View file

@ -103,7 +103,7 @@ func (r *Queryer) QueryStateAfterEvents(
stateEvents, err := helpers.LoadStateEvents(ctx, r.DB, stateEntries)
if err != nil {
return fmt.Errorf("helpers.LoadStateEvents: %w", err)
return err
}
if len(request.PrevEventIDs) > 1 && len(request.StateToFetch) == 0 {
@ -851,7 +851,7 @@ func (r *Queryer) QueryRestrictedJoinAllowed(ctx context.Context, req *api.Query
}
var joinRules gomatrixserverlib.JoinRuleContent
if err = json.Unmarshal(joinRulesEvent.Content(), &joinRules); err != nil {
return fmt.Errorf("json.Unmarshal: %w (JSON content: %s)", err, joinRulesEvent.Content())
return fmt.Errorf("json.Unmarshal: %w", err)
}
// If the join rule isn't "restricted" then there's nothing more to do.
res.Restricted = joinRules.JoinRule == gomatrixserverlib.Restricted