Merge pull request #2132 from pixelfed/staging

Update RemoteProfile, fix missing content warnings

CHANGELOG.md

@@ -8,6 +8,7 @@
 - Updated PostComponent, fix missing like button on comments ([132c1dce](https://github.com/pixelfed/pixelfed/commit/132c1dce))
 - Updated PostComponent.vue, fix load more comments button ([847599ad](https://github.com/pixelfed/pixelfed/commit/847599ad))
 - Updated 2FA Checkpoint, add username + logout button and numeric inputmode ([26affb11](https://github.com/pixelfed/pixelfed/commit/26affb11))
+- Updated RemoteProfile, fix missing content warnings ([e487527a](https://github.com/pixelfed/pixelfed/commit/e487527a))
 
 
 ## [v0.10.9 (2020-04-17)](https://github.com/pixelfed/pixelfed/compare/v0.10.8...v0.10.9)

resources/assets/js/components/RemoteProfile.vue

@@ -70,9 +70,23 @@
 								</div>
 
 								<div class="card-body p-0">
-									<a :href="status.url">
+									<div v-if="status.sensitive == true">
-										<img v-once :src="status.thumb" class="w-100 h-100">
+										<details class="details-animated" @click="status.sensitive = false;">
-									</a>
+											<summary>
+												<p class="mb-0 lead font-weight-bold">CW / NSFW / Hidden Media</p>
+												<p class="font-weight-light">(click to show)</p>
+											</summary>
+											<a :href="status.url">
+												<img v-once :src="status.thumb" class="w-100 h-100">
+											</a>
+										</details>
+									</div>
+									<div v-else>
+										<a :href="status.url">
+											<img v-once :src="status.thumb" class="w-100 h-100">
+										</a>
+										<button v-if="status.cw == true && status.sensitive == false" class="btn btn-block btn-primary font-weight-bold rounded-0" @click="status.sensitive = true;">Hide Media</button>
+									</div>
 									
 								</div>
 
@@ -225,7 +239,9 @@
 								media: status.media_attachments,
 								timestamp: status.created_at,
 								type: status.pf_type,
-								url: status.url
+								url: status.url,
+								sensitive: status.sensitive,
+								cw: status.sensitive
 							}
 						});
 					let ids = data.map(status => status.id);