imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/develop' into travis/voice-messages/download

Browse source
This commit is contained in:
Travis Ralston 2021-07-20 08:55:53 -06:00
commit 5994111e5d
325 changed files with 5224 additions and 4075 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/utils/AutoDiscoveryUtils.tsx
View file

@ -90,7 +90,7 @@ export default class AutoDiscoveryUtils {
href="https://github.com/vector-im/element-web/blob/master/docs/config.md"
target="_blank"
rel="noreferrer noopener"
>{sub}</a>;
>{ sub }</a>;
},
},
);
@ -130,8 +130,8 @@ export default class AutoDiscoveryUtils {
serverErrorIsFatal: isFatalError,
serverDeadError: (
<div>
<strong>{title}</strong>
<div>{body}</div>
<strong>{ title }</strong>
<div>{ body }</div>
</div>
),
};

8
src/utils/ErrorUtils.tsx
View file

@ -44,7 +44,7 @@ export function messageForResourceLimitError(
const linkSub = sub => {
if (adminContact) {
return <a href={adminContact} target="_blank" rel="noreferrer noopener">{sub}</a>;
return <a href={adminContact} target="_blank" rel="noreferrer noopener">{ sub }</a>;
} else {
return sub;
}
@ -76,12 +76,12 @@ export function messageForSyncError(err: MatrixError | Error): ReactNode {
},
);
return <div>
<div>{limitError}</div>
<div>{adminContact}</div>
<div>{ limitError }</div>
<div>{ adminContact }</div>
</div>;
} else {
return <div>
{_t("Unable to connect to Homeserver. Retrying...")}
{ _t("Unable to connect to Homeserver. Retrying...") }
</div>;
}
}

19
src/utils/EventUtils.ts
View file

@ -111,14 +111,19 @@ export function getEventDisplayInfo(mxEvent: MatrixEvent): {
let tileHandler = getHandlerTile(mxEvent);
// Info messages are basically information about commands processed on a room
let isBubbleMessage = eventType.startsWith("m.key.verification") ||
(eventType === EventType.RoomMessage && msgtype && msgtype.startsWith("m.key.verification")) ||
(eventType === EventType.RoomCreate) ||
(eventType === EventType.RoomEncryption) ||
(tileHandler === "messages.MJitsiWidgetEvent");
let isBubbleMessage = (
eventType.startsWith("m.key.verification") ||
(eventType === EventType.RoomMessage && msgtype && msgtype.startsWith("m.key.verification")) ||
(eventType === EventType.RoomCreate) ||
(eventType === EventType.RoomEncryption) ||
(eventType === EventType.CallInvite) ||
(tileHandler === "messages.MJitsiWidgetEvent")
);
let isInfoMessage = (
!isBubbleMessage && eventType !== EventType.RoomMessage &&
eventType !== EventType.Sticker && eventType !== EventType.RoomCreate
!isBubbleMessage &&
eventType !== EventType.RoomMessage &&
eventType !== EventType.Sticker &&
eventType !== EventType.RoomCreate
);
// If we're showing hidden events in the timeline, we should use the