clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #12200 from annando/ignore-view 

"View" activities are now ignored
This commit is contained in:
Hypolite Petovan 2022-11-17 15:28:34 -05:00 committed by GitHub
parent 19db2ab184 cdbfa34066
commit e354f48765
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Protocol/ActivityPub/Receiver.php
View File

@ -559,6 +559,11 @@ class Receiver
return true; return true;
} }
if ($type == 'as:View') {
Logger::info('View activities are ignored.', ['signer' => $signer, 'http_signer' => $http_signer]);
return true;
}
if (!JsonLD::fetchElement($activity, 'as:object', '@id')) { if (!JsonLD::fetchElement($activity, 'as:object', '@id')) {
Logger::info('Empty object', ['activity' => $activity]); Logger::info('Empty object', ['activity' => $activity]);
return true; return true;

4
src/Protocol/ActivityPub/Transmitter.php
View File

@ -657,7 +657,7 @@ class Transmitter
$is_forum_thread = false; $is_forum_thread = false;
} }
if (self::isAnnounce($item) || DI::config()->get('debug', 'total_ap_delivery') || self::isAPPost($last_id)) { if (self::isAnnounce($item) || self::isAPPost($last_id)) {
// Will be activated in a later step // Will be activated in a later step
$networks = Protocol::FEDERATED; $networks = Protocol::FEDERATED;
} else { } else {
@ -902,7 +902,7 @@ class Transmitter
} }
} }
if (DI::config()->get('debug', 'total_ap_delivery') || $all_ap) { if ($all_ap) {
// Will be activated in a later step // Will be activated in a later step
$networks = Protocol::FEDERATED; $networks = Protocol::FEDERATED;
} else { } else {

4
static/defaults.config.php
View File

@ -720,10 +720,6 @@ return [
// Store untrusted content in the inbox entries // Store untrusted content in the inbox entries
'ap_inbox_store_untrusted' => false, 'ap_inbox_store_untrusted' => false,
// total_ap_delivery (Boolean)
// Deliver via AP to every possible receiver and we suppress the delivery to these contacts with other protocols
'total_ap_delivery' => false,
// ap_log_unknown (Boolean) // ap_log_unknown (Boolean)
// Logs every unknown ActivityPub activity // Logs every unknown ActivityPub activity
'ap_log_unknown' => false, 'ap_log_unknown' => false,