tobias/friendica
1
0
Fork 0
Code Pull requests Activity

changed priority of messages

Browse source
This commit is contained in:
Michael 2020-01-08 22:36:31 +00:00
parent d9ea0fea87
commit 3bf7664ee3
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
include/enotify.php
View file

@ -184,10 +184,10 @@ function notification($params)
// First go for the general message // First go for the general message
// "George Bull's post" // "George Bull's post"
if ($params['activity']['explicit_tagged']) { if ($params['activity']['origin_comment']) {
$message = '%1$s tagged you on %2$s\'s %3$s %4$s';
} elseif ($params['activity']['origin_comment']) {
$message = '%1$s replied to you on %2$s\'s %3$s %4$s'; $message = '%1$s replied to you on %2$s\'s %3$s %4$s';
} elseif ($params['activity']['explicit_tagged']) {
$message = '%1$s tagged you on %2$s\'s %3$s %4$s';
} else { } else {
$message = '%1$s commented on %2$s\'s %3$s %4$s'; $message = '%1$s commented on %2$s\'s %3$s %4$s';
} }
@ -198,10 +198,10 @@ function notification($params)
// "your post" // "your post"
if ($params['activity']['origin_thread']) { if ($params['activity']['origin_thread']) {
if ($params['activity']['explicit_tagged']) { if ($params['activity']['origin_comment']) {
$message = '%1$s tagged you on your %2$s %3$s';
} elseif ($params['activity']['origin_comment']) {
$message = '%1$s replied to you on your %2$s %3$s'; $message = '%1$s replied to you on your %2$s %3$s';
} elseif ($params['activity']['explicit_tagged']) {
$message = '%1$s tagged you on your %2$s %3$s';
} else { } else {
$message = '%1$s commented on your %2$s %3$s'; $message = '%1$s commented on your %2$s %3$s';
} }
@ -209,10 +209,10 @@ function notification($params)
$dest_str = $l10n->t($message, $params['source_name'], $item_post_type, $title); $dest_str = $l10n->t($message, $params['source_name'], $item_post_type, $title);
// "their post" // "their post"
} elseif ($item['author-link'] == $params['source_link']) { } elseif ($item['author-link'] == $params['source_link']) {
if ($params['activity']['explicit_tagged']) { if ($params['activity']['origin_comment']) {
$message = '%1$s tagged you on their %2$s %3$s';
} elseif ($params['activity']['origin_comment']) {
$message = '%1$s replied to you on their %2$s %3$s'; $message = '%1$s replied to you on their %2$s %3$s';
} elseif ($params['activity']['explicit_tagged']) {
$message = '%1$s tagged you on their %2$s %3$s';
} else { } else {
$message = '%1$s commented on their %2$s %3$s'; $message = '%1$s commented on their %2$s %3$s';
} }

3
src/Content/Text/BBCode.php
View file

@ -967,6 +967,9 @@ class BBCode
$attributes['avatar'] = ($author_contact['micro'] ?? '') ?: $attributes['avatar']; $attributes['avatar'] = ($author_contact['micro'] ?? '') ?: $attributes['avatar'];
$attributes['profile'] = ($author_contact['url'] ?? '') ?: $attributes['profile']; $attributes['profile'] = ($author_contact['url'] ?? '') ?: $attributes['profile'];
// $author_contact['url'] could be empty. So then we fill it with the profile
$author_contact['url'] = ($attributes['profile'] ?? '') ?: $author_contact['url'];
if ($attributes['avatar']) { if ($attributes['avatar']) {
$attributes['avatar'] = ProxyUtils::proxifyUrl($attributes['avatar'], false, ProxyUtils::SIZE_THUMB); $attributes['avatar'] = ProxyUtils::proxifyUrl($attributes['avatar'], false, ProxyUtils::SIZE_THUMB);
} }