keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Next item structure works (#5380)

Browse source 
* Use "LEFT JOIN" to always fetch the item. Needed for update routines.

* New conversion routine that now covers every item

* Post update is now activated

* We now use a hash based upon RIPEMD-320 for content and activity

* The hash doesn't contain the plink anymore

* Legacy item fields are now "null"able

* New hash function for a server unique item hash

* Introduction of the legacy mode (usage of old item fields)

* Code simplification

* We don't need the "uri" fields anymore in item-activity and item-content

* Use the "created" and not the "received" date for the hash

* Avoiding several notices

* Some more warnings removed

* Improved uri-hash / Likes on Diaspora are now getting a creation date

* Corrected the post update version

* Ensure an unique uri-hash

* Don't delete orhaned item data at the moment

* Partly reworked, due to strange behaviour

* Some more parts reworked

* Using the uri currently seems to be more reliable

* Using the uri here as well

* Use the hash values again

* Grouped item fields in different categories

* Notices again

* use the gravity (we always should)

* Added hint for disabled post updates

* Notices ...

* Issue #5337: Personal notes are displayed again

* Use the gravity again
This commit is contained in:
Michael Vogel 2018-07-15 20:36:20 +02:00 committed by Hypolite Petovan
parent 8ad6b65aeb
commit d3a2ed85fe
21 changed files with 315 additions and 297 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
boot.php
View file

@ -41,7 +41,7 @@ define('FRIENDICA_PLATFORM', 'Friendica');
define('FRIENDICA_CODENAME', 'The Tazmans Flax-lily'); define('FRIENDICA_CODENAME', 'The Tazmans Flax-lily');
define('FRIENDICA_VERSION', '2018.08-dev'); define('FRIENDICA_VERSION', '2018.08-dev');
define('DFRN_PROTOCOL_VERSION', '2.23'); define('DFRN_PROTOCOL_VERSION', '2.23');
define('DB_UPDATE_VERSION', 1276); define('DB_UPDATE_VERSION', 1277);
define('NEW_UPDATE_ROUTINE_VERSION', 1170); define('NEW_UPDATE_ROUTINE_VERSION', 1170);
/** /**
@ -929,6 +929,10 @@ function remote_user()
*/ */
function notice($s) function notice($s)
{ {
if (empty($_SESSION)) {
return;
}
$a = get_app(); $a = get_app();
if (!x($_SESSION, 'sysmsg')) { if (!x($_SESSION, 'sysmsg')) {
$_SESSION['sysmsg'] = []; $_SESSION['sysmsg'] = [];

105
database.sql
View file

@ -1,6 +1,6 @@
-- ------------------------------------------ -- ------------------------------------------
-- Friendica 2018.08-dev (The Tazmans Flax-lily) -- Friendica 2018.08-dev (The Tazmans Flax-lily)
-- DB_UPDATE_VERSION 1276 -- DB_UPDATE_VERSION 1277
-- ------------------------------------------ -- ------------------------------------------
@ -455,68 +455,69 @@ CREATE TABLE IF NOT EXISTS `item` (
`id` int unsigned NOT NULL auto_increment, `id` int unsigned NOT NULL auto_increment,
`guid` varchar(255) NOT NULL DEFAULT '' COMMENT 'A unique identifier for this item', `guid` varchar(255) NOT NULL DEFAULT '' COMMENT 'A unique identifier for this item',
`uri` varchar(255) NOT NULL DEFAULT '' COMMENT '', `uri` varchar(255) NOT NULL DEFAULT '' COMMENT '',
`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'Owner id which owns this copy of the item', `uri-hash` varchar(80) NOT NULL DEFAULT '' COMMENT 'RIPEMD-128 hash from uri',
`contact-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'contact.id',
`type` varchar(20) NOT NULL DEFAULT '' COMMENT '',
`wall` boolean NOT NULL DEFAULT '0' COMMENT 'This item was posted to the wall of uid',
`gravity` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '',
`parent` int unsigned NOT NULL DEFAULT 0 COMMENT 'item.id of the parent to this item if it is a reply of some form; otherwise this must be set to the id of this item', `parent` int unsigned NOT NULL DEFAULT 0 COMMENT 'item.id of the parent to this item if it is a reply of some form; otherwise this must be set to the id of this item',
`parent-uri` varchar(255) NOT NULL DEFAULT '' COMMENT 'uri of the parent to this item', `parent-uri` varchar(255) NOT NULL DEFAULT '' COMMENT 'uri of the parent to this item',
`extid` varchar(255) NOT NULL DEFAULT '' COMMENT '',
`thr-parent` varchar(255) NOT NULL DEFAULT '' COMMENT 'If the parent of this item is not the top-level item in the conversation, the uri of the immediate parent; otherwise set to parent-uri', `thr-parent` varchar(255) NOT NULL DEFAULT '' COMMENT 'If the parent of this item is not the top-level item in the conversation, the uri of the immediate parent; otherwise set to parent-uri',
`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Creation timestamp.', `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Creation timestamp.',
`edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Date of last edit (default is created)', `edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Date of last edit (default is created)',
`commented` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Date of last comment/reply to this item', `commented` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Date of last comment/reply to this item',
`received` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'datetime', `received` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'datetime',
`changed` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Date that something in the conversation changed, indicating clients should fetch the conversation again', `changed` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Date that something in the conversation changed, indicating clients should fetch the conversation again',
`gravity` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '',
`network` char(4) NOT NULL DEFAULT '' COMMENT 'Network from where the item comes from',
`owner-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Link to the contact table with uid=0 of the owner of this item', `owner-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Link to the contact table with uid=0 of the owner of this item',
`owner-name` varchar(255) NOT NULL DEFAULT '' COMMENT 'Name of the owner of this item',
`owner-link` varchar(255) NOT NULL DEFAULT '' COMMENT 'Link to the profile page of the owner of this item',
`owner-avatar` varchar(255) NOT NULL DEFAULT '' COMMENT 'Link to the avatar picture of the owner of this item',
`author-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Link to the contact table with uid=0 of the author of this item', `author-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Link to the contact table with uid=0 of the author of this item',
`author-name` varchar(255) NOT NULL DEFAULT '' COMMENT 'Name of the author of this item',
`author-link` varchar(255) NOT NULL DEFAULT '' COMMENT 'Link to the profile page of the author of this item',
`author-avatar` varchar(255) NOT NULL DEFAULT '' COMMENT 'Link to the avatar picture of the author of this item',
`icid` int unsigned COMMENT 'Id of the item-content table entry that contains the whole item content', `icid` int unsigned COMMENT 'Id of the item-content table entry that contains the whole item content',
`iaid` int unsigned COMMENT 'Id of the item-activity table entry that contains the activity data', `iaid` int unsigned COMMENT 'Id of the item-activity table entry that contains the activity data',
`title` varchar(255) NOT NULL DEFAULT '' COMMENT 'item title', `extid` varchar(255) NOT NULL DEFAULT '' COMMENT '',
`content-warning` varchar(255) NOT NULL DEFAULT '' COMMENT '', `global` boolean NOT NULL DEFAULT '0' COMMENT '',
`body` mediumtext COMMENT 'item body content', `private` boolean NOT NULL DEFAULT '0' COMMENT 'distribution is restricted',
`app` varchar(255) NOT NULL DEFAULT '' COMMENT 'application which generated this item', `bookmark` boolean NOT NULL DEFAULT '0' COMMENT 'item has been bookmarked',
`verb` varchar(100) NOT NULL DEFAULT '' COMMENT 'ActivityStreams verb', `visible` boolean NOT NULL DEFAULT '0' COMMENT '',
`object-type` varchar(100) NOT NULL DEFAULT '' COMMENT 'ActivityStreams object type', `moderated` boolean NOT NULL DEFAULT '0' COMMENT '',
`object` text COMMENT 'JSON encoded object structure unless it is an implied object (normal post)', `deleted` boolean NOT NULL DEFAULT '0' COMMENT 'item has been deleted',
`target-type` varchar(100) NOT NULL DEFAULT '' COMMENT 'ActivityStreams target type if applicable (URI)', `uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'Owner id which owns this copy of the item',
`target` text COMMENT 'JSON encoded target structure if used', `contact-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'contact.id',
`postopts` text COMMENT 'External post connectors add their network name to this comma-separated string to identify that they should be delivered to these networks during delivery', `wall` boolean NOT NULL DEFAULT '0' COMMENT 'This item was posted to the wall of uid',
`plink` varchar(255) NOT NULL DEFAULT '' COMMENT 'permalink or URL to a displayable copy of the message at its source', `origin` boolean NOT NULL DEFAULT '0' COMMENT 'item originated at this site',
`resource-id` varchar(32) NOT NULL DEFAULT '' COMMENT 'Used to link other tables to items, it identifies the linked resource (e.g. photo) and if set must also set resource_type', `pubmail` boolean NOT NULL DEFAULT '0' COMMENT '',
`event-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Used to link to the event.id', `starred` boolean NOT NULL DEFAULT '0' COMMENT 'item has been favourited',
`tag` mediumtext COMMENT '', `unseen` boolean NOT NULL DEFAULT '1' COMMENT 'item has not been seen',
`attach` mediumtext COMMENT 'JSON structure representing attachments to this item', `mention` boolean NOT NULL DEFAULT '0' COMMENT 'The owner of this item was mentioned in it',
`inform` mediumtext COMMENT '', `forum_mode` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '',
`file` mediumtext COMMENT '',
`location` varchar(255) NOT NULL DEFAULT '' COMMENT 'text location where this item originated',
`coord` varchar(255) NOT NULL DEFAULT '' COMMENT 'longitude/latitude pair representing location where this item originated',
`allow_cid` mediumtext COMMENT 'Access Control - list of allowed contact.id \'<19><78>\'', `allow_cid` mediumtext COMMENT 'Access Control - list of allowed contact.id \'<19><78>\'',
`allow_gid` mediumtext COMMENT 'Access Control - list of allowed groups', `allow_gid` mediumtext COMMENT 'Access Control - list of allowed groups',
`deny_cid` mediumtext COMMENT 'Access Control - list of denied contact.id', `deny_cid` mediumtext COMMENT 'Access Control - list of denied contact.id',
`deny_gid` mediumtext COMMENT 'Access Control - list of denied groups', `deny_gid` mediumtext COMMENT 'Access Control - list of denied groups',
`private` boolean NOT NULL DEFAULT '0' COMMENT 'distribution is restricted', `postopts` text COMMENT 'External post connectors add their network name to this comma-separated string to identify that they should be delivered to these networks during delivery',
`pubmail` boolean NOT NULL DEFAULT '0' COMMENT '', `inform` mediumtext COMMENT 'Additional receivers of this post',
`moderated` boolean NOT NULL DEFAULT '0' COMMENT '', `resource-id` varchar(32) NOT NULL DEFAULT '' COMMENT 'Used to link other tables to items, it identifies the linked resource (e.g. photo) and if set must also set resource_type',
`visible` boolean NOT NULL DEFAULT '0' COMMENT '', `event-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Used to link to the event.id',
`starred` boolean NOT NULL DEFAULT '0' COMMENT 'item has been favourited', `attach` mediumtext COMMENT 'JSON structure representing attachments to this item',
`bookmark` boolean NOT NULL DEFAULT '0' COMMENT 'item has been bookmarked', `type` varchar(20) NOT NULL DEFAULT '' COMMENT '',
`unseen` boolean NOT NULL DEFAULT '1' COMMENT 'item has not been seen', `file` mediumtext COMMENT 'Deprecated',
`deleted` boolean NOT NULL DEFAULT '0' COMMENT 'item has been deleted', `location` varchar(255) COMMENT 'Deprecated',
`origin` boolean NOT NULL DEFAULT '0' COMMENT 'item originated at this site', `coord` varchar(255) COMMENT 'Deprecated',
`forum_mode` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '', `tag` mediumtext COMMENT 'Deprecated',
`mention` boolean NOT NULL DEFAULT '0' COMMENT 'The owner of this item was mentioned in it', `plink` varchar(255) COMMENT 'Deprecated',
`network` char(4) NOT NULL DEFAULT '' COMMENT 'Network from where the item comes from', `title` varchar(255) COMMENT 'Deprecated',
`rendered-hash` varchar(32) NOT NULL DEFAULT '' COMMENT '', `content-warning` varchar(255) COMMENT 'Deprecated',
`rendered-html` mediumtext COMMENT 'item.body converted to html', `body` mediumtext COMMENT 'Deprecated',
`global` boolean NOT NULL DEFAULT '0' COMMENT '', `app` varchar(255) COMMENT 'Deprecated',
`verb` varchar(100) COMMENT 'Deprecated',
`object-type` varchar(100) COMMENT 'Deprecated',
`object` text COMMENT 'Deprecated',
`target-type` varchar(100) COMMENT 'Deprecated',
`target` text COMMENT 'Deprecated',
`author-name` varchar(255) COMMENT 'Deprecated',
`author-link` varchar(255) COMMENT 'Deprecated',
`author-avatar` varchar(255) COMMENT 'Deprecated',
`owner-name` varchar(255) COMMENT 'Deprecated',
`owner-link` varchar(255) COMMENT 'Deprecated',
`owner-avatar` varchar(255) COMMENT 'Deprecated',
`rendered-hash` varchar(32) COMMENT 'Deprecated',
`rendered-html` mediumtext COMMENT 'Deprecated',
PRIMARY KEY(`id`), PRIMARY KEY(`id`),
INDEX `guid` (`guid`(191)), INDEX `guid` (`guid`(191)),
INDEX `uri` (`uri`(191)), INDEX `uri` (`uri`(191)),
@ -549,8 +550,8 @@ CREATE TABLE IF NOT EXISTS `item` (
-- --
CREATE TABLE IF NOT EXISTS `item-activity` ( CREATE TABLE IF NOT EXISTS `item-activity` (
`id` int unsigned NOT NULL auto_increment, `id` int unsigned NOT NULL auto_increment,
`uri` varchar(255) NOT NULL DEFAULT '' COMMENT '', `uri` varchar(255) COMMENT '',
`uri-hash` char(80) NOT NULL DEFAULT '' COMMENT 'SHA-1 and RIPEMD-160 hash from uri', `uri-hash` varchar(80) NOT NULL DEFAULT '' COMMENT 'RIPEMD-128 hash from uri',
`activity` smallint unsigned NOT NULL DEFAULT 0 COMMENT '', `activity` smallint unsigned NOT NULL DEFAULT 0 COMMENT '',
PRIMARY KEY(`id`), PRIMARY KEY(`id`),
UNIQUE INDEX `uri-hash` (`uri-hash`), UNIQUE INDEX `uri-hash` (`uri-hash`),
@ -562,8 +563,8 @@ CREATE TABLE IF NOT EXISTS `item-activity` (
-- --
CREATE TABLE IF NOT EXISTS `item-content` ( CREATE TABLE IF NOT EXISTS `item-content` (
`id` int unsigned NOT NULL auto_increment, `id` int unsigned NOT NULL auto_increment,
`uri` varchar(255) NOT NULL DEFAULT '' COMMENT '', `uri` varchar(255) COMMENT '',
`uri-plink-hash` char(80) NOT NULL DEFAULT '' COMMENT 'SHA-1 hash from uri and plink', `uri-plink-hash` varchar(80) NOT NULL DEFAULT '' COMMENT 'RIPEMD-128 hash from uri',
`title` varchar(255) NOT NULL DEFAULT '' COMMENT 'item title', `title` varchar(255) NOT NULL DEFAULT '' COMMENT 'item title',
`content-warning` varchar(255) NOT NULL DEFAULT '' COMMENT '', `content-warning` varchar(255) NOT NULL DEFAULT '' COMMENT '',
`body` mediumtext COMMENT 'item body content', `body` mediumtext COMMENT 'item body content',
@ -591,8 +592,8 @@ CREATE TABLE IF NOT EXISTS `locks` (
`id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID', `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
`name` varchar(128) NOT NULL DEFAULT '' COMMENT '', `name` varchar(128) NOT NULL DEFAULT '' COMMENT '',
`locked` boolean NOT NULL DEFAULT '0' COMMENT '', `locked` boolean NOT NULL DEFAULT '0' COMMENT '',
`expires` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'datetime of lock expiration',
`pid` int unsigned NOT NULL DEFAULT 0 COMMENT 'Process ID', `pid` int unsigned NOT NULL DEFAULT 0 COMMENT 'Process ID',
`expires` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'datetime of cache expiration',
PRIMARY KEY(`id`), PRIMARY KEY(`id`),
INDEX `name_expires` (`name`,`expires`) INDEX `name_expires` (`name`,`expires`)
) DEFAULT COLLATE utf8mb4_general_ci COMMENT=''; ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='';

2
mod/friendica.php
View file

@ -42,7 +42,7 @@ function friendica_init(App $a)
Config::load('feature_lock'); Config::load('feature_lock');
$locked_features = []; $locked_features = [];
if (is_array($a->config['feature_lock']) && count($a->config['feature_lock'])) { if (!empty($a->config['feature_lock']) && count($a->config['feature_lock'])) {
foreach ($a->config['feature_lock'] as $k => $v) { foreach ($a->config['feature_lock'] as $k => $v) {
if ($k === 'config_loaded') { if ($k === 'config_loaded') {
continue; continue;

8
mod/notes.php
View file

@ -57,9 +57,9 @@ function notes_content(App $a, $update = false)
$o .= status_editor($a, $x, $a->contact['id']); $o .= status_editor($a, $x, $a->contact['id']);
} }
$condition = ["`uid` = ? AND `type` = 'note' AND `id` = `parent` AND NOT `wall` $condition = ["`uid` = ? AND `type` = 'note' AND `gravity` = ? AND NOT `wall`
AND `allow_cid` = ? AND `contact-id` = ?", AND `allow_cid` = ? AND `contact-id` = ?",
local_user(), '<' . $a->contact['id'] . '>', $a->contact['id']]; local_user(), GRAVITY_PARENT, '<' . $a->contact['id'] . '>', $a->contact['id']];
$notes = dba::count('item', $condition); $notes = dba::count('item', $condition);
@ -68,13 +68,13 @@ function notes_content(App $a, $update = false)
$params = ['order' => ['created' => true], $params = ['order' => ['created' => true],
'limit' => [$a->pager['start'], $a->pager['itemspage']]]; 'limit' => [$a->pager['start'], $a->pager['itemspage']]];
$r = Item::selectForUser(local_user(), ['item_id'], $condition, $params); $r = Item::selectForUser(local_user(), ['id'], $condition, $params);
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
$parents_arr = []; $parents_arr = [];
while ($rr = Item::fetch($r)) { while ($rr = Item::fetch($r)) {
$parents_arr[] = $rr['item_id']; $parents_arr[] = $rr['id'];
} }
dba::close($r); dba::close($r);

5
mod/parse_url.php
View file

@ -67,9 +67,12 @@ function parse_url_content(App $a) {
$hdrs = []; $hdrs = [];
$h = explode("\n", $result["header"]); $h = explode("\n", $result["header"]);
foreach ($h as $l) { foreach ($h as $l) {
list($k,$v) = array_map("trim", explode(":", trim($l), 2)); $header = array_map("trim", explode(":", trim($l), 2));
if (count($header) == 2) {
list($k,$v) = $header;
$hdrs[$k] = $v; $hdrs[$k] = $v;
} }
}
if (array_key_exists("Content-Type", $hdrs)) { if (array_key_exists("Content-Type", $hdrs)) {
$type = $hdrs["Content-Type"]; $type = $hdrs["Content-Type"];
} }

6
mod/settings.php
View file

@ -26,12 +26,14 @@ use Friendica\Util\Temporal;
function get_theme_config_file($theme) function get_theme_config_file($theme)
{ {
$a = get_app(); $a = get_app();
if (!empty($a->theme_info['extends'])) {
$base_theme = $a->theme_info['extends']; $base_theme = $a->theme_info['extends'];
}
if (file_exists("view/theme/$theme/config.php")) { if (file_exists("view/theme/$theme/config.php")) {
return "view/theme/$theme/config.php"; return "view/theme/$theme/config.php";
} }
if (file_exists("view/theme/$base_theme/config.php")) { if (!empty($base_theme) && file_exists("view/theme/$base_theme/config.php")) {
return "view/theme/$base_theme/config.php"; return "view/theme/$base_theme/config.php";
} }
return null; return null;
@ -1155,7 +1157,7 @@ function settings_content(App $a)
// Private/public post links for the non-JS ACL form // Private/public post links for the non-JS ACL form
$private_post = 1; $private_post = 1;
if ($_REQUEST['public']) { if (!empty($_REQUEST['public']) && !$_REQUEST['public']) {
$private_post = 0; $private_post = 0;
} }

4
src/Content/Text/BBCode.php
View file

@ -579,7 +579,7 @@ class BBCode extends BaseObject
$return .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-preview" /></a><br />', $data["url"], self::proxyUrl($data["preview"], $simplehtml), $data["title"]); $return .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-preview" /></a><br />', $data["url"], self::proxyUrl($data["preview"], $simplehtml), $data["title"]);
} }
if (($data["type"] == "photo") && ($data["url"] != "") && ($data["image"] != "")) { if (($data["type"] == "photo") && !empty($data["url"]) && !empty($data["image"])) {
$return .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-image" /></a>', $data["url"], self::proxyUrl($data["image"], $simplehtml), $data["title"]); $return .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-image" /></a>', $data["url"], self::proxyUrl($data["image"], $simplehtml), $data["title"]);
} else { } else {
$return .= sprintf('<h4><a href="%s">%s</a></h4>', $data['url'], $data['title']); $return .= sprintf('<h4><a href="%s">%s</a></h4>', $data['url'], $data['title']);
@ -613,7 +613,7 @@ class BBCode extends BaseObject
return $data["text"] . $data["after"]; return $data["text"] . $data["after"];
} }
$title = htmlentities($data["title"], ENT_QUOTES, 'UTF-8', false); $title = htmlentities(defaults($data, 'title', ''), ENT_QUOTES, 'UTF-8', false);
$text = htmlentities($data["text"], ENT_QUOTES, 'UTF-8', false); $text = htmlentities($data["text"], ENT_QUOTES, 'UTF-8', false);
if ($plaintext || (($title != "") && strstr($text, $title))) { if ($plaintext || (($title != "") && strstr($text, $title))) {
$data["title"] = $data["url"]; $data["title"] = $data["url"];

5
src/Core/System.php
View file

@ -212,7 +212,10 @@ EOT;
*/ */
public static function processID($prefix) public static function processID($prefix)
{ {
return uniqid($prefix . ':' . str_pad(getmypid() . ':', 8, '0') . ':'); // We aren't calling any other function here.
// Doing so could easily create an endless loop
$trailer = $prefix . ':' . getmypid() . ':';
return substr($trailer . uniqid('') . mt_rand(), 0, 26);
} }
/// @todo Move the following functions from boot.php /// @todo Move the following functions from boot.php

2
src/Core/Worker.php
View file

@ -352,7 +352,7 @@ class Worker
$a->process_id = $old_process_id; $a->process_id = $old_process_id;
unset($a->queue); unset($a->queue);
$duration = number_format(microtime(true) - $stamp, 3); $duration = (microtime(true) - $stamp);
self::$up_start = microtime(true); self::$up_start = microtime(true);

122
src/Database/DBStructure.php
View file

@ -536,26 +536,26 @@ class DBStructure
private static function FieldCommand($parameters, $create = true) { private static function FieldCommand($parameters, $create = true) {
$fieldstruct = $parameters["type"]; $fieldstruct = $parameters["type"];
if (!empty($parameters["Collation"])) { if (isset($parameters["Collation"])) {
$fieldstruct .= " COLLATE ".$parameters["Collation"]; $fieldstruct .= " COLLATE ".$parameters["Collation"];
} }
if (!empty($parameters["not null"])) { if (isset($parameters["not null"])) {
$fieldstruct .= " NOT NULL"; $fieldstruct .= " NOT NULL";
} }
if (!empty($parameters["default"])) { if (isset($parameters["default"])) {
if (strpos(strtolower($parameters["type"]),"int")!==false) { if (strpos(strtolower($parameters["type"]),"int")!==false) {
$fieldstruct .= " DEFAULT ".$parameters["default"]; $fieldstruct .= " DEFAULT ".$parameters["default"];
} else { } else {
$fieldstruct .= " DEFAULT '".$parameters["default"]."'"; $fieldstruct .= " DEFAULT '".$parameters["default"]."'";
} }
} }
if (!empty($parameters["extra"])) { if (isset($parameters["extra"])) {
$fieldstruct .= " ".$parameters["extra"]; $fieldstruct .= " ".$parameters["extra"];
} }
if (!empty($parameters["comment"])) { if (isset($parameters["comment"])) {
$fieldstruct .= " COMMENT '".dbesc($parameters["comment"])."'"; $fieldstruct .= " COMMENT '".dbesc($parameters["comment"])."'";
} }
@ -588,11 +588,11 @@ class DBStructure
} }
} }
if (!empty($structure["engine"])) { if (isset($structure["engine"])) {
$engine = " ENGINE=" . $structure["engine"]; $engine = " ENGINE=" . $structure["engine"];
} }
if (!empty($structure["comment"])) { if (isset($structure["comment"])) {
$comment = " COMMENT='" . dbesc($structure["comment"]) . "'"; $comment = " COMMENT='" . dbesc($structure["comment"]) . "'";
} }
@ -1158,68 +1158,76 @@ class DBStructure
"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "relation" => ["thread" => "iid"]], "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "relation" => ["thread" => "iid"]],
"guid" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "A unique identifier for this item"], "guid" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "A unique identifier for this item"],
"uri" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], "uri" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
"uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "Owner id which owns this copy of the item"], "uri-hash" => ["type" => "varchar(80)", "not null" => "1", "default" => "", "comment" => "RIPEMD-128 hash from uri"],
"contact-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["contact" => "id"], "comment" => "contact.id"],
"type" => ["type" => "varchar(20)", "not null" => "1", "default" => "", "comment" => ""],
"wall" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "This item was posted to the wall of uid"],
"gravity" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
"parent" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["item" => "id"], "comment" => "item.id of the parent to this item if it is a reply of some form; otherwise this must be set to the id of this item"], "parent" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["item" => "id"], "comment" => "item.id of the parent to this item if it is a reply of some form; otherwise this must be set to the id of this item"],
"parent-uri" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "uri of the parent to this item"], "parent-uri" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "uri of the parent to this item"],
"extid" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
"thr-parent" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "If the parent of this item is not the top-level item in the conversation, the uri of the immediate parent; otherwise set to parent-uri"], "thr-parent" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "If the parent of this item is not the top-level item in the conversation, the uri of the immediate parent; otherwise set to parent-uri"],
"created" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => "Creation timestamp."], "created" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => "Creation timestamp."],
"edited" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => "Date of last edit (default is created)"], "edited" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => "Date of last edit (default is created)"],
"commented" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => "Date of last comment/reply to this item"], "commented" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => "Date of last comment/reply to this item"],
"received" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => "datetime"], "received" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => "datetime"],
"changed" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => "Date that something in the conversation changed, indicating clients should fetch the conversation again"], "changed" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => "Date that something in the conversation changed, indicating clients should fetch the conversation again"],
"gravity" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
"network" => ["type" => "char(4)", "not null" => "1", "default" => "", "comment" => "Network from where the item comes from"],
"owner-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["contact" => "id"], "comment" => "Link to the contact table with uid=0 of the owner of this item"], "owner-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["contact" => "id"], "comment" => "Link to the contact table with uid=0 of the owner of this item"],
"owner-name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "Name of the owner of this item"],
"owner-link" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "Link to the profile page of the owner of this item"],
"owner-avatar" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "Link to the avatar picture of the owner of this item"],
"author-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["contact" => "id"], "comment" => "Link to the contact table with uid=0 of the author of this item"], "author-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["contact" => "id"], "comment" => "Link to the contact table with uid=0 of the author of this item"],
"author-name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "Name of the author of this item"],
"author-link" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "Link to the profile page of the author of this item"],
"author-avatar" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "Link to the avatar picture of the author of this item"],
"icid" => ["type" => "int unsigned", "relation" => ["item-content" => "id"], "comment" => "Id of the item-content table entry that contains the whole item content"], "icid" => ["type" => "int unsigned", "relation" => ["item-content" => "id"], "comment" => "Id of the item-content table entry that contains the whole item content"],
"iaid" => ["type" => "int unsigned", "relation" => ["item-activity" => "id"], "comment" => "Id of the item-activity table entry that contains the activity data"], "iaid" => ["type" => "int unsigned", "relation" => ["item-activity" => "id"], "comment" => "Id of the item-activity table entry that contains the activity data"],
"title" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "item title"], "extid" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
"content-warning" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], "global" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
"body" => ["type" => "mediumtext", "comment" => "item body content"], "private" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "distribution is restricted"],
"app" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "application which generated this item"], "bookmark" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "item has been bookmarked"],
"verb" => ["type" => "varchar(100)", "not null" => "1", "default" => "", "comment" => "ActivityStreams verb"], "visible" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
"object-type" => ["type" => "varchar(100)", "not null" => "1", "default" => "", "comment" => "ActivityStreams object type"], "moderated" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
"object" => ["type" => "text", "comment" => "JSON encoded object structure unless it is an implied object (normal post)"], "deleted" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "item has been deleted"],
"target-type" => ["type" => "varchar(100)", "not null" => "1", "default" => "", "comment" => "ActivityStreams target type if applicable (URI)"], // User specific fields. Eventually they will move to user-item
"target" => ["type" => "text", "comment" => "JSON encoded target structure if used"], "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "Owner id which owns this copy of the item"],
"postopts" => ["type" => "text", "comment" => "External post connectors add their network name to this comma-separated string to identify that they should be delivered to these networks during delivery"], "contact-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["contact" => "id"], "comment" => "contact.id"],
"plink" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "permalink or URL to a displayable copy of the message at its source"], "wall" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "This item was posted to the wall of uid"],
"resource-id" => ["type" => "varchar(32)", "not null" => "1", "default" => "", "comment" => "Used to link other tables to items, it identifies the linked resource (e.g. photo) and if set must also set resource_type"], "origin" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "item originated at this site"],
"event-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["event" => "id"], "comment" => "Used to link to the event.id"], "pubmail" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
"tag" => ["type" => "mediumtext", "comment" => ""], "starred" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "item has been favourited"],
"attach" => ["type" => "mediumtext", "comment" => "JSON structure representing attachments to this item"], "unseen" => ["type" => "boolean", "not null" => "1", "default" => "1", "comment" => "item has not been seen"],
"inform" => ["type" => "mediumtext", "comment" => ""], "mention" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "The owner of this item was mentioned in it"],
"file" => ["type" => "mediumtext", "comment" => ""], "forum_mode" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
"location" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "text location where this item originated"], // User specific fields. Should possible be replaced with something different
"coord" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "longitude/latitude pair representing location where this item originated"],
"allow_cid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed contact.id '<19><78>'"], "allow_cid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed contact.id '<19><78>'"],
"allow_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed groups"], "allow_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed groups"],
"deny_cid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied contact.id"], "deny_cid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied contact.id"],
"deny_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied groups"], "deny_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied groups"],
"private" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "distribution is restricted"], "postopts" => ["type" => "text", "comment" => "External post connectors add their network name to this comma-separated string to identify that they should be delivered to these networks during delivery"],
"pubmail" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""], "inform" => ["type" => "mediumtext", "comment" => "Additional receivers of this post"],
"moderated" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""], // It is to be decided whether these fields belong to the user or the structure
"visible" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""], "resource-id" => ["type" => "varchar(32)", "not null" => "1", "default" => "", "comment" => "Used to link other tables to items, it identifies the linked resource (e.g. photo) and if set must also set resource_type"],
"starred" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "item has been favourited"], "event-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["event" => "id"], "comment" => "Used to link to the event.id"],
"bookmark" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "item has been bookmarked"], // Will be replaced by the "attach" table
"unseen" => ["type" => "boolean", "not null" => "1", "default" => "1", "comment" => "item has not been seen"], "attach" => ["type" => "mediumtext", "comment" => "JSON structure representing attachments to this item"],
"deleted" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "item has been deleted"], // Seems to be only used for notes, but is filled at many places.
"origin" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "item originated at this site"], // Will be replaced with some general field that contain the values of "origin" and "wall" as well.
"forum_mode" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""], "type" => ["type" => "varchar(20)", "not null" => "1", "default" => "", "comment" => ""],
"mention" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "The owner of this item was mentioned in it"], // Deprecated fields. Will be removed in upcoming versions
"network" => ["type" => "char(4)", "not null" => "1", "default" => "", "comment" => "Network from where the item comes from"], "file" => ["type" => "mediumtext", "comment" => "Deprecated"],
"rendered-hash" => ["type" => "varchar(32)", "not null" => "1", "default" => "", "comment" => ""], "location" => ["type" => "varchar(255)", "comment" => "Deprecated"],
"rendered-html" => ["type" => "mediumtext", "comment" => "item.body converted to html"], "coord" => ["type" => "varchar(255)", "comment" => "Deprecated"],
"global" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""], "tag" => ["type" => "mediumtext", "comment" => "Deprecated"],
"plink" => ["type" => "varchar(255)", "comment" => "Deprecated"],
"title" => ["type" => "varchar(255)", "comment" => "Deprecated"],
"content-warning" => ["type" => "varchar(255)", "comment" => "Deprecated"],
"body" => ["type" => "mediumtext", "comment" => "Deprecated"],
"app" => ["type" => "varchar(255)", "comment" => "Deprecated"],
"verb" => ["type" => "varchar(100)", "comment" => "Deprecated"],
"object-type" => ["type" => "varchar(100)", "comment" => "Deprecated"],
"object" => ["type" => "text", "comment" => "Deprecated"],
"target-type" => ["type" => "varchar(100)", "comment" => "Deprecated"],
"target" => ["type" => "text", "comment" => "Deprecated"],
"author-name" => ["type" => "varchar(255)", "comment" => "Deprecated"],
"author-link" => ["type" => "varchar(255)", "comment" => "Deprecated"],
"author-avatar" => ["type" => "varchar(255)", "comment" => "Deprecated"],
"owner-name" => ["type" => "varchar(255)", "comment" => "Deprecated"],
"owner-link" => ["type" => "varchar(255)", "comment" => "Deprecated"],
"owner-avatar" => ["type" => "varchar(255)", "comment" => "Deprecated"],
"rendered-hash" => ["type" => "varchar(32)", "comment" => "Deprecated"],
"rendered-html" => ["type" => "mediumtext", "comment" => "Deprecated"],
], ],
"indexes" => [ "indexes" => [
"PRIMARY" => ["id"], "PRIMARY" => ["id"],
@ -1253,8 +1261,8 @@ class DBStructure
"comment" => "Activities for items", "comment" => "Activities for items",
"fields" => [ "fields" => [
"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "relation" => ["thread" => "iid"]], "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "relation" => ["thread" => "iid"]],
"uri" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], "uri" => ["type" => "varchar(255)", "comment" => ""],
"uri-hash" => ["type" => "char(80)", "not null" => "1", "default" => "", "comment" => "SHA-1 and RIPEMD-160 hash from uri"], "uri-hash" => ["type" => "varchar(80)", "not null" => "1", "default" => "", "comment" => "RIPEMD-128 hash from uri"],
"activity" => ["type" => "smallint unsigned", "not null" => "1", "default" => "0", "comment" => ""], "activity" => ["type" => "smallint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
], ],
"indexes" => [ "indexes" => [
@ -1267,8 +1275,8 @@ class DBStructure
"comment" => "Content for all posts", "comment" => "Content for all posts",
"fields" => [ "fields" => [
"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "relation" => ["thread" => "iid"]], "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "relation" => ["thread" => "iid"]],
"uri" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], "uri" => ["type" => "varchar(255)", "comment" => ""],
"uri-plink-hash" => ["type" => "char(80)", "not null" => "1", "default" => "", "comment" => "SHA-1 hash from uri and plink"], "uri-plink-hash" => ["type" => "varchar(80)", "not null" => "1", "default" => "", "comment" => "RIPEMD-128 hash from uri"],
"title" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "item title"], "title" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "item title"],
"content-warning" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], "content-warning" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
"body" => ["type" => "mediumtext", "comment" => "item body content"], "body" => ["type" => "mediumtext", "comment" => "item body content"],

