Merge branch 'dev' into release

This commit is contained in:
Mike Macgirvin 2024-08-20 16:51:30 +10:00
commit beffd93b86
4 changed files with 125 additions and 116 deletions

View file

@ -4874,6 +4874,11 @@ function fix_attached_permissions($uid,$body,$str_contact_allow,$str_group_allow
intval($uid)
);
}
$sync = attach_export_data($channel, $file);
if ($sync) {
Libsync::build_sync_packet($channel['channel_id'], ['file' => [$sync]]);
}
}
}

View file

@ -2151,11 +2151,13 @@ class Activity
self::actor_store($person_obj['id'], $person_obj);
$actorId = new ActorId($person_obj['id']);
// Find any existing abook record
$r = q(
"select * from abook left join xchan on abook_xchan = xchan_hash where abook_xchan = '%s' and abook_channel = %d limit 1",
dbesc($person_obj['id']),
dbesc($actorId->getId()),
intval($channel['channel_id'])
);
if ($r) {
@ -2164,8 +2166,10 @@ class Activity
}
$x = PermissionRoles::role_perms('social');
$theirPerms = $x['perms_connect'];
logger('their_perms: ' . print_r($theirPerms, true));
if (!$theirPerms) {
$theirPerms = $x['perms_connect'];
}
// add tag_deliver permissions to remote groups (deprecated, use post_wall instead)
if (is_array($person_obj) && $person_obj['type'] === 'Group' && !in_array('tag_deliver', $theirPerms)) {
$theirPerms[] = 'tag_deliver';
@ -2187,11 +2191,11 @@ class Activity
// We've already approved them or followed them first
// Send an Accept back to them
set_abconfig($channel['channel_id'], $person_obj['id'], 'activitypub', 'their_follow_id', $their_follow_id);
set_abconfig($channel['channel_id'], $person_obj['id'], 'activitypub', 'their_follow_type', $act->type);
set_abconfig($channel['channel_id'], $actorId->getId(), 'activitypub', 'their_follow_id', $their_follow_id);
set_abconfig($channel['channel_id'], $actorId->getId(), 'activitypub', 'their_follow_type', $act->type);
// In case they unfollowed us and followed again, reset their permissions to show that we're connected again.
if ($theirPerms) {
AbConfig::Set($channel['channel_id'], $person_obj['id'], 'system', 'their_perms', implode(',', $theirPerms));
AbConfig::Set($channel['channel_id'], $actorId->getId(), 'system', 'their_perms', implode(',', $theirPerms));
}
Run::Summon(['Notifier', 'permissions_accept', $contact['abook_id']]);
return;
@ -2237,18 +2241,18 @@ class Activity
// From here on out we assume a Follow activity from somebody we have no existing relationship with
set_abconfig($channel['channel_id'], $person_obj['id'], 'activitypub', 'their_follow_id', $their_follow_id);
set_abconfig($channel['channel_id'], $person_obj['id'], 'activitypub', 'their_follow_type', $act->type);
set_abconfig($channel['channel_id'], $actorId->getId(), 'activitypub', 'their_follow_id', $their_follow_id);
set_abconfig($channel['channel_id'], $actorId->getId(), 'activitypub', 'their_follow_type', $act->type);
// The xchan should have been created by actor_store() above
$r = q(
"select * from xchan where xchan_hash = '%s' and xchan_network = 'activitypub' limit 1",
dbesc($person_obj['id'])
dbesc($actorId->getId())
);
if (!$r) {
logger('xchan not found for ' . $person_obj['id']);
logger('xchan not found for ' . $actorId->getId());
return;
}
$ret = $r[0];

View file

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: 24.08.12\n"
"Project-Id-Version: 24.08.20\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-08-12 16:41+1000\n"
"POT-Creation-Date: 2024-08-20 16:51+1000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -892,7 +892,7 @@ msgstr ""
#: include/conversation.php:959 include/attach.php:1380 include/attach.php:1401
#: src/Module/Embedphotos.php:380 src/Module/Photos.php:856
#: src/Module/Photos.php:1324 src/Module/Cdav.php:877 src/Module/Cdav.php:878
#: src/Module/Cdav.php:884 src/Lib/Activity.php:2443 src/Lib/Apps.php:1261
#: src/Module/Cdav.php:884 src/Lib/Activity.php:2459 src/Lib/Apps.php:1261
#: src/Lib/Apps.php:1352 src/Widget/Portfolio.php:110 src/Widget/Album.php:100
#: src/Storage/Browser.php:183
msgid "Unknown"
@ -1419,7 +1419,7 @@ msgid "Visible to specific connections."
msgstr ""
#: include/items.php:3093 include/misc.php:1720 include/misc.php:3217
#: src/Lib/Activity.php:4049
#: src/Lib/Activity.php:4067
#, php-format
msgid "%1$s (%2$s)"
msgstr ""
@ -1480,17 +1480,17 @@ msgstr ""
msgid "profile photo"
msgstr ""
#: include/items.php:4902
#: include/items.php:4907
#, php-format
msgid "[Edited %s]"
msgstr ""
#: include/items.php:4902
#: include/items.php:4907
msgctxt "edit_activity"
msgid "Post"
msgstr ""
#: include/items.php:4902
#: include/items.php:4907
msgctxt "edit_activity"
msgid "Comment"
msgstr ""
@ -3449,7 +3449,7 @@ msgstr ""
msgid "Profile Visibility Editor"
msgstr ""
#: src/Module/Profperm.php:131 src/Lib/Activity.php:3389 src/Lib/Apps.php:439
#: src/Module/Profperm.php:131 src/Lib/Activity.php:3407 src/Lib/Apps.php:439
#: src/Lib/Libprofile.php:753
msgid "Profile"
msgstr ""
@ -3819,7 +3819,7 @@ msgid "Following"
msgstr ""
#: src/Module/Connections.php:95 src/Module/Connections.php:200
#: src/Lib/Enotify.php:409 src/Lib/Enotify.php:410
#: src/Lib/Enotify.php:407 src/Lib/Enotify.php:408
msgid "Moderated"
msgstr ""
@ -5737,7 +5737,7 @@ msgstr ""
msgid "Block Title"
msgstr ""
#: src/Module/Home.php:150 src/Module/Home.php:159 src/Lib/Enotify.php:76
#: src/Module/Home.php:150 src/Module/Home.php:159 src/Lib/Enotify.php:74
msgid "$Projectname"
msgstr ""
@ -9860,51 +9860,51 @@ msgstr ""
msgid "Quoted post"
msgstr ""
#: src/Lib/Activity.php:3387
#: src/Lib/Activity.php:3405
msgid "Activity"
msgstr ""
#: src/Lib/Activity.php:3395
#, php-format
msgid "Likes %1$s's %2$s"
msgstr ""
#: src/Lib/Activity.php:3398
#, php-format
msgid "Doesn't like %1$s's %2$s"
msgstr ""
#: src/Lib/Activity.php:3401
#, php-format
msgid "Flagged %1$s's %2$s"
msgstr ""
#: src/Lib/Activity.php:3404
#, php-format
msgid "Blocked %1$s's %2$s"
msgstr ""
#: src/Lib/Activity.php:3410
#, php-format
msgid "Will attend %s's event"
msgstr ""
#: src/Lib/Activity.php:3413
#, php-format
msgid "Will not attend %s's event"
msgid "Likes %1$s's %2$s"
msgstr ""
#: src/Lib/Activity.php:3416
#, php-format
msgid "May attend %s's event"
msgid "Doesn't like %1$s's %2$s"
msgstr ""
#: src/Lib/Activity.php:3419
#, php-format
msgid "Flagged %1$s's %2$s"
msgstr ""
#: src/Lib/Activity.php:3422
#, php-format
msgid "Blocked %1$s's %2$s"
msgstr ""
#: src/Lib/Activity.php:3428
#, php-format
msgid "Will attend %s's event"
msgstr ""
#: src/Lib/Activity.php:3431
#, php-format
msgid "Will not attend %s's event"
msgstr ""
#: src/Lib/Activity.php:3434
#, php-format
msgid "May attend %s's event"
msgstr ""
#: src/Lib/Activity.php:3437
#, php-format
msgid "May not attend %s's event"
msgstr ""
#: src/Lib/Activity.php:3425
#: src/Lib/Activity.php:3443
#, php-format
msgid "&#x1f4e2; Repeated %1$s's %2$s"
msgstr ""
@ -11429,312 +11429,312 @@ msgstr ""
msgid "Unable to verify channel signature"
msgstr ""
#: src/Lib/Enotify.php:70
#: src/Lib/Enotify.php:68
msgid "$Projectname Notification"
msgstr ""
#: src/Lib/Enotify.php:71
#: src/Lib/Enotify.php:69
msgid "$projectname"
msgstr ""
#: src/Lib/Enotify.php:73
#: src/Lib/Enotify.php:71
msgid "Thank You,"
msgstr ""
#: src/Lib/Enotify.php:75
#: src/Lib/Enotify.php:73
#, php-format
msgid "%s Administrator"
msgstr ""
#: src/Lib/Enotify.php:76
#: src/Lib/Enotify.php:74
#, php-format
msgid "This email was sent by %1$s at %2$s."
msgstr ""
#: src/Lib/Enotify.php:77
#: src/Lib/Enotify.php:75
#, php-format
msgid ""
"To stop receiving these messages, please adjust your Notification Settings "
"at %s"
msgstr ""
#: src/Lib/Enotify.php:78
#: src/Lib/Enotify.php:76
#, php-format
msgid "To stop receiving these messages, please adjust your %s."
msgstr ""
#: src/Lib/Enotify.php:78
#: src/Lib/Enotify.php:76
msgid "Notification Settings"
msgstr ""
#: src/Lib/Enotify.php:137
#: src/Lib/Enotify.php:135
#, php-format
msgid "%s <!item_type!>"
msgstr ""
#: src/Lib/Enotify.php:141
#: src/Lib/Enotify.php:139
#, php-format
msgid "[$Projectname:Notify] New mail received at %s"
msgstr ""
#: src/Lib/Enotify.php:144
#: src/Lib/Enotify.php:142
#, php-format
msgid "%1$s sent you a new private message at %2$s."
msgstr ""
#: src/Lib/Enotify.php:145
#: src/Lib/Enotify.php:143
#, php-format
msgid "%1$s sent you %2$s."
msgstr ""
#: src/Lib/Enotify.php:145 src/Lib/Enotify.php:157
#: src/Lib/Enotify.php:143 src/Lib/Enotify.php:155
msgid "a private message"
msgstr ""
#: src/Lib/Enotify.php:148 src/Lib/Enotify.php:200
#: src/Lib/Enotify.php:146 src/Lib/Enotify.php:198
msgid "liked"
msgstr ""
#: src/Lib/Enotify.php:151 src/Lib/Enotify.php:204
#: src/Lib/Enotify.php:149 src/Lib/Enotify.php:202
msgid "disliked"
msgstr ""
#: src/Lib/Enotify.php:154
#: src/Lib/Enotify.php:152
msgid "replied to"
msgstr ""
#: src/Lib/Enotify.php:156
#: src/Lib/Enotify.php:154
#, php-format
msgid "%1$s %2$s a private message at %3$s."
msgstr ""
#: src/Lib/Enotify.php:157
#: src/Lib/Enotify.php:155
#, php-format
msgctxt "react_private_message"
msgid "%1$s %2$s %3$s."
msgstr ""
#: src/Lib/Enotify.php:159
#: src/Lib/Enotify.php:157
#, php-format
msgid "Please visit %s to view and/or reply to your private messages."
msgstr ""
#: src/Lib/Enotify.php:178
#: src/Lib/Enotify.php:176
msgid "repeated"
msgstr ""
#: src/Lib/Enotify.php:185
#: src/Lib/Enotify.php:183
msgid "commented on"
msgstr ""
#: src/Lib/Enotify.php:254
#: src/Lib/Enotify.php:252
#, php-format
msgid "%1$s %2$s [zrl=%3$s]a %4$s[/zrl]"
msgstr ""
#: src/Lib/Enotify.php:264
#: src/Lib/Enotify.php:262
#, php-format
msgid "%1$s %2$s [zrl=%3$s]%4$s's %5$s[/zrl]"
msgstr ""
#: src/Lib/Enotify.php:276
#: src/Lib/Enotify.php:274
#, php-format
msgid "%1$s %2$s [zrl=%3$s]your %4$s[/zrl]"
msgstr ""
#: src/Lib/Enotify.php:290
#: src/Lib/Enotify.php:288
#, php-format
msgid "[$Projectname:Notify] Moderated Comment to conversation #%1$d by %2$s"
msgstr ""
#: src/Lib/Enotify.php:293
#: src/Lib/Enotify.php:291
#, php-format
msgid "[$Projectname:Notify] Comment to conversation #%1$d by %2$s"
msgstr ""
#: src/Lib/Enotify.php:295
#: src/Lib/Enotify.php:293
#, php-format
msgid "%1$s commented on an item/conversation you have been following."
msgstr ""
#: src/Lib/Enotify.php:299
#: src/Lib/Enotify.php:297
msgid "(Moderated)"
msgstr ""
#: src/Lib/Enotify.php:302 src/Lib/Enotify.php:385 src/Lib/Enotify.php:413
#: src/Lib/Enotify.php:444 src/Lib/Enotify.php:463 src/Lib/Enotify.php:478
#: src/Lib/Enotify.php:300 src/Lib/Enotify.php:383 src/Lib/Enotify.php:411
#: src/Lib/Enotify.php:442 src/Lib/Enotify.php:461 src/Lib/Enotify.php:476
#, php-format
msgid "Please visit %s to view and/or reply to the conversation."
msgstr ""
#: src/Lib/Enotify.php:306 src/Lib/Enotify.php:307
#: src/Lib/Enotify.php:304 src/Lib/Enotify.php:305
#, php-format
msgid "Please visit %s to approve or reject this comment."
msgstr ""
#: src/Lib/Enotify.php:366
#: src/Lib/Enotify.php:364
#, php-format
msgid "%1$s liked [zrl=%2$s]your %3$s[/zrl]"
msgstr ""
#: src/Lib/Enotify.php:381
#: src/Lib/Enotify.php:379
#, php-format
msgid "[$Projectname:Notify] Like received to conversation #%1$d by %2$s"
msgstr ""
#: src/Lib/Enotify.php:382
#: src/Lib/Enotify.php:380
#, php-format
msgid "%1$s liked a post or conversation you created."
msgstr ""
#: src/Lib/Enotify.php:393
#: src/Lib/Enotify.php:391
#, php-format
msgid "[$Projectname:Notify] %s posted to your profile wall"
msgstr ""
#: src/Lib/Enotify.php:399
#: src/Lib/Enotify.php:397
#, php-format
msgid "%1$s posted to your profile wall at %2$s"
msgstr ""
#: src/Lib/Enotify.php:402
#: src/Lib/Enotify.php:400
#, php-format
msgid "%1$s posted to [zrl=%2$s]your wall[/zrl]"
msgstr ""
#: src/Lib/Enotify.php:409 src/Lib/Enotify.php:410
#: src/Lib/Enotify.php:407 src/Lib/Enotify.php:408
msgid " - "
msgstr ""
#: src/Lib/Enotify.php:418 src/Lib/Enotify.php:419
#: src/Lib/Enotify.php:416 src/Lib/Enotify.php:417
#, php-format
msgid "Please visit %s to approve or reject this post."
msgstr ""
#: src/Lib/Enotify.php:436
#: src/Lib/Enotify.php:434
#, php-format
msgid "[$Projectname:Notify] %s tagged you"
msgstr ""
#: src/Lib/Enotify.php:437
#: src/Lib/Enotify.php:435
#, php-format
msgid "%1$s tagged you at %2$s"
msgstr ""
#: src/Lib/Enotify.php:439
#: src/Lib/Enotify.php:437
#, php-format
msgid "%1$s [zrl=%2$s]tagged you[/zrl]."
msgstr ""
#: src/Lib/Enotify.php:451
#: src/Lib/Enotify.php:449
#, php-format
msgid "[$Projectname:Notify] %1$s poked you"
msgstr ""
#: src/Lib/Enotify.php:452
#: src/Lib/Enotify.php:450
#, php-format
msgid "%1$s poked you at %2$s"
msgstr ""
#: src/Lib/Enotify.php:454
#: src/Lib/Enotify.php:452
#, php-format
msgid "%1$s [zrl=%2$s]poked you[/zrl]."
msgstr ""
#: src/Lib/Enotify.php:470
#: src/Lib/Enotify.php:468
#, php-format
msgid "[$Projectname:Notify] %s tagged your post"
msgstr ""
#: src/Lib/Enotify.php:471
#: src/Lib/Enotify.php:469
#, php-format
msgid "%1$s tagged your post at %2$s"
msgstr ""
#: src/Lib/Enotify.php:473
#: src/Lib/Enotify.php:471
#, php-format
msgid "%1$s tagged [zrl=%2$s]your post[/zrl]"
msgstr ""
#: src/Lib/Enotify.php:485
#: src/Lib/Enotify.php:483
msgid "[$Projectname:Notify] Introduction received"
msgstr ""
#: src/Lib/Enotify.php:486
#: src/Lib/Enotify.php:484
#, php-format
msgid "You've received an new connection request from '%1$s' at %2$s"
msgstr ""
#: src/Lib/Enotify.php:488
#: src/Lib/Enotify.php:486
#, php-format
msgid "You've received [zrl=%1$s]a new connection request[/zrl] from %2$s."
msgstr ""
#: src/Lib/Enotify.php:492 src/Lib/Enotify.php:512
#: src/Lib/Enotify.php:490 src/Lib/Enotify.php:510
#, php-format
msgid "You may visit their profile at %s"
msgstr ""
#: src/Lib/Enotify.php:494
#: src/Lib/Enotify.php:492
#, php-format
msgid "Please visit %s to approve or reject the connection request."
msgstr ""
#: src/Lib/Enotify.php:501
#: src/Lib/Enotify.php:499
msgid "[$Projectname:Notify] Friend suggestion received"
msgstr ""
#: src/Lib/Enotify.php:502
#: src/Lib/Enotify.php:500
#, php-format
msgid "You've received a friend suggestion from '%1$s' at %2$s"
msgstr ""
#: src/Lib/Enotify.php:504
#: src/Lib/Enotify.php:502
#, php-format
msgid "You've received [zrl=%1$s]a friend suggestion[/zrl] for %2$s from %3$s."
msgstr ""
#: src/Lib/Enotify.php:510
#: src/Lib/Enotify.php:508
msgid "Name:"
msgstr ""
#: src/Lib/Enotify.php:511
#: src/Lib/Enotify.php:509
msgid "Photo:"
msgstr ""
#: src/Lib/Enotify.php:514
#: src/Lib/Enotify.php:512
#, php-format
msgid "Please visit %s to approve or reject the suggestion."
msgstr ""
#: src/Lib/Enotify.php:755
#: src/Lib/Enotify.php:753
msgid "[$Projectname:Notify]"
msgstr ""
#: src/Lib/Enotify.php:873
#: src/Lib/Enotify.php:871
msgid "created a new post"
msgstr ""
#: src/Lib/Enotify.php:874
#: src/Lib/Enotify.php:872
#, php-format
msgid "reacted to %s's conversation"
msgstr ""
#: src/Lib/Enotify.php:876
#: src/Lib/Enotify.php:874
#, php-format
msgid "shared %s's post"
msgstr ""
#: src/Lib/Enotify.php:880
#: src/Lib/Enotify.php:878
msgid "sent a direct message"
msgstr ""
#: src/Lib/Enotify.php:887
#: src/Lib/Enotify.php:885
#, php-format
msgid "updated a poll dated %s"
msgstr ""
#: src/Lib/Enotify.php:890
#: src/Lib/Enotify.php:888
#, php-format
msgid "edited a post dated %s"
msgstr ""

View file

@ -1,2 +1,2 @@
<?php
define ('STD_VERSION', '24.08.19');
define ('STD_VERSION', '24.08.20');