Merge pull request #25 from SergiX44/fix-conversation-retrieval

Fallback and conversation retrieval
badfarm · Dec 27, 2020 · f41b309 · f41b309
2 parents c22f565 + 5ed2eb8
commit f41b309
Showing 1 changed file with 25 additions and 26 deletions.
diff --git a/src/Zanzara/Listener/ListenerResolver.php b/src/Zanzara/Listener/ListenerResolver.php
@@ -64,42 +64,41 @@ public function resolveListeners(Update $update): PromiseInterface
 
             case Message::class:
                 $text = $update->getMessage()->getText();
-                if ($text) {
-                    $chatId = $update->getEffectiveChat()->getId();
-                    $this->conversationManager->getConversationHandler($chatId)
-                        ->then(function ($handlerInfo) use ($chatId, $text, $deferred, &$listeners) {
-                            if (!$handlerInfo) {
+                $chatId = $update->getEffectiveChat()->getId();
+                $this->conversationManager->getConversationHandler($chatId)
+                    ->then(function ($handlerInfo) use ($chatId, $text, $deferred, &$listeners) {
+                        if (!$handlerInfo) {
+                            if ($text) {
                                 $this->findListenerAndPush($listeners, 'messages', $text);
-                                $deferred->resolve($listeners);
-                                return;
+                            } elseif ($this->fallbackListener) {
+                                $listeners[] = $this->fallbackListener;
                             }
+                            $deferred->resolve($listeners);
+                            return;
+                        }
+
+                        $skipListeners = $handlerInfo[1];
 
-                            $skipListeners = $handlerInfo[1];
-                            if ($skipListeners) {
+                        if (!$skipListeners && $text) {
+                            $listener = $this->findListenerAndPush($listeners, 'messages', $text);
+                            if (!$listener) {
                                 $listeners[] = new Listener($handlerInfo[0], $this->container);
                             } else {
-                                $listener = $this->findListenerAndPush($listeners, 'messages', $text);
-                                if (!$listener) {
-                                    $listeners[] = new Listener($handlerInfo[0], $this->container);
-                                } else {
-                                    $this->conversationManager->deleteConversationCache($chatId);
-                                }
+                                $this->conversationManager->deleteConversationCache($chatId);
                             }
-
-                            $deferred->resolve($listeners);
-                        })->otherwise(function ($e) use ($deferred) {
-                            // if something goes wrong, reject the promise
-                            $deferred->reject($e);
-                        });
-
-                } else {
-                    $deferred->resolve($listeners);
-                }
+                        } else {
+                            $listeners[] = new Listener($handlerInfo[0], $this->container);
+                        }
+
+                        $deferred->resolve($listeners);
+                    })->otherwise(function ($e) use ($deferred) {
+                        // if something goes wrong, reject the promise
+                        $deferred->reject($e);
+                    });
                 break;
 
             default:
                 $deferred->resolve($listeners);
-
         }
 
         return $deferred->promise();