From 9bfbd48989f3a1727f1f9ac759e295c333a06659 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Nov 2023 09:51:51 +0000 Subject: [PATCH 01/29] build(deps): Bump web-auth/webauthn-lib from 4.7.3 to 4.7.4 Bumps [web-auth/webauthn-lib](https://github.com/web-auth/webauthn-lib) from 4.7.3 to 4.7.4. - [Commits](https://github.com/web-auth/webauthn-lib/compare/4.7.3...4.7.4) --- updated-dependencies: - dependency-name: web-auth/webauthn-lib dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.lock | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/composer.lock b/composer.lock index 3bcf7177..aeed8a73 100644 --- a/composer.lock +++ b/composer.lock @@ -7585,16 +7585,16 @@ }, { "name": "symfony/uid", - "version": "v6.3.0", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/uid.git", - "reference": "01b0f20b1351d997711c56f1638f7a8c3061e384" + "reference": "819fa5ac210fb7ddda4752b91a82f50be7493dd9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/uid/zipball/01b0f20b1351d997711c56f1638f7a8c3061e384", - "reference": "01b0f20b1351d997711c56f1638f7a8c3061e384", + "url": "https://api.github.com/repos/symfony/uid/zipball/819fa5ac210fb7ddda4752b91a82f50be7493dd9", + "reference": "819fa5ac210fb7ddda4752b91a82f50be7493dd9", "shasum": "" }, "require": { @@ -7639,7 +7639,7 @@ "uuid" ], "support": { - "source": "https://github.com/symfony/uid/tree/v6.3.0" + "source": "https://github.com/symfony/uid/tree/v6.3.8" }, "funding": [ { @@ -7655,7 +7655,7 @@ "type": "tidelift" } ], - "time": "2023-04-08T07:25:02+00:00" + "time": "2023-10-31T08:07:48+00:00" }, { "name": "symfony/var-dumper", @@ -8037,7 +8037,7 @@ }, { "name": "web-auth/metadata-service", - "version": "4.7.3", + "version": "4.7.4", "source": { "type": "git", "url": "https://github.com/web-auth/webauthn-metadata-service.git", @@ -8102,7 +8102,7 @@ "webauthn" ], "support": { - "source": "https://github.com/web-auth/webauthn-metadata-service/tree/4.7.3" + "source": "https://github.com/web-auth/webauthn-metadata-service/tree/4.7.4" }, "funding": [ { @@ -8118,16 +8118,16 @@ }, { "name": "web-auth/webauthn-lib", - "version": "4.7.3", + "version": "4.7.4", "source": { "type": "git", "url": "https://github.com/web-auth/webauthn-lib.git", - "reference": "d9b0d0563c561eaec5c24c46a551bf8ff23a030b" + "reference": "944f70e4c578d44d496f8a12299a4d89bf58e3bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/web-auth/webauthn-lib/zipball/d9b0d0563c561eaec5c24c46a551bf8ff23a030b", - "reference": "d9b0d0563c561eaec5c24c46a551bf8ff23a030b", + "url": "https://api.github.com/repos/web-auth/webauthn-lib/zipball/944f70e4c578d44d496f8a12299a4d89bf58e3bb", + "reference": "944f70e4c578d44d496f8a12299a4d89bf58e3bb", "shasum": "" }, "require": { @@ -8190,7 +8190,7 @@ "webauthn" ], "support": { - "source": "https://github.com/web-auth/webauthn-lib/tree/4.7.3" + "source": "https://github.com/web-auth/webauthn-lib/tree/4.7.4" }, "funding": [ { @@ -8202,7 +8202,7 @@ "type": "patreon" } ], - "time": "2023-10-15T11:54:31+00:00" + "time": "2023-11-12T07:41:19+00:00" }, { "name": "webmozart/assert", From 5f2105071e88bd10995a3e8db223898b23ee1348 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Nov 2023 10:15:21 +0000 Subject: [PATCH 02/29] build(deps-dev): Bump openai-php/client from 0.7.8 to 0.7.9 Bumps [openai-php/client](https://github.com/openai-php/client) from 0.7.8 to 0.7.9. - [Release notes](https://github.com/openai-php/client/releases) - [Changelog](https://github.com/openai-php/client/blob/main/CHANGELOG.md) - [Commits](https://github.com/openai-php/client/compare/v0.7.8...v0.7.9) --- updated-dependencies: - dependency-name: openai-php/client dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index aeed8a73..3dc19e14 100644 --- a/composer.lock +++ b/composer.lock @@ -10315,16 +10315,16 @@ }, { "name": "openai-php/client", - "version": "v0.7.8", + "version": "v0.7.9", "source": { "type": "git", "url": "https://github.com/openai-php/client.git", - "reference": "646fb247c1e4f33e6311f62bbfa4e81100881cb9" + "reference": "828096beba2690879eb218763ec121186d91fb80" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/openai-php/client/zipball/646fb247c1e4f33e6311f62bbfa4e81100881cb9", - "reference": "646fb247c1e4f33e6311f62bbfa4e81100881cb9", + "url": "https://api.github.com/repos/openai-php/client/zipball/828096beba2690879eb218763ec121186d91fb80", + "reference": "828096beba2690879eb218763ec121186d91fb80", "shasum": "" }, "require": { @@ -10387,7 +10387,7 @@ ], "support": { "issues": "https://github.com/openai-php/client/issues", - "source": "https://github.com/openai-php/client/tree/v0.7.8" + "source": "https://github.com/openai-php/client/tree/v0.7.9" }, "funding": [ { @@ -10403,7 +10403,7 @@ "type": "github" } ], - "time": "2023-11-07T16:13:43+00:00" + "time": "2023-11-14T08:48:28+00:00" }, { "name": "orchestra/canvas", From a8e86da79e8e1612fb3bb537ca4022406e158fc2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Nov 2023 09:54:48 +0000 Subject: [PATCH 03/29] build(deps): Bump laravel/framework from 10.31.0 to 10.32.1 Bumps [laravel/framework](https://github.com/laravel/framework) from 10.31.0 to 10.32.1. - [Release notes](https://github.com/laravel/framework/releases) - [Changelog](https://github.com/laravel/framework/blob/10.x/CHANGELOG.md) - [Commits](https://github.com/laravel/framework/compare/v10.31.0...v10.32.1) --- updated-dependencies: - dependency-name: laravel/framework dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- composer.lock | 142 +++++++++++++++++++++++++------------------------- 1 file changed, 71 insertions(+), 71 deletions(-) diff --git a/composer.lock b/composer.lock index 3dc19e14..38f92fda 100644 --- a/composer.lock +++ b/composer.lock @@ -951,24 +951,24 @@ }, { "name": "graham-campbell/result-type", - "version": "v1.1.1", + "version": "v1.1.2", "source": { "type": "git", "url": "https://github.com/GrahamCampbell/Result-Type.git", - "reference": "672eff8cf1d6fe1ef09ca0f89c4b287d6a3eb831" + "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/672eff8cf1d6fe1ef09ca0f89c4b287d6a3eb831", - "reference": "672eff8cf1d6fe1ef09ca0f89c4b287d6a3eb831", + "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/fbd48bce38f73f8a4ec8583362e732e4095e5862", + "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862", "shasum": "" }, "require": { "php": "^7.2.5 || ^8.0", - "phpoption/phpoption": "^1.9.1" + "phpoption/phpoption": "^1.9.2" }, "require-dev": { - "phpunit/phpunit": "^8.5.32 || ^9.6.3 || ^10.0.12" + "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2" }, "type": "library", "autoload": { @@ -997,7 +997,7 @@ ], "support": { "issues": "https://github.com/GrahamCampbell/Result-Type/issues", - "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.1" + "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.2" }, "funding": [ { @@ -1009,7 +1009,7 @@ "type": "tidelift" } ], - "time": "2023-02-25T20:23:15+00:00" + "time": "2023-11-12T22:16:48+00:00" }, { "name": "guzzlehttp/guzzle", @@ -1818,16 +1818,16 @@ }, { "name": "laravel/framework", - "version": "v10.31.0", + "version": "v10.32.1", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "507ce9b28bce4b5e4140c28943092ca38e9a52e4" + "reference": "b30e44f20d244f7ba125283e14a8bbac167f4e5b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/507ce9b28bce4b5e4140c28943092ca38e9a52e4", - "reference": "507ce9b28bce4b5e4140c28943092ca38e9a52e4", + "url": "https://api.github.com/repos/laravel/framework/zipball/b30e44f20d244f7ba125283e14a8bbac167f4e5b", + "reference": "b30e44f20d244f7ba125283e14a8bbac167f4e5b", "shasum": "" }, "require": { @@ -1928,7 +1928,7 @@ "league/flysystem-sftp-v3": "^3.0", "mockery/mockery": "^1.5.1", "nyholm/psr7": "^1.2", - "orchestra/testbench-core": "^8.12", + "orchestra/testbench-core": "^8.15.1", "pda/pheanstalk": "^4.0", "phpstan/phpstan": "^1.4.7", "phpunit/phpunit": "^10.0.7", @@ -2016,7 +2016,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2023-11-07T13:48:30+00:00" + "time": "2023-11-14T22:57:08+00:00" }, { "name": "laravel/horizon", @@ -2296,16 +2296,16 @@ }, { "name": "laravel/serializable-closure", - "version": "v1.3.2", + "version": "v1.3.3", "source": { "type": "git", "url": "https://github.com/laravel/serializable-closure.git", - "reference": "076fe2cf128bd54b4341cdc6d49b95b34e101e4c" + "reference": "3dbf8a8e914634c48d389c1234552666b3d43754" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/076fe2cf128bd54b4341cdc6d49b95b34e101e4c", - "reference": "076fe2cf128bd54b4341cdc6d49b95b34e101e4c", + "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/3dbf8a8e914634c48d389c1234552666b3d43754", + "reference": "3dbf8a8e914634c48d389c1234552666b3d43754", "shasum": "" }, "require": { @@ -2352,7 +2352,7 @@ "issues": "https://github.com/laravel/serializable-closure/issues", "source": "https://github.com/laravel/serializable-closure" }, - "time": "2023-10-17T13:38:16+00:00" + "time": "2023-11-08T14:08:06+00:00" }, { "name": "laravel/tinker", @@ -3999,16 +3999,16 @@ }, { "name": "phpoption/phpoption", - "version": "1.9.1", + "version": "1.9.2", "source": { "type": "git", "url": "https://github.com/schmittjoh/php-option.git", - "reference": "dd3a383e599f49777d8b628dadbb90cae435b87e" + "reference": "80735db690fe4fc5c76dfa7f9b770634285fa820" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/dd3a383e599f49777d8b628dadbb90cae435b87e", - "reference": "dd3a383e599f49777d8b628dadbb90cae435b87e", + "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/80735db690fe4fc5c76dfa7f9b770634285fa820", + "reference": "80735db690fe4fc5c76dfa7f9b770634285fa820", "shasum": "" }, "require": { @@ -4016,7 +4016,7 @@ }, "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", - "phpunit/phpunit": "^8.5.32 || ^9.6.3 || ^10.0.12" + "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2" }, "type": "library", "extra": { @@ -4058,7 +4058,7 @@ ], "support": { "issues": "https://github.com/schmittjoh/php-option/issues", - "source": "https://github.com/schmittjoh/php-option/tree/1.9.1" + "source": "https://github.com/schmittjoh/php-option/tree/1.9.2" }, "funding": [ { @@ -4070,7 +4070,7 @@ "type": "tidelift" } ], - "time": "2023-02-25T19:38:58+00:00" + "time": "2023-11-12T21:59:55+00:00" }, { "name": "psr/clock", @@ -5423,16 +5423,16 @@ }, { "name": "symfony/console", - "version": "v6.3.4", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "eca495f2ee845130855ddf1cf18460c38966c8b6" + "reference": "0d14a9f6d04d4ac38a8cea1171f4554e325dae92" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/eca495f2ee845130855ddf1cf18460c38966c8b6", - "reference": "eca495f2ee845130855ddf1cf18460c38966c8b6", + "url": "https://api.github.com/repos/symfony/console/zipball/0d14a9f6d04d4ac38a8cea1171f4554e325dae92", + "reference": "0d14a9f6d04d4ac38a8cea1171f4554e325dae92", "shasum": "" }, "require": { @@ -5493,7 +5493,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.3.4" + "source": "https://github.com/symfony/console/tree/v6.3.8" }, "funding": [ { @@ -5509,7 +5509,7 @@ "type": "tidelift" } ], - "time": "2023-08-16T10:10:12+00:00" + "time": "2023-10-31T08:09:35+00:00" }, { "name": "symfony/css-selector", @@ -6008,16 +6008,16 @@ }, { "name": "symfony/http-foundation", - "version": "v6.3.7", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "59d1837d5d992d16c2628cd0d6b76acf8d69b33e" + "reference": "ce332676de1912c4389222987193c3ef38033df6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/59d1837d5d992d16c2628cd0d6b76acf8d69b33e", - "reference": "59d1837d5d992d16c2628cd0d6b76acf8d69b33e", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/ce332676de1912c4389222987193c3ef38033df6", + "reference": "ce332676de1912c4389222987193c3ef38033df6", "shasum": "" }, "require": { @@ -6065,7 +6065,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v6.3.7" + "source": "https://github.com/symfony/http-foundation/tree/v6.3.8" }, "funding": [ { @@ -6081,20 +6081,20 @@ "type": "tidelift" } ], - "time": "2023-10-28T23:55:27+00:00" + "time": "2023-11-07T10:17:15+00:00" }, { "name": "symfony/http-kernel", - "version": "v6.3.7", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "6d4098095f93279d9536a0e9124439560cc764d0" + "reference": "929202375ccf44a309c34aeca8305408442ebcc1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/6d4098095f93279d9536a0e9124439560cc764d0", - "reference": "6d4098095f93279d9536a0e9124439560cc764d0", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/929202375ccf44a309c34aeca8305408442ebcc1", + "reference": "929202375ccf44a309c34aeca8305408442ebcc1", "shasum": "" }, "require": { @@ -6178,7 +6178,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v6.3.7" + "source": "https://github.com/symfony/http-kernel/tree/v6.3.8" }, "funding": [ { @@ -6194,7 +6194,7 @@ "type": "tidelift" } ], - "time": "2023-10-29T14:31:45+00:00" + "time": "2023-11-10T13:47:32+00:00" }, { "name": "symfony/mailer", @@ -7326,16 +7326,16 @@ }, { "name": "symfony/string", - "version": "v6.3.5", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339" + "reference": "13880a87790c76ef994c91e87efb96134522577a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/13d76d0fb049051ed12a04bef4f9de8715bea339", - "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339", + "url": "https://api.github.com/repos/symfony/string/zipball/13880a87790c76ef994c91e87efb96134522577a", + "reference": "13880a87790c76ef994c91e87efb96134522577a", "shasum": "" }, "require": { @@ -7392,7 +7392,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.3.5" + "source": "https://github.com/symfony/string/tree/v6.3.8" }, "funding": [ { @@ -7408,7 +7408,7 @@ "type": "tidelift" } ], - "time": "2023-09-18T10:38:32+00:00" + "time": "2023-11-09T08:28:21+00:00" }, { "name": "symfony/translation", @@ -7659,16 +7659,16 @@ }, { "name": "symfony/var-dumper", - "version": "v6.3.6", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "999ede244507c32b8e43aebaa10e9fce20de7c97" + "reference": "81acabba9046550e89634876ca64bfcd3c06aa0a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/999ede244507c32b8e43aebaa10e9fce20de7c97", - "reference": "999ede244507c32b8e43aebaa10e9fce20de7c97", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/81acabba9046550e89634876ca64bfcd3c06aa0a", + "reference": "81acabba9046550e89634876ca64bfcd3c06aa0a", "shasum": "" }, "require": { @@ -7723,7 +7723,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.3.6" + "source": "https://github.com/symfony/var-dumper/tree/v6.3.8" }, "funding": [ { @@ -7739,7 +7739,7 @@ "type": "tidelift" } ], - "time": "2023-10-12T18:45:56+00:00" + "time": "2023-11-08T10:42:36+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -7796,31 +7796,31 @@ }, { "name": "vlucas/phpdotenv", - "version": "v5.5.0", + "version": "v5.6.0", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "1a7ea2afc49c3ee6d87061f5a233e3a035d0eae7" + "reference": "2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/1a7ea2afc49c3ee6d87061f5a233e3a035d0eae7", - "reference": "1a7ea2afc49c3ee6d87061f5a233e3a035d0eae7", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4", + "reference": "2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4", "shasum": "" }, "require": { "ext-pcre": "*", - "graham-campbell/result-type": "^1.0.2", - "php": "^7.1.3 || ^8.0", - "phpoption/phpoption": "^1.8", - "symfony/polyfill-ctype": "^1.23", - "symfony/polyfill-mbstring": "^1.23.1", - "symfony/polyfill-php80": "^1.23.1" + "graham-campbell/result-type": "^1.1.2", + "php": "^7.2.5 || ^8.0", + "phpoption/phpoption": "^1.9.2", + "symfony/polyfill-ctype": "^1.24", + "symfony/polyfill-mbstring": "^1.24", + "symfony/polyfill-php80": "^1.24" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.4.1", + "bamarni/composer-bin-plugin": "^1.8.2", "ext-filter": "*", - "phpunit/phpunit": "^7.5.20 || ^8.5.30 || ^9.5.25" + "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2" }, "suggest": { "ext-filter": "Required to use the boolean validator." @@ -7832,7 +7832,7 @@ "forward-command": true }, "branch-alias": { - "dev-master": "5.5-dev" + "dev-master": "5.6-dev" } }, "autoload": { @@ -7864,7 +7864,7 @@ ], "support": { "issues": "https://github.com/vlucas/phpdotenv/issues", - "source": "https://github.com/vlucas/phpdotenv/tree/v5.5.0" + "source": "https://github.com/vlucas/phpdotenv/tree/v5.6.0" }, "funding": [ { @@ -7876,7 +7876,7 @@ "type": "tidelift" } ], - "time": "2022-10-16T01:01:54+00:00" + "time": "2023-11-12T22:43:29+00:00" }, { "name": "voku/portable-ascii", From c58f481b0f879aff692296d27c205763bc8f02c4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Nov 2023 18:19:02 +0000 Subject: [PATCH 04/29] build(deps-dev): Bump laravel/dusk from 7.11.3 to 7.11.4 Bumps [laravel/dusk](https://github.com/laravel/dusk) from 7.11.3 to 7.11.4. - [Release notes](https://github.com/laravel/dusk/releases) - [Changelog](https://github.com/laravel/dusk/blob/7.x/CHANGELOG.md) - [Commits](https://github.com/laravel/dusk/compare/v7.11.3...v7.11.4) --- updated-dependencies: - dependency-name: laravel/dusk dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.lock | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/composer.lock b/composer.lock index 38f92fda..9f3e6b32 100644 --- a/composer.lock +++ b/composer.lock @@ -5578,7 +5578,7 @@ }, { "name": "symfony/deprecation-contracts", - "version": "v3.3.0", + "version": "v3.4.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", @@ -5625,7 +5625,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.3.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0" }, "funding": [ { @@ -5799,7 +5799,7 @@ }, { "name": "symfony/event-dispatcher-contracts", - "version": "v3.3.0", + "version": "v3.4.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", @@ -5855,7 +5855,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.3.0" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.4.0" }, "funding": [ { @@ -7244,16 +7244,16 @@ }, { "name": "symfony/service-contracts", - "version": "v3.3.0", + "version": "v3.4.0", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "40da9cc13ec349d9e4966ce18b5fbcd724ab10a4" + "reference": "b3313c2dbffaf71c8de2934e2ea56ed2291a3838" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/40da9cc13ec349d9e4966ce18b5fbcd724ab10a4", - "reference": "40da9cc13ec349d9e4966ce18b5fbcd724ab10a4", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/b3313c2dbffaf71c8de2934e2ea56ed2291a3838", + "reference": "b3313c2dbffaf71c8de2934e2ea56ed2291a3838", "shasum": "" }, "require": { @@ -7306,7 +7306,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v3.3.0" + "source": "https://github.com/symfony/service-contracts/tree/v3.4.0" }, "funding": [ { @@ -7322,7 +7322,7 @@ "type": "tidelift" } ], - "time": "2023-05-23T14:45:45+00:00" + "time": "2023-07-30T20:28:31+00:00" }, { "name": "symfony/string", @@ -7507,16 +7507,16 @@ }, { "name": "symfony/translation-contracts", - "version": "v3.3.0", + "version": "v3.4.0", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "02c24deb352fb0d79db5486c0c79905a85e37e86" + "reference": "dee0c6e5b4c07ce851b462530088e64b255ac9c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/02c24deb352fb0d79db5486c0c79905a85e37e86", - "reference": "02c24deb352fb0d79db5486c0c79905a85e37e86", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/dee0c6e5b4c07ce851b462530088e64b255ac9c5", + "reference": "dee0c6e5b4c07ce851b462530088e64b255ac9c5", "shasum": "" }, "require": { @@ -7565,7 +7565,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/translation-contracts/tree/v3.3.0" + "source": "https://github.com/symfony/translation-contracts/tree/v3.4.0" }, "funding": [ { @@ -7581,7 +7581,7 @@ "type": "tidelift" } ], - "time": "2023-05-30T17:17:10+00:00" + "time": "2023-07-25T15:08:44+00:00" }, { "name": "symfony/uid", @@ -9751,16 +9751,16 @@ }, { "name": "laravel/dusk", - "version": "v7.11.3", + "version": "v7.11.4", "source": { "type": "git", "url": "https://github.com/laravel/dusk.git", - "reference": "ef474f54ab24989f480c77ba92dc39d07d499dee" + "reference": "99df89ae46cdc197c2e0242ce45b96e5d7633a7b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/dusk/zipball/ef474f54ab24989f480c77ba92dc39d07d499dee", - "reference": "ef474f54ab24989f480c77ba92dc39d07d499dee", + "url": "https://api.github.com/repos/laravel/dusk/zipball/99df89ae46cdc197c2e0242ce45b96e5d7633a7b", + "reference": "99df89ae46cdc197c2e0242ce45b96e5d7633a7b", "shasum": "" }, "require": { @@ -9821,9 +9821,9 @@ ], "support": { "issues": "https://github.com/laravel/dusk/issues", - "source": "https://github.com/laravel/dusk/tree/v7.11.3" + "source": "https://github.com/laravel/dusk/tree/v7.11.4" }, - "time": "2023-10-17T13:53:17+00:00" + "time": "2023-11-14T15:14:47+00:00" }, { "name": "laravel/pint", From 3e058367e6202a2e86cb010da63e1219db9e34c8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Nov 2023 18:22:55 +0000 Subject: [PATCH 05/29] build(deps-dev): Bump openai-php/client from 0.7.9 to 0.7.10 Bumps [openai-php/client](https://github.com/openai-php/client) from 0.7.9 to 0.7.10. - [Release notes](https://github.com/openai-php/client/releases) - [Changelog](https://github.com/openai-php/client/blob/main/CHANGELOG.md) - [Commits](https://github.com/openai-php/client/compare/v0.7.9...v0.7.10) --- updated-dependencies: - dependency-name: openai-php/client dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 9f3e6b32..8126e4f0 100644 --- a/composer.lock +++ b/composer.lock @@ -10315,16 +10315,16 @@ }, { "name": "openai-php/client", - "version": "v0.7.9", + "version": "v0.7.10", "source": { "type": "git", "url": "https://github.com/openai-php/client.git", - "reference": "828096beba2690879eb218763ec121186d91fb80" + "reference": "f9af25d7d7bd8e58f60ada6c30f1c93d65c73833" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/openai-php/client/zipball/828096beba2690879eb218763ec121186d91fb80", - "reference": "828096beba2690879eb218763ec121186d91fb80", + "url": "https://api.github.com/repos/openai-php/client/zipball/f9af25d7d7bd8e58f60ada6c30f1c93d65c73833", + "reference": "f9af25d7d7bd8e58f60ada6c30f1c93d65c73833", "shasum": "" }, "require": { @@ -10387,7 +10387,7 @@ ], "support": { "issues": "https://github.com/openai-php/client/issues", - "source": "https://github.com/openai-php/client/tree/v0.7.9" + "source": "https://github.com/openai-php/client/tree/v0.7.10" }, "funding": [ { @@ -10403,7 +10403,7 @@ "type": "github" } ], - "time": "2023-11-14T08:48:28+00:00" + "time": "2023-11-14T13:39:26+00:00" }, { "name": "orchestra/canvas", From e9c014d7688ba162e19f8268adcbf908faa614ba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Nov 2023 18:25:09 +0000 Subject: [PATCH 06/29] build(deps-dev): Bump phpunit/php-code-coverage from 10.1.7 to 10.1.8 Bumps [phpunit/php-code-coverage](https://github.com/sebastianbergmann/php-code-coverage) from 10.1.7 to 10.1.8. - [Changelog](https://github.com/sebastianbergmann/php-code-coverage/blob/main/ChangeLog-10.1.md) - [Commits](https://github.com/sebastianbergmann/php-code-coverage/compare/10.1.7...10.1.8) --- updated-dependencies: - dependency-name: phpunit/php-code-coverage dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 8126e4f0..73f7f5cb 100644 --- a/composer.lock +++ b/composer.lock @@ -11285,16 +11285,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "10.1.7", + "version": "10.1.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "355324ca4980b8916c18b9db29f3ef484078f26e" + "reference": "84838eed9ded511f61dc3e8b5944a52d9017b297" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/355324ca4980b8916c18b9db29f3ef484078f26e", - "reference": "355324ca4980b8916c18b9db29f3ef484078f26e", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/84838eed9ded511f61dc3e8b5944a52d9017b297", + "reference": "84838eed9ded511f61dc3e8b5944a52d9017b297", "shasum": "" }, "require": { @@ -11351,7 +11351,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.7" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.8" }, "funding": [ { @@ -11359,7 +11359,7 @@ "type": "github" } ], - "time": "2023-10-04T15:34:17+00:00" + "time": "2023-11-15T13:31:15+00:00" }, { "name": "phpunit/php-file-iterator", From 05c63b241d27a4929ce37f852165e6a88bb5b570 Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Sun, 19 Nov 2023 17:22:02 +0000 Subject: [PATCH 07/29] feat: Refactor mention rendering and generator classes - Add support for Mastodon username mentions - Add test for parsing Mastodon usernames in notes - Modify namespace and class imports for `MentionGenerator` and `MentionRenderer` in `Note.php` - Rename `ContactMentionGenerator.php` to `MentionGenerator.php` --- ...tionGenerator.php => MentionGenerator.php} | 2 +- .../Renderers/ContactMentionRenderer.php | 24 ------------ app/CommonMark/Renderers/MentionRenderer.php | 37 +++++++++++++++++++ app/Models/Note.php | 12 +++--- tests/Unit/NotesTest.php | 11 ++++++ 5 files changed, 55 insertions(+), 31 deletions(-) rename app/CommonMark/Generators/{ContactMentionGenerator.php => MentionGenerator.php} (84%) delete mode 100644 app/CommonMark/Renderers/ContactMentionRenderer.php create mode 100644 app/CommonMark/Renderers/MentionRenderer.php diff --git a/app/CommonMark/Generators/ContactMentionGenerator.php b/app/CommonMark/Generators/MentionGenerator.php similarity index 84% rename from app/CommonMark/Generators/ContactMentionGenerator.php rename to app/CommonMark/Generators/MentionGenerator.php index 507f2a0f..2ac1a797 100644 --- a/app/CommonMark/Generators/ContactMentionGenerator.php +++ b/app/CommonMark/Generators/MentionGenerator.php @@ -8,7 +8,7 @@ use League\CommonMark\Extension\Mention\Generator\MentionGeneratorInterface; use League\CommonMark\Extension\Mention\Mention; use League\CommonMark\Node\Inline\AbstractInline; -class ContactMentionGenerator implements MentionGeneratorInterface +class MentionGenerator implements MentionGeneratorInterface { public function generateMention(Mention $mention): ?AbstractInline { diff --git a/app/CommonMark/Renderers/ContactMentionRenderer.php b/app/CommonMark/Renderers/ContactMentionRenderer.php deleted file mode 100644 index f227f121..00000000 --- a/app/CommonMark/Renderers/ContactMentionRenderer.php +++ /dev/null @@ -1,24 +0,0 @@ -getIdentifier())->first(); - - if ($contact === null) { - return '@' . $node->getIdentifier() . ''; - } - - return trim(view('templates.mini-hcard', ['contact' => $contact])->render()); - } -} diff --git a/app/CommonMark/Renderers/MentionRenderer.php b/app/CommonMark/Renderers/MentionRenderer.php new file mode 100644 index 00000000..d970fac8 --- /dev/null +++ b/app/CommonMark/Renderers/MentionRenderer.php @@ -0,0 +1,37 @@ +getIdentifier())->first(); + + // If we have a contact, render a mini-hcard + if ($contact) { + // rendering a blade template to a string, so can’t be an HtmlElement + return trim(view('templates.mini-hcard', ['contact' => $contact])->render()); + } + + // Otherwise, check the link is to the Mastodon profile + $mentionText = $node->getIdentifier(); + $parts = explode('@', $mentionText); + + // This is not [@]handle@instance, so return a Twitter link + if (count($parts) === 1) { + return new HtmlElement('a', ['href' => 'https://twitter.com/' . $parts[0]], '@' . $mentionText); + } + + // Render the Mastodon profile link + return new HtmlElement('a', ['href' => 'https://' . $parts[1] . '/@' . $parts[0]], '@' . $mentionText); + } +} diff --git a/app/Models/Note.php b/app/Models/Note.php index 99f2e193..39d0c5e1 100644 --- a/app/Models/Note.php +++ b/app/Models/Note.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace App\Models; -use App\CommonMark\Generators\ContactMentionGenerator; -use App\CommonMark\Renderers\ContactMentionRenderer; +use App\CommonMark\Generators\MentionGenerator; +use App\CommonMark\Renderers\MentionRenderer; use Codebird\Codebird; use Exception; use GuzzleHttp\Client; @@ -385,10 +385,10 @@ class Note extends Model { $config = [ 'mentions' => [ - 'contacts_handle' => [ + 'mentions_handle' => [ 'prefix' => '@', - 'pattern' => '[a-z\d](?:[a-z\d]|-(?=[a-z\d])){0,38}(?!\w)', - 'generator' => new ContactMentionGenerator(), + 'pattern' => '([\w@.])+(\b)', + 'generator' => new MentionGenerator(), ], ], ]; @@ -397,7 +397,7 @@ class Note extends Model $environment->addExtension(new CommonMarkCoreExtension()); $environment->addExtension(new AutolinkExtension()); $environment->addExtension(new MentionExtension()); - $environment->addRenderer(Mention::class, new ContactMentionRenderer()); + $environment->addRenderer(Mention::class, new MentionRenderer()); $environment->addRenderer(FencedCode::class, new FencedCodeRenderer()); $environment->addRenderer(IndentedCode::class, new IndentedCodeRenderer()); $markdownConverter = new MarkdownConverter($environment); diff --git a/tests/Unit/NotesTest.php b/tests/Unit/NotesTest.php index 990fe076..b252f416 100644 --- a/tests/Unit/NotesTest.php +++ b/tests/Unit/NotesTest.php @@ -437,4 +437,15 @@ class NotesTest extends TestCase $this->assertSame('Antarctica', $note->address); } + + /** @test */ + public function mastodonUsernamesAreParsedCorrectly(): void + { + $expected = '

Hi @freekmurze@phpc.social how are you?

' . PHP_EOL; + $note = Note::factory()->create([ + 'note' => 'Hi @freekmurze@phpc.social how are you?', + ]); + + $this->assertSame($expected, $note->note); + } } From ebc425ad94ded44b7b83681577471cafaabb62d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 09:13:28 +0000 Subject: [PATCH 08/29] build(deps-dev): Bump eslint from 8.53.0 to 8.54.0 Bumps [eslint](https://github.com/eslint/eslint) from 8.53.0 to 8.54.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v8.53.0...v8.54.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 30 +++++++++++++++--------------- package.json | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index d554f9d7..0de29566 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ "compression-webpack-plugin": "^10.0.0", "css-loader": "^6.8.1", "cssnano": "^6.0.1", - "eslint": "^8.53.0", + "eslint": "^8.54.0", "eslint-webpack-plugin": "^4.0.1", "mini-css-extract-plugin": "^2.7.6", "postcss": "^8.4.31", @@ -2032,9 +2032,9 @@ } }, "node_modules/@eslint/js": { - "version": "8.53.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.53.0.tgz", - "integrity": "sha512-Kn7K8dx/5U6+cT1yEhpX1w4PCSg0M+XyRILPgvwcEBjerFWCwQj5sbr3/VmxqV0JGHCBCzyd6LxypEuehypY1w==", + "version": "8.54.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.54.0.tgz", + "integrity": "sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -3623,15 +3623,15 @@ } }, "node_modules/eslint": { - "version": "8.53.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.53.0.tgz", - "integrity": "sha512-N4VuiPjXDUa4xVeV/GC/RV3hQW9Nw+Y463lkWaKKXKYMvmRiRDAtfpuPFLN+E1/6ZhyR8J2ig+eVREnYgUsiag==", + "version": "8.54.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.54.0.tgz", + "integrity": "sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", "@eslint/eslintrc": "^2.1.3", - "@eslint/js": "8.53.0", + "@eslint/js": "8.54.0", "@humanwhocodes/config-array": "^0.11.13", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", @@ -8875,9 +8875,9 @@ } }, "@eslint/js": { - "version": "8.53.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.53.0.tgz", - "integrity": "sha512-Kn7K8dx/5U6+cT1yEhpX1w4PCSg0M+XyRILPgvwcEBjerFWCwQj5sbr3/VmxqV0JGHCBCzyd6LxypEuehypY1w==", + "version": "8.54.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.54.0.tgz", + "integrity": "sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==", "dev": true }, "@humanwhocodes/config-array": { @@ -10067,15 +10067,15 @@ "dev": true }, "eslint": { - "version": "8.53.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.53.0.tgz", - "integrity": "sha512-N4VuiPjXDUa4xVeV/GC/RV3hQW9Nw+Y463lkWaKKXKYMvmRiRDAtfpuPFLN+E1/6ZhyR8J2ig+eVREnYgUsiag==", + "version": "8.54.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.54.0.tgz", + "integrity": "sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==", "dev": true, "requires": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", "@eslint/eslintrc": "^2.1.3", - "@eslint/js": "8.53.0", + "@eslint/js": "8.54.0", "@humanwhocodes/config-array": "^0.11.13", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", diff --git a/package.json b/package.json index 3cca8aa1..4605caa4 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "compression-webpack-plugin": "^10.0.0", "css-loader": "^6.8.1", "cssnano": "^6.0.1", - "eslint": "^8.53.0", + "eslint": "^8.54.0", "eslint-webpack-plugin": "^4.0.1", "mini-css-extract-plugin": "^2.7.6", "postcss": "^8.4.31", From 51bc74750187fe200eb4a63871873b92bf64bc15 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 17:13:50 +0000 Subject: [PATCH 09/29] build(deps): Bump web-auth/webauthn-lib from 4.7.4 to 4.7.7 Bumps [web-auth/webauthn-lib](https://github.com/web-auth/webauthn-lib) from 4.7.4 to 4.7.7. - [Commits](https://github.com/web-auth/webauthn-lib/compare/4.7.4...4.7.7) --- updated-dependencies: - dependency-name: web-auth/webauthn-lib dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.lock | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/composer.lock b/composer.lock index 73f7f5cb..7623b3ed 100644 --- a/composer.lock +++ b/composer.lock @@ -2425,34 +2425,34 @@ }, { "name": "lcobucci/clock", - "version": "3.1.0", + "version": "3.2.0", "source": { "type": "git", "url": "https://github.com/lcobucci/clock.git", - "reference": "30a854ceb22bd87d83a7a4563b3f6312453945fc" + "reference": "6f28b826ea01306b07980cb8320ab30b966cd715" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/lcobucci/clock/zipball/30a854ceb22bd87d83a7a4563b3f6312453945fc", - "reference": "30a854ceb22bd87d83a7a4563b3f6312453945fc", + "url": "https://api.github.com/repos/lcobucci/clock/zipball/6f28b826ea01306b07980cb8320ab30b966cd715", + "reference": "6f28b826ea01306b07980cb8320ab30b966cd715", "shasum": "" }, "require": { - "php": "~8.2.0", + "php": "~8.2.0 || ~8.3.0", "psr/clock": "^1.0" }, "provide": { "psr/clock-implementation": "1.0" }, "require-dev": { - "infection/infection": "^0.26", - "lcobucci/coding-standard": "^10.0.0", - "phpstan/extension-installer": "^1.2", - "phpstan/phpstan": "^1.10.7", + "infection/infection": "^0.27", + "lcobucci/coding-standard": "^11.0.0", + "phpstan/extension-installer": "^1.3.1", + "phpstan/phpstan": "^1.10.25", "phpstan/phpstan-deprecation-rules": "^1.1.3", - "phpstan/phpstan-phpunit": "^1.3.10", - "phpstan/phpstan-strict-rules": "^1.5.0", - "phpunit/phpunit": "^10.0.17" + "phpstan/phpstan-phpunit": "^1.3.13", + "phpstan/phpstan-strict-rules": "^1.5.1", + "phpunit/phpunit": "^10.2.3" }, "type": "library", "autoload": { @@ -2473,7 +2473,7 @@ "description": "Yet another clock abstraction", "support": { "issues": "https://github.com/lcobucci/clock/issues", - "source": "https://github.com/lcobucci/clock/tree/3.1.0" + "source": "https://github.com/lcobucci/clock/tree/3.2.0" }, "funding": [ { @@ -2485,7 +2485,7 @@ "type": "patreon" } ], - "time": "2023-03-20T19:12:25+00:00" + "time": "2023-11-17T17:00:27+00:00" }, { "name": "lcobucci/jwt", @@ -8037,7 +8037,7 @@ }, { "name": "web-auth/metadata-service", - "version": "4.7.4", + "version": "4.7.7", "source": { "type": "git", "url": "https://github.com/web-auth/webauthn-metadata-service.git", @@ -8102,7 +8102,7 @@ "webauthn" ], "support": { - "source": "https://github.com/web-auth/webauthn-metadata-service/tree/4.7.4" + "source": "https://github.com/web-auth/webauthn-metadata-service/tree/4.7.7" }, "funding": [ { @@ -8118,16 +8118,16 @@ }, { "name": "web-auth/webauthn-lib", - "version": "4.7.4", + "version": "4.7.7", "source": { "type": "git", "url": "https://github.com/web-auth/webauthn-lib.git", - "reference": "944f70e4c578d44d496f8a12299a4d89bf58e3bb" + "reference": "4e1b877733e4cbd43101cf0ba07f0854e4cb23de" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/web-auth/webauthn-lib/zipball/944f70e4c578d44d496f8a12299a4d89bf58e3bb", - "reference": "944f70e4c578d44d496f8a12299a4d89bf58e3bb", + "url": "https://api.github.com/repos/web-auth/webauthn-lib/zipball/4e1b877733e4cbd43101cf0ba07f0854e4cb23de", + "reference": "4e1b877733e4cbd43101cf0ba07f0854e4cb23de", "shasum": "" }, "require": { @@ -8190,7 +8190,7 @@ "webauthn" ], "support": { - "source": "https://github.com/web-auth/webauthn-lib/tree/4.7.4" + "source": "https://github.com/web-auth/webauthn-lib/tree/4.7.7" }, "funding": [ { @@ -8202,7 +8202,7 @@ "type": "patreon" } ], - "time": "2023-11-12T07:41:19+00:00" + "time": "2023-11-17T11:42:57+00:00" }, { "name": "webmozart/assert", From c445ce517c855bad57a3907ddba538e9cebf3482 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 17:16:40 +0000 Subject: [PATCH 10/29] build(deps): Bump league/flysystem-aws-s3-v3 from 3.19.0 to 3.21.0 Bumps [league/flysystem-aws-s3-v3](https://github.com/thephpleague/flysystem-aws-s3-v3) from 3.19.0 to 3.21.0. - [Commits](https://github.com/thephpleague/flysystem-aws-s3-v3/compare/3.19.0...3.21.0) --- updated-dependencies: - dependency-name: league/flysystem-aws-s3-v3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- composer.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/composer.lock b/composer.lock index 7623b3ed..1db35bd6 100644 --- a/composer.lock +++ b/composer.lock @@ -62,16 +62,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.284.1", + "version": "3.287.0", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "eb03db9795bfdaed3501ebc7f33b4e6cee0c15b4" + "reference": "06978bfc63111fccd78b364238bf214b4ade8d18" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/eb03db9795bfdaed3501ebc7f33b4e6cee0c15b4", - "reference": "eb03db9795bfdaed3501ebc7f33b4e6cee0c15b4", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/06978bfc63111fccd78b364238bf214b4ade8d18", + "reference": "06978bfc63111fccd78b364238bf214b4ade8d18", "shasum": "" }, "require": { @@ -151,9 +151,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.284.1" + "source": "https://github.com/aws/aws-sdk-php/tree/3.287.0" }, - "time": "2023-11-06T19:08:09+00:00" + "time": "2023-11-17T20:03:36+00:00" }, { "name": "brick/math", @@ -2752,16 +2752,16 @@ }, { "name": "league/flysystem", - "version": "3.19.0", + "version": "3.21.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "1b2aa10f2326e0351399b8ce68e287d8e9209a83" + "reference": "a326d8a2d007e4ca327a57470846e34363789258" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/1b2aa10f2326e0351399b8ce68e287d8e9209a83", - "reference": "1b2aa10f2326e0351399b8ce68e287d8e9209a83", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a326d8a2d007e4ca327a57470846e34363789258", + "reference": "a326d8a2d007e4ca327a57470846e34363789258", "shasum": "" }, "require": { @@ -2826,7 +2826,7 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem/issues", - "source": "https://github.com/thephpleague/flysystem/tree/3.19.0" + "source": "https://github.com/thephpleague/flysystem/tree/3.21.0" }, "funding": [ { @@ -2838,20 +2838,20 @@ "type": "github" } ], - "time": "2023-11-07T09:04:28+00:00" + "time": "2023-11-18T13:59:15+00:00" }, { "name": "league/flysystem-aws-s3-v3", - "version": "3.19.0", + "version": "3.21.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git", - "reference": "03be643c8ed4dea811d946101be3bc875b5cf214" + "reference": "2a1784eec09ee8e190fc27b93e725bc518338929" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/03be643c8ed4dea811d946101be3bc875b5cf214", - "reference": "03be643c8ed4dea811d946101be3bc875b5cf214", + "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/2a1784eec09ee8e190fc27b93e725bc518338929", + "reference": "2a1784eec09ee8e190fc27b93e725bc518338929", "shasum": "" }, "require": { @@ -2892,7 +2892,7 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem-aws-s3-v3/issues", - "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.19.0" + "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.21.0" }, "funding": [ { @@ -2904,20 +2904,20 @@ "type": "github" } ], - "time": "2023-11-06T20:35:28+00:00" + "time": "2023-11-14T11:54:45+00:00" }, { "name": "league/flysystem-local", - "version": "3.19.0", + "version": "3.21.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem-local.git", - "reference": "8d868217f9eeb4e9a7320db5ccad825e9a7a4076" + "reference": "470eb1c09eaabd49ebd908ae06f23983ba3ecfe7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/8d868217f9eeb4e9a7320db5ccad825e9a7a4076", - "reference": "8d868217f9eeb4e9a7320db5ccad825e9a7a4076", + "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/470eb1c09eaabd49ebd908ae06f23983ba3ecfe7", + "reference": "470eb1c09eaabd49ebd908ae06f23983ba3ecfe7", "shasum": "" }, "require": { @@ -2952,7 +2952,7 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem-local/issues", - "source": "https://github.com/thephpleague/flysystem-local/tree/3.19.0" + "source": "https://github.com/thephpleague/flysystem-local/tree/3.21.0" }, "funding": [ { @@ -2964,7 +2964,7 @@ "type": "github" } ], - "time": "2023-11-06T20:35:28+00:00" + "time": "2023-11-18T13:41:42+00:00" }, { "name": "league/mime-type-detection", From eb26bbc2ebf98a94363acfbd65ab15e757c315ef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Nov 2023 09:41:44 +0000 Subject: [PATCH 11/29] build(deps): Bump lcobucci/jwt from 5.1.0 to 5.2.0 Bumps [lcobucci/jwt](https://github.com/lcobucci/jwt) from 5.1.0 to 5.2.0. - [Release notes](https://github.com/lcobucci/jwt/releases) - [Commits](https://github.com/lcobucci/jwt/compare/5.1.0...5.2.0) --- updated-dependencies: - dependency-name: lcobucci/jwt dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- composer.lock | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/composer.lock b/composer.lock index 1db35bd6..91a3b59c 100644 --- a/composer.lock +++ b/composer.lock @@ -2489,21 +2489,19 @@ }, { "name": "lcobucci/jwt", - "version": "5.1.0", + "version": "5.2.0", "source": { "type": "git", "url": "https://github.com/lcobucci/jwt.git", - "reference": "f0031c07b96db6a0ca649206e7eacddb7e9d5908" + "reference": "0ba88aed12c04bd2ed9924f500673f32b67a6211" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/lcobucci/jwt/zipball/f0031c07b96db6a0ca649206e7eacddb7e9d5908", - "reference": "f0031c07b96db6a0ca649206e7eacddb7e9d5908", + "url": "https://api.github.com/repos/lcobucci/jwt/zipball/0ba88aed12c04bd2ed9924f500673f32b67a6211", + "reference": "0ba88aed12c04bd2ed9924f500673f32b67a6211", "shasum": "" }, "require": { - "ext-hash": "*", - "ext-json": "*", "ext-openssl": "*", "ext-sodium": "*", "php": "~8.1.0 || ~8.2.0 || ~8.3.0", @@ -2548,7 +2546,7 @@ ], "support": { "issues": "https://github.com/lcobucci/jwt/issues", - "source": "https://github.com/lcobucci/jwt/tree/5.1.0" + "source": "https://github.com/lcobucci/jwt/tree/5.2.0" }, "funding": [ { @@ -2560,7 +2558,7 @@ "type": "patreon" } ], - "time": "2023-10-31T06:41:47+00:00" + "time": "2023-11-20T21:17:42+00:00" }, { "name": "league/commonmark", From 8d6a0bba4ef8d7036dc1292038fe19bf65bda2c6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Nov 2023 09:07:04 +0000 Subject: [PATCH 12/29] build(deps): Bump laravel/framework from 10.32.1 to 10.33.0 Bumps [laravel/framework](https://github.com/laravel/framework) from 10.32.1 to 10.33.0. - [Release notes](https://github.com/laravel/framework/releases) - [Changelog](https://github.com/laravel/framework/blob/10.x/CHANGELOG.md) - [Commits](https://github.com/laravel/framework/compare/v10.32.1...v10.33.0) --- updated-dependencies: - dependency-name: laravel/framework dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index 91a3b59c..64f86345 100644 --- a/composer.lock +++ b/composer.lock @@ -1818,16 +1818,16 @@ }, { "name": "laravel/framework", - "version": "v10.32.1", + "version": "v10.33.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "b30e44f20d244f7ba125283e14a8bbac167f4e5b" + "reference": "4536872e3e5b6be51b1f655dafd12c9a4fa0cfe8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/b30e44f20d244f7ba125283e14a8bbac167f4e5b", - "reference": "b30e44f20d244f7ba125283e14a8bbac167f4e5b", + "url": "https://api.github.com/repos/laravel/framework/zipball/4536872e3e5b6be51b1f655dafd12c9a4fa0cfe8", + "reference": "4536872e3e5b6be51b1f655dafd12c9a4fa0cfe8", "shasum": "" }, "require": { @@ -2016,7 +2016,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2023-11-14T22:57:08+00:00" + "time": "2023-11-21T14:49:31+00:00" }, { "name": "laravel/horizon", From 2a22d65d9adb0bd3edca30a32c3624f6ee27b5b4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Nov 2023 17:41:06 +0000 Subject: [PATCH 13/29] build(deps-dev): Bump laravel/sail from 1.26.0 to 1.26.1 Bumps [laravel/sail](https://github.com/laravel/sail) from 1.26.0 to 1.26.1. - [Release notes](https://github.com/laravel/sail/releases) - [Changelog](https://github.com/laravel/sail/blob/1.x/CHANGELOG.md) - [Commits](https://github.com/laravel/sail/compare/v1.26.0...v1.26.1) --- updated-dependencies: - dependency-name: laravel/sail dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/composer.lock b/composer.lock index 64f86345..521cc741 100644 --- a/composer.lock +++ b/composer.lock @@ -9891,16 +9891,16 @@ }, { "name": "laravel/sail", - "version": "v1.26.0", + "version": "v1.26.1", "source": { "type": "git", "url": "https://github.com/laravel/sail.git", - "reference": "c60fe037004e272efd0d81f416ed2bfc623d70b4" + "reference": "7a82f5aa364dbee3fd9c52fc464cf0bdd11150ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/sail/zipball/c60fe037004e272efd0d81f416ed2bfc623d70b4", - "reference": "c60fe037004e272efd0d81f416ed2bfc623d70b4", + "url": "https://api.github.com/repos/laravel/sail/zipball/7a82f5aa364dbee3fd9c52fc464cf0bdd11150ed", + "reference": "7a82f5aa364dbee3fd9c52fc464cf0bdd11150ed", "shasum": "" }, "require": { @@ -9952,7 +9952,7 @@ "issues": "https://github.com/laravel/sail/issues", "source": "https://github.com/laravel/sail" }, - "time": "2023-10-18T13:57:15+00:00" + "time": "2023-11-20T15:56:47+00:00" }, { "name": "maximebf/debugbar", @@ -13277,16 +13277,16 @@ }, { "name": "symfony/yaml", - "version": "v6.3.3", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "e23292e8c07c85b971b44c1c4b87af52133e2add" + "reference": "3493af8a8dad7fa91c77fa473ba23ecd95334a92" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/e23292e8c07c85b971b44c1c4b87af52133e2add", - "reference": "e23292e8c07c85b971b44c1c4b87af52133e2add", + "url": "https://api.github.com/repos/symfony/yaml/zipball/3493af8a8dad7fa91c77fa473ba23ecd95334a92", + "reference": "3493af8a8dad7fa91c77fa473ba23ecd95334a92", "shasum": "" }, "require": { @@ -13329,7 +13329,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v6.3.3" + "source": "https://github.com/symfony/yaml/tree/v6.3.8" }, "funding": [ { @@ -13345,7 +13345,7 @@ "type": "tidelift" } ], - "time": "2023-07-31T07:08:24+00:00" + "time": "2023-11-06T10:58:05+00:00" }, { "name": "theseer/tokenizer", From 6c1bd4b1e2a758e8f036f94e672d31e0610cdce5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Nov 2023 17:44:15 +0000 Subject: [PATCH 14/29] build(deps-dev): Bump vimeo/psalm from 5.15.0 to 5.16.0 Bumps [vimeo/psalm](https://github.com/vimeo/psalm) from 5.15.0 to 5.16.0. - [Release notes](https://github.com/vimeo/psalm/releases) - [Commits](https://github.com/vimeo/psalm/compare/5.15.0...5.16.0) --- updated-dependencies: - dependency-name: vimeo/psalm dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- composer.lock | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/composer.lock b/composer.lock index 521cc741..4b78ce64 100644 --- a/composer.lock +++ b/composer.lock @@ -11236,16 +11236,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.24.2", + "version": "1.24.3", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "bcad8d995980440892759db0c32acae7c8e79442" + "reference": "12f01d214f1c73b9c91fdb3b1c415e4c70652083" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/bcad8d995980440892759db0c32acae7c8e79442", - "reference": "bcad8d995980440892759db0c32acae7c8e79442", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/12f01d214f1c73b9c91fdb3b1c415e4c70652083", + "reference": "12f01d214f1c73b9c91fdb3b1c415e4c70652083", "shasum": "" }, "require": { @@ -11277,9 +11277,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.2" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.3" }, - "time": "2023-09-26T12:28:12+00:00" + "time": "2023-11-18T20:15:32+00:00" }, { "name": "phpunit/php-code-coverage", @@ -12795,16 +12795,16 @@ }, { "name": "spatie/array-to-xml", - "version": "3.2.0", + "version": "3.2.2", "source": { "type": "git", "url": "https://github.com/spatie/array-to-xml.git", - "reference": "f9ab39c808500c347d5a8b6b13310bd5221e39e7" + "reference": "96be97e664c87613121d073ea39af4c74e57a7f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/array-to-xml/zipball/f9ab39c808500c347d5a8b6b13310bd5221e39e7", - "reference": "f9ab39c808500c347d5a8b6b13310bd5221e39e7", + "url": "https://api.github.com/repos/spatie/array-to-xml/zipball/96be97e664c87613121d073ea39af4c74e57a7f8", + "reference": "96be97e664c87613121d073ea39af4c74e57a7f8", "shasum": "" }, "require": { @@ -12842,7 +12842,7 @@ "xml" ], "support": { - "source": "https://github.com/spatie/array-to-xml/tree/3.2.0" + "source": "https://github.com/spatie/array-to-xml/tree/3.2.2" }, "funding": [ { @@ -12854,7 +12854,7 @@ "type": "github" } ], - "time": "2023-07-19T18:30:26+00:00" + "time": "2023-11-14T14:08:51+00:00" }, { "name": "spatie/laravel-ray", @@ -13399,16 +13399,16 @@ }, { "name": "vimeo/psalm", - "version": "5.15.0", + "version": "5.16.0", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "5c774aca4746caf3d239d9c8cadb9f882ca29352" + "reference": "2897ba636551a8cb61601cc26f6ccfbba6c36591" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/5c774aca4746caf3d239d9c8cadb9f882ca29352", - "reference": "5c774aca4746caf3d239d9c8cadb9f882ca29352", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/2897ba636551a8cb61601cc26f6ccfbba6c36591", + "reference": "2897ba636551a8cb61601cc26f6ccfbba6c36591", "shasum": "" }, "require": { @@ -13433,8 +13433,8 @@ "php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0", "sebastian/diff": "^4.0 || ^5.0", "spatie/array-to-xml": "^2.17.0 || ^3.0", - "symfony/console": "^4.1.6 || ^5.0 || ^6.0", - "symfony/filesystem": "^5.4 || ^6.0" + "symfony/console": "^4.1.6 || ^5.0 || ^6.0 || ^7.0", + "symfony/filesystem": "^5.4 || ^6.0 || ^7.0" }, "conflict": { "nikic/php-parser": "4.17.0" @@ -13456,7 +13456,7 @@ "psalm/plugin-phpunit": "^0.18", "slevomat/coding-standard": "^8.4", "squizlabs/php_codesniffer": "^3.6", - "symfony/process": "^4.4 || ^5.0 || ^6.0" + "symfony/process": "^4.4 || ^5.0 || ^6.0 || ^7.0" }, "suggest": { "ext-curl": "In order to send data to shepherd", @@ -13469,7 +13469,7 @@ "psalm-refactor", "psalter" ], - "type": "library", + "type": "project", "extra": { "branch-alias": { "dev-master": "5.x-dev", @@ -13501,10 +13501,11 @@ "static analysis" ], "support": { + "docs": "https://psalm.dev/docs", "issues": "https://github.com/vimeo/psalm/issues", - "source": "https://github.com/vimeo/psalm/tree/5.15.0" + "source": "https://github.com/vimeo/psalm" }, - "time": "2023-08-20T23:07:30+00:00" + "time": "2023-11-22T20:38:47+00:00" }, { "name": "zbateson/mail-mime-parser", From 98334f555bae14586a8c0e3070c473dee57425f4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 24 Nov 2023 09:47:57 +0000 Subject: [PATCH 15/29] build(deps-dev): Bump openai-php/client from 0.7.10 to 0.8.0 Bumps [openai-php/client](https://github.com/openai-php/client) from 0.7.10 to 0.8.0. - [Release notes](https://github.com/openai-php/client/releases) - [Changelog](https://github.com/openai-php/client/blob/main/CHANGELOG.md) - [Commits](https://github.com/openai-php/client/compare/v0.7.10...v0.8.0) --- updated-dependencies: - dependency-name: openai-php/client dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- composer.lock | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/composer.json b/composer.json index 0ff75e79..c6c5f22d 100644 --- a/composer.json +++ b/composer.json @@ -41,7 +41,7 @@ "laravel/sail": "^1.18", "mockery/mockery": "^1.4.4", "nunomaduro/collision": "^7.0", - "openai-php/client": "^0.7.1", + "openai-php/client": "^0.8.0", "phpunit/php-code-coverage": "^10.0", "phpunit/phpunit": "^10.1", "psalm/plugin-laravel": "^2.8", diff --git a/composer.lock b/composer.lock index 4b78ce64..d6f06dea 100644 --- a/composer.lock +++ b/composer.lock @@ -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": "371e78415510bbc4f42ee87a76220978", + "content-hash": "3ebf86a88d1a3248d7ae704ee6c827d9", "packages": [ { "name": "aws/aws-crt-php", @@ -10313,16 +10313,16 @@ }, { "name": "openai-php/client", - "version": "v0.7.10", + "version": "v0.8.0", "source": { "type": "git", "url": "https://github.com/openai-php/client.git", - "reference": "f9af25d7d7bd8e58f60ada6c30f1c93d65c73833" + "reference": "d0e4996f6446ced6ad35ec0ea6af20e3596c648f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/openai-php/client/zipball/f9af25d7d7bd8e58f60ada6c30f1c93d65c73833", - "reference": "f9af25d7d7bd8e58f60ada6c30f1c93d65c73833", + "url": "https://api.github.com/repos/openai-php/client/zipball/d0e4996f6446ced6ad35ec0ea6af20e3596c648f", + "reference": "d0e4996f6446ced6ad35ec0ea6af20e3596c648f", "shasum": "" }, "require": { @@ -10337,15 +10337,15 @@ "require-dev": { "guzzlehttp/guzzle": "^7.8.0", "guzzlehttp/psr7": "^2.6.1", - "laravel/pint": "^1.13.2", - "nunomaduro/collision": "^7.9.0", - "pestphp/pest": "^2.19.2", - "pestphp/pest-plugin-arch": "^2.3.3", - "pestphp/pest-plugin-mock": "^2.0.0", - "pestphp/pest-plugin-type-coverage": "^2.2.0", - "phpstan/phpstan": "^1.10.35", + "laravel/pint": "^1.13.6", + "mockery/mockery": "^1.6.6", + "nunomaduro/collision": "^7.10.0", + "pestphp/pest": "^2.25.0", + "pestphp/pest-plugin-arch": "^2.4.1", + "pestphp/pest-plugin-type-coverage": "^2.5.0", + "phpstan/phpstan": "^1.10.44", "rector/rector": "^0.16.0", - "symfony/var-dumper": "^6.3.4" + "symfony/var-dumper": "^6.3.8" }, "type": "library", "autoload": { @@ -10385,7 +10385,7 @@ ], "support": { "issues": "https://github.com/openai-php/client/issues", - "source": "https://github.com/openai-php/client/tree/v0.7.10" + "source": "https://github.com/openai-php/client/tree/v0.8.0" }, "funding": [ { @@ -10401,7 +10401,7 @@ "type": "github" } ], - "time": "2023-11-14T13:39:26+00:00" + "time": "2023-11-23T14:04:47+00:00" }, { "name": "orchestra/canvas", From c0d85277fe9025f99dd5f9fea8812ee7ea197eb8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 24 Nov 2023 23:22:23 +0000 Subject: [PATCH 16/29] build(deps-dev): Bump phpunit/php-code-coverage from 10.1.8 to 10.1.9 Bumps [phpunit/php-code-coverage](https://github.com/sebastianbergmann/php-code-coverage) from 10.1.8 to 10.1.9. - [Changelog](https://github.com/sebastianbergmann/php-code-coverage/blob/main/ChangeLog-10.1.md) - [Commits](https://github.com/sebastianbergmann/php-code-coverage/compare/10.1.8...10.1.9) --- updated-dependencies: - dependency-name: phpunit/php-code-coverage dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/composer.lock b/composer.lock index d6f06dea..58facd1a 100644 --- a/composer.lock +++ b/composer.lock @@ -11283,16 +11283,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "10.1.8", + "version": "10.1.9", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "84838eed9ded511f61dc3e8b5944a52d9017b297" + "reference": "a56a9ab2f680246adcf3db43f38ddf1765774735" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/84838eed9ded511f61dc3e8b5944a52d9017b297", - "reference": "84838eed9ded511f61dc3e8b5944a52d9017b297", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/a56a9ab2f680246adcf3db43f38ddf1765774735", + "reference": "a56a9ab2f680246adcf3db43f38ddf1765774735", "shasum": "" }, "require": { @@ -11349,7 +11349,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.8" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.9" }, "funding": [ { @@ -11357,7 +11357,7 @@ "type": "github" } ], - "time": "2023-11-15T13:31:15+00:00" + "time": "2023-11-23T12:23:20+00:00" }, { "name": "phpunit/php-file-iterator", @@ -13349,16 +13349,16 @@ }, { "name": "theseer/tokenizer", - "version": "1.2.1", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e" + "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96", + "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96", "shasum": "" }, "require": { @@ -13387,7 +13387,7 @@ "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "support": { "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.1" + "source": "https://github.com/theseer/tokenizer/tree/1.2.2" }, "funding": [ { @@ -13395,7 +13395,7 @@ "type": "github" } ], - "time": "2021-07-28T10:34:58+00:00" + "time": "2023-11-20T00:12:19+00:00" }, { "name": "vimeo/psalm", From 92098a793e91a7fb818ca3213641eaf8b5f794f8 Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Sat, 25 Nov 2023 16:08:07 +0000 Subject: [PATCH 17/29] feat: Add webmention counts and icons for replies, likes, and reposts. - Add new SVG icons for the "reply", "like", and "repost" actions - Update webmention info display in note template to include counts and icons for replies, likes, and reposts - Add webmention counts to FrontPageController.php and modify queries in NotesController.php - Modify WebMentionsTableSeeder.php to change URLs, commentable ID, and add new WebMentions --- app/Http/Controllers/FrontPageController.php | 12 ++++- app/Http/Controllers/NotesController.php | 19 +++++++- app/Http/Controllers/SearchController.php | 11 ++++- database/seeders/NotesTableSeeder.php | 2 +- database/seeders/WebMentionsTableSeeder.php | 27 +++++++---- public/assets/app.css | 2 +- public/assets/app.css.br | Bin 1036 -> 1347 bytes resources/css/app.css | 1 + resources/css/content.css | 29 ++++++++++++ resources/css/notes.css | 38 ++++++++++++++++ resources/views/icons/like.blade.php | 1 + resources/views/icons/reply.blade.php | 1 + resources/views/icons/repost.blade.php | 1 + resources/views/notes/show.blade.php | 45 +++++++++++-------- resources/views/templates/note.blade.php | 25 +++++++++++ 15 files changed, 179 insertions(+), 35 deletions(-) create mode 100644 resources/css/notes.css create mode 100644 resources/views/icons/like.blade.php create mode 100644 resources/views/icons/reply.blade.php create mode 100644 resources/views/icons/repost.blade.php diff --git a/app/Http/Controllers/FrontPageController.php b/app/Http/Controllers/FrontPageController.php index 191887a9..9d236bdc 100644 --- a/app/Http/Controllers/FrontPageController.php +++ b/app/Http/Controllers/FrontPageController.php @@ -20,9 +20,17 @@ class FrontPageController extends Controller */ public function index(): Response|View { - $notes = Note::latest()->with(['media', 'client', 'place'])->get(); + $notes = Note::latest()->with(['media', 'client', 'place'])->withCount(['webmentions AS replies' => function ($query) { + $query->where('type', 'in-reply-to'); + }]) + ->withCount(['webmentions AS likes' => function ($query) { + $query->where('type', 'like-of'); + }]) + ->withCount(['webmentions AS reposts' => function ($query) { + $query->where('type', 'repost-of'); + }])->get(); $articles = Article::latest()->get(); - $bookmarks = Bookmark::latest()->get(); + $bookmarks = Bookmark::latest()->with('tags')->get(); $likes = Like::latest()->get(); $items = collect($notes) diff --git a/app/Http/Controllers/NotesController.php b/app/Http/Controllers/NotesController.php index 834ce907..bef422cb 100644 --- a/app/Http/Controllers/NotesController.php +++ b/app/Http/Controllers/NotesController.php @@ -26,8 +26,14 @@ class NotesController extends Controller { $notes = Note::latest() ->with('place', 'media', 'client') - ->withCount(['webmentions As replies' => function ($query) { + ->withCount(['webmentions AS replies' => function ($query) { $query->where('type', 'in-reply-to'); + }]) + ->withCount(['webmentions AS likes' => function ($query) { + $query->where('type', 'like-of'); + }]) + ->withCount(['webmentions AS reposts' => function ($query) { + $query->where('type', 'repost-of'); }])->paginate(10); return view('notes.index', compact('notes')); @@ -39,7 +45,16 @@ class NotesController extends Controller public function show(string $urlId): View|JsonResponse|Response { try { - $note = Note::nb60($urlId)->with('webmentions')->firstOrFail(); + $note = Note::nb60($urlId)->with('place', 'media', 'client') + ->withCount(['webmentions AS replies' => function ($query) { + $query->where('type', 'in-reply-to'); + }]) + ->withCount(['webmentions AS likes' => function ($query) { + $query->where('type', 'like-of'); + }]) + ->withCount(['webmentions AS reposts' => function ($query) { + $query->where('type', 'repost-of'); + }])->firstOrFail(); } catch (ModelNotFoundException $exception) { abort(404); } diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php index 42e9e00d..a8116c88 100644 --- a/app/Http/Controllers/SearchController.php +++ b/app/Http/Controllers/SearchController.php @@ -20,7 +20,16 @@ class SearchController extends Controller /** @var Note $note */ foreach ($notes as $note) { - $note->load('place', 'media', 'client'); + $note->load('place', 'media', 'client') + ->loadCount(['webmentions AS replies' => function ($query) { + $query->where('type', 'in-reply-to'); + }]) + ->loadCount(['webmentions AS likes' => function ($query) { + $query->where('type', 'like-of'); + }]) + ->loadCount(['webmentions AS reposts' => function ($query) { + $query->where('type', 'repost-of'); + }]); } return view('search', compact('search', 'notes')); diff --git a/database/seeders/NotesTableSeeder.php b/database/seeders/NotesTableSeeder.php index 308eab66..e952afa2 100644 --- a/database/seeders/NotesTableSeeder.php +++ b/database/seeders/NotesTableSeeder.php @@ -145,7 +145,7 @@ class NotesTableSeeder extends Seeder $now = Carbon::now()->subHours(6); $noteWithTextLinkandEmoji = Note::create([ - 'note' => 'I love https://duckduckgo.com 💕', // there’s a two-heart emoji at the end of this + 'note' => 'I love https://kagi.com 💕', // there’s a two-heart emoji at the end of this 'created_at' => $now, ]); DB::table('notes') diff --git a/database/seeders/WebMentionsTableSeeder.php b/database/seeders/WebMentionsTableSeeder.php index facf42df..afd1ffb7 100644 --- a/database/seeders/WebMentionsTableSeeder.php +++ b/database/seeders/WebMentionsTableSeeder.php @@ -14,23 +14,32 @@ class WebMentionsTableSeeder extends Seeder */ public function run(): void { - // WebMention Aaron + // WebMention reply Aaron WebMention::create([ 'source' => 'https://aaronpk.localhost/reply/1', - 'target' => config('app.url') . '/notes/E', - 'commentable_id' => '14', + 'target' => config('app.url') . '/notes/Z', + 'commentable_id' => '5', 'commentable_type' => 'App\Models\Note', 'type' => 'in-reply-to', 'mf2' => '{"rels": [], "items": [{"type": ["h-entry"], "properties": {"url": ["https://aaronpk.localhost/reply/1"], "name": ["Hi too"], "author": [{"type": ["h-card"], "value": "Aaron Parecki", "properties": {"url": ["https://aaronpk.localhost"], "name": ["Aaron Parecki"], "photo": ["https://aaronparecki.com/images/profile.jpg"]}}], "content": [{"html": "Hi too", "value": "Hi too"}], "published": ["' . date(DATE_W3C) . '"], "in-reply-to": ["https://aaronpk.loclahost/reply/1", "' . config('app.url') .'/notes/E"]}}]}', ]); - // WebMention Tantek + // WebMention like Tantek WebMention::create([ - 'source' => 'http://tantek.com/', - 'target' => config('app.url') . '/notes/D', - 'commentable_id' => '13', + 'source' => 'https://tantek.com/likes/1', + 'target' => config('app.url') . '/notes/G', + 'commentable_id' => '16', 'commentable_type' => 'App\Models\Note', - 'type' => 'in-reply-to', - 'mf2' => '{"rels": [], "items": [{"type": ["h-entry"], "properties": {"url": ["http://tantek.com/"], "name": ["KUTGW"], "author": [{"type": ["h-card"], "value": "Tantek Celik", "properties": {"url": ["http://tantek.com/"], "name": ["Tantek Celik"]}}], "content": [{"html": "kutgw", "value": "kutgw"}], "published": ["' . date(DATE_W3C) . '"], "in-reply-to": ["' . config('app.url') . '/notes/D"]}}]}', + 'type' => 'like-of', + 'mf2' => '{"rels": [], "items": [{"type": ["h-entry"], "properties": {"url": ["https://tantek.com/likes/1"], "name": ["KUTGW"], "author": [{"type": ["h-card"], "value": "Tantek Celik", "properties": {"url": ["https://tantek.com/"], "name": ["Tantek Celik"], "photo": ["https://tantek.com/photo.jpg"]}}], "content": [{"html": "kutgw", "value": "kutgw"}], "published": ["' . date(DATE_W3C) . '"], "u-like-of": ["' . config('app.url') . '/notes/G"]}}]}', + ]); + // WebMention repost Barry + WebMention::create([ + 'source' => 'https://barryfrost.com/reposts/1', + 'target' => config('app.url') . '/notes/C', + 'commentable_id' => '12', + 'commentable_type' => 'App\Models\Note', + 'type' => 'repost-of', + 'mf2' => '{"rels": [], "items": [{"type": ["h-entry"], "properties": {"url": ["https://barryfrost.com/reposts/1"], "name": ["Kagi is the best"], "author": [{"type": ["h-card"], "value": "Barry Frost", "properties": {"url": ["https://barryfrost.com/"], "name": ["Barry Frost"], "photo": ["https://barryfrost.com/barryfrost.jpg"]}}], "content": [{"html": "Kagi is the Best", "value": "Kagi is the Best"}], "published": ["' . date(DATE_W3C) . '"], "u-repost-of": ["' . config('app.url') . '/notes/C"]}}]}', ]); } } diff --git a/public/assets/app.css b/public/assets/app.css index d04d4d8e..c935785f 100644 --- a/public/assets/app.css +++ b/public/assets/app.css @@ -1 +1 @@ -:root{--font-family-headings:"Archer SSm A","Archer SSm B",serif;--font-family-body:"Verlag A","Verlag B",sans-serif;--font-family-monospace:"Operator Mono SSm A","Operator Mono SSm B",monospace;--font-size-sm:0.75rem;--font-size-base:1rem;--font-size-md:1.25rem;--font-size-lg:1.5rem;--font-size-xl:1.75rem;--font-size-xxl:2rem;--font-size-xxxl:2.25rem;--color-primary:#334700;--color-secondary:#e3ffb7;--color-link:#00649e;--color-link-visited:#bc7aff;--color-primary-shadow:rgba(16,25,0,.4)}@supports (color:color(display-p3 0 0 0)){:root{--color-primary:color(display-p3 0.21567 0.27838 0.03615)}}@supports (color:oklab(0% 0 0)){:root{--color-primary:oklch(36.8% 0.1 125.505deg)}}@supports (color:color(display-p3 0 0 0)){:root{--color-secondary:color(display-p3 0.91016 0.99842 0.74082)}}@supports (color:oklab(0% 0 0)){:root{--color-secondary:oklch(96.3% 0.1 125.505deg)}}@supports (color:color(display-p3 0 0 0)){:root{--color-link:color(display-p3 0.01045 0.38351 0.63618)}}@supports (color:oklab(0% 0 0)){:root{--color-link:oklch(48.09% 0.146 241.41deg)}}@supports (color:color(display-p3 0 0 0)){:root{--color-link-visited:color(display-p3 0.70467 0.47549 0.99958)}}@supports (color:oklab(0% 0 0)){:root{--color-link-visited:oklch(70.44% 0.21 304.41deg)}}@supports (color:color(display-p3 0 0 0)){:root{--color-primary-shadow:color(display-p3 0.06762 0.09646 0.00441/0.4)}}@supports (color:oklab(0% 0 0)){:root{--color-primary-shadow:oklch(19.56% 0.054 125.505deg/40%)}}body{background-color:var(--color-secondary);color:var(--color-primary);font-family:var(--font-family-body);font-size:var(--font-size-md)}code{font-family:var(--font-family-monospace)}h1,h2,h3,h4,h5,h6{font-family:var(--font-family-headings)}.grid{display:grid;grid-template-columns:5vw 1fr 5vw;grid-template-rows:-webkit-min-content 1fr -webkit-min-content;grid-template-rows:min-content 1fr min-content;row-gap:1rem}#site-header{grid-column:2/3;grid-row:1/2}main{grid-column:2/3;grid-row:2/3}.h-feed{-webkit-box-orient:vertical;-webkit-box-direction:normal;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;gap:2rem}.h-entry h1:first-of-type,.h-entry p:first-of-type{-webkit-margin-before:0;margin-block-start:0}.pagination{-webkit-margin-before:1rem;margin-block-start:1rem}footer{grid-column:2/3;grid-row:3/4}footer .iwc-logo{max-width:85vw}footer .footer-actions{-webkit-box-orient:horizontal;-webkit-box-direction:normal;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-direction:row;flex-direction:row;gap:1rem}a{color:var(--color-link)}a:visited{color:var(--color-link-visited)}#site-header a:visited,a.auth:visited{color:var(--color-link)}.hljs{border-radius:.5rem}.h-card .hovercard{-webkit-box-orient:vertical;-webkit-box-direction:normal;background-color:var(--color-secondary);border-radius:1rem;-webkit-box-shadow:0 .5rem .5rem .5rem var(--color-primary-shadow);box-shadow:0 .5rem .5rem .5rem var(--color-primary-shadow);display:none;-ms-flex-direction:column;flex-direction:column;gap:.5rem;opacity:0;padding:1rem;position:absolute;-webkit-transition:opacity .5s ease-in-out;transition:opacity .5s ease-in-out;width:-webkit-fit-content;width:-moz-fit-content;width:fit-content;z-index:100}.h-card .hovercard .u-photo{max-width:6rem}.h-card .hovercard .social-icon{height:1rem;width:1rem}.h-card:hover .hovercard{display:-webkit-box;display:-ms-flexbox;display:flex;opacity:1}.h-entry{-webkit-border-start:1px solid var(--color-primary);-webkit-padding-start:.5rem;border-inline-start:1px solid var(--color-primary);padding-inline-start:.5rem}.h-entry .reply-to{font-style:italic}.h-entry .post-info a{text-decoration:none}.h-entry .note-metadata{-webkit-box-orient:horizontal;-webkit-box-direction:normal;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-direction:row;flex-direction:row;gap:1rem}.h-entry .note-metadata .syndication-links{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-flow:row wrap;flex-flow:row wrap}.h-entry .note-metadata .syndication-links a{text-decoration:none}.h-entry .note-metadata .syndication-links a svg{height:1rem;width:1rem} +:root{--font-family-headings:"Archer SSm A","Archer SSm B",serif;--font-family-body:"Verlag A","Verlag B",sans-serif;--font-family-monospace:"Operator Mono SSm A","Operator Mono SSm B",monospace;--font-size-sm:0.75rem;--font-size-base:1rem;--font-size-md:1.25rem;--font-size-lg:1.5rem;--font-size-xl:1.75rem;--font-size-xxl:2rem;--font-size-xxxl:2.25rem;--color-primary:#334700;--color-secondary:#e3ffb7;--color-link:#00649e;--color-link-visited:#bc7aff;--color-primary-shadow:rgba(16,25,0,.4)}@supports (color:color(display-p3 0 0 0)){:root{--color-primary:color(display-p3 0.21567 0.27838 0.03615)}}@supports (color:oklab(0% 0 0)){:root{--color-primary:oklch(36.8% 0.1 125.505deg)}}@supports (color:color(display-p3 0 0 0)){:root{--color-secondary:color(display-p3 0.91016 0.99842 0.74082)}}@supports (color:oklab(0% 0 0)){:root{--color-secondary:oklch(96.3% 0.1 125.505deg)}}@supports (color:color(display-p3 0 0 0)){:root{--color-link:color(display-p3 0.01045 0.38351 0.63618)}}@supports (color:oklab(0% 0 0)){:root{--color-link:oklch(48.09% 0.146 241.41deg)}}@supports (color:color(display-p3 0 0 0)){:root{--color-link-visited:color(display-p3 0.70467 0.47549 0.99958)}}@supports (color:oklab(0% 0 0)){:root{--color-link-visited:oklch(70.44% 0.21 304.41deg)}}@supports (color:color(display-p3 0 0 0)){:root{--color-primary-shadow:color(display-p3 0.06762 0.09646 0.00441/0.4)}}@supports (color:oklab(0% 0 0)){:root{--color-primary-shadow:oklch(19.56% 0.054 125.505deg/40%)}}body{background-color:var(--color-secondary);color:var(--color-primary);font-family:var(--font-family-body);font-size:var(--font-size-md)}code{font-family:var(--font-family-monospace)}h1,h2,h3,h4,h5,h6{font-family:var(--font-family-headings)}.grid{display:grid;grid-template-columns:5vw 1fr 5vw;grid-template-rows:-webkit-min-content 1fr -webkit-min-content;grid-template-rows:min-content 1fr min-content;row-gap:1rem}#site-header{grid-column:2/3;grid-row:1/2}main{grid-column:2/3;grid-row:2/3}.h-feed{-webkit-box-orient:vertical;-webkit-box-direction:normal;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;gap:2rem}.h-entry h1:first-of-type,.h-entry p:first-of-type{-webkit-margin-before:0;margin-block-start:0}.pagination{-webkit-margin-before:1rem;margin-block-start:1rem}footer{grid-column:2/3;grid-row:3/4}footer .iwc-logo{max-width:85vw}footer .footer-actions{-webkit-box-orient:horizontal;-webkit-box-direction:normal;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-direction:row;flex-direction:row;gap:1rem}a{color:var(--color-link)}a:visited{color:var(--color-link-visited)}#site-header a:visited,a.auth:visited{color:var(--color-link)}.hljs{border-radius:.5rem}.h-card .hovercard{-webkit-box-orient:vertical;-webkit-box-direction:normal;background-color:var(--color-secondary);border-radius:1rem;-webkit-box-shadow:0 .5rem .5rem .5rem var(--color-primary-shadow);box-shadow:0 .5rem .5rem .5rem var(--color-primary-shadow);display:none;-ms-flex-direction:column;flex-direction:column;gap:.5rem;opacity:0;padding:1rem;position:absolute;-webkit-transition:opacity .5s ease-in-out;transition:opacity .5s ease-in-out;width:-webkit-fit-content;width:-moz-fit-content;width:fit-content;z-index:100}.h-card .hovercard .u-photo{max-width:6rem}.h-card .hovercard .social-icon{height:1rem;width:1rem}.h-card:hover .hovercard{display:-webkit-box;display:-ms-flexbox;display:flex;opacity:1}.h-entry{-webkit-border-start:1px solid var(--color-primary);-webkit-padding-start:.5rem;border-inline-start:1px solid var(--color-primary);padding-inline-start:.5rem}.h-entry .reply-to{font-style:italic}.h-entry .post-info a{text-decoration:none}.h-entry .note-metadata{-webkit-box-orient:horizontal;-webkit-box-direction:normal;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-direction:row;flex-direction:row;gap:1rem}.h-entry .note-metadata .likes,.h-entry .note-metadata .replies,.h-entry .note-metadata .reposts{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-webkit-box-align:center;-ms-flex-align:center;align-items:center;display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;-ms-flex-direction:row;flex-direction:row;gap:.5rem}.h-entry .note-metadata .syndication-links{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-flow:row wrap;flex-flow:row wrap}.h-entry .note-metadata .syndication-links a{text-decoration:none}.h-entry .note-metadata .syndication-links a svg{height:1rem;width:1rem}.feather{stroke:currentcolor;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;fill:none;height:24px;width:24px}.sr-only{clip:rect(0 0 0 0);-webkit-clip-path:inset(50%);clip-path:inset(50%);height:1px;overflow:hidden;position:absolute;white-space:nowrap;width:1px}main>.u-comment{-webkit-margin-before:2rem;-webkit-margin-start:2rem;-webkit-border-start:1px solid var(--color-primary);-webkit-padding-start:.5rem;border-inline-start:1px solid var(--color-primary);margin-block-start:2rem;margin-inline-start:2rem;padding-inline-start:.5rem}main>.u-comment .mini-h-card{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-webkit-box-align:baseline;-ms-flex-align:baseline;align-items:baseline;display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;-ms-flex-direction:row;flex-direction:row}main>.u-comment .mini-h-card .u-photo{-webkit-margin-after:.5rem;border-radius:50%;height:2rem;margin-block-end:.5rem;width:2rem}main .notes-subtitle{font-size:1.2rem;font-weight:600}main .webmentions-author-list{-webkit-box-orient:horizontal;-webkit-box-direction:normal;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-flow:row wrap;flex-flow:row wrap;gap:1rem}main .webmentions-author-list img{border-radius:50%;height:4rem;width:4rem} diff --git a/public/assets/app.css.br b/public/assets/app.css.br index b71b212b9b58e79e4d48533f859adcf90f24b13d..9f5f9941e06e6bd9556445dadfb91bd2b7450d36 100644 GIT binary patch literal 1347 zcmV-J1-$wjjTQhLg>l1uA|n6&Ll8v_!->jDUG`}zg{_(25S+q&sub0|Uu2R64ry$X zZB;F%xtZ8*psV0rx~m{7KYlF*+MJ7!ksDzmY+Q_sB;jsn=KVSP7vv(j@`o+616f5Z zRBfHFEKA#SvclMY46NHDQAx=EegmZtNckCwh@(Gn6D>zT-|P~ zZ1}WeD2IqLvc2wU-TJe@lCd3&d(R*Jz}p7PLMY?Gt!pf$AO9r62{j}Tx7y0J1*7P=r`zxfJ7<>~SUeRlcY^fAH^L?B zsm^b(li zc=eQACpXFMCETH_eJY;l_YASM7b=ucQ7`JSauy!f;S~Qr;_^O;V<;E>Wl(Tb_G0uC z>>{JYU{Ml5RBxSS+6>FH^_g4`B~*XZXtffPN^T(?jCh8!i#X_L-1Ft4<)%>{;W*e@ zPj*Djk6f*jLvfCRI}WCJ0(HeYH=~n2+FOPh^e?4Z1@uTtB`-ojsQFz=RpzNWU)3CZ9I+ z@)Rbu^k2o4Dp2l}ROsFm>GY37acFBFleJaCd6raQWENmr?EKkaz|WSy=#S8xHT;CI z6qQZJiJ`kf}8TDx(i4*XYqOY&{ml0Y<309f^ zk~H)4%+78z(%iFxfYuGUPAc8(|L>+yG)7%`$Az_HuIj%haW?o~=S>!7-X-`eUCx+= z@H6nAW{1cwZXpOKR1sUiEyzj8Ly(~Wh53r*>1OZEOKj)zU!a3c#F^ui){cTfREuX2 zKi@p7jzQb8+-EWnG%UQYwIH;B`NL z!%;D-!{MkJ;y@B`lgbeZ_K3H>oc$r%mdD8}XaI~WP7SShqaJ9N0;c5joL5l?`7$Za zBEdBnufIsMQ1tAY!8;!Tn5SLz)^OMSd{I9kC_x-b_4-wvzqP<}w1g)RD|*@?Vi1{* z5e2Y2BQM(+toO5En3flnUr7KnTO%Sroe{+Sr!e?jEahoZnz}rNMm(ADqpi$6%eh$a F${wtcv&8@a literal 1036 zcmV+n1oQhFHV^hp&QRIJm5g`tRiOR3p{HmpdnY@@R-}_&ss200(PGd~WS}T7> z5obF*sdeh$5#3af)xCS2&8w@B$W$1F#bF$B3D;h7xvrEY$5@V?{QKvNYi3aEe0~>#IRPidPi3wVR(BQy9Y3Gb z*b|3P4r4q4SqiZcyOs2Dnm zDs*)Ro^60Y)Ld#)=VA*DZd3x+y~i4%mM_<0D#m2IB$j1cArlrUE#0c`jEg+>!i}@ewc2B~dw<*u^RUj*|2#-G zU9Uy}Dpeg^<*a}h6+chCMUD2PRjX9DEz3xxNPiDjJ>M)Iw^w2(_TsRNBRbiqD%F2y zh)tuAri8STlD-uU6#cQpUM!|2-< z?jAcxjvw|1*2jIvyG|zFTz^g~fplt{>P%Y~iq*RF6@Qlt)T>#Xmpo57rF*Kre5}hc zy*_o~z^<4_B4-|mtJP0+fxENB_A{a&{ko`b@@b=9uEw;M{w+?aBFb*55#0-sW?l}p zL!12w*6ImkloVkm3NS5p{%kPBPfWk*kMKNt6fNRBX)rA(hHiZ*CJkwF4{PFUXl GNlyS&F8)~n diff --git a/resources/css/app.css b/resources/css/app.css index ca75b3e5..9e91b28a 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -4,3 +4,4 @@ @import url('colours.css'); @import url('code.css'); @import url('content.css'); +@import url('notes.css'); diff --git a/resources/css/content.css b/resources/css/content.css index c656acef..acbb031c 100644 --- a/resources/css/content.css +++ b/resources/css/content.css @@ -19,6 +19,15 @@ flex-direction: row; gap: 1rem; + & .replies, + & .likes, + & .reposts { + display: inline-flex; + flex-direction: row; + gap: .5rem; + align-items: center; + } + & .syndication-links { flex-flow: row wrap; @@ -33,3 +42,23 @@ } } } + +.feather { + width: 24px; + height: 24px; + stroke: currentcolor; + stroke-width: 2; + stroke-linecap: round; + stroke-linejoin: round; + fill: none; +} + +.sr-only { + clip: rect(0 0 0 0); + clip-path: inset(50%); + height: 1px; + overflow: hidden; + position: absolute; + white-space: nowrap; + width: 1px; +} diff --git a/resources/css/notes.css b/resources/css/notes.css new file mode 100644 index 00000000..639067b8 --- /dev/null +++ b/resources/css/notes.css @@ -0,0 +1,38 @@ +main { + & > .u-comment { + margin-block-start: 2rem; + margin-inline-start: 2rem; + border-inline-start: 1px solid var(--color-primary); + padding-inline-start: .5rem; + + & .mini-h-card { + display: inline-flex; + flex-direction: row; + align-items: baseline; + + & .u-photo { + width: 2rem; + height: 2rem; + border-radius: 50%; + margin-block-end: 0.5rem; + } + } + } + + & .notes-subtitle { + font-size: 1.2rem; + font-weight: 600; + } + + & .webmentions-author-list { + display: flex; + flex-flow: row wrap; + gap: 1rem; + + & img { + width: 4rem; + height: 4rem; + border-radius: 50%; + } + } +} diff --git a/resources/views/icons/like.blade.php b/resources/views/icons/like.blade.php new file mode 100644 index 00000000..b5b136d5 --- /dev/null +++ b/resources/views/icons/like.blade.php @@ -0,0 +1 @@ + diff --git a/resources/views/icons/reply.blade.php b/resources/views/icons/reply.blade.php new file mode 100644 index 00000000..b2daaf1d --- /dev/null +++ b/resources/views/icons/reply.blade.php @@ -0,0 +1 @@ + diff --git a/resources/views/icons/repost.blade.php b/resources/views/icons/repost.blade.php new file mode 100644 index 00000000..0f89d0e7 --- /dev/null +++ b/resources/views/icons/repost.blade.php @@ -0,0 +1 @@ + diff --git a/resources/views/notes/show.blade.php b/resources/views/notes/show.blade.php index ed8c49cb..de7aa93b 100644 --- a/resources/views/notes/show.blade.php +++ b/resources/views/notes/show.blade.php @@ -25,29 +25,36 @@ @endforeach @if($note->webmentions->filter(function ($webmention) { - return ($webmention->type == 'like-of'); -})->count() > 0)

Likes

-@foreach($note->webmentions->filter(function ($webmention) { - return ($webmention->type == 'like-of'); -}) as $like) - -@endforeach + return ($webmention->type === 'like-of'); +})->count() > 0) +

