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

Update m.render_in to is_falling_back (+ unstable field) (#7979)

Browse source
This commit is contained in:
Michael Telatynski 2022-03-09 16:15:53 +00:00 • committed by GitHub
parent 2ab8b46ba3
commit 288e47fd81
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/utils/Reply.ts
View file

@ -14,13 +14,14 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import { IEventRelation, MatrixEvent } from "matrix-js-sdk/src/models/event";
import { IContent, MatrixEvent } from "matrix-js-sdk/src/models/event";
import { RelationType } from "matrix-js-sdk/src/@types/event";
import sanitizeHtml from "sanitize-html";
import escapeHtml from "escape-html";
import { PERMITTED_URL_SCHEMES } from "../HtmlUtils";
import { makeUserPermalink, RoomPermalinkCreator } from "./permalinks/Permalinks";
import { RecursivePartial } from "../@types/common";
export function getParentEventId(ev: MatrixEvent): string | undefined {
if (!ev || ev.isRedacted()) return;
@ -141,21 +142,18 @@ export function getNestedReplyText(
return { body, html };
}
export function makeReplyMixIn(ev: MatrixEvent, renderIn?: string[]) {
export function makeReplyMixIn(ev?: MatrixEvent, inThread = false): RecursivePartial<IContent> {
if (!ev) return {};
const mixin: any = {
const mixin: RecursivePartial<IContent> = {
'm.relates_to': {
'm.in_reply_to': {
'event_id': ev.getId(),
'io.element.is_falling_back': !inThread, // MSC3440 unstable `is_falling_back` field
},
},
};
if (renderIn) {
mixin['m.relates_to']['m.in_reply_to']['m.render_in'] = renderIn;
}
/**
* If the event replied is part of a thread
* Add the `m.thread` relation so that clients
@ -173,19 +171,12 @@ export function makeReplyMixIn(ev: MatrixEvent, renderIn?: string[]) {
return mixin;
}
export function shouldDisplayReply(event: MatrixEvent, renderTarget?: string): boolean {
export function shouldDisplayReply(event: MatrixEvent, inThread = false): boolean {
const parentExist = Boolean(getParentEventId(event));
if (!parentExist) return false;
if (!inThread) return true;
const relations = event.getRelation();
const renderIn = relations?.["m.in_reply_to"]?.["m.render_in"] ?? [];
const shouldRenderInTarget = !renderTarget || (renderIn.includes(renderTarget));
return parentExist && shouldRenderInTarget;
}
export function getRenderInMixin(relation?: IEventRelation): string[] | undefined {
if (relation?.rel_type === RelationType.Thread) {
return [RelationType.Thread];
}
const inReplyTo = event.getRelation()?.["m.in_reply_to"];
const isFallingBack = inReplyTo?.is_falling_back ?? inReplyTo?.["io.element.is_falling_back"];
return !isFallingBack;
}