harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

works one way sort of - now to go the other way - which will require fixing a whole slew of FIXMEs

Browse Source
This commit is contained in:
friendica 2014-08-26 18:58:48 -07:00
parent e42205cec2
commit 6a42d6fe3b
4 changed files with 51 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/deliver.php
View File

@ -22,7 +22,7 @@ function deliver_run($argv, $argc) {
if($r) { if($r) {
if($r[0]['outq_driver'] === 'post') { if($r[0]['outq_driver'] === 'post') {
$result = z_post_url($r[0]['outq_posturl'],$r[0]['outq_msg']); $result = z_post_url($r[0]['outq_posturl'],$r[0]['outq_msg']);
if($result['success'] && $result['status_code'] < 300) { if($result['success'] && $result['return_code'] < 300) {
logger('deliver: queue post success to ' . $r[0]['outq_posturl'], LOGGER_DEBUG); logger('deliver: queue post success to ' . $r[0]['outq_posturl'], LOGGER_DEBUG);
} }
else { else {

67
include/diaspora.php
View File

@ -150,15 +150,32 @@ function diaspora_process_outbound($arr) {
*/ */
$target_item = $arr['target_item'];
if($target_item && array_key_exists('item_flags',$target_item) && ($target_item['item_flags'] & ITEM_OBSCURED)) {
$key = get_config('system','prvkey');
if($target_item['title'])
$target_item['title'] = crypto_unencapsulate(json_decode($target_item['title'],true),$key);
if($target_item['body'])
$target_item['body'] = crypto_unencapsulate(json_decode($target_item['body'],true),$key);
}
if($arr['walltowall']) if($arr['walltowall'])
return; return;
if($arr['env_recips']) { if($arr['env_recips']) {
$hashes = array();
// re-explode the recipients, but only for this hub/pod
foreach($arr['env_recips'] as $recip)
$hashes[] = "'" . $recip['hash'] . "'";
$r = q("select * from xchan left join hubloc on xchan_hash = hubloc_hash where hubloc_url = '%s' $r = q("select * from xchan left join hubloc on xchan_hash = hubloc_hash where hubloc_url = '%s'
and xchan_hash in (" . implode(',',$arr['env_recips']) . ") and xchan_hash in (" . implode(',', $hashes) . ") and xchan_network in ('diaspora', 'friendica-over-diaspora') ",
and xchan_network in ('diaspora', 'friendica-over-diaspora') ",
dbesc($arr['hub']['hubloc_url']) dbesc($arr['hub']['hubloc_url'])
); );
if(! $r) { if(! $r) {
logger('diaspora_process_outbound: no recipients'); logger('diaspora_process_outbound: no recipients');
return; return;
@ -178,36 +195,36 @@ function diaspora_process_outbound($arr) {
// all other public posts processed as public batches further below // all other public posts processed as public batches further below
if((! $arr['private']) && ($arr['followup'])) { if((! $arr['private']) && ($arr['followup'])) {
diaspora_send_followup($arr['target_item'],$arr['channel'],$contact, true); diaspora_send_followup($target_item,$arr['channel'],$contact, true);
continue; continue;
} }
if(! $contact['xchan_pubkey']) if(! $contact['xchan_pubkey'])
continue; continue;
if(activity_match($arr['target_item']['verb'],ACTIVITY_DISLIKE)) { if(activity_match($target_item['verb'],ACTIVITY_DISLIKE)) {
continue; continue;
} }
elseif(($arr['target_item']['item_restrict'] & ITEM_DELETED) elseif(($target_item['item_restrict'] & ITEM_DELETED)
&& (($arr['target_item']['mid'] === $arr['target_item']['parent_mid']) || $arr['followup'])) { && (($target_item['mid'] === $target_item['parent_mid']) || $arr['followup'])) {
// send both top-level retractions and relayable retractions for owner to relay // send both top-level retractions and relayable retractions for owner to relay
diaspora_send_retraction($arr['target_item'],$arr['channel'],$contact); diaspora_send_retraction($target_item,$arr['channel'],$contact);
continue; continue;
} }
elseif($arr['followup']) { elseif($arr['followup']) {
// send comments and likes to owner to relay // send comments and likes to owner to relay
diaspora_send_followup($arr['target_item'],$arr['channel'],$contact); diaspora_send_followup($target_item,$arr['channel'],$contact);
continue; continue;
} }
elseif($target_item['mid'] !== $target_item['parent_mid']) { elseif($target_item['mid'] !== $target_item['parent_mid']) {
// we are the relay - send comments, likes and relayable_retractions // we are the relay - send comments, likes and relayable_retractions
// (of comments and likes) to our conversants // (of comments and likes) to our conversants
diaspora_send_relay($arr['target_item'],$arr['channel'],$contact); diaspora_send_relay($target_item,$arr['channel'],$contact);
continue; continue;
} }
elseif($arr['top_level']) { elseif($arr['top_level_post']) {
diaspora_send_status($arr['target_item'],$arr['channel'],$contact); diaspora_send_status($target_item,$arr['channel'],$contact);
continue; continue;
} }
} }
@ -221,23 +238,23 @@ function diaspora_process_outbound($arr) {
// unsupported // unsupported
return; return;
} }
elseif(($arr['target_item']['deleted']) elseif(($target_item['deleted'])
&& ($arr['target_item']['mid'] === $arr['target_item']['parent_mod'])) { && ($target_item['mid'] === $target_item['parent_mod'])) {
// top-level retraction // top-level retraction
logger('delivery: diaspora retract: ' . $loc); logger('delivery: diaspora retract: ' . $loc);
diaspora_send_retraction($arr['target_item'],$arr['channel'],$contact,true); diaspora_send_retraction($target_item,$arr['channel'],$contact,true);
return; return;
} }
elseif($arr['target_item']['mid'] !== $arr['target_item']['parent_mid']) { elseif($target_item['mid'] !== $target_item['parent_mid']) {
// we are the relay - send comments, likes and relayable_retractions to our conversants // we are the relay - send comments, likes and relayable_retractions to our conversants
logger('delivery: diaspora relay: ' . $loc); logger('delivery: diaspora relay: ' . $loc);
diaspora_send_relay($arr['target_item'],$arr['channel'],$contact,true); diaspora_send_relay($target_item,$arr['channel'],$contact,true);
return; return;
} }
elseif($arr['top_level_post']) { elseif($arr['top_level_post']) {
// currently no workable solution for sending walltowall // currently no workable solution for sending walltowall
logger('delivery: diaspora status: ' . $loc); logger('delivery: diaspora status: ' . $loc);
diaspora_send_status($arr['target_item'],$arr['channel'],$contact,true); diaspora_send_status($target_item,$arr['channel'],$contact,true);
return; return;
} }
@ -392,7 +409,7 @@ function diaspora_msg_build($msg,$user,$contact,$prvkey,$pubkey,$public = false)
$outer_iv = random_string(16); $outer_iv = random_string(16);
$b_outer_iv = base64_encode($outer_iv); $b_outer_iv = base64_encode($outer_iv);
$handle = $user['xchan_addr']; $handle = $user['channel_address'] . '@' . get_app()->get_hostname();
$padded_data = pkcs5_pad($msg,16); $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 = mcrypt_encrypt(MCRYPT_RIJNDAEL_128, $inner_aes_key, $padded_data, MCRYPT_MODE_CBC, $inner_iv);
@ -1174,18 +1191,20 @@ function diaspora_comment($importer,$xml,$msg) {
return 202; return 202;
} }
$r = q("SELECT * FROM `item` WHERE `uid` = %d AND `mid` = '%s' LIMIT 1", // Friendica is truncating guids at 64 chars
$r = q("SELECT * FROM item WHERE uid = %d AND mid like '%s' LIMIT 1",
intval($importer['channel_id']), intval($importer['channel_id']),
dbesc($guid) dbesc($guid . '%')
); );
if($r) { if($r) {
logger('diaspora_comment: our comment just got relayed back to us (or there was a guid collision) : ' . $guid); logger('diaspora_comment: our comment just got relayed back to us (or there was a guid collision) : ' . $guid);
return; return;
} }
$r = q("SELECT * FROM `item` WHERE `uid` = %d AND `mid` = '%s' LIMIT 1", $r = q("SELECT * FROM item WHERE uid = %d AND mid LIKE '%s' LIMIT 1",
intval($importer['channel_id']), intval($importer['channel_id']),
dbesc($parent_guid) dbesc($parent_guid . '%')
); );
if(! $r) { if(! $r) {
logger('diaspora_comment: parent item not found: parent: ' . $parent_guid . ' item: ' . $guid); logger('diaspora_comment: parent item not found: parent: ' . $parent_guid . ' item: ' . $guid);
@ -1298,7 +1317,7 @@ function diaspora_comment($importer,$xml,$msg) {
// No timestamps for comments? OK, we'll the use current time. // No timestamps for comments? OK, we'll the use current time.
$datarray['changed'] = $datarray['created'] = $datarray['edited'] = datetime_convert(); $datarray['changed'] = $datarray['created'] = $datarray['edited'] = datetime_convert();
$datarray['private'] = $parent_item['private']; $datarray['item_private'] = $parent_item['item_private'];
$datarray['owner_xchan'] = $parent_item['owner_xchan']; $datarray['owner_xchan'] = $parent_item['owner_xchan'];
$datarray['author_xchan'] = $person['xchan_hash']; $datarray['author_xchan'] = $person['xchan_hash'];
@ -2326,7 +2345,7 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) {
$return_code = diaspora_transmit($owner,$contact,$slap,$public_batch); $return_code = diaspora_transmit($owner,$contact,$slap,$public_batch);
logger('diaspora_send_status: guid: '.$item['mid'].' result '.$return_code, LOGGER_DEBUG); // logger('diaspora_send_status: guid: '.$item['mid'].' result '.$return_code, LOGGER_DEBUG);
if(count($images)) { if(count($images)) {
diaspora_send_images($item,$owner,$contact,$images,$public_batch); diaspora_send_images($item,$owner,$contact,$images,$public_batch);

6
include/notifier.php
View File

@ -412,7 +412,7 @@ function notifier_run($argv, $argc){
$recip_list[] = $d['xchan_addr'] . ' (' . $d['xchan_hash'] . ')'; $recip_list[] = $d['xchan_addr'] . ' (' . $d['xchan_hash'] . ')';
if($private) if($private)
$env_recips[] = array('guid' => $d['xchan_guid'],'guid_sig' => $d['xchan_guid_sig']); $env_recips[] = array('guid' => $d['xchan_guid'],'guid_sig' => $d['xchan_guid_sig'],'hash' => $d['xchan_hash']);
} }
} }
@ -445,11 +445,11 @@ function notifier_run($argv, $argc){
// aren't the owner or author. // aren't the owner or author.
$r = q("select hubloc_guid, hubloc_sitekey, hubloc_network, hubloc_flags, hubloc_callback, hubloc_host from hubloc $r = q("select hubloc_guid, hubloc_url, hubloc_sitekey, hubloc_network, hubloc_flags, hubloc_callback, hubloc_host from hubloc
where hubloc_hash in (" . implode(',',$recipients) . ") group by hubloc_sitekey order by hubloc_connected desc limit 1"); where hubloc_hash in (" . implode(',',$recipients) . ") group by hubloc_sitekey order by hubloc_connected desc limit 1");
} }
else { else {
$r = q("select hubloc_guid, hubloc_sitekey, hubloc_network, hubloc_flags, hubloc_callback, hubloc_host from hubloc $r = q("select hubloc_guid, hubloc_url, hubloc_sitekey, hubloc_network, hubloc_flags, hubloc_callback, hubloc_host from hubloc
where hubloc_hash in (" . implode(',',$recipients) . ") $sql_extra group by hubloc_sitekey"); where hubloc_hash in (" . implode(',',$recipients) . ") $sql_extra group by hubloc_sitekey");
} }

5
include/zot.php
View File

@ -117,8 +117,11 @@ function zot_build_packet($channel,$type = 'notify',$recipients = null, $remote_
'version' => ZOT_REVISION 'version' => ZOT_REVISION
); );
if($recipients) if($recipients) {
for($x = 0; $x < count($recipients); $x ++)
unset($recipients[$x]['hash']);
$data['recipients'] = $recipients; $data['recipients'] = $recipients;
}
if($secret) { if($secret) {
$data['secret'] = $secret; $data['secret'] = $secret;