diesel.toml

@@ -0,0 +1,9 @@
+# For documentation on how to configure this file,
+# see https://diesel.rs/guides/configuring-diesel-cli
+
+[print_schema]
+file = "src/db/schema.rs"
+custom_type_derives = ["diesel_derive_enum::DbEnum", "diesel::query_builder::QueryId", "Clone"]
+
+[migrations_directory]
+dir = "./migrations"

migrations/00000000000000_diesel_initial_setup/down.sql

@@ -0,0 +1,6 @@
+-- This file was automatically created by Diesel to setup helper functions
+-- and other internal bookkeeping. This file is safe to edit, any future
+-- changes will be added to existing projects as new migrations.
+
+DROP FUNCTION IF EXISTS diesel_manage_updated_at(_tbl regclass);
+DROP FUNCTION IF EXISTS diesel_set_updated_at();

migrations/00000000000000_diesel_initial_setup/up.sql

@@ -0,0 +1,36 @@
+-- This file was automatically created by Diesel to setup helper functions
+-- and other internal bookkeeping. This file is safe to edit, any future
+-- changes will be added to existing projects as new migrations.
+
+
+
+
+-- Sets up a trigger for the given table to automatically set a column called
+-- `updated_at` whenever the row is modified (unless `updated_at` was included
+-- in the modified columns)
+--
+-- # Example
+--
+-- ```sql
+-- CREATE TABLE users (id SERIAL PRIMARY KEY, updated_at TIMESTAMP NOT NULL DEFAULT NOW());
+--
+-- SELECT diesel_manage_updated_at('users');
+-- ```
+CREATE OR REPLACE FUNCTION diesel_manage_updated_at(_tbl regclass) RETURNS VOID AS $$
+BEGIN
+    EXECUTE format('CREATE TRIGGER set_updated_at BEFORE UPDATE ON %s
+                    FOR EACH ROW EXECUTE PROCEDURE diesel_set_updated_at()', _tbl);
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE OR REPLACE FUNCTION diesel_set_updated_at() RETURNS trigger AS $$
+BEGIN
+    IF (
+        NEW IS DISTINCT FROM OLD AND
+        NEW.updated_at IS NOT DISTINCT FROM OLD.updated_at
+    ) THEN
+        NEW.updated_at := current_timestamp;
+    END IF;
+    RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;

migrations/2025-04-02-141600_create_user/down.sql

@@ -0,0 +1 @@
+DROP TABLE users

migrations/2025-04-02-141600_create_user/up.sql

@@ -0,0 +1,5 @@
+CREATE TABLE users (
+  id SERIAL PRIMARY KEY,
+  is_admin BOOLEAN NOT NULL DEFAULT FALSE
+)
+

migrations/2025-04-02-154126_add_userid_to_users/down.sql

@@ -0,0 +1,2 @@
+ALTER TABLE users
+DROP COLUMN user_id;

migrations/2025-04-02-154126_add_userid_to_users/up.sql

@@ -0,0 +1,2 @@
+ALTER TABLE users
+ADD COLUMN user_id BIGINT NOT NULL;

migrations/2025-04-02-163956_users_id_bigint/down.sql

@@ -0,0 +1,4 @@
+ALTER TABLE users
+ALTER COLUMN id TYPE integer;
+ALTER TABLE users
+ADD COLUMN user_id BIGINT NOT NULL;

migrations/2025-04-02-163956_users_id_bigint/up.sql

@@ -0,0 +1,4 @@
+ALTER TABLE users
+ALTER COLUMN id TYPE BIGINT;
+ALTER TABLE users
+DROP COLUMN user_id;

migrations/2025-04-03-000002_change_user_id_to_bigint.up.sql

@@ -0,0 +1,6 @@
+<<<<<<< HEAD
+=======
+ALTER TABLE users
+ALTER COLUMN id TYPE BIGINT;
+>>>>>>> Snippet
+

migrations/2025-04-03-130758_message_literal_map/down.sql

@@ -0,0 +1 @@
+DROP TABLE IF EXISTS messages;

migrations/2025-04-03-130758_message_literal_map/up.sql

@@ -0,0 +1,7 @@
+CREATE TABLE messages (
+    id SERIAL PRIMARY KEY,
+    chat_id BIGINT NOT NULL,
+    message_id BIGINT NOT NULL,
+    token VARCHAR(255) NOT NULL,
+    UNIQUE (chat_id, message_id)
+);

migrations/2025-04-03-134446_token_map/down.sql

@@ -0,0 +1 @@
+DROP TABLE IF EXISTS literals;

migrations/2025-04-03-134446_token_map/up.sql

@@ -0,0 +1,5 @@
+CREATE TABLE literals (
+    id SERIAL PRIMARY KEY,
+    token VARCHAR(255) UNIQUE NOT NULL,
+    value TEXT
+);

migrations/2025-04-03-135748_litral_value_not_null/down.sql

@@ -0,0 +1,2 @@
+ALTER TABLE literals
+ALTER COLUMN value DROP NOT NULL;

migrations/2025-04-03-135748_litral_value_not_null/up.sql

@@ -0,0 +1,2 @@
+ALTER TABLE literals
+ALTER COLUMN value SET NOT NULL;

migrations/2025-04-07-124248_extend_user_table/down.sql

@@ -0,0 +1,5 @@
+ALTER TABLE users
+DROP COLUMN first_name,
+DROP COLUMN last_name,
+DROP COLUMN username,
+DROP COLUMN language_code;

migrations/2025-04-07-124248_extend_user_table/up.sql

@@ -0,0 +1,5 @@
+ALTER TABLE users
+ADD COLUMN first_name VARCHAR(255),
+ADD COLUMN last_name VARCHAR(255),
+ADD COLUMN username VARCHAR(255),
+ADD COLUMN language_code VARCHAR(10);

migrations/2025-04-07-125633_non_optional_firstname/down.sql

@@ -0,0 +1,6 @@
+-- This file should undo anything in `up.sql`
+
+
+
+ALTER TABLE "users" ALTER COLUMN "first_name" DROP NOT NULL;
+

migrations/2025-04-07-125633_non_optional_firstname/up.sql

@@ -0,0 +1,6 @@
+-- Your SQL goes here
+
+
+
+ALTER TABLE "users" ALTER COLUMN "first_name" SET NOT NULL;
+

migrations/2025-04-07-130716_event_table/down.sql

@@ -0,0 +1,2 @@
+DROP TABLE events;
+

migrations/2025-04-07-130716_event_table/up.sql

@@ -0,0 +1,4 @@
+CREATE TABLE events (
+    id SERIAL PRIMARY KEY,
+    time TIMESTAMP UNIQUE NOT NULL
+);

migrations/2025-04-07-130908_reservation_table/down.sql

@@ -0,0 +1,2 @@
+DROP TABLE reservations;
+DROP TYPE reservation_status;

migrations/2025-04-07-130908_reservation_table/up.sql

@@ -0,0 +1,10 @@
+CREATE TYPE reservation_status AS ENUM ('booked', 'paid');
+
+CREATE TABLE reservations (
+    id SERIAL PRIMARY KEY,
+    user_id INTEGER REFERENCES users(id),
+    entered_name VARCHAR(255),
+    booked_time TIMESTAMP NOT NULL,
+    event_id INTEGER REFERENCES events(id),
+    status reservation_status NOT NULL
+);

migrations/2025-04-07-135609_stringify_reservation_status/down.sql

@@ -0,0 +1,2 @@
+CREATE TYPE reservation_status AS ENUM ('booked', 'paid');
+ALTER TABLE reservations ALTER COLUMN status TYPE reservation_status USING status::reservation_status;

migrations/2025-04-07-135609_stringify_reservation_status/up.sql

@@ -0,0 +1,2 @@
+ALTER TABLE reservations ALTER COLUMN status TYPE VARCHAR;
+DROP TYPE reservation_status;

migrations/2025-04-07-144225_fix_reservation_userid_bigint/down.sql

@@ -0,0 +1,2 @@
+ALTER TABLE reservations
+ALTER COLUMN user_id TYPE INTEGER;

migrations/2025-04-07-144225_fix_reservation_userid_bigint/up.sql

@@ -0,0 +1,2 @@
+ALTER TABLE reservations
+ALTER COLUMN user_id TYPE BIGINT;

migrations/2025-04-07-144945_require_fields_reservation/down.sql

@@ -0,0 +1,4 @@
+ALTER TABLE reservations
+ALTER COLUMN user_id DROP NOT NULL,
+ALTER COLUMN entered_name DROP NOT NULL,
+ALTER COLUMN event_id DROP NOT NULL;

migrations/2025-04-07-144945_require_fields_reservation/up.sql

@@ -0,0 +1,4 @@
+ALTER TABLE reservations
+ALTER COLUMN user_id SET NOT NULL,
+ALTER COLUMN entered_name SET NOT NULL,
+ALTER COLUMN event_id SET NOT NULL;

migrations/2025-04-07-153426_event_timestamptz/down.sql

@@ -0,0 +1,2 @@
+ALTER TABLE events
+ALTER COLUMN time TYPE TIMESTAMP;

migrations/2025-04-07-153426_event_timestamptz/up.sql

@@ -0,0 +1,2 @@
+ALTER TABLE events
+ALTER COLUMN time TYPE TIMESTAMPTZ;

migrations/2025-04-10-120721_media_table/down.sql

@@ -0,0 +1,2 @@
+DROP TABLE media;
+

migrations/2025-04-10-120721_media_table/up.sql

@@ -0,0 +1,6 @@
+CREATE TABLE media (
+    id SERIAL PRIMARY KEY,
+    token VARCHAR NOT NULL,
+    media_type VARCHAR NOT NULL,
+    file_id VARCHAR NOT NULL
+);

migrations/2025-04-18-100731_add_media_group_id/down.sql

@@ -0,0 +1 @@
+ALTER TABLE media DROP COLUMN media_group_id;

migrations/2025-04-18-100731_add_media_group_id/up.sql

@@ -0,0 +1,2 @@
+ALTER TABLE media ADD COLUMN media_group_id VARCHAR NOT NULL;
+

migrations/2025-04-18-101829_optional_media_group_id/down.sql

@@ -0,0 +1 @@
+ALTER TABLE media ALTER COLUMN media_group_id SET NOT NULL;

migrations/2025-04-18-101829_optional_media_group_id/up.sql

@@ -0,0 +1 @@
+ALTER TABLE media ALTER COLUMN media_group_id DROP NOT NULL;

src/admin.rs

@@ -3,11 +3,11 @@ use teloxide::{
     utils::{command::BotCommands, render::RenderMessageTextHelper},
 };
 
+use crate::LogMsg;
 use crate::{
     db::{CallDB, DB},
     BotResult,
 };
-use crate::{BotDialogue, LogMsg, State};
 use log::info;
 
 // These are should not appear in /help
@@ -27,12 +27,6 @@ pub enum AdminCommands {
     Pin,
     /// Removes your admin privileges
     Deop,
-    /// Send command and then click button to edits text in it
-    EditButton,
-    /// Set specified literal value
-    SetLiteral { literal: String },
-    /// Sets chat where this message entered as support's chats
-    SetChat,
 }
 
 pub async fn admin_command_handler(
@@ -40,7 +34,6 @@ pub async fn admin_command_handler(
     bot: Bot,
     msg: Message,
     cmd: AdminCommands,
-    dialogue: BotDialogue,
 ) -> BotResult<()> {
     let tguser = match msg.from.clone() {
         Some(user) => user,
@@ -76,32 +69,6 @@ pub async fn admin_command_handler(
                 .await?;
             Ok(())
         }
-        AdminCommands::EditButton => {
-            dialogue.update(State::EditButton).await?;
-            bot.send_message(msg.chat.id, "Click button which text should be edited")
-                .await?;
-            Ok(())
-        }
-        AdminCommands::SetLiteral { literal } => {
-            dialogue
-                .update(State::Edit {
-                    literal,
-                    lang: "ru".to_string(),
-                    is_caption_set: false,
-                })
-                .await?;
-            bot.send_message(msg.chat.id, "Send message for literal")
-                .await?;
-
-            Ok(())
-        }
-        AdminCommands::SetChat => {
-            dialogue.exit().await?;
-            db.set_literal("support_chat_id", &msg.chat.id.0.to_string())
-                .await?;
-            bot.send_message(msg.chat.id, "ChatId is set!").await?;
-            Ok(())
-        }
     }
 }
 

src/db/application.rs

@@ -1,39 +0,0 @@
-use chrono::{DateTime, FixedOffset, Local};
-use serde::{Deserialize, Serialize};
-
-use super::DbResult;
-use crate::query_call_consume;
-use crate::CallDB;
-
-#[derive(Serialize, Deserialize, Default)]
-pub struct Application<C>
-where
-    C: Serialize,
-{
-    pub _id: bson::oid::ObjectId,
-    pub created_at: DateTime<FixedOffset>,
-    #[serde(flatten)]
-    pub from: C,
-}
-
-impl<C> Application<C>
-where
-    C: Serialize + for<'a> Deserialize<'a> + Send + Sync,
-{
-    pub fn new(from: C) -> Self {
-        Self {
-            _id: Default::default(),
-            created_at: Local::now().into(),
-            from,
-        }
-    }
-
-    query_call_consume!(store, self, db, Self, {
-        let db = db.get_database().await;
-        let ci = db.collection::<Self>("applications");
-
-        ci.insert_one(&self).await?;
-
-        Ok(self)
-    });
-}

src/db/callback_info.rs

@@ -16,7 +16,6 @@ where
 {
     pub _id: bson::oid::ObjectId,
     pub created_at: DateTime<FixedOffset>,
-    pub literal: Option<String>,
     #[serde(flatten)]
     pub callback: C,
 }
@@ -29,16 +28,6 @@ where
         Self {
             _id: Default::default(),
             created_at: Local::now().into(),
-            literal: None,
-            callback,
-        }
-    }
-
-    pub fn new_with_literal(callback: C, literal: String) -> Self {
-        Self {
-            _id: Default::default(),
-            created_at: Local::now().into(),
-            literal: Some(literal),
             callback,
         }
     }

src/db/mod.rs

@@ -1,4 +1,3 @@
-pub mod application;
 pub mod callback_info;
 
 use std::time::Duration;
@@ -38,7 +37,6 @@ pub struct User {
     pub last_name: Option<String>,
     pub username: Option<String>,
     pub language_code: Option<String>,
-    pub metas: Vec<String>,
 }
 
 #[macro_export]
@@ -78,23 +76,6 @@ impl User {
 
         Ok(())
     });
