From 7ed65fc9fed1706b6808a09b4f01a36261eb1b4f Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Tue, 20 Jul 2021 18:06:57 -0600
Subject: [PATCH 1/6] Update PostComponent, use profileUrl method for comments

---
 .../assets/js/components/PostComponent.vue    | 14 +++++++--
 resources/assets/js/components/PostMenu.vue   | 29 ++++++++++++++++---
 2 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/resources/assets/js/components/PostComponent.vue b/resources/assets/js/components/PostComponent.vue
index 7b4e50456..c401d7857 100644
--- a/resources/assets/js/components/PostComponent.vue
+++ b/resources/assets/js/components/PostComponent.vue
@@ -149,7 +149,7 @@
 													<div class="media-body">
 														<div v-if="reply.sensitive == true">
 															<span class="py-3">
-																<a class="text-dark font-weight-bold mr-1" :href="reply.account.url" v-bind:title="reply.account.username">{{truncate(reply.account.username,15)}}</a>
+																<a class="text-dark font-weight-bold mr-1" :href="profileUrl(reply)" v-bind:title="reply.account.username">{{!reply.account.local ? '@' : '' }}{{truncate(reply.account.username,15)}}</a>
 																<span class="text-break">
 																	<span class="font-italic text-muted">This comment may contain sensitive material</span>
 																	<span class="text-primary cursor-pointer pl-1" @click="reply.sensitive = false;">Show</span>
@@ -159,7 +159,7 @@
 														<div v-else>
 															<p class="d-flex justify-content-between align-items-top read-more" style="overflow-y: hidden;">
 																<span>
-																	<a class="text-dark font-weight-bold mr-1 text-break" :href="reply.account.url" v-bind:title="reply.account.username">{{truncate(reply.account.username,15)}}</a>
+																	<a class="text-dark font-weight-bold mr-1 text-break" :href="profileUrl(reply)" v-bind:title="reply.account.username">{{!reply.account.local ? '@' : '' }}{{truncate(reply.account.username,15)}}</a>
 																	<span class="text-break comment-body" style="word-break: break-all;" v-html="reply.content"></span>
 																</span>
 																<span style="min-width:38px;">
@@ -182,7 +182,7 @@
 																	<div class="media-body">
 																		<p class="d-flex justify-content-between align-items-top read-more" style="overflow-y: hidden;">
 																			<span>
-																				<a class="text-dark font-weight-bold mr-1" :href="s.account.url" :title="s.account.username">{{s.account.username}}</a>
+																				<a class="text-dark font-weight-bold mr-1" :href="profileUrl(s)" :title="s.account.username">{{!s.account.local ? '@' : '' }}{{s.account.username}}</a>
 																				<span class="text-break comment-body" style="word-break: break-all;" v-html="s.content"></span>
 																			</span>
 																			<span class="pl-2" style="min-width:38px">
@@ -1567,6 +1567,14 @@ export default {
 				return '/i/web/post/_/' + status.account.id + '/' + status.id;
 			},
 
+			profileUrl(status) {
+				if(status.local == true) {
+					return status.account.url;
+				}
+
+				return '/i/web/profile/_/' + status.account.id;
+			},
+
 			showTaggedPeopleModal() {
 				if(!$('body').hasClass('loggedIn') && this.loaded) {
 					return;
diff --git a/resources/assets/js/components/PostMenu.vue b/resources/assets/js/components/PostMenu.vue
index a4d12d866..55b7c3de0 100644
--- a/resources/assets/js/components/PostMenu.vue
+++ b/resources/assets/js/components/PostMenu.vue
@@ -49,16 +49,17 @@
 				<span v-bind:class="[size =='lg' ? 'fas fa-ellipsis-v fa-lg text-muted' : 'fas fa-ellipsis-v fa-sm text-lighter']"></span>
 			</span>
 			<div class="modal" tabindex="-1" role="dialog" :id="'mt_pid_'+status.id">
-				<div class="modal-dialog modal-sm" role="document">
+				<div class="modal-dialog modal-sm modal-dialog-centered" role="document">
 					<div class="modal-content">
 						<div class="modal-body text-center">
-							<div class="list-group text-dark">
-								<a class="list-group-item text-dark text-decoration-none" :href="status.url">Go to post</a>
+							<div class="list-group">
+								<a class="list-group-item text-dark text-decoration-none" :href="statusUrl(status)">Go to post</a>
 								<!-- a class="list-group-item font-weight-bold text-decoration-none" :href="status.url">Share</a>
 								<a class="list-group-item font-weight-bold text-decoration-none" :href="status.url">Embed</a> -->
 								<a class="list-group-item text-dark text-decoration-none" href="#" @click.prevent="hidePost(status)">Hide</a>
 								<a v-if="activeSession == true && !statusOwner(status)" class="list-group-item text-danger font-weight-bold text-decoration-none" :href="reportUrl(status)">Report</a>
 								<div v-if="activeSession == true && statusOwner(status) == true || profile.is_admin == true" class="list-group-item text-danger font-weight-bold cursor-pointer" @click.prevent="deletePost">Delete</div>
+								<a class="list-group-item text-lighter text-decoration-none" href="#" @click.prevent="closeModal()">Close</a>
 							</div>
 						</div>
 					</div>
@@ -199,7 +200,27 @@
 				}).catch(err => {
 					swal('Error', 'Something went wrong. Please try again later.', 'error');
 				});
