From 5567412c9e54ba28ef6ab54174f333d0813204fa Mon Sep 17 00:00:00 2001 From: Pentacene <48641773+Pentacene@users.noreply.github.com> Date: Mon, 24 Aug 2020 10:05:50 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=89=20Portball=201.21=20and=20atadmin?= =?UTF-8?q?=5Fatall=201.1=20(#12)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- atadmins_atall.py | 4 ++-- list.json | 10 +++++----- portball.py | 28 ++++++++++++++-------------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/atadmins_atall.py b/atadmins_atall.py index ccf59d7..44a47f5 100644 --- a/atadmins_atall.py +++ b/atadmins_atall.py @@ -6,7 +6,7 @@ from os import remove import re import time -@listener(is_plugin=True, outgoing=True, command="atadmins", +@listener(is_plugin=True, incoming=True, outgoing=True, command="atadmins", description="一键 AT 本群管理员（仅在群组中有效）", parameters="<要说的话>") async def atadmins(context): @@ -34,7 +34,7 @@ async def atadmins(context): # await context.reply(' , '.join(admin_list)) await context.delete() -@listener(outgoing=True, command="atall", +@listener(is_plugin=True, incoming=True, outgoing=True, command="atall", description="一键 AT 本群成员（仅在群组中有效）") async def atall(context): await context.edit('正在获取成员列表中...') diff --git a/list.json b/list.json index 81ffd6f..d96802b 100644 --- a/list.json +++ b/list.json @@ -112,7 +112,7 @@ }, { "name": "atadmins_atall", - "version": "1.0", + "version": "1.1", "section": "chat", "maintainer": "Pentacene", "size": "2.5 kb", @@ -152,11 +152,11 @@ }, { "name": "portball", - "version": "1.1", + "version": "1.21", "section": "chat", - "maintainer": "丢失了", - "size": "3.0 kb", - "supported": false, + "maintainer": "Pentacene", + "size": "3.6 kb", + "supported": true, "des-short": "回复你要临时禁言的人的消息来实现XX秒的禁言。", "des": "这个人很懒，什么都没有留下。" }, diff --git a/portball.py b/portball.py index ec174e4..ab50dd7 100644 --- a/portball.py +++ b/portball.py @@ -6,9 +6,9 @@ from datetime import timedelta from telethon.tl.types import ChannelParticipantsAdmins -@listener(is_plugin=True, outgoing=True, command="portball", - description="回复你要临时禁言的人的消息来实现XX秒的禁言。", - parameters="<理由> <时间 单位：秒>") +@listener(incoming=True, outgoing=True, command="portball", + description="回复你要临时禁言的人的消息来实现XX秒的禁言", + parameters="<理由>(空格)<时间/秒>") async def portball(context): reply = await context.get_reply_message() if context.is_group: @@ -18,11 +18,8 @@ async def portball(context): last_name = '' else: last_name = reply.sender.last_name - if not len(action) == 2: - await context.edit('你好蠢诶，没有参数我怎么禁言嘛。') - return if int(action[1])<60: - notification = await bot.send_message(context.chat_id, '诶呀不要小于60秒啦') + notification = await bot.send_message(context.chat_id, '诶呀不要小于60秒啦', reply_to = context.id) await sleep(10) await notification.delete() try: @@ -33,31 +30,34 @@ async def portball(context): admins = await context.client.get_participants(context.chat, filter=ChannelParticipantsAdmins) if context.sender in admins: try: - await bot.edit_permissions(context.chat_id, reply.sender.id, timedelta(seconds=int(action[1].replace(' ',''))), send_messages=False) - await bot.send_message( + await bot.edit_permissions(context.chat_id, reply.sender.id, timedelta(seconds=int(action[1].replace(' ',''))), send_messages=False, send_media=False, send_stickers=False, send_gifs=False, send_games=False, send_inline=False, send_polls=False, invite_users=False, change_info=False, pin_messages=False) + portball_message = await bot.send_message( context.chat_id, f'[{reply.sender.first_name}{last_name}](tg://user?id={reply.sender.id}) 由于 {action[0]} \n' f'被暂时禁言{action[1]}秒', reply_to = reply.id ) + await context.delete() + await sleep(int(action[1].replace(' ',''))) + await portball_message.delete() except rpcerrorlist.UserAdminInvalidError: - notification = await bot.send_message(context.chat_id, '错误：我没有管理员权限或我的权限比被封禁的人要小') + notification = await bot.send_message(context.chat_id, '错误：我没有管理员权限或我的权限比被封禁的人要小', reply_to = context.id) await sleep(10) await notification.delete() except rpcerrorlist.ChatAdminRequiredError: - notification = await bot.send_message(context.chat_id, '错误：我没有管理员权限或我的权限比被封禁的人要小') + notification = await bot.send_message(context.chat_id, '错误：我没有管理员权限或我的权限比被封禁的人要小', reply_to = context.id) await sleep(10) await notification.delete() else: - notification = await bot.send_message(context.chat_id, '诶呀你不是管理员，不要给人家塞口球啊') + notification = await bot.send_message(context.chat_id, '诶呀你不是管理员，不要给人家塞口球啊', reply_to = context.id) await sleep(10) await notification.delete() else: - notification = await bot.send_message(context.chat_id, '你好蠢诶，都没有回复人，我哪知道你要搞谁的事情……') + notification = await bot.send_message(context.chat_id, '你好蠢诶，都没有回复人，我哪知道你要搞谁的事情……', reply_to = context.id) await sleep(10) await notification.delete() else: - notification = await bot.send_message(context.chat_id, '你好蠢诶，又不是群组，怎么禁言啦！') + notification = await bot.send_message(context.chat_id, '你好蠢诶，又不是群组，怎么禁言啦！', reply_to = context.id) await sleep(10) await notification.delete() try: