Skip to content

Commit

Permalink
Merge pull request #111 from Redmomn/master
Browse files Browse the repository at this point in the history
  • Loading branch information
@MistEO
MistEO authored Mar 23, 2024
2 parents dc5c69e + c0e15a6 commit 1fa931c
Show file tree
Hide file tree
Showing 2 changed files with 73 additions and 57 deletions.
19 changes: 12 additions & 7 deletions src/plugins/block/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@ def refresh_accounts(self) -> None:
if time.time() - self.refresh_time < 60 and self.accounts:
return

if not self.accounts and not os.path.exists(self.accounts_dir):
return

with self.refresh_lock:
self.refresh_time = time.time()
go_cqhttp_plugin_accounts: list[int] = [
int(d) for d in os.listdir(self.accounts_dir) if d.isnumeric()
]
if os.path.exists(self.accounts_dir):
go_cqhttp_plugin_accounts: list[int] = [
int(d) for d in os.listdir(self.accounts_dir) if d.isnumeric()
]
else:
go_cqhttp_plugin_accounts = []
onebot_accounts: list[int] = [
int(self_id) for self_id, bot in get_bots().items() if self_id.isnumeric() and bot.type == 'onebot'
int(self_id) for self_id, bot in get_bots().items() if self_id.isnumeric() and bot.type == 'OneBot V11'
]
self.accounts = list(set(go_cqhttp_plugin_accounts + onebot_accounts))

