aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2019-05-20 19:03:10 -0700
committerzotlabs <mike@macgirvin.com>2019-05-20 19:03:10 -0700
commit776074b24feba5c82f36dcead9646d2133802357 (patch)
tree297de7e18da9ed04f6b64e385bc9fe596bf49f1a /Zotlabs
parent8be00316025efc424a7b38ab5a2542dd5d1e9fd0 (diff)
downloadvolse-hubzilla-776074b24feba5c82f36dcead9646d2133802357.tar.gz
volse-hubzilla-776074b24feba5c82f36dcead9646d2133802357.tar.bz2
volse-hubzilla-776074b24feba5c82f36dcead9646d2133802357.zip
translate make-friend activities to zot6
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Lib/Activity.php8
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']);