Merge WikipediaApi into the main code base

Geekbot.net.sln

@@ -7,8 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Geekbot.net", "Geekbot.net/
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{4CAF5F02-EFFE-4FDA-BD44-EEADDBA9600E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WikipediaApi", "WikipediaApi\WikipediaApi.csproj", "{1084D499-EF94-4834-9E6A-B2AD81B60078}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,10 +21,6 @@ Global
 		{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
-		{1084D499-EF94-4834-9E6A-B2AD81B60078}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1084D499-EF94-4834-9E6A-B2AD81B60078}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1084D499-EF94-4834-9E6A-B2AD81B60078}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1084D499-EF94-4834-9E6A-B2AD81B60078}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Geekbot.net/Commands/Integrations/Wikipedia.cs

@@ -8,9 +8,9 @@ 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 HtmlAgilityPack;
-using WikipediaApi;
-using WikipediaApi.Page;
 
 namespace Geekbot.net.Commands.Integrations
 {

Geekbot.net/Lib/WikipediaClient/IWikipediaClient.cs

@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
-using WikipediaApi.Page;
+using Geekbot.net.Lib.WikipediaClient.Page;
 
-namespace WikipediaApi
+namespace Geekbot.net.Lib.WikipediaClient
 {
     public interface IWikipediaClient
     {

Geekbot.net/Lib/WikipediaClient/Page/PageApiUrls.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace WikipediaApi.Page
+namespace Geekbot.net.Lib.WikipediaClient.Page
 {
     public class PageApiUrls
     {

Geekbot.net/Lib/WikipediaClient/Page/PageContentUrlCollection.cs

@@ -1,4 +1,4 @@
-namespace WikipediaApi.Page
+namespace Geekbot.net.Lib.WikipediaClient.Page
 {
     public class PageContentUrlCollection
     {

Geekbot.net/Lib/WikipediaClient/Page/PageContentUrls.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace WikipediaApi.Page
+namespace Geekbot.net.Lib.WikipediaClient.Page
 {
     public class PageContentUrls
     {

Geekbot.net/Lib/WikipediaClient/Page/PageCoordinates.cs

@@ -1,4 +1,4 @@
-namespace WikipediaApi.Page
+namespace Geekbot.net.Lib.WikipediaClient.Page
 {
     public class PageCoordinates
     {

Geekbot.net/Lib/WikipediaClient/Page/PageImage.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace WikipediaApi.Page
+namespace Geekbot.net.Lib.WikipediaClient.Page
 {
     public class PageImage
     {

Geekbot.net/Lib/WikipediaClient/Page/PageNamespace.cs

@@ -1,4 +1,4 @@
-namespace WikipediaApi.Page
+namespace Geekbot.net.Lib.WikipediaClient.Page
 {
     public class PageNamespace
     {

Geekbot.net/Lib/WikipediaClient/Page/PagePreview.cs

@@ -2,7 +2,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
-namespace WikipediaApi.Page
+namespace Geekbot.net.Lib.WikipediaClient.Page
 {
     public class PagePreview
     {

Geekbot.net/Lib/WikipediaClient/Page/PageTitles.cs

@@ -1,4 +1,4 @@
-namespace WikipediaApi.Page
+namespace Geekbot.net.Lib.WikipediaClient.Page
 {
     public class PageTitles
     {

Geekbot.net/Lib/WikipediaClient/Page/PageTypes.cs

@@ -1,6 +1,6 @@
 using System.Runtime.Serialization;
 
-namespace WikipediaApi.Page
+namespace Geekbot.net.Lib.WikipediaClient.Page
 {
     public enum PageTypes
     {

Geekbot.net/Lib/WikipediaClient/WikipediaClient.cs

@@ -1,9 +1,9 @@
 using System.Net.Http;
 using System.Threading.Tasks;
+using Geekbot.net.Lib.WikipediaClient.Page;
 using Newtonsoft.Json;
-using WikipediaApi.Page;
 
-namespace WikipediaApi
+namespace Geekbot.net.Lib.WikipediaClient
 {
     public class WikipediaClient : IWikipediaClient
     {

Geekbot.net/Program.cs

@@ -24,10 +24,10 @@ 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 Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
-using WikipediaApi;
 
 namespace Geekbot.net
 {

WikipediaApi/WikipediaApi.csproj

@@ -1,8 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-  </ItemGroup>
-</Project>