aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/factoids
diff options
context:
space:
mode:
authorJokler <jokler.contact@gmail.com>2018-03-01 18:34:03 +0100
committerJokler <jokler.contact@gmail.com>2018-03-01 18:34:03 +0100
commitd8406b107c651321c9e166abc36fc66730d965a1 (patch)
treea9918c8a98ad3c8d32c46d8b2b1518e43743b056 /src/plugins/factoids
parent7cdca0b7d75172d8f900e8e755ff07ed8a72966a (diff)
downloadfrippy-d8406b107c651321c9e166abc36fc66730d965a1.tar.gz
frippy-d8406b107c651321c9e166abc36fc66730d965a1.zip
Use lossy UTF8 conversion and add a log_error function
Diffstat (limited to 'src/plugins/factoids')
-rw-r--r--src/plugins/factoids/mod.rs2
-rw-r--r--src/plugins/factoids/utils.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/factoids/mod.rs b/src/plugins/factoids/mod.rs
index 3f89943..806bb7e 100644
--- a/src/plugins/factoids/mod.rs
+++ b/src/plugins/factoids/mod.rs
@@ -83,7 +83,7 @@ impl<T: Database> Factoids<T> {
let name = command.tokens.remove(0);
let url = &command.tokens[0];
- let content = ::utils::download(1024, url)?;
+ let content = ::utils::download(url, Some(1024))?;
Ok(self.create_factoid(&name, &content, &command.source)?)
}
diff --git a/src/plugins/factoids/utils.rs b/src/plugins/factoids/utils.rs
index 036dcc6..009b46b 100644
--- a/src/plugins/factoids/utils.rs
+++ b/src/plugins/factoids/utils.rs
@@ -9,7 +9,7 @@ use super::rlua::prelude::*;
use self::LuaError::RuntimeError;
pub fn download(_: &Lua, url: String) -> Result<String, LuaError> {
- match utils::download(1024, &url) {
+ match utils::download(&url, Some(1024)) {
Ok(v) => Ok(v),
Err(e) => Err(RuntimeError(format!("Failed to download {} - {}", url, e.to_string()))),
}