Skip to content

Commit 5c03090

Browse files
committed
Fix empty brackets if roleName is an empty string
1 parent 81bd070 commit 5c03090

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

embedMessages.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -172,12 +172,12 @@ module.exports = async function ({ config, bot, formats }) {
172172

173173
const replyToUserFormatter = function (threadMessage) {
174174
const userId = threadMessage.user_id;
175-
const roleName = threadMessage.role_name || config.fallbackRoleName;
175+
const roleName = threadMessage.role_name || config.fallbackRoleName || "";
176176
const embed = { description: threadMessage.body, color: settings.get(SETTING_NAMES.STAFF_REPLY_DM_COLOR) };
177177

178178
if (!threadMessage.is_anonymous) {
179179
embed.author = {
180-
name: `${threadMessage.user_name} (${roleName})`,
180+
name: `${threadMessage.user_name} ${roleName != "" ? `(${roleName})` : ""}`.trim(),
181181
icon_url: getPfp(userId),
182182
};
183183
} else {
@@ -214,7 +214,7 @@ module.exports = async function ({ config, bot, formats }) {
214214

215215
const replyInThreadFormatter = function (threadMessage) {
216216
const userId = threadMessage.user_id;
217-
const roleName = threadMessage.role_name || config.fallbackRoleName;
217+
const roleName = threadMessage.role_name || config.fallbackRoleName || "";
218218
const embed = {
219219
description: threadMessage.body,
220220
color: settings.get(SETTING_NAMES.STAFF_REPLY_THREAD_COLOR),
@@ -223,12 +223,12 @@ module.exports = async function ({ config, bot, formats }) {
223223

224224
if (!threadMessage.is_anonymous) {
225225
embed.author = {
226-
name: `${threadMessage.user_name} (${roleName})`,
226+
name: `${threadMessage.user_name} ${roleName != "" ? `(${roleName})` : ""}`.trim(),
227227
icon_url: getPfp(userId),
228228
};
229229
} else {
230230
embed.author = {
231-
name: `${roleName} (${threadMessage.user_name}) `,
231+
name: `${roleName} (${threadMessage.user_name})`.trim(),
232232
icon_url: bot.user.avatarURL,
233233
};
234234
}

0 commit comments

Comments
 (0)