Skip to content

Implementing support for more accurate github embed colors #1075

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

Merged
ankitsmt211 merged 6 commits into from
Apr 4, 2024
Merged

Implementing support for more accurate github embed colors #1075

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
525976a
Added support for "complete" and "not planned" issue states
Suleman70 Mar 25, 2024
31a82a5
Changed the purple embed color
Suleman70 Mar 27, 2024
bc50dd1
Enabled support for PR embed colors and their different states
Suleman70 Mar 31, 2024
7871f6b
Reduced cognitive complexity of getIssueState method
Suleman70 Mar 31, 2024
934aacb
Added @SquidXTV changes
Suleman70 Mar 31, 2024
843b593
Added @ankitsmt211 changes
Suleman70 Apr 4, 2024
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
43 changes: 37 additions & 6 deletions application/src/main/java/org/togetherjava/tjbot/features/github/GitHubReference.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,14 @@ public final class GitHubReference extends MessageReceiverAdapter {
*/
static final Pattern ISSUE_REFERENCE_PATTERN =
Pattern.compile("#(?<%s>\\d{1,5})".formatted(ID_GROUP));
private static final int ISSUE_OPEN = Color.green.getRGB();
private static final int ISSUE_CLOSE = Color.red.getRGB();

// Representing different GitHub states of an Issue/PR
private static final Color OPEN_STATE = Color.green;
private static final Color CLOSE_STATE = Color.red;
private static final Color MERGED_STATE = new Color(141, 106, 187);
private static final Color NOT_PLANNED_STATE = new Color(72, 72, 72);
private static final Color DRAFT_STATE = Color.gray;


/**
* A constant representing the date and time formatter used for formatting the creation date of
Expand Down Expand Up @@ -167,9 +173,7 @@ MessageEmbed generateReply(GHIssue issue) throws UncheckedIOException {
String dateOfCreation = FORMATTER.format(createdAt);

String footer = "%s • %s • %s".formatted(labels, assignees, dateOfCreation);

return new EmbedBuilder()
.setColor(issue.getState() == GHIssueState.OPEN ? ISSUE_OPEN : ISSUE_CLOSE)
return new EmbedBuilder().setColor(getIssueStateColor(issue))
.setTitle(title, titleUrl)
.setDescription(description)
.setAuthor(issue.getUser().getName(), null, issue.getUser().getAvatarUrl())
Expand All @@ -181,6 +185,26 @@ MessageEmbed generateReply(GHIssue issue) throws UncheckedIOException {
}
}

/**
* Returns the color based on the state of the issue/PR
*/
private Color getIssueStateColor(GHIssue issue) throws IOException {
if (issue instanceof GHPullRequest pr) {
if (pr.isMerged()) {
return MERGED_STATE;
} else if (pr.isDraft()) {
return DRAFT_STATE;
}
} else {
if (issue.getStateReason() == GHIssueStateReason.COMPLETED) {
return MERGED_STATE;
} else if (issue.getStateReason() == GHIssueStateReason.NOT_PLANNED) {
return NOT_PLANNED_STATE;
}
}
return issue.getState() == GHIssueState.OPEN ? OPEN_STATE : CLOSE_STATE;
}

/**
* Either properly gathers the name of a user or throws a UncheckedIOException.
*/
Expand All @@ -199,6 +223,9 @@ Optional<GHIssue> findIssue(int id, String targetIssueTitle) {
return repositories.stream().map(repository -> {
try {
GHIssue issue = repository.getIssue(id);
if (issue.isPullRequest()) {
issue = repository.getPullRequest(id);
}
if (issue.getTitle().equals(targetIssueTitle)) {
return Optional.of(issue);
}
Expand All @@ -216,7 +243,11 @@ Optional<GHIssue> findIssue(int id, long defaultRepoId) {
.filter(repository -> repository.getId() == defaultRepoId)
.map(repository -> {
try {
return Optional.of(repository.getIssue(id));
GHIssue issue = repository.getIssue(id);
if (issue.isPullRequest()) {
issue = repository.getPullRequest(id);
}
return Optional.of(issue);
} catch (FileNotFoundException ignored) {
return Optional.<GHIssue>empty();
} catch (IOException ex) {
Expand Down