From aafd6a21a52efa739fa010548690e5feeaf90fad Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 8 Jun 2021 01:29:44 -0600 Subject: [PATCH 1/3] Update Notification component, add at (@) symbol for remote profiles and local urls for remote posts and profiles --- .../assets/js/components/NotificationCard.vue | 36 +++++++++++++------ 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/resources/assets/js/components/NotificationCard.vue b/resources/assets/js/components/NotificationCard.vue index ef694f3b9..d0109f1f3 100644 --- a/resources/assets/js/components/NotificationCard.vue +++ b/resources/assets/js/components/NotificationCard.vue @@ -20,51 +20,51 @@

- {{truncate(n.account.username)}} liked your + {{n.account.local == false ? '@':''}}{{truncate(n.account.username)}} liked your - post. + post. - post. + post.

- {{truncate(n.account.username)}} commented on your post. + {{n.account.local == false ? '@':''}}{{truncate(n.account.username)}} commented on your post.

- {{truncate(n.account.username)}} mentioned you. + {{n.account.local == false ? '@':''}}{{truncate(n.account.username)}} mentioned you.

- {{truncate(n.account.username)}} followed you. + {{n.account.local == false ? '@':''}}{{truncate(n.account.username)}} followed you.

- {{truncate(n.account.username)}} shared your post. + {{n.account.local == false ? '@':''}}{{truncate(n.account.username)}} shared your post.

- {{truncate(n.account.username)}} updated a modlog. + {{truncate(n.account.username)}} updated a modlog.

- {{truncate(n.account.username)}} tagged you in a post. + {{n.account.local == false ? '@':''}}{{truncate(n.account.username)}} tagged you in a post.

- {{truncate(n.account.username)}} sent a dm. + {{n.account.local == false ? '@':''}}{{truncate(n.account.username)}} sent a dm.

@@ -256,6 +256,22 @@ return '/storage/no-preview.png'; } return n.status.media_attachments[0].preview_url; + }, + + 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; } } } From 06e7ef16c6b3cd4085f13fd8acceb8825f79a685 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 8 Jun 2021 01:30:53 -0600 Subject: [PATCH 2/3] Update compiled assets --- public/js/network-timeline.js | Bin 176939 -> 177470 bytes public/js/timeline.js | Bin 191010 -> 191541 bytes public/mix-manifest.json | Bin 2207 -> 2207 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/public/js/network-timeline.js b/public/js/network-timeline.js index e6733db6b5c4997fa90f197a9cbcc55b7bc284de..576ac2021a5e9cc10fcb3e62565fd1165106f28b 100644 GIT binary patch delta 929 zcmZ4ejBDR3t_>j(mI1b9`I#vS2DY}gKK6N~IXPB7Ix4n#dbz22rOx?zC5f4NsYN=T z2vsT&RVtHvBLWpefhrSoa`MZA3lfu4i*-Dp>J)8lL)Fwmb+RV^j}R3ON9fLi=+4@# z9%;rX;;B=Tky(svg008o!YB#G@X1|KDU2SQ-$$KgWDJYiOI?NrFkWq(>HoCsY?Tc04}7Llb@WJW3S|(WTm8}sXcu| zD3ktlCU2$=F^DNZDy7He*w=FJqvh(mIEf*+ICM3^zuOE{; z9;?<1P6&9PoJFc)E8GQ#Ao= y0;j74GyNu@h;V|~UK_&1!bpiR+kxq-ij^bP(#SH&IMHHyVGpD1cK>LmJK+F?9zb6J delta 431 zcmdn@ifi>Vt_>j(mMXSo`I#vS2DY}gKK6N~IXPB7I-a(9dbz22rOx?zC5f4NsYN;g z2vwdCRi2Z3BLWpYfGQJna`MZA3lfu4i*>S~>J)8lJ=D}Zbiyb9j}R3OMd%KP=nmhk z9%;rX5};F(ky(svf^F91!YB#G(8*m6_+HIlosoi7UgU&@L`H#WK5mD z@DQWu^jE%2E8(gOkwg`y#|JTSOkeBIR125an$D-i$Tod}3Zvrm1;I=L)87Ozoko&% z3SwG-#LW$6a>O+8TQE}%lA^mIOurG_?a5(GER0C}PvK17tQ=-Zsm8|UX=&37dl+T6 KC&e<|2?qclJe$e@ diff --git a/public/js/timeline.js b/public/js/timeline.js index e6ab5a801dfdb174ac6126127d6f664e3224bff2..7bc90ea3fdac4486b220c9b0bf7fe257d5738268 100644 GIT binary patch delta 5188 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 WH=yj<71`u1eSCf{c$)rq{C@$`U+?Px delta 4635 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 Hy6OJ_u=6jC diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 53dd3292b681f94ad9935ca1b6ada65aedd29783..519e6860bda38e6d77ae2a26168dff623e0f7d51 100644 GIT binary patch delta 58 zcmbO)IA3tXQ&tgEbCX1aR09)31JfjvG-FfaL<7UkKUw>jBrFom%~C9ljFOCv(~{Ft NO%07x43)TQxc~$L5S0J` delta 58 zcmbO)IA3tXQ&y2Q6XQe^1M?JPLqju*R8vDUGjsFJKUw>jBuq?`Qw@yL(hO3Q63r7W N6D^X`(v-Mrxd01c5kCL` From a20931eeb45fb3d2e8537d4b3cd2462b28b702dd Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 8 Jun 2021 01:31:07 -0600 Subject: [PATCH 3/3] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 45e846eb2..64898e30a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Updated PrettyNumber, fix deprecated warning. ([20ec870b](https://github.com/pixelfed/pixelfed/commit/20ec870b)) - 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)) - ([](https://github.com/pixelfed/pixelfed/commit/)) ## [v0.11.0 (2021-06-01)](https://github.com/pixelfed/pixelfed/compare/v0.10.10...v0.11.0)