[Library -> Models] Move rest folder into models.

AnalogFeelings · Feb 8, 2024 · 0938f54 · 0938f54
1 parent ec0f0ca
commit 0938f54
Show file tree

Hide file tree

Showing 29 changed files with 31 additions and 31 deletions.
diff --git a/Source/SammBot.Bot/Modules/BooruModule.cs b/Source/SammBot.Bot/Modules/BooruModule.cs
@@ -30,9 +30,9 @@
 using SammBot.Library.Attributes;
 using SammBot.Library.Extensions;
 using SammBot.Library.Models;
+using SammBot.Library.Models.E621;
+using SammBot.Library.Models.Rule34;
 using SammBot.Library.Preconditions;
-using SammBot.Library.Rest.E621;
-using SammBot.Library.Rest.Rule34;
 
 namespace SammBot.Bot.Modules;
 

diff --git a/Source/SammBot.Bot/Modules/FunModule.cs b/Source/SammBot.Bot/Modules/FunModule.cs
@@ -32,8 +32,8 @@
 using SammBot.Library.Attributes;
 using SammBot.Library.Extensions;
 using SammBot.Library.Models;
+using SammBot.Library.Models.UrbanDictionary;
 using SammBot.Library.Preconditions;
-using SammBot.Library.Rest.UrbanDictionary;
 
 namespace SammBot.Bot.Modules;
 

diff --git a/Source/SammBot.Bot/Modules/RandomModule.cs b/Source/SammBot.Bot/Modules/RandomModule.cs
@@ -29,8 +29,8 @@
 using SammBot.Library.Attributes;
 using SammBot.Library.Extensions;
 using SammBot.Library.Models;
+using SammBot.Library.Models.Animal;
 using SammBot.Library.Preconditions;
-using SammBot.Library.Rest;
 
 namespace SammBot.Bot.Modules;
 

diff --git a/Source/SammBot.Bot/Modules/UtilsModule.cs b/Source/SammBot.Bot/Modules/UtilsModule.cs
@@ -31,9 +31,9 @@
 using SammBot.Library.Attributes;
 using SammBot.Library.Extensions;
 using SammBot.Library.Models;
+using SammBot.Library.Models.OpenWeather.Forecast;
+using SammBot.Library.Models.OpenWeather.Geolocation;
 using SammBot.Library.Preconditions;
-using SammBot.Library.Rest.OpenWeather.Forecast;
-using SammBot.Library.Rest.OpenWeather.Geolocation;
 
 namespace SammBot.Bot.Modules;
 

diff --git a/Source/SammBot.Library/Rest/DuckImage.cs → ...ammBot.Library/Models/Animal/DuckImage.cs b/Source/SammBot.Library/Rest/DuckImage.cs → ...ammBot.Library/Models/Animal/DuckImage.cs
@@ -18,7 +18,7 @@
 
 using System.Text.Json.Serialization;
 
-namespace SammBot.Library.Rest;
+namespace SammBot.Library.Models.Animal;
 
 /// <summary>
 /// A class that contains a duck image from the random-d.uk API.

diff --git a/Source/SammBot.Library/Rest/FoxImage.cs → ...SammBot.Library/Models/Animal/FoxImage.cs b/Source/SammBot.Library/Rest/FoxImage.cs → ...SammBot.Library/Models/Animal/FoxImage.cs
@@ -18,7 +18,7 @@
 
 using System.Text.Json.Serialization;
 
-namespace SammBot.Library.Rest;
+namespace SammBot.Library.Models.Animal;
 
 /// <summary>
 /// A class that contains a fox image from the Random Fox API.

diff --git a/Source/SammBot.Library/Rest/E621/E621File.cs → ...e/SammBot.Library/Models/E621/E621File.cs b/Source/SammBot.Library/Rest/E621/E621File.cs → ...e/SammBot.Library/Models/E621/E621File.cs
@@ -18,7 +18,7 @@
 
 using System.Text.Json.Serialization;
 
-namespace SammBot.Library.Rest.E621;
+namespace SammBot.Library.Models.E621;
 
 /// <summary>
 /// A class that contains a file from the e621 CDN.

