diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..cbe5ad1 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,437 @@ +Attribution-NonCommercial-ShareAlike 4.0 International + +======================================================================= + +Creative Commons Corporation ("Creative Commons") is not a law firm and +does not provide legal services or legal advice. Distribution of +Creative Commons public licenses does not create a lawyer-client or +other relationship. Creative Commons makes its licenses and related +information available on an "as-is" basis. Creative Commons gives no +warranties regarding its licenses, any material licensed under their +terms and conditions, or any related information. Creative Commons +disclaims all liability for damages resulting from their use to the +fullest extent possible. + +Using Creative Commons Public Licenses + +Creative Commons public licenses provide a standard set of terms and +conditions that creators and other rights holders may use to share +original works of authorship and other material subject to copyright +and certain other rights specified in the public license below. The +following considerations are for informational purposes only, are not +exhaustive, and do not form part of our licenses. + + Considerations for licensors: Our public licenses are + intended for use by those authorized to give the public + permission to use material in ways otherwise restricted by + copyright and certain other rights. Our licenses are + irrevocable. Licensors should read and understand the terms + and conditions of the license they choose before applying it. + Licensors should also secure all rights necessary before + applying our licenses so that the public can reuse the + material as expected. Licensors should clearly mark any + material not subject to the license. This includes other CC- + licensed material, or material used under an exception or + limitation to copyright. More considerations for licensors: + wiki.creativecommons.org/Considerations_for_licensors + + Considerations for the public: By using one of our public + licenses, a licensor grants the public permission to use the + licensed material under specified terms and conditions. If + the licensor's permission is not necessary for any reason--for + example, because of any applicable exception or limitation to + copyright--then that use is not regulated by the license. Our + licenses grant only permissions under copyright and certain + other rights that a licensor has authority to grant. Use of + the licensed material may still be restricted for other + reasons, including because others have copyright or other + rights in the material. A licensor may make special requests, + such as asking that all changes be marked or described. + Although not required by our licenses, you are encouraged to + respect those requests where reasonable. More considerations + for the public: + wiki.creativecommons.org/Considerations_for_licensees + +======================================================================= + +Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International +Public License + +By exercising the Licensed Rights (defined below), You accept and agree +to be bound by the terms and conditions of this Creative Commons +Attribution-NonCommercial-ShareAlike 4.0 International Public License +("Public License"). To the extent this Public License may be +interpreted as a contract, You are granted the Licensed Rights in +consideration of Your acceptance of these terms and conditions, and the +Licensor grants You such rights in consideration of benefits the +Licensor receives from making the Licensed Material available under +these terms and conditions. + + +Section 1 -- Definitions. + + a. Adapted Material means material subject to Copyright and Similar + Rights that is derived from or based upon the Licensed Material + and in which the Licensed Material is translated, altered, + arranged, transformed, or otherwise modified in a manner requiring + permission under the Copyright and Similar Rights held by the + Licensor. For purposes of this Public License, where the Licensed + Material is a musical work, performance, or sound recording, + Adapted Material is always produced where the Licensed Material is + synched in timed relation with a moving image. + + b. Adapter's License means the license You apply to Your Copyright + and Similar Rights in Your contributions to Adapted Material in + accordance with the terms and conditions of this Public License. + + c. BY-NC-SA Compatible License means a license listed at + creativecommons.org/compatiblelicenses, approved by Creative + Commons as essentially the equivalent of this Public License. + + d. Copyright and Similar Rights means copyright and/or similar rights + closely related to copyright including, without limitation, + performance, broadcast, sound recording, and Sui Generis Database + Rights, without regard to how the rights are labeled or + categorized. For purposes of this Public License, the rights + specified in Section 2(b)(1)-(2) are not Copyright and Similar + Rights. + + e. Effective Technological Measures means those measures that, in the + absence of proper authority, may not be circumvented under laws + fulfilling obligations under Article 11 of the WIPO Copyright + Treaty adopted on December 20, 1996, and/or similar international + agreements. + + f. Exceptions and Limitations means fair use, fair dealing, and/or + any other exception or limitation to Copyright and Similar Rights + that applies to Your use of the Licensed Material. + + g. License Elements means the license attributes listed in the name + of a Creative Commons Public License. The License Elements of this + Public License are Attribution, NonCommercial, and ShareAlike. + + h. Licensed Material means the artistic or literary work, database, + or other material to which the Licensor applied this Public + License. + + i. Licensed Rights means the rights granted to You subject to the + terms and conditions of this Public License, which are limited to + all Copyright and Similar Rights that apply to Your use of the + Licensed Material and that the Licensor has authority to license. + + j. Licensor means the individual(s) or entity(ies) granting rights + under this Public License. + + k. NonCommercial means not primarily intended for or directed towards + commercial advantage or monetary compensation. For purposes of + this Public License, the exchange of the Licensed Material for + other material subject to Copyright and Similar Rights by digital + file-sharing or similar means is NonCommercial provided there is + no payment of monetary compensation in connection with the + exchange. + + l. Share means to provide material to the public by any means or + process that requires permission under the Licensed Rights, such + as reproduction, public display, public performance, distribution, + dissemination, communication, or importation, and to make material + available to the public including in ways that members of the + public may access the material from a place and at a time + individually chosen by them. + + m. Sui Generis Database Rights means rights other than copyright + resulting from Directive 96/9/EC of the European Parliament and of + the Council of 11 March 1996 on the legal protection of databases, + as amended and/or succeeded, as well as other essentially + equivalent rights anywhere in the world. + + n. You means the individual or entity exercising the Licensed Rights + under this Public License. Your has a corresponding meaning. + + +Section 2 -- Scope. + + a. License grant. + + 1. Subject to the terms and conditions of this Public License, + the Licensor hereby grants You a worldwide, royalty-free, + non-sublicensable, non-exclusive, irrevocable license to + exercise the Licensed Rights in the Licensed Material to: + + a. reproduce and Share the Licensed Material, in whole or + in part, for NonCommercial purposes only; and + + b. produce, reproduce, and Share Adapted Material for + NonCommercial purposes only. + + 2. Exceptions and Limitations. For the avoidance of doubt, where + Exceptions and Limitations apply to Your use, this Public + License does not apply, and You do not need to comply with + its terms and conditions. + + 3. Term. The term of this Public License is specified in Section + 6(a). + + 4. Media and formats; technical modifications allowed. The + Licensor authorizes You to exercise the Licensed Rights in + all media and formats whether now known or hereafter created, + and to make technical modifications necessary to do so. The + Licensor waives and/or agrees not to assert any right or + authority to forbid You from making technical modifications + necessary to exercise the Licensed Rights, including + technical modifications necessary to circumvent Effective + Technological Measures. For purposes of this Public License, + simply making modifications authorized by this Section 2(a) + (4) never produces Adapted Material. + + 5. Downstream recipients. + + a. Offer from the Licensor -- Licensed Material. Every + recipient of the Licensed Material automatically + receives an offer from the Licensor to exercise the + Licensed Rights under the terms and conditions of this + Public License. + + b. Additional offer from the Licensor -- Adapted Material. + Every recipient of Adapted Material from You + automatically receives an offer from the Licensor to + exercise the Licensed Rights in the Adapted Material + under the conditions of the Adapter's License You apply. + + c. No downstream restrictions. You may not offer or impose + any additional or different terms or conditions on, or + apply any Effective Technological Measures to, the + Licensed Material if doing so restricts exercise of the + Licensed Rights by any recipient of the Licensed + Material. + + 6. No endorsement. Nothing in this Public License constitutes or + may be construed as permission to assert or imply that You + are, or that Your use of the Licensed Material is, connected + with, or sponsored, endorsed, or granted official status by, + the Licensor or others designated to receive attribution as + provided in Section 3(a)(1)(A)(i). + + b. Other rights. + + 1. Moral rights, such as the right of integrity, are not + licensed under this Public License, nor are publicity, + privacy, and/or other similar personality rights; however, to + the extent possible, the Licensor waives and/or agrees not to + assert any such rights held by the Licensor to the limited + extent necessary to allow You to exercise the Licensed + Rights, but not otherwise. + + 2. Patent and trademark rights are not licensed under this + Public License. + + 3. To the extent possible, the Licensor waives any right to + collect royalties from You for the exercise of the Licensed + Rights, whether directly or through a collecting society + under any voluntary or waivable statutory or compulsory + licensing scheme. In all other cases the Licensor expressly + reserves any right to collect such royalties, including when + the Licensed Material is used other than for NonCommercial + purposes. + + +Section 3 -- License Conditions. + +Your exercise of the Licensed Rights is expressly made subject to the +following conditions. + + a. Attribution. + + 1. If You Share the Licensed Material (including in modified + form), You must: + + a. retain the following if it is supplied by the Licensor + with the Licensed Material: + + i. identification of the creator(s) of the Licensed + Material and any others designated to receive + attribution, in any reasonable manner requested by + the Licensor (including by pseudonym if + designated); + + ii. a copyright notice; + + iii. a notice that refers to this Public License; + + iv. a notice that refers to the disclaimer of + warranties; + + v. a URI or hyperlink to the Licensed Material to the + extent reasonably practicable; + + b. indicate if You modified the Licensed Material and + retain an indication of any previous modifications; and + + c. indicate the Licensed Material is licensed under this + Public License, and include the text of, or the URI or + hyperlink to, this Public License. + + 2. You may satisfy the conditions in Section 3(a)(1) in any + reasonable manner based on the medium, means, and context in + which You Share the Licensed Material. For example, it may be + reasonable to satisfy the conditions by providing a URI or + hyperlink to a resource that includes the required + information. + 3. If requested by the Licensor, You must remove any of the + information required by Section 3(a)(1)(A) to the extent + reasonably practicable. + + b. ShareAlike. + + In addition to the conditions in Section 3(a), if You Share + Adapted Material You produce, the following conditions also apply. + + 1. The Adapter's License You apply must be a Creative Commons + license with the same License Elements, this version or + later, or a BY-NC-SA Compatible License. + + 2. You must include the text of, or the URI or hyperlink to, the + Adapter's License You apply. You may satisfy this condition + in any reasonable manner based on the medium, means, and + context in which You Share Adapted Material. + + 3. You may not offer or impose any additional or different terms + or conditions on, or apply any Effective Technological + Measures to, Adapted Material that restrict exercise of the + rights granted under the Adapter's License You apply. + + +Section 4 -- Sui Generis Database Rights. + +Where the Licensed Rights include Sui Generis Database Rights that +apply to Your use of the Licensed Material: + + a. for the avoidance of doubt, Section 2(a)(1) grants You the right + to extract, reuse, reproduce, and Share all or a substantial + portion of the contents of the database for NonCommercial purposes + only; + + b. if You include all or a substantial portion of the database + contents in a database in which You have Sui Generis Database + Rights, then the database in which You have Sui Generis Database + Rights (but not its individual contents) is Adapted Material, + including for purposes of Section 3(b); and + + c. You must comply with the conditions in Section 3(a) if You Share + all or a substantial portion of the contents of the database. + +For the avoidance of doubt, this Section 4 supplements and does not +replace Your obligations under this Public License where the Licensed +Rights include other Copyright and Similar Rights. + + +Section 5 -- Disclaimer of Warranties and Limitation of Liability. + + a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE + EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS + AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF + ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, + IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, + WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, + ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT + KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT + ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. + + b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE + TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, + NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, + INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, + COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR + USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR + DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR + IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. + + c. The disclaimer of warranties and limitation of liability provided + above shall be interpreted in a manner that, to the extent + possible, most closely approximates an absolute disclaimer and + waiver of all liability. + + +Section 6 -- Term and Termination. + + a. This Public License applies for the term of the Copyright and + Similar Rights licensed here. However, if You fail to comply with + this Public License, then Your rights under this Public License + terminate automatically. + + b. Where Your right to use the Licensed Material has terminated under + Section 6(a), it reinstates: + + 1. automatically as of the date the violation is cured, provided + it is cured within 30 days of Your discovery of the + violation; or + + 2. upon express reinstatement by the Licensor. + + For the avoidance of doubt, this Section 6(b) does not affect any + right the Licensor may have to seek remedies for Your violations + of this Public License. + + c. For the avoidance of doubt, the Licensor may also offer the + Licensed Material under separate terms or conditions or stop + distributing the Licensed Material at any time; however, doing so + will not terminate this Public License. + + d. Sections 1, 5, 6, 7, and 8 survive termination of this Public + License. + + +Section 7 -- Other Terms and Conditions. + + a. The Licensor shall not be bound by any additional or different + terms or conditions communicated by You unless expressly agreed. + + b. Any arrangements, understandings, or agreements regarding the + Licensed Material not stated herein are separate from and + independent of the terms and conditions of this Public License. + + +Section 8 -- Interpretation. + + a. For the avoidance of doubt, this Public License does not, and + shall not be interpreted to, reduce, limit, restrict, or impose + conditions on any use of the Licensed Material that could lawfully + be made without permission under this Public License. + + b. To the extent possible, if any provision of this Public License is + deemed unenforceable, it shall be automatically reformed to the + minimum extent necessary to make it enforceable. If the provision + cannot be reformed, it shall be severed from this Public License + without affecting the enforceability of the remaining terms and + conditions. + + c. No term or condition of this Public License will be waived and no + failure to comply consented to unless expressly agreed to by the + Licensor. + + d. Nothing in this Public License constitutes or may be interpreted + as a limitation upon, or waiver of, any privileges and immunities + that apply to the Licensor or You, including from the legal + processes of any jurisdiction or authority. + +======================================================================= + +Creative Commons is not a party to its public +licenses. Notwithstanding, Creative Commons may elect to apply one of +its public licenses to material it publishes and in those instances +will be considered the “Licensor.” The text of the Creative Commons +public licenses is dedicated to the public domain under the CC0 Public +Domain Dedication. Except for the limited purpose of indicating that +material is shared under a Creative Commons public license or as +otherwise permitted by the Creative Commons policies published at +creativecommons.org/policies, Creative Commons does not authorize the +use of the trademark "Creative Commons" or any other trademark or logo +of Creative Commons without its prior written consent including, +without limitation, in connection with any unauthorized modifications +to any of its public licenses or any other arrangements, +understandings, or agreements concerning use of licensed material. For +the avoidance of doubt, this paragraph does not form part of the +public licenses. + +Creative Commons may be contacted at creativecommons.org. diff --git a/README.md b/README.md index 45f336d..ab55817 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,31 @@ - - # ByteDiceAssistant An automation tool for Byte Dice. It's both a Discord and Reddit bot in one program. -This tool is not intended to be used publicly outside of the Byte Dice Assistant bots. Expect issues if you host this yourself. +> [!CAUTION] +> This tool is not intended for public use outside of the official Byte Dice Assistant bots. Expect issues if you host this yourself. -## Copyright -WIP!!! +# Open-source - Copyright + +**ByteDiceAssistant © 2025 by Byte Dice is licensed under CC BY-NC-SA 4.0.**\ +**You can learn more about copyright by reading the full [license](/LICENSE.txt).** ## How to run -*Dependecies:* You will need Rust (vi.d.k) and Python (vi.d.k) as well as these Python modules: -* WIP!!! +**Dependecies:** This program uses Rust (v1.82.0) and Python (v3.11.4), you can likely use other versions if they are compatible. This program also uses these Python modules: +* sys +* io +* asyncpraw +* json +* typing +* asyncio +* threading +* time +* emoji +* websockets -To run, download the code and run `$ cargo run`. There are more options when running. You can view a list of those using `$ cargo run -- --help`. \ No newline at end of file +You can install Python modules by running `$ pip install {module}` or `$ python -m pip install {module}` in a terminal. + +**How to run:** +* Download the code (and extract if needed). +* Open a terminal and CD to the downloaded folder. +* Run `$ cargo run`. There are more options when running. You can view a list of those using `$ cargo run -- --help`. + * If you want to only run the Python code, you can either run `$ cargo run -- --py`, or `$ python ./src/python/main.py`. The second option is recommended for better output. \ No newline at end of file diff --git a/bk_week_help_re.md b/bk_week_help_re.md index 8cf99f8..0b36b92 100644 --- a/bk_week_help_re.md +++ b/bk_week_help_re.md @@ -1,9 +1,11 @@ # Reddit Commands To execute a command on the Reddit bot, include `u/ByteDiceAssistant [args]` in a comment. - **`[args]`**: The command you want to run and its arguments. + ## `bk_week_add` Adds the post to the list of posts. - **Only moderators of a subreddit or the OP (Original Poster) can use this command.** + ### **Examples** ``` "u/ByteDiceAssistant bk_week_add" diff --git a/src/bk_week_cmds.rs b/src/bk_week_cmds.rs index 2d3aa9d..3f3318c 100644 --- a/src/bk_week_cmds.rs +++ b/src/bk_week_cmds.rs @@ -1,11 +1,11 @@ use crate::websocket::send_cmd_json; use crate::{rs_println, websocket, Context, Error, BK_WEEK}; -use crate::messages::{send_embed, send_msg, EmbedOptions}; +use crate::messages::{edit_msg, send_embed, send_msg, EmbedOptions}; use crate::data::{self, dc_bind_bk}; use std::fs; -use poise::serenity_prelude::Timestamp; +use poise::serenity_prelude::{ChannelId, GetMessages, Message, Timestamp}; use serde_json::{json, Value}; @@ -39,7 +39,7 @@ pub async fn bk_week_help( } send_msg(ctx, help, true, true).await; - data::read_dc_data(ctx.data(), false); + data::read_dc_data(ctx.data(), false).await; return Ok(()); } @@ -66,7 +66,7 @@ pub async fn bk_week_get( } async fn get_reddit_data(ctx: Context<'_>) -> Result { - let data_lock = ctx.data().reddit_data.lock().unwrap(); + let data_lock = ctx.data().reddit_data.lock().await; match data_lock.as_ref() { Some(data) => Ok(data.clone()), None => Err("Reddit data is corrupted".into()), @@ -307,20 +307,92 @@ pub async fn bk_week_disapprove( #[poise::command(slash_command, prefix_command, default_member_permissions = "ADMINISTRATOR", guild_only)] -/// Sets the channel where the bot will dump all log info. It's reccommended to only run this once. +/// Sets the channel where the bot will dump all log info. It's recommended to only run this once. pub async fn bk_week_bind( ctx: Context<'_> ) -> Result<(), Error> { let c_id = ctx.channel_id().into(); - let r = dc_bind_bk(ctx.data(), ctx.guild_id().unwrap().into(), c_id); + let r = dc_bind_bk(ctx.data(), ctx.guild_id().unwrap().into(), c_id).await; if r { send_msg(ctx, format!("Successfully bound channel ID `{}` as the bk_week channel!", c_id), true, true).await; } else { - send_msg(ctx, "Your server is not in the data!\nHint: Run the command `/add_server` inside of a Discord server.".to_string(), true, true).await; + send_server_not_in_data_msg(ctx).await; } + return Ok(()); +} + + +async fn send_server_not_in_data_msg(ctx: Context<'_>) { + send_msg(ctx, "Your server is not in the data!\nHint: Run the command `/add_server` inside of a Discord server.".to_string(), true, true).await; +} + + +#[poise::command(slash_command, prefix_command, default_member_permissions = "ADMINISTRATOR", guild_only)] +/// Updates all logs +pub async fn bk_week_update( + ctx: Context<'_>, + #[description = "Only adds new posts, leaves everything else unchanged."] only_add: Option +) -> Result<(), Error> +{ + if !data::dc_contains_server(ctx.data(), ctx.guild_id().unwrap().into()).await { + send_server_not_in_data_msg(ctx).await; + return Ok(()); + } + + let d_lock = ctx.data().discord_data.lock().await; + let d = d_lock.as_ref().unwrap(); + let c_id = + d["servers"] + [ctx.guild_id().unwrap().to_string()] + ["bk_week_channel"].as_u64().unwrap(); + + if c_id == 0 { + send_msg(ctx, "Could not find bk_week_channel in data!\nHint: Run `/bk_week_bind` in a (preferably read-only) channel.".to_string(), true, true).await; + return Ok(()); + } + + let c = ChannelId::new(c_id); + + let mut p_text = format!("Reading messages in <#{}>...", c_id); + let progress = send_msg(ctx, p_text.clone(), true, true).await; + + let b = GetMessages::new().limit(100); + let mut msgs = c.messages(ctx.http(), b).await.unwrap(); + msgs = msgs.into_iter().filter(|item| item.author.id == ctx.framework().bot_id).collect(); + + let mut last_msg: Option = msgs.last().cloned(); + + while last_msg.is_some() { + let new_b = GetMessages::new().limit(100).before(last_msg.clone().unwrap()); + let new_msgs = c.messages(ctx.http(), new_b).await.unwrap(); + + last_msg = new_msgs.last().cloned(); + + if new_msgs.is_empty() { + break; + } + + let filtered_msgs: Vec = new_msgs + .into_iter() + .filter(|item| item.author.id == ctx.framework().bot_id) + .collect(); + + msgs.extend(filtered_msgs); + } + + p_text = p_text.as_str().to_owned() + " Done!"; + edit_msg(ctx, progress.unwrap(), p_text).await; + + + // TODO: parse to JSON + // TODO: add new posts to channel + // TODO: edit outdated posts + // TODO: remove removed posts + + return Ok(()); } \ No newline at end of file diff --git a/src/cmds.rs b/src/cmds.rs index dfeca08..15b52a5 100644 --- a/src/cmds.rs +++ b/src/cmds.rs @@ -38,7 +38,7 @@ pub async fn stop( if should_stop && is_creator { let msg = send_msg(ctx, "Saving data...".to_string(), true, true).await.unwrap(); - data::write_dc_data(ctx.data()); + data::write_dc_data(ctx.data()).await; data::write_re_data().await; send_cmd_json("stop_praw", json!([])).await; @@ -92,13 +92,32 @@ pub async fn embed( ).await; if !reply_unwrap { - send_msg(ctx, "Mandatory success response.".to_string(), true, true).await; + send_msg(ctx, "Mandatory success response, please ignore.".to_string(), true, true).await; } return Ok(()); } + +#[poise::command( + slash_command, + prefix_command, + default_member_permissions = "ADMINISTRATOR" +)] +/// Sends a message. +pub async fn send( + ctx: Context<'_>, + #[description = "The message to send (NO EMPHERAL)"] msg: String +) -> Result<(), Error> +{ + send_msg(ctx, msg, false, false).await; + send_msg(ctx, "Mandatory success response, please ignore.".to_string(), true, true).await; + return Ok(()); +} + + + #[poise::command(slash_command, prefix_command, rename = "8_ball")] /// Magic 8-ball. Ask a question, get an answer. pub async fn eight_ball( @@ -149,7 +168,7 @@ pub async fn add_server( ctx: Context<'_> ) -> Result<(), Error> { - let r = dc_add_server(ctx.data(), ctx.guild_id().unwrap().into()); + let r = dc_add_server(ctx.data(), ctx.guild_id().unwrap().into()).await; if r { send_msg(ctx, "Added your server to my data! Thanks for letting me steal it! (/s)".to_string(), true, true).await; diff --git a/src/data.rs b/src/data.rs index 41bbefe..84707fb 100644 --- a/src/data.rs +++ b/src/data.rs @@ -13,7 +13,7 @@ static DATA_PATH_RE: &str = "./data/reddit_data.json"; static PRESET_PATH_RE: &str = "./data/reddit_data_preset.json"; -pub fn read_dc_data(data: &Data, wipe: bool) { +pub async fn read_dc_data(data: &Data, wipe: bool) { if !Path::new(DATA_PATH_DC).exists() || wipe { rs_println!( "{} creating new from preset...", @@ -24,7 +24,7 @@ pub fn read_dc_data(data: &Data, wipe: bool) { let str_data = fs::read_to_string(DATA_PATH_DC).unwrap(); let json_data = serde_json::from_str(&str_data).unwrap(); - let mut dc_data = data.discord_data.lock().unwrap(); + let mut dc_data = data.discord_data.lock().await; *dc_data = json_data; } @@ -44,7 +44,7 @@ fn generate_dc_data() { } -pub fn write_dc_data(data: &Data) { +pub async fn write_dc_data(data: &Data) { if !Path::new(DATA_PATH_DC).exists() { generate_dc_data(); } @@ -55,13 +55,15 @@ pub fn write_dc_data(data: &Data) { .open(DATA_PATH_DC) .unwrap(); - let json_str = serde_json::to_string_pretty(&data.discord_data).unwrap(); + let mut dc_data_lock = data.discord_data.lock().await; + let dc_data = dc_data_lock.as_mut().unwrap(); + let json_str = serde_json::to_string_pretty(dc_data).unwrap(); file.write_all(json_str.as_bytes()).unwrap(); } -pub fn read_re_data(data: &Data, wipe: bool) { +pub async fn read_re_data(data: &Data, wipe: bool) { if !Path::new(DATA_PATH_RE).exists() || wipe { rs_println!( "{} creating new from preset...", @@ -72,7 +74,7 @@ pub fn read_re_data(data: &Data, wipe: bool) { let str_data = fs::read_to_string(DATA_PATH_RE).unwrap(); let json_data = serde_json::from_str(&str_data).unwrap(); - let mut re_data = data.reddit_data.lock().unwrap(); + let mut re_data = data.reddit_data.lock().await; *re_data = json_data; } @@ -95,7 +97,7 @@ fn generate_re_data() { pub async fn update_re_data(data: &Data) { send_cmd_json("update_data_file", json!([])).await; - read_re_data(data, false); + read_re_data(data, false).await; } @@ -104,8 +106,8 @@ pub async fn write_re_data() { } -pub fn dc_add_server(data: &Data, server_id: u64) -> bool { - let mut dc_data_lock = data.discord_data.lock().unwrap(); +pub async fn dc_add_server(data: &Data, server_id: u64) -> bool { + let mut dc_data_lock = data.discord_data.lock().await; let dc_data = dc_data_lock.as_mut().unwrap(); if dc_data.get("servers").is_none() { return false; } @@ -120,8 +122,8 @@ pub fn dc_add_server(data: &Data, server_id: u64) -> bool { } -pub fn dc_bind_bk(data: &Data, server_id: u64, channel_id: u64) -> bool { - let mut dc_data_lock = data.discord_data.lock().unwrap(); +pub async fn dc_bind_bk(data: &Data, server_id: u64, channel_id: u64) -> bool { + let mut dc_data_lock = data.discord_data.lock().await; let dc_data = dc_data_lock.as_mut().unwrap(); if dc_data.get("servers").is_none() { return false; } @@ -137,4 +139,18 @@ pub fn dc_bind_bk(data: &Data, server_id: u64, channel_id: u64) -> bool { server.insert("bk_week_channel".to_string(), channel_id.into()); return true; +} + + +pub async fn dc_contains_server(data: &Data, server_id: u64) -> bool { + let dc_data_lock = data.discord_data.lock().await; + let dc_data = dc_data_lock.as_ref().unwrap(); + + if dc_data.get("servers").is_none() { return false; } + + let mut clone = dc_data.clone(); + let servers = clone["servers"].as_object_mut().unwrap(); + + if servers.contains_key(&server_id.to_string()) { return true; } + else { return false; } } \ No newline at end of file diff --git a/src/main.rs b/src/main.rs index 4210436..00ff5b6 100644 --- a/src/main.rs +++ b/src/main.rs @@ -11,7 +11,6 @@ mod data; use std::process; use std::thread; -use std::sync::Mutex; use clap::Parser; use poise::serenity_prelude as serenity; @@ -19,10 +18,11 @@ use poise::serenity_prelude::Client; use serde::Serialize; use serde_json::Value; use tokio::runtime::Runtime; +use tokio::sync::Mutex; use serde_json; -// TODO: update bk_week help files +// TODO: /bk_week_adds sets as added by bot instead of human // TODO: bot command permissions // TODO: bk_mod verification system @@ -35,7 +35,7 @@ struct Args { py: bool, #[arg(long, help = "Runs only the Rust part of the program.")] rs: bool, - #[arg(short = 'd', long, help = "Enables dev mode. Dev mode shows more debug info and turns of certain security measures.")] + #[arg(short = 'd', long, help = "Enables dev mode. Dev mode shows more debug info and turns off certain security measures.")] dev: bool, #[arg(short = 'w', long, help = "Wipes all data before running the program.")] wipe: bool @@ -97,7 +97,7 @@ async fn main() { async fn start(args: Args) { - let data = gen_data(args); + let data = gen_data(args).await; let mut bot = gen_bot(data).await; rs_println!("Starting bot..."); @@ -105,7 +105,7 @@ async fn start(args: Args) { } -fn gen_data(args: Args) -> Data { +async fn gen_data(args: Args) -> Data { let ball_classic_str = std::fs::read_to_string("./data/8-ball_classic.txt").unwrap(); let ball_quirk_str = std::fs::read_to_string("./data/8-ball_quirky.txt").unwrap(); @@ -120,8 +120,8 @@ fn gen_data(args: Args) -> Data { args: args.clone() }; - data::read_dc_data(&data, args.clone().wipe); - data::read_re_data(&data, args.clone().wipe); + data::read_dc_data(&data, args.clone().wipe).await; + data::read_re_data(&data, args.clone().wipe).await; return data; } @@ -142,6 +142,7 @@ async fn gen_bot(data: Data) -> Client { commands: vec![ cmds::ping(), cmds::embed(), + cmds::send(), cmds::stop(), cmds::eight_ball(), cmds::re_shorturl(), @@ -153,7 +154,8 @@ async fn gen_bot(data: Data) -> Client { bk_week_cmds::bk_week_remove(), bk_week_cmds::bk_week_approve(), bk_week_cmds::bk_week_disapprove(), - bk_week_cmds::bk_week_bind() + bk_week_cmds::bk_week_bind(), + bk_week_cmds::bk_week_update() ], event_handler: events::event_handler, ..Default::default()