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) 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']; diff --git a/public/js/profile.js b/public/js/profile.js index c2dd65a3d..5a441adbc 100644 Binary files a/public/js/profile.js and b/public/js/profile.js differ diff --git a/public/js/rempos.js b/public/js/rempos.js index 65e77a666..6fa5fb99b 100644 Binary files a/public/js/rempos.js and b/public/js/rempos.js differ diff --git a/public/js/status.js b/public/js/status.js index 94f1bbd34..c09608834 100644 Binary files a/public/js/status.js and b/public/js/status.js differ diff --git a/public/js/timeline.js b/public/js/timeline.js index e4fcf0d60..28675c3e9 100644 Binary files a/public/js/timeline.js and b/public/js/timeline.js differ diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 736cb6dfa..ddc6c83a9 100644 Binary files a/public/mix-manifest.json and b/public/mix-manifest.json differ 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 @@
- {{truncate(reply.account.username,15)}} + {{!reply.account.local ? '@' : '' }}{{truncate(reply.account.username,15)}} This comment may contain sensitive material Show @@ -159,7 +159,7 @@

- {{truncate(reply.account.username,15)}} + {{!reply.account.local ? '@' : '' }}{{truncate(reply.account.username,15)}} @@ -182,7 +182,7 @@

- {{s.account.username}} + {{!s.account.local ? '@' : '' }}{{s.account.username}} @@ -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 @@