Skip to content

Commit 97e6599

Browse files
authored
Merge pull request matrix-org#6207 from matrix-org/t3chguy/ts/5
Fix types in SlashCommands
2 parents 782adbc + cce4ccb commit 97e6599

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

src/SlashCommands.tsx

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,10 @@ function success(promise?: Promise<any>) {
150150
return {promise};
151151
}
152152

153+
function successSync(value: any) {
154+
return success(Promise.resolve(value));
155+
}
156+
153157
/* Disable the "unexpected this" error for these commands - all of the run
154158
* functions are called with `this` bound to the Command instance.
155159
*/
@@ -160,7 +164,7 @@ export const Commands = [
160164
args: '<message>',
161165
description: _td('Sends the given message as a spoiler'),
162166
runFn: function(roomId, message) {
163-
return success(ContentHelpers.makeHtmlMessage(
167+
return successSync(ContentHelpers.makeHtmlMessage(
164168
message,
165169
`<span data-mx-spoiler>${message}</span>`,
166170
));
@@ -176,7 +180,7 @@ export const Commands = [
176180
if (args) {
177181
message = message + ' ' + args;
178182
}
179-
return success(ContentHelpers.makeTextMessage(message));
183+
return successSync(ContentHelpers.makeTextMessage(message));
180184
},
181185
category: CommandCategories.messages,
182186
}),
@@ -189,7 +193,7 @@ export const Commands = [
189193
if (args) {
190194
message = message + ' ' + args;
191195
}
192-
return success(ContentHelpers.makeTextMessage(message));
196+
return successSync(ContentHelpers.makeTextMessage(message));
193197
},
194198
category: CommandCategories.messages,
195199
}),
@@ -202,7 +206,7 @@ export const Commands = [
202206
if (args) {
203207
message = message + ' ' + args;
204208
}
205-
return success(ContentHelpers.makeTextMessage(message));
209+
return successSync(ContentHelpers.makeTextMessage(message));
206210
},
207211
category: CommandCategories.messages,
208212
}),
@@ -215,7 +219,7 @@ export const Commands = [
215219
if (args) {
216220
message = message + ' ' + args;
217221
}
218-
return success(ContentHelpers.makeTextMessage(message));
222+
return successSync(ContentHelpers.makeTextMessage(message));
219223
},
220224
category: CommandCategories.messages,
221225
}),
@@ -224,7 +228,7 @@ export const Commands = [
224228
args: '<message>',
225229
description: _td('Sends a message as plain text, without interpreting it as markdown'),
226230
runFn: function(roomId, messages) {
227-
return success(ContentHelpers.makeTextMessage(messages));
231+
return successSync(ContentHelpers.makeTextMessage(messages));
228232
},
229233
category: CommandCategories.messages,
230234
}),
@@ -233,7 +237,7 @@ export const Commands = [
233237
args: '<message>',
234238
description: _td('Sends a message as html, without interpreting it as markdown'),
235239
runFn: function(roomId, messages) {
236-
return success(ContentHelpers.makeHtmlMessage(messages, messages));
240+
return successSync(ContentHelpers.makeHtmlMessage(messages, messages));
237241
},
238242
category: CommandCategories.messages,
239243
}),
@@ -978,7 +982,7 @@ export const Commands = [
978982
args: '<message>',
979983
runFn: function(roomId, args) {
980984
if (!args) return reject(this.getUserId());
981-
return success(ContentHelpers.makeHtmlMessage(args, textToHtmlRainbow(args)));
985+
return successSync(ContentHelpers.makeHtmlMessage(args, textToHtmlRainbow(args)));
982986
},
983987
category: CommandCategories.messages,
984988
}),
@@ -988,7 +992,7 @@ export const Commands = [
988992
args: '<message>',
989993
runFn: function(roomId, args) {
990994
if (!args) return reject(this.getUserId());
991-
return success(ContentHelpers.makeHtmlEmote(args, textToHtmlRainbow(args)));
995+
return successSync(ContentHelpers.makeHtmlEmote(args, textToHtmlRainbow(args)));
992996
},
993997
category: CommandCategories.messages,
994998
}),

0 commit comments

Comments
 (0)