Merge branch 'main' into main

.gitignore

@@ -2,3 +2,4 @@
 /db.sqlite
 .idea/
 .DS_Store
+certs/

.pre-commit-config.yaml

@@ -0,0 +1,29 @@
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.5.0
+    hooks:
+      - id: check-toml
+      - id: end-of-file-fixer
+      - id: fix-byte-order-marker
+      - id: mixed-line-ending
+      - id: trailing-whitespace
+
+  - repo: local
+    hooks:
+      - id: fmt
+        name: fmt
+        description: Format
+        entry: cargo fmt
+        language: system
+        args:
+          - --all
+        types: [ rust ]
+        pass_filenames: false
+
+      - id: check
+        name: check
+        description: Check
+        entry: cargo check
+        language: system
+        types: [ rust ]
+        pass_filenames: false

crates/lavina-core/migrations/0000_first.sql

@@ -0,0 +1,36 @@
+CREATE TABLE users
+(
+    id   INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+    name STRING UNIQUE NOT NULL
+);
+
+-- for development only, replace with properly hashed passwords later
+CREATE TABLE challenges_plain_password
+(
+    user_id  INTEGER PRIMARY KEY NOT NULL,
+    password STRING              NOT NULL
+);
+
+CREATE TABLE rooms
+(
+    id            INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+    name          STRING UNIQUE NOT NULL,
+    topic         STRING        NOT NULL,
+    message_count INTEGER       NOT NULL DEFAULT 0
+);
+
+CREATE TABLE messages
+(
+    room_id INTEGER NOT NULL,
+    id      INTEGER NOT NULL, -- unique per room, sequential in one room
+    content STRING  NOT NULL,
+    PRIMARY KEY (room_id, id)
+);
+
+CREATE TABLE memberships
+(
+    user_id INTEGER NOT NULL,
+    room_id INTEGER NOT NULL,
+    status  INTEGER NOT NULL, -- 0 for not-joined, 1 for joined, 2 for banned
+    PRIMARY KEY (user_id, room_id)
+);

crates/lavina-core/migrations/0001_msg_author.sql

@@ -0,0 +1,2 @@
+ALTER TABLE messages
+    ADD author_id INTEGER NULL REFERENCES users (id);

crates/lavina-core/migrations/0_first.sql

@@ -1,31 +0,0 @@
-create table users(
-    id integer primary key autoincrement not null,
-    name string unique not null
-);
-
--- for development only, replace with properly hashed passwords later
-create table challenges_plain_password(
-    user_id integer primary key not null,
-    password string not null
-);
-
-create table rooms(
-    id integer primary key autoincrement not null,
-    name string unique not null,
-    topic string not null,
-    message_count integer not null default 0
-);
-
-create table messages(
-    room_id integer not null,
-    id integer not null,  -- unique per room, sequential in one room
-    content string not null,
-    primary key (room_id, id)
-);
-
-create table memberships(
-    user_id integer not null,
-    room_id integer not null,
-    status integer not null, -- 0 for not-joined, 1 for joined, 2 for banned
-    primary key (user_id, room_id)
-);

crates/lavina-core/migrations/1_msg_author.sql

@@ -1 +0,0 @@
-alter table messages add author_id integer null references users(id);