Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-04 11:54:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Swap from using raw m.room.member events for room members to using actual RoomMember objects, so User objects can be tacked on. Update tests.

Browse source
This commit is contained in:
Kegan Dougal 2014-11-06 14:52:22 +00:00
parent d4c20c472b
commit e3c3f5a6d0
9 changed files with 52 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
syweb/webclient/components/matrix/matrix-call.js
View file

@ -214,7 +214,7 @@ angular.module('MatrixCall', [])
var self = this;
var roomMembers = modelService.getRoom(this.room_id).current_room_state.members;
if (roomMembers[matrixService.config().user_id].membership != 'join') {
if (roomMembers[matrixService.config().user_id].event.content.membership != 'join') {
console.log("We need to join the room before we can accept this call");
matrixService.join(this.room_id).then(function() {
self.answer();