if OWNER_TELEGRAM_ID is set, process commands only from this user

ayrat555 · Dec 31, 2021 · 8bd0253 · 8bd0253
1 parent 77c31b5
commit 8bd0253
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/README.md b/README.md
@@ -137,7 +137,7 @@ All configuration is done through env variables
 | DELIVER_WORKERS_NUMBER   | no       | 1             | The number of workers to deliver updates                                                                                                                                            |
 | CLEAN_INTERVAL_SECONDS   | no       | 3600          | The bot cleans old feed items and feeds without subscriptions every `CLEAN_INTERVAL_SECONDS` seconds                                                                                |
 | CLEAN_WORKERS_NUMBER     | no       | 1             | The number of workers to remove old data                                                                                                                                            |
-| OWNER_TELEGRAM_ID        | no       | --            | If this value is set, the bot will process commands from the specified chat id                                                                                                      |
+| OWNER_TELEGRAM_ID        | no       | --            | If this value is set, the bot will process commands only from the specified user id                                                                                                      |
 | REQUEST_TIMEOUT          | no       | 5             | Timeout in seconds for feed syncing requests                                                                                                                                        |
 | ADMIN_TELEGRAM_ID        | no       | --            | If this value is set, `/info` command with stats is available for ADMIN_TELEGRAM_ID                                                                                                 |
 

diff --git a/src/bot/handler.rs b/src/bot/handler.rs
@@ -55,10 +55,12 @@ impl Handler {
             Some(message) => message,
         };
 
-        let chat_id = message.chat.id as i64;
+        if let Some(owner_id) = Self::owner_telegram_id() {
+            if message.from.is_none() {
+                return;
+            }
 
-        if let Some(id) = Self::owner_telegram_id() {
-            if id != chat_id {
+            if message.from.as_ref().unwrap().id as i64 != owner_id {
                 return;
             }
         }