Changed some namespaces, work on packages

This commit is contained in:
Master Kwoth
2017-10-13 06:14:54 +02:00
parent e434de5abb
commit 90e71a3a30
295 changed files with 6140 additions and 6111 deletions

View File

@ -6,9 +6,9 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using NadekoBot.Common.Attributes;
using NadekoBot.Services;
using NadekoBot.Core.Services;
using NadekoBot.Modules.Administration.Services;
using NadekoBot.Services.Database.Models;
using NadekoBot.Core.Services.Database.Models;
namespace NadekoBot.Modules.Administration
{

View File

@ -1,7 +1,7 @@
using Discord;
using Discord.Commands;
using NadekoBot.Extensions;
using NadekoBot.Services;
using NadekoBot.Core.Services;
using System.Linq;
using System.Threading.Tasks;
using NadekoBot.Common.Attributes;

View File

@ -1,7 +1,7 @@
using System.Collections.Concurrent;
using Discord;
using NadekoBot.Common.Collections;
using NadekoBot.Services.Database.Models;
using NadekoBot.Core.Services.Database.Models;
namespace NadekoBot.Modules.Administration.Common
{

View File

@ -2,7 +2,7 @@
using Microsoft.EntityFrameworkCore;
using NadekoBot.Common.Attributes;
using NadekoBot.Extensions;
using NadekoBot.Services;
using NadekoBot.Core.Services;
using System;
using System.Threading.Tasks;

View File

@ -1,6 +1,6 @@
using Discord;
using Discord.Commands;
using NadekoBot.Services;
using NadekoBot.Core.Services;
using System.Threading.Tasks;
using NadekoBot.Common.Attributes;
using NadekoBot.Modules.Administration.Services;

View File

@ -1,8 +1,8 @@
using Discord;
using Discord.Commands;
using NadekoBot.Extensions;
using NadekoBot.Services;
using NadekoBot.Services.Database.Models;
using NadekoBot.Core.Services;
using NadekoBot.Core.Services.Database.Models;
using System;
using System.Linq;
using System.Threading.Tasks;

View File

@ -4,12 +4,12 @@ using System.IO;
using System.Linq;
using System.Threading.Tasks;
using Discord.Commands;
using NadekoBot.Services;
using NadekoBot.Services.Database.Models;
using NadekoBot.Core.Services;
using NadekoBot.Core.Services.Database.Models;
using Newtonsoft.Json;
using System.Collections.Concurrent;
using NadekoBot.Extensions;
using NadekoBot.Services.Database;
using NadekoBot.Core.Services.Database;
using Microsoft.Data.Sqlite;
using NadekoBot.Common.Attributes;
using NadekoBot.Common.Collections;

View File

@ -1,12 +1,13 @@
using Discord.Commands;
using NadekoBot.Common.Attributes;
using NadekoBot.Core.Modules.Administration.Services;
using NadekoBot.Modules.Administration.Services;
using NadekoBot.Extensions;
using System;
using System.IO;
using System.Reflection;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Linq;
namespace NadekoBot.Modules.Administration
{
@ -27,7 +28,13 @@ namespace NadekoBot.Modules.Administration
public async Task PackageList()
{
_service.ReloadAvailablePackages();
await Context.Channel.SendConfirmAsync(string.Join("\n", _service.Packages));
await Context.Channel.SendConfirmAsync(
string.Join(
"\n",
_service.Packages
.Select(x => _bot.LoadedPackages.Contains(x)
? "✅ " + x
: x)));
}
[NadekoCommand, Usage, Description, Aliases]

View File

@ -1,6 +1,6 @@
using Discord;
using Discord.Commands;
using NadekoBot.Services;
using NadekoBot.Core.Services;
using System;
using System.Threading.Tasks;
using NadekoBot.Common.Attributes;

View File

@ -1,6 +1,6 @@
using Discord.Commands;
using NadekoBot.Services;
using NadekoBot.Services.Database.Models;
using NadekoBot.Core.Services;
using NadekoBot.Core.Services.Database.Models;
using System.Linq;
using System.Threading.Tasks;
using NadekoBot.Common.Attributes;

View File

@ -2,8 +2,8 @@
using Discord.Commands;
using Microsoft.EntityFrameworkCore;
using NadekoBot.Extensions;
using NadekoBot.Services;
using NadekoBot.Services.Database.Models;
using NadekoBot.Core.Services;
using NadekoBot.Core.Services.Database.Models;
using System;
using System.Linq;
using System.Threading.Tasks;

View File

@ -2,8 +2,8 @@ using Discord;
using Discord.Commands;
using Microsoft.EntityFrameworkCore;
using NadekoBot.Extensions;
using NadekoBot.Services;
using NadekoBot.Services.Database.Models;
using NadekoBot.Core.Services;
using NadekoBot.Core.Services.Database.Models;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;

View File

@ -2,8 +2,8 @@
using Discord.Commands;
using Discord.WebSocket;
using NadekoBot.Extensions;
using NadekoBot.Services;
using NadekoBot.Services.Database.Models;
using NadekoBot.Core.Services;
using NadekoBot.Core.Services.Database.Models;
using System;
using System.Collections.Generic;
using System.Linq;

View File

@ -8,8 +8,8 @@ using System.Linq;
using System.Net.Http;
using System.Threading.Tasks;
using Discord.WebSocket;
using NadekoBot.Services;
using NadekoBot.Services.Database.Models;
using NadekoBot.Core.Services;
using NadekoBot.Core.Services.Database.Models;
using Microsoft.EntityFrameworkCore;
using System.Diagnostics;
using NadekoBot.Common.Attributes;

View File

@ -1,8 +1,8 @@
using Discord;
using Discord.Commands;
using NadekoBot.Extensions;
using NadekoBot.Services;
using NadekoBot.Services.Database.Models;
using NadekoBot.Core.Services;
using NadekoBot.Core.Services.Database.Models;
using System.Threading.Tasks;
using NadekoBot.Common.Attributes;

View File

@ -5,7 +5,7 @@ using Discord;
using Discord.Commands;
using Discord.WebSocket;
using NadekoBot.Common.Collections;
using NadekoBot.Services;
using NadekoBot.Core.Services;
using NLog;
namespace NadekoBot.Modules.Administration.Services

View File

@ -3,7 +3,7 @@ using System.Collections.Concurrent;
using System.Linq;
using System.Threading.Tasks;
using Discord.WebSocket;
using NadekoBot.Services;
using NadekoBot.Core.Services;
using NLog;
namespace NadekoBot.Modules.Administration.Services

View File

@ -5,8 +5,8 @@ using System.Threading.Tasks;
using Discord.WebSocket;
using NadekoBot.Common.Collections;
using NadekoBot.Extensions;
using NadekoBot.Services;
using NadekoBot.Services.Database.Models;
using NadekoBot.Core.Services;
using NadekoBot.Core.Services.Database.Models;
using NLog;
namespace NadekoBot.Modules.Administration.Services

View File

@ -4,8 +4,8 @@ using System.Collections.Generic;
using System.Linq;
using Discord.WebSocket;
using NadekoBot.Extensions;
using NadekoBot.Services;
using NadekoBot.Services.Database.Models;
using NadekoBot.Core.Services;
using NadekoBot.Core.Services.Database.Models;
namespace NadekoBot.Modules.Administration.Services
{

View File

@ -8,9 +8,9 @@ using Discord;
using Discord.WebSocket;
using NadekoBot.Extensions;
using NadekoBot.Modules.Administration.Common;
using NadekoBot.Services;
using NadekoBot.Services.Database.Models;
using NadekoBot.Services.Impl;
using NadekoBot.Core.Services;
using NadekoBot.Core.Services.Database.Models;
using NadekoBot.Core.Services.Impl;
using NLog;
using NadekoBot.Common;

View File

@ -9,8 +9,8 @@ using Discord.WebSocket;
using Microsoft.EntityFrameworkCore;
using NadekoBot.Common.Collections;
using NadekoBot.Extensions;
using NadekoBot.Services;
using NadekoBot.Services.Database.Models;
using NadekoBot.Core.Services;
using NadekoBot.Core.Services.Database.Models;
using NLog;
namespace NadekoBot.Modules.Administration.Services

View File

@ -1,11 +1,11 @@
using NadekoBot.Services;
using NadekoBot.Core.Services;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text.RegularExpressions;
namespace NadekoBot.Core.Modules.Administration.Services
namespace NadekoBot.Modules.Administration.Services
{
public class PackagesService : INService
{

View File

@ -3,8 +3,8 @@ using System.Linq;
using System.Threading;
using Discord.WebSocket;
using NadekoBot.Common.Replacements;
using NadekoBot.Services;
using NadekoBot.Services.Database.Models;
using NadekoBot.Core.Services;
using NadekoBot.Core.Services.Database.Models;
using NLog;
namespace NadekoBot.Modules.Administration.Services

View File

@ -5,8 +5,8 @@ using System.Threading.Tasks;
using Discord;
using Discord.WebSocket;
using NadekoBot.Modules.Administration.Common;
using NadekoBot.Services;
using NadekoBot.Services.Database.Models;
using NadekoBot.Core.Services;
using NadekoBot.Core.Services.Database.Models;
using NLog;
namespace NadekoBot.Modules.Administration.Services

View File

@ -5,7 +5,7 @@ using System.Threading.Tasks;
using Discord;
using NadekoBot.Common.Collections;
using NadekoBot.Extensions;
using NadekoBot.Services;
using NadekoBot.Core.Services;
namespace NadekoBot.Modules.Administration.Services
{

View File

@ -8,8 +8,8 @@ using Discord.WebSocket;
using NadekoBot.Common.ModuleBehaviors;
using NadekoBot.Extensions;
using NadekoBot.Modules.Administration.Common;
using NadekoBot.Services;
using NadekoBot.Services.Database.Models;
using NadekoBot.Core.Services;
using NadekoBot.Core.Services.Database.Models;
using NLog;
namespace NadekoBot.Modules.Administration.Services

View File

@ -7,8 +7,8 @@ using Discord.WebSocket;
using NadekoBot.Common;
using NadekoBot.Common.ModuleBehaviors;
using NadekoBot.Extensions;
using NadekoBot.Services;
using NadekoBot.Services.Impl;
using NadekoBot.Core.Services;
using NadekoBot.Core.Services.Impl;
using NLog;
namespace NadekoBot.Modules.Administration.Services

View File

@ -4,8 +4,8 @@ using System.Linq;
using System.Threading.Tasks;
using Discord;
using Microsoft.EntityFrameworkCore;
using NadekoBot.Services;
using NadekoBot.Services.Database.Models;
using NadekoBot.Core.Services;
using NadekoBot.Core.Services.Database.Models;
namespace NadekoBot.Modules.Administration.Services
{

View File

@ -5,8 +5,8 @@ using System.Linq;
using System.Threading.Tasks;
using Discord;
using Discord.WebSocket;
using NadekoBot.Services;
using NadekoBot.Services.Database.Models;
using NadekoBot.Core.Services;
using NadekoBot.Core.Services.Database.Models;
using NLog;
namespace NadekoBot.Modules.Administration.Services

View File

@ -9,9 +9,9 @@ using Discord;
using Discord.WebSocket;
using NadekoBot.Common.Collections;
using NadekoBot.Extensions;
using NadekoBot.Services;
using NadekoBot.Services.Database.Models;
using NadekoBot.Services.Impl;
using NadekoBot.Core.Services;
using NadekoBot.Core.Services.Database.Models;
using NadekoBot.Core.Services.Impl;
using NLog;
namespace NadekoBot.Modules.Administration.Services

View File

@ -3,8 +3,8 @@ using Discord.Commands;
using Discord.WebSocket;
using Microsoft.EntityFrameworkCore;
using NadekoBot.Extensions;
using NadekoBot.Services;
using NadekoBot.Services.Database.Models;
using NadekoBot.Core.Services;
using NadekoBot.Core.Services.Database.Models;
using System.Linq;
using System.Threading.Tasks;
using NadekoBot.Common.Attributes;

View File

@ -8,8 +8,8 @@ using Microsoft.EntityFrameworkCore;
using NadekoBot.Common.Attributes;
using NadekoBot.Extensions;
using NadekoBot.Modules.Administration.Services;
using NadekoBot.Services;
using NadekoBot.Services.Database.Models;
using NadekoBot.Core.Services;
using NadekoBot.Core.Services.Database.Models;
namespace NadekoBot.Modules.Administration
{

View File

@ -1,7 +1,7 @@
using Discord;
using Discord.Commands;
using NadekoBot.Extensions;
using NadekoBot.Services;
using NadekoBot.Core.Services;
using System;
using System.Collections.Generic;
using System.Linq;

View File

@ -1,8 +1,8 @@
using System.Linq;
using System.Threading.Tasks;
using Discord.Commands;
using NadekoBot.Services;
using NadekoBot.Services.Database.Models;
using NadekoBot.Core.Services;
using NadekoBot.Core.Services.Database.Models;
using Discord;
using NadekoBot.Extensions;
using Discord.WebSocket;

View File

@ -4,7 +4,7 @@ using Discord;
using Discord.WebSocket;
using NadekoBot.Extensions;
using NadekoBot.Modules.CustomReactions.Services;
using NadekoBot.Services.Database.Models;
using NadekoBot.Core.Services.Database.Models;
using System;
using System.Collections.Generic;
using System.Linq;

View File

@ -1,6 +1,6 @@
using Discord;
using Discord.WebSocket;
using NadekoBot.Services.Database.Models;
using NadekoBot.Core.Services.Database.Models;
using NLog;
using System.Collections.Concurrent;
using System.Linq;
@ -9,12 +9,12 @@ using System.Threading.Tasks;
using NadekoBot.Common;
using NadekoBot.Common.ModuleBehaviors;
using NadekoBot.Extensions;
using NadekoBot.Services.Database;
using NadekoBot.Services;
using NadekoBot.Core.Services.Database;
using NadekoBot.Core.Services;
using NadekoBot.Modules.CustomReactions.Extensions;
using NadekoBot.Modules.Permissions.Common;
using NadekoBot.Modules.Permissions.Services;
using NadekoBot.Services.Impl;
using NadekoBot.Core.Services.Impl;
using Newtonsoft.Json;
namespace NadekoBot.Modules.CustomReactions.Services

View File

@ -2,7 +2,7 @@
using NadekoBot.Extensions;
using System.Linq;
using Discord;
using NadekoBot.Services;
using NadekoBot.Core.Services;
using System.Threading.Tasks;
using System;
using System.IO;

View File

@ -7,8 +7,8 @@ using NadekoBot.Extensions;
using System.Linq;
using NadekoBot.Common.Attributes;
using NadekoBot.Common.ModuleBehaviors;
using NadekoBot.Services;
using NadekoBot.Services.Impl;
using NadekoBot.Core.Services;
using NadekoBot.Core.Services.Impl;
namespace NadekoBot.Modules.Help.Services
{

View File

@ -1,7 +1,7 @@
using Discord;
using Discord.Commands;
using NadekoBot.Services;
using NadekoBot.Services.Database.Models;
using NadekoBot.Core.Services;
using NadekoBot.Core.Services.Database.Models;
using System.Threading.Tasks;
using NadekoBot.Common.Attributes;
using NadekoBot.Common.Collections;

View File

@ -2,8 +2,8 @@
using Discord.Commands;
using Microsoft.EntityFrameworkCore;
using NadekoBot.Extensions;
using NadekoBot.Services;
using NadekoBot.Services.Database.Models;
using NadekoBot.Core.Services;
using NadekoBot.Core.Services.Database.Models;
using System.Collections.Concurrent;
using System.Linq;
using System.Threading.Tasks;

View File

@ -1,4 +1,4 @@
using NadekoBot.Services.Database.Models;
using NadekoBot.Core.Services.Database.Models;
namespace NadekoBot.Modules.Permissions.Common
{

View File

@ -2,7 +2,7 @@
using System.Linq;
using Discord;
using Discord.WebSocket;
using NadekoBot.Services.Database.Models;
using NadekoBot.Core.Services.Database.Models;
namespace NadekoBot.Modules.Permissions.Common
{

View File

@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
using NadekoBot.Common.Collections;
using NadekoBot.Services.Database.Models;
using NadekoBot.Core.Services.Database.Models;
namespace NadekoBot.Modules.Permissions.Common
{

View File

@ -3,13 +3,13 @@ using Discord.Commands;
using Discord.WebSocket;
using Microsoft.EntityFrameworkCore;
using NadekoBot.Extensions;
using NadekoBot.Services;
using NadekoBot.Core.Services;
using System.Linq;
using System.Threading.Tasks;
using NadekoBot.Common.Attributes;
using NadekoBot.Common.Collections;
using NadekoBot.Modules.Permissions.Services;
using NadekoBot.Services.Database.Models;
using NadekoBot.Core.Services.Database.Models;
namespace NadekoBot.Modules.Permissions
{

View File

@ -1,13 +1,13 @@
using Discord;
using Discord.Commands;
using NadekoBot.Extensions;
using NadekoBot.Services;
using NadekoBot.Core.Services;
using System.Linq;
using System.Threading.Tasks;
using NadekoBot.Common.Attributes;
using NadekoBot.Common.TypeReaders;
using NadekoBot.Modules.Permissions.Services;
using NadekoBot.Services.Database.Models;
using NadekoBot.Core.Services.Database.Models;
namespace NadekoBot.Modules.Permissions
{

View File

@ -2,9 +2,9 @@
using System.Linq;
using System.Threading.Tasks;
using Discord.Commands;
using NadekoBot.Services;
using NadekoBot.Core.Services;
using Discord;
using NadekoBot.Services.Database.Models;
using NadekoBot.Core.Services.Database.Models;
using System.Collections.Generic;
using Discord.WebSocket;
using NadekoBot.Common.Attributes;

View File

@ -3,8 +3,8 @@ using System.Threading.Tasks;
using Discord;
using NadekoBot.Common.Collections;
using NadekoBot.Common.ModuleBehaviors;
using NadekoBot.Services;
using NadekoBot.Services.Database.Models;
using NadekoBot.Core.Services;
using NadekoBot.Core.Services.Database.Models;
namespace NadekoBot.Modules.Permissions.Services
{

View File

@ -6,8 +6,8 @@ using Discord;
using Discord.WebSocket;
using NadekoBot.Common.Collections;
using NadekoBot.Common.ModuleBehaviors;
using NadekoBot.Services;
using NadekoBot.Services.Database.Models;
using NadekoBot.Core.Services;
using NadekoBot.Core.Services.Database.Models;
namespace NadekoBot.Modules.Permissions.Services
{

View File

@ -8,8 +8,8 @@ using Discord.WebSocket;
using NadekoBot.Common.Collections;
using NadekoBot.Common.ModuleBehaviors;
using NadekoBot.Extensions;
using NadekoBot.Services;
using NadekoBot.Services.Database.Models;
using NadekoBot.Core.Services;
using NadekoBot.Core.Services.Database.Models;
using NLog;
namespace NadekoBot.Modules.Permissions.Services

View File

@ -4,7 +4,7 @@ using Discord;
using Discord.WebSocket;
using NadekoBot.Common.Collections;
using NadekoBot.Common.ModuleBehaviors;
using NadekoBot.Services;
using NadekoBot.Core.Services;
namespace NadekoBot.Modules.Permissions.Services
{

View File

@ -9,9 +9,9 @@ using Microsoft.EntityFrameworkCore;
using NadekoBot.Common.ModuleBehaviors;
using NadekoBot.Extensions;
using NadekoBot.Modules.Permissions.Common;
using NadekoBot.Services;
using NadekoBot.Services.Database.Models;
using NadekoBot.Services.Impl;
using NadekoBot.Core.Services;
using NadekoBot.Core.Services.Database.Models;
using NadekoBot.Core.Services.Impl;
using NLog;
namespace NadekoBot.Modules.Permissions.Services

View File

@ -1,6 +1,6 @@
using System.Threading.Tasks;
using NadekoBot.Services;
using NadekoBot.Services.Database.Models;
using NadekoBot.Core.Services;
using NadekoBot.Core.Services.Database.Models;
namespace NadekoBot.Modules.Permissions.Services
{