Merge pull request #3444 from annando/1705-mail-duplicates

Mails shouldn't be duplicated anymore when sending

diff --combined include/diaspora.php
index 51b496f86f6e6157436bf4efeba5553d21e53c97,69a2e9e572a864ccbf72e2f74afdbe8165c5a31f..b1560b920186adf2fa57b07c5a37a2c366180c32
--- 1/include/diaspora.php
--- 2/include/diaspora.php
+++ b/include/diaspora.php
@@@ -8,8 -8,7 +8,8 @@@
   * This will change in the future.
   */
  
 -use \Friendica\Core\Config;
 +use Friendica\App;
 +use Friendica\Core\Config;
  
  require_once 'include/items.php';
  require_once 'include/bb2diaspora.php';
@@@ -1517,8 -1516,9 +1517,9 @@@ class Diaspora 
  
                $person = self::person_by_handle($msg_author);
  
-               $r = q("SELECT `id` FROM `mail` WHERE `uri` = '%s' LIMIT 1",
-                       dbesc($message_uri)
+               $r = q("SELECT `id` FROM `mail` WHERE `guid` = '%s' AND `uid` = %d LIMIT 1",
+                       dbesc($msg_guid),
+                       intval($importer["uid"])
                );
                if (dbm::is_result($r)) {
                        logger("duplicate message already delivered.", LOGGER_DEBUG);
@@@ -1814,8 -1814,8 +1815,8 @@@
                        return false;
                }
  
-               $r = q("SELECT `id` FROM `mail` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
-                       dbesc($message_uri),
+               $r = q("SELECT `id` FROM `mail` WHERE `guid` = '%s' AND `uid` = %d LIMIT 1",
+                       dbesc($guid),
                        intval($importer["uid"])
                );
                if (dbm::is_result($r)) {
@@@ -3820,3 -3820,4 +3821,3 @@@
                return true;
        }
  }
 -?>