irevoire/brust - Change U2D5BY4KBQLM5NZLWGOTNVYDECYSBHYVGHTWSXSOWYW2NTIMEMTQC

bump the version of serenity and tokyo, and push a huge pile of shit. This should be refactored soon

Created by irevoire on January 20, 2021

U2D5BY4KBQLM5NZLWGOTNVYDECYSBHYVGHTWSXSOWYW2NTIMEMTQC

Dependencies

In channels

main

Change contents

Replacement in Cargo.toml at line 8 [5.6638]

B:BD[5.6769] → [2.0:71]

tokio = { version = "0.2.24", features = ["full"] }
serenity = "0.9.3"

[5.6769]

[6.0]

tokio = { version = "1", features = ["full"] }
serenity = { version = "0.10.2", features = ["collector"] }

Replacement in src/commands/cute/cat.rs at line 6 [6.31]

B:BD[6.214] → [6.214:273]

use serenity::{model::channel::Message, prelude::Context};

[6.214]

[6.273]

use serenity::{
    model::channel::{Message, ReactionType},
    prelude::Context,
};
use std::time::Duration;

Replacement in src/commands/cute/cat.rs at line 19 [6.31]

B:BD[7.862] → [7.862:931]

    let mut rng = data.get::<crate::Random>().unwrap().lock().await;

[7.862]

[8.249]


    loop {
        let mut rng = data.get::<crate::Random>().unwrap().lock().await;
        let page = fetch_cat_page(&mut *rng).await.map_err(|e| {
            anyhow!(
                "Catto express: was not able to deliver you cat: {}\n{}",
                e,
                "https://i.redd.it/4q32jedhkgi31.jpg" // crying catto
            )
        })?;
        let url = fetch_url_in_cat_page(page).ok_or(anyhow!(
            "Catto express: your catto got lost in the page :pensive:"
        ))?;
        let answer = msg
            .channel_id
            .send_files(&ctx, vec![url.as_str()], |m| m.content(&msg.author))
            .await?;
        let plus_emoji = "➕".parse::<ReactionType>().unwrap();

Replacement in src/commands/cute/cat.rs at line 42 [6.31]

B:BD[8.250] → [3.179:427]

    let page = fetch_cat_page(&mut *rng).await.map_err(|e| {
        anyhow!(
            "Catto express: was not able to deliver you cat: {}\n{}",
            e,
            "https://i.redd.it/4q32jedhkgi31.jpg" // crying catto
        )
    })?;

[8.250]

[9.344]

        answer.react(ctx, plus_emoji.clone()).await?;

Replacement in src/commands/cute/cat.rs at line 44 [6.31]

B:BD[9.345] → [3.428:561]

    let url = fetch_url_in_cat_page(page).ok_or(anyhow!(
        "Catto express: your catto got lost in the page :pensive:"
    ))?;

[9.345]

[9.606]

        let more = answer
            .await_reaction(ctx)
            .timeout(Duration::from_secs(60 * 10))
            .filter(move |reaction| reaction.emoji == plus_emoji)
            .await;

Replacement in src/commands/cute/cat.rs at line 50 [6.31]

B:BD[9.607] → [3.562:581]

∅:D[3.581] → [10.21:112]

B:BD[9.643] → [10.21:112]

    msg.channel_id
        .send_files(&ctx, vec![url.as_str()], |m| m.content(&msg.author))
        .await?;

[9.607]

[9.718]

        if more.is_none() {
            break;
        }
    }

Replacement in src/commands/cute/dog.rs at line 5 [11.81]

B:BD[11.249] → [11.249:308]

use serenity::{model::channel::Message, prelude::Context};

[11.249]

[11.308]

use serenity::{
    model::channel::{Message, ReactionType},
    prelude::Context,
};
use std::time::Duration;

Replacement in src/commands/cute/dog.rs at line 20 [11.81]

