diff options
| author | Austin Hellyer <[email protected]> | 2016-11-10 20:25:32 -0700 |
|---|---|---|
| committer | Austin Hellyer <[email protected]> | 2016-12-29 11:55:10 -0800 |
| commit | 0359f512a8aada5ae0371049eb7c66ecd8d68d84 (patch) | |
| tree | f88dd9b362a2d349d0cdcd13b0859c4cc3329f46 /src/client/rest | |
| parent | Rework some event handles (diff) | |
| download | serenity-0359f512a8aada5ae0371049eb7c66ecd8d68d84.tar.xz serenity-0359f512a8aada5ae0371049eb7c66ecd8d68d84.zip | |
Add guild and channel search
Diffstat (limited to 'src/client/rest')
| -rw-r--r-- | src/client/rest/mod.rs | 69 | ||||
| -rw-r--r-- | src/client/rest/ratelimiting.rs | 2 |
2 files changed, 70 insertions, 1 deletions
diff --git a/src/client/rest/mod.rs b/src/client/rest/mod.rs index 5a03f37..1af067d 100644 --- a/src/client/rest/mod.rs +++ b/src/client/rest/mod.rs @@ -44,7 +44,7 @@ use std::default::Default; use std::fmt::Write as FmtWrite; use std::io::{ErrorKind as IoErrorKind, Read}; use std::sync::{Arc, Mutex}; -use ::constants; +use ::constants::{self, ErrorCode}; use ::internal::prelude::*; use ::model::*; use ::utils::decode_array; @@ -1429,6 +1429,73 @@ pub fn remove_group_recipient(group_id: u64, user_id: u64) user_id)) } +/// Searches a [`Channel`] for [`Message`]s that meet provided requirements. +/// +/// **Note**: Bot users can not search. +/// +/// [`Channel`]: ../../model/enum.Channel.html +/// [`Message`]: ../../model/struct.Message.html +pub fn search_channel_messages(channel_id: u64, map: BTreeMap<&str, String>) + -> Result<SearchResult> { + let mut uri = format!("/channels/{}/messages/search?", channel_id); + + for (k, v) in map { + uri.push('&'); + uri.push_str(k); + uri.push('='); + uri.push_str(&v); + } + + let response = request!(Route::ChannelsIdMessagesSearch(channel_id), + get, + "{}", + uri); + + if response.status == StatusCode::Accepted { + return Err(Error::Client(ClientError::ErrorCode(ErrorCode::SearchIndexUnavailable))); + } + + let content = try!(serde_json::from_reader(response)); + + SearchResult::decode(content) +} + +/// Searches a [`Guild`] - and optionally specific [channel][`GuildChannel`]s +/// within it - for messages that meet provided requirements. +/// +/// **Note**: Bot users can not search. +/// +/// [`Guild`]: ../../model/struct.Guild.html +/// [`GuildChannel`]: ../../model/struct.GuildChannel.html +pub fn search_guild_messages(guild_id: u64, + channel_ids: &[u64], + map: BTreeMap<&str, String>) + -> Result<SearchResult> { + let mut uri = format!("/guilds/{}/messages/search?", guild_id); + + for (k, v) in map { + uri.push('&'); + uri.push_str(k); + uri.push('='); + uri.push_str(&v); + } + + for channel_id in channel_ids { + write!(uri, "&channel_id={}", channel_id)?; + } + + let response = request!(Route::GuildsIdMessagesSearch(guild_id), + get, + "{}", + uri); + + if response.status == StatusCode::Accepted { + return Err(Error::Client(ClientError::ErrorCode(ErrorCode::SearchIndexUnavailable))); + } + + SearchResult::decode(try!(serde_json::from_reader(response))) +} + /// Sends a file to a channel. pub fn send_file<R: Read>(channel_id: u64, mut file: R, diff --git a/src/client/rest/ratelimiting.rs b/src/client/rest/ratelimiting.rs index ac085eb..a404310 100644 --- a/src/client/rest/ratelimiting.rs +++ b/src/client/rest/ratelimiting.rs @@ -64,6 +64,7 @@ pub enum Route { ChannelsIdMessagesIdAck(u64), ChannelsIdMessagesIdReactions(u64), ChannelsIdMessagesIdReactionsUserIdType(u64), + ChannelsIdMessagesSearch(u64), ChannelsIdPermissionsOverwriteId(u64), ChannelsIdPins(u64), ChannelsIdPinsMessageId(u64), @@ -87,6 +88,7 @@ pub enum Route { GuildsIdMembersId(u64), GuildsIdMembersIdRolesId(u64), GuildsIdMembersMeNick(u64), + GuildsIdMessagesSearch(u64), GuildsIdPrune(u64), GuildsIdRegions(u64), GuildsIdRoles(u64), |