Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate 2017-11-20 13:41:59 +00:00
commit dfec2904f1

View file

@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
import EventEmitter from 'events';
import Promise from 'bluebird'; import Promise from 'bluebird';
const BULK_REQUEST_DEBOUNCE_MS = 200; const BULK_REQUEST_DEBOUNCE_MS = 200;
@ -29,9 +28,8 @@ const GROUP_PROFILES_CACHE_BUST_MS = 1800000; // 30 mins
/** /**
* Stores data used by <Flair/> * Stores data used by <Flair/>
*/ */
class FlairStore extends EventEmitter { class FlairStore {
constructor(matrixClient) { constructor(matrixClient) {
super();
this._matrixClient = matrixClient; this._matrixClient = matrixClient;
this._userGroups = { this._userGroups = {
// $userId: ['+group1:domain', '+group2:domain', ...] // $userId: ['+group1:domain', '+group2:domain', ...]