98
src/Database/PostUpdate.php
View file

@ -31,10 +31,7 @@ class PostUpdate
if (!self::update1206()) { if (!self::update1206()) {
return; return;
} }
if (!self::update1274()) { if (!self::update1276()) {
return;
}
if (!self::update1275()) {
return; return;
} }
} }
@ -226,95 +223,62 @@ class PostUpdate
} }
/** /**
* @brief update the "item-content" table * @brief update the item related tables
* *
* @return bool "true" when the job is done * @return bool "true" when the job is done
*/ */
private static function update1274() private static function update1276()
{ {
// Was the script completed? // Was the script completed?
if (Config::get("system", "post_update_version") >= 1274) { if (Config::get("system", "post_update_version") >= 1276) {
return true; return true;
} }
logger("Start", LOGGER_DEBUG); $id = Config::get("system", "post_update_version_1276_id", 0);
$fields = ['id', 'title', 'content-warning', 'body', 'location', 'tag', 'file', logger("Start from item " . $id, LOGGER_DEBUG);
'coord', 'app', 'rendered-hash', 'rendered-html', 'verb',
'object-type', 'object', 'target-type', 'target', 'plink',
'author-id', 'owner-id'];
$condition = ["`icid` IS NULL"]; $fields = array_merge(Item::MIXED_CONTENT_FIELDLIST, ['network', 'author-id', 'owner-id', 'tag', 'file',
$params = ['limit' => 10000]; 'author-name', 'author-avatar', 'author-link', 'owner-name', 'owner-avatar', 'owner-link', 'id']);
$items = Item::select($fields, $condition, $params);
if (!DBM::is_result($items)) {
Config::set("system", "post_update_version", 1274);
logger("Done", LOGGER_DEBUG);
return true;
}
$start_id = $id;
$rows = 0; $rows = 0;
$condition = ["`id` > ?", $id];
$params = ['order' => ['id'], 'limit' => 10000];
$items = Item::select($fields, $condition, $params);
while ($item = Item::fetch($items)) { while ($item = Item::fetch($items)) {
// Clearing the author and owner data if there is an id. $id = $item['id'];
if ($item['author-id'] > 0) {
$item['author-name'] = ''; if (empty($item['author-id'])) {
$item['author-link'] = ''; $default = ['url' => $item['author-link'], 'name' => $item['author-name'],
$item['author-avatar'] = ''; 'photo' => $item['author-avatar'], 'network' => $item['network']];
$item['author-id'] = Contact::getIdForURL($item["author-link"], 0, false, $default);
} }
if ($item['owner-id'] > 0) { if (empty($item['owner-id'])) {
$item['owner-name'] = ''; $default = ['url' => $item['owner-link'], 'name' => $item['owner-name'],
$item['owner-link'] = ''; 'photo' => $item['owner-avatar'], 'network' => $item['network']];
$item['owner-avatar'] = '';
$item['owner-id'] = Contact::getIdForURL($item["owner-link"], 0, false, $default);
} }
Item::update($item, ['id' => $item['id']]); Item::update($item, ['id' => $id]);
++$rows; ++$rows;
} }
dba::close($items); dba::close($items);
logger("Processed rows: " . $rows, LOGGER_DEBUG); Config::set("system", "post_update_version_1276_id", $id);
return true;
}
/**
* @brief update the "item-activity" table
*
* @return bool "true" when the job is done
*/
private static function update1275()
{
// Was the script completed?
if (Config::get("system", "post_update_version") >= 1275) {
return true;
}
logger("Start", LOGGER_DEBUG); logger("Processed rows: " . $rows . " - last processed item: " . $id, LOGGER_DEBUG);
$fields = ['id', 'verb']; if ($start_id == $id) {
Config::set("system", "post_update_version", 1276);
$condition = ["`iaid` IS NULL AND NOT `icid` IS NULL AND `verb` IN (?, ?, ?, ?, ?)",
ACTIVITY_LIKE, ACTIVITY_DISLIKE, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE];
$params = ['limit' => 10000];
$items = Item::select($fields, $condition, $params);
if (!DBM::is_result($items)) {
Config::set("system", "post_update_version", 1275);
logger("Done", LOGGER_DEBUG); logger("Done", LOGGER_DEBUG);
return true; return true;
} }
$rows = 0; return false;
while ($item = Item::fetch($items)) {
Item::update($item, ['id' => $item['id']]);
++$rows;
}
dba::close($items);
logger("Processed rows: " . $rows, LOGGER_DEBUG);
return true;
} }
} }

