From c571267df6a8d32b496155dab12c5e0291578927 Mon Sep 17 00:00:00 2001
From: Andrey Tikhonov <andrey.tikhonov@quantori.com>
Date: Tue, 19 Sep 2023 01:31:34 +0400
Subject: [PATCH 1/6] Support language set in code tag as in telegram

---
 README.md                         | 15 +++++++++------
 src/sulguk/entities/decoration.py | 18 ++++++++++++++++--
 src/sulguk/transformer.py         | 14 ++++++++------
 3 files changed, 33 insertions(+), 14 deletions(-)
diff --git a/README.md b/README.md
index 9b26e32..3aa59ac 100644
--- a/README.md
+++ b/README.md
@@ -114,7 +114,7 @@ await bot.send_message(
 For all supported tags unknown attributes are ignored as well as unknown classes.
 Unsupported tags are raising an error. 
 
-Standard telegram tags (with some changes):
+#### Standard telegram tags (with some changes):
 * `<a>` - a hyperlink with `href` attribute 
 * `<b>`, `<strong>` - a bold text
 * `<i>`, `<em>` - an italic text
@@ -125,7 +125,10 @@ Standard telegram tags (with some changes):
 * `<pre>` with optional `class="language-<name>"` - a preformatted block with code. `<name>` will be sent as a language attribute in telegram.
 * `<code>` - an inline preformatted element. 
 
-Additional tags:
+**Note:** In standard Telegram HTML you can set a preformatted text language nesting `<code class="language-<name>">` in `<pre>` tag. This works when it is an only child. But any additional symbol outside of `<code>` breaks it.
+The same behavior is supported in sulguk. Otherwise, you can set the language on `<pre>` tag itself.
+
+#### Additional tags:
 * `<br/>` - new line
 * `<hr/>` - horizontal line
 * `<ul>` - unordered list
@@ -144,14 +147,14 @@ Additional tags:
 * `<cite>`, `<var>` - italic
 * `<progress>`, `<meter>` are rendered using emoji (🟩🟩🟩🟨⬜️⬜️)
 * `<kbd>`, `<samp>` - preformatted text
+* `<img>` - as a link with picture emoji before. `alt` text is used if provided.
 
-Tags which are treated as block elements (like `<div>`):
+#### Tags which are treated as block elements (like `<div>`):
 `<footer>`, `<header>`, `<main>`, `<nav>`, `<section>`
 
-Tags which are treated as inline elements (like `<span>`):
+#### Tags which are treated as inline elements (like `<span>`):
 `<html>`, `<body>`, `<output>`, `<data>`, `<time>`
 
-
-Tags which contents is ignored:
+#### Tags which contents is ignored:
 
 `<head>`, `<link>`, `<meta>`, `<script>`, `<style>`, `<template>`, `<title>`
diff --git a/src/sulguk/entities/decoration.py b/src/sulguk/entities/decoration.py
index 4e868fd..3065d02 100644
--- a/src/sulguk/entities/decoration.py
+++ b/src/sulguk/entities/decoration.py
@@ -3,7 +3,6 @@
 
 from sulguk.data import MessageEntity
 from sulguk.render import State, TextMode
-
 from .base import DecoratedEntity, Group
 
 
@@ -51,6 +50,8 @@ def _get_entity(self, offset: int, length: int) -> MessageEntity:
 
 @dataclass
 class Code(DecoratedEntity):
+    language: Optional[str] = None
+
     def _get_entity(self, offset: int, length: int) -> MessageEntity:
         return MessageEntity(
             type="code", offset=offset, length=length,
@@ -108,7 +109,20 @@ def render(self, state: State) -> None:
         state.canvas.text_mode = text_mode
         state.canvas.add_empty_line()
 
+    def _get_language(self):
+        if self.language:
+            return self.language
+        if len(self.entities) != 1:
+            return None
+        nested = self.entities[0]
+        if not isinstance(nested, Code):
+            return None
+        return nested.language
+
     def _get_entity(self, offset: int, length: int) -> MessageEntity:
         return MessageEntity(
-            type="pre", offset=offset, length=length, language=self.language,
+            type="pre",
+            offset=offset,
+            length=length,
+            language=self._get_language(),
         )
diff --git a/src/sulguk/transformer.py b/src/sulguk/transformer.py
index c026084..c1e7245 100644
--- a/src/sulguk/transformer.py
+++ b/src/sulguk/transformer.py
@@ -123,12 +123,9 @@ def _get_span(self, attrs: Attrs) -> Entity:
             return Spoiler()
         return Group()
 
-    def _get_code(self, attrs: Attrs) -> Entity:
-        return Code()
-
-    def _get_pre(self, attrs: Attrs) -> Entity:
+    def _get_language_class(self, attrs: Attrs):
         classes = self._get_classes(attrs)
-        language = next(
+        return next(
             (
                 c[len(LANG_CLASS_PREFIX):]
                 for c in classes
@@ -136,7 +133,12 @@ def _get_pre(self, attrs: Attrs) -> Entity:
             ),
             None,
         )
-        return Pre(language=language)
+
+    def _get_code(self, attrs: Attrs) -> Entity:
+        return Code(language=self._get_language_class(attrs))
+
+    def _get_pre(self, attrs: Attrs) -> Entity:
+        return Pre(language=self._get_language_class(attrs))
 
     def _get_mark(self, attrs: Attrs):
         inner = Group()

From cc0a01c74f397f8f62f653ff285c12dbe1065331 Mon Sep 17 00:00:00 2001
From: Andrey Tikhonov <andrey.tikhonov@quantori.com>
Date: Tue, 19 Sep 2023 01:46:41 +0400
Subject: [PATCH 2/6] fix ruff warnings

---
 ruff.toml => .ruff.toml            | 10 ++++++++--
 src/sulguk/aiogram_middleware.py   |  1 -
 src/sulguk/entities/list.py        |  1 -
 src/sulguk/entities/no_contents.py |  1 -
 src/sulguk/entities/progress.py    |  1 -
 src/sulguk/entities/stub.py        |  1 -
 src/sulguk/entities/text.py        |  1 -
 src/sulguk/render/state.py         |  1 -
 src/sulguk/wrapper.py              |  1 -
 9 files changed, 8 insertions(+), 10 deletions(-)
 rename ruff.toml => .ruff.toml (62%)

diff --git a/ruff.toml b/.ruff.toml
similarity index 62%
rename from ruff.toml
rename to .ruff.toml
index 577e580..38ed702 100644
--- a/ruff.toml
+++ b/.ruff.toml
@@ -1,5 +1,5 @@
 line-length = 79
-src = ["src/sulguk"]
+src = ["src"]
 
 select = [
     "E",
@@ -19,4 +19,10 @@ select = [
 
 ignore = [
     "RUF001",
-]
\ No newline at end of file
+]
+
+[isort]
+no-lines-before = ["local-folder"]
+
+[flake8-tidy-imports]
+ban-relative-imports = "parents"
\ No newline at end of file
diff --git a/src/sulguk/aiogram_middleware.py b/src/sulguk/aiogram_middleware.py
index 328dad2..fad7410 100644
--- a/src/sulguk/aiogram_middleware.py
+++ b/src/sulguk/aiogram_middleware.py
@@ -22,7 +22,6 @@
 )
 
 from sulguk.data import SULGUK_PARSE_MODE
-
 from .wrapper import transform_html
 
 logger = logging.getLogger(__name__)
diff --git a/src/sulguk/entities/list.py b/src/sulguk/entities/list.py
index c77c816..4d9c0d3 100644
--- a/src/sulguk/entities/list.py
+++ b/src/sulguk/entities/list.py
@@ -3,7 +3,6 @@
 
 from sulguk.data import NumberFormat
 from sulguk.render import State, int_to_number
-
 from .base import Entity, Group
 
 
diff --git a/src/sulguk/entities/no_contents.py b/src/sulguk/entities/no_contents.py
index 2883b81..a031de1 100644
--- a/src/sulguk/entities/no_contents.py
+++ b/src/sulguk/entities/no_contents.py
@@ -1,7 +1,6 @@
 from abc import ABC
 
 from sulguk.render import State
-
 from .base import Entity
 
 
diff --git a/src/sulguk/entities/progress.py b/src/sulguk/entities/progress.py
index fddf361..56304ac 100644
--- a/src/sulguk/entities/progress.py
+++ b/src/sulguk/entities/progress.py
@@ -1,7 +1,6 @@
 from dataclasses import dataclass
 
 from sulguk.render import State
-
 from .base import Entity
 
 
diff --git a/src/sulguk/entities/stub.py b/src/sulguk/entities/stub.py
index c95735c..aecc352 100644
--- a/src/sulguk/entities/stub.py
+++ b/src/sulguk/entities/stub.py
@@ -1,7 +1,6 @@
 from dataclasses import dataclass
 
 from sulguk.render import State
-
 from .base import Entity
 
 
diff --git a/src/sulguk/entities/text.py b/src/sulguk/entities/text.py
index d313618..e3dde01 100644
--- a/src/sulguk/entities/text.py
+++ b/src/sulguk/entities/text.py
@@ -1,7 +1,6 @@
 from dataclasses import dataclass
 
 from sulguk.render import State
-
 from .base import Entity
 
 
diff --git a/src/sulguk/render/state.py b/src/sulguk/render/state.py
index fc833f0..4a9366d 100644
--- a/src/sulguk/render/state.py
+++ b/src/sulguk/render/state.py
@@ -2,7 +2,6 @@
 from typing import List
 
 from sulguk.data import MessageEntity
-
 from .canvas import Canvas
 
 
diff --git a/src/sulguk/wrapper.py b/src/sulguk/wrapper.py
index 6b63dc0..99f1323 100644
--- a/src/sulguk/wrapper.py
+++ b/src/sulguk/wrapper.py
@@ -2,7 +2,6 @@
 from typing import List
 
 from sulguk.render.state import MessageEntity, State
-
 from .transformer import Transformer
 
 

From 91a8b7e84fdd721e63eead1b4ef6e566bd2dd707 Mon Sep 17 00:00:00 2001
From: Andrey Tikhonov <andrey.tikhonov@quantori.com>
Date: Mon, 25 Sep 2023 02:31:06 +0400
Subject: [PATCH 3/6] parse links

---
 src/sulguk/post_manager/__init__.py |  0
 src/sulguk/post_manager/links.py    | 59 +++++++++++++++++++++++++++++
 tests/post_manager/test_links.py    | 22 +++++++++++
 3 files changed, 81 insertions(+)
 create mode 100644 src/sulguk/post_manager/__init__.py
 create mode 100644 src/sulguk/post_manager/links.py
 create mode 100644 tests/post_manager/test_links.py

diff --git a/src/sulguk/post_manager/__init__.py b/src/sulguk/post_manager/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/sulguk/post_manager/links.py b/src/sulguk/post_manager/links.py
new file mode 100644
index 0000000..147de63
--- /dev/null
+++ b/src/sulguk/post_manager/links.py
@@ -0,0 +1,59 @@
+from dataclasses import dataclass
+from typing import Optional, Union
+from urllib.parse import urlparse, parse_qs
+
+
+@dataclass
+class Link:
+    group_id: Union[str, int]
+    post_id: Optional[int] = None
+    comment_id: Optional[int] = None
+
+
+class LinkParseError(ValueError):
+    pass
+
+
+def parse_group_id(group_id: str) -> Union[int, str]:
+    try:
+        return int(group_id)
+    except ValueError:
+        if group_id.startswith("@"):
+            return group_id
+        return "@" + group_id
+
+
+def parse_link(link: str) -> Link:
+    if not link.startswith("https://"):
+        return Link(group_id=parse_group_id(link))
+    parsed = urlparse(link)
+    if parsed.scheme != "https":
+        raise LinkParseError(f"Invalid scheme: {parsed.scheme}")
+    if parsed.hostname != "t.me":
+        raise LinkParseError(f"Invalid hostname: {parsed.hostname}")
+    path = parsed.path[1:].split("/")  # remove starting /
+    if len(path) == 1:
+        return Link(parse_group_id(path[0]))
+    elif len(path) == 2:
+        params = parse_qs(parsed.query)
+        try:
+            post_id = int(path[1])
+        except ValueError:
+            raise LinkParseError(f"Invalid post id: {path[1]}")
+        comment_id_raw = params.get("comment")
+        if not comment_id_raw:
+            comment_id = None
+        elif len(comment_id_raw) == 1:
+            try:
+                comment_id = int(comment_id_raw[0])
+            except ValueError:
+                raise LinkParseError(f"Invalid comment id: {path[1]}")
+        else:
+            raise LinkParseError(f"Cannot parse comment id: {parsed.query}")
+        return Link(
+            group_id=parse_group_id(path[0]),
+            post_id=post_id,
+            comment_id=comment_id,
+        )
+    else:
+        raise LinkParseError(f"Invalid path: {parsed.path}")
diff --git a/tests/post_manager/test_links.py b/tests/post_manager/test_links.py
new file mode 100644
index 0000000..8e4314c
--- /dev/null
+++ b/tests/post_manager/test_links.py
@@ -0,0 +1,22 @@
+import pytest
+
+from sulguk.post_manager.links import Link, parse_link
+
+
+@pytest.mark.parametrize(
+    "src, result", [
+        ("https://t.me/mock_channel_17", Link("@mock_channel_17")),
+        ("@mock_channel_17", Link("@mock_channel_17")),
+        ("123", Link(123)),
+        (
+                "https://t.me/mock_channel_17/52?comment=2754",
+                Link("@mock_channel_17", 52, 2754),
+        ),
+        (
+                "https://t.me/mock_channel_17/52",
+                Link("@mock_channel_17", 52, None),
+        ),
+    ]
+)
+def test_links(src, result):
+    assert result == parse_link(src)

From 848fb1473decba86efa56f996c1cecd46299ac02 Mon Sep 17 00:00:00 2001
From: Andrey Tikhonov <andrey.tikhonov@quantori.com>
Date: Mon, 25 Sep 2023 22:25:06 +0400
Subject: [PATCH 4/6] cli for posts

---
 pyproject.toml                    |   6 ++
 src/sulguk/post_manager/cli.py    | 142 ++++++++++++++++++++++++++++++
 src/sulguk/post_manager/links.py  |  30 +++++++
 src/sulguk/post_manager/params.py |  46 ++++++++++
 4 files changed, 224 insertions(+)
 create mode 100644 src/sulguk/post_manager/cli.py
 create mode 100644 src/sulguk/post_manager/params.py

diff --git a/pyproject.toml b/pyproject.toml
index ea0fbcd..87a2c59 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -21,6 +21,12 @@ classifiers = [
     "Operating System :: OS Independent",
 ]
 dependencies = []
+[project.optional-dependencies]
+cli = [
+    "aiogram",
+]
+[project.scripts]
+sulguk = "sulguk.post_manager.cli:cli"
 
 [project.urls]
 "Homepage" = "https://github.com/tishka17/sulguk"
diff --git a/src/sulguk/post_manager/cli.py b/src/sulguk/post_manager/cli.py
new file mode 100644
index 0000000..11c5f36
--- /dev/null
+++ b/src/sulguk/post_manager/cli.py
@@ -0,0 +1,142 @@
+import asyncio
+import logging
+import os
+from typing import Optional
+
+from aiogram import Bot, Dispatcher, F
+from aiogram.types import Message, Chat
+
+from sulguk import transform_html, RenderResult
+from sulguk.post_manager.links import make_link, unparse_link
+from .params import parse_args, EditArgs, SendArgs
+
+logger = logging.getLogger(__name__)
+
+
+def load_file(filename) -> RenderResult:
+    with open(filename) as f:
+        return transform_html(f.read())
+
+
+async def edit(bot: Bot, args: EditArgs):
+    chat = await bot.get_chat(args.destination.group_id)
+    if not args.destination.post_id:
+        raise ValueError("No post provided to edit")
+    if args.destination.comment_id:
+        chat_id = chat.linked_chat_id
+        message_id = args.destination.comment_id
+    else:
+        chat_id = chat.id
+        message_id = args.destination.post_id
+
+    data = load_file(args.file)
+    await bot.edit_message_text(
+        chat_id=chat_id, message_id=message_id,
+        text=data.text, entities=data.entities,
+    )
+
+
+async def get_linked_message_chat(
+        bot: Bot, chat: Chat, message: Message,
+        pause: float = 1, interval: float = 10, retries: int = 10,
+) -> Optional[Message]:
+    if not chat.linked_chat_id:
+        return None
+    await asyncio.sleep(pause)
+    for _ in range(retries):
+        linked_chat = await bot.get_chat(chat_id=chat.linked_chat_id)
+        pinned_message = linked_chat.pinned_message
+        if not pinned_message:
+            logger.info("No pinned message, retrying")
+        elif pinned_message.forward_from_message_id != message.message_id:
+            logger.info("Pinned message is not the one we wait for, retrying")
+        else:
+            return linked_chat.pinned_message
+        await asyncio.sleep(interval)
+    return None
+
+
+class EventListener:
+    def __init__(self):
+        self.message = None
+
+    async def on_message(self, message: Message, dispatcher: Dispatcher):
+        self.message = message
+        await dispatcher.stop_polling()
+
+
+async def get_linked_message_polling(
+        bot: Bot, chat: Chat, message: Message,
+) -> Optional[Message]:
+    if not chat.linked_chat_id:
+        return
+    dp = Dispatcher()
+    listener = EventListener()
+    dp.message(
+        F.chat.id == chat.linked_chat_id,
+        F.forward_from_message_id == message.message_id,
+    )(listener.on_message)
+    await asyncio.wait_for(dp.start_polling(bot), timeout=10)
+    return listener.message
+
+
+get_linked_message = {
+    "poll": get_linked_message_polling,
+    "getChat": get_linked_message_chat,
+}
+
+
+async def send(bot: Bot, args: SendArgs):
+    chat = await bot.get_chat(args.destination.group_id)
+    data = load_file(args.file[0])
+    message = await bot.send_message(
+        chat_id=chat.id,
+        text=data.text,
+        entities=data.entities,
+        disable_web_page_preview=True,
+    )
+    message_link = make_link(chat, message)
+    logger.info("Message sent: %s", unparse_link(message_link))
+    if len(args.file) < 2:
+        return
+    linked_message = await get_linked_message[args.mode](bot, chat, message)
+    if not linked_message:
+        raise ValueError("No linked message found")
+    for file in args.file[1:]:
+        data = load_file(file)
+        comment = await bot.send_message(
+            chat_id=chat.linked_chat_id,
+            reply_to_message_id=linked_message.message_id,
+            text=data.text,
+            entities=data.entities,
+            disable_web_page_preview=True,
+        )
+        comment_link = make_link(chat, message, comment)
+        logger.info("Comment sent: %s", unparse_link(comment_link))
+
+
+async def main():
+    logging.basicConfig(
+        level=logging.INFO,
+        format="%(asctime)s - %(levelname)s - %(name)s - %(message)s",
+    )
+    bot = Bot(token=os.getenv("BOT_TOKEN"))
+    args = parse_args()
+    try:
+        if args.command == "edit":
+            await edit(bot, args)
+        else:
+            await send(bot, args)
+    finally:
+        await bot.session.close()
+
+
+def cli():
+    try:
+        asyncio.run(main())
+    except (KeyboardInterrupt, SystemExit):
+        logger.error("Bot stopped!")
+
+
+if __name__ == '__main__':
+    cli()
diff --git a/src/sulguk/post_manager/links.py b/src/sulguk/post_manager/links.py
index 147de63..38020f2 100644
--- a/src/sulguk/post_manager/links.py
+++ b/src/sulguk/post_manager/links.py
@@ -2,6 +2,8 @@
 from typing import Optional, Union
 from urllib.parse import urlparse, parse_qs
 
+from aiogram.types import Message, Chat
+
 
 @dataclass
 class Link:
@@ -57,3 +59,31 @@ def parse_link(link: str) -> Link:
         )
     else:
         raise LinkParseError(f"Invalid path: {parsed.path}")
+
+
+def unparse_link(link: Link) -> str:
+    if isinstance(link.group_id, str):
+        group_id = link.group_id.lstrip("@")
+    else:
+        group_id = link.group_id
+    result = f"https://t.me/{group_id}/"
+    if link.post_id:
+        result += f"{link.post_id}"
+    if link.comment_id:
+        result += f"?comment={link.comment_id}"
+    return result
+
+
+def make_link(
+        chat: Chat,
+        message: Optional[Message] = None,
+        comment: Optional[Message] = None,
+) -> Link:
+    link = Link(
+        group_id=chat.username,
+    )
+    if message:
+        link.post_id = message.message_id
+    if comment:
+        link.comment_id = comment.message_id
+    return link
diff --git a/src/sulguk/post_manager/params.py b/src/sulguk/post_manager/params.py
new file mode 100644
index 0000000..96238b8
--- /dev/null
+++ b/src/sulguk/post_manager/params.py
@@ -0,0 +1,46 @@
+from argparse import ArgumentParser
+from typing import List, Literal, Union
+
+from .links import Link, parse_link
+
+
+class SendArgs:
+    command: Literal["send"]
+    mode: Literal["poll", "getChat"]
+    destination: Link
+    file: List[str]
+
+
+class EditArgs:
+    command: Literal["edit"]
+    destination: Link
+    file: str
+
+
+def init_parser():
+    root = ArgumentParser(prog='Sulguk message manager')
+    subparsers = root.add_subparsers(dest="command")
+    sender = subparsers.add_parser("send")
+    sender.add_argument(
+        "destination", type=parse_link
+    )
+    sender.add_argument(
+        "file", nargs='+'
+    )
+    sender.add_argument(
+        "-m", "--mode", choices=["poll", "getChat"],
+        default="poll",
+    )
+    editor = subparsers.add_parser("edit")
+    editor.add_argument(
+        "destination", type=parse_link
+    )
+    editor.add_argument(
+        "file",
+    )
+    return root
+
+
+def parse_args() -> Union[SendArgs, EditArgs]:
+    parser = init_parser()
+    return parser.parse_args()

From 6f00246684aeed7cd669c935330a6ec7e68034b8 Mon Sep 17 00:00:00 2001
From: Andrey Tikhonov <andrey.tikhonov@quantori.com>
Date: Mon, 25 Sep 2023 22:48:47 +0400
Subject: [PATCH 5/6] refactor, handle errors

---
 src/sulguk/post_manager/chat_info.py  |  19 ++++
 src/sulguk/post_manager/cli.py        | 120 ++------------------------
 src/sulguk/post_manager/editor.py     |  36 ++++++++
 src/sulguk/post_manager/exceptions.py |  10 +++
 src/sulguk/post_manager/file.py       |  15 ++++
 src/sulguk/post_manager/sender.py     |  94 ++++++++++++++++++++
 6 files changed, 183 insertions(+), 111 deletions(-)
 create mode 100644 src/sulguk/post_manager/chat_info.py
 create mode 100644 src/sulguk/post_manager/editor.py
 create mode 100644 src/sulguk/post_manager/exceptions.py
 create mode 100644 src/sulguk/post_manager/file.py
 create mode 100644 src/sulguk/post_manager/sender.py

diff --git a/src/sulguk/post_manager/chat_info.py b/src/sulguk/post_manager/chat_info.py
new file mode 100644
index 0000000..78be3aa
--- /dev/null
+++ b/src/sulguk/post_manager/chat_info.py
@@ -0,0 +1,19 @@
+from logging import getLogger
+from typing import Union
+
+from aiogram import Bot
+from aiogram.exceptions import TelegramBadRequest
+
+from .exceptions import ChatNotFound
+
+logger = getLogger(__name__)
+
+
+async def get_chat(bot: Bot, chat_id: Union[str, int]):
+    try:
+        return await bot.get_chat(chat_id)
+    except TelegramBadRequest as e:
+        if "chat not found" in e.message:
+            logger.error("Chat %s not found", chat_id)
+            raise ChatNotFound
+        raise
diff --git a/src/sulguk/post_manager/cli.py b/src/sulguk/post_manager/cli.py
index 11c5f36..96b7952 100644
--- a/src/sulguk/post_manager/cli.py
+++ b/src/sulguk/post_manager/cli.py
@@ -1,118 +1,13 @@
 import asyncio
 import logging
 import os
-from typing import Optional
 
-from aiogram import Bot, Dispatcher, F
-from aiogram.types import Message, Chat
+from aiogram import Bot
 
-from sulguk import transform_html, RenderResult
-from sulguk.post_manager.links import make_link, unparse_link
-from .params import parse_args, EditArgs, SendArgs
-
-logger = logging.getLogger(__name__)
-
-
-def load_file(filename) -> RenderResult:
-    with open(filename) as f:
-        return transform_html(f.read())
-
-
-async def edit(bot: Bot, args: EditArgs):
-    chat = await bot.get_chat(args.destination.group_id)
-    if not args.destination.post_id:
-        raise ValueError("No post provided to edit")
-    if args.destination.comment_id:
-        chat_id = chat.linked_chat_id
-        message_id = args.destination.comment_id
-    else:
-        chat_id = chat.id
-        message_id = args.destination.post_id
-
-    data = load_file(args.file)
-    await bot.edit_message_text(
-        chat_id=chat_id, message_id=message_id,
-        text=data.text, entities=data.entities,
-    )
-
-
-async def get_linked_message_chat(
-        bot: Bot, chat: Chat, message: Message,
-        pause: float = 1, interval: float = 10, retries: int = 10,
-) -> Optional[Message]:
-    if not chat.linked_chat_id:
-        return None
-    await asyncio.sleep(pause)
-    for _ in range(retries):
-        linked_chat = await bot.get_chat(chat_id=chat.linked_chat_id)
-        pinned_message = linked_chat.pinned_message
-        if not pinned_message:
-            logger.info("No pinned message, retrying")
-        elif pinned_message.forward_from_message_id != message.message_id:
-            logger.info("Pinned message is not the one we wait for, retrying")
-        else:
-            return linked_chat.pinned_message
-        await asyncio.sleep(interval)
-    return None
-
-
-class EventListener:
-    def __init__(self):
-        self.message = None
-
-    async def on_message(self, message: Message, dispatcher: Dispatcher):
-        self.message = message
-        await dispatcher.stop_polling()
-
-
-async def get_linked_message_polling(
-        bot: Bot, chat: Chat, message: Message,
-) -> Optional[Message]:
-    if not chat.linked_chat_id:
-        return
-    dp = Dispatcher()
-    listener = EventListener()
-    dp.message(
-        F.chat.id == chat.linked_chat_id,
-        F.forward_from_message_id == message.message_id,
-    )(listener.on_message)
-    await asyncio.wait_for(dp.start_polling(bot), timeout=10)
-    return listener.message
-
-
-get_linked_message = {
-    "poll": get_linked_message_polling,
-    "getChat": get_linked_message_chat,
-}
-
-
-async def send(bot: Bot, args: SendArgs):
-    chat = await bot.get_chat(args.destination.group_id)
-    data = load_file(args.file[0])
-    message = await bot.send_message(
-        chat_id=chat.id,
-        text=data.text,
-        entities=data.entities,
-        disable_web_page_preview=True,
-    )
-    message_link = make_link(chat, message)
-    logger.info("Message sent: %s", unparse_link(message_link))
-    if len(args.file) < 2:
-        return
-    linked_message = await get_linked_message[args.mode](bot, chat, message)
-    if not linked_message:
-        raise ValueError("No linked message found")
-    for file in args.file[1:]:
-        data = load_file(file)
-        comment = await bot.send_message(
-            chat_id=chat.linked_chat_id,
-            reply_to_message_id=linked_message.message_id,
-            text=data.text,
-            entities=data.entities,
-            disable_web_page_preview=True,
-        )
-        comment_link = make_link(chat, message, comment)
-        logger.info("Comment sent: %s", unparse_link(comment_link))
+from .editor import edit
+from .exceptions import ManagerError
+from .params import parse_args
+from .sender import send
 
 
 async def main():
@@ -120,6 +15,7 @@ async def main():
         level=logging.INFO,
         format="%(asctime)s - %(levelname)s - %(name)s - %(message)s",
     )
+    logging.getLogger("aiogram").setLevel(logging.WARNING)
     bot = Bot(token=os.getenv("BOT_TOKEN"))
     args = parse_args()
     try:
@@ -127,6 +23,8 @@ async def main():
             await edit(bot, args)
         else:
             await send(bot, args)
+    except ManagerError:
+        logging.error("There were errors during execution. See above")
     finally:
         await bot.session.close()
 
@@ -135,7 +33,7 @@ def cli():
     try:
         asyncio.run(main())
     except (KeyboardInterrupt, SystemExit):
-        logger.error("Bot stopped!")
+        pass
 
 
 if __name__ == '__main__':
diff --git a/src/sulguk/post_manager/editor.py b/src/sulguk/post_manager/editor.py
new file mode 100644
index 0000000..27d0fa7
--- /dev/null
+++ b/src/sulguk/post_manager/editor.py
@@ -0,0 +1,36 @@
+import logging
+
+from aiogram import Bot
+from aiogram.exceptions import TelegramBadRequest
+
+from .chat_info import get_chat
+from .file import load_file
+from .params import EditArgs
+
+logger = logging.getLogger(__name__)
+
+
+async def edit(bot: Bot, args: EditArgs):
+    chat = await get_chat(bot, args.destination.group_id)
+    if not args.destination.post_id:
+        raise ValueError("No post provided to edit")
+    if args.destination.comment_id:
+        chat_id = chat.linked_chat_id
+        message_id = args.destination.comment_id
+    else:
+        chat_id = chat.id
+        message_id = args.destination.post_id
+
+    data = load_file(args.file)
+    try:
+        await bot.edit_message_text(
+            chat_id=chat_id,
+            message_id=message_id,
+            text=data.text,
+            entities=data.entities,
+        )
+    except TelegramBadRequest as e:
+        if "message is not modified" in e.message:
+            logger.debug("Nothing changed")
+            return
+        raise
diff --git a/src/sulguk/post_manager/exceptions.py b/src/sulguk/post_manager/exceptions.py
new file mode 100644
index 0000000..2a0901e
--- /dev/null
+++ b/src/sulguk/post_manager/exceptions.py
@@ -0,0 +1,10 @@
+class ManagerError(Exception):
+    pass
+
+
+class LinkedMessageNotFound(ManagerError):
+    pass
+
+
+class ChatNotFound(ManagerError):
+    pass
diff --git a/src/sulguk/post_manager/file.py b/src/sulguk/post_manager/file.py
new file mode 100644
index 0000000..7736571
--- /dev/null
+++ b/src/sulguk/post_manager/file.py
@@ -0,0 +1,15 @@
+import logging
+
+from sulguk import transform_html, RenderResult
+from .exceptions import ManagerError
+
+logger = logging.getLogger(__name__)
+
+
+def load_file(filename) -> RenderResult:
+    try:
+        with open(filename) as f:
+            return transform_html(f.read())
+    except FileNotFoundError:
+        logger.error("File `%s` not found", filename)
+        raise ManagerError
diff --git a/src/sulguk/post_manager/sender.py b/src/sulguk/post_manager/sender.py
new file mode 100644
index 0000000..f19d6d8
--- /dev/null
+++ b/src/sulguk/post_manager/sender.py
@@ -0,0 +1,94 @@
+import asyncio
+import logging
+from typing import Optional
+
+from aiogram import Bot, Dispatcher, F
+from aiogram.types import Message, Chat
+
+from .chat_info import get_chat
+from .exceptions import LinkedMessageNotFound
+from .file import load_file
+from .links import make_link, unparse_link
+from .params import SendArgs
+
+logger = logging.getLogger(__name__)
+
+
+async def get_linked_message_chat(
+        bot: Bot, chat: Chat, message: Message,
+        pause: float = 1, interval: float = 10, retries: int = 10,
+) -> Optional[Message]:
+    if not chat.linked_chat_id:
+        return None
+    await asyncio.sleep(pause)
+    for _ in range(retries):
+        linked_chat = await get_chat(bot, chat_id=chat.linked_chat_id)
+        pinned_message = linked_chat.pinned_message
+        if not pinned_message:
+            logger.info("No pinned message, retrying")
+        elif pinned_message.forward_from_message_id != message.message_id:
+            logger.info("Pinned message is not the one we wait for, retrying")
+        else:
+            return linked_chat.pinned_message
+        await asyncio.sleep(interval)
+    return None
+
+
+class EventListener:
+    def __init__(self):
+        self.message = None
+
+    async def on_message(self, message: Message, dispatcher: Dispatcher):
+        self.message = message
+        await dispatcher.stop_polling()
+
+
+async def get_linked_message_polling(
+        bot: Bot, chat: Chat, message: Message,
+) -> Optional[Message]:
+    if not chat.linked_chat_id:
+        return
+    dp = Dispatcher()
+    listener = EventListener()
+    dp.message(
+        F.chat.id == chat.linked_chat_id,
+        F.forward_from_message_id == message.message_id,
+    )(listener.on_message)
+    await asyncio.wait_for(dp.start_polling(bot), timeout=10)
+    return listener.message
+
+
+get_linked_message = {
+    "poll": get_linked_message_polling,
+    "getChat": get_linked_message_chat,
+}
+
+
+async def send(bot: Bot, args: SendArgs):
+    chat = await get_chat(bot, args.destination.group_id)
+    data = load_file(args.file[0])
+    message = await bot.send_message(
+        chat_id=chat.id,
+        text=data.text,
+        entities=data.entities,
+        disable_web_page_preview=True,
+    )
+    message_link = make_link(chat, message)
+    logger.info("Message sent: %s", unparse_link(message_link))
+    if len(args.file) < 2:
+        return
+    linked_message = await get_linked_message[args.mode](bot, chat, message)
+    if not linked_message:
+        logger.error("Cannot load linked message to leave a comment")
+        raise LinkedMessageNotFound("No linked message found")
+    for file in args.file[1:]:
+        data = load_file(file)
+        comment = await bot.send_message(
+            chat_id=chat.linked_chat_id,
+            reply_to_message_id=linked_message.message_id,
+            text=data.text,
+            entities=data.entities,
+            disable_web_page_preview=True,
+        )
+        comment_link = make_link(chat, message, comment)
+        logger.info("Comment sent: %s", unparse_link(comment_link))

From 76e84b76e8f05ca5020834ab2f7971cd886dbd0b Mon Sep 17 00:00:00 2001
From: Andrey Tikhonov <andrey.tikhonov@quantori.com>
Date: Mon, 25 Sep 2023 22:54:57 +0400
Subject: [PATCH 6/6] Update readme

---
 README.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/README.md b/README.md
index 3aa59ac..f60ef47 100644
--- a/README.md
+++ b/README.md
@@ -158,3 +158,29 @@ The same behavior is supported in sulguk. Otherwise, you can set the language on
 #### Tags which contents is ignored:
 
 `<head>`, `<link>`, `<meta>`, `<script>`, `<style>`, `<template>`, `<title>`
+
+
+## Command line utility for channel management
+
+1. Install with addons
+```shell
+pip install 'sulguk[cli]'
+```
+
+2. Set environment variable `BOT_TOKEN`
+
+```shell
+export BOT_TOKEN="your telegram token"
+```
+
+3. Send HTML file as a message to your channel. Additional files will be sent as comments to the first one. You can provide a channel name or a public link
+
+```shell
+sulguk send @chat_id file.html
+```
+
+4. If you want to, edit using the link from shell or from your tg client. Edition of comments is supported as well.
+
+```shell
+sulguk edit 'https://t.me/channel/1?comment=42' file.html
+```
\ No newline at end of file
