mirror of
https://github.com/friendica/friendica
synced 2025-04-27 18:30:12 +00:00
Merge pull request #4393 from MrPetovan/task/3878-move-include-tags-to-src
Move include/tags to src/
This commit is contained in:
Michael Vogel
GitHub
commit
fa95911fdb
13 changed files with 378 additions and 360 deletions
|
|
@ -27,7 +27,6 @@ use dba;
|
|||
use Text_LanguageDetect;
|
||||
|
||||
require_once 'boot.php';
|
||||
require_once 'include/tags.php';
|
||||
require_once 'include/threads.php';
|
||||
require_once 'include/items.php';
|
||||
require_once 'include/text.php';
|
||||
|
|
@ -70,8 +69,8 @@ class Item extends BaseObject
|
|||
continue;
|
||||
}
|
||||
|
||||
create_tags_from_item($item['id']);
|
||||
Term::createFromItem($item['id']);
|
||||
Term::insertFromTagFieldByItemId($item['id']);
|
||||
Term::insertFromFileFieldByItemId($item['id']);
|
||||
update_thread($item['id']);
|
||||
|
||||
Worker::add(PRIORITY_HIGH, "Notifier", 'edit_post', $item['id']);
|
||||
|
|
@ -152,8 +151,8 @@ class Item extends BaseObject
|
|||
'edited' => DateTimeFormat::utcNow(), 'changed' => DateTimeFormat::utcNow()],
|
||||
['id' => $item['id']]);
|
||||
|
||||
create_tags_from_item($item['id']);
|
||||
Term::createFromItem($item['id']);
|
||||
Term::insertFromTagFieldByItemId($item['id']);
|
||||
Term::insertFromFileFieldByItemId($item['id']);
|
||||
delete_thread($item['id'], $item['parent-uri']);
|
||||
|
||||
// If it's the parent of a comment thread, kill all the kids
|
||||
|
|
@ -791,8 +790,8 @@ class Item extends BaseObject
|
|||
* Due to deadlock issues with the "term" table we are doing these steps after the commit.
|
||||
* This is not perfect - but a workable solution until we found the reason for the problem.
|
||||
*/
|
||||
create_tags_from_item($current_post);
|
||||
Term::createFromItem($current_post);
|
||||
Term::insertFromTagFieldByItemId($current_post);
|
||||
Term::insertFromFileFieldByItemId($current_post);
|
||||
|
||||
if ($arr['parent-uri'] === $arr['uri']) {
|
||||
self::addShadow($current_post);
|
||||
|
|
|
|||
|
|
@ -4,20 +4,145 @@
|
|||
*/
|
||||
namespace Friendica\Model;
|
||||
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Database\DBM;
|
||||
use dba;
|
||||
|
||||
require_once "include/dba.php";
|
||||
require_once 'boot.php';
|
||||
require_once 'include/dba.php';
|
||||
|
||||
class Term
|
||||
{
|
||||
public static function insertFromTagFieldByItemId($itemid)
|
||||
{
|
||||
$profile_base = System::baseUrl();
|
||||
$profile_data = parse_url($profile_base);
|
||||
$profile_path = defaults($profile_data, 'path', '');
|
||||
$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)) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Clean up all tags
|
||||
dba::e("DELETE FROM `term` WHERE `otype` = ? AND `oid` = ? AND `type` IN (?, ?)",
|
||||
TERM_OBJ_POST, $itemid, TERM_HASHTAG, TERM_MENTION);
|
||||
|
||||
if ($message['deleted']) {
|
||||
return;
|
||||
}
|
||||
|
||||
$taglist = explode(',', $message['tag']);
|
||||
|
||||
$tags_string = '';
|
||||
foreach ($taglist as $tag) {
|
||||
if ((substr(trim($tag), 0, 1) == '#') || (substr(trim($tag), 0, 1) == '@')) {
|
||||
$tags_string .= ' ' . trim($tag);
|
||||
} else {
|
||||
$tags_string .= ' #' . trim($tag);
|
||||
}
|
||||
}
|
||||
|
||||
$data = ' ' . $message['title'] . ' ' . $message['body'] . ' ' . $tags_string . ' ';
|
||||
|
||||
// ignore anything in a code block
|
||||
$data = preg_replace('/\[code\](.*?)\[\/code\]/sm', '', $data);
|
||||
|
||||
$tags = [];
|
||||
|
||||
$pattern = '/\W\#([^\[].*?)[\s\'".,:;\?!\[\]\/]/ism';
|
||||
if (preg_match_all($pattern, $data, $matches)) {
|
||||
foreach ($matches[1] as $match) {
|
||||
$tags['#' . strtolower($match)] = '';
|
||||
}
|
||||
}
|
||||
|
||||
$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];
|
||||
}
|
||||
}
|
||||
|
||||
foreach ($tags as $tag => $link) {
|
||||
if (substr(trim($tag), 0, 1) == '#') {
|
||||
// try to ignore #039 or #1 or anything like that
|
||||
if (ctype_digit(substr(trim($tag), 1))) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// try to ignore html hex escapes, e.g. #x2317
|
||||
if ((substr(trim($tag), 1, 1) == 'x' || substr(trim($tag), 1, 1) == 'X') && ctype_digit(substr(trim($tag), 2))) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$type = TERM_HASHTAG;
|
||||
$term = substr($tag, 1);
|
||||
} elseif (substr(trim($tag), 0, 1) == '@') {
|
||||
$type = TERM_MENTION;
|
||||
$term = substr($tag, 1);
|
||||
} else { // This shouldn't happen
|
||||
$type = TERM_HASHTAG;
|
||||
$term = $tag;
|
||||
}
|
||||
|
||||
if ($message['uid'] == 0) {
|
||||
$global = true;
|
||||
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']]);
|
||||
}
|
||||
|
||||
dba::insert('term', [
|
||||
'uid' => $message['uid'],
|
||||
'oid' => $itemid,
|
||||
'otype' => TERM_OBJ_POST,
|
||||
'type' => $type,
|
||||
'term' => $term,
|
||||
'url' => $link,
|
||||
'guid' => $message['guid'],
|
||||
'created' => $message['created'],
|
||||
'received' => $message['received'],
|
||||
'global' => $global
|
||||
]);
|
||||
|
||||
// Search for mentions
|
||||
if ((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']]);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static function insertFromTagFieldByItemUri($itemuri, $uid)
|
||||
{
|
||||
$messages = dba::select('item', ['id'], ['uri' => $itemuri, 'uid' => $uid]);
|
||||
|
||||
if (DBM::is_result($messages)) {
|
||||
while ($message = dba::fetch($messages)) {
|
||||
self::insertFromTagFieldByItemId($message['id']);
|
||||
}
|
||||
dba::close($messages);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @param integer $itemid item id
|
||||
* @return void
|
||||
*/
|
||||
public static function createFromItem($itemid)
|
||||
public static function insertFromFileFieldByItemId($itemid)
|
||||
{
|
||||
$message = dba::selectFirst('item', ['uid', 'deleted', 'file'], ['id' => $itemid]);
|
||||
if (!\Friendica\Database\DBM::is_result($message)) {
|
||||
if (!DBM::is_result($message)) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -62,13 +187,13 @@ class Term
|
|||
* @param integer $uid uid
|
||||
* @return void
|
||||
*/
|
||||
public static function createFromItemURI($itemuri, $uid)
|
||||
public static function insertFromFileFieldByItemUri($itemuri, $uid)
|
||||
{
|
||||
$messages = q("SELECT `id` FROM `item` WHERE uri ='%s' AND uid=%d", dbesc($itemuri), intval($uid));
|
||||
|
||||
if (count($messages)) {
|
||||
foreach ($messages as $message) {
|
||||
self::createFromItem($message["id"]);
|
||||
self::insertFromFileFieldByItemId($message["id"]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue