Merge remote-tracking branch 'upstream/develop' into rewrites/mixed-static-object...

[friendica.git] / include / Contact.php

diff --git a/include/Contact.php b/include/Contact.php
index 871418bf57600d34f6fbd46a67228161f805b5c9..7ca45a21bd01e32baee60d3e235faa49afc76cb1 100644 (file)
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -93,20 +93,13 @@ function terminate_friendship($user,$self,$contact) {
 
        if($contact['network'] === NETWORK_OSTATUS) {
 
-               $slap = replace_macros(get_markup_template('follow_slap.tpl'), array(
-                       '$name' => $user['username'],
-                       '$profile_page' => $a->get_baseurl() . '/profile/' . $user['nickname'],
-                       '$photo' => $self['photo'],
-                       '$thumb' => $self['thumb'],
-                       '$published' => datetime_convert('UTC','UTC', 'now', ATOM_TIME),
-                       '$item_id' => 'urn:X-dfrn:' . $a->get_hostname() . ':unfollow:' . get_guid(32),
-                       '$title' => '',
-                       '$type' => 'text',
-                       '$content' => t('stopped following'),
-                       '$nick' => $user['nickname'],
-                       '$verb' => 'http://ostatus.org/schema/1.0/unfollow', // ACTIVITY_UNFOLLOW,
-                       '$ostat_follow' => '' // '<as:verb>http://ostatus.org/schema/1.0/unfollow</as:verb>' . "\r\n"
-               ));
+               require_once('include/ostatus.php');
+
+               // create an unfollow slap
+               $item = array();
+               $item['verb'] = NAMESPACE_OSTATUS."/unfollow";
+               $item['follow'] = $contact["url"];
+               $slap = ostatus::salmon($item, $user);
 
                if((x($contact,'notify')) && (strlen($contact['notify']))) {
                        require_once('include/salmon.php');