- Database namespace is now NadekoBot.Db

- Db related code is now in src/NadekoBot/Db
- Finished major part of the db refactor, but many optimizations are left to be made

src/NadekoBot/Common/TypeReaders/ShmartNumberTypeReader.cs

@@ -5,6 +5,7 @@ using NadekoBot.Core.Services;
 using System;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using NadekoBot.Db;
 using NadekoBot.Modules.Gambling.Services;
 
 namespace NadekoBot.Core.Common.TypeReaders

src/NadekoBot/Db/Extensions/ClubExtensions.cs

@@ -1,10 +1,9 @@
-using NadekoBot.Core.Services.Database.Models;
+using System.Linq;
-using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Db.Models;
 
-namespace NadekoBot.Modules.Xp.Common
+namespace NadekoBot.Db
 {
     public static class ClubExtensions
     {

src/NadekoBot/Db/Extensions/CurrencyTransactionExtensions.cs

@@ -3,7 +3,7 @@ using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Core.Services.Database.Models;
 
-namespace NadekoBot.Core.Services.Database
+namespace NadekoBot.Db
 {
     public static class CurrencyTransactionExtensions
     {

src/NadekoBot/Db/Extensions/CustomReactionsExtensions.cs

@@ -1,11 +1,10 @@
-using NadekoBot.Services.Database.Models;
+using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.Linq;
 using LinqToDB;
 using NadekoBot.Core.Services.Database.Models;
 
-namespace NadekoBot.Modules.CustomReactions
+namespace NadekoBot.Db
 {
     public static class CustomReactionsExtensions
     {

src/NadekoBot/Db/Extensions/DiscordUserExtensions.cs

@@ -1,13 +1,11 @@
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Db.Models;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using Discord;
 using System.Collections.Generic;
-using System;
 using NadekoBot.Core.Services.Database;
-using NadekoBot.Core.Services.Database.Repositories;
 
-namespace NadekoBot.Core.Services
+namespace NadekoBot.Db
 {
     public static class DiscordUserExtensions
     {

src/NadekoBot/Db/Extensions/GuildConfigExtensions.cs

@@ -4,9 +4,9 @@ using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using System;
 using NadekoBot.Core.Services.Database;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Db.Models;
 
-namespace NadekoBot.Modules.Administration
+namespace NadekoBot.Db
 {
     public static class GuildConfigExtensions
     {

src/NadekoBot/Db/Extensions/MusicPlayerSettingsExtensions.cs

@@ -2,7 +2,7 @@
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Core.Services.Database.Models;
 
-namespace NadekoBot.Core.Services.Database.Repositories.Impl
+namespace NadekoBot.Db
 {
     public static class MusicPlayerSettingsExtensions
     {

src/NadekoBot/Db/Extensions/MusicPlaylistExtensions.cs

@@ -1,11 +1,10 @@
-using NadekoBot.Services.Database.Models;
+using System;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Core.Services.Database.Models;
 
-namespace NadekoBot.Modules.Music
+namespace NadekoBot.Db
 {
     public static class MusicPlaylistExtensions
     {

src/NadekoBot/Db/Extensions/PollExtensions.cs

@@ -1,12 +1,12 @@
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Db.Models;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Core.Services.Database;
 using NadekoBot.Core.Services.Database.Models;
-using NadekoBot.Services.Database;
+using NadekoBot.Db;
 
-namespace NadekoBot.Modules.Games.Common
+namespace NadekoBot.Db
 {
     public static class PollExtensions
     {

src/NadekoBot/Db/Extensions/QuoteExtensions.cs

@@ -5,7 +5,7 @@ using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Common;
 
-namespace NadekoBot.Core.Services.Database.Repositories.Impl
+namespace NadekoBot.Db
 {
     public static class QuoteExtensions
     {

src/NadekoBot/Db/Extensions/ReminderExtensions.cs

@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace NadekoBot.Modules.Utility.Common
+namespace NadekoBot.Db
 {
     public static class ReminderExtensions
     {

src/NadekoBot/Db/Extensions/SelfAssignableRolesExtensions.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 
-namespace NadekoBot.Modules.Administration.Common
+namespace NadekoBot.Db
 {
     public static class SelfAssignableRolesExtensions
     {

src/NadekoBot/Db/Extensions/UserXpExtensions.cs

@@ -1,13 +1,11 @@
-using NadekoBot.Services.Database.Models;
+using System.Linq;
-using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using LinqToDB;
 using NadekoBot.Core.Services.Database;
 using NadekoBot.Core.Services.Database.Models;
-using NadekoBot.Services.Database;
 
-namespace NadekoBot.Modules.Xp.Common
+namespace NadekoBot.Db
 {
     public static class UserXpExtensions
     {

src/NadekoBot/Db/Extensions/WaifuExtensions.cs

@@ -6,9 +6,9 @@ using Microsoft.EntityFrameworkCore;
 using NadekoBot.Core.Services.Database;
 using NadekoBot.Core.Services.Database.Models;
 using NadekoBot.Migrations;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Db.Models;
 
-namespace NadekoBot.Modules.Gambling
+namespace NadekoBot.Db
 {
     public class WaifuInfoStats
     {

src/NadekoBot/Db/Extensions/WarningExtensions.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using System;
 
-namespace NadekoBot.Modules.Administration.Common
+namespace NadekoBot.Db
 {
     public static class WarningExtensions
     {

src/NadekoBot/Db/Models/ClubInfo.cs

@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations;
 using NadekoBot.Core.Services.Database.Models;
 
-namespace NadekoBot.Services.Database.Models
+namespace NadekoBot.Db.Models
 {
     public class ClubInfo : DbEntity
     {

src/NadekoBot/Db/Models/DiscordUser.cs

@@ -1,7 +1,7 @@
 using System;
 using NadekoBot.Core.Services.Database.Models;
 
-namespace NadekoBot.Services.Database.Models
+namespace NadekoBot.Db.Models
 {
     public class DiscordUser : DbEntity
     {

src/NadekoBot/Db/Models/FollowedStream.cs

@@ -2,7 +2,7 @@
 using NadekoBot.Core.Services.Database.Models;
 using NadekoBot.Modules.Searches.Common;
 
-namespace NadekoBot.Services.Database.Models
+namespace NadekoBot.Db.Models
 {
     public class FollowedStream : DbEntity
     {

src/NadekoBot/Db/Models/GuildConfig.cs

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

src/NadekoBot/Db/Models/Waifu.cs

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

src/NadekoBot/Db/Models/WaifuUpdate.cs

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

src/NadekoBot/Db/NadekoContext.cs

@@ -6,7 +6,7 @@ using NadekoBot.Core.Services.Impl;
 using System;
 using System.IO;
 using Microsoft.Extensions.Logging;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Db.Models;
 
 namespace NadekoBot.Core.Services.Database
 {

src/NadekoBot/Modules/Administration/Services/AdministrationService.cs

@@ -12,7 +12,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using NadekoBot.Core.Services.Database.Repositories.Impl;
+using NadekoBot.Db;
 
 namespace NadekoBot.Modules.Administration.Services
 {

src/NadekoBot/Modules/Administration/Services/AutoAssignRoleService.cs

@@ -9,7 +9,7 @@ using System.Threading.Channels;
 using LinqToDB;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Core.Services.Database.Models;
-using NadekoBot.Core.Services.Database.Repositories.Impl;
+using NadekoBot.Db;
 using NadekoBot.Extensions;
 using Serilog;
 

src/NadekoBot/Modules/Administration/Services/GameVoiceChannelService.cs

@@ -5,7 +5,7 @@ using Discord.WebSocket;
 using NadekoBot.Common.Collections;
 using NadekoBot.Extensions;
 using NadekoBot.Core.Services;
-using NadekoBot.Core.Services.Database.Repositories.Impl;
+using NadekoBot.Db;
 using Serilog;
 
 namespace NadekoBot.Modules.Administration.Services

src/NadekoBot/Modules/Administration/Services/GuildTimezoneService.cs

@@ -6,6 +6,7 @@ using NadekoBot.Extensions;
 using NadekoBot.Core.Services;
 using NadekoBot.Core.Services.Database.Models;
 using System.Threading.Tasks;
+using NadekoBot.Db;
 
 namespace NadekoBot.Modules.Administration.Services
 {

src/NadekoBot/Modules/Administration/Services/LogCommandService.cs

@@ -12,6 +12,7 @@ using Microsoft.Extensions.Caching.Memory;
 using NadekoBot.Common.Collections;
 using NadekoBot.Core.Services;
 using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Db;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Administration.Common;
 

src/NadekoBot/Modules/Administration/Services/MuteService.cs

@@ -10,6 +10,7 @@ using NadekoBot.Common.Collections;
 using NadekoBot.Extensions;
 using NadekoBot.Core.Services;
 using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Db;
 using Serilog;
 
 namespace NadekoBot.Modules.Administration.Services

src/NadekoBot/Modules/Administration/Services/ProtectionService.cs

@@ -11,6 +11,7 @@ using NadekoBot.Core.Services.Database.Models;
 using NadekoBot.Extensions;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Core.Common.TypeReaders.Models;
+using NadekoBot.Db;
 using Serilog;
 
 namespace NadekoBot.Modules.Administration.Services

src/NadekoBot/Modules/Administration/Services/RoleCommandsService.cs

@@ -8,6 +8,7 @@ using NadekoBot.Extensions;
 using System.Collections.Concurrent;
 using System.Linq;
 using System.Threading.Tasks;
+using NadekoBot.Db;
 using Serilog;
 
 namespace NadekoBot.Modules.Administration.Services

src/NadekoBot/Modules/Administration/Services/SelfAssignedRolesService.cs

@@ -1,15 +1,13 @@
 using Discord;
-using Microsoft.EntityFrameworkCore;
 using NadekoBot.Core.Services;
 using NadekoBot.Core.Services.Database.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using NadekoBot.Modules.Administration;
+using Microsoft.EntityFrameworkCore;
+using NadekoBot.Db;
 using NadekoBot.Modules.Xp;
-using NadekoBot.Modules.Administration.Common;
-using NadekoBot.Modules.Xp.Common;
 
 namespace NadekoBot.Modules.Administration.Services
 {

src/NadekoBot/Modules/Administration/Services/UserPunishService.cs

@@ -12,8 +12,8 @@ using NadekoBot.Common.Replacements;
 using NadekoBot.Core.Common.TypeReaders.Models;
 using NadekoBot.Core.Services;
 using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Db;
 using NadekoBot.Extensions;
-using NadekoBot.Modules.Administration.Common;
 using NadekoBot.Modules.Permissions.Services;
 using Newtonsoft.Json;
 using Serilog;

src/NadekoBot/Modules/Administration/Services/VcRoleService.cs

@@ -8,6 +8,7 @@ using Discord.WebSocket;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Core.Services;
 using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Db;
 using Serilog;
 
 namespace NadekoBot.Modules.Administration.Services

src/NadekoBot/Modules/Gambling/BlackJackCommands.cs

@@ -5,7 +5,6 @@ using NadekoBot.Common;
 using NadekoBot.Modules.Gambling.Common;
 using NadekoBot.Modules.Gambling.Common.Blackjack;
 using NadekoBot.Modules.Gambling.Services;
-using NadekoBot.Services;
 using NadekoBot.Extensions;
 using System.Linq;
 using System.Threading.Tasks;

src/NadekoBot/Modules/Gambling/DiceRollCommands.cs

@@ -2,7 +2,6 @@ using Discord;
 using Discord.Commands;
 using NadekoBot.Common;
 using NadekoBot.Common.Attributes;
-using NadekoBot.Services;
 using NadekoBot.Extensions;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;

src/NadekoBot/Modules/Gambling/DrawCommands.cs

@@ -12,7 +12,6 @@ using NadekoBot.Modules.Gambling.Common;
 using Image = SixLabors.ImageSharp.Image;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;
-using NadekoBot.Services;
 
 namespace NadekoBot.Modules.Gambling
 {

src/NadekoBot/Modules/Gambling/Gambling.cs

@@ -4,7 +4,7 @@ using Discord.WebSocket;
 using NadekoBot.Common;
 using NadekoBot.Common.Attributes;
 using NadekoBot.Modules.Gambling.Common;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Db.Models;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Gambling.Services;
 using System;
@@ -17,6 +17,7 @@ using NadekoBot.Core.Common;
 using NadekoBot.Core.Services;
 using NadekoBot.Core.Services.Database;
 using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Db;
 
 namespace NadekoBot.Modules.Gambling
 {

src/NadekoBot/Modules/Gambling/Services/GamblingService.cs

@@ -11,6 +11,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Common;
+using NadekoBot.Db;
 using NadekoBot.Modules.Gambling.Services;
 using Serilog;
 

src/NadekoBot/Modules/Gambling/Services/Impl/ShopService.cs

@@ -5,6 +5,7 @@ using NadekoBot.Common.Collections;
 using NadekoBot.Core.Services;
 using NadekoBot.Core.Services.Database;
 using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Db;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Administration;
 

src/NadekoBot/Modules/Gambling/Services/PlantPickService.cs

@@ -19,7 +19,7 @@ using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using NadekoBot.Modules.Administration;
+using NadekoBot.Db;
 using Image = SixLabors.ImageSharp.Image;
 using Color = SixLabors.ImageSharp.Color;
 

src/NadekoBot/Modules/Gambling/Services/WaifuService.cs

@@ -1,16 +1,15 @@
 using Discord;
-using Microsoft.EntityFrameworkCore;
 using NadekoBot.Modules.Gambling.Common.Waifu;
 using NadekoBot.Core.Services;
 using NadekoBot.Core.Services.Database.Models;
-using NadekoBot.Core.Services.Database.Repositories;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using NadekoBot.Db;
 using NadekoBot.Modules.Gambling.Common;
-using NadekoBot.Modules.Gambling.Services;
+using NadekoBot.Db.Models;
-using NadekoBot.Services.Database.Models;
 
 namespace NadekoBot.Modules.Gambling.Services
 {

src/NadekoBot/Modules/Gambling/ShopCommands.cs

@@ -12,6 +12,7 @@ using NadekoBot.Modules.Gambling.Common;
 using NadekoBot.Modules.Gambling.Services;
 using NadekoBot.Core.Services;
 using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Db;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Administration;
 using Serilog;

src/NadekoBot/Modules/Games/CleverBotCommands.cs

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

src/NadekoBot/Modules/Games/Common/PollRunner.cs

@@ -1,7 +1,6 @@
 using System.Threading.Tasks;
 using Discord;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Db.Models;
-using NadekoBot.Services;
 using System;
 using System.Linq;
 using System.Threading;

src/NadekoBot/Modules/Games/Common/TicTacToe.cs

@@ -9,7 +9,6 @@ using CommandLine;
 using NadekoBot.Common;
 using NadekoBot.Core.Common;
 using NadekoBot.Core.Services;
-using NadekoBot.Services;
 
 namespace NadekoBot.Modules.Games.Common
 {

src/NadekoBot/Modules/Games/Services/PollService.cs

@@ -6,11 +6,11 @@ using Discord;
 using Discord.WebSocket;
 using NadekoBot.Common.ModuleBehaviors;
 using NadekoBot.Modules.Games.Common;
-using NadekoBot.Services;
+using NadekoBot.Db.Models;
-using NadekoBot.Services.Database.Models;
 using NadekoBot.Common.Collections;
 using NadekoBot.Core.Services;
 using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Db;
 using NadekoBot.Extensions;
 using Serilog;