Merge branch 'master' into rlottie

2019-10-02 23:30:50 +03:00
parent c84536fef7 6c312efc9a
commit 4f5a501be4
2 changed files with 8 additions and 7 deletions
@@ -147,8 +147,9 @@ class BasePortal(ABC):

    @property
    def has_bot(self) -> bool:
-        return ((bool(self.bot) and self.bot.is_in_chat(self.tgid))
-                or (self.peer_type == "user" and self.tg_receiver == self.bot.tgid))
+        return (bool(self.bot)
+                and (self.bot.is_in_chat(self.tgid)
+                     or (self.peer_type == "user" and self.tg_receiver == self.bot.tgid)))

    @property
    def main_intent(self) -> IntentAPI: