From e782333e5cc143b10cb1318eacfed0bd208fe395 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Sun, 5 Apr 2020 17:24:33 +0300
Subject: [PATCH] Fix registering default puppet when using login shared secret
---
mautrix_facebook/puppet.py | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/mautrix_facebook/puppet.py b/mautrix_facebook/puppet.py
index 8f08080..2dd772b 100644
--- a/mautrix_facebook/puppet.py
+++ b/mautrix_facebook/puppet.py
@@ -49,7 +49,7 @@ class Puppet(CustomPuppetMixin):
name: str
photo_id: str
- _is_registered: bool
+ is_registered: bool
custom_mxid: UserID
access_token: str
@@ -66,7 +66,7 @@ class Puppet(CustomPuppetMixin):
self.name = name
self.photo_id = photo_id
- self._is_registered = is_registered
+ self.is_registered = is_registered
self.custom_mxid = custom_mxid
self.access_token = access_token
@@ -90,7 +90,7 @@ class Puppet(CustomPuppetMixin):
def db_instance(self) -> DBPuppet:
if not self._db_instance:
self._db_instance = DBPuppet(fbid=self.fbid, name=self.name, photo_id=self.photo_id,
- matrix_registered=self._is_registered,
+ matrix_registered=self.is_registered,
custom_mxid=self.custom_mxid, next_batch=self._next_batch,
access_token=self.access_token)
return self._db_instance
@@ -104,7 +104,7 @@ class Puppet(CustomPuppetMixin):
def save(self) -> None:
self.db_instance.edit(name=self.name, photo_id=self.photo_id,
- matrix_registered=self._is_registered, custom_mxid=self.custom_mxid,
+ matrix_registered=self.is_registered, custom_mxid=self.custom_mxid,
access_token=self.access_token)
@property
@@ -118,14 +118,6 @@ class Puppet(CustomPuppetMixin):
# endregion
- @property
- def is_registered(self) -> bool:
- return self._is_registered or self.is_real_user
-
- @is_registered.setter
- def is_registered(self, value: bool) -> None:
- self._is_registered = value
-
def default_puppet_should_leave_room(self, room_id: RoomID) -> bool:
portal = p.Portal.get_by_mxid(room_id)
return portal and portal.fbid != self.fbid
--
GitLab