Merge branch 'master' into stable

NotSugden · May 4, 2020 · 10b761f · 10b761f
2 parents 86aad39 + 1e96193
commit 10b761f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "asc-rewrite",
-	"version": "2.1.1",
+	"version": "2.1.0",
 	"description": "The ASC bot",
 	"main": "index.js",
 	"scripts": {

diff --git a/util/WebsiteManager.ts b/util/WebsiteManager.ts
@@ -91,8 +91,8 @@ export default class WebsiteManager extends EventEmitter {
 					result = error;
 				}
 				this.process!.send({
-					_responseID: message._responseID,
-					_result: result
+					_data: { result },
+					_responseID: message._responseID
 				}, errorCB);
 			} else if (action.type === 'GET_GUILD_MEMBERS') {
 				const membersMap = (member: GuildMember | null) => {
@@ -127,14 +127,21 @@ export default class WebsiteManager extends EventEmitter {
 						}
 					}
 					return this.process!.send({
-						_members: members.map(membersMap),
+						_data: {
+							members: members.map(membersMap)
+						},
 						_responseID: message._responseID
 					});
 				} else if (action.query) {
 					const members = await this.client.config.defaultGuild.members.fetch({
 						query: action.query
 					});
-					return members.array().map(membersMap);
+					return this.process!.send({
+						_data: {
+							members: members.array().map(membersMap)
+						},
+						_responseID: message._responseID
+					});
 				}
 			}
 		}