∅:D[7.1825] → [12.76:111]

B:BD[12.76] → [12.76:111]

B:BD[12.111] → [7.1826:1895]

∅:D[7.1895] → [12.174:187]

B:BD[12.174] → [12.174:187]

B:BD[12.187] → [7.1896:1933]

∅:D[7.2233] → [12.455:462]

B:BD[12.455] → [12.455:462]

    let url = if args.len() != 0 {
        fetch_dog_breed_url(args.raw().collect::<Vec<&str>>()).await
    } else {
        fetch_random_dog_url().await
    };

[7.1825]

[3.582]

    loop {
        let url = if args.len() != 0 {
            fetch_dog_breed_url(args.raw().collect::<Vec<&str>>()).await
        } else {
            fetch_random_dog_url().await
        };
        let answer = msg
            .channel_id
            .send_files(&ctx, vec![url?.as_str()], |m| m.content(&msg.author))
            .await?;
        let plus_emoji = "➕".parse::<ReactionType>().unwrap();
        answer.react(ctx, plus_emoji.clone()).await?;
        let more = answer
            .await_reaction(ctx)
            .timeout(Duration::from_secs(60 * 10))
            .filter(move |reaction| reaction.emoji == plus_emoji)
            .await;

Replacement in src/commands/cute/dog.rs at line 42 [11.81]

B:BD[3.583] → [3.583:694]

    msg.channel_id
        .send_files(&ctx, vec![url?.as_str()], |m| m.content(&msg.author))
        .await?;

[3.583]

[3.694]

        if more.is_none() {
            break;
        }
    }

Replacement in src/commands/cute/fox.rs at line 3 [4.9]

B:BD[4.113] → [4.113:172]

use serenity::{model::channel::Message, prelude::Context};

[4.113]

[4.172]

use serenity::{
    model::channel::{Message, ReactionType},
    prelude::Context,
};
use std::time::Duration;

Replacement in src/commands/cute/fox.rs at line 15 [4.9]

B:BD[4.357] → [4.357:402]

    let url = fetch_random_fox_url().await?;

[4.357]

[4.402]

    loop {
        let url = fetch_random_fox_url().await?;
        let answer = msg
            .channel_id
            .send_files(&ctx, vec![url.as_str()], |m| m.content(&msg.author))
            .await?;
        let plus_emoji = "➕".parse::<ReactionType>().unwrap();
        answer.react(ctx, plus_emoji.clone()).await?;
        let more = answer
            .await_reaction(ctx)
            .timeout(Duration::from_secs(60 * 10))
            .filter(move |reaction| reaction.emoji == plus_emoji)
            .await;

Replacement in src/commands/cute/fox.rs at line 33 [4.9]

B:BD[4.403] → [4.403:513]

    msg.channel_id
        .send_files(&ctx, vec![url.as_str()], |m| m.content(&msg.author))
        .await?;

[4.403]

[4.513]

        if more.is_none() {
            break;
        }
    }

Replacement in src/commands/cute/spood.rs at line 6 [10.155]

B:BD[10.334] → [10.334:393]

use serenity::{model::channel::Message, prelude::Context};

[10.334]

[10.393]

use serenity::{
    model::channel::{Message, ReactionType},
    prelude::Context,
};
use std::time::Duration;

Replacement in src/commands/cute/spood.rs at line 19 [10.155]

B:BD[10.622] → [10.622:691]

    let mut rng = data.get::<crate::Random>().unwrap().lock().await;

[10.622]

