aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2019-05-22 12:59:41 +0200
committerMario <mario@mariovavti.com>2019-05-22 12:59:41 +0200
commit94d4bc4bac97075d0b92c5427dee01e4e49974c5 (patch)
tree11533704bc54f47c842728638bd64d061323c6bc
parentc95488549d710b86e2554a453754a0a689e46d7d (diff)
parent776074b24feba5c82f36dcead9646d2133802357 (diff)
downloadvolse-hubzilla-94d4bc4bac97075d0b92c5427dee01e4e49974c5.tar.gz
volse-hubzilla-94d4bc4bac97075d0b92c5427dee01e4e49974c5.tar.bz2
volse-hubzilla-94d4bc4bac97075d0b92c5427dee01e4e49974c5.zip
Merge branch 'dev' into 'dev'
translate make-friend activities to zot6 See merge request hubzilla/core!1654
-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']);