friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

allow comment relaying for comments which were never Diaspora signed

This commit is contained in:
Friendika 2011-08-28 05:00:30 -07:00
parent ada8bee70e
commit 41b00a6f3b
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/diaspora.php
View File

@ -3,6 +3,7 @@
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) {
@ -1060,10 +1061,22 @@ function diaspora_send_relay($item,$owner,$contact) {
$like = false;
}
$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($item['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'
// 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
@ -1076,6 +1089,10 @@ function diaspora_send_relay($item,$owner,$contact) {
$authorsig = $orig_sign['signature'];
}
else {
if($like)
$signed_text = $item['guid'] . ';' . $target_type . ';' . $parent_guid . ';' . $positive . ';' . $myaddr;
else