Set initial dialog status as waiting for command

src/main/scala/eu/xeppaka/bot/CheckDeliveryDialog.scala

@@ -36,7 +36,6 @@ object CheckDeliveryDialog {
       case "/remove" => RemoveParcel
       case "/list" => ListParcels
       case "/help" => Help
-      case "/start" => Help
       case _ => Help
     }
   }
@@ -58,6 +57,8 @@ object CheckDeliveryDialog {
     one_time_keyboard = Some(true)
   ))
 
+  private val removeKeyboard = Some(ReplyKeyboardRemove())
+
   def behavior(chatId: Long, botUri: BotUri): Behavior[Command] = Behaviors.setup[Command] { ctx =>
     implicit val materializer: ActorMaterializer = ActorMaterializer()(ctx.system.toUntyped)
     implicit val executionContext: ExecutionContext = ctx.system.dispatchers.lookup(DispatcherSelector.default())
@@ -66,8 +67,6 @@ object CheckDeliveryDialog {
     val deliveryStateAdapter: ActorRef[CzechPostDeliveryCheck.DeliveryStateChanged] = ctx.messageAdapter(stateChanged => DeliveryStateChanged(stateChanged.state))
     val czechPostDeliveryCheck = ctx.spawnAnonymous(Behaviors.supervise(CzechPostDeliveryCheck.behavior(chatId.toString, deliveryStateAdapter)).onFailure(SupervisorStrategy.restart))
 
-    def initial: Behavior[Command] = sendMessage(SendMessage(chatId, "Waiting for a command...", reply_markup = commandsKeyboard), waitCommand, initial)
-
     def waitCommand: Behavior[Command] = Behaviors.receiveMessage {
       case ProcessMessage(msg, replyTo) =>
         val command = msg.text.map(text => DialogCommand.parse(text))
@@ -78,21 +77,21 @@ object CheckDeliveryDialog {
           Behaviors.same
         } else {
           val message = SendMessage(chatId, "This command is unsupported.")
-          sendMessage(message, initial, initial)
+          sendMessage(message, waitCommand, waitCommand)
         }
       case AddParcel =>
-        val message = SendMessage(chatId, "Please enter a parcel ID.")
+        val message = SendMessage(chatId, "Please enter a parcel ID.", reply_markup = removeKeyboard)
-        sendMessage(message, waitParcelId(parcelId => addParcel(parcelId)), initial)
+        sendMessage(message, waitParcelId(parcelId => addParcel(parcelId)), waitCommand)
       case RemoveParcel =>
-        removeParcel(initial, initial)
+        removeParcel(waitCommand, waitCommand)
       case ListParcels =>
         listParcels
       case Help =>
-        val message = SendMessage(chatId, helpMessage)
+        val message = SendMessage(chatId, helpMessage, reply_markup = commandsKeyboard)
-        sendMessage(message, initial, initial)
+        sendMessage(message, waitCommand, waitCommand)
       case DeliveryStateChanged(state) =>
         val message = SendMessage(chatId, state, Some("Markdown"))
-        sendMessage(message, initial, initial)
+        sendMessage(message, waitCommand, waitCommand)
       case _ =>
         Behaviors.unhandled
     }
@@ -110,17 +109,17 @@ object CheckDeliveryDialog {
 
       Behaviors.receiveMessage {
         case AddParcelSuccess =>
-          val message = SendMessage(chatId, s"Parcel $parcelId was added to the watch list.")
+          val message = SendMessage(chatId, s"Parcel $parcelId was added to the watch list.", reply_markup = commandsKeyboard)
-          sendMessage(message, initial, initial)
+          sendMessage(message, waitCommand, waitCommand)
         case AddParcelFailure(exception) =>
           exception match {
             case CzechPostDeliveryCheck.DuplicateParcelId(_) =>
-              val message = SendMessage(chatId, s"Parcel $parcelId is in the watch list already.")
+              val message = SendMessage(chatId, s"Parcel $parcelId is in the watch list already.", reply_markup = commandsKeyboard)
-              sendMessage(message, initial, initial)
+              sendMessage(message, waitCommand, waitCommand)
             case _ =>
               ctx.log.error(exception, "action=add_parcel result=failure")
-              val message = SendMessage(chatId, s"Adding parcel failed. Please try again.")
+              val message = SendMessage(chatId, s"Adding parcel failed. Please try again.", reply_markup = commandsKeyboard)
-              sendMessage(message, initial, initial)
+              sendMessage(message, waitCommand, waitCommand)
           }
         case otherMessage =>
           stashBuffer.stash(otherMessage)
@@ -141,12 +140,12 @@ object CheckDeliveryDialog {
       Behaviors.receiveMessage {
         case ListParcelsSuccess(parcelsList) =>
           val messageText = "*List of your watched parcels:*\n" + (if (parcelsList.nonEmpty) parcelsList.toSeq.sorted.mkString("\n") else "(empty)")
-          val message = SendMessage(chatId, messageText, Some("Markdown"))
+          val message = SendMessage(chatId, messageText, Some("Markdown"), reply_markup = commandsKeyboard)
-          sendMessage(message, initial, initial)
+          sendMessage(message, waitCommand, waitCommand)
         case ListParcelsFailure(exception) =>
           ctx.log.error(exception, "action=list_parcels result=failure chat_id={}", chatId)
-          val message = SendMessage(chatId, "Failed to get a list of your watched parcels. Please try again later.")
+          val message = SendMessage(chatId, "Failed to get a list of your watched parcels. Please try again later.", reply_markup = commandsKeyboard)
-          sendMessage(message, initial, initial)
+          sendMessage(message, waitCommand, waitCommand)
         case otherMessage =>
           stashBuffer.stash(otherMessage)
           Behaviors.same
@@ -177,8 +176,8 @@ object CheckDeliveryDialog {
             }
           case ListParcelsFailure(exception) =>
             ctx.log.error(exception, "action=list_parcels result=failure chat_id={}", chatId)
-            val message = SendMessage(chatId, "Failed to get a list of your watched parcels. Please try again later.")
+            val message = SendMessage(chatId, "Failed to get a list of your watched parcels. Please try again later.", reply_markup = commandsKeyboard)
-            sendMessage(message, initial, initial)
+            sendMessage(message, waitCommand, waitCommand)
           case otherMessage =>
             stashBuffer.stash(otherMessage)
             Behaviors.same
@@ -198,17 +197,17 @@ object CheckDeliveryDialog {
 
       Behaviors.receiveMessage {
         case RemoveParcelSuccess =>
-          val message = SendMessage(chatId, s"Parcel $parcelId was removed from the watch list.")
+          val message = SendMessage(chatId, s"Parcel $parcelId was removed from the watch list.", reply_markup = commandsKeyboard)
-          sendMessage(message, initial, initial)
+          sendMessage(message, waitCommand, waitCommand)
         case RemoveParcelFailure(exception) =>
           exception match {
             case CzechPostDeliveryCheck.ParcelIdNotFound(_) =>
-              val message = SendMessage(chatId, s"Parcel $parcelId is not found in the list of the watched parcels.")
+              val message = SendMessage(chatId, s"Parcel $parcelId is not found in the list of the watched parcels.", reply_markup = commandsKeyboard)
-              sendMessage(message, initial, initial)
+              sendMessage(message, waitCommand, waitCommand)
             case _ =>
               ctx.log.error(exception, "action=add_parcel result=failure")
-              val message = SendMessage(chatId, s"Remove of the parcel failed. Please try again.")
+              val message = SendMessage(chatId, s"Remove of the parcel failed. Please try again.", reply_markup = commandsKeyboard)
-              sendMessage(message, initial, initial)
+              sendMessage(message, waitCommand, waitCommand)
           }
         case otherMessage =>
           stashBuffer.stash(otherMessage)
@@ -223,7 +222,7 @@ object CheckDeliveryDialog {
     //        val button2 = KeyboardButton("button2")
     //        val keyboard = ReplyKeyboardMarkup(Seq(Seq(button1, button2)))
     //        val message = SendMessage(chatId, "Please enter parcel ID.", reply_markup = Some(keyboard))
-    //        sendMessage(message, waitParcelId(parcelId => addParcel(parcelId)), initial)
+    //        sendMessage(message, waitParcelId(parcelId => addParcel(parcelId)), waitCommand)
     //    }
 
     def waitParcelId(onFinish: String => Behavior[Command]): Behavior[Command] = Behaviors.receiveMessage {
@@ -293,6 +292,6 @@ object CheckDeliveryDialog {
       }
     }
 
-    initial
+    waitCommand
   }
 }