+			},
+
+			statusUrl(status) {
+				if(status.local == true) {
+					return status.url;
+				}
+
+				return '/i/web/post/_/' + status.account.id + '/' + status.id;
+			},
+
+			profileUrl(status) {
+				if(status.local == true) {
+					return status.account.url;
+				}
+
+				return '/i/web/profile/_/' + status.account.id;
+			},
+
+			closeModal() {
+				$('#mt_pid_'+this.status.id).modal('hide');
 			}
 		}
 	}
-</script>
\ No newline at end of file
+</script>

From 11eb6acdaff3488bb62f33c36169f32064fae789 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Tue, 20 Jul 2021 18:13:17 -0600
Subject: [PATCH 2/6] Update Timeline, fix empty timeline card

---
 resources/assets/js/components/Timeline.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/js/components/Timeline.vue b/resources/assets/js/components/Timeline.vue
index f926bff4e..88dffefa7 100644
--- a/resources/assets/js/components/Timeline.vue
+++ b/resources/assets/js/components/Timeline.vue
@@ -198,7 +198,7 @@
 								:recommended="true" />
 						</div>
 
-						<div v-if="!loading && emptyFeed">
+						<div v-if="!loading && emptyFeed && scope !== 'home'">
 							<div class="card rounded-0 mt-3 status-card rounded-0 shadow-none border">
 								<div class="card-body py-5 my-5">
 									<p class="text-center"><i class="fas fa-battery-empty fa-8x text-lighter"></i></p>

From 4778053f882932c6584fa3fff38dee09204b0ad2 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Tue, 20 Jul 2021 18:15:30 -0600
Subject: [PATCH 3/6] Update compiled assets

---
 public/js/profile.js     | Bin 115929 -> 116372 bytes
 public/js/rempos.js      | Bin 76944 -> 77387 bytes
 public/js/status.js      | Bin 123829 -> 124460 bytes
 public/js/timeline.js    | Bin 190808 -> 191269 bytes
 public/mix-manifest.json | Bin 2125 -> 2125 bytes
 5 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/public/js/profile.js b/public/js/profile.js
index c2dd65a3d8fd1ab051a35dd05c653d5d4d37ebcf..5a441adbc751bec2b3f651b27c583d06bc80ed41 100644
GIT binary patch
delta 3974
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

delta 3833
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
S)VJp+WS_4^cKiK)$@^dI(DP;h

diff --git a/public/js/rempos.js b/public/js/rempos.js
index 65e77a6667f070037df59f1d02a375a5638e3a1f..6fa5fb99beaa0f7e20af8b192eee8e280b60b1ab 100644
GIT binary patch
delta 456
zcmbPmljZasmJNzJEWx?%Rg?JztTv15&Una@>0OpS{Q)1N6ibD<g~|4Re2gZHU?xzB
z<>WXW5e`EG1EW;)RHMni#nmP+&=Eoi?9!3nZY021&Cae<T#{H)T0HrDzc`nnt!;^3
zPJVJ?&Saj6`s@Wo`DvLssUWF9gp_@WUSe``eraBbUTIN|m6Cp@etBw=K2))OyuOk)
zLPcgutxj@IesQXAeoA7FRa$9Ya!F=>o`z=i^jcv?ZQj~iolIMeVhyFLs`T*53l!of
zub#`fT}guRH@BEVE=Z4VN@ikCe!6aQYF<fdQEJL`Srx{~lM9}(OkR3JWU~Bsf$5J_
z7)_>MlwuU0ZZ5?rIo&~y5iCA=(;l74`{qkeo^XeK`+8MIW~RxzAM;IjP-RqO&&f>B
z0Gc+vP#UPKPK}WVrf@n?p{P8<#TuHmKqp3*=*5?5C^>^XqNEwSeWN-fBMTxh_1Wd7
j-_T}U&8h?T#X|!{5m4MH0rl!cM;n>w7{tcLYFYyTJgJ--

