From c107400ed252088a242b59d0de2817b9f8b3d066 Mon Sep 17 00:00:00 2001 From: suti7yk5032 Date: Fri, 23 Aug 2024 00:17:51 +0900 Subject: [PATCH] =?UTF-8?q?fstop=E5=81=B4=E3=81=AE=E3=83=9E=E3=82=A6?= =?UTF-8?q?=E3=82=B9=E3=80=81=E3=82=AD=E3=83=BC=E3=83=9C=E3=83=BC=E3=83=89?= =?UTF-8?q?=E3=81=AE=E4=BD=BF=E7=94=A8=E5=81=9C=E6=AD=A2=E5=87=A6=E7=90=86?= =?UTF-8?q?=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 | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dislocker.py b/dislocker.py index 51da894..1273cc0 100644 --- a/dislocker.py +++ b/dislocker.py @@ -162,7 +162,7 @@ class Bot(discord.Client): return {"result": 1, "about": "user_data_not_found"} except Exception as error: - print("キーボードの使用状況を調査中にエラーが発生しました。\nエラー内容") + print("ユーザーの登録状態を調査中にエラーが発生しました。\nエラー内容") print(str(error.__class__.__name__)) print(str(error.args)) print(str(error)) @@ -546,7 +546,6 @@ class Bot(discord.Client): pc_list_record = cursor.fetchall() pc_using_member_id = pc_list_record[0][1] pc_password_hash = pc_list_record[0][2] - if pc_using_member_id == None: return {"result": 1, "about": "not_used"} else: @@ -558,8 +557,18 @@ class Bot(discord.Client): cursor.execute("SELECT * FROM pc_usage_history WHERE member_id = %s AND pc_number = %s ORDER BY id DESC LIMIT 1", (pc_using_member_id, pc_number)) pc_usage_history_record = cursor.fetchall() pc_usage_history_record_id = pc_usage_history_record[0][0] - keyboard_id = pc_usage_history_record[0][3] - mouse_id = pc_usage_history_record[0][4] + keyboard_number = pc_usage_history_record[0][3] + mouse_number = pc_usage_history_record[0][4] + if keyboard_number == None: + pass + else: + # keyboard_listの使用中ユーザーを消す + cursor.execute("UPDATE keyboard_list SET using_member_id = NULL WHERE keyboard_number = %s", (keyboard_number,)) + if mouse_number == None: + pass + else: + # mouse_listの使用中ユーザーを消す + cursor.execute("UPDATE mouse_list SET using_member_id = NULL WHERE keyboard_number = %s", (mouse_number,)) cursor.execute("UPDATE pc_usage_history SET end_use_time = clock_timestamp(), bot_about = %s WHERE id = %s", (bot_about, pc_usage_history_record_id)) dislocker.db.commit() return {"result": 0, "about": "ok"}