Direct transfer without a relay is now possible

diff --git a/doc/htconfig.md b/doc/htconfig.md
index 3f21dccbaf6d6e03eef797e07809d92d7fc715f4..b4b7646e9071719940a2043404f2486e45dd675a 100644 (file)
--- a/doc/htconfig.md
+++ b/doc/htconfig.md
@@ -85,6 +85,7 @@ Example: To set the automatic database cleanup process add this line to your .ht
 * **proxy_cache_time** - Time after which the cache is cleared. Default value is one day.
 * **pushpoll_frequency** -
 * **qsearch_limit** - Default value is 100.
+* **relay_directly** (Boolean) - Enables the direct transfer without using the relay servers
 * **relay_server** - Experimental Diaspora feature. Address of the relay server where public posts should be send to. For example https://podrelay.net
 * **relay_subscribe** (Boolean) - Enables the receiving of public posts from the relay. They will be included in the search and on the community page when it is set up to show all public items.
 * **relay_scope** - Can be "all" or "tags". "all" means that every public post should be received. "tags" means that only posts with selected tags should be received.

diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index f925dc9b5797cb8a6f5d5dba6d7a08f043fe4b85..23bc575dd071ac8ce5d75df0bf9fabdc5a049c65 100644 (file)
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -47,60 +47,100 @@ class Diaspora
        /**
         * @brief Return a list of relay servers
         *
-        * This is an experimental Diaspora feature.
+        * The list contains not only the official relays but also servers that we serve directly
         *
+        * @param integer $item_id   The id of the item that is sent
         * @return array of relay servers
         */
-       public static function relayList()
+       public static function relayList($item_id)
        {
+               $serverlist = [];
+
+               // Fetching relay servers
                $serverdata = Config::get("system", "relay_server");
-               if ($serverdata == "") {
-                       return [];
+               if ($serverdata != "") {
+                       $servers = explode(",", $serverdata);
+                       foreach ($servers as $server) {
+                               $serverlist[$server] = trim($server);
+                       }
                }
 
-               $relay = [];
+               if (Config::get("system", "relay_directly", false)) {
+                       // Servers that want to get all content
+                       $servers = dba::select('gserver', ['url'], ['relay-subscribe' => true, 'relay-scope' => 'all']);
+                       while ($server = dba::fetch($servers)) {
+                               $serverlist[$server['url']] = $server['url'];
+                       }
 
-               $servers = explode(",", $serverdata);
+                       // All tags of the current post
+                       $condition = ['otype' => TERM_OBJ_POST, 'type' => TERM_HASHTAG, 'oid' => $item_id];
+                       $tags = dba::select('term', ['term'], $condition);
+                       $taglist = [];
+                       while ($tag = dba::fetch($tags)) {
+                               $taglist[] = $tag['term'];
+                       }
 
-               foreach ($servers as $server) {
-                       $server = trim($server);
-                       $addr = "relay@".str_replace("http://", "", normalise_link($server));
-                       $batch = $server."/receive/public";
+                       // All servers who wants content with this tag
+                       $tagserverlist = [];
+                       $tagserver = dba::select('gserver-tag', ['gserver-id'], ['tag' => $taglist]);
+                       while ($server = dba::fetch($tagserver)) {
+                               $tagserverlist[] = $server['gserver-id'];
+                       }
 
-                       $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))
-                       );
+                       // All adresses with the given id
+                       $servers = dba::select('gserver', ['url'], ['relay-subscribe' => true, 'relay-scope' => 'tags', 'id' => $tagserverlist]);
+                       while ($server = dba::fetch($servers)) {
+                               $serverlist[$server['url']] = $server['url'];
+                       }
+               }
 
-                       if (!$relais) {
-                               $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')",
-                                       DateTimeFormat::utcNow(),
-                                       dbesc($addr),
-                                       dbesc($addr),
-                                       dbesc($server),
-                                       dbesc(normalise_link($server)),
-                                       dbesc($batch),
-                                       dbesc(NETWORK_DIASPORA),
-                                       intval(CONTACT_IS_FOLLOWER),
-                                       dbesc(DateTimeFormat::utcNow()),
-                                       dbesc(DateTimeFormat::utcNow()),
-                                       dbesc(DateTimeFormat::utcNow())
-                               );
+               // Now we are collecting all relay contacts
+               $contacts = [];
+               foreach ($serverlist as $server_url) {
+                       // We don't send messages to ourselves
+                       if (!link_compare($server_url, System::baseUrl())) {
+                               $contacts[] = self::getRelayContactId($server_url);
+                       }
+               }
 
-                               $relais = q("SELECT `batch`, `id`, `name`,`network` FROM `contact` WHERE `uid` = 0 AND `batch` = '%s' LIMIT 1", dbesc($batch));
-                               if ($relais) {
-                                       $relay[] = $relais[0];
-                               }
-                       } else {
-                               $relay[] = $relais[0];
+               return $contacts;
+       }
+
+       /**
+        * @brief Return a contact for a given server address or creates a dummy entry
+        *
+        * @param string $server_url The url of the server
+        * @return array with the contact
+        */
+       private static function getRelayContactId($server_url)
+       {
+               $batch = $server_url . '/receive/public';
+
+               $fields = ['batch', 'id', 'name', 'network'];
+               $condition = ['uid' => 0, 'network' => NETWORK_DIASPORA, 'batch' => $batch,
+                               'archive' => false, 'blocked' => false];
+               $contact = dba::selectFirst('contact', $fields, $condition);
+               if (DBM::is_result($contact)) {
+                       return $contact;
+               } else {
+                       $fields = ['uid' => 0, 'created' => DateTimeFormat::utcNow(),
+                               'name' => 'relay', 'nick' => 'relay',
+                               'url' => $server_url, 'nurl' => normalise_link($server_url),
+                               'batch' => $batch, 'network' => NETWORK_DIASPORA,
+                               'rel' => CONTACT_IS_FOLLOWER, 'blocked' => false,
+                               'pending' => false, 'writable' => true];
+                       dba::insert('contact', $fields);
+
+                       $fields = ['batch', 'id', 'name', 'network'];
+                       $contact = dba::selectFirst('contact', $fields, $condition);
+                       if (DBM::is_result($contact)) {
+                               return $contact;
                        }
+
                }
 
-               return $relay;
+               // It should never happen that we arrive here
+               return [];
        }
 
        /**

diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index edb0df33adbbcf0d63968dcb6b5ae1cfc055f61d..49fd5e3187bc56900e6ca603a557425df594403d 100644 (file)
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -485,7 +485,7 @@ class Notifier {
 
                        if ($diaspora_delivery) {
                                if (!$followup) {
-                                       $r0 = Diaspora::relayList();
+                                       $r0 = Diaspora::relayList($item_id);
                                }
 
                                $r1 = q("SELECT `batch`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`name`) AS `name`, ANY_VALUE(`network`) AS `network`