diff options
| author | Mario <mario@mariovavti.com> | 2023-07-11 18:57:18 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2023-07-11 18:57:18 +0000 |
| commit | 63fb8d03929189bfc8cbf53d23cb79984fe2c3cd (patch) | |
| tree | b9f74bd8c7721dca7ece251fdbb9a7c4fe9b949a /Zotlabs/Lib/Enotify.php | |
| parent | 57796a2f962d045445cbf69237bb3d6786e4d0d4 (diff) | |
| parent | 384de0925e502cfa8fe6ca287530ef5529fdff10 (diff) | |
| download | volse-hubzilla-63fb8d03929189bfc8cbf53d23cb79984fe2c3cd.tar.gz volse-hubzilla-63fb8d03929189bfc8cbf53d23cb79984fe2c3cd.tar.bz2 volse-hubzilla-63fb8d03929189bfc8cbf53d23cb79984fe2c3cd.zip | |
Merge branch '8.6RC'8.6
Diffstat (limited to 'Zotlabs/Lib/Enotify.php')
| -rw-r--r-- | Zotlabs/Lib/Enotify.php | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php index 585761cc4..c3f96e103 100644 --- a/Zotlabs/Lib/Enotify.php +++ b/Zotlabs/Lib/Enotify.php @@ -145,7 +145,7 @@ class Enotify { $itemlink = $params['link']; - $action = t('commented on'); + $action = (($moderated) ? t('requested to comment on') : t('commented on')); if(array_key_exists('item',$params)) { @@ -158,10 +158,10 @@ class Enotify { } if(activity_match($params['verb'], ACTIVITY_LIKE)) - $action = t('liked'); + $action = (($moderated) ? t('requested to like') : t('liked')); if(activity_match($params['verb'], ACTIVITY_DISLIKE)) - $action = t('disliked'); + $action = (($moderated) ? t('requested to dislike') : t('disliked')); } @@ -307,7 +307,14 @@ class Enotify { $parent_item = $p[0]; - $verb = ((activity_match($params['item']['verb'], ACTIVITY_DISLIKE)) ? t('disliked') : t('liked')); + //$verb = ((activity_match($params['item']['verb'], ACTIVITY_DISLIKE)) ? t('disliked') : t('liked')); + $moderated = (($params['item']['item_blocked'] == ITEM_MODERATED) ? true : false); + + if(activity_match($params['item']['verb'], ACTIVITY_LIKE)) + $verb = (($moderated) ? t('requested to like') : t('liked')); + + if(activity_match($params['item']['verb'], ACTIVITY_DISLIKE)) + $verb = (($moderated) ? t('requested to dislike') : t('disliked')); // "your post" if($p[0]['owner']['xchan_name'] === $p[0]['author']['xchan_name'] && intval($p[0]['item_wall'])) |