Merge remote-tracking branch 'upstream/develop' into develop

[friendica.git] / src / Worker / Notifier.php

diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index 2ad12e7910cf88f57c9984a8bc59c8a618003244..b261b32fc0444b2ecf657026bbbfe2756cbe506f 100644 (file)
--- 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`
@@ -120,19 +119,12 @@ class Notifier {
 
                        $user = $r[0];
 
-                       $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1", intval($item_id));
-                       if (!$r)
-                               return;
-
-                       $self = $r[0];
-
                        $r = q("SELECT * FROM `contact` WHERE NOT `self` AND `uid` = %d", intval($item_id));
                        if (!$r) {
                                return;
                        }
-                       require_once 'include/Contact.php';
                        foreach ($r as $contact) {
-                               terminate_friendship($user, $self, $contact);
+                               Contact::terminateFriendship($user, $contact);
                        }
                        return;
                } elseif ($cmd === 'relocate') {
@@ -181,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`
@@ -533,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`