suti7yk5032/Dislocker
1
0
Fork 0
Code Issues 13 Pull requests Projects 3 Releases 2 Packages Wiki Activity Actions

Merge pull request 'バグ修正のためtestingをmainにマージ' (#24) from testing into main

Browse source 
Reviewed-on: #24
This commit is contained in:
suti7yk5032 2024-10-18 14:00:08 +09:00
commit 9bf5a82343
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dislocker.py
View file

@ -1252,6 +1252,9 @@ async def on_button(interaction: discord.Interaction):
keyboard_not_register_button = discord.ui.Button(style=discord.ButtonStyle.primary, label="キーボードは自前", custom_id=f"keyboardregister_{str(pc_number)}_0") keyboard_not_register_button = discord.ui.Button(style=discord.ButtonStyle.primary, label="キーボードは自前", custom_id=f"keyboardregister_{str(pc_number)}_0")
keyboard_register_view.add_item(keyboard_not_register_button) keyboard_register_view.add_item(keyboard_not_register_button)
keyboard_mouse_not_register_button = discord.ui.Button(style=discord.ButtonStyle.primary, label="キーボード、マウスとも自前", custom_id=f"mouseregister_{str(pc_number)}_0_0")
keyboard_register_view.add_item(keyboard_mouse_not_register_button)
await interaction.response.send_message(f"# :keyboard: キーボードのデバイス番号を選んでください！\n>>> # PC番号 | {str(pc_number)}", view=keyboard_register_view, ephemeral=True) await interaction.response.send_message(f"# :keyboard: キーボードのデバイス番号を選んでください！\n>>> # PC番号 | {str(pc_number)}", view=keyboard_register_view, ephemeral=True)
elif custom_id_split[0] == "keyboardregister": elif custom_id_split[0] == "keyboardregister":

2
dislocker_auth.py
View file

@ -393,7 +393,7 @@ def verify():
if pc_auth["result"] == 0: if pc_auth["result"] == 0:
auth.delete(pc_number) auth.delete(pc_number)
auth.device_use_register(pc_number=pc_number, keyboard_number=pc_auth["output_dict"]["keyboard_number"], mouse_number=pc_auth["output_dict"]["mouse_number"]) #auth.device_use_register(pc_number=pc_number, keyboard_number=pc_auth["output_dict"]["keyboard_number"], mouse_number=pc_auth["output_dict"]["mouse_number"])
print(str(pc_number) + "の認証処理は成功しました.") print(str(pc_number) + "の認証処理は成功しました.")
return jsonify({'message': 'ok'}), 200 return jsonify({'message': 'ok'}), 200
elif pc_auth["result"] == 1: elif pc_auth["result"] == 1: