Skip to content

Commit 4cee71a

Browse files
committed
chore(*): remove target option from other user app commands
1 parent 5a4ccf3 commit 4cee71a

12 files changed

+11
-85
lines changed

src/functions/algoliaResponse.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ export async function algoliaResponse(
2020
algoliaObjectId: string,
2121
emojiId: string,
2222
emojiName: string,
23-
target?: string,
2423
ephemeral?: boolean,
2524
): Promise<Response> {
2625
const full = `http://${algoliaAppId}.${API_BASE_ALGOLIA}/1/indexes/${algoliaIndex}/${encodeURIComponent(
@@ -43,14 +42,13 @@ export async function algoliaResponse(
4342
: null;
4443

4544
const contentParts = [
46-
target ? `${italic(`Suggestion for ${userMention(target)}:`)}` : null,
4745
`<:${emojiName}:${emojiId}> ${bold(resolveHitToNamestring(hit))}${headlineSuffix ? ` ${headlineSuffix}` : ''}`,
4846
hit.content?.length ? `${truncate(decode(hit.content), 300)}` : null,
4947
docsBody?.lines.length ? docsBody.lines.at(0) : null,
5048
`${hyperlink('read more', hideLinkEmbed(hit.url))}`,
5149
].filter(Boolean) as string[];
5250

53-
prepareResponse(res, contentParts.join('\n'), ephemeral ?? false, target ? [target] : []);
51+
prepareResponse(res, contentParts.join('\n'), ephemeral ?? false);
5452
} catch {
5553
prepareErrorResponse(res, 'Invalid result. Make sure to select an entry from the autocomplete.');
5654
}

src/functions/mdn.ts

+2-7
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ function escape(text: string) {
1111
return text.replaceAll('||', '|\u200B|').replaceAll('*', '\\*');
1212
}
1313

14-
export async function mdnSearch(res: Response, query: string, target?: string, ephemeral?: boolean): Promise<Response> {
14+
export async function mdnSearch(res: Response, query: string, ephemeral?: boolean): Promise<Response> {
1515
const trimmedQuery = query.trim();
1616
try {
1717
const qString = `${API_BASE_MDN}/${trimmedQuery}/index.json`;
@@ -41,12 +41,7 @@ export async function mdnSearch(res: Response, query: string, target?: string, e
4141
intro,
4242
];
4343

44-
prepareResponse(
45-
res,
46-
`${target ? `${italic(`Documentation suggestion for ${userMention(target)}:`)}\n` : ''}${parts.join('\n')}`,
47-
ephemeral ?? false,
48-
target ? [target] : [],
49-
);
44+
prepareResponse(res, parts.join('\n'), ephemeral ?? false);
5045

5146
return res;
5247
} catch (error) {

src/functions/node.ts

+1-7
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ export async function nodeSearch(
7272
res: Response,
7373
query: string,
7474
version = 'latest-v18.x',
75-
target?: string,
7675
ephemeral?: boolean,
7776
): Promise<Response> {
7877
const trimmedQuery = query.trim();
@@ -117,12 +116,7 @@ export async function nodeSearch(
117116
.replaceAll(boldCodeBlockRegex, bold(inlineCode('$1'))),
118117
);
119118

120-
prepareResponse(
121-
res,
122-
`${target ? `${italic(`Documentation suggestion for ${userMention(target)}:`)}\n` : ''}${parts.join('\n')}`,
123-
ephemeral ?? false,
124-
target ? [target] : [],
125-
);
119+
prepareResponse(res, parts.join('\n'), ephemeral ?? false);
126120

127121
return res;
128122
} catch (error) {

src/functions/tag.ts

+4-6
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { fetch } from 'undici';
99
import { REMOTE_TAG_URL, PREFIX_SUCCESS } from '../util/constants.js';
1010
import { logger } from '../util/logger.js';
1111
import { prepareResponse, prepareErrorResponse } from '../util/respond.js';
12-
import { suggestionString } from '../util/suggestionString.js';
1312

1413
export type Tag = {
1514
content: string;
@@ -49,11 +48,11 @@ export async function loadTags(tagCache: Collection<string, Tag>, remote = false
4948
}
5049
}
5150

52-
export function findTag(tagCache: Collection<string, Tag>, query: string, target?: string): string | null {
51+
export function findTag(tagCache: Collection<string, Tag>, query: string): string | null {
5352
const cleanQuery = query.replaceAll(/\s+/g, '-');
5453
const tag = tagCache.get(cleanQuery) ?? tagCache.find((tag) => tag.keywords.includes(cleanQuery));
5554
if (!tag) return null;
56-
return suggestionString('tag', tag.content, target);
55+
return tag.content;
5756
}
5857

5958
export async function reloadTags(res: Response, tagCache: Collection<string, Tag>, remote = true) {
@@ -84,13 +83,12 @@ export function showTag(
8483
res: Response,
8584
query: string,
8685
tagCache: Collection<string, Tag>,
87-
target?: string,
8886
ephemeral?: boolean,
8987
): Response {
9088
const trimmedQuery = query.trim().toLowerCase();
91-
const content = findTag(tagCache, trimmedQuery, target);
89+
const content = findTag(tagCache, trimmedQuery);
9290
if (content) {
93-
prepareResponse(res, content, ephemeral ?? false, target ? [target] : []);
91+
prepareResponse(res, content, ephemeral ?? false);
9492
} else {
9593
prepareErrorResponse(res, `Could not find a tag with name or alias similar to \`${trimmedQuery}\`.`);
9694
}

