Merge pull request #28 from omg-xtao/dev

feat(more notice): Group Admin Change and Member Restrict

efb_qq_plugin_go_cqhttp/GoCQHttp.py

@@ -50,6 +50,7 @@ from .Utils import (
     download_user_avatar,
     process_quote_text,
     qq_emoji_list,
+    strf_time,
 )
 
 
@@ -304,6 +305,60 @@ class GoCQHttp(BaseClient):
             context["message"] = text
             self.send_efb_group_notice(context)
 
+        @self.coolq_bot.on_notice("group_admin")
+        def handle_group_admin_msg(context):
+            context["event_description"] = "\u2139 Group Admin Change Event"
+            if (context["sub_type"]) == "set":
+                text = "{nickname}({context[user_id]}) has been appointed as the group({group_name}) administrator"
+            else:
+                text = "{nickname}({context[user_id]}) has been de-appointed as the group({group_name}) administrator"
+
+            original_group = self.get_group_info(context["group_id"], False)
+            group_name = context["group_id"]
+            if original_group is not None and "group_name" in original_group:
+                group_name = original_group["group_name"]
+            text = text.format(
+                nickname=self.get_stranger_info(context["user_id"])["nickname"],
+                context=context,
+                group_name=group_name,
+            )
+
+            context["message"] = text
+            self.send_efb_group_notice(context)
+
+        @self.coolq_bot.on_notice("group_ban")
+        def handle_group_ban_msg(context):
+            context["event_description"] = "\u2139 Group Member Restrict Event"
+            if (context["sub_type"]) == "ban":
+                text = (
+                    "{nickname}({context[user_id]}) "
+                    "is restricted for speaking for {time} at the group({group_name}) by "
+                    "{nickname_}({context[operator_id]})"
+                )
+                time_text = strf_time(context["duration"])
+            else:
+                text = (
+                    "{nickname}({context[user_id]}) "
+                    "is lifted from restrictions at the group({group_name}) by "
+                    "{nickname_}({context[operator_id]}){time}"
+                )
+                time_text = ""
+
+            original_group = self.get_group_info(context["group_id"], False)
+            group_name = context["group_id"]
+            if original_group is not None and "group_name" in original_group:
+                group_name = original_group["group_name"]
+            text = text.format(
+                nickname=self.get_stranger_info(context["user_id"])["nickname"],
+                context=context,
+                time=time_text,
+                group_name=group_name,
+                nickname_=self.get_stranger_info(context["operator_id"])["nickname"],
+            )
+
+            context["message"] = text
+            self.send_efb_group_notice(context)
+
         @self.coolq_bot.on_notice("offline_file")
         def handle_offline_file_upload_msg(context):
             context["event_description"] = "\u2139 Offline File Upload Event"
@@ -922,12 +977,13 @@ class GoCQHttp(BaseClient):
             author = chat.get_member(SystemChatMember.SYSTEM_ID)
         except KeyError:
             author = chat.add_system_member()
+        event_description = context.get("event_description", "")
         msg = Message(
             uid="__group_notice__.%s" % int(time.time()),
             type=MsgType.Text,
             chat=chat,
             author=author,
-            text=context["message"],
+            text=(event_description + "\n\n" + context["message"]) if event_description else context["message"],
             deliver_to=coordinator.master,
         )
         coordinator.send_message(msg)

efb_qq_plugin_go_cqhttp/Utils.py

@@ -784,3 +784,15 @@ def download_voice(voice_url: str):
     else:
         audio_file = origin_file
     return audio_file
+
+
+def strf_time(seconds: int) -> str:
+    minutes, seconds = divmod(seconds, 60)
+    hours, minutes = divmod(minutes, 60)
+    days, hours = divmod(hours, 24)
+    text = ""
+    text += f"{days}d" if days else ""
+    text += f"{hours}h" if hours else ""
+    text += f"{minutes}m" if minutes else ""
+    text += f"{seconds}s" if seconds else ""
+    return text