mykola/mk-dl-bot_legacy
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

begin migrating to postgres

Browse source
This commit is contained in:
mykola2312 2024-03-08 07:01:12 +02:00
parent 0082d1feb5
commit cc9979086f
6 changed files with 71 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -2018,6 +2018,7 @@ dependencies = [
"sha2",
"sqlx-core",
"sqlx-mysql",
"sqlx-postgres",
"sqlx-sqlite",
"syn 1.0.109",
"tempfile",

2
Cargo.toml
View file

@ -10,7 +10,7 @@ anyhow = "1.0.75"
dotenv = "0.15.0"
tokio = { version = "1.32.0", features = ["rt-multi-thread", "macros", "process"] }
teloxide = { version = "0.12.2", git ="https://github.com/teloxide/teloxide", features = ["macros"] }
sqlx = { version = "0.7.3", features = [ "runtime-tokio", "tls-native-tls", "sqlite", "sqlx-sqlite" ] }
sqlx = { version = "0.7.3", features = [ "runtime-tokio", "tls-native-tls", "postgres", "sqlx-postgres" ] }
serde = { version = "1.0.196", features = ["derive"] }
serde_json = "1.0.113"
ordered-float = "4.2.0"

82
migrations/1_init.sql
View file

@ -1,13 +1,13 @@
CREATE TABLE "user"
(
id INTEGER PRIMARY KEY AUTOINCREMENT,
tg_id INTEGER NOT NULL UNIQUE,
username TEXT UNIQUE,
first_name TEXT NOT NULL,
last_name TEXT,
can_download INTEGER NOT NULL,
is_admin INTEGER NOT NULL,
has_private_chat INTEGER NOT NULL
id SERIAL PRIMARY KEY,
tg_id BIGINT NOT NULL UNIQUE,
username VARCHAR UNIQUE,
first_name VARCHAR NOT NULL,
last_name VARCHAR,
can_download BOOLEAN NOT NULL,
is_admin BOOLEAN NOT NULL,
has_private_chat BOOLEAN NOT NULL
);
CREATE INDEX idx_user_tg_id
@ -15,11 +15,11 @@ CREATE INDEX idx_user_tg_id
CREATE TABLE "chat"
(
id INTEGER PRIMARY KEY AUTOINCREMENT,
tg_id INTEGER NOT NULL UNIQUE,
title TEXT NOT NULL,
username TEXT,
can_download INTEGER NOT NULL
id SERIAL PRIMARY KEY,
tg_id BIGINT NOT NULL UNIQUE,
title VARCHAR NOT NULL,
username VARCHAR,
can_download BOOLEAN NOT NULL
);
CREATE INDEX idx_chat_tg_id
@ -27,11 +27,11 @@ CREATE INDEX idx_chat_tg_id
CREATE TABLE "link"
(
id INTEGER PRIMARY KEY AUTOINCREMENT,
domain TEXT NOT NULL UNIQUE,
path TEXT,
download_allowed INTEGER NOT NULL,
auto_download INTEGER NOT NULL
id SERIAL PRIMARY KEY,
domain VARCHAR NOT NULL,
path VARCHAR,
download_allowed BOOLEAN NOT NULL,
auto_download BOOLEAN NOT NULL
);
CREATE INDEX idx_link_domain
@ -39,40 +39,56 @@ CREATE INDEX idx_link_domain
CREATE TABLE "request"
(
id INTEGER PRIMARY KEY AUTOINCREMENT,
id SERIAL PRIMARY KEY,
requested_by INTEGER NOT NULL UNIQUE,
approved_by INTEGER UNIQUE,
message TEXT NOT NULL,
is_approved INTEGER NOT NULL,
message VARCHAR NOT NULL,
is_approved BOOLEAN NOT NULL,
FOREIGN KEY(requested_by) REFERENCES "user"(id),
FOREIGN KEY(approved_by) REFERENCES "user"(id)
);
CREATE TRIGGER "approve"
AFTER UPDATE OF is_approved ON "request"
WHEN new.is_approved = 1
CREATE FUNCTION approve()
RETURNS TRIGGER AS $$
BEGIN
UPDATE user SET can_download = 1 WHERE user.id = new.requested_by;
IF new.is_approved THEN
UPDATE "user" SET can_download = TRUE WHERE "user".id = new.requested_by;
END IF;
RETURN new;
END;
$$ LANGUAGE plpgsql;
CREATE TRIGGER approve
AFTER UPDATE OF is_approved ON request
FOR EACH ROW
EXECUTE FUNCTION approve();
CREATE TABLE "request_chat"
(
id INTEGER PRIMARY KEY AUTOINCREMENT,
id SERIAL PRIMARY KEY,
requested_by INTEGER NOT NULL UNIQUE,
requested_for INTEGER NOT NULL UNIQUE,
approved_by INTEGER UNIQUE,
message TEXT NOT NULL,
is_approved INTEGER NOT NULL,
message VARCHAR NOT NULL,
is_approved BOOLEAN NOT NULL,
FOREIGN KEY(requested_by) REFERENCES "user"(id),
FOREIGN KEY(requested_for) REFERENCES "chat"(id),
FOREIGN KEY(approved_by) REFERENCES "user"(id)
);
CREATE TRIGGER "approve_chat"
AFTER UPDATE OF is_approved ON "request_chat"
WHEN new.is_approved = 1
CREATE FUNCTION approve_chat()
RETURNS TRIGGER AS $$
BEGIN
UPDATE chat SET can_download = 1 WHERE chat.id = new.requested_for;
END;
IF new.is_approved THEN
UPDATE "chat" SET can_download = TRUE WHERE "chat".id = new.requested_for;
END IF;
RETURN new;
END;
$$ LANGUAGE plpgsql;
CREATE TRIGGER approve_chat
AFTER UPDATE OF is_approved ON request_chat
FOR EACH ROW
EXECUTE FUNCTION approve_chat();

5
src/bot.rs
View file

@ -22,12 +22,11 @@ macro_rules! parse_integer {
let out: i64 = match $integer.parse() {
Ok(integer) => integer,
Err(_) => {
$bot.send_message($chat_id, t!("not_valid_integer"))
.await?;
$bot.send_message($chat_id, t!("not_valid_integer")).await?;
return Ok(());
}
};
out
}};
}
}

