Nim v2 broke auto-setup due to strict types

Author: ThomasTJdev

README.md

@@ -320,6 +320,8 @@ nim c -d:release nimletter
 
 ### Option D) Systemd service file
 ```sh
+cp postgres.service ~/.config/systemd/user/
+# (the same as below)
 cp nimletter.service ~/.config/systemd/user/
 podman pull ghcr.io/thomastjdev/nimletter:latest
 systemctl --user daemon-reload

nimletter-compose.yaml

@@ -3,6 +3,7 @@ services:
   postgres:
     image: docker.io/postgres:17.2-alpine
     container_name: postgres
+    restart: unless-stopped
     environment:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres
@@ -20,6 +21,10 @@ services:
   nimletter:
     image: ghcr.io/thomastjdev/nimletter:latest
     container_name: nimletter
+    restart: unless-stopped
+    depends_on:
+      postgres:
+        condition: service_healthy
     environment:
       PG_HOST: localhost:5432
       PG_USER: postgres
@@ -36,8 +41,6 @@ services:
       SMTP_MAILSPERSECOND: 1
       # Use a random long string - it's part of the route to the webhook
       SNS_WEBHOOK_SECRET: secret
-    volumes:
-      - ./src/database/db_schema.sql:/home/nimmer/src/database/db_schema.sql
     ports:
       - "5555:5555"
     network_mode: host

nimletter.nimble

@@ -1,6 +1,6 @@
 # Package
 
-version       = "0.3.4"
+version       = "0.3.5"
 author        = "ThomasTJdev"
 description   = "Newsletter"
 license       = "AGPL v3"

postgres.service

@@ -0,0 +1,63 @@
+#
+# postgres.service for rootless deployment with podman and systemd
+#
+# Requires:
+# - podman
+# - systemd
+#
+# Can be updated with:
+# - podman auto-update
+# - podman auto-update --dry-run
+#
+# How to use:
+# $ cp postgres.service ~/.config/systemd/user/
+# $ podman pull docker.io/postgres:17.2-alpine
+# $ systemctl --user start postgres
+# $ systemctl --user status postgres
+# $ systemctl --user enable postgres
+#
+
+[Unit]
+Description=Podman postgres.service
+Documentation=man:podman-generate-systemd(1)
+Wants=network-online.target
+After=network-online.target
+RequiresMountsFor=%t/containers
+
+[Service]
+Environment=PODMAN_SYSTEMD_UNIT=%n
+Restart=always
+RestartSec=3
+TimeoutStopSec=70
+ExecStartPre=/bin/rm -f %t/%n.ctr-id
+ExecStart=/usr/bin/podman run \
+  --cidfile=%t/%n.ctr-id \
+  --cgroups=no-conmon \
+  --rm \
+  --sdnotify=conmon \
+  -d \
+  --replace \
+  --name postgres \
+  --init \
+  --network host \
+  --label io.containers.autoupdate=registry \
+  --log-driver journald \
+  --log-opt tag=postgres \
+  --env POSTGRES_USER=postgres \
+  --env POSTGRES_PASSWORD=postgres \
+  --env POSTGRES_DB=nimletter_db \
+  -v postgres_data:/var/lib/postgresql/data \
+  -p 5432:5432 \
+  docker.io/postgres:17.2-alpine
+ExecStop=/usr/bin/podman stop \
+  --ignore \
+  --cidfile=%t/%n.ctr-id
+ExecStopPost=/usr/bin/podman rm \
+  -f \
+  --ignore \
+  --cidfile=%t/%n.ctr-id
+Type=notify
+NotifyAccess=all
+
+[Install]
+WantedBy=multi-user.target default.target

src/database/database_connection.nim

@@ -22,8 +22,8 @@ else:
   echo "PostgreSQL: connecting ..."
   let
     pgHost      = getEnv("PG_HOST", "localhost")
-    pgUser*     = getEnv("PG_USER", "nimletter")
-    pgPassword* = getEnv("PG_PASSWORD", "nimletter")
+    pgUser*     = getEnv("PG_USER", "postgres")
+    pgPassword* = getEnv("PG_PASSWORD", "postgres")
     pgDatabase* = getEnv("PG_DATABASE", "nimletter_db")
     pgWorkers   = getEnv("PG_WORKERS", "3").parseInt()
     pg* = newPostgresPool(pgWorkers, pgHost, pgUser, pgPassword, pgDatabase)

src/database/database_setup.nim

@@ -25,7 +25,10 @@ GRANT ALL PRIVILEGES ON DATABASE $1 TO $2;
 
 
 proc databaseCreate*() =
-  let dbSchema = readFile("./src/database/db_schema.sql")
+  when defined(release):
+    let dbSchema = readFile("./db_schema.sql")
+  else:
+    let dbSchema = readFile("./src/database/db_schema.sql")
 
   let dbSplit = dbSchema.split(";\n")
 
@@ -35,11 +38,15 @@ proc databaseCreate*() =
         continue
 
       try:
+        echo "Executing SQL: " & sqlItem
         exec(conn, sql(sqlItem.strip() & ";"))
       except:
         echo "Error executing SQL: " & sqlItem
         echo "Got this error code: " & getCurrentExceptionMsg()
 
+    exec(conn, sql("INSERT INTO mails (name, identifier, category, contentHTML, contentEditor, subject) VALUES (?, ?, ?, ?, ?, ?);"), "Double Opt-In", "double-opt-in", "template", "<div style=\"background-color:#F5F5F5;color:#262626;font-family:&quot;Helvetica Neue&quot;, &quot;Arial Nova&quot;, &quot;Nimbus Sans&quot;, Arial, sans-serif;font-size:16px;font-weight:400;letter-spacing:0.15008px;line-height:1.5;margin:0;padding:32px 0;min-height:100%;width:100%\"><table align=\"center\" width=\"100%\" style=\"margin:0 auto;max-width:600px;background-color:#FFFFFF\" role=\"presentation\" cellSpacing=\"0\" cellPadding=\"0\" border=\"0\"><tbody><tr style=\"width:100%\"><td><div style=\"padding:24px 32px 24px 32px\"><h2 style=\"font-weight:bold;margin:0;font-size:24px;padding:16px 24px 16px 24px\">Hi {{ firstname | there }}</h2><div style=\"font-weight:normal;padding:16px 24px 16px 24px\">We’re glad to have you with us at {{ pagename }}!</div><div style=\"font-weight:normal;padding:16px 24px 16px 24px\">To finish subscribing to our emails, just click the button below. You can unsubscribe anytime if you change your mind.</div><div style=\"text-align:center;padding:16px 24px 16px 24px\"><a href=\"{{ hostname }}/subscribe/optin?contactUUID={{ contactUUID }}\" style=\"color:#FFFFFF;font-size:16px;font-weight:bold;background-color:#4F46E5;border-radius:4px;display:block;padding:12px 20px;text-decoration:none\" target=\"_blank\"><span><!--[if mso]><i style=\"letter-spacing: 20px;mso-font-width:-100%;mso-text-raise:30\" hidden>&nbsp;</i><![endif]--></span><span>Subscribe!</span><span><!--[if mso]><i style=\"letter-spacing: 20px;mso-font-width:-100%\" hidden>&nbsp;</i><![endif]--></span></a></div></div></td></tr></tbody></table></div>", "{ \"root\": { \"type\": \"EmailLayout\", \"data\": { \"backdropColor\": \"#F5F5F5\", \"canvasColor\": \"#FFFFFF\", \"textColor\": \"#262626\", \"fontFamily\": \"MODERN_SANS\", \"childrenIds\": [ \"block-1737229372503\" ] } }, \"block-1737229372503\": { \"type\": \"Container\", \"data\": { \"style\": { \"padding\": { \"top\": 24, \"bottom\": 24, \"right\": 32, \"left\": 32 } }, \"props\": { \"childrenIds\": [ \"block-1737229386674\", \"block-1737229395871\", \"block-1737229536738\", \"block-1737229551815\" ] } } }, \"block-1737229386674\": { \"type\": \"Heading\", \"data\": { \"props\": { \"text\": \"Hi {{ firstname | there }}\" }, \"style\": { \"padding\": { \"top\": 16, \"bottom\": 16, \"right\": 24, \"left\": 24 } } } }, \"block-1737229395871\": { \"type\": \"Text\", \"data\": { \"style\": { \"fontWeight\": \"normal\", \"padding\": { \"top\": 16, \"bottom\": 16, \"right\": 24, \"left\": 24 } }, \"props\": { \"text\": \"We’re glad to have you with us at {{ pagename }}!\" } } }, \"block-1737229536738\": { \"type\": \"Text\", \"data\": { \"style\": { \"fontWeight\": \"normal\", \"padding\": { \"top\": 16, \"bottom\": 16, \"right\": 24, \"left\": 24 } }, \"props\": { \"text\": \"To finish subscribing to our emails, just click the button below. You can unsubscribe anytime if you change your mind.\" } } }, \"block-1737229551815\": { \"type\": \"Button\", \"data\": { \"style\": { \"fontWeight\": \"bold\", \"textAlign\": \"center\", \"padding\": { \"top\": 16, \"bottom\": 16, \"right\": 24, \"left\": 24 } }, \"props\": { \"buttonBackgroundColor\": \"#4F46E5\", \"fullWidth\": true, \"text\": \"Subscribe!\", \"url\": \"{{ hostname }}/subscribe/optin?contactUUID={{ contactUUID }}\" } } } }", "Confirm your email address")
+
+    exec(conn, sql("INSERT INTO settings (page_name, hostname, optin_email) VALUES (?, ?, ?) ON CONFLICT DO NOTHING;"), "Nimletter, drip it!", "https://nimletter.com", 1)
 
 proc databaseDelete*() =
   pg.withConnection conn:

src/database/database_testdata.nim

@@ -30,28 +30,28 @@ proc insertTestData*() =
         """))
 
     exec(conn, sql("""
-      INSERT INTO mails (name, created_at, updated_at, contentHTML, tags, category, editorType, uuid, identifier)
+      INSERT INTO mails (name, contentHTML, tags, category, editorType, identifier)
       VALUES
-      ('Welcome Email', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Hey {{ firstname }}, Welcome to our service!', ARRAY['welcome', 'intro'], 'informational', 'html', uuid_generate_v4(), 'welcome-email'),
-      ('Follow-up Email', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Here is some {{ interest | important }} more information.', ARRAY['followup', 'info'], 'informational', 'html', uuid_generate_v4(), 'followup-email'),
-      ('Anything else?', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Anything else you want?', ARRAY['followup', 'info'], 'informational', 'html', uuid_generate_v4(), 'anything-else'),
-      ('Like it, then click', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Like it, then click', ARRAY['marketing', 'info'], 'drip', 'html', uuid_generate_v4(), 'like-it-then-click'),
-      ('Wee see you (EmailBuilder)', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Wee see you', ARRAY['marketing', 'info'], 'drip', 'emailbuilder', uuid_generate_v4(), 'wee-see-you');
+      ('Welcome Email', 'Hey {{ firstname }}, Welcome to our service!', ARRAY['welcome', 'intro'], 'informational', 'html', 'welcome-email'),
+      ('Follow-up Email', 'Here is some {{ interest | important }} more information.', ARRAY['followup', 'info'], 'informational', 'html', 'followup-email'),
+      ('Anything else', 'Anything else you want', ARRAY['followup', 'info'], 'informational', 'html', 'anything-else'),
+      ('Like it, then click', 'Like it, then click', ARRAY['marketing', 'info'], 'drip', 'html', 'like-it-then-click'),
+      ('Wee see you (EmailBuilder)', 'Wee see you', ARRAY['marketing', 'info'], 'drip', 'emailbuilder', 'wee-see-you');
     """))
 
     exec(conn, sql("""
-      INSERT INTO flows (name, created_at, updated_at)
+      INSERT INTO flows (name)
       VALUES
-      ('Welcome Flow', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
-      ('Click Open Flow', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+      ('Welcome Flow'),
+      ('Click Open Flow');
     """))
 
     exec(conn, sql("""
       INSERT INTO flow_steps (flow_id, mail_id, step_number, trigger_type, delay_minutes, name, subject, created_at)
       VALUES
       ((SELECT id FROM flows WHERE name = 'Welcome Flow'), (SELECT id FROM mails WHERE name = 'Welcome Email'), 1, 'delay', 1, 'Step 1', 'Welcome to our service!', CURRENT_TIMESTAMP),
       ((SELECT id FROM flows WHERE name = 'Welcome Flow'), (SELECT id FROM mails WHERE name = 'Follow-up Email'), 2, 'delay', 1, 'Step 2', 'Follow-up Information', CURRENT_TIMESTAMP),
-      ((SELECT id FROM flows WHERE name = 'Welcome Flow'), (SELECT id FROM mails WHERE name = 'Anything else?'), 3, 'delay', 1, 'Step 3', 'Anything else subject?', CURRENT_TIMESTAMP),
+      ((SELECT id FROM flows WHERE name = 'Welcome Flow'), (SELECT id FROM mails WHERE name = 'Anything else'), 3, 'delay', 1, 'Step 3', 'Anything else subject', CURRENT_TIMESTAMP),
       ((SELECT id FROM flows WHERE name = 'Click Open Flow'), (SELECT id FROM mails WHERE name = 'Like it, then click'), 1, 'delay', 0, 'Step 1', 'Like it, then click', CURRENT_TIMESTAMP),
       ((SELECT id FROM flows WHERE name = 'Click Open Flow'), (SELECT id FROM mails WHERE name = 'Wee see you (EmailBuilder)'), 2, 'click', 0, 'Step 2', 'Wee see you', CURRENT_TIMESTAMP);
         """))

src/database/db_schema.sql

@@ -17,7 +17,7 @@ CREATE TABLE IF NOT EXISTS mails (
   category            TEXT,           -- Category of the mail (e.g., promotional, informational)
   uuid                UUID NOT NULL DEFAULT uuid_generate_v4()  -- Unique identifier
 );
-INSERT INTO mails (name, identifier, category, contentHTML, contentEditor, subject) VALUES ('Double Opt-In', 'double-opt-in', 'template', '<div style="background-color:#F5F5F5;color:#262626;font-family:&quot;Helvetica Neue&quot;, &quot;Arial Nova&quot;, &quot;Nimbus Sans&quot;, Arial, sans-serif;font-size:16px;font-weight:400;letter-spacing:0.15008px;line-height:1.5;margin:0;padding:32px 0;min-height:100%;width:100%"><table align="center" width="100%" style="margin:0 auto;max-width:600px;background-color:#FFFFFF" role="presentation" cellSpacing="0" cellPadding="0" border="0"><tbody><tr style="width:100%"><td><div style="padding:24px 32px 24px 32px"><h2 style="font-weight:bold;margin:0;font-size:24px;padding:16px 24px 16px 24px">Hi {{ firstname | there }}</h2><div style="font-weight:normal;padding:16px 24px 16px 24px">We’re glad to have you with us at {{ pagename }}!</div><div style="font-weight:normal;padding:16px 24px 16px 24px">To finish subscribing to our emails, just click the button below. You can unsubscribe anytime if you change your mind.</div><div style="text-align:center;padding:16px 24px 16px 24px"><a href="{{ hostname }}/subscribe/optin?contactUUID={{ contactUUID }}" style="color:#FFFFFF;font-size:16px;font-weight:bold;background-color:#4F46E5;border-radius:4px;display:block;padding:12px 20px;text-decoration:none" target="_blank"><span><!--[if mso]><i style="letter-spacing: 20px;mso-font-width:-100%;mso-text-raise:30" hidden>&nbsp;</i><![endif]--></span><span>Subscribe!</span><span><!--[if mso]><i style="letter-spacing: 20px;mso-font-width:-100%" hidden>&nbsp;</i><![endif]--></span></a></div></div></td></tr></tbody></table></div>', '{ "root": { "type": "EmailLayout", "data": { "backdropColor": "#F5F5F5", "canvasColor": "#FFFFFF", "textColor": "#262626", "fontFamily": "MODERN_SANS", "childrenIds": [ "block-1737229372503" ] } }, "block-1737229372503": { "type": "Container", "data": { "style": { "padding": { "top": 24, "bottom": 24, "right": 32, "left": 32 } }, "props": { "childrenIds": [ "block-1737229386674", "block-1737229395871", "block-1737229536738", "block-1737229551815" ] } } }, "block-1737229386674": { "type": "Heading", "data": { "props": { "text": "Hi {{ firstname | there }}" }, "style": { "padding": { "top": 16, "bottom": 16, "right": 24, "left": 24 } } } }, "block-1737229395871": { "type": "Text", "data": { "style": { "fontWeight": "normal", "padding": { "top": 16, "bottom": 16, "right": 24, "left": 24 } }, "props": { "text": "We’re glad to have you with us at {{ pagename }}!" } } }, "block-1737229536738": { "type": "Text", "data": { "style": { "fontWeight": "normal", "padding": { "top": 16, "bottom": 16, "right": 24, "left": 24 } }, "props": { "text": "To finish subscribing to our emails, just click the button below. You can unsubscribe anytime if you change your mind." } } }, "block-1737229551815": { "type": "Button", "data": { "style": { "fontWeight": "bold", "textAlign": "center", "padding": { "top": 16, "bottom": 16, "right": 24, "left": 24 } }, "props": { "buttonBackgroundColor": "#4F46E5", "fullWidth": true, "text": "Subscribe!", "url": "{{ hostname }}/subscribe/optin?contactUUID={{ contactUUID }}" } } } }', 'Confirm your email address') ON CONFLICT DO NOTHING;
+
 
 -- Table for flows (campaigns or automated sequences)
 CREATE TABLE IF NOT EXISTS flows (
@@ -66,7 +66,7 @@ CREATE TABLE IF NOT EXISTS contacts (
   created_at          TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
   updated_at          TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
   requires_double_opt_in BOOLEAN DEFAULT TRUE,  -- Flag for double opt-in status
-  double_opt_in_sent  BOOLEAN DEFAULT FALSE,  -- Has initial double opt-in email been sent?
+  double_opt_in_sent  BOOLEAN DEFAULT FALSE,  -- Has initial double opt-in email been sent
   double_opt_in       BOOLEAN DEFAULT FALSE,  -- Flag for double opt-in status
   double_opt_in_data  TEXT, -- IP address, timestamp, etc.
   pending_lists       INT[], -- Pending lists to be signed up to until double_opt_in is complete
@@ -158,7 +158,7 @@ CREATE TABLE IF NOT EXISTS settings (
   optin_email         INT NOT NULL REFERENCES mails(id),
   logo_url            TEXT
 );
-INSERT INTO settings (page_name, hostname, optin_email) VALUES ('Nimletter, drip it!', 'https://nimletter.com', 1) ON CONFLICT DO NOTHING;
+
 
 -- Table for smtp
 CREATE TABLE IF NOT EXISTS smtp_settings (
@@ -223,5 +223,8 @@ CREATE TABLE IF NOT EXISTS sessions (
 
 -- Indexes for efficient querying
 CREATE INDEX IF NOT EXISTS idx_pending_emails_scheduled_for ON pending_emails (scheduled_for);
+
 CREATE INDEX IF NOT EXISTS idx_email_opens_user_id ON email_opens (user_id);
+
 CREATE INDEX IF NOT EXISTS idx_email_clicks_user_id ON email_clicks (user_id);
+