diff --git a/Source/SammBot.Library/Rest/E621/E621Post.cs → ...e/SammBot.Library/Models/E621/E621Post.cs b/Source/SammBot.Library/Rest/E621/E621Post.cs → ...e/SammBot.Library/Models/E621/E621Post.cs
@@ -18,7 +18,7 @@
 
 using System.Text.Json.Serialization;
 
-namespace SammBot.Library.Rest.E621;
+namespace SammBot.Library.Models.E621;
 
 /// <summary>
 /// A class that contains a post from the e621 API.

diff --git a/...ce/SammBot.Library/Rest/E621/E621Reply.cs → .../SammBot.Library/Models/E621/E621Reply.cs b/...ce/SammBot.Library/Rest/E621/E621Reply.cs → .../SammBot.Library/Models/E621/E621Reply.cs
@@ -18,7 +18,7 @@
 
 using System.Text.Json.Serialization;
 
-namespace SammBot.Library.Rest.E621;
+namespace SammBot.Library.Models.E621;
 
 /// <summary>
 /// A class that contains a post query reply from e621.

diff --git a/...ce/SammBot.Library/Rest/E621/E621Score.cs → .../SammBot.Library/Models/E621/E621Score.cs b/...ce/SammBot.Library/Rest/E621/E621Score.cs → .../SammBot.Library/Models/E621/E621Score.cs
@@ -18,7 +18,7 @@
 
 using System.Text.Json.Serialization;
 
-namespace SammBot.Library.Rest.E621;
+namespace SammBot.Library.Models.E621;
 
 /// <summary>
 /// A class containing a post's score in e621.

diff --git a/...Library/Rest/E621/E621SearchParameters.cs → ...brary/Models/E621/E621SearchParameters.cs b/...Library/Rest/E621/E621SearchParameters.cs → ...brary/Models/E621/E621SearchParameters.cs
@@ -18,7 +18,7 @@
 
 using SammBot.Library.Attributes;
 
-namespace SammBot.Library.Rest.E621;
+namespace SammBot.Library.Models.E621;
 
 /// <summary>
 /// A class used to pass search parameters to the e621

diff --git a/Source/SammBot.Library/Rest/E621/E621Tags.cs → ...e/SammBot.Library/Models/E621/E621Tags.cs b/Source/SammBot.Library/Rest/E621/E621Tags.cs → ...e/SammBot.Library/Models/E621/E621Tags.cs
@@ -18,7 +18,7 @@
 
 using System.Text.Json.Serialization;
 
-namespace SammBot.Library.Rest.E621;
+namespace SammBot.Library.Models.E621;
 
 /// <summary>
 /// A class that contains a post's tags on e621.

diff --git a/...est/OpenWeather/Forecast/CloudForecast.cs → ...els/OpenWeather/Forecast/CloudForecast.cs b/...est/OpenWeather/Forecast/CloudForecast.cs → ...els/OpenWeather/Forecast/CloudForecast.cs
@@ -18,7 +18,7 @@
 
 using System.Text.Json.Serialization;
 
