X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fitem.php;h=636bd8c3193496c719488060f29d373f99d48c81;hb=01640a7045e146759bc936dd499ac27738b78940;hp=34882497e40e2d70fdaef77a4127e1bbcf22b7a3;hpb=962724bec71aa15e7b83228c58fbd4709f439077;p=friendica.git diff --git a/mod/item.php b/mod/item.php index 34882497e4..636bd8c319 100644 --- a/mod/item.php +++ b/mod/item.php @@ -1,9 +1,22 @@ . + * * This is the POST destination for most all locally posted * text stuff. This function handles status, wall-to-wall status, * local comments, and remote coments that are posted on this site @@ -18,27 +31,27 @@ use Friendica\App; use Friendica\Content\Pager; use Friendica\Content\Text\BBCode; -use Friendica\Content\Text\HTML; -use Friendica\Core\Config; use Friendica\Core\Hook; -use Friendica\Core\L10n; use Friendica\Core\Logger; use Friendica\Core\Protocol; -use Friendica\Core\System; use Friendica\Core\Session; +use Friendica\Core\System; use Friendica\Core\Worker; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Model\Attach; use Friendica\Model\Contact; use Friendica\Model\Conversation; use Friendica\Model\FileTag; use Friendica\Model\Item; +use Friendica\Model\Notify\Type; use Friendica\Model\Photo; use Friendica\Model\Term; +use Friendica\Network\HTTPException; +use Friendica\Object\EMail\ItemCCEMail; +use Friendica\Protocol\Activity; use Friendica\Protocol\Diaspora; -use Friendica\Protocol\Email; use Friendica\Util\DateTimeFormat; -use Friendica\Util\Emailer; use Friendica\Util\Security; use Friendica\Util\Strings; use Friendica\Worker\Delivery; @@ -47,7 +60,7 @@ require_once __DIR__ . '/../include/items.php'; function item_post(App $a) { if (!Session::isAuthenticated()) { - return 0; + throw new HTTPException\ForbiddenException(); } $uid = local_user(); @@ -56,20 +69,19 @@ function item_post(App $a) { $arr_drop = explode(',', $_REQUEST['dropitems']); drop_items($arr_drop); $json = ['success' => 1]; - echo json_encode($json); - exit(); + System::jsonExit($json); } Hook::callAll('post_local_start', $_REQUEST); - Logger::log('postvars ' . print_r($_REQUEST, true), Logger::DATA); + Logger::debug('postvars', ['_REQUEST' => $_REQUEST]); - $api_source = defaults($_REQUEST, 'api_source', false); + $api_source = $_REQUEST['api_source'] ?? false; $message_id = ((!empty($_REQUEST['message_id']) && $api_source) ? strip_tags($_REQUEST['message_id']) : ''); - $return_path = defaults($_REQUEST, 'return', ''); - $preview = intval(defaults($_REQUEST, 'preview', 0)); + $return_path = $_REQUEST['return'] ?? ''; + $preview = intval($_REQUEST['preview'] ?? 0); /* * Check for doubly-submitted posts, and reject duplicates @@ -78,16 +90,16 @@ function item_post(App $a) { */ if (!$preview && !empty($_REQUEST['post_id_random'])) { if (!empty($_SESSION['post-random']) && $_SESSION['post-random'] == $_REQUEST['post_id_random']) { - Logger::log("item post: duplicate post", Logger::DEBUG); - item_post_return(System::baseUrl(), $api_source, $return_path); + Logger::info('item post: duplicate post'); + item_post_return(DI::baseUrl(), $api_source, $return_path); } else { $_SESSION['post-random'] = $_REQUEST['post_id_random']; } } // Is this a reply to something? - $toplevel_item_id = intval(defaults($_REQUEST, 'parent', 0)); - $thr_parent_uri = trim(defaults($_REQUEST, 'parent_uri', '')); + $toplevel_item_id = intval($_REQUEST['parent'] ?? 0); + $thr_parent_uri = trim($_REQUEST['parent_uri'] ?? ''); $thread_parent_id = 0; $thread_parent_contact = null; @@ -98,8 +110,8 @@ function item_post(App $a) { $parent_contact = null; $objecttype = null; - $profile_uid = defaults($_REQUEST, 'profile_uid', local_user()); - $posttype = defaults($_REQUEST, 'post_type', Item::PT_ARTICLE); + $profile_uid = ($_REQUEST['profile_uid'] ?? 0) ?: local_user(); + $posttype = ($_REQUEST['post_type'] ?? '') ?: Item::PT_ARTICLE; if ($toplevel_item_id || $thr_parent_uri) { if ($toplevel_item_id) { @@ -121,27 +133,27 @@ function item_post(App $a) { } if (!DBA::isResult($toplevel_item)) { - notice(L10n::t('Unable to locate original post.') . EOL); - if (!empty($_REQUEST['return'])) { - $a->internalRedirect($return_path); + notice(DI::l10n()->t('Unable to locate original post.')); + if ($return_path) { + DI::baseUrl()->redirect($return_path); } - exit(); + throw new HTTPException\NotFoundException(DI::l10n()->t('Unable to locate original post.')); } $toplevel_item_id = $toplevel_item['id']; $parent_user = $toplevel_item['uid']; - $objecttype = ACTIVITY_OBJ_COMMENT; + $objecttype = Activity\ObjectType::COMMENT; } if ($toplevel_item_id) { - Logger::info('mod_item: item_post parent=' . $toplevel_item_id); + Logger::info('mod_item: item_post', ['parent' => $toplevel_item_id]); } - $post_id = intval(defaults($_REQUEST, 'post_id', 0)); - $app = strip_tags(defaults($_REQUEST, 'source', '')); - $extid = strip_tags(defaults($_REQUEST, 'extid', '')); - $object = defaults($_REQUEST, 'object', ''); + $post_id = intval($_REQUEST['post_id'] ?? 0); + $app = strip_tags($_REQUEST['source'] ?? ''); + $extid = strip_tags($_REQUEST['extid'] ?? ''); + $object = $_REQUEST['object'] ?? ''; // Don't use "defaults" here. It would turn 0 to 1 if (!isset($_REQUEST['wall'])) { @@ -158,7 +170,7 @@ function item_post(App $a) { // Check for multiple posts with the same message id (when the post was created via API) if (($message_id != '') && ($profile_uid != 0)) { if (Item::exists(['uri' => $message_id, 'uid' => $profile_uid])) { - Logger::log("Message with URI ".$message_id." already exists for user ".$profile_uid, Logger::DEBUG); + Logger::info('Message already exists for user', ['uri' => $message_id, 'uid' => $profile_uid]); return 0; } } @@ -168,13 +180,12 @@ function item_post(App $a) { // Now check that valid personal details have been provided if (!Security::canWriteToUserWall($profile_uid) && !$allow_comment) { - notice(L10n::t('Permission denied.') . EOL); - - if (!empty($_REQUEST['return'])) { - $a->internalRedirect($return_path); + notice(DI::l10n()->t('Permission denied.')); + if ($return_path) { + DI::baseUrl()->redirect($return_path); } - exit(); + throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.')); } // Init post instance @@ -194,20 +205,20 @@ function item_post(App $a) { $categories = ''; $postopts = ''; $emailcc = ''; - $body = defaults($_REQUEST, 'body', ''); - $has_attachment = defaults($_REQUEST, 'has_attachment', 0); + $body = $_REQUEST['body'] ?? ''; + $has_attachment = $_REQUEST['has_attachment'] ?? 0; // If we have a speparate attachment, we need to add it to the body. if (!empty($has_attachment)) { - $attachment_type = defaults($_REQUEST, 'attachment_type', ''); - $attachment_title = defaults($_REQUEST, 'attachment_title', ''); - $attachment_text = defaults($_REQUEST, 'attachment_text', ''); + $attachment_type = $_REQUEST['attachment_type'] ?? ''; + $attachment_title = $_REQUEST['attachment_title'] ?? ''; + $attachment_text = $_REQUEST['attachment_text'] ?? ''; - $attachment_url = hex2bin(defaults($_REQUEST, 'attachment_url', '')); - $attachment_img_src = hex2bin(defaults($_REQUEST, 'attachment_img_src', '')); + $attachment_url = hex2bin($_REQUEST['attachment_url'] ?? ''); + $attachment_img_src = hex2bin($_REQUEST['attachment_img_src'] ?? ''); - $attachment_img_width = defaults($_REQUEST, 'attachment_img_width', 0); - $attachment_img_height = defaults($_REQUEST, 'attachment_img_height', 0); + $attachment_img_width = $_REQUEST['attachment_img_width'] ?? 0; + $attachment_img_height = $_REQUEST['attachment_img_height'] ?? 0; $attachment = [ 'type' => $attachment_type, 'title' => $attachment_title, @@ -230,7 +241,7 @@ function item_post(App $a) { } // Convert links with empty descriptions to links without an explicit description - $body = preg_replace('(\[url=(.*?)\]\[\/url\])ism', '[url]$1[/url]', $body); + $body = preg_replace('#\[url=([^\]]*?)\]\[/url\]#ism', '[url]$1[/url]', $body); if (!empty($orig_post)) { $str_group_allow = $orig_post['allow_gid']; @@ -244,7 +255,7 @@ function item_post(App $a) { $app = $orig_post['app']; $categories = $orig_post['file']; $title = Strings::escapeTags(trim($_REQUEST['title'])); - $body = Strings::escapeHtml(trim($body)); + $body = trim($body); $private = $orig_post['private']; $pubmail_enabled = $orig_post['pubmail']; $network = $orig_post['network']; @@ -269,22 +280,25 @@ function item_post(App $a) { $str_contact_deny = $user['deny_cid']; } else { // use the posted permissions - $str_group_allow = perms2str(defaults($_REQUEST, 'group_allow', '')); - $str_contact_allow = perms2str(defaults($_REQUEST, 'contact_allow', '')); - $str_group_deny = perms2str(defaults($_REQUEST, 'group_deny', '')); - $str_contact_deny = perms2str(defaults($_REQUEST, 'contact_deny', '')); + + $aclFormatter = DI::aclFormatter(); + + $str_group_allow = $aclFormatter->toString($_REQUEST['group_allow'] ?? ''); + $str_contact_allow = $aclFormatter->toString($_REQUEST['contact_allow'] ?? ''); + $str_group_deny = $aclFormatter->toString($_REQUEST['group_deny'] ?? ''); + $str_contact_deny = $aclFormatter->toString($_REQUEST['contact_deny'] ?? ''); } - $title = Strings::escapeTags(trim(defaults($_REQUEST, 'title' , ''))); - $location = Strings::escapeTags(trim(defaults($_REQUEST, 'location', ''))); - $coord = Strings::escapeTags(trim(defaults($_REQUEST, 'coord' , ''))); - $verb = Strings::escapeTags(trim(defaults($_REQUEST, 'verb' , ''))); - $emailcc = Strings::escapeTags(trim(defaults($_REQUEST, 'emailcc' , ''))); - $body = Strings::escapeHtml(trim($body)); - $network = Strings::escapeTags(trim(defaults($_REQUEST, 'network' , Protocol::DFRN))); + $title = Strings::escapeTags(trim($_REQUEST['title'] ?? '')); + $location = Strings::escapeTags(trim($_REQUEST['location'] ?? '')); + $coord = Strings::escapeTags(trim($_REQUEST['coord'] ?? '')); + $verb = Strings::escapeTags(trim($_REQUEST['verb'] ?? '')); + $emailcc = Strings::escapeTags(trim($_REQUEST['emailcc'] ?? '')); + $body = trim($body); + $network = Strings::escapeTags(trim(($_REQUEST['network'] ?? '') ?: Protocol::DFRN)); $guid = System::createUUID(); - $postopts = defaults($_REQUEST, 'postopts', ''); + $postopts = $_REQUEST['postopts'] ?? ''; $private = ((strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) ? 1 : 0); @@ -307,24 +321,26 @@ function item_post(App $a) { $wall = $toplevel_item['wall']; } - $pubmail_enabled = defaults($_REQUEST, 'pubmail_enable', false) && !$private; + $pubmail_enabled = ($_REQUEST['pubmail_enable'] ?? false) && !$private; // if using the API, we won't see pubmail_enable - figure out if it should be set if ($api_source && $profile_uid && $profile_uid == local_user() && !$private) { - if (function_exists('imap_open') && !Config::get('system', 'imap_disabled')) { + if (function_exists('imap_open') && !DI::config()->get('system', 'imap_disabled')) { $pubmail_enabled = DBA::exists('mailacct', ["`uid` = ? AND `server` != ? AND `pubmail`", local_user(), '']); } } if (!strlen($body)) { if ($preview) { - exit(); + System::jsonExit(['preview' => '']); } - info(L10n::t('Empty post discarded.') . EOL); - if (!empty($_REQUEST['return'])) { - $a->internalRedirect($return_path); + + info(DI::l10n()->t('Empty post discarded.')); + if ($return_path) { + DI::baseUrl()->redirect($return_path); } - exit(); + + throw new HTTPException\BadRequestException(DI::l10n()->t('Empty post discarded.')); } } @@ -335,7 +351,7 @@ function item_post(App $a) { // save old and new categories, so we can determine what needs to be deleted from pconfig $categories_old = $categories; - $categories = FileTag::listToFile(trim(defaults($_REQUEST, 'category', '')), 'category'); + $categories = FileTag::listToFile(trim($_REQUEST['category'] ?? ''), 'category'); $categories_new = $categories; if (!empty($filedas) && is_array($filedas)) { @@ -460,7 +476,7 @@ function item_post(App $a) { $match = null; if (!$preview && Photo::setPermissionFromBody($body, $profile_uid, $original_contact_id, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny)) { - $objecttype = ACTIVITY_OBJ_IMAGE; + $objecttype = Activity\ObjectType::IMAGE; } /* @@ -496,28 +512,24 @@ function item_post(App $a) { if ((preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", $body, $match, PREG_SET_ORDER) || isset($data["type"])) && ($posttype != Item::PT_PERSONAL_NOTE)) { $posttype = Item::PT_PAGE; - $objecttype = ACTIVITY_OBJ_BOOKMARK; + $objecttype = Activity\ObjectType::BOOKMARK; } - $body = bb_translate_video($body); - + $body = DI::bbCodeVideo()->transform($body); - // Fold multi-line [code] sequences - $body = preg_replace('/\[\/code\]\s*\[code\]/ism', "\n", $body); - - $body = BBCode::scaleExternalImages($body, false); + $body = BBCode::scaleExternalImages($body); // Setting the object type if not defined before if (!$objecttype) { - $objecttype = ACTIVITY_OBJ_NOTE; // Default value + $objecttype = Activity\ObjectType::NOTE; // Default value $objectdata = BBCode::getAttachedData($body); if ($objectdata["type"] == "link") { - $objecttype = ACTIVITY_OBJ_BOOKMARK; + $objecttype = Activity\ObjectType::BOOKMARK; } elseif ($objectdata["type"] == "video") { - $objecttype = ACTIVITY_OBJ_VIDEO; + $objecttype = Activity\ObjectType::VIDEO; } elseif ($objectdata["type"] == "photo") { - $objecttype = ACTIVITY_OBJ_IMAGE; + $objecttype = Activity\ObjectType::IMAGE; } } @@ -533,7 +545,7 @@ function item_post(App $a) { if (strlen($attachments)) { $attachments .= ','; } - $attachments .= '[attach]href="' . System::baseUrl() . '/attach/' . $attachment['id'] . + $attachments .= '[attach]href="' . DI::baseUrl() . '/attach/' . $attachment['id'] . '" length="' . $attachment['filesize'] . '" type="' . $attachment['filetype'] . '" title="' . ($attachment['filename'] ? $attachment['filename'] : '') . '"[/attach]'; } @@ -542,7 +554,7 @@ function item_post(App $a) { } if (!strlen($verb)) { - $verb = ACTIVITY_POST; + $verb = Activity::POST; } if ($network == "") { @@ -644,6 +656,9 @@ function item_post(App $a) { if ($orig_post) { $datarray['edit'] = true; } else { + // If this was a share, add missing data here + $datarray = Item::addShareDataFromOriginal($datarray); + $datarray['edit'] = false; } @@ -660,27 +675,25 @@ function item_post(App $a) { $datarray["item_id"] = -1; $datarray["author-network"] = Protocol::DFRN; - $o = conversation($a, [array_merge($contact_record, $datarray)], new Pager($a->query_string), 'search', false, true); - Logger::log('preview: ' . $o); - echo json_encode(['preview' => $o]); - exit(); + $o = conversation($a, [array_merge($contact_record, $datarray)], new Pager(DI::args()->getQueryString()), 'search', false, true); + + System::jsonExit(['preview' => $o]); } Hook::callAll('post_local',$datarray); if (!empty($datarray['cancel'])) { - Logger::log('mod_item: post cancelled by addon.'); + Logger::info('mod_item: post cancelled by addon.'); if ($return_path) { - $a->internalRedirect($return_path); + DI::baseUrl()->redirect($return_path); } $json = ['cancel' => 1]; if (!empty($_REQUEST['jsreload'])) { - $json['reload'] = System::baseUrl() . '/' . $_REQUEST['jsreload']; + $json['reload'] = DI::baseUrl() . '/' . $_REQUEST['jsreload']; } - echo json_encode($json); - exit(); + System::jsonExit($json); } if ($orig_post) { @@ -704,11 +717,12 @@ function item_post(App $a) { // update filetags in pconfig FileTag::updatePconfig($uid, $categories_old, $categories_new, 'category'); - if (!empty($_REQUEST['return']) && strlen($return_path)) { - Logger::log('return: ' . $return_path); - $a->internalRedirect($return_path); + info(DI::l10n()->t('Post updated.')); + if ($return_path) { + DI::baseUrl()->redirect($return_path); } - exit(); + + throw new HTTPException\OKException(DI::l10n()->t('Post updated.')); } unset($datarray['edit']); @@ -725,15 +739,23 @@ function item_post(App $a) { $post_id = Item::insert($datarray); if (!$post_id) { - Logger::log("Item wasn't stored."); - $a->internalRedirect($return_path); + info(DI::l10n()->t('Item wasn\'t stored.')); + if ($return_path) { + DI::baseUrl()->redirect($return_path); + } + + throw new HTTPException\InternalServerErrorException(DI::l10n()->t('Item wasn\'t stored.')); } $datarray = Item::selectFirst(Item::ITEM_FIELDLIST, ['id' => $post_id]); if (!DBA::isResult($datarray)) { - Logger::log("Item with id ".$post_id." couldn't be fetched."); - $a->internalRedirect($return_path); + Logger::error('Item couldn\'t be fetched.', ['post_id' => $post_id]); + if ($return_path) { + DI::baseUrl()->redirect($return_path); + } + + throw new HTTPException\InternalServerErrorException(DI::l10n()->t('Item couldn\'t be fetched.')); } // update filetags in pconfig @@ -743,18 +765,18 @@ function item_post(App $a) { if ($toplevel_item_id) { if ($contact_record != $author) { notification([ - 'type' => NOTIFY_COMMENT, + 'type' => Type::COMMENT, 'notify_flags' => $user['notify-flags'], 'language' => $user['language'], 'to_name' => $user['username'], 'to_email' => $user['email'], 'uid' => $user['uid'], 'item' => $datarray, - 'link' => System::baseUrl().'/display/'.urlencode($datarray['guid']), + 'link' => DI::baseUrl().'/display/'.urlencode($datarray['guid']), 'source_name' => $datarray['author-name'], 'source_link' => $datarray['author-link'], 'source_photo' => $datarray['author-avatar'], - 'verb' => ACTIVITY_POST, + 'verb' => Activity::POST, 'otype' => 'item', 'parent' => $toplevel_item_id, 'parent_uri' => $toplevel_item['uri'] @@ -763,18 +785,18 @@ function item_post(App $a) { } else { if (($contact_record != $author) && !count($forum_contact)) { notification([ - 'type' => NOTIFY_WALL, + 'type' => Type::WALL, 'notify_flags' => $user['notify-flags'], 'language' => $user['language'], 'to_name' => $user['username'], 'to_email' => $user['email'], 'uid' => $user['uid'], 'item' => $datarray, - 'link' => System::baseUrl().'/display/'.urlencode($datarray['guid']), + 'link' => DI::baseUrl().'/display/'.urlencode($datarray['guid']), 'source_name' => $datarray['author-name'], 'source_link' => $datarray['author-link'], 'source_photo' => $datarray['author-avatar'], - 'verb' => ACTIVITY_POST, + 'verb' => Activity::POST, 'otype' => 'item' ]); } @@ -783,35 +805,15 @@ function item_post(App $a) { Hook::callAll('post_local_end', $datarray); if (strlen($emailcc) && $profile_uid == local_user()) { - $erecips = explode(',', $emailcc); - if (count($erecips)) { - foreach ($erecips as $recip) { - $addr = trim($recip); - if (!strlen($addr)) { + $recipients = explode(',', $emailcc); + if (count($recipients)) { + foreach ($recipients as $recipient) { + $address = trim($recipient); + if (!strlen($address)) { continue; } - $disclaimer = '
' . L10n::t('This message was sent to you by %s, a member of the Friendica social network.', $a->user['username']) - . '
'; - $disclaimer .= L10n::t('You may visit them online at %s', System::baseUrl() . '/profile/' . $a->user['nickname']) . EOL; - $disclaimer .= L10n::t('Please contact the sender by replying to this post if you do not wish to receive these messages.') . EOL; - if (!$datarray['title']=='') { - $subject = Email::encodeHeader($datarray['title'], 'UTF-8'); - } else { - $subject = Email::encodeHeader('[Friendica]' . ' ' . L10n::t('%s posted an update.', $a->user['username']), 'UTF-8'); - } - $link = '' . $a->user['username'] . '

'; - $html = Item::prepareBody($datarray); - $message = '' . $link . $html . $disclaimer . ''; - $params = [ - 'fromName' => $a->user['username'], - 'fromEmail' => $a->user['email'], - 'toEmail' => $addr, - 'replyTo' => $a->user['email'], - 'messageSubject' => $subject, - 'htmlVersion' => $message, - 'textVersion' => HTML::toPlaintext($html.$disclaimer) - ]; - Emailer::send($params); + DI::emailer()->send(new ItemCCEMail(DI::app(), DI::l10n(), DI::baseUrl(), + $datarray, $address, $author['thumb'] ?? '')); } } } @@ -828,27 +830,25 @@ function item_post(App $a) { Worker::add(['priority' => PRIORITY_HIGH, 'dont_fork' => false], "Notifier", Delivery::POST, $post_id); } - Logger::log('post_complete'); + Logger::info('post_complete'); if ($api_source) { return $post_id; } - item_post_return(System::baseUrl(), $api_source, $return_path); + info(DI::l10n()->t('Post published.')); + item_post_return(DI::baseUrl(), $api_source, $return_path); // NOTREACHED } function item_post_return($baseurl, $api_source, $return_path) { - // figure out how to return, depending on from whence we came - $a = \get_app(); - if ($api_source) { return; } if ($return_path) { - $a->internalRedirect($return_path); + DI::baseUrl()->redirect($return_path); } $json = ['success' => 1]; @@ -856,10 +856,9 @@ function item_post_return($baseurl, $api_source, $return_path) $json['reload'] = $baseurl . '/' . $_REQUEST['jsreload']; } - Logger::log('post_json: ' . print_r($json, true), Logger::DEBUG); + Logger::info('post_json', ['json' => $json]); - echo json_encode($json); - exit(); + System::jsonExit($json); } function item_content(App $a) @@ -871,7 +870,7 @@ function item_content(App $a) $o = ''; if (($a->argc >= 3) && ($a->argv[1] === 'drop') && intval($a->argv[2])) { - if ($a->isAjax()) { + if (DI::mode()->isAjax()) { $o = Item::deleteForUser(['id' => $a->argv[2]], local_user()); } else { if (!empty($a->argv[3])) { @@ -882,10 +881,9 @@ function item_content(App $a) } } - if ($a->isAjax()) { + if (DI::mode()->isAjax()) { // ajax return: [, 0 (no perm) | ] - echo json_encode([intval($a->argv[2]), intval($o)]); - exit(); + System::jsonExit([intval($a->argv[2]), intval($o)]); } } @@ -906,7 +904,7 @@ function item_content(App $a) * * @return array|bool ['replaced' => $replaced, 'contact' => $contact]; * @throws ImagickException - * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws HTTPException\InternalServerErrorException */ function handle_tag(&$body, &$inform, &$str_tags, $profile_uid, $tag, $network = "") { @@ -1015,7 +1013,7 @@ function handle_tag(&$body, &$inform, &$str_tags, $profile_uid, $tag, $network = $profile = $contact["url"]; $alias = $contact["alias"]; - $newname = defaults($contact, "name", $contact["nick"]); + $newname = ($contact["name"] ?? '') ?: $contact["nick"]; } //if there is an url for this persons profile @@ -1054,7 +1052,7 @@ function handle_tag(&$body, &$inform, &$str_tags, $profile_uid, $tag, $network = function item_add_implicit_mentions(array $tags, array $thread_parent_contact, $thread_parent_id) { - if (Config::get('system', 'disable_implicit_mentions')) { + if (DI::config()->get('system', 'disable_implicit_mentions')) { // Add a tag if the parent contact is from ActivityPub or OStatus (This will notify them) if (in_array($thread_parent_contact['network'], [Protocol::OSTATUS, Protocol::ACTIVITYPUB])) { $contact = Term::TAG_CHARACTER[Term::MENTION] . '[url=' . $thread_parent_contact['url'] . ']' . $thread_parent_contact['nick'] . '[/url]';