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

Merge pull request #4223 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2023-03-04 15:17:24 -07:00 committed by GitHub
commit e8f1d11b3d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 209 additions and 208 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -117,6 +117,7 @@
- Update FollowPipeline, fix followers_count and following_count counters ([6153b620](https://github.com/pixelfed/pixelfed/commit/6153b620)) - Update FollowPipeline, fix followers_count and following_count counters ([6153b620](https://github.com/pixelfed/pixelfed/commit/6153b620))
- Update ApiV1Controller, fix media update. Fixes #4196 ([f3164650](https://github.com/pixelfed/pixelfed/commit/f3164650)) - Update ApiV1Controller, fix media update. Fixes #4196 ([f3164650](https://github.com/pixelfed/pixelfed/commit/f3164650))
- Update SearchApiV2Service, fix hashtag search. ([1992b5bc](https://github.com/pixelfed/pixelfed/commit/1992b5bc)) - Update SearchApiV2Service, fix hashtag search. ([1992b5bc](https://github.com/pixelfed/pixelfed/commit/1992b5bc))
- Update ApiV1Controller, allow optional mastodonMode on v2/search endpoint. ([f4a69631](https://github.com/pixelfed/pixelfed/commit/f4a69631))
- ([](https://github.com/pixelfed/pixelfed/commit/)) - ([](https://github.com/pixelfed/pixelfed/commit/))
## [v0.11.4 (2022-10-04)](https://github.com/pixelfed/pixelfed/compare/v0.11.3...v0.11.4) ## [v0.11.4 (2022-10-04)](https://github.com/pixelfed/pixelfed/compare/v0.11.3...v0.11.4)

6
app/Http/Controllers/AccountController.php
View file

@ -479,6 +479,12 @@ class AccountController extends Controller
if($trustDevice == true) { if($trustDevice == true) {
$request->session()->put('sudoTrustDevice', 1); $request->session()->put('sudoTrustDevice', 1);
} }
//Fix wrong scheme when using reverse proxy
if(!str_contains($next, 'https') && config('instance.force_https_urls', true)) {
$next = Str::of($next)->replace('http', 'https')->toString();
}
return redirect($next); return redirect($next);
} else { } else {
return redirect() return redirect()

8
app/Http/Controllers/AdminController.php
View file

@ -42,13 +42,13 @@ use App\Models\CustomEmoji;
class AdminController extends Controller class AdminController extends Controller
{ {
use AdminReportController, use AdminReportController,
AdminDirectoryController, AdminDirectoryController,
AdminDiscoverController, AdminDiscoverController,
AdminHashtagsController, AdminHashtagsController,
// AdminGroupsController, // AdminGroupsController,
AdminMediaController, AdminMediaController,
AdminSettingsController, AdminSettingsController,
AdminInstanceController, AdminInstanceController,
// AdminStorageController, // AdminStorageController,
AdminUserController; AdminUserController;
@ -523,7 +523,7 @@ class AdminController extends Controller
->whereShortcode($request->input('shortcode')); ->whereShortcode($request->input('shortcode'));
}) })
], ],
'emoji' => 'required|file|mimetypes:jpg,png|max:' . (config('federation.custom_emoji.max_size') / 1000) 'emoji' => 'required|file|mimes:jpg,png|max:' . (config('federation.custom_emoji.max_size') / 1000)
]); ]);
$emoji = new CustomEmoji; $emoji = new CustomEmoji;

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

