From 4ff82a5f0a38dbbc9e272fca7df70ea5a190e334 Mon Sep 17 00:00:00 2001
From: Yassine Doghri <yassine@doghri.fr>
Date: Mon, 20 Sep 2021 09:49:29 +0000
Subject: [PATCH] fix: rename field status to task_status to get scheduled
activities
fix: load css using vite service for page view
---
app/Libraries/ActivityPub/Models/ActivityModel.php | 2 +-
app/Views/page.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/Libraries/ActivityPub/Models/ActivityModel.php b/app/Libraries/ActivityPub/Models/ActivityModel.php
index 5e346e45d6..9b8af37ce0 100644
--- a/app/Libraries/ActivityPub/Models/ActivityModel.php
+++ b/app/Libraries/ActivityPub/Models/ActivityModel.php
@@ -113,7 +113,7 @@ class ActivityModel extends UuidModel
public function getScheduledActivities(): array
{
return $this->where('`scheduled_at` <= NOW()', null, false)
- ->where('status', 'queued')
+ ->where('task_status', 'queued')
->orderBy('scheduled_at', 'ASC')
->findAll();
}
diff --git a/app/Views/page.php b/app/Views/page.php
index 77a04ba88b..e71877f03d 100644
--- a/app/Views/page.php
+++ b/app/Views/page.php
@@ -7,7 +7,7 @@
<title><?= $page->title ?></title>
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<link rel="shortcut icon" type="image/png" href="/favicon.ico" />
- <link rel="stylesheet" href="/assets/index.css"/>
+ <?= service('vite')->asset('styles/index.css', 'css') ?>
</head>
<body class="flex flex-col min-h-screen mx-auto">
--
GitLab