Merge pull request #2022 from Urgau/concerns

Add `concern`/`resolve` commands in an rfcbot-like manner

Author: Kobzol

parser/src/command.rs

@@ -5,6 +5,7 @@ use regex::Regex;
 
 pub mod assign;
 pub mod close;
+pub mod concern;
 pub mod nominate;
 pub mod note;
 pub mod ping;
@@ -25,6 +26,7 @@ pub enum Command<'a> {
     Shortcut(Result<shortcut::ShortcutCommand, Error<'a>>),
     Close(Result<close::CloseCommand, Error<'a>>),
     Note(Result<note::NoteCommand, Error<'a>>),
+    Concern(Result<concern::ConcernCommand, Error<'a>>),
     Transfer(Result<transfer::TransferCommand, Error<'a>>),
 }
 
@@ -97,6 +99,11 @@ impl<'a> Input<'a> {
             Command::Note,
             &original_tokenizer,
         ));
+        success.extend(parse_single_command(
+            concern::ConcernCommand::parse,
+            Command::Concern,
+            &original_tokenizer,
+        ));
         success.extend(parse_single_command(
             ping::PingCommand::parse,
             Command::Ping,
@@ -206,6 +213,7 @@ impl<'a> Command<'a> {
             Command::Shortcut(r) => r.is_ok(),
             Command::Close(r) => r.is_ok(),
             Command::Note(r) => r.is_ok(),
+            Command::Concern(r) => r.is_ok(),
             Command::Transfer(r) => r.is_ok(),
         }
     }
@@ -353,3 +361,27 @@ fn review_ignored() {
         assert_eq!(input.next(), None);
     }
 }
+
+#[test]
+fn concern() {
+    let input = "@bot concern this is my concern";
+    let mut input = Input::new(input, vec!["bot"]);
+    assert_eq!(
+        input.next(),
+        Some(Command::Concern(Ok(concern::ConcernCommand::Concern {
+            title: "this is my concern".to_string()
+        })))
+    );
+}
+
+#[test]
+fn resolve() {
+    let input = "@bot resolve this is my concern";
+    let mut input = Input::new(input, vec!["bot"]);
+    assert_eq!(
+        input.next(),
+        Some(Command::Concern(Ok(concern::ConcernCommand::Resolve {
+            title: "this is my concern".to_string()
+        })))
+    );
+}

parser/src/command/concern.rs

@@ -0,0 +1,48 @@
+use crate::error::Error;
+use crate::token::{Token, Tokenizer};
+use std::fmt;
+
+#[derive(PartialEq, Eq, Debug)]
+pub enum ConcernCommand {
+    Concern { title: String },
+    Resolve { title: String },
+}
+
+#[derive(PartialEq, Eq, Debug)]
+pub enum ParseError {
+    MissingTitle,
+}
+
+impl std::error::Error for ParseError {}
+impl fmt::Display for ParseError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            ParseError::MissingTitle => write!(f, "missing required title"),
+        }
+    }
+}
+
+impl ConcernCommand {
+    pub fn parse<'a>(input: &mut Tokenizer<'a>) -> Result<Option<Self>, Error<'a>> {
+        let mut toks = input.clone();
+        if let Some(Token::Word(action @ ("concern" | "resolve"))) = toks.peek_token()? {
+            toks.next_token()?;
+
+            let title = toks.take_line()?.trim().to_string();
+
+            if title.is_empty() {
+                return Err(toks.error(ParseError::MissingTitle));
+            }
+
+            let command = if action == "resolve" {
+                ConcernCommand::Resolve { title }
+            } else {
+                ConcernCommand::Concern { title }
+            };
+
+            Ok(Some(command))
+        } else {
+            Ok(None)
+        }
+    }
+}

src/config.rs

@@ -35,6 +35,7 @@ pub(crate) struct Config {
     pub(crate) review_requested: Option<ReviewRequestedConfig>,
     pub(crate) shortcut: Option<ShortcutConfig>,
     pub(crate) note: Option<NoteConfig>,
+    pub(crate) concern: Option<ConcernConfig>,
     pub(crate) mentions: Option<MentionsConfig>,
     pub(crate) no_merges: Option<NoMergesConfig>,
     // We want this validation to run even without the entry in the config file
@@ -191,6 +192,14 @@ pub(crate) struct NoteConfig {
     _empty: (),
 }
 
+#[derive(PartialEq, Eq, Debug, serde::Deserialize)]
+#[serde(deny_unknown_fields)]
+pub(crate) struct ConcernConfig {
+    /// Set the labels on the PR when concerns are active.
+    #[serde(default)]
+    pub(crate) labels: Vec<String>,
+}
+
 #[derive(PartialEq, Eq, Debug, serde::Deserialize)]
 pub(crate) struct MentionsConfig {
     #[serde(flatten)]
@@ -594,6 +603,9 @@ mod tests {
 
             [note]
 
+            [concern]
+            labels = ["has-concerns"]
+
             [ping.compiler]
             message = """\
             So many people!\
@@ -691,6 +703,9 @@ mod tests {
                 behind_upstream: Some(BehindUpstreamConfig {
                     days_threshold: Some(14),
                 }),
+                concern: Some(ConcernConfig {
+                    labels: vec!["has-concerns".to_string()],
+                }),
             }
         );
     }
@@ -742,6 +757,7 @@ mod tests {
                 }),
                 note: None,
                 ping: None,
+                concern: None,
                 nominate: None,
                 shortcut: None,
                 prioritize: None,

src/github.rs

@@ -482,6 +482,7 @@ pub struct Comment {
     pub updated_at: chrono::DateTime<Utc>,
     #[serde(default, rename = "state")]
     pub pr_review_state: Option<PullRequestReviewState>,
+    pub author_association: AuthorAssociation,
 }
 
 #[derive(Debug, serde::Deserialize, serde::Serialize, Eq, PartialEq)]

src/handlers.rs

@@ -29,6 +29,7 @@ mod autolabel;
 mod bot_pull_requests;
 mod check_commits;
 mod close;
+mod concern;
 pub mod docs_update;
 mod github_releases;
 mod issue_links;
@@ -365,6 +366,7 @@ command_handlers! {
     shortcut: Shortcut,
     close: Close,
     note: Note,
+    concern: Concern,
     transfer: Transfer,
 }