From 36b241c02b7640a72fd3432b511e635e4146e2e6 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 3 Jan 2011 05:58:27 -0800
Subject: [PATCH] change activitystreams unfollow to stop-follow but also send
out OStatus unfollow
---
boot.php | 2 +-
mod/contacts.php | 3 ++-
mod/follow.php | 3 ++-
view/follow_slap.tpl | 1 +
4 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/boot.php b/boot.php
index bf03abfd65..6fe5ee99d6 100644
--- 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 33d1955a54..320c0f4201 100644
--- 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 5f0f3f7e3d..3c9d776573 100644
--- 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 1c4a5f7cee..0d0889f7db 100644
--- 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>