fix: Switch to the Todoist v1 API

Author: notheotherben

Cargo.lock

@@ -28,7 +28,7 @@ serde = { version = "1.0.219", features = ["alloc", "derive"] }
 serde_json = { version = "1.0.149", features = ["alloc"] }
 sha2 = "0.10.8"
 sha256 = "1.6.0"
-todoist-api = "0.3.1"
+todoist-api = "1.0.0-alpha.1"
 tokio = { version = "1.49.0", features = ["net", "io-std", "rt-multi-thread", "time", "fs", "tracing"] }
 tokio-rusqlite = "0.7.0"
 toml = "1.0.1"

Cargo.toml

@@ -18,6 +18,27 @@ const ADVICE_DB_ERROR: &[&str] = &[
 const ADVICE_REPORT_DEV: &[&str] =
     &["Please report this issue to the development team via GitHub."];
 
+const MIGRATIONS: &[&str] = &[
+    "CREATE TABLE IF NOT EXISTS kv (
+        partition TEXT NOT NULL,
+        key TEXT NOT NULL,
+        value TEXT NOT NULL,
+        PRIMARY KEY (partition, key)
+    )",
+    "CREATE TABLE IF NOT EXISTS queues (
+        partition TEXT NOT NULL,
+        key TEXT NOT NULL,
+        payload TEXT,
+        scheduledAt DATETIME DEFAULT CURRENT_TIMESTAMP,
+        hiddenUntil DATETIME DEFAULT CURRENT_TIMESTAMP,
+        reservedBy TEXT,
+        PRIMARY KEY (partition, key)
+    )",
+    "CREATE INDEX IF NOT EXISTS idx_queues_partition_hidden ON queues (partition, hiddenUntil)",
+    "ALTER TABLE queues ADD COLUMN traceparent TEXT",
+    "ALTER TABLE queues ADD COLUMN tracestate TEXT",
+];
+
 impl SqliteDatabase {
     pub async fn open(path: &str) -> Result<Self, errors::Error> {
         let connection = Connection::open(path).await.wrap_user_err(
@@ -341,27 +362,6 @@ impl Queue for SqliteDatabase {
     }
 }
 
-const MIGRATIONS: &[&str] = &[
-    "CREATE TABLE IF NOT EXISTS kv (
-        partition TEXT NOT NULL,
-        key TEXT NOT NULL,
-        value TEXT NOT NULL,
-        PRIMARY KEY (partition, key)
-    )",
-    "CREATE TABLE IF NOT EXISTS queues (
-        partition TEXT NOT NULL,
-        key TEXT NOT NULL,
-        payload TEXT,
-        scheduledAt DATETIME DEFAULT CURRENT_TIMESTAMP,
-        hiddenUntil DATETIME DEFAULT CURRENT_TIMESTAMP,
-        reservedBy TEXT,
-        PRIMARY KEY (partition, key)
-    )",
-    "CREATE INDEX IF NOT EXISTS idx_queues_partition_hidden ON queues (partition, hiddenUntil)",
-    "ALTER TABLE queues ADD COLUMN traceparent TEXT",
-    "ALTER TABLE queues ADD COLUMN tracestate TEXT",
-];
-
 #[cfg(test)]
 mod tests {
     use crate::db::QueueMessage;

src/db/sqlite.rs

@@ -47,12 +47,26 @@ impl TodoistClient {
                 key,
                 move || {
                     Box::pin(async move {
-                        client.get_projects().await.wrap_user_err(
-                "Failed to fetch Todoist projects.",
-                &[
-                    "Check that your Todoist API token is valid and has the necessary permissions.",
-                ],
-            )
+                      let mut projects = Vec::new();
+                      let mut cursor = None;
+
+                      loop {
+                        let response = client.get_projects(None, cursor).await.wrap_user_err(
+                            "Failed to fetch Todoist projects.",
+                            &[
+                                "Check that your Todoist API token is valid and has the necessary permissions.",
+                            ],
+                        )?;
+
+                        projects.extend(response.results);
+                        cursor = response.next_cursor;
+
+                        if cursor.is_none() {
+                            break;
+                        }
+                      }
+
+                      Ok(projects)
                     })
                 },
                 chrono::Duration::hours(24),
@@ -93,12 +107,23 @@ impl TodoistClient {
                     key,
                     move || {
                         Box::pin(async move {
-                            client.get_sections().await.wrap_user_err(
-                    "Failed to fetch Todoist sections.",
-                    &[
-                        "Check that your Todoist API token is valid and has the necessary permissions.",
-                    ],
-                )
+                          let mut sections = Vec::new();
+                          let mut cursor = None;
+                          loop {
+                            let response = client.get_sections(None, cursor).await.wrap_user_err(
+                                "Failed to fetch Todoist sections.",
+                                &[
+                                    "Check that your Todoist API token is valid and has the necessary permissions.",
+                                ],
+                            )?;
+                            sections.extend(response.results);
+                            cursor = response.next_cursor;
+                            if cursor.is_none() {
+                                break;
+                            }
+                          }
+
+                          Ok(sections)
                         })
                     },
                     chrono::Duration::hours(24),

src/publishers/todoist.rs

@@ -75,7 +75,7 @@ impl Job for TodoistUpsertTask {
                 ],
             )?;
 
-            if task.is_completed {
+            if task.completed_at.is_some() {
                 client.0.reopen_task(&existing_task.id).await.wrap_user_err(
                     format!("Failed to reopen completed Todoist task '{}'.", job.title),
                     &[

src/publishers/todoist_upsert.rs

@@ -0,0 +1,17 @@
+use yew::prelude::*;
+
+use crate::{prelude::*, ui::render_page};
+
+pub async fn admin_index<S: Services>(
+    _services: actix_web::web::Data<S>,
+) -> actix_web::HttpResponse {
+    render_page("Admin | Automate", || {
+        html! {
+            <crate::ui::Center>
+                <h1>{ "Admin Dashboard" }</h1>
+                <p>{ "Welcome to the admin dashboard." }</p>
+            </crate::ui::Center>
+        }
+    })
+    .await
+}

src/web/admin.rs

@@ -3,6 +3,7 @@ use human_errors::ResultExt;
 
 use crate::{filter::Filterable, prelude::Services};
 
+mod admin;
 mod oauth;
 mod telemetry;
 mod ui;
@@ -42,7 +43,7 @@ pub async fn run_web_server<S: Services + Clone + Send + Sync + 'static>(
                                     .unwrap_or(false)
                             })
                         }))
-                        .to(ui::admin_index::<S>),
+                        .to(admin::admin_index::<S>),
                 )
                 .default_service(web::to(ui::not_found))
         })

src/web/mod.rs

@@ -1,7 +1,7 @@
 use actix_web::HttpResponseBuilder;
 use yew::{ServerRenderer, prelude::*};
 
-use crate::{prelude::*, ui::render_page};
+use crate::ui::render_page;
 
 pub async fn index() -> actix_web::HttpResponse {
     render_page("Automate | Sierra Softworks", || {
@@ -18,20 +18,6 @@ pub async fn index() -> actix_web::HttpResponse {
     }).await
 }
 
-pub async fn admin_index<S: Services>(
-    _services: actix_web::web::Data<S>,
-) -> actix_web::HttpResponse {
-    render_page("Admin | Automate", || {
-        html! {
-            <crate::ui::Center>
-                <h1>{ "Admin Dashboard" }</h1>
-                <p>{ "Welcome to the admin dashboard." }</p>
-            </crate::ui::Center>
-        }
-    })
-    .await
-}
-
 pub async fn not_found() -> actix_web::HttpResponse {
     error_page(
         404,