diff options
| author | Mario Vavti <mario@mariovavti.com> | 2019-05-23 08:44:44 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2019-05-23 08:44:44 +0200 |
| commit | 8715f74d29298aebbe32add6cca9820660fd1128 (patch) | |
| tree | 0dab7d0a0042d7af831de3349d73683b687f2573 | |
| parent | 152224944b3b007acdbd5ef50372f3e00916414f (diff) | |
| parent | 94d4bc4bac97075d0b92c5427dee01e4e49974c5 (diff) | |
| download | volse-hubzilla-8715f74d29298aebbe32add6cca9820660fd1128.tar.gz volse-hubzilla-8715f74d29298aebbe32add6cca9820660fd1128.tar.bz2 volse-hubzilla-8715f74d29298aebbe32add6cca9820660fd1128.zip | |
Merge branch 'dev' into 4.2RC
| -rw-r--r-- | Zotlabs/Lib/Activity.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index 232d845c7..0843e0a7b 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -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']); |