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

Added "follow" subscription message

This commit is contained in:
Michael 2021-08-22 08:27:56 +00:00
parent 59045b2e23
commit e9c63ff075
2 changed files with 165 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/Model/Notification.php
View File

@ -168,26 +168,33 @@ class Notification extends BaseModel
{ {
$message = []; $message = [];
if ($notification['type'] == Post\UserNotification::NOTIF_NONE) {
return $message;
}
if (empty($notification['target-uri-id'])) {
return $message;
}
$user = User::getById($notification['uid']); $user = User::getById($notification['uid']);
if (empty($user)) { if (empty($user)) {
Logger::info('User not found', ['application' => $notification['uid']]); Logger::info('User not found', ['application' => $notification['uid']]);
return $message; 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)) { if (empty($contact)) {
Logger::info('Contact not found', ['contact' => $notification['actor-id']]); Logger::info('Contact not found', ['contact' => $notification['actor-id']]);
return $message; 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); $like = Verb::getID(Activity::LIKE);
$dislike = Verb::getID(Activity::DISLIKE); $dislike = Verb::getID(Activity::DISLIKE);
$announce = Verb::getID(Activity::ANNOUNCE); $announce = Verb::getID(Activity::ANNOUNCE);
@ -238,8 +245,6 @@ class Notification extends BaseModel
$title = ''; $title = '';
} }
$l10n = DI::l10n()->withLang($user['language']);
switch ($notification['vid']) { switch ($notification['vid']) {
case $like: case $like:
switch ($notification['type']) { switch ($notification['type']) {
@ -320,6 +325,7 @@ class Notification extends BaseModel
} }
break; break;
} }
}
if (!empty($msg)) { if (!empty($msg)) {
// Name of the notification's causer // Name of the notification's causer

50
view/lang/C/messages.po
View File

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