telegram-userbot-cli 0.2.0__tar.gz → 0.4.0__tar.gz

{telegram_userbot_cli-0.2.0 → telegram_userbot_cli-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: telegram-userbot-cli
-Version: 0.2.0
+Version: 0.4.0
 Summary: Full-featured Telegram command-line client powered by a Telethon userbot (your own account, not a bot token)
 License-Expression: Apache-2.0
 License-File: LICENSE
@@ -27,8 +27,12 @@ no daemon, no external service**. Everything the CLI does lives in the CLI.
 - QR-code login (`tg login --qr`) with an independent session
 - Messaging: send / reply / edit / delete / forward / polls / schedule /
   drafts / reactions / pinning
+- Group administration: create groups/channels, invite / kick / ban,
+  admin promotion with granular rights, slow mode, forum topics, admin log
 - Chat management: archive, mute, edit title / description / photo,
   invite links, clear history
+- Contacts, privacy settings, blocking, dialog folders, multi-account,
+  voice transcription
 - Media: download, send files / albums / voice notes / stickers / GIFs,
   contact cards
 - Chats: list dialogs, history, pinned messages, in-chat & global search,
@@ -135,6 +139,48 @@ tg logout          # remove the session
 | `tg status <user>` | Show a user's online status |
 | `tg common-chats <user>` | List chats you share with a user |
 
+### Group administration (v3)
+
+| Command | Description |
+|---|---|
+| `tg new-group <title> <user...>` | Create a basic group with initial members |
+| `tg new-channel <title> [--about text]` | Create a channel; `--group` creates a supergroup |
+| `tg invite <chat> <user...>` | Invite users (supergroups & basic groups) |
+| `tg kick <chat> <user...>` | Remove users (supergroup kick = view-messages ban; `unban` to reverse) |
+| `tg leave <chat>` | Leave a group/channel |
+| `tg ban <chat> <user> [days]` | Ban a user (permanent unless days given); supergroups only |
+| `tg unban <chat> <user>` | Unban a user |
+| `tg banned <chat>` | List banned users (`--json` supported) |
+| `tg admins <chat>` | List admins with ranks |
+| `tg promote <chat> <user> [--title rank]` | Promote with the standard right set |
+| `tg demote <chat> <user>` | Remove admin rights |
+| `tg admin-rights <chat> <user> <flags...>` | Set exact rights: `--change-info --post-messages --edit-messages --delete-messages --ban-users --invite-users --pin-messages --add-admins --anonymous --manage-call --other --manage-topics …`; `--rank` |
+| `tg slow-mode <chat> [seconds]` | Set slow mode (0 = disable); supergroups only |
+| `tg topics <chat>` | List forum topics |
+| `tg topic-create <chat> <title> [text]` | Create a forum topic, optionally with a first message |
+| `tg admin-log <chat> [-n]` | Recent admin actions |
+
+### Contacts, privacy & misc (v4)
+
+| Command | Description |
+|---|---|
+| `tg contact add <user> [name] [--phone]` | Add/update a contact |
+| `tg contact del <user...>` | Delete contacts (by name/id or `+phone`) |
+| `tg contact import <file>` | Bulk import from `.json` / `.csv` (`phone,first_name,last_name`) |
+| `tg contact export [file]` | Export contacts as re-importable JSON (default stdout) |
+| `tg photo-del [--all]` | Delete your most recent profile photo (or all) |
+| `tg privacy get [key...]` | Show privacy settings (default: all) |
+| `tg privacy set <key> all\|contacts\|nobody` | Change a privacy setting; `--allow USER` / `--deny USER` refine it |
+| `tg block <user>` / `tg unblock <user>` / `tg blocked` | Block management |
+| `tg folders` | List dialog folders |
+| `tg folder-create <name> --chat <c>...` | Create a folder with chats |
+| `tg folder-assign <folder> <chat...>` | Add chats to a folder |
+| `tg folder-del <folder>` | Delete a folder |
+| `tg folder-order <folder...>` | Reorder folders (pass all in the wanted order) |
+| `tg accounts` | List configured accounts |
+| `tg login --account <label>` | Log in an additional account |
+| `tg vtr <chat> <msg_id>` | Transcribe a voice note (Telegram Premium required) |
+
 Global flags: `--account` (v1: default only), `--json` (raw JSON output).
 Exit codes: `0` ok, `1` command error, `2` config/connection/session error,
 `130` interrupted.

{telegram_userbot_cli-0.2.0 → telegram_userbot_cli-0.4.0}/README-zh.md

@@ -13,7 +13,9 @@
 
 - 扫码登录（`tg login --qr`），使用独立会话
 - 消息：发送 / 引用回复 / 编辑 / 删除 / 转发 / 投票 / 定时 / 草稿 / 表情回应 / 置顶
+- 群组管理：建群 / 建频道、邀请 / 踢人 / 封禁、管理员升降级（细粒度权限）、慢速模式、论坛话题、管理日志
 - 聊天管理：归档、免打扰、修改群名 / 简介 / 群头像、邀请链接、清空历史
+- 联系人、隐私设置、封锁管理、会话文件夹、多账号、语音转写
 - 媒体：下载、发文件 / 相册 / 语音条 / 贴纸 / GIF、发送名片
 - 聊天：会话列表、历史记录、置顶消息、会话内与全局搜索、在线状态、共同群组
 - 联系人与个人资料管理
@@ -114,6 +116,48 @@ tg logout          # 退出登录并删除会话
 | `tg status <用户>` | 查看用户在线状态 |
 | `tg common-chats <用户>` | 列出与该用户的共同群组 |
 
+### 群组管理（v3）
+
+| 命令 | 说明 |
+|---|---|
+| `tg new-group <标题> <用户...>` | 建基本群并拉入初始成员 |
+| `tg new-channel <标题> [--about 简介]` | 建频道；`--group` 建超级群组 |
+| `tg invite <会话> <用户...>` | 邀请用户（超级群组与基本群都支持） |
+| `tg kick <会话> <用户...>` | 移出用户（超级群组的踢人 = 禁言封禁，`unban` 可恢复） |
+| `tg leave <会话>` | 退出群组/频道 |
+| `tg ban <会话> <用户> [天数]` | 封禁（不带天数 = 永久）；仅超级群组 |
+| `tg unban <会话> <用户>` | 解除封禁 |
+| `tg banned <会话>` | 封禁名单（支持 `--json`） |
+| `tg admins <会话>` | 管理员列表（含头衔） |
+| `tg promote <会话> <用户> [--title 头衔]` | 升级为管理员（标准权限集） |
+| `tg demote <会话> <用户>` | 撤销管理员 |
+| `tg admin-rights <会话> <用户> <权限...>` | 设置精确权限：`--change-info --post-messages --edit-messages --delete-messages --ban-users --invite-users --pin-messages --add-admins --anonymous --manage-call --other --manage-topics …`；`--rank` 定头衔 |
+| `tg slow-mode <会话> [秒]` | 设置慢速模式（0 = 关闭）；仅超级群组 |
+| `tg topics <会话>` | 列出论坛话题 |
+| `tg topic-create <会话> <标题> [首条消息]` | 创建论坛话题 |
+| `tg admin-log <会话> [-n]` | 近期管理操作日志 |
+
+### 联系人、隐私与其他（v4）
+
+| 命令 | 说明 |
+|---|---|
+| `tg contact add <用户> [姓名] [--phone]` | 新增/更新联系人 |
+| `tg contact del <用户...>` | 删除联系人（按名称/id 或 `+手机号`） |
+| `tg contact import <文件>` | 从 `.json` / `.csv` 批量导入（`phone,first_name,last_name`） |
+| `tg contact export [文件]` | 导出为可再导入的 JSON（默认输出到终端） |
+| `tg photo-del [--all]` | 删除最近一张头像（`--all` 删除全部） |
+| `tg privacy get [键...]` | 查看隐私设置（默认全部） |
+| `tg privacy set <键> all\|contacts\|nobody` | 修改隐私设置；`--allow 用户` / `--deny 用户` 精细化 |
+| `tg block <用户>` / `tg unblock <用户>` / `tg blocked` | 封锁管理 |
+| `tg folders` | 列出会话文件夹 |
+| `tg folder-create <名称> --chat <会话>...` | 创建文件夹并加入会话 |
+| `tg folder-assign <文件夹> <会话...>` | 向文件夹追加会话 |
+| `tg folder-del <文件夹>` | 删除文件夹 |
+| `tg folder-order <文件夹...>` | 重排文件夹（按想要的顺序全部列出） |
+| `tg accounts` | 列出已配置的账号 |
+| `tg login --account <标签>` | 登录额外账号 |
+| `tg vtr <会话> <消息id>` | 语音转文字（需要 Telegram Premium） |
+
 全局选项：`--account`（v1 仅 default）、`--json`（原始 JSON 输出）。
 退出码：`0` 成功、`1` 命令错误、`2` 配置/连接/会话错误、`130` 中断。
 

{telegram_userbot_cli-0.2.0 → telegram_userbot_cli-0.4.0}/README.md

@@ -14,8 +14,12 @@ no daemon, no external service**. Everything the CLI does lives in the CLI.
 - QR-code login (`tg login --qr`) with an independent session
 - Messaging: send / reply / edit / delete / forward / polls / schedule /
   drafts / reactions / pinning
+- Group administration: create groups/channels, invite / kick / ban,
+  admin promotion with granular rights, slow mode, forum topics, admin log
 - Chat management: archive, mute, edit title / description / photo,
   invite links, clear history
+- Contacts, privacy settings, blocking, dialog folders, multi-account,
+  voice transcription
 - Media: download, send files / albums / voice notes / stickers / GIFs,
   contact cards
 - Chats: list dialogs, history, pinned messages, in-chat & global search,
@@ -122,6 +126,48 @@ tg logout          # remove the session
 | `tg status <user>` | Show a user's online status |
 | `tg common-chats <user>` | List chats you share with a user |
 
+### Group administration (v3)
+
+| Command | Description |
+|---|---|
+| `tg new-group <title> <user...>` | Create a basic group with initial members |
+| `tg new-channel <title> [--about text]` | Create a channel; `--group` creates a supergroup |
+| `tg invite <chat> <user...>` | Invite users (supergroups & basic groups) |
+| `tg kick <chat> <user...>` | Remove users (supergroup kick = view-messages ban; `unban` to reverse) |
+| `tg leave <chat>` | Leave a group/channel |
+| `tg ban <chat> <user> [days]` | Ban a user (permanent unless days given); supergroups only |
+| `tg unban <chat> <user>` | Unban a user |
+| `tg banned <chat>` | List banned users (`--json` supported) |
+| `tg admins <chat>` | List admins with ranks |
+| `tg promote <chat> <user> [--title rank]` | Promote with the standard right set |
+| `tg demote <chat> <user>` | Remove admin rights |
+| `tg admin-rights <chat> <user> <flags...>` | Set exact rights: `--change-info --post-messages --edit-messages --delete-messages --ban-users --invite-users --pin-messages --add-admins --anonymous --manage-call --other --manage-topics …`; `--rank` |
+| `tg slow-mode <chat> [seconds]` | Set slow mode (0 = disable); supergroups only |
+| `tg topics <chat>` | List forum topics |
+| `tg topic-create <chat> <title> [text]` | Create a forum topic, optionally with a first message |
+| `tg admin-log <chat> [-n]` | Recent admin actions |
+
+### Contacts, privacy & misc (v4)
+
+| Command | Description |
+|---|---|
+| `tg contact add <user> [name] [--phone]` | Add/update a contact |
+| `tg contact del <user...>` | Delete contacts (by name/id or `+phone`) |
+| `tg contact import <file>` | Bulk import from `.json` / `.csv` (`phone,first_name,last_name`) |
+| `tg contact export [file]` | Export contacts as re-importable JSON (default stdout) |
+| `tg photo-del [--all]` | Delete your most recent profile photo (or all) |
+| `tg privacy get [key...]` | Show privacy settings (default: all) |
+| `tg privacy set <key> all\|contacts\|nobody` | Change a privacy setting; `--allow USER` / `--deny USER` refine it |
+| `tg block <user>` / `tg unblock <user>` / `tg blocked` | Block management |
+| `tg folders` | List dialog folders |
+| `tg folder-create <name> --chat <c>...` | Create a folder with chats |
+| `tg folder-assign <folder> <chat...>` | Add chats to a folder |
+| `tg folder-del <folder>` | Delete a folder |
+| `tg folder-order <folder...>` | Reorder folders (pass all in the wanted order) |
+| `tg accounts` | List configured accounts |
+| `tg login --account <label>` | Log in an additional account |
+| `tg vtr <chat> <msg_id>` | Transcribe a voice note (Telegram Premium required) |
+
 Global flags: `--account` (v1: default only), `--json` (raw JSON output).
 Exit codes: `0` ok, `1` command error, `2` config/connection/session error,
 `130` interrupted.

telegram_userbot_cli-0.4.0/ROADMAP.md

@@ -0,0 +1,82 @@
+# Roadmap
+
+The v1 release covers the core daily workflow. The goal is full coverage of
+the Telegram feature surface reachable from a userbot, roughly matching the
+126-tool scope of [chigwell/telegram-mcp](https://github.com/chigwell/telegram-mcp).
+
+Status legend: ✅ done · 🚧 planned · ❌ deliberately out of scope.
+
+## Milestones
+
+### v2 — Messaging enhancements & chat management (shipped)
+
+Messaging:
+
+- ✅ `schedule <chat> <time> <text...>` — send scheduled messages
+  (`send_message(..., schedule=...)`), list/delete scheduled
+  (`scheduled <chat>` / `unschedule <chat> <ids...>`)
+- ✅ `draft <chat> [text]` / `draft-clear <chat>` — save/get/clear drafts
+- ✅ `react <chat> <msg_id> <emoji>` / `unreact` — send/remove reactions
+  (note: reacting to Saved Messages is premium-only on Telegram's side)
+- ✅ `sticker <chat> <file.webp>` — send stickers (telethon handles via `send_file`)
+- ✅ `gif <chat> <query>` — search GIFs (inline query to the built-in @gif bot;
+  `messages.searchGifs` was removed from the TL layer) and send
+- ✅ `contact-card <chat> <name> <phone>` — send a contact card
+- ✅ `pin <chat> <msg_id>` / `unpin <chat> [msg_id]` — pin/unpin messages
+- ✅ `read <chat>` — mark a chat as read
+- ✅ `msg-link <chat> <msg_id>` — export a t.me message link (channels/supergroups)
+
+Chat management:
+
+- ✅ `archive <chat>` / `unarchive <chat>` — archive/unarchive dialogs
+- ✅ `mute <chat> [hours]` / `unmute <chat>` — mute/unmute notifications
+- ✅ `chat-title <chat> <title>` / `chat-about <chat> <text>` /
+  `chat-photo <chat> <file>` — edit chat info
+- ✅ `invite-link <chat>` / `join <link>` — export/import invite links
+- ✅ `clear-history <chat>` — delete all messages in a chat (`--self-only` to
+  keep the other side's copy)
+- ✅ `status <user>` / `common-chats <user>` — online status, common chats
+
+### v3 — Group administration (shipped)
+
+- ✅ `new-group <title> <user...>` / `new-channel <title>` — create groups
+  (`--group` flag makes a supergroup) /channels
+- ✅ `invite <chat> <user...>` / `kick <chat> <user...>` / `leave <chat>`
+  (basic-group kick/leave use `messages.DeleteChatUser`, supergroup kick is a
+  view-messages ban like official clients)
+- ✅ `ban <chat> <user> [days]` / `unban <chat> <user>` / `banned <chat>`
+  (the working participant filter on the current TL layer is
+  `ChannelParticipantsKicked`, not `ChannelParticipantsBanned`)
+- ✅ `admins <chat>` / `promote <chat> <user> [--title]` / `demote <chat> <user>` /
+  `admin-rights <chat> <user> ...` — admin management with granular rights
+  (basic groups use `messages.EditChatAdmin`, no titles)
+- ✅ `slow-mode <chat> [seconds]` — set/disable slow mode
+- ✅ `topics <chat>` / `topic-create <chat> <title> [text]` — forum topics
+  (list/create)
+- ✅ `admin-log <chat>` — recent admin actions
+
+### v4 — Contacts, profile & misc (shipped)
+
+- ✅ `contact add/del` — add/delete contacts (`contact del` also matches `+phone`)
+- ✅ `contact import <file>` / `contact export` — bulk JSON/CSV import,
+  re-importable JSON export (note: Telegram no longer creates contacts for
+  unregistered numbers — unmatched imports return 0)
+- ✅ `photo-del` — delete the most recent profile photo (`--all` for all)
+- ✅ `privacy get/set` — 11 keys (lastseen, phone, calls, p2p, groups, photo,
+  forwards, voicemail, about, birthday, addedby); set rules must use the
+  `InputPrivacyValue*` classes — the output `PrivacyValue*` classes are
+  silently ignored by the server
+- ✅ `block <user>` / `unblock <user>` / `blocked` — block management
+- ✅ `folders` / `folder-create` / `folder-assign` / `folder-del` /
+  `folder-order` — dialog folders (list/create/assign/reorder)
+- ✅ `accounts` — multi-account support (`accounts` lists every
+  `TELEGRAM_SESSION_STRING*`; `login --account LABEL` and
+  `<command> --account LABEL` both work)
+- ✅ `vtr <chat> <msg_id>` — voice transcription via raw
+  `messages.TranscribeAudioRequest` (telethon has no wrapper). Telegram
+  Premium is required server-side; free accounts get a clean error
+
+### Out of scope
+
+- ❌ Agent-oriented event tools (`wait_for_settled_message`, incoming feed
+  watchers) — meaningless for an interactive CLI.

{telegram_userbot_cli-0.2.0 → telegram_userbot_cli-0.4.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "telegram-userbot-cli"
-version = "0.2.0"
+version = "0.4.0"
 description = "Full-featured Telegram command-line client powered by a Telethon userbot (your own account, not a bot token)"
 readme = "README.md"
 license = "Apache-2.0"

{telegram_userbot_cli-0.2.0 → telegram_userbot_cli-0.4.0}/src/tgcli/__init__.py

@@ -1,3 +1,3 @@
 """tgcli — standalone Telegram command-line client."""
 
-__version__ = "0.2.0"
+__version__ = "0.4.0"

{telegram_userbot_cli-0.2.0 → telegram_userbot_cli-0.4.0}/src/tgcli/auth.py

@@ -1,8 +1,10 @@
-"""Login / logout flows."""
+"""Login / logout / multi-account flows."""
 
 import asyncio
 import getpass
 import io
+import os
+import re
 import sys
 from datetime import date, datetime, timezone
 
@@ -14,6 +16,7 @@ from .client import build_client
 from .output import TgError
 
 _MAX_QR_REFRESHES = 5
+_SESSION_ENV_RE = re.compile(r"TELEGRAM_SESSION_STRING(?:_([A-Z0-9_]+))?$")
 
 
 def render_qr(url: str) -> None:
@@ -38,6 +41,19 @@ def _seconds_until(qr) -> float:
         return 120.0
 
 
+def _save_session(args, session_str: str) -> None:
+    account = getattr(args, "account", None)
+    key = config.session_env_var(account)
+    config.write_env(
+        key,
+        session_str,
+        comment=f"generated by tg login on {date.today()}; keep secret, "
+        "do NOT share with the MCP daemon session",
+    )
+    where = f" for account '{account}'" if account else ""
+    print(f"Login successful{where}. Session written to .env — verify with: tg me")
+
+
 async def _qr_login(args) -> None:
     api_id, api_hash = config.require_credentials()
     client = build_client(StringSession(), api_id, api_hash)
@@ -65,13 +81,7 @@ async def _qr_login(args) -> None:
         session_str = StringSession.save(client.session)
     finally:
         await client.disconnect()
-    config.write_env(
-        "TELEGRAM_SESSION_STRING",
-        session_str,
-        comment=f"generated by tg login on {date.today()}; keep secret, "
-        "do NOT share with the MCP daemon session",
-    )
-    print("Login successful. Session written to .env — verify with: tg me")
+    _save_session(args, session_str)
 
 
 async def _phone_login(args) -> None:
@@ -90,13 +100,7 @@ async def _phone_login(args) -> None:
         session_str = StringSession.save(client.session)
     finally:
         await client.disconnect()
-    config.write_env(
-        "TELEGRAM_SESSION_STRING",
-        session_str,
-        comment=f"generated by tg login on {date.today()}; keep secret, "
-        "do NOT share with the MCP daemon session",
-    )
-    print("Login successful. Session written to .env — verify with: tg me")
+    _save_session(args, session_str)
 
 
 async def cmd_login(args) -> None:
@@ -117,3 +121,22 @@ async def cmd_logout(args) -> None:
         await client.disconnect()
     config.clear_env(config.session_env_var(getattr(args, "account", None)))
     print("Logged out; session removed from .env. The MCP daemon's session is untouched.")
+
+
+async def cmd_accounts(args) -> None:
+    """List every configured account (TELEGRAM_SESSION_STRING* entries)."""
+    rows = []
+    for key in os.environ:
+        m = _SESSION_ENV_RE.fullmatch(key)
+        if m and os.environ[key].strip():
+            label = m.group(1).lower() if m.group(1) else "default"
+            rows.append((label, key))
+    rows.sort(key=lambda r: (r[0] != "default", r[0]))
+    if not rows:
+        print("(no accounts configured — run: tg login)")
+        return
+    print(f"{'account':<16} env variable")
+    for label, key in rows:
+        note = "   (default)" if label == "default" else ""
+        print(f"{label:<16} {key}{note}")
+    print("\nuse with: tg <command> --account <label>   |   add one: tg login --account <label>")

{telegram_userbot_cli-0.2.0 → telegram_userbot_cli-0.4.0}/src/tgcli/chats.py

@@ -1,4 +1,4 @@
-"""Chat / search / contacts / profile commands."""
+"""Chat / search / contacts / profile / privacy / block commands."""
 
 from datetime import datetime
 
@@ -8,6 +8,21 @@ from .client import run_with_client
 from .output import TgError, fmt_message_row, json_pp
 from .resolve import resolve_chat
 
+# friendly names for the privacy keys (value -> InputPrivacyKey class name)
+_PRIVACY_KEYS = {
+    "lastseen": "InputPrivacyKeyStatusTimestamp",
+    "phone": "InputPrivacyKeyPhoneNumber",
+    "calls": "InputPrivacyKeyPhoneCall",
+    "p2p": "InputPrivacyKeyPhoneP2P",
+    "groups": "InputPrivacyKeyChatInvite",
+    "photo": "InputPrivacyKeyProfilePhoto",
+    "forwards": "InputPrivacyKeyForwards",
+    "voicemail": "InputPrivacyKeyVoiceMessages",
+    "about": "InputPrivacyKeyAbout",
+    "birthday": "InputPrivacyKeyBirthday",
+    "addedby": "InputPrivacyKeyAddedByPhone",
+}
+
 
 async def cmd_me(args) -> None:
     async with run_with_client(args) as client:
@@ -186,6 +201,171 @@ async def cmd_profile(args) -> None:
         print(json_pp(me.to_dict() if me else {}))
 
 
+async def cmd_photo_del(args) -> None:
+    async with run_with_client(args) as client:
+        photos = await client.get_profile_photos("me")
+        if not photos:
+            print("(no profile photos)")
+            return
+        if not args.all:
+            photos = photos[:1]  # just the most recent one
+        await client(
+            functions.photos.DeletePhotosRequest(
+                id=[
+                    types.InputPhoto(
+                        id=p.id, access_hash=p.access_hash, file_reference=p.file_reference
+                    )
+                    for p in photos
+                ]
+            )
+        )
+        print(f"Deleted {len(photos)} profile photo(s)")
+
+
+def _privacy_key(name: str) -> types.TypeInputPrivacyKey:
+    cls_name = _PRIVACY_KEYS.get(name.lower())
+    if not cls_name:
+        raise TgError(
+            f"unknown privacy key: {name!r}",
+            f"choose from: {', '.join(sorted(_PRIVACY_KEYS))}",
+        )
+    return getattr(types, cls_name)()
+
+
+def _privacy_rule_text(rule, users: dict) -> str:
+    kind = type(rule).__name__.removeprefix("PrivacyValue")
+    if kind == "AllowAll":
+        return "everyone"
+    if kind == "AllowContacts":
+        return "contacts"
+    if kind == "AllowCloseFriends":
+        return "close friends"
+    if kind == "AllowBots":
+        return "bots"
+    if kind == "AllowPremium":
+        return "premium"
+    if kind == "AllowChatParticipants":
+        return "members of " + ", ".join(_display_chat(c, users) for c in rule.chats)
+    if kind == "AllowUsers":
+        return "+" + ", ".join(_display_chat(users.get(u), users) or str(u) for u in rule.users)
+    if kind == "DisallowAll":
+        return "nobody"
+    if kind == "DisallowContacts":
+        return "no contacts"
+    if kind == "DisallowUsers":
+        return "-" + ", ".join(_display_chat(users.get(u), users) or str(u) for u in rule.users)
+    return kind
+
+
+def _display_chat(chat, users: dict) -> str:
+    if chat is None:
+        return "?"
+    title = getattr(chat, "title", None)
+    if title:
+        return title
+    name = " ".join(
+        x for x in (getattr(chat, "first_name", None), getattr(chat, "last_name", None)) if x
+    )
+    return name or "?"
+
+
+async def cmd_privacy_get(args) -> None:
+    keys = args.key or sorted(_PRIVACY_KEYS)
+    async with run_with_client(args) as client:
+        rows = []
+        for name in keys:
+            res = await client(functions.account.GetPrivacyRequest(key=_privacy_key(name)))
+            users = {u.id: u for u in getattr(res, "users", []) or []}
+            rules = " + ".join(_privacy_rule_text(r, users) for r in res.rules) or "(unset)"
+            rows.append((name, rules))
+        if args.json:
+            print(json_pp([{"key": k, "rules": v} for k, v in rows]))
+            return
+        for name, rules in rows:
+            print(f"{name:<10} {rules}")
+
+
+def _input_user(client, peer) -> types.TypeInputUser:
+    if isinstance(peer, types.InputPeerUser):
+        return types.InputUser(user_id=peer.user_id, access_hash=peer.access_hash)
+    if isinstance(peer, types.InputPeerSelf):
+        return types.InputUserSelf()
+    raise TgError("only users can appear in privacy rules")
+
+
+async def cmd_privacy_set(args) -> None:
+    base = args.value.lower()
+    base_map = {"all": "everyone", "contacts": "contacts", "nobody": "nobody"}
+    if base not in base_map:
+        raise TgError(
+            f"unknown privacy value: {args.value!r}",
+            "use all / contacts / nobody, with optional --allow USER / --deny USER",
+        )
+    async with run_with_client(args) as client:
+        # rules need Input* rule classes and InputUser entries
+        resolved_allow = [
+            _input_user(client, await client.get_input_entity(await resolve_chat(client, u)))
+            for u in args.allow
+        ]
+        resolved_deny = [
+            _input_user(client, await client.get_input_entity(await resolve_chat(client, u)))
+            for u in args.deny
+        ]
+        rules: list = []
+        if base == "all":
+            rules.append(types.InputPrivacyValueAllowAll())
+        elif base == "contacts":
+            rules.append(types.InputPrivacyValueAllowContacts())
+        else:
+            rules.append(types.InputPrivacyValueDisallowAll())
+        if resolved_allow:
+            rules.append(types.InputPrivacyValueAllowUsers(users=resolved_allow))
+        if resolved_deny:
+            rules.append(types.InputPrivacyValueDisallowUsers(users=resolved_deny))
+        await client(functions.account.SetPrivacyRequest(key=_privacy_key(args.key), rules=rules))
+        desc = base_map[base]
+        if resolved_allow:
+            desc += ", allow " + ", ".join(args.allow)
+        if resolved_deny:
+            desc += ", deny " + ", ".join(args.deny)
+        print(f"{args.key} set to {desc}")
+
+
+async def cmd_block(args) -> None:
+    async with run_with_client(args) as client:
+        entity = await resolve_chat(client, args.user)
+        await client(functions.contacts.BlockRequest(id=entity))
+        print(f"Blocked {args.user}")
+
+
+async def cmd_unblock(args) -> None:
+    async with run_with_client(args) as client:
+        entity = await resolve_chat(client, args.user)
+        await client(functions.contacts.UnblockRequest(id=entity))
+        print(f"Unblocked {args.user}")
+
+
+async def cmd_blocked(args) -> None:
+    async with run_with_client(args) as client:
+        res = await client(functions.contacts.GetBlockedRequest(offset=0, limit=100))
+        users = {u.id: u for u in getattr(res, "users", []) or []}
+        rows = []
+        for pb in getattr(res, "blocked", []) or []:
+            pid = pb.peer_id.user_id if isinstance(pb.peer_id, types.PeerUser) else pb.peer_id
+            rows.append((pid, getattr(pb, "date", None)))
+        if args.json:
+            print(json_pp([p.to_dict() for p in getattr(res, "blocked", []) or []]))
+            return
+        if not rows:
+            print("(nobody is blocked)")
+            return
+        for pid, date in rows:
+            u = users.get(pid)
+            name = _display_chat(u, users) if u else str(pid)
+            when = date.astimezone().strftime("%Y-%m-%d") if date else ""
+            print(f"{pid:>14}  {name}  {when}")
+
+
 def setup(subparsers, common=None) -> None:
     parents = [common] if common else []
     sp = subparsers.add_parser("me", parents=parents, help="Show your account info")
@@ -233,3 +413,34 @@ def setup(subparsers, common=None) -> None:
     sp.add_argument("--bio", default=None)
     sp.add_argument("--photo", default=None, help="path to an image")
     sp.set_defaults(func=cmd_profile)
+
+    sp = subparsers.add_parser(
+        "photo-del", parents=parents, help="Delete your most recent profile photo (--all for all)"
+    )
+    sp.add_argument("--all", action="store_true", help="delete every profile photo")
+    sp.set_defaults(func=cmd_photo_del)
+
+    sp = subparsers.add_parser("privacy", parents=parents, help="Show privacy settings")
+    sub = sp.add_subparsers(dest="privacy_cmd", required=True)
+    g = sub.add_parser("get", help="privacy get [key...] (default: all)")
+    g.add_argument("key", nargs="*", default=[])
+    g.set_defaults(func=cmd_privacy_get)
+    s = sub.add_parser(
+        "set", help="privacy set KEY all|contacts|nobody [--allow USER] [--deny USER]"
+    )
+    s.add_argument("key", help=f"one of: {', '.join(sorted(_PRIVACY_KEYS))}")
+    s.add_argument("value")
+    s.add_argument("-a", "--allow", action="append", default=[], metavar="USER")
+    s.add_argument("-d", "--deny", action="append", default=[], metavar="USER")
+    s.set_defaults(func=cmd_privacy_set)
+
+    sp = subparsers.add_parser("block", parents=parents, help="Block a user")
+    sp.add_argument("user")
+    sp.set_defaults(func=cmd_block)
+
+    sp = subparsers.add_parser("unblock", parents=parents, help="Unblock a user")
+    sp.add_argument("user")
+    sp.set_defaults(func=cmd_unblock)
+
+    sp = subparsers.add_parser("blocked", parents=parents, help="List blocked users")
+    sp.set_defaults(func=cmd_blocked)

{telegram_userbot_cli-0.2.0 → telegram_userbot_cli-0.4.0}/src/tgcli/cli.py

@@ -6,7 +6,7 @@ import sys
 
 from telethon import errors
 
-from . import __version__, auth, chats, dialogs, media, messages, resolve
+from . import __version__, auth, chats, contacts, dialogs, groups, media, messages, resolve
 from .output import TgError
 
 
@@ -41,7 +41,10 @@ def build_parser() -> argparse.ArgumentParser:
     sp2 = sub.add_parser("logout", parents=[common], help="Log out and remove the session")
     sp2.set_defaults(func=auth.cmd_logout)
 
-    for mod in (messages, chats, media, dialogs):
+    sp3 = sub.add_parser("accounts", parents=[common], help="List configured accounts")
+    sp3.set_defaults(func=auth.cmd_accounts)
+
+    for mod in (messages, chats, media, dialogs, groups, contacts):
         mod.setup(sub, common)
 
     resolve.setup_alias(sub, common)