diff options
| -rw-r--r-- | src/brain.rs | 6 | ||||
| -rw-r--r-- | src/database.rs | 11 | ||||
| -rw-r--r-- | src/import/mod.rs | 7 | ||||
| -rw-r--r-- | src/main.rs | 6 |
4 files changed, 10 insertions, 20 deletions
diff --git a/src/brain.rs b/src/brain.rs index 0ec6a59..daa6f6f 100644 --- a/src/brain.rs +++ b/src/brain.rs @@ -1,4 +1,4 @@ -use crate::database::Database; +use crate::{APP_ID, database::Database}; use twilight_cache_inmemory::DefaultInMemoryCache; use twilight_gateway::Event; @@ -12,9 +12,6 @@ use twilight_model::{ marker::{ChannelMarker, GuildMarker, MessageMarker, UserMarker}, }, }; -const PROD_APP_ID: u64 = 1363055126264283136; -const DEV_APP_ID: u64 = 1363494986699771984; -const APP_ID: u64 = PROD_APP_ID; // A Absolutely Remarkably Terrible Thing macro_rules! aumau { @@ -118,6 +115,7 @@ impl Brain { } pub struct Member { + #[allow(dead_code)] pub id: Id<UserMarker>, pub handle: String, pub global_name: Option<String>, diff --git a/src/database.rs b/src/database.rs index d5ccf92..5bdb4f4 100644 --- a/src/database.rs +++ b/src/database.rs @@ -168,7 +168,7 @@ impl Database { let conn = self.conn.lock().unwrap(); let sql = lb.sql("SELECT * FROM leaderboard_LBID WHERE user_id=?1"); - let user_handle: String = conn + let _user_handle: String = conn .query_row(&sql, params![user], |row| row.get(1)) .map_err(|_| Error::UserNotExist)?; @@ -233,15 +233,6 @@ const CREATE_TABLE_LEADERBOARD_HISTORY: &'static str = "\ points INTEGER NOT NULL DEFAULT 0 );"; -const CREATE_TRIGGER_LDBCHANGETIME_UPDATE: &'static str = "\ - CREATE TRIGGER ldbchangetime_update_LBID - AFTER UPDATE ON leaderboard_LBID - FOR EACH ROW - WHEN NEW.score_updated < OLD.score_updated OR OLD.score_updated IS NULL - BEGIN - UPDATE leaderboard_LBID SET score_updated=CURRENT_TIMESTAMP WHERE user_id=OLD.user_id; - END;"; - const CREATE_TRIGGER_LDBHIST_UPDATE: &'static str = "\ CREATE TRIGGER ldbdhist_update_LBID BEFORE UPDATE ON leaderboard_LBID BEGIN diff --git a/src/import/mod.rs b/src/import/mod.rs index 02429d8..fb14319 100644 --- a/src/import/mod.rs +++ b/src/import/mod.rs @@ -1,9 +1,11 @@ +#![allow(non_snake_case)] use serde::Deserialize; use crate::database::{BoardRow, Database, Error}; #[derive(Debug, Deserialize)] pub struct Emboard { + #[allow(dead_code)] guildName: String, leaderboard: Vec<EmboardRow>, } @@ -55,15 +57,14 @@ pub fn import(db: &Database, json: String) { #[cfg(feature = "emboard-direct")] pub mod emboard_direct { - use std::{sync::Arc, time::Duration}; + use std::sync::Arc; use twilight_model::{ gateway::payload::incoming::InteractionCreate, - http::interaction::{InteractionResponse, InteractionResponseType}, id::{Id, marker::GuildMarker}, }; use twilight_util::builder::InteractionResponseDataBuilder; - use ureq::{Agent, RequestBuilder, config::Config, typestate::WithoutBody}; + use ureq::config::Config; use crate::brain::Brain; diff --git a/src/main.rs b/src/main.rs index c46ce7d..73007e3 100644 --- a/src/main.rs +++ b/src/main.rs @@ -5,7 +5,7 @@ use confindent::Confindent; use database::{BoardRow, Database, Error as DbError, PermissionSetting}; use twilight_cache_inmemory::{DefaultInMemoryCache, ResourceType}; use twilight_gateway::{Event, EventTypeFlags, Intents, Shard, ShardId, StreamExt}; -use twilight_http::{Client as HttpClient, client::InteractionClient}; +use twilight_http::Client as HttpClient; use twilight_model::{ application::{ command::{Command, CommandType}, @@ -15,7 +15,7 @@ use twilight_model::{ }, }, gateway::payload::incoming::InteractionCreate, - http::interaction::{InteractionResponse, InteractionResponseData, InteractionResponseType}, + http::interaction::InteractionResponseData, id::{ Id, marker::{GuildMarker, UserMarker}, @@ -470,7 +470,7 @@ async fn import_cmd( brain: Arc<Brain>, guild: Id<GuildMarker>, create: &InteractionCreate, - data: &CommandData, + _data: &CommandData, ) { let member = create.member.clone().unwrap(); let permissions = member.permissions.unwrap(); |