MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

d* retractions

Browse source
This commit is contained in:
Friendika 2011-08-22 20:35:34 -07:00
parent b0211499c1
commit b9e4668f68
2 changed files with 67 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
include/diaspora.php
View file

@ -771,19 +771,32 @@ function diaspora_retraction($importer,$xml) {
$guid = notags(unxmlify($xml->guid)); $guid = notags(unxmlify($xml->guid));
$diaspora_handle = notags(unxmlify($xml->diaspora_handle)); $diaspora_handle = notags(unxmlify($xml->diaspora_handle));
$type = notags(unxmlify($xml->type));
$contact = diaspora_get_contact_by_handle($importer['uid'],$diaspora_handle); $contact = diaspora_get_contact_by_handle($importer['uid'],$diaspora_handle);
if(! $contact) if(! $contact)
return; return;
// if(($contact['rel'] == CONTACT_IS_FOLLOWER) || ($contact['blocked']) || ($contact['readonly'])) { if($type === 'Person') {
// logger('diaspora_retraction: Ignoring this author.'); contact_remove($contact['id']);
// http_status_exit(202); }
// // NOTREACHED elseif($type === 'Post') {
// } $r = q("select * from item where guid = '%s' and uid = %d limit 1",
dbesc('guid'),
intval($importer['uid'])
);
if(count($r)) {
if(link_compare($r[0]['author-link'],$contact['url'])) {
q("update item set `deleted` = 1, `changed` = '%s' where `id` = %d limit 1",
dbesc(datetime_convert()),
intval($r[0]['id'])
);
}
}
}
http_exit_status(202);
// NOTREACHED
} }
function diaspora_share($me,$contact) { function diaspora_share($me,$contact) {
@ -805,6 +818,28 @@ function diaspora_share($me,$contact) {
return $return_code; return $return_code;
} }
function diaspora_unshare($me,$contact) {
$a = get_app();
$myaddr = $me['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
$tpl = get_markup_template('diaspora_retract.tpl');
$msg = replace_macros($tpl, array(
'$guid' => $me['guid'],
'$type' => 'Person',
'$handle' => $myaddr
));
$slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$me,$contact,$me['prvkey'],$contact['pubkey'])));
post_url($contact['notify'] . '/',$slap);
$return_code = $a->get_curl_code();
logger('diaspora_send_unshare: returns: ' . $return_code);
return $return_code;
}
function diaspora_send_status($item,$owner,$contact) { function diaspora_send_status($item,$owner,$contact) {
$a = get_app(); $a = get_app();
@ -975,8 +1010,21 @@ function diaspora_send_relay($item,$owner,$contact) {
function diaspora_send_retraction($item,$owner,$contact) { function diaspora_send_retraction($item,$owner,$contact) {
$a = get_app();
$myaddr = $owner['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
$tpl = get_markup_template('diaspora_retract.tpl');
$msg = replace_macros($tpl, array(
'$guid' => $item['guid'],
'$type' => 'Post',
'$handle' => $myaddr
));
$slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'])));
post_url($contact['notify'] . '/',$slap);
$return_code = $a->get_curl_code();
logger('diaspora_send_retraction: returns: ' . $return_code);
return $return_code;
} }

10
mod/contacts.php
View file

@ -193,7 +193,7 @@ function contacts_content(&$a) {
// create an unfollow slap // create an unfollow slap
if($orig_record[0]['network'] === 'stat') { if($orig_record[0]['network'] === NETWORK_OSTATUS) {
$tpl = get_markup_template('follow_slap.tpl'); $tpl = get_markup_template('follow_slap.tpl');
$slap = replace_macros($tpl, array( $slap = replace_macros($tpl, array(
'$name' => $a->user['username'], '$name' => $a->user['username'],
@ -215,13 +215,15 @@ function contacts_content(&$a) {
slapper($a->user,$orig_record[0]['notify'],$slap); slapper($a->user,$orig_record[0]['notify'],$slap);
} }
} }
elseif($orig_record[0]['network'] === NETWORK_DIASPORA) {
if($orig_record[0]['network'] === 'dfrn') { require_once('include/diaspora.php');
diaspora_unshare($a->user,$orig_record[0]);
}
elseif($orig_record[0]['network'] === NETWORK_DFRN) {
require_once('include/items.php'); require_once('include/items.php');
dfrn_deliver($a->user,$orig_record[0],'placeholder', 1); dfrn_deliver($a->user,$orig_record[0],'placeholder', 1);
} }
contact_remove($orig_record[0]['id']); contact_remove($orig_record[0]['id']);
info( t('Contact has been removed.') . EOL ); info( t('Contact has been removed.') . EOL );
goaway($a->get_baseurl() . '/contacts'); goaway($a->get_baseurl() . '/contacts');