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

small changes and fixes

Browse Source
This commit is contained in:
Master Kwoth 2016-02-27 02:18:49 +01:00
parent d8fa1327ed
commit 6e01fb29cd
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NadekoBot/Classes/Trivia/TriviaGame.cs
View File

@ -76,7 +76,7 @@ namespace NadekoBot.Classes.Trivia {
// load next question if game is still running
await Task.Delay(2000);
}
End().Wait();
await End();
}
private async Task End() {

2
NadekoBot/Commands/TriviaCommand.cs
View File

@ -41,7 +41,7 @@ namespace NadekoBot.Commands {
.Alias("-tq")
.Do(async e=> {
if (runningTrivias.ContainsKey(e.Server)) {
runningTrivias[e.Server].StopGame();
await runningTrivias[e.Server].StopGame();
} else
await e.Channel.SendMessage("No trivia is running on this server.");
});

2
NadekoBot/Modules/Administration.cs
View File

@ -417,7 +417,7 @@ namespace NadekoBot.Modules {
.Parameter("user",ParameterType.Unparsed)
.Do(async e => {
var usrId = NadekoBot.client.CurrentUser.Id;
if (!string.IsNullOrWhiteSpace(e.GetArg("user"))) {
if (!string.IsNullOrWhiteSpace(e.GetArg("user")) && e.User.ServerPermissions.ManageMessages) {
var usr = e.Server.FindUsers(e.GetArg("user")).FirstOrDefault();
if (usr != null)
usrId = usr.Id;

6
NadekoBot/Modules/Gambling.cs
View File

@ -33,7 +33,11 @@ namespace NadekoBot.Modules
return;
}
var members = role.Members.Where(u => u.Status == Discord.UserStatus.Online); // only online
await e.Channel.SendMessage($"**Raffled user:** {members.ToArray()[new System.Random().Next(0, members.Count())].Name}");
try {
var usr = members.ToArray()[new System.Random().Next(0, members.Count())];
await e.Channel.SendMessage($"**Raffled user:** {usr.Name} (id: {usr.Id})");
}
catch { }
});
/*
cgb.CreateCommand("$$")

3
NadekoBot/NadekoBot.cs
View File

@ -144,11 +144,12 @@ namespace NadekoBot {
try {
var request = e.Request as Discord.API.Client.Rest.SendMessageRequest;
if (request != null) {
request.Content = request.Content?.Replace("@everyone", "@everyοne");
if (string.IsNullOrWhiteSpace(request.Content))
e.Cancel = true;
else
Console.WriteLine("Sending request.");
request.Content = request.Content.Replace("@everyone", "@everyοne");
var content = request.Content;
}
}
catch {