mirror of
https://github.com/element-hq/element-web
synced 2024-11-23 09:46:09 +03:00
filter out conference bots from membership list
This commit is contained in:
parent
bf1e0da598
commit
f9785f68af
1 changed files with 7 additions and 3 deletions
|
@ -23,6 +23,7 @@ var Entities = require("../../../Entities");
|
|||
var sdk = require('../../../index');
|
||||
var GeminiScrollbar = require('react-gemini-scrollbar');
|
||||
var rate_limited_func = require('../../../ratelimitedfunc');
|
||||
var CallHandler = require("../../../CallHandler");
|
||||
|
||||
var INITIAL_LOAD_NUM_MEMBERS = 30;
|
||||
var SHARE_HISTORY_WARNING =
|
||||
|
@ -285,6 +286,7 @@ module.exports = React.createClass({
|
|||
roomMembers: function(limit) {
|
||||
var all_members = this.memberDict || {};
|
||||
var all_user_ids = Object.keys(all_members);
|
||||
var ConferenceHandler = CallHandler.getConferenceHandler();
|
||||
|
||||
if (this.memberSort) all_user_ids.sort(this.memberSort);
|
||||
|
||||
|
@ -295,10 +297,12 @@ module.exports = React.createClass({
|
|||
var m = all_members[user_id];
|
||||
|
||||
if (m.membership == 'join' || m.membership == 'invite') {
|
||||
if ((ConferenceHandler && !ConferenceHandler.isConferenceUser(user_id)) || !ConferenceHandler) {
|
||||
to_display.push(user_id);
|
||||
++count;
|
||||
}
|
||||
}
|
||||
}
|
||||
return to_display;
|
||||
},
|
||||
|
||||
|
|
Loading…
Reference in a new issue