Expand Down Expand Up @@ -70,3 +70,8 @@ async def is_sleep(self, bot: Bot, event: Union[GroupMessageEvent, GroupIncrease
block=True,
rule=Rule(account_manager.is_sleep)
)


@other_bot_msg.handle()
async def _():
return
111 changes: 61 additions & 50 deletions src/plugins/roulette/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

import random
import time

# from .pseudorandom import roulette_randomizer


Expand All @@ -22,6 +23,8 @@
roulette_player = defaultdict(list)
role_cache = defaultdict(lambda: defaultdict(str))

shot_lock = asyncio.Lock()


async def am_I_admin(bot: Bot, event: GroupMessageEvent, state: T_State) -> bool:
info = await get_bot(str(event.self_id)).call_api('get_group_member_info', **{
Expand Down Expand Up @@ -95,10 +98,10 @@ async def is_roulette_type_msg(bot: Bot, event: GroupMessageEvent, state: T_Stat
async def is_config_admin(event: GroupMessageEvent) -> bool:
return BotConfig(event.self_id).is_admin_of_bot(event.user_id)


IsAdmin = permission.GROUP_OWNER | permission.GROUP_ADMIN | Permission(
is_config_admin)


roulette_type_msg = on_message(
priority=5,
block=True,
Expand Down Expand Up @@ -157,16 +160,17 @@ async def shot(self_id: int, user_id: int, group_id: int) -> Optional[Awaitable[
self_role = role_cache[self_id][group_id]

if self_id == user_id:
if mode == 0: # 踢人
if self_role == 'owner': # 牛牛是群主不能退群，不然群就解散了
if mode == 0: # 踢人
if self_role == 'owner': # 牛牛是群主不能退群，不然群就解散了
return None

async def group_leave():
await get_bot(str(self_id)).call_api('set_group_leave', **{
'group_id': group_id
})

return group_leave
elif mode == 1: # 牛牛没法禁言自己
elif mode == 1: # 牛牛没法禁言自己
return None

user_info = await get_bot(str(self_id)).call_api('get_group_member_info', **{
Expand All @@ -180,24 +184,27 @@ async def group_leave():
elif user_role == "admin" and self_role != "owner":
return None

if mode == 0: # 踢人
if mode == 0: # 踢人
async def group_kick():
kicked_users[group_id].add(user_id)
await get_bot(str(self_id)).call_api('set_group_kick', **{
'user_id': user_id,
'group_id': group_id
})

return group_kick

elif mode == 1: # 禁言
elif mode == 1: # 禁言
async def group_ban():
await get_bot(str(self_id)).call_api('set_group_ban', **{
'user_id': user_id,
'group_id': group_id,
'duration': random.randint(5, 20) * 60
})

return group_ban


shot_msg = on_message(
priority=5,
block=True,
Expand All @@ -216,60 +223,63 @@ async def group_ban():

@shot_msg.handle()
async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
roulette_status[event.group_id] -= 1
roulette_count[event.group_id] += 1
shot_msg_count = roulette_count[event.group_id]
roulette_time[event.group_id] = time.time()
roulette_player[event.group_id].append(event.user_id)
async with shot_lock:
roulette_status[event.group_id] -= 1
roulette_count[event.group_id] += 1
shot_msg_count = roulette_count[event.group_id]
roulette_time[event.group_id] = time.time()
roulette_player[event.group_id].append(event.user_id)

if shot_msg_count == 6 and random.random() < 0.125:
roulette_status[event.group_id] = 0
roulette_player[event.group_id] = []
await roulette_msg.finish('我的手中的这把武器，找了无数工匠都难以修缮如新。不......不该如此......')
if shot_msg_count == 6 and random.random() < 0.125:
roulette_status[event.group_id] = 0
roulette_player[event.group_id] = []
await roulette_msg.finish('我的手中的这把武器，找了无数工匠都难以修缮如新。不......不该如此......')

elif roulette_status[event.group_id] > 0:
await roulette_msg.finish(shot_text[shot_msg_count - 1] + f"( {shot_msg_count} / 6 )")
elif roulette_status[event.group_id] > 0:
await roulette_msg.finish(shot_text[shot_msg_count - 1] + f"( {shot_msg_count} / 6 )")

roulette_status[event.group_id] = 0
roulette_status[event.group_id] = 0

async def let_the_bullets_fly():
await asyncio.sleep(random.randint(5, 20))
async def let_the_bullets_fly():
await asyncio.sleep(random.randint(5, 20))

if BotConfig(event.self_id, event.group_id).drunkenness() <= 0:
roulette_player[event.group_id] = []
shot_awaitable = await shot(event.self_id, event.user_id, event.group_id)
if shot_awaitable:
reply_msg = MessageSegment.text(
'米诺斯英雄们的故事......有喜剧，便也会有悲剧。舍弃了荣耀，') + MessageSegment.at(
event.user_id) + MessageSegment.text('选择回归平凡......')
await roulette_msg.send(reply_msg)
await let_the_bullets_fly()
await shot_awaitable()
else:
reply_msg = '听啊，悲鸣停止了。这是幸福的和平到来前的宁静。'
await roulette_msg.finish(reply_msg)

if BotConfig(event.self_id, event.group_id).drunkenness() <= 0:
roulette_player[event.group_id] = []
shot_awaitable = await shot(event.self_id, event.user_id, event.group_id)
if shot_awaitable:
reply_msg = MessageSegment.text('米诺斯英雄们的故事......有喜剧，便也会有悲剧。舍弃了荣耀，') + MessageSegment.at(
event.user_id) + MessageSegment.text('选择回归平凡......')
await roulette_msg.send(reply_msg)
await let_the_bullets_fly()
await shot_awaitable()
else:
reply_msg = '听啊，悲鸣停止了。这是幸福的和平到来前的宁静。'
await roulette_msg.finish(reply_msg)
player = roulette_player[event.group_id]
rand_list = player[-random.randint(1, min(len(player), 6)):][::-1]
roulette_player[event.group_id] = []
shot_awaitable_list = []
for user_id in rand_list:
shot_awaitable = await shot(event.self_id, user_id, event.group_id)
if not shot_awaitable:
continue

else:
player = roulette_player[event.group_id]
rand_list = player[-random.randint(1, min(len(player), 6)):][::-1]
roulette_player[event.group_id] = []
shot_awaitable_list = []
for user_id in rand_list:
shot_awaitable = await shot(event.self_id, user_id, event.group_id)
if not shot_awaitable:
continue

shot_awaitable_list.append(shot_awaitable)
shot_awaitable_list.append(shot_awaitable)

reply_msg = MessageSegment.text('米诺斯英雄们的故事......有喜剧，便也会有悲剧。舍弃了荣耀，') + MessageSegment.at(
user_id) + MessageSegment.text(f'选择回归平凡...... ( {len(shot_awaitable_list)} / 6 )')
await roulette_msg.send(reply_msg)
reply_msg = MessageSegment.text(
'米诺斯英雄们的故事......有喜剧，便也会有悲剧。舍弃了荣耀，') + MessageSegment.at(
user_id) + MessageSegment.text(f'选择回归平凡...... ( {len(shot_awaitable_list)} / 6 )')
await roulette_msg.send(reply_msg)

if not shot_awaitable_list:
return
if not shot_awaitable_list:
return

await let_the_bullets_fly()
for shot_awaitable in shot_awaitable_list:
await shot_awaitable()
await let_the_bullets_fly()
for shot_awaitable in shot_awaitable_list:
await shot_awaitable()


request_cmd = on_request(
Expand All @@ -292,6 +302,7 @@ async def is_drink_msg(bot: Bot, event: GroupMessageEvent, state: T_State) -> bo

return False


drink_msg = on_message(
priority=4,
block=False,
Expand Down

0 comments on commit 1fa931c

Please sign in to comment.