daan/geekbot
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity

Split Geekbot.net into src/Bot, src/Core, and src/Web

Browse source
This commit is contained in:
runebaas 2020-08-08 22:24:01 +02:00
parent 7b6dd2d2f9
commit fc0af492ad
No known key found for this signature in database
GPG key ID: 2677AF508D0300D6
197 changed files with 542 additions and 498 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.gitignore vendored
View file

@ -1,12 +1,10 @@
*/bin/
*/obj/
Geekbot.net/tmp/
/*/**/bin
/*/**/obj
src/Bot/tmp/
src/Bot/Logs/*
!/src/Bot/Logs/.keep
.vs/
UpgradeLog.htm
.idea
.vscode
Geekbot.net/Logs/*
!/Geekbot.net/Logs/.keep
Geekbot.net.sln.DotSettings.user
Geekbot.net/temp/
app

24
Geekbot.net.sln
View file

@ -3,24 +3,36 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.0.0
MinimumVisualStudioVersion = 10.0.0.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Geekbot.net", "Geekbot.net/Geekbot.net.csproj", "{FDCB3D92-E7B5-47BB-A9B5-CFAEFA57CDB4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{4CAF5F02-EFFE-4FDA-BD44-EEADDBA9600E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "src\Core\Core.csproj", "{47671723-52A9-4668-BBC5-2BA76AE3B288}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Web", "src\Web\Web.csproj", "{0A63D5DC-6325-4F53-8ED2-9843239B76CC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bot", "src\Bot\Bot.csproj", "{DBF79896-9F7F-443D-B336-155E276DFF16}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{FDCB3D92-E7B5-47BB-A9B5-CFAEFA57CDB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FDCB3D92-E7B5-47BB-A9B5-CFAEFA57CDB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FDCB3D92-E7B5-47BB-A9B5-CFAEFA57CDB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FDCB3D92-E7B5-47BB-A9B5-CFAEFA57CDB4}.Release|Any CPU.Build.0 = Release|Any CPU
{4CAF5F02-EFFE-4FDA-BD44-EEADDBA9600E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4CAF5F02-EFFE-4FDA-BD44-EEADDBA9600E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4CAF5F02-EFFE-4FDA-BD44-EEADDBA9600E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4CAF5F02-EFFE-4FDA-BD44-EEADDBA9600E}.Release|Any CPU.Build.0 = Release|Any CPU
{47671723-52A9-4668-BBC5-2BA76AE3B288}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{47671723-52A9-4668-BBC5-2BA76AE3B288}.Debug|Any CPU.Build.0 = Debug|Any CPU
{47671723-52A9-4668-BBC5-2BA76AE3B288}.Release|Any CPU.ActiveCfg = Release|Any CPU
{47671723-52A9-4668-BBC5-2BA76AE3B288}.Release|Any CPU.Build.0 = Release|Any CPU
{0A63D5DC-6325-4F53-8ED2-9843239B76CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0A63D5DC-6325-4F53-8ED2-9843239B76CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0A63D5DC-6325-4F53-8ED2-9843239B76CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0A63D5DC-6325-4F53-8ED2-9843239B76CC}.Release|Any CPU.Build.0 = Release|Any CPU
{DBF79896-9F7F-443D-B336-155E276DFF16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DBF79896-9F7F-443D-B336-155E276DFF16}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DBF79896-9F7F-443D-B336-155E276DFF16}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DBF79896-9F7F-443D-B336-155E276DFF16}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

64
Geekbot.net/Geekbot.net.csproj
View file

@ -1,64 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<RuntimeIdentifiers>win-x64;linux-x64</RuntimeIdentifiers>
<ApplicationIcon>derp.ico</ApplicationIcon>
<VersionSuffix>$(VersionSuffix)</VersionSuffix>
<Version Condition=" '$(VersionSuffix)' != '' ">$(VersionSuffix)</Version>
<Version Condition=" '$(VersionSuffix)' == '' ">0.0.0-DEV</Version>
<Company>Pizza and Coffee Studios</Company>
<Authors>Pizza and Coffee Studios</Authors>
<Description>A Discord bot</Description>
<RepositoryUrl>https://github.com/pizzaandcoffee/Geekbot.net</RepositoryUrl>
<NoWarn>NU1701</NoWarn>
<RepositoryType>git</RepositoryType>
<PackageProjectUrl>https://geekbot.pizzaandcoffee.rocks</PackageProjectUrl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<Optimize>true</Optimize>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.8.0" />
<PackageReference Include="Discord.Net" Version="2.2.0" />
<PackageReference Include="Google.Apis.YouTube.v3" Version="1.45.0.1929" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.24" />
<PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.7" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Cors" Version="2.2.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.0-preview.7.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.0-preview.7.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.0-preview.7.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="5.0.0-preview.7.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.0-preview.7.*" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0-preview.7.*" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0-preview.7.*" />
<PackageReference Include="Microsoft.Extensions.Options" Version="5.0.0-preview.7.*" />
<PackageReference Include="MtgApiManager.Lib" Version="1.2.2" />
<PackageReference Include="MyAnimeListSharp" Version="1.3.4" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="NLog" Version="4.7.2" />
<PackageReference Include="NLog.Config" Version="4.7.2" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.0-preview6" />
<PackageReference Include="PokeApi.NET" Version="1.1.2" />
<PackageReference Include="SharpRaven" Version="2.4.0" />
<PackageReference Include="SumoLogic.Logging.NLog" Version="1.0.1.3" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.Runtime.Serialization.Formatters" Version="4.3.0" />
<PackageReference Include="System.Runtime.Serialization.Json" Version="4.3.0" />
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
<PackageReference Include="YamlDotNet" Version="6.0.0" />
</ItemGroup>
<ItemGroup>
<None Update="Storage\*">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Lib\Localization\Translations.yml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\WikipediaApi\WikipediaApi.csproj" />
</ItemGroup>
</Project>

4
Tests/Lib/Converters/EmojiConverter.test.cs → Tests/Core/Converters/EmojiConverter.test.cs
View file

@ -1,7 +1,7 @@
using Geekbot.net.Lib.Converters;
using Geekbot.Core.Converters;
using Xunit;
namespace Tests.Lib.Converters
namespace Tests.Core.Converters
{
public class EmojiConverterTest
{

9
Tests/Lib/DiceParser/DiceParser.test.cs → Tests/Core/DiceParser/DiceParser.test.cs
View file

@ -1,11 +1,10 @@
using System.Collections.Generic;
using System.Text.Json;
using Geekbot.net.Lib.DiceParser;
using Geekbot.net.Lib.RandomNumberGenerator;
using Geekbot.Core.DiceParser;
using Geekbot.Core.RandomNumberGenerator;
using Xunit;
using YamlDotNet.Serialization;
namespace Tests.Lib.DiceParser
namespace Tests.Core.DiceParser
{
public class DiceParserTest
{
@ -200,7 +199,7 @@ namespace Tests.Lib.DiceParser
[Theory, MemberData(nameof(DiceParserTestData))]
public void DiceParserTestFunc(string testName, DiceParserTestDto testData)
{
var parser = new Geekbot.net.Lib.DiceParser.DiceParser(_randomNumberGenerator);
var parser = new Geekbot.Core.DiceParser.DiceParser(_randomNumberGenerator);
var result = parser.Parse(testData.Input);
Assert.Equal(JsonSerializer.Serialize(result), JsonSerializer.Serialize(testData.Expected));

6
Tests/Lib/DiceParser/SingleDie.test.cs → Tests/Core/DiceParser/SingleDie.test.cs
View file

@ -1,8 +1,8 @@
using Geekbot.net.Lib.DiceParser;
using Geekbot.net.Lib.RandomNumberGenerator;
using Geekbot.Core.DiceParser;
using Geekbot.Core.RandomNumberGenerator;
using Xunit;
namespace Tests.Lib.DiceParser
namespace Tests.Core.DiceParser
{
public class SingleDieTest
{

5
Tests/Lib/Levels/LevelCalc.test.cs → Tests/Core/Levels/LevelCalc.test.cs
View file

@ -1,8 +1,7 @@
using System.Collections.Generic;
using Geekbot.net.Lib.Levels;
using Geekbot.Core.Levels;
using Xunit;
namespace Tests.Lib.Levels
namespace Tests.Core.Levels
{
public class LevelCalcTest
{

4
Tests/Lib/Localization/TranslationGuildContext.test.cs → Tests/Core/Localization/TranslationGuildContext.test.cs
View file

@ -1,10 +1,10 @@
using System;
using System.Collections.Generic;
using Geekbot.net.Lib.Localization;
using Geekbot.Core.Localization;
using Moq;
using Xunit;
namespace Tests.Lib.Localization
namespace Tests.Core.Localization
{
public class TranslationGuildContext_test
{

4
Tests/Lib/Localization/Translations.test.cs → Tests/Core/Localization/Translations.test.cs
View file

@ -6,7 +6,7 @@ using Xunit;
using YamlDotNet.Core;
using YamlDotNet.Serialization;
namespace Tests.Lib.Localization
namespace Tests.Core.Localization
{
public class Translations_test
{
@ -14,7 +14,7 @@ namespace Tests.Lib.Localization
public void TranslationsYamlIsValid()
{
// Read the file
var translationFile = File.ReadAllText(Path.GetFullPath("./../../../../Geekbot.net/Lib/Localization/Translations.yml"));
var translationFile = File.ReadAllText(Path.GetFullPath("./../../../../src/Core/Localization/Translations.yml"));
// Deserialize
var input = new StringReader(translationFile);

2
Tests/Tests.csproj
View file

@ -15,6 +15,6 @@
<PackageReference Include="YamlDotNet" Version="6.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Geekbot.net\Geekbot.net.csproj" />
<ProjectReference Include="..\src\Bot\Bot.csproj" />
</ItemGroup>
</Project>

43
src/Bot/Bot.csproj Normal file
View file

@ -0,0 +1,43 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<RuntimeIdentifiers>win-x64;linux-x64</RuntimeIdentifiers>
<ApplicationIcon>derp.ico</ApplicationIcon>
<VersionSuffix>$(VersionSuffix)</VersionSuffix>
<RootNamespace>Geekbot.Bot</RootNamespace>
<AssemblyName>Geekbot</AssemblyName>
<Version Condition=" '$(VersionSuffix)' != '' ">$(VersionSuffix)</Version>
<Version Condition=" '$(VersionSuffix)' == '' ">0.0.0-DEV</Version>
<Company>Pizza and Coffee Studios</Company>
<Authors>Pizza and Coffee Studios</Authors>
<Description>A Discord bot</Description>
<RepositoryUrl>https://github.com/pizzaandcoffee/Geekbot.net</RepositoryUrl>
<NoWarn>NU1701</NoWarn>
<RepositoryType>git</RepositoryType>
<PackageProjectUrl>https://geekbot.pizzaandcoffee.rocks</PackageProjectUrl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<Optimize>true</Optimize>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.8.0" />
<PackageReference Include="Discord.Net" Version="2.2.0" />
<PackageReference Include="Google.Apis.YouTube.v3" Version="1.45.0.1929" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.24" />
<PackageReference Include="MtgApiManager.Lib" Version="1.2.2" />
<PackageReference Include="MyAnimeListSharp" Version="1.3.4" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="PokeApi.NET" Version="1.1.2" />
<PackageReference Include="SharpRaven" Version="2.4.0" />
</ItemGroup>
<ItemGroup>
<Content Include="Storage\*">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Core\Core.csproj" />
<ProjectReference Include="..\Web\Web.csproj" />
</ItemGroup>
</Project>

12
Geekbot.net/Commands/Admin/Admin.cs → src/Bot/Commands/Admin/Admin.cs
View file

@ -4,13 +4,13 @@ using System.Threading.Tasks;
using Discord;
using Discord.Commands;
using Discord.WebSocket;
using Geekbot.net.Lib.CommandPreconditions;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.net.Lib.Extensions;
using Geekbot.net.Lib.GuildSettingsManager;
using Geekbot.net.Lib.Localization;
using Geekbot.Core.CommandPreconditions;
using Geekbot.Core.ErrorHandling;
using Geekbot.Core.Extensions;
using Geekbot.Core.GuildSettingsManager;
using Geekbot.Core.Localization;
namespace Geekbot.net.Commands.Admin
namespace Geekbot.Bot.Commands.Admin
{
[Group("admin")]
[RequireUserPermission(GuildPermission.Administrator)]

6
Geekbot.net/Commands/Admin/Mod.cs → src/Bot/Commands/Admin/Mod.cs
View file

@ -2,10 +2,10 @@
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
using Geekbot.net.Lib.CommandPreconditions;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.Core.CommandPreconditions;
using Geekbot.Core.ErrorHandling;
namespace Geekbot.net.Commands.Admin
namespace Geekbot.Bot.Commands.Admin
{
[Group("mod")]
[RequireUserPermission(GuildPermission.KickMembers)]

10
Geekbot.net/Commands/Admin/Owner/Owner.cs → src/Bot/Commands/Admin/Owner/Owner.cs
View file

@ -3,12 +3,12 @@ using System.Threading.Tasks;
using Discord;
using Discord.Commands;
using Discord.WebSocket;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.net.Lib.GlobalSettings;
using Geekbot.net.Lib.Logger;
using Geekbot.net.Lib.UserRepository;
using Geekbot.Core.ErrorHandling;
using Geekbot.Core.GlobalSettings;
using Geekbot.Core.Logger;
using Geekbot.Core.UserRepository;
namespace Geekbot.net.Commands.Admin.Owner
namespace Geekbot.Bot.Commands.Admin.Owner
{
[Group("owner")]
[RequireOwner]

16
Geekbot.net/Commands/Admin/Role.cs → src/Bot/Commands/Admin/Role.cs
View file

@ -5,15 +5,15 @@ using System.Threading.Tasks;
using Discord;
using Discord.Commands;
using Discord.Net;
using Geekbot.net.Database;
using Geekbot.net.Database.Models;
using Geekbot.net.Lib.CommandPreconditions;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.net.Lib.Extensions;
using Geekbot.net.Lib.Localization;
using Geekbot.net.Lib.ReactionListener;
using Geekbot.Core.CommandPreconditions;
using Geekbot.Core.Database;
using Geekbot.Core.Database.Models;
using Geekbot.Core.ErrorHandling;
using Geekbot.Core.Extensions;
using Geekbot.Core.Localization;
using Geekbot.Core.ReactionListener;
namespace Geekbot.net.Commands.Admin
namespace Geekbot.Bot.Commands.Admin
{
[Group("role")]
[DisableInDirectMessage]

6
Geekbot.net/Commands/Games/Pokedex.cs → src/Bot/Commands/Games/Pokedex.cs
View file

@ -3,11 +3,11 @@ using System.Linq;
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.net.Lib.Extensions;
using Geekbot.Core.ErrorHandling;
using Geekbot.Core.Extensions;
using PokeAPI;
namespace Geekbot.net.Commands.Games
namespace Geekbot.Bot.Commands.Games
{
public class Pokedex : ModuleBase
{

16
Geekbot.net/Commands/Games/Roll/Roll.cs → src/Bot/Commands/Games/Roll/Roll.cs
View file

@ -2,15 +2,15 @@
using System.Linq;
using System.Threading.Tasks;
using Discord.Commands;
using Geekbot.net.Database;
using Geekbot.net.Database.Models;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.net.Lib.Extensions;
using Geekbot.net.Lib.KvInMemoryStore;
using Geekbot.net.Lib.Localization;
using Geekbot.net.Lib.RandomNumberGenerator;
using Geekbot.Core.Database;
using Geekbot.Core.Database.Models;
using Geekbot.Core.ErrorHandling;
using Geekbot.Core.Extensions;
using Geekbot.Core.KvInMemoryStore;
using Geekbot.Core.Localization;
using Geekbot.Core.RandomNumberGenerator;
namespace Geekbot.net.Commands.Games.Roll
namespace Geekbot.Bot.Commands.Games.Roll
{
public class Roll : ModuleBase
{

2
Geekbot.net/Commands/Games/Roll/RollTimeout.cs → src/Bot/Commands/Games/Roll/RollTimeout.cs
View file

@ -1,6 +1,6 @@
using System;
namespace Geekbot.net.Commands.Games.Roll
namespace Geekbot.Bot.Commands.Games.Roll
{
public class RollTimeout
{

6
Geekbot.net/Commands/Integrations/LolMmr/LolMmr.cs → src/Bot/Commands/Integrations/LolMmr/LolMmr.cs
View file

@ -5,10 +5,10 @@ using System.Text;
using System.Threading.Tasks;
using System.Web;
using Discord.Commands;
using Geekbot.net.Lib;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.Core;
using Geekbot.Core.ErrorHandling;
namespace Geekbot.net.Commands.Integrations.LolMmr
namespace Geekbot.Bot.Commands.Integrations.LolMmr
{
public class LolMmr : ModuleBase
{

2
Geekbot.net/Commands/Integrations/LolMmr/LolMmrDto.cs → src/Bot/Commands/Integrations/LolMmr/LolMmrDto.cs
View file

@ -1,4 +1,4 @@
namespace Geekbot.net.Commands.Integrations.LolMmr
namespace Geekbot.Bot.Commands.Integrations.LolMmr
{
public class LolMmrDto
{

3
Geekbot.net/Commands/Integrations/LolMmr/LolMrrInfoDto.cs → src/Bot/Commands/Integrations/LolMmr/LolMrrInfoDto.cs
View file

@ -1,7 +1,6 @@
using System;
using Newtonsoft.Json;
namespace Geekbot.net.Commands.Integrations.LolMmr
namespace Geekbot.Bot.Commands.Integrations.LolMmr
{
public class LolMrrInfoDto
{

8
Geekbot.net/Commands/Integrations/MagicTheGathering.cs → src/Bot/Commands/Integrations/MagicTheGathering.cs
View file

@ -4,12 +4,12 @@ using System.Linq;
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
using Geekbot.net.Lib.Converters;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.net.Lib.Extensions;
using Geekbot.Core.Converters;
using Geekbot.Core.ErrorHandling;
using Geekbot.Core.Extensions;
using MtgApiManager.Lib.Service;
namespace Geekbot.net.Commands.Integrations
namespace Geekbot.Bot.Commands.Integrations
{
public class MagicTheGathering : ModuleBase
{

8
Geekbot.net/Commands/Integrations/Mal.cs → src/Bot/Commands/Integrations/Mal.cs
View file

@ -4,11 +4,11 @@ using System.Web;
using System.Xml;
using Discord;
using Discord.Commands;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.net.Lib.Extensions;
using Geekbot.net.Lib.MalClient;
using Geekbot.Core.ErrorHandling;
using Geekbot.Core.Extensions;
using Geekbot.Core.MalClient;
namespace Geekbot.net.Commands.Integrations
namespace Geekbot.Bot.Commands.Integrations
{
public class Mal : ModuleBase
{

2
Geekbot.net/Commands/Integrations/UbranDictionary/UrbanDictListItemDto.cs → src/Bot/Commands/Integrations/UbranDictionary/UrbanDictListItemDto.cs
View file

@ -1,4 +1,4 @@
namespace Geekbot.net.Commands.Integrations.UbranDictionary
namespace Geekbot.Bot.Commands.Integrations.UbranDictionary
{
internal class UrbanListItemDto
{

2
Geekbot.net/Commands/Integrations/UbranDictionary/UrbanDictResponseDto.cs → src/Bot/Commands/Integrations/UbranDictionary/UrbanDictResponseDto.cs
View file

@ -1,6 +1,6 @@
using System.Collections.Generic;
namespace Geekbot.net.Commands.Integrations.UbranDictionary
namespace Geekbot.Bot.Commands.Integrations.UbranDictionary
{
internal class UrbanResponseDto
{

8
Geekbot.net/Commands/Integrations/UbranDictionary/UrbanDictionary.cs → src/Bot/Commands/Integrations/UbranDictionary/UrbanDictionary.cs
View file

@ -3,11 +3,11 @@ using System.Linq;
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
using Geekbot.net.Lib;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.net.Lib.Extensions;
using Geekbot.Core;
using Geekbot.Core.ErrorHandling;
using Geekbot.Core.Extensions;
namespace Geekbot.net.Commands.Integrations.UbranDictionary
namespace Geekbot.Bot.Commands.Integrations.UbranDictionary
{
public class UrbanDictionary : ModuleBase
{

12
Geekbot.net/Commands/Integrations/Wikipedia.cs → src/Bot/Commands/Integrations/Wikipedia.cs
View file

@ -5,14 +5,14 @@ using System.Text;
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
using Geekbot.net.Database;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.net.Lib.Extensions;
using Geekbot.net.Lib.WikipediaClient;
using Geekbot.net.Lib.WikipediaClient.Page;
using Geekbot.Core.Database;
using Geekbot.Core.ErrorHandling;
using Geekbot.Core.Extensions;
using Geekbot.Core.WikipediaClient;
using Geekbot.Core.WikipediaClient.Page;
using HtmlAgilityPack;
namespace Geekbot.net.Commands.Integrations
namespace Geekbot.Bot.Commands.Integrations
{
public class Wikipedia : ModuleBase
{

6
Geekbot.net/Commands/Integrations/Youtube.cs → src/Bot/Commands/Integrations/Youtube.cs
View file

@ -1,12 +1,12 @@
using System;
using System.Threading.Tasks;
using Discord.Commands;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.net.Lib.GlobalSettings;
using Geekbot.Core.ErrorHandling;
using Geekbot.Core.GlobalSettings;
using Google.Apis.Services;
using Google.Apis.YouTube.v3;
namespace Geekbot.net.Commands.Integrations
namespace Geekbot.Bot.Commands.Integrations
{
public class Youtube : ModuleBase
{

6
Geekbot.net/Commands/Randomness/BenedictCumberbatchNameGenerator.cs → src/Bot/Commands/Randomness/BenedictCumberbatchNameGenerator.cs
View file

@ -2,10 +2,10 @@ using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Discord.Commands;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.net.Lib.RandomNumberGenerator;
using Geekbot.Core.ErrorHandling;
using Geekbot.Core.RandomNumberGenerator;
namespace Geekbot.net.Commands.Randomness
namespace Geekbot.Bot.Commands.Randomness
{
public class BenedictCumberbatchNameGenerator : ModuleBase
{

6
Geekbot.net/Commands/Randomness/Cat/Cat.cs → src/Bot/Commands/Randomness/Cat/Cat.cs
View file

@ -2,10 +2,10 @@
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
using Geekbot.net.Lib;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.Core;
using Geekbot.Core.ErrorHandling;
namespace Geekbot.net.Commands.Randomness.Cat
namespace Geekbot.Bot.Commands.Randomness.Cat
{
public class Cat : ModuleBase
{

2
Geekbot.net/Commands/Randomness/Cat/CatResponseDto.cs → src/Bot/Commands/Randomness/Cat/CatResponseDto.cs
View file

@ -1,4 +1,4 @@
namespace Geekbot.net.Commands.Randomness.Cat
namespace Geekbot.Bot.Commands.Randomness.Cat
{
internal class CatResponseDto
{

2
Geekbot.net/Commands/Randomness/Chuck/ChuckNorrisJokeResponseDto.cs → src/Bot/Commands/Randomness/Chuck/ChuckNorrisJokeResponseDto.cs
View file

@ -1,4 +1,4 @@
namespace Geekbot.net.Commands.Randomness.Chuck
namespace Geekbot.Bot.Commands.Randomness.Chuck
{
internal class ChuckNorrisJokeResponseDto
{

6
Geekbot.net/Commands/Randomness/Chuck/ChuckNorrisJokes.cs → src/Bot/Commands/Randomness/Chuck/ChuckNorrisJokes.cs
View file

@ -2,10 +2,10 @@
using System.Net.Http;
using System.Threading.Tasks;
using Discord.Commands;
using Geekbot.net.Lib;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.Core;
using Geekbot.Core.ErrorHandling;
namespace Geekbot.net.Commands.Randomness.Chuck
namespace Geekbot.Bot.Commands.Randomness.Chuck
{
public class ChuckNorrisJokes : ModuleBase
{

2
Geekbot.net/Commands/Randomness/Dad/DadJokeResponseDto.cs → src/Bot/Commands/Randomness/Dad/DadJokeResponseDto.cs
View file

@ -1,4 +1,4 @@
namespace Geekbot.net.Commands.Randomness.Dad
namespace Geekbot.Bot.Commands.Randomness.Dad
{
internal class DadJokeResponseDto
{

6
Geekbot.net/Commands/Randomness/Dad/DadJokes.cs → src/Bot/Commands/Randomness/Dad/DadJokes.cs
View file

@ -1,10 +1,10 @@
using System;
using System.Threading.Tasks;
using Discord.Commands;
using Geekbot.net.Lib;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.Core;
using Geekbot.Core.ErrorHandling;
namespace Geekbot.net.Commands.Randomness.Dad
namespace Geekbot.Bot.Commands.Randomness.Dad
{
public class DadJokes : ModuleBase
{

6
Geekbot.net/Commands/Randomness/Dog/Dog.cs → src/Bot/Commands/Randomness/Dog/Dog.cs
View file

@ -2,10 +2,10 @@
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
using Geekbot.net.Lib;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.Core;
using Geekbot.Core.ErrorHandling;
namespace Geekbot.net.Commands.Randomness.Dog
namespace Geekbot.Bot.Commands.Randomness.Dog
{
public class Dog : ModuleBase
{

2
Geekbot.net/Commands/Randomness/Dog/DogResponseDto.cs → src/Bot/Commands/Randomness/Dog/DogResponseDto.cs
View file

@ -1,4 +1,4 @@
namespace Geekbot.net.Commands.Randomness.Dog
namespace Geekbot.Bot.Commands.Randomness.Dog
{
internal class DogResponseDto
{

4
Geekbot.net/Commands/Randomness/EightBall.cs → src/Bot/Commands/Randomness/EightBall.cs
View file

@ -2,9 +2,9 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using Discord.Commands;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.Core.ErrorHandling;
namespace Geekbot.net.Commands.Randomness
namespace Geekbot.Bot.Commands.Randomness
{
public class EightBall : ModuleBase
{

4
Geekbot.net/Commands/Randomness/Fortune.cs → src/Bot/Commands/Randomness/Fortune.cs
View file

@ -1,8 +1,8 @@
using System.Threading.Tasks;
using Discord.Commands;
using Geekbot.net.Lib.Media;
using Geekbot.Core.Media;
namespace Geekbot.net.Commands.Randomness
namespace Geekbot.Bot.Commands.Randomness
{
public class Fortune : ModuleBase
{

4
Geekbot.net/Commands/Randomness/Gdq.cs → src/Bot/Commands/Randomness/Gdq.cs
View file

@ -2,9 +2,9 @@
using System.Net;
using System.Threading.Tasks;
using Discord.Commands;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.Core.ErrorHandling;
namespace Geekbot.net.Commands.Randomness
namespace Geekbot.Bot.Commands.Randomness
{
public class Gdq : ModuleBase
{

2
Geekbot.net/Commands/Randomness/Greetings/GreetingBaseDto.cs → src/Bot/Commands/Randomness/Greetings/GreetingBaseDto.cs
View file

@ -1,4 +1,4 @@
namespace Geekbot.net.Commands.Randomness.Greetings
namespace Geekbot.Bot.Commands.Randomness.Greetings
{
public class GreetingBaseDto
{

2
Geekbot.net/Commands/Randomness/Greetings/GreetingDto.cs → src/Bot/Commands/Randomness/Greetings/GreetingDto.cs
View file

@ -1,4 +1,4 @@
namespace Geekbot.net.Commands.Randomness.Greetings
namespace Geekbot.Bot.Commands.Randomness.Greetings
{
public class GreetingDto
{

8
Geekbot.net/Commands/Randomness/Greetings/Greetings.cs → src/Bot/Commands/Randomness/Greetings/Greetings.cs
View file

@ -2,11 +2,11 @@ using System;
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
using Geekbot.net.Lib;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.net.Lib.Extensions;
using Geekbot.Core;
using Geekbot.Core.ErrorHandling;
using Geekbot.Core.Extensions;
namespace Geekbot.net.Commands.Randomness.Greetings
namespace Geekbot.Bot.Commands.Randomness.Greetings
{
public class Greetings : ModuleBase
{

6
Geekbot.net/Commands/Randomness/Kanye/Kanye.cs → src/Bot/Commands/Randomness/Kanye/Kanye.cs
View file

@ -1,10 +1,10 @@
using System;
using System.Threading.Tasks;
using Discord.Commands;
using Geekbot.net.Lib;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.Core;
using Geekbot.Core.ErrorHandling;
namespace Geekbot.net.Commands.Randomness.Kanye
namespace Geekbot.Bot.Commands.Randomness.Kanye
{
public class Kanye : ModuleBase
{

2
Geekbot.net/Commands/Randomness/Kanye/KanyeResponseDto.cs → src/Bot/Commands/Randomness/Kanye/KanyeResponseDto.cs
View file

@ -1,4 +1,4 @@
namespace Geekbot.net.Commands.Randomness.Kanye
namespace Geekbot.Bot.Commands.Randomness.Kanye
{
public class KanyeResponseDto
{

4
Geekbot.net/Commands/Randomness/RandomAnimals.cs → src/Bot/Commands/Randomness/RandomAnimals.cs
View file

@ -1,9 +1,9 @@
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
using Geekbot.net.Lib.Media;
using Geekbot.Core.Media;
namespace Geekbot.net.Commands.Randomness
namespace Geekbot.Bot.Commands.Randomness
{
public class RandomAnimals : ModuleBase
{

14
Geekbot.net/Commands/Randomness/Ship.cs → src/Bot/Commands/Randomness/Ship.cs
View file

@ -3,14 +3,14 @@ using System.Linq;
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
using Geekbot.net.Database;
using Geekbot.net.Database.Models;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.net.Lib.Extensions;
using Geekbot.net.Lib.Localization;
using Geekbot.net.Lib.RandomNumberGenerator;
using Geekbot.Core.Database;
using Geekbot.Core.Database.Models;
using Geekbot.Core.ErrorHandling;
using Geekbot.Core.Extensions;
using Geekbot.Core.Localization;
using Geekbot.Core.RandomNumberGenerator;
namespace Geekbot.net.Commands.Randomness
namespace Geekbot.Bot.Commands.Randomness
{
public class Ship : ModuleBase
{

10
Geekbot.net/Commands/Randomness/Slap.cs → src/Bot/Commands/Randomness/Slap.cs
View file

@ -4,12 +4,12 @@ using System.Linq;
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
using Geekbot.net.Database;
using Geekbot.net.Database.Models;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.net.Lib.Extensions;
using Geekbot.Core.Database;
using Geekbot.Core.Database.Models;
using Geekbot.Core.ErrorHandling;
using Geekbot.Core.Extensions;
namespace Geekbot.net.Commands.Randomness
namespace Geekbot.Bot.Commands.Randomness
{
public class Slap : ModuleBase
{

16
Geekbot.net/Commands/Rpg/Cookies.cs → src/Bot/Commands/Rpg/Cookies.cs
View file

@ -3,15 +3,15 @@ using System.Linq;
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
using Geekbot.net.Database;
using Geekbot.net.Database.Models;
using Geekbot.net.Lib.CommandPreconditions;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.net.Lib.Extensions;
using Geekbot.net.Lib.Localization;
using Geekbot.net.Lib.RandomNumberGenerator;
using Geekbot.Core.CommandPreconditions;
using Geekbot.Core.Database;
using Geekbot.Core.Database.Models;
using Geekbot.Core.ErrorHandling;
using Geekbot.Core.Extensions;
using Geekbot.Core.Localization;
using Geekbot.Core.RandomNumberGenerator;
namespace Geekbot.net.Commands.Rpg
namespace Geekbot.Bot.Commands.Rpg
{
[DisableInDirectMessage]
[Group("cookies")]

12
Geekbot.net/Commands/User/GuildInfo.cs → src/Bot/Commands/User/GuildInfo.cs
View file

@ -3,13 +3,13 @@ using System.Linq;
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
using Geekbot.net.Database;
using Geekbot.net.Lib.CommandPreconditions;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.net.Lib.Extensions;
using Geekbot.net.Lib.Levels;
using Geekbot.Core.CommandPreconditions;
using Geekbot.Core.Database;
using Geekbot.Core.ErrorHandling;
using Geekbot.Core.Extensions;
using Geekbot.Core.Levels;
namespace Geekbot.net.Commands.User
namespace Geekbot.Bot.Commands.User
{
public class GuildInfo : ModuleBase
{

14
Geekbot.net/Commands/User/Karma.cs → src/Bot/Commands/User/Karma.cs
View file

@ -3,14 +3,14 @@ using System.Linq;
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
using Geekbot.net.Database;
using Geekbot.net.Database.Models;
using Geekbot.net.Lib.CommandPreconditions;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.net.Lib.Extensions;
using Geekbot.net.Lib.Localization;
using Geekbot.Core.CommandPreconditions;
using Geekbot.Core.Database;
using Geekbot.Core.Database.Models;
using Geekbot.Core.ErrorHandling;
using Geekbot.Core.Extensions;
using Geekbot.Core.Localization;
namespace Geekbot.net.Commands.User
namespace Geekbot.Bot.Commands.User
{
[DisableInDirectMessage]
public class Karma : ModuleBase

18
Geekbot.net/Commands/User/Ranking/Rank.cs → src/Bot/Commands/User/Ranking/Rank.cs
View file

@ -4,16 +4,16 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Discord.Commands;
using Geekbot.net.Database;
using Geekbot.net.Lib.CommandPreconditions;
using Geekbot.net.Lib.Converters;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.net.Lib.Extensions;
using Geekbot.net.Lib.Highscores;
using Geekbot.net.Lib.Localization;
using Geekbot.net.Lib.UserRepository;
using Geekbot.Core.CommandPreconditions;
using Geekbot.Core.Converters;
using Geekbot.Core.Database;
using Geekbot.Core.ErrorHandling;
using Geekbot.Core.Extensions;
using Geekbot.Core.Highscores;
using Geekbot.Core.Localization;
using Geekbot.Core.UserRepository;
namespace Geekbot.net.Commands.User.Ranking
namespace Geekbot.Bot.Commands.User.Ranking
{
public class Rank : ModuleBase
{

12
Geekbot.net/Commands/User/Stats.cs → src/Bot/Commands/User/Stats.cs
View file

@ -3,13 +3,13 @@ using System.Linq;
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
using Geekbot.net.Database;
using Geekbot.net.Lib.CommandPreconditions;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.net.Lib.Extensions;
using Geekbot.net.Lib.Levels;
using Geekbot.Core.CommandPreconditions;
using Geekbot.Core.Database;
using Geekbot.Core.ErrorHandling;
using Geekbot.Core.Extensions;
using Geekbot.Core.Levels;
namespace Geekbot.net.Commands.User
namespace Geekbot.Bot.Commands.User
{
public class Stats : ModuleBase
{

4
Geekbot.net/Commands/Utils/AvatarGetter.cs → src/Bot/Commands/Utils/AvatarGetter.cs
View file

@ -2,9 +2,9 @@
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.Core.ErrorHandling;
namespace Geekbot.net.Commands.Utils
namespace Geekbot.Bot.Commands.Utils
{
public class AvatarGetter : ModuleBase
{

6
Geekbot.net/Commands/Utils/Changelog/Changelog.cs → src/Bot/Commands/Utils/Changelog/Changelog.cs
View file

@ -6,10 +6,10 @@ using System.Threading.Tasks;
using Discord;
using Discord.Commands;
using Discord.WebSocket;
using Geekbot.net.Lib;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.Core;
using Geekbot.Core.ErrorHandling;
namespace Geekbot.net.Commands.Utils.Changelog
namespace Geekbot.Bot.Commands.Utils.Changelog
{
public class Changelog : ModuleBase
{

2
Geekbot.net/Commands/Utils/Changelog/CommitAuthorDto.cs → src/Bot/Commands/Utils/Changelog/CommitAuthorDto.cs
View file

@ -1,6 +1,6 @@
using System;
namespace Geekbot.net.Commands.Utils.Changelog
namespace Geekbot.Bot.Commands.Utils.Changelog
{
public class CommitAuthorDto
{

2
Geekbot.net/Commands/Utils/Changelog/CommitDto.cs → src/Bot/Commands/Utils/Changelog/CommitDto.cs
View file

@ -1,4 +1,4 @@
namespace Geekbot.net.Commands.Utils.Changelog
namespace Geekbot.Bot.Commands.Utils.Changelog
{
public class CommitDto
{

2
Geekbot.net/Commands/Utils/Changelog/CommitInfoDto.cs → src/Bot/Commands/Utils/Changelog/CommitInfoDto.cs
View file

@ -1,4 +1,4 @@
namespace Geekbot.net.Commands.Utils.Changelog
namespace Geekbot.Bot.Commands.Utils.Changelog
{
public class CommitInfoDto
{

6
Geekbot.net/Commands/Utils/Choose.cs → src/Bot/Commands/Utils/Choose.cs
View file

@ -1,10 +1,10 @@
using System;
using System.Threading.Tasks;
using Discord.Commands;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.net.Lib.Localization;
using Geekbot.Core.ErrorHandling;
using Geekbot.Core.Localization;
namespace Geekbot.net.Commands.Utils
namespace Geekbot.Bot.Commands.Utils
{
public class Choose : ModuleBase
{

9
Geekbot.net/Commands/Utils/Corona/CoronaStats.cs → src/Bot/Commands/Utils/Corona/CoronaStats.cs
View file

@ -1,13 +1,12 @@
using System;
using System.Text;
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
using Geekbot.net.Lib;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.net.Lib.Extensions;
using Geekbot.Core;
using Geekbot.Core.ErrorHandling;
using Geekbot.Core.Extensions;
namespace Geekbot.net.Commands.Utils.Corona
namespace Geekbot.Bot.Commands.Utils.Corona
{
public class CoronaStats : ModuleBase
{

2
Geekbot.net/Commands/Utils/Corona/CoronaSummaryDto.cs → src/Bot/Commands/Utils/Corona/CoronaSummaryDto.cs
View file

@ -1,4 +1,4 @@
namespace Geekbot.net.Commands.Utils.Corona
namespace Geekbot.Bot.Commands.Utils.Corona
{
public class CoronaSummaryDto
{

6
Geekbot.net/Commands/Utils/Dice.cs → src/Bot/Commands/Utils/Dice.cs
View file

@ -3,10 +3,10 @@ using System.Collections.Generic;
using System.Text;
using System.Threading.Tasks;
using Discord.Commands;
using Geekbot.net.Lib.DiceParser;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.Core.DiceParser;
using Geekbot.Core.ErrorHandling;
namespace Geekbot.net.Commands.Utils
namespace Geekbot.Bot.Commands.Utils
{
public class Dice : ModuleBase
{

6
Geekbot.net/Commands/Utils/Emojify.cs → src/Bot/Commands/Utils/Emojify.cs
View file

@ -1,10 +1,10 @@
using System;
using System.Threading.Tasks;
using Discord.Commands;
using Geekbot.net.Lib.Converters;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.Core.Converters;
using Geekbot.Core.ErrorHandling;
namespace Geekbot.net.Commands.Utils
namespace Geekbot.Bot.Commands.Utils
{
public class Emojify : ModuleBase
{

4
Geekbot.net/Commands/Utils/Help.cs → src/Bot/Commands/Utils/Help.cs
View file

@ -3,9 +3,9 @@ using System.Text;
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.Core.ErrorHandling;
namespace Geekbot.net.Commands.Utils
namespace Geekbot.Bot.Commands.Utils
{
public class Help : ModuleBase
{

8
Geekbot.net/Commands/Utils/Info.cs → src/Bot/Commands/Utils/Info.cs
View file

@ -5,11 +5,11 @@ using System.Threading.Tasks;
using Discord;
using Discord.Commands;
using Discord.WebSocket;
using Geekbot.net.Lib;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.net.Lib.Extensions;
using Geekbot.Core;
using Geekbot.Core.ErrorHandling;
using Geekbot.Core.Extensions;
namespace Geekbot.net.Commands.Utils
namespace Geekbot.Bot.Commands.Utils
{
public class Info : ModuleBase
{

4
Geekbot.net/Commands/Utils/Lmgtfy.cs → src/Bot/Commands/Utils/Lmgtfy.cs
View file

@ -2,9 +2,9 @@ using System;
using System.Threading.Tasks;
using System.Web;
using Discord.Commands;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.Core.ErrorHandling;
namespace Geekbot.net.Commands.Utils
namespace Geekbot.Bot.Commands.Utils
{
public class Lmgtfy : ModuleBase
{

2
Geekbot.net/Commands/Utils/Ping.cs → src/Bot/Commands/Utils/Ping.cs
View file

@ -1,7 +1,7 @@
using System.Threading.Tasks;
using Discord.Commands;
namespace Geekbot.net.Commands.Utils
namespace Geekbot.Bot.Commands.Utils
{
public class Ping : ModuleBase
{

18
Geekbot.net/Commands/Utils/Quote/Quote.cs → src/Bot/Commands/Utils/Quote/Quote.cs
View file

@ -3,16 +3,16 @@ using System.Linq;
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
using Geekbot.net.Database;
using Geekbot.net.Database.Models;
using Geekbot.net.Lib.CommandPreconditions;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.net.Lib.Extensions;
using Geekbot.net.Lib.Localization;
using Geekbot.net.Lib.Polyfills;
using Geekbot.net.Lib.RandomNumberGenerator;
using Geekbot.Core.CommandPreconditions;
using Geekbot.Core.Database;
using Geekbot.Core.Database.Models;
using Geekbot.Core.ErrorHandling;
using Geekbot.Core.Extensions;
using Geekbot.Core.Localization;
using Geekbot.Core.Polyfills;
using Geekbot.Core.RandomNumberGenerator;
namespace Geekbot.net.Commands.Utils.Quote
namespace Geekbot.Bot.Commands.Utils.Quote
{
[Group("quote")]
[DisableInDirectMessage]

2
Geekbot.net/Commands/Utils/Quote/QuoteObjectDto.cs → src/Bot/Commands/Utils/Quote/QuoteObjectDto.cs
View file

@ -1,6 +1,6 @@
using System;
namespace Geekbot.net.Commands.Utils.Quote
namespace Geekbot.Bot.Commands.Utils.Quote
{
internal class QuoteObjectDto
{

10
Geekbot.net/Handlers/CommandHandler.cs → src/Bot/Handlers/CommandHandler.cs
View file

@ -5,12 +5,12 @@ using Discord;
using Discord.Commands;
using Discord.Rest;
using Discord.WebSocket;
using Geekbot.net.Database;
using Geekbot.net.Database.Models;
using Geekbot.net.Lib.GuildSettingsManager;
using Geekbot.net.Lib.Logger;
using Geekbot.Core.Database;
using Geekbot.Core.Database.Models;
using Geekbot.Core.GuildSettingsManager;
using Geekbot.Core.Logger;
namespace Geekbot.net.Handlers
namespace Geekbot.Bot.Handlers
{
public class CommandHandler
{

8
Geekbot.net/Handlers/MessageDeletedHandler.cs → src/Bot/Handlers/MessageDeletedHandler.cs
View file

@ -4,11 +4,11 @@ using System.Text;
using System.Threading.Tasks;
using Discord;
using Discord.WebSocket;
using Geekbot.net.Database;
using Geekbot.net.Lib.Extensions;
using Geekbot.net.Lib.Logger;
using Geekbot.Core.Database;
using Geekbot.Core.Extensions;
using Geekbot.Core.Logger;
namespace Geekbot.net.Handlers
namespace Geekbot.Bot.Handlers
{
public class MessageDeletedHandler
{

4
Geekbot.net/Handlers/ReactionHandler.cs → src/Bot/Handlers/ReactionHandler.cs
View file

@ -1,9 +1,9 @@
using System.Threading.Tasks;
using Discord;
using Discord.WebSocket;
using Geekbot.net.Lib.ReactionListener;
using Geekbot.Core.ReactionListener;
namespace Geekbot.net.Handlers
namespace Geekbot.Bot.Handlers
{
public class ReactionHandler
{

10
Geekbot.net/Handlers/StatsHandler.cs → src/Bot/Handlers/StatsHandler.cs
View file

@ -1,13 +1,13 @@
using System;
using System.Threading.Tasks;
using Discord.WebSocket;
using Geekbot.net.Database;
using Geekbot.net.Database.Models;
using Geekbot.net.Lib.Extensions;
using Geekbot.net.Lib.Logger;
using Geekbot.Core.Database;
using Geekbot.Core.Database.Models;
using Geekbot.Core.Extensions;
using Geekbot.Core.Logger;
using Microsoft.EntityFrameworkCore;
namespace Geekbot.net.Handlers
namespace Geekbot.Bot.Handlers
{
public class StatsHandler
{

10
Geekbot.net/Handlers/UserHandler.cs → src/Bot/Handlers/UserHandler.cs
View file

@ -4,12 +4,12 @@ using System.Threading.Tasks;
using Discord;
using Discord.Rest;
using Discord.WebSocket;
using Geekbot.net.Database;
using Geekbot.net.Lib.Extensions;
using Geekbot.net.Lib.Logger;
using Geekbot.net.Lib.UserRepository;
using Geekbot.Core.Database;
using Geekbot.Core.Extensions;
using Geekbot.Core.Logger;
using Geekbot.Core.UserRepository;
namespace Geekbot.net.Handlers
namespace Geekbot.Bot.Handlers
{
public class UserHandler
{

0
Geekbot.net/Logs/.keep → src/Bot/Logs/.keep Executable file → Normal file
View file

42
Geekbot.net/Program.cs → src/Bot/Program.cs Executable file → Normal file
View file

@ -6,30 +6,30 @@ using CommandLine;
using Discord;
using Discord.Commands;
using Discord.WebSocket;
using Geekbot.net.Database;
using Geekbot.net.Handlers;
using Geekbot.net.Lib;
using Geekbot.net.Lib.Converters;
using Geekbot.net.Lib.DiceParser;
using Geekbot.net.Lib.ErrorHandling;
using Geekbot.net.Lib.GlobalSettings;
using Geekbot.net.Lib.GuildSettingsManager;
using Geekbot.net.Lib.Highscores;
using Geekbot.net.Lib.KvInMemoryStore;
using Geekbot.net.Lib.Levels;
using Geekbot.net.Lib.Localization;
using Geekbot.net.Lib.Logger;
using Geekbot.net.Lib.MalClient;
using Geekbot.net.Lib.Media;
using Geekbot.net.Lib.RandomNumberGenerator;
using Geekbot.net.Lib.ReactionListener;
using Geekbot.net.Lib.UserRepository;
using Geekbot.net.Lib.WikipediaClient;
using Geekbot.net.WebApi;
using Geekbot.Bot.Handlers;
using Geekbot.Core;
using Geekbot.Core.Converters;
using Geekbot.Core.Database;
using Geekbot.Core.DiceParser;
using Geekbot.Core.ErrorHandling;
using Geekbot.Core.GlobalSettings;
using Geekbot.Core.GuildSettingsManager;
using Geekbot.Core.Highscores;
using Geekbot.Core.KvInMemoryStore;
using Geekbot.Core.Levels;
using Geekbot.Core.Localization;
using Geekbot.Core.Logger;
using Geekbot.Core.MalClient;
using Geekbot.Core.Media;
using Geekbot.Core.RandomNumberGenerator;
using Geekbot.Core.ReactionListener;
using Geekbot.Core.UserRepository;
using Geekbot.Core.WikipediaClient;
using Geekbot.Web;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection;
namespace Geekbot.net
namespace Geekbot.Bot
{
internal class Program
{

0
Geekbot.net/Storage/croissant → src/Bot/Storage/croissant
View file

0
Geekbot.net/Storage/dab → src/Bot/Storage/dab
View file

0
Geekbot.net/Storage/fortunes → src/Bot/Storage/fortunes
View file

0
Geekbot.net/Storage/foxes → src/Bot/Storage/foxes
View file

0
Geekbot.net/Storage/pandas → src/Bot/Storage/pandas
View file

0
Geekbot.net/Storage/penguins → src/Bot/Storage/penguins
View file

0
Geekbot.net/Storage/pumpkin → src/Bot/Storage/pumpkin
View file

0
Geekbot.net/Storage/squirrel → src/Bot/Storage/squirrel
View file

0
Geekbot.net/Storage/turtles → src/Bot/Storage/turtles
View file

0
Geekbot.net/derp.ico → src/Bot/derp.ico
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 361 KiB

After

Width:  |  Height:  |  Size: 361 KiB

2
Geekbot.net/Lib/CommandPreconditions/DisableInDirectMessageAttribute.cs → src/Core/CommandPreconditions/DisableInDirectMessageAttribute.cs
View file

@ -2,7 +2,7 @@ using System;
using System.Threading.Tasks;
using Discord.Commands;
namespace Geekbot.net.Lib.CommandPreconditions
namespace Geekbot.Core.CommandPreconditions
{
[AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = true)]
public class DisableInDirectMessageAttribute : PreconditionAttribute

4
Geekbot.net/Lib/Constants.cs → src/Core/Constants.cs
View file

@ -1,6 +1,6 @@
using System.Reflection;
namespace Geekbot.net.Lib
namespace Geekbot.Core
{
public static class Constants
{
@ -8,7 +8,7 @@ namespace Geekbot.net.Lib
public static string BotVersion()
{
return typeof(Program).Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion;
return typeof(Constants).Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion;
}
public static string LibraryVersion()

2
Geekbot.net/Lib/Converters/EmojiConverter.cs → src/Core/Converters/EmojiConverter.cs
View file

@ -1,7 +1,7 @@
using System.Collections;
using System.Text;
namespace Geekbot.net.Lib.Converters
namespace Geekbot.Core.Converters
{
public class EmojiConverter : IEmojiConverter
{

2
Geekbot.net/Lib/Converters/IEmojiConverter.cs → src/Core/Converters/IEmojiConverter.cs
View file

@ -1,4 +1,4 @@
namespace Geekbot.net.Lib.Converters
namespace Geekbot.Core.Converters
{
public interface IEmojiConverter
{

2
Geekbot.net/Lib/Converters/IMtgManaConverter.cs → src/Core/Converters/IMtgManaConverter.cs
View file

@ -1,4 +1,4 @@
namespace Geekbot.net.Lib.Converters
namespace Geekbot.Core.Converters
{
public interface IMtgManaConverter
{

2
Geekbot.net/Lib/Converters/MtgManaConverter.cs → src/Core/Converters/MtgManaConverter.cs
View file

@ -1,7 +1,7 @@
using System.Collections.Generic;
using System.Text.RegularExpressions;
namespace Geekbot.net.Lib.Converters
namespace Geekbot.Core.Converters
{
public class MtgManaConverter : IMtgManaConverter
{

40
src/Core/Core.csproj Normal file
View file

@ -0,0 +1,40 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<VersionSuffix>$(VersionSuffix)</VersionSuffix>
<Version Condition=" '$(VersionSuffix)' != '' ">$(VersionSuffix)</Version>
<Version Condition=" '$(VersionSuffix)' == '' ">0.0.0-DEV</Version>
<RootNamespace>Geekbot.Core</RootNamespace>
<AssemblyName>Geekbot.Core</AssemblyName>
<NoWarn>NU1701</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.8.0" />
<PackageReference Include="Discord.Net" Version="2.2.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.0-preview.7.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.0-preview.7.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.0-preview.7.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="5.0.0-preview.7.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.0-preview.7.*" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0-preview.7.*" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0-preview.7.*" />
<PackageReference Include="Microsoft.Extensions.Options" Version="5.0.0-preview.7.*" />
<PackageReference Include="MyAnimeListSharp" Version="1.3.4" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="NLog" Version="4.7.2" />
<PackageReference Include="NLog.Config" Version="4.7.2" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.0-preview6" />
<PackageReference Include="SharpRaven" Version="2.4.0" />
<PackageReference Include="SumoLogic.Logging.NLog" Version="1.0.1.3" />
<PackageReference Include="YamlDotNet" Version="6.0.0" />
</ItemGroup>
<ItemGroup>
<Content Include="Localization\Translations.yml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
</Project>

4
Geekbot.net/Database/DatabaseContext.cs → src/Core/Database/DatabaseContext.cs
View file

@ -1,7 +1,7 @@
using Geekbot.net.Database.Models;
using Geekbot.Core.Database.Models;
using Microsoft.EntityFrameworkCore;
namespace Geekbot.net.Database
namespace Geekbot.Core.Database
{
public class DatabaseContext : DbContext
{

7
Geekbot.net/Database/DatabaseInitializer.cs → src/Core/Database/DatabaseInitializer.cs
View file

@ -1,10 +1,9 @@
using System;
using Geekbot.net.Database.LoggingAdapter;
using Geekbot.net.Lib;
using Geekbot.net.Lib.Logger;
using Geekbot.Core.Database.LoggingAdapter;
using Geekbot.Core.Logger;
using Npgsql.Logging;
namespace Geekbot.net.Database
namespace Geekbot.Core.Database
{
public class DatabaseInitializer
{

2
Geekbot.net/Database/InMemoryDatabase.cs → src/Core/Database/InMemoryDatabase.cs
View file

@ -1,6 +1,6 @@
using Microsoft.EntityFrameworkCore;
namespace Geekbot.net.Database
namespace Geekbot.Core.Database
{
public class InMemoryDatabase : DatabaseContext
{

5
Geekbot.net/Database/LoggingAdapter/NpgsqlLoggingAdapter.cs → src/Core/Database/LoggingAdapter/NpgsqlLoggingAdapter.cs
View file

@ -1,10 +1,9 @@
using System;
using Geekbot.net.Lib;
using Geekbot.net.Lib.Logger;
using Geekbot.Core.Logger;
using Npgsql.Logging;
using LogLevel = NLog.LogLevel;
namespace Geekbot.net.Database.LoggingAdapter
namespace Geekbot.Core.Database.LoggingAdapter
{
public class NpgsqlLoggingAdapter : NpgsqlLogger
{

5
Geekbot.net/Database/LoggingAdapter/NpgsqlLoggingProviderAdapter.cs → src/Core/Database/LoggingAdapter/NpgsqlLoggingProviderAdapter.cs
View file

@ -1,8 +1,7 @@
using Geekbot.net.Lib;
using Geekbot.net.Lib.Logger;
using Geekbot.Core.Logger;
using Npgsql.Logging;
namespace Geekbot.net.Database.LoggingAdapter
namespace Geekbot.Core.Database.LoggingAdapter
{
public class NpgsqlLoggingProviderAdapter : INpgsqlLoggingProvider
{

2
Geekbot.net/Database/Models/CookiesModel.cs → src/Core/Database/Models/CookiesModel.cs
View file

@ -1,7 +1,7 @@
using System;
using System.ComponentModel.DataAnnotations;
namespace Geekbot.net.Database.Models
namespace Geekbot.Core.Database.Models
{
public class CookiesModel
{

2
Geekbot.net/Database/Models/GlobalsModel.cs → src/Core/Database/Models/GlobalsModel.cs
View file

@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;
namespace Geekbot.net.Database.Models
namespace Geekbot.Core.Database.Models
{
public class GlobalsModel
{

Some files were not shown because too many files have changed in this diff Show more