X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fitems.php;h=3c20bc41cfdce0fd7fd37fdb15c28065934b3465;hb=19c039242cc5314702acb13cb504c160fef2f825;hp=4d495d35151b7c184d1c27ebe9b6c04e45f102d6;hpb=eb1b6605b7d94e985786f93e910d6dce2dd9bad1;p=friendica.git

diff --git a/include/items.php b/include/items.php
index 4d495d3515..3c20bc41cf 100644
--- a/include/items.php
+++ b/include/items.php
@@ -3,8 +3,8 @@
  * @file include/items.php
  */
 use Friendica\App;
-use Friendica\ParseUrl;
 use Friendica\Content\Feature;
+use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
@@ -13,37 +13,41 @@ use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Model\Group;
+use Friendica\Model\Term;
 use Friendica\Model\User;
+use Friendica\Model\Item;
+use Friendica\Model\Conversation;
 use Friendica\Object\Image;
 use Friendica\Protocol\DFRN;
 use Friendica\Protocol\OStatus;
 use Friendica\Protocol\Feed;
+use Friendica\Util\ParseUrl;
 
 require_once 'include/bbcode.php';
 require_once 'include/tags.php';
-require_once 'include/files.php';
 require_once 'include/text.php';
 require_once 'include/threads.php';
 require_once 'include/plaintext.php';
 require_once 'mod/share.php';
 require_once 'include/enotify.php';
 
-function construct_verb($item) {
-	if ($item['verb']) {
-		return $item['verb'];
-	}
-	return ACTIVITY_POST;
-}
-
 /* limit_body_size()
  *
- *		The purpose of this function is to apply system message length limits to
- *		imported messages without including any embedded photos in the length
+ *
+ *
  */
