mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/element-hq/dendrite.git synced 2025-09-13 12:52:24 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 6d1c47d2a0 into a408b24d28

Browse source
This commit is contained in:
Tristian Celestin 2025-07-28 20:34:04 +02:00 • committed by GitHub
commit fdace1a129
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 28 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
clientapi/clientapi_test.go
View file

@ -2330,8 +2330,23 @@ func TestCreateRoomInvite(t *testing.T) {
roomID := gjson.GetBytes(w.Body.Bytes(), "room_id").Str roomID := gjson.GetBytes(w.Body.Bytes(), "room_id").Str
validRoomID, _ := spec.NewRoomID(roomID) validRoomID, _ := spec.NewRoomID(roomID)
// Confirm that the room matches the private state preset
ev, err := rsAPI.CurrentStateEvent(context.Background(), *validRoomID, spec.MRoomJoinRules, spec.Invite)
if err != nil {
t.Fatal(err)
}
ev, err = rsAPI.CurrentStateEvent(context.Background(), *validRoomID, spec.MRoomHistoryVisibility, string(gomatrixserverlib.HistoryVisibilityShared))
if err != nil {
t.Fatal(err)
}
ev, err = rsAPI.CurrentStateEvent(context.Background(), *validRoomID, spec.MRoomGuestAccess, "can_join")
if err != nil {
t.Fatal(err)
}
// Now ask the roomserver about the membership event of Bob // Now ask the roomserver about the membership event of Bob
ev, err := rsAPI.CurrentStateEvent(context.Background(), *validRoomID, spec.MRoomMember, bob.ID) ev, err = rsAPI.CurrentStateEvent(context.Background(), *validRoomID, spec.MRoomMember, bob.ID)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

13
roomserver/internal/perform/perform_create_room.go
View file

@ -114,6 +114,18 @@ func (c *Creator) PerformCreateRoom(ctx context.Context, userID spec.UserID, roo
} }
var guestsCanJoin bool var guestsCanJoin bool
// If unspecified, the server should use the visibility to determine which preset to use.
// A visibility of public equates to a preset of public_chat
// and private visibility equates to a preset of private_chat.
if createRequest.StatePreset == "" {
switch createRequest.Visibility {
case "private", "":
createRequest.StatePreset = spec.PresetPrivateChat
case "public":
createRequest.StatePreset = spec.PresetPublicChat
}
}
switch createRequest.StatePreset { switch createRequest.StatePreset {
case spec.PresetPrivateChat: case spec.PresetPrivateChat:
joinRuleContent.JoinRule = spec.Invite joinRuleContent.JoinRule = spec.Invite
@ -130,7 +142,6 @@ func (c *Creator) PerformCreateRoom(ctx context.Context, userID spec.UserID, roo
joinRuleContent.JoinRule = spec.Public joinRuleContent.JoinRule = spec.Public
historyVisibilityContent.HistoryVisibility = historyVisibilityShared historyVisibilityContent.HistoryVisibility = historyVisibilityShared
} }
createEvent := gomatrixserverlib.FledglingEvent{ createEvent := gomatrixserverlib.FledglingEvent{
Type: spec.MRoomCreate, Type: spec.MRoomCreate,
Content: createContent, Content: createContent,