From a2211815d475cce63ce54d885537ed9bea092fd1 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Tue, 8 Jun 2021 01:48:33 -0600
Subject: [PATCH 1/3] Update Activity component, add at (@) symbol for remote
 profiles and local urls for remote posts and profile

---
 resources/assets/js/components/Activity.vue | 40 ++++++++++++++-------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/resources/assets/js/components/Activity.vue b/resources/assets/js/components/Activity.vue
index 570a2e798..b14553328 100644
--- a/resources/assets/js/components/Activity.vue
+++ b/resources/assets/js/components/Activity.vue
@@ -19,42 +19,42 @@
 						<div class="media-body font-weight-light">
 							<div v-if="n.type == 'favourite'">
 								<p class="my-0">
-									<a :href="n.account.url" class="font-weight-bold text-dark word-break" data-placement="bottom" data-toggle="tooltip" :title="n.account.username">{{truncate(n.account.username)}}</a> liked your <a class="font-weight-bold" v-bind:href="n.status.url">post</a>.
+									<a :href="getProfileUrl(n.account)" class="font-weight-bold text-dark word-break" data-placement="bottom" data-toggle="tooltip" :title="n.account.username">{{n.account.local == false ? '@':''}}{{truncate(n.account.username)}}</a> liked your <a class="font-weight-bold" v-bind:href="getPostUrl(n.status)">post</a>.
 								</p>
 							</div>
 							<div v-else-if="n.type == 'comment'">
 								<p class="my-0">
-									<a :href="n.account.url" class="font-weight-bold text-dark word-break" data-placement="bottom" data-toggle="tooltip" :title="n.account.username">{{truncate(n.account.username)}}</a> commented on your <a class="font-weight-bold" v-bind:href="n.status.url">post</a>.
+									<a :href="getProfileUrl(n.account)" class="font-weight-bold text-dark word-break" data-placement="bottom" data-toggle="tooltip" :title="n.account.username">{{n.account.local == false ? '@':''}}{{truncate(n.account.username)}}</a> commented on your <a class="font-weight-bold" v-bind:href="getPostUrl(n.status)">post</a>.
 								</p>
 							</div>
 							<div v-else-if="n.type == 'mention'">
 								<p class="my-0">
-									<a :href="n.account.url" class="font-weight-bold text-dark word-break" data-placement="bottom" data-toggle="tooltip" :title="n.account.username">{{truncate(n.account.username)}}</a> <a class="font-weight-bold" v-bind:href="mentionUrl(n.status)">mentioned</a> you.
+									<a :href="getProfileUrl(n.account)" class="font-weight-bold text-dark word-break" data-placement="bottom" data-toggle="tooltip" :title="n.account.username">{{n.account.local == false ? '@':''}}{{truncate(n.account.username)}}</a> <a class="font-weight-bold" v-bind:href="mentionUrl(n.status)">mentioned</a> you.
 								</p>
 							</div>
 							<div v-else-if="n.type == 'follow'">
 								<p class="my-0">
-									<a :href="n.account.url" class="font-weight-bold text-dark word-break" data-placement="bottom" data-toggle="tooltip" :title="n.account.username">{{truncate(n.account.username)}}</a> followed you.
+									<a :href="getProfileUrl(n.account)" class="font-weight-bold text-dark word-break" data-placement="bottom" data-toggle="tooltip" :title="n.account.username">{{n.account.local == false ? '@':''}}{{truncate(n.account.username)}}</a> followed you.
 								</p>
 							</div>
 							<div v-else-if="n.type == 'share'">
 								<p class="my-0">
-									<a :href="n.account.url" class="font-weight-bold text-dark word-break" data-placement="bottom" data-toggle="tooltip" :title="n.account.username">{{truncate(n.account.username)}}</a> shared your <a class="font-weight-bold" v-bind:href="n.status.reblog.url">post</a>.
+									<a :href="getProfileUrl(n.account)" class="font-weight-bold text-dark word-break" data-placement="bottom" data-toggle="tooltip" :title="n.account.username">{{n.account.local == false ? '@':''}}{{truncate(n.account.username)}}</a> shared your <a class="font-weight-bold" v-bind:href="getPostUrl(n.status)">post</a>.
 								</p>
 							</div>
 							<div v-else-if="n.type == 'modlog'">
 								<p class="my-0">
