]> git.mxchange.org Git - friendica.git/blobdiff - include/diaspora.php
Fix SQL date format bug in dfrn
[friendica.git] / include / diaspora.php
index 1e31bae8e5d155ccb69e0800d0c5a5983a851160..b8eff62b1130f2a25ecd1503d043d130240b8704 100644 (file)
@@ -8,17 +8,19 @@
  * This will change in the future.
  */
 
-require_once("include/items.php");
-require_once("include/bb2diaspora.php");
-require_once("include/Scrape.php");
-require_once("include/Contact.php");
-require_once("include/Photo.php");
-require_once("include/socgraph.php");
-require_once("include/group.php");
-require_once("include/xml.php");
-require_once("include/datetime.php");
-require_once("include/queue_fn.php");
-require_once("include/cache.php");
+use \Friendica\Core\Config;
+
+require_once 'include/items.php';
+require_once 'include/bb2diaspora.php';
+require_once 'include/Scrape.php';
+require_once 'include/Contact.php';
+require_once 'include/Photo.php';
+require_once 'include/socgraph.php';
+require_once 'include/group.php';
+require_once 'include/xml.php';
+require_once 'include/datetime.php';
+require_once 'include/queue_fn.php';
+require_once 'include/cache.php';
 
 /**
  * @brief This class contain functions to create and send Diaspora XML files
@@ -43,15 +45,15 @@ class Diaspora {
 
                $servers = explode(",", $serverdata);
 
-               foreach($servers AS $server) {
+               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(),
@@ -158,6 +160,32 @@ class Diaspora {
                return $data;
        }
 
+       /**
+        * @brief encrypts data via AES
+        *
+        * @param string $key The AES key
+        * @param string $iv The IV (is used for CBC encoding)
+        * @param string $data The data that is to be encrypted
+        *
+        * @return string encrypted data
+        */
+       private static function aes_encrypt($key, $iv, $data) {
+               return openssl_encrypt($data, 'aes-256-cbc', str_pad($key, 32, "\0"), OPENSSL_RAW_DATA, str_pad($iv, 16, "\0"));
+       }
+
+       /**
+        * @brief decrypts data via AES
+        *
+        * @param string $key The AES key
+        * @param string $iv The IV (is used for CBC encoding)
+        * @param string $encrypted The encrypted data
+        *
+        * @return string decrypted data
+        */
+       private static function aes_decrypt($key, $iv, $encrypted) {
+               return openssl_decrypt($encrypted,'aes-256-cbc', str_pad($key, 32, "\0"), OPENSSL_RAW_DATA,str_pad($iv, 16, "\0"));
+       }
+
        /**
         * @brief: Decodes incoming Diaspora message
         *
@@ -179,7 +207,7 @@ class Diaspora {
 
                $children = $basedom->children('https://joindiaspora.com/protocol');
 
-               if($children->header) {
+               if ($children->header) {
                        $public = true;
                        $author_link = str_replace('acct:','',$children->header->author_id);
                } else {
@@ -197,10 +225,7 @@ class Diaspora {
                        $outer_iv = base64_decode($j_outer_key_bundle->iv);
                        $outer_key = base64_decode($j_outer_key_bundle->key);
 
-                       $decrypted = mcrypt_decrypt(MCRYPT_RIJNDAEL_128, $outer_key, $ciphertext, MCRYPT_MODE_CBC, $outer_iv);
-
-
-                       $decrypted = pkcs5_unpad($decrypted);
+                       $decrypted = self::aes_decrypt($outer_key, $outer_iv, $ciphertext);
 
                        logger('decrypted: '.$decrypted, LOGGER_DEBUG);
                        $idom = parse_xml_string($decrypted,false);
@@ -215,11 +240,11 @@ class Diaspora {
 
                // figure out where in the DOM tree our data is hiding
 
-               if($dom->provenance->data)
+               if ($dom->provenance->data)
                        $base = $dom->provenance;
-               elseif($dom->env->data)
+               elseif ($dom->env->data)
                        $base = $dom->env;
-               elseif($dom->data)
+               elseif ($dom->data)
                        $base = $dom;
 
                if (!$base) {
@@ -252,15 +277,14 @@ class Diaspora {
                $data = base64url_decode($data);
 
 
-               if($public)
+               if ($public)
                        $inner_decrypted = $data;
                else {
 
                        // Decode the encrypted blob
 
                        $inner_encrypted = base64_decode($data);
-                       $inner_decrypted = mcrypt_decrypt(MCRYPT_RIJNDAEL_128, $inner_aes_key, $inner_encrypted, MCRYPT_MODE_CBC, $inner_iv);
-                       $inner_decrypted = pkcs5_unpad($inner_decrypted);
+                       $inner_decrypted = self::aes_decrypt($inner_aes_key, $inner_iv, $inner_encrypted);
                }
 
                if (!$author_link) {
@@ -309,10 +333,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 +340,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;
        }
@@ -548,7 +578,7 @@ class Diaspora {
                logger("Fetching diaspora key for: ".$handle);
 
                $r = self::person_by_handle($handle);
-               if($r)
+               if ($r)
                        return $r["pubkey"];
 
                return "";
@@ -604,7 +634,7 @@ class Diaspora {
         */
        private static function add_fcontact($arr, $update = false) {
 
-               if($update) {
+               if ($update) {
                        $r = q("UPDATE `fcontact` SET
                                        `name` = '%s',
                                        `photo` = '%s',
@@ -736,13 +766,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 +796,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;
        }
 
@@ -771,7 +818,7 @@ class Diaspora {
                // perhaps we were already sharing with this person. Now they're sharing with us.
                // That makes us friends.
                // Normally this should have handled by getting a request - but this could get lost
-               if($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) {
+               if ($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) {
                        q("UPDATE `contact` SET `rel` = %d, `writable` = 1 WHERE `id` = %d AND `uid` = %d",
                                intval(CONTACT_IS_FRIEND),
                                intval($contact["id"]),
@@ -781,12 +828,12 @@ class Diaspora {
                        logger("defining user ".$contact["nick"]." as friend");
                }
 
-               if(($contact["blocked"]) || ($contact["readonly"]) || ($contact["archive"]))
+               if (($contact["blocked"]) || ($contact["readonly"]) || ($contact["archive"]))
                        return false;
-               if($contact["rel"] == CONTACT_IS_SHARING || $contact["rel"] == CONTACT_IS_FRIEND)
+               if ($contact["rel"] == CONTACT_IS_SHARING || $contact["rel"] == CONTACT_IS_FRIEND)
                        return true;
-               if($contact["rel"] == CONTACT_IS_FOLLOWER)
-                       if(($importer["page-flags"] == PAGE_COMMUNITY) OR $is_comment)
+               if ($contact["rel"] == CONTACT_IS_FOLLOWER)
+                       if (($importer["page-flags"] == PAGE_COMMUNITY) OR $is_comment)
                                return true;
 
                // Messages for the global users are always accepted
@@ -833,7 +880,7 @@ class Diaspora {
                        dbesc($guid)
                );
 
-               if ($r) {
+               if (dbm::is_result($r)) {
                        logger("message ".$guid." already exists for user ".$uid);
                        return $r[0]["id"];
                }
@@ -944,7 +991,7 @@ class Diaspora {
                logger("Fetch post from ".$source_url, LOGGER_DEBUG);
 
                $envelope = fetch_url($source_url);
-               if($envelope) {
+               if ($envelope) {
                        logger("Envelope was fetched.", LOGGER_DEBUG);
                        $x = self::verify_magic_envelope($envelope);
                        if (!$x)
@@ -960,7 +1007,7 @@ class Diaspora {
                        logger("Fetch post from ".$source_url, LOGGER_DEBUG);
 
                        $x = fetch_url($source_url);
-                       if(!$x)
+                       if (!$x)
                                return false;
                }
 
@@ -1017,7 +1064,7 @@ class Diaspora {
                        FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
                        intval($uid), dbesc($guid));
 
-               if(!$r) {
+               if (!$r) {
                        $result = self::store_by_guid($guid, $contact["url"], $uid);
 
                        if (!$result) {
@@ -1173,10 +1220,11 @@ class Diaspora {
        private static function get_guid_from_uri($uri, $uid) {
 
                $r = q("SELECT `guid` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", dbesc($uri), intval($uid));
-               if (dbm::is_result($r))
+               if (dbm::is_result($r)) {
                        return $r[0]["guid"];
-               else
+               } else {
                        return false;
+               }
        }
 
        /**
@@ -1277,7 +1325,7 @@ class Diaspora {
                }
 
                // If we are the origin of the parent we store the original data and notify our followers
-               if($message_id AND $parent_item["origin"]) {
+               if ($message_id AND $parent_item["origin"]) {
 
                        // Formerly we stored the signed text, the signature and the author in different fields.
                        // We now store the raw data so that we are more flexible.
@@ -1454,7 +1502,7 @@ class Diaspora {
                        intval($importer["uid"]),
                        dbesc($guid)
                );
-               if($c)
+               if ($c)
                        $conversation = $c[0];
                else {
                        $r = q("INSERT INTO `conv` (`uid`, `guid`, `creator`, `created`, `updated`, `subject`, `recips`)
@@ -1467,13 +1515,13 @@ class Diaspora {
                                dbesc($subject),
                                dbesc($participants)
                        );
-                       if($r)
+                       if ($r)
                                $c = q("SELECT * FROM `conv` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
                                        intval($importer["uid"]),
                                        dbesc($guid)
                                );
 
-                       if($c)
+                       if ($c)
                                $conversation = $c[0];
                }
                if (!$conversation) {
@@ -1481,7 +1529,7 @@ class Diaspora {
                        return;
                }
 
-               foreach($messages as $mesg)
+               foreach ($messages as $mesg)
                        self::receive_conversation_message($importer, $contact, $data, $msg, $mesg, $conversation);
 
                return true;
@@ -1611,7 +1659,7 @@ class Diaspora {
                        logger("Stored like ".$datarray["guid"]." with message id ".$message_id, LOGGER_DEBUG);
 
                // If we are the origin of the parent we store the original data and notify our followers
-               if($message_id AND $parent_item["origin"]) {
+               if ($message_id AND $parent_item["origin"]) {
 
                        // Formerly we stored the signed text, the signature and the author in different fields.
                        // We now store the raw data so that we are more flexible.
@@ -1786,10 +1834,10 @@ class Diaspora {
                $handle_parts = explode("@", $author);
                $nick = $handle_parts[0];
 
-               if($name === "")
+               if ($name === "")
                        $name = $handle_parts[0];
 
-               if( preg_match("|^https?://|", $image_url) === 0)
+               if ( preg_match("|^https?://|", $image_url) === 0)
                        $image_url = "http://".$handle_parts[1].$image_url;
 
                update_contact_avatar($image_url, $importer["uid"], $contact["id"]);
@@ -1804,7 +1852,7 @@ class Diaspora {
                // this is to prevent multiple birthday notifications in a single year
                // if we already have a stored birthday and the 'm-d' part hasn't changed, preserve the entry, which will preserve the notify year
 
-               if(substr($birthday,5) === substr($contact["bd"],5))
+               if (substr($birthday,5) === substr($contact["bd"],5))
                        $birthday = $contact["bd"];
 
                $r = q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `addr` = '%s', `name-date` = '%s', `bd` = '%s',
@@ -1822,18 +1870,15 @@ class Diaspora {
                        intval($importer["uid"])
                );
 
-               if ($searchable) {
-                       poco_check($contact["url"], $name, NETWORK_DIASPORA, $image_url, $about, $location, $gender, $keywords, "",
-                               datetime_convert(), 2, $contact["id"], $importer["uid"]);
-               }
-
                $gcontact = array("url" => $contact["url"], "network" => NETWORK_DIASPORA, "generation" => 2,
                                        "photo" => $image_url, "name" => $name, "location" => $location,
                                        "about" => $about, "birthday" => $birthday, "gender" => $gender,
                                        "addr" => $author, "nick" => $nick, "keywords" => $keywords,
                                        "hide" => !$searchable, "nsfw" => $nsfw);
 
-               update_gcontact($gcontact);
+               $gcid = update_gcontact($gcontact);
+
+               link_gcontact($gcid, $importer["uid"], $contact["id"]);
 
                logger("Profile of contact ".$contact["id"]." stored for user ".$importer["uid"], LOGGER_DEBUG);
 
@@ -1850,7 +1895,7 @@ class Diaspora {
 
                $a = get_app();
 
-               if($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) {
+               if ($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) {
                        q("UPDATE `contact` SET `rel` = %d, `writable` = 1 WHERE `id` = %d AND `uid` = %d",
                                intval(CONTACT_IS_FRIEND),
                                intval($contact["id"]),
@@ -1863,7 +1908,7 @@ class Diaspora {
                        intval($importer["uid"])
                );
 
-               if($r && !$r[0]["hide-friends"] && !$contact["hidden"] && intval(get_pconfig($importer["uid"], "system", "post_newfriend"))) {
+               if ($r && !$r[0]["hide-friends"] && !$contact["hidden"] && intval(get_pconfig($importer["uid"], "system", "post_newfriend"))) {
 
                        $self = q("SELECT * FROM `contact` WHERE `self` AND `uid` = %d LIMIT 1",
                                intval($importer["uid"])
@@ -1871,7 +1916,7 @@ class Diaspora {
 
                        // they are not CONTACT_IS_FOLLOWER anymore but that's what we have in the array
 
-                       if($self && $contact["rel"] == CONTACT_IS_FOLLOWER) {
+                       if ($self && $contact["rel"] == CONTACT_IS_FOLLOWER) {
 
                                $arr = array();
                                $arr["uri"] = $arr["parent-uri"] = item_new_uri($a->get_hostname(), $importer["uid"]);
@@ -1902,7 +1947,7 @@ class Diaspora {
                                $arr["deny_gid"]  = $user[0]["deny_gid"];
 
                                $i = item_store($arr);
-                               if($i)
+                               if ($i)
                                        proc_run(PRIORITY_HIGH, "include/notifier.php", "activity", $i);
                        }
                }
@@ -2041,12 +2086,12 @@ class Diaspora {
 
                $def_gid = get_default_group($importer['uid'], $ret["network"]);
 
-               if(intval($def_gid))
+               if (intval($def_gid))
                        group_add_member($importer["uid"], "", $contact_record["id"], $def_gid);
 
                update_contact_avatar($ret["photo"], $importer['uid'], $contact_record["id"], true);
 
-               if($importer["page-flags"] == PAGE_NORMAL) {
+               if ($importer["page-flags"] == PAGE_NORMAL) {
 
                        logger("Sending intra message for author ".$author.".", LOGGER_DEBUG);
 
@@ -2096,7 +2141,7 @@ class Diaspora {
                        );
 
                        $u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($importer["uid"]));
-                       if($u) {
+                       if ($u) {
                                logger("Sending share message (Relation: ".$new_relation.") to author ".$author." - Contact: ".$contact_record["id"]." - User: ".$importer["uid"], LOGGER_DEBUG);
                                $ret = self::send_share($u[0], $contact_record);
 
@@ -2282,8 +2327,9 @@ class Diaspora {
                        dbesc($target_guid),
                        intval($importer["uid"])
                );
-               if (!$r)
+               if (!$r) {
                        return false;
+               }
 
                // Check if the sender is the thread owner
                $p = q("SELECT `id`, `author-link`, `origin` FROM `item` WHERE `id` = %d",
@@ -2306,7 +2352,7 @@ class Diaspora {
                logger("Deleted target ".$target_guid." (".$r[0]["id"].") from user ".$importer["uid"]." parent: ".$p[0]["id"], LOGGER_DEBUG);
 
                // Now check if the retraction needs to be relayed by us
-               if($p[0]["origin"]) {
+               if ($p[0]["origin"]) {
                        // notify others
                        proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $r[0]["id"]);
                }
@@ -2477,15 +2523,17 @@ class Diaspora {
         * @return string the handle in the format user@domain.tld
         */
        private static function my_handle($contact) {
-               if ($contact["addr"] != "")
+               if ($contact["addr"] != "") {
                        return $contact["addr"];
+               }
 
                // Normally we should have a filled "addr" field - but in the past this wasn't the case
                // So - just in case - we build the the address here.
-               if ($contact["nickname"] != "")
+               if ($contact["nickname"] != "") {
                        $nick = $contact["nickname"];
-               else
+               } else {
                        $nick = $contact["nick"];
+               }
 
                return $nick."@".substr(App::get_baseurl(), strpos(App::get_baseurl(),"://") + 3);
        }
@@ -2592,20 +2640,19 @@ class Diaspora {
                        return false;
                }
 
-               $inner_aes_key = random_string(32);
+               $inner_aes_key = openssl_random_pseudo_bytes(32);
                $b_inner_aes_key = base64_encode($inner_aes_key);
-               $inner_iv = random_string(16);
+               $inner_iv = openssl_random_pseudo_bytes(16);
                $b_inner_iv = base64_encode($inner_iv);
 
-               $outer_aes_key = random_string(32);
+               $outer_aes_key = openssl_random_pseudo_bytes(32);
                $b_outer_aes_key = base64_encode($outer_aes_key);
-               $outer_iv = random_string(16);
+               $outer_iv = openssl_random_pseudo_bytes(16);
                $b_outer_iv = base64_encode($outer_iv);
 
                $handle = self::my_handle($user);
 
-               $padded_data = pkcs5_pad($msg,16);
-               $inner_encrypted = mcrypt_encrypt(MCRYPT_RIJNDAEL_128, $inner_aes_key, $padded_data, MCRYPT_MODE_CBC, $inner_iv);
+               $inner_encrypted = self::aes_encrypt($inner_aes_key, $inner_iv, $msg);
 
                $b64_data = base64_encode($inner_encrypted);
 
@@ -2627,9 +2674,8 @@ class Diaspora {
                                                        "author_id" => $handle));
 
                $decrypted_header = xml::from_array($xmldata, $xml, true);
-               $decrypted_header = pkcs5_pad($decrypted_header,16);
 
-               $ciphertext = mcrypt_encrypt(MCRYPT_RIJNDAEL_128, $outer_aes_key, $decrypted_header, MCRYPT_MODE_CBC, $outer_iv);
+               $ciphertext = self::aes_encrypt($outer_aes_key, $outer_iv, $decrypted_header);
 
                $outer_json = json_encode(array("iv" => $b_outer_iv, "key" => $b_outer_aes_key));
 
@@ -2719,7 +2765,7 @@ class Diaspora {
                $a = get_app();
 
                $enabled = intval(get_config("system", "diaspora_enabled"));
-               if(!$enabled)
+               if (!$enabled)
                        return 200;
 
                $logid = random_string(4);
@@ -2949,7 +2995,7 @@ class Diaspora {
         */
        private static function build_event($event_id) {
 
-               $r = q("SELECT `uid`, `start`, `finish`, `summary`, `desc`, `location`, `adjust` FROM `event` WHERE `id` = %d", intval($event_id));
+               $r = q("SELECT `guid`, `uid`, `start`, `finish`, `nofinish`, `summary`, `desc`, `location`, `adjust` FROM `event` WHERE `id` = %d", intval($event_id));
                if (!dbm::is_result($r)) {
                        return array();
                }
@@ -2965,22 +3011,37 @@ class Diaspora {
 
                $user = $r[0];
 
-               if ($event['adjust']) {
+               $r = q("SELECT `addr`, `nick` FROM `contact` WHERE `uid` = %d AND `self`", intval($event['uid']));
+               if (!dbm::is_result($r)) {
+                       return array();
+               }
+
+               $owner = $r[0];
+
+               $eventdata['author'] = self::my_handle($owner);
+
+               if ($event['guid']) {
+                       $eventdata['guid'] = $event['guid'];
+               }
+
+               $mask = 'Y-m-d\TH:i:s\Z';
+
+               /// @todo - establish "all day" events in Friendica
+               $eventdata["all_day"] = "false";
+
+               if (!$event['adjust']) {
                        $eventdata['timezone'] = $user['timezone'];
 
                        if ($eventdata['timezone'] == "") {
                                $eventdata['timezone'] = 'UTC';
                        }
-                       $mask = 'Y-m-d\TH:i:s\Z';
-               } else {
-                       $mask = 'Y-m-d\TH:i:s';
                }
 
                if ($event['start']) {
-                       $eventdata['start'] = datetime_convert("UTC", "UTC", $event['start'], $mask);
+                       $eventdata['start'] = datetime_convert($eventdata['timezone'], "UTC", $event['start'], $mask);
                }
-               if ($event['finish']) {
-                       $eventdata['end'] = datetime_convert("UTC", "UTC", $event['finish'], $mask);
+               if ($event['finish'] AND !$event['nofinish']) {
+                       $eventdata['end'] = datetime_convert($eventdata['timezone'], "UTC", $event['finish'], $mask);
                }
                if ($event['summary']) {
                        $eventdata['summary'] = html_entity_decode(bb2diaspora($event['summary']));
@@ -3043,14 +3104,14 @@ class Diaspora {
                        $body = html_entity_decode(bb2diaspora($body));
 
                        // Adding the title
-                       if(strlen($title))
+                       if (strlen($title))
                                $body = "## ".html_entity_decode($title)."\n\n".$body;
 
                        if ($item["attach"]) {
                                $cnt = preg_match_all('/href=\"(.*?)\"(.*?)title=\"(.*?)\"/ism', $item["attach"], $matches, PREG_SET_ORDER);
-                               if(cnt) {
+                               if (cnt) {
                                        $body .= "\n".t("Attachments:")."\n";
-                                       foreach($matches as $mtch)
+                                       foreach ($matches as $mtch)
                                                $body .= "[".$mtch[3]."](".$mtch[1].")\n";
                                }
                        }
@@ -3083,6 +3144,9 @@ class Diaspora {
                                $event = self::build_event($item['event-id']);
                                if (count($event)) {
                                        $message['event'] = $event;
+
+                                       /// @todo Once Diaspora supports it, we will remove the body
+                                       // $message['raw_message'] = '';
                                }
                        }
 
@@ -3131,7 +3195,11 @@ class Diaspora {
                $parent = $p[0];
 
                $target_type = ($parent["uri"] === $parent["parent-uri"] ? "Post" : "Comment");
-               $positive = "true";
+               if ($item['verb'] === ACTIVITY_LIKE) {
+                       $positive = "true";
+               } elseif ($item['verb'] === ACTIVITY_DISLIKE) {
+                       $positive = "false";
+               }
 
                return(array("positive" => $positive,
                                "guid" => $item["guid"],
@@ -3141,6 +3209,45 @@ class Diaspora {
                                "diaspora_handle" => self::my_handle($owner)));
        }
 
+       /**
+        * @brief Creates an "EventParticipation" object
+        *
+        * @param array $item The item that will be exported
+        * @param array $owner the array of the item owner
+        *
+        * @return array The data for an "EventParticipation"
+        */
+       private static function construct_attend($item, $owner) {
+
+               $p = q("SELECT `guid`, `uri`, `parent-uri` FROM `item` WHERE `uri` = '%s' LIMIT 1",
+                       dbesc($item["thr-parent"]));
+               if (!dbm::is_result($p))
+                       return false;
+
+               $parent = $p[0];
+
+               switch ($item['verb']) {
+                       case ACTIVITY_ATTEND:
+                               $attend_answer = 'accepted';
+                               break;
+                       case ACTIVITY_ATTENDNO:
+                               $attend_answer = 'declined';
+                               break;
+                       case ACTIVITY_ATTENDMAYBE:
+                               $attend_answer = 'tentative';
+                               break;
+                       default:
+                               logger('Unknown verb '.$item['verb'].' in item '.$item['guid']);
+                               return false;
+               }
+
+               return(array("author" => self::my_handle($owner),
+                               "guid" => $item["guid"],
+                               "parent_guid" => $parent["guid"],
+                               "status" => $attend_answer,
+                               "author_signature" => ""));
+       }
+
        /**
         * @brief Creates the object for a comment
         *
@@ -3151,6 +3258,13 @@ class Diaspora {
         */
        private static function construct_comment($item, $owner) {
 
+               $cachekey = "diaspora:construct_comment:".$item['guid'];
+
+               $result = Cache::get($cachekey);
+               if (!is_null($result)) {
+                       return $result;
+               }
+
                $p = q("SELECT `guid` FROM `item` WHERE `parent` = %d AND `id` = %d LIMIT 1",
                        intval($item["parent"]),
                        intval($item["parent"])
@@ -3175,6 +3289,9 @@ class Diaspora {
                if ($item['thr-parent'] != $item['parent-uri']) {
                        $comment['thread_parent_guid'] = self::get_guid_from_uri($item['thr-parent'], $item['uid']);
                }
+
+               Cache::set($cachekey, $comment, CACHE_QUARTER_HOUR);
+
                return($comment);
        }
 
@@ -3190,7 +3307,10 @@ class Diaspora {
         */
        public static function send_followup($item,$owner,$contact,$public_batch = false) {
 
-               if($item['verb'] === ACTIVITY_LIKE) {
+               if (in_array($item['verb'], array(ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE))) {
+                       $message = self::construct_attend($item, $owner);
+                       $type = "event_participation";
+               } elseif (in_array($item["verb"], array(ACTIVITY_LIKE, ACTIVITY_DISLIKE))) {
                        $message = self::construct_like($item, $owner);
                        $type = "like";
                } else {
@@ -3471,7 +3591,7 @@ class Diaspora {
                if ($searchable === 'true') {
                        $dob = '1000-00-00';
 
-                       if (($profile['dob']) && ($profile['dob'] != '0000-00-00'))
+                       if (($profile['dob']) && ($profile['dob'] > '0001-01-01'))
                                $dob = ((intval($profile['dob'])) ? intval($profile['dob']) : '1000') .'-'. datetime_convert('UTC','UTC',$profile['dob'],'m-d');
 
                        $about = $profile['about'];
@@ -3484,7 +3604,7 @@ class Diaspora {
                                $kw = str_replace('  ',' ',$kw);
                                $arr = explode(' ',$profile['pub_keywords']);
                                if (count($arr)) {
-                                       for($x = 0; $x < 5; $x ++) {
+                                       for ($x = 0; $x < 5; $x ++) {
                                                if (trim($arr[$x]))
                                                        $tags .= '#'. trim($arr[$x]) .' ';
                                        }
@@ -3506,7 +3626,7 @@ class Diaspora {
                                "searchable" => $searchable,
                                "tag_string" => $tags);
 
-               foreach($recips as $recip) {
+               foreach ($recips as $recip) {
                        logger("Send updated profile data for user ".$uid." to contact ".$recip["id"], LOGGER_DEBUG);
                        self::build_and_transmit($profile, $recip, "profile", $message, false, "", true);
                }
@@ -3529,17 +3649,20 @@ class Diaspora {
                }
 
                $r = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1", intval($contact['uid']));
-               if(!$r)
+               if (!dbm::is_result($r)) {
                        return false;
+               }
 
                $contact["uprvkey"] = $r[0]['prvkey'];
 
                $r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1", intval($post_id));
-               if (!$r)
+               if (!dbm::is_result($r)) {
                        return false;
+               }
 
-               if (!in_array($r[0]["verb"], array(ACTIVITY_LIKE, ACTIVITY_DISLIKE)))
+               if (!in_array($r[0]["verb"], array(ACTIVITY_LIKE, ACTIVITY_DISLIKE))) {
                        return false;
+               }
 
                $message = self::construct_like($r[0], $contact);
                $message["author_signature"] = self::signature($contact, $message);