From 545d261bddf34f171913e46bb19de99dda5aa0e8 Mon Sep 17 00:00:00 2001 From: Luna Mendes Date: Fri, 6 Jul 2018 02:29:17 -0300 Subject: [PATCH] schema.sql: fix syntax --- README.md | 8 +++++++- litecord/blueprints/channels.py | 2 +- schema.sql | 15 +++++++++------ 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 78a8259..2037582 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,12 @@ We use [pipenv] to manage our dependencies. $ git clone https://gitlab.com/lnmds/litecord $ cd litecord +# create users as you want, etc +$ psql -U some_user -f schema.sql database + +# edit config.py as you please +$ cp config.example.py config.py + # install all packages, including dev-packages $ pipenv install --dev ``` @@ -28,5 +34,5 @@ $ pipenv install --dev $ pipenv shell # boot litecord -$ hypercorn run:app +$ hypercorn -b 0.0.0.0:5000 run:app ``` diff --git a/litecord/blueprints/channels.py b/litecord/blueprints/channels.py index 79a8468..8c362c6 100644 --- a/litecord/blueprints/channels.py +++ b/litecord/blueprints/channels.py @@ -164,7 +164,7 @@ async def delete_message(channel_id, message_id): """, message_id) # TODO: MANAGE_MESSAGES permission check - if not author_id == user_id: + if author_id != user_id: raise Forbidden('You can not delete this message') await app.db.execute(""" diff --git a/schema.sql b/schema.sql index aa63764..f8cad86 100644 --- a/schema.sql +++ b/schema.sql @@ -155,18 +155,20 @@ CREATE TABLE IF NOT EXISTS guild_channels ( CREATE TABLE IF NOT EXISTS guild_text_channels ( - id bigint REFERENCES guild_channels (id) PRIMARY KEY ON DELETE CASCADE, - topic text DEFAULT '' + id bigint REFERENCES guild_channels (id) ON DELETE CASCADE, + topic text DEFAULT '', + PRIMARY KEY (id) ); CREATE TABLE IF NOT EXISTS guild_voice_channels ( - id bigint REFERENCES guild_channels (id) PRIMARY KEY ON DELETE CASCADE, + id bigint REFERENCES guild_channels (id) ON DELETE CASCADE, -- default bitrate for discord is 64kbps bitrate int DEFAULT 64, -- 0 means infinite - user_limit int DEFAULT 0 + user_limit int DEFAULT 0, + PRIMARY KEY (id) ); @@ -176,9 +178,10 @@ CREATE TABLE IF NOT EXISTS dm_channels ( CREATE TABLE IF NOT EXISTS group_dm_channels ( - id bigint REFERENCES channels (id) PRIMARY KEY ON DELETE CASCADE, + id bigint REFERENCES channels (id) ON DELETE CASCADE, owner_id bigint REFERENCES users (id), - icon bigint REFERENCES files (id) + icon bigint REFERENCES files (id), + PRIMARY KEY (id) );