Skip to content

Commit f7a9641

Browse files
jhmaster2000jhmaster2000
committed
Merge remote-tracking branch 'upstream/master'
2 parents 2da3e35 + 5d541f8 commit f7a9641

File tree

4 files changed

+147
-147
lines changed

4 files changed

+147
-147
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"dependencies": {
1414
"discord-akairo": "^8.1.0",
1515
"discord.js": "^12.5.1",
16-
"discord.js-docs": "BenjammingKirby/discord.js-docs#types",
16+
"discord.js-docs": "^0.1.2",
1717
"dotenv": "^10.0.0",
1818
"node-fetch": "^2.6.6",
1919
"pm2": "^5.1.2"

‎src/commands/docs/djs.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import type { Message } from "discord.js";
22
import { Command } from "discord-akairo";
33
import Doc from "discord.js-docs";
4+
import sources = require("../../sources.json");
45

56
export default class DiscordCommand extends Command {
67
public constructor() {
@@ -37,7 +38,7 @@ export default class DiscordCommand extends Command {
3738
public async exec(message: Message, { query, branch }: { query: string; branch: string }): Promise<Message | Message[]> {
3839
const str = query.split(" ");
3940

40-
const source = branch ? "stable" : "main";
41+
const source = branch ? "stable" : sources["main"];
4142
const doc = await Doc.fetch(source, {force: true});
4243
const resultEmbed = doc.resolveEmbed(str.join("#"));
4344
if (!resultEmbed) return;

‎src/sources.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"stable": "https://raw.githubusercontent.com/discordjs/discord.js/docs/stable.json",
3+
"main": "https://raw.githubusercontent.com/discordjs/discord.js/docs/main.json",
4+
"commando": "https://raw.githubusercontent.com/discordjs/commando/docs/master.json",
5+
"rpc": "https://raw.githubusercontent.com/discordjs/rpc/docs/master.json",
6+
"akairo": "https://raw.githubusercontent.com/discord-akairo/discord-akairo/docs/8.1.0.json",
7+
"collection": "https://raw.githubusercontent.com/discordjs/collection/docs/stable.json",
8+
"collection-main": "https://raw.githubusercontent.com/discordjs/collection/docs/main.json",
9+
"builders":"https://raw.githubusercontent.com/discordjs/builders/docs/stable.json",
10+
"builders-main":"https://raw.githubusercontent.com/discordjs/builders/docs/main.json",
11+
"voice":"https://raw.githubusercontent.com/discordjs/voice/docs/stable.json",
12+
"voice-main":"https://raw.githubusercontent.com/discordjs/voice/docs/main.json"
13+
}

‎yarn.lock‎

Lines changed: 131 additions & 145 deletions
Original file line numberDiff line numberDiff line change
@@ -558,155 +558,141 @@
558558
dependencies:
559559
"color-name" "~1.1.4"
560560

561-
"color-name@~1.1.4":
562-
"integrity" "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
563-
"resolved" "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
564-
"version" "1.1.4"
565-
566-
"color-name@1.1.3":
567-
"integrity" "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
568-
"resolved" "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"
569-
"version" "1.1.3"
570-
571-
"combined-stream@^1.0.8":
572-
"integrity" "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="
573-
"resolved" "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"
574-
"version" "1.0.8"
575-
dependencies:
576-
"delayed-stream" "~1.0.0"
577-
578-
"commander@2.15.1":
579-
"integrity" "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag=="
580-
"resolved" "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz"
581-
"version" "2.15.1"
582-
583-
"common-tags@^1.8.0":
584-
"integrity" "sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA=="
585-
"resolved" "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz"
586-
"version" "1.8.2"
587-
588-
"concat-map@0.0.1":
589-
"integrity" "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
590-
"resolved" "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
591-
"version" "0.0.1"
592-
593-
"continuation-local-storage@^3.2.1":
594-
"integrity" "sha512-jx44cconVqkCEEyLSKWwkvUXwO561jXMa3LPjTPsm5QR22PA0/mhe33FT4Xb5y74JDvt/Cq+5lm8S8rskLv9ZA=="
595-
"resolved" "https://registry.npmjs.org/continuation-local-storage/-/continuation-local-storage-3.2.1.tgz"
596-
"version" "3.2.1"
597-
dependencies:
598-
"async-listener" "^0.6.0"
599-
"emitter-listener" "^1.1.1"
600-
601-
"core-util-is@~1.0.0":
602-
"integrity" "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
603-
"resolved" "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz"
604-
"version" "1.0.3"
605-
606-
"create-require@^1.1.0":
607-
"integrity" "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="
608-
"resolved" "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz"
609-
"version" "1.1.1"
610-
611-
"cron@1.8.2":
612-
"integrity" "sha512-Gk2c4y6xKEO8FSAUTklqtfSr7oTq0CiPQeLBG5Fl0qoXpZyMcj1SG59YL+hqq04bu6/IuEA7lMkYDAplQNKkyg=="
613-
"resolved" "https://registry.npmjs.org/cron/-/cron-1.8.2.tgz"
614-
"version" "1.8.2"
615-
dependencies:
616-
"moment-timezone" "^0.5.x"
617-
618-
"cross-spawn@^7.0.2":
619-
"integrity" "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="
620-
"resolved" "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"
621-
"version" "7.0.3"
622-
dependencies:
623-
"path-key" "^3.1.0"
624-
"shebang-command" "^2.0.0"
625-
"which" "^2.0.1"
626-
627-
"culvert@^0.1.2":
628-
"integrity" "sha1-lQL18BVKLVoioCPnn3HMk2+m728="
629-
"resolved" "https://registry.npmjs.org/culvert/-/culvert-0.1.2.tgz"
630-
"version" "0.1.2"
631-
632-
"data-uri-to-buffer@3":
633-
"integrity" "sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og=="
634-
"resolved" "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz"
635-
"version" "3.0.1"
636-
637-
"dayjs@~1.8.24", "dayjs@~1.8.25":
638-
"integrity" "sha512-3VmRXEtw7RZKAf+4Tv1Ym9AGeo8r8+CjDi26x+7SYQil1UqtqdaokhzoEJohqlzt0m5kacJSDhJQkG/LWhpRBw=="
639-
"resolved" "https://registry.npmjs.org/dayjs/-/dayjs-1.8.36.tgz"
640-
"version" "1.8.36"
641-
642-
"debug@^3.2.6":
643-
"integrity" "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="
644-
"resolved" "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"
645-
"version" "3.2.7"
561+
cron@1.8.2:
562+
version "1.8.2"
563+
resolved "https://registry.yarnpkg.com/cron/-/cron-1.8.2.tgz#4ac5e3c55ba8c163d84f3407bde94632da8370ce"
564+
integrity sha512-Gk2c4y6xKEO8FSAUTklqtfSr7oTq0CiPQeLBG5Fl0qoXpZyMcj1SG59YL+hqq04bu6/IuEA7lMkYDAplQNKkyg==
646565
dependencies:
647-
"ms" "^2.1.1"
566+
moment-timezone "^0.5.x"
648567

649-
"debug@^4.0.1", "debug@^4.1.1", "debug@^4.3.1", "debug@~4.3.1", "debug@4":
650-
"integrity" "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="
651-
"resolved" "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz"
652-
"version" "4.3.2"
653-
dependencies:
654-
"ms" "2.1.2"
568+
cross-spawn@^7.0.2:
569+
version "7.0.3"
570+
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
571+
integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
572+
dependencies:
573+
path-key "^3.1.0"
574+
shebang-command "^2.0.0"
575+
which "^2.0.1"
576+
577+
currently-unhandled@^0.4.1:
578+
version "0.4.1"
579+
resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
580+
integrity sha1-mI3zP+qxke95mmE2nddsF635V+o=
581+
dependencies:
582+
array-find-index "^1.0.1"
655583

656-
"deep-is@^0.1.3", "deep-is@~0.1.3":
657-
"integrity" "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
658-
"resolved" "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz"
659-
"version" "0.1.4"
660-
661-
"degenerator@^3.0.1":
662-
"integrity" "sha512-LFsIFEeLPlKvAKXu7j3ssIG6RT0TbI7/GhsqrI0DnHASEQjXQ0LUSYcjJteGgRGmZbl1TnMSxpNQIAiJ7Du5TQ=="
663-
"resolved" "https://registry.npmjs.org/degenerator/-/degenerator-3.0.1.tgz"
664-
"version" "3.0.1"
665-
dependencies:
666-
"ast-types" "^0.13.2"
667-
"escodegen" "^1.8.1"
668-
"esprima" "^4.0.0"
669-
"vm2" "^3.9.3"
670-
671-
"delayed-stream@~1.0.0":
672-
"integrity" "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
673-
"resolved" "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
674-
"version" "1.0.0"
675-
676-
"depd@~1.1.2":
677-
"integrity" "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
678-
"resolved" "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"
679-
"version" "1.1.2"
680-
681-
"diff@^4.0.1":
682-
"integrity" "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="
683-
"resolved" "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz"
684-
"version" "4.0.2"
685-
686-
"dir-glob@^3.0.1":
687-
"integrity" "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA=="
688-
"resolved" "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz"
689-
"version" "3.0.1"
690-
dependencies:
691-
"path-type" "^4.0.0"
692-
693-
"discord-akairo@^8.1.0":
694-
"integrity" "sha512-INWYmHo6NgyYx1ZKGSCmgznVfvkXpWGj4fGCGjO8IPkZ06Bidb9YKr4rXy2lwG0kprCjvqY0qbbhcw6N050abQ=="
695-
"resolved" "https://registry.npmjs.org/discord-akairo/-/discord-akairo-8.1.0.tgz"
696-
"version" "8.1.0"
697-
698-
"discord.js-docs@BenjammingKirby/discord.js-docs#types":
699-
"resolved" "git+ssh://git@github.com/BenjammingKirby/discord.js-docs.git#f8a89e4f2ae9adff2104a79e501e59aadc8e9dbe"
700-
"version" "0.1.2"
701-
dependencies:
702-
"common-tags" "^1.8.0"
703-
"fuse.js" "^3.4.6"
704-
"node-fetch" "^2.6.0"
584+
data-uri-to-buffer@1:
585+
version "1.2.0"
586+
resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz#77163ea9c20d8641b4707e8f18abdf9a78f34835"
587+
integrity sha512-vKQ9DTQPN1FLYiiEEOQ6IBGFqvjCa5rSK3cWMy/Nespm5d/x3dGFT9UBZnkLxCwua/IXBi2TYnwTEpsOvhC4UQ==
588+
589+
dateformat@~1.0.4-1.2.3:
590+
version "1.0.12"
591+
resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-1.0.12.tgz#9f124b67594c937ff706932e4a642cca8dbbfee9"
592+
integrity sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=
593+
dependencies:
594+
get-stdin "^4.0.1"
595+
meow "^3.3.0"
596+
597+
dayjs@~1.8.24, dayjs@~1.8.25:
598+
version "1.8.36"
599+
resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.8.36.tgz#be36e248467afabf8f5a86bae0de0cdceecced50"
600+
integrity sha512-3VmRXEtw7RZKAf+4Tv1Ym9AGeo8r8+CjDi26x+7SYQil1UqtqdaokhzoEJohqlzt0m5kacJSDhJQkG/LWhpRBw==
601+
602+
debug@2:
603+
version "2.6.9"
604+
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
605+
integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
606+
dependencies:
607+
ms "2.0.0"
608+
609+
debug@3.1.0:
610+
version "3.1.0"
611+
resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
612+
integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
613+
dependencies:
614+
ms "2.0.0"
615+
616+
debug@4, debug@^4.0.1, debug@^4.1.1, debug@^4.2, debug@^4.3.0, debug@~4.3.1:
617+
version "4.3.1"
618+
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
619+
integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
620+
dependencies:
621+
ms "2.1.2"
622+
623+
debug@4.1.1, debug@~4.1.1:
624+
version "4.1.1"
625+
resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
626+
integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
627+
dependencies:
628+
ms "^2.1.1"
629+
630+
debug@^3.0, debug@^3.1.0, debug@^3.2.6:
631+
version "3.2.7"
632+
resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
633+
integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
634+
dependencies:
635+
ms "^2.1.1"
636+
637+
decamelize@^1.1.2:
638+
version "1.2.0"
639+
resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
640+
integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
641+
642+
deep-is@^0.1.3, deep-is@~0.1.3:
643+
version "0.1.3"
644+
resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
645+
integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
646+
647+
degenerator@^1.0.4:
648+
version "1.0.4"
649+
resolved "https://registry.yarnpkg.com/degenerator/-/degenerator-1.0.4.tgz#fcf490a37ece266464d9cc431ab98c5819ced095"
650+
integrity sha1-/PSQo37OJmRk2cxDGrmMWBnO0JU=
651+
dependencies:
652+
ast-types "0.x.x"
653+
escodegen "1.x.x"
654+
esprima "3.x.x"
655+
656+
delayed-stream@~1.0.0:
657+
version "1.0.0"
658+
resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
659+
integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
660+
661+
depd@~1.1.2:
662+
version "1.1.2"
663+
resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
664+
integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
705665

706-
"discord.js@^12.5.1":
707-
"integrity" "sha512-D3nkOa/pCkNyn6jLZnAiJApw2N9XrIsXUAdThf01i7yrEuqUmDGc7/CexVWwEcgbQR97XQ+mcnqJpmJ/92B4Aw=="
708-
"resolved" "https://registry.npmjs.org/discord.js/-/discord.js-12.5.3.tgz"
709-
"version" "12.5.3"
666+
diff@^4.0.1:
667+
version "4.0.2"
668+
resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
669+
integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
670+
671+
dir-glob@^3.0.1:
672+
version "3.0.1"
673+
resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
674+
integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
675+
dependencies:
676+
path-type "^4.0.0"
677+
678+
discord-akairo@^8.1.0:
679+
version "8.1.0"
680+
resolved "https://registry.yarnpkg.com/discord-akairo/-/discord-akairo-8.1.0.tgz#9f3d910e12c197d40d3522a3a93679e2a746a6ca"
681+
integrity sha512-INWYmHo6NgyYx1ZKGSCmgznVfvkXpWGj4fGCGjO8IPkZ06Bidb9YKr4rXy2lwG0kprCjvqY0qbbhcw6N050abQ==
682+
683+
discord.js-docs@^0.1.2:
684+
version "0.1.2"
685+
resolved "https://registry.yarnpkg.com/discord.js-docs/-/discord.js-docs-0.1.2.tgz#65941b3d037346cec220d1b5e0ec8e46aa62697e"
686+
integrity sha512-DrDOJD3odnmGJE8HyVaspAYiUN51LotzqIH/tNq9PydZva+wceVM5dijEBI+g/0hSl1/CQKTIgN3z0dIcMv0CQ==
687+
dependencies:
688+
common-tags "^1.8.0"
689+
fuse.js "^3.2.1"
690+
node-fetch "^2.6.0"
691+
692+
discord.js@^12.5.1:
693+
version "12.5.1"
694+
resolved "https://registry.yarnpkg.com/discord.js/-/discord.js-12.5.1.tgz#992b45753e3815526a279914ccc281d3496f5990"
695+
integrity sha512-VwZkVaUAIOB9mKdca0I5MefPMTQJTNg0qdgi1huF3iwsFwJ0L5s/Y69AQe+iPmjuV6j9rtKoG0Ta0n9vgEIL6w==
710696
dependencies:
711697
"@discordjs/collection" "^0.1.6"
712698
"@discordjs/form-data" "^3.0.1"

0 commit comments

Comments
 (0)