merge conflicts

package-lock.json

@@ -8,10 +8,12 @@
             "name": "natsuki",
             "version": "1.0.0",
             "dependencies": {
+                "@discordjs/rest": "^0.1.0-canary.0",
                 "@discordjs/voice": "^0.6.0",
                 "chalk": "^4.1.0",
                 "cron": "^1.8.2",
                 "dblapi.js": "^2.4.1",
+                "discord-api-types": "^0.22.0",
                 "discord.io": "https://github.com/woor/discord.io/tarball/gateway_v6",
                 "discord.js": "^13.1.0",
                 "lastfm": "^0.9.0",
@@ -26,7 +28,7 @@
                 "ws": "^7.4.6"
             },
             "engines": {
-                "node": "12.14.1"
+                "node": ">=16.0.0"
             }
         },
         "node_modules/@dabh/diagnostics": {
@@ -76,6 +78,38 @@
                 "node": ">= 6"
             }
         },
+        "node_modules/@discordjs/rest": {
+            "version": "0.1.0-canary.0",
+            "resolved": "https://registry.npmjs.org/@discordjs/rest/-/rest-0.1.0-canary.0.tgz",
+            "integrity": "sha512-d+s//ISYVV+e0w/926wMEeO7vju+Pn11x1JM4tcmVMCHSDgpi6pnFCNAXF1TEdnDcy7xf9tq5cf2pQkb/7ySTQ==",
+            "dependencies": {
+                "@discordjs/collection": "^0.1.6",
+                "@sapphire/async-queue": "^1.1.4",
+                "@sapphire/snowflake": "^1.3.5",
+                "abort-controller": "^3.0.0",
+                "discord-api-types": "^0.18.1",
+                "form-data": "^4.0.0",
+                "node-fetch": "^2.6.1",
+                "tslib": "^2.3.0"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@discordjs/rest/node_modules/@discordjs/collection": {
+            "version": "0.1.6",
+            "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-0.1.6.tgz",
+            "integrity": "sha512-utRNxnd9kSS2qhyivo9lMlt5qgAUasH2gb7BEOn6p0efFh24gjGomHzWKMAPn2hEReOPQZCJaRKoURwRotKucQ=="
+        },
+        "node_modules/@discordjs/rest/node_modules/discord-api-types": {
+            "version": "0.18.1",
+            "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.18.1.tgz",
+            "integrity": "sha512-hNC38R9ZF4uaujaZQtQfm5CdQO58uhdkoHQAVvMfIL0LgOSZeW575W8H6upngQOuoxWd8tiRII3LLJm9zuQKYg==",
+            "deprecated": "No longer supported. Install the latest release (0.20.2)",
+            "engines": {
+                "node": ">=12"
+            }
+        },
         "node_modules/@discordjs/voice": {
             "version": "0.6.0",
             "resolved": "https://registry.npmjs.org/@discordjs/voice/-/voice-0.6.0.tgz",
@@ -100,6 +134,15 @@
                 "npm": ">=6"
             }
         },
+        "node_modules/@sapphire/snowflake": {
+            "version": "1.3.6",
+            "resolved": "https://registry.npmjs.org/@sapphire/snowflake/-/snowflake-1.3.6.tgz",
+            "integrity": "sha512-QnzuLp+p9D7agynVub/zqlDVriDza9y3STArBhNiNBUgIX8+GL5FpQxstRfw1jDr5jkZUjcuKYAHxjIuXKdJAg==",
+            "engines": {
+                "node": ">=12",
+                "npm": ">=6"
+            }
+        },
         "node_modules/@sindresorhus/is": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.0.1.tgz",
@@ -141,6 +184,17 @@
                 "@types/node": "*"
             }
         },
+        "node_modules/abort-controller": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
+            "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
+            "dependencies": {
+                "event-target-shim": "^5.0.0"
+            },
+            "engines": {
+                "node": ">=6.5"
+            }
+        },
         "node_modules/ansi-styles": {
             "version": "4.3.0",
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -444,6 +498,14 @@
             "resolved": "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz",
             "integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ=="
         },
