matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-26 17:03:12 +03:00
Code Activity

rename related id to associated id

Browse Source
This commit is contained in:
Bruno Windels
2019-06-13 11:50:29 +02:00
parent 3ed9b00398
commit 4143a79f7b
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/client.js
View File

@@ -1735,11 +1735,11 @@ MatrixClient.prototype._sendCompleteEvent = function(roomId, eventObject, txnId,
// that hasn't been sent yet (e.g. with a local id starting with a ~) // that hasn't been sent yet (e.g. with a local id starting with a ~)
// then listen for the remote echo of that event so that by the time // then listen for the remote echo of that event so that by the time
// this event does get sent, we have the correct event_id // this event does get sent, we have the correct event_id
const targetId = localEvent.getRelatedId(); const targetId = localEvent.getAssociatedId();
if (targetId && targetId.startsWith("~")) { if (targetId && targetId.startsWith("~")) {
const target = room.getPendingEvents().find(e => e.getId() === targetId); const target = room.getPendingEvents().find(e => e.getId() === targetId);
target.once("Event.localEventIdReplaced", () => { target.once("Event.localEventIdReplaced", () => {
localEvent.updateRelatedId(target.getId()); localEvent.updateAssociatedId(target.getId());
}); });
} }
const type = localEvent.getType(); const type = localEvent.getType();

4
src/models/event.js
View File

@@ -900,7 +900,7 @@ utils.extend(module.exports.MatrixEvent.prototype, {
* *
* @return {string?} * @return {string?}
*/ */
getRelatedId() { getAssociatedId() {
const relation = this.getRelation(); const relation = this.getRelation();
if (relation) { if (relation) {
return relation.event_id; return relation.event_id;
@@ -917,7 +917,7 @@ utils.extend(module.exports.MatrixEvent.prototype, {
* *
* @param {string} eventId the new event id * @param {string} eventId the new event id
*/ */
updateRelatedId(eventId) { updateAssociatedId(eventId) {
const relation = this.getRelation(); const relation = this.getRelation();
if (relation) { if (relation) {
relation.event_id = eventId; relation.event_id = eventId;

3
src/scheduler.js
View File

@@ -177,7 +177,8 @@ MatrixScheduler.RETRY_BACKOFF_RATELIMIT = function(event, attempts, err) {
* @see module:scheduler~queueAlgorithm * @see module:scheduler~queueAlgorithm
*/ */
MatrixScheduler.QUEUE_MESSAGES = function(event) { MatrixScheduler.QUEUE_MESSAGES = function(event) {
if (event.getType() === "m.room.message" || !!event.getRelatedId()) { // enqueue messages or events that associate with another event (redactions and relations)
if (event.getType() === "m.room.message" || !!event.getAssociatedId()) {
// put these events in the 'message' queue. // put these events in the 'message' queue.
return "message"; return "message";
} }