X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FNotifier.php;h=b261b32fc0444b2ecf657026bbbfe2756cbe506f;hb=a21f6135fcd8f0bfdb49de38a5ab4954d1784503;hp=f092282c319654aacc4e49ab1a54fe2b7891ff3e;hpb=ec02af593db87e78b0b388047ac4265aa5f987b1;p=friendica.git

diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index f092282c31..b261b32fc0 100644
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -4,7 +4,6 @@
  */
 namespace Friendica\Worker;
 
-use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
@@ -109,7 +108,7 @@ class Notifier {
 			$recipients[] = $suggest[0]['cid'];
 			$item = $suggest[0];
 		} elseif ($cmd === 'removeme') {
-			$r = q("SELECT `contact`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`,
+			$r = q("SELECT `contact`.*, `user`.`prvkey` AS `uprvkey`,
 					`user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`,
 					`user`.`page-flags`, `user`.`prvnets`, `user`.`account-type`, `user`.`guid`
 				FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
@@ -124,7 +123,6 @@ class Notifier {
 			if (!$r) {
 				return;
 			}
-			require_once 'include/Contact.php';
 			foreach ($r as $contact) {
 				Contact::terminateFriendship($user, $contact);
 			}
@@ -175,7 +173,7 @@ class Notifier {
 
 		}
 
-		$r = q("SELECT `contact`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`,
+		$r = q("SELECT `contact`.*, `user`.`prvkey` AS `uprvkey`,
 			`user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`,
 			`user`.`page-flags`, `user`.`prvnets`, `user`.`account-type`
 			FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
@@ -527,7 +525,7 @@ class Notifier {
 
 			if ($diaspora_delivery) {
 				if (!$followup) {
-					$r0 = Diaspora::relay_list();
+					$r0 = Diaspora::relayList();
 				}
 
 				$r1 = q("SELECT `batch`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`name`) AS `name`, ANY_VALUE(`network`) AS `network`