mirror of
https://codeberg.org/demostf/api.git
synced 2026-06-03 18:04:08 +02:00
Add php-cs-fixer
This commit is contained in:
parent
e00e6ece5f
commit
309ae17036
54 changed files with 4900 additions and 4106 deletions
|
|
@ -4,35 +4,35 @@ use Doctrine\DBAL\Connection;
|
|||
use RandomLib\Generator;
|
||||
|
||||
class AuthProvider extends BaseProvider {
|
||||
/**
|
||||
* @var Generator
|
||||
*/
|
||||
private $generator;
|
||||
/**
|
||||
* @var Generator
|
||||
*/
|
||||
private $generator;
|
||||
|
||||
public function __construct(Connection $db, Generator $generator) {
|
||||
parent::__construct($db);
|
||||
$this->generator = $generator;
|
||||
}
|
||||
public function __construct(Connection $db, Generator $generator) {
|
||||
parent::__construct($db);
|
||||
$this->generator = $generator;
|
||||
}
|
||||
|
||||
public function generateToken() {
|
||||
return $this->generator->generateString(32, Generator::CHAR_ALNUM);
|
||||
}
|
||||
public function generateToken() {
|
||||
return $this->generator->generateString(32, Generator::CHAR_ALNUM);
|
||||
}
|
||||
|
||||
public function setUser($token, \SteamId $steamid, $key) {
|
||||
apcu_store($token, [
|
||||
'name' => $steamid->getNickname(),
|
||||
'steamid' => $steamid->getSteamId64(),
|
||||
'key' => $key
|
||||
]);
|
||||
}
|
||||
public function setUser($token, \SteamId $steamid, $key) {
|
||||
apcu_store($token, [
|
||||
'name' => $steamid->getNickname(),
|
||||
'steamid' => $steamid->getSteamId64(),
|
||||
'key' => $key
|
||||
]);
|
||||
}
|
||||
|
||||
public function getUser($token) {
|
||||
$found = true;
|
||||
$result = apcu_fetch($token, $found);
|
||||
return $found ? $result : ['name' => null, 'steamid' => null, 'key' => null];
|
||||
}
|
||||
public function getUser($token) {
|
||||
$found = true;
|
||||
$result = apcu_fetch($token, $found);
|
||||
return $found ? $result : ['name' => null, 'steamid' => null, 'key' => null];
|
||||
}
|
||||
|
||||
public function logout($token) {
|
||||
apcu_delete($token);
|
||||
}
|
||||
public function logout($token) {
|
||||
apcu_delete($token);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,64 +7,64 @@ use Doctrine\DBAL\Query\QueryBuilder;
|
|||
use LessQL\Database;
|
||||
|
||||
class BaseProvider {
|
||||
/**
|
||||
* @var Connection
|
||||
*/
|
||||
protected $connection;
|
||||
/**
|
||||
* @var Connection
|
||||
*/
|
||||
protected $connection;
|
||||
|
||||
/**
|
||||
* @var \LessQL\Database
|
||||
*/
|
||||
protected $db;
|
||||
/**
|
||||
* @var \LessQL\Database
|
||||
*/
|
||||
protected $db;
|
||||
|
||||
public function __construct(Connection $connection) {
|
||||
$this->connection = $connection;
|
||||
$this->db = new Database($connection->getWrappedConnection());
|
||||
$this->dbConfig();
|
||||
}
|
||||
public function __construct(Connection $connection) {
|
||||
$this->connection = $connection;
|
||||
$this->db = new Database($connection->getWrappedConnection());
|
||||
$this->dbConfig();
|
||||
}
|
||||
|
||||
private function dbConfig() {
|
||||
$platform = $this->connection->getDatabasePlatform();
|
||||
if ($platform instanceof MySqlPlatform) {
|
||||
$this->db->setIdentifierDelimiter("`");
|
||||
} else {
|
||||
$this->db->setIdentifierDelimiter('"');
|
||||
}
|
||||
private function dbConfig() {
|
||||
$platform = $this->connection->getDatabasePlatform();
|
||||
if ($platform instanceof MySqlPlatform) {
|
||||
$this->db->setIdentifierDelimiter("`");
|
||||
} else {
|
||||
$this->db->setIdentifierDelimiter('"');
|
||||
}
|
||||
|
||||
$this->db->setRewrite(function ($table) {
|
||||
$rawNames = ['chat'];
|
||||
$aliases = [
|
||||
$this->db->setRewrite(function ($table) {
|
||||
$rawNames = ['chat'];
|
||||
$aliases = [
|
||||
|
||||
];
|
||||
if (isset($aliases[$table])) {
|
||||
return $aliases[$table];
|
||||
} else if (array_search($table, $rawNames) === false) {
|
||||
return $table . 's';
|
||||
} else {
|
||||
return $table;
|
||||
}
|
||||
});
|
||||
}
|
||||
];
|
||||
if (isset($aliases[$table])) {
|
||||
return $aliases[$table];
|
||||
} elseif (array_search($table, $rawNames) === false) {
|
||||
return $table . 's';
|
||||
} else {
|
||||
return $table;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
protected function query($sql, array $params = []) {
|
||||
$delimiter = $this->db->getIdentifierDelimiter();
|
||||
$platform = $this->connection->getDatabasePlatform();
|
||||
$sql = str_replace('`', $delimiter, $sql);
|
||||
protected function query($sql, array $params = []) {
|
||||
$delimiter = $this->db->getIdentifierDelimiter();
|
||||
$platform = $this->connection->getDatabasePlatform();
|
||||
$sql = str_replace('`', $delimiter, $sql);
|
||||
|
||||
if ($platform instanceof PostgreSqlPlatform) {
|
||||
$sql = str_replace('FROM_UNIXTIME(', 'to_timestamp(', $sql);
|
||||
}
|
||||
if ($platform instanceof PostgreSqlPlatform) {
|
||||
$sql = str_replace('FROM_UNIXTIME(', 'to_timestamp(', $sql);
|
||||
}
|
||||
|
||||
$query = $this->connection->prepare($sql);
|
||||
$query->execute($params);
|
||||
$query = $this->connection->prepare($sql);
|
||||
$query->execute($params);
|
||||
|
||||
return $query;
|
||||
}
|
||||
return $query;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return QueryBuilder
|
||||
*/
|
||||
protected function getQueryBuilder() {
|
||||
return new QueryBuilder($this->connection);
|
||||
}
|
||||
/**
|
||||
* @return QueryBuilder
|
||||
*/
|
||||
protected function getQueryBuilder() {
|
||||
return new QueryBuilder($this->connection);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,33 +3,33 @@
|
|||
use Demostf\API\Demo\ChatMessage;
|
||||
|
||||
class ChatProvider extends BaseProvider {
|
||||
public function getChat(int $demoId) {
|
||||
$query = $this->getQueryBuilder();
|
||||
$query->select('text', '"from"', 'time')
|
||||
->from('chat')
|
||||
->where($query->expr()->eq('demo_id', $query->createNamedParameter($demoId, \PDO::PARAM_INT)));
|
||||
public function getChat(int $demoId) {
|
||||
$query = $this->getQueryBuilder();
|
||||
$query->select('text', '"from"', 'time')
|
||||
->from('chat')
|
||||
->where($query->expr()->eq('demo_id', $query->createNamedParameter($demoId, \PDO::PARAM_INT)));
|
||||
|
||||
$result = $query->execute();
|
||||
return array_map(function (array $row) {
|
||||
return new ChatMessage(
|
||||
$row['from'],
|
||||
(int)$row['time'],
|
||||
$row['text']
|
||||
);
|
||||
}, $result->fetchAll());
|
||||
}
|
||||
$result = $query->execute();
|
||||
return array_map(function (array $row) {
|
||||
return new ChatMessage(
|
||||
$row['from'],
|
||||
(int)$row['time'],
|
||||
$row['text']
|
||||
);
|
||||
}, $result->fetchAll());
|
||||
}
|
||||
|
||||
public function storeChatMessage(int $demoId, ChatMessage $message) {
|
||||
$query = $this->getQueryBuilder();
|
||||
$query->insert('chat')
|
||||
->values([
|
||||
'demo_id' => $query->createNamedParameter($demoId, \PDO::PARAM_INT),
|
||||
'text' => $query->createNamedParameter($message->getMessage()),
|
||||
'"from"' => $query->createNamedParameter($message->getUser()),
|
||||
'time' => $query->createNamedParameter($message->getTime(), \PDO::PARAM_INT),
|
||||
'created_at' => 'now()',
|
||||
'updated_at' => 'now()',
|
||||
]);
|
||||
$query->execute();
|
||||
}
|
||||
public function storeChatMessage(int $demoId, ChatMessage $message) {
|
||||
$query = $this->getQueryBuilder();
|
||||
$query->insert('chat')
|
||||
->values([
|
||||
'demo_id' => $query->createNamedParameter($demoId, \PDO::PARAM_INT),
|
||||
'text' => $query->createNamedParameter($message->getMessage()),
|
||||
'"from"' => $query->createNamedParameter($message->getUser()),
|
||||
'time' => $query->createNamedParameter($message->getTime(), \PDO::PARAM_INT),
|
||||
'created_at' => 'now()',
|
||||
'updated_at' => 'now()',
|
||||
]);
|
||||
$query->execute();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,74 +4,74 @@ use Demostf\API\Demo\Demo;
|
|||
use Doctrine\DBAL\Connection;
|
||||
|
||||
class DemoListProvider extends BaseProvider {
|
||||
public function listUploads(string $steamid, int $page, array $where = []) {
|
||||
$user = $this->db->user()->where('steamid', $steamid);
|
||||
$where['uploader'] = $user->fetch()->id;
|
||||
return $this->listDemos($page, $where);
|
||||
}
|
||||
public function listUploads(string $steamid, int $page, array $where = []) {
|
||||
$user = $this->db->user()->where('steamid', $steamid);
|
||||
$where['uploader'] = $user->fetch()->id;
|
||||
return $this->listDemos($page, $where);
|
||||
}
|
||||
|
||||
public function listProfile(int $page, array $where = []) {
|
||||
$users = $this->db->user()->where('steamid', $where['players']);
|
||||
unset($where['players']);
|
||||
$userIds = [];
|
||||
foreach ($users as $user) {
|
||||
$userIds[] = $user['id'];
|
||||
}
|
||||
$in = implode(', ', array_fill(0, count($userIds), '?'));
|
||||
public function listProfile(int $page, array $where = []) {
|
||||
$users = $this->db->user()->where('steamid', $where['players']);
|
||||
unset($where['players']);
|
||||
$userIds = [];
|
||||
foreach ($users as $user) {
|
||||
$userIds[] = $user['id'];
|
||||
}
|
||||
$in = implode(', ', array_fill(0, count($userIds), '?'));
|
||||
|
||||
$sql = 'SELECT demos.id FROM demos INNER JOIN players ON players.demo_id = demos.id
|
||||
$sql = 'SELECT demos.id FROM demos INNER JOIN players ON players.demo_id = demos.id
|
||||
WHERE players.user_id IN (' . $in . ') GROUP BY demos.id HAVING COUNT(user_id) = ? ORDER BY demos.id DESC LIMIT 50 OFFSET ' . ((int)$page - 1) * 50;
|
||||
|
||||
$params = $userIds;
|
||||
$params[] = count($userIds);
|
||||
$params = $userIds;
|
||||
$params[] = count($userIds);
|
||||
|
||||
$result = $this->query($sql, $params);
|
||||
$demoIds = $result->fetchAll(\PDO::FETCH_COLUMN);
|
||||
$result = $this->query($sql, $params);
|
||||
$demoIds = $result->fetchAll(\PDO::FETCH_COLUMN);
|
||||
|
||||
$demos = $this->db->demo()->where('id', $demoIds)
|
||||
->where($where)
|
||||
->orderBy('id', 'DESC');
|
||||
return $this->formatList($demos->fetchAll());
|
||||
}
|
||||
$demos = $this->db->demo()->where('id', $demoIds)
|
||||
->where($where)
|
||||
->orderBy('id', 'DESC');
|
||||
return $this->formatList($demos->fetchAll());
|
||||
}
|
||||
|
||||
/**
|
||||
* @param int $page
|
||||
* @param array $where
|
||||
* @param string $order
|
||||
* @return Demo[]
|
||||
*/
|
||||
public function listDemos(int $page, array $where = [], $order = 'DESC') {
|
||||
if (isset($where['players']) and is_array($where['players']) and count($where['players']) > 0) {
|
||||
return $this->listProfile($page, $where);
|
||||
}
|
||||
/**
|
||||
* @param int $page
|
||||
* @param array $where
|
||||
* @param string $order
|
||||
* @return Demo[]
|
||||
*/
|
||||
public function listDemos(int $page, array $where = [], $order = 'DESC') {
|
||||
if (isset($where['players']) and is_array($where['players']) and count($where['players']) > 0) {
|
||||
return $this->listProfile($page, $where);
|
||||
}
|
||||
|
||||
$offset = ($page - 1) * 50;
|
||||
$offset = ($page - 1) * 50;
|
||||
|
||||
$query = $this->getQueryBuilder();
|
||||
$query->select('d.*')
|
||||
->from('demos', 'd')
|
||||
->leftJoin('d', 'upload_blacklist', 'b', $query->expr()->eq('uploader_id', 'uploader'))
|
||||
->where($query->expr()->isNull('b.id'));
|
||||
if (isset($where['map'])) {
|
||||
$query->where($query->expr()->eq('map', $query->createNamedParameter($where['map'])));
|
||||
}
|
||||
if (isset($where['playerCount'])) {
|
||||
$query->where($query->expr()->in('"playerCount"', $query->createNamedParameter($where['playerCount'], Connection::PARAM_INT_ARRAY)));
|
||||
}
|
||||
if (isset($where['uploader'])) {
|
||||
$query->where($query->expr()->in('uploader', $query->createNamedParameter($where['uploader'], \PDO::PARAM_INT)));
|
||||
}
|
||||
$query->orderBy('d.id', $order)
|
||||
->setMaxResults(50)
|
||||
->setFirstResult($offset);
|
||||
$query = $this->getQueryBuilder();
|
||||
$query->select('d.*')
|
||||
->from('demos', 'd')
|
||||
->leftJoin('d', 'upload_blacklist', 'b', $query->expr()->eq('uploader_id', 'uploader'))
|
||||
->where($query->expr()->isNull('b.id'));
|
||||
if (isset($where['map'])) {
|
||||
$query->where($query->expr()->eq('map', $query->createNamedParameter($where['map'])));
|
||||
}
|
||||
if (isset($where['playerCount'])) {
|
||||
$query->where($query->expr()->in('"playerCount"', $query->createNamedParameter($where['playerCount'], Connection::PARAM_INT_ARRAY)));
|
||||
}
|
||||
if (isset($where['uploader'])) {
|
||||
$query->where($query->expr()->in('uploader', $query->createNamedParameter($where['uploader'], \PDO::PARAM_INT)));
|
||||
}
|
||||
$query->orderBy('d.id', $order)
|
||||
->setMaxResults(50)
|
||||
->setFirstResult($offset);
|
||||
|
||||
$demos = $query->execute()->fetchAll(\PDO::FETCH_ASSOC);
|
||||
return $this->formatList($demos);
|
||||
}
|
||||
$demos = $query->execute()->fetchAll(\PDO::FETCH_ASSOC);
|
||||
return $this->formatList($demos);
|
||||
}
|
||||
|
||||
protected function formatList(array $rows) {
|
||||
return array_map(function ($row) {
|
||||
return Demo::fromRow($row);
|
||||
}, $rows);
|
||||
}
|
||||
protected function formatList(array $rows) {
|
||||
return array_map(function ($row) {
|
||||
return Demo::fromRow($row);
|
||||
}, $rows);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@ use Demostf\API\Data\User;
|
|||
use Demostf\API\Demo\Demo;
|
||||
|
||||
class DemoProvider extends BaseProvider {
|
||||
const VERSION = 4;
|
||||
const VERSION = 4;
|
||||
|
||||
public function get(int $id, bool $fetchDetails = true): ?Demo {
|
||||
$demo = $this->db->demo()->where('id', $id);
|
||||
public function get(int $id, bool $fetchDetails = true): ?Demo {
|
||||
$demo = $this->db->demo()->where('id', $id);
|
||||
|
||||
// sql magic
|
||||
$sql = 'WITH demokills AS (SELECT attacker_id, assister_id, victim_id FROM kills WHERE demo_id = ?)
|
||||
// sql magic
|
||||
$sql = 'WITH demokills AS (SELECT attacker_id, assister_id, victim_id FROM kills WHERE demo_id = ?)
|
||||
SELECT players.id, user_id, players.name, team, class, users.steamid, users.avatar,
|
||||
(SELECT COUNT(*) FROM demokills WHERE attacker_id=players.user_id) AS kills,
|
||||
(SELECT COUNT(*) FROM demokills WHERE assister_id=players.user_id) AS assists,
|
||||
|
|
@ -22,73 +22,73 @@ class DemoProvider extends BaseProvider {
|
|||
INNER JOIN users ON players.user_id = users.id
|
||||
WHERE demo_id = ?';
|
||||
|
||||
$demoData = $demo->fetch();
|
||||
if (!$demoData) {
|
||||
return null;
|
||||
}
|
||||
$formattedDemo = Demo::fromRow($demoData);
|
||||
$demoData = $demo->fetch();
|
||||
if (!$demoData) {
|
||||
return null;
|
||||
}
|
||||
$formattedDemo = Demo::fromRow($demoData);
|
||||
|
||||
if ($fetchDetails) {
|
||||
$uploader = $demo->user()->via('uploader')->fetch();
|
||||
$playerQuery = $this->query($sql, [$formattedDemo->getId(), $formattedDemo->getId()]);
|
||||
$players = $playerQuery->fetchAll(\PDO::FETCH_ASSOC);
|
||||
if ($fetchDetails) {
|
||||
$uploader = $demo->user()->via('uploader')->fetch();
|
||||
$playerQuery = $this->query($sql, [$formattedDemo->getId(), $formattedDemo->getId()]);
|
||||
$players = $playerQuery->fetchAll(\PDO::FETCH_ASSOC);
|
||||
|
||||
$formattedDemo->setUploaderUser(User::fromRow([
|
||||
'id' => $uploader['id'],
|
||||
'steamid' => $uploader['steamid'],
|
||||
'name' => $uploader['name'],
|
||||
'avatar' => $uploader['avatar']
|
||||
]));
|
||||
$formattedDemo->setPlayers(array_map(function ($player) {
|
||||
return DemoPlayer::fromRow($player);
|
||||
}, $players));
|
||||
}
|
||||
return $formattedDemo;
|
||||
}
|
||||
$formattedDemo->setUploaderUser(User::fromRow([
|
||||
'id' => $uploader['id'],
|
||||
'steamid' => $uploader['steamid'],
|
||||
'name' => $uploader['name'],
|
||||
'avatar' => $uploader['avatar']
|
||||
]));
|
||||
$formattedDemo->setPlayers(array_map(function ($player) {
|
||||
return DemoPlayer::fromRow($player);
|
||||
}, $players));
|
||||
}
|
||||
return $formattedDemo;
|
||||
}
|
||||
|
||||
public function demoIdByHash($hash): int {
|
||||
$query = $this->getQueryBuilder();
|
||||
$query->select('id')
|
||||
->from('demos')
|
||||
->where($query->expr()->eq('hash', $query->createNamedParameter($hash)));
|
||||
public function demoIdByHash($hash): int {
|
||||
$query = $this->getQueryBuilder();
|
||||
$query->select('id')
|
||||
->from('demos')
|
||||
->where($query->expr()->eq('hash', $query->createNamedParameter($hash)));
|
||||
|
||||
return (int)$query->execute()->fetchColumn();
|
||||
}
|
||||
return (int)$query->execute()->fetchColumn();
|
||||
}
|
||||
|
||||
public function storeDemo(Demo $demo, string $backend, string $path): int {
|
||||
$query = $this->getQueryBuilder();
|
||||
$query->insert('demos')
|
||||
->values([
|
||||
'name' => $query->createNamedParameter($demo->getName()),
|
||||
'url' => $query->createNamedParameter($demo->getUrl()),
|
||||
'map' => $query->createNamedParameter($demo->getMap()),
|
||||
'red' => $query->createNamedParameter($demo->getRed()),
|
||||
'blu' => $query->createNamedParameter($demo->getBlue()),
|
||||
'uploader' => $query->createNamedParameter($demo->getUploader(), \PDO::PARAM_INT),
|
||||
'duration' => $query->createNamedParameter((int)$demo->getDuration(), \PDO::PARAM_INT),
|
||||
'created_at' => $query->createNamedParameter($demo->getTime()->format(\DATE_ATOM)),
|
||||
'updated_at' => 'now()',
|
||||
'backend' => $query->createNamedParameter($backend),
|
||||
'path' => $query->createNamedParameter($path),
|
||||
'"scoreBlue"' => $query->createNamedParameter($demo->getBlueScore(), \PDO::PARAM_INT),
|
||||
'"scoreRed"' => $query->createNamedParameter($demo->getRedScore(), \PDO::PARAM_INT),
|
||||
'version' => $query->createNamedParameter(self::VERSION, \PDO::PARAM_INT),
|
||||
'server' => $query->createNamedParameter($demo->getServer()),
|
||||
'nick' => $query->createNamedParameter($demo->getNick()),
|
||||
'"playerCount"' => $query->createNamedParameter($demo->getPlayerCount(), \PDO::PARAM_INT),
|
||||
'hash' => $query->createNamedParameter($demo->getHash())
|
||||
])
|
||||
->execute();
|
||||
return (int)$this->connection->lastInsertId();
|
||||
}
|
||||
public function storeDemo(Demo $demo, string $backend, string $path): int {
|
||||
$query = $this->getQueryBuilder();
|
||||
$query->insert('demos')
|
||||
->values([
|
||||
'name' => $query->createNamedParameter($demo->getName()),
|
||||
'url' => $query->createNamedParameter($demo->getUrl()),
|
||||
'map' => $query->createNamedParameter($demo->getMap()),
|
||||
'red' => $query->createNamedParameter($demo->getRed()),
|
||||
'blu' => $query->createNamedParameter($demo->getBlue()),
|
||||
'uploader' => $query->createNamedParameter($demo->getUploader(), \PDO::PARAM_INT),
|
||||
'duration' => $query->createNamedParameter((int)$demo->getDuration(), \PDO::PARAM_INT),
|
||||
'created_at' => $query->createNamedParameter($demo->getTime()->format(\DATE_ATOM)),
|
||||
'updated_at' => 'now()',
|
||||
'backend' => $query->createNamedParameter($backend),
|
||||
'path' => $query->createNamedParameter($path),
|
||||
'"scoreBlue"' => $query->createNamedParameter($demo->getBlueScore(), \PDO::PARAM_INT),
|
||||
'"scoreRed"' => $query->createNamedParameter($demo->getRedScore(), \PDO::PARAM_INT),
|
||||
'version' => $query->createNamedParameter(self::VERSION, \PDO::PARAM_INT),
|
||||
'server' => $query->createNamedParameter($demo->getServer()),
|
||||
'nick' => $query->createNamedParameter($demo->getNick()),
|
||||
'"playerCount"' => $query->createNamedParameter($demo->getPlayerCount(), \PDO::PARAM_INT),
|
||||
'hash' => $query->createNamedParameter($demo->getHash())
|
||||
])
|
||||
->execute();
|
||||
return (int)$this->connection->lastInsertId();
|
||||
}
|
||||
|
||||
public function setDemoUrl(int $id, string $backend, string $url, string $path) {
|
||||
$query = $this->getQueryBuilder();
|
||||
$query->update('demos')
|
||||
->set('backend', $query->createNamedParameter($backend))
|
||||
->set('url', $query->createNamedParameter($url))
|
||||
->set('path', $query->createNamedParameter($path))
|
||||
->where($query->expr()->eq('id', $query->createNamedParameter($id, \PDO::PARAM_INT)))
|
||||
->execute();
|
||||
}
|
||||
public function setDemoUrl(int $id, string $backend, string $url, string $path) {
|
||||
$query = $this->getQueryBuilder();
|
||||
$query->update('demos')
|
||||
->set('backend', $query->createNamedParameter($backend))
|
||||
->set('url', $query->createNamedParameter($url))
|
||||
->set('path', $query->createNamedParameter($path))
|
||||
->where($query->expr()->eq('id', $query->createNamedParameter($id, \PDO::PARAM_INT)))
|
||||
->execute();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
<?php namespace Demostf\API\Providers;
|
||||
|
||||
class InfoProvider extends BaseProvider {
|
||||
public function listMaps() {
|
||||
$sql = 'SELECT DISTINCT(map), COUNT(map) AS count from demos GROUP BY map ORDER BY count DESC';
|
||||
$result = $this->query($sql);
|
||||
return $result->fetchAll(\PDO::FETCH_COLUMN);
|
||||
}
|
||||
public function listMaps() {
|
||||
$sql = 'SELECT DISTINCT(map), COUNT(map) AS count from demos GROUP BY map ORDER BY count DESC';
|
||||
$result = $this->query($sql);
|
||||
return $result->fetchAll(\PDO::FETCH_COLUMN);
|
||||
}
|
||||
|
||||
public function getStats() {
|
||||
$demoCount = $this->db->demo()->count();
|
||||
$playerCount = $this->db->user()->count();
|
||||
public function getStats() {
|
||||
$demoCount = $this->db->demo()->count();
|
||||
$playerCount = $this->db->user()->count();
|
||||
|
||||
return [
|
||||
'demos' => $demoCount,
|
||||
'players' => $playerCount
|
||||
];
|
||||
}
|
||||
return [
|
||||
'demos' => $demoCount,
|
||||
'players' => $playerCount
|
||||
];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,20 +5,20 @@ namespace Demostf\API\Providers;
|
|||
use Demostf\API\Data\Kill;
|
||||
|
||||
class KillProvider extends BaseProvider {
|
||||
public function store(Kill $kill): int {
|
||||
$query = $this->getQueryBuilder();
|
||||
$query->insert('kills')
|
||||
->values([
|
||||
'demo_id' => $query->createNamedParameter($kill->getDemoId()),
|
||||
'attacker_id' => $query->createNamedParameter($kill->getAttackerId()),
|
||||
'assister_id' => $query->createNamedParameter($kill->getAssisterId()),
|
||||
'victim_id' => $query->createNamedParameter($kill->getVictimId()),
|
||||
'weapon' => $query->createNamedParameter($kill->getWeapon()),
|
||||
'created_at' => 'now()',
|
||||
'updated_at' => 'now()'
|
||||
]);
|
||||
$query->execute();
|
||||
public function store(Kill $kill): int {
|
||||
$query = $this->getQueryBuilder();
|
||||
$query->insert('kills')
|
||||
->values([
|
||||
'demo_id' => $query->createNamedParameter($kill->getDemoId()),
|
||||
'attacker_id' => $query->createNamedParameter($kill->getAttackerId()),
|
||||
'assister_id' => $query->createNamedParameter($kill->getAssisterId()),
|
||||
'victim_id' => $query->createNamedParameter($kill->getVictimId()),
|
||||
'weapon' => $query->createNamedParameter($kill->getWeapon()),
|
||||
'created_at' => 'now()',
|
||||
'updated_at' => 'now()'
|
||||
]);
|
||||
$query->execute();
|
||||
|
||||
return (int)$this->connection->lastInsertId();
|
||||
}
|
||||
return (int)$this->connection->lastInsertId();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,21 +5,21 @@ namespace Demostf\API\Providers;
|
|||
use Demostf\API\Data\Player;
|
||||
|
||||
class PlayerProvider extends BaseProvider {
|
||||
public function store(Player $player): int {
|
||||
$query = $this->getQueryBuilder();
|
||||
$query->insert('players')
|
||||
->values([
|
||||
'demo_id' => $query->createNamedParameter($player->getDemoId()),
|
||||
'demo_user_id' => $query->createNamedParameter($player->getDemoUserId()),
|
||||
'user_id' => $query->createNamedParameter($player->getUserId()),
|
||||
'name' => $query->createNamedParameter($player->getName()),
|
||||
'team' => $query->createNamedParameter($player->getTeam()),
|
||||
'class' => $query->createNamedParameter($player->getClass()),
|
||||
'created_at' => 'now()',
|
||||
'updated_at' => 'now()'
|
||||
]);
|
||||
$query->execute();
|
||||
public function store(Player $player): int {
|
||||
$query = $this->getQueryBuilder();
|
||||
$query->insert('players')
|
||||
->values([
|
||||
'demo_id' => $query->createNamedParameter($player->getDemoId()),
|
||||
'demo_user_id' => $query->createNamedParameter($player->getDemoUserId()),
|
||||
'user_id' => $query->createNamedParameter($player->getUserId()),
|
||||
'name' => $query->createNamedParameter($player->getName()),
|
||||
'team' => $query->createNamedParameter($player->getTeam()),
|
||||
'class' => $query->createNamedParameter($player->getClass()),
|
||||
'created_at' => 'now()',
|
||||
'updated_at' => 'now()'
|
||||
]);
|
||||
$query->execute();
|
||||
|
||||
return (int)$this->connection->lastInsertId();
|
||||
}
|
||||
return (int)$this->connection->lastInsertId();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,97 +13,98 @@ use Doctrine\DBAL\Connection;
|
|||
use RandomLib\Generator;
|
||||
|
||||
class UploadProvider extends BaseProvider {
|
||||
/** @var Generator */
|
||||
private $generator;
|
||||
/** @var HeaderParser */
|
||||
private $headerParser;
|
||||
/** @var Parser */
|
||||
private $parser;
|
||||
/** @var DemoStore */
|
||||
private $store;
|
||||
/** @var UserProvider */
|
||||
private $userProvider;
|
||||
/** @var DemoProvider */
|
||||
private $demoProvider;
|
||||
/** @var DemoSaver */
|
||||
private $demoSaver;
|
||||
private $baseUrl;
|
||||
/** @var Generator */
|
||||
private $generator;
|
||||
/** @var HeaderParser */
|
||||
private $headerParser;
|
||||
/** @var Parser */
|
||||
private $parser;
|
||||
/** @var DemoStore */
|
||||
private $store;
|
||||
/** @var UserProvider */
|
||||
private $userProvider;
|
||||
/** @var DemoProvider */
|
||||
private $demoProvider;
|
||||
/** @var DemoSaver */
|
||||
private $demoSaver;
|
||||
private $baseUrl;
|
||||
|
||||
public function __construct(Connection $db,
|
||||
string $baseUrl,
|
||||
HeaderParser $headerParser,
|
||||
Parser $parser,
|
||||
DemoStore $store,
|
||||
UserProvider $userProvider,
|
||||
DemoProvider $demoProvider,
|
||||
DemoSaver $demoSaver
|
||||
) {
|
||||
parent::__construct($db);
|
||||
$this->baseUrl = $baseUrl;
|
||||
$this->headerParser = $headerParser;
|
||||
$this->parser = $parser;
|
||||
$this->store = $store;
|
||||
$this->userProvider = $userProvider;
|
||||
$this->demoProvider = $demoProvider;
|
||||
$this->demoSaver = $demoSaver;
|
||||
}
|
||||
public function __construct(
|
||||
Connection $db,
|
||||
string $baseUrl,
|
||||
HeaderParser $headerParser,
|
||||
Parser $parser,
|
||||
DemoStore $store,
|
||||
UserProvider $userProvider,
|
||||
DemoProvider $demoProvider,
|
||||
DemoSaver $demoSaver
|
||||
) {
|
||||
parent::__construct($db);
|
||||
$this->baseUrl = $baseUrl;
|
||||
$this->headerParser = $headerParser;
|
||||
$this->parser = $parser;
|
||||
$this->store = $store;
|
||||
$this->userProvider = $userProvider;
|
||||
$this->demoProvider = $demoProvider;
|
||||
$this->demoSaver = $demoSaver;
|
||||
}
|
||||
|
||||
public function upload(string $key, string $red, string $blu, string $name, string $demoFile): string {
|
||||
$user = $this->userProvider->byKey($key);
|
||||
if (!$user) {
|
||||
return 'Invalid key';
|
||||
}
|
||||
public function upload(string $key, string $red, string $blu, string $name, string $demoFile): string {
|
||||
$user = $this->userProvider->byKey($key);
|
||||
if (!$user) {
|
||||
return 'Invalid key';
|
||||
}
|
||||
|
||||
$hash = hash_file('md5', $demoFile);
|
||||
$hash = hash_file('md5', $demoFile);
|
||||
|
||||
$existingDemo = $this->demoProvider->demoIdByHash($hash);
|
||||
if ($existingDemo) {
|
||||
return 'STV available at: ' . $this->baseUrl . '/' . $existingDemo;
|
||||
}
|
||||
$existingDemo = $this->demoProvider->demoIdByHash($hash);
|
||||
if ($existingDemo) {
|
||||
return 'STV available at: ' . $this->baseUrl . '/' . $existingDemo;
|
||||
}
|
||||
|
||||
$header = $this->headerParser->parseHeader($demoFile);
|
||||
$error = $this->validateHeader(filesize($demoFile), $header);
|
||||
if ($error) {
|
||||
return $error;
|
||||
}
|
||||
$header = $this->headerParser->parseHeader($demoFile);
|
||||
$error = $this->validateHeader(filesize($demoFile), $header);
|
||||
if ($error) {
|
||||
return $error;
|
||||
}
|
||||
|
||||
$parsed = $this->parser->analyse($demoFile);
|
||||
$parsed = $this->parser->analyse($demoFile);
|
||||
|
||||
$error = $this->validateParsed($header, $parsed);
|
||||
if ($error) {
|
||||
return $error;
|
||||
}
|
||||
$error = $this->validateParsed($header, $parsed);
|
||||
if ($error) {
|
||||
return $error;
|
||||
}
|
||||
|
||||
$storedDemo = $this->store->store($demoFile, $hash . '_' . $name);
|
||||
$upload = new Upload($name, $red, $blu, $user->getId(), $hash);
|
||||
$storedDemo = $this->store->store($demoFile, $hash . '_' . $name);
|
||||
$upload = new Upload($name, $red, $blu, $user->getId(), $hash);
|
||||
|
||||
$id = $this->demoSaver->saveDemo($parsed, $header, $storedDemo, $upload);
|
||||
$id = $this->demoSaver->saveDemo($parsed, $header, $storedDemo, $upload);
|
||||
|
||||
return 'STV available at: ' . $this->baseUrl . '/' . $id;
|
||||
}
|
||||
return 'STV available at: ' . $this->baseUrl . '/' . $id;
|
||||
}
|
||||
|
||||
public function validateHeader(int $size, Header $header) {
|
||||
if ($size < 1024) {
|
||||
return 'Demos needs to be at least 1KB is size';
|
||||
}
|
||||
public function validateHeader(int $size, Header $header) {
|
||||
if ($size < 1024) {
|
||||
return 'Demos needs to be at least 1KB is size';
|
||||
}
|
||||
|
||||
if ($size > 100 * 1024 * 1024) {
|
||||
return 'Demos cant be more than 100MB in size';
|
||||
}
|
||||
if ($size > 100 * 1024 * 1024) {
|
||||
return 'Demos cant be more than 100MB in size';
|
||||
}
|
||||
|
||||
if ($header->getDuration() > (60 * 60)) {
|
||||
return 'Demos cant be longer than one hour';
|
||||
}
|
||||
if ($header->getDuration() > (60 * 60)) {
|
||||
return 'Demos cant be longer than one hour';
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public function validateParsed(Header $header, ParsedDemo $parsedDemo) {
|
||||
$rounds = $parsedDemo->getRedScore() + $parsedDemo->getBlueScore();
|
||||
if ($rounds === 0 && $header->getDuration() < (5 * 60)) {
|
||||
return 'Demos must be at least 5 minutes long';
|
||||
}
|
||||
public function validateParsed(Header $header, ParsedDemo $parsedDemo) {
|
||||
$rounds = $parsedDemo->getRedScore() + $parsedDemo->getBlueScore();
|
||||
if ($rounds === 0 && $header->getDuration() < (5 * 60)) {
|
||||
return 'Demos must be at least 5 minutes long';
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,131 +7,131 @@ use Doctrine\DBAL\Connection;
|
|||
use RandomLib\Generator;
|
||||
|
||||
class UserProvider extends BaseProvider {
|
||||
/**
|
||||
* @var Generator
|
||||
*/
|
||||
private $generator;
|
||||
/**
|
||||
* @var Generator
|
||||
*/
|
||||
private $generator;
|
||||
|
||||
public function __construct(Connection $db, Generator $generator) {
|
||||
parent::__construct($db);
|
||||
$this->generator = $generator;
|
||||
}
|
||||
public function __construct(Connection $db, Generator $generator) {
|
||||
parent::__construct($db);
|
||||
$this->generator = $generator;
|
||||
}
|
||||
|
||||
public function store(\SteamId $steamId): string {
|
||||
$token = $this->generator->generateString(64, Generator::EASY_TO_READ);
|
||||
public function store(\SteamId $steamId): string {
|
||||
$token = $this->generator->generateString(64, Generator::EASY_TO_READ);
|
||||
|
||||
$user = $this->get($steamId->getSteamId64());
|
||||
if ($user) {
|
||||
return $user->getToken();
|
||||
}
|
||||
$user = $this->get($steamId->getSteamId64());
|
||||
if ($user) {
|
||||
return $user->getToken();
|
||||
}
|
||||
|
||||
$query = $this->getQueryBuilder();
|
||||
$query->insert('users')
|
||||
->values([
|
||||
'steamid' => $query->createNamedParameter($steamId->getSteamId64()),
|
||||
'name' => $query->createNamedParameter($steamId->getNickname()),
|
||||
'avatar' => $query->createNamedParameter($steamId->getMediumAvatarUrl()),
|
||||
'token' => $query->createNamedParameter($token)
|
||||
])->add('orderBy', 'ON CONFLICT DO NOTHING')// hack to append arbitrary string to sql
|
||||
->execute();
|
||||
$query = $this->getQueryBuilder();
|
||||
$query->insert('users')
|
||||
->values([
|
||||
'steamid' => $query->createNamedParameter($steamId->getSteamId64()),
|
||||
'name' => $query->createNamedParameter($steamId->getNickname()),
|
||||
'avatar' => $query->createNamedParameter($steamId->getMediumAvatarUrl()),
|
||||
'token' => $query->createNamedParameter($token)
|
||||
])->add('orderBy', 'ON CONFLICT DO NOTHING')// hack to append arbitrary string to sql
|
||||
->execute();
|
||||
|
||||
$user = $this->get($steamId->getSteamId64());
|
||||
return $user ? $user->getToken() : $token;
|
||||
}
|
||||
$user = $this->get($steamId->getSteamId64());
|
||||
return $user ? $user->getToken() : $token;
|
||||
}
|
||||
|
||||
public function get(string $steamid): ?User {
|
||||
$query = $this->getQueryBuilder();
|
||||
$query->select(['id', 'steamid', 'name', 'avatar', 'token'])
|
||||
->from('users')
|
||||
->where($query->expr()->eq('steamid', $query->createNamedParameter($steamid)));
|
||||
public function get(string $steamid): ?User {
|
||||
$query = $this->getQueryBuilder();
|
||||
$query->select(['id', 'steamid', 'name', 'avatar', 'token'])
|
||||
->from('users')
|
||||
->where($query->expr()->eq('steamid', $query->createNamedParameter($steamid)));
|
||||
|
||||
$row = $query->execute()->fetch();
|
||||
return $row ? User::fromRow($row) : null;
|
||||
}
|
||||
$row = $query->execute()->fetch();
|
||||
return $row ? User::fromRow($row) : null;
|
||||
}
|
||||
|
||||
private function searchBySteamId(string $steamId): ?array {
|
||||
$query = $this->getQueryBuilder();
|
||||
$query->select('u.id', 'p.name', 'count(demo_id) as count', 'steamid')
|
||||
->from('players', 'p')
|
||||
->innerJoin('p', 'users', 'u', $query->expr()->eq('p.user_id', 'u.id'))
|
||||
->where($query->expr()->eq('steamid', $query->createNamedParameter($steamId)))
|
||||
->groupBy('p.name, u.id')
|
||||
->orderBy('count(demo_id)', 'DESC')
|
||||
->setMaxResults(1);
|
||||
private function searchBySteamId(string $steamId): ?array {
|
||||
$query = $this->getQueryBuilder();
|
||||
$query->select('u.id', 'p.name', 'count(demo_id) as count', 'steamid')
|
||||
->from('players', 'p')
|
||||
->innerJoin('p', 'users', 'u', $query->expr()->eq('p.user_id', 'u.id'))
|
||||
->where($query->expr()->eq('steamid', $query->createNamedParameter($steamId)))
|
||||
->groupBy('p.name, u.id')
|
||||
->orderBy('count(demo_id)', 'DESC')
|
||||
->setMaxResults(1);
|
||||
|
||||
$result = $query->execute()->fetch();
|
||||
if (is_array($result)) {
|
||||
return $result;
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
$result = $query->execute()->fetch();
|
||||
if (is_array($result)) {
|
||||
return $result;
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public function search($query): array {
|
||||
$bySteamId = $this->searchBySteamId($query);
|
||||
if ($bySteamId) {
|
||||
return [
|
||||
$bySteamId
|
||||
];
|
||||
}
|
||||
public function search($query): array {
|
||||
$bySteamId = $this->searchBySteamId($query);
|
||||
if ($bySteamId) {
|
||||
return [
|
||||
$bySteamId
|
||||
];
|
||||
}
|
||||
|
||||
$sql = 'SELECT user_id, players.name, count(demo_id) AS count, steamid,
|
||||
$sql = 'SELECT user_id, players.name, count(demo_id) AS count, steamid,
|
||||
1-(players.name <-> ?) AS sim FROM players
|
||||
INNER JOIN users ON users.id = players.user_id
|
||||
WHERE players.name % ? OR players.name ~* ?
|
||||
GROUP BY players.name, user_id, steamid
|
||||
ORDER BY count DESC
|
||||
LIMIT 100';
|
||||
$result = $this->query($sql, [$query, $query, $query]);
|
||||
$players = $result->fetchAll(\PDO::FETCH_ASSOC);
|
||||
$result = $this->query($sql, [$query, $query, $query]);
|
||||
$players = $result->fetchAll(\PDO::FETCH_ASSOC);
|
||||
|
||||
usort($players, function ($b, $a) use ($query) {
|
||||
if ($a['steamid'] === $query && $a['steamid'] !== $query) {
|
||||
return -1;
|
||||
}
|
||||
$countWeight = 1;
|
||||
$simWeight = 5;
|
||||
$diff = ($a['sim'] * $simWeight + $a['count'] * $countWeight) - ($b['sim'] * $simWeight + $b['count'] * $countWeight);
|
||||
if ($diff === 0) {
|
||||
return 0;
|
||||
} else {
|
||||
return ($diff < 0) ? -1 : 1;
|
||||
}
|
||||
});
|
||||
usort($players, function ($b, $a) use ($query) {
|
||||
if ($a['steamid'] === $query && $a['steamid'] !== $query) {
|
||||
return -1;
|
||||
}
|
||||
$countWeight = 1;
|
||||
$simWeight = 5;
|
||||
$diff = ($a['sim'] * $simWeight + $a['count'] * $countWeight) - ($b['sim'] * $simWeight + $b['count'] * $countWeight);
|
||||
if ($diff === 0) {
|
||||
return 0;
|
||||
} else {
|
||||
return ($diff < 0) ? -1 : 1;
|
||||
}
|
||||
});
|
||||
|
||||
$result = [];
|
||||
foreach ($players as $player) {
|
||||
$id = $player['user_id'];
|
||||
if (!isset($result[$id])) {
|
||||
$result[$id] = [
|
||||
'id' => $id,
|
||||
'name' => $player['name'],
|
||||
'steamid' => $player['steamid']
|
||||
];
|
||||
}
|
||||
}
|
||||
$result = [];
|
||||
foreach ($players as $player) {
|
||||
$id = $player['user_id'];
|
||||
if (!isset($result[$id])) {
|
||||
$result[$id] = [
|
||||
'id' => $id,
|
||||
'name' => $player['name'],
|
||||
'steamid' => $player['steamid']
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
return array_values($result);
|
||||
}
|
||||
return array_values($result);
|
||||
}
|
||||
|
||||
public function byKey($key): ?User {
|
||||
$query = $this->getQueryBuilder();
|
||||
$query->select(['id', 'steamid', 'name', 'avatar', 'token'])
|
||||
->from('users')
|
||||
->where($query->expr()->eq('token', $query->createNamedParameter($key)));
|
||||
public function byKey($key): ?User {
|
||||
$query = $this->getQueryBuilder();
|
||||
$query->select(['id', 'steamid', 'name', 'avatar', 'token'])
|
||||
->from('users')
|
||||
->where($query->expr()->eq('token', $query->createNamedParameter($key)));
|
||||
|
||||
$row = $query->execute()->fetch();
|
||||
return $row ? User::fromRow($row) : null;
|
||||
}
|
||||
$row = $query->execute()->fetch();
|
||||
return $row ? User::fromRow($row) : null;
|
||||
}
|
||||
|
||||
public function getUserId(string $steamId) {
|
||||
$existing = $this->get($steamId);
|
||||
if ($existing) {
|
||||
return $existing->getId();
|
||||
}
|
||||
public function getUserId(string $steamId) {
|
||||
$existing = $this->get($steamId);
|
||||
if ($existing) {
|
||||
return $existing->getId();
|
||||
}
|
||||
|
||||
$this->store(new \SteamId($steamId));
|
||||
$this->store(new \SteamId($steamId));
|
||||
|
||||
return $this->get($steamId)->getId();
|
||||
}
|
||||
return $this->get($steamId)->getId();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue