X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FItem.php;h=1e1603ef6adaf00f85f01bf24a1b8c2c8e8f65c2;hb=7ffcb25321ce9b8517669c461fe58d90ad6d7ec6;hp=7ba6a42e9caf104b2c9f8fe188f94e5975266821;hpb=0454d0a670e051e8519e9a4220606f83d1408214;p=friendica.git diff --git a/src/Model/Item.php b/src/Model/Item.php index 7ba6a42e9c..1e1603ef6a 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -23,12 +23,10 @@ use Friendica\Object\Image; use Friendica\Protocol\Diaspora; use Friendica\Protocol\OStatus; use Friendica\Util\DateTimeFormat; -use Friendica\Util\Temporal; 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'; @@ -71,9 +69,9 @@ class Item extends BaseObject continue; } - create_tags_from_item($item['id']); - Term::createFromItem($item['id']); - update_thread($item['id']); + Term::insertFromTagFieldByItemId($item['id']); + Term::insertFromFileFieldByItemId($item['id']); + self::updateThread($item['id']); Worker::add(PRIORITY_HIGH, "Notifier", 'edit_post', $item['id']); } @@ -153,9 +151,9 @@ class Item extends BaseObject 'edited' => DateTimeFormat::utcNow(), 'changed' => DateTimeFormat::utcNow()], ['id' => $item['id']]); - create_tags_from_item($item['id']); - Term::createFromItem($item['id']); - delete_thread($item['id'], $item['parent-uri']); + Term::insertFromTagFieldByItemId($item['id']); + Term::insertFromFileFieldByItemId($item['id']); + self::deleteThread($item['id'], $item['parent-uri']); // If it's the parent of a comment thread, kill all the kids if ($item['id'] == $item['parent']) { @@ -781,9 +779,9 @@ class Item extends BaseObject } if ($arr['parent-uri'] === $arr['uri']) { - add_thread($current_post); + self::addThread($current_post); } else { - update_thread($parent_id); + self::updateThread($parent_id); } dba::commit(); @@ -792,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); @@ -1291,7 +1289,7 @@ class Item extends BaseObject dbesc($u[0]['deny_gid']), intval($item_id) ); - update_thread($item_id); + self::updateThread($item_id); Worker::add(['priority' => PRIORITY_HIGH, 'dont_fork' => true], 'Notifier', 'tgroup', $item_id); @@ -1776,7 +1774,7 @@ class Item extends BaseObject $like_item = $existing_like[0]; // Already voted, undo it - $fields = ['deleted' => true, 'unseen' => true, 'changed' => datetime_convert()]; + $fields = ['deleted' => true, 'unseen' => true, 'changed' => DateTimeFormat::utcNow()]; dba::update('item', $fields, ['id' => $like_item['id']]); // Clean up the Diaspora signatures for this like @@ -1874,4 +1872,114 @@ EOT; return true; } + + private static function addThread($itemid, $onlyshadow = false) { + $items = q("SELECT `uid`, `created`, `edited`, `commented`, `received`, `changed`, `wall`, `private`, `pubmail`, + `moderated`, `visible`, `spam`, `starred`, `bookmark`, `contact-id`, `gcontact-id`, + `deleted`, `origin`, `forum_mode`, `mention`, `network`, `author-id`, `owner-id` + FROM `item` WHERE `id` = %d AND (`parent` = %d OR `parent` = 0) LIMIT 1", intval($itemid), intval($itemid)); + + if (!$items) + return; + + $item = $items[0]; + $item['iid'] = $itemid; + + if (!$onlyshadow) { + $result = dba::insert('thread', $item); + + logger("Add thread for item ".$itemid." - ".print_r($result, true), LOGGER_DEBUG); + } + } + + public static function updateThreadFromUri($itemuri, $uid) { + $messages = q("SELECT `id` FROM `item` WHERE uri ='%s' AND uid=%d", dbesc($itemuri), intval($uid)); + + if (DBM::is_result($messages)) { + foreach ($messages as $message) { + self::updateThread($message["id"]); + } + } + } + + public static function updateThread($itemid, $setmention = false) { + $items = q("SELECT `uid`, `guid`, `title`, `body`, `created`, `edited`, `commented`, `received`, `changed`, `wall`, `private`, `pubmail`, `moderated`, `visible`, `spam`, `starred`, `bookmark`, `contact-id`, `gcontact-id`, + `deleted`, `origin`, `forum_mode`, `network`, `rendered-html`, `rendered-hash` FROM `item` WHERE `id` = %d AND (`parent` = %d OR `parent` = 0) LIMIT 1", intval($itemid), intval($itemid)); + + if (!DBM::is_result($items)) { + return; + } + + $item = $items[0]; + + if ($setmention) { + $item["mention"] = 1; + } + + $sql = ""; + + foreach ($item AS $field => $data) + if (!in_array($field, ["guid", "title", "body", "rendered-html", "rendered-hash"])) { + if ($sql != "") { + $sql .= ", "; + } + + $sql .= "`".$field."` = '".dbesc($data)."'"; + } + + $result = q("UPDATE `thread` SET ".$sql." WHERE `iid` = %d", intval($itemid)); + + logger("Update thread for item ".$itemid." - guid ".$item["guid"]." - ".print_r($result, true)." ".print_r($item, true), LOGGER_DEBUG); + + // Updating a shadow item entry + $items = q("SELECT `id` FROM `item` WHERE `guid` = '%s' AND `uid` = 0 LIMIT 1", dbesc($item["guid"])); + + if (!DBM::is_result($items)) { + return; + } + + $result = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `rendered-html` = '%s', `rendered-hash` = '%s' WHERE `id` = %d", + dbesc($item["title"]), + dbesc($item["body"]), + dbesc($item["rendered-html"]), + dbesc($item["rendered-hash"]), + intval($items[0]["id"]) + ); + logger("Updating public shadow for post ".$items[0]["id"]." - guid ".$item["guid"]." Result: ".print_r($result, true), LOGGER_DEBUG); + } + + public static function deleteThreadFromUri($itemuri, $uid) { + $messages = q("SELECT `id` FROM `item` WHERE uri ='%s' AND uid=%d", dbesc($itemuri), intval($uid)); + + if (DBM::is_result($messages)) { + foreach ($messages as $message) { + self::deleteThread($message["id"], $itemuri); + } + } + } + + public static function deleteThread($itemid, $itemuri = "") { + $item = q("SELECT `uid` FROM `thread` WHERE `iid` = %d", intval($itemid)); + + if (!DBM::is_result($item)) { + logger('No thread found for id '.$itemid, LOGGER_DEBUG); + return; + } + + // Using dba::delete at this time could delete the associated item entries + $result = dba::e("DELETE FROM `thread` WHERE `iid` = ?", $itemid); + + logger("deleteThread: Deleted thread for item ".$itemid." - ".print_r($result, true), LOGGER_DEBUG); + + if ($itemuri != "") { + $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND NOT `deleted` AND NOT (`uid` IN (%d, 0))", + dbesc($itemuri), + intval($item["uid"]) + ); + if (!DBM::is_result($r)) { + dba::delete('item', ['uri' => $itemuri, 'uid' => 0]); + logger("deleteThread: Deleted shadow for item ".$itemuri, LOGGER_DEBUG); + } + } + } }