refactor

src-tauri/migrations/20230418013219_initial_data.sql

@@ -6,13 +6,11 @@
 CREATE TABLE
   accounts (
     id INTEGER NOT NULL PRIMARY KEY,
+    npub TEXT NOT NULL UNIQUE,
     pubkey TEXT NOT NULL UNIQUE,
     privkey TEXT NOT NULL,
+    follows JSON,
     is_active INTEGER NOT NULL DEFAULT 0,
-    follows TEXT,
-    channels TEXT,
-    chats TEXT,
-    metadata TEXT,
     created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP
   );
 
@@ -20,8 +18,18 @@ CREATE TABLE
 CREATE TABLE
   plebs (
     id INTEGER NOT NULL PRIMARY KEY,
-    pubkey TEXT NOT NULL UNIQUE,
-    metadata TEXT,
+    npub TEXT NOT NULL UNIQUE,
+    display_name TEXT,
+    name TEXT,
+    username TEXT,
+    about TEXT,
+    bio TEXT,
+    website TEXT,
+    picture TEXT,
+    banner TEXT,
+    nip05 TEXT,
+    lud06 TEXT,
+    lud16 TEXT,
     created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP
   );
 
@@ -33,10 +41,11 @@ CREATE TABLE
     account_id INTEGER NOT NULL,
     pubkey TEXT NOT NULL,
     kind INTEGER NOT NULL DEFAULT 1,
-    tags TEXT NOT NULL,
+    tags JSON,
     content TEXT NOT NULL,
     created_at INTEGER NOT NULL,
     parent_id TEXT,
+    parent_comment_id TEXT,
     FOREIGN KEY (account_id) REFERENCES accounts (id)
   );
 
@@ -45,7 +54,9 @@ CREATE TABLE
   channels (
     id INTEGER NOT NULL PRIMARY KEY,
     event_id TEXT NOT NULL UNIQUE,
-    metadata TEXT NOT NULL,
+    name TEXT,
+    about TEXT,
+    picture TEXT,
     created_at INTEGER NOT NULL
   );
 

src-tauri/migrations/20230418080146_create_chats.sql

@@ -3,8 +3,9 @@
 CREATE TABLE
   chats (
     id INTEGER NOT NULL PRIMARY KEY,
-    account_id INTEGER NOT NULL,
-    pubkey TEXT NOT NULL UNIQUE,
-    created_at INTEGER NOT NULL,
-    FOREIGN KEY (account_id) REFERENCES accounts (id)
+    event_id TEXT NOT NULL UNIQUE,
+    receiver_pubkey INTEGER NOT NULL,
+    sender_pubkey TEXT NOT NULL,
+    content TEXT NOT NULL,
+    created_at INTEGER NOT NULL
   );

src-tauri/migrations/20230425024708_add_default_channels.sql

@@ -1,40 +1,57 @@
 -- Add migration script here
 INSERT
-OR IGNORE INTO channels (event_id, pubkey, metadata, created_at)
+OR IGNORE INTO channels (
+  event_id,
+  pubkey,
+  name,
+  about,
+  picture,
+  created_at
+)
 VALUES
   (
     "e3cadf5beca1b2af1cddaa41a633679bedf263e3de1eb229c6686c50d85df753",
     "126103bfddc8df256b6e0abfd7f3797c80dcc4ea88f7c2f87dd4104220b4d65f",
-    '{"name":"lume-general","picture":"https://void.cat/d/UNyxBmAh1MUx5gQTX95jyf.webp","about":"General channel for Lume"}',
+    "lume-general",
+    "General channel for Lume",
+    "https://void.cat/d/UNyxBmAh1MUx5gQTX95jyf.webp",
     1681898574
   );
 
 INSERT
-OR IGNORE INTO channels (event_id, pubkey, metadata, created_at)
-VALUES
-  (
-    "1abf8948d2fd05dd1836b33b324dca65138b2e80c77b27eeeed4323246efba4d",
-    "126103bfddc8df256b6e0abfd7f3797c80dcc4ea88f7c2f87dd4104220b4d65f",
-    '{"picture":"https://void.cat/d/MsqUKXXC4SxDfmT2KiHovJ.webp","name":"Arcade Open R&D","about":""}',
-    1682252461
-  );
-
-INSERT
-OR IGNORE INTO channels (event_id, pubkey, metadata, created_at)
+OR IGNORE INTO channels (
+  event_id,
+  pubkey,
+  name,
+  about,
+  picture,
+  created_at
+)
 VALUES
   (
     "42224859763652914db53052103f0b744df79dfc4efef7e950fc0802fc3df3c5",
     "460c25e682fda7832b52d1f22d3d22b3176d972f60dcdc3212ed8c92ef85065c",
-    '{"about":"General discussion about the Amethyst Nostr client for Android","name":"Amethyst Users","picture":"https://nostr.build/i/5970.png"}',
+    "Amethyst Users",
+    "General discussion about the Amethyst Nostr client for Android",
+    "https://nostr.build/i/5970.png",
     1674092111
   );
 
 INSERT
-OR IGNORE INTO channels (event_id, pubkey, metadata, created_at)
+OR IGNORE INTO channels (
+  event_id,
+  pubkey,
+  name,
+  about,
+  picture,
+  created_at
+)
 VALUES
   (
     "25e5c82273a271cb1a840d0060391a0bf4965cafeb029d5ab55350b418953fbb",
     "ed1d0e1f743a7d19aa2dfb0162df73bacdbc699f67cc55bb91a98c35f7deac69",
-    '{"about":"","name":"Nostr","picture":"https://cloudflare-ipfs.com/ipfs/QmTN4Eas9atUULVbEAbUU8cowhtvK7g3t7jfKztY7wc8eP?.png"}',
+    "Nostr",
+    "",
+    "https://cloudflare-ipfs.com/ipfs/QmTN4Eas9atUULVbEAbUU8cowhtvK7g3t7jfKztY7wc8eP?.png",
     1661333723
   );

src-tauri/migrations/20230427081017_clean_up_account.sql

@@ -1,6 +0,0 @@
--- Add migration script here
-ALTER TABLE accounts
-DROP COLUMN channels;
-
-ALTER TABLE accounts
-DROP COLUMN chats;

src-tauri/src/main.rs

@@ -87,12 +87,6 @@ fn main() {
               sql: include_str!("../migrations/20230425050745_add_blacklist_model.sql"),
               kind: MigrationKind::Up,
             },
-            Migration {
-              version: 20230427081017,
-              description: "clean up account",
-              sql: include_str!("../migrations/20230427081017_clean_up_account.sql"),
-              kind: MigrationKind::Up,
-            },
             Migration {
               version: 20230521092300,
               description: "create block",