diff --git a/data/lang/en.json b/data/lang/en.json index 39a44cf..813e74f 100644 --- a/data/lang/en.json +++ b/data/lang/en.json @@ -32,6 +32,12 @@ "post": "Spoilers and vote length anonymizer for fair review!\n## Post Data:\n**Subreddit:** {0}\n**Post upvotes:** ||`{1:>6}`||\n**Moderator votes:** ||`{2:>6}`||\n**Media type:** `{3}`\n## Listing Data:\n**Added by:** human: {4} | bot: {5}\n**Approved:** {6}", "post_removed": "## Removed by `{0}`\n**Reason:** {1}" } + }, + "db": { + "added_server": "Added your server to my database. Thanks for letting me steal it! (/s)", + "corrupted_data": "Couldn't add your server to the database! The database is corrupted!", + "server_404": "This server is not in the data!\n-# Hint: Run the command `/database AddServer` inside of a Discord server (requires administrator permission).", + "channel_bind": "Successfully added channel ID `{0}` to the database!" } } } \ No newline at end of file diff --git a/data/lang/en_deprecated.json b/data/lang/en_deprecated.json index eda264d..ec47d1e 100644 --- a/data/lang/en_deprecated.json +++ b/data/lang/en_deprecated.json @@ -6,11 +6,11 @@ //"dc_btn_unvote": "Un-vote", //"dc_btn_vote": "Vote", "dc_msg_8-ball_answer": "**8-ball Question:** {0}\n**Answer:** {1}", - "dc_msg_add_to_data": "Added your server to my data! Thanks for letting me steal it! (/s)", - "dc_msg_bound_channel": "Successfully added channel ID `{0}` to the database!", + //"dc_msg_add_to_data": "Added your server to my data! Thanks for letting me steal it! (/s)", + //"dc_msg_bound_channel": "Successfully added channel ID `{0}` to the database!", "dc_msg_cmd_404": "No command \"{0}\" found!\nHint: Try `/help` without any arguments or `/help `", - "dc_msg_corrupted_data": "Oopsies `(。>\\\\<)`. It looks like my data i-is \\**sob*\\*... c-corrupted!", - "dc_msg_data_server_404": "This server is not in the data!\n Hint: Run the command `/database AddServer` inside of a Discord server (requires administrator permission).", + //"dc_msg_corrupted_data": "Oopsies `(。>\\\\<)`. It looks like my data i-is \\**sob*\\*... c-corrupted!", + //"dc_msg_data_server_404": "This server is not in the data!\n Hint: Run the command `/database AddServer` inside of a Discord server (requires administrator permission).", //"dc_msg_dm_python_err_socket": "Unknown internal Python error occurred: Websocket response error", //"dc_msg_dm_python_err": "Unknown internal Python Error:\n```\n{0}\n```", //"dc_msg_embed_default_embed_desc": "Default english embed description.", diff --git a/src/cmds/db/add_server.rs b/src/cmds/db/add_server.rs index de756dd..76f47bf 100644 --- a/src/cmds/db/add_server.rs +++ b/src/cmds/db/add_server.rs @@ -1,4 +1,4 @@ -use crate::{db::discord::add_server, lang, messages::send_msg, Context, Error}; +use crate::{db::discord::add_server, messages::send_msg, Context, Error}; pub async fn cmd( @@ -7,12 +7,9 @@ pub async fn cmd( { let r = add_server(ctx.data(), ctx.guild_id().unwrap().into()).await; - if r.is_ok() { - send_msg(ctx, lang!("dc_msg_add_to_data"), true, true).await; - } - else { - send_msg(ctx, lang!("dc_msg_corrupted_data"), true, true).await; - } + if r.is_ok() + { send_msg(ctx, ctx.data().lang.get("dc.db.added_server", &[]), true, true).await; } + else { send_msg(ctx, ctx.data().lang.get("dc.db.corrupted_data", &[]), true, true).await; } return Ok(()); } \ No newline at end of file diff --git a/src/cmds/db/reddit_channel.rs b/src/cmds/db/reddit_channel.rs index 78e6828..8cbcf51 100644 --- a/src/cmds/db/reddit_channel.rs +++ b/src/cmds/db/reddit_channel.rs @@ -1,18 +1,12 @@ -use crate::{db::discord::bind_bk, lang, messages::send_msg, Context, Error}; +use crate::{db::discord::bind_bk, messages::send_msg, Context, Error}; -pub async fn cmd( - ctx: Context<'_> -) -> Result<(), Error> -{ +pub async fn cmd(ctx: Context<'_>) -> Result<(), Error> { let c_id = ctx.channel_id().into(); let r = bind_bk(ctx.data(), ctx.guild_id().unwrap().into(), c_id).await; - if r.is_ok() { - send_msg(ctx, lang!("dc_msg_bound_channel", c_id), true, true).await; - } - else { - send_msg(ctx, lang!("dc_msg_data_server_404"), true, true).await; - } + if r.is_ok() + { send_msg(ctx, ctx.data().lang.get("dc.db.channel_bind", &[c_id.to_string()]), true, true).await; } + else { send_msg(ctx, ctx.data().lang.get("dc.db.server_404", &[]), true, true).await; } return Ok(()); } \ No newline at end of file diff --git a/src/cmds/db/wwrps_channel.rs b/src/cmds/db/wwrps_channel.rs index c27fcce..f1f7042 100644 --- a/src/cmds/db/wwrps_channel.rs +++ b/src/cmds/db/wwrps_channel.rs @@ -1,4 +1,4 @@ -use crate::{Context, Error, db::discord::bind_wwrps, lang, messages::send_msg}; +use crate::{Context, Error, db::discord::bind_wwrps, messages::send_msg}; pub async fn cmd( ctx: Context<'_> @@ -7,12 +7,9 @@ pub async fn cmd( let c_id = ctx.channel_id().into(); let r = bind_wwrps(ctx.data(), ctx.guild_id().unwrap().into(), c_id).await; - if r.is_ok() { - send_msg(ctx, lang!("dc_msg_bound_channel", c_id), true, true).await; - } - else { - send_msg(ctx, lang!("dc_msg_data_server_404"), true, true).await; - } + if r.is_ok() + { send_msg(ctx, ctx.data().lang.get("dc.db.channel_bind", &[c_id.to_string()]), true, true).await; } + else { send_msg(ctx, ctx.data().lang.get("dc.db.server_404", &[]), true, true).await; } return Ok(()); } \ No newline at end of file