fixbug-settings 合并上游代码

docs/docker-start.md

@@ -6,7 +6,7 @@
 docker run -d --name midjourney-proxy \
  -p 8080:8080 \
  -v /xxx/xxx/config:/home/spring/config \
-  kratos1937/midjourney-proxy:v1.0.7
+  kratos1937/midjourney-proxy:v1.1.0
 ```
 3. 访问 `http://ip:port/mj` 查看API文档
 
@@ -17,5 +17,5 @@ docker run -d --name midjourney-proxy \
  -e mj.discord.guild-id=xxx \
  -e mj.discord.channel-id=xxx \
  -e mj.discord.user-token=xxx \
-  kratos1937/midjourney-proxy:v1.0.8
+  kratos1937/midjourney-proxy:v1.1.0
 ```

src/main/java/com/github/novicezk/midjourney/service/DiscordServiceImpl.java

@@ -45,7 +45,6 @@ public DiscordServiceImpl(DiscordAccount account, RestTemplate restTemplate, Map
 		this.discordInteractionUrl = discordServer + "/api/v9/interactions";
 		this.discordAttachmentUrl = discordServer + "/api/v9/channels/" + account.getChannelId() + "/attachments";
 		this.discordMessageUrl = discordServer + "/api/v9/channels/" + account.getChannelId() + "/messages";
-		this.regionUrl = "https://936929561302675456.discordsays.com/inpaint/api/submit-job";
 	}
 
 	@Override
@@ -123,7 +122,6 @@ public Message<Void> vary(String messageId, String messageHash, String nonce, St
 				.replace("$vary",vary)
 				.replace("$message_id", messageId)
 				.replace("$message_hash", messageHash);
-
 		return postJsonAndCheckStatus(paramsStr);
 	}
 

src/main/resources/api-params/list-settings.json

@@ -0,0 +1,32 @@
+{
+  "type": 2,
+  "application_id": "936929561302675456",
+  "guild_id": "$guild_id",
+  "channel_id": "$channel_id",
+  "session_id": "12b3d9d8dbc0db4536a0fc4664ab7bad",
+  "data": {
+    "version": "1166847114609958943",
+    "id": "1000850743479255081",
+    "name": "settings",
+    "type": 1,
+    "options": [],
+    "application_command": {
+      "id": "1000850743479255081",
+      "application_id": "936929561302675456",
+      "version": "1166847114609958943",
+      "default_member_permissions": null,
+      "type": 1,
+      "nsfw": false,
+      "name": "settings",
+      "description": "View and adjust your personal settings.",
+      "dm_permission": true,
+      "contexts": null,
+      "integration_types": [
+        0
+      ]
+    },
+    "attachments": []
+  },
+  "nonce": "$nonce",
+  "analytics_location": "slash_ui"
+}

src/main/resources/api-params/settings.json

@@ -4,7 +4,7 @@
   "guild_id": "$guild_id",
   "channel_id": "$channel_id",
   "message_flags": 64,
-  "message_id": "1160405256170110986",
+  "message_id": "1174275851265781770",
   "application_id": "936929561302675456",
   "session_id": "$session_id",
   "data": {