start the refactor

This commit is contained in:
2025-05-10 21:49:23 +02:00
parent ae79359990
commit baf7ba2ffb
10 changed files with 473 additions and 321 deletions

View File

@@ -1,8 +1,8 @@
use sqlite::{State, Error};
use crate::database;
use sqlite::{Error, State};
pub struct Database {
ins_connection: &'static database::DB_CONNECTION,//Mutex<Box<sqlite::Connection>>,
ins_connection: &'static database::DB_CONNECTION, //Mutex<Box<sqlite::Connection>>,
}
pub const T_STIKER: i64 = 1;
@@ -10,8 +10,8 @@ pub const T_GIF: i64 = 2;
pub const T_PHOTO: i64 = 3;
impl<'a> Database {
pub fn get_database()->Self{
let ret = Self{
pub fn get_database() -> Self {
let ret = Self {
ins_connection: &database::DB_CONNECTION,
};
ret.create_table();
@@ -34,8 +34,8 @@ impl<'a> Database {
pub fn media_is_banned(&self, stiker_id: &str, media_type: i64) -> bool {
let builder = self.ins_connection.lock().unwrap();
let mut statement = builder
.prepare("SELECT id_stiker FROM bmedia WHERE id_stiker = ? and media_type=?")
.unwrap();
.prepare("SELECT id_stiker FROM bmedia WHERE id_stiker = ? and media_type=?")
.unwrap();
statement.bind((1, stiker_id)).unwrap();
statement.bind((2, media_type)).unwrap();
statement.next().unwrap();
@@ -45,17 +45,17 @@ impl<'a> Database {
}
}
pub fn add_media(&self, stiker_id: &str, group_id: &str, media_type: i64)->bool{
pub fn add_media(&self, stiker_id: &str, group_id: &str, media_type: i64) -> bool {
let builder = self.ins_connection.lock().unwrap();
let mut statement = builder
.prepare("INSERT INTO bmedia (id_stiker, id_group, media_type) VALUES (?,?,?)")
.unwrap();
.prepare("INSERT INTO bmedia (id_stiker, id_group, media_type) VALUES (?,?,?)")
.unwrap();
statement.bind((1, stiker_id)).unwrap();
statement.bind((2, group_id)).unwrap();
statement.bind((3, media_type)).unwrap();
match statement.next(){
Ok(_s)=>true,
Err(_e)=>false,
match statement.next() {
Ok(_s) => true,
Err(_e) => false,
}
}
}