浏览代码

Update SharePipeline

Daniel Supernault 1 年之前
父节点
当前提交
5a19daabce
共有 2 个文件被更改,包括 6 次插入3 次删除
  1. 5 2
      app/Jobs/SharePipeline/SharePipeline.php
  2. 1 1
      app/Jobs/SharePipeline/UndoSharePipeline.php

+ 5 - 2
app/Jobs/SharePipeline/SharePipeline.php

@@ -49,7 +49,10 @@ class SharePipeline implements ShouldQueue
 	public function handle()
 	{
 		$status = $this->status;
-		$parent = $this->status->parent();
+		$parent = Status::find($this->status->reblog_of_id);
+        if(!$parent) {
+            return;
+        }
 		$actor = $status->profile;
 		$target = $parent->profile;
 
@@ -84,7 +87,7 @@ class SharePipeline implements ShouldQueue
 
 	public function remoteAnnounceDeliver()
 	{
-		if(config_cache('federation.activitypub.enabled') == false) {
+		if(config('app.env') !== 'production' || config_cache('federation.activitypub.enabled') == false) {
 			return true;
 		}
 		$status = $this->status;

+ 1 - 1
app/Jobs/SharePipeline/UndoSharePipeline.php

@@ -70,7 +70,7 @@ class UndoSharePipeline implements ShouldQueue
 
 	public function remoteAnnounceDeliver()
 	{
-		if(config_cache('federation.activitypub.enabled') == false) {
+		if(config('app.env') !== 'production' || config_cache('federation.activitypub.enabled') == false) {
 			return 1;
 		}