aboutsummaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorAustin Hellyer <[email protected]>2016-11-19 20:50:33 -0800
committerAustin Hellyer <[email protected]>2016-11-19 20:50:33 -0800
commit66f4acc63163a5f7bd528165ee5fe9ae7d44eb7d (patch)
tree357b4f4632138b6e0270c177cccd445b1c4f2d98 /src/client
parentFix type errors for non-framework builds (diff)
downloadserenity-66f4acc63163a5f7bd528165ee5fe9ae7d44eb7d.tar.xz
serenity-66f4acc63163a5f7bd528165ee5fe9ae7d44eb7d.zip
Rename state methods from find_ to get_
For consistency with the rest of the library, rename the methods prefixed with `find_` to `get_`. The past logic was that items are "found", as they may or may not exist. With get, the expectation is that it is _always_ there, i.e. over REST. However, this is inconsistent, and "get"ting over REST can fail for other reasons.
Diffstat (limited to 'src/client')
-rw-r--r--src/client/context.rs10
-rw-r--r--src/client/dispatch.rs4
2 files changed, 7 insertions, 7 deletions
diff --git a/src/client/context.rs b/src/client/context.rs
index cd3468f..53bc9e2 100644
--- a/src/client/context.rs
+++ b/src/client/context.rs
@@ -761,7 +761,7 @@ impl Context {
let state = STATE.lock().unwrap();
let role = if let Some(role) = {
- state.find_role(guild_id.0, role_id.0)
+ state.get_role(guild_id.0, role_id.0)
} {
role
} else {
@@ -821,8 +821,8 @@ impl Context {
let channel_id = channel_id.into();
feature_state_enabled! {{
- if let Some(channel) = STATE.lock().unwrap().find_channel(channel_id) {
- return Ok(channel.clone())
+ if let Some(channel) = STATE.lock().unwrap().get_channel(channel_id) {
+ return Ok(channel.clone());
}
}}
@@ -836,7 +836,7 @@ impl Context {
feature_state_enabled! {{
let state = STATE.lock().unwrap();
- if let Some(guild) = state.find_guild(guild_id) {
+ if let Some(guild) = state.get_guild(guild_id) {
return Ok(guild.channels.clone());
}
}}
@@ -901,7 +901,7 @@ impl Context {
feature_state_enabled! {{
let state = STATE.lock().unwrap();
- if let Some(member) = state.find_member(guild_id, user_id) {
+ if let Some(member) = state.get_member(guild_id, user_id) {
return Ok(member.clone());
}
}}
diff --git a/src/client/dispatch.rs b/src/client/dispatch.rs
index ad40497..8c10e75 100644
--- a/src/client/dispatch.rs
+++ b/src/client/dispatch.rs
@@ -255,7 +255,7 @@ fn handle_event(event: Event,
feature_state! {{
let before = STATE.lock()
.unwrap()
- .find_channel(event.channel.id());
+ .get_channel(event.channel.id());
update!(update_with_channel_update, event);
thread::spawn(move || {
@@ -413,7 +413,7 @@ fn handle_event(event: Event,
// could fail under any circumstance.
let after = STATE.lock()
.unwrap()
- .find_member(event.guild_id, event.user.id)
+ .get_member(event.guild_id, event.user.id)
.unwrap()
.clone();