From 856c1ffe0e42cda9acf11d9c51a0e699d5d00605 Mon Sep 17 00:00:00 2001
From: Mads Marquart <madsmtm@gmail.com>
Date: Sun, 8 Sep 2019 15:39:39 +0200
Subject: [PATCH] Remove ability to control the listening loop externally

It was probably scarcely used, and separate functionality will be
developed that makes this redundant anyhow.
---
 fbchat/_client.py | 35 +++--------------------------------
 tests/utils.py    |  8 +++-----
 2 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/fbchat/_client.py b/fbchat/_client.py
index dc66c51..1e18a31 100644
--- a/fbchat/_client.py
+++ b/fbchat/_client.py
@@ -43,12 +43,6 @@ class Client:
     to provide custom event handling (mainly useful while listening).
     """
 
-    listening = False
-    """Whether the client is listening.
-
-    Used when creating an external event loop to determine when to stop listening.
-    """
-
     @property
     def uid(self):
         """The ID of the client.
@@ -2694,23 +2688,7 @@ class Client:
             except Exception as e:
                 self.onMessageError(exception=e, msg=m)
 
-    def startListening(self):
-        """Start listening from an external event loop.
-
-        Raises:
-            FBchatException: If request failed
-        """
-        self.listening = True
-
-    def doOneListen(self):
-        """Do one cycle of the listening loop.
-
-        This method is useful if you want to control the client from an external event
-        loop.
-
-        Returns:
-            bool: Whether the loop should keep running
-        """
+    def _doOneListen(self):
         try:
             if self._markAlive:
                 self._ping()
@@ -2729,7 +2707,6 @@ class Client:
             if e.request_status_code in [502, 503]:
                 # Bump pull channel, while contraining withing 0-4
                 self._pull_channel = (self._pull_channel + 1) % 5
-                self.startListening()
             else:
                 raise e
         except Exception as e:
@@ -2737,11 +2714,6 @@ class Client:
 
         return True
 
-    def stopListening(self):
-        """Clean up the variables from `Client.startListening`."""
-        self.listening = False
-        self._sticky, self._pool = (None, None)
-
     def listen(self, markAlive=None):
         """Initialize and runs the listening loop continually.
 
@@ -2751,13 +2723,12 @@ class Client:
         if markAlive is not None:
             self.setActiveStatus(markAlive)
 
-        self.startListening()
         self.onListening()
 
-        while self.listening and self.doOneListen():
+        while self._doOneListen():
             pass
 
-        self.stopListening()
+        self._sticky, self._pool = (None, None)
 
     def setActiveStatus(self, markAlive):
         """Change active status while listening.
diff --git a/tests/utils.py b/tests/utils.py
index 23a8b5b..1e44c92 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -39,22 +39,20 @@ TEXT_LIST = [
 
 
 class ClientThread(threading.Thread):
+    # TODO: Refactor this to work with the new listening setup
     def __init__(self, client, *args, **kwargs):
         self.client = client
         self.should_stop = threading.Event()
         super(ClientThread, self).__init__(*args, **kwargs)
 
     def start(self):
-        self.client.startListening()
-        self.client.doOneListen()  # QPrimer, Facebook now knows we're about to start pulling
+        self.client._doOneListen()  # QPrimer, Facebook now knows we're about to start pulling
         super(ClientThread, self).start()
 
     def run(self):
-        while not self.should_stop.is_set() and self.client.doOneListen():
+        while not self.should_stop.is_set() and self.client._doOneListen():
             pass
 
-        self.client.stopListening()
-
 
 class CaughtValue(threading.Event):
     def set(self, res):