Split the name in the hcard

[friendica.git] / include / like.php

diff --git a/include/like.php b/include/like.php
index 69dfa5cda1bbccc41f1c2f78f3b443b9e0484c03..9a8b9b957b0db24fd2d7f459eb5c24be1132ca4f 100644 (file)
--- a/include/like.php
+++ b/include/like.php
@@ -3,8 +3,9 @@
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
-
-require_once("include/diaspora.php");
+use Friendica\Database\DBM;
+use Friendica\Model\Contact;
+use Friendica\Protocol\Diaspora;
 
 /**
  * @brief add/remove activity to an item
@@ -72,7 +73,7 @@ function do_like($item_id, $verb) {
                dbesc($item_id)
        );
 
-       if (! $item_id || ! dbm::is_result($items)) {
+       if (! $item_id || ! DBM::is_result($items)) {
                logger('like: unknown item ' . $item_id);
                return false;
        }
@@ -90,7 +91,7 @@ function do_like($item_id, $verb) {
                AND `contact`.`uid` = %d",
                intval($item['uid'])
        );
-       if (dbm::is_result($owners)) {
+       if (DBM::is_result($owners)) {
                $owner_self_contact = $owners[0];
        } else {
                logger('like: unknown owner ' . $item['uid']);
@@ -103,7 +104,7 @@ function do_like($item_id, $verb) {
        $contacts = q("SELECT * FROM `contact` WHERE `id` = %d",
                intval($author_id)
        );
-       if (dbm::is_result($contacts)) {
+       if (DBM::is_result($contacts)) {
                $author_contact = $contacts[0];
        } else {
                logger('like: unknown author ' . $author_id);
@@ -115,12 +116,12 @@ function do_like($item_id, $verb) {
                $item_contact_id = $owner_self_contact['id'];
                $item_contact = $owner_self_contact;
        } else {
-               $item_contact_id = get_contact($author_contact['url'], $item['uid']);
+               $item_contact_id = Contact::getIdForURL($author_contact['url'], $item['uid']);
 
                $contacts = q("SELECT * FROM `contact` WHERE `id` = %d",
                        intval($item_contact_id)
                );
-               if (dbm::is_result($contacts)) {
+               if (DBM::is_result($contacts)) {
                        $item_contact = $contacts[0];
                } else {
                        logger('like: unknown item contact ' . $item_contact_id);
@@ -150,7 +151,7 @@ function do_like($item_id, $verb) {
        );
 
        // If it exists, mark it as deleted
-       if (dbm::is_result($existing_like)) {
+       if (DBM::is_result($existing_like)) {
                $like_item = $existing_like[0];
 
                // Already voted, undo it
@@ -162,12 +163,10 @@ function do_like($item_id, $verb) {
                // Clean up the Diaspora signatures for this like
                // Go ahead and do it even if Diaspora support is disabled. We still want to clean up
                // if it had been enabled in the past
-               q("DELETE FROM `sign` WHERE `iid` = %d",
-                       intval($like_item['id'])
-               );
+               dba::delete('sign', array('iid' => $like_item['id']));
 
                $like_item_id = $like_item['id'];
-               Worker::add(PRIORITY_HIGH, "notifier", "like", $like_item_id);
+               Worker::add(PRIORITY_HIGH, "Notifier", "like", $like_item_id);
 
                if (!$event_verb_flag || $like_item['verb'] == $activity) {
                        return true;
@@ -248,13 +247,13 @@ EOT;
        }
 
        // Save the author information for the like in case we need to relay to Diaspora
-       Diaspora::store_like_signature($item_contact, $new_item_id);
+       Diaspora::storeLikeSignature($item_contact, $new_item_id);
 
        $new_item['id'] = $new_item_id;
 
        call_hooks('post_local_end', $new_item);
 
-       Worker::add(PRIORITY_HIGH, "notifier", "like", $new_item_id);
+       Worker::add(PRIORITY_HIGH, "Notifier", "like", $new_item_id);
 
        return true;
 }