Merge remote-tracking branch 'upstream/2021.09-rc' into user-contact

2021-09-12 12:36:04 +00:00
parent eeec6aaeb9 5246b9c4b0
commit 19c3e55ca8
22 changed files with 2030 additions and 1835 deletions
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -744,7 +744,7 @@ class Notifier

 		// Also don't deliver when the direct thread parent was delivered via Diaspora
 		if ($thr_parent['network'] == Protocol::DIASPORA) {
-			Logger::info('Threat parent network is Diaspora, so no AP delivery');
+			Logger::info('Thread parent network is Diaspora, so no AP delivery');
 			return ['count' => 0, 'contacts' => []];
 		}