From: Michael Date: Wed, 15 Apr 2020 16:37:09 +0000 (+0000) Subject: New model class for tag X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2e0501e7c5a51964bb91eba467459fe4bab1b2a4;p=friendica.git New model class for tag --- diff --git a/src/Model/Tag.php b/src/Model/Tag.php new file mode 100644 index 0000000000..2a09ffdd30 --- /dev/null +++ b/src/Model/Tag.php @@ -0,0 +1,81 @@ +. + * + */ + +namespace Friendica\Model; + +use Friendica\Core\Logger; +use Friendica\Database\DBA; +use Friendica\Content\Text\BBCode; + +/** + * Class Tag + * + * This Model class handles tag table interactions. + * This tables stores relevant tags related to posts, like hashtags and mentions. + */ +class Tag +{ + const UNKNOWN = 0; + const HASHTAG = 1; + const MENTION = 2; + const CATEGORY = 3; + const FILE = 5; + /** + * An implicit mention is a mention in a comment body that is redundant with the threading information. + */ + const IMPLICIT_MENTION = 8; + /** + * An exclusive mention transfers the ownership of the post to the target account, usually a forum. + */ + const EXCLUSIVE_MENTION = 9; + + const TAG_CHARACTER = [ + self::HASHTAG => '#', + self::MENTION => '@', + self::IMPLICIT_MENTION => '%', + self::EXCLUSIVE_MENTION => '!', + ]; + + /** + * Store tags from the body + * + * @param integer $uriid + * @param string $body + */ + public static function storeFromBody(int $uriid, string $body) + { + $tags = BBCode::getTags($body); + if (empty($tags)) { + return; + } + + foreach ($tags as $tag) { + if ((substr($tag, 0, 1) != Term::TAG_CHARACTER[Term::HASHTAG]) || (strlen($tag) <= 1)) { + Logger::info('Skip tag', ['uriid' => $uriid, 'tag' => $tag]); + continue; + } + + $fields = ['uri-id' => $uriid, 'name' => substr($tag, 1, 64), 'type' => Term::HASHTAG]; + DBA::insert('tag', $fields, true); + Logger::info('Stored tag', ['uriid' => $uriid, 'tag' => $tag, 'fields' => $fields]); + } + } +} diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php index 57edfb02b7..9ab8bc70c9 100644 --- a/src/Protocol/DFRN.php +++ b/src/Protocol/DFRN.php @@ -40,6 +40,7 @@ use Friendica\Model\Mail; use Friendica\Model\Notify\Type; use Friendica\Model\PermissionSet; use Friendica\Model\Profile; +use Friendica\Model\Tag; use Friendica\Model\Term; use Friendica\Model\User; use Friendica\Network\Probe; @@ -2407,6 +2408,8 @@ class DFRN $item['uri-id'] = ItemURI::insert(['uri' => $item['uri'], 'guid' => $item['guid']]); + Tag::storeFromBody($item['uri-id'], $item["body"]); + // We store the data from "dfrn:diaspora_signature" in a different table, this is done in "Item::insert" $dsprsig = XML::unescape(XML::getFirstNodeValue($xpath, "dfrn:diaspora_signature/text()", $entry)); if ($dsprsig != "") { diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php index 5aa3463181..ee2830362b 100644 --- a/src/Protocol/Diaspora.php +++ b/src/Protocol/Diaspora.php @@ -39,6 +39,7 @@ use Friendica\Model\ItemURI; use Friendica\Model\ItemDeliveryData; use Friendica\Model\Mail; use Friendica\Model\Profile; +use Friendica\Model\Tag; use Friendica\Model\Term; use Friendica\Model\User; use Friendica\Network\Probe; @@ -1850,25 +1851,6 @@ class Diaspora } } - private static function storeTags(int $uriid, string $body) - { - $tags = BBCode::getTags($body); - if (empty($tags)) { - return; - } - - foreach ($tags as $tag) { - if ((substr($tag, 0, 1) != Term::TAG_CHARACTER[Term::HASHTAG]) || (strlen($tag) <= 1)) { - Logger::info('Skip tag', ['uriid' => $uriid, 'tag' => $tag]); - continue; - } - - $fields = ['uri-id' => $uriid, 'name' => substr($tag, 1, 64), 'type' => Term::HASHTAG]; - DBA::insert('tag', $fields, true); - Logger::info('Stored tag', ['uriid' => $uriid, 'tag' => $tag, 'fields' => $fields]); - } - } - /** * Processes an incoming comment * @@ -1963,7 +1945,7 @@ class Diaspora $datarray["body"] = self::replacePeopleGuid($body, $person["url"]); self::storeMentions($datarray['uri-id'], $text); - self::storeTags($datarray['uri-id'], $datarray["body"]); + Tag::storeFromBody($datarray['uri-id'], $datarray["body"]); self::fetchGuid($datarray);