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

New trivia questions, broke audio.

Browse Source 
Improved trivia a bit
This commit is contained in:
Kwoth
2015-12-09 21:47:02 +01:00
parent fc84c0212e
commit 33e4734d58
15 changed files with 24712 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
NadekoBot/Modules/Administration.cs
View File

@ -270,7 +270,7 @@ namespace NadekoBot.Modules
var time = (DateTime.Now - Process.GetCurrentProcess().StartTime);
string uptime = " " + time.Days + " days, " + time.Hours + " hours, and " + time.Minutes + " minutes.";
await client.SendMessage(e.Channel, String.Format("```Servers: {0}\nUnique Users: {1}\nUptime: {2}\nMy id is: {3}```", serverCount, uniqueUserCount, uptime, client.CurrentUserId));
await client.SendMessage(e.Channel, String.Format("```Servers: {0}\nUnique Users: {1}\nUptime: {2}\nMy id is: {3}```", serverCount, uniqueUserCount, uptime, client.CurrentUser.Id));
});
});

30
NadekoBot/Modules/Conversations.cs
View File

@ -45,14 +45,14 @@ namespace NadekoBot.Modules
.Description("Nadeko replies with /o/")
.Do(async e =>
{
await client.SendMessage(e.Channel, Mention.User(e.User) + "/o/");
await client.SendMessage(e.Channel, e.User.Mention + "/o/");
});
cgb.CreateCommand("/o/")
.Description("Nadeko replies with \\o\\")
.Do(async e =>
{
await client.SendMessage(e.Channel, Mention.User(e.User) + "\\o\\");
await client.SendMessage(e.Channel, e.User.Mention + "\\o\\");
});
});
@ -67,9 +67,9 @@ namespace NadekoBot.Modules
.Do(async e =>
{
if (e.User.Id == NadekoBot.OwnerID)
await client.SendMessage(e.Channel, Mention.User(e.User) + ", Of course I do, my Master.");
await client.SendMessage(e.Channel, e.User.Mention + ", Of course I do, my Master.");
else
await client.SendMessage(e.Channel, Mention.User(e.User) + ", Don't be silly.");
await client.SendMessage(e.Channel, e.User.Mention + ", Don't be silly.");
});
CreateCommand(cgb, "die")
@ -82,10 +82,10 @@ namespace NadekoBot.Modules
t.Interval = 2000;
t.Elapsed += (s, ev) => { Environment.Exit(0); };
t.Start();
await client.SendMessage(e.Channel, Mention.User(e.User) + ", Yes, my love.");
await client.SendMessage(e.Channel, e.User.Mention + ", Yes, my love.");
}
else
await client.SendMessage(e.Channel, Mention.User(e.User) + ", No.");
await client.SendMessage(e.Channel, e.User.Mention + ", No.");
});
CreateCommand(cgb, "how are you")
@ -94,18 +94,18 @@ namespace NadekoBot.Modules
{
if (e.User.Id == NadekoBot.OwnerID)
{
await client.SendMessage(e.Channel, Mention.User(e.User) + " I am great as long as you are here.");
await client.SendMessage(e.Channel, e.User.Mention + " I am great as long as you are here.");
}
else
{
var kw = client.GetUser(e.Server, NadekoBot.OwnerID);
if (kw != null && kw.Status == UserStatus.Online)
{
await client.SendMessage(e.Channel, Mention.User(e.User) + " I am great as long as " + Mention.User(kw) + " is with me.");
await client.SendMessage(e.Channel, e.User.Mention + " I am great as long as " + Mention.User(kw) + " is with me.");
}
else
{
await client.SendMessage(e.Channel, Mention.User(e.User) + " I am sad. My Master is not with me.");
await client.SendMessage(e.Channel, e.User.Mention + " I am sad. My Master is not with me.");
}
}
});
@ -128,7 +128,7 @@ namespace NadekoBot.Modules
}
else
{
await client.SendMessage(e.Channel, Mention.User(e.User) + " Eww, why would i do that for you ?!");
await client.SendMessage(e.Channel, e.User.Mention + " Eww, why would i do that for you ?!");
}
});
@ -153,11 +153,11 @@ namespace NadekoBot.Modules
{
if (u.Id == NadekoBot.OwnerID)
{
await client.SendMessage(e.Channel, Mention.User(e.User) + " I don't need your permission to praise my beloved Master <3");
await client.SendMessage(e.Channel, e.User.Mention + " I don't need your permission to praise my beloved Master <3");
}
else
{
await client.SendMessage(e.Channel, Mention.User(e.User) + " Yeah... No.");
await client.SendMessage(e.Channel, e.User.Mention + " Yeah... No.");
}
}
});
@ -166,7 +166,7 @@ namespace NadekoBot.Modules
.Description("Useless.")
.Do(async e =>
{
await client.SendMessage(e.Channel, Mention.User(e.User) + " I will be soon.");
await client.SendMessage(e.Channel, e.User.Mention + " I will be soon.");
});
cgb.CreateCommand("are you there")
@ -398,7 +398,7 @@ namespace NadekoBot.Modules
{
if (StatsCollector.DeleteRequest(int.Parse(e.Args[0])))
{
await client.SendMessage(e.Channel, Mention.User(e.User) + " Request deleted.");
await client.SendMessage(e.Channel, e.User.Mention + " Request deleted.");
}
else
{
@ -425,7 +425,7 @@ namespace NadekoBot.Modules
var sc = StatsCollector.ResolveRequest(int.Parse(e.Args[0]));
if (sc != null)
{
await client.SendMessage(e.Channel, Mention.User(e.User) + " Request resolved, notice sent.");
await client.SendMessage(e.Channel, e.User.Mention + " Request resolved, notice sent.");
await client.SendPrivateMessage(client.GetUser(client.GetServer(sc.ServerId), sc.Id), "**This request of yours has been resolved:**\n" + sc.Text);
}
else

10
NadekoBot/Modules/Music.cs
View File

@ -20,7 +20,7 @@ namespace NadekoBot.Modules
private static bool exit = true;
public static bool NextSong = false;
public static IDiscordVoiceClient Voice;
public static Discord.Audio.DiscordAudioClient Voice;
public static Channel VoiceChannel;
public static bool Pause = false;
public static List<YouTubeVideo> SongQueue = new List<YouTubeVideo>();
@ -144,7 +144,7 @@ namespace NadekoBot.Modules
{
if (Voice != null) return;
VoiceChannel = client.FindChannels(e.Server, e.GetArg("ChannelName").Trim(), ChannelType.Voice).FirstOrDefault();
Voice = await client.JoinVoiceServer(VoiceChannel);
//Voice = await client.JoinVoiceServer(VoiceChannel);
Exit = false;
NextSong = false;
Pause = false;
@ -176,7 +176,7 @@ namespace NadekoBot.Modules
{
while ((byteCount = stream.Read(buffer, 0, blockSize)) > 0)
{
Voice.SendVoicePCM(buffer, byteCount);
// Voice.SendVoicePCM(buffer, byteCount);
counter += blockSize;
if (NextSong)
{
@ -193,10 +193,10 @@ namespace NadekoBot.Modules
}
});
}
await Voice.WaitVoice();
// await Voice.WaitVoice();
}
catch (Exception ex) { Console.WriteLine(ex.ToString()); }
await client.LeaveVoiceServer(VoiceChannel.Server);
// await client.LeaveVoiceServer(VoiceChannel.Server);
Voice = null;
VoiceChannel = null;
});