aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/factoids
diff options
context:
space:
mode:
authorJokler <jokler.contact@gmail.com>2018-03-02 01:37:31 +0100
committerJokler <jokler.contact@gmail.com>2018-03-02 01:37:31 +0100
commit4468347c9107b6e8d283c0995dcbee47469fb352 (patch)
tree3768ef1c26c62f086d50e29e56b4539ff316cbf0 /src/plugins/factoids
parentd7c8b0cc39dc938ed099bcec6c28877044684f1e (diff)
parentd8406b107c651321c9e166abc36fc66730d965a1 (diff)
downloadfrippy-4468347c9107b6e8d283c0995dcbee47469fb352.tar.gz
frippy-4468347c9107b6e8d283c0995dcbee47469fb352.zip
Merge branch 'dev' of github.com:Mavulp/frippy into dev
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()))),
}