diff options
| author | Friendika <info@friendika.com> | 2011-01-03 05:58:27 -0800 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-01-03 05:58:27 -0800 |
| commit | 36b241c02b7640a72fd3432b511e635e4146e2e6 (patch) | |
| tree | 7721cb4778f42a90642b755909a37d790d1263f1 | |
| parent | cdf626e0e77c45e550054594738c9b59f0aeed18 (diff) | |
| download | volse-hubzilla-36b241c02b7640a72fd3432b511e635e4146e2e6.tar.gz volse-hubzilla-36b241c02b7640a72fd3432b511e635e4146e2e6.tar.bz2 volse-hubzilla-36b241c02b7640a72fd3432b511e635e4146e2e6.zip | |
change activitystreams unfollow to stop-follow but also send out OStatus unfollow
| -rw-r--r-- | boot.php | 2 | ||||
| -rw-r--r-- | mod/contacts.php | 3 | ||||
| -rw-r--r-- | mod/follow.php | 3 | ||||
| -rw-r--r-- | view/follow_slap.tpl | 1 |
4 files changed, 6 insertions, 3 deletions
@@ -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 33d1955a5..320c0f420 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 5f0f3f7e3..3c9d77657 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 1c4a5f7ce..0d0889f7d 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> |