Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

s/eventHandlerService.getUsersCountInRoom/modelService.getUserCountInRoom/g

This commit is contained in:
Kegan Dougal 2014-11-17 09:33:22 +00:00
parent 4d922a0f9b
commit fbf8003237
5 changed files with 61 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
syweb/webclient/components/matrix/event-handler-service.js
View File

@ -523,29 +523,8 @@ function(matrixService, $rootScope, $q, $timeout, $filter, mPresence, notificati
}
return lastMessage;
},
/**
* Compute the room users number, ie the number of members who has joined the room.
* @param {String} room_id the room id
* @returns {undefined | Number} the room users number if available
*/
getUsersCountInRoom: function(room_id) {
var memberCount;
var room = modelService.getRoom(room_id);
memberCount = 0;
for (var i in room.current_room_state.members) {
if (!room.current_room_state.members.hasOwnProperty(i)) continue;
var member = room.current_room_state.members[i].event;
if ("join" === member.content.membership) {
memberCount = memberCount + 1;
}
}
return memberCount;
}
};
}]);

23
syweb/webclient/components/matrix/model-service.js
View File

@ -284,6 +284,29 @@ angular.module('modelService', [])
}
}
return powerLevel;
},
/**
* Compute the room users number, ie the number of members who has joined the room.
* @param {String} room_id the room id
* @returns {undefined | Number} the room users number if available
*/
getUserCountInRoom: function(room_id) {
var memberCount;
var room = this.getRoom(room_id);
memberCount = 0;
for (var i in room.current_room_state.members) {
if (!room.current_room_state.members.hasOwnProperty(i)) continue;
var member = room.current_room_state.members[i].event;
if ("join" === member.content.membership) {
memberCount = memberCount + 1;
}
}
return memberCount;
}
};

2
syweb/webclient/recents/recents-filter.js
View File

@ -40,7 +40,7 @@ angular.module('RecentsController')
}
// Count users here
// TODO: Compute it directly in eventHandlerService
room.recent.numUsersInRoom = eventHandlerService.getUsersCountInRoom(room_id);
room.recent.numUsersInRoom = modelService.getUserCountInRoom(room_id);
filtered.push(room);
}

42
syweb/webclient/test/unit/event-handler-service.spec.js
View File

@ -26,45 +26,5 @@ describe('EventHandlerService', function() {
scope = $rootScope;
}));
it('should be able to get the number of joined users in a room', inject(
function(eventHandlerService) {
var roomId = "!foo:matrix.org";
// set mocked data
modelService.getRoom = function(roomId) {
return {
room_id: roomId,
current_room_state: {
members: {
"@adam:matrix.org": {
event: {
content: { membership: "join" },
user_id: "@adam:matrix.org"
}
},
"@beth:matrix.org": {
event: {
content: { membership: "invite" },
user_id: "@beth:matrix.org"
}
},
"@charlie:matrix.org": {
event: {
content: { membership: "join" },
user_id: "@charlie:matrix.org"
}
},
"@danice:matrix.org": {
event: {
content: { membership: "leave" },
user_id: "@danice:matrix.org"
}
}
}
}
};
}
var num = eventHandlerService.getUsersCountInRoom(roomId);
expect(num).toEqual(2);
}));
});

34
syweb/webclient/test/unit/model-service.spec.js
View File

@ -193,4 +193,38 @@ describe('ModelService', function() {
}));
it('should be able to get the number of joined users in a room', inject(
function(modelService) {
var roomId = "!foo:matrix.org";
// set mocked data
var room = modelService.getRoom(roomId);
room.current_room_state.storeStateEvent({
content: { membership: "join" },
user_id: "@adam:matrix.org",
state_key: "@adam:matrix.org",
type: "m.room.member"
});
room.current_room_state.storeStateEvent({
content: { membership: "invite" },
user_id: "@adam:matrix.org",
state_key: "@beth:matrix.org",
type: "m.room.member"
});
room.current_room_state.storeStateEvent({
content: { membership: "join" },
user_id: "@charlie:matrix.org",
state_key: "@charlie:matrix.org",
type: "m.room.member"
});
room.current_room_state.storeStateEvent({
content: { membership: "leave" },
user_id: "@danice:matrix.org",
state_key: "@danice:matrix.org",
type: "m.room.member"
});
var num = modelService.getUserCountInRoom(roomId);
expect(num).toEqual(2);
}));
});