Merge branch 'raphazappa-custom-discord-prefix'

docs/commands.md

@@ -43,6 +43,10 @@ When enabled (enabled by default), the files received from Discord will be uploa
 When disabled (enabled by default), the files received from Discord will be sent as links to WhatsApp.
 - Format: `disableWAUpload`
 
+## setDCPrefix
+When set (your username by default), the prefix will be added to messages sent to WhatsApp from Discord.
+- Format: `setDCPrefix`
+
 ## enableDCPrefix
 When enabled (disabled by default), your Discord username will be added to messages sent to WhatsApp from Discord.
 - Format: `enableDCPrefix`

src/discordHandler.js

@@ -197,6 +197,16 @@ const commands = {
         : 'Whitelist is empty/inactive.',
     );
   },
+  async setdcprefix(message, params) {
+    if (params.length !== 0) {
+      const prefix = message.content.split(' ').slice(1).join(' ');
+      state.settings.DiscordPrefixText = prefix;
+      await controlChannel.send(`Discord prefix is set to ${prefix}!`);
+    } else {
+      state.settings.DiscordPrefixText = null;
+      await controlChannel.send('Discord prefix is set to your discord username!');
+    }
+  },
   async enabledcprefix() {
     state.settings.DiscordPrefix = true;
     await controlChannel.send('Discord username prefix enabled!');
@@ -324,7 +334,7 @@ client.on('messageUpdate', async (_, message) => {
     await message.channel.send("Couldn't edit the message. You can only edit the last 500 messages.");
     return;
   }
-  
+
   state.waClient.ev.emit('discordEdit', { jid, message });
 })
 
@@ -341,7 +351,7 @@ client.on('messageReactionAdd', async (reaction, user) => {
   if (user.id === state.dcClient.user.id) {
     return;
   }
-  
+
   state.waClient.ev.emit('discordReaction', { jid, reaction, removed: false });
 });
 
@@ -358,7 +368,7 @@ client.on('messageReactionRemove', async (reaction, user) => {
   if (user.id === state.dcClient.user.id) {
     return;
   }
-  
+
   state.waClient.ev.emit('discordReaction', { jid, reaction, removed: true });
 });
 

src/index.js

@@ -7,7 +7,7 @@ const storage = require('./storage.js');
 const whatsappHandler =  require('./whatsappHandler.js');
 
 (async () => {
-  const version = 'v0.10.20';
+  const version = 'v0.10.21';
   state.logger = pino({ mixin() { return { version }; } }, pino.destination('logs.txt'));
   let autoSaver = setInterval(() => storage.save(), 5 * 60 * 1000);
   ['SIGINT', 'uncaughtException', 'SIGTERM'].forEach((eventName) => process.on(eventName, async (err) => {

src/state.js

@@ -1,6 +1,7 @@
 module.exports = {
   settings: {
     Whitelist: [],
+    DiscordPrefixText: null,
     DiscordPrefix: false,
     WAGroupPrefix: false,
     UploadAttachments: true,

src/whatsappHandler.js

@@ -154,7 +154,7 @@ const connectToWhatsApp = async (retry = 1) => {
         }
 
         if (state.settings.DiscordPrefix) {
-            content.text = `[${message.member?.nickname || message.author.username}] ${content.text}`;
+            content.text = `[${state.settings.DiscordPrefixText || message.member?.nickname || message.author.username}] ${content.text}`;
         }
 
         if (message.reference) {