Merge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect...

[friendica.git] / include / diaspora.php

diff --git a/include/diaspora.php b/include/diaspora.php
index db2cca471bcad6cf6a81f4b7f72befa6f3fbab60..eca22092d81352987a2a8a0e6981c8c7aa3fb206 100644 (file)
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -8,6 +8,8 @@
  * This will change in the future.
  */
 
+use \Friendica\Core\Config;
+
 require_once("include/items.php");
 require_once("include/bb2diaspora.php");
 require_once("include/Scrape.php");
@@ -45,13 +47,13 @@ class Diaspora {
 
                foreach($servers AS $server) {
                        $server = trim($server);
+                       $addr = "relay@".str_replace("http://", "", normalise_link($server));
                        $batch = $server."/receive/public";
 
-                       $relais = q("SELECT `batch`, `id`, `name`,`network` FROM `contact` WHERE `uid` = 0 AND `batch` = '%s' LIMIT 1", dbesc($batch));
+                       $relais = q("SELECT `batch`, `id`, `name`,`network` FROM `contact` WHERE `uid` = 0 AND `batch` = '%s' AND `addr` = '%s' AND `nurl` = '%s' LIMIT 1",
+                                       dbesc($batch), dbesc($addr), dbesc(normalise_link($server)));
 
                        if (!$relais) {
-                               $addr = "relay@".str_replace("http://", "", normalise_link($server));
-
                                $r = q("INSERT INTO `contact` (`uid`, `created`, `name`, `nick`, `addr`, `url`, `nurl`, `batch`, `network`, `rel`, `blocked`, `pending`, `writable`, `name-date`, `uri-date`, `avatar-date`)
                                        VALUES (0, '%s', '%s', 'relay', '%s', '%s', '%s', '%s', '%s', %d, 0, 0, 1, '%s', '%s', '%s')",
                                        datetime_convert(),
@@ -309,10 +311,6 @@ class Diaspora {
                        return false;
                }
 
-               // Use a dummy importer to import the data for the public copy
-               $importer = array("uid" => 0, "page-flags" => PAGE_FREELOVE);
-               $message_id = self::dispatch($importer,$msg);
-
                // Now distribute it to the followers
                $r = q("SELECT `user`.* FROM `user` WHERE `user`.`uid` IN
                        (SELECT `contact`.`uid` FROM `contact` WHERE `contact`.`network` = '%s' AND `contact`.`addr` = '%s')
@@ -320,13 +318,23 @@ class Diaspora {
                        dbesc(NETWORK_DIASPORA),
                        dbesc($msg["author"])
                );
-               if ($r) {
+
+               if (dbm::is_result($r)) {
                        foreach ($r as $rr) {
                                logger("delivering to: ".$rr["username"]);
                                self::dispatch($rr,$msg);
                        }
-               } else
-                       logger("No subscribers for ".$msg["author"]." ".print_r($msg, true));
+               } else {
+                       $social_relay = (bool)Config::get('system', 'relay_subscribe', false);
+
+                       // Use a dummy importer to import the data for the public copy
+                       if ($social_relay) {
+                               $importer = array("uid" => 0, "page-flags" => PAGE_FREELOVE);
+                               $message_id = self::dispatch($importer,$msg);
+                       } else {
+                               logger("Unwanted message from ".$msg["author"]." send by ".$_SERVER["REMOTE_ADDR"]." with ".$_SERVER["HTTP_USER_AGENT"].": ".print_r($msg, true), LOGGER_DEBUG);
+                       }
+               }
 
                return $message_id;
        }
@@ -736,13 +744,28 @@ class Diaspora {
         * @return The contact id
         */
        private static function contact_by_handle($uid, $handle) {
+
+               // First do a direct search on the contact table
                $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `addr` = '%s' LIMIT 1",
                        intval($uid),
                        dbesc($handle)
                );
 
-               if ($r)
+               if (dbm::is_result($r)) {
                        return $r[0];
+               } else {
+                       // We haven't found it?
+                       // We use another function for it that will possibly create a contact entry
+                       $cid = get_contact($handle, $uid);
+
+                       if ($cid > 0) {
+                               $r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1", intval($cid));
+
+                               if (dbm::is_result($r)) {
+                                       return $r[0];
+                               }
+                       }
+               }
 
                $handle_parts = explode("@", $handle);
                $nurl_sql = "%%://".$handle_parts[1]."%%/profile/".$handle_parts[0];
@@ -751,9 +774,11 @@ class Diaspora {
                        intval($uid),
                        dbesc($nurl_sql)
                );
-               if($r)
+               if (dbm::is_result($r)) {
                        return $r[0];
+               }
 
+               logger("Haven't found contact for user ".$uid." and handle ".$handle, LOGGER_DEBUG);
                return false;
        }
 
@@ -833,7 +858,7 @@ class Diaspora {
                        dbesc($guid)
                );
 
-               if ($r) {
+               if (dbm::is_result($r)) {
                        logger("message ".$guid." already exists for user ".$uid);
                        return $r[0]["id"];
                }