delta 237
zcmX?ohh@S|mJNzJEdH5Q9@7K)8GShnQd3Nf4UEkv{}xx9euke>2re@H89$@^W<{NA
z4_UGzoH8aCI?D5DDCHIvr73CF>VW9!=Y$!>*^4!lK*mju_UoL!h>vkKOJz}JGElY2
zc3S~PXLjD&TAfT=4WKHpDGL<hx8IduWZ{|qU4?Nnw?av3MTu@oVo|oz<c}KSlNbCK
zm~N%Us54pq2FLWbQjF@;@5?iafP}XLg#(!;^M2&m?xD%}gBkA5$@=Va)6;YrSM%2D
QL`NH$=orMt#%fvv0GT>X<NyEw

diff --git a/public/js/status.js b/public/js/status.js
index 94f1bbd34f161a905ee7d920a632bb2363287296..c09608834657c6a371c3e39c043e881a58330855 100644
GIT binary patch
delta 1303
zcmb7DU1%It6y_wm-MA(z+9cAZCfQ3}XWYB9n`GPk)FDd~(Kc+9gsACe7$>unIO*)p
zx;y)0?D`-m7JSG$;1$Ft`yi;0GRS~Jl5JXxr4&T!OQZztQ~Uw3;6sBrJ4v`c+PC?>
zbIzRae&?L8uKT{Y>05o$=N*VAvxr>&7LIzRrq8}kg1^9fK8)fM&kZ5-`?tERXMMHP
zheW;{VM^v7$#?x3ZeBMGJ;RHZcJ`e>yU3SxHQgKIdA>Y~5@@81E2ek0$5RP~Di$-_
z4bgF$GI`;`BwpfGPSP~JJe`wdrGS_B<3XNZ3Wb)e;<?`dM00*F1fq3uE(0)b{VlXR
zoYg8SqA!=%7gS9#gKNhbNtX3u*5HbHZ3IQtXjz$$?#H8I6on0LFT*;&cDOY#HI<o0
zELIsbqiRv>{TsVaJz{YC`7?QqQCRW}2TzzU?)c5^U4KB+Wl0-FXvBFL8#eFXd&z41
zYaJe>$hv>;vhRTkwsu$aaI9~5K<SSSAe=2~8hc9N(#nEV)C^wcluAy|8-*%HC#A_G
zB8eIdlNZ+ENXtPL$*sc~it6idoFXU2lFkk2qSWvP4A?6g-10XMK0mRy4~>7j`(R%z
zgLTByFpo%O2)4RQ!&b4oF>do8H{kKmL307mWx2c}$%d+D3#qhZNRd+HAli`DPR`fi
zArh-Y57ltMk5kI7LztqSI?Pctc?CYE=+7%KL{Z-+3{#Zfgp(AlZbCmrJDc!1MW0-S
zQHt(fg%m|j_oGC*1{$SqUxSDp`~aFg-o`#5*B$R^$3bNGeh7hpU&Ixj5&4vW$?DtC
z(ITb{fmg6dW-h^NP_fr8!Iw>kP&#}j?pF8I#BO``Gx)l*d7`wqH;2mLP~4q^7rUR1
z;mMZ1Sgc<eRQieY@DTZ?29Htdb`5$wZ{$_Ep~v}ShrMzg#(Yh<U>;kW`S1CR|KIa5
zI5l0xvZfc5q@I?vk%eN`9WTSaNj|*+;kIfOXL-iCtmWm!m+kFaAh&k*W*WJXv?^)(
zVnkN5hLTs(WNZsek~je#a(4?}X=~h_!4(Y2C>B^d@e_R1L|#1y0n+^gJW3LGpo2Ud
zho{YdZg!EF3de#}2E$gJzA1wfOAH!os6(v43M3bYcKi1`@M|-5W&3CN&WjuB+%X+i
S9fOfmk5j1=I3@@Jd+J}|t+93h

delta 1032
zcmY+CT}V@57{__^<d#m2Fl*(<Jmj2trfc&vJ834FiC-C%&AHZg$}Qcox!iF%#EXK!
zn|zzEdJzOdVC%yUawrJBFcdTtp(y%*g0A$!F4CKl&X)Sp<?sKz&;NPf|MP|x6qB=x
z=a~v|Sus(e6j+~L*R9u~>2n8>ROdp8HM>C&)it*hiUhWscRDl%mSufqbUA&@$5>fs
zuI;9mxAPsH?VOjZ<sBT;vvn?mWvyDRReaZ+26-;hT-V!M$5e(p+uM0xQ>V?&buoU@
zRH@ZginMtZKtPEWtvtTa(gENS$6AwQO?+wPtfFr!UX{>PQ&mG}Gfo{{QGBgX9Gw51
zg$MKC2ufX#MVD9NQ2qL8JYa$Wy!Hlmq3TrwZq5f29?67#NVBjXEiNkYiUU-r^N$C8
z_@(}@TdZGysMuDL#M;e%Udb74#sZ^(!|yvFO={rbZEUnW8u#}>no_>Ul?J<?mS+4g
zsix|k{xf*|K9u10Sx8bEI7hz8U@F3!L!iY^XJIdq=4K(C3cqH@=tjN2fR<FF5JO2P
zA3$tEj3B426L4b))JnnZwXhr`U{46zz$$$T!ILN|JRCu8GAdV4l=H&bV!VdnZVc_n
zsm`Y(&i7i=rTJ&@Dmgk_joi)Xmi=~~wd96u-0KDnk;dF`n2>y+l28f{CdzfOqAlW{
zC<oBt@m!^|1B}bxc{DtrLA&j3VOrd|9?oX>I(c`O*<thA^xgXHD%J$yI5Czf754|B
zlt?o{$RV^5gqFDNW{c()o*IQixMv6g<cu72F`*L}N(l8~C?xb6gOSh%hR1})hoOwn
z&tWhVIzIw;2z?&`JrxdMX9<xn5MBZm-sg@S2`3`=c%1gF%_K|db8t!#9|$mRRwqaK
zFV`3HdZ(6vQsIxE0mW*(oZ!_vY@X}5u>cNW>m}HOQ@#R&r@w#_FD^qCUde!@NI{Yd
gjZu&2Z$Od1Hi6`5tA0R86=2Nf0>)smSh7q10s{tF)&Kwi

diff --git a/public/js/timeline.js b/public/js/timeline.js
index e4fcf0d60e7f5e53051117e086c09bb55e2f7296..28675c3e995d753cd54f3495d508b2b154f01604 100644
GIT binary patch
delta 724
zcmYL`T}V@57{_^Dj~}%ZOLKid+fFq$b{xxOQ`;fZwJv04$XGOntnKXEoqf4tI<Si_
zf{5w_ZxpCOnim#^7cUgirj71Gnn$7_cGcC0E<+63ndQ0sz0d!7pa1iJzI;|JY$;am
zl~qnQZuG`t{Ee}M*T<!q2%F`@ezi%%vQDkmDZDHj)UKK)!KcHSFduht@kwUzpNM5y
z*Yvb&^><kZ5D_#Y1B1edI0})~Iq`vsx@dD{ak31@DDTxV8~&w4cgVLU;G<O3W{#4P
z6o{%rS}h&oCpfw`F=I^o_yk8zJ_Ng=<!qq0p9}bXB>4`kh;pQoAzb_lD!ko*T5+Wc
zm&i^DUbGRn2wLUth}ZAIwbzK-3vf-QQ~~TV6$((1X{iYIeg6k~@P!g6aoZaBWkqfc
ziZTtY!)=*1*5Q*(iyz>wOamntCbz2a<1`f>&IWhmxM}I@t;bOhLfT5xD1}86YX=JD
z8>Dh=m3~~=gwB>TCQ}b*;d=1SCiKZ<6+uNd?xU$@VHB-&`C@#UbMSs|Y#=Zh_esan
z>8J4VN665c&ogOO7uV6bT+oH9A7LENr(i!RK1SP$F7<@e)$I>^V|=jN$Hg;Tiu2>Q
z&yj$yJcA=Rv4CvCt5XN@%v02a#V6<}{yvL3rFSb<&4PtoUqn9vE6kw4f8Id7a=1Ab
z4u)!9;r2PC#PbX2KwYbnjq3FInlpFCIG)wfLy~`5?;)3$5Kwz-3g>4|knA$rvNkex
X_fl9LQj~P9n{m6%jLGBi=+FHH26O}!

delta 601
zcmZ2_jr+zW?hSpH<+E(_^b&J&^2>t@5|dMlbwX{+@-tHu3>0l`v((hGCa=A$t>6Sy
zQ;=VrS(2Hb=bM^WsuK=XWNT~dR8!-$`Nw4qM#j*|idS_Q!zcS)4PXr2JpbxM0~VKv
zoQ!E_8Kqc!j4OPm%bjKH+<u#lF+ZE7BFZIiyI&FGRr&3vlNjB!IZ`cCO$>|;Otv@g
zWwc>}sArtOWI5g88KWFGOg2`bdOH6FMzQJj&lnxydZwRv#^{FNi9Kh0fZ+Xmjx6W%
zg0Ti6ci{!&K?HB+OU70NPwf@sIRx*|E5;rKZ^COv@9q2dGs^L^_-9smOb0sDm%|`6
z#l+aa*nE1}1SSgvZ`uSV`R#YlF{+8PB>Ux>Pk(rhQE}TF#)GOXSrJYdU@lK?QBj(b
zW~~m01_u||R8VlS<h$f~ffUJa-y_82RLcwuH;5ik(1P?-7G)-b6-?KC!zjA_?F1%g
z_UZOqOq>w&8Q(L;PhU{P$hCd?Or~Gl)0Z!0n#`q8l3G!so03?RJw0$2qr_x~T!HDY
zmNDr}?_0*iF@66jM!xB*XERAo=ikjJ0+QSglni8A{$V8(3*2Lq?HlB_i>+h2X2Vmf
P6CG`)V-On~t7#1Y_chXu

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 736cb6dfa1316dcfad6a9e3bbfa428c7ab1a0067..ddc6c83a9c681550cd4c6b0642b43b3c22b93f69 100644
GIT binary patch
delta 106
zcmV~$u@S;B3<c0CaF;4~q@ZSkZ&|jbaiU0RnSd!g1T76s2B1sD5Ujy_$8=1u?=XjH
zY8)%qP-rayvHlzOxk!f7%1T}~WD*PO@6+>A6-ed`wzfn7E%*ERbLEf%PT2w58aXYZ
IxA8Il0pj}~DF6Tf

delta 106
zcmV~$yAi@L3;@t7aF;4~Ns*cfB=oU8j%4AM2{MI;prxT<fOM%c1Z(i#F&)$U9F~l3
z=!$H`nwV$~=)d8+SaBe14{s!4nEY<gKbP0slq*HCs!Rb4xp;qG_f=97Md3&}$k=PJ
I-^OkH0~;J5KmY&$


From 32268efbc965a3c93efb19226504f6a021e87089 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Tue, 20 Jul 2021 18:15:36 -0600
Subject: [PATCH 4/6] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5e092279..0833ca249 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -65,6 +65,8 @@
 - Updated presenters, improve content warnings. ([86422c81](https://github.com/pixelfed/pixelfed/commit/86422c81))
 - Updated Timeline.vue, increase pagination limit from 3 to 12 and add empty feed placeholder. ([916e8f71](https://github.com/pixelfed/pixelfed/commit/916e8f71))
 - Updated Timeline.vue, improve followed hashtags. ([728f10d7](https://github.com/pixelfed/pixelfed/commit/728f10d7))
+- Updated PostComponent, use profileUrl method for comments. ([7ed65fc9](https://github.com/pixelfed/pixelfed/commit/7ed65fc9))
+- Updated Timeline, fix empty timeline card. ([11eb6acd](https://github.com/pixelfed/pixelfed/commit/11eb6acd))
 -  ([](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 f392fa4ed4414ab899ae15a784f0585cbb83c67b Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Tue, 20 Jul 2021 21:52:49 -0600
Subject: [PATCH 5/6] Update nav

---
 resources/views/layouts/partial/nav.blade.php | 241 +++++++++---------
 1 file changed, 120 insertions(+), 121 deletions(-)

diff --git a/resources/views/layouts/partial/nav.blade.php b/resources/views/layouts/partial/nav.blade.php
index 758d881aa..05f00d939 100644
--- a/resources/views/layouts/partial/nav.blade.php
+++ b/resources/views/layouts/partial/nav.blade.php
@@ -1,128 +1,127 @@
 <nav class="navbar navbar-expand navbar-light navbar-laravel shadow-none border-bottom sticky-top py-1">
-    <div class="container">
-            <a class="navbar-brand d-flex align-items-center" href="{{ route('timeline.personal') }}" title="Logo">
-                <img src="/img/pixelfed-icon-color.svg" height="30px" class="px-2" loading="eager" alt="Pixelfed logo">
-                <span class="font-weight-bold mb-0 d-none d-sm-block" style="font-size:20px;">{{ config_cache('app.name') }}</span>
-            </a>
+	<div class="container">
+			<a class="navbar-brand d-flex align-items-center" href="{{ route('timeline.personal') }}" title="Logo">
+				<img src="/img/pixelfed-icon-color.svg" height="30px" class="px-2" loading="eager" alt="Pixelfed logo">
+				<span class="font-weight-bold mb-0 d-none d-sm-block" style="font-size:20px;">{{ config_cache('app.name') }}</span>
+			</a>
 
-            <div class="collapse navbar-collapse">
-            @auth
-                <div class="navbar-nav d-none d-md-block mx-auto">
-                  <form class="form-inline search-bar" method="get" action="/i/results">
-                    <input class="form-control form-control-sm" name="q" placeholder="{{__('navmenu.search')}}" aria-label="search" autocomplete="off" required style="line-height: 0.6;width:200px" role="search">
-                  </form>
-                </div>
-            @endauth
+			<div class="collapse navbar-collapse">
+			@auth
+				<div class="navbar-nav d-none d-md-block mx-auto">
+				  <form class="form-inline search-bar" method="get" action="/i/results">
+					<input class="form-control form-control-sm" name="q" placeholder="{{__('navmenu.search')}}" aria-label="search" autocomplete="off" required style="line-height: 0.6;width:200px" role="search">
+				  </form>
+				</div>
+			@endauth
 
-            @guest
+			@guest
 
-                <ul class="navbar-nav ml-auto">
-                    <li>
-                        <a class="nav-link font-weight-bold text-dark" href="{{ route('login') }}" title="Login">
-                            {{ __('Login') }}
-                        </a>
-                    </li>
-                @if(config_cache('pixelfed.open_registration') && config('instance.restricted.enabled') == false)
-                    <li>
-                        <a class="ml-3 nav-link font-weight-bold text-dark" href="{{ route('register') }}" title="Register">
-                            {{ __('Register') }}
-                        </a>
-                    </li>
-                @endif
-            @else
-                <div class="ml-auto">
-                    <ul class="navbar-nav align-items-center">
-                        <li class="nav-item px-md-2 d-none d-md-block">
-                            <a class="nav-link font-weight-bold text-dark" href="/" title="Home" data-toggle="tooltip" data-placement="bottom">
-                                <i class="fas fa-home fa-lg"></i>
-                                <span class="sr-only">Home</span>
-                            </a>
-                        </li>
-                        <li class="nav-item px-md-2 d-none d-md-block">
-                            <div class="nav-link font-weight-bold text-dark cursor-pointer" title="Compose" data-toggle="tooltip" data-placement="bottom" onclick="App.util.compose.post()">
-                                <i class="far fa-plus-square fa-lg"></i>
-                                <span class="sr-only">Compose</span>
-                            </div>
-                        </li>
-                        <li class="nav-item px-md-2">
-                            <a class="nav-link font-weight-bold text-dark" href="/account/direct" title="Direct" data-toggle="tooltip" data-placement="bottom">
-                                <i class="far fa-comment-dots fa-lg"></i>
-                                <span class="sr-only">Direct</span>
-                            </a>
-                        </li>
-                        <li class="nav-item px-md-2 d-none d-md-block">
-                            <a class="nav-link font-weight-bold text-dark" href="/account/activity" title="Notifications" data-toggle="tooltip" data-placement="bottom">
-                                <i class="far fa-bell fa-lg"></i>
-                                <span class="sr-only">Notifications</span>
-                            </a>
-                        </li>
-                        <li class="nav-item dropdown ml-2">
-                            <a id="navbarDropdown" class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="User Menu" data-toggle="tooltip" data-placement="bottom">
-                                <i class="far fa-user fa-lg text-dark"></i>
-                                <span class="sr-only">User Menu</span>
-                                <img class="d-none" src="/storage/avatars/default.png?v=0" class="rounded-circle border shadow" width="34" height="34" onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=0';">
-                            </a>
+				<ul class="navbar-nav ml-auto">
+					<li>
+						<a class="nav-link font-weight-bold text-dark" href="{{ route('login') }}" title="Login">
+							{{ __('Login') }}
+						</a>
+					</li>
+				@if(config_cache('pixelfed.open_registration') && in_array(config_cache('system.user_mode'), ['default', 'admin']))
+					<li>
+						<a class="ml-3 nav-link font-weight-bold text-dark" href="{{ route('register') }}" title="Register">
+							{{ __('Register') }}
+						</a>
+					</li>
+				@endif
+			@else
+				<div class="ml-auto">
+					<ul class="navbar-nav align-items-center">
+						<li class="nav-item px-md-2 d-none d-md-block">
+							<a class="nav-link font-weight-bold text-dark" href="/" title="Home" data-toggle="tooltip" data-placement="bottom">
+								<i class="fas fa-home fa-lg"></i>
+								<span class="sr-only">Home</span>
+							</a>
+						</li>
+						<li class="nav-item px-md-2">
+							<a class="nav-link font-weight-bold text-dark" href="/account/direct" title="Direct" data-toggle="tooltip" data-placement="bottom">
+								<i class="far fa-comment-dots fa-lg"></i>
+								<span class="sr-only">Direct</span>
+							</a>
+						</li>
+						<li class="nav-item px-md-2 d-none d-md-block">
+							<a class="nav-link font-weight-bold text-dark" href="/account/activity" title="Notifications" data-toggle="tooltip" data-placement="bottom">
+								<i class="far fa-bell fa-lg"></i>
+								<span class="sr-only">Notifications</span>
+							</a>
+						</li>
+						<li class="nav-item px-md-2 d-none d-md-block">
+							<div class="nav-link btn btn-primary btn-sm py-1 font-weight-bold text-white" title="Compose" data-toggle="tooltip" data-placement="bottom" onclick="App.util.compose.post()">
+								<span>New Post</span>
+							</div>
+						</li>
+						<li class="nav-item dropdown ml-2">
+							<a id="navbarDropdown" class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="User Menu" data-toggle="tooltip" data-placement="bottom">
+								<i class="far fa-user fa-lg text-dark"></i>
+								<span class="sr-only">User Menu</span>
+								<img class="d-none" src="/storage/avatars/default.png?v=0" class="rounded-circle border shadow" width="34" height="34" onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=0';">
+							</a>
 
-                            <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
-                                @if(config('federation.network_timeline'))
-                                <a class="dropdown-item font-weight-bold" href="{{route('timeline.public')}}">
-                                    <span class="fas fa-stream pr-2 text-lighter"></span>
-                                    Public
-                                </a>
-                                <a class="dropdown-item font-weight-bold" href="{{route('timeline.network')}}">
-                                    <span class="fas fa-globe pr-2 text-lighter"></span>
-                                    Network
-                                </a>
-                                @else
-                                <a class="dropdown-item font-weight-bold" href="/">
-                                    <span class="fas fa-home pr-2 text-lighter"></span>
-                                    Home
-                                </a>
-                                <a class="dropdown-item font-weight-bold" href="{{route('timeline.public')}}">
-                                    <span class="fas fa-stream pr-2 text-lighter"></span>
-                                    Public
-                                </a>
-                                @endif
-                                <div class="dropdown-divider"></div>
-                                <a class="dropdown-item font-weight-bold" href="{{route('discover')}}">
-                                    <span class="far fa-compass pr-2 text-lighter"></span>
-                                    {{__('navmenu.discover')}}
-                                </a>
-                                <a class="dropdown-item font-weight-bold" href="/i/stories/new">
-                                    <span class="fas fa-history text-lighter pr-2"></span>
-                                    Stories
-                                </a>
-                                <div class="dropdown-divider"></div>
-                                <a class="dropdown-item font-weight-bold" href="/i/me">
-                                    <span class="far fa-user pr-2 text-lighter"></span>
-                                    {{__('navmenu.myProfile')}}
-                                </a>
-                                <a class="dropdown-item font-weight-bold" href="{{route('settings')}}">
-                                    <span class="fas fa-cog pr-2 text-lighter"></span>
-                                    {{__('navmenu.settings')}}
-                                </a>
-                                @if(Auth::user()->is_admin == true)
-                                <a class="dropdown-item font-weight-bold" href="{{ route('admin.home') }}">
-                                    <span class="fas fa-shield-alt fa-sm pr-2 text-lighter"></span>
-                                    {{__('navmenu.admin')}}
-                                </a>
-                                @endif
-                                <div class="dropdown-divider"></div>
-                                <a class="dropdown-item font-weight-bold" href="{{ route('logout') }}"
-                                   onclick="event.preventDefault();
-                                                 document.getElementById('logout-form').submit();">
-                                    <span class="fas fa-sign-out-alt pr-2"></span>
-                                    {{ __('navmenu.logout') }}
-                                </a>
+							<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
+								@if(config('federation.network_timeline'))
+								<a class="dropdown-item font-weight-bold" href="{{route('timeline.public')}}">
+									<span class="fas fa-stream pr-2 text-lighter"></span>
+									Public
+								</a>
+								<a class="dropdown-item font-weight-bold" href="{{route('timeline.network')}}">
+									<span class="fas fa-globe pr-2 text-lighter"></span>
+									Network
+								</a>
+								@else
+								<a class="dropdown-item font-weight-bold" href="/">
+									<span class="fas fa-home pr-2 text-lighter"></span>
+									Home
+								</a>
+								<a class="dropdown-item font-weight-bold" href="{{route('timeline.public')}}">
+									<span class="fas fa-stream pr-2 text-lighter"></span>
+									Public
+								</a>
+								@endif
+								<div class="dropdown-divider"></div>
+								<a class="dropdown-item font-weight-bold" href="{{route('discover')}}">
+									<span class="far fa-compass pr-2 text-lighter"></span>
+									{{__('navmenu.discover')}}
+								</a>
+								<a class="dropdown-item font-weight-bold" href="/i/stories/new">
+									<span class="fas fa-history text-lighter pr-2"></span>
+									Stories
+								</a>
+								<div class="dropdown-divider"></div>
+								<a class="dropdown-item font-weight-bold" href="/i/me">
+									<span class="far fa-user pr-2 text-lighter"></span>
+									{{__('navmenu.myProfile')}}
+								</a>
+								<a class="dropdown-item font-weight-bold" href="{{route('settings')}}">
+									<span class="fas fa-cog pr-2 text-lighter"></span>
+									{{__('navmenu.settings')}}
+								</a>
+								@if(Auth::user()->is_admin == true)
+								<a class="dropdown-item font-weight-bold" href="{{ route('admin.home') }}">
+									<span class="fas fa-shield-alt fa-sm pr-2 text-lighter"></span>
+									{{__('navmenu.admin')}}
+								</a>
+								@endif
+								<div class="dropdown-divider"></div>
+								<a class="dropdown-item font-weight-bold" href="{{ route('logout') }}"
+								   onclick="event.preventDefault();
+												 document.getElementById('logout-form').submit();">
+									<span class="fas fa-sign-out-alt pr-2"></span>
+									{{ __('navmenu.logout') }}
+								</a>
 
-                                <form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
-                                    @csrf
-                                </form>
-                            </div>
-                        </li>
-                    </div>
-            @endguest
-                </ul>
-            </div>
-    </div>
+								<form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
+									@csrf
+								</form>
+							</div>
+						</li>
+					</div>
+			@endguest
+				</ul>
+			</div>
+	</div>
 </nav>

From 9f4f983f27022b04a71d65a418b7a64d7ea8436a Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Tue, 20 Jul 2021 22:17:31 -0600
Subject: [PATCH 6/6] Update ap helpers, set text type when appropriate

---
 app/Http/Controllers/StatusController.php | 2 ++
 app/Util/ActivityPub/Helpers.php          | 1 +
 2 files changed, 3 insertions(+)

diff --git a/app/Http/Controllers/StatusController.php b/app/Http/Controllers/StatusController.php
index 0cf4a513b..f4b5f74cc 100644
--- a/app/Http/Controllers/StatusController.php
+++ b/app/Http/Controllers/StatusController.php
@@ -364,6 +364,8 @@ class StatusController extends Controller
 		if($photos >= 1 && $videos >= 1) {
 			return 'photo:video:album';
 		}
+
+		return 'text';
 	}
 
 	public function toggleVisibility(Request $request) {
diff --git a/app/Util/ActivityPub/Helpers.php b/app/Util/ActivityPub/Helpers.php
index 48d37615e..f2e1adec5 100644
--- a/app/Util/ActivityPub/Helpers.php
+++ b/app/Util/ActivityPub/Helpers.php
@@ -416,6 +416,7 @@ class Helpers {
 	public static function importNoteAttachment($data, Status $status)
 	{
 		if(self::verifyAttachments($data) == false) {
+			$status->viewType();
 			return;
 		}
 		$attachments = isset($data['object']) ? $data['object']['attachment'] : $data['attachment'];