Refactor channels()

This commit is contained in:
bitfl0wer 2023-05-29 23:59:13 +02:00
parent 3cebafecf6
commit b1dbc53049
No known key found for this signature in database
GPG Key ID: 84BBB60DF895ABF2
2 changed files with 7 additions and 21 deletions

View File

@ -146,27 +146,22 @@ impl Guild {
/// * `limits_user` - A mutable reference to a `Limits` struct containing the user's rate limits.
/// * `limits_instance` - A mutable reference to a `Limits` struct containing the instance's rate limits.
///
pub async fn channels(
&self,
url_api: &str,
token: &str,
limits_user: &mut Limits,
limits_instance: &mut Limits,
) -> Result<Vec<Channel>, InstanceServerError> {
pub async fn channels(&self, user: &mut UserMeta) -> Result<Vec<Channel>, InstanceServerError> {
let mut belongs_to = user.belongs_to.borrow_mut();
let request = Client::new()
.get(format!(
"{}/guilds/{}/channels/",
url_api,
belongs_to.urls.get_api(),
self.id.to_string()
))
.bearer_auth(token);
.bearer_auth(user.token());
let result = match LimitedRequester::new()
.await
.send_request(
request,
crate::api::limits::LimitType::Guild,
limits_instance,
limits_user,
&mut belongs_to.limits,
&mut user.limits,
)
.await
{

View File

@ -31,16 +31,7 @@ async fn get_channels() {
let mut bundle = common::setup().await;
println!(
"{:?}",
bundle
.guild
.channels(
bundle.instance.urls.get_api(),
&bundle.user.token,
&mut bundle.user.limits,
&mut bundle.instance.limits,
)
.await
.unwrap()
bundle.guild.channels(&mut bundle.user).await.unwrap()
);
common::teardown(bundle).await;
}