Use entity property in DB condition in Module\Profile\Status

[friendica.git] / src / Module / Profile / Schedule.php

diff --git a/src/Module/Profile/Schedule.php b/src/Module/Profile/Schedule.php
index 675e132db91a98e835ef8bcb59c453fda46de45b..e72b1c7a656191cd15abce4d003bd3949570189c 100644 (file)
--- a/src/Module/Profile/Schedule.php
+++ b/src/Module/Profile/Schedule.php
@@ -29,6 +29,7 @@ use Friendica\DI;
 use Friendica\Model\Post;
 use Friendica\Module\BaseProfile;
 use Friendica\Network\HTTPException;
+use Friendica\Util\DateTimeFormat;
 
 class Schedule extends BaseProfile
 {
@@ -41,7 +42,12 @@ class Schedule extends BaseProfile
                if (empty($_REQUEST['delete'])) {
                        throw new HTTPException\BadRequestException();
                }
-               self::deleteSchedule($_REQUEST['delete']);              
+
+               if (!DBA::exists('delayed-post', ['id' => $_REQUEST['delete'], 'uid' => local_user()])) {
+                       throw new HTTPException\NotFoundException();
+               }
+
+               Post\Delayed::deleteById($_REQUEST['delete']);
        }
 
        public static function content(array $parameters = [])
@@ -52,7 +58,7 @@ class Schedule extends BaseProfile
 
                $a = DI::app();
 
-               $o = self::getTabsHTML($a, 'schedule', true, $a->user);
+               $o = self::getTabsHTML($a, 'schedule', true, $a->getLoggedInUserNickname(), false);
 
                $schedule = [];
                $delayed = DBA::select('delayed-post', [], ['uid' => local_user()]);
@@ -63,7 +69,7 @@ class Schedule extends BaseProfile
                        }
                        $schedule[] = [
                                'id'           => $row['id'],
-                               'scheduled_at' => $row['delayed'],
+                               'scheduled_at' => DateTimeFormat::local($row['delayed']),
                                'content'      => BBCode::toPlaintext($parameter['item']['body'], false)
                        ];
                }
@@ -83,16 +89,4 @@ class Schedule extends BaseProfile
 
                return $o;
        }
-
-       private static function deleteSchedule($id)
-       {
-               $condtion = ['id' => $id, 'uid' => local_user()];
-               $post = DBA::selectFirst('delayed-post', ['id', 'wid'], $condtion);
-               if (empty($post['id'])) {
-                       return;
-               }
-               
-               DBA::delete('delayed-post', ['id' => $id, 'uid' => local_user()]);
-               DBA::delete('workerqueue', ['id' => $post['wid']]);
-       }
 }