irevoire/brust - Change KSLI6S43M2RU7MMFOSNUIISHJECRZIP3YVMUXHJBAKYXXDMDE5KAC

move the common code between all the cute command in utils

Created by irevoire on January 20, 2021

KSLI6S43M2RU7MMFOSNUIISHJECRZIP3YVMUXHJBAKYXXDMDE5KAC

Dependencies

In channels

main

Change contents

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

B:BD[3.214] → [4.108:219]

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

[3.214]

[3.273]

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

Replacement in src/commands/cute/cat.rs at line 16 [3.31]
B:BD[4.221] → [4.221:232]
```
    loop {
```
[4.221]
[2.0]
```
    crate::repeat_message!(ctx, {
```

Replacement in src/commands/cute/cat.rs at line 34 [3.31]

B:BD[4.729] → [4.729:778]

        let answer = msg
            .channel_id

[4.729]

[4.778]

        msg.channel_id

Replacement in src/commands/cute/cat.rs at line 36 [3.31]
B:BD[4.856] → [4.856:877]
```
            .await?;
```
[4.856]
[4.877]
```
            .await?
    });
```

Deletion in src/commands/cute/cat.rs at line 39 [3.31]

B:BD[4.878] → [4.878:943]

∅:D[5.931] → [6.249:250]

∅:D[4.943] → [6.249:250]

B:BD[6.249] → [6.249:250]

B:BD[6.250] → [4.944:998]

∅:D[7.427] → [8.344:345]

∅:D[4.998] → [8.344:345]

B:BD[8.344] → [8.344:345]

B:BD[8.345] → [4.999:1195]

∅:D[7.561] → [8.606:607]

∅:D[4.1195] → [8.606:607]

B:BD[8.606] → [8.606:607]

B:BD[8.607] → [4.1196:1260]

        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;
        if more.is_none() {
            break;
        }
    }

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

B:BD[9.249] → [4.1261:1372]

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

[9.249]

[9.308]

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

Replacement in src/commands/cute/dog.rs at line 16 [9.81]
B:BD[5.1825] → [4.1373:1384]
```
    loop {
```
[5.1825]
[4.1384]
```
    crate::repeat_message!(ctx, {
```
Replacement in src/commands/cute/dog.rs at line 23 [9.81]
B:BD[4.1566] → [4.1566:1615]
```
        let answer = msg
            .channel_id
```
[4.1566]
[4.1615]
```
        msg.channel_id
```
Replacement in src/commands/cute/dog.rs at line 25 [9.81]
B:BD[4.1694] → [4.1694:1715]
```
            .await?;
```
[4.1694]
[4.1715]
```
            .await?
    });
```

Deletion in src/commands/cute/dog.rs at line 28 [9.81]

B:BD[4.1716] → [4.1716:2033]

∅:D[4.2033] → [7.582:583]

B:BD[10.462] → [7.582:583]

B:BD[7.583] → [4.2034:2097]

∅:D[4.2097] → [7.694:695]

B:BD[7.694] → [7.694:695]

        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;
        if more.is_none() {
            break;
        }
    }

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

B:BD[11.113] → [4.2098:2209]

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

[11.113]

[11.172]

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

Replacement in src/commands/cute/fox.rs at line 11 [11.9]
B:BD[11.357] → [4.2210:2221]
```
    loop {
```
[11.357]
[4.2221]
```
    crate::repeat_message!(ctx, {
```
Replacement in src/commands/cute/fox.rs at line 14 [11.9]
B:BD[4.2271] → [4.2271:2320]
```
        let answer = msg
            .channel_id
```
[4.2271]
[4.2320]
```
        msg.channel_id
```
Replacement in src/commands/cute/fox.rs at line 16 [11.9]
B:BD[4.2398] → [4.2398:2419]
```
            .await?;
```
[4.2398]
[4.2419]
```
            .await?
    });
```

Deletion in src/commands/cute/fox.rs at line 19 [11.9]

B:BD[4.2420] → [4.2420:2737]

∅:D[4.2737] → [11.402:403]

B:BD[11.402] → [11.402:403]

B:BD[11.403] → [4.2738:2801]

∅:D[4.2801] → [11.513:514]

B:BD[11.513] → [11.513:514]

        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;
        if more.is_none() {
            break;
        }
    }

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

B:BD[12.334] → [4.2802:2913]

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

