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

Rename pending event fields

Browse source
This commit is contained in:
Danila Fedorin 2021-08-06 10:27:17 -07:00
parent 1207203b00
commit ac044cb5c2
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/matrix/room/sending/PendingEvent.js
View file

@ -28,7 +28,7 @@ export const SendStatus = createEnum(
"Error", "Error",
); );
const preservedContentFields = [ "m.relates_to" ]; const unencryptedContentFields = [ "m.relates_to" ];
export class PendingEvent { export class PendingEvent {
constructor({data, remove, emitUpdate, attachments}) { constructor({data, remove, emitUpdate, attachments}) {
@ -98,9 +98,9 @@ export class PendingEvent {
this._emitUpdate("status"); this._emitUpdate("status");
} }
get cleanedContent() { get contentForEncryption() {
const content = Object.assign({}, this._data.content); const content = Object.assign({}, this._data.content);
for (const field of preservedContentFields) { for (const field of unencryptedContentFields) {
delete content[field]; delete content[field];
} }
return content; return content;
@ -108,7 +108,7 @@ export class PendingEvent {
_preserveContentFields(into) { _preserveContentFields(into) {
const content = this._data.content; const content = this._data.content;
for (const field of preservedContentFields) { for (const field of unencryptedContentFields) {
if (content[field] !== undefined) { if (content[field] !== undefined) {
into[field] = content[field]; into[field] = content[field];
} }

4
src/matrix/room/sending/SendQueue.js
View file

@ -97,9 +97,9 @@ export class SendQueue {
} }
if (pendingEvent.needsEncryption) { if (pendingEvent.needsEncryption) {
pendingEvent.setEncrypting(); pendingEvent.setEncrypting();
const cleanedContent = pendingEvent.cleanedContent; const encryptionContent = pendingEvent.contentForEncryption;
const {type, content} = await log.wrap("encrypt", log => this._roomEncryption.encrypt( const {type, content} = await log.wrap("encrypt", log => this._roomEncryption.encrypt(
pendingEvent.eventType, cleanedContent, this._hsApi, log)); pendingEvent.eventType, encryptionContent, this._hsApi, log));
pendingEvent.setEncrypted(type, content); pendingEvent.setEncrypted(type, content);
await this._tryUpdateEvent(pendingEvent); await this._tryUpdateEvent(pendingEvent);
} }