Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes

[friendica.git] / mod / item.php

diff --git a/mod/item.php b/mod/item.php
index 695e76a2fa8f1b981b15b6ab0b6952669a2e310d..1c7a970c2da2eda04026e624bbdc35494ab826ad 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -95,8 +95,7 @@ function item_post(App &$a) {
                        $r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1",
                                intval($parent)
                        );
-               }
-               elseif ($parent_uri && local_user()) {
+               } elseif ($parent_uri && local_user()) {
                        // This is coming from an API source, and we are logged in
                        $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
                                dbesc($parent_uri),
@@ -141,16 +140,7 @@ function item_post(App &$a) {
                        $thrparent = q("SELECT `author-link`, `network` FROM `item` WHERE `uri` = '%s' LIMIT 1", dbesc($thr_parent));
                        if (dbm::is_result($thrparent) AND ($thrparent[0]["network"] === NETWORK_OSTATUS)
                                AND (normalise_link($parent_contact["url"]) != normalise_link($thrparent[0]["author-link"]))) {
-                               $parent_contact = null;
-
-                               $r = q("SELECT * FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
-                                       dbesc(normalise_link($thrparent[0]["author-link"])));
-                               if (dbm::is_result($r)) {
-                                       $parent_contact = $r[0];
-                                       $parent_contact["thumb"] = $parent_contact["photo"];
-                                       $parent_contact["micro"] = $parent_contact["photo"];
-                                       unset($parent_contact["id"]);
-                               }
+                               $parent_contact = get_contact_details_by_url($thrparent[0]["author-link"]);
 
                                if (!isset($parent_contact["nick"])) {
                                        require_once("include/Scrape.php");
@@ -569,12 +559,8 @@ function item_post(App &$a) {
         * add a statusnet style reply tag if the original post was from there
         * and we are replying, and there isn't one already
         */
-
-       if($parent AND ($parent_contact['network'] === NETWORK_OSTATUS)) {
-               if ($parent_contact['id'] != "")
-                       $contact = '@'.$parent_contact['nick'].'+'.$parent_contact['id'];
-               else
-                       $contact = '@[url='.$parent_contact['url'].']'.$parent_contact['nick'].'[/url]';
+       if ($parent AND ($parent_contact['network'] == NETWORK_OSTATUS)) {
+               $contact = '@[url='.$parent_contact['url'].']'.$parent_contact['nick'].'[/url]';
 
                if (!in_array($contact,$tags)) {
                        $body = $contact.' '.$body;
@@ -620,16 +606,17 @@ function item_post(App &$a) {
                                continue;
 
                        $success = handle_tag($a, $body, $inform, $str_tags, (local_user()) ? local_user() : $profile_uid , $tag, $network);
-                       if($success['replaced'])
+                       if ($success['replaced']) {
                                $tagged[] = $tag;
-                       if(is_array($success['contact']) && intval($success['contact']['prv'])) {
+                       }
+                       if (is_array($success['contact']) && intval($success['contact']['prv'])) {
                                $private_forum = true;
                                $private_id = $success['contact']['id'];
                        }
                }
        }
 
-       if(($private_forum) && (! $parent) && (! $private)) {
+       if (($private_forum) && (! $parent) && (! $private)) {
                // we tagged a private forum in a top level post and the message was public.
                // Restrict it.
                $private = 1;
@@ -639,8 +626,8 @@ function item_post(App &$a) {
        $attachments = '';
        $match = false;
 
-       if(preg_match_all('/(\[attachment\]([0-9]+)\[\/attachment\])/',$body,$match)) {
-               foreach($match[2] as $mtch) {
+       if (preg_match_all('/(\[attachment\]([0-9]+)\[\/attachment\])/',$body,$match)) {
+               foreach ($match[2] as $mtch) {
                        $r = q("SELECT `id`,`filename`,`filesize`,`filetype` FROM `attach` WHERE `uid` = %d AND `id` = %d LIMIT 1",
                                intval($profile_uid),
                                intval($mtch)
@@ -966,7 +953,7 @@ function item_post(App &$a) {
 
 
                // Store the comment signature information in case we need to relay to Diaspora
-               diaspora::store_comment_signature($datarray, $author, ($self ? $user['prvkey'] : false), $post_id);
+               Diaspora::store_comment_signature($datarray, $author, ($self ? $user['prvkey'] : false), $post_id);
 
        } else {
                $parent = $post_id;