UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-10 00:34:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3560 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2022-06-23 01:13:06 -06:00 committed by GitHub
commit b48e67d098
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 60 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Api/ApiV1Controller.php
View file

@ -173,7 +173,7 @@ class ApiV1Controller extends Controller
'privacy' => $res['locked'] ? 'private' : 'public',
'sensitive' => false,
'language' => $user->language ?? 'en',
'note' => '',
'note' => strip_tags($res['note']),
'fields' => []
];

119
composer.lock generated
View file

@ -180,16 +180,16 @@
},
{
"name": "aws/aws-sdk-php",
"version": "3.225.2",
"version": "3.228.1",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
"reference": "f846724ad842916061127d20da4fe4e129f7d4b8"
"reference": "53b7f43945b19bb0700c75d4c5f130055096e817"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/f846724ad842916061127d20da4fe4e129f7d4b8",
"reference": "f846724ad842916061127d20da4fe4e129f7d4b8",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/53b7f43945b19bb0700c75d4c5f130055096e817",
"reference": "53b7f43945b19bb0700c75d4c5f130055096e817",
"shasum": ""
},
"require": {
@ -197,9 +197,9 @@
"ext-json": "*",
"ext-pcre": "*",
"ext-simplexml": "*",
"guzzlehttp/guzzle": "^5.3.3 || ^6.5.6 || ^7.4.3",
"guzzlehttp/guzzle": "^6.5.7 || ^7.4.4",
"guzzlehttp/promises": "^1.4.0",
"guzzlehttp/psr7": "^1.7.0 || ^2.1.1",
"guzzlehttp/psr7": "^1.8.5 || ^2.3",
"mtdowling/jmespath.php": "^2.6",
"php": ">=5.5"
},
@ -265,9 +265,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.225.2"
"source": "https://github.com/aws/aws-sdk-php/tree/3.228.1"
},
"time": "2022-06-10T19:03:26+00:00"
"time": "2022-06-22T18:16:48+00:00"
},
{
"name": "bacon/bacon-qr-code",
@ -1638,24 +1638,24 @@
},
{
"name": "guzzlehttp/guzzle",
"version": "6.5.7",
"version": "6.5.8",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
"reference": "724562fa861e21a4071c652c8a159934e4f05592"
"reference": "a52f0440530b54fa079ce76e8c5d196a42cad981"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/724562fa861e21a4071c652c8a159934e4f05592",
"reference": "724562fa861e21a4071c652c8a159934e4f05592",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/a52f0440530b54fa079ce76e8c5d196a42cad981",
"reference": "a52f0440530b54fa079ce76e8c5d196a42cad981",
"shasum": ""
},
"require": {
"ext-json": "*",
"guzzlehttp/promises": "^1.0",
"guzzlehttp/psr7": "^1.6.1",
"guzzlehttp/psr7": "^1.9",
"php": ">=5.5",
"symfony/polyfill-intl-idn": "^1.17.0"
"symfony/polyfill-intl-idn": "^1.17"
},
"require-dev": {
"ext-curl": "*",
@ -1733,7 +1733,7 @@
],
"support": {
"issues": "https://github.com/guzzle/guzzle/issues",
"source": "https://github.com/guzzle/guzzle/tree/6.5.7"
"source": "https://github.com/guzzle/guzzle/tree/6.5.8"
},
"funding": [
{
@ -1749,7 +1749,7 @@
"type": "tidelift"
}
],
"time": "2022-06-09T21:36:50+00:00"
"time": "2022-06-20T22:16:07+00:00"
},
{
"name": "guzzlehttp/promises",
@ -1837,16 +1837,16 @@
},
{
"name": "guzzlehttp/psr7",
"version": "1.8.5",
"version": "1.9.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
"reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268"
"reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/337e3ad8e5716c15f9657bd214d16cc5e69df268",
"reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/e98e3e6d4f86621a9b75f623996e6bbdeb4b9318",
"reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318",
"shasum": ""
},
"require": {
@ -1867,7 +1867,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.7-dev"
"dev-master": "1.9-dev"
}
},
"autoload": {
@ -1927,7 +1927,7 @@
],
"support": {
"issues": "https://github.com/guzzle/psr7/issues",
"source": "https://github.com/guzzle/psr7/tree/1.8.5"
"source": "https://github.com/guzzle/psr7/tree/1.9.0"
},
"funding": [
{
@ -1943,7 +1943,7 @@
"type": "tidelift"
}
],
"time": "2022-03-20T21:51:18+00:00"
"time": "2022-06-20T21:43:03+00:00"
},
{
"name": "intervention/image",
@ -2166,16 +2166,16 @@
},
{
"name": "laravel/framework",
"version": "v8.83.16",
"version": "v8.83.17",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "6be5abd144faf517879af7298e9d79f06f250f75"
"reference": "2cf142cd5100b02da248acad3988bdaba5635e16"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/6be5abd144faf517879af7298e9d79f06f250f75",
"reference": "6be5abd144faf517879af7298e9d79f06f250f75",
"url": "https://api.github.com/repos/laravel/framework/zipball/2cf142cd5100b02da248acad3988bdaba5635e16",
"reference": "2cf142cd5100b02da248acad3988bdaba5635e16",
"shasum": ""
},
"require": {
@ -2335,7 +2335,7 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2022-06-07T15:09:06+00:00"
"time": "2022-06-21T14:38:31+00:00"
},
{
"name": "laravel/helpers",
@ -2395,16 +2395,16 @@
},
{
"name": "laravel/horizon",
"version": "v5.9.7",
"version": "v5.9.8",
"source": {
"type": "git",
"url": "https://github.com/laravel/horizon.git",
"reference": "a98150769dc970972c30219662fe0e64259b733f"
"reference": "71291b2dc8172f46a8a503aee97b80d9a4139cdf"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/horizon/zipball/a98150769dc970972c30219662fe0e64259b733f",
"reference": "a98150769dc970972c30219662fe0e64259b733f",
"url": "https://api.github.com/repos/laravel/horizon/zipball/71291b2dc8172f46a8a503aee97b80d9a4139cdf",
"reference": "71291b2dc8172f46a8a503aee97b80d9a4139cdf",
"shasum": ""
},
"require": {
@ -2424,11 +2424,11 @@
"mockery/mockery": "^1.0",
"orchestra/testbench": "^6.0|^7.0",
"phpunit/phpunit": "^9.0",
"predis/predis": "^1.1"
"predis/predis": "^1.1|^2.0"
},
"suggest": {
"ext-redis": "Required to use the Redis PHP driver.",
"predis/predis": "Required when not using the Redis PHP driver (^1.1)."
"predis/predis": "Required when not using the Redis PHP driver (^1.1|^2.0)."
},
"type": "library",
"extra": {
@ -2466,9 +2466,9 @@
],
"support": {
"issues": "https://github.com/laravel/horizon/issues",
"source": "https://github.com/laravel/horizon/tree/v5.9.7"
"source": "https://github.com/laravel/horizon/tree/v5.9.8"
},
"time": "2022-04-20T18:07:08+00:00"
"time": "2022-06-08T13:23:36+00:00"
},
{
"name": "laravel/passport",
@ -4245,16 +4245,16 @@
},
{
"name": "nyholm/psr7",
"version": "1.5.0",
"version": "1.5.1",
"source": {
"type": "git",
"url": "https://github.com/Nyholm/psr7.git",
"reference": "1461e07a0f2a975a52082ca3b769ca912b816226"
"reference": "f734364e38a876a23be4d906a2a089e1315be18a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Nyholm/psr7/zipball/1461e07a0f2a975a52082ca3b769ca912b816226",
"reference": "1461e07a0f2a975a52082ca3b769ca912b816226",
"url": "https://api.github.com/repos/Nyholm/psr7/zipball/f734364e38a876a23be4d906a2a089e1315be18a",
"reference": "f734364e38a876a23be4d906a2a089e1315be18a",
"shasum": ""
},
"require": {
@ -4306,7 +4306,7 @@
],
"support": {
"issues": "https://github.com/Nyholm/psr7/issues",
"source": "https://github.com/Nyholm/psr7/tree/1.5.0"
"source": "https://github.com/Nyholm/psr7/tree/1.5.1"
},
"funding": [
{
@ -4318,7 +4318,7 @@
"type": "github"
}
],
"time": "2022-02-02T18:37:57+00:00"
"time": "2022-06-22T07:13:36+00:00"
},
{
"name": "opis/closure",
@ -4387,16 +4387,16 @@
},
{
"name": "paragonie/constant_time_encoding",
"version": "v2.6.1",
"version": "v2.6.3",
"source": {
"type": "git",
"url": "https://github.com/paragonie/constant_time_encoding.git",
"reference": "d6e1d5d0fb2458dfdd7018ec2f74be120353a3b9"
"reference": "58c3f47f650c94ec05a151692652a868995d2938"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/d6e1d5d0fb2458dfdd7018ec2f74be120353a3b9",
"reference": "d6e1d5d0fb2458dfdd7018ec2f74be120353a3b9",
"url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/58c3f47f650c94ec05a151692652a868995d2938",
"reference": "58c3f47f650c94ec05a151692652a868995d2938",
"shasum": ""
},
"require": {
@ -4450,7 +4450,7 @@
"issues": "https://github.com/paragonie/constant_time_encoding/issues",
"source": "https://github.com/paragonie/constant_time_encoding"
},
"time": "2022-06-11T00:43:46+00:00"
"time": "2022-06-14T06:56:20+00:00"
},
{
"name": "paragonie/random_compat",
@ -5086,16 +5086,16 @@
},
{
"name": "pragmarx/google2fa",
"version": "8.0.0",
"version": "v8.0.1",
"source": {
"type": "git",
"url": "https://github.com/antonioribeiro/google2fa.git",
"reference": "26c4c5cf30a2844ba121760fd7301f8ad240100b"
"reference": "80c3d801b31fe165f8fe99ea085e0a37834e1be3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/antonioribeiro/google2fa/zipball/26c4c5cf30a2844ba121760fd7301f8ad240100b",
"reference": "26c4c5cf30a2844ba121760fd7301f8ad240100b",
"url": "https://api.github.com/repos/antonioribeiro/google2fa/zipball/80c3d801b31fe165f8fe99ea085e0a37834e1be3",
"reference": "80c3d801b31fe165f8fe99ea085e0a37834e1be3",
"shasum": ""
},
"require": {
@ -5132,9 +5132,9 @@
],
"support": {
"issues": "https://github.com/antonioribeiro/google2fa/issues",
"source": "https://github.com/antonioribeiro/google2fa/tree/8.0.0"
"source": "https://github.com/antonioribeiro/google2fa/tree/v8.0.1"
},
"time": "2020-04-05T10:47:18+00:00"
"time": "2022-06-13T21:57:56+00:00"
},
{
"name": "predis/predis",
@ -10594,16 +10594,16 @@
},
{
"name": "phpunit/phpunit",
"version": "9.5.20",
"version": "9.5.21",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba"
"reference": "0e32b76be457de00e83213528f6bb37e2a38fcb1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/12bc8879fb65aef2138b26fc633cb1e3620cffba",
"reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0e32b76be457de00e83213528f6bb37e2a38fcb1",
"reference": "0e32b76be457de00e83213528f6bb37e2a38fcb1",
"shasum": ""
},
"require": {
@ -10637,7 +10637,6 @@
"sebastian/version": "^3.0.2"
},
"require-dev": {
"ext-pdo": "*",
"phpspec/prophecy-phpunit": "^2.0.1"
},
"suggest": {
@ -10681,7 +10680,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.20"
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.21"
},
"funding": [
{
@ -10693,7 +10692,7 @@
"type": "github"
}
],
"time": "2022-04-01T12:37:26+00:00"
"time": "2022-06-19T12:14:25+00:00"
},
{
"name": "sebastian/cli-parser",