박건희 / emon_bot

Go to a project
Toggle navigation Toggle navigation pinning
박건희
32db7b4d 1 parent fd695ffb

Fixed some errors

Inline Side-by-side
Showing 4 changed files with 147 additions and 544 deletions
1 const { MessageActionRow, MessageButton, Interaction } = require('discord.js'); 1 const { MessageActionRow, MessageButton, Interaction } = require('discord.js');
2 -
3 var disabled_var={ 2 var disabled_var={
4 en:true, 3 en:true,
5 ko:false, 4 ko:false,
...@@ -11,39 +10,32 @@ var label_var={ ...@@ -11,39 +10,32 @@ var label_var={
11 jp:'일본어', 10 jp:'일본어',
12 }; 11 };
13 var current_country='영어' // 초기값 영어 12 var current_country='영어' // 초기값 영어
14 -
15 function trans_disabled_var(input_str){ 13 function trans_disabled_var(input_str){
16 if (input_str == "en"){ 14 if (input_str == "en"){
17 disabled_var.en=true; 15 disabled_var.en=true;
18 disabled_var.ko=false; 16 disabled_var.ko=false;
19 disabled_var.jp=false; 17 disabled_var.jp=false;
20 -
21 label_var.en = '😛'; 18 label_var.en = '😛';
22 label_var.ko = '한국어'; 19 label_var.ko = '한국어';
23 label_var.jp = '일본어'; 20 label_var.jp = '일본어';
24 -
25 current_country = '영어'; 21 current_country = '영어';
26 } 22 }
27 else if (input_str == "ko"){ 23 else if (input_str == "ko"){
28 disabled_var.en=false; 24 disabled_var.en=false;
29 disabled_var.ko=true; 25 disabled_var.ko=true;
30 disabled_var.jp=false; 26 disabled_var.jp=false;
31 -
32 label_var.en = '영어'; 27 label_var.en = '영어';
33 label_var.ko = '😛'; 28 label_var.ko = '😛';
34 label_var.jp = '일본어'; 29 label_var.jp = '일본어';
35 -
36 current_country = '한국어'; 30 current_country = '한국어';
37 } 31 }
38 else if (input_str == "jp"){ 32 else if (input_str == "jp"){
39 disabled_var.en=false; 33 disabled_var.en=false;
40 disabled_var.ko=false; 34 disabled_var.ko=false;
41 disabled_var.jp=true; 35 disabled_var.jp=true;
42 -
43 label_var.en = '영어'; 36 label_var.en = '영어';
44 label_var.ko = '한국어'; 37 label_var.ko = '한국어';
45 label_var.jp = '😛'; 38 label_var.jp = '😛';
46 -
47 current_country = '일본어'; 39 current_country = '일본어';
48 } 40 }
49 // 변수가 3개밖에 안되니깐, 가시성위해서 / 어느 언어로부터 바뀌었는지 모르기 때문에, 편하게 변수에 일일이 할당함. 41 // 변수가 3개밖에 안되니깐, 가시성위해서 / 어느 언어로부터 바뀌었는지 모르기 때문에, 편하게 변수에 일일이 할당함.
...@@ -51,9 +43,7 @@ function trans_disabled_var(input_str){ ...@@ -51,9 +43,7 @@ function trans_disabled_var(input_str){
51 // 변수가 100개였다면, 임시 변수 만들고 추적해서 어느 언어에서 바뀌었는지 확인하고, if(임시변수)써서 이모지 할당하고, 43 // 변수가 100개였다면, 임시 변수 만들고 추적해서 어느 언어에서 바뀌었는지 확인하고, if(임시변수)써서 이모지 할당하고,
52 // 그전꺼, 바뀌어야 할 국가변수 바꿈(받은 str값 label_var 배열(?) for 문 돌려서 찾음) 44 // 그전꺼, 바뀌어야 할 국가변수 바꿈(받은 str값 label_var 배열(?) for 문 돌려서 찾음)
53 } 45 }
54 -
55 exports.run = async (client, msg, args, prefix) => { 46 exports.run = async (client, msg, args, prefix) => {
56 -
57 const row = new MessageActionRow() 47 const row = new MessageActionRow()
58 .addComponents( 48 .addComponents(
59 new MessageButton() 49 new MessageButton()
...@@ -61,23 +51,19 @@ exports.run = async (client, msg, args, prefix) => { ...@@ -61,23 +51,19 @@ exports.run = async (client, msg, args, prefix) => {
61 .setLabel(label_var.ko) 51 .setLabel(label_var.ko)
62 .setStyle('PRIMARY') 52 .setStyle('PRIMARY')
63 .setDisabled(disabled_var.ko), 53 .setDisabled(disabled_var.ko),
64 -
65 new MessageButton() 54 new MessageButton()
66 .setCustomId('japanese') 55 .setCustomId('japanese')
67 .setLabel(label_var.jp) 56 .setLabel(label_var.jp)
68 .setStyle('PRIMARY') 57 .setStyle('PRIMARY')
69 .setDisabled(disabled_var.jp), 58 .setDisabled(disabled_var.jp),
70 -
71 new MessageButton() 59 new MessageButton()
72 .setCustomId('english') 60 .setCustomId('english')
73 .setLabel(label_var.en) 61 .setLabel(label_var.en)
74 .setStyle('PRIMARY') 62 .setStyle('PRIMARY')
75 .setDisabled(disabled_var.en), 63 .setDisabled(disabled_var.en),
76 ); //버튼 생성 64 ); //버튼 생성
77 -
78 await msg.reply({ content: '번역하고 싶은 언어를 골라주세요. 현재 언어는 '+ current_country+ '입니다.', components: [row] }); 65 await msg.reply({ content: '번역하고 싶은 언어를 골라주세요. 현재 언어는 '+ current_country+ '입니다.', components: [row] });
79 //버튼 출력 66 //버튼 출력
80 -
81 client.on('interactionCreate', interaction => { 67 client.on('interactionCreate', interaction => {
82 if (!interaction.isButton()) return; 68 if (!interaction.isButton()) return;
83 69
...@@ -90,7 +76,6 @@ exports.run = async (client, msg, args, prefix) => { ...@@ -90,7 +76,6 @@ exports.run = async (client, msg, args, prefix) => {
90 global.trans_var ='jp'; 76 global.trans_var ='jp';
91 trans_disabled_var('jp'); 77 trans_disabled_var('jp');
92 } 78 }
93 -
94 else if(interaction.customId === 'english'){ 79 else if(interaction.customId === 'english'){
95 global.trans_var ='en'; 80 global.trans_var ='en';
96 trans_disabled_var('en'); 81 trans_disabled_var('en');
...@@ -102,8 +87,8 @@ exports.run = async (client, msg, args, prefix) => { ...@@ -102,8 +87,8 @@ exports.run = async (client, msg, args, prefix) => {
102 87
103 exports.config = { 88 exports.config = {
104 name: '나라', 89 name: '나라',
105 - aliases: [' ', ' ', ' ', ' '], 90 + aliases: [],
106 - category: ['translate'], 91 + category: ['Translate'],
107 - des: ['채팅 내용에 대한 검색결과를 보여줍니다.'], 92 + des: ['봇이 띄워주는 버튼을 눌러서 번역할 언어(나라)를 선택합니다.'],
108 use: ['!나라'] 93 use: ['!나라']
109 }; 94 };
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -4,16 +4,18 @@ global.trans_var ='en'; ...@@ -4,16 +4,18 @@ global.trans_var ='en';
4 4
5 exports.run = async (client, msg, args, prefix) => { 5 exports.run = async (client, msg, args, prefix) => {
6 if (args[0]) { // 명령어 뒤에 입력값이 있을 경우 (ex. !<명령어> <채팅>) 6 if (args[0]) { // 명령어 뒤에 입력값이 있을 경우 (ex. !<명령어> <채팅>)
7 + const word = args.join(' ');
8 +
7 if(trans_var=='en'){ 9 if(trans_var=='en'){
8 - en_translate(args[0]).then(transed_text=> {msg.reply(transed_text)}) 10 + en_translate(word).then(transed_text=> {msg.reply(transed_text)})
9 } 11 }
10 12
11 else if(trans_var=='jp'){ 13 else if(trans_var=='jp'){
12 - jp_translate(args[0]).then(transed_text=> {msg.reply(transed_text)}) 14 + jp_translate(word).then(transed_text=> {msg.reply(transed_text)})
13 } 15 }
14 16
15 else if(trans_var=="ko"){ 17 else if(trans_var=="ko"){
16 - ko_translate(args[0]).then(transed_text=> {msg.reply(transed_text)}) 18 + ko_translate(word).then(transed_text=> {msg.reply(transed_text)})
17 } 19 }
18 } 20 }
19 else { 21 else {
...@@ -57,8 +59,8 @@ function ko_translate(distext){ ...@@ -57,8 +59,8 @@ function ko_translate(distext){
57 59
58 exports.config = { 60 exports.config = {
59 name: '번역', 61 name: '번역',
60 - aliases: [' ', ' ', ' ', ' '], 62 + aliases: [],
61 - category: ['translate'], 63 + category: ['Translate'],
62 des: ['채팅 내용에 대한 검색결과를 보여줍니다.'], 64 des: ['채팅 내용에 대한 검색결과를 보여줍니다.'],
63 use: ['!번역 <채팅>'] 65 use: ['!번역 <채팅>']
64 }; 66 };
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -5,40 +5,34 @@ ...@@ -5,40 +5,34 @@
5 "packages": { 5 "packages": {
6 "": { 6 "": {
7 "dependencies": { 7 "dependencies": {
8 - "config.json": "^0.0.4", 8 + "discord.js": "^13.8.0",
9 - "discord.js": "^13.6.0", 9 + "puppeteer": "^14.3.0",
10 -<<<<<<< HEAD
11 -=======
12 - "puppeteer": "^14.1.1",
13 - "puppeteer-core": "^14.1.1",
14 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
15 "tesseract.js": "^2.1.5", 10 "tesseract.js": "^2.1.5",
16 "translatte": "^3.0.1" 11 "translatte": "^3.0.1"
17 } 12 }
18 }, 13 },
19 "node_modules/@discordjs/builders": { 14 "node_modules/@discordjs/builders": {
20 - "version": "0.11.0", 15 + "version": "0.14.0",
21 - "resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-0.11.0.tgz", 16 + "resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-0.14.0.tgz",
22 - "integrity": "sha512-ZTB8yJdJKrKlq44dpWkNUrAtEJEq0gqpb7ASdv4vmq6/mZal5kOv312hQ56I/vxwMre+VIkoHquNUAfnTbiYtg==", 17 + "integrity": "sha512-+fqLIqa9wN3R+kvlld8sgG0nt04BAZxdCDP4t2qZ9TJsquLWA+xMtT8Waibb3d4li4AQS+IOfjiHAznv/dhHgQ==",
23 "dependencies": { 18 "dependencies": {
24 - "@sindresorhus/is": "^4.2.0", 19 + "@sapphire/shapeshift": "^3.1.0",
25 - "discord-api-types": "^0.26.0", 20 + "@sindresorhus/is": "^4.6.0",
26 - "ts-mixer": "^6.0.0", 21 + "discord-api-types": "^0.33.3",
27 - "tslib": "^2.3.1", 22 + "fast-deep-equal": "^3.1.3",
28 - "zod": "^3.11.6" 23 + "ts-mixer": "^6.0.1",
24 + "tslib": "^2.4.0"
29 }, 25 },
30 "engines": { 26 "engines": {
31 - "node": ">=16.0.0", 27 + "node": ">=16.9.0"
32 - "npm": ">=7.0.0"
33 } 28 }
34 }, 29 },
35 "node_modules/@discordjs/collection": { 30 "node_modules/@discordjs/collection": {
36 - "version": "0.4.0", 31 + "version": "0.7.0",
37 - "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-0.4.0.tgz", 32 + "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-0.7.0.tgz",
38 - "integrity": "sha512-zmjq+l/rV35kE6zRrwe8BHqV78JvIh2ybJeZavBi5NySjWXqN3hmmAKg7kYMMXSeiWtSsMoZ/+MQi0DiQWy2lw==", 33 + "integrity": "sha512-R5i8Wb8kIcBAFEPLLf7LVBQKBDYUL+ekb23sOgpkpyGT+V4P7V83wTxcsqmX+PbqHt4cEHn053uMWfRqh/Z/nA==",
39 "engines": { 34 "engines": {
40 - "node": ">=16.0.0", 35 + "node": ">=16.9.0"
41 - "npm": ">=7.0.0"
42 } 36 }
43 }, 37 },
44 "node_modules/@sapphire/async-queue": { 38 "node_modules/@sapphire/async-queue": {
...@@ -50,6 +44,15 @@ ...@@ -50,6 +44,15 @@
50 "npm": ">=7.0.0" 44 "npm": ">=7.0.0"
51 } 45 }
52 }, 46 },
47 + "node_modules/@sapphire/shapeshift": {
48 + "version": "3.1.0",
49 + "resolved": "https://registry.npmjs.org/@sapphire/shapeshift/-/shapeshift-3.1.0.tgz",
50 + "integrity": "sha512-PkxFXd3QJ1qAPS05Dy2UkVGYPm/asF1Ugt2Xyzmv4DHzO3+G7l+873C4XFFcJ9M5Je+eCMC7SSifgPTSur5QuA==",
51 + "engines": {
52 + "node": ">=v15.0.0",
53 + "npm": ">=7.0.0"
54 + }
55 + },
53 "node_modules/@sindresorhus/is": { 56 "node_modules/@sindresorhus/is": {
54 "version": "4.6.0", 57 "version": "4.6.0",
55 "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz", 58 "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",
...@@ -73,9 +76,9 @@ ...@@ -73,9 +76,9 @@
73 } 76 }
74 }, 77 },
75 "node_modules/@types/node": { 78 "node_modules/@types/node": {
76 - "version": "17.0.32", 79 + "version": "17.0.41",
77 - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.32.tgz", 80 + "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.41.tgz",
78 - "integrity": "sha512-eAIcfAvhf/BkHcf4pkLJ7ECpBAhh9kcxRBpip9cTiO+hf+aJrsxYxBeS6OXvOd9WqNAJmavXVpZvY1rBjNsXmw==" 81 + "integrity": "sha512-xA6drNNeqb5YyV5fO3OAEsnXLfO7uF0whiOfPTz5AeDo8KeZFmODKnvwPymMNO8qE/an8pVY/O50tig2SQCrGw=="
79 }, 82 },
80 "node_modules/@types/node-fetch": { 83 "node_modules/@types/node-fetch": {
81 "version": "2.6.1", 84 "version": "2.6.1",
...@@ -107,12 +110,6 @@ ...@@ -107,12 +110,6 @@
107 "@types/node": "*" 110 "@types/node": "*"
108 } 111 }
109 }, 112 },
110 -<<<<<<< HEAD
111 - "node_modules/async": {
112 - "version": "0.9.2",
113 - "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
114 - "integrity": "sha512-l6ToIJIotphWahxxHyzK9bnLR6kM4jJIIgLShZeqLY7iboHoGkdgFl7W2/Ivi4SkMJYGKqW8vSuk0uKUj6qsSw=="
115 -=======
116 "node_modules/@types/yauzl": { 113 "node_modules/@types/yauzl": {
117 "version": "2.10.0", 114 "version": "2.10.0",
118 "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz", 115 "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
...@@ -132,12 +129,11 @@ ...@@ -132,12 +129,11 @@
132 "engines": { 129 "engines": {
133 "node": ">= 6.0.0" 130 "node": ">= 6.0.0"
134 } 131 }
135 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
136 }, 132 },
137 "node_modules/asynckit": { 133 "node_modules/asynckit": {
138 "version": "0.4.0", 134 "version": "0.4.0",
139 "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", 135 "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
140 - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" 136 + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
141 }, 137 },
142 "node_modules/balanced-match": { 138 "node_modules/balanced-match": {
143 "version": "1.0.2", 139 "version": "1.0.2",
...@@ -192,8 +188,6 @@ ...@@ -192,8 +188,6 @@
192 "concat-map": "0.0.1" 188 "concat-map": "0.0.1"
193 } 189 }
194 }, 190 },
195 -<<<<<<< HEAD
196 -=======
197 "node_modules/buffer": { 191 "node_modules/buffer": {
198 "version": "5.7.1", 192 "version": "5.7.1",
199 "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", 193 "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
...@@ -225,7 +219,6 @@ ...@@ -225,7 +219,6 @@
225 "node": "*" 219 "node": "*"
226 } 220 }
227 }, 221 },
228 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
229 "node_modules/cacheable-request": { 222 "node_modules/cacheable-request": {
230 "version": "6.1.0", 223 "version": "6.1.0",
231 "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz", 224 "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
...@@ -243,23 +236,6 @@ ...@@ -243,23 +236,6 @@
243 "node": ">=8" 236 "node": ">=8"
244 } 237 }
245 }, 238 },
246 -<<<<<<< HEAD
247 - "node_modules/cacheable-request/node_modules/get-stream": {
248 - "version": "5.2.0",
249 - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
250 - "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
251 - "dependencies": {
252 - "pump": "^3.0.0"
253 - },
254 - "engines": {
255 - "node": ">=8"
256 - },
257 - "funding": {
258 - "url": "https://github.com/sponsors/sindresorhus"
259 - }
260 - },
261 -=======
262 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
263 "node_modules/cacheable-request/node_modules/lowercase-keys": { 239 "node_modules/cacheable-request/node_modules/lowercase-keys": {
264 "version": "2.0.0", 240 "version": "2.0.0",
265 "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", 241 "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
...@@ -268,12 +244,6 @@ ...@@ -268,12 +244,6 @@
268 "node": ">=8" 244 "node": ">=8"
269 } 245 }
270 }, 246 },
271 -<<<<<<< HEAD
272 - "node_modules/clone-response": {
273 - "version": "1.0.2",
274 - "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
275 - "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
276 -=======
277 "node_modules/chownr": { 247 "node_modules/chownr": {
278 "version": "1.1.4", 248 "version": "1.1.4",
279 "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", 249 "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
...@@ -283,7 +253,6 @@ ...@@ -283,7 +253,6 @@
283 "version": "1.0.2", 253 "version": "1.0.2",
284 "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz", 254 "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
285 "integrity": "sha512-yjLXh88P599UOyPTFX0POsd7WxnbsVsGohcwzHOLspIhhpalPw1BcqED8NblyZLKcGrL8dTgMlcaZxV2jAD41Q==", 255 "integrity": "sha512-yjLXh88P599UOyPTFX0POsd7WxnbsVsGohcwzHOLspIhhpalPw1BcqED8NblyZLKcGrL8dTgMlcaZxV2jAD41Q==",
286 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
287 "dependencies": { 256 "dependencies": {
288 "mimic-response": "^1.0.0" 257 "mimic-response": "^1.0.0"
289 } 258 }
...@@ -310,19 +279,8 @@ ...@@ -310,19 +279,8 @@
310 "node_modules/concat-map": { 279 "node_modules/concat-map": {
311 "version": "0.0.1", 280 "version": "0.0.1",
312 "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", 281 "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
313 - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" 282 + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
314 }, 283 },
315 -<<<<<<< HEAD
316 - "node_modules/config.json": {
317 - "version": "0.0.4",
318 - "resolved": "https://registry.npmjs.org/config.json/-/config.json-0.0.4.tgz",
319 - "integrity": "sha1-3AJQEF3ZhIiMA3Ky9Mq72KL9Gvs=",
320 - "dependencies": {
321 - "nconf": "0.7.1"
322 - }
323 - },
324 -=======
325 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
326 "node_modules/configstore": { 284 "node_modules/configstore": {
327 "version": "4.0.0", 285 "version": "4.0.0",
328 "resolved": "https://registry.npmjs.org/configstore/-/configstore-4.0.0.tgz", 286 "resolved": "https://registry.npmjs.org/configstore/-/configstore-4.0.0.tgz",
...@@ -339,12 +297,6 @@ ...@@ -339,12 +297,6 @@
339 "node": ">=6" 297 "node": ">=6"
340 } 298 }
341 }, 299 },
342 -<<<<<<< HEAD
343 - "node_modules/crypto-random-string": {
344 - "version": "1.0.0",
345 - "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
346 - "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=",
347 -=======
348 "node_modules/cross-fetch": { 300 "node_modules/cross-fetch": {
349 "version": "3.1.5", 301 "version": "3.1.5",
350 "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz", 302 "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz",
...@@ -357,17 +309,10 @@ ...@@ -357,17 +309,10 @@
357 "version": "1.0.0", 309 "version": "1.0.0",
358 "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz", 310 "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
359 "integrity": "sha512-GsVpkFPlycH7/fRR7Dhcmnoii54gV1nz7y4CWyeFS14N+JVBBhY+r8amRHE4BwSYal7BPTDp8isvAlCxyFt3Hg==", 311 "integrity": "sha512-GsVpkFPlycH7/fRR7Dhcmnoii54gV1nz7y4CWyeFS14N+JVBBhY+r8amRHE4BwSYal7BPTDp8isvAlCxyFt3Hg==",
360 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
361 "engines": { 312 "engines": {
362 "node": ">=4" 313 "node": ">=4"
363 } 314 }
364 }, 315 },
365 -<<<<<<< HEAD
366 - "node_modules/decompress-response": {
367 - "version": "3.3.0",
368 - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
369 - "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
370 -=======
371 "node_modules/debug": { 316 "node_modules/debug": {
372 "version": "4.3.4", 317 "version": "4.3.4",
373 "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", 318 "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
...@@ -388,7 +333,6 @@ ...@@ -388,7 +333,6 @@
388 "version": "3.3.0", 333 "version": "3.3.0",
389 "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", 334 "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
390 "integrity": "sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==", 335 "integrity": "sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==",
391 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
392 "dependencies": { 336 "dependencies": {
393 "mimic-response": "^1.0.0" 337 "mimic-response": "^1.0.0"
394 }, 338 },
...@@ -404,38 +348,35 @@ ...@@ -404,38 +348,35 @@
404 "node_modules/delayed-stream": { 348 "node_modules/delayed-stream": {
405 "version": "1.0.0", 349 "version": "1.0.0",
406 "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", 350 "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
407 - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", 351 + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
408 "engines": { 352 "engines": {
409 "node": ">=0.4.0" 353 "node": ">=0.4.0"
410 } 354 }
411 }, 355 },
412 "node_modules/devtools-protocol": { 356 "node_modules/devtools-protocol": {
413 - "version": "0.0.982423", 357 + "version": "0.0.1001819",
414 - "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.982423.tgz", 358 + "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1001819.tgz",
415 - "integrity": "sha512-FnVW2nDbjGNw1uD/JRC+9U5768W7e1TfUwqbDTcSsAu1jXFjITSX8w3rkW5FEpHRMPPGpvNSmO1pOpqByiWscA==" 359 + "integrity": "sha512-G6OsIFnv/rDyxSqBa2lDLR6thp9oJioLsb2Gl+LbQlyoA9/OBAkrTU9jiCcQ8Pnh7z4d6slDiLaogR5hzgJLmQ=="
416 }, 360 },
417 "node_modules/discord-api-types": { 361 "node_modules/discord-api-types": {
418 - "version": "0.26.1", 362 + "version": "0.33.5",
419 - "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.26.1.tgz", 363 + "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.33.5.tgz",
420 - "integrity": "sha512-T5PdMQ+Y1MEECYMV5wmyi9VEYPagEDEi4S0amgsszpWY0VB9JJ/hEvM6BgLhbdnKky4gfmZEXtEEtojN8ZKJQQ==", 364 + "integrity": "sha512-dvO5M52v7m7Dy96+XUnzXNsQ/0npsYpU6dL205kAtEDueswoz3aU3bh1UMoK4cQmcGtB1YRyLKqp+DXi05lzFg=="
421 - "engines": {
422 - "node": ">=12"
423 - }
424 }, 365 },
425 "node_modules/discord.js": { 366 "node_modules/discord.js": {
426 - "version": "13.6.0", 367 + "version": "13.8.0",
427 - "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-13.6.0.tgz", 368 + "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-13.8.0.tgz",
428 - "integrity": "sha512-tXNR8zgsEPxPBvGk3AQjJ9ljIIC6/LOPjzKwpwz8Y1Q2X66Vi3ZqFgRHYwnHKC0jC0F+l4LzxlhmOJsBZDNg9g==", 369 + "integrity": "sha512-EPAA/2VLycYN5wSzavqa4iJ6qj3UtQFtHw5TH/60Fj29ymfEsCQVn//o1mTpwDxzwb+rPIrWhkxKIGGnjfv0Iw==",
429 - "dependencies": { 370 + "dependencies": {
430 - "@discordjs/builders": "^0.11.0", 371 + "@discordjs/builders": "^0.14.0",
431 - "@discordjs/collection": "^0.4.0", 372 + "@discordjs/collection": "^0.7.0",
432 - "@sapphire/async-queue": "^1.1.9", 373 + "@sapphire/async-queue": "^1.3.1",
433 - "@types/node-fetch": "^2.5.12", 374 + "@types/node-fetch": "^2.6.1",
434 - "@types/ws": "^8.2.2", 375 + "@types/ws": "^8.5.3",
435 - "discord-api-types": "^0.26.0", 376 + "discord-api-types": "^0.33.3",
436 "form-data": "^4.0.0", 377 "form-data": "^4.0.0",
437 "node-fetch": "^2.6.1", 378 "node-fetch": "^2.6.1",
438 - "ws": "^8.4.0" 379 + "ws": "^8.7.0"
439 }, 380 },
440 "engines": { 381 "engines": {
441 "node": ">=16.6.0", 382 "node": ">=16.6.0",
...@@ -456,11 +397,7 @@ ...@@ -456,11 +397,7 @@
456 "node_modules/duplexer3": { 397 "node_modules/duplexer3": {
457 "version": "0.1.4", 398 "version": "0.1.4",
458 "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", 399 "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
459 -<<<<<<< HEAD
460 - "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI="
461 -=======
462 "integrity": "sha512-CEj8FwwNA4cVH2uFCoHUrmojhYh1vmCdOaneKJXwkeY1i9jnlslVo9dx+hQ5Hl9GnH/Bwy/IjxAyOePyPKYnzA==" 400 "integrity": "sha512-CEj8FwwNA4cVH2uFCoHUrmojhYh1vmCdOaneKJXwkeY1i9jnlslVo9dx+hQ5Hl9GnH/Bwy/IjxAyOePyPKYnzA=="
463 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
464 }, 401 },
465 "node_modules/end-of-stream": { 402 "node_modules/end-of-stream": {
466 "version": "1.4.4", 403 "version": "1.4.4",
...@@ -470,8 +407,6 @@ ...@@ -470,8 +407,6 @@
470 "once": "^1.4.0" 407 "once": "^1.4.0"
471 } 408 }
472 }, 409 },
473 -<<<<<<< HEAD
474 -=======
475 "node_modules/extract-zip": { 410 "node_modules/extract-zip": {
476 "version": "2.0.1", 411 "version": "2.0.1",
477 "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", 412 "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
...@@ -491,15 +426,19 @@ ...@@ -491,15 +426,19 @@
491 "@types/yauzl": "^2.9.1" 426 "@types/yauzl": "^2.9.1"
492 } 427 }
493 }, 428 },
429 + "node_modules/fast-deep-equal": {
430 + "version": "3.1.3",
431 + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
432 + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
433 + },
494 "node_modules/fd-slicer": { 434 "node_modules/fd-slicer": {
495 "version": "1.1.0", 435 "version": "1.1.0",
496 "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", 436 "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
497 - "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=", 437 + "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
498 "dependencies": { 438 "dependencies": {
499 "pend": "~1.2.0" 439 "pend": "~1.2.0"
500 } 440 }
501 }, 441 },
502 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
503 "node_modules/file-type": { 442 "node_modules/file-type": {
504 "version": "12.4.2", 443 "version": "12.4.2",
505 "resolved": "https://registry.npmjs.org/file-type/-/file-type-12.4.2.tgz", 444 "resolved": "https://registry.npmjs.org/file-type/-/file-type-12.4.2.tgz",
...@@ -541,30 +480,20 @@ ...@@ -541,30 +480,20 @@
541 "node_modules/fs.realpath": { 480 "node_modules/fs.realpath": {
542 "version": "1.0.0", 481 "version": "1.0.0",
543 "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", 482 "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
544 - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" 483 + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
545 }, 484 },
546 "node_modules/get-stream": { 485 "node_modules/get-stream": {
547 -<<<<<<< HEAD
548 - "version": "4.1.0",
549 - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
550 - "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
551 -=======
552 "version": "5.2.0", 486 "version": "5.2.0",
553 "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", 487 "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
554 "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", 488 "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
555 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
556 "dependencies": { 489 "dependencies": {
557 "pump": "^3.0.0" 490 "pump": "^3.0.0"
558 }, 491 },
559 "engines": { 492 "engines": {
560 -<<<<<<< HEAD
561 - "node": ">=6"
562 -=======
563 "node": ">=8" 493 "node": ">=8"
564 }, 494 },
565 "funding": { 495 "funding": {
566 "url": "https://github.com/sponsors/sindresorhus" 496 "url": "https://github.com/sponsors/sindresorhus"
567 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
568 } 497 }
569 }, 498 },
570 "node_modules/glob": { 499 "node_modules/glob": {
...@@ -615,8 +544,6 @@ ...@@ -615,8 +544,6 @@
615 "node": ">=6" 544 "node": ">=6"
616 } 545 }
617 }, 546 },
618 -<<<<<<< HEAD
619 -=======
620 "node_modules/got/node_modules/get-stream": { 547 "node_modules/got/node_modules/get-stream": {
621 "version": "4.1.0", 548 "version": "4.1.0",
622 "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", 549 "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
...@@ -628,7 +555,6 @@ ...@@ -628,7 +555,6 @@
628 "node": ">=6" 555 "node": ">=6"
629 } 556 }
630 }, 557 },
631 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
632 "node_modules/graceful-fs": { 558 "node_modules/graceful-fs": {
633 "version": "4.2.10", 559 "version": "4.2.10",
634 "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", 560 "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
...@@ -639,8 +565,6 @@ ...@@ -639,8 +565,6 @@
639 "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", 565 "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
640 "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==" 566 "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="
641 }, 567 },
642 -<<<<<<< HEAD
643 -=======
644 "node_modules/https-proxy-agent": { 568 "node_modules/https-proxy-agent": {
645 "version": "5.0.1", 569 "version": "5.0.1",
646 "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", 570 "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
...@@ -653,18 +577,11 @@ ...@@ -653,18 +577,11 @@
653 "node": ">= 6" 577 "node": ">= 6"
654 } 578 }
655 }, 579 },
656 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
657 "node_modules/idb-keyval": { 580 "node_modules/idb-keyval": {
658 "version": "3.2.0", 581 "version": "3.2.0",
659 "resolved": "https://registry.npmjs.org/idb-keyval/-/idb-keyval-3.2.0.tgz", 582 "resolved": "https://registry.npmjs.org/idb-keyval/-/idb-keyval-3.2.0.tgz",
660 "integrity": "sha512-slx8Q6oywCCSfKgPgL0sEsXtPVnSbTLWpyiDcu6msHOyKOLari1TD1qocXVCft80umnkk3/Qqh3lwoFt8T/BPQ==" 583 "integrity": "sha512-slx8Q6oywCCSfKgPgL0sEsXtPVnSbTLWpyiDcu6msHOyKOLari1TD1qocXVCft80umnkk3/Qqh3lwoFt8T/BPQ=="
661 }, 584 },
662 -<<<<<<< HEAD
663 - "node_modules/imurmurhash": {
664 - "version": "0.1.4",
665 - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
666 - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
667 -=======
668 "node_modules/ieee754": { 585 "node_modules/ieee754": {
669 "version": "1.2.1", 586 "version": "1.2.1",
670 "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", 587 "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
...@@ -688,7 +605,6 @@ ...@@ -688,7 +605,6 @@
688 "version": "0.1.4", 605 "version": "0.1.4",
689 "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", 606 "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
690 "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", 607 "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
691 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
692 "engines": { 608 "engines": {
693 "node": ">=0.8.19" 609 "node": ">=0.8.19"
694 } 610 }
...@@ -696,7 +612,7 @@ ...@@ -696,7 +612,7 @@
696 "node_modules/inflight": { 612 "node_modules/inflight": {
697 "version": "1.0.6", 613 "version": "1.0.6",
698 "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", 614 "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
699 - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", 615 + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
700 "dependencies": { 616 "dependencies": {
701 "once": "^1.3.0", 617 "once": "^1.3.0",
702 "wrappy": "1" 618 "wrappy": "1"
...@@ -707,11 +623,6 @@ ...@@ -707,11 +623,6 @@
707 "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", 623 "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
708 "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" 624 "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
709 }, 625 },
710 - "node_modules/ini": {
711 - "version": "1.3.8",
712 - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
713 - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
714 - },
715 "node_modules/is-electron": { 626 "node_modules/is-electron": {
716 "version": "2.2.1", 627 "version": "2.2.1",
717 "resolved": "https://registry.npmjs.org/is-electron/-/is-electron-2.2.1.tgz", 628 "resolved": "https://registry.npmjs.org/is-electron/-/is-electron-2.2.1.tgz",
...@@ -720,11 +631,7 @@ ...@@ -720,11 +631,7 @@
720 "node_modules/is-obj": { 631 "node_modules/is-obj": {
721 "version": "1.0.1", 632 "version": "1.0.1",
722 "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", 633 "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
723 -<<<<<<< HEAD
724 - "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
725 -=======
726 "integrity": "sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==", 634 "integrity": "sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==",
727 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
728 "engines": { 635 "engines": {
729 "node": ">=0.10.0" 636 "node": ">=0.10.0"
730 } 637 }
...@@ -753,18 +660,14 @@ ...@@ -753,18 +660,14 @@
753 } 660 }
754 }, 661 },
755 "node_modules/jpeg-js": { 662 "node_modules/jpeg-js": {
756 - "version": "0.4.3", 663 + "version": "0.4.4",
757 - "resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.3.tgz", 664 + "resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.4.tgz",
758 - "integrity": "sha512-ru1HWKek8octvUHFHvE5ZzQ1yAsJmIvRdGWvSoKV52XKyuyYA437QWDttXT8eZXDSbuMpHlLzPDZUPd6idIz+Q==" 665 + "integrity": "sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg=="
759 }, 666 },
760 "node_modules/json-buffer": { 667 "node_modules/json-buffer": {
761 "version": "3.0.0", 668 "version": "3.0.0",
762 "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz", 669 "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
763 -<<<<<<< HEAD
764 - "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg="
765 -=======
766 "integrity": "sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==" 670 "integrity": "sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ=="
767 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
768 }, 671 },
769 "node_modules/keyv": { 672 "node_modules/keyv": {
770 "version": "3.1.0", 673 "version": "3.1.0",
...@@ -774,8 +677,6 @@ ...@@ -774,8 +677,6 @@
774 "json-buffer": "3.0.0" 677 "json-buffer": "3.0.0"
775 } 678 }
776 }, 679 },
777 -<<<<<<< HEAD
778 -=======
779 "node_modules/locate-path": { 680 "node_modules/locate-path": {
780 "version": "5.0.0", 681 "version": "5.0.0",
781 "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", 682 "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
...@@ -787,7 +688,6 @@ ...@@ -787,7 +688,6 @@
787 "node": ">=8" 688 "node": ">=8"
788 } 689 }
789 }, 690 },
790 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
791 "node_modules/lowercase-keys": { 691 "node_modules/lowercase-keys": {
792 "version": "1.0.1", 692 "version": "1.0.1",
793 "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", 693 "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
...@@ -845,25 +745,6 @@ ...@@ -845,25 +745,6 @@
845 "node": "*" 745 "node": "*"
846 } 746 }
847 }, 747 },
848 -<<<<<<< HEAD
849 - "node_modules/minimist": {
850 - "version": "0.0.10",
851 - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
852 - "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8="
853 - },
854 - "node_modules/nconf": {
855 - "version": "0.7.1",
856 - "resolved": "https://registry.npmjs.org/nconf/-/nconf-0.7.1.tgz",
857 - "integrity": "sha1-7ktWHdl5o8WNsSLjjxltSdYa61s=",
858 - "dependencies": {
859 - "async": "~0.9.0",
860 - "ini": "1.x.x",
861 - "optimist": "~0.6.0"
862 - },
863 - "engines": {
864 - "node": ">= 0.4.0"
865 - }
866 -=======
867 "node_modules/mkdirp-classic": { 748 "node_modules/mkdirp-classic": {
868 "version": "0.5.3", 749 "version": "0.5.3",
869 "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", 750 "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
...@@ -873,7 +754,6 @@ ...@@ -873,7 +754,6 @@
873 "version": "2.1.2", 754 "version": "2.1.2",
874 "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", 755 "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
875 "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" 756 "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
876 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
877 }, 757 },
878 "node_modules/node-fetch": { 758 "node_modules/node-fetch": {
879 "version": "2.6.7", 759 "version": "2.6.7",
...@@ -905,7 +785,7 @@ ...@@ -905,7 +785,7 @@
905 "node_modules/once": { 785 "node_modules/once": {
906 "version": "1.4.0", 786 "version": "1.4.0",
907 "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", 787 "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
908 - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", 788 + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
909 "dependencies": { 789 "dependencies": {
910 "wrappy": "1" 790 "wrappy": "1"
911 } 791 }
...@@ -918,18 +798,6 @@ ...@@ -918,18 +798,6 @@
918 "opencollective-postinstall": "index.js" 798 "opencollective-postinstall": "index.js"
919 } 799 }
920 }, 800 },
921 -<<<<<<< HEAD
922 - "node_modules/optimist": {
923 - "version": "0.6.1",
924 - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
925 - "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
926 - "dependencies": {
927 - "minimist": "~0.0.1",
928 - "wordwrap": "~0.0.2"
929 - }
930 - },
931 -=======
932 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
933 "node_modules/p-cancelable": { 801 "node_modules/p-cancelable": {
934 "version": "1.1.0", 802 "version": "1.1.0",
935 "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz", 803 "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
...@@ -938,8 +806,6 @@ ...@@ -938,8 +806,6 @@
938 "node": ">=6" 806 "node": ">=6"
939 } 807 }
940 }, 808 },
941 -<<<<<<< HEAD
942 -=======
943 "node_modules/p-limit": { 809 "node_modules/p-limit": {
944 "version": "2.3.0", 810 "version": "2.3.0",
945 "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", 811 "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
...@@ -981,11 +847,10 @@ ...@@ -981,11 +847,10 @@
981 "node": ">=8" 847 "node": ">=8"
982 } 848 }
983 }, 849 },
984 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
985 "node_modules/path-is-absolute": { 850 "node_modules/path-is-absolute": {
986 "version": "1.0.1", 851 "version": "1.0.1",
987 "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", 852 "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
988 - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", 853 + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
989 "engines": { 854 "engines": {
990 "node": ">=0.10.0" 855 "node": ">=0.10.0"
991 } 856 }
...@@ -993,7 +858,7 @@ ...@@ -993,7 +858,7 @@
993 "node_modules/pend": { 858 "node_modules/pend": {
994 "version": "1.2.0", 859 "version": "1.2.0",
995 "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", 860 "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
996 - "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=" 861 + "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="
997 }, 862 },
998 "node_modules/piexifjs": { 863 "node_modules/piexifjs": {
999 "version": "1.0.6", 864 "version": "1.0.6",
...@@ -1003,21 +868,11 @@ ...@@ -1003,21 +868,11 @@
1003 "node_modules/pify": { 868 "node_modules/pify": {
1004 "version": "3.0.0", 869 "version": "3.0.0",
1005 "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", 870 "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
1006 -<<<<<<< HEAD
1007 - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
1008 -=======
1009 "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==", 871 "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
1010 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
1011 "engines": { 872 "engines": {
1012 "node": ">=4" 873 "node": ">=4"
1013 } 874 }
1014 }, 875 },
1015 -<<<<<<< HEAD
1016 - "node_modules/prepend-http": {
1017 - "version": "2.0.0",
1018 - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
1019 - "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=",
1020 -=======
1021 "node_modules/pkg-dir": { 876 "node_modules/pkg-dir": {
1022 "version": "4.2.0", 877 "version": "4.2.0",
1023 "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", 878 "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
...@@ -1033,13 +888,10 @@ ...@@ -1033,13 +888,10 @@
1033 "version": "2.0.0", 888 "version": "2.0.0",
1034 "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", 889 "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
1035 "integrity": "sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==", 890 "integrity": "sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==",
1036 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
1037 "engines": { 891 "engines": {
1038 "node": ">=4" 892 "node": ">=4"
1039 } 893 }
1040 }, 894 },
1041 -<<<<<<< HEAD
1042 -=======
1043 "node_modules/progress": { 895 "node_modules/progress": {
1044 "version": "2.0.3", 896 "version": "2.0.3",
1045 "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", 897 "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
...@@ -1048,20 +900,16 @@ ...@@ -1048,20 +900,16 @@
1048 "node": ">=0.4.0" 900 "node": ">=0.4.0"
1049 } 901 }
1050 }, 902 },
1051 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
1052 "node_modules/proxy-check": { 903 "node_modules/proxy-check": {
1053 "version": "1.0.8", 904 "version": "1.0.8",
1054 "resolved": "https://registry.npmjs.org/proxy-check/-/proxy-check-1.0.8.tgz", 905 "resolved": "https://registry.npmjs.org/proxy-check/-/proxy-check-1.0.8.tgz",
1055 "integrity": "sha512-gooLamKpgl6wi3tJuVpDC7KL3+xSwstUIatyrknMSLaznc+n/cpEiO2HwIAcU30VLExafchmzTpFOgHr8of0wA==" 906 "integrity": "sha512-gooLamKpgl6wi3tJuVpDC7KL3+xSwstUIatyrknMSLaznc+n/cpEiO2HwIAcU30VLExafchmzTpFOgHr8of0wA=="
1056 }, 907 },
1057 -<<<<<<< HEAD
1058 -=======
1059 "node_modules/proxy-from-env": { 908 "node_modules/proxy-from-env": {
1060 "version": "1.1.0", 909 "version": "1.1.0",
1061 "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", 910 "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
1062 "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" 911 "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
1063 }, 912 },
1064 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
1065 "node_modules/pump": { 913 "node_modules/pump": {
1066 "version": "3.0.0", 914 "version": "3.0.0",
1067 "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", 915 "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
...@@ -1071,39 +919,15 @@ ...@@ -1071,39 +919,15 @@
1071 "once": "^1.3.1" 919 "once": "^1.3.1"
1072 } 920 }
1073 }, 921 },
1074 -<<<<<<< HEAD
1075 -=======
1076 "node_modules/puppeteer": { 922 "node_modules/puppeteer": {
1077 - "version": "14.1.1", 923 + "version": "14.3.0",
1078 - "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-14.1.1.tgz", 924 + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-14.3.0.tgz",
1079 - "integrity": "sha512-4dC6GYR5YlXTmNO3TbYEHTdVSdml1cVD2Ok/h/f/xSTp4ITVdbRWkMjiOaEKRAhtIl6GqaP7B89zx+hfhcNGMQ==", 925 + "integrity": "sha512-pDtg1+vyw1UPIhUjh2/VW1HUdQnaZJHfMacrJciR3AVm+PBiqdCEcFeFb3UJ/CDEQlHOClm3/WFa7IjY25zIGg==",
1080 "hasInstallScript": true, 926 "hasInstallScript": true,
1081 "dependencies": { 927 "dependencies": {
1082 "cross-fetch": "3.1.5", 928 "cross-fetch": "3.1.5",
1083 "debug": "4.3.4", 929 "debug": "4.3.4",
1084 - "devtools-protocol": "0.0.982423", 930 + "devtools-protocol": "0.0.1001819",
1085 - "extract-zip": "2.0.1",
1086 - "https-proxy-agent": "5.0.1",
1087 - "pkg-dir": "4.2.0",
1088 - "progress": "2.0.3",
1089 - "proxy-from-env": "1.1.0",
1090 - "rimraf": "3.0.2",
1091 - "tar-fs": "2.1.1",
1092 - "unbzip2-stream": "1.4.3",
1093 - "ws": "8.6.0"
1094 - },
1095 - "engines": {
1096 - "node": ">=14.1.0"
1097 - }
1098 - },
1099 - "node_modules/puppeteer-core": {
1100 - "version": "14.1.1",
1101 - "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-14.1.1.tgz",
1102 - "integrity": "sha512-DWLzFcawn1ANg2Q06Eieing4Y0fdNI7miax3f+wEbdROzlMG4yXIWzmT6XTKyFyqOjMhW5QNIDdFJftK6oP4og==",
1103 - "dependencies": {
1104 - "cross-fetch": "3.1.5",
1105 - "debug": "4.3.4",
1106 - "devtools-protocol": "0.0.982423",
1107 "extract-zip": "2.0.1", 931 "extract-zip": "2.0.1",
1108 "https-proxy-agent": "5.0.1", 932 "https-proxy-agent": "5.0.1",
1109 "pkg-dir": "4.2.0", 933 "pkg-dir": "4.2.0",
...@@ -1112,7 +936,7 @@ ...@@ -1112,7 +936,7 @@
1112 "rimraf": "3.0.2", 936 "rimraf": "3.0.2",
1113 "tar-fs": "2.1.1", 937 "tar-fs": "2.1.1",
1114 "unbzip2-stream": "1.4.3", 938 "unbzip2-stream": "1.4.3",
1115 - "ws": "8.6.0" 939 + "ws": "8.7.0"
1116 }, 940 },
1117 "engines": { 941 "engines": {
1118 "node": ">=14.1.0" 942 "node": ">=14.1.0"
...@@ -1131,7 +955,6 @@ ...@@ -1131,7 +955,6 @@
1131 "node": ">= 6" 955 "node": ">= 6"
1132 } 956 }
1133 }, 957 },
1134 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
1135 "node_modules/regenerator-runtime": { 958 "node_modules/regenerator-runtime": {
1136 "version": "0.13.9", 959 "version": "0.13.9",
1137 "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz", 960 "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
...@@ -1140,19 +963,17 @@ ...@@ -1140,19 +963,17 @@
1140 "node_modules/resolve-url": { 963 "node_modules/resolve-url": {
1141 "version": "0.2.1", 964 "version": "0.2.1",
1142 "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", 965 "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
1143 - "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=", 966 + "integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==",
1144 "deprecated": "https://github.com/lydell/resolve-url#deprecated" 967 "deprecated": "https://github.com/lydell/resolve-url#deprecated"
1145 }, 968 },
1146 "node_modules/responselike": { 969 "node_modules/responselike": {
1147 "version": "1.0.2", 970 "version": "1.0.2",
1148 "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz", 971 "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
1149 - "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=", 972 + "integrity": "sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ==",
1150 "dependencies": { 973 "dependencies": {
1151 "lowercase-keys": "^1.0.0" 974 "lowercase-keys": "^1.0.0"
1152 } 975 }
1153 }, 976 },
1154 -<<<<<<< HEAD
1155 -=======
1156 "node_modules/rimraf": { 977 "node_modules/rimraf": {
1157 "version": "3.0.2", 978 "version": "3.0.2",
1158 "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", 979 "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
...@@ -1186,14 +1007,11 @@ ...@@ -1186,14 +1007,11 @@
1186 } 1007 }
1187 ] 1008 ]
1188 }, 1009 },
1189 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
1190 "node_modules/signal-exit": { 1010 "node_modules/signal-exit": {
1191 "version": "3.0.7", 1011 "version": "3.0.7",
1192 "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", 1012 "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
1193 "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" 1013 "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
1194 }, 1014 },
1195 -<<<<<<< HEAD
1196 -=======
1197 "node_modules/string_decoder": { 1015 "node_modules/string_decoder": {
1198 "version": "1.3.0", 1016 "version": "1.3.0",
1199 "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", 1017 "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
...@@ -1228,7 +1046,6 @@ ...@@ -1228,7 +1046,6 @@
1228 "node": ">=6" 1046 "node": ">=6"
1229 } 1047 }
1230 }, 1048 },
1231 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
1232 "node_modules/tesseract.js": { 1049 "node_modules/tesseract.js": {
1233 "version": "2.1.5", 1050 "version": "2.1.5",
1234 "resolved": "https://registry.npmjs.org/tesseract.js/-/tesseract.js-2.1.5.tgz", 1051 "resolved": "https://registry.npmjs.org/tesseract.js/-/tesseract.js-2.1.5.tgz",
...@@ -1255,14 +1072,11 @@ ...@@ -1255,14 +1072,11 @@
1255 "resolved": "https://registry.npmjs.org/tesseract.js-core/-/tesseract.js-core-2.2.0.tgz", 1072 "resolved": "https://registry.npmjs.org/tesseract.js-core/-/tesseract.js-core-2.2.0.tgz",
1256 "integrity": "sha512-a8L+OJTbUipBsEDsJhDPlnLB0TY1MkTZqw5dqUwmiDSjUzwvU7HWLg/2+WDRulKUi4LE+7PnHlaBlW0k+V0U0w==" 1073 "integrity": "sha512-a8L+OJTbUipBsEDsJhDPlnLB0TY1MkTZqw5dqUwmiDSjUzwvU7HWLg/2+WDRulKUi4LE+7PnHlaBlW0k+V0U0w=="
1257 }, 1074 },
1258 -<<<<<<< HEAD
1259 -=======
1260 "node_modules/through": { 1075 "node_modules/through": {
1261 "version": "2.3.8", 1076 "version": "2.3.8",
1262 "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", 1077 "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
1263 "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" 1078 "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
1264 }, 1079 },
1265 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
1266 "node_modules/to-readable-stream": { 1080 "node_modules/to-readable-stream": {
1267 "version": "1.0.0", 1081 "version": "1.0.0",
1268 "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz", 1082 "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz",
...@@ -1305,8 +1119,6 @@ ...@@ -1305,8 +1119,6 @@
1305 "node": ">=0.6.11 <=0.7.0 || >=0.7.3" 1119 "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
1306 } 1120 }
1307 }, 1121 },
1308 -<<<<<<< HEAD
1309 -=======
1310 "node_modules/unbzip2-stream": { 1122 "node_modules/unbzip2-stream": {
1311 "version": "1.4.3", 1123 "version": "1.4.3",
1312 "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz", 1124 "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
...@@ -1316,7 +1128,6 @@ ...@@ -1316,7 +1128,6 @@
1316 "through": "^2.3.8" 1128 "through": "^2.3.8"
1317 } 1129 }
1318 }, 1130 },
1319 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
1320 "node_modules/unique-string": { 1131 "node_modules/unique-string": {
1321 "version": "1.0.0", 1132 "version": "1.0.0",
1322 "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz", 1133 "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
...@@ -1339,14 +1150,11 @@ ...@@ -1339,14 +1150,11 @@
1339 "node": ">=4" 1150 "node": ">=4"
1340 } 1151 }
1341 }, 1152 },
1342 -<<<<<<< HEAD
1343 -=======
1344 "node_modules/util-deprecate": { 1153 "node_modules/util-deprecate": {
1345 "version": "1.0.2", 1154 "version": "1.0.2",
1346 "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", 1155 "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
1347 "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" 1156 "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
1348 }, 1157 },
1349 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
1350 "node_modules/webidl-conversions": { 1158 "node_modules/webidl-conversions": {
1351 "version": "3.0.1", 1159 "version": "3.0.1",
1352 "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", 1160 "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
...@@ -1361,14 +1169,6 @@ ...@@ -1361,14 +1169,6 @@
1361 "webidl-conversions": "^3.0.0" 1169 "webidl-conversions": "^3.0.0"
1362 } 1170 }
1363 }, 1171 },
1364 - "node_modules/wordwrap": {
1365 - "version": "0.0.3",
1366 - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
1367 - "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
1368 - "engines": {
1369 - "node": ">=0.4.0"
1370 - }
1371 - },
1372 "node_modules/wrappy": { 1172 "node_modules/wrappy": {
1373 "version": "1.0.2", 1173 "version": "1.0.2",
1374 "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", 1174 "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
...@@ -1385,9 +1185,9 @@ ...@@ -1385,9 +1185,9 @@
1385 } 1185 }
1386 }, 1186 },
1387 "node_modules/ws": { 1187 "node_modules/ws": {
1388 - "version": "8.6.0", 1188 + "version": "8.7.0",
1389 - "resolved": "https://registry.npmjs.org/ws/-/ws-8.6.0.tgz", 1189 + "resolved": "https://registry.npmjs.org/ws/-/ws-8.7.0.tgz",
1390 - "integrity": "sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw==", 1190 + "integrity": "sha512-c2gsP0PRwcLFzUiA8Mkr37/MI7ilIlHQxaEAtd0uNMbVMoy8puJyafRlm0bV9MbGSabUPeLrRRaqIBcFcA2Pqg==",
1391 "engines": { 1191 "engines": {
1392 "node": ">=10.0.0" 1192 "node": ">=10.0.0"
1393 }, 1193 },
...@@ -1436,39 +1236,37 @@ ...@@ -1436,39 +1236,37 @@
1436 "engines": { 1236 "engines": {
1437 "node": "*" 1237 "node": "*"
1438 } 1238 }
1439 - },
1440 - "node_modules/zod": {
1441 - "version": "3.16.0",
1442 - "resolved": "https://registry.npmjs.org/zod/-/zod-3.16.0.tgz",
1443 - "integrity": "sha512-szrIkryADbTM+xBt2a1KoS2CJQXec4f9xG78bj5MJeEH/XqmmHpnO+fG3IE115AKBJak+2HrbxLZkc9mhdbDKA==",
1444 - "funding": {
1445 - "url": "https://github.com/sponsors/colinhacks"
1446 - }
1447 } 1239 }
1448 }, 1240 },
1449 "dependencies": { 1241 "dependencies": {
1450 "@discordjs/builders": { 1242 "@discordjs/builders": {
1451 - "version": "0.11.0", 1243 + "version": "0.14.0",
1452 - "resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-0.11.0.tgz", 1244 + "resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-0.14.0.tgz",
1453 - "integrity": "sha512-ZTB8yJdJKrKlq44dpWkNUrAtEJEq0gqpb7ASdv4vmq6/mZal5kOv312hQ56I/vxwMre+VIkoHquNUAfnTbiYtg==", 1245 + "integrity": "sha512-+fqLIqa9wN3R+kvlld8sgG0nt04BAZxdCDP4t2qZ9TJsquLWA+xMtT8Waibb3d4li4AQS+IOfjiHAznv/dhHgQ==",
1454 "requires": { 1246 "requires": {
1455 - "@sindresorhus/is": "^4.2.0", 1247 + "@sapphire/shapeshift": "^3.1.0",
1456 - "discord-api-types": "^0.26.0", 1248 + "@sindresorhus/is": "^4.6.0",
1457 - "ts-mixer": "^6.0.0", 1249 + "discord-api-types": "^0.33.3",
1458 - "tslib": "^2.3.1", 1250 + "fast-deep-equal": "^3.1.3",
1459 - "zod": "^3.11.6" 1251 + "ts-mixer": "^6.0.1",
1252 + "tslib": "^2.4.0"
1460 } 1253 }
1461 }, 1254 },
1462 "@discordjs/collection": { 1255 "@discordjs/collection": {
1463 - "version": "0.4.0", 1256 + "version": "0.7.0",
1464 - "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-0.4.0.tgz", 1257 + "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-0.7.0.tgz",
1465 - "integrity": "sha512-zmjq+l/rV35kE6zRrwe8BHqV78JvIh2ybJeZavBi5NySjWXqN3hmmAKg7kYMMXSeiWtSsMoZ/+MQi0DiQWy2lw==" 1258 + "integrity": "sha512-R5i8Wb8kIcBAFEPLLf7LVBQKBDYUL+ekb23sOgpkpyGT+V4P7V83wTxcsqmX+PbqHt4cEHn053uMWfRqh/Z/nA=="
1466 }, 1259 },
1467 "@sapphire/async-queue": { 1260 "@sapphire/async-queue": {
1468 "version": "1.3.1", 1261 "version": "1.3.1",
1469 "resolved": "https://registry.npmjs.org/@sapphire/async-queue/-/async-queue-1.3.1.tgz", 1262 "resolved": "https://registry.npmjs.org/@sapphire/async-queue/-/async-queue-1.3.1.tgz",
1470 "integrity": "sha512-FFTlPOWZX1kDj9xCAsRzH5xEJfawg1lNoYAA+ecOWJMHOfiZYb1uXOI3ne9U4UILSEPwfE68p3T9wUHwIQfR0g==" 1263 "integrity": "sha512-FFTlPOWZX1kDj9xCAsRzH5xEJfawg1lNoYAA+ecOWJMHOfiZYb1uXOI3ne9U4UILSEPwfE68p3T9wUHwIQfR0g=="
1471 }, 1264 },
1265 + "@sapphire/shapeshift": {
1266 + "version": "3.1.0",
1267 + "resolved": "https://registry.npmjs.org/@sapphire/shapeshift/-/shapeshift-3.1.0.tgz",
1268 + "integrity": "sha512-PkxFXd3QJ1qAPS05Dy2UkVGYPm/asF1Ugt2Xyzmv4DHzO3+G7l+873C4XFFcJ9M5Je+eCMC7SSifgPTSur5QuA=="
1269 + },
1472 "@sindresorhus/is": { 1270 "@sindresorhus/is": {
1473 "version": "4.6.0", 1271 "version": "4.6.0",
1474 "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz", 1272 "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",
...@@ -1483,9 +1281,9 @@ ...@@ -1483,9 +1281,9 @@
1483 } 1281 }
1484 }, 1282 },
1485 "@types/node": { 1283 "@types/node": {
1486 - "version": "17.0.32", 1284 + "version": "17.0.41",
1487 - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.32.tgz", 1285 + "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.41.tgz",
1488 - "integrity": "sha512-eAIcfAvhf/BkHcf4pkLJ7ECpBAhh9kcxRBpip9cTiO+hf+aJrsxYxBeS6OXvOd9WqNAJmavXVpZvY1rBjNsXmw==" 1286 + "integrity": "sha512-xA6drNNeqb5YyV5fO3OAEsnXLfO7uF0whiOfPTz5AeDo8KeZFmODKnvwPymMNO8qE/an8pVY/O50tig2SQCrGw=="
1489 }, 1287 },
1490 "@types/node-fetch": { 1288 "@types/node-fetch": {
1491 "version": "2.6.1", 1289 "version": "2.6.1",
...@@ -1516,12 +1314,6 @@ ...@@ -1516,12 +1314,6 @@
1516 "@types/node": "*" 1314 "@types/node": "*"
1517 } 1315 }
1518 }, 1316 },
1519 -<<<<<<< HEAD
1520 - "async": {
1521 - "version": "0.9.2",
1522 - "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
1523 - "integrity": "sha512-l6ToIJIotphWahxxHyzK9bnLR6kM4jJIIgLShZeqLY7iboHoGkdgFl7W2/Ivi4SkMJYGKqW8vSuk0uKUj6qsSw=="
1524 -=======
1525 "@types/yauzl": { 1317 "@types/yauzl": {
1526 "version": "2.10.0", 1318 "version": "2.10.0",
1527 "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz", 1319 "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
...@@ -1538,12 +1330,11 @@ ...@@ -1538,12 +1330,11 @@
1538 "requires": { 1330 "requires": {
1539 "debug": "4" 1331 "debug": "4"
1540 } 1332 }
1541 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
1542 }, 1333 },
1543 "asynckit": { 1334 "asynckit": {
1544 "version": "0.4.0", 1335 "version": "0.4.0",
1545 "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", 1336 "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
1546 - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" 1337 + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
1547 }, 1338 },
1548 "balanced-match": { 1339 "balanced-match": {
1549 "version": "1.0.2", 1340 "version": "1.0.2",
...@@ -1584,8 +1375,6 @@ ...@@ -1584,8 +1375,6 @@
1584 "concat-map": "0.0.1" 1375 "concat-map": "0.0.1"
1585 } 1376 }
1586 }, 1377 },
1587 -<<<<<<< HEAD
1588 -=======
1589 "buffer": { 1378 "buffer": {
1590 "version": "5.7.1", 1379 "version": "5.7.1",
1591 "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", 1380 "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
...@@ -1600,7 +1389,6 @@ ...@@ -1600,7 +1389,6 @@
1600 "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", 1389 "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
1601 "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==" 1390 "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ=="
1602 }, 1391 },
1603 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
1604 "cacheable-request": { 1392 "cacheable-request": {
1605 "version": "6.1.0", 1393 "version": "6.1.0",
1606 "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz", 1394 "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
...@@ -1615,17 +1403,6 @@ ...@@ -1615,17 +1403,6 @@
1615 "responselike": "^1.0.2" 1403 "responselike": "^1.0.2"
1616 }, 1404 },
1617 "dependencies": { 1405 "dependencies": {
1618 -<<<<<<< HEAD
1619 - "get-stream": {
1620 - "version": "5.2.0",
1621 - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
1622 - "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
1623 - "requires": {
1624 - "pump": "^3.0.0"
1625 - }
1626 - },
1627 -=======
1628 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
1629 "lowercase-keys": { 1406 "lowercase-keys": {
1630 "version": "2.0.0", 1407 "version": "2.0.0",
1631 "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", 1408 "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
...@@ -1633,12 +1410,6 @@ ...@@ -1633,12 +1410,6 @@
1633 } 1410 }
1634 } 1411 }
1635 }, 1412 },
1636 -<<<<<<< HEAD
1637 - "clone-response": {
1638 - "version": "1.0.2",
1639 - "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
1640 - "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
1641 -=======
1642 "chownr": { 1413 "chownr": {
1643 "version": "1.1.4", 1414 "version": "1.1.4",
1644 "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", 1415 "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
...@@ -1648,7 +1419,6 @@ ...@@ -1648,7 +1419,6 @@
1648 "version": "1.0.2", 1419 "version": "1.0.2",
1649 "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz", 1420 "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
1650 "integrity": "sha512-yjLXh88P599UOyPTFX0POsd7WxnbsVsGohcwzHOLspIhhpalPw1BcqED8NblyZLKcGrL8dTgMlcaZxV2jAD41Q==", 1421 "integrity": "sha512-yjLXh88P599UOyPTFX0POsd7WxnbsVsGohcwzHOLspIhhpalPw1BcqED8NblyZLKcGrL8dTgMlcaZxV2jAD41Q==",
1651 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
1652 "requires": { 1422 "requires": {
1653 "mimic-response": "^1.0.0" 1423 "mimic-response": "^1.0.0"
1654 } 1424 }
...@@ -1669,19 +1439,8 @@ ...@@ -1669,19 +1439,8 @@
1669 "concat-map": { 1439 "concat-map": {
1670 "version": "0.0.1", 1440 "version": "0.0.1",
1671 "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", 1441 "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
1672 - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" 1442 + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
1673 - },
1674 -<<<<<<< HEAD
1675 - "config.json": {
1676 - "version": "0.0.4",
1677 - "resolved": "https://registry.npmjs.org/config.json/-/config.json-0.0.4.tgz",
1678 - "integrity": "sha1-3AJQEF3ZhIiMA3Ky9Mq72KL9Gvs=",
1679 - "requires": {
1680 - "nconf": "0.7.1"
1681 - }
1682 }, 1443 },
1683 -=======
1684 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
1685 "configstore": { 1444 "configstore": {
1686 "version": "4.0.0", 1445 "version": "4.0.0",
1687 "resolved": "https://registry.npmjs.org/configstore/-/configstore-4.0.0.tgz", 1446 "resolved": "https://registry.npmjs.org/configstore/-/configstore-4.0.0.tgz",
...@@ -1695,12 +1454,6 @@ ...@@ -1695,12 +1454,6 @@
1695 "xdg-basedir": "^3.0.0" 1454 "xdg-basedir": "^3.0.0"
1696 } 1455 }
1697 }, 1456 },
1698 -<<<<<<< HEAD
1699 - "crypto-random-string": {
1700 - "version": "1.0.0",
1701 - "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
1702 - "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4="
1703 -=======
1704 "cross-fetch": { 1457 "cross-fetch": {
1705 "version": "3.1.5", 1458 "version": "3.1.5",
1706 "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz", 1459 "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz",
...@@ -1721,16 +1474,11 @@ ...@@ -1721,16 +1474,11 @@
1721 "requires": { 1474 "requires": {
1722 "ms": "2.1.2" 1475 "ms": "2.1.2"
1723 } 1476 }
1724 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
1725 }, 1477 },
1726 "decompress-response": { 1478 "decompress-response": {
1727 "version": "3.3.0", 1479 "version": "3.3.0",
1728 "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", 1480 "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
1729 -<<<<<<< HEAD
1730 - "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
1731 -=======
1732 "integrity": "sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==", 1481 "integrity": "sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==",
1733 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
1734 "requires": { 1482 "requires": {
1735 "mimic-response": "^1.0.0" 1483 "mimic-response": "^1.0.0"
1736 } 1484 }
...@@ -1743,32 +1491,32 @@ ...@@ -1743,32 +1491,32 @@
1743 "delayed-stream": { 1491 "delayed-stream": {
1744 "version": "1.0.0", 1492 "version": "1.0.0",
1745 "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", 1493 "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
1746 - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" 1494 + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
1747 }, 1495 },
1748 "devtools-protocol": { 1496 "devtools-protocol": {
1749 - "version": "0.0.982423", 1497 + "version": "0.0.1001819",
1750 - "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.982423.tgz", 1498 + "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1001819.tgz",
1751 - "integrity": "sha512-FnVW2nDbjGNw1uD/JRC+9U5768W7e1TfUwqbDTcSsAu1jXFjITSX8w3rkW5FEpHRMPPGpvNSmO1pOpqByiWscA==" 1499 + "integrity": "sha512-G6OsIFnv/rDyxSqBa2lDLR6thp9oJioLsb2Gl+LbQlyoA9/OBAkrTU9jiCcQ8Pnh7z4d6slDiLaogR5hzgJLmQ=="
1752 }, 1500 },
1753 "discord-api-types": { 1501 "discord-api-types": {
1754 - "version": "0.26.1", 1502 + "version": "0.33.5",
1755 - "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.26.1.tgz", 1503 + "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.33.5.tgz",
1756 - "integrity": "sha512-T5PdMQ+Y1MEECYMV5wmyi9VEYPagEDEi4S0amgsszpWY0VB9JJ/hEvM6BgLhbdnKky4gfmZEXtEEtojN8ZKJQQ==" 1504 + "integrity": "sha512-dvO5M52v7m7Dy96+XUnzXNsQ/0npsYpU6dL205kAtEDueswoz3aU3bh1UMoK4cQmcGtB1YRyLKqp+DXi05lzFg=="
1757 }, 1505 },
1758 "discord.js": { 1506 "discord.js": {
1759 - "version": "13.6.0", 1507 + "version": "13.8.0",
1760 - "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-13.6.0.tgz", 1508 + "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-13.8.0.tgz",
1761 - "integrity": "sha512-tXNR8zgsEPxPBvGk3AQjJ9ljIIC6/LOPjzKwpwz8Y1Q2X66Vi3ZqFgRHYwnHKC0jC0F+l4LzxlhmOJsBZDNg9g==", 1509 + "integrity": "sha512-EPAA/2VLycYN5wSzavqa4iJ6qj3UtQFtHw5TH/60Fj29ymfEsCQVn//o1mTpwDxzwb+rPIrWhkxKIGGnjfv0Iw==",
1762 "requires": { 1510 "requires": {
1763 - "@discordjs/builders": "^0.11.0", 1511 + "@discordjs/builders": "^0.14.0",
1764 - "@discordjs/collection": "^0.4.0", 1512 + "@discordjs/collection": "^0.7.0",
1765 - "@sapphire/async-queue": "^1.1.9", 1513 + "@sapphire/async-queue": "^1.3.1",
1766 - "@types/node-fetch": "^2.5.12", 1514 + "@types/node-fetch": "^2.6.1",
1767 - "@types/ws": "^8.2.2", 1515 + "@types/ws": "^8.5.3",
1768 - "discord-api-types": "^0.26.0", 1516 + "discord-api-types": "^0.33.3",
1769 "form-data": "^4.0.0", 1517 "form-data": "^4.0.0",
1770 "node-fetch": "^2.6.1", 1518 "node-fetch": "^2.6.1",
1771 - "ws": "^8.4.0" 1519 + "ws": "^8.7.0"
1772 } 1520 }
1773 }, 1521 },
1774 "dot-prop": { 1522 "dot-prop": {
...@@ -1782,11 +1530,7 @@ ...@@ -1782,11 +1530,7 @@
1782 "duplexer3": { 1530 "duplexer3": {
1783 "version": "0.1.4", 1531 "version": "0.1.4",
1784 "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", 1532 "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
1785 -<<<<<<< HEAD
1786 - "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI="
1787 -=======
1788 "integrity": "sha512-CEj8FwwNA4cVH2uFCoHUrmojhYh1vmCdOaneKJXwkeY1i9jnlslVo9dx+hQ5Hl9GnH/Bwy/IjxAyOePyPKYnzA==" 1533 "integrity": "sha512-CEj8FwwNA4cVH2uFCoHUrmojhYh1vmCdOaneKJXwkeY1i9jnlslVo9dx+hQ5Hl9GnH/Bwy/IjxAyOePyPKYnzA=="
1789 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
1790 }, 1534 },
1791 "end-of-stream": { 1535 "end-of-stream": {
1792 "version": "1.4.4", 1536 "version": "1.4.4",
...@@ -1796,8 +1540,6 @@ ...@@ -1796,8 +1540,6 @@
1796 "once": "^1.4.0" 1540 "once": "^1.4.0"
1797 } 1541 }
1798 }, 1542 },
1799 -<<<<<<< HEAD
1800 -=======
1801 "extract-zip": { 1543 "extract-zip": {
1802 "version": "2.0.1", 1544 "version": "2.0.1",
1803 "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", 1545 "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
...@@ -1809,15 +1551,19 @@ ...@@ -1809,15 +1551,19 @@
1809 "yauzl": "^2.10.0" 1551 "yauzl": "^2.10.0"
1810 } 1552 }
1811 }, 1553 },
1554 + "fast-deep-equal": {
1555 + "version": "3.1.3",
1556 + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
1557 + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
1558 + },
1812 "fd-slicer": { 1559 "fd-slicer": {
1813 "version": "1.1.0", 1560 "version": "1.1.0",
1814 "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", 1561 "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
1815 - "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=", 1562 + "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
1816 "requires": { 1563 "requires": {
1817 "pend": "~1.2.0" 1564 "pend": "~1.2.0"
1818 } 1565 }
1819 }, 1566 },
1820 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
1821 "file-type": { 1567 "file-type": {
1822 "version": "12.4.2", 1568 "version": "12.4.2",
1823 "resolved": "https://registry.npmjs.org/file-type/-/file-type-12.4.2.tgz", 1569 "resolved": "https://registry.npmjs.org/file-type/-/file-type-12.4.2.tgz",
...@@ -1850,18 +1596,12 @@ ...@@ -1850,18 +1596,12 @@
1850 "fs.realpath": { 1596 "fs.realpath": {
1851 "version": "1.0.0", 1597 "version": "1.0.0",
1852 "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", 1598 "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
1853 - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" 1599 + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
1854 }, 1600 },
1855 "get-stream": { 1601 "get-stream": {
1856 -<<<<<<< HEAD
1857 - "version": "4.1.0",
1858 - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
1859 - "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
1860 -=======
1861 "version": "5.2.0", 1602 "version": "5.2.0",
1862 "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", 1603 "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
1863 "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", 1604 "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
1864 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
1865 "requires": { 1605 "requires": {
1866 "pump": "^3.0.0" 1606 "pump": "^3.0.0"
1867 } 1607 }
...@@ -1901,8 +1641,6 @@ ...@@ -1901,8 +1641,6 @@
1901 "version": "0.14.0", 1641 "version": "0.14.0",
1902 "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz", 1642 "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
1903 "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==" 1643 "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ=="
1904 -<<<<<<< HEAD
1905 -=======
1906 }, 1644 },
1907 "get-stream": { 1645 "get-stream": {
1908 "version": "4.1.0", 1646 "version": "4.1.0",
...@@ -1911,7 +1649,6 @@ ...@@ -1911,7 +1649,6 @@
1911 "requires": { 1649 "requires": {
1912 "pump": "^3.0.0" 1650 "pump": "^3.0.0"
1913 } 1651 }
1914 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
1915 } 1652 }
1916 } 1653 }
1917 }, 1654 },
...@@ -1925,8 +1662,6 @@ ...@@ -1925,8 +1662,6 @@
1925 "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", 1662 "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
1926 "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==" 1663 "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="
1927 }, 1664 },
1928 -<<<<<<< HEAD
1929 -=======
1930 "https-proxy-agent": { 1665 "https-proxy-agent": {
1931 "version": "5.0.1", 1666 "version": "5.0.1",
1932 "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", 1667 "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
...@@ -1936,18 +1671,11 @@ ...@@ -1936,18 +1671,11 @@
1936 "debug": "4" 1671 "debug": "4"
1937 } 1672 }
1938 }, 1673 },
1939 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
1940 "idb-keyval": { 1674 "idb-keyval": {
1941 "version": "3.2.0", 1675 "version": "3.2.0",
1942 "resolved": "https://registry.npmjs.org/idb-keyval/-/idb-keyval-3.2.0.tgz", 1676 "resolved": "https://registry.npmjs.org/idb-keyval/-/idb-keyval-3.2.0.tgz",
1943 "integrity": "sha512-slx8Q6oywCCSfKgPgL0sEsXtPVnSbTLWpyiDcu6msHOyKOLari1TD1qocXVCft80umnkk3/Qqh3lwoFt8T/BPQ==" 1677 "integrity": "sha512-slx8Q6oywCCSfKgPgL0sEsXtPVnSbTLWpyiDcu6msHOyKOLari1TD1qocXVCft80umnkk3/Qqh3lwoFt8T/BPQ=="
1944 }, 1678 },
1945 -<<<<<<< HEAD
1946 - "imurmurhash": {
1947 - "version": "0.1.4",
1948 - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
1949 - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
1950 -=======
1951 "ieee754": { 1679 "ieee754": {
1952 "version": "1.2.1", 1680 "version": "1.2.1",
1953 "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", 1681 "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
...@@ -1957,12 +1685,11 @@ ...@@ -1957,12 +1685,11 @@
1957 "version": "0.1.4", 1685 "version": "0.1.4",
1958 "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", 1686 "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
1959 "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==" 1687 "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="
1960 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
1961 }, 1688 },
1962 "inflight": { 1689 "inflight": {
1963 "version": "1.0.6", 1690 "version": "1.0.6",
1964 "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", 1691 "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
1965 - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", 1692 + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
1966 "requires": { 1693 "requires": {
1967 "once": "^1.3.0", 1694 "once": "^1.3.0",
1968 "wrappy": "1" 1695 "wrappy": "1"
...@@ -1973,11 +1700,6 @@ ...@@ -1973,11 +1700,6 @@
1973 "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", 1700 "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
1974 "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" 1701 "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
1975 }, 1702 },
1976 - "ini": {
1977 - "version": "1.3.8",
1978 - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
1979 - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
1980 - },
1981 "is-electron": { 1703 "is-electron": {
1982 "version": "2.2.1", 1704 "version": "2.2.1",
1983 "resolved": "https://registry.npmjs.org/is-electron/-/is-electron-2.2.1.tgz", 1705 "resolved": "https://registry.npmjs.org/is-electron/-/is-electron-2.2.1.tgz",
...@@ -1986,11 +1708,7 @@ ...@@ -1986,11 +1708,7 @@
1986 "is-obj": { 1708 "is-obj": {
1987 "version": "1.0.1", 1709 "version": "1.0.1",
1988 "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", 1710 "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
1989 -<<<<<<< HEAD
1990 - "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8="
1991 -=======
1992 "integrity": "sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==" 1711 "integrity": "sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg=="
1993 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
1994 }, 1712 },
1995 "is-url": { 1713 "is-url": {
1996 "version": "1.2.4", 1714 "version": "1.2.4",
...@@ -2010,18 +1728,14 @@ ...@@ -2010,18 +1728,14 @@
2010 } 1728 }
2011 }, 1729 },
2012 "jpeg-js": { 1730 "jpeg-js": {
2013 - "version": "0.4.3", 1731 + "version": "0.4.4",
2014 - "resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.3.tgz", 1732 + "resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.4.tgz",
2015 - "integrity": "sha512-ru1HWKek8octvUHFHvE5ZzQ1yAsJmIvRdGWvSoKV52XKyuyYA437QWDttXT8eZXDSbuMpHlLzPDZUPd6idIz+Q==" 1733 + "integrity": "sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg=="
2016 }, 1734 },
2017 "json-buffer": { 1735 "json-buffer": {
2018 "version": "3.0.0", 1736 "version": "3.0.0",
2019 "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz", 1737 "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
2020 -<<<<<<< HEAD
2021 - "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg="
2022 -=======
2023 "integrity": "sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==" 1738 "integrity": "sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ=="
2024 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
2025 }, 1739 },
2026 "keyv": { 1740 "keyv": {
2027 "version": "3.1.0", 1741 "version": "3.1.0",
...@@ -2031,8 +1745,6 @@ ...@@ -2031,8 +1745,6 @@
2031 "json-buffer": "3.0.0" 1745 "json-buffer": "3.0.0"
2032 } 1746 }
2033 }, 1747 },
2034 -<<<<<<< HEAD
2035 -=======
2036 "locate-path": { 1748 "locate-path": {
2037 "version": "5.0.0", 1749 "version": "5.0.0",
2038 "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", 1750 "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
...@@ -2041,7 +1753,6 @@ ...@@ -2041,7 +1753,6 @@
2041 "p-locate": "^4.1.0" 1753 "p-locate": "^4.1.0"
2042 } 1754 }
2043 }, 1755 },
2044 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
2045 "lowercase-keys": { 1756 "lowercase-keys": {
2046 "version": "1.0.1", 1757 "version": "1.0.1",
2047 "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", 1758 "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
...@@ -2081,22 +1792,6 @@ ...@@ -2081,22 +1792,6 @@
2081 "brace-expansion": "^1.1.7" 1792 "brace-expansion": "^1.1.7"
2082 } 1793 }
2083 }, 1794 },
2084 -<<<<<<< HEAD
2085 - "minimist": {
2086 - "version": "0.0.10",
2087 - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
2088 - "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8="
2089 - },
2090 - "nconf": {
2091 - "version": "0.7.1",
2092 - "resolved": "https://registry.npmjs.org/nconf/-/nconf-0.7.1.tgz",
2093 - "integrity": "sha1-7ktWHdl5o8WNsSLjjxltSdYa61s=",
2094 - "requires": {
2095 - "async": "~0.9.0",
2096 - "ini": "1.x.x",
2097 - "optimist": "~0.6.0"
2098 - }
2099 -=======
2100 "mkdirp-classic": { 1795 "mkdirp-classic": {
2101 "version": "0.5.3", 1796 "version": "0.5.3",
2102 "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", 1797 "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
...@@ -2106,7 +1801,6 @@ ...@@ -2106,7 +1801,6 @@
2106 "version": "2.1.2", 1801 "version": "2.1.2",
2107 "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", 1802 "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
2108 "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" 1803 "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
2109 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
2110 }, 1804 },
2111 "node-fetch": { 1805 "node-fetch": {
2112 "version": "2.6.7", 1806 "version": "2.6.7",
...@@ -2124,7 +1818,7 @@ ...@@ -2124,7 +1818,7 @@
2124 "once": { 1818 "once": {
2125 "version": "1.4.0", 1819 "version": "1.4.0",
2126 "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", 1820 "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
2127 - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", 1821 + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
2128 "requires": { 1822 "requires": {
2129 "wrappy": "1" 1823 "wrappy": "1"
2130 } 1824 }
...@@ -2134,25 +1828,11 @@ ...@@ -2134,25 +1828,11 @@
2134 "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz", 1828 "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz",
2135 "integrity": "sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==" 1829 "integrity": "sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q=="
2136 }, 1830 },
2137 -<<<<<<< HEAD
2138 - "optimist": {
2139 - "version": "0.6.1",
2140 - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
2141 - "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
2142 - "requires": {
2143 - "minimist": "~0.0.1",
2144 - "wordwrap": "~0.0.2"
2145 - }
2146 - },
2147 -=======
2148 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
2149 "p-cancelable": { 1831 "p-cancelable": {
2150 "version": "1.1.0", 1832 "version": "1.1.0",
2151 "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz", 1833 "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
2152 "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==" 1834 "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="
2153 }, 1835 },
2154 -<<<<<<< HEAD
2155 -=======
2156 "p-limit": { 1836 "p-limit": {
2157 "version": "2.3.0", 1837 "version": "2.3.0",
2158 "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", 1838 "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
...@@ -2179,16 +1859,15 @@ ...@@ -2179,16 +1859,15 @@
2179 "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", 1859 "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
2180 "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==" 1860 "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
2181 }, 1861 },
2182 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
2183 "path-is-absolute": { 1862 "path-is-absolute": {
2184 "version": "1.0.1", 1863 "version": "1.0.1",
2185 "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", 1864 "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
2186 - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" 1865 + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="
2187 }, 1866 },
2188 "pend": { 1867 "pend": {
2189 "version": "1.2.0", 1868 "version": "1.2.0",
2190 "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", 1869 "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
2191 - "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=" 1870 + "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="
2192 }, 1871 },
2193 "piexifjs": { 1872 "piexifjs": {
2194 "version": "1.0.6", 1873 "version": "1.0.6",
...@@ -2198,9 +1877,6 @@ ...@@ -2198,9 +1877,6 @@
2198 "pify": { 1877 "pify": {
2199 "version": "3.0.0", 1878 "version": "3.0.0",
2200 "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", 1879 "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
2201 -<<<<<<< HEAD
2202 - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
2203 -=======
2204 "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==" 1880 "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg=="
2205 }, 1881 },
2206 "pkg-dir": { 1882 "pkg-dir": {
...@@ -2210,35 +1886,27 @@ ...@@ -2210,35 +1886,27 @@
2210 "requires": { 1886 "requires": {
2211 "find-up": "^4.0.0" 1887 "find-up": "^4.0.0"
2212 } 1888 }
2213 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
2214 }, 1889 },
2215 "prepend-http": { 1890 "prepend-http": {
2216 "version": "2.0.0", 1891 "version": "2.0.0",
2217 "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", 1892 "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
2218 -<<<<<<< HEAD
2219 - "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc="
2220 -=======
2221 "integrity": "sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==" 1893 "integrity": "sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA=="
2222 }, 1894 },
2223 "progress": { 1895 "progress": {
2224 "version": "2.0.3", 1896 "version": "2.0.3",
2225 "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", 1897 "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
2226 "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==" 1898 "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
2227 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
2228 }, 1899 },
2229 "proxy-check": { 1900 "proxy-check": {
2230 "version": "1.0.8", 1901 "version": "1.0.8",
2231 "resolved": "https://registry.npmjs.org/proxy-check/-/proxy-check-1.0.8.tgz", 1902 "resolved": "https://registry.npmjs.org/proxy-check/-/proxy-check-1.0.8.tgz",
2232 "integrity": "sha512-gooLamKpgl6wi3tJuVpDC7KL3+xSwstUIatyrknMSLaznc+n/cpEiO2HwIAcU30VLExafchmzTpFOgHr8of0wA==" 1903 "integrity": "sha512-gooLamKpgl6wi3tJuVpDC7KL3+xSwstUIatyrknMSLaznc+n/cpEiO2HwIAcU30VLExafchmzTpFOgHr8of0wA=="
2233 }, 1904 },
2234 -<<<<<<< HEAD
2235 -=======
2236 "proxy-from-env": { 1905 "proxy-from-env": {
2237 "version": "1.1.0", 1906 "version": "1.1.0",
2238 "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", 1907 "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
2239 "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" 1908 "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
2240 }, 1909 },
2241 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
2242 "pump": { 1910 "pump": {
2243 "version": "3.0.0", 1911 "version": "3.0.0",
2244 "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", 1912 "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
...@@ -2248,16 +1916,14 @@ ...@@ -2248,16 +1916,14 @@
2248 "once": "^1.3.1" 1916 "once": "^1.3.1"
2249 } 1917 }
2250 }, 1918 },
2251 -<<<<<<< HEAD
2252 -=======
2253 "puppeteer": { 1919 "puppeteer": {
2254 - "version": "14.1.1", 1920 + "version": "14.3.0",
2255 - "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-14.1.1.tgz", 1921 + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-14.3.0.tgz",
2256 - "integrity": "sha512-4dC6GYR5YlXTmNO3TbYEHTdVSdml1cVD2Ok/h/f/xSTp4ITVdbRWkMjiOaEKRAhtIl6GqaP7B89zx+hfhcNGMQ==", 1922 + "integrity": "sha512-pDtg1+vyw1UPIhUjh2/VW1HUdQnaZJHfMacrJciR3AVm+PBiqdCEcFeFb3UJ/CDEQlHOClm3/WFa7IjY25zIGg==",
2257 "requires": { 1923 "requires": {
2258 "cross-fetch": "3.1.5", 1924 "cross-fetch": "3.1.5",
2259 "debug": "4.3.4", 1925 "debug": "4.3.4",
2260 - "devtools-protocol": "0.0.982423", 1926 + "devtools-protocol": "0.0.1001819",
2261 "extract-zip": "2.0.1", 1927 "extract-zip": "2.0.1",
2262 "https-proxy-agent": "5.0.1", 1928 "https-proxy-agent": "5.0.1",
2263 "pkg-dir": "4.2.0", 1929 "pkg-dir": "4.2.0",
...@@ -2266,26 +1932,7 @@ ...@@ -2266,26 +1932,7 @@
2266 "rimraf": "3.0.2", 1932 "rimraf": "3.0.2",
2267 "tar-fs": "2.1.1", 1933 "tar-fs": "2.1.1",
2268 "unbzip2-stream": "1.4.3", 1934 "unbzip2-stream": "1.4.3",
2269 - "ws": "8.6.0" 1935 + "ws": "8.7.0"
2270 - }
2271 - },
2272 - "puppeteer-core": {
2273 - "version": "14.1.1",
2274 - "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-14.1.1.tgz",
2275 - "integrity": "sha512-DWLzFcawn1ANg2Q06Eieing4Y0fdNI7miax3f+wEbdROzlMG4yXIWzmT6XTKyFyqOjMhW5QNIDdFJftK6oP4og==",
2276 - "requires": {
2277 - "cross-fetch": "3.1.5",
2278 - "debug": "4.3.4",
2279 - "devtools-protocol": "0.0.982423",
2280 - "extract-zip": "2.0.1",
2281 - "https-proxy-agent": "5.0.1",
2282 - "pkg-dir": "4.2.0",
2283 - "progress": "2.0.3",
2284 - "proxy-from-env": "1.1.0",
2285 - "rimraf": "3.0.2",
2286 - "tar-fs": "2.1.1",
2287 - "unbzip2-stream": "1.4.3",
2288 - "ws": "8.6.0"
2289 } 1936 }
2290 }, 1937 },
2291 "readable-stream": { 1938 "readable-stream": {
...@@ -2298,7 +1945,6 @@ ...@@ -2298,7 +1945,6 @@
2298 "util-deprecate": "^1.0.1" 1945 "util-deprecate": "^1.0.1"
2299 } 1946 }
2300 }, 1947 },
2301 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
2302 "regenerator-runtime": { 1948 "regenerator-runtime": {
2303 "version": "0.13.9", 1949 "version": "0.13.9",
2304 "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz", 1950 "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
...@@ -2307,18 +1953,16 @@ ...@@ -2307,18 +1953,16 @@
2307 "resolve-url": { 1953 "resolve-url": {
2308 "version": "0.2.1", 1954 "version": "0.2.1",
2309 "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", 1955 "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
2310 - "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=" 1956 + "integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg=="
2311 }, 1957 },
2312 "responselike": { 1958 "responselike": {
2313 "version": "1.0.2", 1959 "version": "1.0.2",
2314 "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz", 1960 "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
2315 - "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=", 1961 + "integrity": "sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ==",
2316 "requires": { 1962 "requires": {
2317 "lowercase-keys": "^1.0.0" 1963 "lowercase-keys": "^1.0.0"
2318 } 1964 }
2319 }, 1965 },
2320 -<<<<<<< HEAD
2321 -=======
2322 "rimraf": { 1966 "rimraf": {
2323 "version": "3.0.2", 1967 "version": "3.0.2",
2324 "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", 1968 "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
...@@ -2332,14 +1976,11 @@ ...@@ -2332,14 +1976,11 @@
2332 "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", 1976 "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
2333 "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" 1977 "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
2334 }, 1978 },
2335 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
2336 "signal-exit": { 1979 "signal-exit": {
2337 "version": "3.0.7", 1980 "version": "3.0.7",
2338 "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", 1981 "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
2339 "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" 1982 "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
2340 }, 1983 },
2341 -<<<<<<< HEAD
2342 -=======
2343 "string_decoder": { 1984 "string_decoder": {
2344 "version": "1.3.0", 1985 "version": "1.3.0",
2345 "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", 1986 "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
...@@ -2371,7 +2012,6 @@ ...@@ -2371,7 +2012,6 @@
2371 "readable-stream": "^3.1.1" 2012 "readable-stream": "^3.1.1"
2372 } 2013 }
2373 }, 2014 },
2374 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
2375 "tesseract.js": { 2015 "tesseract.js": {
2376 "version": "2.1.5", 2016 "version": "2.1.5",
2377 "resolved": "https://registry.npmjs.org/tesseract.js/-/tesseract.js-2.1.5.tgz", 2017 "resolved": "https://registry.npmjs.org/tesseract.js/-/tesseract.js-2.1.5.tgz",
...@@ -2397,14 +2037,11 @@ ...@@ -2397,14 +2037,11 @@
2397 "resolved": "https://registry.npmjs.org/tesseract.js-core/-/tesseract.js-core-2.2.0.tgz", 2037 "resolved": "https://registry.npmjs.org/tesseract.js-core/-/tesseract.js-core-2.2.0.tgz",
2398 "integrity": "sha512-a8L+OJTbUipBsEDsJhDPlnLB0TY1MkTZqw5dqUwmiDSjUzwvU7HWLg/2+WDRulKUi4LE+7PnHlaBlW0k+V0U0w==" 2038 "integrity": "sha512-a8L+OJTbUipBsEDsJhDPlnLB0TY1MkTZqw5dqUwmiDSjUzwvU7HWLg/2+WDRulKUi4LE+7PnHlaBlW0k+V0U0w=="
2399 }, 2039 },
2400 -<<<<<<< HEAD
2401 -=======
2402 "through": { 2040 "through": {
2403 "version": "2.3.8", 2041 "version": "2.3.8",
2404 "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", 2042 "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
2405 "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" 2043 "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
2406 }, 2044 },
2407 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
2408 "to-readable-stream": { 2045 "to-readable-stream": {
2409 "version": "1.0.0", 2046 "version": "1.0.0",
2410 "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz", 2047 "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz",
...@@ -2441,8 +2078,6 @@ ...@@ -2441,8 +2078,6 @@
2441 "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz", 2078 "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
2442 "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==" 2079 "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg=="
2443 }, 2080 },
2444 -<<<<<<< HEAD
2445 -=======
2446 "unbzip2-stream": { 2081 "unbzip2-stream": {
2447 "version": "1.4.3", 2082 "version": "1.4.3",
2448 "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz", 2083 "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
...@@ -2452,7 +2087,6 @@ ...@@ -2452,7 +2087,6 @@
2452 "through": "^2.3.8" 2087 "through": "^2.3.8"
2453 } 2088 }
2454 }, 2089 },
2455 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
2456 "unique-string": { 2090 "unique-string": {
2457 "version": "1.0.0", 2091 "version": "1.0.0",
2458 "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz", 2092 "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
...@@ -2469,14 +2103,11 @@ ...@@ -2469,14 +2103,11 @@
2469 "prepend-http": "^2.0.0" 2103 "prepend-http": "^2.0.0"
2470 } 2104 }
2471 }, 2105 },
2472 -<<<<<<< HEAD
2473 -=======
2474 "util-deprecate": { 2106 "util-deprecate": {
2475 "version": "1.0.2", 2107 "version": "1.0.2",
2476 "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", 2108 "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
2477 "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" 2109 "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
2478 }, 2110 },
2479 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
2480 "webidl-conversions": { 2111 "webidl-conversions": {
2481 "version": "3.0.1", 2112 "version": "3.0.1",
2482 "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", 2113 "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
...@@ -2491,11 +2122,6 @@ ...@@ -2491,11 +2122,6 @@
2491 "webidl-conversions": "^3.0.0" 2122 "webidl-conversions": "^3.0.0"
2492 } 2123 }
2493 }, 2124 },
2494 - "wordwrap": {
2495 - "version": "0.0.3",
2496 - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
2497 - "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc="
2498 - },
2499 "wrappy": { 2125 "wrappy": {
2500 "version": "1.0.2", 2126 "version": "1.0.2",
2501 "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", 2127 "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
...@@ -2512,9 +2138,9 @@ ...@@ -2512,9 +2138,9 @@
2512 } 2138 }
2513 }, 2139 },
2514 "ws": { 2140 "ws": {
2515 - "version": "8.6.0", 2141 + "version": "8.7.0",
2516 - "resolved": "https://registry.npmjs.org/ws/-/ws-8.6.0.tgz", 2142 + "resolved": "https://registry.npmjs.org/ws/-/ws-8.7.0.tgz",
2517 - "integrity": "sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw==", 2143 + "integrity": "sha512-c2gsP0PRwcLFzUiA8Mkr37/MI7ilIlHQxaEAtd0uNMbVMoy8puJyafRlm0bV9MbGSabUPeLrRRaqIBcFcA2Pqg==",
2518 "requires": {} 2144 "requires": {}
2519 }, 2145 },
2520 "xdg-basedir": { 2146 "xdg-basedir": {
...@@ -2540,11 +2166,6 @@ ...@@ -2540,11 +2166,6 @@
2540 "version": "0.3.1", 2166 "version": "0.3.1",
2541 "resolved": "https://registry.npmjs.org/zlibjs/-/zlibjs-0.3.1.tgz", 2167 "resolved": "https://registry.npmjs.org/zlibjs/-/zlibjs-0.3.1.tgz",
2542 "integrity": "sha1-UBl+2yihxCymWcyLTmqd3W1ERVQ=" 2168 "integrity": "sha1-UBl+2yihxCymWcyLTmqd3W1ERVQ="
2543 - },
2544 - "zod": {
2545 - "version": "3.16.0",
2546 - "resolved": "https://registry.npmjs.org/zod/-/zod-3.16.0.tgz",
2547 - "integrity": "sha512-szrIkryADbTM+xBt2a1KoS2CJQXec4f9xG78bj5MJeEH/XqmmHpnO+fG3IE115AKBJak+2HrbxLZkc9mhdbDKA=="
2548 } 2169 }
2549 } 2170 }
2550 } 2171 }
......
1 { 1 {
2 "dependencies": { 2 "dependencies": {
3 - "config.json": "^0.0.4", 3 + "discord.js": "^13.8.0",
4 - "discord.js": "^13.6.0", 4 + "puppeteer": "^14.3.0",
5 -<<<<<<< HEAD
6 -=======
7 - "puppeteer": "^14.1.1",
8 - "puppeteer-core": "^14.1.1",
9 ->>>>>>> d5a6b9b3343c77c3e74f6ccaeaf88b75094c368c
10 "tesseract.js": "^2.1.5", 5 "tesseract.js": "^2.1.5",
11 "translatte": "^3.0.1" 6 "translatte": "^3.0.1"
12 } 7 }
......