Gaming/lua-matrix
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow passing a room object to client:join_room()

Browse Source 
This neatly allows to pass the room object passed to the "invited" event
directly to :join_room(). This way the user does not need to know that
rooms have a "room_id" attribute.
This commit is contained in:
Adrian Perez de Castro
2016-07-05 01:01:34 +03:00
parent e51b67aef6
commit bad6e6ee16
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
matrix/client.lua
View File

@@ -361,12 +361,15 @@ function Client:create_room(alias, public, invite)
return self:_make_room(response.room_id) return self:_make_room(response.room_id)
end end
function Client:join_room(room_id_or_alias) function Client:join_room(room)
local response = self._api:join_room(room_id_or_alias) if type(room) == "string" then
local room = self:_make_room(response.room_id or room_id_or_alias) local response = self._api:join_room(room)
-- XXX: At this point we might have joined the room, but its state has not elseif type(room) == "table" and getmetatable(room) == Room then
-- been synced. Maybe firing the "joined" event should be delayed local response = self._api:join_room(room.room_id)
-- until the next sync (or when the corresponding events come in). else
error("argument #1 must be a string or a room object")
end
room = self:_make_room(response.room_id)
self:fire("joined", room) self:fire("joined", room)
return room return room
end end