VK Groups info

Author: dyakovri

social/routes/group.py

@@ -11,7 +11,7 @@
 from social.models.group import Group
 from social.settings import get_settings
 from social.utils.telegram_groups import update_tg_chat
-from social.utils.vk_groups import update_vk_chat
+from social.utils.vk_groups import update_vk_chat, update_vk_group
 
 
 router = APIRouter(prefix="/group", tags=['User defined groups'])
@@ -28,6 +28,7 @@ class GroupGet(BaseModel):
     id: int
     owner_id: int | None = None
     name: str | None = None
+    type: str | None = None
     description: str | None = None
     invite_link: str | None = None
 
@@ -119,6 +120,8 @@ def update_group_info(
     if patch_info.update_from_source:
         if group.type == "vk_chat":
             update_vk_chat(group)
+        elif group.type == "vk_group":
+            update_vk_group(group)
         elif group.type == "tg_chat" or group.type == "tg_channel":
             update_tg_chat(group)
 

social/utils/vk_groups.py

@@ -4,7 +4,7 @@
 import requests
 from fastapi_sqlalchemy import db
 
-from social.models import CreateGroupRequest, VkChat
+from social.models import CreateGroupRequest, VkChat, VkGroup
 from social.settings import get_settings
 
 
@@ -14,35 +14,55 @@
 
 def get_chat_info(peer_id) -> dict:
     """Получить название чата ВК"""
-    conversation = requests.post(
+    resp = requests.post(
         "https://api.vk.com/method/messages.getConversationsById",
-        json={
+        data={
             "peer_ids": peer_id,
-            "group_id": settings.VK_BOT_GROUP_ID,
             "access_token": settings.VK_BOT_TOKEN,
             "v": 5.199,
         },
     )
     try:
-        return conversation.json()["response"]["items"][0]["chat_settings"]
+        conversation = resp.json()
+        logger.debug("Chat info: %s", conversation)
+        return conversation["response"]["items"][0]["chat_settings"]
     except Exception as exc:
         logger.exception(exc)
         return None
 
 
 def get_chat_invite_link(peer_id):
     """Получить название чата ВК"""
-    conversation = requests.post(
+    resp = requests.post(
         "https://api.vk.com/method/messages.getInviteLink",
-        json={
-            "peer_ids": peer_id,
-            "group_id": settings.VK_BOT_GROUP_ID,
+        data={
+            "peer_id": peer_id,
+            "access_token": settings.VK_BOT_TOKEN,
+            "v": 5.199,
+        },
+    )
+    try:
+        link = resp.json()
+        logger.debug("Chat link: %s", link)
+        return link["response"]["link"]
+    except Exception as exc:
+        logger.exception(exc)
+        return None
+
+
+def get_group_info(group_id) -> dict:
+    """Получить название чата ВК"""
+    groups = requests.post(
+        "https://api.vk.com/method/groups.getById",
+        data={
+            "group_id": group_id,
             "access_token": settings.VK_BOT_TOKEN,
+            "fields": "description",
             "v": 5.199,
         },
     )
     try:
-        return conversation.json()["response"]["link"]
+        return groups.json()["response"]["groups"][0]
     except Exception as exc:
         logger.exception(exc)
         return None
@@ -84,12 +104,22 @@ def approve_vk_chat(request_data: dict[str]):
     logger.info("VK group %d validated (secret=%s)", group.id, text)
 
 
-def update_vk_chat(group: VkChat):
+def update_vk_chat(chat: VkChat):
+    """Обновляет информацию о чате ВК"""
+    chat_info = get_chat_info(chat.peer_id)
+    chat_invite = get_chat_invite_link(chat.peer_id)
+    logger.debug("Chat info: %s, invite: %s", chat_info, chat_invite)
+    chat.name = chat_info.get("title")
+    chat.description = chat_info.get("description")
+    chat.invite_link = chat_invite
+    return chat
+
+
+def update_vk_group(group: VkGroup):
     """Обновляет информацию о группе ВК"""
-    chat_info = get_chat_info(group.peer_id)
-    chat_invite = get_chat_invite_link(group.peer_id)
-    logger.info("Chat info: %s, invite: %s", chat_info, chat_invite)
-    group.name = chat_info.get("title")
-    group.description = chat_info.get("description")
-    group.invite_link = chat_invite
+    group_info = get_group_info(group.group_id)
+    logger.debug("Group info: %s", group_info)
+    group.name = group_info.get("name")
+    group.description = group_info.get("description")
+    group.invite_link = f"https://vk.com/public{group.group_id}"
     return group