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

Use UnstableValue for all location constants (#7388)

Browse source
This commit is contained in:
Andy Balaam 2021-12-15 16:54:11 +00:00 • committed by GitHub
parent fc58ce7ed2
commit 1c6a7646fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/components/views/rooms/MessageComposer.tsx
View file

@ -19,9 +19,9 @@ import { MatrixEvent, IEventRelation } from "matrix-js-sdk/src/models/event";
import { Room } from "matrix-js-sdk/src/models/room";
import { RoomMember } from "matrix-js-sdk/src/models/room-member";
import { RelationType } from 'matrix-js-sdk/src/@types/event';
import { MsgType } from "matrix-js-sdk/src/@types/event";
import { logger } from "matrix-js-sdk/src/logger";
import { POLL_START_EVENT_TYPE } from "matrix-js-sdk/src/@types/polls";
import { makeLocationContent } from "matrix-js-sdk/src/content-helpers";
import { _t } from '../../../languageHandler';
import { MatrixClientPeg } from '../../../MatrixClientPeg';
@ -505,19 +505,33 @@ export default class MessageComposer extends React.Component<IProps, IState> {
return true;
};
private shareLocation = (uri: string, ts: number, type: LocationShareType, description: string): boolean => {
private textForLocation = (
uri: string,
ts: number,
description: string | null,
): string => {
const date = new Date(ts).toISOString();
// TODO: translation, as soon as we've re-worded this better
if (description) {
return `${description} at ${uri} as of ${date}`;
} else {
return `Location at ${uri} as of ${date}`;
}
};
private shareLocation = (
uri: string,
ts: number,
_type: LocationShareType,
description: string | null,
): boolean => {
if (!uri) return false;
try {
const text = `${description ? description : 'Location'} at ${uri} as of ${new Date(ts).toISOString()}`;
// noinspection ES6MissingAwait - we don't care if it fails, it'll get queued.
MatrixClientPeg.get().sendMessage(this.props.room.roomId, {
"body": text,
"msgtype": MsgType.Location,
"geo_uri": uri,
"org.matrix.msc3488.location": { uri, description },
"org.matrix.msc3488.ts": ts,
// TODO: MSC1767 fallbacks for text & thumbnail
});
const text = this.textForLocation(uri, ts, description);
MatrixClientPeg.get().sendMessage(
this.props.room.roomId,
makeLocationContent(text, uri, ts, description),
);
} catch (e) {
logger.error("Error sending location:", e);
}