Merge pull request #3257 from pixelfed/staging

Staging

app/Http/Controllers/CollectionController.php

@@ -33,14 +33,14 @@ class CollectionController extends Controller
         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) {
+                abort_unless($user && $user->is_admin, 404);
             }
-        if($collection->visibility !== 'public') {
-            abort_if(!Auth::check() || Auth::user()->profile_id != $collection->profile_id, 404);
         }
     	return view('collection.show', compact('collection'));
     }
@@ -144,20 +144,23 @@ class CollectionController extends Controller
 
     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 [
-            'id'            => $collection->id,
+            'id' => (string) $collection->id,
+            'visibility' => $collection->visibility,
             'title' => $collection->title,
             'description' => $collection->description,
-            'visibility'    => $collection->visibility
+            '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)
     {
+    	$user = $request->user();
+    	$pid = $user ? $user->profile_id : null;
+
         $profile = Profile::whereNull('status')
             ->whereNull('domain')
             ->findOrFail($id);
 
         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)
             ->map(function($collection) {
                 return [
                     'id' => (string) $collection->id,
+                    'visibility' => $collection->visibility,
                     'title' => $collection->title,
                     'description' => $collection->description,
                     'thumb' => $collection->posts()->first()->thumb(),

app/Http/Controllers/PublicApiController.php

@@ -207,7 +207,7 @@ class PublicApiController extends Controller
             ->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));
         $res = $this->fractal->createData($resource)->toArray();
         return response()->json($res, 200, [], JSON_PRETTY_PRINT);

config/instance.php

@@ -61,8 +61,8 @@ return [
 	],
 
 	'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' => [
 			'enabled' => env('OAUTH_PAT_ENABLED', false),
 			'id' 	  => env('OAUTH_PAT_ID'),
@@ -77,5 +77,5 @@ return [
 		]
 	],
 
-	'enable_cc' => env('ENABLE_CONFIG_CACHE', false)
+	'enable_cc' => env('ENABLE_CONFIG_CACHE', false),
 ];

package.json

@@ -20,7 +20,7 @@
 		"resolve-url-loader": "^2.3.2",
 		"sass": "^1.32.11",
 		"sass-loader": "^7.3.1",
-        "vue": "^2.6.11",
+		"vue": "^2.6.14",
 		"vue-masonry-css": "^1.0.3",
 		"vue-router": "^3.5.1",
 		"vue-template-compiler": "^2.6.11",
@@ -31,6 +31,7 @@
 		"@fancyapps/fancybox": "^3.5.7",
 		"@trevoreyre/autocomplete-vue": "^2.2.0",
 		"animate.css": "^4.1.0",
+		"bigpicture": "^2.6.1",
 		"blurhash": "^1.1.3",
 		"bootstrap-vue": "^2.16.0",
 		"chart.js": "^2.7.2",

public/mix-manifest.json

@@ -10,9 +10,9 @@
     "/css/spa.css": "/css/spa.css?id=cf15b0f0bc32dff75960",
     "/css/landing.css": "/css/landing.css?id=b6a06b969dd1c3c274e6",
     "/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/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/developers.js": "/js/developers.js?id=d578157a93aaa9070669",
     "/js/direct.js": "/js/direct.js?id=76bdac276fca6ac60320",
@@ -24,7 +24,7 @@
     "/js/rempos.js": "/js/rempos.js?id=5f24e4ed251a202023f7",
     "/js/rempro.js": "/js/rempro.js?id=2cc0d82e0cef827608c5",
     "/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/stories.js": "/js/stories.js?id=f882708d5f00b4738dd7",
     "/js/story-compose.js": "/js/story-compose.js?id=0f9d2f7ce5e63ef14c6a",