diff --git a/src/Forum/ForumCategories.php b/src/Forum/ForumCategories.php index 1d89ce5..d8d4def 100644 --- a/src/Forum/ForumCategories.php +++ b/src/Forum/ForumCategories.php @@ -12,11 +12,9 @@ use Misuzu\Pagination; use Misuzu\Users\UserInfo; class ForumCategories { - private IDbConnection $dbConn; private DbStatementCache $cache; public function __construct(IDbConnection $dbConn) { - $this->dbConn = $dbConn; $this->cache = new DbStatementCache($dbConn); } diff --git a/src/Messages/MessagesDatabase.php b/src/Messages/MessagesDatabase.php index c6cab4a..cdf8646 100644 --- a/src/Messages/MessagesDatabase.php +++ b/src/Messages/MessagesDatabase.php @@ -11,7 +11,7 @@ use Misuzu\Users\UserInfo; class MessagesDatabase { private DbStatementCache $cache; - public function __construct(private IDbConnection $dbConn) { + public function __construct(IDbConnection $dbConn) { $this->cache = new DbStatementCache($dbConn); } diff --git a/src/Messages/MessagesRoutes.php b/src/Messages/MessagesRoutes.php index f807deb..c8af1f8 100644 --- a/src/Messages/MessagesRoutes.php +++ b/src/Messages/MessagesRoutes.php @@ -556,9 +556,9 @@ class MessagesRoutes extends RouteHandler { return 400; $content = $request->getContent(); - $messages = explode(',', (string)$content->getParam('messages')); - if(empty($messages)) + $messages = (string)$content->getParam('messages'); + if($messages === '') return [ 'error' => [ 'name' => 'msgs:empty', @@ -566,6 +566,8 @@ class MessagesRoutes extends RouteHandler { ], ]; + $messages = explode(',', $messages); + $this->msgsCtx->getDatabase()->deleteMessages( $this->authInfo->getUserInfo(), $messages @@ -581,9 +583,9 @@ class MessagesRoutes extends RouteHandler { return 400; $content = $request->getContent(); - $messages = explode(',', (string)$content->getParam('messages')); - if(empty($messages)) + $messages = (string)$content->getParam('messages'); + if($messages === '') return [ 'error' => [ 'name' => 'msgs:empty', @@ -591,6 +593,8 @@ class MessagesRoutes extends RouteHandler { ], ]; + $messages = explode(',', $messages); + $this->msgsCtx->getDatabase()->restoreMessages( $this->authInfo->getUserInfo(), $messages @@ -606,9 +610,9 @@ class MessagesRoutes extends RouteHandler { return 400; $content = $request->getContent(); - $messages = explode(',', (string)$content->getParam('messages')); - if(empty($messages)) + $messages = (string)$content->getParam('messages'); + if($messages === '') return [ 'error' => [ 'name' => 'msgs:empty', @@ -616,6 +620,8 @@ class MessagesRoutes extends RouteHandler { ], ]; + $messages = explode(',', $messages); + $this->msgsCtx->getDatabase()->nukeMessages( $this->authInfo->getUserInfo(), $messages diff --git a/src/RoutingErrorHandler.php b/src/RoutingErrorHandler.php index 32bfa92..24c6f6f 100644 --- a/src/RoutingErrorHandler.php +++ b/src/RoutingErrorHandler.php @@ -14,7 +14,7 @@ class RoutingErrorHandler extends HtmlErrorHandler { if($code === 500 || $code === 503) { $response->setTypeHTML(); - $response->setContent(file_get_contents('%s/%03d.html', MSZ_TEMPLATES, $code)); + $response->setContent(file_get_contents(sprintf('%s/%03d.html', MSZ_TEMPLATES, $code))); return; } diff --git a/src/Users/ModNoteInfo.php b/src/Users/ModNoteInfo.php index c6b7055..c25b621 100644 --- a/src/Users/ModNoteInfo.php +++ b/src/Users/ModNoteInfo.php @@ -18,7 +18,7 @@ class ModNoteInfo { return new ModNoteInfo( noteId: $result->getString(0), userId: $result->getString(1), - authorId: $result->getIntegerOrNull(2), + authorId: $result->getStringOrNull(2), created: $result->getInteger(3), title: $result->getString(4), body: $result->getString(5) diff --git a/src/Users/UserInfo.php b/src/Users/UserInfo.php index fe54263..5484a21 100644 --- a/src/Users/UserInfo.php +++ b/src/Users/UserInfo.php @@ -47,7 +47,7 @@ class UserInfo { created: $result->getInteger(9), lastActive: $result->getIntegerOrNull(10), deleted: $result->getIntegerOrNull(11), - displayRoleId: $result->getIntegerOrNull(12), + displayRoleId: $result->getStringOrNull(12), totpKey: $result->getStringOrNull(13), aboutContent: $result->getStringOrNull(14), aboutParser: $result->getInteger(15),