diff --git a/discord.net b/discord.net index 6a7f7b81..39df50a5 160000 --- a/discord.net +++ b/discord.net @@ -1 +1 @@ -Subproject commit 6a7f7b81322266977ef809e521af6c199ec8de54 +Subproject commit 39df50a5eaace37d31848a42f651a9fc40f8f534 diff --git a/src/NadekoBot/Modules/Administration/Commands/Migration.cs b/src/NadekoBot/Modules/Administration/Commands/Migration.cs index 3d5ea9ad..66cee0b3 100644 --- a/src/NadekoBot/Modules/Administration/Commands/Migration.cs +++ b/src/NadekoBot/Modules/Administration/Commands/Migration.cs @@ -81,7 +81,7 @@ namespace NadekoBot.Modules.Administration private void MigrateDb0_9(IUnitOfWork uow) { - var db = new SqliteConnection("Data Source=data/nadekobot.sqlite;Version=3;"); + var db = new SqliteConnection("Data Source=data/nadekobot.sqlite"); db.Open(); var com = db.CreateCommand(); diff --git a/src/NadekoBot/Modules/Searches/Commands/StreamNotificationCommands.cs b/src/NadekoBot/Modules/Searches/Commands/StreamNotificationCommands.cs index 37eb9e4a..6abf08c4 100644 --- a/src/NadekoBot/Modules/Searches/Commands/StreamNotificationCommands.cs +++ b/src/NadekoBot/Modules/Searches/Commands/StreamNotificationCommands.cs @@ -203,14 +203,14 @@ namespace NadekoBot.Modules.Searches { var channel = (ITextChannel)msg.Channel; - username = username.ToUpperInvariant().Trim(); + username = username.ToLowerInvariant().Trim(); FollowedStream toRemove; using (var uow = DbHandler.UnitOfWork()) { var config = uow.GuildConfigs.For(channel.Guild.Id); var streams = config.FollowedStreams; - toRemove = streams.Where(fs => fs.ChannelId == channel.Id && fs.Username.ToUpperInvariant() == username).FirstOrDefault(); + toRemove = streams.Where(fs => fs.ChannelId == channel.Id && fs.Username.ToLowerInvariant() == username).FirstOrDefault(); if (toRemove != null) { config.FollowedStreams = new HashSet(streams.Except(new[] { toRemove })); @@ -258,7 +258,7 @@ namespace NadekoBot.Modules.Searches private async Task TrackStream(ITextChannel channel, string username, FollowedStream.FollowedStreamType type) { - username = username.ToUpperInvariant().Trim(); + username = username.ToLowerInvariant().Trim(); var stream = new FollowedStream { GuildId = channel.Guild.Id, @@ -269,7 +269,7 @@ namespace NadekoBot.Modules.Searches bool exists; using (var uow = DbHandler.UnitOfWork()) { - exists = uow.GuildConfigs.For(channel.Guild.Id).FollowedStreams.Where(fs => fs.ChannelId == channel.Id && fs.Username.ToUpperInvariant().Trim() == username).Any(); + exists = uow.GuildConfigs.For(channel.Guild.Id).FollowedStreams.Where(fs => fs.ChannelId == channel.Id && fs.Username.ToLowerInvariant().Trim() == username).Any(); } if (exists) { diff --git a/src/NadekoBot/libs/libsodium.dll b/src/NadekoBot/libs/libsodium.dll new file mode 100644 index 00000000..f5de830e Binary files /dev/null and b/src/NadekoBot/libs/libsodium.dll differ diff --git a/src/NadekoBot/libs/opus.dll b/src/NadekoBot/libs/opus.dll new file mode 100644 index 00000000..a962869f Binary files /dev/null and b/src/NadekoBot/libs/opus.dll differ diff --git a/src/NadekoBot/project.json b/src/NadekoBot/project.json index c3a8b3b9..bf7a5c54 100644 --- a/src/NadekoBot/project.json +++ b/src/NadekoBot/project.json @@ -10,8 +10,11 @@ "exclude": [ ], }, "copyToOutput": { - "include": [ "data" ], - "exclude": [ "data/musicdata" ] + "include": [ "data" , "libs"], + "exclude": [ "data/musicdata" ], + "mappings": { + "./": "./libs" + } } }, "dependencies": {