X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdiaspora.php;h=eca22092d81352987a2a8a0e6981c8c7aa3fb206;hb=bb59f105e719ef420a5cd0dcacfa3e3955dc5a0c;hp=982274dd1f12a6c240e686274daccb1811e6a736;hpb=9af3f5b0da24e24a74befc0e8feecff0e27e67af;p=friendica.git
diff --git a/include/diaspora.php b/include/diaspora.php
index 982274dd1f..eca22092d8 100644
--- 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");
@@ -18,6 +20,7 @@ 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
@@ -44,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(),
@@ -87,7 +90,7 @@ class Diaspora {
*
* @return string the repaired signature
*/
- private function repair_signature($signature, $handle = "", $level = 1) {
+ private static function repair_signature($signature, $handle = "", $level = 1) {
if ($signature == "")
return ($signature);
@@ -111,7 +114,7 @@ class Diaspora {
*
* @return string verified data
*/
- private function verify_magic_envelope($envelope) {
+ private static function verify_magic_envelope($envelope) {
$basedom = parse_xml_string($envelope, false);
@@ -308,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')
@@ -319,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;
}
@@ -412,7 +421,7 @@ class Diaspora {
*
* @return bool Is the posting valid?
*/
- private function valid_posting($msg, &$fields) {
+ private static function valid_posting($msg, &$fields) {
$data = parse_xml_string($msg["message"], false);
@@ -541,7 +550,7 @@ class Diaspora {
*
* @return string The public key
*/
- private function key($handle) {
+ private static function key($handle) {
$handle = strval($handle);
logger("Fetching diaspora key for: ".$handle);
@@ -560,7 +569,7 @@ class Diaspora {
*
* @return array the queried data
*/
- private function person_by_handle($handle) {
+ private static function person_by_handle($handle) {
$r = q("SELECT * FROM `fcontact` WHERE `network` = '%s' AND `addr` = '%s' LIMIT 1",
dbesc(NETWORK_DIASPORA),
@@ -601,7 +610,7 @@ class Diaspora {
*
* @return string The id of the fcontact entry
*/
- private function add_fcontact($arr, $update = false) {
+ private static function add_fcontact($arr, $update = false) {
if($update) {
$r = q("UPDATE `fcontact` SET
@@ -734,14 +743,29 @@ class Diaspora {
*
* @return The contact id
*/
- private function contact_by_handle($uid, $handle) {
+ 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];
@@ -750,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;
}
@@ -765,7 +791,7 @@ class Diaspora {
*
* @return bool is the contact allowed to post?
*/
- private function post_allow($importer, $contact, $is_comment = false) {
+ private static function post_allow($importer, $contact, $is_comment = false) {
// perhaps we were already sharing with this person. Now they're sharing with us.
// That makes us friends.
@@ -804,7 +830,7 @@ class Diaspora {
*
* @return array The contact data
*/
- private function allowed_contact_by_handle($importer, $handle, $is_comment = false) {
+ private static function allowed_contact_by_handle($importer, $handle, $is_comment = false) {
$contact = self::contact_by_handle($importer["uid"], $handle);
if (!$contact) {
logger("A Contact for handle ".$handle." and user ".$importer["uid"]." was not found");
@@ -826,13 +852,13 @@ class Diaspora {
*
* @return int|bool message id if the message already was stored into the system - or false.
*/
- private function message_exists($uid, $guid) {
+ private static function message_exists($uid, $guid) {
$r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
intval($uid),
dbesc($guid)
);
- if ($r) {
+ if (dbm::is_result($r)) {
logger("message ".$guid." already exists for user ".$uid);
return $r[0]["id"];
}
@@ -845,7 +871,7 @@ class Diaspora {
*
* @param array $item The item array
*/
- private function fetch_guid($item) {
+ private static function fetch_guid($item) {
preg_replace_callback("&\[url=/posts/([^\[\]]*)\](.*)\[\/url\]&Usi",
function ($match) use ($item){
return(self::fetch_guid_sub($match, $item));
@@ -890,7 +916,7 @@ class Diaspora {
* @param array $match array containing a link that has to be checked for a message link
* @param array $item The item array
*/
- private function fetch_guid_sub($match, $item) {
+ private static function fetch_guid_sub($match, $item) {
if (!self::store_by_guid($match[1], $item["author-link"]))
self::store_by_guid($match[1], $item["owner-link"]);
}
@@ -904,7 +930,7 @@ class Diaspora {
*
* @return int the message id of the stored message or false
*/
- private function store_by_guid($guid, $server, $uid = 0) {
+ private static function store_by_guid($guid, $server, $uid = 0) {
$serverparts = parse_url($server);
$server = $serverparts["scheme"]."://".$serverparts["host"];
@@ -933,7 +959,7 @@ class Diaspora {
* 'author' => The author handle
* 'key' => The public key of the author
*/
- private function message($guid, $server, $level = 0) {
+ private static function message($guid, $server, $level = 0) {
if ($level > 5)
return false;
@@ -1009,7 +1035,7 @@ class Diaspora {
*
* @return array the item record
*/
- private function parent_item($uid, $guid, $author, $contact) {
+ private static function parent_item($uid, $guid, $author, $contact) {
$r = q("SELECT `id`, `body`, `wall`, `uri`, `private`, `origin`,
`author-name`, `author-link`, `author-avatar`,
`owner-name`, `owner-link`, `owner-avatar`
@@ -1055,7 +1081,7 @@ class Diaspora {
* 'cid' => contact id
* 'network' => network type
*/
- private function author_contact_by_url($contact, $person, $uid) {
+ private static function author_contact_by_url($contact, $person, $uid) {
$r = q("SELECT `id`, `network`, `url` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1",
dbesc(normalise_link($person["url"])), intval($uid));
@@ -1093,7 +1119,7 @@ class Diaspora {
*
* @return string the post link
*/
- private function plink($addr, $guid) {
+ private static function plink($addr, $guid) {
$r = q("SELECT `url`, `nick`, `network` FROM `fcontact` WHERE `addr`='%s' LIMIT 1", dbesc($addr));
// Fallback
@@ -1123,7 +1149,7 @@ class Diaspora {
*
* @return bool Success
*/
- private function receive_account_deletion($importer, $data) {
+ private static function receive_account_deletion($importer, $data) {
/// @todo Account deletion should remove the contact from the global contacts as well
@@ -1172,10 +1198,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;
+ }
}
/**
@@ -1188,7 +1215,7 @@ class Diaspora {
*
* @return int The message id of the generated comment or "false" if there was an error
*/
- private function receive_comment($importer, $sender, $data, $xml) {
+ private static function receive_comment($importer, $sender, $data, $xml) {
$guid = notags(unxmlify($data->guid));
$parent_guid = notags(unxmlify($data->parent_guid));
$text = unxmlify($data->text);
@@ -1304,7 +1331,7 @@ class Diaspora {
*
* @return bool "true" if it was successful
*/
- private function receive_conversation_message($importer, $contact, $data, $msg, $mesg, $conversation) {
+ private static function receive_conversation_message($importer, $contact, $data, $msg, $mesg, $conversation) {
$guid = notags(unxmlify($data->guid));
$subject = notags(unxmlify($data->subject));
$author = notags(unxmlify($data->author));
@@ -1429,7 +1456,7 @@ class Diaspora {
*
* @return bool Success
*/
- private function receive_conversation($importer, $msg, $data) {
+ private static function receive_conversation($importer, $msg, $data) {
$guid = notags(unxmlify($data->guid));
$subject = notags(unxmlify($data->subject));
$created_at = datetime_convert("UTC", "UTC", notags(unxmlify($data->created_at)));
@@ -1495,7 +1522,7 @@ class Diaspora {
*
* @return string the body
*/
- private function construct_like_body($contact, $parent_item, $guid) {
+ private static function construct_like_body($contact, $parent_item, $guid) {
$bodyverb = t('%1$s likes %2$s\'s %3$s');
$ulink = "[url=".$contact["url"]."]".$contact["name"]."[/url]";
@@ -1513,7 +1540,7 @@ class Diaspora {
*
* @return string The XML
*/
- private function construct_like_object($importer, $parent_item) {
+ private static function construct_like_object($importer, $parent_item) {
$objtype = ACTIVITY_OBJ_NOTE;
$link = '';
$parent_body = $parent_item["body"];
@@ -1537,7 +1564,7 @@ class Diaspora {
*
* @return int The message id of the generated like or "false" if there was an error
*/
- private function receive_like($importer, $sender, $data) {
+ private static function receive_like($importer, $sender, $data) {
$positive = notags(unxmlify($data->positive));
$guid = notags(unxmlify($data->guid));
$parent_type = notags(unxmlify($data->parent_type));
@@ -1634,7 +1661,7 @@ class Diaspora {
*
* @return bool Success?
*/
- private function receive_message($importer, $data) {
+ private static function receive_message($importer, $data) {
$guid = notags(unxmlify($data->guid));
$parent_guid = notags(unxmlify($data->parent_guid));
$text = unxmlify($data->text);
@@ -1715,7 +1742,7 @@ class Diaspora {
*
* @return bool always true
*/
- private function receive_participation($importer, $data) {
+ private static function receive_participation($importer, $data) {
// I'm not sure if we can fully support this message type
return true;
}
@@ -1728,7 +1755,7 @@ class Diaspora {
*
* @return bool always true
*/
- private function receive_photo($importer, $data) {
+ private static function receive_photo($importer, $data) {
// There doesn't seem to be a reason for this function, since the photo data is transmitted in the status message as well
return true;
}
@@ -1741,7 +1768,7 @@ class Diaspora {
*
* @return bool always true
*/
- private function receive_poll_participation($importer, $data) {
+ private static function receive_poll_participation($importer, $data) {
// We don't support polls by now
return true;
}
@@ -1754,7 +1781,7 @@ class Diaspora {
*
* @return bool Success
*/
- private function receive_profile($importer, $data) {
+ private static function receive_profile($importer, $data) {
$author = strtolower(notags(unxmlify($data->author)));
$contact = self::contact_by_handle($importer["uid"], $author);
@@ -1845,7 +1872,7 @@ class Diaspora {
* @param array $importer Array of the importer user
* @param array $contact The contact that send the request
*/
- private function receive_request_make_friend($importer, $contact) {
+ private static function receive_request_make_friend($importer, $contact) {
$a = get_app();
@@ -1914,18 +1941,18 @@ class Diaspora {
*
* @return string The XML
*/
- private function construct_new_friend_object($contact) {
- $objtype = ACTIVITY_OBJ_PERSON;
- $link = ''."\n".
- ''."\n";
+ private static function construct_new_friend_object($contact) {
+ $objtype = ACTIVITY_OBJ_PERSON;
+ $link = ''."\n".
+ ''."\n";
- $xmldata = array("object" => array("type" => $objtype,
- "title" => $contact["name"],
- "id" => $contact["url"]."/".$contact["name"],
- "link" => $link));
+ $xmldata = array("object" => array("type" => $objtype,
+ "title" => $contact["name"],
+ "id" => $contact["url"]."/".$contact["name"],
+ "link" => $link));
- return xml::from_array($xmldata, $xml, true);
- }
+ return xml::from_array($xmldata, $xml, true);
+ }
/**
* @brief Processes incoming sharing notification
@@ -1935,7 +1962,7 @@ class Diaspora {
*
* @return bool Success
*/
- private function receive_contact_request($importer, $data) {
+ private static function receive_contact_request($importer, $data) {
$author = unxmlify($data->author);
$recipient = unxmlify($data->recipient);
@@ -2116,7 +2143,7 @@ class Diaspora {
*
* @return array The fetched item
*/
- private function original_item($guid, $orig_author, $author) {
+ private static function original_item($guid, $orig_author, $author) {
// Do we already have this item?
$r = q("SELECT `body`, `tag`, `app`, `created`, `object-type`, `uri`, `guid`,
@@ -2187,7 +2214,7 @@ class Diaspora {
*
* @return int the message id
*/
- private function receive_reshare($importer, $data, $xml) {
+ private static function receive_reshare($importer, $data, $xml) {
$root_author = notags(unxmlify($data->root_author));
$root_guid = notags(unxmlify($data->root_guid));
$guid = notags(unxmlify($data->guid));
@@ -2266,7 +2293,7 @@ class Diaspora {
*
* @return bool success
*/
- private function item_retraction($importer, $contact, $data) {
+ private static function item_retraction($importer, $contact, $data) {
$target_type = notags(unxmlify($data->target_type));
$target_guid = notags(unxmlify($data->target_guid));
$author = notags(unxmlify($data->author));
@@ -2281,8 +2308,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",
@@ -2305,7 +2333,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"]);
}
@@ -2322,7 +2350,7 @@ class Diaspora {
*
* @return bool Success
*/
- private function receive_retraction($importer, $sender, $data) {
+ private static function receive_retraction($importer, $sender, $data) {
$target_type = notags(unxmlify($data->target_type));
$contact = self::contact_by_handle($importer["uid"], $sender);
@@ -2364,7 +2392,7 @@ class Diaspora {
*
* @return int The message id of the newly created item
*/
- private function receive_status_message($importer, $data, $xml) {
+ private static function receive_status_message($importer, $data, $xml) {
$raw_message = unxmlify($data->raw_message);
$guid = notags(unxmlify($data->guid));
$author = notags(unxmlify($data->author));
@@ -2475,16 +2503,18 @@ class Diaspora {
*
* @return string the handle in the format user@domain.tld
*/
- private function my_handle($contact) {
- if ($contact["addr"] != "")
+ private static function my_handle($contact) {
+ 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);
}
@@ -2534,7 +2564,7 @@ class Diaspora {
*
* @return string The envelope
*/
- private function build_public_message($msg, $user, $contact, $prvkey, $pubkey) {
+ private static function build_public_message($msg, $user, $contact, $prvkey, $pubkey) {
logger("Message: ".$msg, LOGGER_DATA);
@@ -2580,7 +2610,7 @@ class Diaspora {
*
* @return string The envelope
*/
- private function build_private_message($msg, $user, $contact, $prvkey, $pubkey) {
+ private static function build_private_message($msg, $user, $contact, $prvkey, $pubkey) {
logger("Message: ".$msg, LOGGER_DATA);
@@ -2671,7 +2701,7 @@ class Diaspora {
*
* @return string The message that will be transmitted to other servers
*/
- private function build_message($msg, $user, $contact, $prvkey, $pubkey, $public = false) {
+ private static function build_message($msg, $user, $contact, $prvkey, $pubkey, $public = false) {
if ($public)
$magic_env = self::build_public_message($msg,$user,$contact,$prvkey,$pubkey);
@@ -2691,7 +2721,7 @@ class Diaspora {
*
* @return string The signature
*/
- private function signature($owner, $message) {
+ private static function signature($owner, $message) {
$sigmsg = $message;
unset($sigmsg["author_signature"]);
unset($sigmsg["parent_author_signature"]);
@@ -2798,7 +2828,7 @@ class Diaspora {
*
* @return int Result of the transmission
*/
- private function build_and_transmit($owner, $contact, $type, $message, $public_batch = false, $guid = "", $spool = false) {
+ private static function build_and_transmit($owner, $contact, $type, $message, $public_batch = false, $guid = "", $spool = false) {
$msg = self::build_post_xml($type, $message);
@@ -2939,6 +2969,80 @@ class Diaspora {
return($ret);
}
+ /**
+ * @brief Create an event array
+ *
+ * @param integer $event_id The id of the event
+ *
+ * @return array with event data
+ */
+ private static function build_event($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();
+ }
+
+ $event = $r[0];
+
+ $eventdata = array();
+
+ $r = q("SELECT `timezone` FROM `user` WHERE `uid` = %d", intval($event['uid']));
+ if (!dbm::is_result($r)) {
+ return array();
+ }
+
+ $user = $r[0];
+
+ $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';
+ }
+ }
+
+ if ($event['start']) {
+ $eventdata['start'] = datetime_convert($eventdata['timezone'], "UTC", $event['start'], $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']));
+ }
+ if ($event['desc']) {
+ $eventdata['description'] = html_entity_decode(bb2diaspora($event['desc']));
+ }
+ if ($event['location']) {
+ $location = array();
+ $location["address"] = html_entity_decode(bb2diaspora($event['location']));
+ $location["lat"] = 0;
+ $location["lng"] = 0;
+ $eventdata['location'] = $location;
+ }
+
+ return $eventdata;
+ }
+
/**
* @brief Create a post (status message or reshare)
*
@@ -2951,6 +3055,13 @@ class Diaspora {
*/
public static function build_status($item, $owner) {
+ $cachekey = "diaspora:build_status:".$item['guid'];
+
+ $result = Cache::get($cachekey);
+ if (!is_null($result)) {
+ return $result;
+ }
+
$myaddr = self::my_handle($owner);
$public = (($item["private"]) ? "false" : "true");
@@ -3012,9 +3123,24 @@ class Diaspora {
unset($message["location"]);
}
+ if ($item['event-id'] > 0) {
+ $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'] = '';
+ }
+ }
+
$type = "status_message";
}
- return array("type" => $type, "message" => $message);
+
+ $msg = array("type" => $type, "message" => $message);
+
+ Cache::set($cachekey, $msg, CACHE_QUARTER_HOUR);
+
+ return $msg;
}
/**
@@ -3042,7 +3168,7 @@ class Diaspora {
*
* @return array The data for a "like"
*/
- private function construct_like($item, $owner) {
+ private static function construct_like($item, $owner) {
$p = q("SELECT `guid`, `uri`, `parent-uri` FROM `item` WHERE `uri` = '%s' LIMIT 1",
dbesc($item["thr-parent"]));
@@ -3052,7 +3178,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"],
@@ -3062,6 +3192,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
*
@@ -3070,7 +3239,14 @@ class Diaspora {
*
* @return array The data for a comment
*/
- private function construct_comment($item, $owner) {
+ 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"]),
@@ -3096,6 +3272,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);
}
@@ -3111,7 +3290,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 {
@@ -3135,7 +3317,7 @@ class Diaspora {
*
* @return string The message
*/
- private function message_from_signature($item, $signature) {
+ private static function message_from_signature($item, $signature) {
// Split the signed text
$signed_parts = explode(";", $signature['signed_text']);