X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FTerm.php;h=6a213d445b2df4c7b036c7c0728b8cd86a8d13a4;hb=3cd654e76f32dbcf505aef6a60a3e42d318f8b61;hp=03f19197a361705910867c8400e6c6d24f119713;hpb=53b7e4b1021fff736f72abe15de9eff5fe65bd83;p=friendica.git
diff --git a/src/Model/Term.php b/src/Model/Term.php
index 03f19197a3..6a213d445b 100644
--- a/src/Model/Term.php
+++ b/src/Model/Term.php
@@ -5,16 +5,57 @@
namespace Friendica\Model;
use Friendica\Core\System;
-use Friendica\Database\DBM;
-use dba;
-
-require_once 'boot.php';
-require_once 'include/conversation.php';
-require_once 'include/dba.php';
+use Friendica\Database\DBA;
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);
@@ -22,15 +63,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::e("DELETE FROM `term` WHERE `otype` = ? AND `oid` = ? AND `type` IN (?, ?)",
- TERM_OBJ_POST, $itemid, TERM_HASHTAG, TERM_MENTION);
+ self::deleteByItemId($itemid);
if ($message['deleted']) {
return;
@@ -40,7 +82,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 +99,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 +136,34 @@ class Term
$type = TERM_HASHTAG;
$term = substr($tag, 1);
- } elseif (substr(trim($tag), 0, 1) == '@') {
+ $link = '';
+ } 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;
+ $link = '';
+ }
+
+ if (DBA::exists('term', ['uid' => $message['uid'], 'otype' => TERM_OBJ_POST, 'oid' => $itemid, 'term' => $term])) {
+ 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,12 +177,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']) {
- dba::update('item', ['mention' => true], ['id' => $itemid]);
- dba::update('thread', ['mention' => true], ['iid' => $message['parent']]);
+ /// @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']]);
}
}
}
@@ -125,29 +192,29 @@ class Term
/**
* @param integer $itemid item id
+ * @param $files
* @return void
+ * @throws \Exception
*/
- 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
- q("DELETE FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` IN (%d, %d)",
- intval(TERM_OBJ_POST),
- intval($itemid),
- intval(TERM_FILE),
- intval(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,
@@ -159,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,
@@ -176,6 +243,8 @@ class Term
*
* @param array $item
* @return array
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
*/
public static function populateTagsFromItem(&$item)
{
@@ -187,38 +256,59 @@ 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)) {
- if ($tag["url"] == "") {
- $tag["url"] = $searchpath . strtolower($tag["term"]);
+ while ($tag = DBA::fetch($taglist)) {
+ if ($tag['url'] == '') {
+ $tag['url'] = $searchpath . rawurlencode($tag['term']);
}
- $orig_tag = $tag["url"];
+ $orig_tag = $tag['url'];
- $tag["url"] = best_link_url($item, $sp, $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']);
+ $prefix = '';
+ 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
+ * @throws \Exception
+ */
+ 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]);
+
+ }
}