Compare commits
No commits in common. "20d9d1506388bb71594613d77c07bc95453a9d10" and "ab92ecfb4af57c7da9ec4514c74b9a7a15e86a60" have entirely different histories.
20d9d15063
...
ab92ecfb4a
4 changed files with 28 additions and 116 deletions
5
.gitignore
vendored
5
.gitignore
vendored
|
@ -160,10 +160,5 @@ cython_debug/
|
||||||
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
|
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
|
||||||
#.idea/
|
#.idea/
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
config/*
|
config/*
|
||||||
db/*
|
db/*
|
||||||
=======
|
|
||||||
config/
|
|
||||||
db/
|
|
||||||
>>>>>>> for_psql
|
|
||||||
|
|
122
dislocker.py
122
dislocker.py
|
@ -1,14 +1,24 @@
|
||||||
import json
|
import json
|
||||||
import discord
|
import discord
|
||||||
import os
|
import os
|
||||||
<<<<<<< HEAD
|
|
||||||
import sqlite3
|
import sqlite3
|
||||||
=======
|
|
||||||
import psycopg2
|
|
||||||
import datetime
|
|
||||||
>>>>>>> for_psql
|
|
||||||
|
|
||||||
class Database():
|
class Bot(discord.Client):
|
||||||
|
async def on_ready(self):
|
||||||
|
print("ログイン成功")
|
||||||
|
|
||||||
|
async def on_message(self, message):
|
||||||
|
if message.author.bot:
|
||||||
|
return
|
||||||
|
|
||||||
|
if message.content == "/hello":
|
||||||
|
await message.channel.send("こんにちは!!!!")
|
||||||
|
|
||||||
|
if message.content == "/password":
|
||||||
|
await message.channel.send("gjhioragiopwjhgiopweap")
|
||||||
|
|
||||||
|
|
||||||
|
class Cert():
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
if not os.path.isfile("./db/dislocker.db"):
|
if not os.path.isfile("./db/dislocker.db"):
|
||||||
initial = 1
|
initial = 1
|
||||||
|
@ -45,117 +55,23 @@ class Database():
|
||||||
elif result[0][1] == username and result[0][2] == password:
|
elif result[0][1] == username and result[0][2] == password:
|
||||||
return 0
|
return 0
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
|
|
||||||
cert = Cert()
|
cert = Cert()
|
||||||
=======
|
|
||||||
class Bot(discord.Client):
|
|
||||||
def db_connect(self, host, db, user, password):
|
|
||||||
self.db = psycopg2.connect(f"host={host} dbname={db} user={user} password={password}")
|
|
||||||
|
|
||||||
async def on_ready(self):
|
bot_config_path = "./config/bot.json"
|
||||||
print("ログイン成功")
|
|
||||||
|
|
||||||
async def on_message(self, message):
|
|
||||||
if message.author.bot:
|
|
||||||
return
|
|
||||||
|
|
||||||
if isinstance(message.channel, discord.DMChannel):
|
|
||||||
user_id = message.author.id
|
|
||||||
user_name = message.author.name
|
|
||||||
msg_split = message.content.split()
|
|
||||||
if msg_split[0] == "/password":
|
|
||||||
if len(msg_split) <= 2:
|
|
||||||
await message.channel.send("PC番号、もしくはデバイス番号が入力されていません。")
|
|
||||||
|
|
||||||
elif len(msg_split) == 3:
|
|
||||||
if msg_split[1].isdigit() and msg_split[2].isdigit():
|
|
||||||
if int(msg_split[1]) <= 10 and int(msg_split[1]) >= 1:
|
|
||||||
cursor = self.db.cursor()
|
|
||||||
cursor.execute("SELECT * FROM club_member WHERE discord_userid = %s", (str(message.author.id),))
|
|
||||||
member_info = cursor.fetchall()
|
|
||||||
cursor.execute("INSERT INTO pc_usage_history ( member_id, pc_number, device_number, start_use_time ) VALUES ( %s, %s, %s, current_timestamp)", (member_info[0][0], int(msg_split[1]), int(msg_split[2])))
|
|
||||||
self.db.commit()
|
|
||||||
await message.channel.send(f"使用が開始されました。\nPC番号 | {msg_split[1]}\nデバイス番号 | {msg_split[2]}\n")
|
|
||||||
else:
|
|
||||||
await message.channel.send("パソコンの台数が\n# だめです")
|
|
||||||
else:
|
|
||||||
await message.channel.send("構文が不正です。")
|
|
||||||
>>>>>>> for_psql
|
|
||||||
|
|
||||||
elif len(msg_split) >= 4:
|
|
||||||
if msg_split[1].isdigit() and msg_split[2].isdigit():
|
|
||||||
if int(msg_split[1]) <= 10 and int(msg_split[1]) >= 1:
|
|
||||||
cursor = self.db.cursor()
|
|
||||||
cursor.execute("SELECT * FROM club_member WHERE discord_userid = %s", (str(message.author.id),))
|
|
||||||
member_info = cursor.fetchall()
|
|
||||||
cursor.execute("INSERT INTO pc_usage_history ( member_id, pc_number, device_number, start_use_time, use_detail ) VALUES ( %s, %s, %s, current_timestamp, %s)", (member_info[0][0], int(msg_split[1]), int(msg_split[2]), str(msg_split[3])))
|
|
||||||
self.db.commit()
|
|
||||||
await message.channel.send(f"使用が開始されました。\nPC番号 | {msg_split[1]}\nデバイス番号 | {msg_split[2]}\n")
|
|
||||||
else:
|
|
||||||
await message.channel.send("パソコンの台数が\n# だめです")
|
|
||||||
else:
|
|
||||||
await message.channel.send("構文が不正です。")
|
|
||||||
|
|
||||||
|
|
||||||
elif msg_split[0] == "/stop":
|
|
||||||
cursor = self.db.cursor()
|
|
||||||
cursor.execute("SELECT * FROM club_member WHERE discord_userid = %s", (str(message.author.id),))
|
|
||||||
member_info = cursor.fetchall()
|
|
||||||
cursor.execute("SELECT * FROM pc_usage_history WHERE member_id=%s ORDER BY id DESC LIMIT 1", (member_info[0][0],))
|
|
||||||
history_info = cursor.fetchall()
|
|
||||||
cursor.execute("UPDATE pc_usage_history SET end_use_time = current_timestamp WHERE id = %s", (history_info[0][0],))
|
|
||||||
self.db.commit()
|
|
||||||
|
|
||||||
await message.channel.send(f"使用が終了されました。")
|
|
||||||
|
|
||||||
else:
|
|
||||||
|
|
||||||
if message.content == "/hello":
|
|
||||||
await message.channel.send("こんにちは!!!!")
|
|
||||||
|
|
||||||
else:
|
|
||||||
await message.channel.send("どうしましたか?")
|
|
||||||
|
|
||||||
#cert = Cert()
|
|
||||||
|
|
||||||
config_dir_path = "./config/"
|
|
||||||
db_config_path = config_dir_path + "db.json"
|
|
||||||
if not os.path.isfile(db_config_path):
|
|
||||||
if not os.path.isdir(config_dir_path):
|
|
||||||
os.mkdir(config_dir_path)
|
|
||||||
|
|
||||||
db_config = {
|
|
||||||
"host": "localhost",
|
|
||||||
"db": "dislocker",
|
|
||||||
"username": "user",
|
|
||||||
"password": "example_pass",
|
|
||||||
"port": "5432"
|
|
||||||
}
|
|
||||||
with open(db_config_path, "w") as w:
|
|
||||||
json.dump(db_config, w, indent=4)
|
|
||||||
elif os.path.isfile(db_config_path):
|
|
||||||
with open(db_config_path, "r") as r:
|
|
||||||
db_config = json.load(r)
|
|
||||||
|
|
||||||
bot_config_path = config_dir_path + "bot.json"
|
|
||||||
if not os.path.isfile(bot_config_path):
|
if not os.path.isfile(bot_config_path):
|
||||||
if not os.path.isdir(config_dir_path):
|
|
||||||
os.mkdir(config_dir_path)
|
|
||||||
|
|
||||||
bot_config = {
|
bot_config = {
|
||||||
"token": "TYPE HERE BOTS TOKEN KEY"
|
"token": ""
|
||||||
}
|
}
|
||||||
with open(bot_config_path, "w") as w:
|
with open(bot_config_path, "w") as w:
|
||||||
json.dump(bot_config, w, indent=4)
|
json.dump(bot_config, w, indent=4)
|
||||||
|
|
||||||
elif os.path.isfile(bot_config_path):
|
elif os.path.isfile(bot_config_path):
|
||||||
with open(bot_config_path, "r") as r:
|
with open("./config/bot.json", "r") as r:
|
||||||
bot_config = json.load(r)
|
bot_config = json.load(r)
|
||||||
|
|
||||||
intents = discord.Intents.default()
|
intents = discord.Intents.default()
|
||||||
intents.message_content = True
|
intents.message_content = True
|
||||||
|
|
||||||
bot = Bot(intents=intents)
|
bot = Bot(intents=intents)
|
||||||
bot.db_connect(db_config["host"], db_config["db"], db_config["username"], db_config["password"])
|
|
||||||
bot.run(bot_config["token"])
|
bot.run(bot_config["token"])
|
|
@ -1,8 +1,13 @@
|
||||||
# ログイン
|
# ログイン
|
||||||
psql -U suti7 -d dislocker
|
psql -U suti7 -d dislocker
|
||||||
|
|
||||||
CREATE TABLE club_member (id SERIAL NOT NULL, name VARCHAR(30) NOT NULL, discord_username VARCHAR(32) NOT NULL, discord_userid VARCHAR(18) NOT NULL, PRIMARY KEY (id));
|
CREATE TABLE user
|
||||||
CREATE TABLE pc_usage_history (id SERIAL NOT NULL, member_id INTEGER NOT NULL, pc_number INTEGER NOT NULL, device_number INTEGER NOT NULL, start_use_time TIMESTAMP NOT NULL, end_use_time TIMESTAMP, use_detail VARCHAR(30), PRIMARY KEY (id), FOREIGN KEY (memb
|
(user_id INTEGER PRIMARY KEY NOT NULL,
|
||||||
er_id) REFERENCES club_member(id));
|
discord_id INTEGER NOT NULL,
|
||||||
|
discord_username VARCHAR(32) NOT NULL,
|
||||||
|
PRIMARY KEY (user_id));
|
||||||
|
|
||||||
INSERTのとき文字列はシングルクォーテーションで囲む!!!
|
CREATE TABLE user_list (user_id INTEGER NOT NULL, discord_username VARCHAR(32) NOT NULL, discord_userid INTEGER NOT NULL, PRIMARY KEY (user_id));
|
||||||
|
|
||||||
|
# テーブルを作る
|
||||||
|
CREATE TABLE web_auth (id SERIAL, username VARCHAR(10) NOT NULL, password VARCHAR(32) NOT NULL, PRIMARY KEY(id));
|
|
@ -1,4 +0,0 @@
|
||||||
discord.py
|
|
||||||
flask
|
|
||||||
flask-login
|
|
||||||
psycopg2
|
|
Loading…
Reference in a new issue