hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2025-04-24 04:33:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Linting

Browse source
This commit is contained in:
Kegan Dougal 2020-09-11 15:31:40 +01:00
parent bb3400365b
commit 493e2ca389
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
roomserver/auth/auth.go → roomserver/auth/history_visibility.go
View file

@ -19,6 +19,10 @@ import (
"github.com/matrix-org/gomatrixserverlib"
)
const (
shared = "shared"
)
// TODO: This logic should live in gomatrixserverlib
// IsServerAllowed returns true if the server is allowed to see events in the room
@ -50,7 +54,7 @@ func IsServerAllowed(
return true
}
// 3. If history_visibility was set to shared, and the user joined the room at any point after the event was sent, allow.
if historyVisibility == "shared" && serverCurrentlyInRoom {
if historyVisibility == shared && serverCurrentlyInRoom {
return true
}
// 4. If the user's membership was invite, and the history_visibility was set to invited, allow.
@ -67,10 +71,10 @@ func HistoryVisibilityForRoom(hisVisEvent *gomatrixserverlib.Event) (string, err
// https://matrix.org/docs/spec/client_server/r0.6.0#id87
// By default if no history_visibility is set, or if the value is not understood, the visibility is assumed to be shared.
if hisVisEvent == nil {
return "shared", nil
return shared, nil
}
visibility := "shared"
knownStates := []string{"invited", "joined", "shared", "world_readable"}
visibility := shared
knownStates := []string{"invited", "joined", shared, "world_readable"}
if hisVisEvent.Type() != gomatrixserverlib.MRoomHistoryVisibility {
return "", fmt.Errorf("HistoryVisibilityForRoom: passed a non history visibility event: %s", hisVisEvent.Type())
}

6
roomserver/internal/perform/perform_backfill.go
View file

@ -502,10 +502,8 @@ func joinEventsFromHistoryVisibility(
return nil, fmt.Errorf("failed to load history visibility event nid %d", historyVisibilityNID)
}
var hisVisEvent *gomatrixserverlib.Event
for i := range stateEvents {
if stateEvents[i].Type() == gomatrixserverlib.MRoomHistoryVisibility && stateEvents[i].StateKeyEquals("") {
hisVisEvent = &stateEvents[i].Event
}
if stateEvents[0].Type() == gomatrixserverlib.MRoomHistoryVisibility && stateEvents[0].StateKeyEquals("") {
hisVisEvent = &stateEvents[0].Event
}
visibility, err := auth.HistoryVisibilityForRoom(hisVisEvent)
if err != nil {