irevoire/brust - Change HSHQP542PXUJQVPUFX2YOSI6N4DYZ75VTBOIVJMYJXFSTKKIBDMAC

move all the error handling in the error type

Created by irevoire on December 29, 2020

HSHQP542PXUJQVPUFX2YOSI6N4DYZ75VTBOIVJMYJXFSTKKIBDMAC

Dependencies

In channels

main

Change contents

Replacement in src/commands/choose.rs at line 12 [4.12]

B:BD[4.401] → [2.438:499]

∅:D[2.499] → [4.455:478]

B:BD[4.455] → [4.455:478]

        let _ = msg.reply(&ctx, "Give me arguments").await?;
        return Ok(());

[4.401]

[4.478]

        Err(anyhow::anyhow!("Give me arguments"))?;

Replacement in src/commands/choose.rs at line 17 [4.12]

B:BD[4.563] → [2.616:706]

    let _ = msg
        .reply(&ctx, args.iter::<String>().nth(choice).unwrap().unwrap())

[4.563]

[2.706]

    msg.reply(&ctx, args.iter::<String>().nth(choice).unwrap().unwrap())

Replacement in src/commands/cute/cat.rs at line 1 [5.31]
B:BD[5.31] → [2.724:744]
```
use anyhow::Result;
```
[5.31]
[5.32]
```
use anyhow::{anyhow, Result};
```
Replacement in src/commands/cute/cat.rs at line 9 [5.31]
B:BD[5.285] → [3.0:20]
```
#[aliases("doggo")]
```
[5.285]
[6.0]
```
#[aliases("catto")]
```

Replacement in src/commands/cute/cat.rs at line 15 [5.31]

B:BD[7.250] → [2.932:980]

∅:D[7.292] → [8.33:60]

∅:D[2.980] → [8.33:60]

B:BD[8.33] → [8.33:60]

B:BD[8.60] → [2.981:1297]

∅:D[2.1297] → [8.315:344]

B:BD[8.315] → [8.315:344]

    let page = fetch_cat_page(&mut *rng).await;
    if let Err(e) = page {
        let _ = msg
            .reply(
                &ctx,
                format!(
                    "Catto express: was not able to deliver you cat: {}\n{}",
                    e,
                    "https://i.redd.it/4q32jedhkgi31.jpg" // crying catto
                ),
            )
            .await?;
        return Ok(());
    }

[7.250]

[8.344]

    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
        )
    })?;

Replacement in src/commands/cute/cat.rs at line 23 [5.31]

B:BD[8.345] → [8.345:412]

B:BD[8.412] → [2.1298:1480]

∅:D[2.1480] → [8.549:606]

B:BD[8.549] → [8.549:606]

    let url = fetch_url_in_cat_page(page?);
    if url.is_none() {
        let _ = msg
            .reply(
                &ctx,
                format!("Catto express: your catto got lost in the page :pensive:"),
            )
            .await?;
        return Ok(());
    }
    let url = url.unwrap();

[8.345]

[8.606]

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

Replacement in src/commands/cute/cat.rs at line 27 [5.31]
B:BD[8.607] → [8.607:643]
```
    let _ = msg
        .channel_id
```
[8.607]
[3.21]
```
    msg.channel_id
```

Deletion in src/commands/cute/dog.rs at line 15 [6.81]

∅:D[2.1933] → [9.218:225]

B:BD[9.218] → [9.218:225]

B:BD[9.225] → [10.0:24]

B:BD[10.24] → [2.1934:2233]

    };
    let _ = match url {
        Ok(url) => {
            msg.channel_id
                .send_files(&ctx, vec![url.as_str()], |m| m.content(&msg.author))
                .await?
        }
        Err(annoncement) => {
            msg.reply(&ctx, format!("Doggo express: {}", annoncement))
                .await?
        }

Insertion in src/commands/cute/dog.rs at line 16 [6.81]

[9.462]

[6.1106]


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

Replacement in src/commands/cute/spood.rs at line 1 [3.155]
B:BD[3.155] → [3.156:176]
```
use anyhow::Result;
```
[3.155]
[3.176]
```
use anyhow::{anyhow, Result};
```

Replacement in src/commands/cute/spood.rs at line 15 [3.155]

B:BD[3.692] → [3.692:1134]

    let page = fetch_spood_page(&mut *rng).await;
    if let Err(e) = page {
        let _ = msg
            .reply(
                &ctx,
                format!(
                    "Spoddo express: was not able to deliver you spood: {}\n{}",
                    e,
                    "https://cdn.drawception.com/drawings/gB8gGBpkSW.png" // crying spoddo
                ),
            )
            .await?;
        return Ok(());
    }

[3.692]

[3.1134]

    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
        )
    })?;

Replacement in src/commands/cute/spood.rs at line 23 [3.155]

B:BD[3.1135] → [3.1135:1455]

    let url = fetch_url_in_spood_page(page?, &mut *rng);
    if url.is_none() {
        let _ = msg
            .reply(
                &ctx,
                format!("Spoddo express: your spood got lost in the page :pensive:"),
            )
            .await?;
        return Ok(());
    }
    let url = url.unwrap();

[3.1135]

[3.1455]

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

