diff --git a/CHANGELOG.md b/CHANGELOG.md index e28c0c8c7..01b293c72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ - Updated Blurhash util, add default hash for invalid media. ([38a37c15](https://github.com/pixelfed/pixelfed/commit/38a37c15)) - Updated VideoThumbnail job, generate blurhash for videos. ([896452c7](https://github.com/pixelfed/pixelfed/commit/896452c7)) - Updated MediaTransformers, add default blurhash attribute. ([3f14a4c4](https://github.com/pixelfed/pixelfed/commit/3f14a4c4)) +- Updated Timeline.vue, fix hashtag status previews. ([7768e844](https://github.com/pixelfed/pixelfed/commit/7768e844)) ## [v0.10.10 (2021-01-28)](https://github.com/pixelfed/pixelfed/compare/v0.10.9...v0.10.10) ### Added diff --git a/app/Util/ActivityPub/Helpers.php b/app/Util/ActivityPub/Helpers.php index 2291b9779..3f37f44b2 100644 --- a/app/Util/ActivityPub/Helpers.php +++ b/app/Util/ActivityPub/Helpers.php @@ -326,16 +326,15 @@ class Helpers { if(isset($activity['object']['attributedTo'])) { $actorDomain = parse_url($activity['object']['attributedTo'], PHP_URL_HOST); if(!self::validateUrl($activity['object']['attributedTo']) || - $idDomain !== $actorDomain) + $idDomain !== $actorDomain || + $actorDomain !== $urlDomain + ) { return; } } - if( - $idDomain !== $urlDomain || - $actorDomain !== $urlDomain - ) { + if($idDomain !== $urlDomain) { return; } diff --git a/public/js/timeline.js b/public/js/timeline.js index eea9a2a40..88c6aa1c9 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 52229ee96..ee772b609 100644 Binary files a/public/mix-manifest.json and b/public/mix-manifest.json differ diff --git a/resources/assets/js/components/Timeline.vue b/resources/assets/js/components/Timeline.vue index 71f94bd6a..35e371962 100644 --- a/resources/assets/js/components/Timeline.vue +++ b/resources/assets/js/components/Timeline.vue @@ -79,14 +79,35 @@
-
+
+
+
+ + + +
+
+ +
+
+ +
- {{tag.status.like_count}} + {{formatCount(tag.status.favourites_count)}} - {{tag.status.share_count}} + {{formatCount(tag.status.reply_count)}}