From d1dc4c9e9c36f48cc583bcef66e6e940816ed518 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@element.io>
Date: Tue, 20 Apr 2021 17:56:53 +0200
Subject: [PATCH] remove extra layer of log items

---
 src/matrix/room/Invite.js | 49 ++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 26 deletions(-)

diff --git a/src/matrix/room/Invite.js b/src/matrix/room/Invite.js
index 58f598a4..a9846ccc 100644
--- a/src/matrix/room/Invite.js
+++ b/src/matrix/room/Invite.js
@@ -77,33 +77,30 @@ export class Invite extends EventEmitter {
 
     async writeSync(membership, roomResponse, txn, log) {
         if (membership === "invite") {
-            return log.wrap("new invite", async log => {
-                log.set("id", this.id);
-                const inviteState = roomResponse["invite_state"]?.events;
-                if (!Array.isArray(inviteState)) {
-                    return null;
-                }
-                const summaryData = this._createSummaryData(inviteState);
-                let heroes;
-                if (!summaryData.name && !summaryData.canonicalAlias) {
-                    heroes = await this._createHeroes(inviteState);
-                }
-                const myInvite = this._getMyInvite(inviteState);
-                if (!myInvite) {
-                    return null;
-                }
-                const inviter = this._getInviter(myInvite, inviteState);
-                const inviteData = this._createData(inviteState, myInvite, inviter, summaryData, heroes);
-                txn.invites.set(inviteData);
-                return {inviteData, inviter};
-            });
-        } else {
-            return log.wrap("remove invite", log => {
-                log.set("id", this.id);
-                log.set("membership", membership);
-                txn.invites.remove(this.id);
+            log.set("id", this.id);
+            log.set("add", true);
+            const inviteState = roomResponse["invite_state"]?.events;
+            if (!Array.isArray(inviteState)) {
                 return null;
-            });
+            }
+            const summaryData = this._createSummaryData(inviteState);
+            let heroes;
+            if (!summaryData.name && !summaryData.canonicalAlias) {
+                heroes = await this._createHeroes(inviteState);
+            }
+            const myInvite = this._getMyInvite(inviteState);
+            if (!myInvite) {
+                return null;
+            }
+            const inviter = this._getInviter(myInvite, inviteState);
+            const inviteData = this._createData(inviteState, myInvite, inviter, summaryData, heroes);
+            txn.invites.set(inviteData);
+            return {inviteData, inviter};
+        } else {
+            log.set("id", this.id);
+            log.set("membership", membership);
+            txn.invites.remove(this.id);
+            return null;
         }
     }