src/handling/handleApplicationCommand.ts

+3-6
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ export async function handleApplicationCommand(
7373
castArgs.query,
7474
EMOJI_ID_CLYDE_BLURPLE,
7575
'discord',
76-
castArgs.target,
7776
castArgs.hide,
7877
);
7978
break;
@@ -90,7 +89,6 @@ export async function handleApplicationCommand(
9089
castArgs.query,
9190
EMOJI_ID_DTYPES,
9291
'dtypes',
93-
castArgs.target,
9492
castArgs.hide,
9593
);
9694

@@ -107,27 +105,26 @@ export async function handleApplicationCommand(
107105
castArgs.query,
108106
EMOJI_ID_GUIDE,
109107
'guide',
110-
castArgs.target,
111108
castArgs.hide,
112109
);
113110
break;
114111
}
115112

116113
case 'mdn': {
117114
const castArgs = args as ArgumentsOf<typeof MdnCommand>;
118-
await mdnSearch(res, castArgs.query, castArgs.target, castArgs.hide);
115+
await mdnSearch(res, castArgs.query, castArgs.hide);
119116
break;
120117
}
121118

122119
case 'node': {
123120
const castArgs = args as ArgumentsOf<typeof NodeCommand>;
124-
await nodeSearch(res, castArgs.query, castArgs.version, castArgs.target, castArgs.hide);
121+
await nodeSearch(res, castArgs.query, castArgs.version, castArgs.hide);
125122
break;
126123
}
127124

128125
case 'tag': {
129126
const castArgs = args as ArgumentsOf<typeof TagCommand>;
130-
showTag(res, castArgs.query, tagCache, castArgs.target, castArgs.hide);
127+
showTag(res, castArgs.query, tagCache, castArgs.hide);
131128
break;
132129
}
133130

src/interactions/discorddocs.ts

-6
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@ export const DiscordDocsCommand = {
1111
autocomplete: true,
1212
required: true,
1313
},
14-
{
15-
type: ApplicationCommandOptionType.User,
16-
name: 'target',
17-
description: 'User to mention',
18-
required: false,
19-
},
2014
{
2115
type: ApplicationCommandOptionType.Boolean,
2216
name: 'hide',

src/interactions/discordtypes.ts

-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { ApplicationCommandOptionType } from 'discord-api-types/v10';
22

33
const QUERY_DESCRIPTION = 'Type, Enum or Interface to search for' as const;
4-
const TARGET_DESCRIPTION = 'User to mention' as const;
54
const VERSION_DESCRIPTION = 'Attempts to filter the results to the specified version' as const;
65
const EPHEMERAL_DESCRIPTION = 'Hide command output' as const;
76

@@ -16,12 +15,6 @@ export const DTypesCommand = {
1615
required: true,
1716
autocomplete: true,
1817
},
19-
{
20-
type: ApplicationCommandOptionType.User,
21-
name: 'target',
22-
description: TARGET_DESCRIPTION,
23-
required: false,
24-
},
2518
{
2619
type: ApplicationCommandOptionType.String,
2720
name: 'version',

src/interactions/guide.ts

-6
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@ export const GuideCommand = {
1111
autocomplete: true,
1212
required: true,
1313
},
14-
{
15-
type: ApplicationCommandOptionType.User,
16-
name: 'target',
17-
description: 'User to mention',
18-
required: false,
19-
},
2014
{
2115
type: ApplicationCommandOptionType.Boolean,
2216
name: 'hide',

src/interactions/mdn.ts

-6
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@ export const MdnCommand = {
1111
required: true,
1212
autocomplete: true,
1313
},
14-
{
15-
type: ApplicationCommandOptionType.User,
16-
name: 'target',
17-
description: 'User to mention',
18-
required: false,
19-
},
2014
{
2115
type: ApplicationCommandOptionType.Boolean,
2216
name: 'hide',

src/interactions/node.ts

-6
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,6 @@ export const NodeCommand = {
3030
},
3131
],
3232
},
33-
{
34-
type: ApplicationCommandOptionType.User,
35-
name: 'target',
36-
description: 'User to mention',
37-
required: false,
38-
},
3933
{
4034
type: ApplicationCommandOptionType.Boolean,
4135
name: 'hide',

src/interactions/tag.ts

-6
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@ export const TagCommand = {
1111
required: true,
1212
autocomplete: true,
1313
},
14-
{
15-
type: ApplicationCommandOptionType.User,
16-
name: 'target',
17-
description: 'User to mention',
18-
required: false,
19-
},
2014
{
2115
type: ApplicationCommandOptionType.Boolean,
2216
name: 'hide',

src/util/suggestionString.ts

-19
This file was deleted.

0 commit comments

Comments
 (0)