Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 03:35:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

follow AND join remote groups since we don't know for sure which is supported

Browse source
This commit is contained in:
nobody 2020-11-16 14:51:03 -08:00
parent c491ba1872
commit cacd699507
3 changed files with 30 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Zotlabs/Lib/Activity.php
View file

@ -1458,7 +1458,7 @@ class Activity {
$person_obj = $act->actor;
if ($act->type === 'Follow') {
if (in_array($act->type, [ 'Follow', 'Invite', 'Join'])) {
$their_follow_id = $act->id;
}
elseif ($act->type === 'Accept') {
@ -1501,6 +1501,8 @@ class Activity {
switch($act->type) {
case 'Follow':
case 'Invite':
case 'Join':
// A second Follow request, but we haven't approved the first one
@ -1840,6 +1842,7 @@ class Activity {
}
}
$xchan_type = (($person_obj['type'] === 'Group') ? 1 : 0);
$about = ((isset($person_obj['summary'])) ? html2bbcode(purify_html($person_obj['summary'])) : EMPTY_STR);
$p = q("select * from xchan where xchan_url = '%s' and xchan_network = 'zot6' limit 1",
@ -1867,6 +1870,7 @@ class Activity {
'xchan_updated' => datetime_convert(),
'xchan_name_date' => datetime_convert(),
'xchan_network' => 'activitypub',
'xchan_type' => $xchan_type,
'xchan_photo_date' => datetime_convert('UTC','UTC','1968-01-01'),
'xchan_photo_l' => z_root() . '/' . get_default_profile_photo(),
'xchan_photo_m' => z_root() . '/' . get_default_profile_photo(80),
@ -1886,13 +1890,14 @@ class Activity {
}
// update existing record
$u = q("update xchan set xchan_updated = '%s', xchan_name = '%s', xchan_pubkey = '%s', xchan_network = '%s', xchan_name_date = '%s', xchan_hidden = %d where xchan_hash = '%s'",
$u = q("update xchan set xchan_updated = '%s', xchan_name = '%s', xchan_pubkey = '%s', xchan_network = '%s', xchan_name_date = '%s', xchan_hidden = %d, xchan_type = %d where xchan_hash = '%s'",
dbesc(datetime_convert()),
dbesc($name),
dbesc($pubkey),
dbesc('activitypub'),
dbesc(datetime_convert()),
intval($hidden),
intval($xchan_type),
dbesc($url)
);

18
Zotlabs/Lib/ActivityPub.php
View file

@ -251,9 +251,19 @@ class ActivityPub {
'to' => [ $x['recipient']['xchan_hash'] ]
]);
// for Group actors, send both a Follow and a Join because some platforms only support one and there's
// no way of discovering/knowing in advance which type they support
$join_msg = null;
if (intval($x['recipient']['xchan_type']) === 1) {
$join_msg = $msg;
$join_msg['type'] = 'Join';
$join_msg['signature'] = LDSignatures::sign($join_msg,$x['sender']);
$jmsg2 = json_encode($join_msg, JSON_UNESCAPED_SLASHES);
}
$msg['signature'] = LDSignatures::sign($msg,$x['sender']);
$jmsg = json_encode($msg, JSON_UNESCAPED_SLASHES);
$h = q("select * from hubloc where hubloc_hash = '%s' limit 1",
@ -265,6 +275,12 @@ class ActivityPub {
if ($qi) {
$x['deliveries'] = $qi;
}
if ($join_msg) {
$qi = self::queue_message($join_msg,$x['sender'],$h[0]);
if ($qi) {
$x['deliveries'] = $qi;
}
}
}
$x['success'] = true;

6
Zotlabs/Module/Inbox.php
View file

@ -256,6 +256,12 @@ class Inbox extends Controller {
Activity::follow($channel,$AS);
}
break;
case 'Invite':
if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && $AS->obj['type'] === 'Group') {
// do follow activity
Activity::follow($channel,$AS);
}
break;
case 'Join':
if (is_array($AS->obj) && array_key_exists('type', $AS->obj) && $AS->obj['type'] === 'Group') {
// do follow activity