change activitystreams unfollow to stop-follow but also send out OStatus unfollow

diff --git a/boot.php b/boot.php
index bf03abfd650f13899898b85a35786fc4cd79185b..6fe5ee99d6b65b4a74300f6500c949efbbf06168 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -102,7 +102,7 @@ define ( 'ACTIVITY_OBJ_HEART',   NAMESPACE_DFRN            . '/heart' );
 
 define ( 'ACTIVITY_FRIEND',      NAMESPACE_ACTIVITY_SCHEMA . 'make-friend' );
 define ( 'ACTIVITY_FOLLOW',      NAMESPACE_ACTIVITY_SCHEMA . 'follow' );
-define ( 'ACTIVITY_UNFOLLOW',    NAMESPACE_ACTIVITY_SCHEMA . 'unfollow' );
+define ( 'ACTIVITY_UNFOLLOW',    NAMESPACE_ACTIVITY_SCHEMA . 'stop-following' );
 define ( 'ACTIVITY_POST',        NAMESPACE_ACTIVITY_SCHEMA . 'post' );
 define ( 'ACTIVITY_UPDATE',      NAMESPACE_ACTIVITY_SCHEMA . 'update' );
 define ( 'ACTIVITY_TAG',         NAMESPACE_ACTIVITY_SCHEMA . 'tag' );

diff --git a/mod/contacts.php b/mod/contacts.php
index 33d1955a54b2c51ac056651a1b3407979a90ab62..320c0f4201c9e4b4c2ce759219dffaaffcc31e9d 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -165,7 +165,8 @@ function contacts_content(&$a) {
                                        '$type' => 'text',
                                        '$content' => t('stopped following'),
                                        '$nick' => $a->user['nickname'],
-                                       '$verb' => ACTIVITY_UNFOLLOW
+                                       '$verb' => ACTIVITY_UNFOLLOW,
+                                       '$ostat_follow' => '<as:verb>http://ostatus.org/schema/1.0/unfollow</as:verb>' . "\r\n";
                                ));
 
                                if((x($orig_record[0],'notify')) && (strlen($orig_record[0]['notify']))) {

diff --git a/mod/follow.php b/mod/follow.php
index 5f0f3f7e3d616a6e8f26bb4e729eff683ed8b6a9..3c9d7765738e04fb9c191c5892ebb13b733f0175 100644 (file)
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -173,7 +173,8 @@ function follow_post(&$a) {
                '$type' => 'text',
                '$content' => t('following'),
                '$nick' => $a->user['nickname'],
-               '$verb' => ACTIVITY_FOLLOW
+               '$verb' => ACTIVITY_FOLLOW,
+               '$ostat_follow' => ''
        ));
 
        $r = q("SELECT `contact`.*, `user`.* FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid` 

diff --git a/view/follow_slap.tpl b/view/follow_slap.tpl
index 1c4a5f7cee92dd9a49d18df5cad8730053aefec0..0d0889f7dbf4028aa54b074a7aa68a181bae81ca 100644 (file)
--- a/view/follow_slap.tpl
+++ b/view/follow_slap.tpl
@@ -21,4 +21,5 @@
                <poco:displayName>$name</poco:displayName>
                </as:actor>
                <as:verb>$verb</as:verb>
+               $ostat_follow
        </entry>