Skip to content

Commit 192314c

Browse files
eunwoo1104eunwoo1104
committed
style: black
1 parent 8ff1585 commit 192314c

File tree

6 files changed

+75
-30
lines changed

6 files changed

+75
-30
lines changed

‎addons/error.py

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,20 @@ async def on_interaction_error(self, ctx: InteractionContext, ex: Exception):
5252
report_required = True
5353
components = None
5454
if report_required:
55-
components = ActionRow(Button(style=ButtonStyles.SUCCESS, label="전송하기", custom_id="errlog"))
55+
components = ActionRow(
56+
Button(style=ButtonStyles.SUCCESS, label="전송하기", custom_id="errlog")
57+
)
5658
msg = await ctx.send(embed=base, components=[components])
5759

5860
if report_required:
5961
components.components[0].disabled = True
6062
try:
61-
await self.bot.interaction.wait_interaction(timeout=60, check=lambda x: x.data.custom_id == "errlog" and x.message.id == msg.id and x.author == ctx.author)
63+
await self.bot.interaction.wait_interaction(
64+
timeout=60,
65+
check=lambda x: x.data.custom_id == "errlog"
66+
and x.message.id == msg.id
67+
and x.author == ctx.author,
68+
)
6269
cmd = self.bot.interaction.get_command(ctx)
6370
usage = f"/{cmd.command.name}"
6471
if cmd.subcommand_group:
@@ -72,16 +79,20 @@ async def on_interaction_error(self, ctx: InteractionContext, ex: Exception):
7279
elif isinstance(v, Role):
7380
v = f"<@&{v.id}>"
7481
usage += f" {k}:{v}"
75-
debug_format = f"===LAYTHE-DEBUG===\n" \
76-
f"CMD: {usage}\n" \
77-
f"AUTHOR: {ctx.author} (ID: {ctx.author.id})\n" \
78-
f"TRACEBACK:\n\n" \
79-
f"{tb}\n" \
80-
f"===END-DEBUG==="
82+
debug_format = (
83+
f"===LAYTHE-DEBUG===\n"
84+
f"CMD: {usage}\n"
85+
f"AUTHOR: {ctx.author} (ID: {ctx.author.id})\n"
86+
f"TRACEBACK:\n\n"
87+
f"{tb}\n"
88+
f"===END-DEBUG==="
89+
)
8190
fname = f"traceback/{str(time.time()).split('.')[0]}.txt"
8291
with open(fname, "w", encoding="UTF-8") as f:
8392
f.write(debug_format)
84-
await self.bot.create_message(891520234920501268, f"새로운 오류가 저장되었습니다. (`{fname}`)")
93+
await self.bot.create_message(
94+
891520234920501268, f"새로운 오류가 저장되었습니다. (`{fname}`)"
95+
)
8596
await msg.reply("성공적으로 오류 메시지를 전송했어요!")
8697
except TimeoutError:
8798
pass

‎addons/level.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,9 @@ async def reset_level_callback(self, ctx: InteractionContext):
100100

101101
@slash("레벨제외", description="특정 채널을 레벨 시스템에서 제외시키는 방법을 알려줘요.")
102102
async def exclude_level(self, ctx: InteractionContext):
103-
await ctx.send("ℹ 현재 자동 설정은 사용할 수 없어요. 원하시는 채널을 레벨에서 제외하기 위해서는 해당 채널의 주제에 다음 문구를 추가해주세요.\n> `laythe:leveloff`")
103+
await ctx.send(
104+
"ℹ 현재 자동 설정은 사용할 수 없어요. 원하시는 채널을 레벨에서 제외하기 위해서는 해당 채널의 주제에 다음 문구를 추가해주세요.\n> `laythe:leveloff`"
105+
)
104106

105107
@on("message_create")
106108
async def on_message_create(self, message: Message):

‎addons/log.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -539,9 +539,13 @@ async def execute_welcome(self, member: GuildMemberAdd):
539539
if not data.welcome_channel:
540540
return
541541
if data.greet:
542-
await self.bot.create_message(data.welcome_channel, data.greet.format(mention=member.mention))
542+
await self.bot.create_message(
543+
data.welcome_channel, data.greet.format(mention=member.mention)
544+
)
543545
if data.greet_dm and member.user:
544-
await member.user.send(f"> `{self.bot.get_guild(member.guild_id).name}`에서 자동으로 전송한 환영 메세지에요.\n{data.greet_dm.format(name=str(member.user))}")
546+
await member.user.send(
547+
f"> `{self.bot.get_guild(member.guild_id).name}`에서 자동으로 전송한 환영 메세지에요.\n{data.greet_dm.format(name=str(member.user))}"
548+
)
545549

546550
@on("guild_member_remove")
547551
async def on_guild_member_remove(self, member_delete: GuildMemberRemove):
@@ -558,10 +562,14 @@ async def on_guild_member_remove(self, member_delete: GuildMemberRemove):
558562

559563
@on("guild_member_remove")
560564
async def execute_goodbye(self, member_delete: GuildMemberRemove):
561-
data = await self.bot.database.request_guild_setting(int(member_delete.guild_id))
565+
data = await self.bot.database.request_guild_setting(
566+
int(member_delete.guild_id)
567+
)
562568
if not data.welcome_channel or not data.bye:
563569
return
564-
await self.bot.create_message(data.welcome_channel, data.bye.format(name=str(member_delete.user)))
570+
await self.bot.create_message(
571+
data.welcome_channel, data.bye.format(name=str(member_delete.user))
572+
)
565573

