mirror of
https://github.com/friendica/friendica
synced 2024-12-23 06:40:15 +00:00
change activitystreams unfollow to stop-follow but also send out OStatus unfollow
This commit is contained in:
parent
cdf626e0e7
commit
36b241c02b
4 changed files with 6 additions and 3 deletions
2
boot.php
2
boot.php
|
@ -102,7 +102,7 @@ define ( 'ACTIVITY_OBJ_HEART', NAMESPACE_DFRN . '/heart' );
|
||||||
|
|
||||||
define ( 'ACTIVITY_FRIEND', NAMESPACE_ACTIVITY_SCHEMA . 'make-friend' );
|
define ( 'ACTIVITY_FRIEND', NAMESPACE_ACTIVITY_SCHEMA . 'make-friend' );
|
||||||
define ( 'ACTIVITY_FOLLOW', NAMESPACE_ACTIVITY_SCHEMA . 'follow' );
|
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_POST', NAMESPACE_ACTIVITY_SCHEMA . 'post' );
|
||||||
define ( 'ACTIVITY_UPDATE', NAMESPACE_ACTIVITY_SCHEMA . 'update' );
|
define ( 'ACTIVITY_UPDATE', NAMESPACE_ACTIVITY_SCHEMA . 'update' );
|
||||||
define ( 'ACTIVITY_TAG', NAMESPACE_ACTIVITY_SCHEMA . 'tag' );
|
define ( 'ACTIVITY_TAG', NAMESPACE_ACTIVITY_SCHEMA . 'tag' );
|
||||||
|
|
|
@ -165,7 +165,8 @@ function contacts_content(&$a) {
|
||||||
'$type' => 'text',
|
'$type' => 'text',
|
||||||
'$content' => t('stopped following'),
|
'$content' => t('stopped following'),
|
||||||
'$nick' => $a->user['nickname'],
|
'$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']))) {
|
if((x($orig_record[0],'notify')) && (strlen($orig_record[0]['notify']))) {
|
||||||
|
|
|
@ -173,7 +173,8 @@ function follow_post(&$a) {
|
||||||
'$type' => 'text',
|
'$type' => 'text',
|
||||||
'$content' => t('following'),
|
'$content' => t('following'),
|
||||||
'$nick' => $a->user['nickname'],
|
'$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`
|
$r = q("SELECT `contact`.*, `user`.* FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
|
||||||
|
|
|
@ -21,4 +21,5 @@
|
||||||
<poco:displayName>$name</poco:displayName>
|
<poco:displayName>$name</poco:displayName>
|
||||||
</as:actor>
|
</as:actor>
|
||||||
<as:verb>$verb</as:verb>
|
<as:verb>$verb</as:verb>
|
||||||
|
$ostat_follow
|
||||||
</entry>
|
</entry>
|
||||||
|
|
Loading…
Reference in a new issue