diff --git a/docs/configuration.md b/docs/configuration.md index a5b3a493e..77cf0cfb2 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -399,7 +399,7 @@ The bot's status text. Set to `none` to disable. #### statusType **Default:** `playing` -The bot's status type. One of `playing`, `watching`, `listening`, `streaming`. +The bot's status type. One of `playing`, `watching`, `listening`, `streaming`, `custom`, `competing`. #### statusUrl **Default:** [nothing] diff --git a/src/data/cfg.jsdoc.js b/src/data/cfg.jsdoc.js index 1e673baa3..2b0682e3b 100644 --- a/src/data/cfg.jsdoc.js +++ b/src/data/cfg.jsdoc.js @@ -10,7 +10,7 @@ * @property {string} [snippetPrefix="!!"] * @property {string} [snippetPrefixAnon="!!!"] * @property {string} [status="Message me for help!"] - * @property {"playing"|"watching"|"listening"|"streaming"} [statusType="playing"] + * @property {"playing"|"watching"|"listening"|"streaming"|"custom"|"competing"} [statusType="playing"] * @property {string} [statusUrl=""] * @property {string} [responseMessage="Thank you for your message! Our mod team will reply to you here as soon as possible."] * @property {string} [closeMessage] @@ -78,7 +78,7 @@ * @property {boolean} [errorOnUnknownInlineSnippet=true] * @property {boolean} [allowChangingDisplayRole=true] * @property {string} [fallbackRoleName=null] - * @property {string} [overrideRoleNameDisplay] Overrides the role displayed on replies + * @property {string} [overrideRoleNameDisplay=null] * @property {boolean} [breakFormattingForNames=true] * @property {boolean} [autoAlert=false] * @property {string} [autoAlertDelay="2m"] Delay before auto-alert kicks in. Uses the same format as timed close; for example 1m30s for 1 minute and 30 seconds. diff --git a/src/data/cfg.schema.json b/src/data/cfg.schema.json index 76ae31ff8..a88f7533c 100644 --- a/src/data/cfg.schema.json +++ b/src/data/cfg.schema.json @@ -83,7 +83,7 @@ }, "statusType": { "type": "string", - "enum": ["playing", "watching", "listening", "streaming"], + "enum": ["playing", "watching", "listening", "streaming", "custom", "competing"], "default": "playing" }, "statusUrl": { diff --git a/src/main.js b/src/main.js index bce3385bc..1d7d5ff34 100644 --- a/src/main.js +++ b/src/main.js @@ -107,10 +107,14 @@ function initStatus() { "watching": Eris.Constants.ActivityTypes.WATCHING, "listening": Eris.Constants.ActivityTypes.LISTENING, "streaming": Eris.Constants.ActivityTypes.STREAMING, + "custom": Eris.Constants.ActivityTypes.CUSTOM, + "competing": Eris.Constants.ActivityTypes.COMPETING, }[config.statusType] || Eris.Constants.ActivityTypes.GAME; if (type === Eris.Constants.ActivityTypes.STREAMING) { bot.editStatus(null, { name: config.status, type, url: config.statusUrl }); + } else if (type === Eris.Constants.ActivityTypes.CUSTOM) { + bot.editStatus(null, { name: "custom", type, state: config.status }); } else { bot.editStatus(null, { name: config.status, type }); }