UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-10 00:34:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update comments, fix remote reply bug

Browse source
This commit is contained in:
Daniel Supernault 2020-07-21 19:14:48 -06:00
parent e6b52471fb
commit f33061642a
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -110,7 +110,7 @@ class PublicApiController extends Controller
]); ]);
$limit = $request->limit ?? 10; $limit = $request->limit ?? 10;
$profile = Profile::whereUsername($username)->whereNull('status')->firstOrFail(); $profile = Profile::whereNull('status')->findOrFail($username);
$status = Status::whereProfileId($profile->id)->whereCommentsDisabled(false)->findOrFail($postId); $status = Status::whereProfileId($profile->id)->whereCommentsDisabled(false)->findOrFail($postId);
$this->scopeCheck($profile, $status); $this->scopeCheck($profile, $status);

4
resources/assets/js/components/PostComponent.vue
View file

@ -1120,7 +1120,7 @@ export default {
}, },
fetchComments() { fetchComments() {
let url = '/api/v2/comments/'+this.statusUsername+'/status/'+this.statusId; let url = '/api/v2/comments/'+this.statusProfileId+'/status/'+this.statusId;
axios.get(url) axios.get(url)
.then(response => { .then(response => {
let self = this; let self = this;
@ -1306,7 +1306,7 @@ export default {
reply.thread = true; reply.thread = true;
return; return;
} }
let url = '/api/v2/comments/'+reply.account.username+'/status/'+reply.id; let url = '/api/v2/comments/'+reply.account.id+'/status/'+reply.id;
axios.get(url) axios.get(url)
.then(response => { .then(response => {
reply.replies = _.reverse(response.data.data); reply.replies = _.reverse(response.data.data);