harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'dev'

Browse Source 
Zot -> Zot6 translation issue, liking a "new friend" activity

See merge request hubzilla/core!1723
This commit is contained in:
Max Kostikov 2019-09-10 10:40:53 +02:00
commit f2b121cd58
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Zotlabs/Lib/Activity.php
View File

@ -293,8 +293,14 @@ class Activity {
$ret = []; $ret = [];
$objtype = self::activity_obj_mapper($i['obj_type']); if($i['verb'] === ACTIVITY_FRIEND) {
// Hubzilla 'make-friend' activity, no direct mapping from AS1 to AS2 - make it a note
$objtype = 'Note';
}
else {
$objtype = self::activity_obj_mapper($i['obj_type']);
}
if(intval($i['item_deleted'])) { if(intval($i['item_deleted'])) {
$ret['type'] = 'Tombstone'; $ret['type'] = 'Tombstone';
$ret['formerType'] = $objtype; $ret['formerType'] = $objtype;
@ -486,6 +492,12 @@ class Activity {
$ret = []; $ret = [];
$reply = false; $reply = false;
if($i['verb'] === ACTIVITY_FRIEND) {
// Hubzilla 'make-friend' activity, no direct mapping from AS1 to AS2 - make it a note
$ret['obj'] = [];
}
if(intval($i['item_deleted'])) { if(intval($i['item_deleted'])) {
$ret['type'] = 'Tombstone'; $ret['type'] = 'Tombstone';
$ret['formerType'] = self::activity_obj_mapper($i['obj_type']); $ret['formerType'] = self::activity_obj_mapper($i['obj_type']);
@ -498,11 +510,6 @@ class Activity {
return $ret; return $ret;
} }
if($i['verb'] === ACTIVITY_FRIEND) {
// Hubzilla 'make-friend' activity, no direct mapping from AS1 to AS2 - make it a note
$ret['obj_type'] = ACTIVITY_OBJ_NOTE;
$ret['obj'] = [];
}
$ret['type'] = self::activity_mapper($i['verb']); $ret['type'] = self::activity_mapper($i['verb']);
@ -797,6 +804,9 @@ class Activity {
if(strpos($verb,ACTIVITY_MOOD) !== false) if(strpos($verb,ACTIVITY_MOOD) !== false)
return 'Create'; return 'Create';
if(strpos($verb,ACTIVITY_FRIEND) !== false)
return 'Create';
if(strpos($verb,ACTIVITY_POKE) !== false) if(strpos($verb,ACTIVITY_POKE) !== false)
return 'Activity'; return 'Activity';

1
include/zot.php
View File

@ -2392,7 +2392,6 @@ function process_mail_delivery($sender, $arr, $deliveries) {
} }
} }
$r = q("select id, conv_guid from mail where mid = '%s' and channel_id = %d limit 1", $r = q("select id, conv_guid from mail where mid = '%s' and channel_id = %d limit 1",
dbesc($arr['mid']), dbesc($arr['mid']),
intval($channel['channel_id']) intval($channel['channel_id'])