Merge pull request 'Bluesky: Support Restrictions / Updated Friendica handle description' (#1489) from heluecht/friendica-addons:restrictions into develop
Reviewed-on: #1489 Reviewed-by: Hypolite Petovan <hypolite@mrpetovan.com>
This commit is contained in:
commit
b4eee553d1
|
@ -323,7 +323,7 @@ function bluesky_addon_admin(string &$o)
|
||||||
|
|
||||||
$o = Renderer::replaceMacros($t, [
|
$o = Renderer::replaceMacros($t, [
|
||||||
'$submit' => DI::l10n()->t('Save Settings'),
|
'$submit' => DI::l10n()->t('Save Settings'),
|
||||||
'$friendica_handles' => ['friendica_handles', DI::l10n()->t('Allow your users to use your hostname for their Bluesky handles'), DI::config()->get('bluesky', 'friendica_handles'), DI::l10n()->t('Before enabling this option, you have to download and configure the bluesky-handles repository on your system. See https://git.friendi.ca/heluecht/bluesky-handles')],
|
'$friendica_handles' => ['friendica_handles', DI::l10n()->t('Allow your users to use your hostname for their Bluesky handles'), DI::config()->get('bluesky', 'friendica_handles'), DI::l10n()->t('Before enabling this option, you have to setup a wildcard domain configuration and you have to enable wildcard requests in your webserver configuration. On Apache this is done by adding "ServerAlias *.%s" to your HTTP configuration. You don\'t need to change the HTTPS configuration.', DI::baseUrl()->getHost())],
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -525,8 +525,8 @@ function bluesky_cron()
|
||||||
// Refresh the token now, so that it doesn't need to be refreshed in parallel by the following workers
|
// Refresh the token now, so that it doesn't need to be refreshed in parallel by the following workers
|
||||||
bluesky_get_token($pconfig['uid']);
|
bluesky_get_token($pconfig['uid']);
|
||||||
|
|
||||||
Worker::add(['priority' => Worker::PRIORITY_MEDIUM, 'force_priority' => true], 'addon/bluesky/bluesky_timeline.php', $pconfig['uid'], $last);
|
|
||||||
Worker::add(['priority' => Worker::PRIORITY_MEDIUM, 'force_priority' => true], 'addon/bluesky/bluesky_notifications.php', $pconfig['uid'], $last);
|
Worker::add(['priority' => Worker::PRIORITY_MEDIUM, 'force_priority' => true], 'addon/bluesky/bluesky_notifications.php', $pconfig['uid'], $last);
|
||||||
|
Worker::add(['priority' => Worker::PRIORITY_MEDIUM, 'force_priority' => true], 'addon/bluesky/bluesky_timeline.php', $pconfig['uid'], $last);
|
||||||
|
|
||||||
if (DI::pConfig()->get($pconfig['uid'], 'bluesky', 'import_feeds')) {
|
if (DI::pConfig()->get($pconfig['uid'], 'bluesky', 'import_feeds')) {
|
||||||
$feeds = bluesky_get_feeds($pconfig['uid']);
|
$feeds = bluesky_get_feeds($pconfig['uid']);
|
||||||
|
@ -1176,6 +1176,8 @@ function bluesky_process_post(stdClass $post, int $uid, int $fetch_uid, int $pos
|
||||||
$item = bluesky_add_media($post->embed, $item, $uid, $level, $last_poll);
|
$item = bluesky_add_media($post->embed, $item, $uid, $level, $last_poll);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$item['restrictions'] = bluesky_get_restrictions_for_user($post, $item, $post_reason);
|
||||||
|
|
||||||
if (empty($item['post-reason'])) {
|
if (empty($item['post-reason'])) {
|
||||||
$item['post-reason'] = $post_reason;
|
$item['post-reason'] = $post_reason;
|
||||||
}
|
}
|
||||||
|
@ -1223,6 +1225,49 @@ function bluesky_get_header(stdClass $post, string $uri, int $uid, int $fetch_ui
|
||||||
return $item;
|
return $item;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function bluesky_get_restrictions_for_user(stdClass $post, array $item, int $post_reason): ?int
|
||||||
|
{
|
||||||
|
if (!empty($post->viewer->replyDisabled)) {
|
||||||
|
return Item::CANT_REPLY;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(empty($post->threadgate)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!isset($post->threadgate->record->allow)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($item['uid'] == 0) {
|
||||||
|
return Item::CANT_REPLY;
|
||||||
|
}
|
||||||
|
|
||||||
|
$restrict = true;
|
||||||
|
$type = '$type';
|
||||||
|
foreach ($post->threadgate->record->allow as $allow) {
|
||||||
|
switch ($allow->$type) {
|
||||||
|
case 'app.bsky.feed.threadgate#followingRule':
|
||||||
|
// Only followers can reply.
|
||||||
|
if (Contact::isFollower($item['author-id'], $item['uid'])) {
|
||||||
|
$restrict = false;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case 'app.bsky.feed.threadgate#mentionRule':
|
||||||
|
// Only mentioned accounts can reply.
|
||||||
|
if ($post_reason == Item::PR_TO) {
|
||||||
|
$restrict = false;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case 'app.bsky.feed.threadgate#listRule';
|
||||||
|
// Only accounts in the provided list can reply. We don't support this at the moment.
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $restrict ? Item::CANT_REPLY : null;
|
||||||
|
}
|
||||||
|
|
||||||
function bluesky_get_content(array $item, stdClass $record, string $uri, int $uid, int $fetch_uid, int $level, int $last_poll): array
|
function bluesky_get_content(array $item, stdClass $record, string $uri, int $uid, int $fetch_uid, int $level, int $last_poll): array
|
||||||
{
|
{
|
||||||
if (empty($item)) {
|
if (empty($item)) {
|
||||||
|
|
|
@ -8,7 +8,7 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: \n"
|
"Project-Id-Version: \n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2024-02-28 03:05+0000\n"
|
"POT-Creation-Date: 2024-03-22 05:31+0000\n"
|
||||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||||
|
@ -26,10 +26,12 @@ msgid "Allow your users to use your hostname for their Bluesky handles"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: bluesky.php:326
|
#: bluesky.php:326
|
||||||
|
#, php-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"Before enabling this option, you have to download and configure the bluesky-"
|
"Before enabling this option, you have to setup a wildcard domain "
|
||||||
"handles repository on your system. See https://git.friendi.ca/heluecht/"
|
"configuration and you have to enable wildcard requests in your webserver "
|
||||||
"bluesky-handles"
|
"configuration. On Apache this is done by adding \"ServerAlias *.%s\" to your "
|
||||||
|
"HTTP configuration. You don't need to change the HTTPS configuration."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: bluesky.php:354
|
#: bluesky.php:354
|
||||||
|
|
Loading…
Reference in a new issue