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

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

diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php
index 8cd774d45554a4a6c88346e2f909df3c6ec5da66..c47e98287b7adeb352afe182d11917430265745c 100644 (file)
--- a/src/Worker/Delivery.php
+++ b/src/Worker/Delivery.php
@@ -140,7 +140,7 @@ class Delivery {
                        }
                }
 
-               $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`.`account-type`, `user`.`prvnets`
                        FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
@@ -354,10 +354,10 @@ class Delivery {
                                        add_to_queue($contact['id'],NETWORK_DFRN,$atom);
 
                                        // The message could not be delivered. We mark the contact as "dead"
-                                       mark_for_death($contact);
+                                       Contact::markForArchival($contact);
                                } else {
                                        // We successfully delivered a message, the contact is alive
-                                       unmark_for_death($contact);
+                                       Contact::unmarkForArchival($contact);
                                }
 
                                break;
@@ -485,7 +485,7 @@ class Delivery {
                                        break;
 
                                if ($mail) {
-                                       Diaspora::send_mail($item,$owner,$contact);
+                                       Diaspora::sendMail($item,$owner,$contact);
                                        break;
                                }
 
@@ -498,7 +498,7 @@ class Delivery {
                                if (($target_item['deleted']) && (($target_item['uri'] === $target_item['parent-uri']) || $followup)) {
                                        // top-level retraction
                                        logger('diaspora retract: '.$loc);
-                                       Diaspora::send_retraction($target_item,$owner,$contact,$public_message);
+                                       Diaspora::sendRetraction($target_item,$owner,$contact,$public_message);
                                        break;
                                } elseif ($relocate) {
                                        Diaspora::sendAccountMigration($owner, $contact, $uid);
@@ -506,17 +506,17 @@ class Delivery {
                                } elseif ($followup) {
                                        // send comments and likes to owner to relay
                                        logger('diaspora followup: '.$loc);
-                                       Diaspora::send_followup($target_item,$owner,$contact,$public_message);
+                                       Diaspora::sendFollowup($target_item,$owner,$contact,$public_message);
                                        break;
                                } elseif ($target_item['uri'] !== $target_item['parent-uri']) {
                                        // we are the relay - send comments, likes and relayable_retractions to our conversants
                                        logger('diaspora relay: '.$loc);
-                                       Diaspora::send_relay($target_item,$owner,$contact,$public_message);
+                                       Diaspora::sendRelay($target_item,$owner,$contact,$public_message);
                                        break;
                                } elseif ($top_level && !$walltowall) {
                                        // currently no workable solution for sending walltowall
                                        logger('diaspora status: '.$loc);
-                                       Diaspora::send_status($target_item,$owner,$contact,$public_message);
+                                       Diaspora::sendStatus($target_item,$owner,$contact,$public_message);
                                        break;
                                }