154
src/Model/Item.php
View file

@ -78,6 +78,17 @@ class Item extends BaseObject
// The item-activity table only stores the index and needs this array to know the matching activity. // The item-activity table only stores the index and needs this array to know the matching activity.
const ACTIVITIES = [ACTIVITY_LIKE, ACTIVITY_DISLIKE, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE]; const ACTIVITIES = [ACTIVITY_LIKE, ACTIVITY_DISLIKE, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE];
private static $legacy_mode = null;
public static function isLegacyMode()
{
if (is_null(self::$legacy_mode)) {
self::$legacy_mode = (Config::get("system", "post_update_version") < 1276);
}
return self::$legacy_mode;
}
/** /**
* @brief returns an activity index from an activity string * @brief returns an activity index from an activity string
* *
@ -156,12 +167,14 @@ class Item extends BaseObject
// ---------------------- Transform item content data ---------------------- // ---------------------- Transform item content data ----------------------
// Fetch data from the item-content table whenever there is content there // Fetch data from the item-content table whenever there is content there
if (self::isLegacyMode()) {
foreach (self::MIXED_CONTENT_FIELDLIST as $field) { foreach (self::MIXED_CONTENT_FIELDLIST as $field) {
if (empty($row[$field]) && !empty($row['internal-item-' . $field])) { if (empty($row[$field]) && !empty($row['internal-item-' . $field])) {
$row[$field] = $row['internal-item-' . $field]; $row[$field] = $row['internal-item-' . $field];
} }
unset($row['internal-item-' . $field]); unset($row['internal-item-' . $field]);
} }
}
if (!empty($row['internal-iaid']) && array_key_exists('verb', $row)) { if (!empty($row['internal-iaid']) && array_key_exists('verb', $row)) {
$row['verb'] = self::indexToActivity($row['internal-activity']); $row['verb'] = self::indexToActivity($row['internal-activity']);
@ -568,20 +581,20 @@ class Item extends BaseObject
$joins .= sprintf("STRAIGHT_JOIN `contact` ON `contact`.`id` = $master_table.`contact-id` $joins .= sprintf("STRAIGHT_JOIN `contact` ON `contact`.`id` = $master_table.`contact-id`
AND NOT `contact`.`blocked` AND NOT `contact`.`blocked`
AND ((NOT `contact`.`readonly` AND NOT `contact`.`pending` AND (`contact`.`rel` IN (%s, %s))) AND ((NOT `contact`.`readonly` AND NOT `contact`.`pending` AND (`contact`.`rel` IN (%s, %s)))
OR `contact`.`self` OR (`item`.`id` != `item`.`parent`) OR `contact`.`uid` = 0) OR `contact`.`self` OR `item`.`gravity` != %d OR `contact`.`uid` = 0)
STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = $master_table.`author-id` AND NOT `author`.`blocked` STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = $master_table.`author-id` AND NOT `author`.`blocked`
STRAIGHT_JOIN `contact` AS `owner` ON `owner`.`id` = $master_table.`owner-id` AND NOT `owner`.`blocked` STRAIGHT_JOIN `contact` AS `owner` ON `owner`.`id` = $master_table.`owner-id` AND NOT `owner`.`blocked`
LEFT JOIN `user-item` ON `user-item`.`iid` = $master_table_key AND `user-item`.`uid` = %d", LEFT JOIN `user-item` ON `user-item`.`iid` = $master_table_key AND `user-item`.`uid` = %d",
CONTACT_IS_SHARING, CONTACT_IS_FRIEND, intval($uid)); CONTACT_IS_SHARING, CONTACT_IS_FRIEND, GRAVITY_PARENT, intval($uid));
} else { } else {
if (strpos($sql_commands, "`contact`.") !== false) { if (strpos($sql_commands, "`contact`.") !== false) {
$joins .= "STRAIGHT_JOIN `contact` ON `contact`.`id` = $master_table.`contact-id`"; $joins .= "LEFT JOIN `contact` ON `contact`.`id` = $master_table.`contact-id`";
} }
if (strpos($sql_commands, "`author`.") !== false) { if (strpos($sql_commands, "`author`.") !== false) {
$joins .= " STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = $master_table.`author-id`"; $joins .= " LEFT JOIN `contact` AS `author` ON `author`.`id` = $master_table.`author-id`";
} }
if (strpos($sql_commands, "`owner`.") !== false) { if (strpos($sql_commands, "`owner`.") !== false) {
$joins .= " STRAIGHT_JOIN `contact` AS `owner` ON `owner`.`id` = $master_table.`owner-id`"; $joins .= " LEFT JOIN `contact` AS `owner` ON `owner`.`id` = $master_table.`owner-id`";
} }
} }
@ -645,7 +658,7 @@ class Item extends BaseObject
foreach ($fields as $table => $table_fields) { foreach ($fields as $table => $table_fields) {
foreach ($table_fields as $field => $select) { foreach ($table_fields as $field => $select) {
if (empty($selected) || in_array($select, $selected)) { if (empty($selected) || in_array($select, $selected)) {
if (in_array($select, self::MIXED_CONTENT_FIELDLIST)) { if (self::isLegacyMode() && in_array($select, self::MIXED_CONTENT_FIELDLIST)) {
$selection[] = "`item`.`".$select."` AS `internal-item-" . $select . "`"; $selection[] = "`item`.`".$select."` AS `internal-item-" . $select . "`";
} }
if (is_int($field)) { if (is_int($field)) {
@ -685,6 +698,19 @@ class Item extends BaseObject
return $query; return $query;
} }
/**
* @brief Generate a server unique item hash for linking between the item tables
*
* @param string $uri Item URI
* @param date $created Item creation date
*
* @return string the item hash
*/
private static function itemHash($uri, $created)
{
return round(strtotime($created) / 100) . hash('ripemd128', $uri);
}
/** /**
* @brief Update existing item entries * @brief Update existing item entries
* *
@ -710,13 +736,13 @@ class Item extends BaseObject
// We cannot simply expand the condition to check for origin entries // We cannot simply expand the condition to check for origin entries
// The condition needn't to be a simple array but could be a complex condition. // The condition needn't to be a simple array but could be a complex condition.
// And we have to execute this query before the update to ensure to fetch the same data. // And we have to execute this query before the update to ensure to fetch the same data.
$items = dba::select('item', ['id', 'origin', 'uri', 'plink', 'iaid', 'icid', 'tag', 'file'], $condition); $items = dba::select('item', ['id', 'origin', 'uri', 'created', 'uri-hash', 'iaid', 'icid', 'tag', 'file'], $condition);
$content_fields = []; $content_fields = [];
foreach (array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST) as $field) { foreach (array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST) as $field) {
if (isset($fields[$field])) { if (isset($fields[$field])) {
$content_fields[$field] = $fields[$field]; $content_fields[$field] = $fields[$field];
if (in_array($field, self::CONTENT_FIELDLIST)) { if (in_array($field, self::CONTENT_FIELDLIST) || !self::isLegacyMode()) {
unset($fields[$field]); unset($fields[$field]);
} else { } else {
$fields[$field] = null; $fields[$field] = null;
@ -759,18 +785,41 @@ class Item extends BaseObject
$rows = dba::affected_rows(); $rows = dba::affected_rows();
while ($item = dba::fetch($items)) { while ($item = dba::fetch($items)) {
if (!empty($item['plink'])) { // This part here can safely be removed when the legacy fields in the item had been removed
$content_fields['plink'] = $item['plink']; if (empty($item['uri-hash']) && !empty($item['uri']) && !empty($item['created'])) {
// Fetch the uri-hash from an existing item entry if there is one
$item_condition = ["`uri` = ? AND `uri-hash` != ''", $item['uri']];
$existing = dba::selectfirst('item', ['uri-hash'], $item_condition);
if (DBM::is_result($existing)) {
$item['uri-hash'] = $existing['uri-hash'];
} else {
$item['uri-hash'] = self::itemHash($item['uri'], $item['created']);
} }
dba::update('item', ['uri-hash' => $item['uri-hash']], ['id' => $item['id']]);
dba::update('item-activity', ['uri-hash' => $item['uri-hash']], ["`uri` = ? AND `uri-hash` = ''", $item['uri']]);
dba::update('item-content', ['uri-plink-hash' => $item['uri-hash']], ["`uri` = ? AND `uri-plink-hash` = ''", $item['uri']]);
}
if (!empty($item['iaid']) || (!empty($content_fields['verb']) && (self::activityToIndex($content_fields['verb']) >= 0))) { if (!empty($item['iaid']) || (!empty($content_fields['verb']) && (self::activityToIndex($content_fields['verb']) >= 0))) {
self::updateActivity($content_fields, ['uri' => $item['uri']]); if (!empty($item['iaid'])) {
$update_condition = ['id' => $item['iaid']];
} else {
$update_condition = ['uri-hash' => $item['uri-hash']];
}
self::updateActivity($content_fields, $update_condition);
if (empty($item['iaid'])) { if (empty($item['iaid'])) {
$item_activity = dba::selectFirst('item-activity', ['id'], ['uri' => $item['uri']]); $item_activity = dba::selectFirst('item-activity', ['id'], ['uri-hash' => $item['uri-hash']]);
if (DBM::is_result($item_activity)) { if (DBM::is_result($item_activity)) {
$item_fields = ['iaid' => $item_activity['id'], 'icid' => null]; $item_fields = ['iaid' => $item_activity['id'], 'icid' => null];
foreach (self::MIXED_CONTENT_FIELDLIST as $field) { foreach (self::MIXED_CONTENT_FIELDLIST as $field) {
$item_fields[$field] = ''; if (self::isLegacyMode()) {
$item_fields[$field] = null;
} else {
unset($item_fields[$field]);
}
} }
dba::update('item', $item_fields, ['id' => $item['id']]); dba::update('item', $item_fields, ['id' => $item['id']]);
@ -786,16 +835,25 @@ class Item extends BaseObject
} }
} }
} else { } else {
self::updateContent($content_fields, ['uri' => $item['uri']]); if (!empty($item['icid'])) {
$update_condition = ['id' => $item['icid']];
} else {
$update_condition = ['uri-plink-hash' => $item['uri-hash']];
}
self::updateContent($content_fields, $update_condition);
if (empty($item['icid'])) { if (empty($item['icid'])) {
$item_content = dba::selectFirst('item-content', [], ['uri' => $item['uri']]); $item_content = dba::selectFirst('item-content', [], ['uri-plink-hash' => $item['uri-hash']]);
if (DBM::is_result($item_content)) { if (DBM::is_result($item_content)) {
$item_fields = ['icid' => $item_content['id']]; $item_fields = ['icid' => $item_content['id']];
// Clear all fields in the item table that have a content in the item-content table // Clear all fields in the item table that have a content in the item-content table
foreach ($item_content as $field => $content) { foreach ($item_content as $field => $content) {
if (in_array($field, self::MIXED_CONTENT_FIELDLIST) && !empty($item_content[$field])) { if (in_array($field, self::MIXED_CONTENT_FIELDLIST) && !empty($item_content[$field])) {
$item_fields[$field] = ''; if (self::isLegacyMode()) {
$item_fields[$field] = null;
} else {
unset($item_fields[$field]);
}
} }
} }
dba::update('item', $item_fields, ['id' => $item['id']]); dba::update('item', $item_fields, ['id' => $item['id']]);
@ -1228,6 +1286,13 @@ class Item extends BaseObject
} }
} }
// Ensure to always have the same creation date.
$existing = dba::selectfirst('item', ['created', 'uri-hash'], ['uri' => $item['uri']]);
if (DBM::is_result($existing)) {
$item['created'] = $existing['created'];
$item['uri-hash'] = $existing['uri-hash'];
}
self::addLanguageToItemArray($item); self::addLanguageToItemArray($item);
$item['wall'] = intval(defaults($item, 'wall', 0)); $item['wall'] = intval(defaults($item, 'wall', 0));
@ -1272,6 +1337,9 @@ class Item extends BaseObject
$item['inform'] = trim(defaults($item, 'inform', '')); $item['inform'] = trim(defaults($item, 'inform', ''));
$item['file'] = trim(defaults($item, 'file', '')); $item['file'] = trim(defaults($item, 'file', ''));
// Unique identifier to be linked against item-activities and item-content
$item['uri-hash'] = defaults($item, 'uri-hash', self::itemHash($item['uri'], $item['created']));
// When there is no content then we don't post it // When there is no content then we don't post it
if ($item['body'].$item['title'] == '') { if ($item['body'].$item['title'] == '') {
logger('No body, no title.'); logger('No body, no title.');
@ -1288,10 +1356,6 @@ class Item extends BaseObject
$item['edited'] = DateTimeFormat::utcNow(); $item['edited'] = DateTimeFormat::utcNow();
} }
if (($item['author-link'] == "") && ($item['owner-link'] == "")) {
logger("Both author-link and owner-link are empty. Called by: " . System::callstack(), LOGGER_DEBUG);
}
$item['plink'] = defaults($item, 'plink', System::baseUrl() . '/display/' . urlencode($item['guid'])); $item['plink'] = defaults($item, 'plink', System::baseUrl() . '/display/' . urlencode($item['guid']));
// The contact-id should be set before "self::insert" was called - but there seems to be issues sometimes // The contact-id should be set before "self::insert" was called - but there seems to be issues sometimes
@ -1718,9 +1782,7 @@ class Item extends BaseObject
} }
$fields = ['uri' => $item['uri'], 'activity' => $activity_index, $fields = ['uri' => $item['uri'], 'activity' => $activity_index,
'uri-hash' => hash('sha1', $item['uri']) . hash('ripemd160', $item['uri'])]; 'uri-hash' => $item['uri-hash']];
$saved_item = $item;
// We just remove everything that is content // We just remove everything that is content
foreach (array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST) as $field) { foreach (array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST) as $field) {
@ -1734,7 +1796,7 @@ class Item extends BaseObject
} }
// Do we already have this content? // Do we already have this content?
$item_activity = dba::selectFirst('item-activity', ['id'], ['uri' => $item['uri']]); $item_activity = dba::selectFirst('item-activity', ['id'], ['uri-hash' => $item['uri-hash']]);
if (DBM::is_result($item_activity)) { if (DBM::is_result($item_activity)) {
$item['iaid'] = $item_activity['id']; $item['iaid'] = $item_activity['id'];
logger('Fetched activity for URI ' . $item['uri'] . ' (' . $item['iaid'] . ')'); logger('Fetched activity for URI ' . $item['uri'] . ' (' . $item['iaid'] . ')');
@ -1742,9 +1804,8 @@ class Item extends BaseObject
$item['iaid'] = dba::lastInsertId(); $item['iaid'] = dba::lastInsertId();
logger('Inserted activity for URI ' . $item['uri'] . ' (' . $item['iaid'] . ')'); logger('Inserted activity for URI ' . $item['uri'] . ' (' . $item['iaid'] . ')');
} else { } else {
// This shouldn't happen. But if it does, we simply store it in the item-content table // This shouldn't happen.
logger('Could not insert activity for URI ' . $item['uri'] . ' - should not happen'); logger('Could not insert activity for URI ' . $item['uri'] . ' - should not happen');
$item = $saved_item;
return false; return false;
} }
if ($locked) { if ($locked) {
@ -1760,8 +1821,7 @@ class Item extends BaseObject
*/ */
private static function insertContent(&$item) private static function insertContent(&$item)
{ {
$fields = ['uri' => $item['uri'], 'plink' => $item['plink'], $fields = ['uri' => $item['uri'], 'uri-plink-hash' => $item['uri-hash']];
'uri-plink-hash' => hash('sha1', $item['plink']).hash('sha1', $item['uri'])];
foreach (array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST) as $field) { foreach (array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST) as $field) {
if (isset($item[$field])) { if (isset($item[$field])) {
@ -1777,7 +1837,7 @@ class Item extends BaseObject
} }
// Do we already have this content? // Do we already have this content?
$item_content = dba::selectFirst('item-content', ['id'], ['uri' => $item['uri']]); $item_content = dba::selectFirst('item-content', ['id'], ['uri-plink-hash' => $item['uri-hash']]);
if (DBM::is_result($item_content)) { if (DBM::is_result($item_content)) {
$item['icid'] = $item_content['id']; $item['icid'] = $item_content['id'];
logger('Fetched content for URI ' . $item['uri'] . ' (' . $item['icid'] . ')'); logger('Fetched content for URI ' . $item['uri'] . ' (' . $item['icid'] . ')');
@ -1785,32 +1845,14 @@ class Item extends BaseObject
$item['icid'] = dba::lastInsertId(); $item['icid'] = dba::lastInsertId();
logger('Inserted content for URI ' . $item['uri'] . ' (' . $item['icid'] . ')'); logger('Inserted content for URI ' . $item['uri'] . ' (' . $item['icid'] . ')');
} else { } else {
// By setting the ICID value through the worker we should avoid timing problems. // This shouldn't happen.
// When the locking works, this shouldn't be needed. But better be prepared. logger('Could not insert content for URI ' . $item['uri'] . ' - should not happen');
Worker::add(PRIORITY_HIGH, 'SetItemContentID', $item['uri']);
logger('Could not insert content for URI ' . $item['uri'] . ' - trying asynchronously');
} }
if ($locked) { if ($locked) {
Lock::release('item_insert_content'); Lock::release('item_insert_content');
} }
} }
/**
* @brief Set the item content id for a given URI
*
* @param string $uri The item URI
*/
public static function setICIDforURI($uri)
{
$item_content = dba::selectFirst('item-content', ['id'], ['uri' => $uri]);
if (DBM::is_result($item_content)) {
dba::update('item', ['icid' => $item_content['id']], ['icid' => 0, 'uri' => $uri]);
logger('Asynchronously set item content id for URI ' . $uri . ' (' . $item_content['id'] . ') - Affected: '. (int)dba::affected_rows());
} else {
logger('No item-content found for URI ' . $uri);
}
}
/** /**
* @brief Update existing item content entries * @brief Update existing item content entries
* *
@ -1828,10 +1870,9 @@ class Item extends BaseObject
return false; return false;
} }
$fields = ['activity' => $activity_index, $fields = ['activity' => $activity_index];
'uri-hash' => hash('sha1', $condition['uri']) . hash('ripemd160', $condition['uri'])];
logger('Update activity for URI ' . $condition['uri']); logger('Update activity for ' . json_encode($condition));
dba::update('item-activity', $fields, $condition, true); dba::update('item-activity', $fields, $condition, true);
@ -1860,14 +1901,7 @@ class Item extends BaseObject
$fields = $condition; $fields = $condition;
} }
if (!empty($item['plink'])) { logger('Update content for ' . json_encode($condition));
$fields['uri-plink-hash'] = hash('sha1', $item['plink']) . hash('sha1', $condition['uri']);
} else {
// Ensure that we don't delete the plink
unset($fields['plink']);
}
logger('Update content for URI ' . $condition['uri']);
dba::update('item-content', $fields, $condition, true); dba::update('item-content', $fields, $condition, true);
} }

4
src/Model/ItemContent.php
View file

@ -93,7 +93,7 @@ class ItemContent extends BaseObject
} }
} }
$html = Text\BBCode::convert($post['text'] . $post['after'], false, $htmlmode); $html = Text\BBCode::convert($post['text'] . defaults($post, 'after', ''), false, $htmlmode);
$msg = Text\HTML::toPlaintext($html, 0, true); $msg = Text\HTML::toPlaintext($html, 0, true);
$msg = trim(html_entity_decode($msg, ENT_QUOTES, 'UTF-8')); $msg = trim(html_entity_decode($msg, ENT_QUOTES, 'UTF-8'));
@ -102,7 +102,7 @@ class ItemContent extends BaseObject
if ($post['type'] == 'link') { if ($post['type'] == 'link') {
$link = $post['url']; $link = $post['url'];
} elseif ($post['type'] == 'text') { } elseif ($post['type'] == 'text') {
$link = $post['url']; $link = defaults($post, 'url', '');
} elseif ($post['type'] == 'video') { } elseif ($post['type'] == 'video') {
$link = $post['url']; $link = $post['url'];
} elseif ($post['type'] == 'photo') { } elseif ($post['type'] == 'photo') {

12
src/Network/Probe.php
View file

@ -335,7 +335,7 @@ class Probe
} }
if (x($data, "photo")) { if (x($data, "photo")) {
$data["baseurl"] = Network::getUrlMatch(normalise_link($data["baseurl"]), normalise_link($data["photo"])); $data["baseurl"] = Network::getUrlMatch(normalise_link(defaults($data, "baseurl", "")), normalise_link($data["photo"]));
} else { } else {
$data["photo"] = System::baseUrl().'/images/person-175.jpg'; $data["photo"] = System::baseUrl().'/images/person-175.jpg';
} }
@ -1142,7 +1142,7 @@ class Probe
} }
// Older Friendica versions had used the "uid" field differently than newer versions // Older Friendica versions had used the "uid" field differently than newer versions
if ($data["nick"] == $data["guid"]) { if (!empty($data["nick"]) && !empty($data["guid"]) && ($data["nick"] == $data["guid"])) {
unset($data["guid"]); unset($data["guid"]);
} }
} }
@ -1390,16 +1390,16 @@ class Probe
} }
} }
$data["location"] = $xpath->query("//p[contains(@class, 'p-locality')]")->item(0)->nodeValue; $data["location"] = XML::getFirstNodeValue($xpath, "//p[contains(@class, 'p-locality')]");
if ($data["location"] == '') { if ($data["location"] == '') {
$data["location"] = $xpath->query("//p[contains(@class, 'location')]")->item(0)->nodeValue; $data["location"] = XML::getFirstNodeValue($xpath, "//p[contains(@class, 'location')]");
} }
$data["about"] = $xpath->query("//p[contains(@class, 'p-note')]")->item(0)->nodeValue; $data["about"] = XML::getFirstNodeValue($xpath, "//p[contains(@class, 'p-note')]");
if ($data["about"] == '') { if ($data["about"] == '') {
$data["about"] = $xpath->query("//p[contains(@class, 'summary')]")->item(0)->nodeValue; $data["about"] = XML::getFirstNodeValue($xpath, "//p[contains(@class, 'summary')]");
} }
$avatar = $xpath->query("//img[contains(@class, 'u-photo')]")->item(0); $avatar = $xpath->query("//img[contains(@class, 'u-photo')]")->item(0);

3
src/Protocol/Diaspora.php
View file

@ -2005,6 +2005,9 @@ class Diaspora
$datarray["body"] = $verb; $datarray["body"] = $verb;
// Diaspora doesn't provide a date for likes
$datarray["changed"] = $datarray["created"] = $datarray["edited"] = DateTimeFormat::utcNow();
// like on comments have the comment as parent. So we need to fetch the toplevel parent // like on comments have the comment as parent. So we need to fetch the toplevel parent
if ($parent_item["id"] != $parent_item["parent"]) { if ($parent_item["id"] != $parent_item["parent"]) {
$toplevel = Item::selectFirst(['origin'], ['id' => $parent_item["parent"]]); $toplevel = Item::selectFirst(['origin'], ['id' => $parent_item["parent"]]);

17
src/Protocol/PortableContact.php
View file

@ -19,6 +19,7 @@ use Friendica\Network\Probe;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network; use Friendica\Util\Network;
use Friendica\Protocol\Diaspora; use Friendica\Protocol\Diaspora;
use Friendica\Util\XML;
use dba; use dba;
use DOMDocument; use DOMDocument;
use DOMXPath; use DOMXPath;
@ -916,7 +917,7 @@ class PortableContact
return false; return false;
} }
$server["site_name"] = $xpath->evaluate("//head/title/text()")->item(0)->nodeValue; $server["site_name"] = XML::getFirstNodeValue($xpath, '//head/title/text()');
return $server; return $server;
} }
@ -1003,7 +1004,7 @@ class PortableContact
// Quit if there is a timeout. // Quit if there is a timeout.
// But we want to make sure to only quit if we are mostly sure that this server url fits. // But we want to make sure to only quit if we are mostly sure that this server url fits.
if (DBM::is_result($gserver) && ($orig_server_url == $server_url) && if (DBM::is_result($gserver) && ($orig_server_url == $server_url) &&
($serverret['errno'] == CURLE_OPERATION_TIMEDOUT)) { (!$serverret["success"] && ($serverret['errno'] == CURLE_OPERATION_TIMEDOUT))) {
logger("Connection to server ".$server_url." timed out.", LOGGER_DEBUG); logger("Connection to server ".$server_url." timed out.", LOGGER_DEBUG);
dba::update('gserver', ['last_failure' => DateTimeFormat::utcNow()], ['nurl' => normalise_link($server_url)]); dba::update('gserver', ['last_failure' => DateTimeFormat::utcNow()], ['nurl' => normalise_link($server_url)]);
return false; return false;
@ -1018,7 +1019,7 @@ class PortableContact
$serverret = Network::curl($server_url."/.well-known/host-meta", false, $redirects, ['timeout' => 20]); $serverret = Network::curl($server_url."/.well-known/host-meta", false, $redirects, ['timeout' => 20]);
// Quit if there is a timeout // Quit if there is a timeout
if ($serverret['errno'] == CURLE_OPERATION_TIMEDOUT) { if (!$serverret["success"] && ($serverret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
logger("Connection to server ".$server_url." timed out.", LOGGER_DEBUG); logger("Connection to server ".$server_url." timed out.", LOGGER_DEBUG);
dba::update('gserver', ['last_failure' => DateTimeFormat::utcNow()], ['nurl' => normalise_link($server_url)]); dba::update('gserver', ['last_failure' => DateTimeFormat::utcNow()], ['nurl' => normalise_link($server_url)]);
return false; return false;
@ -1230,8 +1231,14 @@ class PortableContact
$site_name = $data->site->name; $site_name = $data->site->name;
$data->site->closed = self::toBoolean($data->site->closed); $data->site->closed = self::toBoolean($data->site->closed);
if (!empty($data->site->private)) {
$data->site->private = self::toBoolean($data->site->private); $data->site->private = self::toBoolean($data->site->private);
}
if (!empty($data->site->inviteonly)) {
$data->site->inviteonly = self::toBoolean($data->site->inviteonly); $data->site->inviteonly = self::toBoolean($data->site->inviteonly);
}
if (!$data->site->closed && !$data->site->private and $data->site->inviteonly) { if (!$data->site->closed && !$data->site->private and $data->site->inviteonly) {
$register_policy = REGISTER_APPROVE; $register_policy = REGISTER_APPROVE;
@ -1325,7 +1332,9 @@ class PortableContact
$noscrape = $data->no_scrape_url; $noscrape = $data->no_scrape_url;
} }
$version = $data->version; $version = $data->version;
if (!empty($data->site_name)) {
$site_name = $data->site_name; $site_name = $data->site_name;
}
$info = $data->info; $info = $data->info;
$register_policy = constant($data->register_policy); $register_policy = constant($data->register_policy);
$platform = $data->platform; $platform = $data->platform;
@ -1714,7 +1723,9 @@ class PortableContact
$contact_type = -1; $contact_type = -1;
$generation = $default_generation; $generation = $default_generation;
if (!empty($entry->displayName)) {
$name = $entry->displayName; $name = $entry->displayName;
}
if (isset($entry->urls)) { if (isset($entry->urls)) {
foreach ($entry->urls as $url) { foreach ($entry->urls as $url) {

3
src/Worker/CronJobs.php
View file

@ -36,7 +36,8 @@ class CronJobs
// Call possible post update functions // Call possible post update functions
// see src/Database/PostUpdate.php for more details // see src/Database/PostUpdate.php for more details
if ($command == 'post_update') { if ($command == 'post_update') {
PostUpdate::update(); // Post updates will be reenabled (hopefully in a few days) when most item works are done
// PostUpdate::update();
return; return;
} }

7
src/Worker/Delivery.php
View file

@ -44,6 +44,7 @@ class Delivery extends BaseObject
return; return;
} }
$uid = $target_item['uid']; $uid = $target_item['uid'];
$items = [];
} elseif ($cmd == self::SUGGESTION) { } elseif ($cmd == self::SUGGESTION) {
$target_item = dba::selectFirst('fsuggest', [], ['id' => $item_id]); $target_item = dba::selectFirst('fsuggest', [], ['id' => $item_id]);
if (!DBM::is_result($target_item)) { if (!DBM::is_result($target_item)) {
@ -127,6 +128,10 @@ class Delivery extends BaseObject
} }
} }
if (empty($items)) {
logger('No delivery data for ' . $cmd . ' - Item ID: ' .$item_id . ' - Contact ID: ' . $contact_id);
}
$owner = User::getOwnerDataById($uid); $owner = User::getOwnerDataById($uid);
if (!DBM::is_result($owner)) { if (!DBM::is_result($owner)) {
return; return;
@ -271,7 +276,7 @@ class Delivery extends BaseObject
// We don't have a relationship with contacts on a public post. // We don't have a relationship with contacts on a public post.
// Se we transmit with the new method and via Diaspora as a fallback // Se we transmit with the new method and via Diaspora as a fallback
if (($items[0]['uid'] == 0) || ($contact['uid'] == 0)) { if (!empty($items) && (($items[0]['uid'] == 0) || ($contact['uid'] == 0))) {
// Transmit in public if it's a relay post // Transmit in public if it's a relay post
$public_dfrn = ($contact['contact-type'] == ACCOUNT_TYPE_RELAY); $public_dfrn = ($contact['contact-type'] == ACCOUNT_TYPE_RELAY);

4
src/Worker/Expire.php
View file

@ -42,12 +42,12 @@ class Expire {
// Normally we shouldn't have orphaned data at all. // Normally we shouldn't have orphaned data at all.
// If we do have some, then we have to check why. // If we do have some, then we have to check why.
logger('Deleting orphaned item activities - start', LOGGER_DEBUG); logger('Deleting orphaned item activities - start', LOGGER_DEBUG);
$condition = ["NOT EXISTS (SELECT `iaid` FROM `item` WHERE `item`.`uri` = `item-activity`.`uri`)"]; $condition = ["NOT EXISTS (SELECT `iaid` FROM `item` WHERE `item`.`iaid` = `item-activity`.`id`)"];
dba::delete('item-activity', $condition); dba::delete('item-activity', $condition);
logger('Orphaned item activities deleted: ' . dba::affected_rows(), LOGGER_DEBUG); logger('Orphaned item activities deleted: ' . dba::affected_rows(), LOGGER_DEBUG);
logger('Deleting orphaned item content - start', LOGGER_DEBUG); logger('Deleting orphaned item content - start', LOGGER_DEBUG);
$condition = ["NOT EXISTS (SELECT `icid` FROM `item` WHERE `item`.`uri` = `item-content`.`uri`)"]; $condition = ["NOT EXISTS (SELECT `icid` FROM `item` WHERE `item`.`icid` = `item-content`.`id`)"];
dba::delete('item-content', $condition); dba::delete('item-content', $condition);
logger('Orphaned item content deleted: ' . dba::affected_rows(), LOGGER_DEBUG); logger('Orphaned item content deleted: ' . dba::affected_rows(), LOGGER_DEBUG);

4
src/Worker/Notifier.php
View file

@ -378,7 +378,7 @@ class Notifier {
} }
// If this is a public message and pubmail is set on the parent, include all your email contacts // If this is a public message and pubmail is set on the parent, include all your email contacts
if (function_exists('imap_open') && !Config::get('system','imap_disabled')) { if (!empty($target_item) && function_exists('imap_open') && !Config::get('system','imap_disabled')) {
if (!strlen($target_item['allow_cid']) && !strlen($target_item['allow_gid']) if (!strlen($target_item['allow_cid']) && !strlen($target_item['allow_gid'])
&& !strlen($target_item['deny_cid']) && !strlen($target_item['deny_gid']) && !strlen($target_item['deny_cid']) && !strlen($target_item['deny_gid'])
&& intval($target_item['pubmail'])) { && intval($target_item['pubmail'])) {
@ -412,7 +412,7 @@ class Notifier {
// delivery loop // delivery loop
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
foreach ($r as $contact) { foreach ($r as $contact) {
logger("Deliver ".$target_item["guid"]." to ".$contact['url']." via network ".$contact['network'], LOGGER_DEBUG); logger("Deliver ".$item_id." to ".$contact['url']." via network ".$contact['network'], LOGGER_DEBUG);
Worker::add(['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true], Worker::add(['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true],
'Delivery', $cmd, $item_id, (int)$contact['id']); 'Delivery', $cmd, $item_id, (int)$contact['id']);

21
src/Worker/SetItemContentID.php
View file

@ -1,21 +0,0 @@
<?php
/**
* @file src/Worker/SetItemContentID.php
* @brief This script sets the "icid" value in the item table if it couldn't set before.
*
* This script is started from mod/item.php to fix timing problems.
*/
namespace Friendica\Worker;
use Friendica\Model\Item;
class SetItemContentID {
public static function execute($uri = '') {
if (empty($uri)) {
return;
}
Item::setICIDforURI($uri);
}
}