Merge pull request #5 from markelovstyle/master

Some changes

nicevk/api.py

@@ -1,14 +1,13 @@
 import asyncio
+import dotenv
+import json
+
 from functools import wraps
 from pathlib import Path
-
 from loguru import logger
 from python_rucaptcha.ImageCaptcha import ImageCaptcha, aioImageCaptcha
 from vkbottle import User, Message, VKError
-import dotenv
 from vkbottle.framework import Middleware
-import json
-
 from nicevk.errors import CaptchaError
 
 

nicevk/plugins/help_plugin.py

@@ -6,4 +6,7 @@
 
 @user.on.message_handler(text=".help")
 async def help_(ans: Message):
-    await edit(ans, "Available commands:\n\n" + "\n".join(commands))
+    await edit(
+        ans.peer_id, ans.id,
+        "Available commands:\n\n" + "\n".join(commands)
+    )

nicevk/plugins/ignore_plugin.py

@@ -23,7 +23,7 @@ async def help_(ans: Message, username: str):
         ).object_id,
     ]
     save_state()
-    await edit(ans, "User ignored")
+    await edit(ans.peer_id, ans.id, "User ignored")
 
 
 @user.on.message_handler(text=".rm-ignore <username>")
@@ -42,14 +42,14 @@ async def help_(ans: Message, username: str):
             )
         ]
     except ValueError:
-        await edit(ans, "That user is not muted")
+        await edit(ans.peer_id, ans.id, "That user is not muted")
     else:
-        await edit(ans, "User removed from ignore")
+        await edit(ans.peer_id, ans.id, "User removed from ignore")
     finally:
         save_state()
 
 
 @user.on.message_handler()
-async def middleware(message: Message):
-    if message.from_id in state.get("ignore", []):
-        await message.api.messages.delete([message.id])
+async def middleware(ans: Message):
+    if ans.from_id in state.get("ignore", []):
+        await ans.api.messages.delete(message_ids=ans.id)

nicevk/plugins/load_plugin.py

@@ -1,13 +1,10 @@
-from datetime import datetime
+import wget
+import runpy
 
+from datetime import datetime
 from vkbottle import Message
-
 from nicevk.api import user, commands, nicevk_folder
 
-import wget
-
-import runpy
-
 commands.append(".dl_mod <url> - download and execute plugin")
 
 
@@ -19,7 +16,6 @@ async def help_(ans: Message, url: str):
         nicevk_folder / f"module_{datetime.now().isoformat().replace('.', ' ')}.py"
     )
     wget.download(url.strip(), out=out_path)
-
     runpy.run_path(out_path)
 
     await ans.api.messages.edit(

nicevk/plugins/notes_plugin.py

@@ -14,10 +14,9 @@
 
 @user.on.message_handler(text=".notes")
 async def list_notes(ans: Message):
-    await ans.api.messages.edit(
-        ans.peer_id,
-        ans.id,
-        f"Available notes:\n\n" + "\n".join(state.get("notes", {}).keys()),
+    await edit(
+        ans.peer_id, ans.id,
+        f"Available notes:\n\n" + "\n".join(state.get("notes", {}).keys())
     )
 
 
@@ -28,7 +27,8 @@ async def get_notes(ans: Message, name: str):
         save_state()
     if name in state["notes"].keys():
         await edit(
-            ans, f"Note '{name}'\n\n{state['notes'][name]}"
+            ans.peer_id, ans.id,
+            f"Note '{name}'\n\n{state['notes'][name]}"
         )
     else:
         await ans.api.messages.edit(ans.peer_id, ans.id, f"Note '{name}' is not found")
@@ -39,5 +39,8 @@ async def save_notes(ans: Message, name: str, text: str):
     if "notes" not in state.keys():
         state["notes"] = {}
     state["notes"][name] = text
-    await ans.api.messages.edit(ans.peer_id, ans.id, f"Note '{name}' saved!")
+    await edit(
+        ans.peer_id, ans.id,
+        f"Note '{name}' saved!"
+    )
     save_state()

nicevk/plugins/restart_plugin.py

@@ -1,9 +1,8 @@
 import asyncio
 import subprocess
-from functools import wraps
 
+from functools import wraps
 from vkbottle import Message, VKError
-
 from nicevk.api import user, commands, state, save_state, coro
 
 commands.append(".restart - restart nicevk")

nicevk/plugins/spam_plugin.py

@@ -8,6 +8,6 @@
 @user.on.message_handler(text=".spam <amount> <text>")
 async def help_(ans: Message, amount: str, text: str):
     amount = int(amount)
-    await user.api.messages.delete([ans.id], delete_for_all=True)
+    await user.api.messages.delete(ans.id, delete_for_all=True)
     for i in range(amount):
         await ans(text)

nicevk/utils.py

@@ -1,37 +1,20 @@
-from vkbottle import Message
+from vkbottle.api import UserApi
 
+api = UserApi.get_current()
 
-async def edit(ans: Message, text: str):
-    data = ans.__dict__
-    keys_to_pop = [
-        "message",
-        "flags",
-        "timestamp",
-        "text",
-        "random_id",
-        "id",
-        "conversation_message_id",
-        "from_id",
-        "date",
-        "out",
-        "read_state",
-        "ref",
-        "ref_source",
-        "important",
-        "reply_message",
-        "fwd_messages",
-        "action",
-    ]
-    for key in keys_to_pop:
-        data.pop(key, None)
-    if ans.geo is not None:
-        lat, long = ans.geo.coordinates.latitude, ans.geo.coordinates.longitude
-        data["lat"] = lat
-        data["long"] = long
-    data.pop("geo", None)
-    await ans.api.messages.edit(
-        message=text,
-        attachment=",".join(data.pop("attachments")),
-        **data,
-        keep_forward_messages=True
+
+def get_params(obj: dict) -> dict:
+    return {
+        k: v for k, v in obj.items()
+        if v is not None and k != "params"
+    }
+
+
+async def edit(
+    peer_id: int, msg_id: int,
+    text: str, **params
+):
+    locals().update(params)
+    return await api.messages.edit(
+        **get_params(locals())
     )