for_psqlブランチをマージ
This commit is contained in:
parent
7cfd94053e
commit
ace0af03d6
1 changed files with 0 additions and 9 deletions
|
@ -1,12 +1,8 @@
|
||||||
import json
|
import json
|
||||||
import discord
|
import discord
|
||||||
import os
|
import os
|
||||||
<<<<<<< HEAD
|
|
||||||
import sqlite3
|
|
||||||
=======
|
|
||||||
import psycopg2
|
import psycopg2
|
||||||
import datetime
|
import datetime
|
||||||
>>>>>>> for_psql
|
|
||||||
|
|
||||||
class Database():
|
class Database():
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
|
@ -45,10 +41,6 @@ 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()
|
|
||||||
=======
|
|
||||||
class Bot(discord.Client):
|
class Bot(discord.Client):
|
||||||
def db_connect(self, host, db, user, password):
|
def db_connect(self, host, db, user, password):
|
||||||
self.db = psycopg2.connect(f"host={host} dbname={db} user={user} password={password}")
|
self.db = psycopg2.connect(f"host={host} dbname={db} user={user} password={password}")
|
||||||
|
@ -81,7 +73,6 @@ class Bot(discord.Client):
|
||||||
await message.channel.send("パソコンの台数が\n# だめです")
|
await message.channel.send("パソコンの台数が\n# だめです")
|
||||||
else:
|
else:
|
||||||
await message.channel.send("構文が不正です。")
|
await message.channel.send("構文が不正です。")
|
||||||
>>>>>>> for_psql
|
|
||||||
|
|
||||||
elif len(msg_split) >= 4:
|
elif len(msg_split) >= 4:
|
||||||
if msg_split[1].isdigit() and msg_split[2].isdigit():
|
if msg_split[1].isdigit() and msg_split[2].isdigit():
|
||||||
|
|
Loading…
Reference in a new issue