[12.334]

[12.393]

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

Replacement in src/commands/cute/spood.rs at line 16 [12.155]
B:BD[4.2915] → [4.2915:2926]
```
    loop {
```
[4.2915]
[2.463]
```
    crate::repeat_message!(ctx, {
```
Replacement in src/commands/cute/spood.rs at line 34 [12.155]
B:BD[4.3459] → [4.3459:3508]
```
        let answer = msg
            .channel_id
```
[4.3459]
[4.3508]
```
        msg.channel_id
```
Replacement in src/commands/cute/spood.rs at line 36 [12.155]
B:BD[4.3586] → [4.3586:3607]
```
            .await?;
```
[4.3586]
[4.3607]
```
            .await?
    });
```

Deletion in src/commands/cute/spood.rs at line 39 [12.155]

B:BD[4.3608] → [4.3608:3673]

∅:D[4.3673] → [12.691:692]

B:BD[12.691] → [12.691:692]

B:BD[12.692] → [4.3674:3728]

∅:D[7.997] → [12.1134:1135]

∅:D[4.3728] → [12.1134:1135]

B:BD[12.1134] → [12.1134:1135]

B:BD[12.1135] → [4.3729:3925]

∅:D[7.1145] → [12.1455:1456]

∅:D[4.3925] → [12.1455:1456]

B:BD[12.1455] → [12.1455:1456]

B:BD[12.1456] → [4.3926:3990]

        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;
        if more.is_none() {
            break;
        }
    }

Insertion in src/utils.rs at line 4 [13.358]

[13.513]


/// You can execute what you want in the block, but it should return a `serenity::model::channel::Message`.
/// Then an emoji will be sent under the message, and while someone click on this emoji the block
/// will be repeated.
/// It also needs to get a `serenity::prelude::Context`.
/// Here is an example with the command fox:
/// ```no_run
/// #[command]
/// pub async fn fox(ctx: &Context, msg: &Message, _args: Args) -> CommandResult {
///     crate::repeat_message!(ctx, {
///         let url = fetch_random_fox_url().await?;
///
///         msg.channel_id
///             .send_files(&ctx, vec![url.as_str()], |m| m.content(&msg.author))
///             .await?
///     });
///
///     Ok(())
/// }
/// ```
#[macro_export]
macro_rules! repeat_message {
    ($ctx:ident, $code:block) => {
        loop {
            use serenity::model::channel::ReactionType;
            let plus_emoji = "➕".parse::<ReactionType>().unwrap();
            let answer = $code;
            answer.react($ctx, plus_emoji.clone()).await?;
            let more = answer
                .await_reaction($ctx)
                .timeout(std::time::Duration::from_secs(60 * 10))
                .filter(move |reaction| reaction.emoji == plus_emoji)
                .await;

Insertion in src/utils.rs at line 41 [13.358]

[13.514]

[5.8205]

            if more.is_none() {
                break;
            }
            println!("sent something from macro");
        }
    };
}

move the common code between all the cute command in utils

Dependencies

In channels

Change contents

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

Replacement in src/commands/cute/cat.rs at line 16 [3.31]

Replacement in src/commands/cute/cat.rs at line 34 [3.31]

Replacement in src/commands/cute/cat.rs at line 36 [3.31]

Deletion in src/commands/cute/cat.rs at line 39 [3.31]

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

Replacement in src/commands/cute/dog.rs at line 16 [9.81]

Replacement in src/commands/cute/dog.rs at line 23 [9.81]

Replacement in src/commands/cute/dog.rs at line 25 [9.81]

Deletion in src/commands/cute/dog.rs at line 28 [9.81]

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

Replacement in src/commands/cute/fox.rs at line 11 [11.9]

Replacement in src/commands/cute/fox.rs at line 14 [11.9]

Replacement in src/commands/cute/fox.rs at line 16 [11.9]

Deletion in src/commands/cute/fox.rs at line 19 [11.9]

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

Replacement in src/commands/cute/spood.rs at line 16 [12.155]

Replacement in src/commands/cute/spood.rs at line 34 [12.155]

Replacement in src/commands/cute/spood.rs at line 36 [12.155]

Deletion in src/commands/cute/spood.rs at line 39 [12.155]

Insertion in src/utils.rs at line 4 [13.358]

Insertion in src/utils.rs at line 41 [13.358]