diff options
| author | friendica <info@friendica.com> | 2014-09-01 22:59:11 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-09-01 22:59:11 -0700 |
| commit | 9dac46ca25b11f80dded42db31e7e062fc7b5142 (patch) | |
| tree | e4ab47f657ce1e6ae0aabf6be51bdf169e4b389d /include/diaspora.php | |
| parent | 688722de5bf928c53fa694e0469f81c4ac2b646d (diff) | |
| download | volse-hubzilla-9dac46ca25b11f80dded42db31e7e062fc7b5142.tar.gz volse-hubzilla-9dac46ca25b11f80dded42db31e7e062fc7b5142.tar.bz2 volse-hubzilla-9dac46ca25b11f80dded42db31e7e062fc7b5142.zip | |
minor nits
Diffstat (limited to 'include/diaspora.php')
| -rwxr-xr-x | include/diaspora.php | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/include/diaspora.php b/include/diaspora.php index b544dad53..2f32053f8 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -2584,18 +2584,22 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) { * */ - $handle = diaspora_handle_from_contact($item['author_xchan']); + if($item['author_xchan'] === $owner['channel_hash']) + $handle = $owner['channel_address'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3); + else + $handle = diaspora_handle_from_contact($item['author_xchan']); + if(! $handle) { logger('diaspora_send_relay: no handle'); return; } if($relay_retract) - $sender_signed_text = $item['guid'] . ';' . $target_type; + $sender_signed_text = $item['mid'] . ';' . $target_type; elseif($like) - $sender_signed_text = $item['guid'] . ';' . $target_type . ';' . $parent['guid'] . ';' . $positive . ';' . $handle; + $sender_signed_text = $item['mid'] . ';' . $target_type . ';' . $parent['mid'] . ';' . $positive . ';' . $handle; else - $sender_signed_text = $item['guid'] . ';' . $parent['guid'] . ';' . $text . ';' . $handle; + $sender_signed_text = $item['mid'] . ';' . $parent['mid'] . ';' . $text . ';' . $handle; // Sign the relayable with the top-level owner's signature // |