OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Reverted patches done for SYWEB-40

pull/10/head
Emmanuel ROHEE 2014-09-18 15:19:35 +02:00
parent 704e7e9f44
commit 0db0528e8e
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -243,9 +243,8 @@ function(matrixService, $rootScope, $q, $timeout, mPresence) {
// add membership changes as if they were a room message if something interesting changed // add membership changes as if they were a room message if something interesting changed
// Exception: Do not do this if the event is a room state event because such events already come // Exception: Do not do this if the event is a room state event because such events already come
// as room messages events. Moreover, when they come as room messages events, they are relatively ordered // as room messages events. Moreover, when they come as room messages events, they are relatively ordered
// with other other room messages XXX This is no longer true, you only get a single event, not a room message event. // with other other room messages
// FIXME: This possibly reintroduces multiple join messages. if (event.content.prev !== event.content.membership && !isStateEvent) {
if (event.content.prev !== event.content.membership) { // && !isStateEvent
if (isLiveEvent) { if (isLiveEvent) {
$rootScope.events.rooms[event.room_id].messages.push(event); $rootScope.events.rooms[event.room_id].messages.push(event);
} }
@ -376,7 +375,6 @@ function(matrixService, $rootScope, $q, $timeout, mPresence) {
handleMessage(event, isLiveEvent); handleMessage(event, isLiveEvent);
break; break;
case "m.room.member": case "m.room.member":
isStateEvent = true;
handleRoomMember(event, isLiveEvent, isStateEvent); handleRoomMember(event, isLiveEvent, isStateEvent);
break; break;
case "m.presence": case "m.presence":
@ -406,8 +404,6 @@ function(matrixService, $rootScope, $q, $timeout, mPresence) {
// isLiveEvents determines whether notifications should be shown, whether // isLiveEvents determines whether notifications should be shown, whether
// messages get appended to the start/end of lists, etc. // messages get appended to the start/end of lists, etc.
handleEvents: function(events, isLiveEvents, isStateEvents) { handleEvents: function(events, isLiveEvents, isStateEvents) {
// XXX FIXME TODO: isStateEvents is being left as undefined sometimes. It makes no sense
// to have isStateEvents as an arg, since things like m.room.member are ALWAYS state events.
for (var i=0; i<events.length; i++) { for (var i=0; i<events.length; i++) {
this.handleEvent(events[i], isLiveEvents, isStateEvents); this.handleEvent(events[i], isLiveEvents, isStateEvents);
} }
@ -423,7 +419,6 @@ function(matrixService, $rootScope, $q, $timeout, mPresence) {
if (dir && 'b' === dir) { if (dir && 'b' === dir) {
// paginateBackMessages requests messages to be in reverse chronological order // paginateBackMessages requests messages to be in reverse chronological order
for (var i=0; i<events.length; i++) { for (var i=0; i<events.length; i++) {
// FIXME: Being live != being state
this.handleEvent(events[i], isLiveEvents, isLiveEvents); this.handleEvent(events[i], isLiveEvents, isLiveEvents);
} }
@ -433,7 +428,6 @@ function(matrixService, $rootScope, $q, $timeout, mPresence) {
else { else {
// InitialSync returns messages in chronological order // InitialSync returns messages in chronological order
for (var i=events.length - 1; i>=0; i--) { for (var i=events.length - 1; i>=0; i--) {
// FIXME: Being live != being state
this.handleEvent(events[i], isLiveEvents, isLiveEvents); this.handleEvent(events[i], isLiveEvents, isLiveEvents);
} }
// Store where to start pagination // Store where to start pagination

8
webclient/recents/recents-filter.js
View File

@ -19,14 +19,13 @@
angular.module('RecentsController') angular.module('RecentsController')
.filter('orderRecents', ["matrixService", "eventHandlerService", function(matrixService, eventHandlerService) { .filter('orderRecents', ["matrixService", "eventHandlerService", function(matrixService, eventHandlerService) {
return function(rooms) { return function(rooms) {
var user_id = matrixService.config().user_id; var user_id = matrixService.config().user_id;
// Transform the dict into an array // Transform the dict into an array
// The key, room_id, is already in value objects // The key, room_id, is already in value objects
var filtered = []; var filtered = [];
angular.forEach(rooms, function(room, room_id) { angular.forEach(rooms, function(room, room_id) {
// Show the room only if the user has joined it or has been invited // Show the room only if the user has joined it or has been invited
// (ie, do not show it if he has been banned) // (ie, do not show it if he has been banned)
var member = eventHandlerService.getMember(room_id, user_id); var member = eventHandlerService.getMember(room_id, user_id);
@ -35,8 +34,9 @@ angular.module('RecentsController')
// Count users here // Count users here
// TODO: Compute it directly in eventHandlerService // TODO: Compute it directly in eventHandlerService
room.numUsersInRoom = eventHandlerService.getUsersCountInRoom(room_id); room.numUsersInRoom = eventHandlerService.getUsersCountInRoom(room_id);
filtered.push(room);
} }
filtered.push(room);
}); });
// And time sort them // And time sort them
@ -60,4 +60,4 @@ angular.module('RecentsController')
}); });
return filtered; return filtered;
}; };
}]); }]);