-function limit_body_size($body) {
-
-//	logger('limit_body_size: start', LOGGER_DEBUG);
 
+/**
+ * The purpose of this function is to apply system message length limits to
+ * imported messages without including any embedded photos in the length
+ *
+ * @brief Truncates imported message body string length to max_import_size
+ * @param string $body
+ * @return string
+ */
+/// @TODO move to src/Model/Item.php
+function limit_body_size($body)
+{
 	$maxlen = get_max_import_size();
 
 	// If the length of the body, including the embedded images, is smaller
@@ -55,7 +59,6 @@ function limit_body_size($body) {
 		$orig_body = $body;
 		$new_body = '';
 		$textlen = 0;
-		$max_found = false;
 
 		$img_start = strpos($orig_body, '[img');
 		$img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false);
@@ -110,12 +113,10 @@ function limit_body_size($body) {
 			if ($textlen < $maxlen) {
 				logger('limit_body_size: the limit happens after the end of the last image', LOGGER_DEBUG);
 				$new_body = $new_body . substr($orig_body, 0, $maxlen - $textlen);
-				$textlen = $maxlen;
 			}
 		} else {
 			logger('limit_body_size: the text size with embedded images extracted did not violate the limit', LOGGER_DEBUG);
 			$new_body = $new_body . $orig_body;
-			$textlen += strlen($orig_body);
 		}
 
 		return $new_body;
@@ -124,35 +125,9 @@ function limit_body_size($body) {
 	}
 }
 
-function title_is_body($title, $body) {
-
-	$title = strip_tags($title);
-	$title = trim($title);
-	$title = html_entity_decode($title, ENT_QUOTES, 'UTF-8');
-	$title = str_replace(array("\n", "\r", "\t", " "), array("", "", "", ""), $title);
-
-	$body = strip_tags($body);
-	$body = trim($body);
-	$body = html_entity_decode($body, ENT_QUOTES, 'UTF-8');
-	$body = str_replace(array("\n", "\r", "\t", " "), array("", "", "", ""), $body);
-
-	if (strlen($title) < strlen($body)) {
-		$body = substr($body, 0, strlen($title));
-	}
-
-	if (($title != $body) && (substr($title, -3) == "...")) {
-		$pos = strrpos($title, "...");
-		if ($pos > 0) {
-			$title = substr($title, 0, $pos);
-			$body = substr($body, 0, $pos);
-		}
-	}
-
-	return ($title == $body);
-}
-
+/// @TODO move to ???
 function add_page_info_data($data) {
-	call_hooks('page_info_data', $data);
+	Addon::callHooks('page_info_data', $data);
 
 	// It maybe is a rich content, but if it does have everything that a link has,
 	// then treat it that way
@@ -169,15 +144,9 @@ function add_page_info_data($data) {
 		return "";
 	}
 
-	if (sizeof($data["images"]) > 0) {
-		$preview = $data["images"][0];
-	} else {
-		$preview = "";
-	}
-
 	// Escape some bad characters
-	$data["url"] = str_replace(array("[", "]"), array("&#91;", "&#93;"), htmlentities($data["url"], ENT_QUOTES, 'UTF-8', false));
-	$data["title"] = str_replace(array("[", "]"), array("&#91;", "&#93;"), htmlentities($data["title"], ENT_QUOTES, 'UTF-8', false));
+	$data["url"] = str_replace(["[", "]"], ["&#91;", "&#93;"], htmlentities($data["url"], ENT_QUOTES, 'UTF-8', false));
+	$data["title"] = str_replace(["[", "]"], ["&#91;", "&#93;"], htmlentities($data["title"], ENT_QUOTES, 'UTF-8', false));
 
 	$text = "[attachment type='".$data["type"]."'";
 
@@ -198,7 +167,7 @@ function add_page_info_data($data) {
 	}
 
 	if (sizeof($data["images"]) > 0) {
-		$preview = str_replace(array("[", "]"), array("&#91;", "&#93;"), htmlentities($data["images"][0]["src"], ENT_QUOTES, 'UTF-8', false));
+		$preview = str_replace(["[", "]"], ["&#91;", "&#93;"], htmlentities($data["images"][0]["src"], ENT_QUOTES, 'UTF-8', false));
 		// if the preview picture is larger than 500 pixels then show it in a larger mode
 		// But only, if the picture isn't higher than large (To prevent huge posts)
 		if (!Config::get('system', 'always_show_preview') && ($data["images"][0]["width"] >= 500)
@@ -215,9 +184,9 @@ function add_page_info_data($data) {
 	if (isset($data["keywords"]) && count($data["keywords"])) {
 		$hashtags = "\n";
 		foreach ($data["keywords"] AS $keyword) {
-			/// @todo make a positive list of allowed characters
-			$hashtag = str_replace(array(" ", "+", "/", ".", "#", "'", "’", "`", "(", ")", "„", "“"),
-						array("", "", "", "", "", "", "", "", "", "", "", ""), $keyword);
+			/// @TODO make a positive list of allowed characters
+			$hashtag = str_replace([" ", "+", "/", ".", "#", "'", "’", "`", "(", ")", "„", "“"],
+						["", "", "", "", "", "", "", "", "", "", "", ""], $keyword);
 			$hashtags .= "#[url=" . System::baseUrl() . "/search?tag=" . rawurlencode($hashtag) . "]" . $hashtag . "[/url] ";
 		}
 	}
@@ -225,6 +194,7 @@ function add_page_info_data($data) {
 	return "\n".$text.$hashtags;
 }
 
+/// @TODO move to ???
 function query_page_info($url, $no_photos = false, $photo = "", $keywords = false, $keyword_blacklist = "") {
 
 	$data = ParseUrl::getSiteinfoCached($url, true);
@@ -253,14 +223,15 @@ function query_page_info($url, $no_photos = false, $photo = "", $keywords = fals
 	return $data;
 }
 
+/// @TODO move to ???
 function add_page_keywords($url, $no_photos = false, $photo = "", $keywords = false, $keyword_blacklist = "") {
 	$data = query_page_info($url, $no_photos, $photo, $keywords, $keyword_blacklist);
 
 	$tags = "";
 	if (isset($data["keywords"]) && count($data["keywords"])) {
 		foreach ($data["keywords"] AS $keyword) {
-			$hashtag = str_replace(array(" ", "+", "/", ".", "#", "'"),
-				array("", "", "", "", "", ""), $keyword);
+			$hashtag = str_replace([" ", "+", "/", ".", "#", "'"],
+				["", "", "", "", "", ""], $keyword);
 
 			if ($tags != "") {
 				$tags .= ", ";
@@ -273,6 +244,7 @@ function add_page_keywords($url, $no_photos = false, $photo = "", $keywords = fa
 	return $tags;
 }
 
+/// @TODO move to ???
 function add_page_info($url, $no_photos = false, $photo = "", $keywords = false, $keyword_blacklist = "") {
 	$data = query_page_info($url, $no_photos, $photo, $keywords, $keyword_blacklist);
 
@@ -281,6 +253,7 @@ function add_page_info($url, $no_photos = false, $photo = "", $keywords = false,
 	return $text;
 }
 
+/// @TODO move to ???
 function add_page_info_to_body($body, $texturl = false, $no_photos = false) {
 
 	logger('add_page_info_to_body: fetch page info for body ' . $body, LOGGER_DEBUG);
@@ -319,7 +292,7 @@ function add_page_info_to_body($body, $texturl = false, $no_photos = false) {
 			$body = $removedlink;
 		}
 
-		$url = str_replace(array('/', '.'), array('\/', '\.'), $matches[1]);
+		$url = str_replace(['/', '.'], ['\/', '\.'], $matches[1]);
 		$removedlink = preg_replace("/\[url\=" . $url . "\](.*?)\[\/url\]/ism", '', $body);
 		if (($removedlink == "") || strstr($body, $removedlink)) {
 			$body = $removedlink;
@@ -334,153 +307,10 @@ function add_page_info_to_body($body, $texturl = false, $no_photos = false) {
 	return $body;
 }
 
-/**
- * Adds a "lang" specification in a "postopts" element of given $arr,
- * if possible and not already present.
- * Expects "body" element to exist in $arr.
- *
- * @todo Add a parameter to request forcing override
- */
-function item_add_language_opt(&$arr) {
-
-	if (version_compare(PHP_VERSION, '5.3.0', '<')) {
-		 // LanguageDetect.php not available ?
-		return;
-	}
-
-	if (x($arr, 'postopts') ) {
-		if (strstr($arr['postopts'], 'lang=') ) {
-			// do not override
-			/// @TODO Add parameter to request overriding
-			return;
-		}
-		$postopts = $arr['postopts'];
-	} else {
-		$postopts = "";
-	}
-
-	$naked_body = preg_replace('/\[(.+?)\]/','', $arr['body']);
-	$l = new Text_LanguageDetect();
-	$lng = $l->detect($naked_body, 3);
-
-	if (sizeof($lng) > 0) {
-		if ($postopts != "") $postopts .= '&'; // arbitrary separator, to be reviewed
-		$postopts .= 'lang=';
-		$sep = "";
-		foreach ($lng as $language => $score) {
-			$postopts .= $sep . $language . ";" . $score;
-			$sep = ':';
-		}
-		$arr['postopts'] = $postopts;
-	}
-}
-
-/**
- * @brief Creates an unique guid out of a given uri
- *
- * @param string $uri uri of an item entry
- * @param string $host (Optional) hostname for the GUID prefix
- * @return string unique guid
- */
-function uri_to_guid($uri, $host = "") {
-
-	// Our regular guid routine is using this kind of prefix as well
-	// We have to avoid that different routines could accidentally create the same value
-	$parsed = parse_url($uri);
-
-	// When the hostname isn't given, we take it from the uri
-	if ($host == "") {
-		// Is it in the format data@host.tld?
-		if ((count($parsed) == 1) && strstr($uri, '@')) {
-			$mailparts = explode('@', $uri);
-			$host = array_pop($mailparts);
-		} else {
-			$host = $parsed["host"];
-		}
-	}
-
-	// We use a hash of the hostname as prefix for the guid
-	$guid_prefix = hash("crc32", $host);
-
-	// Remove the scheme to make sure that "https" and "http" doesn't make a difference
-	unset($parsed["scheme"]);
-
-	// Glue it together to be able to make a hash from it
-	$host_id = implode("/", $parsed);
-
-	// We could use any hash algorithm since it isn't a security issue
-	$host_hash = hash("ripemd128", $host_id);
-
-	return $guid_prefix.$host_hash;
-}
-
-/**
- * @brief Store the conversation data
- *
- * @param array $arr Item array with conversation data
- * @return array Item array with removed conversation data
- */
-function store_conversation($arr) {
-	if (in_array($arr['network'], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS)) && !empty($arr['uri'])) {
-		$conversation = array('item-uri' => $arr['uri'], 'received' => DBM::date());
-
-		if (isset($arr['parent-uri']) && ($arr['parent-uri'] != $arr['uri'])) {
-			$conversation['reply-to-uri'] = $arr['parent-uri'];
-		}
-		if (isset($arr['thr-parent']) && ($arr['thr-parent'] != $arr['uri'])) {
-			$conversation['reply-to-uri'] = $arr['thr-parent'];
-		}
-
-		if (isset($arr['conversation-uri'])) {
-			$conversation['conversation-uri'] = $arr['conversation-uri'];
-		}
-
-		if (isset($arr['conversation-href'])) {
-			$conversation['conversation-href'] = $arr['conversation-href'];
-		}
-
-		if (isset($arr['protocol'])) {
-			$conversation['protocol'] = $arr['protocol'];
-		}
-
-		if (isset($arr['source'])) {
-			$conversation['source'] = $arr['source'];
-		}
-
-		$old_conv = dba::fetch_first("SELECT `item-uri`, `reply-to-uri`, `conversation-uri`, `conversation-href`, `protocol`, `source`
-				FROM `conversation` WHERE `item-uri` = ?", $conversation['item-uri']);
-		if (DBM::is_result($old_conv)) {
-			// Don't update when only the source has changed.
-			// Only do this when there had been no source before.
-			if ($old_conv['source'] != '') {
-				unset($old_conv['source']);
-			}
-			// Update structure data all the time but the source only when its from a better protocol.
-			if (($old_conv['protocol'] < $conversation['protocol']) && ($old_conv['protocol'] != 0)) {
-				unset($conversation['protocol']);
-				unset($conversation['source']);
-			}
-			if (!dba::update('conversation', $conversation, array('item-uri' => $conversation['item-uri']), $old_conv)) {
-				logger('Conversation: update for '.$conversation['item-uri'].' from '.$conv['protocol'].' to '.$conversation['protocol'].' failed', LOGGER_DEBUG);
-			}
-		} else {
-			if (!dba::insert('conversation', $conversation, true)) {
-				logger('Conversation: insert for '.$conversation['item-uri'].' (protocol '.$conversation['protocol'].') failed', LOGGER_DEBUG);
-			}
-		}
-	}
-
-	unset($arr['conversation-uri']);
-	unset($arr['conversation-href']);
-	unset($arr['protocol']);
-	unset($arr['source']);
-
-	return $arr;
-}
-
 /// @TODO add type-hint array
-function item_store($arr, $force_parent = false, $notify = false, $dontcache = false) {
-
+/// @TODO move to src/Model/Item.php
+function item_store($arr, $force_parent = false, $notify = false, $dontcache = false)
+{
 	$a = get_app();
 
 	// If it is a posting where users should get notifications, then define it as wall posting
@@ -488,28 +318,29 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
 		$arr['wall'] = 1;
 		$arr['type'] = 'wall';
 		$arr['origin'] = 1;
-		$arr['last-child'] = 1;
 		$arr['network'] = NETWORK_DFRN;
 		$arr['protocol'] = PROTOCOL_DFRN;
 
 		// We have to avoid duplicates. So we create the GUID in form of a hash of the plink or uri.
-		// In difference to the call to "uri_to_guid" several lines below we add the hash of our own host.
+		// In difference to the call to "Item::guidFromUri" several lines below we add the hash of our own host.
 		// This is done because our host is the original creator of the post.
 		if (!isset($arr['guid'])) {
 			if (isset($arr['plink'])) {
-				$arr['guid'] = uri_to_guid($arr['plink'], $a->get_hostname());
+				$arr['guid'] = Item::guidFromUri($arr['plink'], $a->get_hostname());
 			} elseif (isset($arr['uri'])) {
-				$arr['guid'] = uri_to_guid($arr['uri'], $a->get_hostname());
+				$arr['guid'] = Item::guidFromUri($arr['uri'], $a->get_hostname());
 			}
 		}
+	} else {
+		$arr['network'] = trim(defaults($arr, 'network', NETWORK_PHANTOM));
 	}
 
 	if ($notify) {
 		$guid_prefix = "";
 	} elseif ((trim($arr['guid']) == "") && (trim($arr['plink']) != "")) {
-		$arr['guid'] = uri_to_guid($arr['plink']);
+		$arr['guid'] = Item::guidFromUri($arr['plink']);
 	} elseif ((trim($arr['guid']) == "") && (trim($arr['uri']) != "")) {
-		$arr['guid'] = uri_to_guid($arr['uri']);
+		$arr['guid'] = Item::guidFromUri($arr['uri']);
 	} else {
 		$parsed = parse_url($arr["author-link"]);
 		$guid_prefix = hash("crc32", $parsed["host"]);
@@ -519,7 +350,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
 	$arr['uri']           = ((x($arr, 'uri'))           ? notags(trim($arr['uri']))           : item_new_uri($a->get_hostname(), $uid, $arr['guid']));
 
 	// Store conversation data
-	$arr = store_conversation($arr);
+	$arr = Conversation::insert($arr);
 
 	/*
 	 * If a Diaspora signature structure was passed in, pull it out of the
@@ -534,7 +365,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
 	}
 
 	// Converting the plink
-	/// @todo Check if this is really still needed
+	/// @TODO Check if this is really still needed
 	if ($arr['network'] == NETWORK_OSTATUS) {
 		if (isset($arr['plink'])) {
 			$arr['plink'] = OStatus::convertHref($arr['plink']);
@@ -562,9 +393,9 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
 	// check for create date and expire time
 	$expire_interval = Config::get('system', 'dbclean-expire-days', 0);
 
-	$r = dba::select('user', array('expire'), array('uid' => $uid), array("limit" => 1));
-	if (DBM::is_result($r) && ($r['expire'] > 0) && (($r['expire'] < $expire_interval) || ($expire_interval == 0))) {
-		$expire_interval = $r['expire'];
+	$user = dba::selectFirst('user', ['expire'], ['uid' => $uid]);
+	if (DBM::is_result($user) && ($user['expire'] > 0) && (($user['expire'] < $expire_interval) || ($expire_interval == 0))) {
+		$expire_interval = $user['expire'];
 	}
 
 	if (($expire_interval > 0) && !empty($arr['created'])) {
@@ -581,7 +412,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
 	 * We have to check several networks since Friendica posts could be repeated
 	 * via OStatus (maybe Diasporsa as well)
 	 */
-	if (in_array(trim($arr['network']), array(NETWORK_DIASPORA, NETWORK_DFRN, NETWORK_OSTATUS, ""))) {
+	if (in_array($arr['network'], [NETWORK_DIASPORA, NETWORK_DFRN, NETWORK_OSTATUS, ""])) {
 		$r = q("SELECT `id`, `network` FROM `item` WHERE `uri` = '%s' AND `uid` = %d AND `network` IN ('%s', '%s', '%s')  LIMIT 1",
 				dbesc(trim($arr['uri'])),
 				intval($uid),
@@ -600,12 +431,12 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
 	}
 
 	/// @TODO old-lost code?
-	// Shouldn't happen but we want to make absolutely sure it doesn't leak from a plugin.
+	// Shouldn't happen but we want to make absolutely sure it doesn't leak from an addon.
 	// Deactivated, since the bbcode parser can handle with it - and it destroys posts with some smileys that contain "<"
 	//if ((strpos($arr['body'],'<') !== false) || (strpos($arr['body'],'>') !== false))
 	//	$arr['body'] = strip_tags($arr['body']);
 
-	item_add_language_opt($arr);
+	Item::addLanguageInPostopts($arr);
 
 	$arr['wall']          = ((x($arr, 'wall'))          ? intval($arr['wall'])                : 0);
 	$arr['extid']         = ((x($arr, 'extid'))         ? notags(trim($arr['extid']))         : '');
@@ -623,7 +454,6 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
 	$arr['title']         = ((x($arr, 'title'))         ? trim($arr['title'])         : '');
 	$arr['location']      = ((x($arr, 'location'))      ? trim($arr['location'])      : '');
 	$arr['coord']         = ((x($arr, 'coord'))         ? notags(trim($arr['coord']))         : '');
-	$arr['last-child']    = ((x($arr, 'last-child'))    ? intval($arr['last-child'])          : 0 );
 	$arr['visible']       = ((x($arr, 'visible') !== false) ? intval($arr['visible'])         : 1 );
 	$arr['deleted']       = 0;
 	$arr['parent-uri']    = ((x($arr, 'parent-uri'))    ? notags(trim($arr['parent-uri']))    : $arr['uri']);
@@ -644,7 +474,6 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
 	$arr['attach']        = ((x($arr, 'attach'))        ? notags(trim($arr['attach']))        : '');
 	$arr['app']           = ((x($arr, 'app'))           ? notags(trim($arr['app']))           : '');
 	$arr['origin']        = ((x($arr, 'origin'))        ? intval($arr['origin'])              : 0 );
-	$arr['network']       = ((x($arr, 'network'))       ? trim($arr['network'])               : '');
 	$arr['postopts']      = ((x($arr, 'postopts'))      ? trim($arr['postopts'])              : '');
 	$arr['resource-id']   = ((x($arr, 'resource-id'))   ? trim($arr['resource-id'])           : '');
 	$arr['event-id']      = ((x($arr, 'event-id'))      ? intval($arr['event-id'])            : 0 );
@@ -674,18 +503,19 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
 		$arr['plink'] = System::baseUrl() . '/display/' . urlencode($arr['guid']);
 	}
 
-	if ($arr['network'] == "") {
+	if ($arr['network'] == NETWORK_PHANTOM) {
 		$r = q("SELECT `network` FROM `contact` WHERE `network` IN ('%s', '%s', '%s') AND `nurl` = '%s' AND `uid` = %d LIMIT 1",
 			dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS),
 			dbesc(normalise_link($arr['author-link'])),
 			intval($arr['uid'])
 		);
 
-		if (!DBM::is_result($r))
+		if (!DBM::is_result($r)) {
 			$r = q("SELECT `network` FROM `gcontact` WHERE `network` IN ('%s', '%s', '%s') AND `nurl` = '%s' LIMIT 1",
 				dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS),
 				dbesc(normalise_link($arr['author-link']))
 			);
+		}
 
 		if (!DBM::is_result($r)) {
 			$r = q("SELECT `network` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
@@ -733,18 +563,18 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
 		logger("Contact-id was missing for post ".$arr["guid"]." from user id ".$uid." - now set to ".$arr["contact-id"], LOGGER_DEBUG);
 	}
 
-	if ($arr["gcontact-id"] == 0) {
+	if (!x($arr, "gcontact-id")) {
 		/*
 		 * The gcontact should mostly behave like the contact. But is is supposed to be global for the system.
 		 * This means that wall posts, repeated posts, etc. should have the gcontact id of the owner.
 		 * On comments the author is the better choice.
 		 */
 		if ($arr['parent-uri'] === $arr['uri']) {
-			$arr["gcontact-id"] = GContact::getId(array("url" => $arr['owner-link'], "network" => $arr['network'],
-								 "photo" => $arr['owner-avatar'], "name" => $arr['owner-name']));
+			$arr["gcontact-id"] = GContact::getId(["url" => $arr['owner-link'], "network" => $arr['network'],
+								 "photo" => $arr['owner-avatar'], "name" => $arr['owner-name']]);
 		} else {
-			$arr["gcontact-id"] = GContact::getId(array("url" => $arr['author-link'], "network" => $arr['network'],
-								 "photo" => $arr['author-avatar'], "name" => $arr['author-name']));
+			$arr["gcontact-id"] = GContact::getId(["url" => $arr['author-link'], "network" => $arr['network'],
+								 "photo" => $arr['author-avatar'], "name" => $arr['author-name']]);
 		}
 	}
 
@@ -852,11 +682,10 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
 			logger("item_store: Checking if parent ".$parent_id." has to be tagged as mention for user ".$arr['uid'], LOGGER_DEBUG);
 			$u = q("SELECT `nickname` FROM `user` WHERE `uid` = %d", intval($arr['uid']));
 			if (DBM::is_result($u)) {
-				$a = get_app();
 				$self = normalise_link(System::baseUrl() . '/profile/' . $u[0]['nickname']);
 				logger("item_store: 'myself' is ".$self." for parent ".$parent_id." checking against ".$arr['author-link']." and ".$arr['owner-link'], LOGGER_DEBUG);
 				if ((normalise_link($arr['author-link']) == $self) || (normalise_link($arr['owner-link']) == $self)) {
-					dba::update('thread', array('mention' => true), array('iid' => $parent_id));
+					dba::update('thread', ['mention' => true], ['iid' => $parent_id]);
 					logger("item_store: tagged thread ".$parent_id." as mention for user ".$self, LOGGER_DEBUG);
 				}
 			}
@@ -891,7 +720,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
 	}
 
 	// On Friendica and Diaspora the GUID is unique
-	if (in_array($arr['network'], array(NETWORK_DFRN, NETWORK_DIASPORA))) {
+	if (in_array($arr['network'], [NETWORK_DFRN, NETWORK_DIASPORA])) {
 		$r = q("SELECT `id` FROM `item` WHERE `guid` = '%s' AND `uid` = %d LIMIT 1",
 			dbesc($arr['guid']),
 			intval($arr['uid'])
@@ -920,7 +749,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
 		$arr["global"] = true;
 
 		// Set the global flag on all items if this was a global item entry
-		dba::update('item', array('global' => true), array('uri' => $arr["uri"]));
+		dba::update('item', ['global' => true], ['uri' => $arr["uri"]]);
 	} else {
 		$isglobal = q("SELECT `global` FROM `item` WHERE `uid` = 0 AND `uri` = '%s'", dbesc($arr["uri"]));
 
@@ -945,9 +774,9 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
 	put_item_in_cache($arr);
 
 	if ($notify) {
-		call_hooks('post_local', $arr);
+		Addon::callHooks('post_local', $arr);
 	} else {
-		call_hooks('post_remote', $arr);
+		Addon::callHooks('post_remote', $arr);
 	}
 
 	// This array field is used to trigger some automatic reactions
@@ -955,7 +784,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
 	unset($arr['api_source']);
 
 	if (x($arr, 'cancel')) {
-		logger('item_store: post cancelled by plugin.');
+		logger('item_store: post cancelled by addon.');
 		return 0;
 	}
 
@@ -1031,7 +860,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
 		logger('Duplicated post occurred. uri = ' . $arr['uri'] . ' uid = ' . $arr['uid']);
 
 		// Yes, we could do a rollback here - but we are having many users with MyISAM.
-		dba::delete('item', array('id' => $current_post));
+		dba::delete('item', ['id' => $current_post]);
 		dba::commit();
 		return 0;
 	} elseif ($r[0]["entries"] == 0) {
@@ -1042,14 +871,14 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
 	}
 
 	logger('item_store: created item '.$current_post);
-	item_set_last_item($arr);
+	Item::updateContact($arr);
 
 	if (!$parent_id || ($arr['parent-uri'] === $arr['uri'])) {
 		$parent_id = $current_post;
 	}
 
 	// Set parent id
-	$r = dba::update('item', array('parent' => $parent_id), array('id' => $current_post));
+	dba::update('item', ['parent' => $parent_id], ['id' => $current_post]);
 
 	$arr['id'] = $current_post;
 	$arr['parent'] = $parent_id;
@@ -1057,9 +886,9 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
 	// update the commented timestamp on the parent
 	// Only update "commented" if it is really a comment
 	if (($arr['verb'] == ACTIVITY_POST) || !Config::get("system", "like_no_comment")) {
-		dba::update('item', array('commented' => datetime_convert(), 'changed' => datetime_convert()), array('id' => $parent_id));
+		dba::update('item', ['commented' => datetime_convert(), 'changed' => datetime_convert()], ['id' => $parent_id]);
 	} else {
-		dba::update('item', array('changed' => datetime_convert()), array('id' => $parent_id));
+		dba::update('item', ['changed' => datetime_convert()], ['id' => $parent_id]);
 	}
 
 	if ($dsprsig) {
@@ -1073,8 +902,8 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
 			logger("Repaired double encoded signature from handle ".$dsprsig->signer, LOGGER_DEBUG);
 		}
 
-		dba::insert('sign', array('iid' => $current_post, 'signed_text' => $dsprsig->signed_text,
-					'signature' => $dsprsig->signature, 'signer' => $dsprsig->signer));
+		dba::insert('sign', ['iid' => $current_post, 'signed_text' => $dsprsig->signed_text,
+					'signature' => $dsprsig->signature, 'signer' => $dsprsig->signer]);
 	}
 
 	$deleted = tag_deliver($arr['uid'], $current_post);
@@ -1088,9 +917,9 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
 		$r = q('SELECT * FROM `item` WHERE `id` = %d', intval($current_post));
 		if ((DBM::is_result($r)) && (count($r) == 1)) {
 			if ($notify) {
-				call_hooks('post_local_end', $r[0]);
+				Addon::callHooks('post_local_end', $r[0]);
 			} else {
-				call_hooks('post_remote_end', $r[0]);
+				Addon::callHooks('post_remote_end', $r[0]);
 			}
 		} else {
 			logger('item_store: new item not found in DB, id ' . $current_post);
@@ -1110,86 +939,24 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
 	 * This is not perfect - but a workable solution until we found the reason for the problem.
 	 */
 	create_tags_from_item($current_post);
-	create_files_from_item($current_post);
-
-	/*
-	 * If this is now the last-child, force all _other_ children of this parent to *not* be last-child
-	 * It is done after the transaction to avoid dead locks.
-	 */
-	if ($arr['last-child']) {
-		$r = q("UPDATE `item` SET `last-child` = 0 WHERE `parent-uri` = '%s' AND `uid` = %d AND `id` != %d",
-			dbesc($arr['uri']),
-			intval($arr['uid']),
-			intval($current_post)
-		);
-	}
+	Term::createFromItem($current_post);
 
 	if ($arr['parent-uri'] === $arr['uri']) {
-		add_shadow_thread($current_post);
+		Item::addShadow($current_post);
 	} else {
-		add_shadow_entry($current_post);
+		Item::addShadowPost($current_post);
 	}
 
-	check_item_notification($current_post, $uid);
+	check_user_notification($current_post);
 
 	if ($notify) {
-		Worker::add(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), "Notifier", $notify_type, $current_post);
+		Worker::add(['priority' => PRIORITY_HIGH, 'dont_fork' => true], "Notifier", $notify_type, $current_post);
 	}
 
 	return $current_post;
 }
 
-/**
- * @brief Set "success_update" and "last-item" to the date of the last time we heard from this contact
- *
- * This can be used to filter for inactive contacts.
- * Only do this for public postings to avoid privacy problems, since poco data is public.
- * Don't set this value if it isn't from the owner (could be an author that we don't know)
- *
- * @param array $arr Contains the just posted item record
- */
-function item_set_last_item($arr) {
-	// Unarchive the author
-	$contact = dba::select('contact', [], ['id' => $arr["author-link"]], ['limit' => 1]);
-	if ($contact['term-date'] > NULL_DATE) {
-		 Contact::unmarkForArchival($contact);
-	}
-
-	// Unarchive the contact if it is a toplevel posting
-	if ($arr["parent-uri"] === $arr["uri"]) {
-		$contact = dba::select('contact', [], ['id' => $arr["contact-id"]], ['limit' => 1]);
-		if ($contact['term-date'] > NULL_DATE) {
-			 Contact::unmarkForArchival($contact);
-		}
-	}
-
-	$update = (!$arr['private'] && (($arr["author-link"] === $arr["owner-link"]) || ($arr["parent-uri"] === $arr["uri"])));
-
-	// Is it a forum? Then we don't care about the rules from above
-	if (!$update && ($arr["network"] == NETWORK_DFRN) && ($arr["parent-uri"] === $arr["uri"])) {
-		$isforum = q("SELECT `forum` FROM `contact` WHERE `id` = %d AND `forum`",
-				intval($arr['contact-id']));
-		if (DBM::is_result($isforum)) {
-			$update = true;
-		}
-	}
-
-	if ($update) {
-		dba::update('contact', array('success_update' => $arr['received'], 'last-item' => $arr['received']),
-			array('id' => $arr['contact-id']));
-	}
-	// Now do the same for the system wide contacts with uid=0
-	if (!$arr['private']) {
-		dba::update('contact', array('success_update' => $arr['received'], 'last-item' => $arr['received']),
-			array('id' => $arr['owner-id']));
-
-		if ($arr['owner-id'] != $arr['author-id']) {
-			dba::update('contact', array('success_update' => $arr['received'], 'last-item' => $arr['received']),
-				array('id' => $arr['author-id']));
-		}
-	}
-}
-
+/// @TODO move to src/Model/Item.php
 function item_body_set_hashtags(&$item) {
 
 	$tags = get_tags($item["body"]);
@@ -1203,8 +970,6 @@ function item_body_set_hashtags(&$item) {
 	// Otherwise there could be problems with hashtags like #test and #test2
 	rsort($tags);
 
-	$a = get_app();
-
 	$URLSearchString = "^\[\]";
 
 	// All hashtags should point to the home server if "local_tags" is activated
@@ -1259,6 +1024,7 @@ function item_body_set_hashtags(&$item) {
 	$item["body"] = str_replace("&num;", "#", $item["body"]);
 }
 
+/// @TODO move to src/Model/Item.php
 function get_item_guid($id) {
 	$r = q("SELECT `guid` FROM `item` WHERE `id` = %d LIMIT 1", intval($id));
 	if (DBM::is_result($r)) {
@@ -1269,6 +1035,7 @@ function get_item_guid($id) {
 	}
 }
 
+/// @TODO move to src/Model/Item.php
 function get_item_id($guid, $uid = 0) {
 
 	$nick = "";
@@ -1302,10 +1069,11 @@ function get_item_id($guid, $uid = 0) {
 			$nick = $r[0]["nickname"];
 		}
 	}
-	return array("nick" => $nick, "id" => $id);
+	return ["nick" => $nick, "id" => $id];
 }
 
 // return - test
+/// @TODO move to src/Model/Item.php
 function get_item_contact($item, $contacts) {
 	if (! count($contacts) || (! is_array($item))) {
 		return false;
@@ -1313,7 +1081,6 @@ function get_item_contact($item, $contacts) {
 	foreach ($contacts as $contact) {
 		if ($contact['id'] == $item['contact-id']) {
 			return $contact;
-			break; // NOTREACHED
 		}
 	}
 	return false;
@@ -1325,16 +1092,14 @@ function get_item_contact($item, $contacts) {
  * @param int $item_id
  * @return bool true if item was deleted, else false
  */
-function tag_deliver($uid, $item_id) {
-
-	$a = get_app();
-
+/// @TODO move to src/Model/Item.php
+function tag_deliver($uid, $item_id)
+{
 	$mention = false;
 
 	$u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
 		intval($uid)
 	);
-
 	if (! DBM::is_result($u)) {
 		return;
 	}
@@ -1342,7 +1107,6 @@ function tag_deliver($uid, $item_id) {
 	$community_page = (($u[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
 	$prvgroup = (($u[0]['page-flags'] == PAGE_PRVGROUP) ? true : false);
 
-
 	$i = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 		intval($item_id),
 		intval($uid)
@@ -1377,15 +1141,15 @@ function tag_deliver($uid, $item_id) {
 			// mmh.. no mention.. community page or private group... no wall.. no origin.. top-post (not a comment)
 			// delete it!
 			logger("tag_deliver: no-mention top-level post to communuty or private group. delete.");
-			dba::delete('item', array('id' => $item_id));
+			dba::delete('item', ['id' => $item_id]);
 			return true;
 		}
 		return;
 	}
 
-	$arr = array('item' => $item, 'user' => $u[0], 'contact' => $r[0]);
+	$arr = ['item' => $item, 'user' => $u[0], 'contact' => $r[0]];
 
-	call_hooks('tagged', $arr);
+	Addon::callHooks('tagged', $arr);
 
 	if ((! $community_page) && (! $prvgroup)) {
 		return;
@@ -1429,12 +1193,11 @@ function tag_deliver($uid, $item_id) {
 	);
 	update_thread($item_id);
 
-	Worker::add(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), 'Notifier', 'tgroup', $item_id);
+	Worker::add(['priority' => PRIORITY_HIGH, 'dont_fork' => true], 'Notifier', 'tgroup', $item_id);
 
 }
 
-
-
+/// @TODO move to src/Protocol/DFRN.php
 function tgroup_check($uid, $item) {
 
 	$mention = false;
@@ -1490,8 +1253,9 @@ function tgroup_check($uid, $item) {
  * item is assumed to be up-to-date.  If the timestamps are equal it
  * assumes the update has been seen before and should be ignored.
  *
- * @todo fix type-hints (both array)
+ * @TODO fix type-hints (both array)
  */
+/// @TODO move to src/Protocol/DFRN.php
 function edited_timestamp_is_newer($existing, $update) {
 	if (!x($existing, 'edited') || !$existing['edited']) {
 		return true;
@@ -1531,8 +1295,9 @@ function edited_timestamp_is_newer($existing, $update) {
  * to get all the feed items into a mostly linear ordering, and might still require
  * recursion.
  *
- * @todo find proper type-hints
+ * @TODO find proper type-hints
  */
+/// @TODO move to ???
 function consume_feed($xml, $importer, &$contact, &$hub, $datedir = 0, $pass = 0) {
 	if ($contact['network'] === NETWORK_OSTATUS) {
 		if ($pass < 2) {
@@ -1577,6 +1342,7 @@ function consume_feed($xml, $importer, &$contact, &$hub, $datedir = 0, $pass = 0
 }
 
 /// @TODO type-hint is array
+/// @TODO move to src/Model/Item.php
 function item_is_remote_self($contact, &$datarray) {
 	$a = get_app();
 
@@ -1655,6 +1421,7 @@ function item_is_remote_self($contact, &$datarray) {
 }
 
 /// @TODO find proper type-hints
+/// @TODO move to src/Model/Item.php
 function new_follower($importer, $contact, $datarray, $item, $sharing = false) {
 	$url = notags(trim($datarray['author-link']));
 	$name = notags(trim($datarray['author-name']));
@@ -1672,15 +1439,13 @@ function new_follower($importer, $contact, $datarray, $item, $sharing = false) {
 	if (is_array($contact)) {
 		if (($contact['network'] == NETWORK_OSTATUS && $contact['rel'] == CONTACT_IS_SHARING)
 			|| ($sharing && $contact['rel'] == CONTACT_IS_FOLLOWER)) {
-			$r = dba::update('contact', array('rel' => CONTACT_IS_FRIEND, 'writable' => true),
-					array('id' => $contact['id'], 'uid' => $importer['uid']));
+			dba::update('contact', ['rel' => CONTACT_IS_FRIEND, 'writable' => true],
+					['id' => $contact['id'], 'uid' => $importer['uid']]);
 		}
 		// send email notification to owner?
 	} else {
-
 		// create contact record
-
-		$r = q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `name`, `nick`, `photo`, `network`, `rel`,
+		q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `name`, `nick`, `photo`, `network`, `rel`,
 			`blocked`, `readonly`, `pending`, `writable`)
 			VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, 0, 0, 1, 1)",
 			intval($importer['uid']),
@@ -1693,6 +1458,7 @@ function new_follower($importer, $contact, $datarray, $item, $sharing = false) {
 			dbesc(NETWORK_OSTATUS),
 			intval(CONTACT_IS_FOLLOWER)
 		);
+
 		$r = q("SELECT `id`, `network` FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `pending` = 1 LIMIT 1",
 				intval($importer['uid']),
 				dbesc($url)
@@ -1706,24 +1472,22 @@ function new_follower($importer, $contact, $datarray, $item, $sharing = false) {
 		$r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
 			intval($importer['uid'])
 		);
-
-		if (DBM::is_result($r) && !in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE, PAGE_COMMUNITY))) {
-
+		if (DBM::is_result($r) && !in_array($r[0]['page-flags'], [PAGE_SOAPBOX, PAGE_FREELOVE, PAGE_COMMUNITY])) {
 			// create notification
 			$hash = random_string();
 
 			if (is_array($contact_record)) {
-				dba::insert('intro', array('uid' => $importer['uid'], 'contact-id' => $contact_record['id'],
+				dba::insert('intro', ['uid' => $importer['uid'], 'contact-id' => $contact_record['id'],
 							'blocked' => false, 'knowyou' => false,
-							'hash' => $hash, 'datetime' => datetime_convert()));
+							'hash' => $hash, 'datetime' => datetime_convert()]);
 			}
 
 			Group::addMember(User::getDefaultGroup($importer['uid'], $contact_record["network"]), $contact_record['id']);
 
 			if (($r[0]['notify-flags'] & NOTIFY_INTRO) &&
-				in_array($r[0]['page-flags'], array(PAGE_NORMAL))) {
+				in_array($r[0]['page-flags'], [PAGE_NORMAL])) {
 
-				notification(array(
+				notification([
 					'type'         => NOTIFY_INTRO,
 					'notify_flags' => $r[0]['notify-flags'],
 					'language'     => $r[0]['language'],
@@ -1736,11 +1500,11 @@ function new_follower($importer, $contact, $datarray, $item, $sharing = false) {
 					'source_photo' => $contact_record['photo'],
 					'verb'         => ($sharing ? ACTIVITY_FRIEND : ACTIVITY_FOLLOW),
 					'otype'        => 'intro'
-				));
+				]);
 
 			}
-		} elseif (DBM::is_result($r) && in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE, PAGE_COMMUNITY))) {
-			$r = q("UPDATE `contact` SET `pending` = 0 WHERE `uid` = %d AND `url` = '%s' AND `pending` LIMIT 1",
+		} elseif (DBM::is_result($r) && in_array($r[0]['page-flags'], [PAGE_SOAPBOX, PAGE_FREELOVE, PAGE_COMMUNITY])) {
+			q("UPDATE `contact` SET `pending` = 0 WHERE `uid` = %d AND `url` = '%s' AND `pending` LIMIT 1",
 					intval($importer['uid']),
 					dbesc($url)
 			);
@@ -1749,24 +1513,27 @@ function new_follower($importer, $contact, $datarray, $item, $sharing = false) {
 	}
 }
 
-function lose_follower($importer, $contact, array $datarray = array(), $item = "") {
+/// @TODO move to src/Model/Item.php
+function lose_follower($importer, $contact, array $datarray = [], $item = "") {
 
 	if (($contact['rel'] == CONTACT_IS_FRIEND) || ($contact['rel'] == CONTACT_IS_SHARING)) {
-		dba::update('contact', array('rel' => CONTACT_IS_SHARING), array('id' => $contact['id']));
+		dba::update('contact', ['rel' => CONTACT_IS_SHARING], ['id' => $contact['id']]);
 	} else {
 		Contact::remove($contact['id']);
 	}
 }
 
-function lose_sharer($importer, $contact, array $datarray = array(), $item = "") {
+/// @TODO move to src/Model/Item.php
+function lose_sharer($importer, $contact, array $datarray = [], $item = "") {
 
 	if (($contact['rel'] == CONTACT_IS_FRIEND) || ($contact['rel'] == CONTACT_IS_FOLLOWER)) {
-		dba::update('contact', array('rel' => CONTACT_IS_FOLLOWER), array('id' => $contact['id']));
+		dba::update('contact', ['rel' => CONTACT_IS_FOLLOWER], ['id' => $contact['id']]);
 	} else {
 		Contact::remove($contact['id']);
 	}
 }
 
+/// @TODO move to ???
 function subscribe_to_hub($url, $importer, $contact, $hubmode = 'subscribe') {
 
 	$a = get_app();
@@ -1796,7 +1563,7 @@ function subscribe_to_hub($url, $importer, $contact, $hubmode = 'subscribe') {
 	logger('subscribe_to_hub: ' . $hubmode . ' ' . $contact['name'] . ' to hub ' . $url . ' endpoint: '  . $push_url . ' with verifier ' . $verify_token);
 
 	if (!strlen($contact['hub-verify']) || ($contact['hub-verify'] != $verify_token)) {
-		$r = dba::update('contact', array('hub-verify' => $verify_token), array('id' => $contact['id']));
+		dba::update('contact', ['hub-verify' => $verify_token], ['id' => $contact['id']]);
 	}
 
 	post_url($url, $params);
@@ -1807,16 +1574,23 @@ function subscribe_to_hub($url, $importer, $contact, $hubmode = 'subscribe') {
 
 }
 
-function fix_private_photos($s, $uid, $item = null, $cid = 0) {
-
-	if (Config::get('system','disable_embedded')) {
+/**
+ *
+ * @param string $s
+ * @param int    $uid
+ * @param array  $item
+ * @param int    $cid
+ * @return string
+ */
+/// @TODO move to src/Model/Item.php
+function fix_private_photos($s, $uid, $item = null, $cid = 0)
+{
+	if (Config::get('system', 'disable_embedded')) {
 		return $s;
 	}
 
-	$a = get_app();
-
 	logger('fix_private_photos: check for photos', LOGGER_DEBUG);
-	$site = substr(System::baseUrl(),strpos(System::baseUrl(),'://'));
+	$site = substr(System::baseUrl(), strpos(System::baseUrl(), '://'));
 
 	$orig_body = $s;
 	$new_body = '';
@@ -1824,19 +1598,18 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) {
 	$img_start = strpos($orig_body, '[img');
 	$img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false);
 	$img_len = ($img_start !== false ? strpos(substr($orig_body, $img_start + $img_st_close + 1), '[/img]') : false);
-	while ( ($img_st_close !== false) && ($img_len !== false) ) {
 
+	while (($img_st_close !== false) && ($img_len !== false)) {
 		$img_st_close++; // make it point to AFTER the closing bracket
 		$image = substr($orig_body, $img_start + $img_st_close, $img_len);
 
 		logger('fix_private_photos: found photo ' . $image, LOGGER_DEBUG);
 
-
-		if (stristr($image , $site . '/photo/')) {
+		if (stristr($image, $site . '/photo/')) {
 			// Only embed locally hosted photos
 			$replace = false;
 			$i = basename($image);
-			$i = str_replace(array('.jpg', '.png', '.gif'),array('', '',''), $i);
+			$i = str_replace(['.jpg', '.png', '.gif'], ['', '', ''], $i);
 			$x = strpos($i, '-');
 
 			if ($x) {
@@ -1846,7 +1619,6 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) {
 					dbesc($i),
 					intval($res),
 					intval($uid)
-
 				);
 				if (DBM::is_result($r)) {
 					/*
@@ -1914,6 +1686,7 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) {
 }
 
 /// @TODO type-hint is array
+/// @TODO move to src/Model/Item.php
 function has_permissions($obj) {
 	return (
 		(
@@ -1929,6 +1702,7 @@ function has_permissions($obj) {
 }
 
 /// @TODO type-hint is array
+/// @TODO move to src/Model/Item.php
 function compare_permissions($obj1, $obj2) {
 	// first part is easy. Check that these are exactly the same.
 	if (($obj1['allow_cid'] == $obj2['allow_cid'])
@@ -1950,6 +1724,7 @@ function compare_permissions($obj1, $obj2) {
 
 // returns an array of contact-ids that are allowed to see this object
 /// @TODO type-hint is array
+/// @TODO move to src/Model/Item.php
 function enumerate_permissions($obj) {
 	$allow_people = expand_acl($obj['allow_cid']);
 	$allow_groups = Group::expand(expand_acl($obj['allow_gid']));
@@ -1961,14 +1736,15 @@ function enumerate_permissions($obj) {
 	return $recipients;
 }
 
+/// @TODO move to src/Model/Item.php
 function item_getfeedtags($item) {
-	$ret = array();
+	$ret = [];
 	$matches = false;
 	$cnt = preg_match_all('|\#\[url\=(.*?)\](.*?)\[\/url\]|', $item['tag'], $matches);
 	if ($cnt) {
 		for ($x = 0; $x < $cnt; $x ++) {
 			if ($matches[1][$x]) {
-				$ret[$matches[2][$x]] = array('#', $matches[1][$x], $matches[2][$x]);
+				$ret[$matches[2][$x]] = ['#', $matches[1][$x], $matches[2][$x]];
 			}
 		}
 	}
@@ -1977,16 +1753,17 @@ function item_getfeedtags($item) {
 	if ($cnt) {
 		for ($x = 0; $x < $cnt; $x ++) {
 			if ($matches[1][$x]) {
-				$ret[] = array('@', $matches[1][$x], $matches[2][$x]);
+				$ret[] = ['@', $matches[1][$x], $matches[2][$x]];
 			}
 		}
 	}
 	return $ret;
 }
 
+/// @TODO move to src/Model/Item.php
 function item_expire($uid, $days, $network = "", $force = false) {
 
-	if ((! $uid) || ($days < 1)) {
+	if (!$uid || ($days < 1)) {
 		return;
 	}
 
@@ -1995,7 +1772,7 @@ function item_expire($uid, $days, $network = "", $force = false) {
 	 * and just expire conversations started by others
 	 */
 	$expire_network_only = PConfig::get($uid,'expire', 'network_only');
-	$sql_extra = ((intval($expire_network_only)) ? " AND wall = 0 " : "");
+	$sql_extra = (intval($expire_network_only) ? " AND wall = 0 " : "");
 
 	if ($network != "") {
 		$sql_extra .= sprintf(" AND network = '%s' ", dbesc($network));
@@ -2019,7 +1796,7 @@ function item_expire($uid, $days, $network = "", $force = false) {
 		intval($days)
 	);
 
-	if (! DBM::is_result($r)) {
+	if (!DBM::is_result($r)) {
 		return;
 	}
 
@@ -2056,37 +1833,30 @@ function item_expire($uid, $days, $network = "", $force = false) {
 			continue;
 		}
 
-		drop_item($item['id'], false);
+		Item::delete($item['id'], PRIORITY_LOW);
 	}
-
-	Worker::add(array('priority' => PRIORITY_LOW, 'dont_fork' => true), "Notifier", "expire", $uid);
 }
 
 /// @TODO type-hint is array
+/// @TODO move to ...
 function drop_items($items) {
 	$uid = 0;
 
-	if (! local_user() && ! remote_user()) {
+	if (!local_user() && !remote_user()) {
 		return;
 	}
 
 	if (count($items)) {
 		foreach ($items as $item) {
-			$owner = drop_item($item,false);
+			$owner = Item::delete($item);
 			if ($owner && ! $uid)
 				$uid = $owner;
 		}
 	}
-
-	// multiple threads may have been deleted, send an expire notification
-
-	if ($uid) {
-		Worker::add(array('priority' => PRIORITY_LOW, 'dont_fork' => true), "Notifier", "expire", $uid);
-	}
 }
 
-
-function drop_item($id, $interactive = true) {
+/// @TODO move to ...
+function drop_item($id) {
 
 	$a = get_app();
 
@@ -2096,11 +1866,8 @@ function drop_item($id, $interactive = true) {
 		intval($id)
 	);
 
-	if (! DBM::is_result($r)) {
-		if (! $interactive) {
-			return 0;
-		}
-		notice( t('Item not found.') . EOL);
+	if (!DBM::is_result($r)) {
+		notice(t('Item not found.') . EOL);
 		goaway(System::baseUrl() . '/' . $_SESSION['return_url']);
 	}
 
@@ -2110,8 +1877,6 @@ function drop_item($id, $interactive = true) {
 		return 0;
 	}
 
-	$owner = $item['uid'];
-
 	$contact_id = 0;
 
 	// check if logged in user is either the author or owner of this item
@@ -2125,23 +1890,22 @@ function drop_item($id, $interactive = true) {
 		}
 	}
 
-
-	if ((local_user() == $item['uid']) || $contact_id || !$interactive) {
+	if ((local_user() == $item['uid']) || $contact_id) {
 
 		// Check if we should do HTML-based delete confirmation
 		if ($_REQUEST['confirm']) {
 			// <form> can't take arguments in its "action" parameter
 			// so add any arguments as hidden inputs
 			$query = explode_querystring($a->query_string);
-			$inputs = array();
+			$inputs = [];
 			foreach ($query['args'] as $arg) {
 				if (strpos($arg, 'confirm=') === false) {
 					$arg_parts = explode('=', $arg);
-					$inputs[] = array('name' => $arg_parts[0], 'value' => $arg_parts[1]);
+					$inputs[] = ['name' => $arg_parts[0], 'value' => $arg_parts[1]];
 				}
 			}
 
-			return replace_macros(get_markup_template('confirm.tpl'), array(
+			return replace_macros(get_markup_template('confirm.tpl'), [
 				'$method' => 'get',
 				'$message' => t('Do you really want to delete this item?'),
 				'$extra_inputs' => $inputs,
@@ -2149,136 +1913,27 @@ function drop_item($id, $interactive = true) {
 				'$confirm_url' => $query['base'],
 				'$confirm_name' => 'confirmed',
 				'$cancel' => t('Cancel'),
-			));
+			]);
 		}
 		// Now check how the user responded to the confirmation query
 		if ($_REQUEST['canceled']) {
 			goaway(System::baseUrl() . '/' . $_SESSION['return_url']);
 		}
 
-		logger('delete item: ' . $item['id'], LOGGER_DEBUG);
-
 		// delete the item
-		$r = dba::update('item', array('deleted' => true, 'title' => '', 'body' => '',
-					'edited' => datetime_convert(), 'changed' => datetime_convert()),
-				array('id' => $item['id']));
-
-		create_tags_from_item($item['id']);
-		create_files_from_item($item['id']);
-		delete_thread($item['id'], $item['parent-uri']);
-
-		// clean up categories and tags so they don't end up as orphans
-
-		$matches = false;
-		$cnt = preg_match_all('/<(.*?)>/', $item['file'], $matches, PREG_SET_ORDER);
-		if ($cnt) {
-			foreach ($matches as $mtch) {
-				file_tag_unsave_file($item['uid'], $item['id'], $mtch[1],true);
-			}
-		}
-
-		$matches = false;
-
-		$cnt = preg_match_all('/\[(.*?)\]/', $item['file'], $matches, PREG_SET_ORDER);
-		if ($cnt) {
-			foreach ($matches as $mtch) {
-				file_tag_unsave_file($item['uid'], $item['id'], $mtch[1],false);
-			}
-		}
-
-		/*
-		 * If item is a link to a photo resource, nuke all the associated photos
-		 * (visitors will not have photo resources)
-		 * This only applies to photos uploaded from the photos page. Photos inserted into a post do not
-		 * generate a resource-id and therefore aren't intimately linked to the item.
-		 */
-		if (strlen($item['resource-id'])) {
-			dba::delete('photo', array('resource-id' => $item['resource-id'], 'uid' => $item['uid']));
-		}
+		Item::delete($item['id']);
 
-		// If item is a link to an event, nuke the event record.
-		if (intval($item['event-id'])) {
-			dba::delete('event', array('id' => $item['event-id'], 'uid' => $item['uid']));
-		}
-
-		// If item has attachments, drop them
-		foreach (explode(", ", $item['attach']) as $attach) {
-			preg_match("|attach/(\d+)|", $attach, $matches);
-			dba::delete('attach', array('id' => $matches[1], 'uid' => $item['uid']));
-		}
-
-		// The new code splits the queries since the mysql optimizer really has bad problems with subqueries
-
-		// Creating list of parents
-		$r = q("SELECT `id` FROM `item` WHERE `parent` = %d AND `uid` = %d",
-			intval($item['id']),
-			intval($item['uid'])
-		);
-
-		$parentid = "";
-
-		foreach ($r as $row) {
-			if ($parentid != "") {
-				$parentid .= ", ";
-			}
-
-			$parentid .= $row["id"];
-		}
-
-		// Now delete them
-		if ($parentid != "") {
-			$r = q("DELETE FROM `sign` WHERE `iid` IN (%s)", dbesc($parentid));
-		}
-
-		// If it's the parent of a comment thread, kill all the kids
-		if ($item['uri'] == $item['parent-uri']) {
-			$r = dba::update('item', array('deleted' => true, 'title' => '', 'body' => '',
-					'edited' => datetime_convert(), 'changed' => datetime_convert()),
-				array('parent-uri' => $item['parent-uri'], 'uid' => $item['uid']));
-
-			create_tags_from_itemuri($item['parent-uri'], $item['uid']);
-			create_files_from_itemuri($item['parent-uri'], $item['uid']);
-			delete_thread_uri($item['parent-uri'], $item['uid']);
-			// ignore the result
-		} else {
-			// ensure that last-child is set in case the comment that had it just got wiped.
-			dba::update('item', array('last-child' => false, 'changed' => datetime_convert()),
-					array('parent-uri' => $item['parent-uri'], 'uid' => $item['uid']));
-
-			// who is the last child now?
-			$r = q("SELECT `id` FROM `item` WHERE `parent-uri` = '%s' AND `type` != 'activity' AND `deleted` = 0 AND `uid` = %d ORDER BY `edited` DESC LIMIT 1",
-				dbesc($item['parent-uri']),
-				intval($item['uid'])
-			);
-			if (DBM::is_result($r)) {
-				dba::update('item', array('last-child' => true), array('id' => $r[0]['id']));
-			}
-		}
-
-		// send the notification upstream/downstream
-		// The priority depends on how the deletion is done.
-		$drop_id = intval($item['id']);
-		$priority = ($interactive ? PRIORITY_HIGH : PRIORITY_LOW);
-
-		Worker::add(array('priority' => $priority, 'dont_fork' => true), "Notifier", "drop", $drop_id);
-
-		if (! $interactive) {
-			return $owner;
-		}
 		goaway(System::baseUrl() . '/' . $_SESSION['return_url']);
 		//NOTREACHED
 	} else {
-		if (! $interactive) {
-			return 0;
-		}
-		notice( t('Permission denied.') . EOL);
+		notice(t('Permission denied.') . EOL);
 		goaway(System::baseUrl() . '/' . $_SESSION['return_url']);
 		//NOTREACHED
 	}
-
 }
 
-/// @todo: This query seems to be really slow
+/// @TODO: This query seems to be really slow
+/// @TODO move to src/Model/Item.php
 function first_post_date($uid, $wall = false) {
 	$r = q("SELECT `id`, `created` FROM `item`
 		WHERE `uid` = %d AND `wall` = %d AND `deleted` = 0 AND `visible` = 1 AND `moderated` = 0
@@ -2294,20 +1949,21 @@ function first_post_date($uid, $wall = false) {
 	return false;
 }
 
-/* modified posted_dates() {below} to arrange the list in years */
+/* arrange the list in years */
+/// @TODO move to src/Model/Item.php
 function list_post_dates($uid, $wall) {
 	$dnow = datetime_convert('',date_default_timezone_get(), 'now','Y-m-d');
 
 	$dthen = first_post_date($uid, $wall);
 	if (! $dthen) {
-		return array();
+		return [];
 	}
 
 	// Set the start and end date to the beginning of the month
 	$dnow = substr($dnow, 0, 8) . '01';
 	$dthen = substr($dthen, 0, 8) . '01';
 
-	$ret = array();
+	$ret = [];
 
 	/*
 	 * Starting with the current month, get the first and last days of every
@@ -2321,44 +1977,15 @@ function list_post_dates($uid, $wall) {
 		$end_month = datetime_convert('', '', $dend, 'Y-m-d');
 		$str = day_translate(datetime_convert('', '', $dnow, 'F'));
 		if (!$ret[$dyear]) {
-			$ret[$dyear] = array();
+			$ret[$dyear] = [];
 		}
-		$ret[$dyear][] = array($str, $end_month, $start_month);
+		$ret[$dyear][] = [$str, $end_month, $start_month];
 		$dnow = datetime_convert('', '', $dnow . ' -1 month', 'Y-m-d');
 	}
 	return $ret;
 }
 
-function posted_dates($uid, $wall) {
-	$dnow = datetime_convert('', date_default_timezone_get(), 'now', 'Y-m-d');
-
-	$dthen = first_post_date($uid, $wall);
-	if (! $dthen) {
-		return array();
-	}
-
-	// Set the start and end date to the beginning of the month
-	$dnow = substr($dnow, 0, 8) . '01';
-	$dthen = substr($dthen, 0, 8) . '01';
-
-	$ret = array();
-	/*
-	 * Starting with the current month, get the first and last days of every
-	 * month down to and including the month of the first post
-	 */
-	while (substr($dnow, 0, 7) >= substr($dthen, 0, 7)) {
-		$dstart = substr($dnow, 0, 8) . '01';
-		$dend = substr($dnow, 0, 8) . get_dim(intval($dnow), intval(substr($dnow, 5)));
-		$start_month = datetime_convert('', '', $dstart, 'Y-m-d');
-		$end_month = datetime_convert('', '', $dend, 'Y-m-d');
-		$str = day_translate(datetime_convert('', '', $dnow, 'F Y'));
-		$ret[] = array($str, $end_month, $start_month);
-		$dnow = datetime_convert('', '', $dnow . ' -1 month', 'Y-m-d');
-	}
-	return $ret;
-}
-
-
+/// @TODO move to src/Model/Item.php
 function posted_date_widget($url, $uid, $wall) {
 	$o = '';
 
@@ -2387,7 +2014,7 @@ function posted_date_widget($url, $uid, $wall) {
 	$cutoff_year = intval(datetime_convert('',date_default_timezone_get(), 'now', 'Y')) - $visible_years;
 	$cutoff = ((array_key_exists($cutoff_year, $ret))? true : false);
 
-	$o = replace_macros(get_markup_template('posted_date_widget.tpl'),array(
+	$o = replace_macros(get_markup_template('posted_date_widget.tpl'),[
 		'$title' => t('Archives'),
 		'$size' => $visible_years,
 		'$cutoff_year' => $cutoff_year,
@@ -2396,6 +2023,6 @@ function posted_date_widget($url, $uid, $wall) {
 		'$dates' => $ret,
 		'$showmore' => t('show more')
 
-	));
+	]);
 	return $o;
 }