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

fix: empty similarity search footnotes #29

Merged
merged 2 commits into from
Oct 3, 2024
Merged

fix: empty similarity search footnotes #29

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e8da2c
fix: empty footnotes
sshivaditya Oct 3, 2024
4582a14
fix: similar issue filter
sshivaditya Oct 3, 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
29 changes: 20 additions & 9 deletions src/handlers/issue-deduplication.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,13 @@ export async function issueChecker(context: Context): Promise<boolean> {
} = context;
const { payload } = context as { payload: IssuePayload };
const issue = payload.issue;
const issueContent = issue.body + issue.title;

//Find and remove the footnotes from the issue content
const existingBody = context.payload.issue.body;
const footnoteIndex = existingBody?.indexOf("\n###### Similar");
const issueBody = footnoteIndex !== -1 ? existingBody?.substring(0, footnoteIndex) : existingBody;
const issueContent = issueBody + issue.title;

// Fetch all similar issues based on settings.warningThreshold
const similarIssues = await supabase.issue.findSimilarIssues(issueContent, context.config.warningThreshold, issue.node_id);
if (similarIssues && similarIssues.length > 0) {
Expand All @@ -50,7 +56,7 @@ export async function issueChecker(context: Context): Promise<boolean> {
// Handle issues that match the settings.warningThreshold but not the MATCH_THRESHOLD
if (similarIssues.length > 0) {
logger.info(`Similar issue which matches more than ${context.config.warningThreshold} already exists`);
await handleSimilarIssuesComment(context, payload, issue.number, similarIssues);
await handleSimilarIssuesComment(context, payload, issue.number, similarIssues, issueBody || "");
return true;
}
}
Expand All @@ -77,7 +83,13 @@ function matchRepoOrgToSimilarIssueRepoOrg(repoOrg: string, similarIssueRepoOrg:
* @param issueNumber
* @param similarIssues
*/
async function handleSimilarIssuesComment(context: Context, payload: IssuePayload, issueNumber: number, similarIssues: IssueSimilaritySearchResult[]) {
async function handleSimilarIssuesComment(
context: Context,
payload: IssuePayload,
issueNumber: number,
similarIssues: IssueSimilaritySearchResult[],
modifiedBody: string
) {
const issueList: IssueGraphqlResponse[] = await Promise.all(
similarIssues.map(async (issue: IssueSimilaritySearchResult) => {
const issueUrl: IssueGraphqlResponse = await context.octokit.graphql(
Expand Down Expand Up @@ -112,19 +124,18 @@ async function handleSimilarIssuesComment(context: Context, payload: IssuePayloa
return `[^0${index + 1}^]: [${issue.node.title}](${modifiedUrl}) ${issue.similarity}%`;
})
.join("\n");

if (commentBody.length === 0) {
return;
}
const footnoteLinks = [...Array(++finalIndex).keys()].map((i) => `[^0${i + 1}^]`).join("");
const body = "\n###### Similar " + footnoteLinks + "\n\n" + commentBody;

// Remove the existing foot note
const existingBody = context.payload.issue.body;
const footnoteIndex = existingBody?.indexOf("\n###### Similar");
const newBody = footnoteIndex !== -1 ? existingBody?.substring(0, footnoteIndex) : existingBody;

//Append the new foot note
await context.octokit.issues.update({
owner: payload.repository.owner.login,
repo: payload.repository.name,
issue_number: issueNumber,
body: newBody + body,
body: modifiedBody + body,
});
}