From 067db1b81cde0182854d65656f678255a878087d Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Fri, 15 Apr 2016 00:50:44 +0200 Subject: [PATCH] Refactor done --- NadekoBot/Classes/DBHandler.cs | 2 +- NadekoBot/Classes/FlowersHandler.cs | 6 +++--- NadekoBot/Classes/NadekoStats.cs | 4 ++-- .../Modules/Administration/AdministrationModule.cs | 4 ++-- NadekoBot/Modules/Administration/Commands/Remind.cs | 2 +- .../Administration/Commands/ServerGreetCommand.cs | 8 ++++---- .../Modules/Conversations/Commands/RequestsCommand.cs | 10 +++++----- NadekoBot/Modules/Conversations/Conversations.cs | 4 ++-- NadekoBot/{Classes => Modules}/DiscordCommand.cs | 0 NadekoBot/Modules/Games/Commands/SpeedTyping.cs | 2 +- NadekoBot/Modules/Music/MusicModule.cs | 6 +++--- NadekoBot/Modules/Pokemon/PokemonModule.cs | 2 +- .../Searches/Commands}/IMDB/ImdbMovie.cs | 2 +- .../Searches/Commands}/IMDB/ImdbScraper.cs | 2 +- NadekoBot/Modules/Searches/SearchesModule.cs | 2 +- .../DataModels}/AnnouncementModel.cs | 6 ++++-- .../DataModels}/CommandModel.cs | 2 +- .../DataModels}/CurrencyStateModel.cs | 2 +- .../DataModels}/CurrencyTransactionModel.cs | 2 +- .../{_DataModels => _Models/DataModels}/Donator.cs | 2 +- .../{_DataModels => _Models/DataModels}/IDataModel.cs | 2 +- .../DataModels}/MusicPlaylist.cs | 2 +- .../DataModels}/PlaylistSongInfo.cs | 2 +- .../{_DataModels => _Models/DataModels}/PokeTypes.cs | 2 +- .../{_DataModels => _Models/DataModels}/Reminder.cs | 2 +- .../DataModels}/RequestModel.cs | 2 +- .../{_DataModels => _Models/DataModels}/SongInfo.cs | 2 +- .../{_DataModels => _Models/DataModels}/StatsModel.cs | 2 +- .../DataModels}/TypingArticleModel.cs | 2 +- .../DataModels}/UserQuoteModel.cs | 2 +- .../{Classes => _Models}/JSONModels/AnimeResult.cs | 0 .../{Classes => _Models}/JSONModels/Configuration.cs | 0 .../JSONModels/LocalizedStrings.cs | 0 NadekoBot/{Classes => _Models}/JSONModels/MagicItem.cs | 0 .../{Classes => _Models}/JSONModels/MangaResult.cs | 0 .../{Classes => _Models}/JSONModels/PokemonType.cs | 0 .../{Classes => _Models}/JSONModels/_JSONModels.cs | 0 37 files changed, 46 insertions(+), 44 deletions(-) rename NadekoBot/{Classes => Modules}/DiscordCommand.cs (100%) rename NadekoBot/{Classes => Modules/Searches/Commands}/IMDB/ImdbMovie.cs (98%) rename NadekoBot/{Classes => Modules/Searches/Commands}/IMDB/ImdbScraper.cs (99%) rename NadekoBot/{_DataModels => _Models/DataModels}/AnnouncementModel.cs (87%) rename NadekoBot/{_DataModels => _Models/DataModels}/CommandModel.cs (90%) rename NadekoBot/{_DataModels => _Models/DataModels}/CurrencyStateModel.cs (81%) rename NadekoBot/{_DataModels => _Models/DataModels}/CurrencyTransactionModel.cs (83%) rename NadekoBot/{_DataModels => _Models/DataModels}/Donator.cs (82%) rename NadekoBot/{_DataModels => _Models/DataModels}/IDataModel.cs (90%) rename NadekoBot/{_DataModels => _Models/DataModels}/MusicPlaylist.cs (84%) rename NadekoBot/{_DataModels => _Models/DataModels}/PlaylistSongInfo.cs (82%) rename NadekoBot/{_DataModels => _Models/DataModels}/PokeTypes.cs (88%) rename NadekoBot/{_DataModels => _Models/DataModels}/Reminder.cs (91%) rename NadekoBot/{_DataModels => _Models/DataModels}/RequestModel.cs (89%) rename NadekoBot/{_DataModels => _Models/DataModels}/SongInfo.cs (91%) rename NadekoBot/{_DataModels => _Models/DataModels}/StatsModel.cs (88%) rename NadekoBot/{_DataModels => _Models/DataModels}/TypingArticleModel.cs (72%) rename NadekoBot/{_DataModels => _Models/DataModels}/UserQuoteModel.cs (83%) rename NadekoBot/{Classes => _Models}/JSONModels/AnimeResult.cs (100%) rename NadekoBot/{Classes => _Models}/JSONModels/Configuration.cs (100%) rename NadekoBot/{Classes => _Models}/JSONModels/LocalizedStrings.cs (100%) rename NadekoBot/{Classes => _Models}/JSONModels/MagicItem.cs (100%) rename NadekoBot/{Classes => _Models}/JSONModels/MangaResult.cs (100%) rename NadekoBot/{Classes => _Models}/JSONModels/PokemonType.cs (100%) rename NadekoBot/{Classes => _Models}/JSONModels/_JSONModels.cs (100%) diff --git a/NadekoBot/Classes/DBHandler.cs b/NadekoBot/Classes/DBHandler.cs index 36e5ccca..b6b85c9c 100644 --- a/NadekoBot/Classes/DBHandler.cs +++ b/NadekoBot/Classes/DBHandler.cs @@ -1,4 +1,4 @@ -using NadekoBot._DataModels; +using NadekoBot.DataModels; using SQLite; using System; using System.Collections.Generic; diff --git a/NadekoBot/Classes/FlowersHandler.cs b/NadekoBot/Classes/FlowersHandler.cs index d696c0b1..c7dbf9a5 100644 --- a/NadekoBot/Classes/FlowersHandler.cs +++ b/NadekoBot/Classes/FlowersHandler.cs @@ -10,7 +10,7 @@ namespace NadekoBot.Classes return; await Task.Run(() => { - DbHandler.Instance.InsertData(new _DataModels.CurrencyTransaction + DbHandler.Instance.InsertData(new DataModels.CurrencyTransaction { Reason = reason, UserId = (long)u.Id, @@ -34,12 +34,12 @@ namespace NadekoBot.Classes if (amount <= 0) return false; var uid = (long)u.Id; - var state = DbHandler.Instance.FindOne<_DataModels.CurrencyState>(cs => cs.UserId == uid); + var state = DbHandler.Instance.FindOne(cs => cs.UserId == uid); if (state.Value < amount) return false; - DbHandler.Instance.InsertData(new _DataModels.CurrencyTransaction + DbHandler.Instance.InsertData(new DataModels.CurrencyTransaction { Reason = reason, UserId = (long)u.Id, diff --git a/NadekoBot/Classes/NadekoStats.cs b/NadekoBot/Classes/NadekoStats.cs index a8fc8f94..b829dc30 100644 --- a/NadekoBot/Classes/NadekoStats.cs +++ b/NadekoBot/Classes/NadekoStats.cs @@ -182,7 +182,7 @@ namespace NadekoBot .Sum(x => x.Users.Count(u => u.Status == UserStatus.Online))); var connectedServers = NadekoBot.Client.Servers.Count(); - Classes.DbHandler.Instance.InsertData(new _DataModels.Stats + Classes.DbHandler.Instance.InsertData(new DataModels.Stats { OnlineUsers = onlineUsers, RealOnlineUsers = realOnlineUsers, @@ -207,7 +207,7 @@ namespace NadekoBot try { commandsRan++; - Classes.DbHandler.Instance.InsertData(new _DataModels.Command + Classes.DbHandler.Instance.InsertData(new DataModels.Command { ServerId = (long)e.Server.Id, ServerName = e.Server.Name, diff --git a/NadekoBot/Modules/Administration/AdministrationModule.cs b/NadekoBot/Modules/Administration/AdministrationModule.cs index 572849eb..948df3a5 100644 --- a/NadekoBot/Modules/Administration/AdministrationModule.cs +++ b/NadekoBot/Modules/Administration/AdministrationModule.cs @@ -1,7 +1,7 @@ using Discord; using Discord.Commands; using Discord.Modules; -using NadekoBot._DataModels; +using NadekoBot.DataModels; using NadekoBot.Classes; using NadekoBot.Extensions; using NadekoBot.Modules.Administration.Commands; @@ -727,7 +727,7 @@ namespace NadekoBot.Modules.Administration await Task.Run(() => { SaveParseToDb("data/parsedata/Announcements.json"); - SaveParseToDb<_DataModels.Command>("data/parsedata/CommandsRan.json"); + SaveParseToDb("data/parsedata/CommandsRan.json"); SaveParseToDb("data/parsedata/Requests.json"); SaveParseToDb("data/parsedata/Stats.json"); SaveParseToDb("data/parsedata/TypingArticles.json"); diff --git a/NadekoBot/Modules/Administration/Commands/Remind.cs b/NadekoBot/Modules/Administration/Commands/Remind.cs index f14ca224..6b20fa2c 100644 --- a/NadekoBot/Modules/Administration/Commands/Remind.cs +++ b/NadekoBot/Modules/Administration/Commands/Remind.cs @@ -1,7 +1,7 @@ using Discord; using Discord.Commands; -using NadekoBot._DataModels; using NadekoBot.Classes; +using NadekoBot.DataModels; using System; using System.Collections.Generic; using System.Linq; diff --git a/NadekoBot/Modules/Administration/Commands/ServerGreetCommand.cs b/NadekoBot/Modules/Administration/Commands/ServerGreetCommand.cs index 80e346b0..a2fb5f55 100644 --- a/NadekoBot/Modules/Administration/Commands/ServerGreetCommand.cs +++ b/NadekoBot/Modules/Administration/Commands/ServerGreetCommand.cs @@ -34,7 +34,7 @@ namespace NadekoBot.Modules.Administration.Commands NadekoBot.Client.UserJoined += UserJoined; NadekoBot.Client.UserLeft += UserLeft; - var data = Classes.DbHandler.Instance.GetAllRows<_DataModels.Announcement>(); + var data = Classes.DbHandler.Instance.GetAllRows(); if (!data.Any()) return; foreach (var obj in data) @@ -114,7 +114,7 @@ namespace NadekoBot.Modules.Administration.Commands public class AnnounceControls { - private _DataModels.Announcement _model { get; } + private DataModels.Announcement _model { get; } public bool Greet { get { return _model.Greet; } @@ -160,14 +160,14 @@ namespace NadekoBot.Modules.Administration.Commands set { _model.ServerId = (long)value; } } - public AnnounceControls(_DataModels.Announcement model) + public AnnounceControls(DataModels.Announcement model) { this._model = model; } public AnnounceControls(ulong serverId) { - this._model = new _DataModels.Announcement(); + this._model = new DataModels.Announcement(); ServerId = serverId; } diff --git a/NadekoBot/Modules/Conversations/Commands/RequestsCommand.cs b/NadekoBot/Modules/Conversations/Commands/RequestsCommand.cs index e57e8b90..2713f15f 100644 --- a/NadekoBot/Modules/Conversations/Commands/RequestsCommand.cs +++ b/NadekoBot/Modules/Conversations/Commands/RequestsCommand.cs @@ -10,7 +10,7 @@ namespace NadekoBot.Classes.Conversations.Commands { public void SaveRequest(CommandEventArgs e, string text) { - DbHandler.Instance.InsertData(new _DataModels.Request + DbHandler.Instance.InsertData(new DataModels.Request { RequestText = text, UserName = e.User.Name, @@ -23,7 +23,7 @@ namespace NadekoBot.Classes.Conversations.Commands // todo what if it's too long? public string GetRequests() { - var task = DbHandler.Instance.GetAllRows<_DataModels.Request>(); + var task = DbHandler.Instance.GetAllRows(); var str = "Here are all current requests for NadekoBot:\n\n"; foreach (var reqObj in task) @@ -35,14 +35,14 @@ namespace NadekoBot.Classes.Conversations.Commands } public bool DeleteRequest(int requestNumber) => - DbHandler.Instance.Delete<_DataModels.Request>(requestNumber) != null; + DbHandler.Instance.Delete(requestNumber) != null; /// /// Delete a request with a number and returns that request object. /// /// RequestObject of the request. Null if none - public _DataModels.Request ResolveRequest(int requestNumber) => - DbHandler.Instance.Delete<_DataModels.Request>(requestNumber); + public DataModels.Request ResolveRequest(int requestNumber) => + DbHandler.Instance.Delete(requestNumber); internal override void Init(CommandGroupBuilder cgb) { diff --git a/NadekoBot/Modules/Conversations/Conversations.cs b/NadekoBot/Modules/Conversations/Conversations.cs index 14c9bc10..9bb9db52 100644 --- a/NadekoBot/Modules/Conversations/Conversations.cs +++ b/NadekoBot/Modules/Conversations/Conversations.cs @@ -88,7 +88,7 @@ namespace NadekoBot.Modules.Conversations if (string.IsNullOrWhiteSpace(text)) return; await Task.Run(() => - Classes.DbHandler.Instance.InsertData(new _DataModels.UserQuote() + Classes.DbHandler.Instance.InsertData(new DataModels.UserQuote() { DateAdded = DateTime.Now, Keyword = e.GetArg("keyword").ToLowerInvariant(), @@ -109,7 +109,7 @@ namespace NadekoBot.Modules.Conversations return; var quote = - Classes.DbHandler.Instance.GetRandom<_DataModels.UserQuote>( + Classes.DbHandler.Instance.GetRandom( uqm => uqm.Keyword == keyword); if (quote != null) diff --git a/NadekoBot/Classes/DiscordCommand.cs b/NadekoBot/Modules/DiscordCommand.cs similarity index 100% rename from NadekoBot/Classes/DiscordCommand.cs rename to NadekoBot/Modules/DiscordCommand.cs diff --git a/NadekoBot/Modules/Games/Commands/SpeedTyping.cs b/NadekoBot/Modules/Games/Commands/SpeedTyping.cs index ceb7a3b5..f4e18d1a 100644 --- a/NadekoBot/Modules/Games/Commands/SpeedTyping.cs +++ b/NadekoBot/Modules/Games/Commands/SpeedTyping.cs @@ -1,7 +1,7 @@ using Discord; using Discord.Commands; -using NadekoBot._DataModels; using NadekoBot.Classes; +using NadekoBot.DataModels; using NadekoBot.Extensions; using System; using System.Collections.Concurrent; diff --git a/NadekoBot/Modules/Music/MusicModule.cs b/NadekoBot/Modules/Music/MusicModule.cs index 00b1af41..c770d75a 100644 --- a/NadekoBot/Modules/Music/MusicModule.cs +++ b/NadekoBot/Modules/Music/MusicModule.cs @@ -1,7 +1,7 @@ using Discord; using Discord.Commands; using Discord.Modules; -using NadekoBot._DataModels; +using NadekoBot.DataModels; using NadekoBot.Classes; using NadekoBot.Extensions; using NadekoBot.Modules.Music.Classes; @@ -443,7 +443,7 @@ namespace NadekoBot.Modules.Music return; - var songInfos = currentPlaylist.Select(s => new _DataModels.SongInfo + var songInfos = currentPlaylist.Select(s => new DataModels.SongInfo { Provider = s.SongInfo.Provider, ProviderType = (int)s.SongInfo.ProviderType, @@ -519,7 +519,7 @@ namespace NadekoBot.Modules.Music psi.PlaylistId == playlist.Id); var songInfos = psis.Select(psi => DbHandler.Instance - .FindOne<_DataModels.SongInfo>(si => si.Id == psi.SongInfoId)); + .FindOne(si => si.Id == psi.SongInfoId)); await e.Channel.SendMessage($"`Attempting to load {songInfos.Count()} songs`"); foreach (var si in songInfos) diff --git a/NadekoBot/Modules/Pokemon/PokemonModule.cs b/NadekoBot/Modules/Pokemon/PokemonModule.cs index 87e9a7e6..ab3ced33 100644 --- a/NadekoBot/Modules/Pokemon/PokemonModule.cs +++ b/NadekoBot/Modules/Pokemon/PokemonModule.cs @@ -1,7 +1,7 @@ using Discord.Commands; using Discord.Modules; using NadekoBot.Classes; -using NadekoBot._DataModels; +using NadekoBot.DataModels; using NadekoBot.Classes.JSONModels; using NadekoBot.Extensions; using NadekoBot.Modules.Permissions.Classes; diff --git a/NadekoBot/Classes/IMDB/ImdbMovie.cs b/NadekoBot/Modules/Searches/Commands/IMDB/ImdbMovie.cs similarity index 98% rename from NadekoBot/Classes/IMDB/ImdbMovie.cs rename to NadekoBot/Modules/Searches/Commands/IMDB/ImdbMovie.cs index 3803c7bd..87397dbf 100644 --- a/NadekoBot/Classes/IMDB/ImdbMovie.cs +++ b/NadekoBot/Modules/Searches/Commands/IMDB/ImdbMovie.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Web; -namespace NadekoBot.Classes.IMDB +namespace NadekoBot.Modules.Searches.Commands.IMDB { public class ImdbMovie { diff --git a/NadekoBot/Classes/IMDB/ImdbScraper.cs b/NadekoBot/Modules/Searches/Commands/IMDB/ImdbScraper.cs similarity index 99% rename from NadekoBot/Classes/IMDB/ImdbScraper.cs rename to NadekoBot/Modules/Searches/Commands/IMDB/ImdbScraper.cs index cd319e19..1735eda6 100644 --- a/NadekoBot/Classes/IMDB/ImdbScraper.cs +++ b/NadekoBot/Modules/Searches/Commands/IMDB/ImdbScraper.cs @@ -18,7 +18,7 @@ using System.Text.RegularExpressions; * Last Updated: Feb, 2016 *******************************************************************************/ -namespace NadekoBot.Classes.IMDB +namespace NadekoBot.Modules.Searches.Commands.IMDB { public static class ImdbScraper { diff --git a/NadekoBot/Modules/Searches/SearchesModule.cs b/NadekoBot/Modules/Searches/SearchesModule.cs index cfb4f6f3..532fe7d2 100644 --- a/NadekoBot/Modules/Searches/SearchesModule.cs +++ b/NadekoBot/Modules/Searches/SearchesModule.cs @@ -1,11 +1,11 @@ using Discord.Commands; using Discord.Modules; using NadekoBot.Classes; -using NadekoBot.Classes.IMDB; using NadekoBot.Classes.JSONModels; using NadekoBot.Extensions; using NadekoBot.Modules.Permissions.Classes; using NadekoBot.Modules.Searches.Commands; +using NadekoBot.Modules.Searches.Commands.IMDB; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using System; diff --git a/NadekoBot/_DataModels/AnnouncementModel.cs b/NadekoBot/_Models/DataModels/AnnouncementModel.cs similarity index 87% rename from NadekoBot/_DataModels/AnnouncementModel.cs rename to NadekoBot/_Models/DataModels/AnnouncementModel.cs index ace4a0d0..534daf24 100644 --- a/NadekoBot/_DataModels/AnnouncementModel.cs +++ b/NadekoBot/_Models/DataModels/AnnouncementModel.cs @@ -1,7 +1,9 @@ using Newtonsoft.Json; -namespace NadekoBot._DataModels { - internal class Announcement : IDataModel { +namespace NadekoBot.DataModels +{ + internal class Announcement : IDataModel + { public long ServerId { get; set; } = 0; public bool Greet { get; set; } = false; public bool GreetPM { get; set; } = false; diff --git a/NadekoBot/_DataModels/CommandModel.cs b/NadekoBot/_Models/DataModels/CommandModel.cs similarity index 90% rename from NadekoBot/_DataModels/CommandModel.cs rename to NadekoBot/_Models/DataModels/CommandModel.cs index 2402bd4b..204ec061 100644 --- a/NadekoBot/_DataModels/CommandModel.cs +++ b/NadekoBot/_Models/DataModels/CommandModel.cs @@ -1,4 +1,4 @@ -namespace NadekoBot._DataModels { +namespace NadekoBot.DataModels { internal class Command : IDataModel { public long UserId { get; set; } public string UserName { get; set; } diff --git a/NadekoBot/_DataModels/CurrencyStateModel.cs b/NadekoBot/_Models/DataModels/CurrencyStateModel.cs similarity index 81% rename from NadekoBot/_DataModels/CurrencyStateModel.cs rename to NadekoBot/_Models/DataModels/CurrencyStateModel.cs index 43e8eebe..9c8b8671 100644 --- a/NadekoBot/_DataModels/CurrencyStateModel.cs +++ b/NadekoBot/_Models/DataModels/CurrencyStateModel.cs @@ -1,4 +1,4 @@ -namespace NadekoBot._DataModels { +namespace NadekoBot.DataModels { internal class CurrencyState : IDataModel { public long Value { get; set; } [SQLite.Unique] diff --git a/NadekoBot/_DataModels/CurrencyTransactionModel.cs b/NadekoBot/_Models/DataModels/CurrencyTransactionModel.cs similarity index 83% rename from NadekoBot/_DataModels/CurrencyTransactionModel.cs rename to NadekoBot/_Models/DataModels/CurrencyTransactionModel.cs index 95a377df..51fcccc3 100644 --- a/NadekoBot/_DataModels/CurrencyTransactionModel.cs +++ b/NadekoBot/_Models/DataModels/CurrencyTransactionModel.cs @@ -1,4 +1,4 @@ -namespace NadekoBot._DataModels { +namespace NadekoBot.DataModels { internal class CurrencyTransaction : IDataModel { public string Reason { get; set; } public int Value { get; set; } diff --git a/NadekoBot/_DataModels/Donator.cs b/NadekoBot/_Models/DataModels/Donator.cs similarity index 82% rename from NadekoBot/_DataModels/Donator.cs rename to NadekoBot/_Models/DataModels/Donator.cs index 9aa56e83..483898ec 100644 --- a/NadekoBot/_DataModels/Donator.cs +++ b/NadekoBot/_Models/DataModels/Donator.cs @@ -1,4 +1,4 @@ -namespace NadekoBot._DataModels { +namespace NadekoBot.DataModels { internal class Donator : IDataModel { public long UserId { get; set; } public string UserName { get; set; } diff --git a/NadekoBot/_DataModels/IDataModel.cs b/NadekoBot/_Models/DataModels/IDataModel.cs similarity index 90% rename from NadekoBot/_DataModels/IDataModel.cs rename to NadekoBot/_Models/DataModels/IDataModel.cs index 9837e737..90191474 100644 --- a/NadekoBot/_DataModels/IDataModel.cs +++ b/NadekoBot/_Models/DataModels/IDataModel.cs @@ -1,7 +1,7 @@ using SQLite; using System; -namespace NadekoBot._DataModels +namespace NadekoBot.DataModels { internal abstract class IDataModel { diff --git a/NadekoBot/_DataModels/MusicPlaylist.cs b/NadekoBot/_Models/DataModels/MusicPlaylist.cs similarity index 84% rename from NadekoBot/_DataModels/MusicPlaylist.cs rename to NadekoBot/_Models/DataModels/MusicPlaylist.cs index c841d33b..60973baa 100644 --- a/NadekoBot/_DataModels/MusicPlaylist.cs +++ b/NadekoBot/_Models/DataModels/MusicPlaylist.cs @@ -1,4 +1,4 @@ -namespace NadekoBot._DataModels +namespace NadekoBot.DataModels { internal class MusicPlaylist : IDataModel { diff --git a/NadekoBot/_DataModels/PlaylistSongInfo.cs b/NadekoBot/_Models/DataModels/PlaylistSongInfo.cs similarity index 82% rename from NadekoBot/_DataModels/PlaylistSongInfo.cs rename to NadekoBot/_Models/DataModels/PlaylistSongInfo.cs index 0585dd47..84929781 100644 --- a/NadekoBot/_DataModels/PlaylistSongInfo.cs +++ b/NadekoBot/_Models/DataModels/PlaylistSongInfo.cs @@ -1,4 +1,4 @@ -namespace NadekoBot._DataModels +namespace NadekoBot.DataModels { internal class PlaylistSongInfo : IDataModel { diff --git a/NadekoBot/_DataModels/PokeTypes.cs b/NadekoBot/_Models/DataModels/PokeTypes.cs similarity index 88% rename from NadekoBot/_DataModels/PokeTypes.cs rename to NadekoBot/_Models/DataModels/PokeTypes.cs index 67d090a0..d0f538af 100644 --- a/NadekoBot/_DataModels/PokeTypes.cs +++ b/NadekoBot/_Models/DataModels/PokeTypes.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace NadekoBot._DataModels +namespace NadekoBot.DataModels { class UserPokeTypes : IDataModel { diff --git a/NadekoBot/_DataModels/Reminder.cs b/NadekoBot/_Models/DataModels/Reminder.cs similarity index 91% rename from NadekoBot/_DataModels/Reminder.cs rename to NadekoBot/_Models/DataModels/Reminder.cs index 252c9f70..043700fd 100644 --- a/NadekoBot/_DataModels/Reminder.cs +++ b/NadekoBot/_Models/DataModels/Reminder.cs @@ -1,6 +1,6 @@ using System; -namespace NadekoBot._DataModels +namespace NadekoBot.DataModels { class Reminder : IDataModel { diff --git a/NadekoBot/_DataModels/RequestModel.cs b/NadekoBot/_Models/DataModels/RequestModel.cs similarity index 89% rename from NadekoBot/_DataModels/RequestModel.cs rename to NadekoBot/_Models/DataModels/RequestModel.cs index 720f2ee6..7b86198f 100644 --- a/NadekoBot/_DataModels/RequestModel.cs +++ b/NadekoBot/_Models/DataModels/RequestModel.cs @@ -1,4 +1,4 @@ -namespace NadekoBot._DataModels { +namespace NadekoBot.DataModels { internal class Request : IDataModel { public string UserName { get; set; } public long UserId { get; set; } diff --git a/NadekoBot/_DataModels/SongInfo.cs b/NadekoBot/_Models/DataModels/SongInfo.cs similarity index 91% rename from NadekoBot/_DataModels/SongInfo.cs rename to NadekoBot/_Models/DataModels/SongInfo.cs index 275a780c..6fe980ac 100644 --- a/NadekoBot/_DataModels/SongInfo.cs +++ b/NadekoBot/_Models/DataModels/SongInfo.cs @@ -1,6 +1,6 @@ using SQLite; -namespace NadekoBot._DataModels +namespace NadekoBot.DataModels { internal class SongInfo : IDataModel { diff --git a/NadekoBot/_DataModels/StatsModel.cs b/NadekoBot/_Models/DataModels/StatsModel.cs similarity index 88% rename from NadekoBot/_DataModels/StatsModel.cs rename to NadekoBot/_Models/DataModels/StatsModel.cs index aa7a61f6..480b569f 100644 --- a/NadekoBot/_DataModels/StatsModel.cs +++ b/NadekoBot/_Models/DataModels/StatsModel.cs @@ -1,6 +1,6 @@ using System; -namespace NadekoBot._DataModels { +namespace NadekoBot.DataModels { internal class Stats : IDataModel { public int ConnectedServers { get; set; } public int OnlineUsers { get; set; } diff --git a/NadekoBot/_DataModels/TypingArticleModel.cs b/NadekoBot/_Models/DataModels/TypingArticleModel.cs similarity index 72% rename from NadekoBot/_DataModels/TypingArticleModel.cs rename to NadekoBot/_Models/DataModels/TypingArticleModel.cs index a3fc09da..2557a51c 100644 --- a/NadekoBot/_DataModels/TypingArticleModel.cs +++ b/NadekoBot/_Models/DataModels/TypingArticleModel.cs @@ -1,4 +1,4 @@ -namespace NadekoBot._DataModels { +namespace NadekoBot.DataModels { internal class TypingArticle : IDataModel { public string Text { get; set; } } diff --git a/NadekoBot/_DataModels/UserQuoteModel.cs b/NadekoBot/_Models/DataModels/UserQuoteModel.cs similarity index 83% rename from NadekoBot/_DataModels/UserQuoteModel.cs rename to NadekoBot/_Models/DataModels/UserQuoteModel.cs index bfda00cc..544252cc 100644 --- a/NadekoBot/_DataModels/UserQuoteModel.cs +++ b/NadekoBot/_Models/DataModels/UserQuoteModel.cs @@ -1,4 +1,4 @@ -namespace NadekoBot._DataModels { +namespace NadekoBot.DataModels { internal class UserQuote : IDataModel { public string UserName { get; set; } public string Keyword { get; set; } diff --git a/NadekoBot/Classes/JSONModels/AnimeResult.cs b/NadekoBot/_Models/JSONModels/AnimeResult.cs similarity index 100% rename from NadekoBot/Classes/JSONModels/AnimeResult.cs rename to NadekoBot/_Models/JSONModels/AnimeResult.cs diff --git a/NadekoBot/Classes/JSONModels/Configuration.cs b/NadekoBot/_Models/JSONModels/Configuration.cs similarity index 100% rename from NadekoBot/Classes/JSONModels/Configuration.cs rename to NadekoBot/_Models/JSONModels/Configuration.cs diff --git a/NadekoBot/Classes/JSONModels/LocalizedStrings.cs b/NadekoBot/_Models/JSONModels/LocalizedStrings.cs similarity index 100% rename from NadekoBot/Classes/JSONModels/LocalizedStrings.cs rename to NadekoBot/_Models/JSONModels/LocalizedStrings.cs diff --git a/NadekoBot/Classes/JSONModels/MagicItem.cs b/NadekoBot/_Models/JSONModels/MagicItem.cs similarity index 100% rename from NadekoBot/Classes/JSONModels/MagicItem.cs rename to NadekoBot/_Models/JSONModels/MagicItem.cs diff --git a/NadekoBot/Classes/JSONModels/MangaResult.cs b/NadekoBot/_Models/JSONModels/MangaResult.cs similarity index 100% rename from NadekoBot/Classes/JSONModels/MangaResult.cs rename to NadekoBot/_Models/JSONModels/MangaResult.cs diff --git a/NadekoBot/Classes/JSONModels/PokemonType.cs b/NadekoBot/_Models/JSONModels/PokemonType.cs similarity index 100% rename from NadekoBot/Classes/JSONModels/PokemonType.cs rename to NadekoBot/_Models/JSONModels/PokemonType.cs diff --git a/NadekoBot/Classes/JSONModels/_JSONModels.cs b/NadekoBot/_Models/JSONModels/_JSONModels.cs similarity index 100% rename from NadekoBot/Classes/JSONModels/_JSONModels.cs rename to NadekoBot/_Models/JSONModels/_JSONModels.cs