summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--database.sql66
-rw-r--r--public/account/delete.php10
-rw-r--r--public/account/login/twitch.php16
-rw-r--r--public/emotes/index.php24
-rw-r--r--public/emotes/rate.php2
-rw-r--r--public/emotes/setmanip.php2
-rw-r--r--public/emotes/upload.php23
-rw-r--r--public/emotesets.php25
-rw-r--r--public/static/img/defaults/profile_picture.pngbin0 -> 29739 bytes
-rw-r--r--public/system/emotes/index.php8
-rw-r--r--public/users.php33
-rw-r--r--src/emote.php15
-rw-r--r--src/images.php2
-rw-r--r--src/user.php2
14 files changed, 101 insertions, 127 deletions
diff --git a/database.sql b/database.sql
index 035282b..c540587 100644
--- a/database.sql
+++ b/database.sql
@@ -1,5 +1,5 @@
CREATE TABLE IF NOT EXISTS users (
- id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
+ id CHAR(32) NOT NULL PRIMARY KEY DEFAULT REPLACE(UUID(), '-', ''),
username TEXT NOT NULL UNIQUE,
password TEXT,
secret_key TEXT NOT NULL,
@@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS users (
CREATE TABLE IF NOT EXISTS connections (
id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
- user_id INTEGER NOT NULL REFERENCES users(id),
+ user_id CHAR(32) NOT NULL REFERENCES users(id) ON DELETE CASCADE,
alias_id TEXT NOT NULL,
platform TEXT NOT NULL,
data TEXT NOT NULL,
@@ -17,53 +17,49 @@ CREATE TABLE IF NOT EXISTS connections (
);
CREATE TABLE IF NOT EXISTS emotes (
- id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
+ id CHAR(32) NOT NULL PRIMARY KEY DEFAULT REPLACE(UUID(),'-',''),
code TEXT NOT NULL,
- mime TEXT NOT NULL,
- ext TEXT NOT NULL,
- uploaded_by INTEGER REFERENCES users(id),
+ notes TEXT,
+ uploaded_by CHAR(32) REFERENCES users(id),
created_at TIMESTAMP NOT NULL DEFAULT UTC_TIMESTAMP,
- updated_at TIMESTAMP NOT NULL,
- visibility INTEGER NOT NULL,
- is_featured BOOLEAN NOT NULL DEFAULT false
+ visibility INTEGER NOT NULL
);
CREATE TABLE IF NOT EXISTS emote_sets (
- id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
- owner_id INTEGER NOT NULL REFERENCES users(id),
- linked_to INTEGER REFERENCES emote_sets(id),
+ id CHAR(32) NOT NULL PRIMARY KEY DEFAULT REPLACE(UUID(),'-',''),
+ owner_id CHAR(32) NOT NULL REFERENCES users(id) ON DELETE CASCADE,
name TEXT NOT NULL,
- size INTEGER,
- is_global BOOLEAN NOT NULL DEFAULT false
+ is_global BOOLEAN NOT NULL DEFAULT false,
+ is_featured BOOLEAN NOT NULL DEFAULT false
);
CREATE TABLE IF NOT EXISTS emote_set_contents (
id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
- emote_set_id INTEGER NOT NULL REFERENCES emote_sets(id),
- emote_id INTEGER NOT NULL REFERENCES emotes(id),
- name TEXT,
- added_by INTEGER NOT NULL REFERENCES users(id),
+ emote_set_id CHAR(32) NOT NULL REFERENCES emote_sets(id) ON DELETE CASCADE,
+ emote_id CHAR(32) NOT NULL REFERENCES emotes(id) ON DELETE CASCADE,
+ code TEXT,
+ added_by CHAR(32) REFERENCES users(id),
added_at TIMESTAMP NOT NULL DEFAULT UTC_TIMESTAMP
);
CREATE TABLE IF NOT EXISTS acquired_emote_sets (
id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
- user_id INTEGER NOT NULL,
- emote_set_id INTEGER NOT NULL,
+ user_id CHAR(32) NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+ emote_set_id CHAR(32) NOT NULL REFERENCES emote_sets(id) ON DELETE CASCADE,
is_default BOOLEAN NOT NULL DEFAULT false
);
CREATE TABLE IF NOT EXISTS ratings (
id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
- user_id INTEGER NOT NULL REFERENCES users(id),
- emote_id INTEGER NOT NULL REFERENCES emotes(id),
+ user_id CHAR(32) NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+ emote_id CHAR(32) NOT NULL REFERENCES emotes(id) ON DELETE CASCADE,
rate INTEGER NOT NULL,
rated_at TIMESTAMP NOT NULL DEFAULT UTC_TIMESTAMP
);
CREATE TABLE IF NOT EXISTS inbox_messages (
id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
- recipient_id INTEGER NOT NULL REFERENCES users(id),
+ recipient_id CHAR(32) NOT NULL REFERENCES users(id) ON DELETE CASCADE,
message_type INTEGER NOT NULL,
contents TEXT NOT NULL,
link TEXT,
@@ -73,10 +69,10 @@ CREATE TABLE IF NOT EXISTS inbox_messages (
CREATE TABLE IF NOT EXISTS reports (
id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
- sender_id INTEGER NOT NULL REFERENCES users(id),
+ sender_id CHAR(32) NOT NULL REFERENCES users(id) ON DELETE CASCADE,
contents TEXT NOT NULL,
sent_at TIMESTAMP NOT NULL DEFAULT UTC_TIMESTAMP,
- resolved_by INTEGER REFERENCES users(id),
+ resolved_by CHAR(32) REFERENCES users(id),
response_message TEXT
);
@@ -103,29 +99,29 @@ CREATE TABLE IF NOT EXISTS roles (
CREATE TABLE IF NOT EXISTS role_assigns(
id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
- user_id INTEGER NOT NULL UNIQUE REFERENCES users(id),
- role_id INTEGER NOT NULL REFERENCES roles(id)
+ user_id CHAR(32) NOT NULL UNIQUE REFERENCES users(id) ON DELETE CASCADE,
+ role_id INTEGER NOT NULL REFERENCES roles(id) ON DELETE CASCADE
);
CREATE TABLE IF NOT EXISTS mod_actions(
id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
- user_id INTEGER NOT NULL REFERENCES users(id),
- emote_id INTEGER NOT NULL REFERENCES emotes(id),
+ user_id CHAR(32) NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+ emote_id CHAR(32) NOT NULL REFERENCES emotes(id) ON DELETE CASCADE,
verdict INTEGER NOT NULL,
comment TEXT,
created_at TIMESTAMP NOT NULL DEFAULT UTC_TIMESTAMP
);
----------------------------
--- INSERTIONS --
----------------------------
+-- -------------------------
+-- INSERTIONS
+-- -------------------------
-- CREATING A ROLE FOR USERS
INSERT IGNORE INTO roles(id, name) VALUES (1, 'User');
----------------------------
--- TRIGGERS --
----------------------------
+-- -------------------------
+-- TRIGGERS
+-- -------------------------
-- CREATE EMOTESET AND ASSIGN ROLE FOR NEW USER
DELIMITER $$
diff --git a/public/account/delete.php b/public/account/delete.php
index ecfcc80..4459edb 100644
--- a/public/account/delete.php
+++ b/public/account/delete.php
@@ -12,15 +12,7 @@ if (!isset($_SESSION["user_id"])) {
$id = $_SESSION["user_id"];
$db = new PDO(DB_URL, DB_USER, DB_PASS);
-
-$stmt = $db->prepare("UPDATE emotes SET uploaded_by = NULL WHERE uploaded_by = ?");
-$stmt->execute([$id]);
-
-$stmt = $db->prepare("DELETE FROM connections WHERE user_id = ?");
-$stmt->execute([$id]);
-
-$stmt = $db->prepare("DELETE FROM users WHERE id = ?");
-$stmt->execute([$id]);
+$db->prepare("DELETE FROM users WHERE id = ?")->execute([$id]);
session_unset();
session_destroy();
diff --git a/public/account/login/twitch.php b/public/account/login/twitch.php
index dfd319f..f322f42 100644
--- a/public/account/login/twitch.php
+++ b/public/account/login/twitch.php
@@ -69,9 +69,9 @@ if (empty($twitch_user["data"])) {
$twitch_user = $twitch_user["data"][0];
// saving it
-$_SESSION["twitch_access_token"] = $response["access_token"];
-$_SESSION["twitch_refresh_token"] = $response["refresh_token"];
-$_SESSION["twitch_expires_on"] = time() + intval($response["expires_in"]);
+$twitch_access_token = $response["access_token"];
+$twitch_refresh_token = $response["refresh_token"];
+$twitch_expires_on = time() + intval($response["expires_in"]);
$db = new PDO(DB_URL, DB_USER, DB_PASS);
@@ -102,21 +102,21 @@ if ($row = $stmt->fetch()) {
} else {
$user_secret_key = generate_random_string(32);
$user_name = $twitch_user["login"];
+ $user_id = bin2hex(random_bytes(16));
- $stmt = $db->prepare("INSERT INTO users(username, secret_key) VALUES (?, ?)");
- if (!$stmt->execute([$user_name, $user_secret_key])) {
+
+ $stmt = $db->prepare("INSERT INTO users(id, username, secret_key) VALUES (?, ?, ?)");
+ if (!$stmt->execute([$user_id, $user_name, $user_secret_key])) {
$db = null;
echo "Failed to create a user";
exit;
}
- $user_id = $db->lastInsertId();
-
$stmt = $db->prepare("INSERT INTO connections(user_id, alias_id, platform, data) VALUES (?, ?, 'twitch', ?)");
$stmt->execute([
$user_id,
$twitch_user["id"],
- $_SESSION["twitch_access_token"] . ":" . $_SESSION["twitch_refresh_token"] . ":" . $_SESSION["twitch_expires_on"]
+ sprintf("%s:%s:%s", $twitch_access_token, $twitch_refresh_token, $twitch_expires_on)
]);
}
diff --git a/public/emotes/index.php b/public/emotes/index.php
index 3491ab8..2c2cff7 100644
--- a/public/emotes/index.php
+++ b/public/emotes/index.php
@@ -61,7 +61,7 @@ function display_list_emotes(PDO &$db, string $search, string $sort_by, int $pag
array_push($emotes, new Emote(
$row["id"],
$row["code"],
- $row["ext"],
+ "webp",
intval(strtotime($row["created_at"])),
$uploader,
$row["is_in_user_set"],
@@ -73,7 +73,7 @@ function display_list_emotes(PDO &$db, string $search, string $sort_by, int $pag
return $emotes;
}
-function display_emote(PDO &$db, int $id)
+function display_emote(PDO &$db, string $id)
{
$stmt = $db->prepare("SELECT e.*, COALESCE(COUNT(r.rate), 0) as total_rating,
COALESCE(ROUND(AVG(r.rate), 2), 0) AS average_rating
@@ -89,7 +89,7 @@ function display_emote(PDO &$db, int $id)
$emote = new Emote(
$row["id"],
$row["code"],
- $row["ext"],
+ "webp",
intval(strtotime($row["created_at"])),
$row["uploaded_by"],
false,
@@ -130,14 +130,14 @@ $total_pages = 0;
$search = "%" . ($_GET["q"] ?? "") . "%";
$sort_by = $_GET["sort_by"] ?? "";
-if ($id == "" || !is_numeric($id)) {
+if (empty($id)) {
$emotes = display_list_emotes($db, $search, $sort_by, $page, $limit);
$stmt = $db->prepare("SELECT COUNT(*) FROM emotes WHERE code LIKE ? AND visibility = 1");
$stmt->execute([$search]);
$total_emotes = $stmt->fetch()[0];
$total_pages = ceil($total_emotes / $limit);
} else {
- $emote = display_emote($db, intval($id));
+ $emote = display_emote($db, $id);
}
if (CLIENT_REQUIRES_JSON) {
@@ -180,14 +180,14 @@ if (CLIENT_REQUIRES_JSON) {
<?php echo $emote != null ? "Emote - " . $emote->get_code() : "$total_emotes Emotes - Page $page/$total_pages" ?>
</div>
<?php
- if (empty($emotes)) { ?>
+ if ($emote != null) { ?>
<div class="box content">
<div class="emote-showcase">
- <img src="/static/userdata/emotes/<?php echo $emote->get_id() . '/' . '1x.' . $emote->get_ext() ?>"
+ <img src="/static/userdata/emotes/<?php echo $emote->get_id() ?>/1x.webp"
alt="<?php echo $emote->get_code() ?>">
- <img src="/static/userdata/emotes/<?php echo $emote->get_id() . '/' . '2x.' . $emote->get_ext() ?>"
+ <img src="/static/userdata/emotes/<?php echo $emote->get_id() ?>/2x.webp"
alt="<?php echo $emote->get_code() ?>">
- <img src="/static/userdata/emotes/<?php echo $emote->get_id() . '/' . '3x.' . $emote->get_ext() ?>"
+ <img src="/static/userdata/emotes/<?php echo $emote->get_id() ?>/3x.webp"
alt="<?php echo $emote->get_code() ?>">
</div>
</div>
@@ -200,14 +200,14 @@ if (CLIENT_REQUIRES_JSON) {
$added = false;
if (isset($_SESSION["user_emote_set_id"])) {
- $stmt = $db->prepare("SELECT id, name FROM emote_set_contents WHERE emote_set_id = ? AND emote_id = ?");
+ $stmt = $db->prepare("SELECT id, code FROM emote_set_contents WHERE emote_set_id = ? AND emote_id = ?");
$stmt->execute([$_SESSION["user_emote_set_id"], $emote->get_id()]);
$added = false;
if ($row = $stmt->fetch()) {
$added = true;
- $emote_current_name = $row["name"] ?? $emote->get_code();
+ $emote_current_name = $row["code"] ?? $emote->get_code();
}
}
@@ -419,7 +419,7 @@ if (CLIENT_REQUIRES_JSON) {
echo '<img src="/static/img/icons/yes.png" class="emote-check" />';
}
- echo '<img src="/static/userdata/emotes/' . $e->get_id() . '/2x.' . $e->get_ext() . '" alt="' . $e->get_code() . '"/>';
+ echo '<img src="/static/userdata/emotes/' . $e->get_id() . '/2x.webp" alt="' . $e->get_code() . '"/>';
echo '<h1>' . $e->get_code() . '</h1>';
echo '<p>' . ($e->get_uploaded_by() == null ? (ANONYMOUS_DEFAULT_NAME . "*") : $e->get_uploaded_by()["username"]) . '</p>';
echo '</a>';
diff --git a/public/emotes/rate.php b/public/emotes/rate.php
index 2f63d7c..1e8eb67 100644
--- a/public/emotes/rate.php
+++ b/public/emotes/rate.php
@@ -18,7 +18,7 @@ if (isset($_SESSION["user_role"]) && !$_SESSION["user_role"]["permission_rate"])
exit;
}
-$id = intval(str_safe($_POST["id"] ?? "0", 10));
+$id = str_safe($_POST["id"] ?? "0", 32);
$rate = intval(str_safe($_POST["rate"] ?? "0", 2));
if ($id == 0 || $rate == 0) {
diff --git a/public/emotes/setmanip.php b/public/emotes/setmanip.php
index 8b43b54..8b0f085 100644
--- a/public/emotes/setmanip.php
+++ b/public/emotes/setmanip.php
@@ -109,7 +109,7 @@ switch ($action) {
$value = null;
}
- $stmt = $db->prepare("UPDATE emote_set_contents SET name = ? WHERE emote_set_id = ? AND emote_id = ?");
+ $stmt = $db->prepare("UPDATE emote_set_contents SET code = ? WHERE emote_set_id = ? AND emote_id = ?");
$stmt->execute([$value, $emote_set_id, $emote_id]);
$db = null;
diff --git a/public/emotes/upload.php b/public/emotes/upload.php
index 137e29b..89abf44 100644
--- a/public/emotes/upload.php
+++ b/public/emotes/upload.php
@@ -225,6 +225,11 @@ if (is_null(list($mime, $ext) = get_mime_and_ext($image["tmp_name"]))) {
exit;
}
+$notes = str_safe($_POST["notes"] ?? "", EMOTE_COMMENT_MAX_LENGTH);
+if (empty($notes)) {
+ $notes = null;
+}
+
$visibility = clamp(intval($_POST["visibility"], EMOTE_VISIBILITY_DEFAULT), 0, 2);
if (MOD_EMOTES_APPROVE && $visibility == 1 && EMOTE_VISIBILITY_DEFAULT != 1) {
@@ -234,21 +239,9 @@ if (MOD_EMOTES_APPROVE && $visibility == 1 && EMOTE_VISIBILITY_DEFAULT != 1) {
// creating a new emote record
$db = new PDO(DB_URL, DB_USER, DB_PASS);
-$stmt = $db->prepare("INSERT INTO emotes(code, mime, ext, uploaded_by, visibility) VALUES (?, ?, ?, ?, ?)");
-$stmt->execute([$code, $mime, $ext, $uploaded_by, $visibility]);
-
-$id = $db->lastInsertId();
-
-if ($id == 0) {
- $db = null;
- http_response_code(500);
- echo json_encode([
- "status_code" => 500,
- "message" => "Failed to create an emote record",
- "data" => null
- ]);
- exit;
-}
+$id = bin2hex(random_bytes(16));
+$stmt = $db->prepare("INSERT INTO emotes(id, code, notes, uploaded_by, visibility) VALUES (?, ?, ?, ?, ?)");
+$stmt->execute([$id, $code, $notes, $uploaded_by, $visibility]);
$path = "../static/userdata/emotes/$id";
diff --git a/public/emotesets.php b/public/emotesets.php
index 61a8312..5405f52 100644
--- a/public/emotesets.php
+++ b/public/emotesets.php
@@ -27,11 +27,11 @@ if ($id == "global") {
$stmt = $db->prepare("SELECT
e.*,
CASE
- WHEN esc.name IS NOT NULL THEN esc.name
+ WHEN esc.code IS NOT NULL THEN esc.code
ELSE e.code
END AS code,
CASE
- WHEN esc.name IS NOT NULL THEN e.code
+ WHEN esc.code IS NOT NULL THEN e.code
ELSE NULL
END AS original_code
FROM emotes e
@@ -63,11 +63,11 @@ if ($id == "global") {
foreach ($emote_sets as &$e) {
$stmt = $db->prepare("SELECT e.*,
CASE
- WHEN esc.name IS NOT NULL THEN esc.name
+ WHEN esc.code IS NOT NULL THEN esc.code
ELSE e.code
END AS code,
CASE
- WHEN esc.name IS NOT NULL THEN e.code
+ WHEN esc.code IS NOT NULL THEN e.code
ELSE NULL
END AS original_code
FROM emotes e
@@ -101,11 +101,11 @@ if ($id == "global") {
$stmt = $db->prepare("SELECT e.*,
CASE
- WHEN esc.name IS NOT NULL THEN esc.name
+ WHEN esc.code IS NOT NULL THEN esc.code
ELSE e.code
END AS code,
CASE
- WHEN esc.name IS NOT NULL THEN e.code
+ WHEN esc.code IS NOT NULL THEN e.code
ELSE NULL
END AS original_code
FROM emotes e
@@ -124,7 +124,6 @@ if ($id == "global") {
}
}
} else {
- $id = intval($id);
$stmt = $db->prepare("SELECT * FROM emote_sets WHERE id = ?");
$stmt->execute([$id]);
@@ -133,11 +132,11 @@ if ($id == "global") {
$stmt = $db->prepare("SELECT e.*,
CASE
- WHEN esc.name IS NOT NULL THEN esc.name
+ WHEN esc.code IS NOT NULL THEN esc.code
ELSE e.code
END AS code,
CASE
- WHEN esc.name IS NOT NULL THEN e.code
+ WHEN esc.code IS NOT NULL THEN e.code
ELSE NULL
END AS original_code
FROM emotes e
@@ -213,17 +212,13 @@ if (CLIENT_REQUIRES_JSON) {
<div>
<?php
echo '<p>' . $set_row["name"] . '</p>';
-
- if ($set_row["size"]) {
- echo '<p class="circled black">' . $set_row["size"] . '</p>';
- }
?>
</div>
<div>
<?php
foreach ($set_row["emotes"] as $emm) {
- echo '<img src="/static/userdata/emotes/' . $emm["id"] . '/1x.' . $emm["ext"] . '">';
+ echo '<img src="/static/userdata/emotes/' . $emm["id"] . '/1x.webp">';
}
?>
</div>
@@ -243,7 +238,7 @@ if (CLIENT_REQUIRES_JSON) {
} else if (!empty($emote_set)) {
foreach ($emote_set["emotes"] as $emote_row) {
echo '<a class="box emote" href="/emotes?id=' . $emote_row["id"] . '">';
- echo '<img src="/static/userdata/emotes/' . $emote_row["id"] . '/2x.' . $emote_row["ext"] . '" alt="' . $emote_row["code"] . '"/>';
+ echo '<img src="/static/userdata/emotes/' . $emote_row["id"] . '/2x.webp" alt="' . $emote_row["code"] . '"/>';
echo '<h1>' . $emote_row["code"] . '</h1>';
echo '<p>' . ($emote_row["uploaded_by"] == null ? (ANONYMOUS_DEFAULT_NAME . "*") : $emote_row["uploaded_by"]["username"]) . '</p>';
echo '</a>';
diff --git a/public/static/img/defaults/profile_picture.png b/public/static/img/defaults/profile_picture.png
new file mode 100644
index 0000000..caaab1a
--- /dev/null
+++ b/public/static/img/defaults/profile_picture.png
Binary files differ
diff --git a/public/system/emotes/index.php b/public/system/emotes/index.php
index 713957e..98d56b8 100644
--- a/public/system/emotes/index.php
+++ b/public/system/emotes/index.php
@@ -60,7 +60,7 @@ if ($emote_id > 0) {
<?php
foreach ($emote_results as $row) {
echo '<a href="/system/emotes?id=' . $row["id"] . '">';
- echo '<img src="/static/userdata/emotes/' . $row["id"] . '/1x.' . $row["ext"] . '">';
+ echo '<img src="/static/userdata/emotes/' . $row["id"] . '/1x.webp">';
echo '<b>' . $row["code"] . '</b>';
echo '<span style="font-size:10px;"> by ';
@@ -86,11 +86,11 @@ if ($emote_id > 0) {
<div class="box navtab">Emote - <?php echo $emote["code"] ?></div>
<div class="box content">
<div class="emote-showcase">
- <img src="/static/userdata/emotes/<?php echo $emote["id"] . '/' . '1x.' . $emote["ext"] ?>"
+ <img src="/static/userdata/emotes/<?php echo $emote["id"] ?>/1x.webp"
alt="<?php echo $emote["id"] ?>">
- <img src="/static/userdata/emotes/<?php echo $emote["id"] . '/' . '2x.' . $emote["ext"] ?>"
+ <img src="/static/userdata/emotes/<?php echo $emote["id"] ?>/2x.webp"
alt="<?php echo $emote["id"] ?>">
- <img src="/static/userdata/emotes/<?php echo $emote["id"] . '/' . '3x.' . $emote["ext"] ?>"
+ <img src="/static/userdata/emotes/<?php echo $emote["id"] ?>/3x.webp"
alt="<?php echo $emote["id"] ?>">
</div>
</div>
diff --git a/public/users.php b/public/users.php
index baebcb4..1fbc6de 100644
--- a/public/users.php
+++ b/public/users.php
@@ -124,13 +124,13 @@ $stmt = null;
if ($id != "") {
$stmt = $db->prepare("SELECT * FROM users WHERE id = ?");
- $stmt->execute([intval($id)]);
+ $stmt->execute([$id]);
} else if ($alias_id != "") {
$stmt = $db->prepare("SELECT u.* FROM users u
INNER JOIN connections co ON (co.alias_id = ? AND co.platform = 'twitch')
WHERE co.user_id = u.id
");
- $stmt->execute([intval($alias_id)]);
+ $stmt->execute([$alias_id]);
}
$user = null;
@@ -155,19 +155,19 @@ $stmt->execute([$user->id()]);
while ($row = $stmt->fetch()) {
// getting more info about set
- $set_stmt = $db->prepare("SELECT id, name, size FROM emote_sets WHERE id = ?");
+ $set_stmt = $db->prepare("SELECT id, name FROM emote_sets WHERE id = ?");
$set_stmt->execute([$row["emote_set_id"]]);
$set = $set_stmt->fetch();
// getting info about emote set content
$em_stmt = $db->prepare(
- "SELECT e.id, e.mime, e.ext, e.created_at, e.uploaded_by,
+ "SELECT e.id, e.created_at, e.uploaded_by,
CASE
- WHEN esc.name IS NOT NULL THEN esc.name
+ WHEN esc.code IS NOT NULL THEN esc.code
ELSE e.code
END AS code,
CASE
- WHEN esc.name IS NOT NULL THEN e.code
+ WHEN esc.code IS NOT NULL THEN e.code
ELSE NULL
END AS original_code
FROM emotes e
@@ -190,7 +190,6 @@ while ($row = $stmt->fetch()) {
$emote_set = [
"id" => $set["id"],
"name" => $set["name"],
- "size" => $set["size"],
"emotes" => $emote_set_emotes
];
@@ -285,7 +284,7 @@ if ($is_json) {
"status_code" => 200,
"message" => null,
"data" => [
- "id" => intval($user->id()),
+ "id" => $user->id(),
"username" => $user->username(),
"joined_at" => $user->joined_at(),
"last_active_at" => $user->last_active_at(),
@@ -378,7 +377,7 @@ if ($is_json) {
}
?>
<?php
- $stmt = $db->prepare("SELECT code, ext FROM emotes WHERE id = ?");
+ $stmt = $db->prepare("SELECT code FROM emotes WHERE id = ?");
$stmt->execute([$fav_emote]);
if ($row = $stmt->fetch()) {
@@ -386,7 +385,7 @@ if ($is_json) {
echo '<th><img src="/static/img/icons/heart.png"> Favorite emote</th>';
echo '<td>';
echo "<a href=\"/emotes?id=$fav_emote\">";
- echo $row["code"] . ' <img src="/static/userdata/emotes/' . $fav_emote . '/1x.' . $row["ext"] . '" width="16" height="16">';
+ echo $row["code"] . ' <img src="/static/userdata/emotes/' . $fav_emote . '/1x.webp" width="16" height="16">';
echo '</a></td></tr>';
}
?>
@@ -398,7 +397,7 @@ if ($is_json) {
<a href="/message/send.php?user=<?php echo $user->id() ?>">Send a message</a>
<?php
if (isset($_SESSION["user_role"]) && $_SESSION["user_role"]["permission_report"]) {
- echo '<a href="/report?user_id=<?php echo $user->id() ?>">Report user</a>';
+ echo '<a href="/report?user_id=' . $user->id() . '">Report user</a>';
}
?>
</section>
@@ -415,14 +414,10 @@ if ($is_json) {
<?php
if (!empty($emote_sets)) {
foreach ($emote_sets as $set_row) { ?>
- <a href="/emotesets?id=<?php echo $set_row["id"] ?>" class="box">
+ <a href="/emotesets.php?id=<?php echo $set_row["id"] ?>" class="box">
<div>
<?php
echo '<p>' . $set_row["name"] . '</p>';
-
- if ($set_row["size"]) {
- echo '<p class="circled black">' . $set_row["size"] . '</p>';
- }
?>
</div>
@@ -430,7 +425,7 @@ if ($is_json) {
<?php
for ($i = 0; $i < clamp(count($set_row["emotes"]), 0, 5); $i++) {
$e = &$set_row["emotes"][$i];
- echo '<img src="/static/userdata/emotes/' . $e["id"] . '/1x.' . $e["ext"] . '">';
+ echo '<img src="/static/userdata/emotes/' . $e["id"] . '/1x.webp">';
}
?>
</div>
@@ -453,7 +448,7 @@ if ($is_json) {
if (!empty($active_emote_set["emotes"])) {
foreach ($active_emote_set["emotes"] as $emote_row) {
echo '<a class="box emote" href="/emotes?id=' . $emote_row["id"] . '">';
- echo '<img src="/static/userdata/emotes/' . $emote_row["id"] . '/2x.' . $emote_row["ext"] . '" alt="' . $emote_row["code"] . '"/>';
+ echo '<img src="/static/userdata/emotes/' . $emote_row["id"] . '/2x.webp" alt="' . $emote_row["code"] . '"/>';
echo '<h1>' . $emote_row["code"] . '</h1>';
echo '<p>' . ($emote_row["uploaded_by"] == null ? (ANONYMOUS_DEFAULT_NAME . "*") : $emote_row["uploaded_by"]["username"]) . '</p>';
echo '</a>';
@@ -480,7 +475,7 @@ if ($is_json) {
<?php
foreach ($uploaded_emotes as $emote_row) {
echo '<a class="box emote" href="/emotes?id=' . $emote_row["id"] . '">';
- echo '<img src="/static/userdata/emotes/' . $emote_row["id"] . '/2x.' . $emote_row["ext"] . '" alt="' . $emote_row["code"] . '"/>';
+ echo '<img src="/static/userdata/emotes/' . $emote_row["id"] . '/2x.webp" alt="' . $emote_row["code"] . '"/>';
echo '<h1>' . $emote_row["code"] . '</h1>';
echo '</a>';
}
diff --git a/src/emote.php b/src/emote.php
index 769d62a..ea9e52c 100644
--- a/src/emote.php
+++ b/src/emote.php
@@ -65,7 +65,7 @@ class Emote
function html_random_emote(PDO &$db)
{
- $stmt = $db->prepare("SELECT id, ext, code FROM emotes WHERE visibility = 1 AND is_featured = false ORDER BY RAND() LIMIT 1");
+ $stmt = $db->prepare("SELECT id, code FROM emotes WHERE visibility = 1 ORDER BY RAND() LIMIT 1");
$stmt->execute();
if ($row = $stmt->fetch()) {
@@ -77,8 +77,8 @@ function html_random_emote(PDO &$db)
</div>
<div class="box content center">
<a href="/emotes?id=<?php echo $row["id"] ?>">
- <img src="/static/userdata/emotes/<?php echo $row["id"] . '/3x.' . $row["ext"] ?>"
- alt="<?php echo $row["code"] ?>" width="192">
+ <img src="/static/userdata/emotes/<?php echo $row["id"] ?>/3x.webp" alt="<?php echo $row["code"] ?>"
+ width="192">
</a>
</div>
</section>
@@ -89,7 +89,10 @@ function html_random_emote(PDO &$db)
function html_featured_emote(PDO &$db)
{
- $stmt = $db->prepare("SELECT id, ext, code FROM emotes WHERE visibility = 1 AND is_featured = true ORDER BY updated_at DESC LIMIT 1");
+ $stmt = $db->prepare("SELECT e.id, e.code FROM emotes e
+ INNER JOIN emote_sets es ON es.is_featured = TRUE
+ INNER JOIN emote_set_contents esc ON es.id = esc.emote_set_id
+ WHERE e.visibility = 1 AND e.id = esc.emote_id ORDER BY esc.added_at DESC LIMIT 1");
$stmt->execute();
if ($row = $stmt->fetch()) {
@@ -101,8 +104,8 @@ function html_featured_emote(PDO &$db)
</div>
<div class="box content center">
<a href="/emotes?id=<?php echo $row["id"] ?>">
- <img src="/static/userdata/emotes/<?php echo $row["id"] . '/3x.' . $row["ext"] ?>"
- alt="<?php echo $row["code"] ?>" width="192">
+ <img src="/static/userdata/emotes/<?php echo $row["id"] ?>/3x.webp" alt="<?php echo $row["code"] ?>"
+ width="192">
</a>
</div>
</section>
diff --git a/src/images.php b/src/images.php
index d57794f..6ce8b5a 100644
--- a/src/images.php
+++ b/src/images.php
@@ -12,7 +12,7 @@ function resize_image(string $src_path, string $dst_path, int $max_width, int $m
$imagick = new Imagick();
$imagick->readImage($src_path);
- $format = "." . strtolower($imagick->getImageFormat());
+ $format = ".webp";
if (!$set_format) {
$format = "";
diff --git a/src/user.php b/src/user.php
index c09c5d5..e9fec0b 100644
--- a/src/user.php
+++ b/src/user.php
@@ -1,7 +1,7 @@
<?php
class User
{
- private int $id;
+ private string $id;
private string $username;
private int $joined_at;
private int $last_active_at;
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-12 21:22:22 +0000