2
src/bot/bot.rs
View file

@ -10,7 +10,7 @@ use tracing::{event, Level};
use super::start::handle_new_chat_member;
use super::types::*;
use crate::db::DbPool;
use crate::util::{unwrap_env, parse_env};
use crate::util::{parse_env, unwrap_env};
use super::dl::cmd_download;
use super::op::cmd_op;

24
src/db.rs
View file

@ -1,10 +1,10 @@
use sqlx::migrate::MigrateDatabase;
use sqlx::{Sqlite, SqlitePool};
use sqlx::{PgPool, Postgres};
use std::fmt;
use super::util::make_database_url;
use super::util::unwrap_env;
pub type DbPool = SqlitePool;
pub type DbPool = PgPool;
#[derive(sqlx::FromRow, Debug)]
pub struct User {
@ -83,15 +83,25 @@ pub struct RequestChat {
pub is_approved: i64,
}
pub async fn db_init() -> SqlitePool {
pub fn make_database_url() -> String {
format!(
"postgres://{}:{}@{}/{}",
unwrap_env("POSTGRES_USER"),
unwrap_env("POSTGRES_PASSWORD"),
unwrap_env("POSTGRES_HOST"),
unwrap_env("POSTGRES_DB")
)
}
pub async fn db_init() -> PgPool {
let db_url = make_database_url();
if !Sqlite::database_exists(&db_url).await.unwrap_or(false) {
Sqlite::create_database(&db_url)
if !Postgres::database_exists(&db_url).await.unwrap_or(false) {
Postgres::create_database(&db_url)
.await
.expect("failed to create database");
}
let db = SqlitePool::connect(&db_url).await.unwrap();
let db = PgPool::connect(&db_url).await.unwrap();
sqlx::migrate!().run(&db).await.unwrap();
db