From a07184db583bee351a9a0aab07afef2ced054061 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Thu, 4 Apr 2019 21:26:10 -0600
Subject: [PATCH] Update AP Helpers

---
 app/Util/ActivityPub/Helpers.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/Util/ActivityPub/Helpers.php b/app/Util/ActivityPub/Helpers.php
index ba972b2b2..8747dd5c8 100644
--- a/app/Util/ActivityPub/Helpers.php
+++ b/app/Util/ActivityPub/Helpers.php
@@ -148,7 +148,10 @@ class Helpers {
 		$host = parse_url($valid, PHP_URL_HOST);
 
 		if(config('costar.enabled') == true) {
-			if(in_array($host, config('costar.domain.block')) == true) {
+			if(
+				(config('costar.domain.block') != null && in_array($host, config('costar.domain.block')) == true) || 
+				(config('costar.actor.block') != null && in_array($url, config('costar.actor.block')) == true)
+			) {
 				return false;
 			}
 		}
@@ -163,7 +166,7 @@ class Helpers {
 	public static function validateLocalUrl($url)
 	{
 		$url = self::validateUrl($url);
-		if($url) {
+		if($url == true) {
 			$domain = config('pixelfed.domain.app');
 			$host = parse_url($url, PHP_URL_HOST);
 			$url = $domain === $host ? $url : false;