Added "follow" subscription message

src/Model/Notification.php

@@ -168,26 +168,33 @@ class Notification extends BaseModel
 	{
 		$message = [];
 
-		if ($notification['type'] == Post\UserNotification::NOTIF_NONE) {
-			return $message;
-		}
-
-		if (empty($notification['target-uri-id'])) {
-			return $message;
-		}
-
 		$user = User::getById($notification['uid']);
 		if (empty($user)) {
 			Logger::info('User not found', ['application' => $notification['uid']]);
 			return $message;
 		}
 
-		$causer = $contact = Contact::getById($notification['actor-id'], ['id', 'name', 'url']);
+		$l10n = DI::l10n()->withLang($user['language']);
+
+		$causer = $contact = Contact::getById($notification['actor-id'], ['id', 'name', 'url', 'pending']);
 		if (empty($contact)) {
 			Logger::info('Contact not found', ['contact' => $notification['actor-id']]);
 			return $message;
 		}
 
+		if ($notification['type'] == Post\UserNotification::NOTIF_NONE) {
+			if ($contact['pending']) {
+				$msg = $l10n->t('%1$s wants to follow you');
+			} else {
+				$msg = $l10n->t('%1$s had started following you');
+			}
+			$title = $contact['name'];
+			$link = DI::baseUrl() . '/contact/' . $contact['id'];
+		} else {
+			if (empty($notification['target-uri-id'])) {
+				return $message;
+			}
+
 			$like     = Verb::getID(Activity::LIKE);
 			$dislike  = Verb::getID(Activity::DISLIKE);
 			$announce = Verb::getID(Activity::ANNOUNCE);
@@ -238,8 +245,6 @@ class Notification extends BaseModel
 				$title = '';
 			}
 
-		$l10n = DI::l10n()->withLang($user['language']);
-
 			switch ($notification['vid']) {
 				case $like:
 					switch ($notification['type']) {
@@ -320,6 +325,7 @@ class Notification extends BaseModel
 					}
 					break;
 			}
+		}
 
 		if (!empty($msg)) {
 			// Name of the notification's causer

view/lang/C/messages.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2021.09-dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-22 03:57+0000\n"
+"POT-Creation-Date: 2021-08-22 08:26+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -4665,97 +4665,107 @@ msgstr ""
 msgid "[no subject]"
 msgstr ""
 
-#: src/Model/Notification.php:247
+#: src/Model/Notification.php:187
+#, php-format
+msgid "%1$s wants to follow you"
+msgstr ""
+
+#: src/Model/Notification.php:189
+#, php-format
+msgid "%1$s had started following you"
+msgstr ""
+
+#: src/Model/Notification.php:252
 #, php-format
 msgid "%1$s liked your comment %2$s"
 msgstr ""
 
-#: src/Model/Notification.php:250
+#: src/Model/Notification.php:255
 #, php-format
 msgid "%1$s liked your post %2$s"
 msgstr ""
 
-#: src/Model/Notification.php:257
+#: src/Model/Notification.php:262
 #, php-format
 msgid "%1$s disliked your comment %2$s"
 msgstr ""
 
-#: src/Model/Notification.php:260
+#: src/Model/Notification.php:265
 #, php-format
 msgid "%1$s disliked your post %2$s"
 msgstr ""
 
-#: src/Model/Notification.php:267
+#: src/Model/Notification.php:272
 #, php-format
 msgid "%1$s shared your comment %2$s"
 msgstr ""
 
-#: src/Model/Notification.php:270
+#: src/Model/Notification.php:275
 #, php-format
 msgid "%1$s shared your post %2$s"
 msgstr ""
 
-#: src/Model/Notification.php:277
+#: src/Model/Notification.php:282
 #, php-format
 msgid "%1$s tagged you on %2$s"
 msgstr ""
 
-#: src/Model/Notification.php:281
+#: src/Model/Notification.php:286
 #, php-format
 msgid "%1$s replied to you on %2$s"
 msgstr ""
 
-#: src/Model/Notification.php:285
+#: src/Model/Notification.php:290
 #, php-format
 msgid "%1$s commented in your thread %2$s"
 msgstr ""
 
-#: src/Model/Notification.php:289
+#: src/Model/Notification.php:294
 #, php-format
 msgid "%1$s commented on your comment %2$s"
 msgstr ""
 
-#: src/Model/Notification.php:295
+#: src/Model/Notification.php:300
 #, php-format
 msgid "%1$s commented in their thread %2$s"
 msgstr ""
 
-#: src/Model/Notification.php:297
+#: src/Model/Notification.php:302
 #, php-format
 msgid "%1$s commented in their thread"
 msgstr ""
 
-#: src/Model/Notification.php:299
+#: src/Model/Notification.php:304
 #, php-format
 msgid "%1$s commented in the thread %2$s from %3$s"
 msgstr ""
 
-#: src/Model/Notification.php:301
+#: src/Model/Notification.php:306
 #, php-format
 msgid "%1$s commented in the thread from %3$s"
 msgstr ""
 
-#: src/Model/Notification.php:306
+#: src/Model/Notification.php:311
 #, php-format
 msgid "%1$s commented on your thread %2$s"
 msgstr ""
 
-#: src/Model/Notification.php:311
+#: src/Model/Notification.php:316
 #, php-format
 msgid "%1$s shared the post %2$s from %3$s"
 msgstr ""
 
-#: src/Model/Notification.php:313
+#: src/Model/Notification.php:318
 #, php-format
 msgid "%1$s shared a post from %3$s"
 msgstr ""
 
-#: src/Model/Notification.php:315
+#: src/Model/Notification.php:320
 #, php-format
 msgid "%1$s shared the post %2$s"
 msgstr ""
 
-#: src/Model/Notification.php:317
+#: src/Model/Notification.php:322
 #, php-format
 msgid "%1$s shared a post"
 msgstr ""