Skip to content

!welcome by Hess #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
BHess2653 wants to merge 10 commits into from
Closed

!welcome by Hess #145

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
dc28031
First commit for welcome command
May 6, 2018
6b389fd
added new command and welcome action
May 6, 2018
ec9493c
changed welcome message and added welcome message when users join
May 6, 2018
f22e29f
updated guildMemberAdd in client.js. new users now recieve a dm welco…
May 7, 2018
5e7facd
fixed eslint error on welcome.js
May 7, 2018
d4a3b52
made changes for pull request. changed !welcome to !tos and added com…
May 8, 2018
ae2c578
review changes
May 9, 2018
11fd991
added welcomeMsg to botUtils name might change
May 9, 2018
ce06c13
removed consts changed with welcomeMsg()
May 9, 2018
ee7535d
added newMemeber announcement to botUtils messages and changes welcom…
May 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
removed consts changed with welcomeMsg()
  • Loading branch information
BHess2653 authored and BHess2653 committed May 9, 2018
commit ce06c13bfcd2c00b391503bc34b9e601086f0d92
4 changes: 1 addition & 3 deletions bot/client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,10 @@ client.on('message', (message) => {
client.on('guildMemberAdd', (member) => {
// Channel to send messages at
const channel = member.guild.channels.find('name', 'general');
// Direct message to member
const dmMsg = welcomeMsg(member.user.id);
// Channel Announcement Message
const chanMsg = `Welcome to the Full Sail Armada ${member}!`;
// Send welcome message to members who join
member.send(dmMsg);
member.send(welcomeMsg(member.user.id));
util.log('Direct message sent to new member', 0);
// Check for channel
if (channel) {
Expand Down
4 changes: 2 additions & 2 deletions bot/controllers/welcome.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
const BaseController = require('../baseController.js');
const Command = require('../baseCommand.js');
const { welcomeMsg } = require('../botUtils.js');

Copy link
Contributor

@brennondenny brennondenny May 7, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add in the default comments found across the controllers to your welcome.js file.

class WelcomeController extends BaseController {
constructor(message) {
Expand All @@ -25,8 +26,7 @@ class WelcomeController extends BaseController {
// Send direct message to user
welcomeAction() {
const { message } = this;
const directMsg = `<@${message.author.id}>, Welcome to the Full Sail Armada! These are the terms of service...`;
return directMsg;
return welcomeMsg(message.author.id);
}
}
module.exports = WelcomeController;