Merge pull request #11981 from annando/better-quote

[friendica.git] / src / Worker / ExpirePosts.php

diff --git a/src/Worker/ExpirePosts.php b/src/Worker/ExpirePosts.php
index 52d792ea6288cb482fd1da3ef33901f90ffcebe9..bbdfaa42c7e94d19d80d0eaaea6d7641f8df0c62 100644 (file)
--- a/src/Worker/ExpirePosts.php
+++ b/src/Worker/ExpirePosts.php
@@ -122,7 +122,7 @@ class ExpirePosts
                $rows = 0;
                $userposts = DBA::select('post-user', [], ["`uri-id` not in (select `uri-id` from `post`)"]);
                while ($fields = DBA::fetch($userposts)) {
-                       $post_fields = DBStructure::getFieldsForTable('post', $fields);
+                       $post_fields = DI::dbaDefinition()->truncateFieldsForTable('post', $fields);
                        DBA::insert('post', $post_fields, Database::INSERT_IGNORE);
                        $rows++;
                }
@@ -136,7 +136,7 @@ class ExpirePosts
                $rows = 0;
                $userposts = DBA::select('post-user', [], ["`gravity` = ? AND `uri-id` not in (select `uri-id` from `post-thread`)", GRAVITY_PARENT]);
                while ($fields = DBA::fetch($userposts)) {
-                       $post_fields = DBStructure::getFieldsForTable('post-thread', $fields);
+                       $post_fields = DI::dbaDefinition()->truncateFieldsForTable('post-thread', $fields);
                        $post_fields['commented'] = $post_fields['changed'] = $post_fields['created'];
                        DBA::insert('post-thread', $post_fields, Database::INSERT_IGNORE);
                        $rows++;
@@ -151,7 +151,7 @@ class ExpirePosts
                $rows = 0;
                $userposts = DBA::select('post-user', [], ["`gravity` = ? AND `id` not in (select `post-user-id` from `post-thread-user`)", GRAVITY_PARENT]);
                while ($fields = DBA::fetch($userposts)) {
-                       $post_fields = DBStructure::getFieldsForTable('post-thread-user', $fields);
+                       $post_fields = DI::dbaDefinition()->truncateFieldsForTable('post-thread-user', $fields);
                        $post_fields['commented'] = $post_fields['changed'] = $post_fields['created'];
                        DBA::insert('post-thread-user', $post_fields, Database::INSERT_IGNORE);
                        $rows++;
@@ -183,6 +183,7 @@ class ExpirePosts
                        AND NOT EXISTS(SELECT `parent-uri-id` FROM `post-user` WHERE `parent-uri-id` = `item-uri`.`id`)
                        AND NOT EXISTS(SELECT `thr-parent-id` FROM `post-user` WHERE `thr-parent-id` = `item-uri`.`id`)
                        AND NOT EXISTS(SELECT `external-id` FROM `post-user` WHERE `external-id` = `item-uri`.`id`)
+                       AND NOT EXISTS(SELECT `conversation-id` FROM `post-thread` WHERE `conversation-id` = `item-uri`.`id`)
                        AND NOT EXISTS(SELECT `uri-id` FROM `mail` WHERE `uri-id` = `item-uri`.`id`)
                        AND NOT EXISTS(SELECT `uri-id` FROM `event` WHERE `uri-id` = `item-uri`.`id`)
                        AND NOT EXISTS(SELECT `uri-id` FROM `user-contact` WHERE `uri-id` = `item-uri`.`id`)