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

use isLocationEvent util everywhere (#8551)

Browse source 
Signed-off-by: Kerry Archibald <kerrya@element.io>
This commit is contained in:
Kerry 2022-05-10 17:39:28 +02:00 • committed by GitHub
parent 38f34c3d6a
commit 3c5942aa35
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/TextForEvent.tsx
View file

@ -29,7 +29,6 @@ import {
M_POLL_END,
PollStartEvent,
} from "matrix-events-sdk";
import { M_LOCATION } from "matrix-js-sdk/src/@types/location";
import { _t } from './languageHandler';
import * as Roles from './Roles';
@ -46,6 +45,7 @@ import AccessibleButton from './components/views/elements/AccessibleButton';
import RightPanelStore from './stores/right-panel/RightPanelStore';
import UserIdentifierCustomisations from './customisations/UserIdentifier';
import { ViewRoomPayload } from "./dispatcher/payloads/ViewRoomPayload";
import { isLocationEvent } from './utils/EventUtils';
export function getSenderName(event: MatrixEvent): string {
return event.sender?.name ?? event.getSender() ?? _t("Someone");
@ -305,11 +305,7 @@ function textForServerACLEvent(ev: MatrixEvent): () => string | null {
}
function textForMessageEvent(ev: MatrixEvent): () => string | null {
const type = ev.getType();
const content = ev.getContent();
const msgtype = content.msgtype;
if (M_LOCATION.matches(type) || M_LOCATION.matches(msgtype)) {
if (isLocationEvent(ev)) {
return textForLocationEvent(ev);
}