Merge pull request #2830 from pixelfed/staging

Staging

CHANGELOG.md

@@ -35,6 +35,7 @@
 - Updated Timeline, disable new post update checker and hide reaction bar on network timeline. ([1e3d3a69](https://github.com/pixelfed/pixelfed/commit/1e3d3a69))
 - Updated PublicApiController, improve network timeline perf. ([e5f683fd](https://github.com/pixelfed/pixelfed/commit/e5f683fd))
 - Updated Network Timeline, use existing Timeline component. ([0deaafc0](https://github.com/pixelfed/pixelfed/commit/0deaafc0))
+- Updated PostComponent, show like count to owner using MomentUI. ([e9c46bab](https://github.com/pixelfed/pixelfed/commit/e9c46bab))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.11.0 (2021-06-01)](https://github.com/pixelfed/pixelfed/compare/v0.10.10...v0.11.0)

public/mix-manifest.json

@@ -27,7 +27,7 @@
     "/js/rempos.js": "/js/rempos.js?id=c171fb360ed24e710ab0",
     "/js/rempro.js": "/js/rempro.js?id=b0c387fbbaef217dd089",
     "/js/search.js": "/js/search.js?id=3ba14b0584cb9d408a3f",
-    "/js/status.js": "/js/status.js?id=36da3b0777b5f9633e86",
+    "/js/status.js": "/js/status.js?id=bde5811432c2db213f0d",
     "/js/story-compose.js": "/js/story-compose.js?id=b16bcf2adad9651735e1",
     "/js/theme-monokai.js": "/js/theme-monokai.js?id=8842103833ba4861bcfa",
     "/js/timeline.js": "/js/timeline.js?id=67c42aa27dac05a5e91c"

resources/assets/js/components/PostComponent.vue

@@ -288,7 +288,7 @@
 				<div class="container" style="max-width: 700px;">
 							<div class="postPresenterContainer d-none d-flex justify-content-center align-items-center bg-dark">
 								<div v-if="status.pf_type === 'photo'" class="w-100">
-									<photo-presenter :status="status" v-on:lightbox="lightbox"></photo-presenter>
+									<photo-presenter :status="status" v-on:lightbox="lightbox" v-on:togglecw="status.sensitive = false"></photo-presenter>
 								</div>
 
 								<div v-else-if="status.pf_type === 'video'" class="w-100">
@@ -321,7 +321,10 @@
 								<div class="text-center mr-5">
 									<div v-bind:class="[reactions.liked ? 'fas fa-heart text-danger m-0 cursor-pointer' : 'far fa-heart m-0 like-btn cursor-pointer']" title="Like" v-on:click="likeStatus" style="font-size:1.575rem">
 									</div>
-									<div class="like-count font-weight-bold mt-2 rounded border" style="cursor:pointer;" v-on:click="likesModal">{{status.favourites_count || 0}}</div>
+									<div class="like-count font-weight-bold mt-2 rounded border" style="cursor:pointer;" v-on:click="likesModal">
+
+										{{ownerOrAdmin() ? (status.liked_by.total_count + 1) : 0}}
+									</div>
 								</div>
 								<div class="text-center">
 									<div v-if="status.visibility == 'public'" v-bind:class="[reactions.shared ? 'h3 far fa-share-square m-0 text-primary cursor-pointer' : 'h3 far fa-share-square m-0 share-btn cursor-pointer']" title="Share" v-on:click="shareStatus">
@@ -894,6 +897,7 @@ export default {
 				this.layout = 'metro';
 				return;
 			}
+
 			if(forceMetro == true || u.has('ui') && u.get('ui') == 'metro' && this.layout != 'metro') {
 				this.layout = 'metro';
 			}