require_once('include/crypto.php');
require_once('include/items.php');
require_once('include/bb2diaspora.php');
+require_once('include/contact_selectors.php');
function diaspora_dispatch($importer,$msg) {
$created = unxmlify($xml->created_at);
$private = ((unxmlify($xml->public) == 'false') ? 1 : 0);
- $body = unxmlify($xml->raw_message);
-
- require_once('library/HTMLPurifier.auto.php');
- require_once('include/html2bbcode.php');
-
- $maxlen = get_max_import_size();
- if($maxlen && (strlen($body) > $maxlen))
- $body = substr($body,0, $maxlen);
-
- if((strpos($body,'<') !== false) || (strpos($body,'>') !== false)) {
-
- $body = preg_replace('#<object[^>]+>.+?' . 'http://www.youtube.com/((?:v|cp)/[A-Za-z0-9\-_=]+).+?</object>#s',
- '[youtube]$1[/youtube]', $body);
-
- $body = preg_replace('#<iframe[^>].+?' . 'http://www.youtube.com/embed/([A-Za-z0-9\-_=]+).+?</iframe>#s',
- '[youtube]$1[/youtube]', $body);
-
- $body = oembed_html2bbcode($body);
-
- $config = HTMLPurifier_Config::createDefault();
- $config->set('Cache.DefinitionImpl', null);
- $purifier = new HTMLPurifier($config);
- $body = $purifier->purify($body);
-
- $body = html2bbcode($body);
- }
+ $body = diaspora2bb($xml->raw_message);
$datarray = array();
$datarray['uid'] = $importer['uid'];
$datarray['author-link'] = $contact['url'];
$datarray['author-avatar'] = $contact['thumb'];
$datarray['body'] = $body;
+ $datarray['app'] = 'Diaspora';
item_store($datarray);
// NOTREACHED
}
+ $r = q("SELECT * FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
+ intval($importer['uid']),
+ dbesc($guid)
+ );
+ if(count($r)) {
+ logger('daspora_comment: our comment just got relayed back to us (or there was a guid collision) : ' . $guid);
+ return;
+ }
+
$r = q("SELECT * FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
intval($importer['uid']),
dbesc($parent_guid)
if($parent_author_signature) {
-// $owner_signed_data = $guid . ';' . $parent_guid . ';' . $text . ';' . $msg['author'];
$owner_signed_data = $guid . ';' . $parent_guid . ';' . $text . ';' . $diaspora_handle;
$parent_author_signature = base64_decode($parent_author_signature);
// Phew! Everything checks out. Now create an item.
- require_once('library/HTMLPurifier.auto.php');
- require_once('include/html2bbcode.php');
-
- $body = $text;
-
- $maxlen = get_max_import_size();
- if($maxlen && (strlen($body) > $maxlen))
- $body = substr($body,0, $maxlen);
-
- if((strpos($body,'<') !== false) || (strpos($body,'>') !== false)) {
-
- $body = preg_replace('#<object[^>]+>.+?' . 'http://www.youtube.com/((?:v|cp)/[A-Za-z0-9\-_=]+).+?</object>#s',
- '[youtube]$1[/youtube]', $body);
-
- $body = preg_replace('#<iframe[^>].+?' . 'http://www.youtube.com/embed/([A-Za-z0-9\-_=]+).+?</iframe>#s',
- '[youtube]$1[/youtube]', $body);
-
- $body = oembed_html2bbcode($body);
-
- $config = HTMLPurifier_Config::createDefault();
- $config->set('Cache.DefinitionImpl', null);
- $purifier = new HTMLPurifier($config);
- $body = $purifier->purify($body);
-
- $body = html2bbcode($body);
- }
+ $body = diaspora2bb($text);
$message_id = $diaspora_handle . ':' . $guid;
$datarray['author-link'] = $person['url'];
$datarray['author-avatar'] = ((x($person,'thumb')) ? $person['thumb'] : $person['photo']);
$datarray['body'] = $body;
+ $datarray['app'] = 'Diaspora';
$message_id = item_store($datarray);
dbesc(base64_encode($author_signature)),
dbesc($diaspora_handle)
);
- }
- // notify others
- proc_run('php','include/notifier.php','comment',$message_id);
+ // if the message isn't already being relayed, notify others
+ // the existence of parent_author_signature means the parent_author or owner
+ // is already relaying.
+ proc_run('php','include/notifier.php','comment',$message_id);
+ }
return;
-
}
function diaspora_photo($importer,$xml,$msg) {
$plink = '[url=' . $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $parent_item['id'] . ']' . $post_type . '[/url]';
$arr['body'] = sprintf( $bodyverb, $ulink, $alink, $plink );
+ $arr['app'] = 'Diaspora';
+
$arr['private'] = $parent_item['private'];
$arr['verb'] = $activity;
$arr['object-type'] = $objtype;
);
}
- // notify others
- proc_run('php','include/notifier.php','comment',$message_id);
+ // if the message isn't already being relayed, notify others
+ // the existence of parent_author_signature means the parent_author or owner
+ // is already relaying.
+
+ if(! $parent_author_signature)
+ proc_run('php','include/notifier.php','comment',$message_id);
return;
}
}
}
- $body = xmlify(bb2diaspora($body));
+ $body = xmlify(html_entity_decode(bb2diaspora($body)));
+
$public = (($item['private']) ? 'false' : 'true');
require_once('include/datetime.php');
$like = false;
}
- $text = bb2diaspora($item['body']);
+ $text = html_entity_decode(bb2diaspora($item['body']));
// sign it
else
return;
- // fetch the original signature
- $r = q("select * from sign where iid = %d limit 1",
- intval($item['id'])
- );
- if(! count($r))
- return;
- $orig_sign = $r[0];
-
if($item['verb'] === ACTIVITY_LIKE) {
$tpl = get_markup_template('diaspora_like_relay.tpl');
$like = true;
$like = false;
}
- $text = bb2diaspora($item['body']);
+ $body = $item['body'];
+
+ $itemcontact = q("select * from contact where `id` = %d limit 1",
+ intval($item['contact-id'])
+ );
+ if(count($itemcontact)) {
+ if(! $itemcontact[0]['self']) {
+ $prefix = sprintf( t('[Relayed] Comment authored by %s from network %s'),
+ '['. $item['author-name'] . ']' . '(' . $item['author-link'] . ')',
+ network_to_name($itemcontact['network'])) . "\n";
+ $body = $prefix . $body;
+ }
+ }
+
+ $text = html_entity_decode(bb2diaspora($body));
+
+ // fetch the original signature if somebody sent the post to us to relay
+ // If we are relaying for a reply originating here, there wasn't a 'send to relay'
+ // action. It wasn't needed. In that case create the original signature and the
+ // owner (parent author) signature
+
+ $r = q("select * from sign where iid = %d limit 1",
+ intval($item['id'])
+ );
+ if(count($r)) {
+ $orig_sign = $r[0];
+ $signed_text = $orig_sign['signed_text'];
+ $authorsig = $orig_sign['signature'];
+ }
+ else {
+
- // sign it
- if($like)
- $parent_signed_text = $orig_sign['signed_text'];
- else
- $parent_signed_text = $orig_sign['signed_text'];
+
+ if($like)
+ $signed_text = $item['guid'] . ';' . $target_type . ';' . $parent_guid . ';' . $positive . ';' . $myaddr;
+ else
+ $signed_text = $item['guid'] . ';' . $parent_guid . ';' . $text . ';' . $myaddr;
+
+ $authorsig = base64_encode(rsa_sign($signed_text,$owner['uprvkey'],'sha'));
+
+ q("insert into sign (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ",
+ intval($item['id']),
+ dbesc($signed_text),
+ dbesc(base64_encode($authorsig)),
+ dbesc($myaddr)
+ );
+
+ }
+
+ // sign it
$parentauthorsig = base64_encode(rsa_sign($signed_text,$owner['uprvkey'],'sha'));
'$target_type' =>xmlify($target_type),
'$authorsig' => xmlify($orig_sign['signature']),
'$parentsig' => xmlify($parentauthorsig),
- '$text' => xmlify($text),
+ '$body' => xmlify($text),
'$positive' => xmlify($positive),
- '$diaspora_handle' => xmlify($myaddr)
+ '$handle' => xmlify($myaddr)
));
- // fetch the original signature
- $r = q("select * from sign where iid = %d limit 1",
- intval($item['id'])
- );
- if(! count($r))
- return;
-
logger('diaspora_relay_comment: base message: ' . $msg, LOGGER_DATA);
$slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'])));
projects / friendica.git / blobdiff