Merge branch 'develop' into travis/ft-sep1620/03-jitsi-obvious

src/stores/CommunityPrototypeStore.ts

@@ -24,9 +24,9 @@ import * as utils from "matrix-js-sdk/src/utils";
 import { UPDATE_EVENT } from "./AsyncStore";
 import FlairStore from "./FlairStore";
 import TagOrderStore from "./TagOrderStore";
-import { MatrixClientPeg } from "../MatrixClientPeg";
 import GroupStore from "./GroupStore";
 import dis from "../dispatcher/dispatcher";
+import { isNullOrUndefined } from "matrix-js-sdk/src/utils";
 
 interface IState {
     // nothing of value - we use account data
@@ -77,7 +77,7 @@ export class CommunityPrototypeStore extends AsyncStoreWithClient<IState> {
 
     public getGeneralChat(communityId: string): Room {
         const rooms = GroupStore.getGroupRooms(communityId)
-            .map(r => MatrixClientPeg.get().getRoom(r.roomId))
+            .map(r => this.matrixClient.getRoom(r.roomId))
             .filter(r => !!r);
         let chat = rooms.find(r => {
             const idState = r.currentState.getStateEvents("im.vector.general_chat", "");
@@ -88,6 +88,26 @@ export class CommunityPrototypeStore extends AsyncStoreWithClient<IState> {
         return chat; // can be null
     }
 
+    public isAdminOf(communityId: string): boolean {
+        const members = GroupStore.getGroupMembers(communityId);
+        const myMember = members.find(m => m.userId === this.matrixClient.getUserId());
+        return myMember?.isPrivileged;
+    }
+
+    public canInviteTo(communityId: string): boolean {
+        const generalChat = this.getGeneralChat(communityId);
+        if (!generalChat) return this.isAdminOf(communityId);
+
+        const myMember = generalChat.getMember(this.matrixClient.getUserId());
+        if (!myMember) return this.isAdminOf(communityId);
+
+        const pl = generalChat.currentState.getStateEvents("m.room.power_levels", "");
+        if (!pl) return this.isAdminOf(communityId);
+
+        const invitePl = isNullOrUndefined(pl.invite) ? 50 : Number(pl.invite);
+        return invitePl <= myMember.powerLevel;
+    }
+
     protected async onAction(payload: ActionPayload): Promise<any> {
         if (!this.matrixClient || !SettingsStore.getValue("feature_communities_v2_prototypes")) {
             return;

src/stores/RoomViewStore.tsx

@@ -18,6 +18,7 @@ limitations under the License.
 
 import React from "react";
 import {Store} from 'flux/utils';
+import {MatrixError} from "matrix-js-sdk/src/http-api";
 
 import dis from '../dispatcher/dispatcher';
 import {MatrixClientPeg} from '../MatrixClientPeg';
@@ -26,6 +27,9 @@ import Modal from '../Modal';
 import { _t } from '../languageHandler';
 import { getCachedRoomIDForAlias, storeRoomAliasInCache } from '../RoomAliasCache';
 import {ActionPayload} from "../dispatcher/payloads";
+import {retry} from "../utils/promise";
+
+const NUM_JOIN_RETRY = 5;
 
 const INITIAL_STATE = {
     // Whether we're joining the currently viewed room (see isJoining())
@@ -259,24 +263,32 @@ class RoomViewStore extends Store<ActionPayload> {
         });
     }
 
-    private joinRoom(payload: ActionPayload) {
+    private async joinRoom(payload: ActionPayload) {
         this.setState({
             joining: true,
         });
-        MatrixClientPeg.get().joinRoom(
-            this.state.roomAlias || this.state.roomId, payload.opts,
-        ).then(() => {
+
+        const cli = MatrixClientPeg.get();
+        const address = this.state.roomAlias || this.state.roomId;
+        try {
+            await retry<void, MatrixError>(() => cli.joinRoom(address, payload.opts), NUM_JOIN_RETRY, (err) => {
+                // if we received a Gateway timeout then retry
+                return err.httpStatus === 504;
+            });
+
             // We do *not* clear the 'joining' flag because the Room object and/or our 'joined' member event may not
             // have come down the sync stream yet, and that's the point at which we'd consider the user joined to the
             // room.
             dis.dispatch({ action: 'join_room_ready' });
-        }, (err) => {
+        } catch (err) {
             dis.dispatch({
                 action: 'join_room_error',
                 err: err,
             });
+
             let msg = err.message ? err.message : JSON.stringify(err);
             console.log("Failed to join room:", msg);
+
             if (err.name === "ConnectionError") {
                 msg = _t("There was an error joining the room");
             } else if (err.errcode === 'M_INCOMPATIBLE_ROOM_VERSION') {
@@ -296,12 +308,13 @@ class RoomViewStore extends Store<ActionPayload> {
                     }
                 }
             }
+
             const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createTrackedDialog('Failed to join room', '', ErrorDialog, {
                 title: _t("Failed to join room"),
                 description: msg,
             });
-        });
+        }
     }
 
     private getInvitingUserId(roomId: string): string {