GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Change some Salmon events and similar

Browse Source 
Use Profile instead of User and (if we know it) send along the target
profile, so a Diaspora plugin can encrypt to the receiver.
This commit is contained in:
Mikael Nordfeldth
2015-10-04 17:23:11 +02:00
parent f4ed171397
commit 6afa091dca
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/OStatus/lib/salmon.php
View File

@@ -43,18 +43,18 @@ class Salmon
*
* @param string $endpoint_uri
* @param string $xml string representation of payload
* @param User $user local user profile whose keys we sign with
* @param Profile $user profile whose keys we sign with (must be a local user)
* @return boolean success
*/
public static function post($endpoint_uri, $xml, User $user, Profile $target=null)
public static function post($endpoint_uri, $xml, Profile $actor, Profile $target=null)
{
if (empty($endpoint_uri)) {
common_debug('No endpoint URI for Salmon post to '.$user->getUri());
common_debug('No endpoint URI for Salmon post to '.$actor->getUri());
return false;
}
try {
$magic_env = MagicEnvelope::signAsUser($xml, $user);
$magic_env = MagicEnvelope::signAsUser($xml, $actor->getUser());
} catch (Exception $e) {
common_log(LOG_ERR, "Salmon unable to sign: " . $e->getMessage());
return false;