mirror of
https://github.com/IgorL123/mafia_api.git
synced 2026-09-23 23:20:19 +00:00
Merge branch 'main' into adamain
This commit is contained in:
@@ -0,0 +1,26 @@
|
|||||||
|
def isEnd(cur, trueChatID):
|
||||||
|
# cur.execute(f"SELECT ChatID FROM Chats WHERE TrueChatID = '{trueChatID}'")
|
||||||
|
# row = cur.fetchall()
|
||||||
|
# chatID = row[0]
|
||||||
|
#
|
||||||
|
# cur.execute(f"SELECT UserID FROM UsersChats WHERE ChatID = '{chatID}'")
|
||||||
|
# usersIDs = cur.fetchall()
|
||||||
|
#
|
||||||
|
# allAlive = True
|
||||||
|
# for id in usersIDs:
|
||||||
|
# cur.execute(f"SELECT isAlive FROM Users WHERE UserID = '{id}', role = ")
|
||||||
|
# row = cur.fetchall()
|
||||||
|
# if row[0] == False:
|
||||||
|
# allAlive = False
|
||||||
|
|
||||||
|
cur.execute(f"Select role from chats join userschats uc on uc.chatid = chats.chatid join "
|
||||||
|
f"users on users.userid = uc.userid where truechatid = '{trueChatID}' and isAlive = true")
|
||||||
|
roles = cur.fetchall()
|
||||||
|
|
||||||
|
m = roles.count(4)
|
||||||
|
if m == 0:
|
||||||
|
return "citizens"
|
||||||
|
elif m >= len(roles) - m:
|
||||||
|
return "mafia"
|
||||||
|
|
||||||
|
return ""
|
||||||
@@ -1,12 +1,43 @@
|
|||||||
from flask import Flask, request
|
from flask import Flask, request, jsonify
|
||||||
import db
|
import db
|
||||||
|
import api_functions
|
||||||
|
|
||||||
|
|
||||||
app = Flask(__name__)
|
app = Flask(__name__)
|
||||||
|
|
||||||
|
|
||||||
@app.route('/')
|
@app.route('/action', methods=["POST"])
|
||||||
def hello_world(): # put application's code here
|
def action(): # put application's code here
|
||||||
return 'Hello World!'
|
data = request.json
|
||||||
|
trueChatID = data['chatID']
|
||||||
|
killedUserID = data['KilledUserID']
|
||||||
|
healedUserID = data['HealedUserID']
|
||||||
|
checkedUserID = data['CheckedUserID']
|
||||||
|
|
||||||
|
response = {
|
||||||
|
"killedUserId": "",
|
||||||
|
"isEndGame": "",
|
||||||
|
"checkedRole": False
|
||||||
|
}
|
||||||
|
|
||||||
|
cur = db.cursor
|
||||||
|
|
||||||
|
if killedUserID != healedUserID:
|
||||||
|
cur.execute(f"Select UserID from chats join userschats uc on uc.chatid = chats.chatid join "
|
||||||
|
f"users on users.userid = uc.userid where truechatid = '{trueChatID}' and TrueUserID = '{killedUserID}'")
|
||||||
|
id = cur.fetchall()[0]
|
||||||
|
cur.execute(f"UPDATE Users SET isAlive = false WHERE UserID = '{id}'")
|
||||||
|
response["killedUserId"] = killedUserID
|
||||||
|
|
||||||
|
cur.execute(f"SELECT role FROM users WHERE TrueUserID ='{checkedUserID}';")
|
||||||
|
role = cur.fetchall()[0]
|
||||||
|
|
||||||
|
if role == 4:
|
||||||
|
response["checkedRole"] = True
|
||||||
|
|
||||||
|
response["isEndGame"] = api_functions.isEnd(cur, trueChatID)
|
||||||
|
|
||||||
|
return jsonify(response), 200
|
||||||
|
|
||||||
|
|
||||||
@app.route('/create_game', methods=["POST"])
|
@app.route('/create_game', methods=["POST"])
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ db_params = {
|
|||||||
'password': '4oumQk'
|
'password': '4oumQk'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
connection = psycopg2.connect(**db_params) # запускаем один раз
|
connection = psycopg2.connect(**db_params) # запускаем один раз
|
||||||
|
|
||||||
|
|
||||||
@@ -50,3 +51,4 @@ def query_change(x):
|
|||||||
|
|
||||||
def close(cur):
|
def close(cur):
|
||||||
cursor.close()
|
cursor.close()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user