Merge pull request #9713 from annando/annando/issue9712

Comment to Twitter post is posted to AP instead
This commit is contained in:
Tobias Diekershoff 2020-12-28 08:08:02 +01:00 committed by GitHub
commit cf65725373
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -766,6 +766,11 @@ class Notifier
*/ */
private static function activityPubDelivery($cmd, array $target_item, array $parent, array $thr_parent, $priority, $created, $owner) private static function activityPubDelivery($cmd, array $target_item, array $parent, array $thr_parent, $priority, $created, $owner)
{ {
// Don't deliver via AP when the starting post isn't from a federated network
if (!in_array($parent['network'], Protocol::FEDERATED)) {
return 0;
}
// Don't deliver via AP when the starting post is delivered via Diaspora // Don't deliver via AP when the starting post is delivered via Diaspora
if ($parent['network'] == Protocol::DIASPORA) { if ($parent['network'] == Protocol::DIASPORA) {
return 0; return 0;