@ -3172,7 +3172,8 @@ class ApiV1Controller extends Controller
'following' => 'nullable' 'following' => 'nullable'
]); ]);
return $this->json(SearchApiV2Service::query($request, true)); $mastodonMode = !$request->has('_pe');
return $this->json(SearchApiV2Service::query($request, $mastodonMode));
} }
/** /**

1
app/Services/SearchApiV2Service.php
View file

@ -131,6 +131,7 @@ class SearchApiV2Service
return $q->where('can_search', true) return $q->where('can_search', true)
->orWhereNull('can_search'); ->orWhereNull('can_search');
}) })
->orderByDesc('cached_count')
->offset($offset) ->offset($offset)
->limit($limit) ->limit($limit)
->get() ->get()

4
app/Util/Site/Nodeinfo.php
View file

@ -56,10 +56,10 @@ class Nodeinfo {
'version' => config('pixelfed.version'), 'version' => config('pixelfed.version'),
], ],
'usage' => [ 'usage' => [
'localPosts' => $statuses, 'localPosts' => (int) $statuses,
'localComments' => 0, 'localComments' => 0,
'users' => [ 'users' => [
'total' => $users, 'total' => (int) $users,
'activeHalfyear' => (int) $activeHalfYear, 'activeHalfyear' => (int) $activeHalfYear,
'activeMonth' => (int) $activeMonth, 'activeMonth' => (int) $activeMonth,
], ],

97
composer.lock generated
View file

@ -114,16 +114,16 @@
}, },
{ {
"name": "aws/aws-sdk-php", "name": "aws/aws-sdk-php",
"version": "3.261.1", "version": "3.261.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/aws/aws-sdk-php.git", "url": "https://github.com/aws/aws-sdk-php.git",
"reference": "cb7f6d7ca313bfd3135ff23c49d734c1a7616d6a" "reference": "31bc1e2a528c0f0881e4366d8ee0fa729cd42b00"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/cb7f6d7ca313bfd3135ff23c49d734c1a7616d6a", "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/31bc1e2a528c0f0881e4366d8ee0fa729cd42b00",
"reference": "cb7f6d7ca313bfd3135ff23c49d734c1a7616d6a", "reference": "31bc1e2a528c0f0881e4366d8ee0fa729cd42b00",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -202,9 +202,9 @@
"support": { "support": {
"forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
"issues": "https://github.com/aws/aws-sdk-php/issues", "issues": "https://github.com/aws/aws-sdk-php/issues",
"source": "https://github.com/aws/aws-sdk-php/tree/3.261.1" "source": "https://github.com/aws/aws-sdk-php/tree/3.261.4"
}, },
"time": "2023-02-28T19:22:11+00:00" "time": "2023-03-03T19:22:53+00:00"
}, },
{ {
"name": "bacon/bacon-qr-code", "name": "bacon/bacon-qr-code",
@ -538,21 +538,24 @@
}, },
{ {
"name": "dasprid/enum", "name": "dasprid/enum",
"version": "1.0.3", "version": "1.0.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/DASPRiD/Enum.git", "url": "https://github.com/DASPRiD/Enum.git",
"reference": "5abf82f213618696dda8e3bf6f64dd042d8542b2" "reference": "8e6b6ea76eabbf19ea2bf5b67b98e1860474012f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/DASPRiD/Enum/zipball/5abf82f213618696dda8e3bf6f64dd042d8542b2", "url": "https://api.github.com/repos/DASPRiD/Enum/zipball/8e6b6ea76eabbf19ea2bf5b67b98e1860474012f",
"reference": "5abf82f213618696dda8e3bf6f64dd042d8542b2", "reference": "8e6b6ea76eabbf19ea2bf5b67b98e1860474012f",
"shasum": "" "shasum": ""
}, },
"require": {
"php": ">=7.1 <9.0"
},
"require-dev": { "require-dev": {
"phpunit/phpunit": "^7 | ^8 | ^9", "phpunit/phpunit": "^7 | ^8 | ^9",
"squizlabs/php_codesniffer": "^3.4" "squizlabs/php_codesniffer": "*"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
@ -579,9 +582,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/DASPRiD/Enum/issues", "issues": "https://github.com/DASPRiD/Enum/issues",
"source": "https://github.com/DASPRiD/Enum/tree/1.0.3" "source": "https://github.com/DASPRiD/Enum/tree/1.0.4"
}, },
"time": "2020-10-02T16:03:48+00:00" "time": "2023-03-01T18:44:03+00:00"
}, },
{ {
"name": "defuse/php-encryption", "name": "defuse/php-encryption",
@ -5521,33 +5524,27 @@
}, },
{ {
"name": "predis/predis", "name": "predis/predis",
"version": "v2.1.1", "version": "v2.1.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/predis/predis.git", "url": "https://github.com/predis/predis.git",
"reference": "c5b60884e89630f9518a7919f0566db438f0fc9a" "reference": "a77a43913a74f9331f637bb12867eb8e274814e5"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/predis/predis/zipball/c5b60884e89630f9518a7919f0566db438f0fc9a", "url": "https://api.github.com/repos/predis/predis/zipball/a77a43913a74f9331f637bb12867eb8e274814e5",
"reference": "c5b60884e89630f9518a7919f0566db438f0fc9a", "reference": "a77a43913a74f9331f637bb12867eb8e274814e5",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.2 || ^8.0" "php": "^7.2 || ^8.0"
}, },
"require-dev": { "require-dev": {
"friendsofphp/php-cs-fixer": "^3.3",
"phpstan/phpstan": "^1.9",
"phpunit/phpunit": "^8.0 || ~9.4.4" "phpunit/phpunit": "^8.0 || ~9.4.4"
}, },
"suggest": {
"ext-curl": "Allows access to Webdis when paired with phpiredis"
},
"type": "library", "type": "library",
"extra": {
"branch-alias": {
"dev-main": "2.0-dev"
}
},
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"Predis\\": "src/" "Predis\\": "src/"
@ -5562,12 +5559,6 @@
"name": "Till Krüss", "name": "Till Krüss",
"homepage": "https://till.im", "homepage": "https://till.im",
"role": "Maintainer" "role": "Maintainer"
},
{
"name": "Daniele Alessandri",
"email": "suppakilla@gmail.com",
"homepage": "http://clorophilla.net",
"role": "Creator"
} }
], ],
"description": "A flexible and feature-complete Redis client for PHP.", "description": "A flexible and feature-complete Redis client for PHP.",
@ -5579,7 +5570,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/predis/predis/issues", "issues": "https://github.com/predis/predis/issues",
"source": "https://github.com/predis/predis/tree/v2.1.1" "source": "https://github.com/predis/predis/tree/v2.1.2"
}, },
"funding": [ "funding": [
{ {
@ -5587,7 +5578,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2023-01-17T20:57:35+00:00" "time": "2023-03-02T18:32:04+00:00"
}, },
{ {
"name": "psr/cache", "name": "psr/cache",
@ -10899,16 +10890,16 @@
"packages-dev": [ "packages-dev": [
{ {
"name": "brianium/paratest", "name": "brianium/paratest",
"version": "v6.9.0", "version": "v6.9.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/paratestphp/paratest.git", "url": "https://github.com/paratestphp/paratest.git",
"reference": "6f90dcaf14077a64c966936584b301dd4d01a440" "reference": "51691208db882922c55d6c465be3e7d95028c449"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/paratestphp/paratest/zipball/6f90dcaf14077a64c966936584b301dd4d01a440", "url": "https://api.github.com/repos/paratestphp/paratest/zipball/51691208db882922c55d6c465be3e7d95028c449",
"reference": "6f90dcaf14077a64c966936584b301dd4d01a440", "reference": "51691208db882922c55d6c465be3e7d95028c449",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -10919,22 +10910,22 @@
"fidry/cpu-core-counter": "^0.4.1 || ^0.5.1", "fidry/cpu-core-counter": "^0.4.1 || ^0.5.1",
"jean85/pretty-package-versions": "^2.0.5", "jean85/pretty-package-versions": "^2.0.5",
"php": "^7.3 || ^8.0", "php": "^7.3 || ^8.0",
"phpunit/php-code-coverage": "^9.2.24", "phpunit/php-code-coverage": "^9.2.25",
"phpunit/php-file-iterator": "^3.0.6", "phpunit/php-file-iterator": "^3.0.6",
"phpunit/php-timer": "^5.0.3", "phpunit/php-timer": "^5.0.3",
"phpunit/phpunit": "^9.6.3", "phpunit/phpunit": "^9.6.4",
"sebastian/environment": "^5.1.4", "sebastian/environment": "^5.1.5",
"symfony/console": "^5.4.16 || ^6.2.5", "symfony/console": "^5.4.21 || ^6.2.7",
"symfony/process": "^5.4.11 || ^6.2.5" "symfony/process": "^5.4.21 || ^6.2.7"
}, },
"require-dev": { "require-dev": {
"doctrine/coding-standard": "^10.0.0", "doctrine/coding-standard": "^10.0.0",
"ext-pcov": "*", "ext-pcov": "*",
"ext-posix": "*", "ext-posix": "*",
"infection/infection": "^0.26.19", "infection/infection": "^0.26.19",
"squizlabs/php_codesniffer": "^3.7.1", "squizlabs/php_codesniffer": "^3.7.2",
"symfony/filesystem": "^5.4.13 || ^6.2.5", "symfony/filesystem": "^5.4.21 || ^6.2.7",
"vimeo/psalm": "^5.6" "vimeo/psalm": "^5.7.7"
}, },
"bin": [ "bin": [
"bin/paratest", "bin/paratest",
@ -10975,7 +10966,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/paratestphp/paratest/issues", "issues": "https://github.com/paratestphp/paratest/issues",
"source": "https://github.com/paratestphp/paratest/tree/v6.9.0" "source": "https://github.com/paratestphp/paratest/tree/v6.9.1"
}, },
"funding": [ "funding": [
{ {
@ -10987,7 +10978,7 @@
"type": "paypal" "type": "paypal"
} }
], ],
"time": "2023-02-07T10:03:32+00:00" "time": "2023-03-03T09:35:17+00:00"
}, },
{ {
"name": "doctrine/instantiator", "name": "doctrine/instantiator",
@ -11190,16 +11181,16 @@
}, },
{ {
"name": "filp/whoops", "name": "filp/whoops",
"version": "2.14.6", "version": "2.15.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/filp/whoops.git", "url": "https://github.com/filp/whoops.git",
"reference": "f7948baaa0330277c729714910336383286305da" "reference": "3e8aebbca9f0ae6f618962c4ad514077fd365ab3"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/filp/whoops/zipball/f7948baaa0330277c729714910336383286305da", "url": "https://api.github.com/repos/filp/whoops/zipball/3e8aebbca9f0ae6f618962c4ad514077fd365ab3",
"reference": "f7948baaa0330277c729714910336383286305da", "reference": "3e8aebbca9f0ae6f618962c4ad514077fd365ab3",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -11249,7 +11240,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/filp/whoops/issues", "issues": "https://github.com/filp/whoops/issues",
"source": "https://github.com/filp/whoops/tree/2.14.6" "source": "https://github.com/filp/whoops/tree/2.15.0"
}, },
"funding": [ "funding": [
{ {
@ -11257,7 +11248,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2022-11-02T16:23:29+00:00" "time": "2023-03-03T12:00:00+00:00"
}, },
{ {
"name": "hamcrest/hamcrest-php", "name": "hamcrest/hamcrest-php",

1
config/backup.php
View file

@ -28,6 +28,7 @@ return [
*/ */
'exclude' => [ 'exclude' => [
base_path('.git'), base_path('.git'),
base_path('storage/app/public/cache'),
base_path('vendor'), base_path('vendor'),
base_path('node_modules'), base_path('node_modules'),
], ],

