Skip to content

Commit

Permalink
fix(messages): allow to send empty messages with only embeds. (#1849)
Browse files Browse the repository at this point in the history
  • Loading branch information
C0ZEN authored Nov 16, 2022
1 parent e5fb548 commit 97fe68f
Show file tree
Hide file tree
Showing 58 changed files with 33 additions and 63 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ export class DiscordLoggerErrorService extends AbstractService {

public getErrorMessageResponse(): IDiscordMessageResponse {
return {
content: ``,
options: {
embeds: [createMock<MessageEmbed>()],
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ describe(`DiscordLoggerErrorService`, (): void => {

const result = service.getErrorMessageResponse(error);

expect(result.content).toBe(``);
expect(result.content).toBeUndefined();
});
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ export class DiscordLoggerErrorService extends AbstractService {

public getErrorMessageResponse(error: Readonly<Error | string>): IDiscordMessageResponse {
return {
content: ``,
options: {
embeds: [this._getMessageEmbed(error)],
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ describe(`DiscordLoggerWarningService`, (): void => {

const result = service.getWarningMessageResponse(warning);

expect(result.content).toBe(``);
expect(result.content).toBeUndefined();
});
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ export class DiscordLoggerWarningService extends AbstractService {

public getWarningMessageResponse(warning: Readonly<string>): IDiscordMessageResponse {
return {
content: ``,
options: {
embeds: [this._getMessageEmbed(warning)],
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { IDiscordMessageOptions } from '../types/discord-message-options';

export interface IDiscordMessageResponse {
content: string;
content?: string;
readonly options: IDiscordMessageOptions;
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ export class DiscordMessageCommandCookieService extends AbstractService {

public getMessageResponse(): IDiscordMessageResponse {
return {
content: ``,
options: {
embeds: [createMock<MessageEmbed>()],
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ describe(`DiscordMessageCommandCookieService`, (): void => {

const result = await service.handleResponse(anyDiscordMessage);

expect(result.content).toBe(``);
expect(result.content).toBeUndefined();
});
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ export class DiscordMessageCommandCookieService extends AbstractService {

public getMessageResponse(): Promise<IDiscordMessageResponse> {
const message: IDiscordMessageResponse = {
content: ``,
options: {
embeds: [this._getMessageEmbed()],
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ describe(`DiscordMessageCommandCliErrorService`, (): void => {

const result = await service.getCliErrorMessageResponse();

expect(result.content).toBe(``);
expect(result.content).toBeUndefined();
});
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ export class DiscordMessageCommandCliErrorService extends AbstractService {
*/
public getCliErrorMessageResponse(): Promise<IDiscordMessageResponse> {
const message: IDiscordMessageResponse = {
content: ``,
options: {
embeds: [this._getMessageEmbed()],
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ describe(`DiscordMessageCommandErrorService`, (): void => {

const result = await service.handleResponse(anyDiscordMessage);

expect(result.content).toBe(``);
expect(result.content).toBeUndefined();
});
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ export class DiscordMessageCommandErrorService extends AbstractService {

public getMessageResponse(): Promise<IDiscordMessageResponse> {
const message: IDiscordMessageResponse = {
content: ``,
options: {
embeds: [this._getMessageEmbed()],
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ describe(`DiscordMessageCommandFeatureNoonHelp`, (): void => {

const result = await service.getMessageResponse(anyDiscordMessage, discordCommandFlags);

expect(result.content).toBe(``);
expect(result.content).toBeUndefined();
});
});
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ export class DiscordMessageCommandFeatureNoonHelp<T extends string> implements D
.getMessageResponse()
.then((helpMessageResponse: Readonly<IDiscordMessageResponse>): Promise<IDiscordMessageResponse> => {
const message: IDiscordMessageResponse = {
content: ``,
options: {
embeds: [this._getMessageEmbed(anyDiscordMessage, discordCommandFlags)],
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -825,7 +825,7 @@ describe(`DiscordMessageCommandFeatureNoonHumanize`, (): void => {

const result = await service.getMessageResponse(state);

expect(result.content).toBe(``);
expect(result.content).toBeUndefined();
});
});
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ export class DiscordMessageCommandFeatureNoonHumanize<T extends string>
.getMessageResponse()
.then((helpMessageResponse: Readonly<IDiscordMessageResponse>): Promise<IDiscordMessageResponse> => {
const message: IDiscordMessageResponse = {
content: ``,
options: {
embeds: [this._getMessageEmbed(state)],
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ describe(`DiscordMessageCommandFeatureNoonService`, (): void => {

const result = await service.getMessageResponse(anyDiscordMessage, messageFlags);

expect(result[0].content).toBe(``);
expect(result[0].content).toBeUndefined();
});
});

Expand Down Expand Up @@ -481,7 +481,7 @@ describe(`DiscordMessageCommandFeatureNoonService`, (): void => {

const result = await service.getMessageResponse(anyDiscordMessage, messageFlags);

expect(result[0].content).toBe(``);
expect(result[0].content).toBeUndefined();
});
});

Expand Down Expand Up @@ -703,7 +703,7 @@ describe(`DiscordMessageCommandFeatureNoonService`, (): void => {

const result = await service.getMessageResponse(anyDiscordMessage, messageFlags);

expect(result[0].content).toBe(``);
expect(result[0].content).toBeUndefined();
});
});
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ export class DiscordMessageCommandFeatureNoonService extends AbstractService {

if (!_.isEmpty(discordCommandSplittedFlagsResponse.commandFlagsSuccess)) {
discordMessageResponses.unshift({
content: ``,
options: {
embeds: [this._getMessageEmbed(discordCommandSplittedFlagsResponse.commandFlagsSuccess)],
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ describe(`DiscordMessageCommandFeatureReleaseNotesHelp`, (): void => {

const result = await service.getMessageResponse(anyDiscordMessage, discordCommandFlags);

expect(result.content).toBe(``);
expect(result.content).toBeUndefined();
});
});
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ export class DiscordMessageCommandFeatureReleaseNotesHelp<T extends string>
.getMessageResponse()
.then((helpMessageResponse: Readonly<IDiscordMessageResponse>): Promise<IDiscordMessageResponse> => {
const message: IDiscordMessageResponse = {
content: ``,
options: {
embeds: [this._getMessageEmbed(anyDiscordMessage, discordCommandFlags)],
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -876,7 +876,7 @@ describe(`DiscordMessageCommandFeatureReleaseNotesHumanize`, (): void => {

const result = await service.getMessageResponse(state);

expect(result.content).toBe(``);
expect(result.content).toBeUndefined();
});
});
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ export class DiscordMessageCommandFeatureReleaseNotesHumanize<T extends string>
.getMessageResponse()
.then((helpMessageResponse: Readonly<IDiscordMessageResponse>): Promise<IDiscordMessageResponse> => {
const message: IDiscordMessageResponse = {
content: ``,
options: {
embeds: [this._getMessageEmbed(state)],
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ describe(`DiscordMessageCommandFeatureReleaseNotesService`, (): void => {

const result = await service.getMessageResponse(anyDiscordMessage, messageFlags);

expect(result[0].content).toBe(``);
expect(result[0].content).toBeUndefined();
});
});

Expand Down Expand Up @@ -490,7 +490,7 @@ describe(`DiscordMessageCommandFeatureReleaseNotesService`, (): void => {

const result = await service.getMessageResponse(anyDiscordMessage, messageFlags);

expect(result[0].content).toBe(``);
expect(result[0].content).toBeUndefined();
});
});

Expand Down Expand Up @@ -714,7 +714,7 @@ describe(`DiscordMessageCommandFeatureReleaseNotesService`, (): void => {

const result = await service.getMessageResponse(anyDiscordMessage, messageFlags);

expect(result[0].content).toBe(``);
expect(result[0].content).toBeUndefined();
});
});
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ export class DiscordMessageCommandFeatureReleaseNotesService extends AbstractSer

if (!_.isEmpty(discordCommandSplittedFlagsResponse.commandFlagsSuccess)) {
discordMessageResponses.unshift({
content: ``,
options: {
embeds: [this._getMessageEmbed(discordCommandSplittedFlagsResponse.commandFlagsSuccess)],
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ describe(`DiscordMessageCommandFeatureEmptyContentErrorService`, (): void => {

const result = await service.getMessageResponse();

expect(result.content).toBe(``);
expect(result.content).toBeUndefined();
});
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ export class DiscordMessageCommandFeatureEmptyContentErrorService extends Discor
.getCliErrorMessageResponse()
.then((cliErrorMessageResponse: Readonly<IDiscordMessageResponse>): Promise<IDiscordMessageResponse> => {
const message: IDiscordMessageResponse = {
content: ``,
options: {
embeds: [this._getMessageEmbed()],
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ describe(`DiscordMessageCommandFeatureEmptyFeatureNameErrorService`, (): void =>

const result = await service.getMessageResponse(anyDiscordMessage, commands);

expect(result.content).toBe(``);
expect(result.content).toBeUndefined();
});
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ export class DiscordMessageCommandFeatureEmptyFeatureNameErrorService extends Di
.getCliErrorMessageResponse()
.then((cliErrorMessageResponse: Readonly<IDiscordMessageResponse>): Promise<IDiscordMessageResponse> => {
const message: IDiscordMessageResponse = {
content: ``,
options: {
embeds: [this._getMessageEmbed(anyDiscordMessage, commands)],
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ describe(`DiscordMessageCommandFeatureWrongFeatureNameErrorService`, (): void =>

const result = await service.getMessageResponse(anyDiscordMessage, commands, featureName);

expect(result.content).toBe(``);
expect(result.content).toBeUndefined();
});
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ export class DiscordMessageCommandFeatureWrongFeatureNameErrorService extends Di
.getCliErrorMessageResponse()
.then((cliErrorMessageResponse: Readonly<IDiscordMessageResponse>): Promise<IDiscordMessageResponse> => {
const message: IDiscordMessageResponse = {
content: ``,
options: {
embeds: [this._getMessageEmbed(anyDiscordMessage, commands, featureName)],
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ describe(`DiscordMessageCommandFeatureDuplicatedFlagsErrorService`, (): void =>

const result = await service.getMessageResponse(flagsDuplicated);

expect(result.content).toBe(``);
expect(result.content).toBeUndefined();
});
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ export class DiscordMessageCommandFeatureDuplicatedFlagsErrorService extends Dis
.getCliErrorMessageResponse()
.then((cliErrorMessageResponse: Readonly<IDiscordMessageResponse>): Promise<IDiscordMessageResponse> => {
const message: IDiscordMessageResponse = {
content: ``,
options: {
embeds: [this._getMessageEmbed(flagsDuplicated)],
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ describe(`DiscordMessageCommandFeatureEmptyFlagsErrorService`, (): void => {

const result = await service.getMessageResponse(anyDiscordMessage, commands, featureName);

expect(result.content).toBe(``);
expect(result.content).toBeUndefined();
});
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ export class DiscordMessageCommandFeatureEmptyFlagsErrorService extends DiscordM
.getCliErrorMessageResponse()
.then((cliErrorMessageResponse: Readonly<IDiscordMessageResponse>): Promise<IDiscordMessageResponse> => {
const message: IDiscordMessageResponse = {
content: ``,
options: {
embeds: [this._getMessageEmbed(anyDiscordMessage, commands, featureName)],
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ describe(`DiscordMessageCommandFeatureOppositeFlagsErrorService`, (): void => {

const result = await service.getMessageResponse(oppositeFlags);

expect(result.content).toBe(``);
expect(result.content).toBeUndefined();
});
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ export class DiscordMessageCommandFeatureOppositeFlagsErrorService extends Disco
.getCliErrorMessageResponse()
.then((cliErrorMessageResponse: Readonly<IDiscordMessageResponse>): Promise<IDiscordMessageResponse> => {
const message: IDiscordMessageResponse = {
content: ``,
options: {
embeds: [this._getMessageEmbed(oppositeFlags)],
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ describe(`DiscordMessageCommandFeatureWrongFlagsErrorService`, (): void => {

const result = await service.getMessageResponse(flagsErrors);

expect(result.content).toBe(``);
expect(result.content).toBeUndefined();
});
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ export class DiscordMessageCommandFeatureWrongFlagsErrorService extends DiscordM
.getCliErrorMessageResponse()
.then((cliErrorMessageResponse: Readonly<IDiscordMessageResponse>): Promise<IDiscordMessageResponse> => {
const message: IDiscordMessageResponse = {
content: ``,
options: {
embeds: [this._getMessageEmbed(flagsErrors)],
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ describe(`DiscordMessageCommandHelpService`, (): void => {

const result = await service.getMessageResponse();

expect(result.content).toBe(``);
expect(result.content).toBeUndefined();
});
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ export class DiscordMessageCommandHelpService extends AbstractService {
.getMessageResponse()
.then((helpDiscordMessageResponse: Readonly<IDiscordMessageResponse>): Promise<IDiscordMessageResponse> => {
const message: IDiscordMessageResponse = {
content: ``,
options: {
embeds: [this._getMessageEmbed()],
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ describe(`DiscordMessageCommandLunchService`, (): void => {

const result = await service.getMessageResponse();

expect(result.content).toBe(``);
expect(result.content).toBeUndefined();
});
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ export class DiscordMessageCommandLunchService extends AbstractService {

public getMessageResponse(): Promise<IDiscordMessageResponse> {
const message: IDiscordMessageResponse = {
content: ``,
options: {
embeds: [this._getMessageEmbed()],
},
Expand Down
Loading

0 comments on commit 97fe68f

Please sign in to comment.