Merge pull request #12200 from annando/ignore-view
"View" activities are now ignored
This commit is contained in:
commit
e354f48765
3 changed files with 7 additions and 6 deletions
|
@ -559,6 +559,11 @@ class Receiver
|
|||
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')) {
|
||||
Logger::info('Empty object', ['activity' => $activity]);
|
||||
return true;
|
||||
|
|
|
@ -657,7 +657,7 @@ class Transmitter
|
|||
$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
|
||||
$networks = Protocol::FEDERATED;
|
||||
} 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
|
||||
$networks = Protocol::FEDERATED;
|
||||
} else {
|
||||
|
|
|
@ -720,10 +720,6 @@ return [
|
|||
// Store untrusted content in the inbox entries
|
||||
'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)
|
||||
// Logs every unknown ActivityPub activity
|
||||
'ap_log_unknown' => false,
|
||||
|
|
Loading…
Reference in a new issue