瀏覽代碼

Update AP helpers, add forceBanCheck param to validateUrl method

Daniel Supernault 10 月之前
父節點
當前提交
42424028b0
共有 1 個文件被更改,包括 3 次插入3 次删除
  1. 3 3
      app/Util/ActivityPub/Helpers.php

+ 3 - 3
app/Util/ActivityPub/Helpers.php

@@ -155,7 +155,7 @@ class Helpers
         return in_array($url, $audience['to']) || in_array($url, $audience['cc']);
     }
 
-    public static function validateUrl($url = null, $disableDNSCheck = false)
+    public static function validateUrl($url = null, $disableDNSCheck = false, $forceBanCheck = false)
     {
         if (is_array($url) && ! empty($url)) {
             $url = $url[0];
@@ -212,7 +212,7 @@ class Helpers
                 }
             }
 
-            if ($disableDNSCheck !== true && app()->environment() === 'production') {
+            if ($forceBanCheck || $disableDNSCheck !== true && app()->environment() === 'production') {
                 $bannedInstances = InstanceService::getBannedDomains();
                 if (in_array($host, $bannedInstances)) {
                     return false;
@@ -739,7 +739,7 @@ class Helpers
             $width = isset($media['width']) ? $media['width'] : false;
             $height = isset($media['height']) ? $media['height'] : false;
 
-            $media = new Media();
+            $media = new Media;
             $media->blurhash = $blurhash;
             $media->remote_media = true;
             $media->status_id = $status->id;