@@ -37,17 +37,6 @@ pub(super) async fn handle_command(
3737 let issue = event. issue ( ) . unwrap ( ) ;
3838 let user = event. user ( ) ;
3939
40- let is_team_member = user. is_team_member ( & ctx. github ) . await . unwrap_or ( false ) ;
41-
42- if !is_team_member {
43- let cmnt = ErrorComment :: new (
44- & issue,
45- "Only team members can be part of the decision process." ,
46- ) ;
47- cmnt. post ( & ctx. github ) . await ?;
48- return Ok ( ( ) ) ;
49- }
50-
5140 match get_issue_decision_state ( & db, & issue. number ) . await {
5241 Ok ( _state) => {
5342 // TO DO
@@ -60,6 +49,17 @@ pub(super) async fn handle_command(
6049 Ok ( ( ) )
6150 }
6251 _ => {
52+ let is_team_member = user. is_team_member ( & ctx. github ) . await . unwrap_or ( false ) ;
53+ if !is_team_member {
54+ let cmnt = ErrorComment :: new (
55+ & issue,
56+ "Only team members can be part of the decision process." ,
57+ ) ;
58+ cmnt. post ( & ctx. github ) . await ?;
59+
60+ return Ok ( ( ) ) ;
61+ }
62+
6363 match team_name {
6464 None => {
6565 let cmnt = ErrorComment :: new (
@@ -155,7 +155,7 @@ fn build_status_comment(
155155) -> anyhow:: Result < String > {
156156 let mut comment = "| Team member | State |\n |-------------|-------|" . to_owned ( ) ;
157157 for ( user, status) in current {
158- let mut user_statuses = format ! ( "\n | {} |" , user) ;
158+ let mut user_statuses = format ! ( "\n | @ {} |" , user) ;
159159
160160 // previous stasuses
161161 match history. get ( user) {
@@ -228,8 +228,8 @@ mod tests {
228228 . expect ( "it shouldn't fail building the message" ) ;
229229 let expected_comment = "| Team member | State |\n \
230230 |-------------|-------|\n \
231- | Barbara | ~~hold~~ ~~merge~~ **merge** |\n \
232- | Niklaus | ~~merge~~ ~~hold~~ **merge** |"
231+ | @ Barbara | ~~hold~~ ~~merge~~ **merge** |\n \
232+ | @ Niklaus | ~~merge~~ ~~hold~~ **merge** |"
233233 . to_string ( ) ;
234234
235235 assert_eq ! ( build_result, expected_comment) ;
@@ -267,9 +267,9 @@ mod tests {
267267 . expect ( "it shouldn't fail building the message" ) ;
268268 let expected_comment = "| Team member | State |\n \
269269 |-------------|-------|\n \
270- | Barbara | ~~hold~~ ~~merge~~ **merge** |\n \
271- | Niklaus | ~~merge~~ ~~hold~~ **merge** |\n \
272- | Tom | |"
270+ | @ Barbara | ~~hold~~ ~~merge~~ **merge** |\n \
271+ | @ Niklaus | ~~merge~~ ~~hold~~ **merge** |\n \
272+ | @ Tom | |"
273273 . to_string ( ) ;
274274
275275 assert_eq ! ( build_result, expected_comment) ;
@@ -330,8 +330,8 @@ mod tests {
330330 . expect ( "it shouldn't fail building the message" ) ;
331331 let expected_comment = "| Team member | State |\n \
332332 |-------------|-------|\n \
333- | Barbara | **merge** |\n \
334- | Niklaus | **merge** |\
333+ | @ Barbara | **merge** |\n \
334+ | @ Niklaus | **merge** |\
335335 "
336336 . to_string ( ) ;
337337
0 commit comments