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

Merge pull request #1737 from Kwoth/2.0

Browse Source 
2.0.2
This commit is contained in:
Master Kwoth 2017-10-21 21:09:05 +02:00 committed by GitHub
commit 1ce4ff8839
7 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
NadekoBot.Core/Modules/Administration/DangerousCommands.cs
View File

@ -9,6 +9,7 @@ using System.Threading.Tasks;
#if !GLOBAL_NADEKO #if !GLOBAL_NADEKO
namespace NadekoBot.Modules.Administration namespace NadekoBot.Modules.Administration
{ {
//todo make users confirm their decision
public partial class Administration public partial class Administration
{ {
[Group] [Group]
@ -45,7 +46,9 @@ namespace NadekoBot.Modules.Administration
[NadekoCommand, Usage, Description, Aliases] [NadekoCommand, Usage, Description, Aliases]
[OwnerOnly] [OwnerOnly]
public Task DeleteWaifus() => public Task DeleteWaifus() =>
ExecSql("DELETE FROM WaifuUpdates; DELETE FROM WaifuInfo;"); ExecSql(@"DELETE FROM WaifuUpdates;
DELETE FROM WaifuItem;
DELETE FROM WaifuInfo;");
[NadekoCommand, Usage, Description, Aliases] [NadekoCommand, Usage, Description, Aliases]
[OwnerOnly] [OwnerOnly]

2
NadekoBot.Core/Modules/Administration/SelfAssignedRolesCommands.cs
View File

@ -1,6 +1,5 @@
using Discord; using Discord;
using Discord.Commands; using Discord.Commands;
using Discord.WebSocket;
using NadekoBot.Extensions; using NadekoBot.Extensions;
using NadekoBot.Core.Services; using NadekoBot.Core.Services;
using NadekoBot.Core.Services.Database.Models; using NadekoBot.Core.Services.Database.Models;
@ -11,7 +10,6 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using NadekoBot.Common.Attributes; using NadekoBot.Common.Attributes;
using NadekoBot.Common.Collections; using NadekoBot.Common.Collections;
using Microsoft.EntityFrameworkCore;
namespace NadekoBot.Modules.Administration namespace NadekoBot.Modules.Administration
{ {

4
NadekoBot.Core/NadekoBot.Core.csproj
View File

@ -13,10 +13,6 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<PackageReference Include="Discord.Net" Version="1.0.2" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AngleSharp" Version="0.9.9" /> <PackageReference Include="AngleSharp" Version="0.9.9" />
<PackageReference Include="Discord.Net" Version="2.0.0-alpha-build-00832" /> <PackageReference Include="Discord.Net" Version="2.0.0-alpha-build-00832" />

4
NadekoBot.Core/Services/Impl/StatsService.cs
View File

@ -1,8 +1,6 @@
using Discord; using Discord;
using Discord.WebSocket; using Discord.WebSocket;
using NadekoBot.Common.ShardCom;
using NadekoBot.Extensions; using NadekoBot.Extensions;
using Newtonsoft.Json;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;
@ -23,7 +21,7 @@ namespace NadekoBot.Core.Services.Impl
private readonly IBotCredentials _creds; private readonly IBotCredentials _creds;
private readonly DateTime _started; private readonly DateTime _started;
public const string BotVersion = "2.0.0"; public const string BotVersion = "2.0.2";
public string Author => "Kwoth#2560"; public string Author => "Kwoth#2560";
public string Library => "Discord.Net"; public string Library => "Discord.Net";

2
NadekoBot.Core/_Extensions/IUserExtensions.cs
View File

@ -44,6 +44,6 @@ namespace NadekoBot.Extensions
public static string RealAvatarUrl(this DiscordUser usr) => public static string RealAvatarUrl(this DiscordUser usr) =>
usr.AvatarId.StartsWith("a_") usr.AvatarId.StartsWith("a_")
? $"{DiscordConfig.CDNUrl}avatars/{usr.UserId}/{usr.AvatarId}.gif" ? $"{DiscordConfig.CDNUrl}avatars/{usr.UserId}/{usr.AvatarId}.gif"
: ((IUser)usr).GetAvatarUrl(ImageFormat.Auto); : $"{DiscordConfig.CDNUrl}avatars/{usr.UserId}/{usr.AvatarId}.png";
} }
} }

7
NuGet.Config
View File

@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<packageSources> <packageSources>
<add key="ImageSharp" value="https://www.myget.org/F/imagesharp/api/v3/index.json" /> <add key="Discord.Net" value="https://www.myget.org/F/discord-net/api/v3/index.json" />
<add key="Kwoth" value="https://www.myget.org/F/kwoth/api/v3/index.json" /> <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
<add key="Kwoth-myget" value="https://www.myget.org/F/kwoth/api/v3/index.json" />
</packageSources> </packageSources>
</configuration> </configuration>

8
src/NadekoBot/NuGet.Config
View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
<add key="Kwoth-myget" value="https://www.myget.org/F/kwoth/api/v3/index.json" />
<add key="Discord.Net" value="https://www.myget.org/F/discord-net/api/v3/index.json" />
</packageSources>
</configuration>