Merge pull request #2134 from pixelfed/staging

Update RemotePost component, fix missing like button on comments
This commit is contained in:
daniel 2020-04-20 22:44:30 -06:00 committed by GitHub
commit b41414f113
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 3 deletions

View file

@ -10,6 +10,7 @@
- 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))
- Updated RemotePost component, fix missing like button on comments ([7ef90565](https://github.com/pixelfed/pixelfed/commit/7ef90565))
## [v0.10.9 (2020-04-17)](https://github.com/pixelfed/pixelfed/compare/v0.10.8...v0.10.9)

View file

@ -437,7 +437,7 @@ class InternalApiController extends Controller
$status = Status::whereProfileId($user->id)
->whereNull('reblog_of_id')
->whereVisibility('public')
->whereIn('visibility', ['public', 'unlisted'])
->findOrFail($statusId);
$template = $status->in_reply_to_id ? 'status.reply' : 'status.remote';
return view($template, compact('user', 'status'));

2
public/js/rempos.js vendored

File diff suppressed because one or more lines are too long

View file

@ -21,7 +21,7 @@
"/js/profile.js": "/js/profile.js?id=21d25df460d1fa9bab60",
"/js/profile-directory.js": "/js/profile-directory.js?id=7160b00d9beda164f1bc",
"/js/quill.js": "/js/quill.js?id=9b15ab0ae830e7293390",
"/js/rempos.js": "/js/rempos.js?id=8dafb37fda5c7977b9af",
"/js/rempos.js": "/js/rempos.js?id=6695b8d4868883a34fcd",
"/js/rempro.js": "/js/rempro.js?id=1cef29f9c7b39704a86a",
"/js/search.js": "/js/search.js?id=b19e1df082a4baa25bb8",
"/js/status.js": "/js/status.js?id=05b227c197bc00d64851",

View file

@ -166,6 +166,7 @@
<span class="text-break " v-html="reply.content"></span>
</span>
<span class="pl-2">
<span v-on:click="likeReply(reply, $event)"><i v-bind:class="[reply.favourited ? 'fas fa-heart fa-sm text-danger':'far fa-heart fa-sm text-lighter']"></i></span>
<post-menu :status="reply" :profile="user" :size="'sm'" :modal="'true'" class="d-inline-block px-2" v-on:deletePost="deleteComment(reply.id, index)"></post-menu>
</span>
</p>