Add BotDialogue

examples/dialogue_bot/Cargo.toml

@@ -10,10 +10,11 @@ edition = "2018"
 log = "0.4.8"
 tokio = "0.2.9"
 pretty_env_logger = "0.4.0"
+futures = "0.3.5"
 smart-default = "0.6.0"
 derive_more = "0.99.9"
 teloxide = { path = "../../" }
-teloxide-macros = { git = "http://github.com/teloxide/teloxide-macros", branch = "ponos" }
+teloxide-macros = { git = "http://github.com/teloxide/teloxide-macros", branch = "master" }
 
 [profile.release]
 lto = true

examples/dialogue_bot/src/states.rs

@@ -1,7 +1,5 @@
 use teloxide::prelude::*;
 
-use super::transitions::*;
-
 #[derive(Default)]
 pub struct StartState;
 
@@ -30,20 +28,3 @@ up!(
     Receive10x5AnswerState + [_10x5_answer: u8] -> ReceiveGandalfAlternativeNameState,
     ReceiveGandalfAlternativeNameState + [gandalf_alternative_name: String] -> ExitState,
 );
-
-#[bot_dialogue]
-#[derive(SmartDefault, From)]
-pub enum Dialogue {
-    #[default]
-    #[handler(start)]
-    Start(StartState),
-
-    #[handler(receive_days_of_week)]
-    ReceiveDaysOfWeek(ReceiveDaysOfWeekState),
-
-    #[handler(receive_10x5_answer)]
-    Receive10x5Answer(Receive10x5AnswerState),
-
-    #[handler(receive_gandalf_alternative_name)]
-    ReceiveGandalfAlternativeName(ReceiveGandalfAlternativeNameState),
-}

examples/dialogue_bot/src/transitions.rs

@@ -55,3 +55,19 @@ async fn receive_gandalf_alternative_name(
         }
     }
 }
+
+#[derive(BotDialogue, SmartDefault, From)]
+pub enum Dialogue {
+    #[default]
+    #[handler(start)]
+    Start(StartState),
+
+    #[handler(receive_days_of_week)]
+    ReceiveDaysOfWeek(ReceiveDaysOfWeekState),
+
+    #[handler(receive_10x5_answer)]
+    Receive10x5Answer(Receive10x5AnswerState),
+
+    #[handler(receive_gandalf_alternative_name)]
+    ReceiveGandalfAlternativeName(ReceiveGandalfAlternativeNameState),
+}

src/dispatching/dialogue/bot_dialogue.rs

@@ -0,0 +1,14 @@
+use crate::{
+    dispatching::{dialogue::TransitionOut, UpdateWithCx},
+    types::Message,
+};
+use futures::future::BoxFuture;
+
+/// Represents a dialogue FSM.
+pub trait BotDialogue: Default {
+    /// Turns itself into another state, depending on the input message.
+    fn dispatch(
+        self,
+        cx: UpdateWithCx<Message>,
+    ) -> BoxFuture<'static, TransitionOut<Self>>;
+}

src/dispatching/dialogue/mod.rs

@@ -42,6 +42,7 @@
 
 #![allow(clippy::type_complexity)]
 
+mod bot_dialogue;
 mod dialogue_dispatcher;
 mod dialogue_dispatcher_handler;
 mod dialogue_stage;
@@ -50,6 +51,7 @@ mod get_chat_id;
 mod storage;
 
 use crate::{requests::ResponseResult, types::Message};
+pub use bot_dialogue::BotDialogue;
 pub use dialogue_dispatcher::DialogueDispatcher;
 pub use dialogue_dispatcher_handler::DialogueDispatcherHandler;
 pub use dialogue_stage::{exit, next, DialogueStage};

src/prelude.rs

@@ -3,8 +3,8 @@
 pub use crate::{
     dispatching::{
         dialogue::{
-            exit, next, DialogueDispatcher, DialogueStage, DialogueWithCx,
+            exit, next, BotDialogue, DialogueDispatcher, DialogueStage,
-            GetChatId, TransitionIn, TransitionOut,
+            DialogueWithCx, GetChatId, TransitionIn, TransitionOut,
         },
         Dispatcher, DispatcherHandlerRx, DispatcherHandlerRxExt, UpdateWithCx,
     },