Merge pull request #1669 from pixelfed/staging

Update Profile.vue component, fix cw + filter bug

public/mix-manifest.json

@@ -18,7 +18,7 @@
     "/js/hashtag.js": "/js/hashtag.js?id=1e5990f89b6bfe7e037b",
     "/js/loops.js": "/js/loops.js?id=9c31302552d789d5f35b",
     "/js/mode-dot.js": "/js/mode-dot.js?id=993d7fee684361edddbc",
-    "/js/profile.js": "/js/profile.js?id=2e555fe6c8406d7536e0",
+    "/js/profile.js": "/js/profile.js?id=c0d5f349300590fefc8a",
     "/js/quill.js": "/js/quill.js?id=1ab4119a62cc484034d9",
     "/js/search.js": "/js/search.js?id=f312959df65e86a307a3",
     "/js/status.js": "/js/status.js?id=0857ea680bd2eb9c0b05",

resources/assets/js/components/Profile.vue

@@ -165,7 +165,7 @@
 					<div class="row" v-if="mode == 'grid'">
 						<div class="col-4 p-1 p-md-3" v-for="(s, index) in timeline">
 							<a class="card info-overlay card-md-border-0" :href="s.url">
-								<div :class="'square ' + s.media_attachments[0].filter_class">
+								<div :class="[s.sensitive ? 'square' : 'square ' + s.media_attachments[0].filter_class]">
 									<span v-if="s.pf_type == 'photo:album'" class="float-right mr-3 post-icon"><i class="fas fa-images fa-2x"></i></span>
 									<span v-if="s.pf_type == 'video'" class="float-right mr-3 post-icon"><i class="fas fa-video fa-2x"></i></span>
 									<span v-if="s.pf_type == 'video:album'" class="float-right mr-3 post-icon"><i class="fas fa-film fa-2x"></i></span>
@@ -329,7 +329,7 @@
 						  :gutter="{default: '5px'}"
 						>
 							<div class="p-1" v-for="(s, index) in timeline">
-								<a :class="s.media_attachments[0].filter_class + ' card info-overlay card-md-border-0'" :href="s.url">
+								<a :class="[s.sensitive ? 'card info-overlay card-md-border-0' : s.media_attachments[0].filter_class + ' card info-overlay card-md-border-0']" :href="s.url">
 									<img :src="previewUrl(s)" class="img-fluid w-100">
 								</a>
 							</div>