+        "node_modules/event-target-shim": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
+            "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
+            "engines": {
+                "node": ">=6"
+            }
+        },
         "node_modules/fast-safe-stringify": {
             "version": "2.0.7",
             "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz",
@@ -459,6 +521,19 @@
             "resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz",
             "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="
         },
+        "node_modules/form-data": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+            "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+            "dependencies": {
+                "asynckit": "^0.4.0",
+                "combined-stream": "^1.0.8",
+                "mime-types": "^2.1.12"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
         "node_modules/has-flag": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -1186,6 +1261,33 @@
                 "mime-types": "^2.1.12"
             }
         },
+        "@discordjs/rest": {
+            "version": "0.1.0-canary.0",
+            "resolved": "https://registry.npmjs.org/@discordjs/rest/-/rest-0.1.0-canary.0.tgz",
+            "integrity": "sha512-d+s//ISYVV+e0w/926wMEeO7vju+Pn11x1JM4tcmVMCHSDgpi6pnFCNAXF1TEdnDcy7xf9tq5cf2pQkb/7ySTQ==",
+            "requires": {
+                "@discordjs/collection": "^0.1.6",
+                "@sapphire/async-queue": "^1.1.4",
+                "@sapphire/snowflake": "^1.3.5",
+                "abort-controller": "^3.0.0",
+                "discord-api-types": "^0.18.1",
+                "form-data": "^4.0.0",
+                "node-fetch": "^2.6.1",
+                "tslib": "^2.3.0"
+            },
+            "dependencies": {
+                "@discordjs/collection": {
+                    "version": "0.1.6",
+                    "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-0.1.6.tgz",
+                    "integrity": "sha512-utRNxnd9kSS2qhyivo9lMlt5qgAUasH2gb7BEOn6p0efFh24gjGomHzWKMAPn2hEReOPQZCJaRKoURwRotKucQ=="
+                },
+                "discord-api-types": {
+                    "version": "0.18.1",
+                    "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.18.1.tgz",
+                    "integrity": "sha512-hNC38R9ZF4uaujaZQtQfm5CdQO58uhdkoHQAVvMfIL0LgOSZeW575W8H6upngQOuoxWd8tiRII3LLJm9zuQKYg=="
+                }
+            }
+        },
         "@discordjs/voice": {
             "version": "0.6.0",
             "resolved": "https://registry.npmjs.org/@discordjs/voice/-/voice-0.6.0.tgz",
@@ -1203,6 +1305,11 @@
             "resolved": "https://registry.npmjs.org/@sapphire/async-queue/-/async-queue-1.1.4.tgz",
             "integrity": "sha512-fFrlF/uWpGOX5djw5Mu2Hnnrunao75WGey0sP0J3jnhmrJ5TAPzHYOmytD5iN/+pMxS+f+u/gezqHa9tPhRHEA=="
         },
+        "@sapphire/snowflake": {
+            "version": "1.3.6",
+            "resolved": "https://registry.npmjs.org/@sapphire/snowflake/-/snowflake-1.3.6.tgz",
+            "integrity": "sha512-QnzuLp+p9D7agynVub/zqlDVriDza9y3STArBhNiNBUgIX8+GL5FpQxstRfw1jDr5jkZUjcuKYAHxjIuXKdJAg=="
+        },
         "@sindresorhus/is": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.0.1.tgz",
@@ -1238,6 +1345,14 @@
                 "@types/node": "*"
             }
         },
+        "abort-controller": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
+            "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
+            "requires": {
+                "event-target-shim": "^5.0.0"
+            }
+        },
         "ansi-styles": {
             "version": "4.3.0",
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -1498,6 +1613,11 @@
             "resolved": "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz",
             "integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ=="
         },
+        "event-target-shim": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
+            "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="
+        },
         "fast-safe-stringify": {
             "version": "2.0.7",
             "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz",
@@ -1513,6 +1633,16 @@
             "resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz",
             "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="
         },
+        "form-data": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+            "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+            "requires": {
+                "asynckit": "^0.4.0",
+                "combined-stream": "^1.0.8",
+                "mime-types": "^2.1.12"
+            }
+        },
         "has-flag": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",