diff --git a/include/api.php b/include/api.php
index 7164f85abf..f5747ad1cf 100644
--- a/include/api.php
+++ b/include/api.php
@@ -4731,7 +4731,7 @@ function post_photo_item($hash, $allow_cid, $deny_cid, $allow_gid, $deny_gid, $f
 				. '[/url]';
 
 	// do the magic for storing the item in the database and trigger the federation to other contacts
-	item_store($arr);
+	Item::insert($arr);
 }
 
 /**
diff --git a/include/event.php b/include/event.php
index f5c4613d45..48edeeae64 100644
--- a/include/event.php
+++ b/include/event.php
@@ -11,6 +11,7 @@ use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
+use Friendica\Model\Item;
 use Friendica\Model\Profile;
 use Friendica\Util\Map;
 
@@ -399,7 +400,7 @@ function event_store($arr) {
 		$item_arr['object'] .= '<content>' . xmlify(format_event_bbcode($event)) . '</content>';
 		$item_arr['object'] .= '</object>' . "\n";
 
-		$item_id = item_store($item_arr);
+		$item_id = Item::insert($item_arr);
 		if ($item_id) {
 			q("UPDATE `item` SET `event-id` = %d  WHERE `uid` = %d AND `id` = %d",
 				intval($event['id']),
diff --git a/include/items.php b/include/items.php
index 1951b340cb..884b91393b 100644
--- a/include/items.php
+++ b/include/items.php
@@ -32,101 +32,6 @@ require_once 'include/threads.php';
 require_once 'mod/share.php';
 require_once 'include/enotify.php';
 
-/* 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
- *
- * @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
-	// than the maximum, then don't waste time looking for the images
-	if ($maxlen && (strlen($body) > $maxlen)) {
-
-		logger('limit_body_size: the total body length exceeds the limit', LOGGER_DEBUG);
-
-		$orig_body = $body;
-		$new_body = '';
-		$textlen = 0;
-
-		$img_start = strpos($orig_body, '[img');
-		$img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false);
-		$img_end = ($img_start !== false ? strpos(substr($orig_body, $img_start), '[/img]') : false);
-		while (($img_st_close !== false) && ($img_end !== false)) {
-
-			$img_st_close++; // make it point to AFTER the closing bracket
-			$img_end += $img_start;
-			$img_end += strlen('[/img]');
-
-			if (! strcmp(substr($orig_body, $img_start + $img_st_close, 5), 'data:')) {
-				// This is an embedded image
-
-				if (($textlen + $img_start) > $maxlen ) {
-					if ($textlen < $maxlen) {
-						logger('limit_body_size: the limit happens before an embedded image', LOGGER_DEBUG);
-						$new_body = $new_body . substr($orig_body, 0, $maxlen - $textlen);
-						$textlen = $maxlen;
-					}
-				} else {
-					$new_body = $new_body . substr($orig_body, 0, $img_start);
-					$textlen += $img_start;
-				}
-
-				$new_body = $new_body . substr($orig_body, $img_start, $img_end - $img_start);
-			} else {
-
-				if (($textlen + $img_end) > $maxlen ) {
-					if ($textlen < $maxlen) {
-						logger('limit_body_size: the limit happens before the end of a non-embedded image', LOGGER_DEBUG);
-						$new_body = $new_body . substr($orig_body, 0, $maxlen - $textlen);
-						$textlen = $maxlen;
-					}
-				} else {
-					$new_body = $new_body . substr($orig_body, 0, $img_end);
-					$textlen += $img_end;
-				}
-			}
-			$orig_body = substr($orig_body, $img_end);
-
-			if ($orig_body === false) {
-				// in case the body ends on a closing image tag
-				$orig_body = '';
-			}
-
-			$img_start = strpos($orig_body, '[img');
-			$img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false);
-			$img_end = ($img_start !== false ? strpos(substr($orig_body, $img_start), '[/img]') : false);
-		}
-
-		if (($textlen + strlen($orig_body)) > $maxlen) {
-			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);
-			}
-		} 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;
-		}
-
-		return $new_body;
-	} else {
-		return $body;
-	}
-}
-
-/// @TODO move to ???
 function add_page_info_data($data) {
 	Addon::callHooks('page_info_data', $data);
 
@@ -195,7 +100,6 @@ 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);
@@ -224,7 +128,6 @@ 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);
 
@@ -245,7 +148,6 @@ 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);
 
@@ -254,7 +156,6 @@ 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);
@@ -308,882 +209,6 @@ function add_page_info_to_body($body, $texturl = false, $no_photos = false) {
 	return $body;
 }
 
-/// @TODO add type-hint array
-/// @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
-	if ($notify) {
-		$arr['wall'] = 1;
-		$arr['type'] = 'wall';
-		$arr['origin'] = 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 "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'] = Item::guidFromUri($arr['plink'], $a->get_hostname());
-			} elseif (isset($arr['uri'])) {
-				$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'] = Item::guidFromUri($arr['plink']);
-	} elseif ((trim($arr['guid']) == "") && (trim($arr['uri']) != "")) {
-		$arr['guid'] = Item::guidFromUri($arr['uri']);
-	} else {
-		$parsed = parse_url($arr["author-link"]);
-		$guid_prefix = hash("crc32", $parsed["host"]);
-	}
-
-	$arr['guid']          = ((x($arr, 'guid'))          ? notags(trim($arr['guid']))          : get_guid(32, $guid_prefix));
-	$arr['uri']           = ((x($arr, 'uri'))           ? notags(trim($arr['uri']))           : item_new_uri($a->get_hostname(), $uid, $arr['guid']));
-
-	// Store conversation data
-	$arr = Conversation::insert($arr);
-
-	/*
-	 * If a Diaspora signature structure was passed in, pull it out of the
-	 * item array and set it aside for later storage.
-	 */
-
-	$dsprsig = null;
-	if (x($arr, 'dsprsig')) {
-		$encoded_signature = $arr['dsprsig'];
-		$dsprsig = json_decode(base64_decode($arr['dsprsig']));
-		unset($arr['dsprsig']);
-	}
-
-	// Converting the plink
-	/// @TODO Check if this is really still needed
-	if ($arr['network'] == NETWORK_OSTATUS) {
-		if (isset($arr['plink'])) {
-			$arr['plink'] = OStatus::convertHref($arr['plink']);
-		} elseif (isset($arr['uri'])) {
-			$arr['plink'] = OStatus::convertHref($arr['uri']);
-		}
-	}
-
-	if (x($arr, 'gravity')) {
-		$arr['gravity'] = intval($arr['gravity']);
-	} elseif ($arr['parent-uri'] === $arr['uri']) {
-		$arr['gravity'] = 0;
-	} elseif (activity_match($arr['verb'],ACTIVITY_POST)) {
-		$arr['gravity'] = 6;
-	} else {
-		$arr['gravity'] = 6;   // extensible catchall
-	}
-
-	if (! x($arr, 'type')) {
-		$arr['type']      = 'remote';
-	}
-
-	$uid = intval($arr['uid']);
-
-	// check for create date and expire time
-	$expire_interval = Config::get('system', 'dbclean-expire-days', 0);
-
-	$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'])) {
-		$expire_date = time() - ($expire_interval * 86400);
-		$created_date = strtotime($arr['created']);
-		if ($created_date < $expire_date) {
-			logger('item-store: item created ('.date('c', $created_date).') before expiration time ('.date('c', $expire_date).'). ignored. ' . print_r($arr,true), LOGGER_DEBUG);
-			return 0;
-		}
-	}
-
-	/*
-	 * Do we already have this item?
-	 * We have to check several networks since Friendica posts could be repeated
-	 * via OStatus (maybe Diasporsa as well)
-	 */
-	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),
-				dbesc(NETWORK_DIASPORA),
-				dbesc(NETWORK_DFRN),
-				dbesc(NETWORK_OSTATUS)
-			);
-		if (DBM::is_result($r)) {
-			// We only log the entries with a different user id than 0. Otherwise we would have too many false positives
-			if ($uid != 0) {
-				logger("Item with uri ".$arr['uri']." already existed for user ".$uid." with id ".$r[0]["id"]." target network ".$r[0]["network"]." - new network: ".$arr['network']);
-			}
-
-			return $r[0]["id"];
-		}
-	}
-
-	/// @TODO old-lost code?
-	// 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::addLanguageInPostopts($arr);
-
-	$arr['wall']          = ((x($arr, 'wall'))          ? intval($arr['wall'])                : 0);
-	$arr['extid']         = ((x($arr, 'extid'))         ? notags(trim($arr['extid']))         : '');
-	$arr['author-name']   = ((x($arr, 'author-name'))   ? trim($arr['author-name'])   : '');
-	$arr['author-link']   = ((x($arr, 'author-link'))   ? notags(trim($arr['author-link']))   : '');
-	$arr['author-avatar'] = ((x($arr, 'author-avatar')) ? notags(trim($arr['author-avatar'])) : '');
-	$arr['owner-name']    = ((x($arr, 'owner-name'))    ? trim($arr['owner-name'])    : '');
-	$arr['owner-link']    = ((x($arr, 'owner-link'))    ? notags(trim($arr['owner-link']))    : '');
-	$arr['owner-avatar']  = ((x($arr, 'owner-avatar'))  ? notags(trim($arr['owner-avatar']))  : '');
-	$arr['received']      = ((x($arr, 'received') !== false) ? datetime_convert('UTC','UTC', $arr['received']) : datetime_convert());
-	$arr['created']       = ((x($arr, 'created') !== false) ? datetime_convert('UTC','UTC', $arr['created']) : $arr['received']);
-	$arr['edited']        = ((x($arr, 'edited') !== false) ? datetime_convert('UTC','UTC', $arr['edited']) : $arr['created']);
-	$arr['changed']       = ((x($arr, 'changed') !== false) ? datetime_convert('UTC','UTC', $arr['changed']) : $arr['created']);
-	$arr['commented']     = ((x($arr, 'commented') !== false) ? datetime_convert('UTC','UTC', $arr['commented']) : $arr['created']);
-	$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['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']);
-	$arr['verb']          = ((x($arr, 'verb'))          ? notags(trim($arr['verb']))          : '');
-	$arr['object-type']   = ((x($arr, 'object-type'))   ? notags(trim($arr['object-type']))   : '');
-	$arr['object']        = ((x($arr, 'object'))        ? trim($arr['object'])                : '');
-	$arr['target-type']   = ((x($arr, 'target-type'))   ? notags(trim($arr['target-type']))   : '');
-	$arr['target']        = ((x($arr, 'target'))        ? trim($arr['target'])                : '');
-	$arr['plink']         = ((x($arr, 'plink'))         ? notags(trim($arr['plink']))         : '');
-	$arr['allow_cid']     = ((x($arr, 'allow_cid'))     ? trim($arr['allow_cid'])             : '');
-	$arr['allow_gid']     = ((x($arr, 'allow_gid'))     ? trim($arr['allow_gid'])             : '');
-	$arr['deny_cid']      = ((x($arr, 'deny_cid'))      ? trim($arr['deny_cid'])              : '');
-	$arr['deny_gid']      = ((x($arr, 'deny_gid'))      ? trim($arr['deny_gid'])              : '');
-	$arr['private']       = ((x($arr, 'private'))       ? intval($arr['private'])             : 0 );
-	$arr['bookmark']      = ((x($arr, 'bookmark'))      ? intval($arr['bookmark'])            : 0 );
-	$arr['body']          = ((x($arr, 'body'))          ? trim($arr['body'])                  : '');
-	$arr['tag']           = ((x($arr, 'tag'))           ? notags(trim($arr['tag']))           : '');
-	$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['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 );
-	$arr['inform']        = ((x($arr, 'inform'))        ? trim($arr['inform'])                : '');
-	$arr['file']          = ((x($arr, 'file'))          ? trim($arr['file'])                  : '');
-
-	// When there is no content then we don't post it
-	if ($arr['body'].$arr['title'] == '') {
-		return 0;
-	}
-
-	// Items cannot be stored before they happen ...
-	if ($arr['created'] > datetime_convert()) {
-		$arr['created'] = datetime_convert();
-	}
-
-	// We haven't invented time travel by now.
-	if ($arr['edited'] > datetime_convert()) {
-		$arr['edited'] = datetime_convert();
-	}
-
-	if (($arr['author-link'] == "") && ($arr['owner-link'] == "")) {
-		logger("Both author-link and owner-link are empty. Called by: " . System::callstack(), LOGGER_DEBUG);
-	}
-
-	if ($arr['plink'] == "") {
-		$arr['plink'] = System::baseUrl() . '/display/' . urlencode($arr['guid']);
-	}
-
-	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)) {
-			$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",
-				intval($arr['contact-id']),
-				intval($arr['uid'])
-			);
-		}
-
-		if (DBM::is_result($r)) {
-			$arr['network'] = $r[0]["network"];
-		}
-
-		// Fallback to friendica (why is it empty in some cases?)
-		if ($arr['network'] == "") {
-			$arr['network'] = NETWORK_DFRN;
-		}
-
-		logger("item_store: Set network to " . $arr["network"] . " for " . $arr["uri"], LOGGER_DEBUG);
-	}
-
-	// The contact-id should be set before "item_store" was called - but there seems to be some issues
-	if ($arr["contact-id"] == 0) {
-		/*
-		 * First we are looking for a suitable contact that matches with the author of the post
-		 * This is done only for comments (See below explanation at "gcontact-id")
-		 */
-		if ($arr['parent-uri'] != $arr['uri']) {
-			$arr["contact-id"] = Contact::getIdForURL($arr['author-link'], $uid);
-		}
-
-		// If not present then maybe the owner was found
-		if ($arr["contact-id"] == 0) {
-			$arr["contact-id"] = Contact::getIdForURL($arr['owner-link'], $uid);
-		}
-
-		// Still missing? Then use the "self" contact of the current user
-		if ($arr["contact-id"] == 0) {
-			$r = q("SELECT `id` FROM `contact` WHERE `self` AND `uid` = %d", intval($uid));
-
-			if (DBM::is_result($r)) {
-				$arr["contact-id"] = $r[0]["id"];
-			}
-		}
-
-		logger("Contact-id was missing for post ".$arr["guid"]." from user id ".$uid." - now set to ".$arr["contact-id"], LOGGER_DEBUG);
-	}
-
-	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(["url" => $arr['owner-link'], "network" => $arr['network'],
-								 "photo" => $arr['owner-avatar'], "name" => $arr['owner-name']]);
-		} else {
-			$arr["gcontact-id"] = GContact::getId(["url" => $arr['author-link'], "network" => $arr['network'],
-								 "photo" => $arr['author-avatar'], "name" => $arr['author-name']]);
-		}
-	}
-
-	if ($arr["author-id"] == 0) {
-		$arr["author-id"] = Contact::getIdForURL($arr["author-link"], 0);
-	}
-
-	if (Contact::isBlocked($arr["author-id"])) {
-		logger('Contact '.$arr["author-id"].' is blocked, item '.$arr["uri"].' will not be stored');
-		return 0;
-	}
-
-	if ($arr["owner-id"] == 0) {
-		$arr["owner-id"] = Contact::getIdForURL($arr["owner-link"], 0);
-	}
-
-	if (Contact::isBlocked($arr["owner-id"])) {
-		logger('Contact '.$arr["owner-id"].' is blocked, item '.$arr["uri"].' will not be stored');
-		return 0;
-	}
-
-	if ($arr['guid'] != "") {
-		// Checking if there is already an item with the same guid
-		logger('checking for an item for user '.$arr['uid'].' on network '.$arr['network'].' with the guid '.$arr['guid'], LOGGER_DEBUG);
-		$r = q("SELECT `guid` FROM `item` WHERE `guid` = '%s' AND `network` = '%s' AND `uid` = '%d' LIMIT 1",
-			dbesc($arr['guid']), dbesc($arr['network']), intval($arr['uid']));
-
-		if (DBM::is_result($r)) {
-			logger('found item with guid '.$arr['guid'].' for user '.$arr['uid'].' on network '.$arr['network'], LOGGER_DEBUG);
-			return 0;
-		}
-	}
-
-	// Check for hashtags in the body and repair or add hashtag links
-	item_body_set_hashtags($arr);
-
-	$arr['thr-parent'] = $arr['parent-uri'];
-
-	if ($arr['parent-uri'] === $arr['uri']) {
-		$parent_id = 0;
-		$parent_deleted = 0;
-		$allow_cid = $arr['allow_cid'];
-		$allow_gid = $arr['allow_gid'];
-		$deny_cid  = $arr['deny_cid'];
-		$deny_gid  = $arr['deny_gid'];
-		$notify_type = 'wall-new';
-	} else {
-
-		// find the parent and snarf the item id and ACLs
-		// and anything else we need to inherit
-
-		$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d ORDER BY `id` ASC LIMIT 1",
-			dbesc($arr['parent-uri']),
-			intval($arr['uid'])
-		);
-
-		if (DBM::is_result($r)) {
-
-			// is the new message multi-level threaded?
-			// even though we don't support it now, preserve the info
-			// and re-attach to the conversation parent.
-
-			if ($r[0]['uri'] != $r[0]['parent-uri']) {
-				$arr['parent-uri'] = $r[0]['parent-uri'];
-				$z = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `parent-uri` = '%s' AND `uid` = %d
-					ORDER BY `id` ASC LIMIT 1",
-					dbesc($r[0]['parent-uri']),
-					dbesc($r[0]['parent-uri']),
-					intval($arr['uid'])
-				);
-
-				if (DBM::is_result($z)) {
-					$r = $z;
-				}
-			}
-
-			$parent_id      = $r[0]['id'];
-			$parent_deleted = $r[0]['deleted'];
-			$allow_cid      = $r[0]['allow_cid'];
-			$allow_gid      = $r[0]['allow_gid'];
-			$deny_cid       = $r[0]['deny_cid'];
-			$deny_gid       = $r[0]['deny_gid'];
-			$arr['wall']    = $r[0]['wall'];
-			$notify_type    = 'comment-new';
-
-			/*
-			 * If the parent is private, force privacy for the entire conversation
-			 * This differs from the above settings as it subtly allows comments from
-			 * email correspondents to be private even if the overall thread is not.
-			 */
-			if ($r[0]['private']) {
-				$arr['private'] = $r[0]['private'];
-			}
-
-			/*
-			 * Edge case. We host a public forum that was originally posted to privately.
-			 * The original author commented, but as this is a comment, the permissions
-			 * weren't fixed up so it will still show the comment as private unless we fix it here.
-			 */
-			if ((intval($r[0]['forum_mode']) == 1) && $r[0]['private']) {
-				$arr['private'] = 0;
-			}
-
-			// If its a post from myself then tag the thread as "mention"
-			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)) {
-				$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', ['mention' => true], ['iid' => $parent_id]);
-					logger("item_store: tagged thread ".$parent_id." as mention for user ".$self, LOGGER_DEBUG);
-				}
-			}
-		} else {
-			/*
-			 * Allow one to see reply tweets from status.net even when
-			 * we don't have or can't see the original post.
-			 */
-			if ($force_parent) {
-				logger('item_store: $force_parent=true, reply converted to top-level post.');
-				$parent_id = 0;
-				$arr['parent-uri'] = $arr['uri'];
-				$arr['gravity'] = 0;
-			} else {
-				logger('item_store: item parent '.$arr['parent-uri'].' for '.$arr['uid'].' was not found - ignoring item');
-				return 0;
-			}
-
-			$parent_deleted = 0;
-		}
-	}
-
-	$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `network` IN ('%s', '%s') AND `uid` = %d LIMIT 1",
-		dbesc($arr['uri']),
-		dbesc($arr['network']),
-		dbesc(NETWORK_DFRN),
-		intval($arr['uid'])
-	);
-	if (DBM::is_result($r)) {
-		logger('duplicated item with the same uri found. '.print_r($arr,true));
-		return 0;
-	}
-
-	// On Friendica and Diaspora the GUID is unique
-	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'])
-		);
-		if (DBM::is_result($r)) {
-			logger('duplicated item with the same guid found. '.print_r($arr,true));
-			return 0;
-		}
-	} else {
-		// Check for an existing post with the same content. There seems to be a problem with OStatus.
-		$r = q("SELECT `id` FROM `item` WHERE `body` = '%s' AND `network` = '%s' AND `created` = '%s' AND `contact-id` = %d AND `uid` = %d LIMIT 1",
-			dbesc($arr['body']),
-			dbesc($arr['network']),
-			dbesc($arr['created']),
-			intval($arr['contact-id']),
-			intval($arr['uid'])
-		);
-		if (DBM::is_result($r)) {
-			logger('duplicated item with the same body found. '.print_r($arr,true));
-			return 0;
-		}
-	}
-
-	// Is this item available in the global items (with uid=0)?
-	if ($arr["uid"] == 0) {
-		$arr["global"] = true;
-
-		// Set the global flag on all items if this was a global item entry
-		dba::update('item', ['global' => true], ['uri' => $arr["uri"]]);
-	} else {
-		$isglobal = q("SELECT `global` FROM `item` WHERE `uid` = 0 AND `uri` = '%s'", dbesc($arr["uri"]));
-
-		$arr["global"] = (DBM::is_result($isglobal) && count($isglobal) > 0);
-	}
-
-	// ACL settings
-	if (strlen($allow_cid) || strlen($allow_gid) || strlen($deny_cid) || strlen($deny_gid)) {
-		$private = 1;
-	} else {
-		$private = $arr['private'];
-	}
-
-	$arr["allow_cid"] = $allow_cid;
-	$arr["allow_gid"] = $allow_gid;
-	$arr["deny_cid"] = $deny_cid;
-	$arr["deny_gid"] = $deny_gid;
-	$arr["private"] = $private;
-	$arr["deleted"] = $parent_deleted;
-
-	// Fill the cache field
-	put_item_in_cache($arr);
-
-	if ($notify) {
-		Addon::callHooks('post_local', $arr);
-	} else {
-		Addon::callHooks('post_remote', $arr);
-	}
-
-	// This array field is used to trigger some automatic reactions
-	// It is mainly used in the "post_local" hook.
-	unset($arr['api_source']);
-
-	if (x($arr, 'cancel')) {
-		logger('item_store: post cancelled by addon.');
-		return 0;
-	}
-
-	/*
-	 * Check for already added items.
-	 * There is a timing issue here that sometimes creates double postings.
-	 * An unique index would help - but the limitations of MySQL (maximum size of index values) prevent this.
-	 */
-	if ($arr["uid"] == 0) {
-		$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = 0 LIMIT 1", dbesc(trim($arr['uri'])));
-		if (DBM::is_result($r)) {
-			logger('Global item already stored. URI: '.$arr['uri'].' on network '.$arr['network'], LOGGER_DEBUG);
-			return 0;
-		}
-	}
-
-	logger('item_store: ' . print_r($arr,true), LOGGER_DATA);
-
-	dba::transaction();
-	$r = dba::insert('item', $arr);
-
-	// When the item was successfully stored we fetch the ID of the item.
-	if (DBM::is_result($r)) {
-		$current_post = dba::lastInsertId();
-	} else {
-		// This can happen - for example - if there are locking timeouts.
-		dba::rollback();
-
-		// Store the data into a spool file so that we can try again later.
-
-		// At first we restore the Diaspora signature that we removed above.
-		if (isset($encoded_signature)) {
-			$arr['dsprsig'] = $encoded_signature;
-		}
-
-		// Now we store the data in the spool directory
-		// We use "microtime" to keep the arrival order and "mt_rand" to avoid duplicates
-		$file = 'item-'.round(microtime(true) * 10000).'-'.mt_rand().'.msg';
-
-		$spoolpath = get_spoolpath();
-		if ($spoolpath != "") {
-			$spool = $spoolpath.'/'.$file;
-			file_put_contents($spool, json_encode($arr));
-			logger("Item wasn't stored - Item was spooled into file ".$file, LOGGER_DEBUG);
-		}
-		return 0;
-	}
-
-	if ($current_post == 0) {
-		// This is one of these error messages that never should occur.
-		logger("couldn't find created item - we better quit now.");
-		dba::rollback();
-		return 0;
-	}
-
-	// How much entries have we created?
-	// We wouldn't need this query when we could use an unique index - but MySQL has length problems with them.
-	$r = q("SELECT COUNT(*) AS `entries` FROM `item` WHERE `uri` = '%s' AND `uid` = %d AND `network` = '%s'",
-		dbesc($arr['uri']),
-		intval($arr['uid']),
-		dbesc($arr['network'])
-	);
-
-	if (!DBM::is_result($r)) {
-		// This shouldn't happen, since COUNT always works when the database connection is there.
-		logger("We couldn't count the stored entries. Very strange ...");
-		dba::rollback();
-		return 0;
-	}
-
-	if ($r[0]["entries"] > 1) {
-		// There are duplicates. We delete our just created entry.
-		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', ['id' => $current_post]);
-		dba::commit();
-		return 0;
-	} elseif ($r[0]["entries"] == 0) {
-		// This really should never happen since we quit earlier if there were problems.
-		logger("Something is terribly wrong. We haven't found our created entry.");
-		dba::rollback();
-		return 0;
-	}
-
-	logger('item_store: created item '.$current_post);
-	Item::updateContact($arr);
-
-	if (!$parent_id || ($arr['parent-uri'] === $arr['uri'])) {
-		$parent_id = $current_post;
-	}
-
-	// Set parent id
-	dba::update('item', ['parent' => $parent_id], ['id' => $current_post]);
-
-	$arr['id'] = $current_post;
-	$arr['parent'] = $parent_id;
-
-	// 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', ['commented' => datetime_convert(), 'changed' => datetime_convert()], ['id' => $parent_id]);
-	} else {
-		dba::update('item', ['changed' => datetime_convert()], ['id' => $parent_id]);
-	}
-
-	if ($dsprsig) {
-
-		/*
-		 * Friendica servers lower than 3.4.3-2 had double encoded the signature ...
-		 * We can check for this condition when we decode and encode the stuff again.
-		 */
-		if (base64_encode(base64_decode(base64_decode($dsprsig->signature))) == base64_decode($dsprsig->signature)) {
-			$dsprsig->signature = base64_decode($dsprsig->signature);
-			logger("Repaired double encoded signature from handle ".$dsprsig->signer, LOGGER_DEBUG);
-		}
-
-		dba::insert('sign', ['iid' => $current_post, 'signed_text' => $dsprsig->signed_text,
-					'signature' => $dsprsig->signature, 'signer' => $dsprsig->signer]);
-	}
-
-	$deleted = tag_deliver($arr['uid'], $current_post);
-
-	/*
-	 * current post can be deleted if is for a community page and no mention are
-	 * in it.
-	 */
-	if (!$deleted && !$dontcache) {
-
-		$r = q('SELECT * FROM `item` WHERE `id` = %d', intval($current_post));
-		if ((DBM::is_result($r)) && (count($r) == 1)) {
-			if ($notify) {
-				Addon::callHooks('post_local_end', $r[0]);
-			} else {
-				Addon::callHooks('post_remote_end', $r[0]);
-			}
-		} else {
-			logger('item_store: new item not found in DB, id ' . $current_post);
-		}
-	}
-
-	if ($arr['parent-uri'] === $arr['uri']) {
-		add_thread($current_post);
-	} else {
-		update_thread($parent_id);
-	}
-
-	dba::commit();
-
-	/*
-	 * 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);
-
-	if ($arr['parent-uri'] === $arr['uri']) {
-		Item::addShadow($current_post);
-	} else {
-		Item::addShadowPost($current_post);
-	}
-
-	check_user_notification($current_post);
-
-	if ($notify) {
-		Worker::add(['priority' => PRIORITY_HIGH, 'dont_fork' => true], "Notifier", $notify_type, $current_post);
-	}
-
-	return $current_post;
-}
-
-/// @TODO move to src/Model/Item.php
-function item_body_set_hashtags(&$item) {
-
-	$tags = get_tags($item["body"]);
-
-	// No hashtags?
-	if (!count($tags)) {
-		return false;
-	}
-
-	// This sorting is important when there are hashtags that are part of other hashtags
-	// Otherwise there could be problems with hashtags like #test and #test2
-	rsort($tags);
-
-	$URLSearchString = "^\[\]";
-
-	// All hashtags should point to the home server if "local_tags" is activated
-	if (Config::get('system', 'local_tags')) {
-		$item["body"] = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
-				"#[url=".System::baseUrl()."/search?tag=$2]$2[/url]", $item["body"]);
-
-		$item["tag"] = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
-				"#[url=".System::baseUrl()."/search?tag=$2]$2[/url]", $item["tag"]);
-	}
-
-	// mask hashtags inside of url, bookmarks and attachments to avoid urls in urls
-	$item["body"] = preg_replace_callback("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
-		function ($match) {
-			return ("[url=" . str_replace("#", "&num;", $match[1]) . "]" . str_replace("#", "&num;", $match[2]) . "[/url]");
-		}, $item["body"]);
-
-	$item["body"] = preg_replace_callback("/\[bookmark\=([$URLSearchString]*)\](.*?)\[\/bookmark\]/ism",
-		function ($match) {
-			return ("[bookmark=" . str_replace("#", "&num;", $match[1]) . "]" . str_replace("#", "&num;", $match[2]) . "[/bookmark]");
-		}, $item["body"]);
-
-	$item["body"] = preg_replace_callback("/\[attachment (.*)\](.*?)\[\/attachment\]/ism",
-		function ($match) {
-			return ("[attachment " . str_replace("#", "&num;", $match[1]) . "]" . $match[2] . "[/attachment]");
-		}, $item["body"]);
-
-	// Repair recursive urls
-	$item["body"] = preg_replace("/&num;\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
-			"&num;$2", $item["body"]);
-
-	foreach ($tags as $tag) {
-		if ((strpos($tag, '#') !== 0) || (strpos($tag, '[url='))) {
-			continue;
-		}
-
-		$basetag = str_replace('_',' ',substr($tag,1));
-
-		$newtag = '#[url=' . System::baseUrl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
-
-		$item["body"] = str_replace($tag, $newtag, $item["body"]);
-
-		if (!stristr($item["tag"], "/search?tag=" . $basetag . "]" . $basetag . "[/url]")) {
-			if (strlen($item["tag"])) {
-				$item["tag"] = ','.$item["tag"];
-			}
-			$item["tag"] = $newtag.$item["tag"];
-		}
-	}
-
-	// Convert back the masked hashtags
-	$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)) {
-		return $r[0]["guid"];
-	} else {
-		/// @TODO This else-block can be elimited again
-		return "";
-	}
-}
-
-/// @TODO move to src/Model/Item.php
-function get_item_id($guid, $uid = 0) {
-
-	$nick = "";
-	$id = 0;
-
-	if ($uid == 0) {
-		$uid == local_user();
-	}
-
-	// Does the given user have this item?
-	if ($uid) {
-		$r = q("SELECT `item`.`id`, `user`.`nickname` FROM `item` INNER JOIN `user` ON `user`.`uid` = `item`.`uid`
-			WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 AND `item`.`moderated` = 0
-				AND `item`.`guid` = '%s' AND `item`.`uid` = %d", dbesc($guid), intval($uid));
-		if (DBM::is_result($r)) {
-			$id = $r[0]["id"];
-			$nick = $r[0]["nickname"];
-		}
-	}
-
-	// Or is it anywhere on the server?
-	if ($nick == "") {
-		$r = q("SELECT `item`.`id`, `user`.`nickname` FROM `item` INNER JOIN `user` ON `user`.`uid` = `item`.`uid`
-			WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 AND `item`.`moderated` = 0
-				AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = ''
-				AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''
-				AND `item`.`private` = 0 AND `item`.`wall` = 1
-				AND `item`.`guid` = '%s'", dbesc($guid));
-		if (DBM::is_result($r)) {
-			$id = $r[0]["id"];
-			$nick = $r[0]["nickname"];
-		}
-	}
-	return ["nick" => $nick, "id" => $id];
-}
-
-/**
- * look for mention tags and setup a second delivery chain for forum/community posts if appropriate
- * @param int $uid
- * @param int $item_id
- * @return bool true if item was deleted, else false
- */
-/// @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;
-	}
-
-	$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)
-	);
-	if (! DBM::is_result($i)) {
-		return;
-	}
-
-	$item = $i[0];
-
-	$link = normalise_link(System::baseUrl() . '/profile/' . $u[0]['nickname']);
-
-	/*
-	 * Diaspora uses their own hardwired link URL in @-tags
-	 * instead of the one we supply with webfinger
-	 */
-	$dlink = normalise_link(System::baseUrl() . '/u/' . $u[0]['nickname']);
-
-	$cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism', $item['body'], $matches, PREG_SET_ORDER);
-	if ($cnt) {
-		foreach ($matches as $mtch) {
-			if (link_compare($link, $mtch[1]) || link_compare($dlink, $mtch[1])) {
-				$mention = true;
-				logger('tag_deliver: mention found: ' . $mtch[2]);
-			}
-		}
-	}
-
-	if (! $mention) {
-		if (($community_page || $prvgroup) &&
-			  (!$item['wall']) && (!$item['origin']) && ($item['id'] == $item['parent'])) {
-			// 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', ['id' => $item_id]);
-			return true;
-		}
-		return;
-	}
-
-	$arr = ['item' => $item, 'user' => $u[0], 'contact' => $r[0]];
-
-	Addon::callHooks('tagged', $arr);
-
-	if ((! $community_page) && (! $prvgroup)) {
-		return;
-	}
-
-	/*
-	 * tgroup delivery - setup a second delivery chain
-	 * prevent delivery looping - only proceed
-	 * if the message originated elsewhere and is a top-level post
-	 */
-	if (($item['wall']) || ($item['origin']) || ($item['id'] != $item['parent'])) {
-		return;
-	}
-
-	// now change this copy of the post to a forum head message and deliver to all the tgroup members
-	$c = q("SELECT `name`, `url`, `thumb` FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
-		intval($u[0]['uid'])
-	);
-	if (! DBM::is_result($c)) {
-		return;
-	}
-
-	// also reset all the privacy bits to the forum default permissions
-
-	$private = ($u[0]['allow_cid'] || $u[0]['allow_gid'] || $u[0]['deny_cid'] || $u[0]['deny_gid']) ? 1 : 0;
-
-	$forum_mode = (($prvgroup) ? 2 : 1);
-
-	q("UPDATE `item` SET `wall` = 1, `origin` = 1, `forum_mode` = %d, `owner-name` = '%s', `owner-link` = '%s', `owner-avatar` = '%s',
-		`private` = %d, `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s'  WHERE `id` = %d",
-		intval($forum_mode),
-		dbesc($c[0]['name']),
-		dbesc($c[0]['url']),
-		dbesc($c[0]['thumb']),
-		intval($private),
-		dbesc($u[0]['allow_cid']),
-		dbesc($u[0]['allow_gid']),
-		dbesc($u[0]['deny_cid']),
-		dbesc($u[0]['deny_gid']),
-		intval($item_id)
-	);
-	update_thread($item_id);
-
-	Worker::add(['priority' => PRIORITY_HIGH, 'dont_fork' => true], 'Notifier', 'tgroup', $item_id);
-
-}
-
 /**
  *
  * consume_feed - process atom feed and update anything/everything we might need to update
@@ -1212,7 +237,6 @@ function tag_deliver($uid, $item_id)
  *
  * @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) {
@@ -1256,199 +280,6 @@ 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();
-
-	if (!$contact['remote_self']) {
-		return false;
-	}
-
-	// Prevent the forwarding of posts that are forwarded
-	if ($datarray["extid"] == NETWORK_DFRN) {
-		return false;
-	}
-
-	// Prevent to forward already forwarded posts
-	if ($datarray["app"] == $a->get_hostname()) {
-		return false;
-	}
-
-	// Only forward posts
-	if ($datarray["verb"] != ACTIVITY_POST) {
-		return false;
-	}
-
-	if (($contact['network'] != NETWORK_FEED) && $datarray['private']) {
-		return false;
-	}
-
-	$datarray2 = $datarray;
-	logger('remote-self start - Contact '.$contact['url'].' - '.$contact['remote_self'].' Item '.print_r($datarray, true), LOGGER_DEBUG);
-	if ($contact['remote_self'] == 2) {
-		$r = q("SELECT `id`,`url`,`name`,`thumb` FROM `contact` WHERE `uid` = %d AND `self`",
-			intval($contact['uid']));
-		if (DBM::is_result($r)) {
-			$datarray['contact-id'] = $r[0]["id"];
-
-			$datarray['owner-name'] = $r[0]["name"];
-			$datarray['owner-link'] = $r[0]["url"];
-			$datarray['owner-avatar'] = $r[0]["thumb"];
-
-			$datarray['author-name']   = $datarray['owner-name'];
-			$datarray['author-link']   = $datarray['owner-link'];
-			$datarray['author-avatar'] = $datarray['owner-avatar'];
-
-			unset($datarray['created']);
-			unset($datarray['edited']);
-		}
-
-		if ($contact['network'] != NETWORK_FEED) {
-			$datarray["guid"] = get_guid(32);
-			unset($datarray["plink"]);
-			$datarray["uri"] = item_new_uri($a->get_hostname(), $contact['uid'], $datarray["guid"]);
-			$datarray["parent-uri"] = $datarray["uri"];
-			$datarray["extid"] = $contact['network'];
-			$urlpart = parse_url($datarray2['author-link']);
-			$datarray["app"] = $urlpart["host"];
-		} else {
-			$datarray['private'] = 0;
-		}
-	}
-
-	if ($contact['network'] != NETWORK_FEED) {
-		// Store the original post
-		$r = item_store($datarray2, false, false);
-		logger('remote-self post original item - Contact '.$contact['url'].' return '.$r.' Item '.print_r($datarray2, true), LOGGER_DEBUG);
-	} else {
-		$datarray["app"] = "Feed";
-	}
-
-	// Trigger automatic reactions for addons
-	$datarray['api_source'] = true;
-
-	// We have to tell the hooks who we are - this really should be improved
-	$_SESSION["authenticated"] = true;
-	$_SESSION["uid"] = $contact['uid'];
-
-	return true;
-}
-
-/// @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']));
-	$photo = notags(trim($datarray['author-avatar']));
-
-	if (is_object($item)) {
-		$rawtag = $item->get_item_tags(NAMESPACE_ACTIVITY,'actor');
-		if ($rawtag && $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data']) {
-			$nick = $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data'];
-		}
-	} else {
-		$nick = $item;
-	}
-
-	if (is_array($contact)) {
-		if (($contact['network'] == NETWORK_OSTATUS && $contact['rel'] == CONTACT_IS_SHARING)
-			|| ($sharing && $contact['rel'] == CONTACT_IS_FOLLOWER)) {
-			dba::update('contact', ['rel' => CONTACT_IS_FRIEND, 'writable' => true],
-					['id' => $contact['id'], 'uid' => $importer['uid']]);
-		}
-		// send email notification to owner?
-	} else {
-		// create contact record
-		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']),
-			dbesc(datetime_convert()),
-			dbesc($url),
-			dbesc(normalise_link($url)),
-			dbesc($name),
-			dbesc($nick),
-			dbesc($photo),
-			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)
-		);
-		if (DBM::is_result($r)) {
-			$contact_record = $r[0];
-			Contact::updateAvatar($photo, $importer["uid"], $contact_record["id"], true);
-		}
-
-		/// @TODO Encapsulate this into a function/method
-		$r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
-			intval($importer['uid'])
-		);
-		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', ['uid' => $importer['uid'], 'contact-id' => $contact_record['id'],
-							'blocked' => false, 'knowyou' => false,
-							'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'], [PAGE_NORMAL])) {
-
-				notification([
-					'type'         => NOTIFY_INTRO,
-					'notify_flags' => $r[0]['notify-flags'],
-					'language'     => $r[0]['language'],
-					'to_name'      => $r[0]['username'],
-					'to_email'     => $r[0]['email'],
-					'uid'          => $r[0]['uid'],
-					'link'		   => System::baseUrl() . '/notifications/intro',
-					'source_name'  => ((strlen(stripslashes($contact_record['name']))) ? stripslashes($contact_record['name']) : L10n::t('[Name Withheld]')),
-					'source_link'  => $contact_record['url'],
-					'source_photo' => $contact_record['photo'],
-					'verb'         => ($sharing ? ACTIVITY_FRIEND : ACTIVITY_FOLLOW),
-					'otype'        => 'intro'
-				]);
-
-			}
-		} 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)
-			);
-		}
-
-	}
-}
-
-/// @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', ['rel' => CONTACT_IS_SHARING], ['id' => $contact['id']]);
-	} else {
-		Contact::remove($contact['id']);
-	}
-}
-
-/// @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', ['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();
@@ -1464,7 +295,7 @@ function subscribe_to_hub($url, $importer, $contact, $hubmode = 'subscribe') {
 	 * through the direct Diaspora protocol. If we try and use
 	 * the feed, we'll get duplicates. So don't.
 	 */
-	if ((! DBM::is_result($r)) || $contact['network'] === NETWORK_DIASPORA) {
+	if ((!DBM::is_result($r)) || $contact['network'] === NETWORK_DIASPORA) {
 		return;
 	}
 
@@ -1489,271 +320,7 @@ function subscribe_to_hub($url, $importer, $contact, $hubmode = 'subscribe') {
 
 }
 
-/**
- *
- * @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;
-	}
-
-	logger('fix_private_photos: check for photos', LOGGER_DEBUG);
-	$site = substr(System::baseUrl(), strpos(System::baseUrl(), '://'));
-
-	$orig_body = $s;
-	$new_body = '';
-
-	$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)) {
-		$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/')) {
-			// Only embed locally hosted photos
-			$replace = false;
-			$i = basename($image);
-			$i = str_replace(['.jpg', '.png', '.gif'], ['', '', ''], $i);
-			$x = strpos($i, '-');
-
-			if ($x) {
-				$res = substr($i, $x + 1);
-				$i = substr($i, 0, $x);
-				$r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `scale` = %d AND `uid` = %d",
-					dbesc($i),
-					intval($res),
-					intval($uid)
-				);
-				if (DBM::is_result($r)) {
-					/*
-					 * Check to see if we should replace this photo link with an embedded image
-					 * 1. No need to do so if the photo is public
-					 * 2. If there's a contact-id provided, see if they're in the access list
-					 *    for the photo. If so, embed it.
-					 * 3. Otherwise, if we have an item, see if the item permissions match the photo
-					 *    permissions, regardless of order but first check to see if they're an exact
-					 *    match to save some processing overhead.
-					 */
-					if (has_permissions($r[0])) {
-						if ($cid) {
-							$recips = enumerate_permissions($r[0]);
-							if (in_array($cid, $recips)) {
-								$replace = true;
-							}
-						} elseif ($item) {
-							if (compare_permissions($item, $r[0])) {
-								$replace = true;
-							}
-						}
-					}
-					if ($replace) {
-						$data = $r[0]['data'];
-						$type = $r[0]['type'];
-
-						// If a custom width and height were specified, apply before embedding
-						if (preg_match("/\[img\=([0-9]*)x([0-9]*)\]/is", substr($orig_body, $img_start, $img_st_close), $match)) {
-							logger('fix_private_photos: scaling photo', LOGGER_DEBUG);
-
-							$width = intval($match[1]);
-							$height = intval($match[2]);
-
-							$Image = new Image($data, $type);
-							if ($Image->isValid()) {
-								$Image->scaleDown(max($width, $height));
-								$data = $Image->asString();
-								$type = $Image->getType();
-							}
-						}
-
-						logger('fix_private_photos: replacing photo', LOGGER_DEBUG);
-						$image = 'data:' . $type . ';base64,' . base64_encode($data);
-						logger('fix_private_photos: replaced: ' . $image, LOGGER_DATA);
-					}
-				}
-			}
-		}
-
-		$new_body = $new_body . substr($orig_body, 0, $img_start + $img_st_close) . $image . '[/img]';
-		$orig_body = substr($orig_body, $img_start + $img_st_close + $img_len + strlen('[/img]'));
-		if ($orig_body === false) {
-			$orig_body = '';
-		}
-
-		$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);
-	}
-
-	$new_body = $new_body . $orig_body;
-
-	return $new_body;
-}
-
 /// @TODO type-hint is array
-/// @TODO move to src/Model/Item.php
-function has_permissions($obj) {
-	return (
-		(
-			x($obj, 'allow_cid')
-		) || (
-			x($obj, 'allow_gid')
-		) || (
-			x($obj, 'deny_cid')
-		) || (
-			x($obj, 'deny_gid')
-		)
-	);
-}
-
-/// @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'])
-		&& ($obj1['allow_gid'] == $obj2['allow_gid'])
-		&& ($obj1['deny_cid'] == $obj2['deny_cid'])
-		&& ($obj1['deny_gid'] == $obj2['deny_gid'])) {
-		return true;
-	}
-
-	// This is harder. Parse all the permissions and compare the resulting set.
-	$recipients1 = enumerate_permissions($obj1);
-	$recipients2 = enumerate_permissions($obj2);
-	sort($recipients1);
-	sort($recipients2);
-
-	/// @TODO Comparison of arrays, maybe use array_diff_assoc() here?
-	return ($recipients1 == $recipients2);
-}
-
-// 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']));
-	$deny_people  = expand_acl($obj['deny_cid']);
-	$deny_groups  = Group::expand(expand_acl($obj['deny_gid']));
-	$recipients   = array_unique(array_merge($allow_people, $allow_groups));
-	$deny         = array_unique(array_merge($deny_people, $deny_groups));
-	$recipients   = array_diff($recipients, $deny);
-	return $recipients;
-}
-
-/// @TODO move to src/Model/Item.php
-function item_getfeedtags($item) {
-	$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]] = ['#', $matches[1][$x], $matches[2][$x]];
-			}
-		}
-	}
-	$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[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)) {
-		return;
-	}
-
-	/*
-	 * $expire_network_only = save your own wall posts
-	 * 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 " : "");
-
-	if ($network != "") {
-		$sql_extra .= sprintf(" AND network = '%s' ", dbesc($network));
-
-		/*
-		 * There is an index "uid_network_received" but not "uid_network_created"
-		 * This avoids the creation of another index just for one purpose.
-		 * And it doesn't really matter wether to look at "received" or "created"
-		 */
-		$range = "AND `received` < UTC_TIMESTAMP() - INTERVAL %d DAY ";
-	} else {
-		$range = "AND `created` < UTC_TIMESTAMP() - INTERVAL %d DAY ";
-	}
-
-	$r = q("SELECT `file`, `resource-id`, `starred`, `type`, `id` FROM `item`
-		WHERE `uid` = %d $range
-		AND `id` = `parent`
-		$sql_extra
-		AND `deleted` = 0",
-		intval($uid),
-		intval($days)
-	);
-
-	if (!DBM::is_result($r)) {
-		return;
-	}
-
-	$expire_items = PConfig::get($uid, 'expire', 'items', 1);
-
-	// Forcing expiring of items - but not notes and marked items
-	if ($force) {
-		$expire_items = true;
-	}
-
-	$expire_notes = PConfig::get($uid, 'expire', 'notes', 1);
-	$expire_starred = PConfig::get($uid, 'expire', 'starred', 1);
-	$expire_photos = PConfig::get($uid, 'expire', 'photos', 0);
-
-	logger('User '.$uid.': expire: # items=' . count($r). "; expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos");
-
-	foreach ($r as $item) {
-
-		// don't expire filed items
-
-		if (strpos($item['file'],'[') !== false) {
-			continue;
-		}
-
-		// Only expire posts, not photos and photo comments
-
-		if ($expire_photos == 0 && strlen($item['resource-id'])) {
-			continue;
-		} elseif ($expire_starred == 0 && intval($item['starred'])) {
-			continue;
-		} elseif ($expire_notes == 0 && $item['type'] == 'note') {
-			continue;
-		} elseif ($expire_items == 0 && $item['type'] != 'note') {
-			continue;
-		}
-
-		Item::delete($item['id'], PRIORITY_LOW);
-	}
-}
-
-/// @TODO type-hint is array
-/// @TODO move to ...
 function drop_items($items) {
 	$uid = 0;
 
@@ -1764,13 +331,12 @@ function drop_items($items) {
 	if (count($items)) {
 		foreach ($items as $item) {
 			$owner = Item::delete($item);
-			if ($owner && ! $uid)
+			if ($owner && !$uid)
 				$uid = $owner;
 		}
 	}
 }
 
-/// @TODO move to ...
 function drop_item($id) {
 
 	$a = get_app();
@@ -1847,30 +413,12 @@ function drop_item($id) {
 	}
 }
 
-/// @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
-		AND `id` = `parent`
-		ORDER BY `created` ASC LIMIT 1",
-		intval($uid),
-		intval($wall ? 1 : 0)
-	);
-	if (DBM::is_result($r)) {
-		// logger('first_post_date: ' . $r[0]['id'] . ' ' . $r[0]['created'], LOGGER_DATA);
-		return substr(datetime_convert('',date_default_timezone_get(), $r[0]['created']),0,10);
-	}
-	return false;
-}
-
 /* 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) {
+	$dthen = Item::firstPostDate($uid, $wall);
+	if (!$dthen) {
 		return [];
 	}
 
@@ -1900,11 +448,10 @@ function list_post_dates($uid, $wall) {
 	return $ret;
 }
 
-/// @TODO move to src/Model/Item.php
 function posted_date_widget($url, $uid, $wall) {
 	$o = '';
 
-	if (! Feature::isEnabled($uid, 'archives')) {
+	if (!Feature::isEnabled($uid, 'archives')) {
 		return $o;
 	}
 
@@ -1916,13 +463,13 @@ function posted_date_widget($url, $uid, $wall) {
 	*/
 
 	$visible_years = PConfig::get($uid,'system','archive_visible_years');
-	if (! $visible_years) {
+	if (!$visible_years) {
 		$visible_years = 5;
 	}
 
 	$ret = list_post_dates($uid, $wall);
 
-	if (! DBM::is_result($ret)) {
+	if (!DBM::is_result($ret)) {
 		return $o;
 	}
 
diff --git a/include/like.php b/include/like.php
index ae344d4269..7e24b463ce 100644
--- a/include/like.php
+++ b/include/like.php
@@ -9,6 +9,7 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
+use Friendica\Model\Item;
 use Friendica\Protocol\Diaspora;
 
 /**
@@ -244,7 +245,7 @@ EOT;
 		'unseen'        => 1,
 	];
 
-	$new_item_id = item_store($new_item);
+	$new_item_id = Item::insert($new_item);
 
 	// @todo: Explain this block
 	if (! $item['visible']) {
diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 3066a871fc..9106f58802 100644
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -26,6 +26,7 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
+use Friendica\Model\Item;
 use Friendica\Model\User;
 use Friendica\Network\Probe;
 use Friendica\Protocol\Diaspora;
@@ -439,7 +440,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 					$arr['deny_cid']  = $user['deny_cid'];
 					$arr['deny_gid']  = $user['deny_gid'];
 
-					$i = item_store($arr);
+					$i = Item::insert($arr);
 					if ($i) {
 						Worker::add(PRIORITY_HIGH, "Notifier", "activity", $i);
 					}
@@ -701,7 +702,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 					$arr['deny_cid']  = $user['deny_cid'];
 					$arr['deny_gid']  = $user['deny_gid'];
 
-					$i = item_store($arr);
+					$i = Item::insert($arr);
 					if ($i) {
 						Worker::add(PRIORITY_HIGH, "Notifier", "activity", $i);
 					}
diff --git a/mod/item.php b/mod/item.php
index 1a512acec8..46a7b184c1 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -729,7 +729,7 @@ function item_post(App $a) {
 	unset($datarray['self']);
 	unset($datarray['api_source']);
 
-	$post_id = item_store($datarray);
+	$post_id = Item::insert($datarray);
 
 	if (!$post_id) {
 		logger("Item wasn't stored.");
diff --git a/mod/notify.php b/mod/notify.php
index 8ae925a065..3613aab399 100644
--- a/mod/notify.php
+++ b/mod/notify.php
@@ -8,6 +8,7 @@ use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Module\Login;
+use Friendica\Model\Item;
 
 function notify_init(App $a)
 {
@@ -27,7 +28,7 @@ function notify_init(App $a)
 				require_once("include/items.php");
 				$urldata = parse_url($note['link']);
 				$guid = basename($urldata["path"]);
-				$itemdata = get_item_id($guid, local_user());
+				$itemdata = Item::getIdAndNickByGuid($guid, local_user());
 				if ($itemdata["id"] != 0) {
 					$note['link'] = System::baseUrl().'/display/'.$itemdata["nick"].'/'.$itemdata["id"];
 				}
diff --git a/mod/photos.php b/mod/photos.php
index 227f5d2a3c..a9e77c7c39 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -13,6 +13,7 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
+use Friendica\Model\Item;
 use Friendica\Model\Photo;
 use Friendica\Model\Profile;
 use Friendica\Network\Probe;
@@ -519,7 +520,7 @@ function photos_post(App $a)
 						. '[img]' . System::baseUrl() . '/photo/' . $p[0]['resource-id'] . '-' . $p[0]['scale'] . '.'. $ext . '[/img]'
 						. '[/url]';
 
-			$item_id = item_store($arr);
+			$item_id = Item::insert($arr);
 		}
 
 		if ($item_id) {
@@ -709,7 +710,7 @@ function photos_post(App $a)
 						. System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . '</id>';
 					$arr['target'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . '" />' . "\n" . '<link rel="preview" type="'.$p[0]['type'].'" href="' . System::baseUrl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.' . $ext . '" />') . '</link></target>';
 
-					$item_id = item_store($arr);
+					$item_id = Item::insert($arr);
 					if ($item_id) {
 						Worker::add(PRIORITY_HIGH, "Notifier", "tag", $item_id);
 					}
@@ -931,7 +932,7 @@ function photos_post(App $a)
 				. '[img]' . System::baseUrl() . "/photo/{$photo_hash}-{$smallest}.".$Image->getExt() . '[/img]'
 				. '[/url]';
 
-	$item_id = item_store($arr);
+	$item_id = Item::insert($arr);
 	// Update the photo albums cache
 	Photo::clearAlbumCache($page_owner_uid);
 
diff --git a/mod/poke.php b/mod/poke.php
index eb85685d73..f5df4d5f83 100644
--- a/mod/poke.php
+++ b/mod/poke.php
@@ -19,6 +19,7 @@ use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
+use Friendica\Model\Item;
 
 require_once 'include/security.php';
 require_once 'include/bbcode.php';
@@ -132,7 +133,7 @@ function poke_init(App $a) {
 	$arr['object'] .= xmlify('<link rel="photo" type="image/jpeg" href="' . $target['photo'] . '" />' . "\n");
 	$arr['object'] .= '</link></object>' . "\n";
 
-	$item_id = item_store($arr);
+	$item_id = Item::insert($arr);
 	if($item_id) {
 		//q("UPDATE `item` SET `plink` = '%s' WHERE `uid` = %d AND `id` = %d",
 		//	dbesc(System::baseUrl() . '/display/' . $poster['nickname'] . '/' . $item_id),
diff --git a/mod/profiles.php b/mod/profiles.php
index 6c581269c9..055bbf99eb 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -15,6 +15,7 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\GContact;
 use Friendica\Model\Profile;
+use Friendica\Model\Item;
 use Friendica\Network\Probe;
 
 function profiles_init(App $a) {
@@ -601,7 +602,7 @@ function profile_activity($changed, $value) {
 	$arr['deny_cid']  = $a->user['deny_cid'];
 	$arr['deny_gid']  = $a->user['deny_gid'];
 
-	$i = item_store($arr);
+	$i = Item::insert($arr);
 	if ($i) {
 		Worker::add(PRIORITY_HIGH, "Notifier", "activity", $i);
 	}
diff --git a/mod/subthread.php b/mod/subthread.php
index 9502b7f8d0..dc8dcc1a9e 100644
--- a/mod/subthread.php
+++ b/mod/subthread.php
@@ -7,6 +7,7 @@ use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
+use Friendica\Model\Item;
 
 require_once 'include/security.php';
 require_once 'include/bbcode.php';
@@ -149,7 +150,7 @@ EOT;
 	$arr['visible'] = 1;
 	$arr['unseen'] = 1;
 
-	$post_id = item_store($arr);
+	$post_id = Item::insert($arr);
 
 	if (! $item['visible']) {
 		$r = q("UPDATE `item` SET `visible` = 1 WHERE `id` = %d AND `uid` = %d",
diff --git a/mod/tagger.php b/mod/tagger.php
index 942cad2ad5..050e532f33 100644
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -8,6 +8,7 @@ use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
+use Friendica\Model\Item;
 
 require_once 'include/security.php';
 require_once 'include/bbcode.php';
@@ -145,13 +146,7 @@ EOT;
 	$arr['unseen'] = 1;
 	$arr['origin'] = 1;
 
-	$post_id = item_store($arr);
-
-//	q("UPDATE `item` set plink = '%s' where id = %d",
-//		dbesc(System::baseUrl() . '/display/' . $owner_nick . '/' . $post_id),
-//		intval($post_id)
-//	);
-
+	$post_id = Item::insert($arr);
 
 	if(! $item['visible']) {
 		$r = q("UPDATE `item` SET `visible` = 1 WHERE `id` = %d AND `uid` = %d",
diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index ce6b252218..6feafdf854 100644
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -549,4 +549,91 @@ class BBCode
 		$s = htmlspecialchars($s, ENT_NOQUOTES, 'UTF-8');
 		return $s;
 	}
+
+	/**
+	 * 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
+	 */
+	public static function limitBodySize($body)
+	{
+		$maxlen = get_max_import_size();
+
+		// If the length of the body, including the embedded images, is smaller
+		// than the maximum, then don't waste time looking for the images
+		if ($maxlen && (strlen($body) > $maxlen)) {
+
+			logger('the total body length exceeds the limit', LOGGER_DEBUG);
+
+			$orig_body = $body;
+			$new_body = '';
+			$textlen = 0;
+
+			$img_start = strpos($orig_body, '[img');
+			$img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false);
+			$img_end = ($img_start !== false ? strpos(substr($orig_body, $img_start), '[/img]') : false);
+			while (($img_st_close !== false) && ($img_end !== false)) {
+
+				$img_st_close++; // make it point to AFTER the closing bracket
+				$img_end += $img_start;
+				$img_end += strlen('[/img]');
+
+				if (!strcmp(substr($orig_body, $img_start + $img_st_close, 5), 'data:')) {
+					// This is an embedded image
+
+					if (($textlen + $img_start) > $maxlen) {
+						if ($textlen < $maxlen) {
+							logger('the limit happens before an embedded image', LOGGER_DEBUG);
+							$new_body = $new_body . substr($orig_body, 0, $maxlen - $textlen);
+							$textlen = $maxlen;
+						}
+					} else {
+						$new_body = $new_body . substr($orig_body, 0, $img_start);
+						$textlen += $img_start;
+					}
+
+					$new_body = $new_body . substr($orig_body, $img_start, $img_end - $img_start);
+				} else {
+
+					if (($textlen + $img_end) > $maxlen) {
+						if ($textlen < $maxlen) {
+							logger('the limit happens before the end of a non-embedded image', LOGGER_DEBUG);
+							$new_body = $new_body . substr($orig_body, 0, $maxlen - $textlen);
+							$textlen = $maxlen;
+						}
+					} else {
+						$new_body = $new_body . substr($orig_body, 0, $img_end);
+						$textlen += $img_end;
+					}
+				}
+				$orig_body = substr($orig_body, $img_end);
+
+				if ($orig_body === false) {
+					// in case the body ends on a closing image tag
+					$orig_body = '';
+				}
+
+				$img_start = strpos($orig_body, '[img');
+				$img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false);
+				$img_end = ($img_start !== false ? strpos(substr($orig_body, $img_start), '[/img]') : false);
+			}
+
+			if (($textlen + strlen($orig_body)) > $maxlen) {
+				if ($textlen < $maxlen) {
+					logger('the limit happens after the end of the last image', LOGGER_DEBUG);
+					$new_body = $new_body . substr($orig_body, 0, $maxlen - $textlen);
+				}
+			} else {
+				logger('the text size with embedded images extracted did not violate the limit', LOGGER_DEBUG);
+				$new_body = $new_body . $orig_body;
+			}
+
+			return $new_body;
+		} else {
+			return $body;
+		}
+	}
 }
diff --git a/src/Core/System.php b/src/Core/System.php
index d0eb651e93..7b68f6131c 100644
--- a/src/Core/System.php
+++ b/src/Core/System.php
@@ -60,7 +60,7 @@ class System extends BaseObject
 		$previous = ['class' => '', 'function' => ''];
 
 		// The ignore list contains all functions that are only wrapper functions
-		$ignore = ['get_config', 'get_pconfig', 'set_config', 'set_pconfig', 'fetch_url', 'probe_url'];
+		$ignore = ['fetchUrl'];
 
 		while ($func = array_pop($trace)) {
 			if (!empty($func['class'])) {
diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index ba9536b391..3b12dbf739 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -1354,4 +1354,113 @@ class Contact extends BaseObject
 
 		return $contact;
 	}
+
+	public static function addRelationship($importer, $contact, $datarray, $item, $sharing = false) {
+		$url = notags(trim($datarray['author-link']));
+		$name = notags(trim($datarray['author-name']));
+		$photo = notags(trim($datarray['author-avatar']));
+
+		if (is_object($item)) {
+			$rawtag = $item->get_item_tags(NAMESPACE_ACTIVITY,'actor');
+			if ($rawtag && $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data']) {
+				$nick = $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data'];
+			}
+		} else {
+			$nick = $item;
+		}
+
+		if (is_array($contact)) {
+			if (($contact['network'] == NETWORK_OSTATUS && $contact['rel'] == CONTACT_IS_SHARING)
+				|| ($sharing && $contact['rel'] == CONTACT_IS_FOLLOWER)) {
+				dba::update('contact', ['rel' => CONTACT_IS_FRIEND, 'writable' => true],
+						['id' => $contact['id'], 'uid' => $importer['uid']]);
+			}
+			// send email notification to owner?
+		} else {
+			// create contact record
+			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']),
+				dbesc(datetime_convert()),
+				dbesc($url),
+				dbesc(normalise_link($url)),
+				dbesc($name),
+				dbesc($nick),
+				dbesc($photo),
+				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)
+			);
+			if (DBM::is_result($r)) {
+				$contact_record = $r[0];
+				Contact::updateAvatar($photo, $importer["uid"], $contact_record["id"], true);
+			}
+
+			/// @TODO Encapsulate this into a function/method
+			$r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
+				intval($importer['uid'])
+			);
+			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', ['uid' => $importer['uid'], 'contact-id' => $contact_record['id'],
+								'blocked' => false, 'knowyou' => false,
+								'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'], [PAGE_NORMAL])) {
+
+					notification([
+						'type'         => NOTIFY_INTRO,
+						'notify_flags' => $r[0]['notify-flags'],
+						'language'     => $r[0]['language'],
+						'to_name'      => $r[0]['username'],
+						'to_email'     => $r[0]['email'],
+						'uid'          => $r[0]['uid'],
+						'link'		   => System::baseUrl() . '/notifications/intro',
+						'source_name'  => ((strlen(stripslashes($contact_record['name']))) ? stripslashes($contact_record['name']) : L10n::t('[Name Withheld]')),
+						'source_link'  => $contact_record['url'],
+						'source_photo' => $contact_record['photo'],
+						'verb'         => ($sharing ? ACTIVITY_FRIEND : ACTIVITY_FOLLOW),
+						'otype'        => 'intro'
+					]);
+
+				}
+			} 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)
+				);
+			}
+
+		}
+	}
+
+	public static function removeFollower($importer, $contact, array $datarray = [], $item = "") {
+
+		if (($contact['rel'] == CONTACT_IS_FRIEND) || ($contact['rel'] == CONTACT_IS_SHARING)) {
+			dba::update('contact', ['rel' => CONTACT_IS_SHARING], ['id' => $contact['id']]);
+		} else {
+			Contact::remove($contact['id']);
+		}
+	}
+
+	public static function removeSharer($importer, $contact, array $datarray = [], $item = "") {
+
+		if (($contact['rel'] == CONTACT_IS_FRIEND) || ($contact['rel'] == CONTACT_IS_FOLLOWER)) {
+			dba::update('contact', ['rel' => CONTACT_IS_FOLLOWER], ['id' => $contact['id']]);
+		} else {
+			Contact::remove($contact['id']);
+		}
+	}
 }
diff --git a/src/Model/Item.php b/src/Model/Item.php
index 40ecc20a98..98ffd89ff1 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -6,16 +6,26 @@
 
 namespace Friendica\Model;
 
+use Friendica\Core\Addon;
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
-use Friendica\Model\Term;
+use Friendica\Core\System;
 use Friendica\Model\Contact;
+use Friendica\Model\Conversation;
+use Friendica\Model\GContact;
+use Friendica\Model\Group;
+use Friendica\Model\Term;
+use Friendica\Model\User;
 use Friendica\Database\DBM;
+use Friendica\Protocol\OStatus;
 use dba;
 use Text_LanguageDetect;
 
 require_once 'include/tags.php';
 require_once 'include/threads.php';
 require_once 'include/items.php';
+require_once 'include/text.php';
 
 class Item
 {
@@ -157,6 +167,643 @@ class Item
 		return true;
 	}
 
+	public static function insert($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
+		if ($notify) {
+			$arr['wall'] = 1;
+			$arr['type'] = 'wall';
+			$arr['origin'] = 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 "self::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'] = self::guidFromUri($arr['plink'], $a->get_hostname());
+				} elseif (isset($arr['uri'])) {
+					$arr['guid'] = self::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'] = self::guidFromUri($arr['plink']);
+		} elseif ((trim($arr['guid']) == "") && (trim($arr['uri']) != "")) {
+			$arr['guid'] = self::guidFromUri($arr['uri']);
+		} else {
+			$parsed = parse_url($arr["author-link"]);
+			$guid_prefix = hash("crc32", $parsed["host"]);
+		}
+
+		$arr['guid'] = notags(trim(defaults($arr, 'guid', get_guid(32, $guid_prefix))));
+		$arr['uri'] = notags(trim(defaults($arr, 'uri', item_new_uri($a->get_hostname(), $uid, $arr['guid']))));
+
+		// Store conversation data
+		$arr = Conversation::insert($arr);
+
+		/*
+		 * If a Diaspora signature structure was passed in, pull it out of the
+		 * item array and set it aside for later storage.
+		 */
+
+		$dsprsig = null;
+		if (x($arr, 'dsprsig')) {
+			$encoded_signature = $arr['dsprsig'];
+			$dsprsig = json_decode(base64_decode($arr['dsprsig']));
+			unset($arr['dsprsig']);
+		}
+
+		// Converting the plink
+		/// @TODO Check if this is really still needed
+		if ($arr['network'] == NETWORK_OSTATUS) {
+			if (isset($arr['plink'])) {
+				$arr['plink'] = OStatus::convertHref($arr['plink']);
+			} elseif (isset($arr['uri'])) {
+				$arr['plink'] = OStatus::convertHref($arr['uri']);
+			}
+		}
+
+		if (x($arr, 'gravity')) {
+			$arr['gravity'] = intval($arr['gravity']);
+		} elseif ($arr['parent-uri'] === $arr['uri']) {
+			$arr['gravity'] = 0;
+		} elseif (activity_match($arr['verb'],ACTIVITY_POST)) {
+			$arr['gravity'] = 6;
+		} else {
+			$arr['gravity'] = 6;   // extensible catchall
+		}
+
+		$arr['type'] = defaults($arr, 'type', 'remote');
+
+		$uid = intval($arr['uid']);
+
+		// check for create date and expire time
+		$expire_interval = Config::get('system', 'dbclean-expire-days', 0);
+
+		$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'])) {
+			$expire_date = time() - ($expire_interval * 86400);
+			$created_date = strtotime($arr['created']);
+			if ($created_date < $expire_date) {
+				logger('item-store: item created ('.date('c', $created_date).') before expiration time ('.date('c', $expire_date).'). ignored. ' . print_r($arr,true), LOGGER_DEBUG);
+				return 0;
+			}
+		}
+
+		/*
+		 * Do we already have this item?
+		 * We have to check several networks since Friendica posts could be repeated
+		 * via OStatus (maybe Diasporsa as well)
+		 */
+		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),
+					dbesc(NETWORK_DIASPORA),
+					dbesc(NETWORK_DFRN),
+					dbesc(NETWORK_OSTATUS)
+				);
+			if (DBM::is_result($r)) {
+				// We only log the entries with a different user id than 0. Otherwise we would have too many false positives
+				if ($uid != 0) {
+					logger("Item with uri ".$arr['uri']." already existed for user ".$uid." with id ".$r[0]["id"]." target network ".$r[0]["network"]." - new network: ".$arr['network']);
+				}
+
+				return $r[0]["id"];
+			}
+		}
+
+		self::addLanguageInPostopts($arr);
+
+		$arr['wall']          = intval(defaults($arr, 'wall', 0));
+		$arr['extid']         = trim(defaults($arr, 'extid', ''));
+		$arr['author-name']   = trim(defaults($arr, 'author-name', ''));
+		$arr['author-link']   = trim(defaults($arr, 'author-link', ''));
+		$arr['author-avatar'] = trim(defaults($arr, 'author-avatar', ''));
+		$arr['owner-name']    = trim(defaults($arr, 'owner-name', ''));
+		$arr['owner-link']    = trim(defaults($arr, 'owner-link', ''));
+		$arr['owner-avatar']  = trim(defaults($arr, 'owner-avatar', ''));
+		$arr['received']      = ((x($arr, 'received') !== false) ? datetime_convert('UTC','UTC', $arr['received']) : datetime_convert());
+		$arr['created']       = ((x($arr, 'created') !== false) ? datetime_convert('UTC','UTC', $arr['created']) : $arr['received']);
+		$arr['edited']        = ((x($arr, 'edited') !== false) ? datetime_convert('UTC','UTC', $arr['edited']) : $arr['created']);
+		$arr['changed']       = ((x($arr, 'changed') !== false) ? datetime_convert('UTC','UTC', $arr['changed']) : $arr['created']);
+		$arr['commented']     = ((x($arr, 'commented') !== false) ? datetime_convert('UTC','UTC', $arr['commented']) : $arr['created']);
+		$arr['title']         = trim(defaults($arr, 'title', ''));
+		$arr['location']      = trim(defaults($arr, 'location', ''));
+		$arr['coord']         = trim(defaults($arr, 'coord', ''));
+		$arr['visible']       = ((x($arr, 'visible') !== false) ? intval($arr['visible'])         : 1);
+		$arr['deleted']       = 0;
+		$arr['parent-uri']    = trim(defaults($arr, 'parent-uri', $arr['uri']));
+		$arr['verb']          = trim(defaults($arr, 'verb', ''));
+		$arr['object-type']   = trim(defaults($arr, 'object-type', ''));
+		$arr['object']        = trim(defaults($arr, 'object', ''));
+		$arr['target-type']   = trim(defaults($arr, 'target-type', ''));
+		$arr['target']        = trim(defaults($arr, 'target', ''));
+		$arr['plink']         = trim(defaults($arr, 'plink', ''));
+		$arr['allow_cid']     = trim(defaults($arr, 'allow_cid', ''));
+		$arr['allow_gid']     = trim(defaults($arr, 'allow_gid', ''));
+		$arr['deny_cid']      = trim(defaults($arr, 'deny_cid', ''));
+		$arr['deny_gid']      = trim(defaults($arr, 'deny_gid', ''));
+		$arr['private']       = intval(defaults($arr, 'private', 0));
+		$arr['bookmark']      = intval(defaults($arr, 'bookmark', 0));
+		$arr['body']          = trim(defaults($arr, 'body', ''));
+		$arr['tag']           = trim(defaults($arr, 'tag', ''));
+		$arr['attach']        = trim(defaults($arr, 'attach', ''));
+		$arr['app']           = trim(defaults($arr, 'app', ''));
+		$arr['origin']        = intval(defaults($arr, 'origin', 0));
+		$arr['postopts']      = trim(defaults($arr, 'postopts', ''));
+		$arr['resource-id']   = trim(defaults($arr, 'resource-id', ''));
+		$arr['event-id']      = intval(defaults($arr, 'event-id', 0));
+		$arr['inform']        = trim(defaults($arr, 'inform', ''));
+		$arr['file']          = trim(defaults($arr, 'file', ''));
+
+		// When there is no content then we don't post it
+		if ($arr['body'].$arr['title'] == '') {
+			return 0;
+		}
+
+		// Items cannot be stored before they happen ...
+		if ($arr['created'] > datetime_convert()) {
+			$arr['created'] = datetime_convert();
+		}
+
+		// We haven't invented time travel by now.
+		if ($arr['edited'] > datetime_convert()) {
+			$arr['edited'] = datetime_convert();
+		}
+
+		if (($arr['author-link'] == "") && ($arr['owner-link'] == "")) {
+			logger("Both author-link and owner-link are empty. Called by: " . System::callstack(), LOGGER_DEBUG);
+		}
+
+		if ($arr['plink'] == "") {
+			$arr['plink'] = System::baseUrl() . '/display/' . urlencode($arr['guid']);
+		}
+
+		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)) {
+				$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",
+					intval($arr['contact-id']),
+					intval($arr['uid'])
+				);
+			}
+
+			if (DBM::is_result($r)) {
+				$arr['network'] = $r[0]["network"];
+			}
+
+			// Fallback to friendica (why is it empty in some cases?)
+			if ($arr['network'] == "") {
+				$arr['network'] = NETWORK_DFRN;
+			}
+
+			logger("Set network to " . $arr["network"] . " for " . $arr["uri"], LOGGER_DEBUG);
+		}
+
+		// The contact-id should be set before "self::insert" was called - but there seems to be some issues
+		if ($arr["contact-id"] == 0) {
+			/*
+			 * First we are looking for a suitable contact that matches with the author of the post
+			 * This is done only for comments (See below explanation at "gcontact-id")
+			 */
+			if ($arr['parent-uri'] != $arr['uri']) {
+				$arr["contact-id"] = Contact::getIdForURL($arr['author-link'], $uid);
+			}
+
+			// If not present then maybe the owner was found
+			if ($arr["contact-id"] == 0) {
+				$arr["contact-id"] = Contact::getIdForURL($arr['owner-link'], $uid);
+			}
+
+			// Still missing? Then use the "self" contact of the current user
+			if ($arr["contact-id"] == 0) {
+				$r = q("SELECT `id` FROM `contact` WHERE `self` AND `uid` = %d", intval($uid));
+
+				if (DBM::is_result($r)) {
+					$arr["contact-id"] = $r[0]["id"];
+				}
+			}
+
+			logger("Contact-id was missing for post ".$arr["guid"]." from user id ".$uid." - now set to ".$arr["contact-id"], LOGGER_DEBUG);
+		}
+
+		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(["url" => $arr['owner-link'], "network" => $arr['network'],
+									 "photo" => $arr['owner-avatar'], "name" => $arr['owner-name']]);
+			} else {
+				$arr["gcontact-id"] = GContact::getId(["url" => $arr['author-link'], "network" => $arr['network'],
+									 "photo" => $arr['author-avatar'], "name" => $arr['author-name']]);
+			}
+		}
+
+		if ($arr["author-id"] == 0) {
+			$arr["author-id"] = Contact::getIdForURL($arr["author-link"], 0);
+		}
+
+		if (Contact::isBlocked($arr["author-id"])) {
+			logger('Contact '.$arr["author-id"].' is blocked, item '.$arr["uri"].' will not be stored');
+			return 0;
+		}
+
+		if ($arr["owner-id"] == 0) {
+			$arr["owner-id"] = Contact::getIdForURL($arr["owner-link"], 0);
+		}
+
+		if (Contact::isBlocked($arr["owner-id"])) {
+			logger('Contact '.$arr["owner-id"].' is blocked, item '.$arr["uri"].' will not be stored');
+			return 0;
+		}
+
+		if ($arr['guid'] != "") {
+			// Checking if there is already an item with the same guid
+			logger('checking for an item for user '.$arr['uid'].' on network '.$arr['network'].' with the guid '.$arr['guid'], LOGGER_DEBUG);
+			$r = q("SELECT `guid` FROM `item` WHERE `guid` = '%s' AND `network` = '%s' AND `uid` = '%d' LIMIT 1",
+				dbesc($arr['guid']), dbesc($arr['network']), intval($arr['uid']));
+
+			if (DBM::is_result($r)) {
+				logger('found item with guid '.$arr['guid'].' for user '.$arr['uid'].' on network '.$arr['network'], LOGGER_DEBUG);
+				return 0;
+			}
+		}
+
+		// Check for hashtags in the body and repair or add hashtag links
+		self::setHashtags($arr);
+
+		$arr['thr-parent'] = $arr['parent-uri'];
+
+		if ($arr['parent-uri'] === $arr['uri']) {
+			$parent_id = 0;
+			$parent_deleted = 0;
+			$allow_cid = $arr['allow_cid'];
+			$allow_gid = $arr['allow_gid'];
+			$deny_cid  = $arr['deny_cid'];
+			$deny_gid  = $arr['deny_gid'];
+			$notify_type = 'wall-new';
+		} else {
+
+			// find the parent and snarf the item id and ACLs
+			// and anything else we need to inherit
+
+			$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d ORDER BY `id` ASC LIMIT 1",
+				dbesc($arr['parent-uri']),
+				intval($arr['uid'])
+			);
+
+			if (DBM::is_result($r)) {
+
+				// is the new message multi-level threaded?
+				// even though we don't support it now, preserve the info
+				// and re-attach to the conversation parent.
+
+				if ($r[0]['uri'] != $r[0]['parent-uri']) {
+					$arr['parent-uri'] = $r[0]['parent-uri'];
+					$z = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `parent-uri` = '%s' AND `uid` = %d
+						ORDER BY `id` ASC LIMIT 1",
+						dbesc($r[0]['parent-uri']),
+						dbesc($r[0]['parent-uri']),
+						intval($arr['uid'])
+					);
+
+					if (DBM::is_result($z)) {
+						$r = $z;
+					}
+				}
+
+				$parent_id      = $r[0]['id'];
+				$parent_deleted = $r[0]['deleted'];
+				$allow_cid      = $r[0]['allow_cid'];
+				$allow_gid      = $r[0]['allow_gid'];
+				$deny_cid       = $r[0]['deny_cid'];
+				$deny_gid       = $r[0]['deny_gid'];
+				$arr['wall']    = $r[0]['wall'];
+				$notify_type    = 'comment-new';
+
+				/*
+				 * If the parent is private, force privacy for the entire conversation
+				 * This differs from the above settings as it subtly allows comments from
+				 * email correspondents to be private even if the overall thread is not.
+				 */
+				if ($r[0]['private']) {
+					$arr['private'] = $r[0]['private'];
+				}
+
+				/*
+				 * Edge case. We host a public forum that was originally posted to privately.
+				 * The original author commented, but as this is a comment, the permissions
+				 * weren't fixed up so it will still show the comment as private unless we fix it here.
+				 */
+				if ((intval($r[0]['forum_mode']) == 1) && $r[0]['private']) {
+					$arr['private'] = 0;
+				}
+
+				// If its a post from myself then tag the thread as "mention"
+				logger("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)) {
+					$self = normalise_link(System::baseUrl() . '/profile/' . $u[0]['nickname']);
+					logger("'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', ['mention' => true], ['iid' => $parent_id]);
+						logger("tagged thread ".$parent_id." as mention for user ".$self, LOGGER_DEBUG);
+					}
+				}
+			} else {
+				/*
+				 * Allow one to see reply tweets from status.net even when
+				 * we don't have or can't see the original post.
+				 */
+				if ($force_parent) {
+					logger('$force_parent=true, reply converted to top-level post.');
+					$parent_id = 0;
+					$arr['parent-uri'] = $arr['uri'];
+					$arr['gravity'] = 0;
+				} else {
+					logger('item parent '.$arr['parent-uri'].' for '.$arr['uid'].' was not found - ignoring item');
+					return 0;
+				}
+
+				$parent_deleted = 0;
+			}
+		}
+
+		$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `network` IN ('%s', '%s') AND `uid` = %d LIMIT 1",
+			dbesc($arr['uri']),
+			dbesc($arr['network']),
+			dbesc(NETWORK_DFRN),
+			intval($arr['uid'])
+		);
+		if (DBM::is_result($r)) {
+			logger('duplicated item with the same uri found. '.print_r($arr,true));
+			return 0;
+		}
+
+		// On Friendica and Diaspora the GUID is unique
+		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'])
+			);
+			if (DBM::is_result($r)) {
+				logger('duplicated item with the same guid found. '.print_r($arr,true));
+				return 0;
+			}
+		} else {
+			// Check for an existing post with the same content. There seems to be a problem with OStatus.
+			$r = q("SELECT `id` FROM `item` WHERE `body` = '%s' AND `network` = '%s' AND `created` = '%s' AND `contact-id` = %d AND `uid` = %d LIMIT 1",
+				dbesc($arr['body']),
+				dbesc($arr['network']),
+				dbesc($arr['created']),
+				intval($arr['contact-id']),
+				intval($arr['uid'])
+			);
+			if (DBM::is_result($r)) {
+				logger('duplicated item with the same body found. '.print_r($arr,true));
+				return 0;
+			}
+		}
+
+		// Is this item available in the global items (with uid=0)?
+		if ($arr["uid"] == 0) {
+			$arr["global"] = true;
+
+			// Set the global flag on all items if this was a global item entry
+			dba::update('item', ['global' => true], ['uri' => $arr["uri"]]);
+		} else {
+			$isglobal = q("SELECT `global` FROM `item` WHERE `uid` = 0 AND `uri` = '%s'", dbesc($arr["uri"]));
+
+			$arr["global"] = (DBM::is_result($isglobal) && count($isglobal) > 0);
+		}
+
+		// ACL settings
+		if (strlen($allow_cid) || strlen($allow_gid) || strlen($deny_cid) || strlen($deny_gid)) {
+			$private = 1;
+		} else {
+			$private = $arr['private'];
+		}
+
+		$arr["allow_cid"] = $allow_cid;
+		$arr["allow_gid"] = $allow_gid;
+		$arr["deny_cid"] = $deny_cid;
+		$arr["deny_gid"] = $deny_gid;
+		$arr["private"] = $private;
+		$arr["deleted"] = $parent_deleted;
+
+		// Fill the cache field
+		put_item_in_cache($arr);
+
+		if ($notify) {
+			Addon::callHooks('post_local', $arr);
+		} else {
+			Addon::callHooks('post_remote', $arr);
+		}
+
+		// This array field is used to trigger some automatic reactions
+		// It is mainly used in the "post_local" hook.
+		unset($arr['api_source']);
+
+		if (x($arr, 'cancel')) {
+			logger('post cancelled by addon.');
+			return 0;
+		}
+
+		/*
+		 * Check for already added items.
+		 * There is a timing issue here that sometimes creates double postings.
+		 * An unique index would help - but the limitations of MySQL (maximum size of index values) prevent this.
+		 */
+		if ($arr["uid"] == 0) {
+			$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = 0 LIMIT 1", dbesc(trim($arr['uri'])));
+			if (DBM::is_result($r)) {
+				logger('Global item already stored. URI: '.$arr['uri'].' on network '.$arr['network'], LOGGER_DEBUG);
+				return 0;
+			}
+		}
+
+		logger('' . print_r($arr,true), LOGGER_DATA);
+
+		dba::transaction();
+		$r = dba::insert('item', $arr);
+
+		// When the item was successfully stored we fetch the ID of the item.
+		if (DBM::is_result($r)) {
+			$current_post = dba::lastInsertId();
+		} else {
+			// This can happen - for example - if there are locking timeouts.
+			dba::rollback();
+
+			// Store the data into a spool file so that we can try again later.
+
+			// At first we restore the Diaspora signature that we removed above.
+			if (isset($encoded_signature)) {
+				$arr['dsprsig'] = $encoded_signature;
+			}
+
+			// Now we store the data in the spool directory
+			// We use "microtime" to keep the arrival order and "mt_rand" to avoid duplicates
+			$file = 'item-'.round(microtime(true) * 10000).'-'.mt_rand().'.msg';
+
+			$spoolpath = get_spoolpath();
+			if ($spoolpath != "") {
+				$spool = $spoolpath.'/'.$file;
+				file_put_contents($spool, json_encode($arr));
+				logger("Item wasn't stored - Item was spooled into file ".$file, LOGGER_DEBUG);
+			}
+			return 0;
+		}
+
+		if ($current_post == 0) {
+			// This is one of these error messages that never should occur.
+			logger("couldn't find created item - we better quit now.");
+			dba::rollback();
+			return 0;
+		}
+
+		// How much entries have we created?
+		// We wouldn't need this query when we could use an unique index - but MySQL has length problems with them.
+		$r = q("SELECT COUNT(*) AS `entries` FROM `item` WHERE `uri` = '%s' AND `uid` = %d AND `network` = '%s'",
+			dbesc($arr['uri']),
+			intval($arr['uid']),
+			dbesc($arr['network'])
+		);
+
+		if (!DBM::is_result($r)) {
+			// This shouldn't happen, since COUNT always works when the database connection is there.
+			logger("We couldn't count the stored entries. Very strange ...");
+			dba::rollback();
+			return 0;
+		}
+
+		if ($r[0]["entries"] > 1) {
+			// There are duplicates. We delete our just created entry.
+			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', ['id' => $current_post]);
+			dba::commit();
+			return 0;
+		} elseif ($r[0]["entries"] == 0) {
+			// This really should never happen since we quit earlier if there were problems.
+			logger("Something is terribly wrong. We haven't found our created entry.");
+			dba::rollback();
+			return 0;
+		}
+
+		logger('created item '.$current_post);
+		self::updateContact($arr);
+
+		if (!$parent_id || ($arr['parent-uri'] === $arr['uri'])) {
+			$parent_id = $current_post;
+		}
+
+		// Set parent id
+		dba::update('item', ['parent' => $parent_id], ['id' => $current_post]);
+
+		$arr['id'] = $current_post;
+		$arr['parent'] = $parent_id;
+
+		// 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', ['commented' => datetime_convert(), 'changed' => datetime_convert()], ['id' => $parent_id]);
+		} else {
+			dba::update('item', ['changed' => datetime_convert()], ['id' => $parent_id]);
+		}
+
+		if ($dsprsig) {
+			/*
+			 * Friendica servers lower than 3.4.3-2 had double encoded the signature ...
+			 * We can check for this condition when we decode and encode the stuff again.
+			 */
+			if (base64_encode(base64_decode(base64_decode($dsprsig->signature))) == base64_decode($dsprsig->signature)) {
+				$dsprsig->signature = base64_decode($dsprsig->signature);
+				logger("Repaired double encoded signature from handle ".$dsprsig->signer, LOGGER_DEBUG);
+			}
+
+			dba::insert('sign', ['iid' => $current_post, 'signed_text' => $dsprsig->signed_text,
+						'signature' => $dsprsig->signature, 'signer' => $dsprsig->signer]);
+		}
+
+		$deleted = self::tagDeliver($arr['uid'], $current_post);
+
+		/*
+		 * current post can be deleted if is for a community page and no mention are
+		 * in it.
+		 */
+		if (!$deleted && !$dontcache) {
+			$r = q('SELECT * FROM `item` WHERE `id` = %d', intval($current_post));
+			if (DBM::is_result($r) && (count($r) == 1)) {
+				if ($notify) {
+					Addon::callHooks('post_local_end', $r[0]);
+				} else {
+					Addon::callHooks('post_remote_end', $r[0]);
+				}
+			} else {
+				logger('new item not found in DB, id ' . $current_post);
+			}
+		}
+
+		if ($arr['parent-uri'] === $arr['uri']) {
+			add_thread($current_post);
+		} else {
+			update_thread($parent_id);
+		}
+
+		dba::commit();
+
+		/*
+		 * 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);
+
+		if ($arr['parent-uri'] === $arr['uri']) {
+			self::addShadow($current_post);
+		} else {
+			self::addShadowPost($current_post);
+		}
+
+		check_user_notification($current_post);
+
+		if ($notify) {
+			Worker::add(['priority' => PRIORITY_HIGH, 'dont_fork' => true], "Notifier", $notify_type, $current_post);
+		}
+
+		return $current_post;
+	}
+
 	/**
 	 * @brief Add a shadow entry for a given item id that is a thread starter
 	 *
@@ -233,7 +880,7 @@ class Item
 					$item['type'] = 'remote';
 				}
 
-				$public_shadow = item_store($item, false, false, true);
+				$public_shadow = self::insert($item, false, false, true);
 
 				logger("Stored public shadow for thread ".$itemid." under id ".$public_shadow, LOGGER_DEBUG);
 			}
@@ -287,7 +934,7 @@ class Item
 			$item['type'] = 'remote';
 		}
 
-		$public_shadow = item_store($item, false, false, true);
+		$public_shadow = self::insert($item, false, false, true);
 
 		logger("Stored public shadow for comment ".$item['uri']." under id ".$public_shadow, LOGGER_DEBUG);
 	}
@@ -296,10 +943,8 @@ class Item
 	 * 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 change to "local", once the "Item::insert" is in this class
 	 */
-	public static function addLanguageInPostopts(&$arr)
+	private static function addLanguageInPostopts(&$arr)
 	{
 		if (x($arr, 'postopts')) {
 			if (strstr($arr['postopts'], 'lang=')) {
@@ -377,11 +1022,10 @@ class Item
 	 * 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)
 	 *
-	 * @Todo Set this to private, once Item::insert is there
-	 *
 	 * @param array $arr Contains the just posted item record
 	 */
-	public static function updateContact($arr) {
+	private static function updateContact($arr)
+	{
 		// Unarchive the author
 		$contact = dba::selectFirst('contact', [], ['id' => $arr["author-link"]]);
 		if ($contact['term-date'] > NULL_DATE) {
@@ -422,4 +1066,580 @@ class Item
 			}
 		}
 	}
+
+	private static function setHashtags(&$item)
+	{
+
+		$tags = get_tags($item["body"]);
+
+		// No hashtags?
+		if (!count($tags)) {
+			return false;
+		}
+
+		// This sorting is important when there are hashtags that are part of other hashtags
+		// Otherwise there could be problems with hashtags like #test and #test2
+		rsort($tags);
+
+		$URLSearchString = "^\[\]";
+
+		// All hashtags should point to the home server if "local_tags" is activated
+		if (Config::get('system', 'local_tags')) {
+			$item["body"] = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
+					"#[url=".System::baseUrl()."/search?tag=$2]$2[/url]", $item["body"]);
+
+			$item["tag"] = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
+					"#[url=".System::baseUrl()."/search?tag=$2]$2[/url]", $item["tag"]);
+		}
+
+		// mask hashtags inside of url, bookmarks and attachments to avoid urls in urls
+		$item["body"] = preg_replace_callback("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
+			function ($match) {
+				return ("[url=" . str_replace("#", "&num;", $match[1]) . "]" . str_replace("#", "&num;", $match[2]) . "[/url]");
+			}, $item["body"]);
+
+		$item["body"] = preg_replace_callback("/\[bookmark\=([$URLSearchString]*)\](.*?)\[\/bookmark\]/ism",
+			function ($match) {
+				return ("[bookmark=" . str_replace("#", "&num;", $match[1]) . "]" . str_replace("#", "&num;", $match[2]) . "[/bookmark]");
+			}, $item["body"]);
+
+		$item["body"] = preg_replace_callback("/\[attachment (.*)\](.*?)\[\/attachment\]/ism",
+			function ($match) {
+				return ("[attachment " . str_replace("#", "&num;", $match[1]) . "]" . $match[2] . "[/attachment]");
+			}, $item["body"]);
+
+		// Repair recursive urls
+		$item["body"] = preg_replace("/&num;\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
+				"&num;$2", $item["body"]);
+
+		foreach ($tags as $tag) {
+			if ((strpos($tag, '#') !== 0) || strpos($tag, '[url=')) {
+				continue;
+			}
+
+			$basetag = str_replace('_',' ',substr($tag,1));
+
+			$newtag = '#[url=' . System::baseUrl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
+
+			$item["body"] = str_replace($tag, $newtag, $item["body"]);
+
+			if (!stristr($item["tag"], "/search?tag=" . $basetag . "]" . $basetag . "[/url]")) {
+				if (strlen($item["tag"])) {
+					$item["tag"] = ','.$item["tag"];
+				}
+				$item["tag"] = $newtag.$item["tag"];
+			}
+		}
+
+		// Convert back the masked hashtags
+		$item["body"] = str_replace("&num;", "#", $item["body"]);
+	}
+
+	public static function getGuidById($id)
+	{
+		$r = q("SELECT `guid` FROM `item` WHERE `id` = %d LIMIT 1", intval($id));
+		if (DBM::is_result($r)) {
+			return $r[0]["guid"];
+		} else {
+			return "";
+		}
+	}
+
+	public static function getIdAndNickByGuid($guid, $uid = 0)
+	{
+		$nick = "";
+		$id = 0;
+
+		if ($uid == 0) {
+			$uid == local_user();
+		}
+
+		// Does the given user have this item?
+		if ($uid) {
+			$r = q("SELECT `item`.`id`, `user`.`nickname` FROM `item` INNER JOIN `user` ON `user`.`uid` = `item`.`uid`
+				WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 AND `item`.`moderated` = 0
+					AND `item`.`guid` = '%s' AND `item`.`uid` = %d", dbesc($guid), intval($uid));
+			if (DBM::is_result($r)) {
+				$id = $r[0]["id"];
+				$nick = $r[0]["nickname"];
+			}
+		}
+
+		// Or is it anywhere on the server?
+		if ($nick == "") {
+			$r = q("SELECT `item`.`id`, `user`.`nickname` FROM `item` INNER JOIN `user` ON `user`.`uid` = `item`.`uid`
+				WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 AND `item`.`moderated` = 0
+					AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = ''
+					AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''
+					AND `item`.`private` = 0 AND `item`.`wall` = 1
+					AND `item`.`guid` = '%s'", dbesc($guid));
+			if (DBM::is_result($r)) {
+				$id = $r[0]["id"];
+				$nick = $r[0]["nickname"];
+			}
+		}
+		return ["nick" => $nick, "id" => $id];
+	}
+
+	/**
+	 * look for mention tags and setup a second delivery chain for forum/community posts if appropriate
+	 * @param int $uid
+	 * @param int $item_id
+	 * @return bool true if item was deleted, else false
+	 */
+	private static function tagDeliver($uid, $item_id)
+	{
+		$mention = false;
+
+		$u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
+			intval($uid)
+		);
+		if (!DBM::is_result($u)) {
+			return;
+		}
+
+		$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)
+		);
+		if (!DBM::is_result($i)) {
+			return;
+		}
+
+		$item = $i[0];
+
+		$link = normalise_link(System::baseUrl() . '/profile/' . $u[0]['nickname']);
+
+		/*
+		 * Diaspora uses their own hardwired link URL in @-tags
+		 * instead of the one we supply with webfinger
+		 */
+		$dlink = normalise_link(System::baseUrl() . '/u/' . $u[0]['nickname']);
+
+		$cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism', $item['body'], $matches, PREG_SET_ORDER);
+		if ($cnt) {
+			foreach ($matches as $mtch) {
+				if (link_compare($link, $mtch[1]) || link_compare($dlink, $mtch[1])) {
+					$mention = true;
+					logger('mention found: ' . $mtch[2]);
+				}
+			}
+		}
+
+		if (!$mention) {
+			if (($community_page || $prvgroup) &&
+				  !$item['wall'] && !$item['origin'] && ($item['id'] == $item['parent'])) {
+				// mmh.. no mention.. community page or private group... no wall.. no origin.. top-post (not a comment)
+				// delete it!
+				logger("no-mention top-level post to communuty or private group. delete.");
+				dba::delete('item', ['id' => $item_id]);
+				return true;
+			}
+			return;
+		}
+
+		$arr = ['item' => $item, 'user' => $u[0], 'contact' => $r[0]];
+
+		Addon::callHooks('tagged', $arr);
+
+		if (!$community_page && !$prvgroup) {
+			return;
+		}
+
+		/*
+		 * tgroup delivery - setup a second delivery chain
+		 * prevent delivery looping - only proceed
+		 * if the message originated elsewhere and is a top-level post
+		 */
+		if ($item['wall'] || $item['origin'] || ($item['id'] != $item['parent'])) {
+			return;
+		}
+
+		// now change this copy of the post to a forum head message and deliver to all the tgroup members
+		$c = q("SELECT `name`, `url`, `thumb` FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
+			intval($u[0]['uid'])
+		);
+		if (!DBM::is_result($c)) {
+			return;
+		}
+
+		// also reset all the privacy bits to the forum default permissions
+
+		$private = ($u[0]['allow_cid'] || $u[0]['allow_gid'] || $u[0]['deny_cid'] || $u[0]['deny_gid']) ? 1 : 0;
+
+		$forum_mode = (($prvgroup) ? 2 : 1);
+
+		q("UPDATE `item` SET `wall` = 1, `origin` = 1, `forum_mode` = %d, `owner-name` = '%s', `owner-link` = '%s', `owner-avatar` = '%s',
+			`private` = %d, `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s'  WHERE `id` = %d",
+			intval($forum_mode),
+			dbesc($c[0]['name']),
+			dbesc($c[0]['url']),
+			dbesc($c[0]['thumb']),
+			intval($private),
+			dbesc($u[0]['allow_cid']),
+			dbesc($u[0]['allow_gid']),
+			dbesc($u[0]['deny_cid']),
+			dbesc($u[0]['deny_gid']),
+			intval($item_id)
+		);
+		update_thread($item_id);
+
+		Worker::add(['priority' => PRIORITY_HIGH, 'dont_fork' => true], 'Notifier', 'tgroup', $item_id);
+
+	}
+
+	public static function isRemoteSelf($contact, &$datarray)
+	{
+		$a = get_app();
+
+		if (!$contact['remote_self']) {
+			return false;
+		}
+
+		// Prevent the forwarding of posts that are forwarded
+		if ($datarray["extid"] == NETWORK_DFRN) {
+			return false;
+		}
+
+		// Prevent to forward already forwarded posts
+		if ($datarray["app"] == $a->get_hostname()) {
+			return false;
+		}
+
+		// Only forward posts
+		if ($datarray["verb"] != ACTIVITY_POST) {
+			return false;
+		}
+
+		if (($contact['network'] != NETWORK_FEED) && $datarray['private']) {
+			return false;
+		}
+
+		$datarray2 = $datarray;
+		logger('remote-self start - Contact '.$contact['url'].' - '.$contact['remote_self'].' Item '.print_r($datarray, true), LOGGER_DEBUG);
+		if ($contact['remote_self'] == 2) {
+			$r = q("SELECT `id`,`url`,`name`,`thumb` FROM `contact` WHERE `uid` = %d AND `self`",
+				intval($contact['uid']));
+			if (DBM::is_result($r)) {
+				$datarray['contact-id'] = $r[0]["id"];
+
+				$datarray['owner-name'] = $r[0]["name"];
+				$datarray['owner-link'] = $r[0]["url"];
+				$datarray['owner-avatar'] = $r[0]["thumb"];
+
+				$datarray['author-name']   = $datarray['owner-name'];
+				$datarray['author-link']   = $datarray['owner-link'];
+				$datarray['author-avatar'] = $datarray['owner-avatar'];
+
+				unset($datarray['created']);
+				unset($datarray['edited']);
+			}
+
+			if ($contact['network'] != NETWORK_FEED) {
+				$datarray["guid"] = get_guid(32);
+				unset($datarray["plink"]);
+				$datarray["uri"] = item_new_uri($a->get_hostname(), $contact['uid'], $datarray["guid"]);
+				$datarray["parent-uri"] = $datarray["uri"];
+				$datarray["extid"] = $contact['network'];
+				$urlpart = parse_url($datarray2['author-link']);
+				$datarray["app"] = $urlpart["host"];
+			} else {
+				$datarray['private'] = 0;
+			}
+		}
+
+		if ($contact['network'] != NETWORK_FEED) {
+			// Store the original post
+			$r = self::insert($datarray2, false, false);
+			logger('remote-self post original item - Contact '.$contact['url'].' return '.$r.' Item '.print_r($datarray2, true), LOGGER_DEBUG);
+		} else {
+			$datarray["app"] = "Feed";
+		}
+
+		// Trigger automatic reactions for addons
+		$datarray['api_source'] = true;
+
+		// We have to tell the hooks who we are - this really should be improved
+		$_SESSION["authenticated"] = true;
+		$_SESSION["uid"] = $contact['uid'];
+
+		return true;
+	}
+
+	/**
+	 *
+	 * @param string $s
+	 * @param int    $uid
+	 * @param array  $item
+	 * @param int    $cid
+	 * @return string
+	 */
+	public static function fixPrivatePhotos($s, $uid, $item = null, $cid = 0)
+	{
+		if (Config::get('system', 'disable_embedded')) {
+			return $s;
+		}
+
+		logger('check for photos', LOGGER_DEBUG);
+		$site = substr(System::baseUrl(), strpos(System::baseUrl(), '://'));
+
+		$orig_body = $s;
+		$new_body = '';
+
+		$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)) {
+			$img_st_close++; // make it point to AFTER the closing bracket
+			$image = substr($orig_body, $img_start + $img_st_close, $img_len);
+
+			logger('found photo ' . $image, LOGGER_DEBUG);
+
+			if (stristr($image, $site . '/photo/')) {
+				// Only embed locally hosted photos
+				$replace = false;
+				$i = basename($image);
+				$i = str_replace(['.jpg', '.png', '.gif'], ['', '', ''], $i);
+				$x = strpos($i, '-');
+
+				if ($x) {
+					$res = substr($i, $x + 1);
+					$i = substr($i, 0, $x);
+					$r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `scale` = %d AND `uid` = %d",
+						dbesc($i),
+						intval($res),
+						intval($uid)
+					);
+					if (DBM::is_result($r)) {
+						/*
+						 * Check to see if we should replace this photo link with an embedded image
+						 * 1. No need to do so if the photo is public
+						 * 2. If there's a contact-id provided, see if they're in the access list
+						 *    for the photo. If so, embed it.
+						 * 3. Otherwise, if we have an item, see if the item permissions match the photo
+						 *    permissions, regardless of order but first check to see if they're an exact
+						 *    match to save some processing overhead.
+						 */
+						if (self::hasPermissions($r[0])) {
+							if ($cid) {
+								$recips = self::enumeratePermissions($r[0]);
+								if (in_array($cid, $recips)) {
+									$replace = true;
+								}
+							} elseif ($item) {
+								if (self::samePermissions($item, $r[0])) {
+									$replace = true;
+								}
+							}
+						}
+						if ($replace) {
+							$data = $r[0]['data'];
+							$type = $r[0]['type'];
+
+							// If a custom width and height were specified, apply before embedding
+							if (preg_match("/\[img\=([0-9]*)x([0-9]*)\]/is", substr($orig_body, $img_start, $img_st_close), $match)) {
+								logger('scaling photo', LOGGER_DEBUG);
+
+								$width = intval($match[1]);
+								$height = intval($match[2]);
+
+								$Image = new Image($data, $type);
+								if ($Image->isValid()) {
+									$Image->scaleDown(max($width, $height));
+									$data = $Image->asString();
+									$type = $Image->getType();
+								}
+							}
+
+							logger('replacing photo', LOGGER_DEBUG);
+							$image = 'data:' . $type . ';base64,' . base64_encode($data);
+							logger('replaced: ' . $image, LOGGER_DATA);
+						}
+					}
+				}
+			}
+
+			$new_body = $new_body . substr($orig_body, 0, $img_start + $img_st_close) . $image . '[/img]';
+			$orig_body = substr($orig_body, $img_start + $img_st_close + $img_len + strlen('[/img]'));
+			if ($orig_body === false) {
+				$orig_body = '';
+			}
+
+			$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);
+		}
+
+		$new_body = $new_body . $orig_body;
+
+		return $new_body;
+	}
+
+	private static function hasPermissions($obj)
+	{
+		return (
+			(
+				x($obj, 'allow_cid')
+			) || (
+				x($obj, 'allow_gid')
+			) || (
+				x($obj, 'deny_cid')
+			) || (
+				x($obj, 'deny_gid')
+			)
+		);
+	}
+
+	private static function samePermissions($obj1, $obj2)
+	{
+		// first part is easy. Check that these are exactly the same.
+		if (($obj1['allow_cid'] == $obj2['allow_cid'])
+			&& ($obj1['allow_gid'] == $obj2['allow_gid'])
+			&& ($obj1['deny_cid'] == $obj2['deny_cid'])
+			&& ($obj1['deny_gid'] == $obj2['deny_gid'])) {
+			return true;
+		}
+
+		// This is harder. Parse all the permissions and compare the resulting set.
+		$recipients1 = self::enumeratePermissions($obj1);
+		$recipients2 = self::enumeratePermissions($obj2);
+		sort($recipients1);
+		sort($recipients2);
+
+		/// @TODO Comparison of arrays, maybe use array_diff_assoc() here?
+		return ($recipients1 == $recipients2);
+	}
+
+	// returns an array of contact-ids that are allowed to see this object
+	private static function enumeratePermissions($obj)
+	{
+		$allow_people = expand_acl($obj['allow_cid']);
+		$allow_groups = Group::expand(expand_acl($obj['allow_gid']));
+		$deny_people  = expand_acl($obj['deny_cid']);
+		$deny_groups  = Group::expand(expand_acl($obj['deny_gid']));
+		$recipients   = array_unique(array_merge($allow_people, $allow_groups));
+		$deny         = array_unique(array_merge($deny_people, $deny_groups));
+		$recipients   = array_diff($recipients, $deny);
+		return $recipients;
+	}
+
+	public static function getFeedTags($item)
+	{
+		$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]] = ['#', $matches[1][$x], $matches[2][$x]];
+				}
+			}
+		}
+		$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[1][$x], $matches[2][$x]];
+				}
+			}
+		}
+		return $ret;
+	}
+
+	public static function expire($uid, $days, $network = "", $force = false)
+	{
+		if (!$uid || ($days < 1)) {
+			return;
+		}
+
+		/*
+		 * $expire_network_only = save your own wall posts
+		 * 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 " : "");
+
+		if ($network != "") {
+			$sql_extra .= sprintf(" AND network = '%s' ", dbesc($network));
+
+			/*
+			 * There is an index "uid_network_received" but not "uid_network_created"
+			 * This avoids the creation of another index just for one purpose.
+			 * And it doesn't really matter wether to look at "received" or "created"
+			 */
+			$range = "AND `received` < UTC_TIMESTAMP() - INTERVAL %d DAY ";
+		} else {
+			$range = "AND `created` < UTC_TIMESTAMP() - INTERVAL %d DAY ";
+		}
+
+		$r = q("SELECT `file`, `resource-id`, `starred`, `type`, `id` FROM `item`
+			WHERE `uid` = %d $range
+			AND `id` = `parent`
+			$sql_extra
+			AND `deleted` = 0",
+			intval($uid),
+			intval($days)
+		);
+
+		if (!DBM::is_result($r)) {
+			return;
+		}
+
+		$expire_items = PConfig::get($uid, 'expire', 'items', 1);
+
+		// Forcing expiring of items - but not notes and marked items
+		if ($force) {
+			$expire_items = true;
+		}
+
+		$expire_notes = PConfig::get($uid, 'expire', 'notes', 1);
+		$expire_starred = PConfig::get($uid, 'expire', 'starred', 1);
+		$expire_photos = PConfig::get($uid, 'expire', 'photos', 0);
+
+		logger('User '.$uid.': expire: # items=' . count($r). "; expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos");
+
+		foreach ($r as $item) {
+
+			// don't expire filed items
+
+			if (strpos($item['file'],'[') !== false) {
+				continue;
+			}
+
+			// Only expire posts, not photos and photo comments
+
+			if ($expire_photos == 0 && strlen($item['resource-id'])) {
+				continue;
+			} elseif ($expire_starred == 0 && intval($item['starred'])) {
+				continue;
+			} elseif ($expire_notes == 0 && $item['type'] == 'note') {
+				continue;
+			} elseif ($expire_items == 0 && $item['type'] != 'note') {
+				continue;
+			}
+
+			self::delete($item['id'], PRIORITY_LOW);
+		}
+	}
+
+	/// @TODO: This query seems to be really slow
+	public static function firstPostDate($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
+			AND `id` = `parent`
+			ORDER BY `created` ASC LIMIT 1",
+			intval($uid),
+			intval($wall ? 1 : 0)
+		);
+		if (DBM::is_result($r)) {
+			return substr(datetime_convert('',date_default_timezone_get(), $r[0]['created']),0,10);
+		}
+		return false;
+	}
 }
diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 59141576b3..6a83981371 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -19,6 +19,7 @@ use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Model\Group;
+use Friendica\Model\Item;
 use Friendica\Model\Profile;
 use Friendica\Model\Term;
 use Friendica\Model\User;
@@ -27,6 +28,7 @@ use Friendica\Protocol\OStatus;
 use Friendica\Util\Crypto;
 use Friendica\Util\Network;
 use Friendica\Util\XML;
+use Friendica\Content\Text\BBCode;
 
 use dba;
 use DOMDocument;
@@ -922,7 +924,7 @@ class DFRN
 		}
 
 		if ($item['allow_cid'] || $item['allow_gid'] || $item['deny_cid'] || $item['deny_gid']) {
-			$body = fix_private_photos($item['body'], $owner['uid'], $item, $cid);
+			$body = Item::fixPrivatePhotos($item['body'], $owner['uid'], $item, $cid);
 		} else {
 			$body = $item['body'];
 		}
@@ -1059,7 +1061,7 @@ class DFRN
 			$entry->appendChild($actarg);
 		}
 
-		$tags = item_getfeedtags($item);
+		$tags = Item::getFeedTags($item);
 
 		if (count($tags)) {
 			foreach ($tags as $t) {
@@ -2214,7 +2216,7 @@ class DFRN
 					"to_email"     => $importer["email"],
 					"uid"          => $importer["importer_uid"],
 					"item"         => $item,
-					"link"         => System::baseUrl()."/display/".urlencode(get_item_guid($posted_id)),
+					"link"         => System::baseUrl()."/display/".urlencode(Item::getGuidById($posted_id)),
 					"source_name"  => stripslashes($item["author-name"]),
 					"source_link"  => $item["author-link"],
 					"source_photo" => ((link_compare($item["author-link"], $importer["url"]))
@@ -2254,22 +2256,22 @@ class DFRN
 			// This function once was responsible for DFRN and OStatus.
 			if (activity_match($item["verb"], ACTIVITY_FOLLOW)) {
 				logger("New follower");
-				new_follower($importer, $contact, $item, $nickname);
+				Contact::addRelationship($importer, $contact, $item, $nickname);
 				return false;
 			}
 			if (activity_match($item["verb"], ACTIVITY_UNFOLLOW)) {
 				logger("Lost follower");
-				lose_follower($importer, $contact, $item);
+				Contact::removeFollower($importer, $contact, $item);
 				return false;
 			}
 			if (activity_match($item["verb"], ACTIVITY_REQ_FRIEND)) {
 				logger("New friend request");
-				new_follower($importer, $contact, $item, $nickname, true);
+				Contact::addRelationship($importer, $contact, $item, $nickname, true);
 				return false;
 			}
 			if (activity_match($item["verb"], ACTIVITY_UNFRIEND)) {
 				logger("Lost sharer");
-				lose_sharer($importer, $contact, $item);
+				Contact::removeSharer($importer, $contact, $item);
 				return false;
 			}
 		} else {
@@ -2448,7 +2450,7 @@ class DFRN
 		// make sure nobody is trying to sneak some html tags by us
 		$item["body"] = notags(base64url_decode($item["body"]));
 
-		$item["body"] = limit_body_size($item["body"]);
+		$item["body"] = BBCode::limitBodySize($item["body"]);
 
 		/// @todo Do we really need this check for HTML elements? (It was copied from the old function)
 		if ((strpos($item['body'], '<') !== false) && (strpos($item['body'], '>') !== false)) {
@@ -2502,7 +2504,7 @@ class DFRN
 
 		$item["guid"] = $xpath->query("dfrn:diaspora_guid/text()", $entry)->item(0)->nodeValue;
 
-		// We store the data from "dfrn:diaspora_signature" in a different table, this is done in "item_store"
+		// We store the data from "dfrn:diaspora_signature" in a different table, this is done in "Item::insert"
 		$dsprsig = unxmlify($xpath->query("dfrn:diaspora_signature/text()", $entry)->item(0)->nodeValue);
 		if ($dsprsig != "") {
 			$item["dsprsig"] = $dsprsig;
@@ -2670,7 +2672,7 @@ class DFRN
 		}
 
 		if (in_array($entrytype, [DFRN_REPLY, DFRN_REPLY_RC])) {
-			$posted_id = item_store($item);
+			$posted_id = Item::insert($item);
 			$parent = 0;
 
 			if ($posted_id) {
@@ -2700,7 +2702,7 @@ class DFRN
 				/*
 				 * The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery,
 				 * but otherwise there's a possible data mixup on the sender's system.
-				 * the tgroup delivery code called from item_store will correct it if it's a forum,
+				 * the tgroup delivery code called from Item::insert will correct it if it's a forum,
 				 * but we're going to unconditionally correct it here so that the post will always be owned by our contact.
 				 */
 				logger('Correcting item owner.', LOGGER_DEBUG);
@@ -2716,9 +2718,9 @@ class DFRN
 
 			// This is my contact on another system, but it's really me.
 			// Turn this into a wall post.
-			$notify = item_is_remote_self($importer, $item);
+			$notify = Item::isRemoteSelf($importer, $item);
 
-			$posted_id = item_store($item, false, $notify);
+			$posted_id = Item::insert($item, false, $notify);
 
 			logger("Item was stored with id ".$posted_id, LOGGER_DEBUG);
 
diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 86fdb2374c..c05db2eb1f 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -20,6 +20,7 @@ use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Model\Group;
+use Friendica\Model\Item;
 use Friendica\Model\Profile;
 use Friendica\Model\Queue;
 use Friendica\Model\User;
@@ -1730,7 +1731,7 @@ class Diaspora
 
 		self::fetchGuid($datarray);
 
-		$message_id = item_store($datarray);
+		$message_id = Item::insert($datarray);
 
 		if ($message_id <= 0) {
 			return false;
@@ -2051,7 +2052,7 @@ class Diaspora
 
 		$datarray["body"] = self::constructLikeBody($contact, $parent_item, $guid);
 
-		$message_id = item_store($datarray);
+		$message_id = Item::insert($datarray);
 
 		if ($message_id <= 0) {
 			return false;
@@ -2417,7 +2418,7 @@ class Diaspora
 				$arr["deny_cid"]  = $user["deny_cid"];
 				$arr["deny_gid"]  = $user["deny_gid"];
 
-				$i = item_store($arr);
+				$i = Item::insert($arr);
 				if ($i) {
 					Worker::add(PRIORITY_HIGH, "Notifier", "activity", $i);
 				}
@@ -2501,7 +2502,7 @@ class Diaspora
 				return true;
 			} else {
 				logger("Author ".$author." doesn't want to follow us anymore.", LOGGER_DEBUG);
-				lose_follower($importer, $contact);
+				Contact::removeFollower($importer, $contact);
 				return true;
 			}
 		}
@@ -2780,7 +2781,7 @@ class Diaspora
 		$datarray["object-type"] = $original_item["object-type"];
 
 		self::fetchGuid($datarray);
-		$message_id = item_store($datarray);
+		$message_id = Item::insert($datarray);
 
 		self::sendParticipation($contact, $datarray);
 
@@ -3020,7 +3021,7 @@ class Diaspora
 		}
 
 		self::fetchGuid($datarray);
-		$message_id = item_store($datarray);
+		$message_id = Item::insert($datarray);
 
 		self::sendParticipation($contact, $datarray);
 
diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php
index cc0915472d..ed421d8532 100644
--- a/src/Protocol/Feed.php
+++ b/src/Protocol/Feed.php
@@ -423,7 +423,7 @@ class Feed {
 			if (!$simulate) {
 				logger("Stored feed: ".print_r($item, true), LOGGER_DEBUG);
 
-				$notify = item_is_remote_self($contact, $item);
+				$notify = Item::isRemoteSelf($contact, $item);
 
 				// Distributed items should have a well formatted URI.
 				// Additionally we have to avoid conflicts with identical URI between imported feeds and these items.
@@ -433,7 +433,7 @@ class Feed {
 					unset($item['parent-uri']);
 				}
 
-				$id = item_store($item, false, $notify);
+				$id = Item::insert($item, false, $notify);
 
 				logger("Feed for contact ".$contact["url"]." stored under id ".$id);
 			} else {
diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index e41f3addc1..3c0f3627be 100644
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -14,6 +14,7 @@ use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Model\Conversation;
+use Friendica\Model\Item;
 use Friendica\Network\Probe;
 use Friendica\Object\Image;
 use Friendica\Util\Lock;
@@ -455,12 +456,12 @@ class OStatus
 			}
 
 			if ($item["verb"] == ACTIVITY_FOLLOW) {
-				new_follower($importer, $contact, $item, $nickname);
+				Contact::addRelationship($importer, $contact, $item, $nickname);
 				continue;
 			}
 
 			if ($item["verb"] == NAMESPACE_OSTATUS."/unfollow") {
-				lose_follower($importer, $contact, $item, $dummy);
+				Contact::removeFollower($importer, $contact, $item, $dummy);
 				continue;
 			}
 
@@ -521,12 +522,12 @@ class OStatus
 							logger("Item with uri ".$item["uri"]." is from a blocked contact.", LOGGER_DEBUG);
 						} else {
 							// We are having duplicated entries. Hopefully this solves it.
-							if (Lock::set('ostatus_process_item_store')) {
-								$ret = item_store($item);
-								Lock::remove('ostatus_process_item_store');
+							if (Lock::set('ostatus_process_item_insert')) {
+								$ret = Item::insert($item);
+								Lock::remove('ostatus_process_item_insert');
 								logger("Item with uri ".$item["uri"]." for user ".$importer["uid"].' stored. Return value: '.$ret);
 							} else {
-								$ret = item_store($item);
+								$ret = Item::insert($item);
 								logger("We couldn't lock - but tried to store the item anyway. Return value is ".$ret);
 							}
 						}
@@ -1996,7 +1997,7 @@ class OStatus
 			XML::addElement($doc, $entry, "ostatus:conversation", $conversation_uri, $attributes);
 		}
 
-		$tags = item_getfeedtags($item);
+		$tags = item::getFeedTags($item);
 
 		if (count($tags)) {
 			foreach ($tags as $t) {
diff --git a/src/Util/Network.php b/src/Util/Network.php
index 1f9184ae96..551dee0f07 100644
--- a/src/Util/Network.php
+++ b/src/Util/Network.php
@@ -82,7 +82,7 @@ class Network
 		$a = get_app();
 
 		if (self::isUrlBlocked($url)) {
-			logger('z_fetch_url: domain of ' . $url . ' is blocked', LOGGER_DATA);
+			logger('domain of ' . $url . ' is blocked', LOGGER_DATA);
 			return $ret;
 		}
 
@@ -187,7 +187,7 @@ class Network
 		}
 
 		if (curl_errno($ch) !== CURLE_OK) {
-			logger('fetch_url error fetching ' . $url . ': ' . curl_error($ch), LOGGER_NORMAL);
+			logger('error fetching ' . $url . ': ' . curl_error($ch), LOGGER_NORMAL);
 		}
 
 		$ret['errno'] = curl_errno($ch);
@@ -197,7 +197,7 @@ class Network
 
 		$http_code = $curl_info['http_code'];
 
-		logger('fetch_url ' . $url . ': ' . $http_code . " " . $s, LOGGER_DATA);
+		logger($url . ': ' . $http_code . " " . $s, LOGGER_DATA);
 		$header = '';
 
 		// Pull out multiple headers, e.g. proxy and continuation headers
@@ -250,8 +250,8 @@ class Network
 		if (!$ret['success']) {
 			$ret['error'] = curl_error($ch);
 			$ret['debug'] = $curl_info;
-			logger('z_fetch_url: error: '.$url.': '.$ret['return_code'].' - '.$ret['error'], LOGGER_DEBUG);
-			logger('z_fetch_url: debug: '.print_r($curl_info, true), LOGGER_DATA);
+			logger('error: '.$url.': '.$ret['return_code'].' - '.$ret['error'], LOGGER_DEBUG);
+			logger('debug: '.print_r($curl_info, true), LOGGER_DATA);
 		}
 
 		$ret['body'] = substr($s, strlen($header));
diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php
index e17d68f885..5b03a10ec1 100644
--- a/src/Worker/Delivery.php
+++ b/src/Worker/Delivery.php
@@ -207,7 +207,7 @@ class Delivery {
 				logger('notifier: '.$target_item["guid"].' dfrndelivery: '.$contact['name']);
 
 				if ($mail) {
-					$item['body'] = fix_private_photos($item['body'],$owner['uid'],null,$message[0]['contact-id']);
+					$item['body'] = Item::fixPrivatePhotos($item['body'],$owner['uid'],null,$message[0]['contact-id']);
 					$atom = DFRN::mail($item, $owner);
 				} elseif ($fsuggest) {
 					$atom = DFRN::fsuggest($item, $owner);
diff --git a/src/Worker/Expire.php b/src/Worker/Expire.php
index 6b853bde77..822a4389df 100644
--- a/src/Worker/Expire.php
+++ b/src/Worker/Expire.php
@@ -9,6 +9,7 @@ namespace Friendica\Worker;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
+use Friendica\Model\Item;
 use Friendica\Database\DBM;
 use dba;
 
@@ -43,7 +44,7 @@ class Expire {
 			$user = dba::selectFirst('user', ['uid', 'username', 'expire'], ['uid' => $param]);
 			if (DBM::is_result($user)) {
 				logger('Expire items for user '.$user['uid'].' ('.$user['username'].') - interval: '.$user['expire'], LOGGER_DEBUG);
-				item_expire($user['uid'], $user['expire']);
+				Item::expire($user['uid'], $user['expire']);
 				logger('Expire items for user '.$user['uid'].' ('.$user['username'].') - done ', LOGGER_DEBUG);
 			}
 			return;
diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php
index 3a5fa5575b..c83c69f7ae 100644
--- a/src/Worker/OnePoll.php
+++ b/src/Worker/OnePoll.php
@@ -8,6 +8,8 @@ use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
+use Friendica\Model\Item;
+use Friendica\Content\Text\BBCode;
 use Friendica\Protocol\Email;
 use Friendica\Protocol\PortableContact;
 use Friendica\Util\Network;
@@ -487,7 +489,7 @@ class OnePoll
 								continue;
 							}
 							$datarray['body'] = escape_tags($r['body']);
-							$datarray['body'] = limit_body_size($datarray['body']);
+							$datarray['body'] = BBCode::limitBodySize($datarray['body']);
 
 							logger("Mail: Importing ".$msg_uid." for ".$mailconf['user']);
 
@@ -531,7 +533,7 @@ class OnePoll
 								$datarray['allow_cid'] = '<' . $contact['id'] . '>';
 							}
 
-							$stored_item = item_store($datarray);
+							$stored_item = Item::insert($datarray);
 
 							switch ($mailconf['action']) {
 								case 0:
diff --git a/src/Worker/SpoolPost.php b/src/Worker/SpoolPost.php
index a394ee0fe1..31474abfbf 100644
--- a/src/Worker/SpoolPost.php
+++ b/src/Worker/SpoolPost.php
@@ -5,6 +5,7 @@
  */
 namespace Friendica\Worker;
 
+use Friendica\Model\Item;
 use Friendica\Core\Config;
 
 require_once("include/items.php");
@@ -46,7 +47,7 @@ class SpoolPost {
 						continue;
 					}
 
-					$result = item_store($arr);
+					$result = Item::insert($arr);
 
 					logger("Spool file ".$file." stored: ".$result, LOGGER_DEBUG);
 					unlink($fullfile);