Replacement in src/commands/cute/spood.rs at line 27 [3.155]
B:BD[3.1456] → [3.1456:1492]
```
    let _ = msg
        .channel_id
```
[3.1456]
[3.1492]
```
    msg.channel_id
```
Replacement in src/commands/mock.rs at line 33 [12.10]
B:BD[11.1133] → [2.3230:3275]
```
        let _ = msg.reply(&ctx, new).await?;
```
[11.1133]
[11.1171]
```
        msg.reply(&ctx, new).await?;
```
Replacement in src/commands/mock.rs at line 35 [12.10]
B:BD[11.1177] → [2.3276:3313]
```
    let _ = msg.delete(&ctx).await?;
```
[11.1177]
[12.690]
```
    msg.delete(&ctx).await?;
```
Replacement in src/commands/roll.rs at line 1 [13.39]
B:BD[13.39] → [2.4572:4600]
```
use anyhow::{anyhow, bail};
```
[13.39]
[13.40]
```
use anyhow::{anyhow, bail, Result};
```

Replacement in src/commands/roll.rs at line 17 [13.39]

B:BD[13.558] → [2.4792:4841]

        .collect::<anyhow::Result<Vec<Term>>>();

[13.558]

[13.627]

        .collect::<anyhow::Result<Vec<Term>>>()?;

Deletion in src/commands/roll.rs at line 19 [13.39]

B:BD[13.628] → [13.628:660]

B:BD[13.660] → [2.4842:4923]

∅:D[2.4923] → [13.741:780]

B:BD[13.741] → [13.741:780]

    if let Err(ref e) = terms {
        let _ = msg.reply(&ctx, format!("{}", e)).await?;
        return Ok(());
    }
    let terms = terms.unwrap();

Replacement in src/commands/roll.rs at line 23 [13.39]

B:BD[13.875] → [13.875:985]

B:BD[13.985] → [2.4924:5021]

∅:D[2.5021] → [13.1082:1107]

B:BD[13.1082] → [13.1082:1107]

        let step = match parser.and(&term, &mut *rng) {
            Ok(step) => step,
            Err(e) => {
                let _ = msg.reply(&ctx, format!("{}", e)).await?;
                return Ok(());
            }
        };

[13.875]

[13.1107]

        let step = parser.and(&term, &mut *rng)?;

Replacement in src/commands/roll.rs at line 36 [13.39]

B:BD[13.1292] → [2.5109:5204]

    let _ = msg
        .reply(&ctx, format!("{} ({})", parser.unwrap(), res))
        .await;

[13.1292]

[13.1409]

    msg.reply(&ctx, format!("{} ({})", parser.unwrap(), res))
        .await?;

Replacement in src/commands/roll.rs at line 50 [13.39]

B:BD[13.1691] → [13.1691:1878]

        let s = match self {
            Roll::Dice(rolls, faces) => format!("{}d{}", rolls, faces),
            Roll::Const(c) => format!("{}", c),
        };
        write!(f, "{}", s)

[13.1691]

[13.1878]

        match self {
            Roll::Dice(rolls, faces) => write!(f, "{}d{}", rolls, faces),
            Roll::Const(c) => write!(f, "{}", c),
        }

Replacement in src/commands/roll.rs at line 72 [13.39]

B:BD[13.2281] → [2.5324:5386]

    fn from_str(s: &str) -> anyhow::Result<Self, Self::Err> {

[13.2281]

[13.2335]

    fn from_str(s: &str) -> Result<Self> {

Replacement in src/commands/roll.rs at line 95 [13.39]

B:BD[13.2897] → [13.2897:3019]

        let s = match self {
            Binop::Add => "+",
            Binop::Sub => "-",
            Binop::Mul => "*",

[13.2897]

[13.3019]

        let c = match self {
            Binop::Add => '+',
            Binop::Sub => '-',
            Binop::Mul => '*',

Replacement in src/commands/roll.rs at line 100 [13.39]
B:BD[13.3030] → [13.3030:3057]
```
        write!(f, "{}", s)
```
[13.3030]
[13.3057]
```
        write!(f, "{}", c)
```
Replacement in src/commands/tg.rs at line 33 [14.108]
B:BD[14.1152] → [15.226:272]
```
    let _ = msg.channel_id.say(&ctx, insult);
```
[14.1152]
[14.1208]
```
    msg.channel_id.say(&ctx, insult).await?;
```

move all the error handling in the error type

Dependencies

In channels

Change contents

Replacement in src/commands/choose.rs at line 12 [4.12]

Replacement in src/commands/choose.rs at line 17 [4.12]

Replacement in src/commands/cute/cat.rs at line 1 [5.31]

Replacement in src/commands/cute/cat.rs at line 9 [5.31]

Replacement in src/commands/cute/cat.rs at line 15 [5.31]

Replacement in src/commands/cute/cat.rs at line 23 [5.31]

Replacement in src/commands/cute/cat.rs at line 27 [5.31]

Deletion in src/commands/cute/dog.rs at line 15 [6.81]

Insertion in src/commands/cute/dog.rs at line 16 [6.81]

Replacement in src/commands/cute/spood.rs at line 1 [3.155]

Replacement in src/commands/cute/spood.rs at line 15 [3.155]

Replacement in src/commands/cute/spood.rs at line 23 [3.155]

Replacement in src/commands/cute/spood.rs at line 27 [3.155]

Replacement in src/commands/mock.rs at line 33 [12.10]

Replacement in src/commands/mock.rs at line 35 [12.10]

Replacement in src/commands/roll.rs at line 1 [13.39]