flashii/misuzu-interim
flashii/misuzu-interim
Archived
2
1
Fork 0
Code Issues Pull requests Releases 163 Wiki Activity Actions

Updated to latest Index version.

Browse source
This commit is contained in:
flash 2024-10-05 02:40:29 +00:00
parent 324fe21d73
commit 0f45a5f60f
138 changed files with 500 additions and 1329 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets/misuzu.css/news/feeds.css
View file

@ -1,6 +1,6 @@
.news__feeds {
display: grid;
grid-template-columns: 1fr 1fr;
grid-template-columns: 1fr;
grid-gap: 2px;
padding: 2px;
}

8
composer.json
View file

@ -1,15 +1,13 @@
{
"require": {
"flashwave/index": "^0.2408.40014",
"flashwave/sasae": "^1.1",
"flashwave/syokuhou": "^1.2",
"flashwave/index": "^0.2410",
"flashwave/aiwass": "^1.1",
"erusev/parsedown": "~1.6",
"chillerlan/php-qrcode": "^4.3",
"symfony/mailer": "^6.0",
"matomo/device-detector": "^6.1",
"sentry/sdk": "^4.0",
"nesbot/carbon": "^3.7",
"flashwave/aiwass": "^1.0"
"nesbot/carbon": "^3.7"
},
"autoload": {
"classmap": [

105
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "c8edfa21e13dedc126a6351b7d367559",
"content-hash": "526f12235a073ac908e932627e1a16fa",
"packages": [
{
"name": "carbonphp/carbon-doctrine-types",
@ -418,15 +418,15 @@
},
{
"name": "flashwave/aiwass",
"version": "v1.0.0",
"version": "v1.1.0",
"source": {
"type": "git",
"url": "https://patchii.net/flashii/aiwass.git",
"reference": "de27da54b603f0fdc06dab89341908e73ea7a880"
"reference": "cf6653ed4676d549b543eeba2b9db517c1feb356"
},
"require": {
"ext-msgpack": ">=2.2",
"flashwave/index": "^0.2408.40014",
"flashwave/index": "^0.2410",
"php": ">=8.3"
},
"require-dev": {
@ -453,27 +453,32 @@
],
"description": "Shared HTTP RPC client/server library.",
"homepage": "https://railgun.sh/aiwass",
"time": "2024-08-16T15:59:19+00:00"
"time": "2024-10-05T00:04:26+00:00"
},
{
"name": "flashwave/index",
"version": "v0.2408.611934",
"version": "v0.2410.42339",
"source": {
"type": "git",
"url": "https://patchii.net/flash/index.git",
"reference": "2217c8c3de8e4ec8d7f9ec0f37078dbc2183d14e"
"reference": "d3e4d0985a1189d15fb8ed9eb105830c9dc38c4d"
},
"require": {
"ext-mbstring": "*",
"php": ">=8.3"
"php": ">=8.3",
"twig/html-extra": "^3.13",
"twig/twig": "^3.14"
},
"require-dev": {
"phpstan/phpstan": "^1.11",
"phpunit/phpunit": "^11.2"
},
"suggest": {
"ext-mysqli": "Support for the Index\\Data\\MariaDB namespace (both mysqlnd and libmysql are supported).",
"ext-sqlite3": "Support for the Index\\Data\\SQLite namespace."
"ext-memcache": "Support for the Index\\Cache\\Memcached namespace (only if you can't use ext-memcached for some reason).",
"ext-memcached": "Support for the Index\\Cache\\Memcached namespace (you should use this instead of ext-memcache).",
"ext-mysqli": "Support for the Index\\Db\\MariaDb namespace (both mysqlnd and libmysql are supported).",
"ext-redis": "Support for the Index\\Cache\\Valkey namespace.",
"ext-sqlite3": "Support for the Index\\Db\\Sqlite namespace."
},
"type": "library",
"autoload": {
@ -495,85 +500,7 @@
],
"description": "Composer package for the common library for my projects.",
"homepage": "https://railgun.sh/index",
"time": "2024-09-30T17:34:51+00:00"
},
{
"name": "flashwave/sasae",
"version": "v1.1.1",
"source": {
"type": "git",
"url": "https://patchii.net/flash/sasae.git",
"reference": "897a28e56926ad465bf0daf587caf3d92a311383"
},
"require": {
"flashwave/index": "^0.2408.40014",
"php": ">=8.3",
"twig/html-extra": "^3.12",
"twig/twig": "^3.12"
},
"require-dev": {
"phpstan/phpstan": "^1.11",
"phpunit/phpunit": "^11.2"
},
"type": "library",
"autoload": {
"psr-4": {
"Sasae\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"bsd-3-clause-clear"
],
"authors": [
{
"name": "flashwave",
"email": "packagist@flash.moe",
"homepage": "https://flash.moe",
"role": "mom"
}
],
"description": "A wrapper for Twig with added common functionality.",
"homepage": "https://railgun.sh/sasae",
"time": "2024-09-01T20:38:47+00:00"
},
{
"name": "flashwave/syokuhou",
"version": "v1.2.0",
"source": {
"type": "git",
"url": "https://patchii.net/flash/syokuhou.git",
"reference": "129a46c0d917382f9bc195cce278be51984eb87d"
},
"require": {
"flashwave/index": "^0.2408.40014",
"php": ">=8.3"
},
"require-dev": {
"phpstan/phpstan": "^1.11",
"phpunit/phpunit": "^11.2"
},
"type": "library",
"autoload": {
"psr-4": {
"Syokuhou\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"bsd-3-clause-clear"
],
"authors": [
{
"name": "flashwave",
"email": "packagist@flash.moe",
"homepage": "https://flash.moe",
"role": "mom"
}
],
"description": "Configuration library for PHP.",
"homepage": "https://railgun.sh/syokuhou",
"time": "2024-08-04T01:07:23+00:00"
"time": "2024-10-04T23:39:32+00:00"
},
{
"name": "guzzlehttp/psr7",

8
database/2023_01_07_023235_initial_structure_ndx.php
View file

@ -1,11 +1,11 @@
<?php
use Index\Data\IDbConnection;
use Index\Data\Migration\IDbMigration;
use Index\Db\DbConnection;
use Index\Db\Migration\DbMigration;
// Switching to the Index migration system!!!!!!
final class InitialStructureNdx_20230107_023235 implements IDbMigration {
public function migrate(IDbConnection $conn): void {
final class InitialStructureNdx_20230107_023235 implements DbMigration {
public function migrate(DbConnection $conn): void {
$hasMszTrack = false;
// check if the old migrations table exists

8
database/2023_04_30_001226_create_topic_redirs_table.php
View file

@ -1,9 +1,9 @@
<?php
use Index\Data\IDbConnection;
use Index\Data\Migration\IDbMigration;
use Index\Db\DbConnection;
use Index\Db\Migration\DbMigration;
final class CreateTopicRedirsTable_20230430_001226 implements IDbMigration {
public function migrate(IDbConnection $conn): void {
final class CreateTopicRedirsTable_20230430_001226 implements DbMigration {
public function migrate(DbConnection $conn): void {
$conn->execute('
CREATE TABLE msz_forum_topics_redirects (
topic_id INT(10) UNSIGNED NOT NULL,

8
database/2023_07_21_121854_update_user_agent_storage.php
View file

@ -1,10 +1,10 @@
<?php
use Index\Data\IDbConnection;
use Index\Data\Migration\IDbMigration;
use Index\Db\DbConnection;
use Index\Db\Migration\DbMigration;
use Misuzu\ClientInfo;
final class UpdateUserAgentStorage_20230721_121854 implements IDbMigration {
public function migrate(IDbConnection $conn): void {
final class UpdateUserAgentStorage_20230721_121854 implements DbMigration {
public function migrate(DbConnection $conn): void {
// convert user agent fields to BLOB and add field for client info storage
$conn->execute('
ALTER TABLE msz_login_attempts

8
database/2023_07_24_201010_add_moderator_notes_table.php
View file

@ -1,9 +1,9 @@
<?php
use Index\Data\IDbConnection;
use Index\Data\Migration\IDbMigration;
use Index\Db\DbConnection;
use Index\Db\Migration\DbMigration;
final class AddModeratorNotesTable_20230724_201010 implements IDbMigration {
public function migrate(IDbConnection $conn): void {
final class AddModeratorNotesTable_20230724_201010 implements DbMigration {
public function migrate(DbConnection $conn): void {
$conn->execute('
CREATE TABLE msz_users_modnotes (
note_id INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,

8
database/2023_07_26_175936_add_new_bans_table.php
View file

@ -1,9 +1,9 @@
<?php
use Index\Data\IDbConnection;
use Index\Data\Migration\IDbMigration;
use Index\Db\DbConnection;
use Index\Db\Migration\DbMigration;
final class AddNewBansTable_20230726_175936 implements IDbMigration {
public function migrate(IDbConnection $conn): void {
final class AddNewBansTable_20230726_175936 implements DbMigration {
public function migrate(DbConnection $conn): void {
$conn->execute('
CREATE TABLE msz_users_bans (
ban_id INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,

8
database/2023_07_26_210150_redo_warnings_table.php
View file

@ -1,9 +1,9 @@
<?php
use Index\Data\IDbConnection;
use Index\Data\Migration\IDbMigration;
use Index\Db\DbConnection;
use Index\Db\Migration\DbMigration;
final class RedoWarningsTable_20230726_210150 implements IDbMigration {
public function migrate(IDbConnection $conn): void {
final class RedoWarningsTable_20230726_210150 implements DbMigration {
public function migrate(DbConnection $conn): void {
$conn->execute('
CREATE TABLE msz_users_warnings (
warn_id INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,

8
database/2023_07_27_130516_pluralise_users_for_role_relations.php
View file

@ -1,9 +1,9 @@
<?php
use Index\Data\IDbConnection;
use Index\Data\Migration\IDbMigration;
use Index\Db\DbConnection;
use Index\Db\Migration\DbMigration;
final class PluraliseUsersForRoleRelations_20230727_130516 implements IDbMigration {
public function migrate(IDbConnection $conn): void {
final class PluraliseUsersForRoleRelations_20230727_130516 implements DbMigration {
public function migrate(DbConnection $conn): void {
$conn->execute('RENAME TABLE msz_user_roles TO msz_users_roles');
}
}

8
database/2023_07_28_212101_create_counters_table.php
View file

@ -1,9 +1,9 @@
<?php
use Index\Data\IDbConnection;
use Index\Data\Migration\IDbMigration;
use Index\Db\DbConnection;
use Index\Db\Migration\DbMigration;
final class CreateCountersTable_20230728_212101 implements IDbMigration {
public function migrate(IDbConnection $conn): void {
final class CreateCountersTable_20230728_212101 implements DbMigration {
public function migrate(DbConnection $conn): void {
$conn->execute('
CREATE TABLE msz_counters (
counter_name VARBINARY(64) NOT NULL,

8
database/2023_08_03_114403_update_collations_in_various_tables.php
View file

@ -1,9 +1,9 @@
<?php
use Index\Data\IDbConnection;
use Index\Data\Migration\IDbMigration;
use Index\Db\DbConnection;
use Index\Db\Migration\DbMigration;
final class UpdateCollationsInVariousTables_20230803_114403 implements IDbMigration {
public function migrate(IDbConnection $conn): void {
final class UpdateCollationsInVariousTables_20230803_114403 implements DbMigration {
public function migrate(DbConnection $conn): void {
$conn->execute('
ALTER TABLE msz_audit_log
CHANGE COLUMN log_action log_action VARCHAR(50) NOT NULL COLLATE "ascii_general_ci" AFTER user_id,

8
database/2023_08_30_213930_new_permissions_system.php
View file

@ -1,9 +1,9 @@
<?php
use Index\Data\IDbConnection;
use Index\Data\Migration\IDbMigration;
use Index\Db\DbConnection;
use Index\Db\Migration\DbMigration;
final class NewPermissionsSystem_20230830_213930 implements IDbMigration {
public function migrate(IDbConnection $conn): void {
final class NewPermissionsSystem_20230830_213930 implements DbMigration {
public function migrate(DbConnection $conn): void {
// make sure cron doesn't fuck us over
$conn->execute('DELETE FROM msz_config WHERE config_name = "perms.needsRecalc"');

8
database/2024_01_30_233734_create_messages_table.php
View file

@ -1,9 +1,9 @@
<?php
use Index\Data\IDbConnection;
use Index\Data\Migration\IDbMigration;
use Index\Db\DbConnection;
use Index\Db\Migration\DbMigration;
final class CreateMessagesTable_20240130_233734 implements IDbMigration {
public function migrate(IDbConnection $conn): void {
final class CreateMessagesTable_20240130_233734 implements DbMigration {
public function migrate(DbConnection $conn): void {
$conn->execute('
CREATE TABLE msz_messages (
msg_id BINARY(8) NOT NULL,

8
database/2024_06_02_194809_base_sixty_four_encode_pms_in_db.php
View file

@ -1,9 +1,9 @@
<?php
use Index\Data\IDbConnection;
use Index\Data\Migration\IDbMigration;
use Index\Db\DbConnection;
use Index\Db\Migration\DbMigration;
final class BaseSixtyFourEncodePmsInDb_20240602_194809 implements IDbMigration {
public function migrate(IDbConnection $conn): void {
final class BaseSixtyFourEncodePmsInDb_20240602_194809 implements DbMigration {
public function migrate(DbConnection $conn): void {
$conn->execute('UPDATE msz_messages SET msg_title = TO_BASE64(msg_title), msg_body = TO_BASE64(msg_body)');
$conn->execute('
ALTER TABLE `msz_messages`

8
database/2024_09_16_205613_add_role_id_string.php
View file

@ -1,9 +1,9 @@
<?php
use Index\Data\IDbConnection;
use Index\Data\Migration\IDbMigration;
use Index\Db\DbConnection;
use Index\Db\Migration\DbMigration;
final class AddRoleIdString_20240916_205613 implements IDbMigration {
public function migrate(IDbConnection $conn): void {
final class AddRoleIdString_20240916_205613 implements DbMigration {
public function migrate(DbConnection $conn): void {
$conn->execute(<<<SQL
ALTER TABLE msz_roles
ADD COLUMN role_string VARCHAR(20) NULL DEFAULT NULL COLLATE 'ascii_general_ci' AFTER role_id,

4
docs/source.md
View file

@ -13,6 +13,7 @@ Below are a number of links to source code repositories related to Flashii.net a
- [Seria](https://patchii.net/flashii/seria): Software used by the downloads tracker.
- [Mince](https://patchii.net/flashii/mince): Source code for the Minecraft servers subwebsite.
- [Awaki](https://patchii.net/flashii/awaki): Redirect service hosted on fii.moe.
- [Aleister](https://patchii.net/flashii/aleister): Public API gateway.
## Tools & Software
- [SoFii](https://patchii.net/flashii/sofii): Launcher for Soldier of Fortune 2
@ -21,8 +22,7 @@ Below are a number of links to source code repositories related to Flashii.net a
## First-Party Libraries
- [Index](https://patchii.net/flash/index): Base library used in almost any component of the website that uses PHP.
- [Sasae](https://patchii.net/flash/sasae): Extension to the Twig templating library.
- [Syokuhou](https://patchii.net/flash/syokuhou): Configuration library.
- [Aiwass](https://patchii.net/flashii/aiwass): Internal RPC extension, mainly used to supply data to the API gateway.
## Historical
- [AJAX Chat (fork)](https://patchii.net/flashii/ajax-chat): Old chat software (2013-2015). Still kept on life support for the nostalgia.

8
misuzu.php
View file

@ -1,9 +1,9 @@
<?php
namespace Misuzu;
use Index\Data\DbTools;
use Syokuhou\DbConfig;
use Syokuhou\FileConfig;
use Index\Db\DbTools;
use Index\Config\Db\DbConfig;
use Index\Config\Fs\FsConfig;
define('MSZ_STARTUP', microtime(true));
define('MSZ_ROOT', __DIR__);
@ -22,7 +22,7 @@ error_reporting(MSZ_DEBUG ? -1 : 0);
mb_internal_encoding('UTF-8');
date_default_timezone_set('GMT');
$cfg = FileConfig::fromFile(MSZ_CONFIG . '/config.cfg');
$cfg = FsConfig::fromFile(MSZ_CONFIG . '/config.cfg');
if($cfg->hasValues('sentry:dsn'))
(function($cfg) {

12
package-lock.json generated
View file

@ -417,9 +417,9 @@
}
},
"node_modules/caniuse-lite": {
"version": "1.0.30001664",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001664.tgz",
"integrity": "sha512-AmE7k4dXiNKQipgn7a2xg558IRqPN3jMQY/rOsbxDhrd0tyChwbITBfiwtnqz8bi2M5mIWbxAYBvk7W7QBUS2g==",
"version": "1.0.30001667",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001667.tgz",
"integrity": "sha512-7LTwJjcRkzKFmtqGsibMeuXmvFDfZq/nzIjnmgCGzKKRVzjD72selLDK1oPF/Oxzmt4fNcPvTDvGqSDG4tCALw==",
"funding": [
{
"type": "opencollective",
@ -703,9 +703,9 @@
}
},
"node_modules/electron-to-chromium": {
"version": "1.5.29",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.29.tgz",
"integrity": "sha512-PF8n2AlIhCKXQ+gTpiJi0VhcHDb69kYX4MtCiivctc2QD3XuNZ/XIOlbGzt7WAjjEev0TtaH6Cu3arZExm5DOw==",
"version": "1.5.32",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.32.tgz",
"integrity": "sha512-M+7ph0VGBQqqpTT2YrabjNKSQ2fEl9PVx6AK3N558gDH9NO8O6XN9SXXFWRo9u9PbEg/bWq+tjXQr+eXmxubCw==",
"license": "ISC"
},
"node_modules/entities": {

2
public-legacy/auth/login.php
View file

@ -4,7 +4,7 @@ namespace Misuzu;
use Exception;
use Misuzu\Auth\AuthTokenCookie;
$urls = $msz->getURLs();
$urls = $msz->getUrls();
$authInfo = $msz->getAuthInfo();
if($authInfo->isLoggedIn()) {
Tools::redirect($urls->format('index'));

2
public-legacy/auth/logout.php
View file

@ -24,4 +24,4 @@ if($authInfo->isLoggedIn()) {
AuthTokenCookie::apply($tokenPacker->pack($tokenInfo));
}
Tools::redirect($msz->getURLs()->format('index'));;
Tools::redirect($msz->getUrls()->format('index'));;

2
public-legacy/auth/password.php
View file

@ -4,7 +4,7 @@ namespace Misuzu;
use RuntimeException;
use Misuzu\Users\User;
$urls = $msz->getURLs();
$urls = $msz->getUrls();
$authInfo = $msz->getAuthInfo();
if($authInfo->isLoggedIn()) {
Tools::redirect($urls->format('settings-account'));

2
public-legacy/auth/register.php
View file

@ -4,7 +4,7 @@ namespace Misuzu;
use RuntimeException;
use Misuzu\Users\User;
$urls = $msz->getURLs();
$urls = $msz->getUrls();
$authInfo = $msz->getAuthInfo();
if($authInfo->isLoggedIn()) {
Tools::redirect($urls->format('index'));

2
public-legacy/auth/revert.php
View file

@ -3,7 +3,7 @@ namespace Misuzu;
use Misuzu\Auth\AuthTokenCookie;
$urls = $msz->getURLs();
$urls = $msz->getUrls();
if(CSRF::validateRequest()) {
$tokenInfo = $msz->getAuthInfo()->getTokenInfo();

2
public-legacy/auth/twofactor.php
View file

@ -5,7 +5,7 @@ use RuntimeException;
use Misuzu\TOTPGenerator;
use Misuzu\Auth\AuthTokenCookie;
$urls = $msz->getURLs();
$urls = $msz->getUrls();
$authInfo = $msz->getAuthInfo();
if($authInfo->isLoggedIn()) {
Tools::redirect($urls->format('index'));

2
public-legacy/comments.php
View file

@ -4,7 +4,7 @@ namespace Misuzu;
use RuntimeException;
$usersCtx = $msz->getUsersContext();
$redirect = filter_input(INPUT_GET, 'return') ?? $_SERVER['HTTP_REFERER'] ?? $msz->getURLs()->format('index');
$redirect = filter_input(INPUT_GET, 'return') ?? $_SERVER['HTTP_REFERER'] ?? $msz->getUrls()->format('index');
if(!Tools::isLocalURL($redirect))
Template::displayInfo('Possible request forgery detected.', 403);

4
public-legacy/forum/index.php
View file

@ -32,14 +32,14 @@ if($mode === 'mark') {
$forumCategories->updateUserReadCategory($userInfo, $categoryInfo);
}
Tools::redirect($msz->getURLs()->format($categoryId ? 'forum-category' : 'forum-index', ['forum' => $categoryId]));
Tools::redirect($msz->getUrls()->format($categoryId ? 'forum-category' : 'forum-index', ['forum' => $categoryId]));
return;
}
Template::render('confirm', [
'title' => 'Mark forum as read',
'message' => 'Are you sure you want to mark ' . ($categoryId < 1 ? 'the entire' : 'this') . ' forum as read?',
'return' => $msz->getURLs()->format($categoryId ? 'forum-category' : 'forum-index', ['forum' => $categoryId]),
'return' => $msz->getUrls()->format($categoryId ? 'forum-category' : 'forum-index', ['forum' => $categoryId]),
'params' => [
'forum' => $categoryId,
]

2
public-legacy/forum/leaderboard.php
View file

@ -94,7 +94,7 @@ MD;
$markdown .= sprintf("| %s | [%s](%s%s) | %s |\r\n", $ranking->position,
$ranking->user?->getName() ?? 'Deleted User',
$msz->getSiteInfo()->getURL(),
$msz->getURLs()->format('user-profile', ['user' => $ranking->userId]),
$msz->getUrls()->format('user-profile', ['user' => $ranking->userId]),
number_format($ranking->postsCount));
}

2
public-legacy/forum/post.php
View file

@ -3,7 +3,7 @@ namespace Misuzu;
use RuntimeException;
$urls = $msz->getURLs();
$urls = $msz->getUrls();
$forumCtx = $msz->getForumContext();
$forumPosts = $forumCtx->getPosts();
$usersCtx = $msz->getUsersContext();

2
public-legacy/forum/posting.php
View file

@ -258,7 +258,7 @@ if(!empty($_POST)) {
if(empty($notices)) {
// does this ternary ever return forum-topic?
$redirect = $msz->getURLs()->format(empty($topicInfo) ? 'forum-topic' : 'forum-post', [
$redirect = $msz->getUrls()->format(empty($topicInfo) ? 'forum-topic' : 'forum-post', [
'topic' => $topicId ?? 0,
'post' => $postId ?? 0,
]);

2
public-legacy/forum/topic.php
View file

@ -4,7 +4,7 @@ namespace Misuzu;
use stdClass;
use RuntimeException;
$urls = $msz->getURLs();
$urls = $msz->getUrls();
$forumCtx = $msz->getForumContext();
$forumCategories = $forumCtx->getCategories();
$forumTopics = $forumCtx->getTopics();

2
public-legacy/manage/changelog/change.php
View file

@ -15,7 +15,7 @@ $changeActions = [];
foreach(Changelog::ACTIONS as $action)
$changeActions[$action] = Changelog::actionText($action);
$urls = $msz->getURLs();
$urls = $msz->getUrls();
$changelog = $msz->getChangelog();
$changeId = (string)filter_input(INPUT_GET, 'c', FILTER_SANITIZE_NUMBER_INT);
$changeInfo = null;

2
public-legacy/manage/changelog/tag.php
View file

@ -6,7 +6,7 @@ use RuntimeException;
if(!$msz->getAuthInfo()->getPerms('global')->check(Perm::G_CL_TAGS_MANAGE))
Template::throwError(403);
$urls = $msz->getURLs();
$urls = $msz->getUrls();
$changelog = $msz->getChangelog();
$tagId = (string)filter_input(INPUT_GET, 't', FILTER_SANITIZE_NUMBER_INT);
$loadTagInfo = fn() => $changelog->getTag($tagId);

2
public-legacy/manage/forum/redirs.php
View file

@ -5,7 +5,7 @@ $authInfo = $msz->getAuthInfo();
if(!$authInfo->getPerms('global')->check(Perm::G_FORUM_TOPIC_REDIRS_MANAGE))
Template::throwError(403);
$urls = $msz->getURLs();
$urls = $msz->getUrls();
$forumCtx = $msz->getForumContext();
$forumTopicRedirects = $forumCtx->getTopicRedirects();

2
public-legacy/manage/general/emoticon.php
View file

@ -97,7 +97,7 @@ while($_SERVER['REQUEST_METHOD'] === 'POST' && CSRF::validateRequest()) {
[$emoteInfo->getId()]
);
Tools::redirect($msz->getURLs()->format('manage-general-emoticon', ['emote' => $emoteInfo->getId()]));
Tools::redirect($msz->getUrls()->format('manage-general-emoticon', ['emote' => $emoteInfo->getId()]));
return;
}

2
public-legacy/manage/general/emoticons.php
View file

@ -37,7 +37,7 @@ if(CSRF::validateRequest() && !empty($_GET['emote'])) {
}
}
Tools::redirect($msz->getURLs()->format('manage-general-emoticons'));
Tools::redirect($msz->getUrls()->format('manage-general-emoticons'));
return;
}

2
public-legacy/manage/general/setting-delete.php
View file

@ -13,7 +13,7 @@ if($_SERVER['REQUEST_METHOD'] === 'POST' && CSRF::validateRequest()) {
$valueName = $valueInfo->getName();
$msz->createAuditLog('CONFIG_DELETE', [$valueName]);
$cfg->removeValues($valueName);
Tools::redirect($msz->getURLs()->format('manage-general-settings'));
Tools::redirect($msz->getUrls()->format('manage-general-settings'));
return;
}

4
public-legacy/manage/general/setting.php
View file

@ -1,7 +1,7 @@
<?php
namespace Misuzu;
use Syokuhou\DbConfig;
use Index\Config\Db\DbConfig;
if(!$msz->getAuthInfo()->getPerms('global')->check(Perm::G_CONFIG_MANAGE))
Template::throwError(403);
@ -73,7 +73,7 @@ while($_SERVER['REQUEST_METHOD'] === 'POST' && CSRF::validateRequest()) {
$msz->createAuditLog($isNew ? 'CONFIG_CREATE' : 'CONFIG_UPDATE', [$sName]);
$applyFunc($sName, $sValue);
Tools::redirect($msz->getURLs()->format('manage-general-settings'));
Tools::redirect($msz->getUrls()->format('manage-general-settings'));
return;
}

2
public-legacy/manage/news/category.php
View file

@ -6,7 +6,7 @@ use RuntimeException;
if(!$msz->getAuthInfo()->getPerms('global')->check(Perm::G_NEWS_CATEGORIES_MANAGE))
Template::throwError(403);
$urls = $msz->getURLs();
$urls = $msz->getUrls();
$news = $msz->getNews();
$categoryId = (string)filter_input(INPUT_GET, 'c', FILTER_SANITIZE_NUMBER_INT);
$loadCategoryInfo = fn() => $news->getCategory(categoryId: $categoryId);

2
public-legacy/manage/news/post.php
View file

@ -7,7 +7,7 @@ $authInfo = $msz->getAuthInfo();
if(!$authInfo->getPerms('global')->check(Perm::G_NEWS_POSTS_MANAGE))
Template::throwError(403);
$urls = $msz->getURLs();
$urls = $msz->getUrls();
$news = $msz->getNews();
$postId = (string)filter_input(INPUT_GET, 'p', FILTER_SANITIZE_NUMBER_INT);
$loadPostInfo = fn() => $news->getPost($postId);

2
public-legacy/manage/users/ban.php
View file

@ -9,7 +9,7 @@ $authInfo = $msz->getAuthInfo();
if(!$authInfo->getPerms('user')->check(Perm::U_BANS_MANAGE))
Template::throwError(403);
$urls = $msz->getURLs();
$urls = $msz->getUrls();
$usersCtx = $msz->getUsersContext();
$bans = $usersCtx->getBans();

2
public-legacy/manage/users/note.php
View file

@ -13,7 +13,7 @@ $hasUserId = filter_has_var(INPUT_GET, 'u');
if((!$hasNoteId && !$hasUserId) || ($hasNoteId && $hasUserId))
Template::throwError(400);
$urls = $msz->getURLs();
$urls = $msz->getUrls();
$usersCtx = $msz->getUsersContext();
$modNotes = $usersCtx->getModNotes();

2
public-legacy/manage/users/role.php
View file

@ -168,7 +168,7 @@ while($_SERVER['REQUEST_METHOD'] === 'POST' && CSRF::validateRequest()) {
$msz->getConfig()->setBoolean('perms.needsRecalc', true);
}
Tools::redirect($msz->getURLs()->format('manage-role', ['role' => $roleInfo->getId()]));
Tools::redirect($msz->getUrls()->format('manage-role', ['role' => $roleInfo->getId()]));
return;
}

2
public-legacy/manage/users/user.php
View file

@ -12,7 +12,7 @@ $viewerPerms = $authInfo->getPerms('user');
if(!$authInfo->isLoggedIn())
Template::throwError(403);
$urls = $msz->getURLs();
$urls = $msz->getUrls();
$usersCtx = $msz->getUsersContext();
$users = $usersCtx->getUsers();
$roles = $usersCtx->getRoles();

2
public-legacy/manage/users/warning.php
View file

@ -7,7 +7,7 @@ $authInfo = $msz->getAuthInfo();
if(!$authInfo->getPerms('user')->check(Perm::U_WARNINGS_MANAGE))
Template::throwError(403);
$urls = $msz->getURLs();
$urls = $msz->getUrls();
$usersCtx = $msz->getUsersContext();
$users = $usersCtx->getUsers();
$warns = $usersCtx->getWarnings();

2
public-legacy/profile.php
View file

@ -14,7 +14,7 @@ $userId = !empty($_GET['u']) && is_string($_GET['u']) ? trim($_GET['u']) : 0;
$profileMode = !empty($_GET['m']) && is_string($_GET['m']) ? (string)$_GET['m'] : '';
$isEditing = !empty($_GET['edit']) && is_string($_GET['edit']) ? (bool)$_GET['edit'] : !empty($_POST) && is_array($_POST);
$urls = $msz->getURLs();
$urls = $msz->getUrls();
$usersCtx = $msz->getUsersContext();
$users = $usersCtx->getUsers();
$forumCtx = $msz->getForumContext();

11
public-legacy/settings/data.php
View file

@ -3,7 +3,6 @@ namespace Misuzu;
use ZipArchive;
use Index\XString;
use Index\IO\FileStream;
use Misuzu\Users\UserInfo;
$authInfo = $msz->getAuthInfo();
@ -42,7 +41,7 @@ function db_to_zip(ZipArchive $archive, UserInfo $userInfo, string $baseName, ar
}
$tmpName = sys_get_temp_dir() . DIRECTORY_SEPARATOR . sprintf('msz-user-data-%s-%s-%s.tmp', $userId, $baseName, XString::random(8));
$tmpStream = FileStream::newWrite($tmpName);
$tmpHandle = fopen($tmpName, 'wb');
try {
$stmt = $dbConn->prepare(sprintf('SELECT %s FROM msz_%s WHERE %s = ?', implode(', ', $fields), $baseName, $userIdField));
@ -85,12 +84,12 @@ function db_to_zip(ZipArchive $archive, UserInfo $userInfo, string $baseName, ar
$row[$fieldInfo['name']] = $fieldValue;
}
$tmpStream->write(json_encode($row, JSON_INVALID_UTF8_SUBSTITUTE));
$tmpStream->write("\n");
fwrite($tmpHandle, json_encode($row, JSON_INVALID_UTF8_SUBSTITUTE));
fwrite($tmpHandle, "\n");
}
} finally {
$tmpStream->flush();
$tmpStream->close();
fflush($tmpHandle);
fclose($tmpHandle);
}
$archive->addFile($tmpName, $baseName . '.jsonl');

2
public-legacy/settings/sessions.php
View file

@ -37,7 +37,7 @@ while($_SERVER['REQUEST_METHOD'] === 'POST' && CSRF::validateRequest()) {
}
if($activeSessionKilled) {
Tools::redirect($msz->getURLs()->format('index'));
Tools::redirect($msz->getUrls()->format('index'));
return;
} else break;
}

5
public/index.php
View file

@ -2,10 +2,7 @@
namespace Misuzu;
use RuntimeException;
use Misuzu\Auth\AuthTokenBuilder;
use Misuzu\Auth\AuthTokenCookie;
use Misuzu\Auth\AuthTokenInfo;
use Sasae\SasaeEnvironment;
use Misuzu\Auth\{AuthTokenBuilder,AuthTokenCookie,AuthTokenInfo};
require_once __DIR__ . '/../misuzu.php';

6
src/AuditLog/AuditLog.php
View file

@ -2,9 +2,7 @@
namespace Misuzu\AuditLog;
use InvalidArgumentException;
use Index\Data\DbStatementCache;
use Index\Data\IDbConnection;
use Index\Data\IDbResult;
use Index\Db\{DbConnection,DbStatementCache};
use Index\Net\IPAddress;
use Misuzu\Pagination;
use Misuzu\Users\UserInfo;
@ -12,7 +10,7 @@ use Misuzu\Users\UserInfo;
class AuditLog {
private DbStatementCache $cache;
public function __construct(IDbConnection $dbConn) {
public function __construct(DbConnection $dbConn) {
$this->cache = new DbStatementCache($dbConn);
}

4
src/AuditLog/AuditLogInfo.php
View file

@ -3,7 +3,7 @@ namespace Misuzu\AuditLog;
use ValueError;
use Carbon\CarbonImmutable;
use Index\Data\IDbResult;
use Index\Db\DbResult;
use Index\Net\IPAddress;
class AuditLogInfo {
@ -16,7 +16,7 @@ class AuditLogInfo {
private string $country,
) {}
public static function fromResult(IDbResult $result): AuditLogInfo {
public static function fromResult(DbResult $result): AuditLogInfo {
return new AuditLogInfo(
userId: $result->getStringOrNull(0),
action: $result->getString(1),

8
src/Auth/AuthContext.php
View file

@ -1,8 +1,8 @@
<?php
namespace Misuzu\Auth;
use Index\Data\IDbConnection;
use Syokuhou\IConfig;
use Index\Config\Config;
use Index\Db\DbConnection;
class AuthContext {
private Sessions $sessions;
@ -10,9 +10,9 @@ class AuthContext {
private RecoveryTokens $recoveryTokens;
private TwoFactorAuthSessions $tfaSessions;
private IConfig $config;
private Config $config;
public function __construct(IDbConnection $dbConn, IConfig $config) {
public function __construct(DbConnection $dbConn, Config $config) {
$this->config = $config;
$this->sessions = new Sessions($dbConn);
$this->loginAttempts = new LoginAttempts($dbConn);

4
src/Auth/AuthRpcActions.php
View file

@ -4,11 +4,11 @@ namespace Misuzu\Auth;
use RuntimeException;
use Misuzu\Users\{UsersContext,UserInfo};
use Aiwass\Server\{RpcActionHandler,RpcProcedure};
use Syokuhou\IConfig;
use Index\Config\Config;
final class AuthRpcActions extends RpcActionHandler {
public function __construct(
private IConfig $impersonateConfig,
private Config $impersonateConfig,
private UsersContext $usersCtx,
private AuthContext $authCtx
) {}

45
src/Auth/AuthTokenPacker.php
View file

@ -3,7 +3,6 @@ namespace Misuzu\Auth;
use RuntimeException;
use Index\UriBase64;
use Index\IO\MemoryStream;
class AuthTokenPacker {
private const EPOCH_V2 = 1682985600;
@ -64,32 +63,40 @@ class AuthTokenPacker {
$unpackTime = unpack('Nts', $timestamp);
if($unpackTime === false)
throw new RuntimeException('$token does not contain a valid timestamp.');
return AuthTokenInfo::empty();
$timestamp = $unpackTime['ts'] + self::EPOCH_V2;
$stream = MemoryStream::fromString($data);
$stream->seek(0);
$handle = fopen('php://memory', 'rb+');
if($handle === false)
return AuthTokenInfo::empty();
for(;;) {
$length = $stream->readChar();
if($length === null)
break;
try {
fwrite($handle, $data);
fseek($handle, 0);
$length = ord($length);
if($length < 1)
break;
for(;;) {
$length = fgetc($handle);
if($length === false)
break;
$name = $stream->read($length);
$value = null;
$length = $stream->readChar();
if($length !== null) {
$length = ord($length);
if($length > 0)
$value = $stream->read($length);
}
if($length < 1)
break;
$builder->setProperty($name, $value);
$name = fread($handle, $length);
$value = null;
$length = fgetc($handle);
if($length !== false) {
$length = ord($length);
if($length > 0)
$value = fread($handle, $length);
}
$builder->setProperty($name, $value);
}
} finally {
fclose($handle);
}
} else
return AuthTokenInfo::empty();

4
src/Auth/LoginAttemptInfo.php
View file

@ -3,7 +3,7 @@ namespace Misuzu\Auth;
use Misuzu\ClientInfo;
use Carbon\CarbonImmutable;
use Index\Data\IDbResult;
use Index\Db\DbResult;
use Index\Net\IPAddress;
class LoginAttemptInfo {
@ -17,7 +17,7 @@ class LoginAttemptInfo {
private string $clientInfo,
) {}
public static function fromResult(IDbResult $result): LoginAttemptInfo {
public static function fromResult(DbResult $result): LoginAttemptInfo {
return new LoginAttemptInfo(
userId: $result->getStringOrNull(0),
success: $result->getBoolean(1),

5
src/Auth/LoginAttempts.php
View file

@ -1,8 +1,7 @@
<?php
namespace Misuzu\Auth;
use Index\Data\DbStatementCache;
use Index\Data\IDbConnection;
use Index\Db\{DbConnection,DbStatementCache};
use Index\Net\IPAddress;
use Misuzu\ClientInfo;
use Misuzu\Pagination;
@ -14,7 +13,7 @@ class LoginAttempts {
private DbStatementCache $cache;
public function __construct(IDbConnection $dbConn) {
public function __construct(DbConnection $dbConn) {
$this->cache = new DbStatementCache($dbConn);
}

4
src/Auth/RecoveryTokenInfo.php
View file

@ -2,7 +2,7 @@
namespace Misuzu\Auth;
use Carbon\CarbonImmutable;
use Index\Data\IDbResult;
use Index\Db\DbResult;
use Index\Net\IPAddress;
class RecoveryTokenInfo {
@ -13,7 +13,7 @@ class RecoveryTokenInfo {
private int $created;
private ?string $code;
public function __construct(IDbResult $result) {
public function __construct(DbResult $result) {
$this->userId = (string)$result->getInteger(0);
$this->remoteAddr = $result->getString(1);
$this->created = $result->getInteger(2);

5
src/Auth/RecoveryTokens.php
View file

@ -4,8 +4,7 @@ namespace Misuzu\Auth;
use InvalidArgumentException;
use RuntimeException;
use Index\Base32;
use Index\Data\DbStatementCache;
use Index\Data\IDbConnection;
use Index\Db\{DbConnection,DbStatementCache};
use Index\Net\IPAddress;
use Misuzu\ClientInfo;
use Misuzu\Pagination;
@ -14,7 +13,7 @@ use Misuzu\Users\UserInfo;
class RecoveryTokens {
private DbStatementCache $cache;
public function __construct(IDbConnection $dbConn) {
public function __construct(DbConnection $dbConn) {
$this->cache = new DbStatementCache($dbConn);
}

4
src/Auth/SessionInfo.php
View file

@ -3,7 +3,7 @@ namespace Misuzu\Auth;
use Misuzu\ClientInfo;
use Carbon\CarbonImmutable;
use Index\Data\IDbResult;
use Index\Db\DbResult;
use Index\Net\IPAddress;
class SessionInfo {
@ -22,7 +22,7 @@ class SessionInfo {
private ?int $lastActive,
) {}
public static function fromResult(IDbResult $result): SessionInfo {
public static function fromResult(DbResult $result): SessionInfo {
return new SessionInfo(
id: $result->getString(0),
userId: $result->getString(1),

8
src/Auth/Sessions.php
View file

@ -4,19 +4,17 @@ namespace Misuzu\Auth;
use InvalidArgumentException;
use RuntimeException;
use Index\XString;
use Index\Data\DbStatementCache;
use Index\Data\DbTools;
use Index\Data\IDbConnection;
use Index\Db\{DbConnection,DbStatementCache,DbTools};
use Index\Net\IPAddress;
use Misuzu\ClientInfo;
use Misuzu\Pagination;
use Misuzu\Users\UserInfo;
class Sessions {
private IDbConnection $dbConn;
private DbConnection $dbConn;
private DbStatementCache $cache;
public function __construct(IDbConnection $dbConn) {
public function __construct(DbConnection $dbConn) {
$this->dbConn = $dbConn;
$this->cache = new DbStatementCache($dbConn);
}

5
src/Auth/TwoFactorAuthSessions.php
View file

@ -2,14 +2,13 @@
namespace Misuzu\Auth;
use Index\XString;
use Index\Data\DbStatementCache;
use Index\Data\IDbConnection;
use Index\Db\{DbConnection,DbStatementCache};
use Misuzu\Users\UserInfo;
class TwoFactorAuthSessions {
private DbStatementCache $cache;
public function __construct(IDbConnection $dbConn) {
public function __construct(DbConnection $dbConn) {
$this->cache = new DbStatementCache($dbConn);
}

8
src/CSRF.php
View file

@ -1,19 +1,19 @@
<?php
namespace Misuzu;
use Index\CSRFP;
use Index\CsrfToken;
final class CSRF {
private static CSRFP $instance;
private static CsrfToken $instance;
private static string $secretKey = '';
public static function create(string $identity, ?string $secretKey = null): CSRFP {
public static function create(string $identity, ?string $secretKey = null): CsrfToken {
if($secretKey === null)
$secretKey = self::$secretKey;
else
self::$secretKey = $secretKey;
return new CSRFP($secretKey, $identity);
return new CsrfToken($secretKey, $identity);
}
public static function init(string $secretKey, string $identity): void {

4
src/Changelog/ChangeInfo.php
View file

@ -2,7 +2,7 @@
namespace Misuzu\Changelog;
use Carbon\CarbonImmutable;
use Index\Data\IDbResult;
use Index\Db\DbResult;
class ChangeInfo {
public function __construct(
@ -14,7 +14,7 @@ class ChangeInfo {
private string $body,
) {}
public static function fromResult(IDbResult $result): ChangeInfo {
public static function fromResult(DbResult $result): ChangeInfo {
return new ChangeInfo(
id: $result->getString(0),
userId: $result->getStringOrNull(1),

4
src/Changelog/ChangeTagInfo.php
View file

@ -3,7 +3,7 @@ namespace Misuzu\Changelog;
use Stringable;
use Carbon\CarbonImmutable;
use Index\Data\IDbResult;
use Index\Db\DbResult;
class ChangeTagInfo implements Stringable {
private string $id;
@ -13,7 +13,7 @@ class ChangeTagInfo implements Stringable {
private int $archived;
private int $changes;
public function __construct(IDbResult $result) {
public function __construct(DbResult $result) {
$this->id = (string)$result->getInteger(0);
$this->name = $result->getString(1);
$this->description = $result->getString(2);

9
src/Changelog/Changelog.php
View file

@ -4,10 +4,7 @@ namespace Misuzu\Changelog;
use InvalidArgumentException;
use RuntimeException;
use DateTimeInterface;
use Index\Data\DbStatementCache;
use Index\Data\DbTools;
use Index\Data\IDbConnection;
use Index\Data\IDbResult;
use Index\Db\{DbConnection,DbStatementCache,DbTools};
use Misuzu\Pagination;
use Misuzu\Users\UserInfo;
@ -15,12 +12,12 @@ class Changelog {
// not a strict list but useful to have
public const ACTIONS = ['add', 'remove', 'update', 'fix', 'import', 'revert'];
private IDbConnection $dbConn;
private DbConnection $dbConn;
private DbStatementCache $cache;
private array $tags = [];
public function __construct(IDbConnection $dbConn) {
public function __construct(DbConnection $dbConn) {
$this->dbConn = $dbConn;
$this->cache = new DbStatementCache($dbConn);
}

71
src/Changelog/ChangelogRoutes.php
View file

@ -3,18 +3,20 @@ namespace Misuzu\Changelog;
use ErrorException;
use RuntimeException;
use Index\Http\Routing\{HttpGet,RouteHandler};
use Index\Http\Routing\{HttpGet,RouteHandler,RouteHandlerTrait};
use Index\Syndication\FeedBuilder;
use Index\Urls\{UrlFormat,UrlRegistry,UrlSource,UrlSourceTrait};
use Misuzu\{Pagination,SiteInfo,Template};
use Misuzu\Auth\AuthInfo;
use Misuzu\Comments\{Comments,CommentsEx};
use Misuzu\Feeds\{Feed,FeedItem,AtomFeedSerializer,RssFeedSerializer};
use Misuzu\URLs\{URLInfo,URLRegistry};
use Misuzu\Users\UsersContext;
final class ChangelogRoutes extends RouteHandler {
final class ChangelogRoutes implements RouteHandler, UrlSource {
use RouteHandlerTrait, UrlSourceTrait;
public function __construct(
private SiteInfo $siteInfo,
private URLRegistry $urls,
private UrlRegistry $urls,
private Changelog $changelog,
private UsersContext $usersCtx,
private AuthInfo $authInfo,
@ -27,7 +29,7 @@ final class ChangelogRoutes extends RouteHandler {
}
#[HttpGet('/changelog')]
#[URLInfo('changelog-index', '/changelog', ['date' => '<date>', 'user' => '<user>', 'tags' => '<tags>', 'p' => '<page>'])]
#[UrlFormat('changelog-index', '/changelog', ['date' => '<date>', 'user' => '<user>', 'tags' => '<tags>', 'p' => '<page>'])]
public function getIndex($response, $request) {
$filterDate = (string)$request->getParam('date');
$filterUser = (string)$request->getParam('user', FILTER_SANITIZE_NUMBER_INT);
@ -96,8 +98,8 @@ final class ChangelogRoutes extends RouteHandler {
}
#[HttpGet('/changelog/change/([0-9]+)')]
#[URLInfo('changelog-change', '/changelog/change/<change>')]
#[URLInfo('changelog-change-comments', '/changelog/change/<change>', fragment: 'comments')]
#[UrlFormat('changelog-change', '/changelog/change/<change>')]
#[UrlFormat('changelog-change-comments', '/changelog/change/<change>', fragment: 'comments')]
public function getChange($response, $request, string $changeId) {
try {
$changeInfo = $this->changelog->getChange($changeId);
@ -117,44 +119,29 @@ final class ChangelogRoutes extends RouteHandler {
]);
}
private function createFeed(string $feedMode): Feed {
#[HttpGet('/changelog.(xml|rss|atom)')]
#[UrlFormat('changelog-feed', '/changelog.xml')]
public function getFeed($response) {
$response->setContentType('application/rss+xml; charset=utf-8');
$siteName = $this->siteInfo->getName();
$siteUrl = $this->siteInfo->getURL();
$changes = $this->changelog->getChanges(pagination: new Pagination(10));
$feed = (new Feed)
->setTitle($siteName . ' » Changelog')
->setDescription('Live feed of changes to ' . $siteName . '.')
->setContentUrl($this->siteInfo->getURL() . $this->urls->format('changelog-index'))
->setFeedUrl($this->siteInfo->getURL() . $this->urls->format("changelog-feed-{$feedMode}"));
$feed = new FeedBuilder;
$feed->setTitle(sprintf('%s » Changelog', $siteName));
$feed->setDescription(sprintf('Live feed of changes to %s.', $siteName));
$feed->setContentUrl($siteUrl . $this->urls->format('changelog-index'));
$feed->setFeedUrl($siteUrl . $this->urls->format('changelog-feed'));
foreach($changes as $change) {
$changeUrl = $this->siteInfo->getURL() . $this->urls->format('changelog-change', ['change' => $change->getId()]);
$commentsUrl = $this->siteInfo->getURL() . $this->urls->format('changelog-change-comments', ['change' => $change->getId()]);
foreach($changes as $change)
$feed->createEntry(function($item) use ($change, $siteUrl) {
$item->setTitle(sprintf('%s: %s', $change->getActionText(), $change->getSummary()));
$item->setCreatedAt($change->getCreatedTime());
$item->setContentUrl($siteUrl . $this->urls->format('changelog-change', ['change' => $change->getId()]));
$item->setCommentsUrl($siteUrl . $this->urls->format('changelog-change-comments', ['change' => $change->getId()]));
});
$feedItem = (new FeedItem)
->setTitle($change->getActionText() . ': ' . $change->getSummary())
->setCreationDate($change->getCreatedTime())
->setUniqueId($changeUrl)
->setContentUrl($changeUrl)
->setCommentsUrl($commentsUrl);
$feed->addItem($feedItem);
}
return $feed;
}
#[HttpGet('/changelog.rss')]
#[URLInfo('changelog-feed-rss', '/changelog.rss')]
public function getFeedRSS($response) {
$response->setContentType('application/rss+xml; charset=utf-8');
return (new RssFeedSerializer)->serializeFeed($this->createFeed('rss'));
}
#[HttpGet('/changelog.atom')]
#[URLInfo('changelog-feed-atom', '/changelog.atom')]
public function getFeedAtom($response) {
$response->setContentType('application/atom+xml; charset=utf-8');
return (new AtomFeedSerializer)->serializeFeed($this->createFeed('atom'));
return $feed->toXmlString();
}
}

8
src/Comments/Comments.php
View file

@ -3,17 +3,15 @@ namespace Misuzu\Comments;
use InvalidArgumentException;
use RuntimeException;
use Index\Data\DbStatementCache;
use Index\Data\IDbConnection;
use Index\Data\IDbResult;
use Index\Db\{DbConnection,DbStatementCache};
use Misuzu\Pagination;
use Misuzu\Users\UserInfo;
class Comments {
private IDbConnection $dbConn;
private DbConnection $dbConn;
private DbStatementCache $cache;
public function __construct(IDbConnection $dbConn) {
public function __construct(DbConnection $dbConn) {
$this->dbConn = $dbConn;
$this->cache = new DbStatementCache($dbConn);
}

4
src/Comments/CommentsCategoryInfo.php
View file

@ -3,7 +3,7 @@ namespace Misuzu\Comments;
use Misuzu\Users\UserInfo;
use Carbon\CarbonImmutable;
use Index\Data\IDbResult;
use Index\Db\DbResult;
class CommentsCategoryInfo {
public function __construct(
@ -15,7 +15,7 @@ class CommentsCategoryInfo {
private int $comments,
) {}
public static function fromResult(IDbResult $result): CommentsCategoryInfo {
public static function fromResult(DbResult $result): CommentsCategoryInfo {
return new CommentsCategoryInfo(
id: $result->getString(0),
name: $result->getString(1),

2
src/Comments/CommentsPostInfo.php
View file

@ -2,7 +2,7 @@
namespace Misuzu\Comments;
use Carbon\CarbonImmutable;
use Index\Data\IDbResult;
use Index\Db\DbResult;
class CommentsPostInfo {
public function __construct(

4
src/Comments/CommentsPostVoteInfo.php
View file

@ -1,14 +1,14 @@
<?php
namespace Misuzu\Comments;
use Index\Data\IDbResult;
use Index\Db\DbResult;
class CommentsPostVoteInfo {
private string $commentId;
private string $userId;
private int $weight;
public function __construct(IDbResult $result) {
public function __construct(DbResult $result) {
$this->commentId = (string)$result->getInteger(0);
$this->userId = (string)$result->getInteger(1);
$this->weight = $result->getInteger(2);

4
src/Counters/CounterInfo.php
View file

@ -2,7 +2,7 @@
namespace Misuzu\Counters;
use Carbon\CarbonImmutable;
use Index\Data\IDbResult;
use Index\Db\DbResult;
class CounterInfo {
public function __construct(
@ -11,7 +11,7 @@ class CounterInfo {
private int $updated,
) {}
public static function fromResult(IDbResult $result): CounterInfo {
public static function fromResult(DbResult $result): CounterInfo {
return new CounterInfo(
name: $result->getString(0),
value: $result->getInteger(1),

6
src/Counters/Counters.php
View file

@ -2,9 +2,7 @@
namespace Misuzu\Counters;
use InvalidArgumentException;
use Index\Data\DbStatementCache;
use Index\Data\DbTools;
use Index\Data\IDbConnection;
use Index\Db\{DbConnection,DbStatementCache,DbTools};
use Misuzu\Pagination;
// insert increment and decrement calls in places someday
@ -12,7 +10,7 @@ use Misuzu\Pagination;
class Counters {
private DbStatementCache $cache;
public function __construct(IDbConnection $dbConn) {
public function __construct(DbConnection $dbConn) {
$this->cache = new DbStatementCache($dbConn);
}

4
src/Emoticons/EmoteInfo.php
View file

@ -2,7 +2,7 @@
namespace Misuzu\Emoticons;
use Stringable;
use Index\Data\IDbResult;
use Index\Db\DbResult;
class EmoteInfo implements Stringable {
public function __construct(
@ -12,7 +12,7 @@ class EmoteInfo implements Stringable {
private string $url,
) {}
public static function fromResult(IDbResult $result): EmoteInfo {
public static function fromResult(DbResult $result): EmoteInfo {
return new EmoteInfo(
id: $result->getString(0),
order: $result->getInteger(1),

4
src/Emoticons/EmoteStringInfo.php
View file

@ -2,7 +2,7 @@
namespace Misuzu\Emoticons;
use Stringable;
use Index\Data\IDbResult;
use Index\Db\DbResult;
class EmoteStringInfo implements Stringable {
public function __construct(
@ -11,7 +11,7 @@ class EmoteStringInfo implements Stringable {
private string $string,
) {}
public static function fromResult(IDbResult $result): EmoteStringInfo {
public static function fromResult(DbResult $result): EmoteStringInfo {
return new EmoteStringInfo(
emoteId: $result->getString(0),
order: $result->getInteger(1),

7
src/Emoticons/Emotes.php
View file

@ -3,8 +3,7 @@ namespace Misuzu\Emoticons;
use InvalidArgumentException;
use RuntimeException;
use Index\Data\DbStatementCache;
use Index\Data\IDbConnection;
use Index\Db\{DbConnection,DbStatementCache};
class Emotes {
private const EMOTE_ORDER = [
@ -13,10 +12,10 @@ class Emotes {
'rank' => 'emote_hierarchy',
];
private IDbConnection $dbConn;
private DbConnection $dbConn;
private DbStatementCache $cache;
public function __construct(IDbConnection $dbConn) {
public function __construct(DbConnection $dbConn) {
$this->dbConn = $dbConn;
$this->cache = new DbStatementCache($dbConn);
}

117
src/Feeds/AtomFeedSerializer.php
View file

@ -1,117 +0,0 @@
<?php
namespace Misuzu\Feeds;
use DOMDocument;
use DOMElement;
use DOMNode;
class AtomFeedSerializer extends XmlFeedSerializer {
protected function formatTime(int $time): string {
return date('c', $time);
}
protected function createRoot(DOMDocument $document, Feed $feed): DOMNode {
$atom = $document->appendChild($document->createElement('feed'));
if($atom instanceof DOMElement)
$atom->setAttribute('xmlns', 'http://www.w3.org/2005/Atom');
$atom->appendChild(
$document->createElement(
'id',
$feed->hasContentUrl()
? $this->cleanString($feed->getContentUrl())
: time()
)
);
return $atom;
}
protected function createTitle(DOMDocument $document, string $title): DOMNode {
return $document->createElement('title', $this->cleanString($title));
}
protected function createDescription(DOMDocument $document, string $description): ?DOMNode {
return $document->createElement('subtitle', $this->cleanString($description));
}
protected function createLastUpdate(DOMDocument $document, int $lastUpdate): ?DOMNode {
return $document->createElement('updated', $this->formatTime($lastUpdate));
}
protected function createContentUrl(DOMDocument $document, string $contentUrl): ?DOMNode {
$link = $document->createElement('link');
$link->setAttribute('href', $this->cleanString($contentUrl));
return $link;
}
protected function createFeedUrl(DOMDocument $document, string $feedUrl): ?DOMNode {
$link = $document->createElement('link');
$link->setAttribute('href', $this->cleanString($feedUrl));
$link->setAttribute('ref', 'self');
return $link;
}
protected function createItem(DOMDocument $document, FeedItem $feedItem): DOMNode {
$elem = $document->createElement('entry');
$elem->appendChild(
$document->createElement(
'id',
$feedItem->hasContentUrl()
? $this->cleanString($feedItem->getContentUrl())
: time()
)
);
return $elem;
}
protected function createItemTitle(DOMDocument $document, string $title): DOMNode {
return $document->createElement('title', $this->cleanString($title));
}
protected function createItemSummary(DOMDocument $document, string $summary): ?DOMNode {
return $document->createElement('summary', $this->cleanString($summary));
}
protected function createItemContent(DOMDocument $document, string $content): ?DOMNode {
$elem = $document->createElement('content', $this->cleanString($content));
$elem->setAttribute('type', 'html');
return $elem;
}
protected function createItemCreationDate(DOMDocument $document, int $creationDate): ?DOMNode {
return $document->createElement('updated', $this->formatTime($creationDate));
}
protected function createItemUniqueId(DOMDocument $document, string $uniqueId): ?DOMNode {
return null;
}
protected function createItemContentUrl(DOMDocument $document, string $contentUrl): ?DOMNode {
$elem = $document->createElement('link');
$elem->setAttribute('href', $this->cleanString($contentUrl));
$elem->setAttribute('type', 'text/html');
return $elem;
}
protected function createItemCommentsUrl(DOMDocument $document, string $commentsUrl): ?DOMNode {
return null;
}
protected function createItemAuthor(DOMDocument $document, ?string $authorName, ?string $authorUrl): ?DOMNode {
if(empty($authorName) && empty($authorUrl))
return null;
$elem = $document->createElement('author');
if(!empty($authorName))
$elem->appendChild($document->createElement('name', $this->cleanString($authorName)));
if(!empty($authorUrl))
$elem->appendChild($document->createElement('uri', $this->cleanString($authorUrl)));
return $elem;
}
}

74
src/Feeds/Feed.php
View file

@ -1,74 +0,0 @@
<?php
namespace Misuzu\Feeds;
class Feed {
private string $title = '';
private ?string $description = null;
private ?int $lastUpdate = null;
private ?string $contentUrl = null;
private ?string $feedUrl = null;
private array $feedItems = [];
public function getTitle(): string {
return $this->title;
}
public function setTitle(string $title): self {
$this->title = $title;
return $this;
}
public function getDescription(): string {
return $this->description ?? '';
}
public function hasDescription(): bool {
return isset($this->description);
}
public function setDescription(?string $description): self {
$this->description = $description;
return $this;
}
public function getLastUpdate(): int {
return $this->lastUpdate ?? 0;
}
public function hasLastUpdate(): bool {
return isset($this->lastUpdate);
}
public function setLastUpdate(?int $lastUpdate): self {
$this->lastUpdate = $lastUpdate;
return $this;
}
public function getContentUrl(): string {
return $this->contentUrl ?? '';
}
public function hasContentUrl(): bool {
return isset($this->contentUrl);
}
public function setContentUrl(?string $contentUrl): self {
$this->contentUrl = $contentUrl;
return $this;
}
public function getFeedUrl(): string {
return $this->feedUrl ?? '';
}
public function hasFeedUrl(): bool {
return isset($this->feedUrl);
}
public function setFeedUrl(?string $feedUrl): self {
$this->feedUrl = $feedUrl;
return $this;
}
public function getItems(): array {
return $this->feedItems;
}
public function hasItems(): bool {
return count($this->feedItems) > 0;
}
public function addItem(FeedItem $item): self {
$this->feedItems[] = $item;
return $this;
}
}

110
src/Feeds/FeedItem.php
View file

@ -1,110 +0,0 @@
<?php
namespace Misuzu\Feeds;
class FeedItem {
private string $title = '';
private ?string $summary = null;
private ?string $content = null;
private ?int $creationDate = null;
private ?string $uniqueId = null;
private ?string $contentUrl = null;
private ?string $commentsUrl = null;
private ?string $authorName = null;
private ?string $authorUrl = null;
public function getTitle(): string {
return $this->title;
}
public function setTitle(string $title): self {
$this->title = $title;
return $this;
}
public function getSummary(): string {
return $this->summary ?? '';
}
public function hasSummary(): bool {
return isset($this->summary);
}
public function setSummary(?string $summary): self {
$this->summary = $summary;
return $this;
}
public function getContent(): string {
return $this->content ?? '';
}
public function hasContent(): bool {
return isset($this->content);
}
public function setContent(?string $content): self {
$this->content = $content;
return $this;
}
public function getCreationDate(): int {
return $this->creationDate;
}
public function hasCreationDate(): bool {
return isset($this->creationDate);
}
public function setCreationDate(?int $creationDate): self {
$this->creationDate = $creationDate;
return $this;
}
public function getUniqueId(): string {
return $this->uniqueId ?? '';
}
public function hasUniqueId(): bool {
return isset($this->uniqueId);
}
public function setUniqueId(?string $uniqueId): self {
$this->uniqueId = $uniqueId;
return $this;
}
public function getContentUrl(): string {
return $this->contentUrl ?? '';
}
public function hasContentUrl(): bool {
return isset($this->contentUrl);
}
public function setContentUrl(?string $contentUrl): self {
$this->contentUrl = $contentUrl;
return $this;
}
public function getCommentsUrl(): string {
return $this->commentsUrl ?? '';
}
public function hasCommentsUrl(): bool {
return isset($this->commentsUrl);
}
public function setCommentsUrl(?string $commentsUrl): self {
$this->commentsUrl = $commentsUrl;
return $this;
}
public function getAuthorName(): string {
return $this->authorName ?? '';
}
public function hasAuthorName(): bool {
return isset($this->authorName);
}
public function setAuthorName(?string $authorName): self {
$this->authorName = $authorName;
return $this;
}
public function getAuthorUrl(): string {
return $this->authorUrl ?? '';
}
public function hasAuthorUrl(): bool {
return isset($this->authorUrl);
}
public function setAuthorUrl(?string $authorUrl): self {
$this->authorUrl = $authorUrl;
return $this;
}
}

6
src/Feeds/FeedSerializer.php
View file

@ -1,6 +0,0 @@
<?php
namespace Misuzu\Feeds;
abstract class FeedSerializer {
abstract public function serializeFeed(Feed $feed): string;
}

85
src/Feeds/RssFeedSerializer.php
View file

@ -1,85 +0,0 @@
<?php
namespace Misuzu\Feeds;
use DOMDocument;
use DOMElement;
use DOMNode;
class RssFeedSerializer extends XmlFeedSerializer {
protected function formatTime(int $time): string {
return date('r', $time);
}
protected function createRoot(DOMDocument $document, Feed $feed): DOMNode {
$rss = $document->appendChild($document->createElement('rss'));
if($rss instanceof DOMElement) {
$rss->setAttribute('version', '2.0');
$rss->setAttribute('xmlns:atom', 'http://www.w3.org/2005/Atom');
}
$channel = $rss->appendChild($document->createElement('channel'));
$channel->appendChild($document->createElement('ttl', '900'));
return $channel;
}
protected function createTitle(DOMDocument $document, string $title): DOMNode {
return $document->createElement('title', $this->cleanString($title));
}
protected function createDescription(DOMDocument $document, string $description): ?DOMNode {
return $document->createElement('description', $this->cleanString($description));
}
protected function createLastUpdate(DOMDocument $document, int $lastUpdate): ?DOMNode {
return $document->createElement('pubDate', $this->formatTime($lastUpdate));
}
protected function createContentUrl(DOMDocument $document, string $contentUrl): ?DOMNode {
return $document->createElement('link', $this->cleanString($contentUrl));
}
protected function createFeedUrl(DOMDocument $document, string $feedUrl): ?DOMNode {
$link = $document->createElement('atom:link');
$link->setAttribute('href', $this->cleanString($feedUrl));
$link->setAttribute('ref', 'self');
return $link;
}
protected function createItem(DOMDocument $document, FeedItem $feedItem): DOMNode {
return $document->createElement('item');
}
protected function createItemTitle(DOMDocument $document, string $title): DOMNode {
return $document->createElement('title', $this->cleanString($title));
}
protected function createItemSummary(DOMDocument $document, string $summary): ?DOMNode {
return $document->createElement('description', $this->cleanString($summary));
}
protected function createItemContent(DOMDocument $document, string $content): ?DOMNode {
return null;
}
protected function createItemCreationDate(DOMDocument $document, int $creationDate): ?DOMNode {
return $document->createElement('pubDate', $this->formatTime($creationDate));
}
protected function createItemUniqueId(DOMDocument $document, string $uniqueId): ?DOMNode {
$elem = $document->createElement('guid', $uniqueId);
$elem->setAttribute('isPermaLink', 'true');
return $elem;
}
protected function createItemContentUrl(DOMDocument $document, string $contentUrl): ?DOMNode {
return $document->createElement('link', $contentUrl);
}
protected function createItemCommentsUrl(DOMDocument $document, string $commentsUrl): ?DOMNode {
return $document->createElement('comments', $commentsUrl);
}
protected function createItemAuthor(DOMDocument $document, ?string $authorName, ?string $authorUrl): ?DOMNode {
return null;
}
}

79
src/Feeds/XmlFeedSerializer.php
View file

@ -1,79 +0,0 @@
<?php
namespace Misuzu\Feeds;
use DOMDocument;
use DOMNode;
abstract class XmlFeedSerializer extends FeedSerializer {
public function serializeFeed(Feed $feed): string {
$document = new DOMDocument('1.0', 'utf-8');
$root = $this->createRoot($document, $feed);
$root->appendChild($this->createTitle($document, $feed->getTitle()));
if($feed->hasDescription())
self::appendChild($root, $this->createDescription($document, $feed->getDescription()));
if($feed->hasLastUpdate())
self::appendChild($root, $this->createLastUpdate($document, $feed->getLastUpdate()));
if($feed->hasContentUrl())
self::appendChild($root, $this->createContentUrl($document, $feed->getContentUrl()));
if($feed->hasFeedUrl())
self::appendChild($root, $this->createFeedUrl($document, $feed->getFeedUrl()));
if($feed->hasItems()) {
foreach($feed->getItems() as $item) {
$root->appendChild($this->serializeFeedItem($document, $item));
}
}
return $document->saveXML();
}
private function serializeFeedItem(DOMDocument $document, FeedItem $feedItem): DOMNode {
$elem = $this->createItem($document, $feedItem);
$elem->appendChild($this->createItemTitle($document, $feedItem->getTitle()));
if($feedItem->hasSummary())
self::appendChild($elem, $this->createItemSummary($document, $feedItem->getSummary()));
if($feedItem->hasContent())
self::appendChild($elem, $this->createItemContent($document, $feedItem->getContent()));
if($feedItem->hasCreationDate())
self::appendChild($elem, $this->createItemCreationDate($document, $feedItem->getCreationDate()));
if($feedItem->hasUniqueId())
self::appendChild($elem, $this->createItemUniqueId($document, $feedItem->getUniqueId()));
if($feedItem->hasContentUrl())
self::appendChild($elem, $this->createItemContentUrl($document, $feedItem->getContentUrl()));
if($feedItem->hasCommentsUrl())
self::appendChild($elem, $this->createItemCommentsUrl($document, $feedItem->getCommentsUrl()));
if($feedItem->hasAuthorName() || $feedItem->hasAuthorUrl())
self::appendChild($elem, $this->createItemAuthor($document, $feedItem->getAuthorName(), $feedItem->getAuthorUrl()));
return $elem;
}
protected function cleanString(string $string): string {
return htmlspecialchars($string, ENT_XML1 | ENT_COMPAT | ENT_SUBSTITUTE);
}
protected static function appendChild(DOMNode $parent, ?DOMNode $elem): ?DOMNode {
if($elem !== null)
return $parent->appendChild($elem);
return $elem;
}
abstract protected function formatTime(int $time): string;
abstract protected function createRoot(DOMDocument $document, Feed $feed): DOMNode;
abstract protected function createTitle(DOMDocument $document, string $title): DOMNode;
abstract protected function createDescription(DOMDocument $document, string $description): ?DOMNode;
abstract protected function createLastUpdate(DOMDocument $document, int $lastUpdate): ?DOMNode;
abstract protected function createContentUrl(DOMDocument $document, string $contentUrl): ?DOMNode;
abstract protected function createFeedUrl(DOMDocument $document, string $feedUrl): ?DOMNode;
abstract protected function createItem(DOMDocument $document, FeedItem $feedItem): DOMNode;
abstract protected function createItemTitle(DOMDocument $document, string $title): DOMNode;
abstract protected function createItemSummary(DOMDocument $document, string $summary): ?DOMNode;
abstract protected function createItemContent(DOMDocument $document, string $content): ?DOMNode;
abstract protected function createItemCreationDate(DOMDocument $document, int $creationDate): ?DOMNode;
abstract protected function createItemUniqueId(DOMDocument $document, string $uniqueId): ?DOMNode;
abstract protected function createItemContentUrl(DOMDocument $document, string $contentUrl): ?DOMNode;
abstract protected function createItemCommentsUrl(DOMDocument $document, string $commentsUrl): ?DOMNode;
abstract protected function createItemAuthor(DOMDocument $document, ?string $authorName, ?string $authorUrl): ?DOMNode;
}

6
src/Forum/ForumCategories.php
View file

@ -5,16 +5,14 @@ use InvalidArgumentException;
use RuntimeException;
use stdClass;
use Index\Colour\Colour;
use Index\Data\DbStatementCache;
use Index\Data\DbTools;
use Index\Data\IDbConnection;
use Index\Db\{DbConnection,DbStatementCache,DbTools};
use Misuzu\Pagination;
use Misuzu\Users\UserInfo;
class ForumCategories {
private DbStatementCache $cache;
public function __construct(IDbConnection $dbConn) {
public function __construct(DbConnection $dbConn) {
$this->cache = new DbStatementCache($dbConn);
}

4
src/Forum/ForumCategoryInfo.php
View file

@ -3,7 +3,7 @@ namespace Misuzu\Forum;
use Carbon\CarbonImmutable;
use Index\Colour\Colour;
use Index\Data\IDbResult;
use Index\Db\DbResult;
class ForumCategoryInfo {
// should the types just be replaced with flags indicating what's allowed?
@ -44,7 +44,7 @@ class ForumCategoryInfo {
private int $postsCount,
) {}
public static function fromResult(IDbResult $result): ForumCategoryInfo {
public static function fromResult(DbResult $result): ForumCategoryInfo {
return new ForumCategoryInfo(
id: $result->getString(0),
order: $result->getInteger(1),

4
src/Forum/ForumContext.php
View file

@ -2,7 +2,7 @@
namespace Misuzu\Forum;
use stdClass;
use Index\Data\IDbConnection;
use Index\Db\DbConnection;
use Misuzu\Users\UserInfo;
class ForumContext {
@ -14,7 +14,7 @@ class ForumContext {
private array $totalUserTopics = [];
private array $totalUserPosts = [];
public function __construct(IDbConnection $dbConn) {
public function __construct(DbConnection $dbConn) {
$this->categories = new ForumCategories($dbConn);
$this->topics = new ForumTopics($dbConn);
$this->topicRedirects = new ForumTopicRedirects($dbConn);

4
src/Forum/ForumPostInfo.php
View file

@ -4,7 +4,7 @@ namespace Misuzu\Forum;
use Misuzu\Parsers\Parser;
use Carbon\CarbonImmutable;
use Index\XDateTime;
use Index\Data\IDbResult;
use Index\Db\DbResult;
use Index\Net\IPAddress;
class ForumPostInfo {
@ -22,7 +22,7 @@ class ForumPostInfo {
private ?int $deleted,
) {}
public static function fromResult(IDbResult $result): ForumPostInfo {
public static function fromResult(DbResult $result): ForumPostInfo {
return new ForumPostInfo(
id: $result->getString(0),
topicId: $result->getString(1),

8
src/Forum/ForumPosts.php
View file

@ -5,18 +5,16 @@ use InvalidArgumentException;
use RuntimeException;
use stdClass;
use Carbon\CarbonImmutable;
use Index\Data\DbStatementCache;
use Index\Data\DbTools;
use Index\Data\IDbConnection;
use Index\Db\{DbConnection,DbStatementCache,DbTools};
use Index\Net\IPAddress;
use Misuzu\Pagination;
use Misuzu\Users\UserInfo;
class ForumPosts {
private IDbConnection $dbConn;
private DbConnection $dbConn;
private DbStatementCache $cache;
public function __construct(IDbConnection $dbConn) {
public function __construct(DbConnection $dbConn) {
$this->dbConn = $dbConn;
$this->cache = new DbStatementCache($dbConn);
}

4
src/Forum/ForumTopicInfo.php
View file

@ -3,7 +3,7 @@ namespace Misuzu\Forum;
use Carbon\CarbonImmutable;
use Index\XDateTime;
use Index\Data\IDbResult;
use Index\Db\DbResult;
class ForumTopicInfo {
public const TYPE_DISCUSSION = 0;
@ -33,7 +33,7 @@ class ForumTopicInfo {
private ?int $locked,
) {}
public static function fromResult(IDbResult $result): ForumTopicInfo {
public static function fromResult(DbResult $result): ForumTopicInfo {
return new ForumTopicInfo(
id: $result->getString(0),
categoryId: $result->getString(1),

4
src/Forum/ForumTopicRedirectInfo.php
View file

@ -2,7 +2,7 @@
namespace Misuzu\Forum;
use Carbon\CarbonImmutable;
use Index\Data\IDbResult;
use Index\Db\DbResult;
class ForumTopicRedirectInfo {
public function __construct(
@ -12,7 +12,7 @@ class ForumTopicRedirectInfo {
private int $created,
) {}
public static function fromResult(IDbResult $result): ForumTopicRedirectInfo {
public static function fromResult(DbResult $result): ForumTopicRedirectInfo {
return new ForumTopicRedirectInfo(
topicId: $result->getString(0),
userId: $result->getStringOrNull(1),

5
src/Forum/ForumTopicRedirects.php
View file

@ -2,15 +2,14 @@
namespace Misuzu\Forum;
use RuntimeException;
use Index\Data\DbStatementCache;
use Index\Data\IDbConnection;
use Index\Db\{DbConnection,DbStatementCache};
use Misuzu\Pagination;
use Misuzu\Users\UserInfo;
class ForumTopicRedirects {
private DbStatementCache $cache;
public function __construct(IDbConnection $dbConn) {
public function __construct(DbConnection $dbConn) {
$this->cache = new DbStatementCache($dbConn);
}

8
src/Forum/ForumTopics.php
View file

@ -4,17 +4,15 @@ namespace Misuzu\Forum;
use InvalidArgumentException;
use RuntimeException;
use stdClass;
use Index\Data\DbStatementCache;
use Index\Data\DbTools;
use Index\Data\IDbConnection;
use Index\Db\{DbConnection,DbStatementCache,DbTools};
use Misuzu\Pagination;
use Misuzu\Users\UserInfo;
class ForumTopics {
private IDbConnection $dbConn;
private DbConnection $dbConn;
private DbStatementCache $cache;
public function __construct(IDbConnection $dbConn) {
public function __construct(DbConnection $dbConn) {
$this->dbConn = $dbConn;
$this->cache = new DbStatementCache($dbConn);
}

8
src/Hanyuu/HanyuuRpcActions.php
View file

@ -4,17 +4,17 @@ namespace Misuzu\Hanyuu;
use RuntimeException;
use Misuzu\CSRF;
use Misuzu\Auth\AuthContext;
use Misuzu\URLs\URLRegistry;
use Misuzu\Users\{UsersContext,UserInfo};
use Aiwass\Server\{RpcActionHandler,RpcProcedure};
use Index\Colour\Colour;
use Syokuhou\IConfig;
use Index\Config\Config;
use Index\Urls\UrlRegistry;
final class HanyuuRpcActions extends RpcActionHandler {
public function __construct(
private $getBaseUrl,
private IConfig $impersonateConfig,
private URLRegistry $urls,
private Config $impersonateConfig,
private UrlRegistry $urls,
private UsersContext $usersCtx,
private AuthContext $authCtx
) {}

18
src/Home/HomeRoutes.php
View file

@ -3,22 +3,24 @@ namespace Misuzu\Home;
use RuntimeException;
use Index\XDateTime;
use Index\Data\{DbTools,IDbConnection};
use Index\Http\Routing\{HttpGet,RouteHandler};
use Syokuhou\IConfig;
use Index\Config\Config;
use Index\Db\{DbConnection,DbTools};
use Index\Http\Routing\{HttpGet,RouteHandler,RouteHandlerTrait};
use Index\Urls\{UrlFormat,UrlSource,UrlSourceTrait};
use Misuzu\{Pagination,SiteInfo,Template};
use Misuzu\Auth\AuthInfo;
use Misuzu\Changelog\Changelog;
use Misuzu\Comments\Comments;
use Misuzu\Counters\Counters;
use Misuzu\News\News;
use Misuzu\URLs\URLInfo;
use Misuzu\Users\UsersContext;
class HomeRoutes extends RouteHandler {
class HomeRoutes implements RouteHandler, UrlSource {
use RouteHandlerTrait, UrlSourceTrait;
public function __construct(
private IConfig $config,
private IDbConnection $dbConn,
private Config $config,
private DbConnection $dbConn,
private SiteInfo $siteInfo,
private AuthInfo $authInfo,
private Changelog $changelog,
@ -151,7 +153,7 @@ class HomeRoutes extends RouteHandler {
}
#[HttpGet('/')]
#[URLInfo('index', '/')]
#[UrlFormat('index', '/')]
public function getIndex(...$args) {
return $this->authInfo->isLoggedIn()
? $this->getHome(...$args)

16
src/Info/InfoRoutes.php
View file

@ -1,12 +1,14 @@
<?php
namespace Misuzu\Info;
use Index\Http\Routing\{HttpGet,RouteHandler};
use Index\Http\Routing\{HttpGet,RouteHandler,RouteHandlerTrait};
use Index\Urls\{UrlFormat,UrlSource,UrlSourceTrait};
use Misuzu\Template;
use Misuzu\Parsers\Parser;
use Misuzu\URLs\URLInfo;
class InfoRoutes extends RouteHandler {
class InfoRoutes implements RouteHandler, UrlSource {
use RouteHandlerTrait, UrlSourceTrait;
private const DOCS_PATH = MSZ_ROOT . '/docs';
private const PROJECT_PATHS = [
'misuzu' => MSZ_ROOT,
@ -18,14 +20,14 @@ class InfoRoutes extends RouteHandler {
];
#[HttpGet('/info')]
#[URLInfo('info-index', '/info')]
#[UrlFormat('info-index', '/info')]
public function getIndex() {
return Template::renderRaw('info.index');
}
#[HttpGet('/info/([A-Za-z0-9_]+)')]
#[URLInfo('info', '/info/<title>')]
#[URLInfo('info-doc', '/info/<title>')]
#[UrlFormat('info', '/info/<title>')]
#[UrlFormat('info-doc', '/info/<title>')]
public function getDocsPage($response, $request, string $name) {
return $this->serveMarkdownDocument(
sprintf('%s/%s.md', self::DOCS_PATH, $name)
@ -71,7 +73,7 @@ class InfoRoutes extends RouteHandler {
}
#[HttpGet('/info/([A-Za-z0-9_]+)/([A-Za-z0-9_]+)')]
#[URLInfo('info-project-doc', '/info/<project>/<title>')]
#[UrlFormat('info-project-doc', '/info/<project>/<title>')]
public function getProjectPage($response, $request, string $project, string $name) {
if(!array_key_exists($project, self::PROJECT_PATHS))
return 404;

46
src/LegacyRoutes.php
View file

@ -1,15 +1,17 @@
<?php
namespace Misuzu;
use Index\Http\Routing\{HttpGet,RouteHandler};
use Misuzu\URLs\{IURLSource,URLInfo,URLRegistry};
use Index\Http\Routing\{HttpGet,RouteHandler,RouteHandlerTrait};
use Index\Urls\{UrlFormat,UrlRegistry,UrlSource,UrlSourceTrait};
class LegacyRoutes implements RouteHandler, UrlSource {
use RouteHandlerTrait, UrlSourceTrait;
class LegacyRoutes extends RouteHandler implements IURLSource {
public function __construct(
private URLRegistry $urls
private UrlRegistry $urls
) {}
public function registerURLs(URLRegistry $urls): void {
public function registerUrls(UrlRegistry $urls): void {
// eventually this should be handled by context classes
$urls->register('search-index', '/search.php');
$urls->register('search-query', '/search.php', ['q' => '<query>'], '<section>');
@ -156,20 +158,6 @@ class LegacyRoutes extends RouteHandler implements IURLSource {
$response->redirect($location, true);
}
#[HttpGet('/news.php/rss')]
public function getNewsRssPHP($response, $request): void {
$catId = (int)$request->getParam('c', FILTER_SANITIZE_NUMBER_INT);
$location = $this->urls->format($catId > 0 ? 'news-category-feed-rss' : 'news-feed-rss', ['category' => $catId]);
$response->redirect($location, true);
}
#[HttpGet('/news.php/atom')]
public function getNewsAtomPHP($response, $request): void {
$catId = (int)$request->getParam('c', FILTER_SANITIZE_NUMBER_INT);
$location = $this->urls->format($catId > 0 ? 'news-category-feed-atom' : 'news-feed-atom', ['category' => $catId]);
$response->redirect($location, true);
}
#[HttpGet('/news/index.php')]
public function getNewsIndexPHP($response, $request): void {
$response->redirect($this->urls->format('news-index', [
@ -192,25 +180,15 @@ class LegacyRoutes extends RouteHandler implements IURLSource {
]), true);
}
#[HttpGet('/news.php/rss')]
#[HttpGet('/news.php/atom')]
#[HttpGet('/news/feed.php')]
public function getNewsFeedPHP($response, $request): int {
return 400;
}
#[HttpGet('/news/feed.php/rss')]
public function getNewsFeedRssPHP($response, $request): void {
$catId = (int)$request->getParam('c', FILTER_SANITIZE_NUMBER_INT);
$response->redirect($this->urls->format(
$catId > 0 ? 'news-category-feed-rss' : 'news-feed-rss',
['category' => $catId]
), true);
}
#[HttpGet('/news/feed.php/atom')]
public function getNewsFeedAtomPHP($response, $request): void {
public function getNewsFeedPHP($response, $request): void {
$catId = (int)$request->getParam('c', FILTER_SANITIZE_NUMBER_INT);
$response->redirect($this->urls->format(
$catId > 0 ? 'news-category-feed-atom' : 'news-feed-atom',
$catId > 0 ? 'news-category-feed' : 'news-feed',
['category' => $catId]
), true);
}
@ -262,7 +240,7 @@ class LegacyRoutes extends RouteHandler implements IURLSource {
}
#[HttpGet('/manage')]
#[URLInfo('manage-index', '/manage')]
#[UrlFormat('manage-index', '/manage')]
public function getManageIndex($response): void {
$response->redirect($this->urls->format('manage-general-overview'));
}

6
src/Mailer.php
View file

@ -2,7 +2,7 @@
namespace Misuzu;
use InvalidArgumentException;
use Syokuhou\IConfig;
use Index\Config\Config;
use Symfony\Component\Mime\Email as SymfonyMessage;
use Symfony\Component\Mime\Address as SymfonyAddress;
use Symfony\Component\Mailer\Transport as SymfonyTransport;
@ -10,10 +10,10 @@ use Symfony\Component\Mailer\Transport as SymfonyTransport;
final class Mailer {
private const TEMPLATE_PATH = MSZ_ROOT . '/config/emails/%s.txt';
private static IConfig $config;
private static Config $config;
private static $transport = null;
public static function init(IConfig $config): void {
public static function init(Config $config): void {
self::$config = $config;
}

4
src/Messages/MessageInfo.php
View file

@ -3,7 +3,7 @@ namespace Misuzu\Messages;
use Misuzu\Parsers\Parser;
use Carbon\CarbonImmutable;
use Index\Data\IDbResult;
use Index\Db\DbResult;
class MessageInfo {
public function __construct(
@ -21,7 +21,7 @@ class MessageInfo {
private ?int $deleted,
) {}
public static function fromResult(IDbResult $result): MessageInfo {
public static function fromResult(DbResult $result): MessageInfo {
return new MessageInfo(
messageId: $result->getString(0),
ownerId: $result->getString(1),

5
src/Messages/MessagesContext.php
View file

@ -1,11 +1,12 @@
<?php
namespace Misuzu\Messages;
use Index\Data\IDbConnection;
use Index\Db\DbConnection;
class MessagesContext {
private MessagesDatabase $database;
public function __construct(IDbConnection $dbConn) {
public function __construct(DbConnection $dbConn) {
$this->database = new MessagesDatabase($dbConn);
}

4
src/Messages/MessagesDatabase.php
View file

@ -4,14 +4,14 @@ namespace Misuzu\Messages;
use InvalidArgumentException;
use RuntimeException;
use DateTimeInterface;
use Index\Data\{DbStatementCache,DbTools,IDbConnection};
use Index\Db\{DbConnection,DbStatementCache,DbTools};
use Misuzu\Pagination;
use Misuzu\Users\UserInfo;
class MessagesDatabase {
private DbStatementCache $cache;
public function __construct(IDbConnection $dbConn) {
public function __construct(DbConnection $dbConn) {
$this->cache = new DbStatementCache($dbConn);
}

36
src/Messages/MessagesRoutes.php
View file

@ -5,16 +5,18 @@ use stdClass;
use InvalidArgumentException;
use RuntimeException;
use Index\XString;
use Index\Http\Routing\{HttpGet,HttpMiddleware,HttpPost,RouteHandler};
use Syokuhou\IConfig;
use Index\Config\Config;
use Index\Http\Routing\{HttpGet,HttpMiddleware,HttpPost,RouteHandler,RouteHandlerTrait};
use Index\Urls\{UrlFormat,UrlRegistry,UrlSource,UrlSourceTrait};
use Misuzu\{CSRF,Pagination,Perm,Template};
use Misuzu\Auth\AuthInfo;
use Misuzu\Parsers\Parser;
use Misuzu\Perms\Permissions;
use Misuzu\URLs\{URLInfo,URLRegistry};
use Misuzu\Users\{UsersContext,UserInfo};
class MessagesRoutes extends RouteHandler {
class MessagesRoutes implements RouteHandler, UrlSource {
use RouteHandlerTrait, UrlSourceTrait;
public const FOLDER_META = [
'inbox' => [ 'title' => 'Inbox', 'icon' => 'fas fa-inbox fa-fw' ],
'drafts' => [ 'title' => 'Drafts', 'icon' => 'fas fa-pencil-alt fa-fw' ],
@ -23,8 +25,8 @@ class MessagesRoutes extends RouteHandler {
];
public function __construct(
private IConfig $config,
private URLRegistry $urls,
private Config $config,
private UrlRegistry $urls,
private AuthInfo $authInfo,
private MessagesContext $msgsCtx,
private UsersContext $usersCtx,
@ -77,7 +79,7 @@ class MessagesRoutes extends RouteHandler {
}
#[HttpGet('/messages')]
#[URLInfo('messages-index', '/messages', ['folder' => '<folder>', 'page' => '<page>'])]
#[UrlFormat('messages-index', '/messages', ['folder' => '<folder>', 'page' => '<page>'])]
public function getIndex($response, $request, string $folderName = '') {
$folderName = (string)$request->getParam('folder');
if($folderName === '')
@ -130,7 +132,7 @@ class MessagesRoutes extends RouteHandler {
}
#[HttpGet('/messages/stats')]
#[URLInfo('messages-stats', '/messages/stats')]
#[UrlFormat('messages-stats', '/messages/stats')]
public function getStats() {
$selfInfo = $this->authInfo->getUserInfo();
$msgsDb = $this->msgsCtx->getDatabase();
@ -147,7 +149,7 @@ class MessagesRoutes extends RouteHandler {
}
#[HttpPost('/messages/recipient')]
#[URLInfo('messages-recipient', '/messages/recipient')]
#[UrlFormat('messages-recipient', '/messages/recipient')]
public function postRecipient($response, $request) {
if(!$request->isFormContent())
return 400;
@ -187,7 +189,7 @@ class MessagesRoutes extends RouteHandler {
}
#[HttpGet('/messages/compose')]
#[URLInfo('messages-compose', '/messages/compose', ['recipient' => '<recipient>'])]
#[UrlFormat('messages-compose', '/messages/compose', ['recipient' => '<recipient>'])]
public function getEditor($response, $request) {
if(!$this->canSendMessages)
return 403;
@ -198,7 +200,7 @@ class MessagesRoutes extends RouteHandler {
}
#[HttpGet('/messages/([A-Za-z0-9]+)')]
#[URLInfo('messages-view', '/messages/<message>')]
#[UrlFormat('messages-view', '/messages/<message>')]
public function getView($response, $request, string $messageId) {
if(strlen($messageId) !== 8)
return 404;
@ -328,7 +330,7 @@ class MessagesRoutes extends RouteHandler {
}
#[HttpPost('/messages/create')]
#[URLInfo('messages-create', '/messages/create')]
#[UrlFormat('messages-create', '/messages/create')]
public function postCreate($response, $request) {
if(!$request->isFormContent())
return 400;
@ -431,7 +433,7 @@ class MessagesRoutes extends RouteHandler {
}
#[HttpPost('/messages/([A-Za-z0-9]+)')]
#[URLInfo('messages-update', '/messages/<message>')]
#[UrlFormat('messages-update', '/messages/<message>')]
public function postUpdate($response, $request, string $messageId) {
if(!$request->isFormContent())
return 400;
@ -522,7 +524,7 @@ class MessagesRoutes extends RouteHandler {
}
#[HttpPost('/messages/mark')]
#[URLInfo('messages-mark', '/messages/mark')]
#[UrlFormat('messages-mark', '/messages/mark')]
public function postMark($response, $request) {
if(!$request->isFormContent())
return 400;
@ -553,7 +555,7 @@ class MessagesRoutes extends RouteHandler {
}
#[HttpPost('/messages/delete')]
#[URLInfo('messages-delete', '/messages/delete')]
#[UrlFormat('messages-delete', '/messages/delete')]
public function postDelete($response, $request) {
if(!$request->isFormContent())
return 400;
@ -580,7 +582,7 @@ class MessagesRoutes extends RouteHandler {
}
#[HttpPost('/messages/restore')]
#[URLInfo('messages-restore', '/messages/restore')]
#[UrlFormat('messages-restore', '/messages/restore')]
public function postRestore($response, $request) {
if(!$request->isFormContent())
return 400;
@ -607,7 +609,7 @@ class MessagesRoutes extends RouteHandler {
}
#[HttpPost('/messages/nuke')]
#[URLInfo('messages-nuke', '/messages/nuke')]
#[UrlFormat('messages-nuke', '/messages/nuke')]
public function postNuke($response, $request) {
if(!$request->isFormContent())
return 400;

34
src/MisuzuContext.php
View file

@ -13,14 +13,14 @@ use Misuzu\Messages\MessagesContext;
use Misuzu\News\News;
use Misuzu\Perms\Permissions;
use Misuzu\Profile\ProfileFields;
use Misuzu\URLs\URLRegistry;
use Misuzu\Users\{UsersContext,UserInfo};
use Aiwass\HmacVerificationProvider;
use Aiwass\Server\RpcServer;
use Index\Data\IDbConnection;
use Index\Data\Migration\{IDbMigrationRepo,DbMigrationManager,FsDbMigrationRepo};
use Sasae\SasaeEnvironment;
use Syokuhou\IConfig;
use Index\Config\Config;
use Index\Db\DbConnection;
use Index\Db\Migration\{DbMigrationManager,DbMigrationRepo,FsDbMigrationRepo};
use Index\Templating\TplEnvironment;
use Index\Urls\UrlRegistry;
// this class should function as the root for everything going forward
// no more magical static classes that are just kind of assumed to exist
@ -29,9 +29,9 @@ use Syokuhou\IConfig;
// dunno if i want null checks some maybe some kind of init func should be called first like is the case
// with the http shit
class MisuzuContext {
private IDbConnection $dbConn;
private IConfig $config;
private SasaeEnvironment $templating;
private DbConnection $dbConn;
private Config $config;
private TplEnvironment $templating;
private AuditLog $auditLog;
private Counters $counters;
@ -53,9 +53,9 @@ class MisuzuContext {
private SiteInfo $siteInfo;
// this probably shouldn't be available
private URLRegistry $urls;
private UrlRegistry $urls;
public function __construct(IDbConnection $dbConn, IConfig $config) {
public function __construct(DbConnection $dbConn, Config $config) {
$this->dbConn = $dbConn;
$this->config = $config;
@ -77,7 +77,7 @@ class MisuzuContext {
$this->profileFields = new ProfileFields($dbConn);
}
public function getDbConn(): IDbConnection {
public function getDbConn(): DbConnection {
return $this->dbConn;
}
@ -90,15 +90,15 @@ class MisuzuContext {
return new DbMigrationManager($this->dbConn, 'msz_' . DbMigrationManager::DEFAULT_TABLE);
}
public function createMigrationRepo(): IDbMigrationRepo {
public function createMigrationRepo(): DbMigrationRepo {
return new FsDbMigrationRepo(MSZ_MIGRATIONS);
}
public function getURLs(): URLRegistry {
public function getUrls(): UrlRegistry {
return $this->urls;
}
public function getConfig(): IConfig {
public function getConfig(): Config {
return $this->config;
}
@ -198,12 +198,12 @@ class MisuzuContext {
$globals['active_ban_info'] = $this->usersCtx->tryGetActiveBan($this->authInfo->getUserInfo());
$globals['display_timings_info'] = $isDebug || $this->authInfo->getPerms('global')->check(Perm::G_TIMINGS_VIEW);
$this->templating = new SasaeEnvironment(
$this->templating = new TplEnvironment(
MSZ_TEMPLATES,
cache: $isDebug ? null : ['Misuzu', GitInfo::hash(true)],
debug: $isDebug
);
$this->templating->addExtension(new MisuzuSasaeExtension($this));
$this->templating->addExtension(new TemplatingExtension($this));
$this->templating->addGlobal('globals', $globals);
Template::init($this->templating);
@ -212,7 +212,7 @@ class MisuzuContext {
public function createRouting(): RoutingContext {
$routingCtx = new RoutingContext();
$this->urls = $routingCtx->getURLs();
$this->urls = $routingCtx->getUrls();
$routingCtx->register(new \Misuzu\Home\HomeRoutes(
$this->config,

Some files were not shown because too many files have changed in this diff Show more