diff --git a/src/data/DefaultLogMessages.json b/src/data/DefaultLogMessages.json index 9f558a1b..3b655325 100644 --- a/src/data/DefaultLogMessages.json +++ b/src/data/DefaultLogMessages.json @@ -1,47 +1,48 @@ { - "MEMBER_WARN": "⚠️ **{member.user.username}#{member.user.discriminator}** (`{member.id}`) was warned by {mod.username}#{mod.discriminator}", - "MEMBER_MUTE": "🔇 **{member.user.username}#{member.user.discriminator}** (`{member.id}`) was muted indefinitely by {mod.username}#{mod.discriminator}", - "MEMBER_TIMED_MUTE": "🔇 **{member.user.username}#{member.user.discriminator}** (`{member.id}`) was muted for **{time}** by {mod.username}#{mod.discriminator}", - "MEMBER_UNMUTE": "🔊 **{member.user.username}#{member.user.discriminator}** (`{member.id}`) was unmuted by {mod.username}#{mod.discriminator}", - "MEMBER_TIMED_UNMUTE": "🔊 **{member.user.username}#{member.user.discriminator}** (`{member.id}`) was scheduled to be unmuted in **{time}** by {mod.username}#{mod.discriminator}", - "MEMBER_MUTE_EXPIRED": "🔊 **{member.user.username}#{member.user.discriminator}**'s mute expired", + "MEMBER_WARN": "⚠️ <@!{member.id}> (**{member.user.username}#{member.user.discriminator}**, `{member.id}`) was warned by {mod.username}#{mod.discriminator}", + "MEMBER_MUTE": "🔇 <@!{member.id}> (**{member.user.username}#{member.user.discriminator}**, `{member.id}`) was muted indefinitely by {mod.username}#{mod.discriminator}", + "MEMBER_TIMED_MUTE": "🔇 <@!{member.id}> (**{member.user.username}#{member.user.discriminator}**, `{member.id}`) was muted for **{time}** by {mod.username}#{mod.discriminator}", + "MEMBER_UNMUTE": "🔊 <@!{member.id}> (**{member.user.username}#{member.user.discriminator}**, `{member.id}`) was unmuted by {mod.username}#{mod.discriminator}", + "MEMBER_TIMED_UNMUTE": "🔊 <@!{member.id}> (**{member.user.username}#{member.user.discriminator}**, `{member.id}`) was scheduled to be unmuted in **{time}** by {mod.username}#{mod.discriminator}", + "MEMBER_MUTE_EXPIRED": "🔊 <@!{member.id}> (**{member.user.username}#{member.user.discriminator}**, `{member.id}`)'s mute expired", "MEMBER_KICK": "👢 **{user.username}#{user.discriminator}** (`{user.id}`) was kicked by {mod.username}#{mod.discriminator}", "MEMBER_BAN": "🔨 **{user.username}#{user.discriminator}** (`{user.id}`) was banned by {mod.username}#{mod.discriminator}", "MEMBER_UNBAN": "🔓 User (`{userId}`) was unbanned by {mod.username}#{mod.discriminator}", "MEMBER_FORCEBAN": "🔨 User (`{userId}`) was forcebanned by {mod.username}#{mod.discriminator}", - "MEMBER_SOFTBAN": "🔨 **{member.user.username}#{member.user.discriminator}** (`{member.id}`) was softbanned by {mod.username}#{mod.discriminator}", + "MEMBER_SOFTBAN": "🔨 <@!{member.id}> (**{member.user.username}#{member.user.discriminator}**, `{member.id}`) was softbanned by {mod.username}#{mod.discriminator}", "MEMBER_JOIN": "📥 **{member.user.username}#{member.user.discriminator}** (`{member.id}`, <@!{member.id}>) joined{new} (created {account_age} ago)", - "MEMBER_LEAVE": "📤 **{member.user.username}#{member.user.discriminator}** (`{member.id}`) left the server", - "MEMBER_ROLE_ADD": "🔑 **{member.user.username}#{member.user.discriminator}** (`{member.id}`): role(s) **{roles}** added by {mod.username}#{mod.discriminator}", - "MEMBER_ROLE_REMOVE": "🔑 **{member.user.username}#{member.user.discriminator}** (`{member.id}`): role(s) **{roles}** removed by {mod.username}#{mod.discriminator}", - "MEMBER_ROLE_CHANGES": "🔑 **{member.user.username}#{member.user.discriminator}** (`{member.id}`): roles changed: added **{addedRoles}**, removed **{removedRoles}** by {mod.username}#{mod.discriminator}", - "MEMBER_NICK_CHANGE": "✏ **{member.user.username}#{member.user.discriminator}** (`{member.id}`): nickname changed from **{oldNick}** to **{newNick}**", - "MEMBER_USERNAME_CHANGE": "✏ **{member.user.username}#{member.user.discriminator}** (`{member.id}`): username changed from **{oldName}** to **{newName}**", - "MEMBER_RESTORE": "💿 **{member.user.username}#{member.user.discriminator}** (`{member.id}`) was restored", + "MEMBER_LEAVE": "📤 <@!{member.id}> (**{member.user.username}#{member.user.discriminator}**, `{member.id}`) left the server", + "MEMBER_ROLE_ADD": "🔑 <@!{member.id}> (**{member.user.username}#{member.user.discriminator}**, `{member.id}`): role(s) **{roles}** added by {mod.username}#{mod.discriminator}", + "MEMBER_ROLE_REMOVE": "🔑 <@!{member.id}> (**{member.user.username}#{member.user.discriminator}**, `{member.id}`): role(s) **{roles}** removed by {mod.username}#{mod.discriminator}", + "MEMBER_ROLE_CHANGES": "🔑 <@!{member.id}> (**{member.user.username}#{member.user.discriminator}**, `{member.id}`): roles changed: added **{addedRoles}**, removed **{removedRoles}** by {mod.username}#{mod.discriminator}", + "MEMBER_NICK_CHANGE": "✏ <@!{member.id}> (**{member.user.username}#{member.user.discriminator}**, `{member.id}`): nickname changed from **{oldNick}** to **{newNick}**", + "MEMBER_USERNAME_CHANGE": "✏ <@!{member.id}> (**{member.user.username}#{member.user.discriminator}**, `{member.id}`): username changed from **{oldName}** to **{newName}**", + "MEMBER_RESTORE": "💿 <@!{member.id}> (**{member.user.username}#{member.user.discriminator}**, `{member.id}`) was restored", - "CHANNEL_CREATE": "🖊 Channel **#{channel.name}** was created", - "CHANNEL_DELETE": "🗑 Channel **#{channel.name}** was deleted", - "CHANNEL_EDIT": "✏ Channel **#{channel.name}** was edited", + "CHANNEL_CREATE": "🖊 Channel <#{channel.id}> (**#{channel.name}**, `{channel.id}`) was created", + "CHANNEL_DELETE": "🗑 Channel <#{channel.id}> (**#{channel.name}**, `{channel.id}`) was deleted", + "CHANNEL_EDIT": "✏ Channel <#{channel.id}> (**#{channel.name}**, `{channel.id}`) was edited", - "ROLE_CREATE": "🖊 Role **{role.name}** was created", - "ROLE_DELETE": "🖊 Role **{role.name}** was deleted", - "ROLE_EDIT": "🖊 Role **{role.name}** was edited", + "ROLE_CREATE": "🖊 Role **{role.name}** (`{role.id}`) was created", + "ROLE_DELETE": "🖊 Role **{role.name}** (`{role.id}`) was deleted", + "ROLE_EDIT": "🖊 Role **{role.name}** (`{role.id}`) was edited", - "MESSAGE_EDIT": "✏ **{member.user.username}#{member.user.discriminator}** (`{member.id}`) edited their message in **#{channel.name}**:\nBefore:```{before}```After:```{after}```", - "MESSAGE_DELETE": "🗑 Message from **{member.user.username}#{member.user.discriminator}** (`{member.id}`) deleted in **#{channel.name}** (originally posted at **{messageDate}**):\n```{messageText}```{attachments}", - "MESSAGE_DELETE_BULK": "🗑 **{count}** messages deleted in **#{channel.name}** ({archiveUrl})", - "MESSAGE_DELETE_BARE": "🗑 Message (`{messageId}`) deleted in **#{channel.name}** (no more info available)", + "MESSAGE_EDIT": "✏ <@!{member.id}> (**{member.user.username}#{member.user.discriminator}**, `{member.id}`) edited their message in <#{channel.id}> (**#{channel.name}**, `{channel.id}`):\nBefore:```{before}```After:```{after}```", + "MESSAGE_DELETE": "🗑 Message from **{member.user.username}#{member.user.discriminator}** (`{member.id}`) deleted in <#{channel.id}> (**#{channel.name}**, `{channel.id}`) (originally posted at **{messageDate}**):\n```{messageText}```{attachments}", + "MESSAGE_DELETE_BULK": "🗑 **{count}** messages deleted in <#{channel.id}> (**#{channel.name}**, `{channel.id}`) ({archiveUrl})", + "MESSAGE_DELETE_BARE": "🗑 Message (`{messageId}`) deleted in <#{channel.id}> (**#{channel.name}**, `{channel.id}`) (no more info available)", - "VOICE_CHANNEL_JOIN": "🎙 🔵 **{member.user.username}#{member.user.discriminator}** (`{member.id}`) joined **{channel.name}**", - "VOICE_CHANNEL_MOVE": "🎙 ↔ **{member.user.username}#{member.user.discriminator}** (`{member.id}`) moved from **{oldChannel.name}** to **{newChannel.name}**", - "VOICE_CHANNEL_LEAVE": "🎙 🔴 **{member.user.username}#{member.user.discriminator}** (`{member.id}`) left **{channel.name}**", + "VOICE_CHANNEL_JOIN": "🎙 🔵 <@!{member.id}> (**{member.user.username}#{member.user.discriminator}**, `{member.id}`) (`{member.id}`) joined **{channel.name}**", + "VOICE_CHANNEL_MOVE": "🎙 ↔ <@!{member.id}> (**{member.user.username}#{member.user.discriminator}**, `{member.id}`) (`{member.id}`) moved from **{oldChannel.name}** to **{newChannel.name}**", + "VOICE_CHANNEL_LEAVE": "🎙 🔴 <@!{member.id}> (**{member.user.username}#{member.user.discriminator}**, `{member.id}`) (`{member.id}`) left **{channel.name}**", + "VOICE_CHANNEL_FORCE_MOVE": "\uD83C\uDF99 ✍ <@!{member.id}> (**{member.user.username}#{member.user.discriminator}**, `{member.id}`) was moved from **{oldChannel.name}** to **{newChannel.name}** by {mod.username}#{mod.discriminator}", - "COMMAND": "🤖 **{member.user.username}#{member.user.discriminator}** (`{member.id}`) used command in **#{channel.name}**:\n`{command}`", + "COMMAND": "🤖 **{member.user.username}#{member.user.discriminator}** (`{member.id}`) used command in <#{channel.id}> (**#{channel.name}**, `{channel.id}`):\n`{command}`", - "MESSAGE_SPAM_DETECTED": "🛑 **{member.user.username}#{member.user.discriminator}** (`{member.id}`) spam detected in **#{channel.name}**: {description} (more than {limit} in {interval}s)\n{archiveUrl}", - "OTHER_SPAM_DETECTED": "🛑 **{member.user.username}#{member.user.discriminator}** (`{member.id}`) spam detected: {description} (more than {limit} in {interval}s)", - "CENSOR": "🛑 **{member.user.username}#{member.user.discriminator}** (`{member.id}`) censored message in **#{channel.name}** (`{channel.id}`) {reason}:\n```{messageText}```", - "CLEAN": "🚿 **{mod.username}#{mod.discriminator}** (`{mod.id}`) cleaned **{count}** message(s) in **#{channel.name}**\n{archiveUrl}", + "MESSAGE_SPAM_DETECTED": "🛑 <@!{member.id}> (**{member.user.username}#{member.user.discriminator}**, `{member.id}`) spam detected in <#{channel.id}> (**#{channel.name}**, `{channel.id}`): {description} (more than {limit} in {interval}s)\n{archiveUrl}", + "OTHER_SPAM_DETECTED": "🛑 <@!{member.id}> (**{member.user.username}#{member.user.discriminator}**, `{member.id}`) spam detected: {description} (more than {limit} in {interval}s)", + "CENSOR": "🛑 <@!{member.id}> (**{member.user.username}#{member.user.discriminator}**, `{member.id}`) censored message in <#{channel.id}> (**#{channel.name}**, `{channel.id}`): {reason}:\n```{messageText}```", + "CLEAN": "🚿 **{mod.username}#{mod.discriminator}** (`{mod.id}`) cleaned **{count}** message(s) in <#{channel.id}> (**#{channel.name}**, `{channel.id}`)\n{archiveUrl}", "CASE_CREATE": "✏ **{mod.username}#{mod.discriminator}** (`{mod.id}`) manually created new **{caseType}** case (#{caseNum})", diff --git a/src/data/LogType.ts b/src/data/LogType.ts index a4e3b8db..9956b36f 100644 --- a/src/data/LogType.ts +++ b/src/data/LogType.ts @@ -48,4 +48,5 @@ export enum LogType { OTHER_SPAM_DETECTED, MEMBER_ROLE_CHANGES, + VOICE_CHANNEL_FORCE_MOVE, } diff --git a/src/plugins/Utility.ts b/src/plugins/Utility.ts index de533027..159683dd 100644 --- a/src/plugins/Utility.ts +++ b/src/plugins/Utility.ts @@ -685,6 +685,13 @@ export class UtilityPlugin extends ZeppelinPlugin