flashii/seria
2
0
Fork 0
Code Pull requests Releases Activity

Allow user colours to be NULL instead of 0x40000000.

Browse source
This commit is contained in:
flash 2025-01-19 21:03:30 +00:00
parent 2ef4d6d66d
commit 63769ce72d
3 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
database/2025_01_19_205947_fix_user_colour_field.php Normal file
View file

@ -0,0 +1,14 @@
<?php
use Index\Db\DbConnection;
use Index\Db\Migration\DbMigration;
final class FixUserColourField_20250119_205947 implements DbMigration {
public function migrate(DbConnection $conn): void {
$conn->execute(<<<SQL
ALTER TABLE ser_users
CHANGE COLUMN user_colour user_colour INT(10) UNSIGNED NULL DEFAULT NULL AFTER user_name;
SQL);
$conn->execute('UPDATE ser_users SET user_colour = NULL WHERE user_colour & 0x40000000');
}
}

4
src/Users/UserInfo.php
View file

@ -19,12 +19,10 @@ class UserInfo {
) {}
public static function fromResult(DbResult $result): UserInfo {
$colour = $result->getIntegerOrNull(2);
return new UserInfo(
id: $result->getString(0),
name: $result->getString(1),
colourRaw: $colour === null || $colour & 0x40000000 ? null : $colour,
colourRaw: $result->getIntegerOrNull(2),
rank: $result->getInteger(3),
perms: $result->getInteger(4),
passKey: $result->getStringOrNull(5),

5
src/Users/Users.php
View file

@ -20,14 +20,13 @@ class Users {
}
public function syncApiUser(V1User $authInfo): void {
$userColourUnfixed = $authInfo->getColourRaw() ?? 0x40000000;
$stmt = $this->cache->get('INSERT INTO ser_users (user_id, user_name, user_colour, user_rank, user_permissions) VALUES (?, ?, ?, ?, 0) ON DUPLICATE KEY UPDATE user_name = ?, user_colour = ?, user_rank = ?');
$stmt->nextParameter($authInfo->getId());
$stmt->nextParameter($authInfo->getName());
$stmt->nextParameter($userColourUnfixed);
$stmt->nextParameter($authInfo->getColourRaw());
$stmt->nextParameter($authInfo->getRank());
$stmt->nextParameter($authInfo->getName());
$stmt->nextParameter($userColourUnfixed);
$stmt->nextParameter($authInfo->getColourRaw());
$stmt->nextParameter($authInfo->getRank());
$stmt->execute();
}