chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #2843 from pixelfed/staging 

Update RemotePost.vue, fix content warning button.
This commit is contained in:
daniel 2021-07-06 21:15:09 -06:00 committed by GitHub
parent d2545b2850 7dbf6690f5
commit 25fb62e43f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -44,6 +44,7 @@
- Updated NotificationService, use zrevrangebyscore for api. ([d43e6d8d](https://github.com/pixelfed/pixelfed/commit/d43e6d8d)) - Updated NotificationService, use zrevrangebyscore for api. ([d43e6d8d](https://github.com/pixelfed/pixelfed/commit/d43e6d8d))
- Updated ApiV1Controller, use PublicTimelineService. ([f67c67bc](https://github.com/pixelfed/pixelfed/commit/f67c67bc)) - Updated ApiV1Controller, use PublicTimelineService. ([f67c67bc](https://github.com/pixelfed/pixelfed/commit/f67c67bc))
- Updated ApiV1Controller, use ProfileService for verify_credentials. ([352aa573](https://github.com/pixelfed/pixelfed/commit/352aa573)) - Updated ApiV1Controller, use ProfileService for verify_credentials. ([352aa573](https://github.com/pixelfed/pixelfed/commit/352aa573))
- Updated RemotePost.vue, fix content warning button. ([7647e724](https://github.com/pixelfed/pixelfed/commit/7647e724))
- ([](https://github.com/pixelfed/pixelfed/commit/)) - ([](https://github.com/pixelfed/pixelfed/commit/))
## [v0.11.0 (2021-06-01)](https://github.com/pixelfed/pixelfed/compare/v0.10.10...v0.11.0) ## [v0.11.0 (2021-06-01)](https://github.com/pixelfed/pixelfed/compare/v0.10.10...v0.11.0)

2
public/js/rempos.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/mix-manifest.json
View File

@ -24,7 +24,7 @@
"/js/profile.js": "/js/profile.js?id=3c5ea4c28993fb9826af", "/js/profile.js": "/js/profile.js?id=3c5ea4c28993fb9826af",
"/js/profile-directory.js": "/js/profile-directory.js?id=886f17ad7ab4b2e08019", "/js/profile-directory.js": "/js/profile-directory.js?id=886f17ad7ab4b2e08019",
"/js/quill.js": "/js/quill.js?id=866b31b9b9540305751d", "/js/quill.js": "/js/quill.js?id=866b31b9b9540305751d",
"/js/rempos.js": "/js/rempos.js?id=c171fb360ed24e710ab0", "/js/rempos.js": "/js/rempos.js?id=a3b1f802e293977dbc60",
"/js/rempro.js": "/js/rempro.js?id=b0c387fbbaef217dd089", "/js/rempro.js": "/js/rempro.js?id=b0c387fbbaef217dd089",
"/js/search.js": "/js/search.js?id=3ba14b0584cb9d408a3f", "/js/search.js": "/js/search.js?id=3ba14b0584cb9d408a3f",
"/js/status.js": "/js/status.js?id=bde5811432c2db213f0d", "/js/status.js": "/js/status.js?id=bde5811432c2db213f0d",

6
resources/assets/js/components/RemotePost.vue
View File

@ -46,7 +46,7 @@
<div class="col-12 col-md-8 px-0 mx-0"> <div class="col-12 col-md-8 px-0 mx-0">
<div class="postPresenterContainer d-none d-flex justify-content-center align-items-center" style="background: #000;"> <div class="postPresenterContainer d-none d-flex justify-content-center align-items-center" style="background: #000;">
<div v-if="status.pf_type === 'photo'" class="w-100"> <div v-if="status.pf_type === 'photo'" class="w-100">
<photo-presenter :status="status"></photo-presenter> <photo-presenter :status="status" v-on:togglecw="status.sensitive = false"></photo-presenter>
</div> </div>
<div v-else-if="status.pf_type === 'video'" class="w-100"> <div v-else-if="status.pf_type === 'video'" class="w-100">
@ -106,12 +106,12 @@
<div class="card-body status-comments pt-0"> <div class="card-body status-comments pt-0">
<div class="status-comment"> <div class="status-comment">
<div v-if="status.content.length" class="pt-3"> <div v-if="status.content.length" class="pt-3">
<div v-if="showCaption != true"> <div v-if="status.sensitive">
<span class="py-3"> <span class="py-3">
<a class="text-dark font-weight-bold mr-1" :href="profileUrl" v-bind:title="status.account.username">{{truncate(status.account.username,15)}}</a> <a class="text-dark font-weight-bold mr-1" :href="profileUrl" v-bind:title="status.account.username">{{truncate(status.account.username,15)}}</a>
<span class="text-break"> <span class="text-break">
<span class="font-italic text-muted">This comment may contain sensitive material</span> <span class="font-italic text-muted">This comment may contain sensitive material</span>
<span class="text-primary cursor-pointer pl-1" @click="showCaption = true">Show</span> <span class="text-primary cursor-pointer pl-1" @click="status.sensitive = false">Show</span>
</span> </span>
</span> </span>
</div> </div>