From 125ca3e60189555bf354e2e3287764dee86fbd73 Mon Sep 17 00:00:00 2001 From: suti7yk5032 Date: Fri, 23 Aug 2024 01:15:21 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=AD=E3=83=BC=E3=83=9C=E3=83=BC=E3=83=89?= =?UTF-8?q?=E3=80=81=E3=83=9E=E3=82=A6=E3=82=B9=E3=81=AE=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E7=A2=BA=E8=AA=8D=E9=96=A2=E6=95=B0=E3=81=AB=E8=87=AA=E5=89=8D?= =?UTF-8?q?=E3=81=AE=E3=82=82=E3=81=AE=E3=81=8B=E3=82=92=E5=88=A4=E5=AE=9A?= =?UTF-8?q?=E3=81=99=E3=82=8B=E5=87=A6=E7=90=86=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dislocker.py | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/dislocker.py b/dislocker.py index cd2c787..1dab5b8 100644 --- a/dislocker.py +++ b/dislocker.py @@ -241,17 +241,19 @@ class Bot(discord.Client): def keyboard_used_check(self, **kwargs): try: - keyboard_number = int(kwargs["keyboard_number"]) - - cursor = dislocker.db.cursor() - - cursor.execute("SELECT * FROM keyboard_list WHERE keyboard_number=%s", (keyboard_number,)) - keyboard_list_record = cursor.fetchall() - if keyboard_list_record[0][1] == None: + if kwargs["keyboard_number"] == None: return {"result": 0, "about": "ok"} else: - return {"result": 1, "about": "keyboard_already_in_use_by_other"} + keyboard_number = int(kwargs["keyboard_number"]) + + cursor = dislocker.db.cursor() + cursor.execute("SELECT * FROM keyboard_list WHERE keyboard_number=%s", (keyboard_number,)) + keyboard_list_record = cursor.fetchall() + if keyboard_list_record[0][1] == None: + return {"result": 0, "about": "ok"} + else: + return {"result": 1, "about": "keyboard_already_in_use_by_other"} except Exception as error: print("キーボードの使用状況を調査中にエラーが発生しました。\nエラー内容") @@ -265,17 +267,19 @@ class Bot(discord.Client): def mouse_used_check(self, **kwargs): try: - mouse_number = int(kwargs["mouse_number"]) - - cursor = dislocker.db.cursor() - - cursor.execute("SELECT * FROM mouse_list WHERE mouse_number=%s", (mouse_number,)) - mouse_list_record = cursor.fetchall() - if mouse_list_record[0][1] == None: + if kwargs["mouse_number"] == None: return {"result": 0, "about": "ok"} else: - return {"result": 1, "about": "mouse_already_in_use_by_other"} + mouse_number = int(kwargs["mouse_number"]) + + cursor = dislocker.db.cursor() + cursor.execute("SELECT * FROM mouse_list WHERE mouse_number=%s", (mouse_number,)) + mouse_list_record = cursor.fetchall() + if mouse_list_record[0][1] == None: + return {"result": 0, "about": "ok"} + else: + return {"result": 1, "about": "mouse_already_in_use_by_other"} except Exception as error: print("マウスの使用状況を調査中にエラーが発生しました。\nエラー内容")