-									<a :href="n.account.url" class="font-weight-bold text-dark word-break" :title="n.account.username">{{truncate(n.account.username)}}</a> updated a <a class="font-weight-bold" v-bind:href="n.modlog.url">modlog</a>.
+									<a :href="getProfileUrl(n.account)" class="font-weight-bold text-dark word-break" :title="n.account.username">{{truncate(n.account.username)}}</a> updated a <a class="font-weight-bold" v-bind:href="n.modlog.url">modlog</a>.
 								</p>
 							</div>
 							<div v-else-if="n.type == 'tagged'">
 								<p class="my-0">
-									<a :href="n.account.url" class="font-weight-bold text-dark word-break" :title="n.account.username">{{truncate(n.account.username)}}</a> tagged you in a <a class="font-weight-bold" v-bind:href="n.tagged.post_url">post</a>.
+									<a :href="getProfileUrl(n.account)" class="font-weight-bold text-dark word-break" :title="n.account.username">{{n.account.local == false ? '@':''}}{{truncate(n.account.username)}}</a> tagged you in a <a class="font-weight-bold" v-bind:href="n.tagged.post_url">post</a>.
 								</p>
 							</div>
 							<div v-else-if="n.type == 'direct'">
 							<p class="my-0">
-								<a :href="n.account.url" class="font-weight-bold text-dark word-break" :title="n.account.username">{{truncate(n.account.username)}}</a> sent a <a class="font-weight-bold" v-bind:href="'/account/direct/t/'+n.account.id">dm</a>.
+								<a :href="getProfileUrl(n.account)" class="font-weight-bold text-dark word-break" :title="n.account.username">{{n.account.local == false ? '@':''}}{{truncate(n.account.username)}}</a> sent a <a class="font-weight-bold" v-bind:href="'/account/direct/t/'+n.account.id">dm</a>.
 							</p>
 						</div>
 							<div class="align-items-center">
@@ -63,7 +63,7 @@
 						</div>
 						<div>
 							<div v-if="n.status && n.status && n.status.media_attachments && n.status.media_attachments.length">
-								<a :href="n.status.url">
+								<a :href="getPostUrl(n.status)">
 									<img :src="n.status.media_attachments[0].preview_url" width="32px" height="32px">
 								</a>
 							</div>
@@ -83,7 +83,7 @@
 									Follow
 								</a>
 							</div> -->
-							
+
 							<!-- <div v-else-if="n.status && n.status.parent && !n.status.parent.media_attachments && n.type == 'like' && n.relationship.following == false">
 								<a href="#" class="btn btn-primary py-0 font-weight-bold">
 									Follow
