mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-28 20:38:55 +03:00
Code Issues Projects Releases Packages Wiki Activity

iterate PR

Browse source
This commit is contained in:
Michael Telatynski 2020-09-08 15:22:23 +01:00
parent 3bc42d7470
commit 9d85d0436c
1 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/components/structures/RoomView.tsx
View file

@ -69,6 +69,8 @@ import PinnedEventsPanel from "../views/rooms/PinnedEventsPanel";
import AuxPanel from "../views/rooms/AuxPanel"; import AuxPanel from "../views/rooms/AuxPanel";
import RoomHeader from "../views/rooms/RoomHeader"; import RoomHeader from "../views/rooms/RoomHeader";
import TintableSvg from "../views/elements/TintableSvg"; import TintableSvg from "../views/elements/TintableSvg";
import type * as ConferenceHandler from '../../VectorConferenceHandler';
import {XOR} from "../../@types/common";
const DEBUG = false; const DEBUG = false;
let debuglog = function(msg: string) {}; let debuglog = function(msg: string) {};
@ -81,7 +83,7 @@ if (DEBUG) {
} }
interface IProps { interface IProps {
ConferenceHandler?: any; ConferenceHandler?: ConferenceHandler;
// An object representing a third party invite to join this room // An object representing a third party invite to join this room
// Fields: // Fields:
@ -102,7 +104,11 @@ interface IProps {
// * avatarUrl (string) The mxc:// avatar URL for the room // * avatarUrl (string) The mxc:// avatar URL for the room
// * inviterName (string) The display name of the person who // * inviterName (string) The display name of the person who
// * invited us to the room // * invited us to the room
oobData?: any; oobData?: {
name?: string;
avatarUrl?: string;
inviterName?: string;
};
// Servers the RoomView can use to try and assist joins // Servers the RoomView can use to try and assist joins
viaServers?: string[]; viaServers?: string[];
@ -137,7 +143,12 @@ export interface IState {
searching: boolean; searching: boolean;
searchTerm?: string; searchTerm?: string;
searchScope?: "All" | "Room"; searchScope?: "All" | "Room";
searchResults?: any; searchResults?: XOR<{}, {
count: number;
highlights: string[];
results: MatrixEvent[];
next_batch: string; // eslint-disable-line camelcase
}>;
searchHighlights?: string[]; searchHighlights?: string[];
searchInProgress?: boolean; searchInProgress?: boolean;
callState?: string; callState?: string;
@ -166,7 +177,11 @@ export interface IState {
statusBarVisible: boolean; statusBarVisible: boolean;
// We load this later by asking the js-sdk to suggest a version for us. // We load this later by asking the js-sdk to suggest a version for us.
// This object is the result of Room#getRecommendedVersion() // This object is the result of Room#getRecommendedVersion()
upgradeRecommendation?: any; upgradeRecommendation?: {
version: string;
needsUpgrade: boolean;
urgent: boolean;
};
canReact: boolean; canReact: boolean;
canReply: boolean; canReply: boolean;
useIRCLayout: boolean; useIRCLayout: boolean;
@ -1034,7 +1049,7 @@ export default class RoomView extends React.Component<IProps, IState> {
private checkIfAlone(room: Room, countInfluence?: number) { private checkIfAlone(room: Room, countInfluence?: number) {
let warnedAboutLonelyRoom = false; let warnedAboutLonelyRoom = false;
if (localStorage) { if (localStorage) {
warnedAboutLonelyRoom = !!localStorage.getItem('mx_user_alone_warned_' + this.state.room.roomId); warnedAboutLonelyRoom = Boolean(localStorage.getItem('mx_user_alone_warned_' + this.state.room.roomId));
} }
if (warnedAboutLonelyRoom) { if (warnedAboutLonelyRoom) {
if (this.state.isAlone) this.setState({isAlone: false}); if (this.state.isAlone) this.setState({isAlone: false});