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

Merge branch 'dev' into 'dev'

Browse Source 
translate make-friend activities to zot6

See merge request hubzilla/core!1654
This commit is contained in:
Mario 2019-05-22 12:59:41 +02:00
commit 94d4bc4bac
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Zotlabs/Lib/Activity.php
View File

@ -5,6 +5,8 @@ namespace Zotlabs\Lib;
use Zotlabs\Daemon\Master;
use Zotlabs\Zot6\HTTPSig;
require_once('include/event.php');
class Activity {
static function encode_object($x) {
@ -470,6 +472,12 @@ class Activity {
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']);