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

Update Status model, fixes #1637

Browse source
This commit is contained in:
Daniel Supernault 2019-10-07 02:46:21 -06:00
parent ef77de4e05
commit c952442077
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/Status.php
View file

@ -370,6 +370,13 @@ class Status extends Model
return $mention->permalink(); return $mention->permalink();
})->toArray(); })->toArray();
if($status->in_reply_to_id != null) {
$parent = $status->parent();
if($parent) {
$mentions = array_merge([$parent->profile->permalink()], $mentions);
}
}
switch ($scope) { switch ($scope) {
case 'public': case 'public':
$res['to'] = [ $res['to'] = [
@ -379,18 +386,14 @@ class Status extends Model
break; break;
case 'unlisted': case 'unlisted':
$res['to'] = [ $res['to'] = array_merge([$this->profile->permalink('/followers')], $mentions);
$this->profile->permalink('/followers')
];
$res['cc'] = [ $res['cc'] = [
"https://www.w3.org/ns/activitystreams#Public" "https://www.w3.org/ns/activitystreams#Public"
]; ];
break; break;
case 'private': case 'private':
$res['to'] = [ $res['to'] = array_merge([$this->profile->permalink('/followers')], $mentions);
$this->profile->permalink('/followers')
];
$res['cc'] = []; $res['cc'] = [];
break; break;