item_store: prevent storing a duplicate item with same uri+uid

[friendica.git] / include / diaspora.php

diff --git a/include/diaspora.php b/include/diaspora.php
index 3c28373eacebaec0ade5e06952fff99dd4ce82f7..1ae8ca8006e3d4f3cf3551d7ac3e27c4266e1129 100644 (file)
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -68,6 +68,7 @@ function diaspora_get_contact_by_handle($uid,$handle) {
 }
 
 function find_diaspora_person_by_handle($handle) {
+       $update = false;
        $r = q("select * from fcontact where network = '%s' and addr = '%s' limit 1",
                dbesc(NETWORK_DIASPORA),
                dbesc($handle)
@@ -75,18 +76,14 @@ function find_diaspora_person_by_handle($handle) {
        if(count($r)) {
                // update record occasionally so it doesn't get stale
                $d = strtotime($r[0]['updated'] . ' +00:00');
-               if($d < strtotime('now - 14 days')) {
-                       q("delete from fcontact where id = %d limit 1",
-                               intval($r[0]['id'])
-                       );
-               }
-               else
+               if($d > strtotime('now - 14 days'))
                        return $r[0];
+               $update = true;
        }
        require_once('include/Scrape.php');
        $r = probe_url($handle, PROBE_DIASPORA);
        if((count($r)) && ($r['network'] === NETWORK_DIASPORA)) {
-               add_fcontact($r);
+               add_fcontact($r,$update);
                return ($r);
        }
        return false;
@@ -111,8 +108,10 @@ function diaspora_pubmsg_build($msg,$user,$contact,$prvkey,$pubkey) {
        
        $handle = $user['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
 
-       $b64_data = base64_encode($msg);
-       $b64url_data = base64url_encode($b64_data);
+//     $b64_data = base64_encode($msg);
+//     $b64url_data = base64url_encode($b64_data);
+
+       $b64url_data = base64url_encode($msg);
 
        $data = str_replace(array("\n","\r"," ","\t"),array('','','',''),$b64url_data);
 
@@ -128,7 +127,7 @@ function diaspora_pubmsg_build($msg,$user,$contact,$prvkey,$pubkey) {
 
 $magic_env = <<< EOT
 <?xml version='1.0' encoding='UTF-8'?>
-<diaspora xmlns="https://joindiaspora.org/protocol" xmlns:me="http://salmon-protocol.org/ns/magic-env" >
+<diaspora xmlns="https://joindiaspora.com/protocol" xmlns:me="http://salmon-protocol.org/ns/magic-env" >
   <header>
     <author_id>$handle</author_id>
   </header>
@@ -149,9 +148,12 @@ EOT;
 
 
 
-function diaspora_msg_build($msg,$user,$contact,$prvkey,$pubkey) {
+function diaspora_msg_build($msg,$user,$contact,$prvkey,$pubkey,$public = false) {
        $a = get_app();
 
+       if($public)
+               return diaspora_pubmsg_build($msg,$user,$contact,$prvkey,$pubkey);
+
        logger('diaspora_msg_build: ' . $msg, LOGGER_DATA);
 
        $inner_aes_key = random_string(32);
@@ -214,7 +216,7 @@ EOT;
 
 $magic_env = <<< EOT
 <?xml version='1.0' encoding='UTF-8'?>
-<diaspora xmlns="https://joindiaspora.org/protocol" xmlns:me="http://salmon-protocol.org/ns/magic-env" >
+<diaspora xmlns="https://joindiaspora.com/protocol" xmlns:me="http://salmon-protocol.org/ns/magic-env" >
   $encrypted_header
   <me:env>
     <me:encoding>base64url</me:encoding>
@@ -292,7 +294,7 @@ function diaspora_decode($importer,$xml) {
 
 ***** CURRENT
 
-                *     <author_id>acct:galaxor@diaspora.priateship.org</author_id>
+                *     <author_id>galaxor@diaspora.priateship.org</author_id>
 
 ***** END DIFFS
 
@@ -383,7 +385,7 @@ function diaspora_decode($importer,$xml) {
 
        if(! $verify) {
                logger('mod-diaspora: Message did not verify. Discarding.');
-//             http_status_exit(400);
+               http_status_exit(400);
        }
 
        logger('mod-diaspora: Message verified.');
@@ -427,13 +429,16 @@ function diaspora_request($importer,$xml) {
                return;
        }
 
-       $r = q("INSERT INTO `contact` (`uid`, `network`,`addr`,`created`,`url`,`name`,`nick`,`photo`,`pubkey`,`notify`,`poll`,`blocked`,`priority`)
-               VALUES ( %d, '%s', '%s', '%s','%s','%s','%s','%s','%s','%s','%s',%d,%d) ",
+       $batch = (($ret['batch']) ? $ret['batch'] : implode('/', array_slice(explode('/',$ret['url']),0,3)) . '/receive/public');
+
+       $r = q("INSERT INTO `contact` (`uid`, `network`,`addr`,`created`,`url`,`batch`,`name`,`nick`,`photo`,`pubkey`,`notify`,`poll`,`blocked`,`priority`)
+               VALUES ( %d, '%s', '%s', '%s','%s','%s','%s','%s','%s','%s','%s','%s',%d,%d) ",
                intval($importer['uid']),
                dbesc($ret['network']),
                dbesc($ret['addr']),
                datetime_convert(),
                dbesc($ret['url']),
+               dbesc($batch),
                dbesc($ret['name']),
                dbesc($ret['nick']),
                dbesc($ret['photo']),
@@ -983,7 +988,7 @@ function diaspora_unshare($me,$contact) {
 
 
 
-function diaspora_send_status($item,$owner,$contact) {
+function diaspora_send_status($item,$owner,$contact,$public_batch = false) {
 
        $a = get_app();
        $myaddr = $owner['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
@@ -1025,19 +1030,19 @@ function diaspora_send_status($item,$owner,$contact) {
 
        logger('diaspora_send_status: ' . $owner['username'] . ' -> ' . $contact['name'] . ' base message: ' . $msg, LOGGER_DATA);
 
-       $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'])));
+       $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],$public_batch)));
 
-       $return_code = diaspora_transmit($owner,$contact,$slap);
+       $return_code = diaspora_transmit($owner,$contact,$slap,$public_batch);
 
        if(count($images)) {
-               diaspora_send_images($item,$owner,$contact,$images);
+               diaspora_send_images($item,$owner,$contact,$images,$public_batch);
        }
 
        return $return_code;
 }
 
 
-function diaspora_send_images($item,$owner,$contact,$images) {
+function diaspora_send_images($item,$owner,$contact,$images,$public_batch = false) {
        $a = get_app();
        if(! count($images))
                return;
@@ -1069,14 +1074,14 @@ function diaspora_send_images($item,$owner,$contact,$images) {
 
 
                logger('diaspora_send_photo: base message: ' . $msg, LOGGER_DATA);
-               $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'])));
+               $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],$public_batch)));
 
-               diaspora_transmit($owner,$contact,$slap);
+               diaspora_transmit($owner,$contact,$slap,$public_batch);
        }
 
 }
 
-function diaspora_send_followup($item,$owner,$contact) {
+function diaspora_send_followup($item,$owner,$contact,$public_batch = false) {
 
        $a = get_app();
        $myaddr = $owner['nickname'] . '@' .  substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
@@ -1124,13 +1129,13 @@ function diaspora_send_followup($item,$owner,$contact) {
 
        logger('diaspora_followup: base message: ' . $msg, LOGGER_DATA);
 
-       $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'])));
+       $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],$public_batch)));
 
-       return(diaspora_transmit($owner,$contact,$slap));
+       return(diaspora_transmit($owner,$contact,$slap,$public_batch));
 }
 
 
-function diaspora_send_relay($item,$owner,$contact) {
+function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
 
 
        $a = get_app();
@@ -1226,15 +1231,15 @@ function diaspora_send_relay($item,$owner,$contact) {
 
        logger('diaspora_relay_comment: base message: ' . $msg, LOGGER_DATA);
 
-       $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'])));
+       $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],$public_batch)));
 
-       return(diaspora_transmit($owner,$contact,$slap));
+       return(diaspora_transmit($owner,$contact,$slap,$public_batch));
 
 }
 
 
 
-function diaspora_send_retraction($item,$owner,$contact) {
+function diaspora_send_retraction($item,$owner,$contact,$public_batch = false) {
 
        $a = get_app();
        $myaddr = $owner['nickname'] . '@' .  substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
@@ -1246,32 +1251,35 @@ function diaspora_send_retraction($item,$owner,$contact) {
                '$handle' => $myaddr
        ));
 
-       $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'])));
+       $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],$public_batch)));
 
-       return(diaspora_transmit($owner,$contact,$slap));
+       return(diaspora_transmit($owner,$contact,$slap,$public_batch));
 }
 
 
 
