Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
synapse
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Timo Ley
synapse
Commits
b0483cd4
"src/api/client_server/voip.rs" did not exist on "109892b4b754e1666d4f00d9aec6356b46093668"
Commit
b0483cd4
authored
10 years ago
by
Emmanuel ROHEE
Browse files
Options
Downloads
Patches
Plain Diff
Filter room where the user has been banned
parent
8aa4b7bf
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
webclient/components/matrix/event-handler-service.js
+16
-0
16 additions, 0 deletions
webclient/components/matrix/event-handler-service.js
webclient/recents/recents-filter.js
+13
-5
13 additions, 5 deletions
webclient/recents/recents-filter.js
with
29 additions
and
5 deletions
webclient/components/matrix/event-handler-service.js
+
16
−
0
View file @
b0483cd4
...
@@ -398,6 +398,22 @@ angular.module('eventHandlerService', [])
...
@@ -398,6 +398,22 @@ angular.module('eventHandlerService', [])
}
}
return
memberCount
;
return
memberCount
;
},
/**
* Get the member object of a room member
* @param {String} room_id the room id
* @param {String} user_id the id of the user
* @returns {undefined | Object} the member object of this user in this room if he is part of the room
*/
getMember
:
function
(
room_id
,
user_id
)
{
var
member
;
var
room
=
$rootScope
.
events
.
rooms
[
room_id
];
if
(
room
)
{
member
=
room
.
members
[
user_id
];
}
return
member
;
}
}
};
};
}]);
}]);
This diff is collapsed.
Click to expand it.
webclient/recents/recents-filter.js
+
13
−
5
View file @
b0483cd4
...
@@ -17,19 +17,27 @@
...
@@ -17,19 +17,27 @@
'
use strict
'
;
'
use strict
'
;
angular
.
module
(
'
RecentsController
'
)
angular
.
module
(
'
RecentsController
'
)
.
filter
(
'
orderRecents
'
,
[
"
eventHandlerService
"
,
function
(
eventHandlerService
)
{
.
filter
(
'
orderRecents
'
,
[
"
matrixService
"
,
"
eventHandlerService
"
,
function
(
matrixService
,
eventHandlerService
)
{
return
function
(
rooms
)
{
return
function
(
rooms
)
{
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
)
{
// Count users here
// Show the room only if the user has joined it or has been invited
// TODO: Compute it directly in eventHandlerService
// (ie, do not show it if he has been banned)
room
.
numUsersInRoom
=
eventHandlerService
.
getUsersCountInRoom
(
room_id
);
var
member
=
eventHandlerService
.
getMember
(
room_id
,
user_id
);
if
(
member
&&
(
"
invite
"
===
member
.
membership
||
"
join
"
===
member
.
membership
))
{
// Count users here
// TODO: Compute it directly in eventHandlerService
room
.
numUsersInRoom
=
eventHandlerService
.
getUsersCountInRoom
(
room_id
);
filtered
.
push
(
room
);
filtered
.
push
(
room
);
}
});
});
// And time sort them
// And time sort them
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment