mattburchett/NadekoBot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/Kwoth/master'

Browse Source
This commit is contained in:
ZR2 2016-01-25 08:01:55 +10:30
commit 75146241d9
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NadekoBot/Commands/ServerGreetCommand.cs
View File

@ -197,6 +197,8 @@ namespace NadekoBot.Commands {
AnnouncementsDictionary[e.Server.Id].GreetText = e.GetArg("msg"); AnnouncementsDictionary[e.Server.Id].GreetText = e.GetArg("msg");
await e.Send("New greet message set."); await e.Send("New greet message set.");
if (!AnnouncementsDictionary[e.Server.Id].Greet)
await e.Send("Enable greet messsages by typing `.greet`");
}); });
cgb.CreateCommand(".bye") cgb.CreateCommand(".bye")
@ -225,6 +227,8 @@ namespace NadekoBot.Commands {
AnnouncementsDictionary[e.Server.Id].ByeText = e.GetArg("msg"); AnnouncementsDictionary[e.Server.Id].ByeText = e.GetArg("msg");
await e.Send("New bye message set."); await e.Send("New bye message set.");
if (!AnnouncementsDictionary[e.Server.Id].Bye)
await e.Send("Enable bye messsages by typing `.bye`");
}); });
} }
} }

16
NadekoBot/Modules/Administration.cs
View File

@ -313,16 +313,14 @@ namespace NadekoBot.Modules
await client.CurrentUser.Edit(NadekoBot.password, e.GetArg("new_name")); await client.CurrentUser.Edit(NadekoBot.password, e.GetArg("new_name"));
}); });
cgb.CreateCommand(".setgame") cgb.CreateCommand(".setgame")
.Description("Sets the bots game.") .Description("Sets the bots game.")
.Parameter("set_game", ParameterType.Required) .Parameter("set_game", ParameterType.Unparsed)
.Do( e => { .Do(e => {
if (e.User.Id != NadekoBot.OwnerID || e.GetArg("set_game") == null) return; if (e.User.Id != NadekoBot.OwnerID || e.GetArg("set_game") == null) return;
client.SetGame(e.GetArg("set_game"));
});
client.SetGame(e.GetArg("set_game"));
});
cgb.CreateCommand(".checkmyperms") cgb.CreateCommand(".checkmyperms")
.Description("Checks your userspecific permissions on this channel.") .Description("Checks your userspecific permissions on this channel.")