<?php
/**
- * @file include/enotify.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
*/
use Friendica\Content\Text\BBCode;
$item_id = 0;
}
+ if (isset($params['item']['uri-id'])) {
+ $uri_id = $params['item']['uri-id'];
+ } else {
+ $uri_id = 0;
+ }
+
if (isset($params['parent'])) {
$parent_id = $params['parent'];
} else {
$parent_id = 0;
}
+ if (isset($params['item']['parent-uri-id'])) {
+ $parent_uri_id = $params['item']['parent-uri-id'];
+ } else {
+ $parent_uri_id = 0;
+ }
+
$epreamble = '';
$preamble = '';
$subject = '';
// "George Bull's post"
if ($params['activity']['origin_comment']) {
- $message = '%1$s replied to you on %2$s\'s %3$s %4$s';
+ $message = $l10n->t('%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';
+ $message = $l10n->t('%1$s tagged you on %2$s\'s %3$s %4$s');
} else {
- $message = '%1$s commented on %2$s\'s %3$s %4$s';
+ $message = $l10n->t('%1$s commented on %2$s\'s %3$s %4$s');
}
- $dest_str = $l10n->t($message, $params['source_name'], $item['author-name'], $item_post_type, $title);
+ $dest_str = sprintf($message, $params['source_name'], $item['author-name'], $item_post_type, $title);
// Then look for the special cases
// "your post"
if ($params['activity']['origin_thread']) {
if ($params['activity']['origin_comment']) {
- $message = '%1$s replied to you on your %2$s %3$s';
+ $message = $l10n->t('%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';
+ $message = $l10n->t('%1$s tagged you on your %2$s %3$s');
} else {
- $message = '%1$s commented on your %2$s %3$s';
+ $message = $l10n->t('%1$s commented on your %2$s %3$s');
}
- $dest_str = $l10n->t($message, $params['source_name'], $item_post_type, $title);
+ $dest_str = sprintf($message, $params['source_name'], $item_post_type, $title);
// "their post"
} elseif ($item['author-link'] == $params['source_link']) {
if ($params['activity']['origin_comment']) {
- $message = '%1$s replied to you on their %2$s %3$s';
+ $message = $l10n->t('%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';
+ $message = $l10n->t('%1$s tagged you on their %2$s %3$s');
} else {
- $message = '%1$s commented on their %2$s %3$s';
+ $message = $l10n->t('%1$s commented on their %2$s %3$s');
}
- $dest_str = $l10n->t($message, $params['source_name'], $item_post_type, $title);
+ $dest_str = sprintf($message, $params['source_name'], $item_post_type, $title);
}
// Some mail software relies on subject field for threading.
if ($show_in_notification_page) {
$notification = DI::notify()->insert([
- 'name' => $params['source_name'] ?? '',
- 'name_cache' => strip_tags(BBCode::convert($params['source_name'] ?? '')),
- 'url' => $params['source_link'] ?? '',
- 'photo' => $params['source_photo'] ?? '',
- 'link' => $itemlink ?? '',
- 'uid' => $params['uid'] ?? 0,
- 'iid' => $item_id ?? 0,
- 'parent' => $parent_id ?? 0,
- 'type' => $params['type'] ?? '',
- 'verb' => $params['verb'] ?? '',
- 'otype' => $params['otype'] ?? '',
+ 'name' => $params['source_name'] ?? '',
+ 'name_cache' => substr(strip_tags(BBCode::convert($params['source_name'] ?? '')), 0, 255),
+ 'url' => $params['source_link'] ?? '',
+ 'photo' => $params['source_photo'] ?? '',
+ 'link' => $itemlink ?? '',
+ 'uid' => $params['uid'] ?? 0,
+ 'iid' => $item_id,
+ 'uri-id' => $uri_id,
+ 'parent' => $parent_id,
+ 'parent-uri-id' => $parent_uri_id,
+ 'type' => $params['type'] ?? '',
+ 'verb' => $params['verb'] ?? '',
+ 'otype' => $params['otype'] ?? '',
]);
$notification->msg = Renderer::replaceMacros($epreamble, ['$itemlink' => $notification->link]);
if (!DBA::exists('notify-threads', ['master-parent-item' => $params['parent'], 'receiver-uid' => $params['uid']])) {
Logger::log("notify_id:" . intval($notify_id) . ", parent: " . intval($params['parent']) . "uid: " . intval($params['uid']), Logger::DEBUG);
- $fields = ['notify-id' => $notify_id, 'master-parent-item' => $params['parent'],
- 'receiver-uid' => $params['uid'], 'parent-item' => 0];
+ $fields = ['notify-id' => $notify_id, 'master-parent-item' => $params['parent'],
+ 'master-parent-uri-id' => $parent_uri_id,
+ 'receiver-uid' => $params['uid'], 'parent-item' => 0];
DBA::insert('notify-threads', $fields);
$additional_mail_header .= "Message-ID: <${id_for_parent}>\n";
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
function check_item_notification($itemid, $uid, $notification_type) {
- $fields = ['id', 'mention', 'tag', 'parent', 'title', 'body',
+ $fields = ['id', 'uri-id', 'mention', 'parent', 'parent-uri-id', 'title', 'body',
'author-link', 'author-name', 'author-avatar', 'author-id',
'guid', 'parent-uri', 'uri', 'contact-id', 'network'];
$condition = ['id' => $itemid, 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT], 'deleted' => false];
projects / friendica.git / blobdiff