{"header":{"message":"add a quite shitty roll command\n","description":null,"timestamp":"2020-09-10T13:05:02Z","authors":[{"email":"irevoire@hotmail.fr","name":"Thomas Campistron"}]},"hash":"BXX426GPHXW3DYKLDXL4GZ2C4VLCXTQQYERMF4IXQWNIUMG64DWAC","authors":[],"deps":{"hashes":[["BXX426GPHXW3DYKLDXL4GZ2C4VLCXTQQYERMF4IXQWNIUMG64DWAC","add a quite shitty roll command\n"],["AA",null],["QQ7U6XFHZCKJ4TKVW62TCGWR7DNNJVCCWQH2CCTSTWJ36FPQIKBQC","add the choose command\n"],["HU54Y66265W2VOTVERPHEFFKM3FDNZHL5FDTWBE4OX5YIELFNRLAC","init\n"],["UA6AQUK37FVMQHXLMRAEEKV4JF6CHJI5Y72G2HSJX4HGY42AVAVAC","add the roasted command\n"],["VX4LH5RUBCNCHN4VIKMMHSXMFSZBVKFTHSHLKSBMRCVA2G76GUQQC","add the react and big command\n"],["5YD5TE7BVUUMNIT2WQPFPLZ75Z4GK74B2NPCZO33U2JWCEOSN4HAC","redo the whole bot, remove all the command and create a new tg command\n"],["D6WUCIR44ECRZYWW3ZRAKZPOIE3AN6YCNH33F633KB2NL3N3BOGAC","add a big command\n"],["7X3AZRA7PHV3TYMSR6YSE3XZTZDYRF7UMH7UELYMTXRBYCVE6R4QC","add a mock command\n"],["35EVA5MHEJMVJWQUXIJWAX43LJZ7YLE5Y4YN5T2SOSTBTQB6HTTQC","split the commands in multiple files\n"],["DQHQELI3CD6DAOLYDKL5VVDFPH7ZEHD6QKGOD6EXI643J4IC45CAC","remove the need of the main to include each command one by one\n"]],"deps":["QQ7U6XFHZCKJ4TKVW62TCGWR7DNNJVCCWQH2CCTSTWJ36FPQIKBQC"],"known":["HU54Y66265W2VOTVERPHEFFKM3FDNZHL5FDTWBE4OX5YIELFNRLAC","5YD5TE7BVUUMNIT2WQPFPLZ75Z4GK74B2NPCZO33U2JWCEOSN4HAC","7X3AZRA7PHV3TYMSR6YSE3XZTZDYRF7UMH7UELYMTXRBYCVE6R4QC","UA6AQUK37FVMQHXLMRAEEKV4JF6CHJI5Y72G2HSJX4HGY42AVAVAC","D6WUCIR44ECRZYWW3ZRAKZPOIE3AN6YCNH33F633KB2NL3N3BOGAC","VX4LH5RUBCNCHN4VIKMMHSXMFSZBVKFTHSHLKSBMRCVA2G76GUQQC"]},"hunks":[{"Edit":{"inode":{"change":10,"pos":2477},"path":"src/commands/mod.rs","line":7,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":23}],"down_context":[{"change":11,"pos":23}],"flag":"BLOCK","start":0,"end":10,"inode":{"change":10,"pos":2477}}},"contents":[{"Add":"mod roll;"}]}},{"Edit":{"inode":{"change":10,"pos":2477},"path":"src/commands/mod.rs","line":16,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":69}],"down_context":[{"change":11,"pos":69}],"flag":"BLOCK","start":11,"end":28,"inode":{"change":10,"pos":2477}}},"contents":[{"Add":"pub use roll::*;"}]}},{"FileAdd":{"meta":{"basename":"roll.rs","metadata":0},"context":[{"change":10,"pos":11}],"contents":[{"Add":"use rand::Rng;"},{"Add":"use serenity::framework::standard::{macros::command, Args, CommandResult};"},{"Add":"use serenity::{model::channel::Message, prelude::Context};"},{"Add":"use std::str::FromStr;"},{"Add":""},{"Add":"#[command]"},{"Add":"#[description = r#\"Roll dice\"#]"},{"Add":"pub fn roll(ctx: &mut Context, msg: &Message, mut args: Args) -> CommandResult {"},{"Add":" let data = ctx.data.read();"},{"Add":" let mut rng = data.get::().unwrap().lock().unwrap();"},{"Add":""},{"Add":" let terms = args"},{"Add":" .iter::()"},{"Add":" .map(|arg| arg.unwrap())"},{"Add":" .map(|s| s.parse::())"},{"Add":" .collect::, Box>>();"},{"Add":""},{"Add":" if let Err(ref e) = terms {"},{"Add":" let _ = msg.reply(&ctx, format!(\"{}\", e));"},{"Add":" return Err(e.into());"},{"Add":" }"},{"Add":" let terms = terms.unwrap();"},{"Add":""},{"Add":" let mut parser = Parser::default();"},{"Add":" let mut res = Vec::new();"},{"Add":""},{"Add":" for term in terms {"},{"Add":" let step = match parser.and(&term, &mut *rng) {"},{"Add":" Ok(step) => step,"},{"Add":" Err(e) => {"},{"Add":" let _ = msg.reply(&ctx, format!(\"{}\", e));"},{"Add":" return Err(e.into());"},{"Add":" }"},{"Add":" };"},{"Add":" match term {"},{"Add":" Term::Roll(_) => res.push(format!(\"{}\", step)),"},{"Add":" Term::Binop(op) => res.push(op.to_string()),"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" let res = res.join(\" \");"},{"Add":""},{"Add":" let _ = msg.reply("},{"Add":" &ctx,"},{"Add":" format!(\"{} ({})\", parser.total.ok_or(\"There was no op\")?, res),"},{"Add":" );"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"enum Roll {"},{"Add":" // a roll in the form of x throw of dices of y faces"},{"Add":" Dice(usize, usize),"},{"Add":" // a const value added or subbed to a dice"},{"Add":" Const(usize),"},{"Add":"}"},{"Add":""},{"Add":"impl std::fmt::Display for Roll {"},{"Add":" fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {"},{"Add":" let s = match self {"},{"Add":" Roll::Dice(rolls, faces) => format!(\"{}d{}\", rolls, faces),"},{"Add":" Roll::Const(c) => format!(\"{}\", c),"},{"Add":" };"},{"Add":" write!(f, \"{}\", s)"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl Roll {"},{"Add":" /// Generate a value for the roll"},{"Add":" pub fn roll(&self, rng: &mut impl Rng) -> i64 {"},{"Add":" match self {"},{"Add":" Roll::Dice(rolls, faces) => {"},{"Add":" (0..*rolls).fold(0, |acc, _| acc + rng.gen_range(1, faces + 1) as i64)"},{"Add":" }"},{"Add":" Roll::Const(c) => *c as i64,"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl FromStr for Roll {"},{"Add":" type Err = Box;"},{"Add":""},{"Add":" fn from_str(s: &str) -> Result {"},{"Add":" if let Ok(c) = s.parse::() {"},{"Add":" return Ok(Roll::Const(c));"},{"Add":" }"},{"Add":" let v: Vec<&str> = s.split('d').collect();"},{"Add":" if v.len() != 2 {"},{"Add":" return Err(\"Failed to parse the dice\".into());"},{"Add":" }"},{"Add":" let (rolls, faces) = (v[0], v[1]);"},{"Add":" Ok(Roll::Dice(rolls.parse()?, faces.parse()?))"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"/// represent different binary operations"},{"Add":"#[derive(Clone, Copy)]"},{"Add":"enum Binop {"},{"Add":" Add,"},{"Add":" Sub,"},{"Add":" Mul,"},{"Add":"}"},{"Add":""},{"Add":"impl std::fmt::Display for Binop {"},{"Add":" fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {"},{"Add":" let s = match self {"},{"Add":" Binop::Add => \"+\","},{"Add":" Binop::Sub => \"-\","},{"Add":" Binop::Mul => \"*\","},{"Add":" };"},{"Add":" write!(f, \"{}\", s)"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl Binop {"},{"Add":" pub fn run(&self, left: i64, right: i64) -> i64 {"},{"Add":" match self {"},{"Add":" Binop::Add => left + right,"},{"Add":" Binop::Sub => left - right,"},{"Add":" Binop::Mul => left * right,"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl FromStr for Binop {"},{"Add":" type Err = Box;"},{"Add":""},{"Add":" fn from_str(s: &str) -> Result {"},{"Add":" match s.trim() {"},{"Add":" \"+\" => Ok(Binop::Add),"},{"Add":" \"-\" => Ok(Binop::Sub),"},{"Add":" \"*\" => Ok(Binop::Mul),"},{"Add":" s => Err(format!(\"Unsupported operator {}\", s).into()),"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"enum Term {"},{"Add":" Binop(Binop),"},{"Add":" Roll(Roll),"},{"Add":"}"},{"Add":""},{"Add":"impl FromStr for Term {"},{"Add":" type Err = Box;"},{"Add":""},{"Add":" fn from_str(s: &str) -> Result {"},{"Add":" if let Ok(b) = s.parse::() {"},{"Add":" Ok(Term::Binop(b))"},{"Add":" } else if let Ok(r) = s.parse::() {"},{"Add":" Ok(Term::Roll(r))"},{"Add":" } else {"},{"Add":" Err(format!(\"Can't parse this term: \\\"{}\\\"\", s).into())"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Default)]"},{"Add":"struct Parser {"},{"Add":" total: Option,"},{"Add":" binop: Option,"},{"Add":"}"},{"Add":""},{"Add":"impl Parser {"},{"Add":" pub fn and("},{"Add":" &mut self,"},{"Add":" term: &Term,"},{"Add":" rng: &mut impl Rng,"},{"Add":" ) -> Result> {"},{"Add":" match term {"},{"Add":" Term::Binop(binop) => {"},{"Add":" if self.binop.is_some() || self.total.is_none() {"},{"Add":" return Err(format!("},{"Add":" \"Malformed equation: was expecting a term but instead got: {}\","},{"Add":" binop"},{"Add":" )"},{"Add":" .into());"},{"Add":" }"},{"Add":" self.binop = Some(*binop);"},{"Add":" self.total.ok_or(\"Bug\".into())"},{"Add":" }"},{"Add":" Term::Roll(roll) => {"},{"Add":" let res = roll.roll(rng);"},{"Add":""},{"Add":" if self.binop.is_none() && self.total.is_some() {"},{"Add":" Err(format!("},{"Add":" \"Malformed equation: was expecting an operator but intsead got: {}\","},{"Add":" roll"},{"Add":" )"},{"Add":" .into())"},{"Add":" } else if self.total.is_none() {"},{"Add":" self.total = Some(res);"},{"Add":" Ok(res)"},{"Add":" } else {"},{"Add":" self.total = Some(self.binop.take().unwrap().run(self.total.unwrap(), res));"},{"Add":" Ok(res)"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":"}"}]}},{"Replacement":{"inode":{"change":3,"pos":17},"path":"src/main.rs","line":52,"ins":{"up_context":[{"change":3,"pos":5663}],"down_context":[{"change":3,"pos":5679}],"flag":"BLOCK","start":5426,"end":5483,"inode":{"change":3,"pos":17}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":5663},"to":{"change":2,"start":692,"end":743},"introduced_by":2}],"inode":{"change":3,"pos":17}},"ins_contents":[{"Add":"#[commands(tg, mock, roasted, big, react, choose, roll)]"}],"del_contents":[{"Del":"#[commands(tg, mock, roasted, big, react, choose)]\n"}]}}],"owner":"irevoire","repo":"brust","token":"AWzEKAoySJUKA2NeDGyT758XQZZhRG3HlrnHqBfND38=","login":null}

…

Dependencies

Change contents