-namespace SammBot.Library.Rest.OpenWeather.Forecast;
+namespace SammBot.Library.Models.OpenWeather.Forecast;
 
 public class CloudForecast
 {

diff --git a/.../OpenWeather/Forecast/CompleteForecast.cs → .../OpenWeather/Forecast/CompleteForecast.cs b/.../OpenWeather/Forecast/CompleteForecast.cs → .../OpenWeather/Forecast/CompleteForecast.cs
@@ -18,7 +18,7 @@
 
 using System.Text.Json.Serialization;
 
-namespace SammBot.Library.Rest.OpenWeather.Forecast;
+namespace SammBot.Library.Models.OpenWeather.Forecast;
 
 public class CompleteForecast
 {

diff --git a/...ry/Rest/OpenWeather/Forecast/Condition.cs → .../Models/OpenWeather/Forecast/Condition.cs b/...ry/Rest/OpenWeather/Forecast/Condition.cs → .../Models/OpenWeather/Forecast/Condition.cs
@@ -18,7 +18,7 @@
 
 using System.Text.Json.Serialization;
 
-namespace SammBot.Library.Rest.OpenWeather.Forecast;
+namespace SammBot.Library.Models.OpenWeather.Forecast;
 
 public class Condition
 {

diff --git a/...y/Rest/OpenWeather/Forecast/Coordinate.cs → ...Models/OpenWeather/Forecast/Coordinate.cs b/...y/Rest/OpenWeather/Forecast/Coordinate.cs → ...Models/OpenWeather/Forecast/Coordinate.cs
@@ -18,7 +18,7 @@
 
 using System.Text.Json.Serialization;
 
-namespace SammBot.Library.Rest.OpenWeather.Forecast;
+namespace SammBot.Library.Models.OpenWeather.Forecast;
 
 public class Coordinate
 {

diff --git a/.../OpenWeather/Forecast/ForecastLocation.cs → .../OpenWeather/Forecast/ForecastLocation.cs b/.../OpenWeather/Forecast/ForecastLocation.cs → .../OpenWeather/Forecast/ForecastLocation.cs
@@ -18,7 +18,7 @@
 
 using System.Text.Json.Serialization;
 
-namespace SammBot.Library.Rest.OpenWeather.Forecast;
+namespace SammBot.Library.Models.OpenWeather.Forecast;
 
 public class ForecastLocation
 {

diff --git a/...Rest/OpenWeather/Forecast/MainForecast.cs → ...dels/OpenWeather/Forecast/MainForecast.cs b/...Rest/OpenWeather/Forecast/MainForecast.cs → ...dels/OpenWeather/Forecast/MainForecast.cs
@@ -18,7 +18,7 @@
 
 using System.Text.Json.Serialization;
 
-namespace SammBot.Library.Rest.OpenWeather.Forecast;
+namespace SammBot.Library.Models.OpenWeather.Forecast;
 
 public class MainForecast
 {

diff --git a/...Rest/OpenWeather/Forecast/RainForecast.cs → ...dels/OpenWeather/Forecast/RainForecast.cs b/...Rest/OpenWeather/Forecast/RainForecast.cs → ...dels/OpenWeather/Forecast/RainForecast.cs
@@ -18,7 +18,7 @@
 
 using System.Text.Json.Serialization;
 
-namespace SammBot.Library.Rest.OpenWeather.Forecast;
+namespace SammBot.Library.Models.OpenWeather.Forecast;
 
 public class RainForecast
 {

diff --git a/...Rest/OpenWeather/Forecast/SnowForecast.cs → ...dels/OpenWeather/Forecast/SnowForecast.cs b/...Rest/OpenWeather/Forecast/SnowForecast.cs → ...dels/OpenWeather/Forecast/SnowForecast.cs
@@ -18,7 +18,7 @@
 
 using System.Text.Json.Serialization;
 
-namespace SammBot.Library.Rest.OpenWeather.Forecast;
+namespace SammBot.Library.Models.OpenWeather.Forecast;
 
 public class SnowForecast
 {

diff --git a/...OpenWeather/Forecast/WeatherParameters.cs → ...OpenWeather/Forecast/WeatherParameters.cs b/...OpenWeather/Forecast/WeatherParameters.cs → ...OpenWeather/Forecast/WeatherParameters.cs
@@ -18,7 +18,7 @@
 
 using SammBot.Library.Attributes;
 
-namespace SammBot.Library.Rest.OpenWeather.Forecast;
+namespace SammBot.Library.Models.OpenWeather.Forecast;
 
 public class WeatherParameters
 {

diff --git a/...Rest/OpenWeather/Forecast/WindForecast.cs → ...dels/OpenWeather/Forecast/WindForecast.cs b/...Rest/OpenWeather/Forecast/WindForecast.cs → ...dels/OpenWeather/Forecast/WindForecast.cs
@@ -18,7 +18,7 @@
 
 using System.Text.Json.Serialization;
 
-namespace SammBot.Library.Rest.OpenWeather.Forecast;
+namespace SammBot.Library.Models.OpenWeather.Forecast;
 
 public class WindForecast
 {

diff --git a/...eather/Geolocation/GeolocationLocation.cs → ...eather/Geolocation/GeolocationLocation.cs b/...eather/Geolocation/GeolocationLocation.cs → ...eather/Geolocation/GeolocationLocation.cs
@@ -18,7 +18,7 @@
 
 using System.Text.Json.Serialization;
 
-namespace SammBot.Library.Rest.OpenWeather.Geolocation;
+namespace SammBot.Library.Models.OpenWeather.Geolocation;
 
 public class GeolocationLocation
 {

diff --git a/...ther/Geolocation/GeolocationParameters.cs → ...ther/Geolocation/GeolocationParameters.cs b/...ther/Geolocation/GeolocationParameters.cs → ...ther/Geolocation/GeolocationParameters.cs
@@ -18,7 +18,7 @@
 
 using SammBot.Library.Attributes;
 
-namespace SammBot.Library.Rest.OpenWeather.Geolocation;
+namespace SammBot.Library.Models.OpenWeather.Geolocation;
 
 public class GeolocationParameters
 {

diff --git a/...SammBot.Library/Rest/Rule34/Rule34Post.cs → ...mmBot.Library/Models/Rule34/Rule34Post.cs b/...SammBot.Library/Rest/Rule34/Rule34Post.cs → ...mmBot.Library/Models/Rule34/Rule34Post.cs
@@ -18,7 +18,7 @@
 
 using System.Text.Json.Serialization;
 
-namespace SammBot.Library.Rest.Rule34;
+namespace SammBot.Library.Models.Rule34;
 
 /// <summary>
 /// A class that contains a post from the Rule34 API.

diff --git a/...ary/Rest/Rule34/Rule34SearchParameters.cs → ...y/Models/Rule34/Rule34SearchParameters.cs b/...ary/Rest/Rule34/Rule34SearchParameters.cs → ...y/Models/Rule34/Rule34SearchParameters.cs
@@ -18,7 +18,7 @@
 
 using SammBot.Library.Attributes;
 
-namespace SammBot.Library.Rest.Rule34;
+namespace SammBot.Library.Models.Rule34;
 
 /// <summary>
 /// A class used to pass search parameters to the Rule34

diff --git a/...y/Rest/UrbanDictionary/UrbanDefinition.cs → ...Models/UrbanDictionary/UrbanDefinition.cs b/...y/Rest/UrbanDictionary/UrbanDefinition.cs → ...Models/UrbanDictionary/UrbanDefinition.cs
@@ -18,7 +18,7 @@
 
 using System.Text.Json.Serialization;
 
-namespace SammBot.Library.Rest.UrbanDictionary;
+namespace SammBot.Library.Models.UrbanDictionary;
 
 /// <summary>
 /// A class that contains a word definition from the Urban Dictionary API.

diff --git a/...st/UrbanDictionary/UrbanDefinitionList.cs → ...ls/UrbanDictionary/UrbanDefinitionList.cs b/...st/UrbanDictionary/UrbanDefinitionList.cs → ...ls/UrbanDictionary/UrbanDefinitionList.cs
@@ -18,7 +18,7 @@
 
 using System.Text.Json.Serialization;
 
-namespace SammBot.Library.Rest.UrbanDictionary;
+namespace SammBot.Library.Models.UrbanDictionary;
 
 /// <summary>
 /// A class that contains a list of word definitions from the Urban Dictionary

diff --git a/.../UrbanDictionary/UrbanSearchParameters.cs → .../UrbanDictionary/UrbanSearchParameters.cs b/.../UrbanDictionary/UrbanSearchParameters.cs → .../UrbanDictionary/UrbanSearchParameters.cs
@@ -18,7 +18,7 @@
 
 using SammBot.Library.Attributes;
 
-namespace SammBot.Library.Rest.UrbanDictionary;
+namespace SammBot.Library.Models.UrbanDictionary;
 
 /// <summary>
 /// A class used to pass search parameters to the Urban