UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-23 21:43:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2134 from pixelfed/staging

Browse source 
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 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -10,6 +10,7 @@
- Updated PostComponent.vue, fix load more comments button ([847599ad](https://github.com/pixelfed/pixelfed/commit/847599ad)) - 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 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 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) ## [v0.10.9 (2020-04-17)](https://github.com/pixelfed/pixelfed/compare/v0.10.8...v0.10.9)

2
app/Http/Controllers/InternalApiController.php
View file

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

BIN
public/js/rempos.js vendored
View file

Binary file not shown.

BIN
public/mix-manifest.json
View file

Binary file not shown.

1
resources/assets/js/components/RemotePost.vue
View file

@ -166,6 +166,7 @@
<span class="text-break " v-html="reply.content"></span> <span class="text-break " v-html="reply.content"></span>
</span> </span>
<span class="pl-2"> <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> <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> </span>
</p> </p>