ChronosXYZ/signaller
1
0
Fork 0
mirror of https://github.com/signaller-matrix/signaller.git synced 2024-11-09 12:11:03 +00:00
Code Issues Projects Releases Wiki Activity

Fix nil events field

Browse Source
This commit is contained in:
nxshock 2019-08-08 20:01:55 +05:00
parent 3bbb8b19a8
commit f8c6a259e2
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
internal/backends/memory/backend.go
View File

@ -35,6 +35,7 @@ func NewBackend(hostname string) *Backend {
validateUsernameFunc: defaultValidationUsernameFunc, validateUsernameFunc: defaultValidationUsernameFunc,
rooms: make(map[string]internal.Room), rooms: make(map[string]internal.Room),
roomAliases: make(map[string]internal.Room), roomAliases: make(map[string]internal.Room),
events: make(map[string]rooms.Event),
data: make(map[string]internal.User)} data: make(map[string]internal.User)}
} }

35
internal/backends/memory/user.go
View File

@ -111,14 +111,16 @@ func (user *User) CreateRoom(request createroom.Request) (internal.Room, models.
} }
func (user *User) SetTopic(room internal.Room, topic string) models.ApiError { func (user *User) SetTopic(room internal.Room, topic string) models.ApiError {
room.(*Room).mutex.Lock() memRoom := room.(*Room)
defer room.(*Room).mutex.Unlock()
if room.(*Room).creator.ID() != user.ID() { // TODO: currently only creator can change topic memRoom.mutex.Lock()
defer memRoom.mutex.Unlock()
if memRoom.creator.ID() != user.ID() { // TODO: currently only creator can change topic
return models.NewError(models.M_FORBIDDEN, "") return models.NewError(models.M_FORBIDDEN, "")
} }
room.(*Room).topic = topic memRoom.topic = topic
rEvent := &RoomEvent{ rEvent := &RoomEvent{
Type: rooms.Topic, Type: rooms.Topic,
@ -168,8 +170,10 @@ func (user *User) Invite(room internal.Room, invitee internal.User) models.ApiEr
} }
func (user *User) LeaveRoom(room internal.Room) models.ApiError { func (user *User) LeaveRoom(room internal.Room) models.ApiError {
room.(*Room).mutex.Lock() memRoom := room.(*Room)
defer room.(*Room).mutex.Unlock()
memRoom.mutex.Lock()
defer memRoom.mutex.Unlock()
for i, roomMember := range room.(*Room).joined { for i, roomMember := range room.(*Room).joined {
if roomMember.ID() == user.ID() { if roomMember.ID() == user.ID() {
@ -182,11 +186,13 @@ func (user *User) LeaveRoom(room internal.Room) models.ApiError {
} }
func (user *User) SendMessage(room internal.Room, text string) models.ApiError { func (user *User) SendMessage(room internal.Room, text string) models.ApiError {
room.(*Room).mutex.Lock() memRoom := room.(*Room)
defer room.(*Room).mutex.Unlock()
memRoom.mutex.Lock()
defer memRoom.mutex.Unlock()
userInRoom := false userInRoom := false
for _, roomMember := range room.(*Room).joined { for _, roomMember := range memRoom.joined {
if roomMember.ID() == user.ID() { if roomMember.ID() == user.ID() {
userInRoom = true userInRoom = true
} }
@ -247,10 +253,12 @@ func (user *User) SetRoomVisibility(room internal.Room, visibilityType createroo
return models.NewError(models.M_FORBIDDEN, "only room owner can change visibility") // TODO: room administrators can use this method too return models.NewError(models.M_FORBIDDEN, "only room owner can change visibility") // TODO: room administrators can use this method too
} }
room.(*Room).mutex.Lock() memRoom := room.(*Room)
defer room.(*Room).mutex.Unlock()
room.(*Room).visibility = visibilityType memRoom.mutex.Lock()
defer memRoom.mutex.Unlock()
memRoom.visibility = visibilityType
return nil return nil
} }
@ -263,6 +271,9 @@ func (user *User) ChangePassword(newPassword string) {
} }
func (user *User) Logout(token string) { func (user *User) Logout(token string) {
user.mutex.Lock()
defer user.mutex.Unlock()
delete(user.Tokens, token) delete(user.Tokens, token)
} }