karx/dircord
1
0
Fork 4
Code Issues 2 Pull requests 1 Projects Releases Wiki Activity

Make reply content limit configurable

Browse source
This commit is contained in:
Yash Karandikar 2022-08-02 18:57:43 -05:00
parent 331ef2db6f
commit 12d5076e28
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/discord_irc.rs
View file

@ -1,5 +1,6 @@
use crate::{
regex, ChannelMappingKey, MembersKey, OptionReplacer, OptionStringKey, SenderKey, UserIdKey,
regex, ChannelMappingKey, MembersKey, OptionReplacer, OptionStringKey, RefContentLimitKey,
SenderKey, UserIdKey,
};
use ellipse::Ellipse;
use fancy_regex::{Captures, Replacer};
@ -115,6 +116,7 @@ impl EventHandler for Handler {
.as_deref()
.unwrap_or("++");
let mapping = ctx_data.get::<ChannelMappingKey>().unwrap().clone();
let ref_content_limit = ctx_data.get::<RefContentLimitKey>().unwrap();
if user_id == msg.author.id || msg.author.bot {
return;
@ -153,7 +155,7 @@ impl EventHandler for Handler {
{
if let Ok(mut reply) = channel_id.message(&ctx, message_id).await {
reply.guild_id = guild_id; // lmao
let (reply_prefix, _) = create_prefix(&reply, true, &ctx).await;
let (reply_prefix, reply_content_limit) = create_prefix(&reply, true, &ctx).await;
let mut content = reply.content;
content = content.replace("\r\n", " "); // just in case
@ -163,10 +165,14 @@ impl EventHandler for Handler {
content = discord_to_irc_processing(&content, &**members_lock, &ctx, &roles).await;
let to_send = (&*content).truncate_ellipse(40); // limit taken from discord
let to_send = (&*content).truncate_ellipse(
ref_content_limit
.map(|l| l as usize)
.unwrap_or(reply_content_limit),
);
sender
.send_privmsg(channel, &format!("{}{}", reply_prefix, to_send))
.send_privmsg(channel, format!("{}{}", reply_prefix, to_send))
.unwrap();
}
}

3
src/main.rs
View file

@ -37,6 +37,7 @@ struct DircordConfig {
raw_prefix: Option<String>,
channels: HashMap<String, u64>,
webhooks: Option<HashMap<String, String>>,
ref_content_limit: Option<u16>,
}
macro_rules! type_map_key {
@ -60,6 +61,7 @@ type_map_key!(
StringKey => String,
OptionStringKey => Option<String>,
ChannelMappingKey => HashMap<String, u64>,
RefContentLimitKey => Option<u16>,
);
#[cfg(unix)]
@ -135,6 +137,7 @@ async fn main() -> anyhow::Result<()> {
data.insert::<MembersKey>(members.clone());
data.insert::<OptionStringKey>(conf.raw_prefix);
data.insert::<ChannelMappingKey>((*channels).clone());
data.insert::<RefContentLimitKey>(conf.ref_content_limit);
}
let mut webhooks_transformed: HashMap<String, Webhook> = HashMap::new();