deltabot-cli 6.2.0__tar.gz → 7.0.0__tar.gz

{deltabot_cli-6.2.0/deltabot_cli.egg-info → deltabot_cli-7.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: deltabot-cli
-Version: 6.2.0
+Version: 7.0.0
 Summary: Library to speedup Delta Chat bot development
 Author-email: adbenitez <adb@merlinux.eu>
 Project-URL: Homepage, https://github.com/deltachat-bot/deltabot-cli-py
@@ -15,7 +15,6 @@ License-File: LICENSE
 Requires-Dist: deltachat2[full]>=0.5.0
 Requires-Dist: appdirs>=1.4.4
 Requires-Dist: rich>=12.6.0
-Requires-Dist: qrcode>=7.4.2
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
@@ -23,6 +22,7 @@ Requires-Dist: isort; extra == "dev"
 Requires-Dist: pylint; extra == "dev"
 Requires-Dist: pylama; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
+Dynamic: license-file
 
 # deltabot-cli for Python
 

{deltabot_cli-6.2.0 → deltabot_cli-7.0.0}/deltabot_cli/cli.py

@@ -10,7 +10,6 @@ from pathlib import Path
 from threading import Thread
 from typing import Callable, Set, Union
 
-import qrcode
 from appdirs import user_config_dir
 from deltachat2 import Bot, CoreEvent, Event, EventType, IOTransport, JsonRpcError, Rpc
 from deltachat2.events import EventFilter, HookCollection, HookDecorator, RawEvent
@@ -136,7 +135,8 @@ class BotCli:
         import_parser.add_argument("path", help="path to the account backup", type=Path)
 
         self.add_subcommand(_serve_cmd, name="serve")
-        self.add_subcommand(_qr_cmd, name="qr")
+        self.add_subcommand(_link_cmd, name="link")
+        self.add_subcommand(_admin_cmd, name="admin")
         self.add_subcommand(_list_cmd, name="list")
         self.add_subcommand(_remove_cmd, name="remove")
 
@@ -172,6 +172,25 @@ class BotCli:
             return rpc.get_config(accid, "configured_addr")
         return rpc.get_config(accid, "addr")
 
+    def get_admin_chat(self, rpc: Rpc, accid: int) -> int:
+        """Return the bot administration group.
+        If the account is not configured, zero is returned.
+        """
+        if not rpc.is_configured(accid):
+            return 0
+        chatid = int(rpc.get_config(accid, "ui.admin_chat") or 0)
+        return chatid or self.reset_admin_chat(rpc, accid)
+
+    def reset_admin_chat(self, rpc: Rpc, accid: int) -> int:
+        """Reset the bot administration group and return the new group id.
+        If the account is not configured, zero is returned.
+        """
+        if not rpc.is_configured(accid):
+            return 0
+        chatid = rpc.create_group_chat(accid, "Bot Admins", True)
+        rpc.set_config(accid, "ui.admin_chat", str(chatid))
+        return chatid
+
     def start(self) -> None:
         """Start running the bot and processing incoming messages."""
         self.init_parser()
@@ -305,8 +324,38 @@ def _config_cmd_for_acc(bot: Bot, accid: int, args: Namespace) -> None:
             print(f"{key}={value!r}")
 
 
-def _qr_cmd(cli: BotCli, bot: Bot, args: Namespace) -> None:
-    """get bot's verification QR"""
+def _admin_cmd(cli: BotCli, bot: Bot, args: Namespace) -> None:
+    """print the invitation link to the bot administration group.
+    WARNING: don't share this, anyone joining will become admin of the bot"""
+    if args.account:
+        accounts = [cli.get_account(bot.rpc, args.account)]
+        if not accounts[0]:
+            bot.logger.error(f"unknown account: {args.account!r}")
+            sys.exit(1)
+    else:
+        accounts = bot.rpc.get_all_account_ids()
+    for accid in accounts:
+        addr = cli.get_address(bot.rpc, accid)
+        print(f"Account #{accid} ({addr}):")
+        _admin_cmd_for_acc(cli, bot, accid)
+        print("")
+    if not accounts:
+        bot.logger.error("There are no accounts yet, add a new account using the init subcommand")
+        sys.exit(1)
+
+
+def _admin_cmd_for_acc(cli: BotCli, bot: Bot, accid: int) -> None:
+    """print bot's admin group invitation for the given account"""
+    if bot.rpc.is_configured(accid):
+        chatid = cli.get_admin_chat(bot.rpc, accid)
+        qrdata = bot.rpc.get_chat_securejoin_qr_code(accid, chatid)
+        print(qrdata)
+    else:
+        bot.logger.error("account not configured")
+
+
+def _link_cmd(cli: BotCli, bot: Bot, args: Namespace) -> None:
+    """print the bot's chat invitation link"""
     if args.account:
         accounts = [cli.get_account(bot.rpc, args.account)]
         if not accounts[0]:
@@ -317,22 +366,18 @@ def _qr_cmd(cli: BotCli, bot: Bot, args: Namespace) -> None:
     for accid in accounts:
         addr = cli.get_address(bot.rpc, accid)
         print(f"Account #{accid} ({addr}):")
-        _qr_cmd_for_acc(bot, accid)
+        _link_cmd_for_acc(bot, accid)
         print("")
     if not accounts:
         bot.logger.error("There are no accounts yet, add a new account using the init subcommand")
         sys.exit(1)
 
 
-def _qr_cmd_for_acc(bot: Bot, accid: int) -> None:
-    """get bot's verification QR"""
+def _link_cmd_for_acc(bot: Bot, accid: int) -> None:
+    """print the bot's chat invitation link for the given account"""
     if bot.rpc.is_configured(accid):
-        qrdata, _ = bot.rpc.get_chat_securejoin_qr_code_svg(accid, None)
-        code = qrcode.QRCode()
-        code.add_data(qrdata)
-        code.print_ascii(invert=True)
-        fragment = qrdata.split(":", maxsplit=1)[1].replace("#", "&", 1)
-        print(f"https://i.delta.chat/#{fragment}")
+        qrdata = bot.rpc.get_chat_securejoin_qr_code(accid, None)
+        print(qrdata)
     else:
         bot.logger.error("account not configured")
 

{deltabot_cli-6.2.0 → deltabot_cli-7.0.0/deltabot_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: deltabot-cli
-Version: 6.2.0
+Version: 7.0.0
 Summary: Library to speedup Delta Chat bot development
 Author-email: adbenitez <adb@merlinux.eu>
 Project-URL: Homepage, https://github.com/deltachat-bot/deltabot-cli-py
@@ -15,7 +15,6 @@ License-File: LICENSE
 Requires-Dist: deltachat2[full]>=0.5.0
 Requires-Dist: appdirs>=1.4.4
 Requires-Dist: rich>=12.6.0
-Requires-Dist: qrcode>=7.4.2
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
@@ -23,6 +22,7 @@ Requires-Dist: isort; extra == "dev"
 Requires-Dist: pylint; extra == "dev"
 Requires-Dist: pylama; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
+Dynamic: license-file
 
 # deltabot-cli for Python
 

{deltabot_cli-6.2.0 → deltabot_cli-7.0.0}/deltabot_cli.egg-info/requires.txt

@@ -1,7 +1,6 @@
 deltachat2[full]>=0.5.0
 appdirs>=1.4.4
 rich>=12.6.0
-qrcode>=7.4.2
 
 [dev]
 black

{deltabot_cli-6.2.0 → deltabot_cli-7.0.0}/pyproject.toml

@@ -22,7 +22,6 @@ dependencies = [
     "deltachat2[full]>=0.5.0",
     "appdirs>=1.4.4",
     "rich>=12.6.0",
-    "qrcode>=7.4.2",
 ]
 
 [project.urls]