60
package-lock.json generated
View file

@ -2048,9 +2048,9 @@
"integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==" "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA=="
}, },
"node_modules/@types/node": { "node_modules/@types/node": {
"version": "18.14.2", "version": "18.14.6",
"resolved": "https://registry.npmjs.org/@types/node/-/node-18.14.2.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-18.14.6.tgz",
"integrity": "sha512-1uEQxww3DaghA0RxqHx0O0ppVlo43pJhepY51OxuQIKHpjbnYLA7vcdwioNPzIqmC2u3I/dmylcqjlh0e7AyUA==" "integrity": "sha512-93+VvleD3mXwlLI/xASjw0FzKcwzl3OdTCzm1LaRfqgS21gfFtK3zDXM5Op9TeeMsJVOaJ2VRDpT9q4Y3d0AvA=="
}, },
"node_modules/@types/parse-json": { "node_modules/@types/parse-json": {
"version": "4.0.0", "version": "4.0.0",
@ -3046,9 +3046,9 @@
} }
}, },
"node_modules/caniuse-lite": { "node_modules/caniuse-lite": {
"version": "1.0.30001458", "version": "1.0.30001460",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001458.tgz", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001460.tgz",
"integrity": "sha512-lQ1VlUUq5q9ro9X+5gOEyH7i3vm+AYVT1WDCVB69XOZ17KZRhnZ9J0Sqz7wTHQaLBJccNCHq8/Ww5LlOIZbB0w==", "integrity": "sha512-Bud7abqjvEjipUkpLs4D7gR0l8hBYBHoa+tGtKJHvT2AYzLp1z7EmVkUT4ERpVUfca8S2HGIVs883D8pUH1ZzQ==",
"funding": [ "funding": [
{ {
"type": "opencollective", "type": "opencollective",
@ -4053,9 +4053,9 @@
"integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
}, },
"node_modules/electron-to-chromium": { "node_modules/electron-to-chromium": {
"version": "1.4.314", "version": "1.4.320",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.314.tgz", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.320.tgz",
"integrity": "sha512-+3RmNVx9hZLlc0gW//4yep0K5SYKmIvB5DXg1Yg6varsuAHlHwTeqeygfS8DWwLCsNOWrgj+p9qgM5WYjw1lXQ==" "integrity": "sha512-h70iRscrNluMZPVICXYl5SSB+rBKo22XfuIS1ER0OQxQZpKTnFpuS6coj7wY9M/3trv7OR88rRMOlKmRvDty7Q=="
}, },
"node_modules/elliptic": { "node_modules/elliptic": {
"version": "6.5.4", "version": "6.5.4",
@ -5714,9 +5714,9 @@
"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
}, },
"node_modules/lilconfig": { "node_modules/lilconfig": {
"version": "2.0.6", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.6.tgz", "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
"integrity": "sha512-9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg==", "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==",
"engines": { "engines": {
"node": ">=10" "node": ">=10"
} }
@ -7278,9 +7278,9 @@
} }
}, },
"node_modules/pusher-js/node_modules/@types/node": { "node_modules/pusher-js/node_modules/@types/node": {
"version": "14.18.36", "version": "14.18.37",
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.36.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.37.tgz",
"integrity": "sha512-FXKWbsJ6a1hIrRxv+FoukuHnGTgEzKYGi7kilfMae96AL9UNkPFNWJEEYWzdRI9ooIkbr4AKldyuSTLql06vLQ==", "integrity": "sha512-7GgtHCs/QZrBrDzgIJnQtuSvhFSwhyYSI2uafSwZoNt1iOGhEN5fwNrQMjtONyHm9+/LoA4453jH0CMYcr06Pg==",
"dev": true "dev": true
}, },
"node_modules/qs": { "node_modules/qs": {
@ -10860,9 +10860,9 @@
"integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==" "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA=="
}, },
"@types/node": { "@types/node": {
"version": "18.14.2", "version": "18.14.6",
"resolved": "https://registry.npmjs.org/@types/node/-/node-18.14.2.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-18.14.6.tgz",
"integrity": "sha512-1uEQxww3DaghA0RxqHx0O0ppVlo43pJhepY51OxuQIKHpjbnYLA7vcdwioNPzIqmC2u3I/dmylcqjlh0e7AyUA==" "integrity": "sha512-93+VvleD3mXwlLI/xASjw0FzKcwzl3OdTCzm1LaRfqgS21gfFtK3zDXM5Op9TeeMsJVOaJ2VRDpT9q4Y3d0AvA=="
}, },
"@types/parse-json": { "@types/parse-json": {
"version": "4.0.0", "version": "4.0.0",
@ -11684,9 +11684,9 @@
} }
}, },
"caniuse-lite": { "caniuse-lite": {
"version": "1.0.30001458", "version": "1.0.30001460",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001458.tgz", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001460.tgz",
"integrity": "sha512-lQ1VlUUq5q9ro9X+5gOEyH7i3vm+AYVT1WDCVB69XOZ17KZRhnZ9J0Sqz7wTHQaLBJccNCHq8/Ww5LlOIZbB0w==" "integrity": "sha512-Bud7abqjvEjipUkpLs4D7gR0l8hBYBHoa+tGtKJHvT2AYzLp1z7EmVkUT4ERpVUfca8S2HGIVs883D8pUH1ZzQ=="
}, },
"chalk": { "chalk": {
"version": "4.1.2", "version": "4.1.2",
@ -12459,9 +12459,9 @@
"integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
}, },
"electron-to-chromium": { "electron-to-chromium": {
"version": "1.4.314", "version": "1.4.320",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.314.tgz", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.320.tgz",
"integrity": "sha512-+3RmNVx9hZLlc0gW//4yep0K5SYKmIvB5DXg1Yg6varsuAHlHwTeqeygfS8DWwLCsNOWrgj+p9qgM5WYjw1lXQ==" "integrity": "sha512-h70iRscrNluMZPVICXYl5SSB+rBKo22XfuIS1ER0OQxQZpKTnFpuS6coj7wY9M/3trv7OR88rRMOlKmRvDty7Q=="
}, },
"elliptic": { "elliptic": {
"version": "6.5.4", "version": "6.5.4",
@ -13688,9 +13688,9 @@
} }
}, },
"lilconfig": { "lilconfig": {
"version": "2.0.6", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.6.tgz", "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
"integrity": "sha512-9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg==" "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ=="
}, },
"lines-and-columns": { "lines-and-columns": {
"version": "1.2.4", "version": "1.2.4",
@ -14782,9 +14782,9 @@
}, },
"dependencies": { "dependencies": {
"@types/node": { "@types/node": {
"version": "14.18.36", "version": "14.18.37",
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.36.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.37.tgz",
"integrity": "sha512-FXKWbsJ6a1hIrRxv+FoukuHnGTgEzKYGi7kilfMae96AL9UNkPFNWJEEYWzdRI9ooIkbr4AKldyuSTLql06vLQ==", "integrity": "sha512-7GgtHCs/QZrBrDzgIJnQtuSvhFSwhyYSI2uafSwZoNt1iOGhEN5fwNrQMjtONyHm9+/LoA4453jH0CMYcr06Pg==",
"dev": true "dev": true
} }
} }

