Merge branch 'main' into feat-flagtr

README.md

@@ -186,5 +186,44 @@ Command | Description
 `reminviterank <role-name>` | remove invite rank configured with that role
 `invitetracking <ON\|OFF>` | remove invite rank configured with that role
 
+### 📨 Greeting Commands
+
+Replace `cmd` with `welcome` for setting up welcome message and `farewell` for setting up farewell message<br>
+
+Command | Description
+------------ | -------------
+`cmd [#channel\|off]` | enable or disable greeting message
+`cmd preview` | preview the configured greeting message
+`cmd desc <text>` | set embed description
+`cmd thumbnail <ON\|OFF>` | enable/disable embed thumbnail
+`cmd color <hexcolor>` | set embed color
+`cmd footer <text>` | set embed footer content
+
+Replacements
+```
+\n : New Line
+{server} : Server Name
+{count} : Server member count
+{member:name} : Member Name
+{member:tag} : Member Tag
+{inviter:name} : Inviter Name
+{inviter:tag} : Inviter Tag
+{invites} : Inviter Invites
+``` 
+
+### Admin Commands
+
+Command | Description
+------------ | -------------
+`setprefix <new-prefix>` | sets a new prefix for this server
+`xpsystem <ON\|OFF>` | enable or disable XP ranking system in the server
+`counter <type> <name>` | setup counter channel in the guild. Counter types: `all/members/bots`
+`addrr <#channel> <messageid> <emote> <role>` | setup reaction role for the specified message
+`removerr <#channel> <messageid>` | remove configured reaction for the specified message
+
+
+## Credits
+Dashboard: [Atlanta](https://github.com/Androz2091/AtlantaBot)
+
 ## 🤝 Contributing
 Feel free to [Fork](https://github.com/saiteja-madha/discord-js-bot/fork) this repository, create a feature branch and submit a pull request

package.json

@@ -1,6 +1,6 @@
 {
   "name": "discord-js-bot",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "A multipurpose discord bot built using discord-js",
   "main": "bot.js",
   "author": "Sai Teja M",

src/features/automod.js

@@ -29,8 +29,9 @@ function run(client) {
   });
 
   client.on("messageDelete", async (message) => {
-    const { channelId, id, guild } = message;
-    if (!guild) return;
+    if (message.partial) message = await message.fetch().catch((err) => {});
+    if (message.partial || message.author.bot || message.channel.type === "DM") return;
+    if (!message.guild) return;
 
     const settings = (await getSettings(message.guild)).automod;
     if (!settings.anti_ghostping || !settings.log_channel) return;

src/features/reaction-roles.js

@@ -7,17 +7,21 @@ const { loadReactionRoles, getReactionRole } = require("@schemas/reactionrole-sc
 async function run(client) {
   await loadReactionRoles();
 
-  client.on("messageReactionAdd", async (reaction) => {
+  client.on("messageReactionAdd", async (reaction, user) => {
     const data = await fetchRoleData(reaction);
     if (data) {
-      await reaction.message.member.roles.add(reaction.message.guild.roles.cache.get(data.role_id));
+      let member = await reaction.message.guild.members.fetch(user.id);
+      if (!member) return;
+      await member.roles.add(reaction.message.guild.roles.cache.get(data.role_id));
     }
   });
 
-  client.on("messageReactionRemove", async (reaction) => {
+  client.on("messageReactionRemove", async (reaction, user) => {
     const data = await fetchRoleData(reaction);
     if (data) {
-      await reaction.message.member.roles.remove(reaction.message.guild.roles.cache.get(data.role_id));
+      let member = await reaction.message.guild.members.fetch(user.id);
+      if (!member) return;
+      await member.roles.remove(reaction.message.guild.roles.cache.get(data.role_id));
     }
   });
 }