pepepper/tissue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into release-20200830

Browse Source
This commit is contained in:
shibafu 2020-08-30 13:57:19 +09:00
commit fb48f1fd74
9 changed files with 306 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Ejaculation.php
View File

@ -101,6 +101,7 @@ class Ejaculation extends Model
return route('checkin', [
'link' => $this->link,
'tags' => $this->textTags(),
'is_private' => $this->is_private,
'is_too_sensitive' => $this->is_too_sensitive,
]);
}

2
app/Http/Controllers/EjaculationController.php
View File

@ -144,7 +144,7 @@ class EjaculationController extends Controller
'link' => old('link') ?? $ejaculation->link,
'tags' => $tags,
'note' => old('note') ?? $ejaculation->note,
'is_private' => is_bool(old('is_private')) ? old('is_private') : $ejaculation->note,
'is_private' => is_bool(old('is_private')) ? old('is_private') : $ejaculation->is_private,
'is_too_sensitive' => is_bool(old('is_too_sensitive')) ? old('is_too_sensitive') : $ejaculation->is_too_sensitive
],
'errors' => isset($errors) ? $errors->getMessages() : null

1
app/Http/Kernel.php
View File

@ -79,6 +79,7 @@ class Kernel extends HttpKernel
* @var array
*/
protected $middlewarePriority = [
\App\Http\Middleware\EncryptCookies::class,
\Illuminate\Session\Middleware\StartSession::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
\App\Http\Middleware\Authenticate::class,

403
composer.lock generated
View File

@ -8,20 +8,20 @@
"packages": [
{
"name": "anhskohbo/no-captcha",
"version": "3.2.0",
"version": "3.2.1",
"source": {
"type": "git",
"url": "https://github.com/anhskohbo/no-captcha.git",
"reference": "c14dd67024f30fd28f38ac9faa44cc47e1d4bddf"
"reference": "6386365b76cfa6a6043dc2783a2a615c8574faf9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/anhskohbo/no-captcha/zipball/c14dd67024f30fd28f38ac9faa44cc47e1d4bddf",
"reference": "c14dd67024f30fd28f38ac9faa44cc47e1d4bddf",
"url": "https://api.github.com/repos/anhskohbo/no-captcha/zipball/6386365b76cfa6a6043dc2783a2a615c8574faf9",
"reference": "6386365b76cfa6a6043dc2783a2a615c8574faf9",
"shasum": ""
},
"require": {
"guzzlehttp/guzzle": "^6.2",
"guzzlehttp/guzzle": "^6.2|^7.0",
"illuminate/support": "^5.0|^6.0|^7.0",
"php": ">=5.5.5"
},
@ -64,7 +64,7 @@
"no-captcha",
"recaptcha"
],
"time": "2020-03-04T03:27:38+00:00"
"time": "2020-08-06T05:45:09+00:00"
},
{
"name": "clue/stream-filter",
@ -709,16 +709,16 @@
},
{
"name": "egulias/email-validator",
"version": "2.1.18",
"version": "2.1.19",
"source": {
"type": "git",
"url": "https://github.com/egulias/EmailValidator.git",
"reference": "cfa3d44471c7f5bfb684ac2b0da7114283d78441"
"reference": "840d5603eb84cc81a6a0382adac3293e57c1c64c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/egulias/EmailValidator/zipball/cfa3d44471c7f5bfb684ac2b0da7114283d78441",
"reference": "cfa3d44471c7f5bfb684ac2b0da7114283d78441",
"url": "https://api.github.com/repos/egulias/EmailValidator/zipball/840d5603eb84cc81a6a0382adac3293e57c1c64c",
"reference": "840d5603eb84cc81a6a0382adac3293e57c1c64c",
"shasum": ""
},
"require": {
@ -763,7 +763,7 @@
"validation",
"validator"
],
"time": "2020-06-16T20:11:17+00:00"
"time": "2020-08-08T21:28:19+00:00"
},
{
"name": "erusev/parsedown",
@ -1190,16 +1190,16 @@
},
{
"name": "laravel/framework",
"version": "v6.18.26",
"version": "v6.18.35",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "d11b6168c65251ffa81ae0dfaf017ad2f30013da"
"reference": "baec6c2d7f433594cb858c35c2a2946df7ecac13"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/d11b6168c65251ffa81ae0dfaf017ad2f30013da",
"reference": "d11b6168c65251ffa81ae0dfaf017ad2f30013da",
"url": "https://api.github.com/repos/laravel/framework/zipball/baec6c2d7f433594cb858c35c2a2946df7ecac13",
"reference": "baec6c2d7f433594cb858c35c2a2946df7ecac13",
"shasum": ""
},
"require": {
@ -1334,7 +1334,7 @@
"framework",
"laravel"
],
"time": "2020-07-21T14:25:39+00:00"
"time": "2020-08-07T15:06:09+00:00"
},
{
"name": "laravel/helpers",
@ -1391,16 +1391,16 @@
},
{
"name": "laravel/tinker",
"version": "v2.4.1",
"version": "v2.4.2",
"source": {
"type": "git",
"url": "https://github.com/laravel/tinker.git",
"reference": "3c9ef136ca59366bc1b50b7f2500a946d5149c62"
"reference": "58424c24e8aec31c3a3ac54eb3adb15e8a0a067b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/tinker/zipball/3c9ef136ca59366bc1b50b7f2500a946d5149c62",
"reference": "3c9ef136ca59366bc1b50b7f2500a946d5149c62",
"url": "https://api.github.com/repos/laravel/tinker/zipball/58424c24e8aec31c3a3ac54eb3adb15e8a0a067b",
"reference": "58424c24e8aec31c3a3ac54eb3adb15e8a0a067b",
"shasum": ""
},
"require": {
@ -1451,20 +1451,20 @@
"laravel",
"psysh"
],
"time": "2020-07-07T15:10:00+00:00"
"time": "2020-08-11T19:28:08+00:00"
},
{
"name": "league/commonmark",
"version": "1.5.3",
"version": "1.5.4",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/commonmark.git",
"reference": "2574454b97e4103dc4e36917bd783b25624aefcd"
"reference": "21819c989e69bab07e933866ad30c7e3f32984ba"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/commonmark/zipball/2574454b97e4103dc4e36917bd783b25624aefcd",
"reference": "2574454b97e4103dc4e36917bd783b25624aefcd",
"url": "https://api.github.com/repos/thephpleague/commonmark/zipball/21819c989e69bab07e933866ad30c7e3f32984ba",
"reference": "21819c989e69bab07e933866ad30c7e3f32984ba",
"shasum": ""
},
"require": {
@ -1546,7 +1546,7 @@
"type": "tidelift"
}
],
"time": "2020-07-19T22:47:30+00:00"
"time": "2020-08-18T01:19:12+00:00"
},
{
"name": "league/csv",
@ -1627,28 +1627,29 @@
},
{
"name": "league/flysystem",
"version": "1.0.69",
"version": "1.1.2",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
"reference": "7106f78428a344bc4f643c233a94e48795f10967"
"reference": "63cd8c14708b9544d3f61d3c15b747fda1c95c6e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/7106f78428a344bc4f643c233a94e48795f10967",
"reference": "7106f78428a344bc4f643c233a94e48795f10967",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/63cd8c14708b9544d3f61d3c15b747fda1c95c6e",
"reference": "63cd8c14708b9544d3f61d3c15b747fda1c95c6e",
"shasum": ""
},
"require": {
"ext-fileinfo": "*",
"php": ">=5.5.9"
"league/mime-type-detection": "^1.3",
"php": "^7.2.5 || ^8.0"
},
"conflict": {
"league/flysystem-sftp": "<1.0.6"
},
"require-dev": {
"phpspec/phpspec": "^3.4",
"phpunit/phpunit": "^5.7.26"
"phpspec/prophecy": "^1.11.1",
"phpunit/phpunit": "^8.5.8"
},
"suggest": {
"ext-fileinfo": "Required for MimeType",
@ -1713,7 +1714,58 @@
"type": "other"
}
],
"time": "2020-05-18T15:13:39+00:00"
"time": "2020-08-18T10:57:55+00:00"
},
{
"name": "league/mime-type-detection",
"version": "1.4.0",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/mime-type-detection.git",
"reference": "fda190b62b962d96a069fcc414d781db66d65b69"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/fda190b62b962d96a069fcc414d781db66d65b69",
"reference": "fda190b62b962d96a069fcc414d781db66d65b69",
"shasum": ""
},
"require": {
"ext-fileinfo": "*",
"php": "^7.2 || ^8.0"
},
"require-dev": {
"phpstan/phpstan": "^0.12.36",
"phpunit/phpunit": "^8.5.8"
},
"type": "library",
"autoload": {
"psr-4": {
"League\\MimeTypeDetection\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Frank de Jonge",
"email": "info@frankdejonge.nl"
}
],
"description": "Mime-type detection for Flysystem",
"funding": [
{
"url": "https://github.com/frankdejonge",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/league/flysystem",
"type": "tidelift"
}
],
"time": "2020-08-09T10:34:01+00:00"
},
{
"name": "misd/linkify",
@ -1853,16 +1905,16 @@
},
{
"name": "nesbot/carbon",
"version": "2.36.1",
"version": "2.38.0",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
"reference": "ee7378a36cc62952100e718bcc58be4c7210e55f"
"reference": "d8f6a6a91d1eb9304527b040500f61923e97674b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/ee7378a36cc62952100e718bcc58be4c7210e55f",
"reference": "ee7378a36cc62952100e718bcc58be4c7210e55f",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/d8f6a6a91d1eb9304527b040500f61923e97674b",
"reference": "d8f6a6a91d1eb9304527b040500f61923e97674b",
"shasum": ""
},
"require": {
@ -1877,7 +1929,7 @@
"kylekatarnls/multi-tester": "^2.0",
"phpmd/phpmd": "^2.8",
"phpstan/extension-installer": "^1.0",
"phpstan/phpstan": "^0.12.30",
"phpstan/phpstan": "^0.12.35",
"phpunit/phpunit": "^7.5 || ^8.0",
"squizlabs/php_codesniffer": "^3.4"
},
@ -1938,20 +1990,20 @@
"type": "tidelift"
}
],
"time": "2020-07-04T12:29:56+00:00"
"time": "2020-08-04T19:12:46+00:00"
},
{
"name": "nikic/php-parser",
"version": "v4.6.0",
"version": "v4.9.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
"reference": "c346bbfafe2ff60680258b631afb730d186ed864"
"reference": "aaee038b912e567780949787d5fe1977be11a778"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/c346bbfafe2ff60680258b631afb730d186ed864",
"reference": "c346bbfafe2ff60680258b631afb730d186ed864",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/aaee038b912e567780949787d5fe1977be11a778",
"reference": "aaee038b912e567780949787d5fe1977be11a778",
"shasum": ""
},
"require": {
@ -1959,8 +2011,8 @@
"php": ">=7.0"
},
"require-dev": {
"ircmaxell/php-yacc": "0.0.5",
"phpunit/phpunit": "^6.5 || ^7.0 || ^8.0"
"ircmaxell/php-yacc": "^0.0.7",
"phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
},
"bin": [
"bin/php-parse"
@ -1968,7 +2020,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "4.3-dev"
"dev-master": "4.9-dev"
}
},
"autoload": {
@ -1990,7 +2042,7 @@
"parser",
"php"
],
"time": "2020-07-02T17:12:47+00:00"
"time": "2020-08-18T19:48:01+00:00"
},
{
"name": "openpear/stream_filter_mbstring",
@ -2035,16 +2087,16 @@
},
{
"name": "opis/closure",
"version": "3.5.5",
"version": "3.5.6",
"source": {
"type": "git",
"url": "https://github.com/opis/closure.git",
"reference": "dec9fc5ecfca93f45cd6121f8e6f14457dff372c"
"reference": "e8d34df855b0a0549a300cb8cb4db472556e8aa9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/opis/closure/zipball/dec9fc5ecfca93f45cd6121f8e6f14457dff372c",
"reference": "dec9fc5ecfca93f45cd6121f8e6f14457dff372c",
"url": "https://api.github.com/repos/opis/closure/zipball/e8d34df855b0a0549a300cb8cb4db472556e8aa9",
"reference": "e8d34df855b0a0549a300cb8cb4db472556e8aa9",
"shasum": ""
},
"require": {
@ -2092,7 +2144,7 @@
"serialization",
"serialize"
],
"time": "2020-06-17T14:59:55+00:00"
"time": "2020-08-11T08:46:50+00:00"
},
{
"name": "paragonie/random_compat",
@ -3602,16 +3654,16 @@
},
{
"name": "symfony/debug",
"version": "v4.4.10",
"version": "v4.4.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
"reference": "28f92d08bb6d1fddf8158e02c194ad43870007e6"
"reference": "47aa9064d75db36389692dd4d39895a0820f00f2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/debug/zipball/28f92d08bb6d1fddf8158e02c194ad43870007e6",
"reference": "28f92d08bb6d1fddf8158e02c194ad43870007e6",
"url": "https://api.github.com/repos/symfony/debug/zipball/47aa9064d75db36389692dd4d39895a0820f00f2",
"reference": "47aa9064d75db36389692dd4d39895a0820f00f2",
"shasum": ""
},
"require": {
@ -3669,7 +3721,7 @@
"type": "tidelift"
}
],
"time": "2020-05-24T08:33:35+00:00"
"time": "2020-07-23T08:31:43+00:00"
},
{
"name": "symfony/deprecation-contracts",
@ -3808,16 +3860,16 @@
},
{
"name": "symfony/error-handler",
"version": "v4.4.10",
"version": "v4.4.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/error-handler.git",
"reference": "0df9a23c0f9eddbb6682479fee6fd58b88add75b"
"reference": "66f151360550ec2b3273b3746febb12e6ba0348b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/error-handler/zipball/0df9a23c0f9eddbb6682479fee6fd58b88add75b",
"reference": "0df9a23c0f9eddbb6682479fee6fd58b88add75b",
"url": "https://api.github.com/repos/symfony/error-handler/zipball/66f151360550ec2b3273b3746febb12e6ba0348b",
"reference": "66f151360550ec2b3273b3746febb12e6ba0348b",
"shasum": ""
},
"require": {
@ -3875,20 +3927,20 @@
"type": "tidelift"
}
],
"time": "2020-05-28T10:39:14+00:00"
"time": "2020-07-23T08:35:20+00:00"
},
{
"name": "symfony/event-dispatcher",
"version": "v4.4.10",
"version": "v4.4.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
"reference": "a5370aaa7807c7a439b21386661ffccf3dff2866"
"reference": "6140fc7047dafc5abbe84ba16a34a86c0b0229b8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a5370aaa7807c7a439b21386661ffccf3dff2866",
"reference": "a5370aaa7807c7a439b21386661ffccf3dff2866",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/6140fc7047dafc5abbe84ba16a34a86c0b0229b8",
"reference": "6140fc7047dafc5abbe84ba16a34a86c0b0229b8",
"shasum": ""
},
"require": {
@ -3959,7 +4011,7 @@
"type": "tidelift"
}
],
"time": "2020-05-20T08:37:50+00:00"
"time": "2020-06-18T17:59:13+00:00"
},
{
"name": "symfony/event-dispatcher-contracts",
@ -4039,20 +4091,20 @@
},
{
"name": "symfony/finder",
"version": "v4.4.10",
"version": "v4.4.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
"reference": "5729f943f9854c5781984ed4907bbb817735776b"
"reference": "2727aa35fddfada1dd37599948528e9b152eb742"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/5729f943f9854c5781984ed4907bbb817735776b",
"reference": "5729f943f9854c5781984ed4907bbb817735776b",
"url": "https://api.github.com/repos/symfony/finder/zipball/2727aa35fddfada1dd37599948528e9b152eb742",
"reference": "2727aa35fddfada1dd37599948528e9b152eb742",
"shasum": ""
},
"require": {
"php": "^7.1.3"
"php": ">=7.1.3"
},
"type": "library",
"extra": {
@ -4098,7 +4150,7 @@
"type": "tidelift"
}
],
"time": "2020-03-27T16:54:36+00:00"
"time": "2020-07-05T09:39:30+00:00"
},
{
"name": "symfony/http-foundation",
@ -4171,16 +4223,16 @@
},
{
"name": "symfony/http-kernel",
"version": "v4.4.10",
"version": "v4.4.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
"reference": "81d42148474e1852a333ed7a732f2a014af75430"
"reference": "a675d2bf04a9328f164910cae6e3918b295151f3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/81d42148474e1852a333ed7a732f2a014af75430",
"reference": "81d42148474e1852a333ed7a732f2a014af75430",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/a675d2bf04a9328f164910cae6e3918b295151f3",
"reference": "a675d2bf04a9328f164910cae6e3918b295151f3",
"shasum": ""
},
"require": {
@ -4272,7 +4324,7 @@
"type": "tidelift"
}
],
"time": "2020-06-12T11:15:37+00:00"
"time": "2020-07-24T04:10:09+00:00"
},
{
"name": "symfony/mime",
@ -4499,7 +4551,7 @@
},
{
"name": "symfony/polyfill-iconv",
"version": "v1.18.0",
"version": "v1.18.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-iconv.git",
@ -4576,16 +4628,16 @@
},
{
"name": "symfony/polyfill-intl-idn",
"version": "v1.18.0",
"version": "v1.18.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-idn.git",
"reference": "bc6549d068d0160e0f10f7a5a23c7d1406b95ebe"
"reference": "5dcab1bc7146cf8c1beaa4502a3d9be344334251"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/bc6549d068d0160e0f10f7a5a23c7d1406b95ebe",
"reference": "bc6549d068d0160e0f10f7a5a23c7d1406b95ebe",
"url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/5dcab1bc7146cf8c1beaa4502a3d9be344334251",
"reference": "5dcab1bc7146cf8c1beaa4502a3d9be344334251",
"shasum": ""
},
"require": {
@ -4657,11 +4709,11 @@
"type": "tidelift"
}
],
"time": "2020-07-14T12:35:20+00:00"
"time": "2020-08-04T06:02:08+00:00"
},
{
"name": "symfony/polyfill-intl-normalizer",
"version": "v1.18.0",
"version": "v1.18.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-normalizer.git",
@ -4819,7 +4871,7 @@
},
{
"name": "symfony/polyfill-php70",
"version": "v1.18.0",
"version": "v1.18.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php70.git",
@ -4896,7 +4948,7 @@
},
{
"name": "symfony/polyfill-php72",
"version": "v1.18.0",
"version": "v1.18.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php72.git",
@ -4969,7 +5021,7 @@
},
{
"name": "symfony/polyfill-php73",
"version": "v1.18.0",
"version": "v1.18.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php73.git",
@ -5045,7 +5097,7 @@
},
{
"name": "symfony/polyfill-php80",
"version": "v1.18.0",
"version": "v1.18.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php80.git",
@ -5202,20 +5254,20 @@
},
{
"name": "symfony/process",
"version": "v4.4.10",
"version": "v4.4.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
"reference": "c714958428a85c86ab97e3a0c96db4c4f381b7f5"
"reference": "65e70bab62f3da7089a8d4591fb23fbacacb3479"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/c714958428a85c86ab97e3a0c96db4c4f381b7f5",
"reference": "c714958428a85c86ab97e3a0c96db4c4f381b7f5",
"url": "https://api.github.com/repos/symfony/process/zipball/65e70bab62f3da7089a8d4591fb23fbacacb3479",
"reference": "65e70bab62f3da7089a8d4591fb23fbacacb3479",
"shasum": ""
},
"require": {
"php": "^7.1.3"
"php": ">=7.1.3"
},
"type": "library",
"extra": {
@ -5261,24 +5313,24 @@
"type": "tidelift"
}
],
"time": "2020-05-30T20:06:45+00:00"
"time": "2020-07-23T08:31:43+00:00"
},
{
"name": "symfony/routing",
"version": "v4.4.10",
"version": "v4.4.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
"reference": "0f557911dde75c2a9652b8097bd7c9f54507f646"
"reference": "e103381a4c2f0731c14589041852bf979e97c7af"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/routing/zipball/0f557911dde75c2a9652b8097bd7c9f54507f646",
"reference": "0f557911dde75c2a9652b8097bd7c9f54507f646",
"url": "https://api.github.com/repos/symfony/routing/zipball/e103381a4c2f0731c14589041852bf979e97c7af",
"reference": "e103381a4c2f0731c14589041852bf979e97c7af",
"shasum": ""
},
"require": {
"php": "^7.1.3"
"php": ">=7.1.3"
},
"conflict": {
"symfony/config": "<4.2",
@ -5351,7 +5403,7 @@
"type": "tidelift"
}
],
"time": "2020-05-30T20:07:26+00:00"
"time": "2020-07-05T09:39:30+00:00"
},
{
"name": "symfony/service-contracts",
@ -5431,16 +5483,16 @@
},
{
"name": "symfony/translation",
"version": "v4.4.10",
"version": "v4.4.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
"reference": "79d3ef9096a6a6047dbc69218b68c7b7f63193af"
"reference": "a8ea9d97353294eb6783f2894ef8cee99a045822"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/79d3ef9096a6a6047dbc69218b68c7b7f63193af",
"reference": "79d3ef9096a6a6047dbc69218b68c7b7f63193af",
"url": "https://api.github.com/repos/symfony/translation/zipball/a8ea9d97353294eb6783f2894ef8cee99a045822",
"reference": "a8ea9d97353294eb6783f2894ef8cee99a045822",
"shasum": ""
},
"require": {
@ -5517,7 +5569,7 @@
"type": "tidelift"
}
],
"time": "2020-05-30T20:06:45+00:00"
"time": "2020-07-23T08:31:43+00:00"
},
{
"name": "symfony/translation-contracts",
@ -5926,29 +5978,30 @@
"packages-dev": [
{
"name": "barryvdh/laravel-debugbar",
"version": "v3.3.3",
"version": "v3.4.1",
"source": {
"type": "git",
"url": "https://github.com/barryvdh/laravel-debugbar.git",
"reference": "57f2219f6d9efe41ed1bc880d86701c52f261bf5"
"reference": "9e785aa5584e8839fd43070202dd7f2e912db51c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/57f2219f6d9efe41ed1bc880d86701c52f261bf5",
"reference": "57f2219f6d9efe41ed1bc880d86701c52f261bf5",
"url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/9e785aa5584e8839fd43070202dd7f2e912db51c",
"reference": "9e785aa5584e8839fd43070202dd7f2e912db51c",
"shasum": ""
},
"require": {
"illuminate/routing": "^5.5|^6|^7",
"illuminate/session": "^5.5|^6|^7",
"illuminate/support": "^5.5|^6|^7",
"maximebf/debugbar": "^1.15.1",
"maximebf/debugbar": "^1.16.3",
"php": ">=7.0",
"symfony/debug": "^3|^4|^5",
"symfony/finder": "^3|^4|^5"
},
"require-dev": {
"laravel/framework": "5.5.x"
"orchestra/testbench": "^3.5|^4.0|^5.0",
"phpunit/phpunit": "^6.0|^7.0|^8.5|^9.0"
},
"type": "library",
"extra": {
@ -5996,43 +6049,46 @@
"type": "github"
}
],
"time": "2020-05-05T10:53:32+00:00"
"time": "2020-08-11T10:30:51+00:00"
},
{
"name": "barryvdh/laravel-ide-helper",
"version": "v2.7.0",
"version": "v2.8.0",
"source": {
"type": "git",
"url": "https://github.com/barryvdh/laravel-ide-helper.git",
"reference": "5f677edc14bdcfdcac36633e6eea71b2728a4dbc"
"reference": "ba95d18ef55c91295250ae8b7bfa73d8fb866b9b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/5f677edc14bdcfdcac36633e6eea71b2728a4dbc",
"reference": "5f677edc14bdcfdcac36633e6eea71b2728a4dbc",
"url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/ba95d18ef55c91295250ae8b7bfa73d8fb866b9b",
"reference": "ba95d18ef55c91295250ae8b7bfa73d8fb866b9b",
"shasum": ""
},
"require": {
"barryvdh/reflection-docblock": "^2.0.6",
"composer/composer": "^1.6",
"composer/composer": "^1.6 || ^2.0@dev",
"doctrine/dbal": "~2.3",
"illuminate/console": "^5.5|^6|^7",
"illuminate/filesystem": "^5.5|^6|^7",
"illuminate/support": "^5.5|^6|^7",
"php": ">=7.2"
"illuminate/console": "^5.5 || ^6 || ^7",
"illuminate/filesystem": "^5.5 || ^6 || ^7",
"illuminate/support": "^5.5 || ^6 || ^7",
"php": ">=7.2",
"phpdocumentor/type-resolver": "^1.1.0"
},
"require-dev": {
"illuminate/config": "^5.5|^6|^7",
"illuminate/view": "^5.5|^6|^7",
"illuminate/config": "^5.5 || ^6 || ^7",
"illuminate/view": "^5.5 || ^6 || ^7",
"mockery/mockery": "^1.3",
"orchestra/testbench": "^3|^4|^5",
"phpro/grumphp": "^0.17.1",
"squizlabs/php_codesniffer": "^3"
"orchestra/testbench": "^3.5 || ^4 || ^5",
"phpro/grumphp": "^0.19.0",
"spatie/phpunit-snapshot-assertions": "^1.4 || ^2.2 || ^3",
"squizlabs/php_codesniffer": "^3.5",
"vimeo/psalm": "^3.12"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.6-dev"
"dev-master": "2.7-dev"
},
"laravel": {
"providers": [
@ -6073,7 +6129,7 @@
"type": "github"
}
],
"time": "2020-04-22T09:57:26+00:00"
"time": "2020-08-10T08:22:48+00:00"
},
{
"name": "barryvdh/reflection-docblock",
@ -6192,16 +6248,16 @@
},
{
"name": "composer/composer",
"version": "1.10.6",
"version": "1.10.10",
"source": {
"type": "git",
"url": "https://github.com/composer/composer.git",
"reference": "be81b9c4735362c26876bdbfd3b5bc7e7f711c88"
"reference": "32966a3b1d48bc01472a8321fd6472b44fad033a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/composer/composer/zipball/be81b9c4735362c26876bdbfd3b5bc7e7f711c88",
"reference": "be81b9c4735362c26876bdbfd3b5bc7e7f711c88",
"url": "https://api.github.com/repos/composer/composer/zipball/32966a3b1d48bc01472a8321fd6472b44fad033a",
"reference": "32966a3b1d48bc01472a8321fd6472b44fad033a",
"shasum": ""
},
"require": {
@ -6209,7 +6265,7 @@
"composer/semver": "^1.0",
"composer/spdx-licenses": "^1.2",
"composer/xdebug-handler": "^1.1",
"justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0",
"justinrainbow/json-schema": "^5.2.10",
"php": "^5.3.2 || ^7.0",
"psr/log": "^1.0",
"seld/jsonlint": "^1.4",
@ -6220,12 +6276,11 @@
"symfony/process": "^2.7 || ^3.0 || ^4.0 || ^5.0"
},
"conflict": {
"symfony/console": "2.8.38",
"symfony/phpunit-bridge": "3.4.40"
"symfony/console": "2.8.38"
},
"require-dev": {
"phpspec/prophecy": "^1.10",
"symfony/phpunit-bridge": "^3.4"
"symfony/phpunit-bridge": "^4.2"
},
"suggest": {
"ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
@ -6274,12 +6329,16 @@
"url": "https://packagist.com",
"type": "custom"
},
{
"url": "https://github.com/composer",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/composer/composer",
"type": "tidelift"
}
],
"time": "2020-05-06T08:28:10+00:00"
"time": "2020-08-03T09:35:19+00:00"
},
{
"name": "composer/semver",
@ -6344,16 +6403,16 @@
},
{
"name": "composer/spdx-licenses",
"version": "1.5.3",
"version": "1.5.4",
"source": {
"type": "git",
"url": "https://github.com/composer/spdx-licenses.git",
"reference": "0c3e51e1880ca149682332770e25977c70cf9dae"
"reference": "6946f785871e2314c60b4524851f3702ea4f2223"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/composer/spdx-licenses/zipball/0c3e51e1880ca149682332770e25977c70cf9dae",
"reference": "0c3e51e1880ca149682332770e25977c70cf9dae",
"url": "https://api.github.com/repos/composer/spdx-licenses/zipball/6946f785871e2314c60b4524851f3702ea4f2223",
"reference": "6946f785871e2314c60b4524851f3702ea4f2223",
"shasum": ""
},
"require": {
@ -6400,20 +6459,34 @@
"spdx",
"validator"
],
"time": "2020-02-14T07:44:31+00:00"
"funding": [
{
"url": "https://packagist.com",
"type": "custom"
},
{
"url": "https://github.com/composer",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/composer/composer",
"type": "tidelift"
}
],
"time": "2020-07-15T15:35:07+00:00"
},
{
"name": "composer/xdebug-handler",
"version": "1.4.2",
"version": "1.4.3",
"source": {
"type": "git",
"url": "https://github.com/composer/xdebug-handler.git",
"reference": "fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51"
"reference": "ebd27a9866ae8254e873866f795491f02418c5a5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/composer/xdebug-handler/zipball/fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51",
"reference": "fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51",
"url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ebd27a9866ae8254e873866f795491f02418c5a5",
"reference": "ebd27a9866ae8254e873866f795491f02418c5a5",
"shasum": ""
},
"require": {
@ -6458,7 +6531,7 @@
"type": "tidelift"
}
],
"time": "2020-06-04T11:16:35+00:00"
"time": "2020-08-19T10:27:58+00:00"
},
{
"name": "doctrine/annotations",
@ -7128,16 +7201,16 @@
},
{
"name": "justinrainbow/json-schema",
"version": "5.2.9",
"version": "5.2.10",
"source": {
"type": "git",
"url": "https://github.com/justinrainbow/json-schema.git",
"reference": "44c6787311242a979fa15c704327c20e7221a0e4"
"reference": "2ba9c8c862ecd5510ed16c6340aa9f6eadb4f31b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/44c6787311242a979fa15c704327c20e7221a0e4",
"reference": "44c6787311242a979fa15c704327c20e7221a0e4",
"url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/2ba9c8c862ecd5510ed16c6340aa9f6eadb4f31b",
"reference": "2ba9c8c862ecd5510ed16c6340aa9f6eadb4f31b",
"shasum": ""
},
"require": {
@ -7190,7 +7263,7 @@
"json",
"schema"
],
"time": "2019-09-25T14:49:45+00:00"
"time": "2020-05-27T16:41:55+00:00"
},
{
"name": "maximebf/debugbar",
@ -8835,16 +8908,16 @@
},
{
"name": "seld/jsonlint",
"version": "1.8.0",
"version": "1.8.1",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/jsonlint.git",
"reference": "ff2aa5420bfbc296cf6a0bc785fa5b35736de7c1"
"reference": "3d5eb71705adfa34bd34b993400622932b2f62fd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/ff2aa5420bfbc296cf6a0bc785fa5b35736de7c1",
"reference": "ff2aa5420bfbc296cf6a0bc785fa5b35736de7c1",
"url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/3d5eb71705adfa34bd34b993400622932b2f62fd",
"reference": "3d5eb71705adfa34bd34b993400622932b2f62fd",
"shasum": ""
},
"require": {
@ -8890,20 +8963,20 @@
"type": "tidelift"
}
],
"time": "2020-04-30T19:05:18+00:00"
"time": "2020-08-13T09:07:59+00:00"
},
{
"name": "seld/phar-utils",
"version": "1.1.0",
"version": "1.1.1",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/phar-utils.git",
"reference": "8800503d56b9867d43d9c303b9cbcc26016e82f0"
"reference": "8674b1d84ffb47cc59a101f5d5a3b61e87d23796"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/8800503d56b9867d43d9c303b9cbcc26016e82f0",
"reference": "8800503d56b9867d43d9c303b9cbcc26016e82f0",
"url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/8674b1d84ffb47cc59a101f5d5a3b61e87d23796",
"reference": "8674b1d84ffb47cc59a101f5d5a3b61e87d23796",
"shasum": ""
},
"require": {
@ -8934,11 +9007,11 @@
"keywords": [
"phar"
],
"time": "2020-02-14T15:25:33+00:00"
"time": "2020-07-07T18:42:57+00:00"
},
{
"name": "symfony/filesystem",
"version": "v5.1.2",
"version": "v5.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",

4
package.json
View File

@ -15,7 +15,7 @@
"devDependencies": {
"@types/bootstrap": "^4.5.0",
"@types/cal-heatmap": "^3.3.10",
"@types/chart.js": "^2.9.23",
"@types/chart.js": "^2.9.24",
"@types/classnames": "^2.2.10",
"@types/clipboard": "^2.0.1",
"@types/jquery": "^3.3.38",
@ -24,7 +24,7 @@
"@types/react": "^16.9.35",
"@types/react-dom": "^16.9.8",
"@typescript-eslint/eslint-plugin": "^3.1.0",
"@typescript-eslint/parser": "^3.1.0",
"@typescript-eslint/parser": "^3.9.1",
"bootstrap": "^4.5.0",
"cal-heatmap": "^3.3.10",
"chart.js": "^2.7.1",

1
resources/assets/js/fetch.ts
View File

@ -67,5 +67,6 @@ export class ResponseError extends Error {
this.name = 'ResponseError';
this.response = response;
Object.setPrototypeOf(this, new.target.prototype);
}
}

9
resources/assets/js/tissue.ts
View File

@ -1,4 +1,4 @@
import { fetchGet } from './fetch';
import { fetchGet, ResponseError } from './fetch';
export function suicide<T>(e: T) {
return function (): never {
@ -15,7 +15,12 @@ export function linkCard(el: Element) {
}
fetchGet('/api/checkin/card', { url })
.then((response) => response.json())
.then((response) => {
if (response.ok) {
return response.json();
}
throw new ResponseError(response);
})
.then((data) => {
const metaColumn = el.querySelector('.col-12:last-of-type') || die();
const imageColumn = el.querySelector<HTMLElement>('.col-12:first-of-type') || die();

12
routes/api.php
View File

@ -15,12 +15,14 @@
// return $request->user();
//});
Route::get('/checkin/card', 'Api\\CardController@show')
->middleware('throttle:180,1,card');
Route::middleware('stateful')->group(function () {
Route::get('/checkin/card', 'Api\\CardController@show')
->middleware('throttle:30|180,1,card');
Route::middleware(['throttle:60,1', 'stateful', 'auth'])->group(function () {
Route::post('/likes', 'Api\\LikeController@store');
Route::delete('/likes/{id}', 'Api\\LikeController@destroy');
Route::middleware(['throttle:60,1', 'auth'])->group(function () {
Route::post('/likes', 'Api\\LikeController@store');
Route::delete('/likes/{id}', 'Api\\LikeController@destroy');
});
});
Route::post('/webhooks/checkin/{webhook}', 'Api\\WebhookController@checkin')

58
yarn.lock
View File

@ -1058,10 +1058,10 @@
dependencies:
"@types/d3" "^3"
"@types/chart.js@^2.9.23":
version "2.9.23"
resolved "https://registry.yarnpkg.com/@types/chart.js/-/chart.js-2.9.23.tgz#5de713e801f5aff4d042c7d49ab9691489c11848"
integrity sha512-4QQNE/b+digosu3mnj4E7aNQGKnlpzXa9JvQYPtexpO7v9gnDeqwc1DxF8vLJWLDCNoO6hH0EgO8K/7PtJl8wg==
"@types/chart.js@^2.9.24":
version "2.9.24"
resolved "https://registry.yarnpkg.com/@types/chart.js/-/chart.js-2.9.24.tgz#f044fde90c928cb054e2ea582eb68d9945d84bc6"
integrity sha512-AQI7X+ow3SaONl44JrHoL/5B+lCsJyG31UHZ5RP98Uh15hI/zjEkDsAb4EIm4P9TGfNhZLXw/nMc5w0u10+/fQ==
dependencies:
moment "^2.10.2"
@ -1212,16 +1212,33 @@
eslint-scope "^5.0.0"
eslint-utils "^2.0.0"
"@typescript-eslint/parser@^3.1.0":
version "3.1.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-3.1.0.tgz#9c02ba5d88ad2355672f39e6cd4176f172dd47f8"
integrity sha512-NcDSJK8qTA2tPfyGiPes9HtVKLbksmuYjlgGAUs7Ld2K0swdWibnCq9IJx9kJN8JJdgUJSorFiGaPHBgH81F/Q==
"@typescript-eslint/experimental-utils@3.9.1":
version "3.9.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-3.9.1.tgz#b140b2dc7a7554a44f8a86fb6fe7cbfe57ca059e"
integrity sha512-lkiZ8iBBaYoyEKhCkkw4SAeatXyBq9Ece5bZXdLe1LWBUwTszGbmbiqmQbwWA8cSYDnjWXp9eDbXpf9Sn0hLAg==
dependencies:
"@types/json-schema" "^7.0.3"
"@typescript-eslint/types" "3.9.1"
"@typescript-eslint/typescript-estree" "3.9.1"
eslint-scope "^5.0.0"
eslint-utils "^2.0.0"
"@typescript-eslint/parser@^3.9.1":
version "3.9.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-3.9.1.tgz#ab7983abaea0ae138ff5671c7c7739d8a191b181"
integrity sha512-y5QvPFUn4Vl4qM40lI+pNWhTcOWtpZAJ8pOEQ21fTTW4xTJkRplMjMRje7LYTXqVKKX9GJhcyweMz2+W1J5bMg==
dependencies:
"@types/eslint-visitor-keys" "^1.0.0"
"@typescript-eslint/experimental-utils" "3.1.0"
"@typescript-eslint/typescript-estree" "3.1.0"
"@typescript-eslint/experimental-utils" "3.9.1"
"@typescript-eslint/types" "3.9.1"
"@typescript-eslint/typescript-estree" "3.9.1"
eslint-visitor-keys "^1.1.0"
"@typescript-eslint/types@3.9.1":
version "3.9.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-3.9.1.tgz#b2a6eaac843cf2f2777b3f2464fb1fbce5111416"
integrity sha512-15JcTlNQE1BsYy5NBhctnEhEoctjXOjOK+Q+rk8ugC+WXU9rAcS2BYhoh6X4rOaXJEpIYDl+p7ix+A5U0BqPTw==
"@typescript-eslint/typescript-estree@3.1.0":
version "3.1.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-3.1.0.tgz#eaff52d31e615e05b894f8b9d2c3d8af152a5dd2"
@ -1235,6 +1252,27 @@
semver "^7.3.2"
tsutils "^3.17.1"
"@typescript-eslint/typescript-estree@3.9.1":
version "3.9.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-3.9.1.tgz#fd81cada74bc8a7f3a2345b00897acb087935779"
integrity sha512-IqM0gfGxOmIKPhiHW/iyAEXwSVqMmR2wJ9uXHNdFpqVvPaQ3dWg302vW127sBpAiqM9SfHhyS40NKLsoMpN2KA==
dependencies:
"@typescript-eslint/types" "3.9.1"
"@typescript-eslint/visitor-keys" "3.9.1"
debug "^4.1.1"
glob "^7.1.6"
is-glob "^4.0.1"
lodash "^4.17.15"
semver "^7.3.2"
tsutils "^3.17.1"
"@typescript-eslint/visitor-keys@3.9.1":
version "3.9.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-3.9.1.tgz#92af3747cdb71509199a8f7a4f00b41d636551d1"
integrity sha512-zxdtUjeoSh+prCpogswMwVUJfEFmCOjdzK9rpNjNBfm6EyPt99x3RrJoBOGZO23FCt0WPKUCOL5mb/9D5LjdwQ==
dependencies:
eslint-visitor-keys "^1.1.0"
"@vue/component-compiler-utils@^3.1.0":
version "3.1.1"
resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-3.1.1.tgz#d4ef8f80292674044ad6211e336a302e4d2a6575"