From 197429a4224e4bacd1a4897278467ed0acbca29a Mon Sep 17 00:00:00 2001 From: mykola2312 <49044616+mykola2312@users.noreply.github.com> Date: Sat, 2 Mar 2024 18:55:23 +0200 Subject: [PATCH] impl Display for User so logging would be easy --- src/bot/op.rs | 7 +------ src/db.rs | 9 ++++++++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/bot/op.rs b/src/bot/op.rs index 506db29..04ba161 100644 --- a/src/bot/op.rs +++ b/src/bot/op.rs @@ -33,12 +33,7 @@ pub async fn cmd_op(bot: Bot, msg: Message, db: DbPool) -> HandlerResult { .execute(&db) .await?; - event!( - Level::INFO, - "opped {} - {}", - target.tg_id, - target.username_or_name() - ); + event!(Level::INFO, "opped {}", target); bot.send_message(msg.chat.id, "opped").await?; } else { bot.send_message(msg.chat.id, "You have to reply on target's message") diff --git a/src/db.rs b/src/db.rs index 0b8d0ac..6dcb2e3 100644 --- a/src/db.rs +++ b/src/db.rs @@ -1,6 +1,6 @@ use sqlx::migrate::MigrateDatabase; use sqlx::{Sqlite, SqlitePool}; -use std::sync::Arc; +use std::fmt; use super::util::make_database_url; @@ -15,6 +15,13 @@ pub struct User { pub last_name: Option, pub can_download: i64, pub is_admin: i64, + pub has_private_chat: i64, +} + +impl fmt::Display for User { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + write!(f, "{} - {}", self.tg_id, self.username_or_name()) + } } impl User {