566574
@on("message_reaction_remove_all")
567575
async def on_message_reaction_remove_all(self, remove: MessageReactionRemoveAll):

‎addons/manage.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -188,13 +188,10 @@ async def mute(
188188

189189
self.bot.dispatch("management_command", ctx)
190190

191-
@slash("언뮤트",
191+
@slash(
192+
"언뮤트",
192193
description="선택한 유저를 언뮤트하거나 타임아웃을 제거해요.",
193-
connector={
194-
"유저": "user",
195-
"타임아웃": "use_timeout",
196-
"사유": "reason"
197-
},
194+
connector={"유저": "user", "타임아웃": "use_timeout", "사유": "reason"},
198195
)
199196
@option(
200197
ApplicationCommandOptionType.USER,
@@ -214,7 +211,13 @@ async def mute(
214211
description="언뮤트 또는 타임아웃 제거의 사유",
215212
required=False,
216213
)
217-
async def unmute(self, ctx: InteractionContext, user: GuildMember, use_timeout: bool = False, reason: str = None):
214+
async def unmute(
215+
self,
216+
ctx: InteractionContext,
217+
user: GuildMember,
218+
use_timeout: bool = False,
219+
reason: str = None,
220+
):
218221
await ctx.defer()
219222
if use_timeout:
220223
await self.bot.modify_guild_member(

‎addons/utils.py

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -198,11 +198,22 @@ async def subscribe(self, ctx: InteractionContext):
198198
await self.bot.follow_news_channel(Config.NOTICE_CHANNEL, ctx.channel_id)
199199
await ctx.send("✅ 성공적으로 CodeNU 레이테 공지 채널에 구독했어요.")
200200

201-
@slash("맞춤법", description="맞춤법을 검사해줘요. 틀린 경우가 있으니 참고용으로만 사용해주세요.", connector={"텍스트": "text"})
202-
@option(ApplicationCommandOptionType.STRING, name="텍스트", description="맞춤법 검사를 진행할 텍스트", required=True)
201+
@slash(
202+
"맞춤법",
203+
description="맞춤법을 검사해줘요. 틀린 경우가 있으니 참고용으로만 사용해주세요.",
204+
connector={"텍스트": "text"},
205+
)
206+
@option(
207+
ApplicationCommandOptionType.STRING,
208+
name="텍스트",
209+
description="맞춤법 검사를 진행할 텍스트",
210+
required=True,
211+
)
203212
async def spell_check(self, ctx: InteractionContext, text: str):
204213
if not self.bot.spell:
205-
return await ctx.send("❌ 이런! 이 봇에서는 이 기능을 사용할 수 없어요.\n[Laythe 소스코드는 여기서 확인할 수 있어요.](https://github.com/codenu/laythe-v2)")
214+
return await ctx.send(
215+
"❌ 이런! 이 봇에서는 이 기능을 사용할 수 없어요.\n[Laythe 소스코드는 여기서 확인할 수 있어요.](https://github.com/codenu/laythe-v2)"
216+
)
206217
await ctx.defer()
207218
orig = text
208219
changed = text
@@ -219,11 +230,14 @@ async def spell_check(self, ctx: InteractionContext, text: str):
219230
orig_text = x["orgStr"]
220231
orig = orig.replace(orig_text, f"[__{orig_text}__]")
221232
embed = Embed(
222-
title="문법 오류를 발견했어요.",
223-
timestamp=ctx.id.timestamp,
224-
color=utils.EmbedColor.NEGATIVE)
233+
title="문법 오류를 발견했어요.",
234+
timestamp=ctx.id.timestamp,
235+
color=utils.EmbedColor.NEGATIVE,
236+
)
225237
embed.add_field(name="수정 전", value=orig, inline=False)
226-
embed.add_field(name="수정 후", value=changed or "`수정 결과를 표시할 수 없어요.`", inline=False)
238+
embed.add_field(
239+
name="수정 후", value=changed or "`수정 결과를 표시할 수 없어요.`", inline=False
240+
)
227241
await ctx.send(embed=embed)
228242

229243
@on("ready")

‎laythe/bot.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
from extlib.spellchecker import SpellChecker
2323
except ImportError:
2424
import sys
25+
2526
print("extlib missing, `/맞춤법` command and klist-related features disabled.")
2627
KListClient = None
2728
SpellChecker = None
@@ -60,8 +61,14 @@ def __init__(self, *, logger: Logger):
6061
)
6162
self.nugrid = None # soonTM
6263
self.loop.create_task(self.setup_bot())
63-
self.klist = KListClient(self, Config.KBOT_TOKEN, self.http.session) if KListClient else KListClient # noqa
64-
self.spell = SpellChecker(self.http.session) if SpellChecker else SpellChecker # noqa
64+
self.klist = (
65+
KListClient(self, Config.KBOT_TOKEN, self.http.session)
66+
if KListClient
67+
else KListClient
68+
) # noqa
69+
self.spell = (
70+
SpellChecker(self.http.session) if SpellChecker else SpellChecker
71+
) # noqa
6572

6673
async def setup_bot(self):
6774
await self.wait_ready()

0 commit comments

Comments
 (0)