@@ -226,7 +226,7 @@ export default {
 
 		followProfile(n) {
 			let self = this;
-			let id = n.account.id; 
+			let id = n.account.id;
 			axios.post('/i/follow', {
 					item: id
 			}).then(res => {
@@ -264,6 +264,22 @@ export default {
 			}
 			return '/';
 		},
+
+		getProfileUrl(account) {
+			if(account.local == true) {
+				return account.url;
+			}
+
+			return '/i/web/profile/_/' + account.id;
+		},
+
+		getPostUrl(status) {
+			if(status.local == true) {
+				return status.url;
+			}
+
+			return '/i/web/post/_/' + status.account.id + '/' + status.id;
+		}
 	}
 }
-</script>
\ No newline at end of file
+</script>

From b230834d251bdffaa59324d21e8e73d45f59e936 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Tue, 8 Jun 2021 01:49:18 -0600
Subject: [PATCH 2/3] Update compiled assets

---
 public/js/activity.js    | Bin 8994 -> 9518 bytes
 public/mix-manifest.json | Bin 2207 -> 2207 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/public/js/activity.js b/public/js/activity.js
index 8c97f3089068c672b354696c01999faa84315c96..eb0f7151a1e7d944366dab6256c01b6b8716a335 100644
GIT binary patch
delta 1090
zcmZ4Fw$5upFL%C1iB6(Us!qO6-ozQ{jQNuo-?8MWspU=n#26z2WN0MY7TKqj<|UV8
z=I3c>R_9GlVsdB9o4ktYE@S@W4(4Vc$-`m<6tQR71|+|+yabXDSoZ<R`D|vI`L=nf
z<qD2PMTwOfiJI1_Hi_1$+S;1=(W$YvB|yTuD7B=tC{H1O^FKB*CZ0UoM7@;6l0?1S
z#Dd8WIYcI#a2hh_YvgUt;EZMj8hL~(14!y}%QENb<WKhHKBALv>zi1Tp_i7EpI@Yr
zs&8y)YHXHjtO+;Q&eqUAUt6hC$x0)CvMrAk2ar<^=EU<zf;cH)P6Lkwh?4>4EZ`Ai
z%-_77r;({%Cq1<!peR2rGbc5)D8~vO5+$0|P?sCp+Lq|$<R>TQ*q7*)0@Wz#XX=-y
zCg~SIwCTs|D`}VLWv0}E&B`w>A;BPJh)F<AP-7C4lk-dSK*nh+LCxK4&d<sSbg!+z
zVMeJEJroCPB<ewRXinx8ij+361qLw842YwZ9F(k-lr*&`Cko|@L9|2M2-I6#l2}q&
ztT{PP#Aq^~a4lt~>ra*zamQ`LdJ0Y7yjGNnLjUVewijPOp))4uOE}{8r19i$64m%@
quonuPd|vW5ekJMz;!%IIhBOP_u&@^*Y(|&ND@GhX+1wzvhy?(Aj%k?y

delta 593
zcmZ4Iwa9HkFL$0siB6(Us!pCx{=^ySjCqq7-?8MYspU`p#26z2WN0MY7TKqj<|UV8
z=I3c>R_9MnVsdB9pS+6cE@R&04(4Vc$-`m<6tQR71|+|+yabXDSoZ<R`D|vIdA50}
z<qD2PMTwOfiJI1_Hi_1$+S;0V(W$YvB|yTuD7B=tC{H18^FKB*CZ2rTM7@;6l0?1S
z#Dd8WIYcI#a2hh_Y2<It;EZMj8hL~(14!y}%QENd<W2VFKBALn>zi1Tp_i7EpI@Yr
zs&8y)YHXHjtO+;Q&eqUAPg|){$x0({vMrAk2ar<^=EU<zf;cH)P6Lkwh?4>4EZ`Ai
z%-g)3r;%y%ZGIL;Ap3#9VMg9Wy~O0?{L;J<z0#tb$@L<UlYOPNCMO6xa3<;%mn4>y
z7VAw8kTsqBLbw)(S|w3;G_@N=aj4z=T8s&om8&Ec;IM#Q%25FBn4;9Aocwf%n<hxr
qplR7CqQ2QzS{2<6pfJc=oBztN;F9W*d&S5Dw*?p$n|l-%u>b&R9?1Uy

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 519e6860bda38e6d77ae2a26168dff623e0f7d51..5480d344635611181483eb25008d5effeab43a35 100644
GIT binary patch
delta 31
ncmbO)IA3tWQ;{?S3qzwMLrYWBq$CqF^CT1Fl$4D>m$3r?q%R7d

delta 31
ncmbO)IA3tWQxS8E<TTTi6a&-bL=y{3<3y9Rl(daMm$3r?t;P#H


From 1baf378497d0fa8c3dd78cecbc566a565258e10c Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Tue, 8 Jun 2021 01:49:26 -0600
Subject: [PATCH 3/3] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 64898e30a..b24d855ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 - Updated landing page, use config_cache. ([54920294](https://github.com/pixelfed/pixelfed/commit/54920294))
 - Updated Timeline, implement suggested post opt out. ([66750d34](https://github.com/pixelfed/pixelfed/commit/66750d34))
 - Updated Notification component, add at (@) symbol for remote profiles and local urls for remote posts and profile. ([aafd6a21](https://github.com/pixelfed/pixelfed/commit/aafd6a21))
+- Updated Activity component, add at (@) symbol for remote profiles and local urls for remote posts and profile. ([a2211815](https://github.com/pixelfed/pixelfed/commit/a2211815))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.11.0 (2021-06-01)](https://github.com/pixelfed/pixelfed/compare/v0.10.10...v0.11.0)