-function diaspora_transmit($owner,$contact,$slap) {
+function diaspora_transmit($owner,$contact,$slap,$public_batch) {
 
        $a = get_app();
-
-       post_url($contact['notify'] . '/',$slap);
+       $logid = random_string(4);
+       logger('diaspora_transmit: ' . $logid . ' ' . (($public_batch) ? $contact['batch'] : $contact['notify']));
+       post_url((($public_batch) ? $contact['batch'] : $contact['notify']) . '/',$slap);
        $return_code = $a->get_curl_code();
-       logger('diaspora_transmit: returns: ' . $return_code);
+       logger('diaspora_transmit: ' . $logid . ' returns: ' . $return_code);
 
-       if(! $return_code) {
+       if((! $return_code) || (($curl_stat == 503) && (stristr($a->get_curl_headers(),'retry-after')))) {
                logger('diaspora_transmit: queue message');
                // queue message for redelivery
-               q("INSERT INTO `queue` ( `cid`, `created`, `last`, `content`)
-                       VALUES ( %d, '%s', '%s', '%s') ",
+               q("INSERT INTO `queue` ( `cid`, `created`, `last`, `content`,`batch`)
+                       VALUES ( %d, '%s', '%s', '%s', %d) ",
                        intval($contact['id']),
                        dbesc(datetime_convert()),
                        dbesc(datetime_convert()),
-                       dbesc($slap)
+                       dbesc($slap),
+                       intval($public_batch)
                );
        }
 
+
        return(($return_code) ? $return_code : (-1));
 }