Likes

+
+ @foreach($note->webmentions->filter(function ($webmention) { + return ($webmention->type === 'like-of'); + }) as $like) + + + + @endforeach +
@endif @if($note->webmentions->filter(function ($webmention) { - return ($webmention->type == 'repost-of'); -})->count() > 0)

Reposts

-@foreach($note->webmentions->filter(function ($webmention) { - return ($webmention->type == 'repost-of'); -}) as $repost) -

- - {{ $repost['author']['properties']['name'][0] }} - reposted this at {{ $repost['published'] }}. -

-@endforeach + return ($webmention->type === 'repost-of'); +})->count() > 0) +

Reposts

+
+ @foreach($note->webmentions->filter(function ($webmention) { + return ($webmention->type == 'repost-of'); + }) as $repost) + + {{ $repost['author']['properties']['name'][0] }} reposted this at {{ $repost['published'] }} + + @endforeach +
@endif @stop @section('scripts') - + @parent + @stop diff --git a/resources/views/templates/note.blade.php b/resources/views/templates/note.blade.php index e8bc60f1..eef657ff 100644 --- a/resources/views/templates/note.blade.php +++ b/resources/views/templates/note.blade.php @@ -40,6 +40,31 @@ in {!! $note->address !!} @endif + @if($note->replies > 0 || $note->likes > 0 || $note->reposts > 0) +
+ @if($note->replies > 0) +
+ @include('icons.reply') + {{ $note->replies }} + replies +
+ @endif + @if($note->likes > 0) + + @endif + @if($note->reposts > 0) +
+ @include('icons.repost') + {{ $note->reposts }} + reposts +
+ @endif +
+ @endif