Add no_update flag to speed up Contact::getIdForURL instances

[friendica.git] / src / Protocol / OStatus.php

diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index 7ad6f50f1f05e6eab582a5939d6716ddd14eeee2..c6f840a66e0b60150f9d57b0574e26df51b88527 100644 (file)
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -26,7 +26,6 @@ use DOMXPath;
 
 require_once 'include/dba.php';
 require_once 'include/html2bbcode.php';
-require_once 'include/bbcode.php';
 require_once 'include/items.php';
 require_once 'mod/share.php';
 require_once 'include/enotify.php';
@@ -187,7 +186,7 @@ class OStatus
                        }
 
                        // Ensure that we are having this contact (with uid=0)
-                       $cid = Contact::getIdForURL($aliaslink, 0);
+                       $cid = Contact::getIdForURL($aliaslink, 0, true);
 
                        if ($cid) {
                                $fields = ['url', 'nurl', 'name', 'nick', 'alias', 'about', 'location'];
@@ -466,6 +465,11 @@ class OStatus
                                        if (!$valid) {
                                                // If not, then it depends on this setting
                                                $valid = !Config::get('system', 'ostatus_full_threads');
+                                               if ($valid) {
+                                                       logger("Item with uri ".self::$itemlist[0]['uri']." will be imported due to the system settings.", LOGGER_DEBUG);
+                                               }
+                                       } else {
+                                               logger("Item with uri ".self::$itemlist[0]['uri']." belongs to a contact (".self::$itemlist[0]['contact-id']."). It will be imported.", LOGGER_DEBUG);
                                        }
                                        if ($valid) {
                                                // Never post a thread when the only interaction by our contact was a like
@@ -476,10 +480,16 @@ class OStatus
                                                                $valid = true;
                                                        }
                                                }
+                                               if ($valid) {
+                                                       logger("Item with uri ".self::$itemlist[0]['uri']." will be imported since the thread contains posts or shares.", LOGGER_DEBUG);
+                                               }
                                        }
                                } else {
                                        // But we will only import complete threads
                                        $valid = dba::exists('item', ['uid' => $importer["uid"], 'uri' => self::$itemlist[0]['parent-uri']]);
+                                       if ($valid) {
+                                               logger("Item with uri ".self::$itemlist[0]["uri"]." belongs to parent ".self::$itemlist[0]['parent-uri']." of user ".$importer["uid"].". It will be imported.", LOGGER_DEBUG);
+                                       }
                                }
 
                                if ($valid) {
@@ -1373,7 +1383,7 @@ class OStatus
                XML::addElement($doc, $author, "uri", $owner["url"]);
                XML::addElement($doc, $author, "name", $owner["nick"]);
                XML::addElement($doc, $author, "email", $owner["addr"]);
-               XML::addElement($doc, $author, "summary", bbcode($owner["about"], false, false, 7));
+               XML::addElement($doc, $author, "summary", BBCode::convert($owner["about"], false, 7));
 
                $attributes = ["rel" => "alternate", "type" => "text/html", "href" => $owner["url"]];
                XML::addElement($doc, $author, "link", "", $attributes);
@@ -1398,7 +1408,7 @@ class OStatus
 
                XML::addElement($doc, $author, "poco:preferredUsername", $owner["nick"]);
                XML::addElement($doc, $author, "poco:displayName", $owner["name"]);
-               XML::addElement($doc, $author, "poco:note", bbcode($owner["about"], false, false, 7));
+               XML::addElement($doc, $author, "poco:note", BBCode::convert($owner["about"], false, 7));
 
                if (trim($owner["location"]) != "") {
                        $element = $doc->createElement("poco:address");
@@ -1879,7 +1889,7 @@ class OStatus
                        $body = "[b]".$item['title']."[/b]\n\n".$body;
                }
 
-               $body = bbcode($body, false, false, 7);
+               $body = BBCode::convert($body, false, 7);
 
                XML::addElement($doc, $entry, "content", $body, ["type" => "html"]);
 
@@ -2098,7 +2108,7 @@ class OStatus
                }
 
                $check_date = DateTimeFormat::utc($last_update);
-               $authorid = Contact::getIdForURL($owner["url"], 0);
+               $authorid = Contact::getIdForURL($owner["url"], 0, true);
 
                $sql_extra = '';
                if ($filter === 'posts') {
@@ -2118,6 +2128,7 @@ class OStatus
                                AND `item`.`created` > '%s'
                                AND NOT `item`.`deleted`
                                AND NOT `item`.`private`
+                               AND `item`.`visible`
                                AND `thread`.`network` IN ('%s', '%s')
                                $sql_extra
                                ORDER BY `item`.`created` DESC LIMIT %d",