Update AP helpers, fix sensitive bug

1 year ago · 00ed330cf3
parent 09ca96cc2b
commit 00ed330cf3
1 changed files with 4 additions and 3 deletions
--- a/app/Util/ActivityPub/Helpers.php
+++ b/app/Util/ActivityPub/Helpers.php
@ -548,10 +548,11 @@ class Helpers {

    public static function getSensitive($activity, $url)
    {
-        $id = isset($activity['id']) ? self::pluckval($activity['id']) : self::pluckval($url);
-        $url = isset($activity['url']) ? self::pluckval($activity['url']) : $id;
-        $urlDomain = parse_url($url, PHP_URL_HOST);
+        if(!$url || !strlen($url)) {
+            return true;
+        }

+        $urlDomain = parse_url($url, PHP_URL_HOST);
        $cw = isset($activity['sensitive']) ? (bool) $activity['sensitive'] : false;

        if(in_array($urlDomain, InstanceService::getNsfwDomains())) {