Deploy msgboard
Browse files- src/msgboard/db.py +10 -1
- src/msgboard/store.py +13 -0
src/msgboard/db.py
CHANGED
|
@@ -540,10 +540,19 @@ CREATE TABLE channel_imports (
|
|
| 540 |
);
|
| 541 |
"""
|
| 542 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 543 |
# Index i holds the SQL that moves the schema from version i to i + 1.
|
| 544 |
MIGRATIONS = [SCHEMA_V1, SCHEMA_V2, SCHEMA_V3, SCHEMA_V4, SCHEMA_V5, SCHEMA_V6, SCHEMA_V7, SCHEMA_V8, SCHEMA_V9,
|
| 545 |
SCHEMA_V10, SCHEMA_V11, SCHEMA_V12, SCHEMA_V13, SCHEMA_V14, SCHEMA_V15, SCHEMA_V16, SCHEMA_V17, SCHEMA_V18, SCHEMA_V19, SCHEMA_V20, SCHEMA_V21, SCHEMA_V22,
|
| 546 |
-
SCHEMA_V23, SCHEMA_V24, SCHEMA_V25, SCHEMA_V26, SCHEMA_V27, SCHEMA_V28]
|
| 547 |
SCHEMA_VERSION = len(MIGRATIONS)
|
| 548 |
|
| 549 |
|
|
|
|
| 540 |
);
|
| 541 |
"""
|
| 542 |
|
| 543 |
+
# v29: one-time membership backfill; subsequent sign-ins/restarts respect leaving.
|
| 544 |
+
SCHEMA_V29 = """
|
| 545 |
+
INSERT OR IGNORE INTO channel_members (channel_id, principal_id, added_by, added_at)
|
| 546 |
+
SELECT c.id, p.id, NULL, CAST(strftime('%s', 'now') AS REAL)
|
| 547 |
+
FROM channels c CROSS JOIN principals p
|
| 548 |
+
WHERE c.name = 'general' AND c.kind = 'public' AND c.archived = 0
|
| 549 |
+
AND p.identity_type = 'user' AND p.disabled = 0 AND p.role != 'guest';
|
| 550 |
+
"""
|
| 551 |
+
|
| 552 |
# Index i holds the SQL that moves the schema from version i to i + 1.
|
| 553 |
MIGRATIONS = [SCHEMA_V1, SCHEMA_V2, SCHEMA_V3, SCHEMA_V4, SCHEMA_V5, SCHEMA_V6, SCHEMA_V7, SCHEMA_V8, SCHEMA_V9,
|
| 554 |
SCHEMA_V10, SCHEMA_V11, SCHEMA_V12, SCHEMA_V13, SCHEMA_V14, SCHEMA_V15, SCHEMA_V16, SCHEMA_V17, SCHEMA_V18, SCHEMA_V19, SCHEMA_V20, SCHEMA_V21, SCHEMA_V22,
|
| 555 |
+
SCHEMA_V23, SCHEMA_V24, SCHEMA_V25, SCHEMA_V26, SCHEMA_V27, SCHEMA_V28, SCHEMA_V29]
|
| 556 |
SCHEMA_VERSION = len(MIGRATIONS)
|
| 557 |
|
| 558 |
|
src/msgboard/store.py
CHANGED
|
@@ -216,6 +216,16 @@ def visible_channel_ids(conn, p: Principal) -> list[int] | None:
|
|
| 216 |
# --------------------------------------------------------------- bootstrap admin
|
| 217 |
|
| 218 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 219 |
def admin_exists(conn) -> bool:
|
| 220 |
return conn.execute("SELECT 1 FROM principals WHERE issuer = 'local' AND external_id = 'operator'").fetchone() is not None
|
| 221 |
|
|
@@ -716,6 +726,8 @@ def create_channel(conn, p: Principal, name, description, private, now: float) -
|
|
| 716 |
cid = cur.lastrowid
|
| 717 |
conn.execute("INSERT INTO channel_members (channel_id, principal_id, added_by, added_at) VALUES (?, ?, ?, ?)",
|
| 718 |
(cid, p.id, p.id, now))
|
|
|
|
|
|
|
| 719 |
audit(conn, p.id, "channel.create", f"channel:{cid}", {"name": name, "private": private}, now)
|
| 720 |
return _channel_json(conn, conn.execute("SELECT * FROM channels WHERE id = ?", (cid,)).fetchone()), True
|
| 721 |
|
|
@@ -1118,6 +1130,7 @@ def join(conn, code, name, display_name, now: float) -> dict:
|
|
| 1118 |
(PEOPLE, name, row["role"], display_name, now, inviter["id"], row["id"])).lastrowid
|
| 1119 |
conn.execute("UPDATE invites SET uses = uses + 1 WHERE id = ?", (row["id"],))
|
| 1120 |
_join_channels(conn, row, pid, now)
|
|
|
|
| 1121 |
_, token = _new_credential(conn, pid, inviter["id"], now)
|
| 1122 |
audit(conn, pid, "join.human", f"principal:{pid}", {"invite": row["id"], "role": row["role"]}, now)
|
| 1123 |
return {"token": token, "principal": principal_json(conn, _principal_row(conn, pid)), "created": True, "next": JOIN_NEXT}
|
|
|
|
| 216 |
# --------------------------------------------------------------- bootstrap admin
|
| 217 |
|
| 218 |
|
| 219 |
+
def _join_general(conn, now: float, principal_id: int | None = None) -> None:
|
| 220 |
+
"""Initial membership only: never call on sign-in or server startup."""
|
| 221 |
+
sql = """INSERT OR IGNORE INTO channel_members (channel_id, principal_id, added_by, added_at)
|
| 222 |
+
SELECT c.id, p.id, NULL, ? FROM channels c CROSS JOIN principals p
|
| 223 |
+
WHERE c.name = 'general' AND c.kind = 'public' AND c.archived = 0
|
| 224 |
+
AND p.identity_type = 'user' AND p.disabled = 0 AND p.role != 'guest'"""
|
| 225 |
+
conn.execute(sql + (" AND p.id = ?" if principal_id is not None else ""),
|
| 226 |
+
(now, principal_id) if principal_id is not None else (now,))
|
| 227 |
+
|
| 228 |
+
|
| 229 |
def admin_exists(conn) -> bool:
|
| 230 |
return conn.execute("SELECT 1 FROM principals WHERE issuer = 'local' AND external_id = 'operator'").fetchone() is not None
|
| 231 |
|
|
|
|
| 726 |
cid = cur.lastrowid
|
| 727 |
conn.execute("INSERT INTO channel_members (channel_id, principal_id, added_by, added_at) VALUES (?, ?, ?, ?)",
|
| 728 |
(cid, p.id, p.id, now))
|
| 729 |
+
if name == "general" and not private:
|
| 730 |
+
_join_general(conn, now)
|
| 731 |
audit(conn, p.id, "channel.create", f"channel:{cid}", {"name": name, "private": private}, now)
|
| 732 |
return _channel_json(conn, conn.execute("SELECT * FROM channels WHERE id = ?", (cid,)).fetchone()), True
|
| 733 |
|
|
|
|
| 1130 |
(PEOPLE, name, row["role"], display_name, now, inviter["id"], row["id"])).lastrowid
|
| 1131 |
conn.execute("UPDATE invites SET uses = uses + 1 WHERE id = ?", (row["id"],))
|
| 1132 |
_join_channels(conn, row, pid, now)
|
| 1133 |
+
_join_general(conn, now, pid)
|
| 1134 |
_, token = _new_credential(conn, pid, inviter["id"], now)
|
| 1135 |
audit(conn, pid, "join.human", f"principal:{pid}", {"invite": row["id"], "role": row["role"]}, now)
|
| 1136 |
return {"token": token, "principal": principal_json(conn, _principal_row(conn, pid)), "created": True, "next": JOIN_NEXT}
|