Merge pull request #4570 from pixelfed/staging

Staging

CHANGELOG.md

@@ -49,6 +49,7 @@
 - Update ApiV1Controller, hydrate reblog state in home timeline ([13bdaa2e](https://github.com/pixelfed/pixelfed/commit/13bdaa2e))
 - Update Timeline component, improve reblog support ([29de91e5](https://github.com/pixelfed/pixelfed/commit/29de91e5))
 - Update timeline settings, add photo reblogs only option ([e2705b9a](https://github.com/pixelfed/pixelfed/commit/e2705b9a))
+- Update PostContent, add text cw warning ([911504fa](https://github.com/pixelfed/pixelfed/commit/911504fa))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.11.8 (2023-05-29)](https://github.com/pixelfed/pixelfed/compare/v0.11.7...v0.11.8)

resources/assets/components/partials/post/PostContent.vue

@@ -138,7 +138,18 @@
 				<mixed-album-presenter :status="status" v-on:lightbox="toggleLightbox" v-on:togglecw="status.sensitive = false" style="border-radius:15px !important;object-fit: contain;background-color: #000;overflow: hidden;align-items:center" :class="{ fixedHeight: fixedHeight }"></mixed-album-presenter>
 			</div>
 
-			<div v-else-if="status.pf_type === 'text'"></div>
+			<div v-else-if="status.pf_type === 'text'">
+                <div v-if="status.sensitive" class="border m-3 p-5 rounded-lg">
+                    <p class="text-center">
+                        <i class="far fa-eye-slash fa-2x"></i>
+                    </p>
+                    <p class="text-center lead font-weight-bold mb-0">Sensitive Content</p>
+                    <p class="text-center">{{ status.spoiler_text && status.spoiler_text.length ? status.spoiler_text : 'This post may contain sensitive content' }}</p>
+                    <p class="text-center mb-0">
+                        <button class="btn btn-primary btn-sm font-weight-bold" @click="status.sensitive = false">See post</button>
+                    </p>
+                </div>
+            </div>
 
 			<div v-else class="bg-light rounded-lg d-flex align-items-center justify-content-center" style="height: 400px;">
 				<div>