浏览代码

Update Status model, fixes #1637

Daniel Supernault 5 年之前
父节点
当前提交
c952442077
共有 1 个文件被更改,包括 9 次插入6 次删除
  1. 9 6
      app/Status.php

+ 9 - 6
app/Status.php

@@ -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'] = [
-                    $this->profile->permalink('/followers')
-                ];
+                $res['to'] = array_merge([$this->profile->permalink('/followers')], $mentions);
                 $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'] = [
-                    $this->profile->permalink('/followers')
-                ];
+                $res['to'] = array_merge([$this->profile->permalink('/followers')], $mentions);
                 $res['cc'] = [];
                 $res['cc'] = [];
                 break;
                 break;