BIN
public/js/spa.js vendored
View file

Binary file not shown.

BIN
public/mix-manifest.json
View file

Binary file not shown.

236
resources/lang/sv/web.php
View file

@ -3,184 +3,184 @@
return [ return [
'common' => [ 'common' => [
'comment' => 'Comment', 'comment' => 'Kommentera',
'commented' => 'Commented', 'commented' => 'Kommenterade',
'comments' => 'Comments', 'comments' => 'Kommentarer',
'like' => 'Like', 'like' => 'Gilla',
'liked' => 'Liked', 'liked' => 'Gillade',
'likes' => 'Likes', 'likes' => 'Gillar-markeringar',
'share' => 'Share', 'share' => 'Dela',
'shared' => 'Shared', 'shared' => 'Delade',
'shares' => 'Shares', 'shares' => 'Delningar',
'unshare' => 'Unshare', 'unshare' => 'Sluta dela',
'cancel' => 'Cancel', 'cancel' => 'Avbryt',
'copyLink' => 'Copy Link', 'copyLink' => 'Kopiera länk',
'delete' => 'Delete', 'delete' => 'Ta bort',
'error' => 'Error', 'error' => 'Fel',
'errorMsg' => 'Something went wrong. Please try again later.', 'errorMsg' => 'Något gick fel. Försök igen senare',
'oops' => 'Oops!', 'oops' => 'Oops!',
'other' => 'Other', 'other' => 'Andra',
'readMore' => 'Read more', 'readMore' => 'Läs mer',
'success' => 'Success', 'success' => 'Lyckades',
'sensitive' => 'Sensitive', 'sensitive' => 'Känsligt',
'sensitiveContent' => 'Sensitive Content', 'sensitiveContent' => 'Känsligt innehåll',
'sensitiveContentWarning' => 'This post may contain sensitive content', 'sensitiveContentWarning' => 'TDet här inlägget kan innehålla känsligt innehåll',
], ],
'site' => [ 'site' => [
'terms' => 'Terms of Use', 'terms' => 'Villkor',
'privacy' => 'Privacy Policy', 'privacy' => 'Integritetspolicy',
], ],
'navmenu' => [ 'navmenu' => [
'search' => 'Search', 'search' => 'Sök',
'admin' => 'Admin Dashboard', 'admin' => 'Admin Panel',
// Timelines // Timelines
'homeFeed' => 'Home Feed', 'homeFeed' => 'Hemflödet',
'localFeed' => 'Local Feed', 'localFeed' => 'Lokala flödet',
'globalFeed' => 'Global Feed', 'globalFeed' => 'Globala flödet',
// Core features // Core features
'discover' => 'Discover', 'discover' => 'Utforska',
'directMessages' => 'Direct Messages', 'directMessages' => 'Direktmeddelanden',
'notifications' => 'Notifications', 'notifications' => 'Notifikationer',
'groups' => 'Groups', 'groups' => 'Grupper',
'stories' => 'Stories', 'stories' => 'Stories',
// Self links // Self links
'profile' => 'Profile', 'profile' => 'Profil',
'drive' => 'Drive', 'drive' => 'Drive',
'settings' => 'Settings', 'settings' => 'Inställningar',
'compose' => 'Create New', 'compose' => 'Skapa nytt',
'logout' => 'Logout', 'logout' => 'Logga ut',
// Nav footer // Nav footer
'about' => 'About', 'about' => 'Om',
'help' => 'Help', 'help' => 'Hjälp',
'language' => 'Language', 'language' => 'Språk',
'privacy' => 'Privacy', 'privacy' => 'Integritet',
'terms' => 'Terms', 'terms' => 'Vilkor',
// Temporary links // Temporary links
'backToPreviousDesign' => 'Go back to previous design' 'backToPreviousDesign' => 'Gå tillbaka till den gamla designen'
], ],
'directMessages' => [ 'directMessages' => [
'inbox' => 'Inbox', 'inbox' => 'Inkorg',
'sent' => 'Sent', 'sent' => 'Skickat',
'requests' => 'Requests' 'requests' => 'Förfrågningar'
], ],
'notifications' => [ 'notifications' => [
'liked' => 'liked your', 'liked' => 'gillade ditt',
'commented' => 'commented on your', 'commented' => 'kommenterade på ditt',
'reacted' => 'reacted to your', 'reacted' => 'reagerade på ditt',
'shared' => 'shared your', 'shared' => 'delade ditt',
'tagged' => 'tagged you in a', 'tagged' => 'taggade dig i en',
'updatedA' => 'updated a', 'updatedA' => 'uppdaterade en',
'sentA' => 'sent a', 'sentA' => 'skickade en',
'followed' => 'followed', 'followed' => 'följer',
'mentioned' => 'mentioned', 'mentioned' => 'nämnde',
'you' => 'you', 'you' => 'dig',
'yourApplication' => 'Your application to join', 'yourApplication' => 'Din ansökan att gå med',
'applicationApproved' => 'was approved!', 'applicationApproved' => 'blev godkänd!',
'applicationRejected' => 'was rejected. You can re-apply to join in 6 months.', 'applicationRejected' => 'blev nekad. Du kan ansöka igen om 6 månader.',
'dm' => 'dm', 'dm' => 'dm',
'groupPost' => 'group post', 'groupPost' => 'grupp inlägg',
'modlog' => 'modlog', 'modlog' => 'modlog',
'post' => 'post', 'post' => 'inlägg',
'story' => 'story', 'story' => 'story',
], ],
'post' => [ 'post' => [
'shareToFollowers' => 'Share to followers', 'shareToFollowers' => 'Dela till följare',
'shareToOther' => 'Share to other', 'shareToOther' => 'Dela till andra',
'noLikes' => 'No likes yet', 'noLikes' => 'Inga gilla-markeringar än',
'uploading' => 'Uploading', 'uploading' => 'Laddar upp',
], ],
'profile' => [ 'profile' => [
'posts' => 'Posts', 'posts' => 'Inlägg',
'followers' => 'Followers', 'followers' => 'Följare',
'following' => 'Following', 'following' => 'Följer',
'admin' => 'Admin', 'admin' => 'Admin',
'collections' => 'Collections', 'collections' => 'Kollektioner',
'follow' => 'Follow', 'follow' => 'Följ',
'unfollow' => 'Unfollow', 'unfollow' => 'Sluta följa',
'editProfile' => 'Edit Profile', 'editProfile' => 'Redigera profil',
'followRequested' => 'Follow Requested', 'followRequested' => 'Följförfrågan skickad',
'joined' => 'Joined', 'joined' => 'Gick med',
'emptyCollections' => 'We can\'t seem to find any collections', 'emptyCollections' => 'Vi verkar inte hitta några kollektioner',
'emptyPosts' => 'We can\'t seem to find any posts', 'emptyPosts' => 'Vi verkar inte hitta några inlägg',
], ],
'menu' => [ 'menu' => [
'viewPost' => 'View Post', 'viewPost' => 'Visa inlägg',
'viewProfile' => 'View Profile', 'viewProfile' => 'Visa profil',
'moderationTools' => 'Moderation Tools', 'moderationTools' => 'Modereringsverktyg',
'report' => 'Report', 'report' => 'Rapportera',
'archive' => 'Archive', 'archive' => 'Arkivera',
'unarchive' => 'Unarchive', 'unarchive' => 'avarkivera',
'embed' => 'Embed', 'embed' => 'Bädda in',
'selectOneOption' => 'Select one of the following options', 'selectOneOption' => 'Välj ett av följande alternativ',
'unlistFromTimelines' => 'Unlist from Timelines', 'unlistFromTimelines' => 'Avlista från tidslinjer',
'addCW' => 'Add Content Warning', 'addCW' => 'Lägg till känslighetsvarning',
'removeCW' => 'Remove Content Warning', 'removeCW' => 'Ta bort känslighetsvarning',
'markAsSpammer' => 'Mark as Spammer', 'markAsSpammer' => 'Markera som spammare',
'markAsSpammerText' => 'Unlist + CW existing and future posts', 'markAsSpammerText' => 'Avlista + känslighetsmarkera nuvarande och framtida inlägg',
'spam' => 'Spam', 'spam' => 'Spam',
'sensitive' => 'Sensitive Content', 'sensitive' => 'Känsligt innehåll',
'abusive' => 'Abusive or Harmful', 'abusive' => 'Missbruk eller skadligt',
'underageAccount' => 'Underage Account', 'underageAccount' => 'Minderårigt konto',
'copyrightInfringement' => 'Copyright Infringement', 'copyrightInfringement' => 'Upphovsrättsintrång',
'impersonation' => 'Impersonation', 'impersonation' => 'Personimitation',
'scamOrFraud' => 'Scam or Fraud', 'scamOrFraud' => 'Bedrägeri',
'confirmReport' => 'Confirm Report', 'confirmReport' => 'Bekräfta anmälan',
'confirmReportText' => 'Are you sure you want to report this post?', 'confirmReportText' => 'Är du säker att du vill anmäla detta inlägg?',
'reportSent' => 'Report Sent!', 'reportSent' => 'Anmälan skickad!',
'reportSentText' => 'We have successfully received your report.', 'reportSentText' => 'Vi har fått emot din anmälan till detta inlägg.',
'reportSentError' => 'There was an issue reporting this post.', 'reportSentError' => 'Något gick fel när detta inlägget skulle anmälas.',
'modAddCWConfirm' => 'Are you sure you want to add a content warning to this post?', 'modAddCWConfirm' => 'Är du säker att du vill lägga till känslighetsvarning på detta inlägget?',
'modCWSuccess' => 'Successfully added content warning', 'modCWSuccess' => 'Lade till känslighetsvarning',
'modRemoveCWConfirm' => 'Are you sure you want to remove the content warning on this post?', 'modRemoveCWConfirm' => 'Är du säker att du vill ta bort känslighetsvarningen på detta inlägget?',
'modRemoveCWSuccess' => 'Successfully removed content warning', 'modRemoveCWSuccess' => 'Tog bort känsloghetsvarning',
'modUnlistConfirm' => 'Are you sure you want to unlist this post?', 'modUnlistConfirm' => 'Är du säker att du vill avlista detta inlägget?',
'modUnlistSuccess' => 'Successfully unlisted post', 'modUnlistSuccess' => 'Avlistade inlägget',
'modMarkAsSpammerConfirm' => 'Are you sure you want to mark this user as a spammer? All existing and future posts will be unlisted on timelines and a content warning will be applied.', 'modMarkAsSpammerConfirm' => 'Är du säker att du vill markera detta konto som spammare? Alla nuvarande och framtida inlägg kommer avlistas och en känslighetsvarning kommer läggas till på inläggen',
'modMarkAsSpammerSuccess' => 'Successfully marked account as spammer', 'modMarkAsSpammerSuccess' => 'Markerade kontot som spammare',
'toFollowers' => 'to Followers', 'toFollowers' => 'till följare',
'showCaption' => 'Show Caption', 'showCaption' => 'Visa bildtext',
'showLikes' => 'Show Likes', 'showLikes' => 'Visa gilla-markeringar',
'compactMode' => 'Compact Mode', 'compactMode' => 'Kompaktläge',
'embedConfirmText' => 'By using this embed, you agree to our', 'embedConfirmText' => 'Genom att använda denna inbäddning godkänner du vår',
'deletePostConfirm' => 'Are you sure you want to delete this post?', 'deletePostConfirm' => 'Är du säker att du vill ta bort detta inlägg?',
'archivePostConfirm' => 'Are you sure you want to archive this post?', 'archivePostConfirm' => 'Är du säker att du vill arkivera detta inlägg?',
'unarchivePostConfirm' => 'Are you sure you want to unarchive this post?', 'unarchivePostConfirm' => 'Är du säker att du vill avarkivera detta inlägg?',
], ],
'story' => [ 'story' => [
'add' => 'Add Story' 'add' => 'Lägg till Story'
], ],
'timeline' => [ 'timeline' => [
'peopleYouMayKnow' => 'People you may know' 'peopleYouMayKnow' => 'Personer du kanske känner'
], ],
'hashtags' => [ 'hashtags' => [
'emptyFeed' => 'We can\'t seem to find any posts for this hashtag' 'emptyFeed' => 'Vi kan inte hitta några inlägg med den hashtagen'
], ],
]; ];