Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[NOT PUBLISHED BUT IN OPS PROD] - handle not_in_channel issue #10

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[NOT PUBLISHED BUT IN OPS PROD] - handle not_in_channel issue #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion src/main/java/jobs/PublishMessageJob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -16,6 +17,7 @@
import com.ullink.slack.simpleslackapi.SlackMessageHandle;
import com.ullink.slack.simpleslackapi.SlackSession;
import com.ullink.slack.simpleslackapi.SlackChatConfiguration;
import com.ullink.slack.simpleslackapi.replies.ParsedSlackReply;
import com.ullink.slack.simpleslackapi.replies.SlackMessageReply;

public class PublishMessageJob implements Runnable
Expand Down Expand Up @@ -106,6 +108,17 @@ public void run()
{
SlackMessageHandle<SlackMessageReply> handle = session.sendMessage(channel, comment, attachment, SlackChatConfiguration.getConfiguration().asUser());
ReviewRequest previousRequest = reviewRequestService.getReviewRequest(channel.getId(), changeId);
// Workaround for https://github.com/Itiviti/simple-slack-api/issues/152
ParsedSlackReply reply = handle.getReply();
if (!reply.isOk())
{
if ("not_in_channel".equals(reply.getErrorMessage()))
{
throw new IOException("Failed to send message to slack (" + reply.getErrorMessage() + "): please add bot to channel *`" + (channel.getName() != null ? channel.getName() : channel) + "`* and try again");
}
throw new IOException("Failed to send message to slack: " + reply.getErrorMessage());
}
// End of workaround for https://github.com/Itiviti/simple-slack-api/issues/152
ReviewRequest newRequest = new ReviewRequest(handle.getReply().getTimestamp(), changeId, channel.getId());
reviewRequestService.registerReviewRequest(newRequest);
if (previousRequest != null)
Expand All @@ -119,7 +132,16 @@ public void run()
}
catch (IOException e)
{
session.sendMessage(fromChannel, "Could not find change id *`" + changeId + "`*, check that the change id is valid and does not correspond to a draft", null, SlackChatConfiguration.getConfiguration().asUser());
if (e.getMessage() != null && e.getMessage().contains("please add bot to channel"))
{
// Workaround for https://github.com/Itiviti/simple-slack-api/issues/152
session.sendMessage(fromChannel, e.getMessage(), null, SlackChatConfiguration.getConfiguration().asUser());
// End of workaround for https://github.com/Itiviti/simple-slack-api/issues/152
}
else
{
session.sendMessage(fromChannel, "Could not find change id *`" + changeId + "`*, check that the change id is valid and does not correspond to a draft", null, SlackChatConfiguration.getConfiguration().asUser());
}
LOGGER.error("Could not publish review for change id " + changeId, e);
}
}
Expand Down