X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FTerm.php;h=da07659b4e3289f2575210ec6818d0f7a2c4e117;hb=4874f7f8abebaf242e274d167ffd335897435cdf;hp=b211e7d2ebd532cdd48c44b99639762f3c091def;hpb=62a61a95d3e1357a64b157136490c82aa4495d3e;p=friendica.git diff --git a/src/Model/Term.php b/src/Model/Term.php index b211e7d2eb..da07659b4e 100644 --- a/src/Model/Term.php +++ b/src/Model/Term.php @@ -5,9 +5,7 @@ namespace Friendica\Model; use Friendica\Core\System; -use Friendica\Database\DBM; -use Friendica\Model\Item; -use dba; +use Friendica\Database\DBA; require_once 'boot.php'; require_once 'include/conversation.php'; @@ -15,7 +13,53 @@ require_once 'include/dba.php'; class Term { - public static function insertFromTagFieldByItemId($itemid) + public static function tagTextFromItemId($itemid) + { + $tag_text = ''; + $condition = ['otype' => TERM_OBJ_POST, 'oid' => $itemid, 'type' => [TERM_HASHTAG, TERM_MENTION]]; + $tags = DBA::select('term', [], $condition); + while ($tag = DBA::fetch($tags)) { + if ($tag_text != '') { + $tag_text .= ','; + } + + if ($tag['type'] == 1) { + $tag_text .= '#'; + } else { + $tag_text .= '@'; + } + $tag_text .= '[url=' . $tag['url'] . ']' . $tag['term'] . '[/url]'; + } + return $tag_text; + } + + public static function tagArrayFromItemId($itemid, $type = [TERM_HASHTAG, TERM_MENTION]) + { + $condition = ['otype' => TERM_OBJ_POST, 'oid' => $itemid, 'type' => $type]; + $tags = DBA::select('term', ['type', 'term', 'url'], $condition); + if (!DBA::isResult($tags)) { + return []; + } + + return DBA::toArray($tags); + } + + public static function fileTextFromItemId($itemid) + { + $file_text = ''; + $condition = ['otype' => TERM_OBJ_POST, 'oid' => $itemid, 'type' => [TERM_FILE, TERM_CATEGORY]]; + $tags = DBA::select('term', [], $condition); + while ($tag = DBA::fetch($tags)) { + if ($tag['type'] == TERM_CATEGORY) { + $file_text .= '<' . $tag['term'] . '>'; + } else { + $file_text .= '[' . $tag['term'] . ']'; + } + } + return $file_text; + } + + public static function insertFromTagFieldByItemId($itemid, $tags) { $profile_base = System::baseUrl(); $profile_data = parse_url($profile_base); @@ -23,14 +67,16 @@ class Term $profile_base_friendica = $profile_data['host'] . $profile_path . '/profile/'; $profile_base_diaspora = $profile_data['host'] . $profile_path . '/u/'; - $fields = ['guid', 'uid', 'id', 'edited', 'deleted', 'created', 'received', 'title', 'body', 'tag', 'parent']; - $message = dba::selectFirst('item', $fields, ['id' => $itemid]); - if (!DBM::is_result($message)) { + $fields = ['guid', 'uid', 'id', 'edited', 'deleted', 'created', 'received', 'title', 'body', 'parent']; + $message = Item::selectFirst($fields, ['id' => $itemid]); + if (!DBA::isResult($message)) { return; } + $message['tag'] = $tags; + // Clean up all tags - dba::delete('term', ['otype' => TERM_OBJ_POST, 'oid' => $itemid, 'type' => [TERM_HASHTAG, TERM_MENTION]]); + self::deleteByItemId($itemid); if ($message['deleted']) { return; @@ -40,7 +86,7 @@ class Term $tags_string = ''; foreach ($taglist as $tag) { - if ((substr(trim($tag), 0, 1) == '#') || (substr(trim($tag), 0, 1) == '@')) { + if ((substr(trim($tag), 0, 1) == '#') || (substr(trim($tag), 0, 1) == '@') || (substr(trim($tag), 0, 1) == '!')) { $tags_string .= ' ' . trim($tag); } else { $tags_string .= ' #' . trim($tag); @@ -57,14 +103,26 @@ class Term $pattern = '/\W\#([^\[].*?)[\s\'".,:;\?!\[\]\/]/ism'; if (preg_match_all($pattern, $data, $matches)) { foreach ($matches[1] as $match) { - $tags['#' . strtolower($match)] = ''; + $tags['#' . $match] = ''; } } - $pattern = '/\W([\#@])\[url\=(.*?)\](.*?)\[\/url\]/ism'; + $pattern = '/\W([\#@!])\[url\=(.*?)\](.*?)\[\/url\]/ism'; if (preg_match_all($pattern, $data, $matches, PREG_SET_ORDER)) { foreach ($matches as $match) { - $tags[$match[1] . strtolower(trim($match[3], ',.:;[]/\"?!'))] = $match[2]; + + if (($match[1] == '@') || ($match[1] == '!')) { + $contact = Contact::getDetailsByURL($match[2], 0); + if (!empty($contact['addr'])) { + $match[3] = $contact['addr']; + } + + if (!empty($contact['url'])) { + $match[2] = $contact['url']; + } + } + + $tags[$match[1] . trim($match[3], ',.:;[]/\"?!')] = $match[2]; } } @@ -82,22 +140,32 @@ class Term $type = TERM_HASHTAG; $term = substr($tag, 1); - } elseif (substr(trim($tag), 0, 1) == '@') { + } elseif ((substr(trim($tag), 0, 1) == '@') || (substr(trim($tag), 0, 1) == '!')) { $type = TERM_MENTION; - $term = substr($tag, 1); + + $contact = Contact::getDetailsByURL($link, 0); + if (!empty($contact['name'])) { + $term = $contact['name']; + } else { + $term = substr($tag, 1); + } } else { // This shouldn't happen $type = TERM_HASHTAG; $term = $tag; } + if (DBA::exists('term', ['uid' => $message['uid'], 'otype' => TERM_OBJ_POST, 'oid' => $itemid, 'url' => $link])) { + continue; + } + if ($message['uid'] == 0) { $global = true; - dba::update('term', ['global' => true], ['otype' => TERM_OBJ_POST, 'guid' => $message['guid']]); + DBA::update('term', ['global' => true], ['otype' => TERM_OBJ_POST, 'guid' => $message['guid']]); } else { - $global = dba::exists('term', ['uid' => 0, 'otype' => TERM_OBJ_POST, 'guid' => $message['guid']]); + $global = DBA::exists('term', ['uid' => 0, 'otype' => TERM_OBJ_POST, 'guid' => $message['guid']]); } - dba::insert('term', [ + DBA::insert('term', [ 'uid' => $message['uid'], 'oid' => $itemid, 'otype' => TERM_OBJ_POST, @@ -111,13 +179,13 @@ class Term ]); // Search for mentions - if ((substr($tag, 0, 1) == '@') && (strpos($link, $profile_base_friendica) || strpos($link, $profile_base_diaspora))) { + if (((substr($tag, 0, 1) == '@') || (substr($tag, 0, 1) == '!')) && (strpos($link, $profile_base_friendica) || strpos($link, $profile_base_diaspora))) { $users = q("SELECT `uid` FROM `contact` WHERE self AND (`url` = '%s' OR `nurl` = '%s')", $link, $link); foreach ($users AS $user) { if ($user['uid'] == $message['uid']) { /// @todo This function is called frim Item::update - so we mustn't call that function here - dba::update('item', ['mention' => true], ['id' => $itemid]); - dba::update('thread', ['mention' => true], ['iid' => $message['parent']]); + DBA::update('item', ['mention' => true], ['id' => $itemid]); + DBA::update('thread', ['mention' => true], ['iid' => $message['parent']]); } } } @@ -128,23 +196,25 @@ class Term * @param integer $itemid item id * @return void */ - public static function insertFromFileFieldByItemId($itemid) + public static function insertFromFileFieldByItemId($itemid, $files) { - $message = dba::selectFirst('item', ['uid', 'deleted', 'file'], ['id' => $itemid]); - if (!DBM::is_result($message)) { + $message = Item::selectFirst(['uid', 'deleted'], ['id' => $itemid]); + if (!DBA::isResult($message)) { return; } // Clean up all tags - dba::delete('term', ['otype' => TERM_OBJ_POST, 'oid' => $itemid, 'type' => [TERM_FILE, TERM_CATEGORY]]); + DBA::delete('term', ['otype' => TERM_OBJ_POST, 'oid' => $itemid, 'type' => [TERM_FILE, TERM_CATEGORY]]); if ($message["deleted"]) { return; } + $message['file'] = $files; + if (preg_match_all("/\[(.*?)\]/ism", $message["file"], $files)) { foreach ($files[1] as $file) { - dba::insert('term', [ + DBA::insert('term', [ 'uid' => $message["uid"], 'oid' => $itemid, 'otype' => TERM_OBJ_POST, @@ -156,7 +226,7 @@ class Term if (preg_match_all("/\<(.*?)\>/ism", $message["file"], $files)) { foreach ($files[1] as $file) { - dba::insert('term', [ + DBA::insert('term', [ 'uid' => $message["uid"], 'oid' => $itemid, 'otype' => TERM_OBJ_POST, @@ -184,38 +254,56 @@ class Term $searchpath = System::baseUrl() . "/search?tag="; - $taglist = dba::select( + $taglist = DBA::select( 'term', ['type', 'term', 'url'], ["`otype` = ? AND `oid` = ? AND `type` IN (?, ?)", TERM_OBJ_POST, $item['id'], TERM_HASHTAG, TERM_MENTION], ['order' => ['tid']] ); - while ($tag = dba::fetch($taglist)) { + while ($tag = DBA::fetch($taglist)) { if ($tag["url"] == "") { - $tag["url"] = $searchpath . strtolower($tag["term"]); + $tag["url"] = $searchpath . $tag["term"]; } - $orig_tag = $tag["url"]; + $orig_tag = $tag['url']; - $tag["url"] = Contact::magicLinkById($item['author-id'], $tag['url']); + $author = ['uid' => 0, 'id' => $item['author-id'], + 'network' => $item['author-network'], 'url' => $item['author-link']]; + $tag['url'] = Contact::magicLinkByContact($author, $tag['url']); - if ($tag["type"] == TERM_HASHTAG) { - if ($orig_tag != $tag["url"]) { - $item['body'] = str_replace($orig_tag, $tag["url"], $item['body']); + if ($tag['type'] == TERM_HASHTAG) { + if ($orig_tag != $tag['url']) { + $item['body'] = str_replace($orig_tag, $tag['url'], $item['body']); } - $return['hashtags'][] = "#" . $tag["term"] . ""; - $prefix = "#"; - } elseif ($tag["type"] == TERM_MENTION) { - $return['mentions'][] = "@" . $tag["term"] . ""; - $prefix = "@"; + $return['hashtags'][] = '#' . $tag['term'] . ''; + $prefix = '#'; + } elseif ($tag['type'] == TERM_MENTION) { + $return['mentions'][] = '@' . $tag['term'] . ''; + $prefix = '@'; } - $return['tags'][] = $prefix . "" . $tag["term"] . ""; + $return['tags'][] = $prefix . '' . $tag['term'] . ''; } - dba::close($taglist); + DBA::close($taglist); return $return; } + + /** + * Delete all tags from an item + * @param int itemid - choose from which item the tags will be removed + * @param array type - items type. default is [TERM_HASHTAG, TERM_MENTION] + */ + public static function deleteByItemId($itemid, $type = [TERM_HASHTAG, TERM_MENTION]) + { + if (empty($itemid)) { + return; + } + + // Clean up all tags + DBA::delete('term', ['otype' => TERM_OBJ_POST, 'oid' => $itemid, 'type' => $type]); + + } }