From 2e2a946c649b55b480d46fbd69da6820d548e24a Mon Sep 17 00:00:00 2001
From: Mostafa Ahangarha <ahangarha@riseup.net>
Date: Thu, 10 Jun 2021 13:29:26 +0430
Subject: [PATCH 01/12] improve persian translation

---
 resources/lang/fa/helpcenter.php   |  4 +--
 resources/lang/fa/navmenu.php      | 12 ++++----
 resources/lang/fa/notification.php |  6 ++--
 resources/lang/fa/passwords.php    |  8 ++---
 resources/lang/fa/profile.php      |  4 +--
 resources/lang/fa/site.php         |  4 +--
 resources/lang/fa/timeline.php     |  2 +-
 resources/lang/fa/validation.php   | 48 +++++++++++++++---------------
 8 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/resources/lang/fa/helpcenter.php b/resources/lang/fa/helpcenter.php
index a5a9aebc0..e54d2bcf5 100644
--- a/resources/lang/fa/helpcenter.php
+++ b/resources/lang/fa/helpcenter.php
@@ -15,8 +15,8 @@ return [
 	'timelines' => 'خط زمانی',
 	'embed'	=> 'توکار',
 
-	'communityGuidelines' => 'دستورالعمل‌های انجمن',
-	'whatIsTheFediverse' => 'نامتمرکز یعنی چی؟',
+	'communityGuidelines' => 'دستورالعمل‌های اجتماع',
+	'whatIsTheFediverse' => 'فدیورس چیست؟',
 	'controllingVisibility' => 'کنترل نمایش',
 	'blockingAccounts' => 'حساب‌های مسدودشده',
 	'safetyTips' => 'نکات امنیتی',
diff --git a/resources/lang/fa/navmenu.php b/resources/lang/fa/navmenu.php
index 1a59a3332..890d041f0 100644
--- a/resources/lang/fa/navmenu.php
+++ b/resources/lang/fa/navmenu.php
@@ -5,15 +5,15 @@ return [
 	'home'				=> 'خانه',
 	'local'				=> 'محلی',
 	'network'			=> 'شبکه',
-	'discover'			=> 'کشف‌کردن',
+	'discover'			=> 'کشف ‌کردن',
 	'viewMyProfile'		=> 'مشاهده نمایه من',
 	'myProfile'			=> 'نمایه من',
-	'myTimeline'		=> 'جدول زمانی من',
-	'publicTimeline'	=> 'جدول زمانی عمومی',
-	'remoteFollow'		=> 'از راه دور دنبال کنید',
+	'myTimeline'		=> 'خط‌زمانی من',
+	'publicTimeline'	=> 'خط‌زمانی عمومی',
+	'remoteFollow'		=> 'پیگیری راه دور',
 	'settings'			=> 'تنظیمات',
 	'admin'				=> 'مدیر',
 	'logout'			=> 'خروج',
-	'directMessages'	=> 'پیام خصوصی',
-	'composePost'		=> 'نوشتن پست',
+	'directMessages'	=> 'پیام مستقیم',
+	'composePost'		=> 'ایجاد فرسته',
 ];
diff --git a/resources/lang/fa/notification.php b/resources/lang/fa/notification.php
index f3289b686..6769d53a6 100644
--- a/resources/lang/fa/notification.php
+++ b/resources/lang/fa/notification.php
@@ -2,11 +2,11 @@
 
 return [
 
-  'likedPhoto'          => 'پست شما را پسندید.',
+  'likedPhoto'          => 'فرستهٔ شما را پسندید.',
   'likedComment'        => 'دیدگاه شما را پسندید.',
   'startedFollowingYou' => 'شما را دنبال می‌کند.',
-  'commented'           => 'دیدگاهی روی پست شما نوشت.',
+  'commented'           => 'دیدگاهی روی فرستهٔ شما نوشت.',
   'mentionedYou'        => 'شما را صدا کرد.',
-  'shared'				      => 'پستی منتشر کرد.',
+  'shared'				      => 'فرسته‌ای منتشر کرد.',
 
 ];
diff --git a/resources/lang/fa/passwords.php b/resources/lang/fa/passwords.php
index b65644c5c..f58c26627 100644
--- a/resources/lang/fa/passwords.php
+++ b/resources/lang/fa/passwords.php
@@ -13,10 +13,10 @@ return [
     |
     */
 
-    'password' => 'رمز عبور شما باید حداقل شامل ۶ کاراکتر باشد و همچنین با تکرار آن مطابق باشد.',
+    'password' => 'رمز عبور شما باید حداقل شامل ۶ حرف بوده و همچنین با تکرار آن مطابق باشد.',
     'reset'    => 'رمز عبور شما بازنشانی شد!',
-    'sent'     => 'اگر ایمیل شما در پایگاه‌داده ما موجود باشد، شما ایمیل شامل یک لینک بازنشانی رمز عبور در چند دقیقه آینده دریافت خواهید کرد. در صورتی که ایمیلی دریافت نکردید، لطفا صندوق هرزنامه خود را نیز بررسی کنید.',
-    'token'    => 'این لینک نامعتبر است.',
-    'user'     => 'اگر ایمیل شما در پایگاه‌داده ما موجود باشد، شما ایمیل شامل یک لینک بازنشانی رمز عبور در چند دقیقه آینده دریافت خواهید کرد. در صورتی که ایمیلی دریافت نکردید، لطفا صندوق هرزنامه خود را نیز بررسی کنید.',
+    'sent'     => 'اگر ایمیل‌تان در پایگاه‌داده ما موجود باشد، در چند دقیقه آینده ایمیلی حاوی یک پیوند بازنشانی رمز عبور دریافت خواهید کرد. در صورتی که ایمیلی دریافت نکردید، لطفا صندوق هرزنامه خود را نیز بررسی کنید.',
+    'token'    => 'این پیوند نامعتبر است.',
+    'user'     => 'اگر ایمیل‌تان در پایگاه‌داده ما موجود باشد، در چند دقیقه آینده ایمیلی حاوی یک پیوند بازنشانی رمز عبور دریافت خواهید کرد. در صورتی که ایمیلی دریافت نکردید، لطفا صندوق هرزنامه خود را نیز بررسی کنید.',
 
 ];
diff --git a/resources/lang/fa/profile.php b/resources/lang/fa/profile.php
index 171b219b2..129702916 100644
--- a/resources/lang/fa/profile.php
+++ b/resources/lang/fa/profile.php
@@ -1,10 +1,10 @@
 <?php
 
 return [
-  'emptyTimeline'         => 'این کاربر هنوز پستی ارسال نکرده!',
+  'emptyTimeline'         => 'این کاربر هنوز چیزی منتشر نکرده است!',
   'emptyFollowers'        => 'این کاربر هنوز دنبال‌کننده‌ای ندارد!',
   'emptyFollowing'        => 'این کاربر هنوز کسی را دنبال نمی‌کند!',
-  'emptySaved'            => 'شما هنوز هیچ پستی ذخیره نکرده‌اید!',
+  'emptySaved'            => 'شما هنوز هیچ فرسته‌ای را ذخیره نکرده‌اید!',
   'savedWarning'          => 'فقط شما می‌توانید آنچه که ذخیره کرده‌اید را ببینید.',
   'privateProfileWarning' => 'این حساب خصوصی است.',
   'alreadyFollow'         => 'الان :username را دنبال می‌کنید؟',
diff --git a/resources/lang/fa/site.php b/resources/lang/fa/site.php
index 9b5e54750..44cce7bc2 100644
--- a/resources/lang/fa/site.php
+++ b/resources/lang/fa/site.php
@@ -5,8 +5,8 @@ return [
     'about'             => 'درباره',
     'help'              => 'راهنما',
     'language'          => 'زبان‌ها',
-    'fediverse'         => 'نامتمرکز',
-    'opensource'        => 'متن باز',
+    'fediverse'         => 'فدیورس',
+    'opensource'        => 'آزاد/متن‌باز',
     'terms'             => 'قوانین',
     'privacy'           => 'حریم خصوصی',
     'l10nWip'           => 'ما هنوز روی محلی‌سازی کار می‌کنیم.',
diff --git a/resources/lang/fa/timeline.php b/resources/lang/fa/timeline.php
index 86289e3b6..03ac29640 100644
--- a/resources/lang/fa/timeline.php
+++ b/resources/lang/fa/timeline.php
@@ -2,6 +2,6 @@
 
 return [
 
-  'emptyPersonalTimeline' => 'جدول زمانی شما خالی است.',
+  'emptyPersonalTimeline' => 'خط‌زمانی شما خالی است.',
 
 ];
diff --git a/resources/lang/fa/validation.php b/resources/lang/fa/validation.php
index 3776a77a5..62768d4a0 100644
--- a/resources/lang/fa/validation.php
+++ b/resources/lang/fa/validation.php
@@ -14,7 +14,7 @@ return [
     */
 
     'accepted'             => ':attribute باید پذیرفته شده باشد.',
-    'active_url'           => 'آدرس :attribute معتبر نیست',
+    'active_url'           => 'نشانی :attribute معتبر نیست',
     'after'                => ':attribute باید تاریخی بعد از :date باشد.',
     'after_or_equal'       => ':attribute باید تاریخی بعد از :date، یا مطابق با آن باشد.',
     'alpha'                => ':attribute باید فقط حروف الفبا باشد.',
@@ -26,8 +26,8 @@ return [
     'between'              => [
         'numeric' => ':attribute باید بین :min و :max باشد.',
         'file'    => ':attribute باید بین :min و :max کیلوبایت باشد.',
-        'string'  => ':attribute باید بین :min و :max کاراکتر باشد.',
-        'array'   => ':attribute باید بین :min و :max آیتم باشد.',
+        'string'  => ':attribute باید بین :min و :max حرف باشد.',
+        'array'   => ':attribute باید بین :min و :max مورد باشد.',
     ],
     'boolean'              => 'فیلد :attribute فقط می‌تواند صحیح و یا غلط باشد',
     'confirmed'            => ':attribute با فیلد تکرار مطابقت ندارد.',
@@ -38,39 +38,39 @@ return [
     'digits_between'       => ':attribute باید بین :min و :max رقم باشد.',
     'dimensions'           => 'ابعاد تصویر :attribute قابل قبول نیست.',
     'distinct'             => 'فیلد :attribute تکراری است.',
-    'email'                => ':attribute باید یک ایمیل معتبر باشد',
-    'exists'               => ':attribute انتخاب شده، معتبر نیست.',
-    'file'                 => ':attribute باید یک فایل باشد',
+    'email'                => ':attribute باید ایمیلی معتبر باشد',
+    'exists'               => ':attribute انتخاب شده معتبر نیست.',
+    'file'                 => ':attribute باید یک پرونده باشد',
     'filled'               => 'فیلد :attribute الزامی است',
     'image'                => ':attribute باید تصویر باشد.',
-    'in'                   => ':attribute انتخاب شده، معتبر نیست.',
+    'in'                   => ':attribute انتخاب شده معتبر نیست.',
     'in_array'             => 'فیلد :attribute در :other وجود ندارد.',
-    'integer'              => ':attribute باید عدد صحیح باشد.',
+    'integer'              => ':attribute باید عددی صحیح باشد.',
     'ip'                   => ':attribute باید IP معتبر باشد.',
-    'ipv4'                 => ':attribute باید یک آدرس معتبر از نوع IPv4 باشد.',
-    'ipv6'                 => ':attribute باید یک آدرس معتبر از نوع IPv6 باشد.',
+    'ipv4'                 => ':attribute باید یک نشانی معتبر از نوع IPv4 باشد.',
+    'ipv6'                 => ':attribute باید یک نشانی معتبر از نوع IPv6 باشد.',
     'json'                 => 'فیلد :attribute باید یک رشته از نوع JSON باشد.',
     'max'                  => [
         'numeric' => ':attribute نباید بزرگتر از :max باشد.',
         'file'    => ':attribute نباید بزرگتر از :max کیلوبایت باشد.',
-        'string'  => ':attribute نباید بیشتر از :max کاراکتر باشد.',
-        'array'   => ':attribute نباید بیشتر از :max آیتم باشد.',
+        'string'  => ':attribute نباید بیشتر از :max حرف باشد.',
+        'array'   => ':attribute نباید بیشتر از :max مورد باشد.',
     ],
-    'mimes'                => ':attribute باید یکی از فرمت های :values باشد.',
-    'mimetypes'            => ':attribute باید یکی از فرمت های :values باشد.',
+    'mimes'                => ':attribute باید یکی از قالب‌های :values باشد.',
+    'mimetypes'            => ':attribute باید یکی از قالب‌های :values باشد.',
     'min'                  => [
         'numeric' => ':attribute نباید کوچکتر از :min باشد.',
         'file'    => ':attribute نباید کوچکتر از :min کیلوبایت باشد.',
-        'string'  => ':attribute نباید کمتر از :min کاراکتر باشد.',
-        'array'   => ':attribute نباید کمتر از :min آیتم باشد.',
+        'string'  => ':attribute نباید کمتر از :min حرف باشد.',
+        'array'   => ':attribute نباید کمتر از :min مورد باشد.',
     ],
-    'not_in'               => ':attribute انتخاب شده، معتبر نیست.',
+    'not_in'               => ':attribute انتخاب شده معتبر نیست.',
     'not_regex'            => ':attribute نامعتبر است.',
     'numeric'              => ':attribute باید عدد باشد.',
     'present'              => 'فیلد :attribute باید در پارامترهای ارسالی وجود داشته باشد.',
-    'regex'                => 'فرمت :attribute معتبر نیست',
+    'regex'                => 'قالب :attribute معتبر نیست',
     'required'             => 'فیلد :attribute الزامی است',
-    'required_if'          => 'هنگامی که :other برابر با :value است، فیلد :attribute الزامی است.',
+    'required_if'          => 'هنگامی که :other برابر با :value باشد، فیلد :attribute الزامی است.',
     'required_unless'      => 'فیلد :attribute ضروری است، مگر آنکه :other در :values موجود باشد.',
     'required_with'        => 'در صورت وجود فیلد :values، فیلد :attribute الزامی است.',
     'required_with_all'    => 'در صورت وجود فیلدهای :values، فیلد :attribute الزامی است.',
@@ -80,14 +80,14 @@ return [
     'size'                 => [
         'numeric' => ':attribute باید برابر با :size باشد.',
         'file'    => ':attribute باید برابر با :size کیلوبایت باشد.',
-        'string'  => ':attribute باید برابر با :size کاراکتر باشد.',
-        'array'   => ':attribute باسد شامل :size آیتم باشد.',
+        'string'  => ':attribute باید برابر با :size حرف باشد.',
+        'array'   => ':attribute باید شامل :size مورد باشد.',
     ],
     'string'               => 'فیلد :attribute باید متن باشد.',
     'timezone'             => 'فیلد :attribute باید یک منطقه زمانی قابل قبول باشد.',
     'unique'               => ':attribute قبلا انتخاب شده است.',
-    'uploaded'             => 'آپلود فایل :attribute موفقیت آمیز نبود.',
-    'url'                  => 'فرمت آدرس :attribute اشتباه است.',
+    'uploaded'             => 'بارگذاری پرونده :attribute موفقیت آمیز نبود.',
+    'url'                  => 'قالب نشانی :attribute اشتباه است.',
 
     /*
     |--------------------------------------------------------------------------
@@ -131,7 +131,7 @@ return [
         'phone'                 => 'تلفن',
         'mobile'                => 'تلفن همراه',
         'age'                   => 'سن',
-        'sex'                   => 'جنسیت',
+        'sex'                   => 'جنس',
         'gender'                => 'جنسیت',
         'day'                   => 'روز',
         'month'                 => 'ماه',

From 4a30ff118d63a0c865537c9710f8433cff9f5a38 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Tue, 6 Jul 2021 21:21:16 -0600
Subject: [PATCH 02/12] Update api routes

---
 routes/api.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routes/api.php b/routes/api.php
index 97e913e09..9251f32e3 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -72,7 +72,7 @@ Route::group(['prefix' => 'api'], function() use($middleware) {
 
 
 		Route::get('timelines/home', 'Api\ApiV1Controller@timelineHome')->middleware($middleware);
-		Route::get('timelines/public', 'Api\ApiV1Controller@timelinePublic');
+		Route::get('timelines/public', 'Api\ApiV1Controller@timelinePublic')->middleware($middleware);
 		Route::get('timelines/tag/{hashtag}', 'Api\ApiV1Controller@timelineHashtag');
 	});
 	Route::group(['prefix' => 'stories'], function () use($middleware) {

From f2686cacd27066bdd5e0316bda649e3cd588ac0f Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Tue, 6 Jul 2021 23:36:25 -0600
Subject: [PATCH 03/12] Update AdminMediaController, improve perf and use
 simple pagination

---
 app/Http/Controllers/Admin/AdminMediaController.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Admin/AdminMediaController.php b/app/Http/Controllers/Admin/AdminMediaController.php
index eb4bd93a8..da9c3b27e 100644
--- a/app/Http/Controllers/Admin/AdminMediaController.php
+++ b/app/Http/Controllers/Admin/AdminMediaController.php
@@ -27,6 +27,7 @@ trait AdminMediaController
 			],
 			'search' => 'nullable|string|min:1|max:20'
 		]);
+
 		if($request->filled('search')) {
 			$profiles = Profile::where('username', 'like', '%'.$request->input('search').'%')->pluck('id')->toArray();
 			$media = Media::whereHas('status')
@@ -42,7 +43,8 @@ trait AdminMediaController
 			$media = MediaBlocklist::latest()->paginate(12);
 			return view('admin.media.home', compact('media'));
 		}
-		$media = Media::whereHas('status')->with('status')->orderby('id', 'desc')->paginate(12);
+
+		$media = Media::whereNull('remote_url')->orderby('id', 'desc')->simplePaginate(12);
 		return view('admin.media.home', compact('media'));
 	}
 
@@ -51,4 +53,4 @@ trait AdminMediaController
 		$media = Media::findOrFail($id);
 		return view('admin.media.show', compact('media'));
 	}
-}
\ No newline at end of file
+}

From 2e5464376053c874a600fed9fd3a945d43828460 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Tue, 6 Jul 2021 23:36:56 -0600
Subject: [PATCH 04/12] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b72b817d..9ec1931a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -45,6 +45,7 @@
 - Updated ApiV1Controller, use PublicTimelineService. ([f67c67bc](https://github.com/pixelfed/pixelfed/commit/f67c67bc))
 - Updated ApiV1Controller, use ProfileService for verify_credentials. ([352aa573](https://github.com/pixelfed/pixelfed/commit/352aa573))
 - Updated RemotePost.vue, fix content warning button. ([7647e724](https://github.com/pixelfed/pixelfed/commit/7647e724))
+- Updated AdminMediaController, improve perf and use simple pagination. ([f2686cac](https://github.com/pixelfed/pixelfed/commit/f2686cac))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.11.0 (2021-06-01)](https://github.com/pixelfed/pixelfed/compare/v0.10.10...v0.11.0)

From 42c6121ab9bd38f254664758972590a2e0d5ac42 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Tue, 6 Jul 2021 23:40:08 -0600
Subject: [PATCH 05/12] Update PostComponent, fix MomentUI like counter

---
 resources/assets/js/components/PostComponent.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/resources/assets/js/components/PostComponent.vue b/resources/assets/js/components/PostComponent.vue
index 1526f047d..6e7a657ed 100644
--- a/resources/assets/js/components/PostComponent.vue
+++ b/resources/assets/js/components/PostComponent.vue
@@ -323,7 +323,7 @@
 									</div>
 									<div class="like-count font-weight-bold mt-2 rounded border" style="cursor:pointer;" v-on:click="likesModal">
 
-										{{ownerOrAdmin() ? (status.liked_by.total_count + 1) : 0}}
+										{{ownerOrAdmin == true ? (status.liked_by.total_count + 1) : 0}}
 									</div>
 								</div>
 								<div class="text-center">
@@ -898,6 +898,10 @@ export default {
 				return;
 			}
 
+			if(u.has('ui') && u.get('ui') == 'moment' && this.layout != 'moment') {
+				this.layout = 'moment';
+			}
+
 			if(forceMetro == true || u.has('ui') && u.get('ui') == 'metro' && this.layout != 'metro') {
 				this.layout = 'metro';
 			}

From 2d6c335f1f92c1f6b976971dd72c2b6824e139ce Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Tue, 6 Jul 2021 23:40:35 -0600
Subject: [PATCH 06/12] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ec1931a8..7278cc02f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -46,6 +46,7 @@
 - Updated ApiV1Controller, use ProfileService for verify_credentials. ([352aa573](https://github.com/pixelfed/pixelfed/commit/352aa573))
 - Updated RemotePost.vue, fix content warning button. ([7647e724](https://github.com/pixelfed/pixelfed/commit/7647e724))
 - Updated AdminMediaController, improve perf and use simple pagination. ([f2686cac](https://github.com/pixelfed/pixelfed/commit/f2686cac))
+- Updated PostComponent, fix MomentUI like counter. ([42c6121a](https://github.com/pixelfed/pixelfed/commit/42c6121a))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.11.0 (2021-06-01)](https://github.com/pixelfed/pixelfed/compare/v0.10.10...v0.11.0)

From 0e7b2617d47d006759324b2ea2fe4ad8881f687f Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Tue, 6 Jul 2021 23:49:31 -0600
Subject: [PATCH 07/12] Update compiled assets

---
 public/js/status.js      | Bin 121589 -> 121672 bytes
 public/mix-manifest.json | Bin 2125 -> 2125 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/public/js/status.js b/public/js/status.js
index a9754c59ee4bda8ddac17c17f021997da2293c5f..2f1cca12682afa5bb8515ab73df1919ada916535 100644
GIT binary patch
delta 965
zcmZXTOH30{6ozxO1i?o_lo%dH7?ZJ;OOX;DEnW)^5NO2`TJ3{2I<`}o&a1RDJW7c>
zqhVt+nn{QYHxLaAqm9l2gKkVTChC@zi6I(YxpD7Iv5eyGe)pXJKX>N8_t*34w=b&i
z_E&Yx_aq5*b_-gMP79e4!nTYEhd0BkKW71}-gT%geF1l<D~RVrCfRZxV;pb`GRL_B
zXc#kgP83-=gT~GBu$y4%MZz_#1S22%^M4Ah7^g`xjYf4%md<cgf)3IPQb10nm<1Fv
z<)gdqqsXJgqfHi1q2N&p(X%5yU6`Y(Y+}Zrk#Z<vDtzvxWtR_m^#-06<S~inFEKnL
zp|IKG-F5XU-=mw2c_hs+x&M!WL(0}v67tHK*h2^^53Ui)*VuMl1pQ;{3YR{`j~|4H
zvU9x!!lf#z@7$zhpP_PALS_gXNfNxMD<lGA$v#a>`?p(hc|1ogin2tK*1rf>q&B2n
zSh-p%u8<dxl_Rnt#!7_P-l5W)ckBMTPQzQA7wD`%JDB7dL0f77aiXoen@TwxR40Lq
zjBNe1JxQl1nUiqBPA_D{td!FOc1jZ>p$_JuP1_LRTaAYE;A^n>^S!J}twE#ZN+^+0
zZ?3@|OQ3VoSsZYx?>FIux~%|Pt`!F+4^>7LSI25A>o_XDuCH%r^a!Sslti`9wO2~T
zRhu#ZO?xsW0bLg3gUXlhh%wu^e9=XD$e4FI4JXNpHjZL~9v7967*WXWcUC{9;gtF)
z4X5|ajjgar9W1n&^h$t6wZMYs@ScCmk~;emn$#T@md!?ngFcfUbKo@T2M0YSS$S}n
zbc2Ttlj;R<n-mjZ$|U_Lw@exr!LDWR!To0K*;9B@V=-RjZXm{QDF>oaoACL7#&5yx
F=HD}qK=%Lu

delta 866
zcmX@Hjs5FZ_6gRk2CmvZO4ED#87-&V^)X6v7^az;7?_w_Opotl^hEGB^f9U+ctAPL
z>8$;X(g-1qenw+9B_pqbT&3xaWsGtgd(*>>U2V(qGgA}{Y;A3W?ej`=a;$=NLToej
za`N-DOAB;-5z-;{O4+HEN>(A0)g#VXdq5==ZEdsE)UtG{fO?8j3vv>ZQ$tcKN`gz%
z(lRS_oDkZpAf{L8gikhzlx7L9sR^I#AF1vZ3Dj7enpl*a;a^ZvtmBQ)5ouptYZa*z
z0aTEinpf&slA7z2nVVUn<AqQY0WmdV@}9`uQXV=b8JWeH&aicwJTWST(PQ$rs0EC!
zlk?-0Cf7x?P2L}US<qVt#b_(9&5L7%nHjw&Z;w}C^xAwQ-a>0~a#!f)on5MSe7U7Y
zl}egAnHowFuFe^o-<(+HFIb|NU!Ip*<X_~NlAD>Qp=m$8i<MD!`#}lDzyL(hOJy?3
zv06Bq7=Yt3Kn)g!u{tq%K=&plmt^MW6-TEemL%$y>B3~EGfiN$K^WpTfiVKXTQ-4F
z8^OCdfiZ>~rY}~ZdiuvbjMCGiCo<L|)I6BTXo27<Ok%V|@De96njv`eCovi!csD08
zu14^BCNtV2c$X(LMk9D;QyAM2ydzT>^|o7NGKzDtIEPr~PJg(RQHlkWn5X|=%GkNx
zznIZmk|o$M$P$vaz4tJROrO@vn9TwTU2qEJ00uQktJ3y&Qy6E;FdIb{LQDY#CD;^}
z)QZ$Bu-b{ea@${JGgdQAuWw@H-yX1q@fq9phr1c?GqHf;4Q^g4&=95Vd-pMR%K!i{
CUKvaP

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index d8f6afeaab03d4551d5fa9fb67df771c204c0e92..a4ab9b18feb3815bff7ec7706f756f7e2056a60b 100644
GIT binary patch
delta 32
ncmX>ra8_VLG`onQnL$d5i9xD`nUQIdMOw14fl=z@eD-?)rLYPj

delta 32
ncmX>ra8_VLG`mPrN~)=ap`nSfQL<4=l98ctnnB9seD-?)sl^IL


From 1a2e41b1e3b12a15048eff471b31ae026b7eab74 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Wed, 7 Jul 2021 00:23:43 -0600
Subject: [PATCH 08/12] Update status views, remove like counts from status
 embed

---
 resources/views/status/embed.blade.php | 331 ++++++++++++-------------
 resources/views/status/show.blade.php  |   8 +-
 2 files changed, 164 insertions(+), 175 deletions(-)

diff --git a/resources/views/status/embed.blade.php b/resources/views/status/embed.blade.php
index 265189b86..c5369a1ae 100644
--- a/resources/views/status/embed.blade.php
+++ b/resources/views/status/embed.blade.php
@@ -1,177 +1,172 @@
 <!DOCTYPE html>
 <html lang="{{ app()->getLocale() }}">
 <head>
-    
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="mobile-web-app-capable" content="yes">
+		
+		<meta charset="utf-8">
+		<meta http-equiv="X-UA-Compatible" content="IE=edge">
+		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<meta name="mobile-web-app-capable" content="yes">
 
-    <title>{{ $title ?? config('app.name', 'Pixelfed') }}</title>
+		<title>{{ $title ?? config('app.name', 'Pixelfed') }}</title>
 
-    <meta property="og:site_name" content="{{ config('app.name', 'pixelfed') }}">
-    <meta property="og:title" content="{{ $title ?? config('app.name', 'pixelfed') }}">
-    <meta property="og:type" content="article">
-    <meta property="og:url" content="{{$status->url()}}">
-    <meta name="medium" content="image">
-    <meta name="theme-color" content="#10c5f8">
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <link rel="shortcut icon" type="image/png" href="/img/favicon.png?v=2">
-    <link rel="apple-touch-icon" type="image/png" href="/img/favicon.png?v=2">
-    <link href="{{ mix('css/app.css') }}" rel="stylesheet">
-    <style type="text/css">
-      body.embed-card {
-          background: #fff !important;
-          margin: 0;
-          padding-bottom: 0;
-      }
-      .status-card-embed {
-        box-shadow: none;
-        border-radius: 4px;
-        overflow: hidden;
-      }
-    </style>
+		<meta property="og:site_name" content="{{ config('app.name', 'pixelfed') }}">
+		<meta property="og:title" content="{{ $title ?? config('app.name', 'pixelfed') }}">
+		<meta property="og:type" content="article">
+		<meta property="og:url" content="{{$status->url()}}">
+		<meta name="medium" content="image">
+		<meta name="theme-color" content="#10c5f8">
+		<meta name="apple-mobile-web-app-capable" content="yes">
+		<link rel="shortcut icon" type="image/png" href="/img/favicon.png?v=2">
+		<link rel="apple-touch-icon" type="image/png" href="/img/favicon.png?v=2">
+		<link href="{{ mix('css/app.css') }}" rel="stylesheet">
+		<style type="text/css">
+			body.embed-card {
+					background: #fff !important;
+					margin: 0;
+					padding-bottom: 0;
+			}
+			.status-card-embed {
+				box-shadow: none;
+				border-radius: 4px;
+				overflow: hidden;
+			}
+		</style>
 </head>
 <body class="bg-white">
-  <div class="embed-card">
-  @php($item = $status)
-  <div class="card status-card-embed card-md-rounded-0 border">
-    <div class="card-header d-inline-flex align-items-center bg-white">
-      <img src="{{$item->profile->avatarUrl()}}" width="32px" height="32px" target="_blank" style="border-radius: 32px;">
-      <a class="username font-weight-bold pl-2 text-dark" target="_blank" href="{{$item->profile->url()}}">
-        {{$item->profile->username}}
-      </a>
-    </div>
-    <a href="{{$status->url()}}" target="_blank">
-    @php($status = $item)
-    @switch($status->viewType())
-      @case('photo')
-      @case('image')
-        @if($status->is_nsfw)
-        <details class="details-animated">
-          <summary>
-            <p class="mb-0 lead font-weight-bold">CW / NSFW / Hidden Media</p>
-            <p class="font-weight-light">(click to show)</p>
-          </summary>
-          <a class="max-hide-overflow {{$status->firstMedia()->filter_class}}" href="{{$status->url()}}" target="_blank">
-            <img class="card-img-top" src="{{$status->mediaUrl()}}">
-          </a>
-        </details>
-        @else
-        <div class="{{$status->firstMedia()->filter_class}}">
-          <img src="{{$status->mediaUrl()}}" width="100%">
-        </div>
-        @endif
-      @break
-      @case('photo:album')
-        <div id="photo-carousel-wrapper-{{$status->id}}" class="carousel slide carousel-fade mb-n3 " data-ride="carousel">
-          <ol class="carousel-indicators">
-            @for($i = 0; $i < $status->media_count; $i++)
-            <li data-target="#photo-carousel-wrapper-{{$status->id}}" data-slide-to="{{$i}}" class="{{$i == 0 ? 'active' : ''}}"></li>
-            @endfor
-          </ol>
-          <div class="carousel-inner">
-            @foreach($status->media()->orderBy('order')->get() as $media)
-            <div class="carousel-item {{$loop->iteration == 1 ? 'active' : ''}}">
-              <figure class="{{$media->filter_class}}">
-                <div class="float-right mr-3 badge badge-dark border border-secondary rounded-pill p-2" style="position:absolute;top:8px;right:0;margin-bottom:-20px;">{{$loop->iteration}}/{{$loop->count}}</div>
-                <img class="d-block w-100" src="{{$media->url()}}" alt="{{$status->caption}}">
-              </figure>
-            </div>
-            @endforeach
-          </div>
-          <a class="carousel-control-prev" href="#photo-carousel-wrapper-{{$status->id}}" role="button" data-slide="prev">
-            <span class="carousel-control-prev-icon" aria-hidden="true"></span>
-            <span class="sr-only">Previous</span>
-          </a>
-          <a class="carousel-control-next" href="#photo-carousel-wrapper-{{$status->id}}" role="button" data-slide="next">
-            <span class="carousel-control-next-icon" aria-hidden="true"></span>
-            <span class="sr-only">Next</span>
-          </a>
-        </div>
-      @break
-      @case('video')
-        @if($status->is_nsfw)
-        <details class="details-animated">
-          <summary>
-            <p class="mb-0 lead font-weight-bold">CW / NSFW / Hidden Media</p>
-            <p class="font-weight-light">(click to show)</p>
-          </summary>
-          <div class="embed-responsive embed-responsive-16by9">
-            <video class="video" preload="none" controls loop>
-              <source src="{{$status->firstMedia()->url()}}" type="{{$status->firstMedia()->mime}}">
-            </video>
-          </div>
-         </details>
-        @else
-        <div class="embed-responsive embed-responsive-16by9">
-          <video class="video" preload="none" controls loop>
-            <source src="{{$status->firstMedia()->url()}}" type="{{$status->firstMedia()->mime}}">
-          </video>
-        </div>
-        @endif
-      @break
-      @case('video-album')
-        @if($status->is_nsfw)
-        <details class="details-animated">
-          <summary>
-            <p class="mb-0 lead font-weight-bold">CW / NSFW / Hidden Media</p>
-            <p class="font-weight-light">(click to show)</p>
-          </summary>
-          <div class="embed-responsive embed-responsive-16by9">
-            <video class="video" preload="none" controls loop>
-              <source src="{{$status->firstMedia()->url()}}" type="{{$status->firstMedia()->mime}}">
-            </video>
-          </div>
-         </details>
-        @else
-        <div class="embed-responsive embed-responsive-16by9">
-          <video class="video" preload="none" controls loop>
-            <source src="{{$status->firstMedia()->url()}}" type="{{$status->firstMedia()->mime}}">
-          </video>
-        </div>
-        @endif
-      @break
-    @endswitch
-  </a>
-  @if($layout != 'compact')
-    <div class="card-body">
-      <div class="view-more mb-2">
-        <a class="font-weight-bold" href="{{$status->url()}}" target="_blank">View More on Pixelfed</a>
-      </div>
-      <hr>
-      @if($showLikes)
-      <div class="likes font-weight-bold pb-2">
-        <span class="like-count">{{$item->likes_count}}</span> likes
-      </div>
-      @endif
-      <div class="caption">
-        <p class="my-0">
-          <span class="username font-weight-bold">
-            <bdi><a class="text-dark" href="{{$item->profile->url()}}" target="_blank">{{$item->profile->username}}</a></bdi>
-          </span>
-         @if($showCaption)
-          <span class="caption-container">{!! $item->rendered ?? e($item->caption) !!}</span>
-          @endif
-        </p>
-      </div>
-    </div>
-    @endif
-    <div class="card-footer bg-white d-inline-flex justify-content-between align-items-center">
-      <div class="timestamp">
-        <p class="small text-uppercase mb-0"><a href="{{$item->url()}}" class="text-muted" target="_blank">{{$item->created_at->diffForHumans()}}</a></p>
-      </div>
-      <div>
-        <a class="small font-weight-bold text-muted pr-1" href="{{config('app.url')}}" target="_blank">{{config('pixelfed.domain.app')}}</a>
-        <img src="/img/pixelfed-icon-color.svg" width="26px">
-      </div>
-    </div>
-  </div>
-  </div>
-  <script type="text/javascript">window.addEventListener("message",e=>{const t=e.data||{};window.parent&&"setHeight"===t.type&&window.parent.postMessage({type:"setHeight",id:t.id,height:document.getElementsByTagName("html")[0].scrollHeight},"*")});</script>
-  <script type="text/javascript">document.querySelectorAll('.caption-container a').forEach(function(i) {i.setAttribute('target', '_blank');});</script>
-    <script type="text/javascript" src="{{ mix('js/manifest.js') }}"></script>
-    <script type="text/javascript" src="{{ mix('js/vendor.js') }}"></script>
-    <script type="text/javascript" src="{{ mix('js/app.js') }}"></script>
+	<div class="embed-card">
+	@php($item = $status)
+	<div class="card status-card-embed card-md-rounded-0 border">
+		<div class="card-header d-inline-flex align-items-center bg-white">
+			<img src="{{$item->profile->avatarUrl()}}" width="32px" height="32px" target="_blank" style="border-radius: 32px;">
+			<a class="username font-weight-bold pl-2 text-dark" target="_blank" href="{{$item->profile->url()}}">
+				{{$item->profile->username}}
+			</a>
+		</div>
+		<a href="{{$status->url()}}" target="_blank">
+		@php($status = $item)
+		@switch($status->viewType())
+			@case('photo')
+			@case('image')
+				@if($status->is_nsfw)
+				<details class="details-animated">
+					<summary>
+						<p class="mb-0 lead font-weight-bold">CW / NSFW / Hidden Media</p>
+						<p class="font-weight-light">(click to show)</p>
+					</summary>
+					<a class="max-hide-overflow {{$status->firstMedia()->filter_class}}" href="{{$status->url()}}" target="_blank">
+						<img class="card-img-top" src="{{$status->mediaUrl()}}">
+					</a>
+				</details>
+				@else
+				<div class="{{$status->firstMedia()->filter_class}}">
+					<img src="{{$status->mediaUrl()}}" width="100%">
+				</div>
+				@endif
+			@break
+			@case('photo:album')
+				<div id="photo-carousel-wrapper-{{$status->id}}" class="carousel slide carousel-fade mb-n3 " data-ride="carousel">
+					<ol class="carousel-indicators">
+						@for($i = 0; $i < $status->media_count; $i++)
+						<li data-target="#photo-carousel-wrapper-{{$status->id}}" data-slide-to="{{$i}}" class="{{$i == 0 ? 'active' : ''}}"></li>
+						@endfor
+					</ol>
+					<div class="carousel-inner">
+						@foreach($status->media()->orderBy('order')->get() as $media)
+						<div class="carousel-item {{$loop->iteration == 1 ? 'active' : ''}}">
+							<figure class="{{$media->filter_class}}">
+								<div class="float-right mr-3 badge badge-dark border border-secondary rounded-pill p-2" style="position:absolute;top:8px;right:0;margin-bottom:-20px;">{{$loop->iteration}}/{{$loop->count}}</div>
+								<img class="d-block w-100" src="{{$media->url()}}" alt="{{$status->caption}}">
+							</figure>
+						</div>
+						@endforeach
+					</div>
+					<a class="carousel-control-prev" href="#photo-carousel-wrapper-{{$status->id}}" role="button" data-slide="prev">
+						<span class="carousel-control-prev-icon" aria-hidden="true"></span>
+						<span class="sr-only">Previous</span>
+					</a>
+					<a class="carousel-control-next" href="#photo-carousel-wrapper-{{$status->id}}" role="button" data-slide="next">
+						<span class="carousel-control-next-icon" aria-hidden="true"></span>
+						<span class="sr-only">Next</span>
+					</a>
+				</div>
+			@break
+			@case('video')
+				@if($status->is_nsfw)
+				<details class="details-animated">
+					<summary>
+						<p class="mb-0 lead font-weight-bold">CW / NSFW / Hidden Media</p>
+						<p class="font-weight-light">(click to show)</p>
+					</summary>
+					<div class="embed-responsive embed-responsive-16by9">
+						<video class="video" preload="none" controls loop>
+							<source src="{{$status->firstMedia()->url()}}" type="{{$status->firstMedia()->mime}}">
+						</video>
+					</div>
+				 </details>
+				@else
+				<div class="embed-responsive embed-responsive-16by9">
+					<video class="video" preload="none" controls loop>
+						<source src="{{$status->firstMedia()->url()}}" type="{{$status->firstMedia()->mime}}">
+					</video>
+				</div>
+				@endif
+			@break
+			@case('video-album')
+				@if($status->is_nsfw)
+				<details class="details-animated">
+					<summary>
+						<p class="mb-0 lead font-weight-bold">CW / NSFW / Hidden Media</p>
+						<p class="font-weight-light">(click to show)</p>
+					</summary>
+					<div class="embed-responsive embed-responsive-16by9">
+						<video class="video" preload="none" controls loop>
+							<source src="{{$status->firstMedia()->url()}}" type="{{$status->firstMedia()->mime}}">
+						</video>
+					</div>
+				 </details>
+				@else
+				<div class="embed-responsive embed-responsive-16by9">
+					<video class="video" preload="none" controls loop>
+						<source src="{{$status->firstMedia()->url()}}" type="{{$status->firstMedia()->mime}}">
+					</video>
+				</div>
+				@endif
+			@break
+		@endswitch
+	</a>
+	@if($layout != 'compact')
+		<div class="card-body">
+			<div class="view-more mb-2">
+				<a class="font-weight-bold" href="{{$status->url()}}" target="_blank">View More on Pixelfed</a>
+			</div>
+			<hr>
+			<div class="caption">
+				<p class="my-0">
+					<span class="username font-weight-bold">
+						<bdi><a class="text-dark" href="{{$item->profile->url()}}" target="_blank">{{$item->profile->username}}</a></bdi>
+					</span>
+				 @if($showCaption)
+					<span class="caption-container">{!! $item->rendered ?? e($item->caption) !!}</span>
+					@endif
+				</p>
+			</div>
+		</div>
+		@endif
+		<div class="card-footer bg-white d-inline-flex justify-content-between align-items-center">
+			<div class="timestamp">
+				<p class="small text-uppercase mb-0"><a href="{{$item->url()}}" class="text-muted" target="_blank">{{$item->created_at->diffForHumans()}}</a></p>
+			</div>
+			<div>
+				<a class="small font-weight-bold text-muted pr-1" href="{{config('app.url')}}" target="_blank">{{config('pixelfed.domain.app')}}</a>
+				<img src="/img/pixelfed-icon-color.svg" width="26px">
+			</div>
+		</div>
+	</div>
+	</div>
+	<script type="text/javascript">window.addEventListener("message",e=>{const t=e.data||{};window.parent&&"setHeight"===t.type&&window.parent.postMessage({type:"setHeight",id:t.id,height:document.getElementsByTagName("html")[0].scrollHeight},"*")});</script>
+	<script type="text/javascript">document.querySelectorAll('.caption-container a').forEach(function(i) {i.setAttribute('target', '_blank');});</script>
+		<script type="text/javascript" src="{{ mix('js/manifest.js') }}"></script>
+		<script type="text/javascript" src="{{ mix('js/vendor.js') }}"></script>
+		<script type="text/javascript" src="{{ mix('js/app.js') }}"></script>
 </body>
 </html>
diff --git a/resources/views/status/show.blade.php b/resources/views/status/show.blade.php
index 11362b81f..22b0590e0 100644
--- a/resources/views/status/show.blade.php
+++ b/resources/views/status/show.blade.php
@@ -25,11 +25,5 @@
 
 @push('scripts')
 <script type="text/javascript" src="{{ mix('js/status.js') }}"></script>
-<script type="text/javascript">
-$(document).ready(function() {
-  new Vue({ 
-    el: '#content'
-  });
-});
-</script>
+<script type="text/javascript">App.boot();</script>
 @endpush

From 9017f7c4e1dcb429d64d3a3e6df08d44ad509f5a Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Wed, 7 Jul 2021 00:40:01 -0600
Subject: [PATCH 09/12] Update Profile, fix unauthenticated private profiles

---
 app/Http/Controllers/ProfileController.php    |   3 +-
 resources/assets/js/components/Profile.vue    |   9 +-
 .../profile/partial/private-info.blade.php    | 190 +++++++++---------
 resources/views/profile/private.blade.php     |  36 ++--
 4 files changed, 115 insertions(+), 123 deletions(-)

diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php
index 4c38a2319..74e84f63e 100644
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@@ -47,7 +47,8 @@ class ProfileController extends Controller
 			});
 
 			if ($user->is_private == true) {
-				abort(404);
+				$profile = null;
+				return view('profile.private', compact('user'));
 			}
 
 			$owner = false;
diff --git a/resources/assets/js/components/Profile.vue b/resources/assets/js/components/Profile.vue
index d846dcaa3..c00e9676d 100644
--- a/resources/assets/js/components/Profile.vue
+++ b/resources/assets/js/components/Profile.vue
@@ -703,6 +703,11 @@
 			this.fetchProfile();
 			let u = new URLSearchParams(window.location.search);
 			let forceMetro = localStorage.getItem('pf_metro_ui.exp.forceMetro') == 'true';
+
+			if(u.has('ui') && u.get('ui') == 'moment' && this.layout != 'moment') {
+				this.layout = 'moment';
+			}
+
 			if(forceMetro == true || u.has('ui') && u.get('ui') == 'metro' && this.layout != 'metro') {
 				this.layout = 'metro';
 			}
@@ -739,10 +744,6 @@
 					}
 				});
 			}
-			if(window.outerWidth < 576) {
-				$('nav.navbar').hide();
-				this.isMobile = true;
-			}
 		},
 
 		updated() {
diff --git a/resources/views/profile/partial/private-info.blade.php b/resources/views/profile/partial/private-info.blade.php
index 7965955f8..ae0862d18 100644
--- a/resources/views/profile/partial/private-info.blade.php
+++ b/resources/views/profile/partial/private-info.blade.php
@@ -1,107 +1,97 @@
 <div class="bg-white py-5 border-bottom">
-  <div class="container">
-    <div class="row">
-      <div class="col-12 col-md-4 d-flex">
-        <div class="profile-avatar mx-auto">
-          <img class="rounded-circle box-shadow" src="{{$user->avatarUrl()}}" width="172px" height="172px">
-        </div>
-      </div>
-      <div class="col-12 col-md-8 d-flex align-items-center">
-        <div class="profile-details">
-          <div class="username-bar pb-2 d-flex align-items-center">
-            <span class="font-weight-ultralight h3">{{$user->username}}</span>
-            @if(Auth::check() && $is_following == true)
-            <span class="pl-4">
-              <form class="follow-form" method="post" action="/i/follow" style="display: inline;" data-id="{{$user->id}}" data-action="unfollow">
-                @csrf
-                <input type="hidden" name="item" value="{{$user->id}}">
-                <button class="btn btn-outline-secondary font-weight-bold px-4 py-0" type="submit">Unfollow</button>
-              </form>
-            </span>
-            @elseif(Auth::check() && $requested == true)
-            <span class="pl-4">
-              <button class="btn btn-outline-secondary font-weight-bold px-4 py-0 disabled" disabled type="button">Follow Requested</button>
-            </span>
-            @elseif(Auth::check() && $is_following == false)
-            <span class="pl-4">
-              <form class="follow-form" method="post" action="/i/follow" style="display: inline;" data-id="{{$user->id}}" data-action="follow">
-                @csrf
-                <input type="hidden" name="item" value="{{$user->id}}">
-                <button class="btn btn-primary font-weight-bold px-4 py-0" type="submit">Follow</button>
-              </form>
-            </span>
-            @endif
-            <span class="pl-4">
-              <i class="fas fa-cog fa-lg text-muted cursor-pointer" data-toggle="modal" data-target="#ctxProfileMenu"></i>
-              <div class="modal" tabindex="-1" role="dialog" id="ctxProfileMenu">
-                <div class="modal-dialog modal-dialog-centered modal-sm">
-                  <div class="modal-content">
-                    <div class="modal-body p-0">
-                      <div class="list-group-item cursor-pointer text-center rounded text-dark" onclick="window.App.util.clipboard('{{$user->url()}}');$('#ctxProfileMenu').modal('hide')">
-                        Copy Link
-                      </div>
-                      @auth
-                      <div class="list-group-item cursor-pointer text-center rounded text-dark" onclick="muteProfile()">
-                        Mute
-                      </div>
-                      <a class="list-group-item cursor-pointer text-center rounded text-dark text-decoration-none" href="i/report?type=user&id={{$user->id}}">
-                        Report User
-                      </a>
-                      <div class="list-group-item cursor-pointer text-center rounded text-dark" onclick="blockProfile()">
-                        Block
-                      </div>
-                      @endauth
-                      <div class="list-group-item cursor-pointer text-center rounded text-muted" onclick="$('#ctxProfileMenu').modal('hide')">
-                        Close
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </span>
-          </div>
-          <div class="profile-stats pb-3 d-inline-flex lead">
-            <div class="font-weight-light pr-5">
-              <span class="font-weight-bold">{{$user->statuses()->whereNull('reblog_of_id')->whereNull('in_reply_to_id')->count()}}</span> 
-              Posts
-            </div>
-          </div>
-          <p class="lead mb-0">
-            <span class="font-weight-bold">{{$user->name}}</span> 
-            @if($user->remote_url)
-            <span class="badge badge-info">REMOTE PROFILE</span>
-            @endif
-          </p>
-          <p class="mb-0 lead">{{$user->bio}}</p>
-          <p class="mb-0"><a href="{{$user->website}}" class="font-weight-bold" rel="me external nofollow noopener" target="_blank">{{str_limit($user->website, 30)}}</a></p>
-        </div>
-      </div>
-    </div>
-  </div>
+	<div class="container">
+		<div class="row">
+			<div class="col-12 col-md-4 d-flex">
+				<div class="profile-avatar mx-auto">
+					<img class="rounded-circle box-shadow" src="{{$user->avatarUrl()}}" width="172px" height="172px">
+				</div>
+			</div>
+			<div class="col-12 col-md-8 d-flex align-items-center">
+				<div class="profile-details">
+					<div class="username-bar pb-2 d-flex align-items-center">
+						<span class="font-weight-ultralight h3">{{$user->username}}</span>
+						@if(Auth::check() && $is_following == true)
+						<span class="pl-4">
+							<form class="follow-form" method="post" action="/i/follow" style="display: inline;" data-id="{{$user->id}}" data-action="unfollow">
+								@csrf
+								<input type="hidden" name="item" value="{{$user->id}}">
+								<button class="btn btn-outline-secondary font-weight-bold px-4 py-0" type="submit">Unfollow</button>
+							</form>
+						</span>
+						@elseif(Auth::check() && $requested == true)
+						<span class="pl-4">
+							<button class="btn btn-outline-secondary font-weight-bold px-4 py-0 disabled" disabled type="button">Follow Requested</button>
+						</span>
+						@elseif(Auth::check() && $is_following == false)
+						<span class="pl-4">
+							<form class="follow-form" method="post" action="/i/follow" style="display: inline;" data-id="{{$user->id}}" data-action="follow">
+								@csrf
+								<input type="hidden" name="item" value="{{$user->id}}">
+								<button class="btn btn-primary font-weight-bold px-4 py-0" type="submit">Follow</button>
+							</form>
+						</span>
+						@endif
+						@auth
+						<span class="pl-4">
+							<i class="fas fa-cog fa-lg text-muted cursor-pointer" data-toggle="modal" data-target="#ctxProfileMenu"></i>
+							<div class="modal" tabindex="-1" role="dialog" id="ctxProfileMenu">
+								<div class="modal-dialog modal-dialog-centered modal-sm">
+									<div class="modal-content">
+										<div class="modal-body p-0">
+											<div class="list-group-item cursor-pointer text-center rounded text-dark" onclick="window.App.util.clipboard('{{$user->url()}}');$('#ctxProfileMenu').modal('hide')">
+												Copy Link
+											</div>
+											@auth
+											<div class="list-group-item cursor-pointer text-center rounded text-dark" onclick="muteProfile()">
+												Mute
+											</div>
+											<a class="list-group-item cursor-pointer text-center rounded text-dark text-decoration-none" href="i/report?type=user&id={{$user->id}}">
+												Report User
+											</a>
+											<div class="list-group-item cursor-pointer text-center rounded text-dark" onclick="blockProfile()">
+												Block
+											</div>
+											@endauth
+											<div class="list-group-item cursor-pointer text-center rounded text-muted" onclick="$('#ctxProfileMenu').modal('hide')">
+												Close
+											</div>
+										</div>
+									</div>
+								</div>
+							</div>
+						</span>
+						@endauth
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
 </div>
 
 @push('scripts')
+@auth
 <script type="text/javascript">
-  function muteProfile() {
-      axios.post('/i/mute', {
-        type: 'user',
-        item: '{{$user->id}}'
-      }).then(res => {
-        $('#ctxProfileMenu').modal('hide');
-        $('#ctxProfileMenu').hide();
-        swal('Muted Profile', 'You have successfully muted this profile.', 'success');
-      });
-  }
-  function blockProfile() {
-      axios.post('/i/block', {
-        type: 'user',
-        item: '{{$user->id}}'
-      }).then(res => {
-        $('#ctxProfileMenu').modal('hide');
-        $('#ctxProfileMenu').hide();
-        swal('Blocked Profile', 'You have successfully blocked this profile.', 'success');
-      });
-  }
+	function muteProfile() {
+			axios.post('/i/mute', {
+				type: 'user',
+				item: '{{$user->id}}'
+			}).then(res => {
+				$('#ctxProfileMenu').modal('hide');
+				$('#ctxProfileMenu').hide();
+				swal('Muted Profile', 'You have successfully muted this profile.', 'success');
+			});
+	}
+	function blockProfile() {
+			axios.post('/i/block', {
+				type: 'user',
+				item: '{{$user->id}}'
+			}).then(res => {
+				$('#ctxProfileMenu').modal('hide');
+				$('#ctxProfileMenu').hide();
+				swal('Blocked Profile', 'You have successfully blocked this profile.', 'success');
+			});
+	}
 
 </script>
-@endpush
\ No newline at end of file
+@endauth
+@endpush
diff --git a/resources/views/profile/private.blade.php b/resources/views/profile/private.blade.php
index 891f535af..a738c6603 100644
--- a/resources/views/profile/private.blade.php
+++ b/resources/views/profile/private.blade.php
@@ -2,28 +2,28 @@
 
 @section('content')
 @if (session('error'))
-    <div class="alert alert-danger text-center font-weight-bold mb-0">
-        {{ session('error') }}
-    </div>
+		<div class="alert alert-danger text-center font-weight-bold mb-0">
+				{{ session('error') }}
+		</div>
 @endif
 @include('profile.partial.private-info')
 
 <div class="container">
-  <div class="profile-timeline mt-2 mt-md-4">
-    <div class="card">
-      <div class="card-body py-5">
-        <p class="text-center lead font-weight-bold mb-0">
-          {{__('profile.privateProfileWarning')}}
-        </p>
+	<div class="profile-timeline mt-2 mt-md-4">
+		<div class="">
+			<div class="py-5">
+				<p class="text-center lead font-weight-bold">
+					{{__('profile.privateProfileWarning')}}
+				</p>
 
-        @if(!Auth::check())
-        <p class="text-center mb-0">{{ __('profile.alreadyFollow', ['username'=>$user->username])}}</p>
-        <p class="text-center mb-0"><a href="{{route('login')}}">{{__('Log in')}}</a></p>
-        <p class="text-center mb-0">{{__('profile.loginToSeeProfile')}}</p>
-        @endif
-      </div>
-    </div>
-  </div>
+				@if(!Auth::check())
+				<p class="text-center mb-0">{{ __('profile.alreadyFollow', ['username'=>$user->username])}}</p>
+				<p class="text-center mb-0"><a href="{{route('login')}}">{{__('Log in')}}</a></p>
+				<p class="text-center mb-0">{{__('profile.loginToSeeProfile')}}</p>
+				@endif
+			</div>
+		</div>
+	</div>
 </div>
 
 @endsection
@@ -34,4 +34,4 @@
 @if($user->remote_url)
 <meta name="robots" content="noindex, nofollow">
 @endif
-@endpush
\ No newline at end of file
+@endpush

From 4fe42e5b576e1adc40e431f2e2a9ce7af4dda310 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Wed, 7 Jul 2021 01:06:20 -0600
Subject: [PATCH 10/12] Update PublicApiController, improve home timeline perf

---
 app/Http/Controllers/PublicApiController.php | 73 +++++---------------
 1 file changed, 18 insertions(+), 55 deletions(-)

diff --git a/app/Http/Controllers/PublicApiController.php b/app/Http/Controllers/PublicApiController.php
index 212ee31f0..549349042 100644
--- a/app/Http/Controllers/PublicApiController.php
+++ b/app/Http/Controllers/PublicApiController.php
@@ -290,69 +290,32 @@ class PublicApiController extends Controller
         $max = $request->input('max_id');
         $limit = $request->input('limit') ?? 3;
         $user = $request->user();
-        $amin = SnowflakeService::byDate(now()->subDays(90));
-
-        $key = 'user:last_active_at:id:'.$user->id;
-        $ttl = now()->addMinutes(5);
-        Cache::remember($key, $ttl, function() use($user) {
-            $user->last_active_at = now();
-            $user->save();
-            return;
-        });
 
         $filtered = UserFilter::whereUserId($user->profile_id)
                   ->whereFilterableType('App\Profile')
                   ->whereIn('filter_type', ['mute', 'block'])
                   ->pluck('filterable_id')->toArray();
 
-        if($min || $max) {
-            $dir = $min ? '>' : '<';
-            $id = $min ?? $max;
-            $timeline = Status::select(
-                        'id',
-                        'profile_id',
-                        'type',
-                        'scope',
-                        'local'
-                      )->where('id', $dir, $id)
-                      ->where('id', '>', $amin)
-                      ->whereIn('type', ['text', 'photo', 'photo:album', 'video', 'video:album', 'photo:video:album'])
-                      ->whereNotIn('profile_id', $filtered)
-                      ->whereLocal(true)
-                      ->whereScope('public')
-                      ->orderBy('id', 'desc')
-                      ->limit($limit)
-                      ->get()
-                      ->map(function($s) use ($user) {
-                           $status = StatusService::get($s->id);
-                           $status['favourited'] = (bool) LikeService::liked($user->profile_id, $s->id);
-                           return $status;
-                      });
-            $res = $timeline->toArray();
-        } else {
-            $timeline = Status::select(
-                        'id',
-                        'profile_id',
-                        'type',
-                        'scope',
-                        'local'
-                      )->whereIn('type', ['text', 'photo', 'photo:album', 'video', 'video:album', 'photo:video:album'])
-                      ->where('id', '>', $amin)
-                      ->whereNotIn('profile_id', $filtered)
-                      ->with('profile', 'hashtags', 'mentions')
-                      ->whereLocal(true)
-                      ->whereScope('public')
-                      ->orderBy('id', 'desc')
-                      ->limit($limit)
-                      ->get()
-                      ->map(function($s) use ($user) {
-                           $status = StatusService::get($s->id);
-                           $status['favourited'] = (bool) LikeService::liked($user->profile_id, $s->id);
-                           return $status;
-                      });
-            $res = $timeline->toArray();
+        if(PublicTimelineService::count() == 0) {
+        	PublicTimelineService::warmCache(true, 400);
         }
 
+        if ($max) {
+			$feed = PublicTimelineService::getRankedMaxId($max, $limit);
+		} else if ($min) {
+			$feed = PublicTimelineService::getRankedMinId($min, $limit);
+		} else {
+			$feed = PublicTimelineService::get(0, $limit);
+		}
+
+		$res = collect($feed)
+            ->map(function($k) use($user) {
+                $status = StatusService::get($k);
+                $status['favourited'] = (bool) LikeService::liked($user->profile_id, $k);
+                return $status;
+            })
+            ->toArray();
+
         return response()->json($res);
     }
 

From a9565ad5589fcf0152d348b27e114d39663de489 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Wed, 7 Jul 2021 01:07:02 -0600
Subject: [PATCH 11/12] Update compiled assets

---
 public/js/profile.js     | Bin 112873 -> 112892 bytes
 public/mix-manifest.json | Bin 2125 -> 2125 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/public/js/profile.js b/public/js/profile.js
index 18f9c2e7885fd14f1f9d2d4c2ffba71792aebd1e..285de789570793a692501221141fee26c2d379ee 100644
GIT binary patch
delta 912
zcmZ8fT}V@580Ov990vY7{44WR<D5M0r=88e&KjAKqNNiBX9{cV=yYyh+gVvcMG)0R
zlr8vzy6C2xF2Xv<F~Z1*Aa(u?$_uaRLW(Yuf-oxjj*(||^}f&Zyzl$GFW>iJP5)y}
zKV~v&*#Mug7;C%hf&wj?`+YH*iU%piWTJ*5LxHeJ@w{m63yA;I6};FVjG05eGm*Gx
zGSO*>|J%y2w2kKj(tt5TD?Kh28Qlr7!zS&iZ-^QK4tsUgKCW6iJ>IO9K2I!bwZXIX
zI42uQbc0n*)<o`;tGbrx$^KC{FBv9tv!s_ZF_0!w(*`5r!!%VRwniwXPKby7VlWck
zAxO7ZCNe=tw5|4nAdRiQ)c}&Ne7pr4uA}bq44P^o9+Xu4>8Vkxc$}ZDNr=gu&1Dil
zliL#yl6n6U?~?iHghd71+&vYn%yB9xn(tG=<@x<8n3+!-pjntoQx-;4aCGsN3d)v-
zRd9Fd_$IiSa&6{`!>Op8(m+lgAlzC2h4Oj<d<PKZuSV!8A<<)lbs%E19aueLMi7ti
zIXl=0HD(8g4s~05Fmym6{$+=)gw5o@L4unDORhlsSjtMVRyG_Dg%}p$3mhEMD?KEi
z=3rcpc#2{L`H}-Ni7me2gi3tf38nar6UqR|Uz{+hA$vTkfd=w8^0zuNo)qroi7d!X
zJouIM9=f1hhZKiJ7rY?CtpmU*cf5APFcgx-{h@#_+87oC(Nn$<t(3~02Vq&6X=#8v
zS`ufDz%@f2Vg<g!ru^*?*^_)z0S~l+XN$l_8HA_Wz)SqfJTRz5<`{lXPS0R{WE=sr
zjZlQ2c_4d3@^wN!e(!;uq&}k^b{h~=>!(Fx%(a6{pN05Px2=b`MJl805O#OLE^^rY
hF6bo<Q(h>>+q_Up@(M2)@i8xy|KaoHi(csK{S9zVCC2~&

delta 955
zcmY*YTT2vS80K-dbraFbcBSp4L&{7I>u#=V9>z?`R4QvF)U7pEcfTB3W~X&c%lZRB
zP)zX!U39qVt^<ROPzF|XktGD3paX_=(M1>1O_GPcF>>f)c;DxF-tT*#_vM?p8Rz#I
z=iO4z${K|TLO_-UUG!8#G#+`fxq4|(QRAsWUuqzeNOvglOkZt9WvH}N*dp+1?4*x<
zJ+U+|`udc3LJ*})pVIGB`uC-Jlw?9K_8U*v4Tz4`_Qtp&H||cmDr4n4;+0jzI5)DF
z;~1?MzucTB@NN5>x_I%d)Y{Q?O27BeYy2F2z;WpleM~Q*tuf>q7skAK94oVAuCpml
z>+^BW(Wabkrjz*y8PgNha4^1e3F_D83YNR++vYdv@8{P1Ppq2%ucFLWd*-j(AZH<H
zgQkUJHW*o`UHNaIsQ%*jI=x`gZOi_}aU0Ao4ljetXYgzp&{kl`M$dsGHu7bm&PJIm
zq>YU)pSwInRt3H)b0EcwHDo~T%_u3gNHgZ&jOIYo?@x6@Gu&U^Wq}w!rZ2&`{cY64
z9d8IPt;Q_k@OCu_-PM9ZGtZ4*fM#YFBI;!^5x^{%c(fdnlZeAaCiG%C0*rc6jtU1k
z?2pn{hv3dt<B1_&lmdQHB6MRA6|AH^h%&Dx#3bI&OMXcmNG6#o4)><i{!CGVPIaP;
zP6UzbwC-W&J_Rx2Br?xSnt7!HIiQmvtfylktfn`u?0X0sKul*P#<EsuQoqn>*(oqT
zRDo@Wm^rnqF*I5)vpUU;%ILN1kJn+dgILbK*5NS|ZtX<Sn)72lhTyg=B@?l9i^|^h
z$yidbN=>B!@2xu<cH=6?;^$_Zcda3kCKm^+-y_L9v$wC&vj-7oX3`>|uMZ-^`jv%o
zoP{r8tfhCt$o`j4gyH_1?_j~(juICUt9ykEYqzHzbxs$NlZOLQNu%exu$2um+J$ab
ddSg2ZXnq7v>W^SOBlbp?Hf-_c<p_>-{{gPeHb?*f

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index a4ab9b18feb3815bff7ec7706f756f7e2056a60b..4b26e6ae2e1aa7e3470cadec9d2abdb2ebef4a0b 100644
GIT binary patch
delta 33
ocmX>ra8_W$WmXXjqqJmGLz5&UgH-cm)5J8>Bun$n&so!$0Kz;9@c;k-

delta 33
ocmX>ra8_W$WmXa6WYg3{lVl?cOH1RlBufh;v&6K`&so!$0K>5g{Qv*}


From 8a683a928502d1aa057b20f96166dcd19b12f63f Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Wed, 7 Jul 2021 01:07:30 -0600
Subject: [PATCH 12/12] Update changelog

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7278cc02f..2b611fc28 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -47,6 +47,9 @@
 - Updated RemotePost.vue, fix content warning button. ([7647e724](https://github.com/pixelfed/pixelfed/commit/7647e724))
 - Updated AdminMediaController, improve perf and use simple pagination. ([f2686cac](https://github.com/pixelfed/pixelfed/commit/f2686cac))
 - Updated PostComponent, fix MomentUI like counter. ([42c6121a](https://github.com/pixelfed/pixelfed/commit/42c6121a))
+- Updated status views, remove like counts from status embed. ([1a2e41b1](https://github.com/pixelfed/pixelfed/commit/1a2e41b1))
+- Updated Profile, fix unauthenticated private profiles. ([9017f7c4](https://github.com/pixelfed/pixelfed/commit/9017f7c4))
+- Updated PublicApiController, impr home timeline perf. ([4fe42e5b](https://github.com/pixelfed/pixelfed/commit/4fe42e5b))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.11.0 (2021-06-01)](https://github.com/pixelfed/pixelfed/compare/v0.10.10...v0.11.0)