X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=src%2FWorker%2FNotifier.php;h=e3eb6810a3c418915a0d57e5c5ee3ad038cfd80f;hb=2978b1eef0ef47809bbbce5e04e8336d6260255a;hp=a3a03055ec9f13040bc289652f5eb4e99cd3a923;hpb=5747cfc79c9ade7fb95cc95769ed06bb7ad118ef;p=friendica.git

diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index a3a03055ec..e3eb6810a3 100644
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -7,13 +7,15 @@ namespace Friendica\Worker;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
+use Friendica\Model\Contact;
+use Friendica\Model\Group;
 use Friendica\Network\Probe;
-use Friendica\Object\Contact;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\OStatus;
 use Friendica\Protocol\Salmon;
 use dba;
 
+require_once 'include/dba.php';
 require_once 'include/queue_fn.php';
 require_once 'include/html2plain.php';
 require_once 'include/datetime.php';
@@ -207,8 +209,6 @@ class Notifier {
 
 			$slap = OStatus::salmon($target_item, $owner);
 
-			require_once 'include/group.php';
-
 			$parent = $items[0];
 
 			$thr_parent = q("SELECT `network`, `author-link`, `owner-link` FROM `item` WHERE `uri` = '%s' AND `uid` = %d",
@@ -349,9 +349,9 @@ class Notifier {
 				}
 
 				$allow_people = expand_acl($parent['allow_cid']);
-				$allow_groups = expand_groups(expand_acl($parent['allow_gid']),true);
+				$allow_groups = Group::expand(expand_acl($parent['allow_gid']),true);
 				$deny_people  = expand_acl($parent['deny_cid']);
-				$deny_groups  = expand_groups(expand_acl($parent['deny_gid']));
+				$deny_groups  = Group::expand(expand_acl($parent['deny_gid']));
 
 				// if our parent is a public forum (forum_mode == 1), uplink to the origional author causing
 				// a delivery fork. private groups (forum_mode == 2) do not uplink