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

Satisfy King Linter

Browse source
This commit is contained in:
Neil Alexander 2020-05-04 17:29:18 +01:00
parent 5f28243464
commit b5413f4453
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
roomserver/internal/perform_join.go
View file

@ -116,7 +116,7 @@ func (r *RoomserverInternalAPI) performJoinRoomByID(
if req.Content == nil { if req.Content == nil {
req.Content = map[string]interface{}{} req.Content = map[string]interface{}{}
} }
req.Content["membership"] = "join" req.Content["membership"] = gomatrixserverlib.Join
if err = eb.SetContent(req.Content); err != nil { if err = eb.SetContent(req.Content); err != nil {
return fmt.Errorf("eb.SetContent: %w", err) return fmt.Errorf("eb.SetContent: %w", err)
} }
@ -145,7 +145,7 @@ func (r *RoomserverInternalAPI) performJoinRoomByID(
for _, se := range buildRes.StateEvents { for _, se := range buildRes.StateEvents {
if membership, merr := se.Membership(); merr == nil { if membership, merr := se.Membership(); merr == nil {
if se.StateKey() != nil && *se.StateKey() == *event.StateKey() { if se.StateKey() != nil && *se.StateKey() == *event.StateKey() {
alreadyJoined = (membership == "join") alreadyJoined = (membership == gomatrixserverlib.Join)
break break
} }
} }

2
roomserver/internal/perform_leave.go
View file

@ -70,7 +70,7 @@ func (r *RoomserverInternalAPI) performLeaveRoomByID(
if err != nil { if err != nil {
return fmt.Errorf("Error getting membership: %w", err) return fmt.Errorf("Error getting membership: %w", err)
} }
if membership != "join" { if membership != gomatrixserverlib.Join {
// TODO: should be able to handle "invite" in this case too, if // TODO: should be able to handle "invite" in this case too, if
// it's a case of kicking or banning or such // it's a case of kicking or banning or such
return fmt.Errorf("User %q is not joined to the room (membership is %q)", req.UserID, membership) return fmt.Errorf("User %q is not joined to the room (membership is %q)", req.UserID, membership)