Merge pull request #80 from Xtao-Labs/revert-79-master

Revert "portball v1.40 - ignore msg if sender is not admin"
This commit is contained in:
Pentacene 2020-11-28 18:09:10 +08:00 committed by GitHub
commit f7f6e76292
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 41 deletions

View File

@ -152,7 +152,7 @@
}, },
{ {
"name": "portball", "name": "portball",
"version": "1.40", "version": "1.31",
"section": "chat", "section": "chat",
"maintainer": "Pentacene", "maintainer": "Pentacene",
"size": "3.6 kb", "size": "3.6 kb",

View File

@ -6,24 +6,18 @@ from datetime import timedelta
from telethon.tl.types import ChannelParticipantsAdmins from telethon.tl.types import ChannelParticipantsAdmins
@listener(is_plugin=True, outgoing=True, incoming=True, command="portball", @listener(is_plugin=True, outgoing=True, command="portball",
description="回复你要临时禁言的人的消息来实现XX秒的禁言", description="回复你要临时禁言的人的消息来实现XX秒的禁言",
parameters="<理由>(空格)<时间/秒>") parameters="<理由>(空格)<时间/秒>")
async def portball(context): async def portball(context):
reply = await context.get_reply_message() reply = await context.get_reply_message()
if context.is_group: if context.is_group:
admins = await context.client.get_participants(context.chat, filter=ChannelParticipantsAdmins)
# if message sender is one of admins or group anonymous bot
if (context.sender in admins) or (context.sender_id == 1087968824):
# if this msg reply to a message
if reply: if reply:
action = context.arguments.split() action = context.arguments.split()
# get sender's last_name
if reply.sender.last_name == None: if reply.sender.last_name == None:
last_name = '' last_name = ''
else: else:
last_name = reply.sender.last_name last_name = reply.sender.last_name
# if something wrong with the command
if len(action) < 2: if len(action) < 2:
notification = await bot.send_message(context.chat_id, '格式是\n-portball 理由 秒数\n真蠢', reply_to = context.id) notification = await bot.send_message(context.chat_id, '格式是\n-portball 理由 秒数\n真蠢', reply_to = context.id)
await sleep(10) await sleep(10)
@ -33,7 +27,6 @@ async def portball(context):
except: except:
pass pass
return False return False
# if time of portball less than 60 seconds
if int(action[1])<60: if int(action[1])<60:
notification = await bot.send_message(context.chat_id, '诶呀不要小于60秒啦', reply_to = context.id) notification = await bot.send_message(context.chat_id, '诶呀不要小于60秒啦', reply_to = context.id)
await sleep(10) await sleep(10)
@ -43,13 +36,14 @@ async def portball(context):
except: except:
pass pass
return False return False
# portball admins = await context.client.get_participants(context.chat, filter=ChannelParticipantsAdmins)
if (context.sender in admins) or (context.sender_id == 1087968824):
try: try:
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) 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( portball_message = await bot.send_message(
context.chat_id, context.chat_id,
f'[{reply.sender.first_name}{last_name}](tg://user?id={reply.sender.id}) 由于 {action[0]} 被塞了{action[1]}秒口球.\n f'[{reply.sender.first_name}{last_name}](tg://user?id={reply.sender.id}) 由于 {action[0]} \n'
f'到期自动拔出,无后遗症.', f'被暂时禁言{action[1]}',
reply_to = reply.id reply_to = reply.id
) )
await context.delete() await context.delete()
@ -63,15 +57,14 @@ async def portball(context):
notification = await bot.send_message(context.chat_id, '错误:我没有管理员权限或我的权限比被封禁的人要小', reply_to = context.id) notification = await bot.send_message(context.chat_id, '错误:我没有管理员权限或我的权限比被封禁的人要小', reply_to = context.id)
await sleep(10) await sleep(10)
await notification.delete() await notification.delete()
else:
# if not reply to any message notification = await bot.send_message(context.chat_id, '诶呀你不是管理员,不要给人家塞口球啊', reply_to = context.id)
await sleep(10)
await notification.delete()
else: else:
notification = await bot.send_message(context.chat_id, '你好蠢诶,都没有回复人,我哪知道你要搞谁的事情……', reply_to = context.id) notification = await bot.send_message(context.chat_id, '你好蠢诶,都没有回复人,我哪知道你要搞谁的事情……', reply_to = context.id)
await sleep(10) await sleep(10)
await notification.delete() await notification.delete()
# if sender is not admin
else:
return
else: else:
notification = await bot.send_message(context.chat_id, '你好蠢诶,又不是群组,怎么禁言啦!', reply_to = context.id) notification = await bot.send_message(context.chat_id, '你好蠢诶,又不是群组,怎么禁言啦!', reply_to = context.id)
await sleep(10) await sleep(10)