Arsharth/hydrogen-web
1
0
Fork 0
forked from mystiq/hydrogen-web
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move threading relation type const to relations.js

Browse source
This commit is contained in:
RMidhunSuresh 2021-12-22 12:37:36 +05:30
parent 38781db858
commit f44fa775de
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/matrix/room/timeline/entries/BaseEventEntry.js
View file

@ -16,9 +16,9 @@ limitations under the License.
import {BaseEntry} from "./BaseEntry"; import {BaseEntry} from "./BaseEntry";
import {REDACTION_TYPE} from "../../common.js"; import {REDACTION_TYPE} from "../../common.js";
import {createAnnotation, ANNOTATION_RELATION_TYPE, getRelationFromContent} from "../relations.js"; import {createAnnotation, ANNOTATION_RELATION_TYPE, THREADING_RELATION_TYPE, getRelationFromContent} from "../relations.js";
import {PendingAnnotation} from "../PendingAnnotation.js"; import {PendingAnnotation} from "../PendingAnnotation.js";
import {createReplyContent, THREADING_REL_TYPE} from "./reply.js" import {createReplyContent} from "./reply.js";
/** Deals mainly with local echo for relations and redactions, /** Deals mainly with local echo for relations and redactions,
* so it is shared between PendingEventEntry and EventEntry */ * so it is shared between PendingEventEntry and EventEntry */
@ -36,7 +36,7 @@ export class BaseEventEntry extends BaseEntry {
} }
get isThread() { get isThread() {
return this.relation?.["rel_type"] === THREADING_REL_TYPE; return this.relation?.["rel_type"] === THREADING_RELATION_TYPE;
} }
get isRedacting() { get isRedacting() {

8
src/matrix/room/timeline/entries/reply.js
View file

@ -14,9 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
import {getRelatedEventId} from "../relations.js"; import {getRelatedEventId, THREADING_RELATION_TYPE} from "../relations.js";
export const THREADING_REL_TYPE = "io.element.thread";
function htmlEscape(string) { function htmlEscape(string) {
return string.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;"); return string.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
@ -54,7 +52,7 @@ function _createReplyContent(targetId, msgtype, body, formattedBody, threadId) {
}; };
if (threadId) { if (threadId) {
Object.assign(reply["m.relates_to"], { Object.assign(reply["m.relates_to"], {
rel_type: THREADING_REL_TYPE, rel_type: THREADING_RELATION_TYPE,
event_id: threadId, event_id: threadId,
}); });
} }
@ -93,7 +91,7 @@ function createThreadContent(entry, msgtype, body) {
msgtype, msgtype,
body, body,
"m.relates_to": { "m.relates_to": {
"rel_type": THREADING_REL_TYPE, "rel_type": THREADING_RELATION_TYPE,
"event_id": getRelatedEventId(entry) "event_id": getRelatedEventId(entry)
} }
}; };

1
src/matrix/room/timeline/relations.js
View file

@ -18,6 +18,7 @@ import {REDACTION_TYPE} from "../common.js";
export const REACTION_TYPE = "m.reaction"; export const REACTION_TYPE = "m.reaction";
export const ANNOTATION_RELATION_TYPE = "m.annotation"; export const ANNOTATION_RELATION_TYPE = "m.annotation";
export const THREADING_RELATION_TYPE = "io.element.thread";
export function createAnnotation(targetId, key) { export function createAnnotation(targetId, key) {
return { return {