useful command added

src/functions/about.rs

@@ -1,4 +1,4 @@
-use crate::{hooks, utils::keyboard_manager::Keyboard};
+use crate::{hooks, utils::keyboard::Keyboard};
 use teloxide::{
     payloads::SendMessageSetters,
     prelude::*,

src/functions/groups.rs

@@ -1,6 +1,6 @@
 use crate::utils::{
-    group_manager::{Group, Groups},
-    keyboard_manager::Keyboard,
+    groups::{Group, Groups},
+    keyboard::Keyboard,
 };
 use teloxide::{
     payloads::SendMessageSetters,

src/functions/inline.rs

@@ -2,7 +2,7 @@ use crates_io_api::{AsyncClient, Crate, CratesQuery};
 use std::error::Error;
 use teloxide::{prelude::*, types::*};
 
-use crate::utils::inline_manager::*;
+use crate::utils::inlines::*;
 
 pub async fn inline(
     bot: Bot,

src/functions/latest.rs

@@ -1,4 +1,4 @@
-use crate::utils::{github::GitHub, keyboard_manager::Keyboard};
+use crate::utils::{github::GitHub, keyboard::Keyboard};
 use octocrab::models::repos::Release;
 use teloxide::{
     payloads::SendMessageSetters,

src/functions/mod.rs

@@ -8,16 +8,15 @@ pub mod latest;
 pub mod offtop;
 pub mod rules;
 pub mod start;
+pub mod useful;
 pub mod version;
 
 pub use inline::inline;
 
-use crate::utils::github::GitHub;
-use crate::utils::group_manager::Groups;
+use crate::utils::{github::GitHub, groups::Groups, resources::Resources};
 use crate::Command;
 use std::error::Error;
-use teloxide::prelude::*;
-use teloxide::types::*;
+use teloxide::{prelude::*, types::*};
 
 pub async fn commands(
     bot: Bot,
@@ -26,6 +25,7 @@ pub async fn commands(
     cmd: Command,
     github: GitHub,
     groups: Groups,
+    resources: Resources,
 ) -> Result<(), Box<dyn Error + Send + Sync>> {
     let _ = match cmd {
         Command::Start => crate::functions::start::command(&bot, &msg).await,
@@ -36,6 +36,7 @@ pub async fn commands(
         Command::Latest => crate::functions::latest::command(&bot, github, &msg).await,
         Command::Version => crate::functions::version::command(&bot, github, &msg).await,
         Command::Off => crate::functions::offtop::command(&bot, &msg, &me).await,
+        Command::Useful => crate::functions::useful::command(&bot, &msg, &resources).await,
     };
 
     Ok(())

src/functions/rules.rs

@@ -1,4 +1,4 @@
-use crate::{hooks, utils::keyboard_manager::Keyboard};
+use crate::{hooks, utils::keyboard::Keyboard};
 use teloxide::{
     payloads::SendMessageSetters,
     prelude::*,

src/functions/start.rs

@@ -1,4 +1,4 @@
-use crate::utils::keyboard_manager::Keyboard;
+use crate::utils::keyboard::Keyboard;
 use teloxide::{
     payloads::SendMessageSetters,
     prelude::*,

src/functions/useful.rs

@@ -0,0 +1,41 @@
+use crate::utils::{keyboard::Keyboard, resources::Resources};
+use teloxide::{
+    payloads::SendMessageSetters,
+    prelude::*,
+    types::{InlineKeyboardMarkup, ParseMode},
+};
+
+static TEXT: &str = "<b>Rustga oid foydali materiallar:</b>\n\
+Agar o'zingizdan material qo'shmoqchi bo'lsangiz, bizni \
+<a href='https://github.com/rust-lang-uz/rustina/blob/main/source.json'>\
+source.json</a> ni yangilang!";
+
+pub async fn command(bot: &Bot, msg: &Message, resources: &Resources) -> ResponseResult<()> {
+    let categories = resources.get_keys();
+
+    bot.send_message(msg.chat.id, TEXT)
+        .parse_mode(ParseMode::Html)
+        .reply_markup(keyboard_list(1, categories))
+        .disable_web_page_preview(true)
+        .await?;
+
+    Ok(())
+}
+
+pub fn keyboard_list(page: u32, categories: Vec<String>) -> InlineKeyboardMarkup {
+    let mut keyboard = Keyboard::new();
+
+    for category in categories {
+        keyboard.text(
+            &format!(
+                "{}{}",
+                &category[0..1].to_uppercase(),
+                &category[1..].replace("_", " ")
+            ),
+            &format!("useful_{}_{}", page, category),
+        );
+        keyboard.row();
+    }
+
+    keyboard.get()
+}

src/functions/version.rs

@@ -1,4 +1,4 @@
-use crate::utils::{github::GitHub, keyboard_manager::Keyboard};
+use crate::utils::{github::GitHub, keyboard::Keyboard};
 use octocrab::models::repos::Release;
 use teloxide::{
     payloads::SendMessageSetters,

src/hooks/is_private.rs

@@ -4,7 +4,7 @@ use teloxide::{
     types::{InlineKeyboardMarkup, ParseMode},
 };
 
-use crate::utils::keyboard_manager::Keyboard;
+use crate::utils::keyboard::Keyboard;
 
 static TEXT: &str = "⚠️ <b>Bu komanda faqat shaxsiy chat uchun!</b>";
 

src/lib.rs

@@ -35,6 +35,9 @@ pub enum Command {
 
     /// Report offtopic
     Off,
+
+    /// Useful resources
+    Useful,
 }
 
 pub fn handler() -> UpdateHandler<Box<dyn std::error::Error + Send + Sync + 'static>> {

src/main.rs

@@ -1,7 +1,7 @@
 use crates_io_api::AsyncClient;
 use rustina::{
     handler,
-    utils::{github::GitHub, group_manager::Groups},
+    utils::{github::GitHub, groups::Groups, resources::Resources},
 };
 use std::error::Error;
 use teloxide::prelude::*;
@@ -13,16 +13,17 @@ async fn main() -> Result<(), Box<dyn Error>> {
 
     let bot = Bot::from_env();
 
-    let groups: Groups = Groups::new();
+    let groups = Groups::new();
     let github = GitHub::new();
     let crates_client = AsyncClient::new(
         "Rustina Assistant ([email protected])",
         std::time::Duration::from_millis(100),
     )
     .unwrap();
+    let resources = Resources::new();
 
     Dispatcher::builder(bot, handler())
-        .dependencies(dptree::deps![crates_client, github, groups])
+        .dependencies(dptree::deps![crates_client, github, groups, resources])
         // If no handler succeeded to handle an update, this closure will be called
         .default_handler(|upd| async move {
             log::warn!("Unhandled update: {:?}", upd);

src/utils/inline_manager.rs → src/utils/inlines.rs

@@ -1,4 +1,4 @@
-use super::keyboard_manager::Keyboard;
+use super::keyboard::Keyboard;
 use crates_io_api::Crate;
 use teloxide::types::*;
 

src/utils/mod.rs

@@ -1,4 +1,5 @@
 pub mod github;
-pub mod group_manager;
-pub mod inline_manager;
-pub mod keyboard_manager;
+pub mod groups;
+pub mod inlines;
+pub mod keyboard;
+pub mod resources;

src/utils/resources.rs

@@ -0,0 +1,36 @@
+use serde::{Deserialize, Serialize};
+use std::collections::HashMap;
+
+static RESOURCE: &'static str = include_str!("../../source.json");
+
+#[derive(Serialize, Deserialize, Clone, Debug)]
+pub struct Resource {
+    pub name: String,
+    pub desc: String,
+    pub link: String,
+}
+
+#[derive(Clone, Debug)]
+pub struct Resources {
+    materials: HashMap<String, Vec<Resource>>,
+}
+
+impl Resources {
+    pub fn new() -> Self {
+        Resources {
+            materials: serde_json::from_str(RESOURCE).unwrap(),
+        }
+    }
+
+    pub fn get_keys(&self) -> Vec<String> {
+        self.materials.keys().map(|k| k.to_string()).collect()
+    }
+
+    pub fn get_materials(&self, key: &str) -> Option<&Vec<Resource>> {
+        self.materials.get(key)
+    }
+
+    pub fn get_material(&self, key: &str, index: usize) -> Option<&Resource> {
+        self.materials.get(key).and_then(|v| v.get(index))
+    }
+}