X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FModel%2FTerm.php;h=6a213d445b2df4c7b036c7c0728b8cd86a8d13a4;hb=3cd654e76f32dbcf505aef6a60a3e42d318f8b61;hp=854861ccb589b022609d48000a7b21f0d2ce286c;hpb=ec898ecd2a6a79e1e8a6a9dda94e90393eb08487;p=friendica.git
diff --git a/src/Model/Term.php b/src/Model/Term.php
index 854861ccb5..6a213d445b 100644
--- a/src/Model/Term.php
+++ b/src/Model/Term.php
@@ -7,10 +7,6 @@ namespace Friendica\Model;
use Friendica\Core\System;
use Friendica\Database\DBA;
-require_once 'boot.php';
-require_once 'include/conversation.php';
-require_once 'include/dba.php';
-
class Term
{
public static function tagTextFromItemId($itemid)
@@ -76,7 +72,7 @@ class Term
$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;
@@ -86,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);
@@ -107,11 +103,11 @@ class Term
}
}
- $pattern = '/\W([\#@])\[url\=(.*?)\](.*?)\[\/url\]/ism';
+ $pattern = '/\W([\#@!])\[url\=(.*?)\](.*?)\[\/url\]/ism';
if (preg_match_all($pattern, $data, $matches, PREG_SET_ORDER)) {
foreach ($matches as $match) {
- if ($match[1] == '@') {
+ if (($match[1] == '@') || ($match[1] == '!')) {
$contact = Contact::getDetailsByURL($match[2], 0);
if (!empty($contact['addr'])) {
$match[3] = $contact['addr'];
@@ -140,7 +136,8 @@ 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;
$contact = Contact::getDetailsByURL($link, 0);
@@ -152,9 +149,10 @@ class Term
} else { // This shouldn't happen
$type = TERM_HASHTAG;
$term = $tag;
+ $link = '';
}
- if (DBA::exists('term', ['uid' => $message['uid'], 'otype' => TERM_OBJ_POST, 'oid' => $itemid, 'url' => $link])) {
+ if (DBA::exists('term', ['uid' => $message['uid'], 'otype' => TERM_OBJ_POST, 'oid' => $itemid, 'term' => $term])) {
continue;
}
@@ -179,7 +177,7 @@ 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']) {
@@ -194,7 +192,9 @@ class Term
/**
* @param integer $itemid item id
+ * @param $files
* @return void
+ * @throws \Exception
*/
public static function insertFromFileFieldByItemId($itemid, $files)
{
@@ -243,6 +243,8 @@ class Term
*
* @param array $item
* @return array
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
*/
public static function populateTagsFromItem(&$item)
{
@@ -262,32 +264,51 @@ class Term
);
while ($tag = DBA::fetch($taglist)) {
- if ($tag["url"] == "") {
- $tag["url"] = $searchpath . $tag["term"];
+ if ($tag['url'] == '') {
+ $tag['url'] = $searchpath . rawurlencode($tag['term']);
}
- $orig_tag = $tag["url"];
+ $orig_tag = $tag['url'];
$author = ['uid' => 0, 'id' => $item['author-id'],
'network' => $item['author-network'], 'url' => $item['author-link']];
- $tag["url"] = Contact::magicLinkByContact($author, $tag['url']);
+ $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);
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]);
+
+ }
}