mirror of
https://github.com/signaller-matrix/signaller.git
synced 2024-11-22 02:12:20 +00:00
Add leave room method
This commit is contained in:
parent
c179fdc4b6
commit
32937adc80
@ -29,5 +29,6 @@ type User interface {
|
|||||||
ID() string
|
ID() string
|
||||||
Password() string
|
Password() string
|
||||||
CreateRoom(request createroom.Request) (Room, *models.ApiError)
|
CreateRoom(request createroom.Request) (Room, *models.ApiError)
|
||||||
|
LeaveRoom(room Room) *models.ApiError
|
||||||
SetTopic(room Room, topic string) *models.ApiError
|
SetTopic(room Room, topic string) *models.ApiError
|
||||||
}
|
}
|
||||||
|
@ -99,3 +99,25 @@ func TestSetRoomTopicWithnprivelegedUser(t *testing.T) {
|
|||||||
err := user2.SetTopic(room, newTopic)
|
err := user2.SetTopic(room, newTopic)
|
||||||
assert.NotNil(t, err)
|
assert.NotNil(t, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestLeaveRoom(t *testing.T) {
|
||||||
|
backend := NewBackend("localhost")
|
||||||
|
|
||||||
|
user, _, _ := backend.Register("user1", "", "")
|
||||||
|
|
||||||
|
request := createroom.Request{
|
||||||
|
RoomAliasName: "room1",
|
||||||
|
Name: "room1",
|
||||||
|
Topic: "topic"}
|
||||||
|
|
||||||
|
room, _ := user.CreateRoom(request)
|
||||||
|
|
||||||
|
assert.Equal(t, 1, len(room.(*Room).joined))
|
||||||
|
|
||||||
|
err := user.LeaveRoom(room)
|
||||||
|
assert.Equal(t, 0, len(room.(*Room).joined))
|
||||||
|
|
||||||
|
// Try to leave room again must throw error
|
||||||
|
err = user.LeaveRoom(room)
|
||||||
|
assert.NotNil(t, err)
|
||||||
|
}
|
||||||
|
@ -114,3 +114,17 @@ func (user *User) SetTopic(room internal.Room, topic string) *models.ApiError {
|
|||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (user *User) LeaveRoom(room internal.Room) *models.ApiError {
|
||||||
|
room.(*Room).mutex.Lock()
|
||||||
|
defer room.(*Room).mutex.Unlock()
|
||||||
|
|
||||||
|
for i, roomMember := range room.(*Room).joined {
|
||||||
|
if roomMember.ID() == user.ID() {
|
||||||
|
room.(*Room).joined = append(room.(*Room).joined[:i], room.(*Room).joined[i+1:]...)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return internal.NewError(models.M_BAD_STATE, "you are not a member of group") // TODO: check error code
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user