chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #3257 from pixelfed/staging 

Staging
This commit is contained in:
daniel 2022-02-17 18:52:44 -07:00 committed by GitHub
parent ddb784d423 6f2c717e27
commit c4556b5963
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 25356 additions and 25176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
app/Http/Controllers/CollectionController.php
View File

@ -33,14 +33,14 @@ class CollectionController extends Controller
return view('collection.create', compact('collection')); return view('collection.create', compact('collection'));
} }
public function show(Request $request, int $collection) public function show(Request $request, int $id)
{ {
$collection = Collection::with('profile')->whereNotNull('published_at')->findOrFail($collection); $user = $request->user();
if($collection->profile->status != null) { $collection = Collection::findOrFail($id);
abort(404); if($collection->published_at == null || $collection->visibility != 'public') {
} if(!$user || $user->profile_id != $collection->profile_id) {
if($collection->visibility !== 'public') { abort_unless($user && $user->is_admin, 404);
abort_if(!Auth::check() || Auth::user()->profile_id != $collection->profile_id, 404); }
} }
return view('collection.show', compact('collection')); return view('collection.show', compact('collection'));
} }
@ -144,20 +144,23 @@ class CollectionController extends Controller
public function get(Request $request, $id) public function get(Request $request, $id)
{ {
$profile = Auth::check() ? Auth::user()->profile : []; $user = $request->user();
$collection = Collection::findOrFail($id);
$collection = Collection::whereVisibility('public')->findOrFail($id); if($collection->published_at == null || $collection->visibility != 'public') {
if($collection->published_at == null) { if(!$user || $user->profile_id != $collection->profile_id) {
if(!Auth::check() || $profile->id !== $collection->profile_id) { abort_unless($user && $user->is_admin, 404);
abort(404);
} }
} }
return [ return [
'id' => $collection->id, 'id' => (string) $collection->id,
'title' => $collection->title, 'visibility' => $collection->visibility,
'description' => $collection->description, 'title' => $collection->title,
'visibility' => $collection->visibility 'description' => $collection->description,
'thumb' => $collection->posts()->first()->thumb(),
'url' => $collection->url(),
'post_count' => $collection->posts()->count(),
'published_at' => $collection->published_at
]; ];
} }
@ -183,26 +186,28 @@ class CollectionController extends Controller
public function getUserCollections(Request $request, int $id) public function getUserCollections(Request $request, int $id)
{ {
$user = $request->user();
$pid = $user ? $user->profile_id : null;
$profile = Profile::whereNull('status') $profile = Profile::whereNull('status')
->whereNull('domain') ->whereNull('domain')
->findOrFail($id); ->findOrFail($id);
if($profile->is_private) { if($profile->is_private) {
abort_if(!Auth::check(), 404); abort_if(!$pid, 404);
abort_if(!$profile->followedBy(Auth::user()->profile) && $profile->id != Auth::user()->profile_id, 404); abort_if(!$profile->id != $pid, 404);
} }
return $profile $visibility = $pid == $profile->id ? ['public', 'private'] : ['public'];
->collections()
->has('posts') return Collection::whereProfileId($profile->id)
->with('posts') ->whereIn('visibility', $visibility)
->whereVisibility('public') ->orderByDesc('id')
->whereNotNull('published_at')
->orderByDesc('published_at')
->paginate(9) ->paginate(9)
->map(function($collection) { ->map(function($collection) {
return [ return [
'id' => (string) $collection->id, 'id' => (string) $collection->id,
'visibility' => $collection->visibility,
'title' => $collection->title, 'title' => $collection->title,
'description' => $collection->description, 'description' => $collection->description,
'thumb' => $collection->posts()->first()->thumb(), 'thumb' => $collection->posts()->first()->thumb(),

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

@ -207,7 +207,7 @@ class PublicApiController extends Controller
->paginate($limit); ->paginate($limit);
} }
$resource = new Fractal\Resource\Collection($replies, new StatusTransformer(), 'data'); $resource = new Fractal\Resource\Collection($replies, new StatusStatelessTransformer(), 'data');
$resource->setPaginator(new IlluminatePaginatorAdapter($replies)); $resource->setPaginator(new IlluminatePaginatorAdapter($replies));
$res = $this->fractal->createData($resource)->toArray(); $res = $this->fractal->createData($resource)->toArray();
return response()->json($res, 200, [], JSON_PRETTY_PRINT); return response()->json($res, 200, [], JSON_PRETTY_PRINT);

6
config/instance.php
View File

@ -61,8 +61,8 @@ return [
], ],
'oauth' => [ 'oauth' => [
'token_expiration' => env('OAUTH_TOKEN_DAYS', 15), 'token_expiration' => env('OAUTH_TOKEN_DAYS', 365),
'refresh_expiration' => env('OAUTH_REFRESH_DAYS', 30), 'refresh_expiration' => env('OAUTH_REFRESH_DAYS', 400),
'pat' => [ 'pat' => [
'enabled' => env('OAUTH_PAT_ENABLED', false), 'enabled' => env('OAUTH_PAT_ENABLED', false),
'id' => env('OAUTH_PAT_ID'), 'id' => env('OAUTH_PAT_ID'),
@ -77,5 +77,5 @@ return [
] ]
], ],
'enable_cc' => env('ENABLE_CONFIG_CACHE', false) 'enable_cc' => env('ENABLE_CONFIG_CACHE', false),
]; ];

50326
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

129
package.json
View File

@ -1,66 +1,67 @@
{ {
"name": "pixelfed", "name": "pixelfed",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "npm run development", "dev": "npm run development",
"development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
"watch": "npm run development -- --watch", "watch": "npm run development -- --watch",
"watch-poll": "npm run watch -- --watch-poll", "watch-poll": "npm run watch -- --watch-poll",
"hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
"prod": "npm run production", "prod": "npm run production",
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
}, },
"devDependencies": { "devDependencies": {
"axios": "^0.21.1", "axios": "^0.21.1",
"bootstrap": "^4.5.2", "bootstrap": "^4.5.2",
"cross-env": "^5.2.1", "cross-env": "^5.2.1",
"jquery": "^3.6.0", "jquery": "^3.6.0",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"popper.js": "^1.16.1", "popper.js": "^1.16.1",
"resolve-url-loader": "^2.3.2", "resolve-url-loader": "^2.3.2",
"sass": "^1.32.11", "sass": "^1.32.11",
"sass-loader": "^7.3.1", "sass-loader": "^7.3.1",
"vue": "^2.6.11", "vue": "^2.6.14",
"vue-masonry-css": "^1.0.3", "vue-masonry-css": "^1.0.3",
"vue-router": "^3.5.1", "vue-router": "^3.5.1",
"vue-template-compiler": "^2.6.11", "vue-template-compiler": "^2.6.11",
"vuex": "^3.6.2", "vuex": "^3.6.2",
"vuex-router-sync": "^5.0.0" "vuex-router-sync": "^5.0.0"
}, },
"dependencies": { "dependencies": {
"@fancyapps/fancybox": "^3.5.7", "@fancyapps/fancybox": "^3.5.7",
"@trevoreyre/autocomplete-vue": "^2.2.0", "@trevoreyre/autocomplete-vue": "^2.2.0",
"animate.css": "^4.1.0", "animate.css": "^4.1.0",
"blurhash": "^1.1.3", "bigpicture": "^2.6.1",
"bootstrap-vue": "^2.16.0", "blurhash": "^1.1.3",
"chart.js": "^2.7.2", "bootstrap-vue": "^2.16.0",
"filesize": "^3.6.1", "chart.js": "^2.7.2",
"howler": "^2.2.0", "filesize": "^3.6.1",
"infinite-scroll": "^3.0.6", "howler": "^2.2.0",
"jquery-scroll-lock": "^3.1.3", "infinite-scroll": "^3.0.6",
"jquery.scrollbar": "^0.2.11", "jquery-scroll-lock": "^3.1.3",
"js-cookie": "^2.2.0", "jquery.scrollbar": "^0.2.11",
"laravel-echo": "^1.8.1", "js-cookie": "^2.2.0",
"laravel-mix": "^4.1.4", "laravel-echo": "^1.8.1",
"node-sass": "^4.14.1", "laravel-mix": "^4.1.4",
"promise-polyfill": "8.1.0", "node-sass": "^4.14.1",
"readmore-js": "^2.2.1", "promise-polyfill": "8.1.0",
"sweetalert": "^2.1.2", "readmore-js": "^2.2.1",
"twitter-text": "^2.0.5", "sweetalert": "^2.1.2",
"vue-blurhash": "^0.1.4", "twitter-text": "^2.0.5",
"vue-carousel": "^0.18.0", "vue-blurhash": "^0.1.4",
"vue-content-loader": "^0.2.3", "vue-carousel": "^0.18.0",
"vue-cropperjs": "^4.1.0", "vue-content-loader": "^0.2.3",
"vue-i18n": "^8.26.7", "vue-cropperjs": "^4.1.0",
"vue-infinite-loading": "^2.4.5", "vue-i18n": "^8.26.7",
"vue-intersect": "^1.1.6", "vue-infinite-loading": "^2.4.5",
"vue-loading-overlay": "^3.3.3", "vue-intersect": "^1.1.6",
"vue-timeago": "^5.1.2", "vue-loading-overlay": "^3.3.3",
"vue-tribute": "^1.0.7", "vue-timeago": "^5.1.2",
"zuck.js": "^1.6.0" "vue-tribute": "^1.0.7",
}, "zuck.js": "^1.6.0"
"collective": { },
"type": "opencollective", "collective": {
"url": "https://opencollective.com/pixelfed" "type": "opencollective",
} "url": "https://opencollective.com/pixelfed"
}
} }

2
public/js/collections.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/js/compose.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/js/spa.js vendored
View File

File diff suppressed because one or more lines are too long

6
public/mix-manifest.json
View File

@ -10,9 +10,9 @@
"/css/spa.css": "/css/spa.css?id=cf15b0f0bc32dff75960", "/css/spa.css": "/css/spa.css?id=cf15b0f0bc32dff75960",
"/css/landing.css": "/css/landing.css?id=b6a06b969dd1c3c274e6", "/css/landing.css": "/css/landing.css?id=b6a06b969dd1c3c274e6",
"/js/collectioncompose.js": "/js/collectioncompose.js?id=684458578e59365b9b7f", "/js/collectioncompose.js": "/js/collectioncompose.js?id=684458578e59365b9b7f",
"/js/collections.js": "/js/collections.js?id=0d1fc5ad7d4a47a8adbb", "/js/collections.js": "/js/collections.js?id=55f19d02e0b1746d4d51",
"/js/components.js": "/js/components.js?id=2978883dc0ca9cd1681c", "/js/components.js": "/js/components.js?id=2978883dc0ca9cd1681c",
"/js/compose.js": "/js/compose.js?id=cde1d9492fd2586ec137", "/js/compose.js": "/js/compose.js?id=66dcc410302cefbf4b86",
"/js/compose-classic.js": "/js/compose-classic.js?id=ee4ad4759a55261c429c", "/js/compose-classic.js": "/js/compose-classic.js?id=ee4ad4759a55261c429c",
"/js/developers.js": "/js/developers.js?id=d578157a93aaa9070669", "/js/developers.js": "/js/developers.js?id=d578157a93aaa9070669",
"/js/direct.js": "/js/direct.js?id=76bdac276fca6ac60320", "/js/direct.js": "/js/direct.js?id=76bdac276fca6ac60320",
@ -24,7 +24,7 @@
"/js/rempos.js": "/js/rempos.js?id=5f24e4ed251a202023f7", "/js/rempos.js": "/js/rempos.js?id=5f24e4ed251a202023f7",
"/js/rempro.js": "/js/rempro.js?id=2cc0d82e0cef827608c5", "/js/rempro.js": "/js/rempro.js?id=2cc0d82e0cef827608c5",
"/js/search.js": "/js/search.js?id=dc888b173463dc3894ba", "/js/search.js": "/js/search.js?id=dc888b173463dc3894ba",
"/js/spa.js": "/js/spa.js?id=45d20b3c25a385475272", "/js/spa.js": "/js/spa.js?id=edaf0ab01657ffed5786",
"/js/status.js": "/js/status.js?id=5869d8f86d80221006d3", "/js/status.js": "/js/status.js?id=5869d8f86d80221006d3",
"/js/stories.js": "/js/stories.js?id=f882708d5f00b4738dd7", "/js/stories.js": "/js/stories.js?id=f882708d5f00b4738dd7",
"/js/story-compose.js": "/js/story-compose.js?id=0f9d2f7ce5e63ef14c6a", "/js/story-compose.js": "/js/story-compose.js?id=0f9d2f7ce5e63ef14c6a",