From 6ec193d554134098e592464413c04d94e553efaf Mon Sep 17 00:00:00 2001
From: miruka <miruka@disroot.org>
Date: Mon, 19 Aug 2019 11:51:09 -0400
Subject: [PATCH] =?UTF-8?q?obj.=5F=5Fdict=5F=5F=20calls=20=E2=86=92=20obj.?=
 =?UTF-8?q?serialized=20or=20vars(obj)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TODO.md                     |  2 --
 src/python/matrix_client.py | 10 +++++-----
 src/python/models/items.py  |  2 +-
 src/python/models/model.py  |  8 +++++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/TODO.md b/TODO.md
index 834004ca..6cfbfbf1 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,6 +1,4 @@
 - Refactoring
-  - filter string serialize thing
-  - `x.__dict__` → `vars(x)`
   - Make all icon SVG files white/black, since we can now use ColorOverlay
     - Make the icon blue in EditAccount when hovering and no avatar set
 
diff --git a/src/python/matrix_client.py b/src/python/matrix_client.py
index 39cdb62e..0ce0e131 100644
--- a/src/python/matrix_client.py
+++ b/src/python/matrix_client.py
@@ -318,7 +318,7 @@ class MatrixClient(nio.AsyncClient):
         room = self.models[Room, self.user_id][room_id]
 
         if room.last_event is None:
-            room.last_event = item.__dict__
+            room.last_event = item.serialized
             return
 
         for_us        = item.target_id in self.backend.clients
@@ -334,7 +334,7 @@ class MatrixClient(nio.AsyncClient):
         if item.date < room.last_event["date"]:  # If this is a past event
             return
 
-        room.last_event = item.__dict__
+        room.last_event = item.serialized
 
 
     async def register_nio_room(self, room: nio.MatrixRoom, left: bool = False,
@@ -492,7 +492,7 @@ class MatrixClient(nio.AsyncClient):
     async def onErrorResponse(self, resp: nio.ErrorResponse) -> None:
         # TODO: show something in the client, must be seen on login screen too
         try:
-            log.warning("%s - %s", resp, json.dumps(resp.__dict__, indent=4))
+            log.warning("%s - %s", resp, json.dumps(vars(resp), indent=4))
         except Exception:
             log.warning(repr(resp))
 
@@ -549,7 +549,7 @@ class MatrixClient(nio.AsyncClient):
         else:
             to = "???"
             log.warning("Invalid visibility - %s",
-                        json.dumps(ev.__dict__, indent=4))
+                        json.dumps(vars(ev), indent=4))
 
         co = f"%1 made future room history visible to {to}."
         await self.register_nio_event(room, ev, content=co)
@@ -642,7 +642,7 @@ class MatrixClient(nio.AsyncClient):
             )
 
         log.warning("Invalid member event - %s",
-                    json.dumps(ev.__dict__, indent=4))
+                    json.dumps(vars(ev), indent=4))
         return None
 
 
diff --git a/src/python/models/items.py b/src/python/models/items.py
index 6b2439fc..149c133b 100644
--- a/src/python/models/items.py
+++ b/src/python/models/items.py
@@ -37,7 +37,7 @@ class Room(ModelItem):
     left:           bool      = False
     typing_members: List[str] = field(default_factory=list)
 
-    # Event __dict__
+    # Event.serialized
     last_event: Optional[Dict[str, Any]] = field(default=None, repr=False)
 
     def __lt__(self, other: "Room") -> bool:
diff --git a/src/python/models/model.py b/src/python/models/model.py
index ebe1dc41..52eee322 100644
--- a/src/python/models/model.py
+++ b/src/python/models/model.py
@@ -54,8 +54,8 @@ class Model(MutableMapping):
         new = value
 
         if key in self:
-            existing = dict(self[key].__dict__)  # copy to not alter with pop
-            merged   = {**existing, **value.__dict__}
+            existing = dict(self[key].serialized)  # copy to not alter with pop
+            merged   = {**existing, **value.serialized}
 
             existing.pop("parent_model", None)
             merged.pop("parent_model", None)
@@ -63,7 +63,9 @@ class Model(MutableMapping):
             if merged == existing:
                 return
 
-            new = type(value)(**merged)
+            merged_init_kwargs = {**vars(self[key]), **vars(value)}
+            merged_init_kwargs.pop("parent_model", None)
+            new = type(value)(**merged_init_kwargs)
 
         new.parent_model = self