Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 03:35:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix the profile change activity post

Browse source
This commit is contained in:
friendica 2012-11-05 21:05:51 -08:00
parent 90e70d9674
commit 7d926213c6
2 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
boot.php
View file

@ -271,8 +271,8 @@ define ( 'NAMESPACE_ATOM1', 'http://www.w3.org/2005/Atom' );
*/ */
define ( 'ACTIVITY_LIKE', NAMESPACE_ACTIVITY_SCHEMA . 'like' ); define ( 'ACTIVITY_LIKE', NAMESPACE_ACTIVITY_SCHEMA . 'like' );
define ( 'ACTIVITY_DISLIKE', NAMESPACE_DFRN . '/dislike' ); define ( 'ACTIVITY_DISLIKE', NAMESPACE_ZOT . '/activity/dislike' );
define ( 'ACTIVITY_OBJ_HEART', NAMESPACE_DFRN . '/heart' ); define ( 'ACTIVITY_OBJ_HEART', NAMESPACE_ZOT . '/activity/heart' );
define ( 'ACTIVITY_FRIEND', NAMESPACE_ACTIVITY_SCHEMA . 'make-friend' ); define ( 'ACTIVITY_FRIEND', NAMESPACE_ACTIVITY_SCHEMA . 'make-friend' );
define ( 'ACTIVITY_REQ_FRIEND', NAMESPACE_ACTIVITY_SCHEMA . 'request-friend' ); define ( 'ACTIVITY_REQ_FRIEND', NAMESPACE_ACTIVITY_SCHEMA . 'request-friend' );
@ -297,8 +297,8 @@ define ( 'ACTIVITY_OBJ_P_PHOTO', NAMESPACE_ACTIVITY_SCHEMA . 'profile-photo' );
define ( 'ACTIVITY_OBJ_ALBUM', NAMESPACE_ACTIVITY_SCHEMA . 'photo-album' ); define ( 'ACTIVITY_OBJ_ALBUM', NAMESPACE_ACTIVITY_SCHEMA . 'photo-album' );
define ( 'ACTIVITY_OBJ_EVENT', NAMESPACE_ACTIVITY_SCHEMA . 'event' ); define ( 'ACTIVITY_OBJ_EVENT', NAMESPACE_ACTIVITY_SCHEMA . 'event' );
define ( 'ACTIVITY_OBJ_GROUP', NAMESPACE_ACTIVITY_SCHEMA . 'group' ); define ( 'ACTIVITY_OBJ_GROUP', NAMESPACE_ACTIVITY_SCHEMA . 'group' );
define ( 'ACTIVITY_OBJ_TAGTERM', NAMESPACE_DFRN . '/tagterm' ); define ( 'ACTIVITY_OBJ_TAGTERM', NAMESPACE_ZOT . '/activity/tagterm' );
define ( 'ACTIVITY_OBJ_PROFILE', NAMESPACE_DFRN . '/profile' ); define ( 'ACTIVITY_OBJ_PROFILE', NAMESPACE_ZOT . '/activity/profile' );
/** /**
* item weight for query ordering * item weight for query ordering

24
include/activities.php
View file

@ -25,7 +25,7 @@ function profile_activity($changed, $value) {
$arr['verb'] = ACTIVITY_UPDATE; $arr['verb'] = ACTIVITY_UPDATE;
$arr['obj_type'] = ACTIVITY_OBJ_PROFILE; $arr['obj_type'] = ACTIVITY_OBJ_PROFILE;
$A = '[url=' . z_root() . '/profile/' . $self[0]['xchan_addr'] . ']' . $self[0]['xchan_name'] . '[/url]'; $A = '[url=' . z_root() . '/channel/' . $self['channel_address'] . ']' . $self['channel_name'] . '[/url]';
$changes = ''; $changes = '';
@ -42,11 +42,11 @@ function profile_activity($changed, $value) {
$changes .= $ch; $changes .= $ch;
} }
$prof = '[url=' . z_root() . '/profile/' . $self[0]['xchan_addr'] . ']' . t('public profile') . '[/url]'; $prof = '[url=' . z_root() . '/profile/' . $self['channel_address'] . ']' . t('public profile') . '[/url]';
if($t == 1 && strlen($value)) { if($t == 1 && strlen($value)) {
$message = sprintf( t('%1$s changed %2$s to “%3$s”'), $A, $changes, $value); $message = sprintf( t('%1$s changed %2$s to “%3$s”'), $A, $changes, $value);
$message .= "\n\n" . sprintf( t(' - Visit %1$s\'s %2$s'), $A, $prof); $message .= "\n\n" . sprintf( t('Visit %1$s\'s %2$s'), $A, $prof);
} }
else else
$message = sprintf( t('%1$s has an updated %2$s, changing %3$s.'), $A, $prof, $changes); $message = sprintf( t('%1$s has an updated %2$s, changing %3$s.'), $A, $prof, $changes);
@ -55,21 +55,23 @@ function profile_activity($changed, $value) {
$arr['body'] = $message; $arr['body'] = $message;
$links = array(); $links = array();
$links[] = array('rel' => 'alternate', 'type' => 'text/html', 'href' => z_root() . '/profile/' . $self[0]['xchan_addr']); $links[] = array('rel' => 'alternate', 'type' => 'text/html',
$links[] = array('rel' => 'photo', 'type' => $self[0]['xchan_photo_mimetype'], 'href' => $self[0]['xchan_photo_l']); 'href' => z_root() . '/profile/' . $self['channel_address']);
$links[] = array('rel' => 'photo', 'type' => $self['xchan_photo_mimetype'],
'href' => $self['xchan_photo_l']);
$arr['object'] = json_encode(array( $arr['object'] = json_encode(array(
'type' => ACTIVITY_OBJ_PROFILE, 'type' => ACTIVITY_OBJ_PROFILE,
'title' => $self[0]['channel_name'], 'title' => $self['channel_name'],
'id' => $self[0]['xchan_url'] . '/' . $self[0]['xchan_hash'], 'id' => $self['xchan_url'] . '/' . $self['xchan_hash'],
'link' => $links 'link' => $links
)); ));
$arr['allow_cid'] = $self[0]['channel_allow_cid']; $arr['allow_cid'] = $self['channel_allow_cid'];
$arr['allow_gid'] = $self[0]['channel_allow_gid']; $arr['allow_gid'] = $self['channel_allow_gid'];
$arr['deny_cid'] = $self[0]['channel_deny_cid']; $arr['deny_cid'] = $self['channel_deny_cid'];
$arr['deny_gid'] = $self[0]['channel_deny_gid']; $arr['deny_gid'] = $self['channel_deny_gid'];
$i = item_store($arr); $i = item_store($arr);