From 54ae4651f63143b673d16cd7feef98169b031a25 Mon Sep 17 00:00:00 2001
From: Sebastian Martinez <me@sebastinez.dev>
Date: Wed, 18 Sep 2024 13:01:26 +0200
Subject: [PATCH] Add `timestamp` and `revisionCount` to issue and patch
 listings

---
 src-tauri/bindings/Issue.ts       |  1 +
 src-tauri/bindings/Patch.ts       |  2 ++
 src-tauri/src/lib.rs              |  2 +-
 src-tauri/src/types/cobs.rs       | 16 +++++++++++++---
 src/components/IssueTeaser.svelte |  3 ++-
 src/components/PatchTeaser.svelte |  3 ++-
 src/lib/utils.ts                  |  2 --
 7 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src-tauri/bindings/Issue.ts b/src-tauri/bindings/Issue.ts
index 995cc231..5a95bf39 100644
--- a/src-tauri/bindings/Issue.ts
+++ b/src-tauri/bindings/Issue.ts
@@ -8,4 +8,5 @@ export type Issue = {
   state: { status: "closed"; reason: "other" | "solved" } | { status: "open" };
   assignees: Array<Author>;
   labels: Array<string>;
+  timestamp: number;
 };
diff --git a/src-tauri/bindings/Patch.ts b/src-tauri/bindings/Patch.ts
index 446b3473..94dfb707 100644
--- a/src-tauri/bindings/Patch.ts
+++ b/src-tauri/bindings/Patch.ts
@@ -23,4 +23,6 @@ export type Patch = {
       };
   assignees: Array<Author>;
   labels: Array<string>;
+  timestamp: number;
+  revisionCount: number;
 };
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 24eeb6a4..5294f66d 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -53,7 +53,7 @@ impl AppState {
                     "issues": issues,
                     "patches": patches,
                     "head": head,
-                    "lastCommit": commit.time().seconds(),
+                    "lastCommit": commit.time().seconds() * 1000,
                 },
             }))
         });
diff --git a/src-tauri/src/types/cobs.rs b/src-tauri/src/types/cobs.rs
index 68b44e83..77ec6190 100644
--- a/src-tauri/src/types/cobs.rs
+++ b/src-tauri/src/types/cobs.rs
@@ -1,4 +1,4 @@
-use radicle::cob::Label;
+use radicle::cob;
 use radicle::identity;
 use radicle::issue;
 use radicle::node::{Alias, AliasStore};
@@ -27,6 +27,7 @@ impl Author {
 
 #[derive(TS, Serialize)]
 #[ts(export)]
+#[serde(rename_all = "camelCase")]
 pub struct Issue {
     #[ts(as = "String")]
     id: String,
@@ -36,7 +37,9 @@ pub struct Issue {
     state: issue::State,
     assignees: Vec<Author>,
     #[ts(as = "Vec<String>")]
-    labels: Vec<Label>,
+    labels: Vec<cob::Label>,
+    #[ts(type = "number")]
+    timestamp: cob::Timestamp,
 }
 
 impl Issue {
@@ -51,12 +54,14 @@ impl Issue {
                 .map(|did| Author::new(*did, aliases))
                 .collect::<Vec<_>>(),
             labels: issue.labels().cloned().collect::<Vec<_>>(),
+            timestamp: issue.timestamp(),
         }
     }
 }
 
 #[derive(TS, Serialize)]
 #[ts(export)]
+#[serde(rename_all = "camelCase")]
 pub struct Patch {
     #[ts(as = "String")]
     id: String,
@@ -75,7 +80,10 @@ pub struct Patch {
     state: patch::State,
     assignees: Vec<Author>,
     #[ts(as = "Vec<String>")]
-    labels: Vec<Label>,
+    labels: Vec<cob::Label>,
+    #[ts(type = "number")]
+    timestamp: cob::Timestamp,
+    revision_count: usize,
 }
 
 impl Patch {
@@ -90,6 +98,8 @@ impl Patch {
                 .map(|did| Author::new(did, aliases))
                 .collect::<Vec<_>>(),
             labels: patch.labels().cloned().collect::<Vec<_>>(),
+            timestamp: patch.timestamp(),
+            revision_count: patch.revisions().count(),
         }
     }
 }
diff --git a/src/components/IssueTeaser.svelte b/src/components/IssueTeaser.svelte
index 65851706..f4870318 100644
--- a/src/components/IssueTeaser.svelte
+++ b/src/components/IssueTeaser.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import type { Issue } from "@bindings/Issue";
 
-  import { formatOid } from "@app/lib/utils";
+  import { formatOid, formatTimestamp } from "@app/lib/utils";
 
   import Icon from "./Icon.svelte";
   import InlineTitle from "./InlineTitle.svelte";
@@ -68,6 +68,7 @@
           alias={issue.author.alias} />
         opened
         <div class="global-oid">{formatOid(issue.id)}</div>
+        {formatTimestamp(issue.timestamp)}
       </div>
     </div>
   </div>
diff --git a/src/components/PatchTeaser.svelte b/src/components/PatchTeaser.svelte
index 42c7d4ae..115e6b24 100644
--- a/src/components/PatchTeaser.svelte
+++ b/src/components/PatchTeaser.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import type { Patch } from "@bindings/Patch";
 
-  import { formatOid } from "@app/lib/utils";
+  import { formatOid, formatTimestamp } from "@app/lib/utils";
 
   import Icon from "./Icon.svelte";
   import InlineTitle from "./InlineTitle.svelte";
@@ -73,6 +73,7 @@
           alias={patch.author.alias} />
         opened
         <div class="global-oid">{formatOid(patch.id)}</div>
+        {formatTimestamp(patch.timestamp)}
       </div>
     </div>
   </div>
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
index 735eba4c..d9e4c7cb 100644
--- a/src/lib/utils.ts
+++ b/src/lib/utils.ts
@@ -51,8 +51,6 @@ export const formatTimestamp = (
     second: 1000,
   };
 
-  // Multiplying timestamp with 1000 to convert from seconds to milliseconds
-  timestamp = timestamp * 1000;
   const rtf = new Intl.RelativeTimeFormat("en", {
     numeric: "auto",
     style: "long",