Merge pull request #4 from jacopomaroli/main

update client

.dockerignore

@@ -0,0 +1,2 @@
+node_modules
+.env

.vscode/launch.json

@@ -0,0 +1,23 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "ts-node",
+            "type": "node",
+            "request": "launch",
+            "args": [
+                "cmd/bot.ts"
+            ],
+            "runtimeArgs": [
+                "-r",
+                "ts-node/register"
+            ],
+            "cwd": "${workspaceRoot}",
+            "internalConsoleOptions": "openOnSessionStart",
+            "skipFiles": []
+        }
+    ]
+}

.yarnrc.yml

@@ -0,0 +1 @@
+nodeLinker: node-modules

package.json

@@ -40,7 +40,7 @@
   "dependencies": {
     "@types/node-fetch": "^2.6.4",
     "discord.js": "^14.9.0",
-    "midjourney": "^2.7.79",
+    "midjourney": "^3.0.81",
     "node-fetch": "2.6.11",
     "socks-proxy-agent": "^8.0.1"
   }

src/bot.ts

@@ -88,17 +88,18 @@ export class MidjourneyBot extends Midjourney {
     return message;
   }
 
-  async upscale(index: number, channelId: string, messageID: string) {
+  async upscale(index: 1 | 2 | 3 | 4, channelId: string, messageID: string) {
     const msg = await this.getMessage(channelId, messageID);
     if (!msg) return;
     this.log(msg?.attachments.first()?.url);
     const messageHash = this.UriToHash(<string>msg.attachments.first()?.url);
     this.MJApi.config.ChannelId = channelId;
-    const httpStatus = await this.MJApi.UpscaleApi(
+    const httpStatus = await this.MJApi.UpscaleApi({
       index,
-      messageID,
-      messageHash
-    );
+      msgId: messageID,
+      hash: messageHash,
+      flags: 0
+    });
     if (httpStatus !== 204) {
       await (<TextChannel>this.client.channels.cache.get(channelId)).send(
         "Request has failed; please try later"
@@ -110,17 +111,18 @@ export class MidjourneyBot extends Midjourney {
     }
   }
 
-  async variation(index: number, channelId: string, messageID: string) {
+  async variation(index: 1 | 2 | 3 | 4, channelId: string, messageID: string) {
     const msg = await this.getMessage(channelId, messageID);
     if (!msg) return;
     this.log(msg?.attachments.first()?.url);
     const messageHash = this.UriToHash(<string>msg.attachments.first()?.url);
     this.MJApi.config.ChannelId = channelId;
-    const httpStatus = await this.MJApi.VariationApi(
+    const httpStatus = await this.MJApi.VariationApi({
       index,
-      messageID,
-      messageHash
-    );
+      msgId: messageID,
+      hash: messageHash,
+      flags: 0
+    });
     if (httpStatus !== 204) {
       await (<TextChannel>this.client.channels.cache.get(channelId)).send(
         "Request has failed; please try later"