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

Merge WikipediaApi into the main code base

Browse source
This commit is contained in:
runebaas 2020-08-08 21:09:27 +02:00
parent 3813290f89
commit c22d0cf941
No known key found for this signature in database
GPG key ID: 2677AF508D0300D6
15 changed files with 16 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Geekbot.net.sln
View file

@ -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

4
Geekbot.net/Commands/Integrations/Wikipedia.cs
View file

@ -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
{

4
WikipediaApi/IWikipediaClient.cs → Geekbot.net/Lib/WikipediaClient/IWikipediaClient.cs
View file

@ -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
{

2
WikipediaApi/Page/PageApiUrls.cs → Geekbot.net/Lib/WikipediaClient/Page/PageApiUrls.cs
View file

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

2
WikipediaApi/Page/PageContentUrlCollection.cs → Geekbot.net/Lib/WikipediaClient/Page/PageContentUrlCollection.cs
View file

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

2
WikipediaApi/Page/PageContentUrls.cs → Geekbot.net/Lib/WikipediaClient/Page/PageContentUrls.cs
View file

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

2
WikipediaApi/Page/PageCoordinates.cs → Geekbot.net/Lib/WikipediaClient/Page/PageCoordinates.cs
View file

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

2
WikipediaApi/Page/PageImage.cs → Geekbot.net/Lib/WikipediaClient/Page/PageImage.cs
View file

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

2
WikipediaApi/Page/PageNamespace.cs → Geekbot.net/Lib/WikipediaClient/Page/PageNamespace.cs
View file

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

2
WikipediaApi/Page/PagePreview.cs → Geekbot.net/Lib/WikipediaClient/Page/PagePreview.cs
View file

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

2
WikipediaApi/Page/PageTitles.cs → Geekbot.net/Lib/WikipediaClient/Page/PageTitles.cs
View file

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

2
WikipediaApi/Page/PageTypes.cs → Geekbot.net/Lib/WikipediaClient/Page/PageTypes.cs
View file

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

4
WikipediaApi/WikipediaClient.cs → Geekbot.net/Lib/WikipediaClient/WikipediaClient.cs
View file

@ -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
{

2
Geekbot.net/Program.cs
View file

@ -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
{

8
WikipediaApi/WikipediaApi.csproj
View file

@ -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>