Fix several database issues

diff --git a/database.sql b/database.sql
index 3e1c44f99a23e20cf77a3f89da7193630e432d9d..db1d90420b710ace8a807b1d0cee5a58c7691803 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -1,6 +1,6 @@
 -- ------------------------------------------
 -- Friendica 2021.03-dev (Red Hot Poker)
--- DB_UPDATE_VERSION 1400
+-- DB_UPDATE_VERSION 1401
 -- ------------------------------------------
 
 
@@ -889,7 +889,7 @@ CREATE TABLE IF NOT EXISTS `notify` (
        `msg` mediumtext COMMENT '',
        `uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'Owner User id',
        `link` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-       `iid` int unsigned COMMENT 'item.id',
+       `iid` int unsigned COMMENT '',
        `parent` int unsigned COMMENT '',
        `uri-id` int unsigned COMMENT 'Item-uri id of the related post',
        `parent-uri-id` int unsigned COMMENT 'Item-uri id of the parent of the related post',
@@ -915,17 +915,15 @@ CREATE TABLE IF NOT EXISTS `notify` (
 CREATE TABLE IF NOT EXISTS `notify-threads` (
        `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
        `notify-id` int unsigned NOT NULL DEFAULT 0 COMMENT '',
-       `master-parent-item` int unsigned COMMENT '',
+       `master-parent-item` int unsigned COMMENT 'Deprecated',
        `master-parent-uri-id` int unsigned COMMENT 'Item-uri id of the parent of the related post',
        `parent-item` int unsigned NOT NULL DEFAULT 0 COMMENT '',
        `receiver-uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
         PRIMARY KEY(`id`),
-        INDEX `master-parent-item` (`master-parent-item`),
         INDEX `master-parent-uri-id` (`master-parent-uri-id`),
         INDEX `receiver-uid` (`receiver-uid`),
         INDEX `notify-id` (`notify-id`),
        FOREIGN KEY (`notify-id`) REFERENCES `notify` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
-       FOREIGN KEY (`master-parent-item`) REFERENCES `item` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
        FOREIGN KEY (`master-parent-uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
        FOREIGN KEY (`receiver-uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='';
@@ -1748,7 +1746,6 @@ DROP VIEW IF EXISTS `post-thread-view`;
 CREATE VIEW `post-thread-view` AS SELECT 
        `post-user`.`id` AS `id`,
        `item`.`id` AS `item-id`,
-       `post-user`.`id` AS `iid`,
        `post-user`.`id` AS `post-user-id`,
        `post-thread-user`.`uid` AS `uid`,
        `parent-post`.`id` AS `parent`,

diff --git a/mod/editpost.php b/mod/editpost.php
index 31f121bd546150f62563c77bb0657d765ccc8ec6..8ef15208457afe333e785401e7fb788a74d17e68 100644 (file)
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -46,7 +46,7 @@ function editpost_content(App $a)
        }
 
        $fields = ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
-               'type', 'body', 'title', 'uri-id', 'wall', 'post-type', 'guid'];
+               'body', 'title', 'uri-id', 'wall', 'post-type', 'guid'];
 
        $item = Post::selectFirstForUser(local_user(), $fields, ['id' => $post_id, 'uid' => local_user()]);
 

diff --git a/src/Model/Post.php b/src/Model/Post.php
index ff86dc6f2dd752b49300f3e3aa11dc2f1d6d621b..e3114ca90995e05b44d5698ecb7743c56b54aac2 100644 (file)
--- a/src/Model/Post.php
+++ b/src/Model/Post.php
@@ -224,7 +224,7 @@ class Post
                        $selected = array_merge(Item::DISPLAY_FIELDLIST, Item::ITEM_FIELDLIST);
 
                        if ($view == 'post-thread-view') {
-                               $selected = array_merge($selected, ['ignored', 'iid']);
+                               $selected = array_merge($selected, ['ignored']);
                        }
                }
 

diff --git a/src/Module/Update/Profile.php b/src/Module/Update/Profile.php
index 93a3752a4fd7ce6e1606106e056097e0f800988b..bab1a63a344b08a1b30f7027605f9643bf4239b1 100644 (file)
--- a/src/Module/Update/Profile.php
+++ b/src/Module/Update/Profile.php
@@ -68,9 +68,12 @@ class Profile extends BaseModule
 
                $last_updated = $last_updated_array[$last_updated_key] ?? 0;
 
-               // If the page user is the owner of the page we should query for unseen
-               // items. Otherwise use a timestamp of the last succesful update request.
-               if ($is_owner || !$last_updated) {
+               if ($_GET['force'] && !empty($_GET['item'])) {
+                       // When the parent is provided, we only fetch this
+                       $sql_extra4 = " AND `parent` = " . intval($_GET['item']);
+               } elseif ($is_owner || !$last_updated) {
+                       // If the page user is the owner of the page we should query for unseen
+                       // items. Otherwise use a timestamp of the last succesful update request.
                        $sql_extra4 = " AND `unseen`";
                } else {
                        $gmupdate = gmdate(DateTimeFormat::MYSQL, $last_updated);

diff --git a/src/Worker/RemoveContact.php b/src/Worker/RemoveContact.php
index d07780edf199afb2e6876f48c96a0929c7fbc0b4..ecfe498ffcd2df096da970afdcda71033a6f2b90 100644 (file)
--- a/src/Worker/RemoveContact.php
+++ b/src/Worker/RemoveContact.php
@@ -32,6 +32,10 @@ use Friendica\Model\Post;
  */
 class RemoveContact {
        public static function execute($id) {
+               if (empty($id)) {
+                       return;
+               }
+
                // Only delete if the contact is to be deleted
                $contact = DBA::selectFirst('contact', ['uid'], ['deleted' => true, 'id' => $id]);
                if (!DBA::isResult($contact)) {
@@ -47,20 +51,31 @@ class RemoveContact {
                } else {
                        $condition = ['uid' => $contact['uid'], 'contact-id' => $id];
                }
-               do {
-                       $items = Post::select(['item-id', 'post-user-id', 'uri-id', 'guid'], $condition, ['limit' => 100]);
-                       while ($item = Post::fetch($items)) {
-                               Logger::info('Delete removed contact item', ['id' => $item['item-id'], 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]);
-                               if (DBStructure::existsTable('item')) {
-                                       DBA::delete('item', ['id' => $item['item-id']]);
+               if (DBStructure::existsTable('item')) {
+                       do {
+                               $items = Post::select(['item-id', 'post-user-id', 'uri-id', 'guid'], $condition, ['limit' => 100]);
+                               while ($item = Post::fetch($items)) {
+                                       Logger::info('Delete removed contact item', ['id' => $item['item-id'], 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]);
+                                               DBA::delete('item', ['id' => $item['item-id']]);
                                }
-                               Post::delete(['uri-id' => $item['uri-id']]);
-                               Post\ThreadUser::delete(['post-user-id' => $item['post-user-id']]);
-                               Post\Thread::delete(['uri-id' => $item['uri-id']]);
-                               Post\User::delete(['id' => $item['post-user-id']]);
-                       }
-                       DBA::close($items);
-               } while (Post::exists($condition));
+                               DBA::close($items);
+                       } while (Post::exists($condition));
+               }
+
+               Post\User::delete(['author-id' => $id]);
+               Post\User::delete(['owner-id' => $id]);
+               Post\User::delete(['causer-id' => $id]);
+               Post\User::delete(['contact-id' => $id]);
+               Post\ThreadUser::delete(['author-id' => $id]);
+               Post\ThreadUser::delete(['owner-id' => $id]);
+               Post\ThreadUser::delete(['causer-id' => $id]);
+               Post\ThreadUser::delete(['contact-id' => $id]);
+               Post\Thread::delete(['author-id' => $id]);
+               Post\Thread::delete(['owner-id' => $id]);
+               Post\Thread::delete(['causer-id' => $id]);
+               Post::delete(['author-id' => $id]);
+               Post::delete(['owner-id' => $id]);
+               Post::delete(['causer-id' => $id]);
 
                Photo::delete(['contact-id' => $id]);
                $ret = DBA::delete('contact', ['id' => $id]);

diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php
index f6126210563e68d4a0ac430836733253cc8109ef..d7408c11b68e1babc779887c63759ddb28cea879 100644 (file)
--- a/static/dbstructure.config.php
+++ b/static/dbstructure.config.php
@@ -55,7 +55,7 @@
 use Friendica\Database\DBA;
 
 if (!defined('DB_UPDATE_VERSION')) {
-       define('DB_UPDATE_VERSION', 1400);
+       define('DB_UPDATE_VERSION', 1401);
 }
 
 return [
@@ -951,8 +951,8 @@ return [
                        "msg" => ["type" => "mediumtext", "comment" => ""],
                        "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "foreign" => ["user" => "uid"], "comment" => "Owner User id"],
                        "link" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-                       "iid" => ["type" => "int unsigned", "relation" => ["item" => "id"], "comment" => "item.id"],
-                       "parent" => ["type" => "int unsigned", "relation" => ["item" => "id"], "comment" => ""],
+                       "iid" => ["type" => "int unsigned", "comment" => ""],
+                       "parent" => ["type" => "int unsigned", "comment" => ""],
                        "uri-id" => ["type" => "int unsigned", "foreign" => ["item-uri" => "id"], "comment" => "Item-uri id of the related post"],
                        "parent-uri-id" => ["type" => "int unsigned", "foreign" => ["item-uri" => "id"], "comment" => "Item-uri id of the parent of the related post"],
                        "seen" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
@@ -975,7 +975,7 @@ return [
                "fields" => [
                        "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
                        "notify-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["notify" => "id"], "comment" => ""],
-                       "master-parent-item" => ["type" => "int unsigned", "foreign" => ["item" => "id"], "comment" => ""],
+                       "master-parent-item" => ["type" => "int unsigned", "comment" => "Deprecated"],
                        "master-parent-uri-id" => ["type" => "int unsigned", "foreign" => ["item-uri" => "id"], "comment" => "Item-uri id of the parent of the related post"],
                        "parent-item" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "comment" => ""],
                        "receiver-uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "foreign" => ["user" => "uid"],
@@ -983,7 +983,6 @@ return [
                ],
                "indexes" => [
                        "PRIMARY" => ["id"],
-                       "master-parent-item" => ["master-parent-item"],
                        "master-parent-uri-id" => ["master-parent-uri-id"],
                        "receiver-uid" => ["receiver-uid"],
                        "notify-id" => ["notify-id"],

diff --git a/static/dbview.config.php b/static/dbview.config.php
index 3751e671c9911c702391f9f2a73261c2f93ddbfe..fcd04c96822da61ec7e8b92df789d12e4fdfee24 100644 (file)
--- a/static/dbview.config.php
+++ b/static/dbview.config.php
@@ -197,7 +197,6 @@
                "fields" => [
                        "id" => ["post-user", "id"],
                        "item-id" => ["item", "id"],
-                       "iid" => ["post-user", "id"],
                        "post-user-id" => ["post-user", "id"],
                        "uid" => ["post-thread-user", "uid"],
                        "parent" => ["parent-post", "id"],