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

Minor changes and a slight fix

Browse Source
This commit is contained in:
Kwoth 2016-12-25 08:10:27 +01:00
parent 3526f956c3
commit 0565830583
3 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/NadekoBot/Modules/Administration/Commands/LogCommand.cs
View File

@ -628,32 +628,49 @@ namespace NadekoBot.Modules.Administration
switch (logChannelType) switch (logChannelType)
{ {
case LogType.Other: case LogType.Other:
newLogSetting.LogOtherId = null;
break; break;
case LogType.MessageUpdated: case LogType.MessageUpdated:
newLogSetting.MessageUpdatedId = null;
break; break;
case LogType.MessageDeleted: case LogType.MessageDeleted:
newLogSetting.MessageDeletedId = null;
break; break;
case LogType.UserJoined: case LogType.UserJoined:
newLogSetting.UserJoinedId = null;
break; break;
case LogType.UserLeft: case LogType.UserLeft:
newLogSetting.UserLeftId = null;
break; break;
case LogType.UserBanned: case LogType.UserBanned:
newLogSetting.UserBannedId = null;
break; break;
case LogType.UserUnbanned: case LogType.UserUnbanned:
newLogSetting.UserUnbannedId = null;
break; break;
case LogType.UserUpdated: case LogType.UserUpdated:
newLogSetting.UserUpdatedId = null;
break;
case LogType.UserMuted:
newLogSetting.UserMutedId = null;
break; break;
case LogType.ChannelCreated: case LogType.ChannelCreated:
newLogSetting.ChannelCreatedId = null;
break; break;
case LogType.ChannelDestroyed: case LogType.ChannelDestroyed:
newLogSetting.ChannelDestroyedId = null;
break; break;
case LogType.ChannelUpdated: case LogType.ChannelUpdated:
newLogSetting.ChannelUpdatedId = null;
break; break;
case LogType.UserPresence: case LogType.UserPresence:
newLogSetting.LogUserPresenceId = null;
break; break;
case LogType.VoicePresence: case LogType.VoicePresence:
newLogSetting.LogVoicePresenceId = null;
break; break;
case LogType.VoicePresenceTTS: case LogType.VoicePresenceTTS:
newLogSetting.LogVoicePresenceTTSId = null;
break; break;
default: default:
break; break;

11
src/NadekoBot/Modules/Games/Commands/TriviaCommands.cs
View File

@ -40,8 +40,9 @@ namespace NadekoBot.Modules.Games
await channel.SendConfirmAsync($"**Trivia game started! {triviaGame.WinRequirement} points needed to win.**").ConfigureAwait(false); await channel.SendConfirmAsync($"**Trivia game started! {triviaGame.WinRequirement} points needed to win.**").ConfigureAwait(false);
else else
await triviaGame.StopGame().ConfigureAwait(false); await triviaGame.StopGame().ConfigureAwait(false);
return;
} }
else
await channel.SendErrorAsync("Trivia game is already running on this server.\n" + trivia.CurrentQuestion).ConfigureAwait(false); await channel.SendErrorAsync("Trivia game is already running on this server.\n" + trivia.CurrentQuestion).ConfigureAwait(false);
} }
@ -53,8 +54,11 @@ namespace NadekoBot.Modules.Games
TriviaGame trivia; TriviaGame trivia;
if (RunningTrivias.TryGetValue(channel.Guild.Id, out trivia)) if (RunningTrivias.TryGetValue(channel.Guild.Id, out trivia))
{
await channel.SendConfirmAsync("Leaderboard", trivia.GetLeaderboard()).ConfigureAwait(false); await channel.SendConfirmAsync("Leaderboard", trivia.GetLeaderboard()).ConfigureAwait(false);
else return;
}
await channel.SendErrorAsync("No trivia is running on this server.").ConfigureAwait(false); await channel.SendErrorAsync("No trivia is running on this server.").ConfigureAwait(false);
} }
@ -68,8 +72,9 @@ namespace NadekoBot.Modules.Games
if (RunningTrivias.TryGetValue(channel.Guild.Id, out trivia)) if (RunningTrivias.TryGetValue(channel.Guild.Id, out trivia))
{ {
await trivia.StopGame().ConfigureAwait(false); await trivia.StopGame().ConfigureAwait(false);
return;
} }
else
await channel.SendErrorAsync("No trivia is running on this server.").ConfigureAwait(false); await channel.SendErrorAsync("No trivia is running on this server.").ConfigureAwait(false);
} }
} }

1
src/NadekoBot/NadekoBot.xproj
View File

@ -20,6 +20,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<DnxInvisibleContent Include="data\questions.json" /> <DnxInvisibleContent Include="data\questions.json" />
<DnxInvisibleContent Include="data\questions2.json" />
</ItemGroup> </ItemGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" /> <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
</Project> </Project>