Merge pull request #2600 from pixelfed/staging

Staging

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

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(
+		if($idDomain !== $urlDomain) {
-			$idDomain !== $urlDomain || 
-			$actorDomain !== $urlDomain
-		) {
 			return;
 		}
 

public/mix-manifest.json

@@ -30,5 +30,5 @@
     "/js/status.js": "/js/status.js?id=5fc1e46961585fd79519",
     "/js/story-compose.js": "/js/story-compose.js?id=b31904f8fd5b397f8c54",
     "/js/theme-monokai.js": "/js/theme-monokai.js?id=85f0af57479412548223",
-    "/js/timeline.js": "/js/timeline.js?id=b2b0ceaa6d9408a33446"
+    "/js/timeline.js": "/js/timeline.js?id=09579f9e2ad35b97b4b6"
 }

resources/assets/js/components/Timeline.vue

@@ -79,14 +79,35 @@
 								<div v-for="(tag, index) in hashtagPosts" class="col-4 p-0 p-sm-2 p-md-3 hashtag-post-square">
 									<a class="card info-overlay card-md-border-0" :href="tag.status.url">
 										<div :class="[tag.status.filter ? 'square ' + tag.status.filter : 'square']">
-											<div class="square-content" :style="'background-image: url('+tag.status.thumb+')'"></div>
+											<div v-if="tag.status.sensitive" class="square-content">
+												<div class="info-overlay-text-label">
+													<h5 class="text-white m-auto font-weight-bold">
+														<span>
+															<span class="far fa-eye-slash fa-lg p-2 d-flex-inline"></span>
+														</span>
+													</h5>
+												</div>
+												<blur-hash-canvas
+													width="32"
+													height="32"
+													:hash="tag.status.media_attachments[0].blurhash"
+													/>
+											</div>
+											<div v-else class="square-content">
+												<blur-hash-image
+													width="32"
+													height="32"
+													:hash="tag.status.media_attachments[0].blurhash"
+													:src="tag.status.media_attachments[0].preview_url"
+													/>
+											</div>
 											<div class="info-overlay-text">
 												<h5 class="text-white m-auto font-weight-bold">
 													<span class="pr-4">
-														<span class="far fa-heart fa-lg pr-1"></span> {{tag.status.like_count}}
+														<span class="far fa-heart fa-lg pr-1"></span> {{formatCount(tag.status.favourites_count)}}
 													</span>
 													<span>
-														<span class="fas fa-retweet fa-lg pr-1"></span> {{tag.status.share_count}}
+														<span class="far fa-comment fa-lg pr-1"></span> {{formatCount(tag.status.reply_count)}}
 													</span>
 												</h5>
 											</div>