friendica/friendica
6
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2024-05-24 14:55:00 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

better handling of relayed Diaspora comments

Browse source
This commit is contained in:
Friendika 2011-08-29 00:51:08 -07:00
parent bfc708e07b
commit 391330d95f
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
include/diaspora.php
View file

@ -1065,9 +1065,11 @@ function diaspora_send_relay($item,$owner,$contact) {
$text = html_entity_decode(bb2diaspora($body)); $text = html_entity_decode(bb2diaspora($body));
// fetch the original signature if somebody sent the post to us to relay // 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 on our own account, there wasn't a 'send to relay'
// action. It wasn't needed. In that case create the original signature and the // action. It wasn't needed. In that case create the original signature and the
// owner (parent author) signature // owner (parent author) signature
// comments from other networks will be relayed under our name, with a brief
// preamble to describe what's happening and noting the real author
$r = q("select * from sign where iid = %d limit 1", $r = q("select * from sign where iid = %d limit 1",
intval($item['id']) intval($item['id'])
@ -1076,6 +1078,7 @@ function diaspora_send_relay($item,$owner,$contact) {
$orig_sign = $r[0]; $orig_sign = $r[0];
$signed_text = $orig_sign['signed_text']; $signed_text = $orig_sign['signed_text'];
$authorsig = $orig_sign['signature']; $authorsig = $orig_sign['signature'];
$handle = $orig_sign['signer'];
} }
else { else {
@ -1105,7 +1108,7 @@ function diaspora_send_relay($item,$owner,$contact) {
dbesc(base64_encode($authorsig)), dbesc(base64_encode($authorsig)),
dbesc($myaddr) dbesc($myaddr)
); );
$handle = $myaddr;
} }
} }
@ -1121,7 +1124,7 @@ function diaspora_send_relay($item,$owner,$contact) {
'$parentsig' => xmlify($parentauthorsig), '$parentsig' => xmlify($parentauthorsig),
'$body' => xmlify($text), '$body' => xmlify($text),
'$positive' => xmlify($positive), '$positive' => xmlify($positive),
'$handle' => xmlify($myaddr) '$handle' => xmlify($handle)
)); ));
logger('diaspora_relay_comment: base message: ' . $msg, LOGGER_DATA); logger('diaspora_relay_comment: base message: ' . $msg, LOGGER_DATA);