mirror of
https://github.com/xHyroM/bun-discord-bot.git
synced 2024-11-10 01:08:07 +01:00
feat: add type to github cmd
This commit is contained in:
parent
14a9b97f9b
commit
2b2faf7997
2 changed files with 36 additions and 11 deletions
|
@ -3,7 +3,7 @@ import { Command } from '../structures/Command';
|
||||||
// @ts-expect-error Types :(
|
// @ts-expect-error Types :(
|
||||||
import utilities from '../../files/utilities.toml';
|
import utilities from '../../files/utilities.toml';
|
||||||
import { CommandContext } from '../structures/contexts/CommandContext';
|
import { CommandContext } from '../structures/contexts/CommandContext';
|
||||||
import { getIssueOrPR, search, formatStatus, formatEmojiStatus, IssueState } from '../utils/githubUtils';
|
import { getIssueOrPR, search, formatStatus, formatEmojiStatus, IssueState, IssueType } from '../utils/githubUtils';
|
||||||
|
|
||||||
const invalidIssue = (ctx: CommandContext, query: string) => {
|
const invalidIssue = (ctx: CommandContext, query: string) => {
|
||||||
return ctx.editResponse(
|
return ctx.editResponse(
|
||||||
|
@ -26,6 +26,7 @@ new Command({
|
||||||
ctx.value,
|
ctx.value,
|
||||||
(ctx.options.find(o => o.name === 'repository'))?.value as string || 'oven-sh/bun',
|
(ctx.options.find(o => o.name === 'repository'))?.value as string || 'oven-sh/bun',
|
||||||
(ctx.options.find(o => o.name === 'state')?.value as string || 'all') as IssueState,
|
(ctx.options.find(o => o.name === 'state')?.value as string || 'all') as IssueState,
|
||||||
|
(ctx.options.find(o => o.name === 'type')?.value as string || '(IS|PR)') as IssueType,
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -54,6 +55,26 @@ new Command({
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: 'type',
|
||||||
|
description: 'Issues or PRs',
|
||||||
|
type: ApplicationCommandOptionType.String,
|
||||||
|
required: false,
|
||||||
|
choices: [
|
||||||
|
{
|
||||||
|
name: 'Issues',
|
||||||
|
value: '(IS)',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'Pull Requests',
|
||||||
|
value: '(PR)',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'Both',
|
||||||
|
value: '(IS|PR)',
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
name: 'repository',
|
name: 'repository',
|
||||||
description: 'Project repository (default oven-sh/bun)',
|
description: 'Project repository (default oven-sh/bun)',
|
||||||
|
@ -77,12 +98,13 @@ new Command({
|
||||||
let query: string = (ctx.options[0] as APIApplicationCommandInteractionDataStringOption).value;
|
let query: string = (ctx.options[0] as APIApplicationCommandInteractionDataStringOption).value;
|
||||||
const repository: string = (ctx.options.find(o => o.name === 'repository') as APIApplicationCommandInteractionDataStringOption)?.value || 'oven-sh/bun';
|
const repository: string = (ctx.options.find(o => o.name === 'repository') as APIApplicationCommandInteractionDataStringOption)?.value || 'oven-sh/bun';
|
||||||
const state: IssueState = ((ctx.options.find(o => o.name === 'state') as APIApplicationCommandInteractionDataStringOption)?.value || 'all') as IssueState;
|
const state: IssueState = ((ctx.options.find(o => o.name === 'state') as APIApplicationCommandInteractionDataStringOption)?.value || 'all') as IssueState;
|
||||||
|
const type: IssueType = ((ctx.options.find(o => o.name === 'type') as APIApplicationCommandInteractionDataStringOption)?.value || '(IS|PR)') as IssueType;
|
||||||
|
|
||||||
const repositorySplit = repository.split('/');
|
const repositorySplit = repository.split('/');
|
||||||
const repositoryOwner = repositorySplit[0];
|
const repositoryOwner = repositorySplit[0];
|
||||||
const repositoryName = repositorySplit[1];
|
const repositoryName = repositorySplit[1];
|
||||||
|
|
||||||
let issueOrPR = await getIssueOrPR(parseInt(query), repository, state);
|
let issueOrPR = await getIssueOrPR(parseInt(query), repository, state, type);
|
||||||
if (!issueOrPR) {
|
if (!issueOrPR) {
|
||||||
const res = await fetch(`https://api.github.com/search/issues?q=${encodeURIComponent(query)}${encodeURIComponent(' repo:oven-sh/bun')}`);
|
const res = await fetch(`https://api.github.com/search/issues?q=${encodeURIComponent(query)}${encodeURIComponent(' repo:oven-sh/bun')}`);
|
||||||
|
|
||||||
|
|
|
@ -9,6 +9,7 @@ import { Database } from 'bun:sqlite';
|
||||||
import { githubTitleClean } from './regexes';
|
import { githubTitleClean } from './regexes';
|
||||||
|
|
||||||
export type IssueState = 'open' | 'closed' | 'all' | 'merged';
|
export type IssueState = 'open' | 'closed' | 'all' | 'merged';
|
||||||
|
export type IssueType = '(IS)' | '(PR)' | '(IS|PR)';
|
||||||
interface Issue {
|
interface Issue {
|
||||||
id: number;
|
id: number;
|
||||||
repository: string;
|
repository: string;
|
||||||
|
@ -20,7 +21,7 @@ interface Issue {
|
||||||
html_url: string;
|
html_url: string;
|
||||||
user_login: string;
|
user_login: string;
|
||||||
user_html_url: string;
|
user_html_url: string;
|
||||||
type: '(IS)' | '(PR)';
|
type: IssueType;
|
||||||
}
|
}
|
||||||
|
|
||||||
interface PullRequest extends Issue {
|
interface PullRequest extends Issue {
|
||||||
|
@ -180,13 +181,14 @@ export const deleteIssueOrPR = (number: number, repository: string) => {
|
||||||
db.exec(`DELETE FROM issuesandprs WHERE repository = '${repository}' AND number = ${number}`);
|
db.exec(`DELETE FROM issuesandprs WHERE repository = '${repository}' AND number = ${number}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
export const search = async(query: string, repository: string, state: IssueState): Promise<APIApplicationCommandOptionChoice[]> => {
|
export const search = async(query: string, repository: string, state: IssueState, type: IssueType): Promise<APIApplicationCommandOptionChoice[]> => {
|
||||||
try {
|
try {
|
||||||
|
const sqliteTypePrepase = type !== '(IS|PR)' ? ` AND type = '${type}'` : '';
|
||||||
const arrayFiltered = state === 'all'
|
const arrayFiltered = state === 'all'
|
||||||
? await db.prepare(`SELECT * FROM issuesandprs WHERE repository = ?`).all(repository)
|
? await db.prepare(`SELECT * FROM issuesandprs WHERE repository = ?${sqliteTypePrepase}`).all(repository)
|
||||||
: state === 'merged'
|
: state === 'merged'
|
||||||
? await db.prepare(`SELECT * FROM issuesandprs WHERE merged_at IS NOT NULL AND repository = ?`).all(repository)
|
? await db.prepare(`SELECT * FROM issuesandprs WHERE merged_at IS NOT NULL AND repository = ?${sqliteTypePrepase}`).all(repository)
|
||||||
: await db.prepare(`SELECT * FROM issuesandprs WHERE repository = ? AND state = ?`).all(repository, state);
|
: await db.prepare(`SELECT * FROM issuesandprs WHERE repository = ? AND state = ?${sqliteTypePrepase}`).all(repository, state);
|
||||||
|
|
||||||
if (!query) {
|
if (!query) {
|
||||||
const array = arrayFiltered.slice(0, 25);
|
const array = arrayFiltered.slice(0, 25);
|
||||||
|
@ -218,12 +220,13 @@ export const search = async(query: string, repository: string, state: IssueState
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export const getIssueOrPR = async(number: number, repository: string, state: IssueState): Promise<Issue | PullRequest> => {
|
export const getIssueOrPR = async(number: number, repository: string, state: IssueState, type: IssueType): Promise<Issue | PullRequest> => {
|
||||||
|
const sqliteTypePrepase = type !== '(IS|PR)' ? ` AND type = '${type}'` : '';
|
||||||
const issueOrPR = state === 'all'
|
const issueOrPR = state === 'all'
|
||||||
? await db.prepare(`SELECT * FROM issuesandprs WHERE repository = ? AND number = ?`).get(repository, number)
|
? await db.prepare(`SELECT * FROM issuesandprs WHERE repository = ? AND number = ?${sqliteTypePrepase}`).get(repository, number)
|
||||||
: state === 'merged'
|
: state === 'merged'
|
||||||
? await db.prepare(`SELECT * FROM issuesandprs WHERE repository = ? AND number = ? AND merged_at IS NOT NULL`).get(repository, number)
|
? await db.prepare(`SELECT * FROM issuesandprs WHERE repository = ? AND number = ? AND merged_at IS NOT NULL${sqliteTypePrepase}`).get(repository, number)
|
||||||
: await db.prepare(`SELECT * FROM issuesandprs WHERE repository = ? AND number = ? AND state = ?`).get(repository, number, state);
|
: await db.prepare(`SELECT * FROM issuesandprs WHERE repository = ? AND number = ? AND state = ?${sqliteTypePrepase}`).get(repository, number, state);
|
||||||
|
|
||||||
return issueOrPR;
|
return issueOrPR;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue