Compare commits
No commits in common. "3fedb29509b7d8208106190e35401790f500cbff" and "44c14e27eea1a2db78d549a880d61e2519502638" have entirely different histories.
3fedb29509
...
44c14e27ee
8
bot.py
8
bot.py
|
|
@ -9,7 +9,6 @@ from discord.ui import Modal, InputText
|
|||
from discord.utils import get
|
||||
from discord.ext import commands
|
||||
from dbutil import MessageDB
|
||||
from dbutil import GuildAppDB
|
||||
|
||||
load_dotenv()
|
||||
|
||||
|
|
@ -40,23 +39,16 @@ async def on_ready():
|
|||
activity = discord.Activity(name=f"{len(bot.guilds)} guilds", type=discord.ActivityType.listening)
|
||||
await bot.change_presence(activity=activity, status = discord.Status.online)
|
||||
print(f"Logged in as {bot.user}")
|
||||
for i in bot.guilds:
|
||||
if str(i.id) not in GuildAppDB.get_all_guilds():
|
||||
GuildAppDB.create_guild(str(i.id), i.name)
|
||||
print(f"entry for {i.id} created")
|
||||
|
||||
@bot.event
|
||||
async def on_guild_join(guild):
|
||||
activity = discord.Activity(name=f"{len(bot.guilds)} guilds", type=discord.ActivityType.listening)
|
||||
await bot.change_presence(activity=activity, status = discord.Status.online)
|
||||
GuildAppDB.create_guild(str(guild.id), guild.name)
|
||||
print(f"Joined guild {guild.name}: {guild.id}")
|
||||
|
||||
@bot.event
|
||||
async def on_guild_remove(guild):
|
||||
activity = discord.Activity(name=f"{len(bot.guilds)} guilds", type=discord.ActivityType.listening)
|
||||
await bot.change_presence(activity=activity, status = discord.Status.online)
|
||||
print(f"Removed from guild {guild.name}: {guild.id}")
|
||||
|
||||
@bot.slash_command(description = "Command used to apply")
|
||||
async def apply(ctx):
|
||||
|
|
|
|||
88
dbutil.py
88
dbutil.py
|
|
@ -30,7 +30,7 @@ class GuildAppDB():
|
|||
applications = {}
|
||||
application_blob = pickle.dumps(applications)
|
||||
data = guild_id, guild_name, application_blob
|
||||
con = sqlite3.connect("applications.db")
|
||||
con = sqlite3.connect("application.db")
|
||||
cur = con.cursor()
|
||||
cur.execute("INSERT INTO app_guildapp_db VALUES (?, ?, ?)", data)
|
||||
con.commit()
|
||||
|
|
@ -38,32 +38,22 @@ class GuildAppDB():
|
|||
def remove_guild(guild_id: str) -> None:
|
||||
con = sqlite3.connect("applications.db")
|
||||
cur = con.cursor()
|
||||
cur.execute("DELETE FROM app_guildapp_db WHERE guild_id=(?)", (guild_id, ))
|
||||
cur.execute(f"DELETE FROM app_guildapp_db WHERE guild_id={guild_id}")
|
||||
con.commit()
|
||||
|
||||
def get_all_guilds() -> list:
|
||||
con = sqlite3.connect("applications.db")
|
||||
cur = con.cursor()
|
||||
cur.execute("SELECT guild_id FROM app_guildapp_db")
|
||||
guilds = cur.fetchall()
|
||||
guilds = [guild[0] for guild in guilds]
|
||||
return guilds
|
||||
|
||||
def add_application_entry(guild_id: str, application_name: str) -> str:
|
||||
con = sqlite3.connect("applications.db")
|
||||
cur = con.cursor()
|
||||
cur.execute("SELECT applications_blob FROM app_guildapp_db WHERE guild_id=(?)", (guild_id, ))
|
||||
cur.execute(f"SELECT application_blob FROM app_guildapp_db WHERE guild_id={guild_id}")
|
||||
application_blob = cur.fetchone()
|
||||
applications = pickle.loads(application_blob[0])
|
||||
print(applications)
|
||||
applications = pickle.loads(application_blob)
|
||||
if application_name not in applications.keys():
|
||||
applications[application_name] = {
|
||||
applications[f"application_name"] = {
|
||||
"app_id": "",
|
||||
"resp_channel": "",
|
||||
"questions": []
|
||||
"resp_channel": ""
|
||||
}
|
||||
application_blob2 = pickle.dumps(applications)
|
||||
cur.execute("UPDATE app_guildapp_db SET applications_blob = (?) WHERE guild_id= (?)", (application_blob2, guild_id))
|
||||
cur.execute(f"UPDATE app_guildapp_db SET application_blob = ? WHERE guild_id={guild_id}", application_blob2)
|
||||
con.commit()
|
||||
return "success"
|
||||
else:
|
||||
|
|
@ -72,37 +62,28 @@ class GuildAppDB():
|
|||
def remove_application_entry(guild_id: str, application_name: str) -> str:
|
||||
con = sqlite3.connect("applications.db")
|
||||
cur = con.cursor()
|
||||
cur.execute("SELECT applications_blob FROM app_guildapp_db WHERE guild_id=(?)", (guild_id, ))
|
||||
cur.execute(f"SELECT application_blob FROM app_guildapp_db WHERE guild_id={guild_id}")
|
||||
application_blob = cur.fetchone()
|
||||
applications = pickle.loads(application_blob[0])
|
||||
applications = pickle.loads(application_blob)
|
||||
if application_name in applications.keys():
|
||||
applications.pop(application_name)
|
||||
application_blob2 = pickle.dumps(applications)
|
||||
cur.execute("UPDATE app_guildapp_db SET applications_blob = (?) WHERE guild_id= (?)", (application_blob2, guild_id))
|
||||
cur.execute(f"UPDATE app_guildapp_db SET application_blob = ? WHERE guild_id={guild_id}", application_blob2)
|
||||
con.commit()
|
||||
return "success"
|
||||
else:
|
||||
return "error on remove application entry: application not found"
|
||||
|
||||
def get_application_entry(guild_id: str, application_name: str):
|
||||
con = sqlite3.connect("applications.db")
|
||||
cur = con.cursor()
|
||||
cur.execute("SELECT applications_blob FROM app_guildapp_db WHERE guild_id=(?)", (guild_id, ))
|
||||
application_blob = cur.fetchone()
|
||||
applications = pickle.loads(application_blob[0])
|
||||
if application_name in applications.keys():
|
||||
return applications[application_name]
|
||||
|
||||
def set_response_channel(guild_id: str, application_name: str, channel_id: str) -> str:
|
||||
con = sqlite3.connect("applications.db")
|
||||
cur = con.cursor()
|
||||
cur.execute("SELECT applications_blob FROM app_guildapp_db WHERE guild_id=(?)", (guild_id, ))
|
||||
cur.execute(f"SELECT application_blob FROM app_guildapp_db WHERE guild_id={guild_id}")
|
||||
application_blob = cur.fetchone()
|
||||
applications = pickle.loads(application_blob[0])
|
||||
applications = pickle.loads(application_blob)
|
||||
if application_name in applications.keys():
|
||||
applications[application_name]["resp_channel"] = channel_id
|
||||
application_blob2 = pickle.dumps(applications)
|
||||
cur.execute("UPDATE app_guildapp_db SET applications_blob = (?) WHERE guild_id= (?)", (application_blob2, guild_id))
|
||||
cur.execute(f"UPDATE app_guildapp_db SET application_blob = ? WHERE guild_id={guild_id}", application_blob2)
|
||||
con.commit()
|
||||
return "success"
|
||||
else:
|
||||
|
|
@ -111,14 +92,14 @@ class GuildAppDB():
|
|||
def add_question(guild_id: str, application_name: str, question: str) -> str:
|
||||
con = sqlite3.connect("applications.db")
|
||||
cur = con.cursor()
|
||||
cur.execute("SELECT applications_blob FROM app_guildapp_db WHERE guild_id=(?)", (guild_id, ))
|
||||
cur.execute(f"SELECT application_blob FROM app_guildapp_db WHERE guild_id={guild_id}")
|
||||
application_blob = cur.fetchone()
|
||||
applications = pickle.loads(application_blob[0])
|
||||
applications = pickle.loads(application_blob)
|
||||
if application_name in applications.keys():
|
||||
question_index = int(len(applications[application_name]["questions"]))
|
||||
applications[application_name]["questions"].append(question)
|
||||
applications[application_name]["questions"][question_index] = question
|
||||
application_blob2 = pickle.dumps(applications)
|
||||
cur.execute("UPDATE app_guildapp_db SET applications_blob = (?) WHERE guild_id= (?)", (application_blob2, guild_id))
|
||||
cur.execute(f"UPDATE app_guildapp_db SET application_blob = ? WHERE guild_id={guild_id}", application_blob2)
|
||||
con.commit()
|
||||
return "success"
|
||||
else:
|
||||
|
|
@ -127,9 +108,9 @@ class GuildAppDB():
|
|||
def get_questions(guild_id: str, application_name: str):
|
||||
con = sqlite3.connect("applications.db")
|
||||
cur = con.cursor()
|
||||
cur.execute("SELECT applications_blob FROM app_guildapp_db WHERE guild_id=(?)", (guild_id, ))
|
||||
cur.execute(f"SELECT application_blob FROM app_guildapp_db WHERE guild_id={guild_id}")
|
||||
application_blob = cur.fetchone()
|
||||
applications = pickle.loads(application_blob[0])
|
||||
applications = pickle.loads(application_blob)
|
||||
if application_name in applications.keys():
|
||||
questions = applications[application_name]["questions"]
|
||||
return questions, len(questions)
|
||||
|
|
@ -139,16 +120,16 @@ class GuildAppDB():
|
|||
def edit_question(guild_id: str, application_name: str, question_index: int, new_question: str):
|
||||
con = sqlite3.connect("applications.db")
|
||||
cur = con.cursor()
|
||||
cur.execute("SELECT applications_blob FROM app_guildapp_db WHERE guild_id=(?)", (guild_id, ))
|
||||
cur.execute(f"SELECT application_blob FROM app_guildapp_db WHERE guild_id={guild_id}")
|
||||
application_blob = cur.fetchone()
|
||||
applications = pickle.loads(application_blob[0])
|
||||
applications = pickle.loads(application_blob)
|
||||
if application_name in applications.keys():
|
||||
questions = applications[application_name]["questions"]
|
||||
if question_index <= len(questions):
|
||||
if question_index in applications[application_name].keys():
|
||||
questions = applications[application_name]["questions"]#[question_index] = new_question
|
||||
questions[question_index-1] = new_question
|
||||
applications[application_name]["questions"] = questions
|
||||
application_blob2 = pickle.dumps(applications)
|
||||
cur.execute("UPDATE app_guildapp_db SET applications_blob = (?) WHERE guild_id= (?)", (application_blob2, guild_id))
|
||||
cur.execute(f"UPDATE app_guildapp_db SET application_blob = ? WHERE guild_id={guild_id}", application_blob2)
|
||||
con.commit()
|
||||
return "success"
|
||||
else:
|
||||
|
|
@ -159,23 +140,16 @@ class GuildAppDB():
|
|||
def move_question(guild_id: str, application_name: str, init_que_index: int, fin_que_index: int):
|
||||
con = sqlite3.connect("applications.db")
|
||||
cur = con.cursor()
|
||||
cur.execute("SELECT applications_blob FROM app_guildapp_db WHERE guild_id=(?)", (guild_id, ))
|
||||
cur.execute(f"SELECT application_blob FROM app_guildapp_db WHERE guild_id={guild_id}")
|
||||
application_blob = cur.fetchone()
|
||||
applications = pickle.loads(application_blob[0])
|
||||
applications = pickle.loads(application_blob)
|
||||
if application_name in applications.keys():
|
||||
questions = applications[application_name]["questions"]
|
||||
if init_que_index <= len(questions) and fin_que_index <= len(questions):
|
||||
if init_que_index > fin_que_index:
|
||||
questions.insert(fin_que_index-1, questions[init_que_index-1])
|
||||
questions.pop(init_que_index)
|
||||
elif init_que_index < fin_que_index:
|
||||
questions.insert(fin_que_index, questions[init_que_index-1])
|
||||
questions.pop(init_que_index-1)
|
||||
else:
|
||||
return "error on move question: init and fin index equal"
|
||||
questions.insert(init_que_index-1, questions.pop(fin_que_index-1))
|
||||
applications[application_name]["questions"] = questions
|
||||
application_blob2 = pickle.dumps(applications)
|
||||
cur.execute("UPDATE app_guildapp_db SET applications_blob = (?) WHERE guild_id= (?)", (application_blob2, guild_id))
|
||||
cur.execute(f"UPDATE app_guildapp_db SET application_blob = ? WHERE guild_id={guild_id}", application_blob2)
|
||||
con.commit()
|
||||
return "success"
|
||||
else:
|
||||
|
|
@ -186,16 +160,16 @@ class GuildAppDB():
|
|||
def remove_question(guild_id: str, application_name: str, question_index: int):
|
||||
con = sqlite3.connect("applications.db")
|
||||
cur = con.cursor()
|
||||
cur.execute("SELECT applications_blob FROM app_guildapp_db WHERE guild_id=(?)", (guild_id, ))
|
||||
cur.execute(f"SELECT application_blob FROM app_guildapp_db WHERE guild_id={guild_id}")
|
||||
application_blob = cur.fetchone()
|
||||
applications = pickle.loads(application_blob[0])
|
||||
applications = pickle.loads(application_blob)
|
||||
if application_name in applications.keys():
|
||||
questions = applications[application_name]["questions"]
|
||||
if question_index <= len(questions):
|
||||
questions.pop(question_index-1)
|
||||
applications[application_name]["questions"] = questions
|
||||
application_blob2 = pickle.dumps(applications)
|
||||
cur.execute("UPDATE app_guildapp_db SET applications_blob = (?) WHERE guild_id= (?)", (application_blob2, guild_id))
|
||||
cur.execute(f"UPDATE app_guildapp_db SET application_blob = ? WHERE guild_id={guild_id}", application_blob2)
|
||||
con.commit()
|
||||
return "success"
|
||||
else:
|
||||
|
|
|
|||
Loading…
Reference in New Issue