From 9141596ec92708f314ba891a7a9531f9bf00f80f Mon Sep 17 00:00:00 2001
From: Daniel Odendahl Jr <danielbodendahl@gmail.com>
Date: Mon, 22 May 2017 02:53:41 +0000
Subject: [PATCH] Join Role

---
 assets/json/clearsetting.json    |  3 ++-
 commands/settings/joinrole.js    | 30 ++++++++++++++++++++++++++++++
 commands/settings/settinglist.js |  2 ++
 index.js                         |  2 ++
 package.json                     |  2 +-
 5 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 commands/settings/joinrole.js

diff --git a/assets/json/clearsetting.json b/assets/json/clearsetting.json
index dd08208b..b1b25b2d 100644
--- a/assets/json/clearsetting.json
+++ b/assets/json/clearsetting.json
@@ -5,5 +5,6 @@
     "joinMsg",
     "leaveMsg",
     "staffRole",
-    "singleRole"
+    "singleRole",
+    "joinRole"
 ]
diff --git a/commands/settings/joinrole.js b/commands/settings/joinrole.js
new file mode 100644
index 00000000..2f9cc877
--- /dev/null
+++ b/commands/settings/joinrole.js
@@ -0,0 +1,30 @@
+const { Command } = require('discord.js-commando');
+
+module.exports = class JoinRoleCommand extends Command {
+    constructor(client) {
+        super(client, {
+            name: 'join-role',
+            group: 'settings',
+            memberName: 'join-role',
+            description: 'Sets a role that new members are automatically joined to.',
+            guildOnly: true,
+            args: [
+                {
+                    key: 'role',
+                    prompt: 'What role should new members be joined to?',
+                    type: 'role'
+                }
+            ]
+        });
+    }
+    
+    hasPermission(msg) {
+        return msg.member.hasPermission('ADMINISTRATOR');
+    }
+
+    run(msg, args) {
+        const { role } = args;
+        msg.guild.settings.set('joinRole', role.id);
+        return msg.say(`Join Role set to ${role.name}.`);
+    }
+};
diff --git a/commands/settings/settinglist.js b/commands/settings/settinglist.js
index 458236a1..708401ec 100644
--- a/commands/settings/settinglist.js
+++ b/commands/settings/settinglist.js
@@ -17,11 +17,13 @@ module.exports = class SettingListCommand extends Command {
         const modLog = msg.guild.settings.get('modLog', false);
         const memberLog = msg.guild.settings.get('memberLog', false);
         const singleRole = msg.guild.settings.get('singleRole', false);
+        const joinRole = msg.guild.settings.get('joinRole', false);
         return msg.say(stripIndents`
             **Prefix:** ${msg.guild.commandPrefix}
             **Invite Guard:** ${msg.guild.settings.get('inviteGuard', false)}
             **Staff Role:** ${staffRole ? (msg.guild.roles.has(staffRole) ? msg.guild.roles.get(staffRole).name : 'Missing') : 'None'}
             **Mod Channel:** ${modLog ? (msg.guild.channels.has(modLog) ? msg.guild.channels.get(modLog).name : 'Missing') : 'None'}
+            **Join Role:** ${joinRole ? (msg.guild.roles.has(joinRole) ? msg.guild.roles.get(joinRole).name : 'Missing') : 'None'}
             **Member Channel:** ${memberLog ? (msg.guild.channels.has(memberLog) ? msg.guild.channels.get(memberLog).name : 'Missing') : 'None'}
             **Join Message:** ${msg.guild.settings.get('joinMsg', 'Welcome <user>! (Default)')}
             **Leave Message:** ${msg.guild.settings.get('leaveMsg', 'Bye <user>... (Default)')}
diff --git a/index.js b/index.js
index 411384e1..30b86ef9 100644
--- a/index.js
+++ b/index.js
@@ -107,6 +107,8 @@ client.dispatcher.addInhibitor(msg => {
 });
 
 client.on('guildMemberAdd', (member) => {
+    const role = member.guild.roles.get(member.guild.settings.get('joinRole'));
+    if (member.guild.me.hasPermission('MANAGE_ROLES') && role) member.addRole(role);
     const channel = member.guild.channels.get(member.guild.settings.get('memberLog'));
     if (!channel) return;
     if (!channel.permissionsFor(client.user).has('SEND_MESSAGES')) return;
diff --git a/package.json b/package.json
index b69252c4..d2bd3f5a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "xiaobot",
-  "version": "19.11.2",
+  "version": "19.12.0",
   "description": "A Discord Bot",
   "main": "shardingmanager.js",
   "scripts": {