-
-    pub async fn insert_meta<D: CallDB>(&self, db: &mut D, meta: &str) -> DbResult<()> {
-        let db_collection = db.get_database().await.collection::<Self>("users");
-
-        db_collection
-            .update_one(
-                doc! { "_id": self._id },
-                doc! {
-                    "$push": {
-                        "metas": meta,
-                    }
-                },
-            )
-            .await?;
-
-        Ok(())
-    }
 }
 
 #[derive(Serialize, Deserialize)]
@@ -141,6 +122,7 @@ impl DB {
     }
 
     pub async fn migrate(&mut self) -> DbResult<()> {
+        let db = self.get_database().await;
         /// some migrations doesn't realy need type of collection
         type AnyCollection = Event;
         let events = self.get_database().await.collection::<Event>("events");
@@ -234,7 +216,7 @@ pub trait CallDB {
                 doc! { "id": userid },
                 doc! {
                     "$set": doc! { "first_name": firstname},
-                    "$setOnInsert": doc! { "is_admin": false, "metas": [] },
+                    "$setOnInsert": doc! { "is_admin": false },
                 },
             )
             .upsert(true)

src/db/models.rs

@@ -0,0 +1,74 @@
+// Generated by diesel_ext
+
+#![allow(unused)]
+#![allow(clippy::all)]
+
+use crate::db::schema::*;
+
+use chrono::offset::Utc;
+use chrono::DateTime;
+use chrono::NaiveDateTime;
+use diesel::prelude::*;
+#[derive(Queryable, Debug, Identifiable)]
+#[diesel(table_name = events)]
+pub struct Event {
+    pub id: i32,
+    pub time: DateTime<Utc>,
+}
+
+#[derive(Queryable, Debug, Identifiable)]
+#[diesel(table_name = literals)]
+pub struct Literal {
+    pub id: i32,
+    pub token: String,
+    pub value: String,
+}
+
+#[derive(Queryable, Debug, Identifiable)]
+#[diesel(table_name = media)]
+pub struct Media {
+    pub id: i32,
+    pub token: String,
+    pub media_type: String,
+    pub file_id: String,
+    pub media_group_id: Option<String>,
+}
+
+#[derive(Queryable, Debug, Identifiable)]
+#[diesel(table_name = messages)]
+pub struct Message {
+    pub id: i32,
+    pub chat_id: i64,
+    pub message_id: i64,
+    pub token: String,
+}
+
+#[derive(Queryable, Debug, Identifiable)]
+#[diesel(table_name = reservations)]
+pub struct Reservation {
+    pub id: i32,
+    pub user_id: i64,
+    pub entered_name: String,
+    pub booked_time: NaiveDateTime,
+    pub event_id: i32,
+    pub status: String,
+}
+
+#[derive(Queryable, Debug, Identifiable)]
+#[diesel(primary_key(chat_id))]
+#[diesel(table_name = teloxide_dialogues)]
+pub struct TeloxideDialogue {
+    pub chat_id: i64,
+    pub dialogue: Vec<u8>,
+}
+
+#[derive(Queryable, Debug)]
+#[diesel(table_name = users)]
+pub struct User {
+    pub id: i64,
+    pub is_admin: bool,
+    pub first_name: String,
+    pub last_name: Option<String>,
+    pub username: Option<String>,
+    pub language_code: Option<String>,
+}

src/db/schema.rs

@@ -0,0 +1,84 @@
+// @generated automatically by Diesel CLI.
+
+diesel::table! {
+    events (id) {
+        id -> Int4,
+        time -> Timestamptz,
+    }
+}
+
+diesel::table! {
+    literals (id) {
+        id -> Int4,
+        #[max_length = 255]
+        token -> Varchar,
+        value -> Text,
+    }
+}
+
+diesel::table! {
+    media (id) {
+        id -> Int4,
+        token -> Varchar,
+        media_type -> Varchar,
+        file_id -> Varchar,
+        media_group_id -> Nullable<Varchar>,
+    }
+}
+
+diesel::table! {
+    messages (id) {
+        id -> Int4,
+        chat_id -> Int8,
+        message_id -> Int8,
+        #[max_length = 255]
+        token -> Varchar,
+    }
+}
+
+diesel::table! {
+    reservations (id) {
+        id -> Int4,
+        user_id -> Int8,
+        #[max_length = 255]
+        entered_name -> Varchar,
+        booked_time -> Timestamp,
+        event_id -> Int4,
+        status -> Varchar,
+    }
+}
+
+diesel::table! {
+    teloxide_dialogues (chat_id) {
+        chat_id -> Int8,
+        dialogue -> Bytea,
+    }
+}
+
+diesel::table! {
+    users (id) {
+        id -> Int8,
+        is_admin -> Bool,
+        #[max_length = 255]
+        first_name -> Varchar,
+        #[max_length = 255]
+        last_name -> Nullable<Varchar>,
+        #[max_length = 255]
+        username -> Nullable<Varchar>,
+        #[max_length = 10]
+        language_code -> Nullable<Varchar>,
+    }
+}
+
+diesel::joinable!(reservations -> events (event_id));
+diesel::joinable!(reservations -> users (user_id));
+
+diesel::allow_tables_to_appear_in_same_query!(
+    events,
+    literals,
+    media,
+    messages,
+    reservations,
+    teloxide_dialogues,
+    users,
+);

src/main.rs

@@ -3,9 +3,8 @@ pub mod db;
 pub mod mongodb_storage;
 pub mod utils;
 
-use db::application::Application;
 use db::callback_info::CallbackInfo;
-use log::{error, info, warn};
+use log::{info, warn};
 use std::time::Duration;
 use utils::create_callback_button;
 
@@ -15,14 +14,15 @@ use crate::db::{CallDB, DB};
 use crate::mongodb_storage::MongodbStorage;
 
 use chrono::{DateTime, Utc};
+use chrono_tz::Asia;
 use db::DbError;
 use envconfig::Envconfig;
 use serde::{Deserialize, Serialize};
 use teloxide::dispatching::dialogue::serializer::Json;
 use teloxide::dispatching::dialogue::{GetChatId, Serializer};
 use teloxide::types::{
-    InlineKeyboardButton, InlineKeyboardMarkup, InputFile, InputMedia, MediaKind, MessageId,
+    InlineKeyboardButton, InlineKeyboardMarkup, InputFile, InputMedia, MediaKind, MessageKind,
-    MessageKind, ParseMode, ReplyMarkup,
+    ParseMode, ReplyMarkup,
 };
 use teloxide::{
     payloads::SendMessageSetters,
@@ -40,15 +40,13 @@ pub struct Config {
     pub db_url: String,
     #[envconfig(from = "ADMIN_PASS")]
     pub admin_password: String,
-    #[envconfig(from = "ADMIN_ID")]
-    pub admin_id: u64,
 }
 
 #[derive(BotCommands, Clone)]
 #[command(rename_rule = "lowercase")]
 enum UserCommands {
     /// The first message of user
-    Start(String),
+    Start,
     /// Shows this message.
     Help,
 }
@@ -73,7 +71,6 @@ pub enum State {
         lang: String,
         is_caption_set: bool,
     },
-    EditButton,
 }
 
 #[derive(Serialize, Deserialize)]
@@ -82,9 +79,6 @@ pub enum State {
 pub enum Callback {
     MoreInfo,
     ProjectPage { id: u32 },
-    GoHome,
-    LeaveApplication,
-    AskQuestion, // Add this line for the new callback
 }
 
 type CallbackStore = CallbackInfo<Callback>;
@@ -109,7 +103,6 @@ pub enum BotError {
     TeloxideError(#[from] teloxide::RequestError),
     // TODO: not a really good to hardcode types, better to extend it later
     StorageError(#[from] mongodb_storage::MongodbStorageError<<Json as Serializer<State>>::Error>),
-    MsgTooOld(String),
 }
 
 pub type BotResult<T> = Result<T, BotError>;
@@ -150,18 +143,6 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         .inspect(|u: Update| {
             info!("{u:#?}"); // Print the update to the console with inspect
         })
-        .branch(
-            Update::filter_callback_query()
-                .filter_async(async |q: CallbackQuery, mut db: DB| {
-                    let tguser = q.from.clone();
-                    let user = db
-                        .get_or_init_user(tguser.id.0 as i64, &tguser.first_name)
-                        .await;
-                    user.map(|u| u.is_admin).unwrap_or(false)
-                })
-                .enter_dialogue::<CallbackQuery, MongodbStorage<Json>, State>()
-                .branch(dptree::case![State::EditButton].endpoint(button_edit_callback)),
-        )
         .branch(Update::filter_callback_query().endpoint(callback_handler))
         .branch(command_handler(config))
         .branch(
@@ -205,63 +186,6 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     Ok(())
 }
 
-async fn button_edit_callback(
-    bot: Bot,
-    mut db: DB,
-    dialogue: BotDialogue,
-    q: CallbackQuery,
-) -> BotResult<()> {
-    bot.answer_callback_query(&q.id).await?;
-
-    let id = match q.data {
-        Some(id) => id,
-        None => {
-            bot.send_message(q.from.id, "Not compatible callback to edit text on")
-                .await?;
-
-            return Ok(());
-        }
-    };
-
-    let ci = match CallbackStore::get(&mut db, &id).await? {
-        Some(ci) => ci,
-        None => {
-            bot.send_message(
-                q.from.id,
-                "Can't get button information. Maybe created not by this bot or message too old",
-            )
-            .await?;
-
-            return Ok(());
-        }
-    };
-    let literal = match ci.literal {
-        Some(l) => l,
-        None => {
-            bot.send_message(
-                q.from.id,
-                "This button is not editable (probably text is generated)",
-            )
-            .await?;
-
-            return Ok(());
-        }
-    };
-
-    let lang = "ru".to_string();
-    dialogue
-        .update(State::Edit {
-            literal,
-            lang,
-            is_caption_set: false,
-        })
-        .await?;
-
-    bot.send_message(q.from.id, "Send text of button").await?;
-
-    Ok(())
-}
-
 async fn callback_handler(bot: Bot, mut db: DB, q: CallbackQuery) -> BotResult<()> {
     bot.answer_callback_query(&q.id).await?;
 
@@ -284,119 +208,17 @@ async fn callback_handler(bot: Bot, mut db: DB, q: CallbackQuery) -> BotResult<(
 
     match callback {
         Callback::MoreInfo => {
-            let keyboard = Some(single_button_markup!(
+            answer_message(
-                create_callback_button("go_home", Callback::GoHome, &mut db).await?
-            ));
-
-            replace_message(
                 &bot,
-                &mut db,
                 q.chat_id().map(|i| i.0).unwrap_or(q.from.id.0 as i64),
-                q.message.map_or_else(
+                &mut db,
-                    || {
+                "more_info",
-                        Err(BotError::MsgTooOld(
+                None as Option<InlineKeyboardMarkup>,
-                            "Failed to get message id, probably message too old".to_string(),
-                        ))
-                    },
-                    |m| Ok(m.id().0),
-                )?,
-                "more_info_msg",
-                keyboard,
             )
             .await?
         }
         Callback::ProjectPage { id } => {
-            let nextproject = match db
+            bot.send_message(q.from.id, format!("Some project No: {id}"))
-                .get_literal_value(&format!("project_{}_msg", id + 1))
-                .await?
-                .unwrap_or("emptyproject".into())
-                .as_str()
-            {
-                "end" | "empty" | "none" => None,
-                _ => Some(
-                    create_callback_button(
-                        "next_project",
-                        Callback::ProjectPage { id: id + 1 },
-                        &mut db,
-                    )
-                    .await?,
-                ),
-            };
-            let prevproject = match id.wrapping_sub(1) {
-                0 => None,
-                _ => Some(
-                    create_callback_button(
-                        "prev_project",
-                        Callback::ProjectPage {
-                            id: id.wrapping_sub(1),
-                        },
-                        &mut db,
-                    )
-                    .await?,
-                ),
-            };
-            let keyboard = buttons_markup!(
-                [prevproject, nextproject].into_iter().flatten(),
-                [create_callback_button("go_home", Callback::GoHome, &mut db).await?]
-            );
-
-            replace_message(
-                &bot,
-                &mut db,
-                q.chat_id().map(|i| i.0).unwrap_or(q.from.id.0 as i64),
-                q.message.map_or_else(
-                    || {
-                        Err(BotError::MsgTooOld(
-                            "Failed to get message id, probably message too old".to_string(),
-                        ))
-                    },
-                    |m| Ok(m.id().0),
-                )?,
-                &format!("project_{}_msg", id),
-                Some(keyboard),
-            )
-            .await?
-        }
-        Callback::GoHome => {
-            let keyboard = make_start_buttons(&mut db).await?;
-
-            replace_message(
-                &bot,
-                &mut db,
-                q.chat_id().map(|i| i.0).unwrap_or(q.from.id.0 as i64),
-                q.message.map_or_else(
-                    || {
-                        Err(BotError::MsgTooOld(
-                            "Failed to get message id, probably message too old".to_string(),
-                        ))
-                    },
-                    |m| Ok(m.id().0),
-                )?,
-                "start",
-                Some(keyboard),
-            )
-            .await?
-        }
-        Callback::LeaveApplication => {
-            let application = Application::new(q.from.clone()).store(&mut db).await?;
-            send_application_to_chat(&bot, &mut db, &application).await?;
-            answer_message(
-                &bot,
-                q.from.id.0 as i64,
-                &mut db,
-                "left_application_msg",
-                None as Option<InlineKeyboardMarkup>,
-            )
-            .await?;
-        }
-        Callback::AskQuestion => {
-            answer_message(
-                &bot,
-                q.from.id.0 as i64,
-                &mut db,
-                "ask_question_msg",
-                None as Option<InlineKeyboardMarkup>,
-            )
                 .await?;
         }
     };
@@ -404,74 +226,6 @@ async fn callback_handler(bot: Bot, mut db: DB, q: CallbackQuery) -> BotResult<(
     Ok(())
 }
 
-async fn send_application_to_chat(
-    bot: &Bot,
-    db: &mut DB,
-    app: &Application<teloxide::types::User>,
-) -> BotResult<()> {
-    let chat_id: i64 = match db.get_literal_value("support_chat_id").await? {
-        Some(strcid) => match strcid.parse() {
-            Ok(cid) => cid,
-            Err(err) => {
-                notify_admin(&format!(
-                    "Support chat_id should be a number. Got: {strcid}, err: {err}.\n\
-                Anyways, applied user: {:?}",
-                    app.from
-                ))
-                .await;
-                return Ok(());
-            }
-        },
-        None => {
-            notify_admin(&format!(
-                "support_chat_id is not set!!!\nAnyways, applied user: {:?}",
-                app.from
-            ))
-            .await;
-            return Ok(());
-        }
-    };
-    let msg = match db.get_literal_value("application_format").await? {
-        Some(msg) => msg
-            .replace("{user_id}", app.from.id.0.to_string().as_str())
-            .replace(
-                "{username}",
-                app.from
-                    .username
-                    .clone()
-                    .unwrap_or("Username not set".to_string())
-                    .as_str(),
-            ),
-        None => {
-            notify_admin("format for support_chat_id is not set").await;
-            return Ok(());
-        }
-    };
-
-    bot.send_message(ChatId(chat_id), msg).await?;
-
-    Ok(())
-}
-
-/// This is an emergent situation function, so it should not return any Result, but handle Results
-/// on its own
-async fn notify_admin(text: &str) {
-    let config = match Config::init_from_env() {
-        Ok(config) => config,
-        Err(err) => {
-            error!("notify_admin: Failed to get config from env, err: {err}");
-            return;
-        }
-    };
-    let bot = Bot::new(&config.bot_token);
-    match bot.send_message(UserId(config.admin_id), text).await {
-        Ok(_) => {}
-        Err(err) => {
-            error!("notify_admin: Failed to send message to admin, WHATS WRONG???, err: {err}");
-        }
-    }
-}
-
 async fn edit_msg_cmd_handler(
     bot: Bot,
     mut db: DB,
@@ -678,7 +432,6 @@ fn command_handler(
                     user.map(|u| u.is_admin).unwrap_or(false)
                 })
                 .filter_command::<AdminCommands>()
-                .enter_dialogue::<Message, MongodbStorage<Json>, State>()
                 .endpoint(admin_command_handler),
         )
 }
@@ -703,10 +456,7 @@ async fn user_command_handler(
         msg.html_text().unwrap_or("|EMPTY_MESSAGE|".into())
     );
     match cmd {
-        UserCommands::Start(meta) => {
+        UserCommands::Start => {
-            if !meta.is_empty() {
-                user.insert_meta(&mut db, &meta).await?;
-            }
             let mut db2 = db.clone();
             answer_message(
                 &bot,
@@ -853,94 +603,32 @@ async fn answer_message<RM: Into<ReplyMarkup>>(
     Ok(())
 }
 
-async fn replace_message(
-    bot: &Bot,
-    db: &mut DB,
-    chat_id: i64,
-    message_id: i32,
-    literal: &str,
-    keyboard: Option<InlineKeyboardMarkup>,
-) -> BotResult<()> {
-    let text = db
-        .get_literal_value(literal)
-        .await?
-        .unwrap_or("Please, set content of this message".into());
-    let media = db.get_media(literal).await?;
-    let (chat_id, msg_id) = match media.len() {
-        // just a text
-        0 => {
-            let msg = bot.edit_message_text(ChatId(chat_id), MessageId(message_id), text);
-            let msg = match keyboard {
-                Some(ref kbd) => msg.reply_markup(kbd.clone()),
-                None => msg,
-            };
-            let msg = msg.parse_mode(teloxide::types::ParseMode::Html);
-            info!("ENTS: {:?}", msg.entities);
-            let msg = match msg.await {
-                Ok(msg) => msg,
-                Err(teloxide::RequestError::Api(teloxide::ApiError::Unknown(errtext)))
-                    if errtext.as_str()
-                        == "Bad Request: there is no text in the message to edit" =>
-                {
-                    // fallback to sending message
-                    warn!("Fallback into sending message instead of editing because it contains media");
-                    return answer_message(bot, chat_id, db, literal, keyboard).await;
-                }
-                Err(err) => return Err(err.into()),
-            };
-
-            (msg.chat.id.0, msg.id.0)
-        }
-        // single media
-        1 => {
-            let media = &media[0]; // safe, cause we just checked len
-            let input_file = InputFile::file_id(media.file_id.to_string());
-            let media = match media.media_type.as_str() {
-                "photo" => InputMedia::Photo(teloxide::types::InputMediaPhoto::new(input_file)),
-                "video" => InputMedia::Video(teloxide::types::InputMediaVideo::new(input_file)),
-                _ => todo!(),
-            };
-            bot.edit_message_media(ChatId(chat_id), MessageId(message_id), media)
-                .await?;
-
-            let msg = bot.edit_message_caption(ChatId(chat_id), MessageId(message_id));
-            let msg = match text.as_str() {
-                "" => msg,
-                text => msg.caption(text),
-            };
-            let msg = match keyboard {
-                Some(kbd) => msg.reply_markup(kbd),
-                None => msg,
-            };
-
-            let msg = msg.parse_mode(teloxide::types::ParseMode::Html);
-            let msg = msg.await?;
-
-            (msg.chat.id.0, msg.id.0)
-        }
-        // >= 2, should use media group
-        _ => {
-            unreachable!();
-        }
-    };
-    db.set_message_literal(chat_id, msg_id, literal).await?;
-
-    Ok(())
-}
-
 async fn make_start_buttons(db: &mut DB) -> BotResult<InlineKeyboardMarkup> {
-    let mut buttons: Vec<Vec<InlineKeyboardButton>> = Vec::new();
+    let mut buttons: Vec<Vec<InlineKeyboardButton>> = db
+        .get_all_events()
+        .await?
+        .iter()
+        .map(|e| {
+            vec![InlineKeyboardButton::callback(
+                e.time.with_timezone(&Asia::Dubai).to_string(),
+                format!("event:{}", e._id),
+            )]
+        })
+        .collect();
+    buttons.push(vec![InlineKeyboardButton::callback(
+        "More info",
+        CallbackStore::new(Callback::MoreInfo)
+            .store(db)
+            .await?
+            .get_id(),
+    )]);
     buttons.push(vec![
-        create_callback_button("show_projects", Callback::ProjectPage { id: 1 }, db).await?,
+        create_callback_button(
-    ]);
+            "show_projects",
-    buttons.push(vec![
+            CallbackStore::new(Callback::ProjectPage { id: 1 }),
-        create_callback_button("more_info", Callback::MoreInfo, db).await?,
+            db,
-    ]);
+        )
-    buttons.push(vec![
+        .await?,
-        create_callback_button("leave_application", Callback::LeaveApplication, db).await?,
-    ]);
-    buttons.push(vec![
-        create_callback_button("ask_question", Callback::AskQuestion, db).await?,
     ]);
 
     Ok(InlineKeyboardMarkup::new(buttons))

src/utils.rs

@@ -6,44 +6,9 @@ use crate::{
     BotResult,
 };
 
-#[macro_export]
-macro_rules! single_button_markup {
-    ($button:expr) => {
-        InlineKeyboardMarkup {
-            inline_keyboard: vec![vec![$button]],
-        }
-    };
-}
-
-#[macro_export]
-macro_rules! stacked_buttons_markup {
-    ($( $button:expr ),+) => {
-        InlineKeyboardMarkup {
-            inline_keyboard: vec![
-                $(
-                    vec![$button],
-                )*
-            ],
-        }
-    };
-}
-
-#[macro_export]
-macro_rules! buttons_markup {
-    ($( $buttons:expr ),+) => {
-        InlineKeyboardMarkup {
-            inline_keyboard: vec![
-                $(
-                    $buttons.into_iter().collect::<Vec<_>>(),
-                )*
-            ],
-        }
-    };
-}
-
 pub async fn create_callback_button<C, D>(
     literal: &str,
-    callback: C,
+    ci: CallbackInfo<C>,
     db: &mut D,
 ) -> BotResult<InlineKeyboardButton>
 where
@@ -54,38 +19,10 @@ where
         .get_literal_value(literal)
         .await?
         .unwrap_or("Please, set content of this message".into());
-    let ci = CallbackInfo::new_with_literal(callback, literal.to_string())
+    let ci = ci.store(db).await?;
-        .store(db)
-        .await?;
 
     Ok(InlineKeyboardButton::new(
         text,
         teloxide::types::InlineKeyboardButtonKind::CallbackData(ci.get_id()),
     ))
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use teloxide::types::InlineKeyboardButton;
-    use teloxide::types::InlineKeyboardMarkup;
-
-    #[test]
-    fn test_buttons_markup() {
-        let button1 = InlineKeyboardButton::new(
-            "Button 1",
-            teloxide::types::InlineKeyboardButtonKind::CallbackData("callback1".into()),
-        );
-        let button2 = InlineKeyboardButton::new(
-            "Button 2",
-            teloxide::types::InlineKeyboardButtonKind::CallbackData("callback2".into()),
-        );
-
-        let markup = buttons_markup!([button1.clone(), button2.clone()], [button1.clone()]);
-
-        assert_eq!(markup.inline_keyboard.len(), 2);
-        assert_eq!(markup.inline_keyboard[0][0].text, "Button 1");
-        assert_eq!(markup.inline_keyboard[0][1].text, "Button 2");
-        assert_eq!(markup.inline_keyboard[1][0].text, "Button 1");
-    }
-}