diff --git a/src/tasks/remind.ts b/src/tasks/remind.ts index ac1dce5f..790be9c1 100644 --- a/src/tasks/remind.ts +++ b/src/tasks/remind.ts @@ -115,6 +115,10 @@ export async function remind(api: Api): Promise { // get possible appropers, prefixed with '@' and joined with commas const possibleApprovers = maintainerUsernames .filter((username) => { + if (mergeRequest.assignee.username === username) { + return false; + } + if (approval.approved_by.length === 0) { return true; } @@ -133,8 +137,8 @@ export async function remind(api: Api): Promise { // send message to slack await client.chat.postMessage({ - channel: SLACK_CHANNEL, - text: `Merge request '${mergeRequest.title}' needs more approvals! See ${mergeRequest.web_url}!`, + channel: SLACK_CHANNEL, + text: `Merge request '${mergeRequest.title}' needs more approvals! See ${mergeRequest.web_url}!`, }); // create note in merge request @@ -149,12 +153,15 @@ export async function remind(api: Api): Promise { // send message to slack await client.chat.postMessage({ - channel: SLACK_CHANNEL, - text: `Merge request '${mergeRequest.title}' is ready to be merged! See ${mergeRequest.web_url}!`, + channel: SLACK_CHANNEL, + text: `Merge request '${mergeRequest.title}' is ready to be merged! See ${mergeRequest.web_url}!`, }); // prefix maintainers with '@' and join with commas const possibleMergers = maintainerUsernames + .filter((username) => { + return mergeRequest.assignee.username !== username; + }) .map((username) => `@${username}`) .join(', ');