summaryrefslogtreecommitdiffstats
path: root/src/plugins/factoids/mod.rs
diff options
context:
space:
mode:
authorJokler <jokler.contact@gmail.com>2018-02-13 15:35:03 +0100
committerJokler <jokler.contact@gmail.com>2018-02-13 15:35:03 +0100
commit048f5f048456b4537b1067273b89d5192c65fb21 (patch)
tree94527759c080e1e0b6f28d4985c41562111e0dd0 /src/plugins/factoids/mod.rs
parent046a0114f0e23be258cbb6834c286153b758ecaf (diff)
downloadfrippy-048f5f048456b4537b1067273b89d5192c65fb21.tar.gz
frippy-048f5f048456b4537b1067273b89d5192c65fb21.zip
Add some sandboxing
Diffstat (limited to 'src/plugins/factoids/mod.rs')
-rw-r--r--src/plugins/factoids/mod.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/factoids/mod.rs b/src/plugins/factoids/mod.rs
index aeb83b0..d67416f 100644
--- a/src/plugins/factoids/mod.rs
+++ b/src/plugins/factoids/mod.rs
@@ -201,7 +201,7 @@ impl<T: Database> Factoids<T> {
factoid
};
- server.send_privmsg(&command.target, &value)
+ server.send_privmsg(&command.target, &value.replace("\n", "|").replace("\r", ""))
}
}
@@ -221,7 +221,7 @@ impl<T: Database> Factoids<T> {
let lua = Lua::new();
let globals = lua.globals();
- globals.set("factoid", lua.load(code, Some(name))?)?;
+ globals.set("factoid", code)?;
globals.set("args", args)?;
globals.set("input", command.tokens.join(" "))?;
globals.set("user", command.source.clone())?;
@@ -231,7 +231,7 @@ impl<T: Database> Factoids<T> {
lua.exec::<()>(LUA_SANDBOX, Some(name))?;
let output: Vec<String> = globals.get::<_, Vec<String>>("output")?;
- Ok(output.join("|").replace("\n", "|"))
+ Ok(output.join("|"))
}
fn invalid_command(&self, server: &IrcServer, command: &PluginCommand) -> Result<(), IrcError> {