From 5d289f730ed2b2435386ce3d95ab887b4b0f5a10 Mon Sep 17 00:00:00 2001
From: Daniil Okhlopkov <5613295+ohld@users.noreply.github.com>
Date: Sun, 5 Oct 2025 15:04:50 +0300
Subject: [PATCH 1/4] Relax lint configuration

---
 .github/workflows/linters.yml | 2 +-
 pyproject.toml                | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
index 37b0991f..ee1f6771 100644
--- a/.github/workflows/linters.yml
+++ b/.github/workflows/linters.yml
@@ -30,7 +30,7 @@ jobs:
         continue-on-error: true
       - name: Lint with ruff
         run: |
-          ruff src
+          ruff check src
       - name: Format with ruff
         run: |
           ruff format src --diff
diff --git a/pyproject.toml b/pyproject.toml
index 43fa5e2c..41559aec 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,10 +1,8 @@
 [tool.ruff]
 line-length = 88
 
-# Enable Pyflakes `E` and `F` codes by default.
+# Enable only style-related checks by default.
 select = [
-    # Pyflakes
-    "F",
     # Pycodestyle
     "E",
     "W",

From 6f236c14668ce632b20a5bae5ebe42acbebb89d4 Mon Sep 17 00:00:00 2001
From: Daniil Okhlopkov <5613295+ohld@users.noreply.github.com>
Date: Sun, 5 Oct 2025 15:12:20 +0300
Subject: [PATCH 2/4] Fix Redis import for Ruff

---
 src/redis.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/redis.py b/src/redis.py
index cc358f7f..071cc793 100644
--- a/src/redis.py
+++ b/src/redis.py
@@ -3,7 +3,7 @@
 
 import orjson
 
-import redis.asyncio as aioredis
+from redis import asyncio as aioredis
 from src.config import settings
 from src.models import CustomModel
 

From 1a7ece5476aee48317fbd638b6ccde697dc164a9 Mon Sep 17 00:00:00 2001
From: Daniil Okhlopkov <5613295+ohld@users.noreply.github.com>
Date: Sun, 5 Oct 2025 15:22:40 +0300
Subject: [PATCH 3/4] Tidy lint config and imports

---
 pyproject.toml                 | 16 +++++++++-------
 src/tgbot/handlers/reaction.py |  8 ++------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 41559aec..64c983c4 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,9 @@
 [tool.ruff]
-line-length = 88
+line-length = 100
+src = ["src"]
+target-version = "py311"
 
+[tool.ruff.lint]
 # Enable only style-related checks by default.
 select = [
     # Pycodestyle
@@ -33,16 +36,15 @@ exclude = [
     "node_modules",
     "venv",
 ]
-per-file-ignores = {}
 
 # Allow unused variables when underscore-prefixed.
 dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
 
-# Assume Python 3.11.
-target-version = "py311"
-
-[tool.ruff.mccabe]
+[tool.ruff.lint.mccabe]
 # Unlike Flake8, default to a complexity level of 10.
 max-complexity = 10
 
-[tool.poetry.dependencies]
\ No newline at end of file
+[tool.ruff.lint.isort]
+known-first-party = ["src"]
+
+[tool.poetry.dependencies]
diff --git a/src/tgbot/handlers/reaction.py b/src/tgbot/handlers/reaction.py
index ff917995..302696c7 100644
--- a/src/tgbot/handlers/reaction.py
+++ b/src/tgbot/handlers/reaction.py
@@ -1,14 +1,10 @@
-"""
-    Handle reactions on sent memes
-"""
+"""Handle reactions on sent memes."""
 
 import asyncio
 import logging
 
 from telegram import Update
-from telegram.ext import (
-    ContextTypes,
-)
+from telegram.ext import ContextTypes
 
 from src.flows.rewards.daily import reward_user_for_daily_activity
 from src.recommendations.service import (

From e4bc9819363b47bf14df5f587ed694f00280bb67 Mon Sep 17 00:00:00 2001
From: Daniil Okhlopkov <5613295+ohld@users.noreply.github.com>
Date: Sun, 5 Oct 2025 15:32:16 +0300
Subject: [PATCH 4/4] Support legacy Ruff configuration keys

---
 pyproject.toml | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 64c983c4..f14af123 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -3,7 +3,6 @@ line-length = 100
 src = ["src"]
 target-version = "py311"
 
-[tool.ruff.lint]
 # Enable only style-related checks by default.
 select = [
     # Pycodestyle
@@ -40,10 +39,25 @@ exclude = [
 # Allow unused variables when underscore-prefixed.
 dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
 
-[tool.ruff.lint.mccabe]
+[tool.ruff.mccabe]
 # Unlike Flake8, default to a complexity level of 10.
 max-complexity = 10
 
+[tool.ruff.isort]
+known-first-party = ["src"]
+
+[tool.ruff.lint]
+select = [
+    "E",
+    "W",
+    "I001",
+]
+ignore = []
+dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
+
+[tool.ruff.lint.mccabe]
+max-complexity = 10
+
 [tool.ruff.lint.isort]
 known-first-party = ["src"]