[10.691]


    loop {
        let mut rng = data.get::<crate::Random>().unwrap().lock().await;
        let page = fetch_spood_page(&mut *rng).await.map_err(|e| {
            anyhow!(
                "Spoddo express: was not able to deliver you spood: {}\n{}",
                e,
                "https://cdn.drawception.com/drawings/gB8gGBpkSW.png" // crying spoddo
            )
        })?;
        let url = fetch_url_in_spood_page(page, &mut *rng).ok_or(anyhow!(
            "Spoddo express: your spood got lost in the page :pensive:"
        ))?;
        let answer = msg
            .channel_id
            .send_files(&ctx, vec![url.as_str()], |m| m.content(&msg.author))
            .await?;
        let plus_emoji = "➕".parse::<ReactionType>().unwrap();

Replacement in src/commands/cute/spood.rs at line 42 [10.155]

B:BD[10.692] → [3.727:997]

    let page = fetch_spood_page(&mut *rng).await.map_err(|e| {
        anyhow!(
            "Spoddo express: was not able to deliver you spood: {}\n{}",
            e,
            "https://cdn.drawception.com/drawings/gB8gGBpkSW.png" // crying spoddo
        )
    })?;

[10.692]

[10.1134]

        answer.react(ctx, plus_emoji.clone()).await?;

Replacement in src/commands/cute/spood.rs at line 44 [10.155]

B:BD[10.1135] → [3.998:1145]

    let url = fetch_url_in_spood_page(page, &mut *rng).ok_or(anyhow!(
        "Spoddo express: your spood got lost in the page :pensive:"
    ))?;

[10.1135]

[10.1455]

        let more = answer
            .await_reaction(ctx)
            .timeout(Duration::from_secs(60 * 10))
            .filter(move |reaction| reaction.emoji == plus_emoji)
            .await;

Replacement in src/commands/cute/spood.rs at line 50 [10.155]

B:BD[10.1456] → [3.1146:1165]

∅:D[3.1165] → [10.1492:1583]

B:BD[10.1492] → [10.1492:1583]

    msg.channel_id
        .send_files(&ctx, vec![url.as_str()], |m| m.content(&msg.author))
        .await?;

[10.1456]

[10.1583]

        if more.is_none() {
            break;
        }
    }

Insertion in src/commands/tg.rs at line 4 [13.108]
[13.234]
[7.5972]
```
use serenity::prelude::Mutex;
```
Deletion in src/commands/tg.rs at line 6 [13.108]
B:BD[7.5992] → [7.5992:6016]
```
use tokio::sync::Mutex;
```
Insertion in src/main.rs at line 16 [5.17]
[14.175]
[15.752]
```
    http::Http,
```
Deletion in src/main.rs at line 24 [5.17]
B:BD[7.6711] → [7.6711:6735]
```
use tokio::sync::Mutex;
```
Insertion in src/main.rs at line 83 [5.17]
[16.203]
[7.7152]
```
    let http = Http::new_with_token(&token);
```

Insertion in src/main.rs at line 85 [5.17]

[7.7153]

    // We will fetch your bot's owners and id
    let (owners, bot_id) = match http.get_current_application_info().await {
        Ok(info) => {
            let mut owners = HashSet::new();
            if let Some(team) = info.team {
                owners.insert(team.owner_user_id);
            } else {
                owners.insert(info.owner.id);
            }
            match http.get_current_user().await {
                Ok(bot_id) => (owners, bot_id.id),
                Err(why) => panic!("Could not access the bot id: {:?}", why),
            }
        }
        Err(why) => panic!("Could not access application info: {:?}", why),
    };

Replacement in src/main.rs at line 103 [5.17]

B:BD[7.7198] → [7.7198:7269]

        .configure(|c| c.prefix("!").delimiters(vec![", ", ",", " "]))

[7.7198]

[7.7269]

        .configure(|c| {
            c.prefix("!")
                .on_mention(Some(bot_id))
                .owners(owners)
                .delimiters(vec![", ", ",", " "])
        })

Insertion in src/main.rs at line 115 [5.17]
[7.7399]
[7.7399]
```
        .event_handler(Handler)
```
Deletion in src/main.rs at line 117 [5.17]
B:BD[7.7429] → [7.7429:7461]
```
        .event_handler(Handler)
```