From dab803a4e8fcf8bf0ae64ad6ca4afe8763cf9d0a Mon Sep 17 00:00:00 2001 From: er8dd Date: Fri, 22 Mar 2024 03:49:05 +0400 Subject: [PATCH] tags --- olgram/migrations/models/24_20240322034823_update.sql | 4 ++++ olgram/models/models.py | 1 + server/custom.py | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 olgram/migrations/models/24_20240322034823_update.sql diff --git a/olgram/migrations/models/24_20240322034823_update.sql b/olgram/migrations/models/24_20240322034823_update.sql new file mode 100644 index 0000000..d6f0164 --- /dev/null +++ b/olgram/migrations/models/24_20240322034823_update.sql @@ -0,0 +1,4 @@ +-- upgrade -- +ALTER TABLE "bot" ADD "enable_tags" BOOL NOT NULL DEFAULT False; +-- downgrade -- +ALTER TABLE "bot" DROP COLUMN "enable_tags"; diff --git a/olgram/models/models.py b/olgram/models/models.py index 639fa46..a12f513 100644 --- a/olgram/models/models.py +++ b/olgram/models/models.py @@ -49,6 +49,7 @@ class Bot(Model): enable_always_second_message = fields.BooleanField(default=False) enable_thread_interrupt = fields.BooleanField(default=True) enable_mailing = fields.BooleanField(default=False) + enable_tags = fields.BooleanField(default=False) last_mailing_at = fields.DatetimeField(null=True, default=None) def decrypted_token(self): diff --git a/server/custom.py b/server/custom.py index 5bed877..4b84c2f 100644 --- a/server/custom.py +++ b/server/custom.py @@ -254,7 +254,7 @@ async def handle_operator_message(message: types.Message, super_chat_id: int, bo await banned_user.delete() return SendMessage(chat_id=message.chat.id, text=_("Пользователь разбанен")) if bot.enable_tags: - if message.text.startswith("/tag "): + if message.text and message.text.startswith("/tag "): tag = message.text.replace("/tag ", "")[:20].strip() if tag: await _redis.set(_tag_uid(bot.pk, chat_id), tag, pexpire=ServerSettings.redis_timeout_ms())