Allow tokens to be ignored, add example random generation, tweak return for sources

src/Attributes/RequireTokenAttribute.cs

@@ -1,6 +1,7 @@
 using System.Net;
 using Exsersewo.Common.Utilities;
 using Kynareth.Helpers;
+using Microsoft.AspNetCore.Mvc.Controllers;
 using Microsoft.AspNetCore.Mvc.Filters;
 
 namespace Kynareth.Attributes;
@@ -10,7 +11,11 @@ public class RequireTokenAttribute : ActionFilterAttribute
 {
 	public override async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
 	{
-		if (await RequestHelper.IsRequestAuthenticatedAsync(context.HttpContext.Request))
+		var methodInfo = (ControllerActionDescriptor)context.ActionDescriptor;
+
+		var shouldIgnoreToken = methodInfo.MethodInfo.CustomAttributes.Any(x=>x.AttributeType == typeof(IgnoreTokenAttribute));
+		
+		if (shouldIgnoreToken || await RequestHelper.IsRequestAuthenticatedAsync(context.HttpContext.Request))
 		{
 			await next();
 			return;
@@ -24,3 +29,8 @@ public class RequireTokenAttribute : ActionFilterAttribute
 		return;
 	}
 }
+
+public class IgnoreTokenAttribute : Attribute
+{
+	
+}

src/Controllers/AmogusController.cs

@@ -1,7 +1,9 @@
 using Exsersewo.Common.Utilities;
 using ImageMagick;
+using Kynareth.Attributes;
 using Kynareth.Helpers;
 using Microsoft.AspNetCore.Mvc;
+using Kynareth.Extensions;
 
 namespace Kynareth.Controllers;
 
@@ -31,14 +33,17 @@ public class AmogusController : BaseController<AmogusController>
 	}
 	
 	[HttpGet("roles")]
+	[IgnoreToken]
 	public async Task<object> GetAmongUsRoles()
 		=> Ok(EventResult.FromSuccess(Enum.GetNames<AmogusRole>().Except("None")));
 	
 	[HttpGet("colours")]
+	[IgnoreToken]
 	public async Task<object> GetAmongUsColours()
 		=> Ok(EventResult.FromSuccess(Enum.GetNames<AmogusColour>().Except("None")));
 
 	[HttpGet("skins")]
+	[IgnoreToken]
 	public async Task<object> GetAmongUsSkins()
 		=> Ok(EventResult.FromSuccess(Enum.GetNames<AmogusSkin>().Except("None")));
 }

src/Controllers/ImageGenerationController.cs

@@ -17,6 +17,7 @@ public class ImageGenerationController : BaseController<ImageGenerationControlle
 
 	[HttpGet]
 	[EndpointMetrics("image.generate.get.templates")]
+	[IgnoreToken]
 	[ProducesResponseType(typeof(IEnumerable<ImageGenerationEndpointRead>), StatusCodes.Status200OK)]
 	public Task<object> GetTemplates()
 	{
@@ -54,4 +55,38 @@ public class ImageGenerationController : BaseController<ImageGenerationControlle
 		}
 	}
 	
+	[HttpGet("{template}/random")]
+	[EndpointMetrics("image.generate.generate.random")]
+	[ProducesResponseType(typeof(Stream), StatusCodes.Status200OK, "image/png")]
+	[ProducesResponseType(typeof(EventResult), StatusCodes.Status400BadRequest)]
+	[ProducesResponseType(typeof(EventResult), StatusCodes.Status404NotFound)]
+	[ProducesResponseType(typeof(EventResult), StatusCodes.Status500InternalServerError)]
+	[IgnoreToken]
+	public async Task<object> GenerateMemeAsync(string template, [FromQuery] string variant = null)
+	{
+		try
+		{
+			if (!string.IsNullOrWhiteSpace(template))
+			{
+				var result = await ImageManager.GenerateImageAsync(template, variant, Request.HttpContext.RequestAborted);
+
+				if (result is byte[] data)
+				{
+					var image = new MemoryStream(data);
+				
+					return HttpContext.SendStream(image, "image/png");
+				}
+
+				return result as IResult;
+			}
+
+			return HttpContext.Send(EventResult.FromFailure("No template has been provided"), System.Net.HttpStatusCode.BadRequest);
+		}
+		catch (ArgumentException ex)
+		{
+			_logger.LogCritical(ex.Message, ex);
+			
+			return HttpContext.Send(EventResult.FromFailure("Can't parse result"), System.Net.HttpStatusCode.InternalServerError);
+		}
+	}
 }

src/Controllers/ImageManipulationController.cs

@@ -49,6 +49,7 @@ public class ImageManipulationController : BaseController<ImageManipulationContr
 	///  BOTTOM TEXT  ///
 	/// ------------- ///	
 	[HttpGet]
+	[IgnoreToken]
 	[EndpointMetrics("image.generate.get.templates")]
 	[ProducesResponseType(typeof(IEnumerable<ImageGenerationEndpointRead>), StatusCodes.Status200OK)]
 	public Task<object> GetTemplates()

src/Extensions.cs

@@ -1,22 +0,0 @@
-namespace Kynareth;
-
-public static class Extensions
-{
-	public static T GetRandomEnumValue<T>() where T : Enum 
-		=> (T) Enum.GetValues(typeof(T)).OfType<Enum>().OrderBy(_ => Guid.NewGuid()).FirstOrDefault();
-	
-	public static IList<int> Range(int start, int stop, int step)
-	{
-		var list = new List<int>();
-		
-		for (int i = start; i < stop; i += step) {
-			list.Add(i);
-		}
-
-		return list;
-	}
-	
-	public static T[] Except<T>(this T[] array, T specificValue) where T : IComparable {
-		return array.Where<T>(val => val.CompareTo(specificValue) != 0).ToArray();
-	}
-}

src/Extensions/CollectionExtensions.cs

@@ -0,0 +1,46 @@
+using Exsersewo.Common.Extensions;
+
+namespace Kynareth.Extensions;
+
+public static class CollectionExtensions
+{
+	public static ICollection<T> GetRandomAmount<T>(this ICollection<T> stack, int amount)
+	{
+		T[] entries = new T[amount];
+
+		for (int x = 0; x < amount; x++)
+		{
+			entries[x] = stack.CryptoRandom();
+		}
+		
+		return entries;
+	}
+	
+	public static ICollection<T> GetRandomAmount<T>(this IEnumerable<T> stack, int amount)
+	{
+		T[] entries = new T[amount];
+
+		for (int x = 0; x < amount; x++)
+		{
+			entries[x] = stack.CryptoRandom();
+		}
+		
+		return entries;
+	}
+	
+	public static IList<int> Range(int start, int stop, int step)
+	{
+		var list = new List<int>();
+		
+		for (int i = start; i < stop; i += step) {
+			list.Add(i);
+		}
+
+		return list;
+	}
+
+	public static T[] Except<T>(this T[] array, T specificValue) where T : IComparable
+	{
+		return array.Where<T>(val => val.CompareTo(specificValue) != 0).ToArray();
+	}
+}

src/Extensions/EnumHelper.cs

@@ -0,0 +1,7 @@
+namespace Kynareth.Extensions;
+
+public static class EnumHelper
+{
+	public static T GetRandomEnumValue<T>() where T : Enum 
+		=> (T) Enum.GetValues(typeof(T)).OfType<Enum>().OrderBy(_ => Guid.NewGuid()).FirstOrDefault();
+}

src/Helpers/AmogusHelper.cs

@@ -3,7 +3,8 @@ using System.Numerics;
 using System.Text;
 using ImageMagick;
 using Kynareth.Managers;
-using Kynareth.Models;
+using Kynareth.Extensions;
+using CollectionExtensions = Kynareth.Extensions.CollectionExtensions;
 
 namespace Kynareth.Helpers;
 
@@ -412,7 +413,7 @@ public static class AmogusHelper
         using MagickImage stars2 = new MagickImage(stars);
         stars2.Distort(DistortMethod.ScaleRotateTranslate, 180);
 
-        foreach (var x in Extensions.Range(-800, width, 320))
+        foreach (var x in CollectionExtensions.Range(-800, width, 320))
         {
             baseImage.Composite(stars2, Gravity.Northwest, x, (int)(x / 60f) - 200, CompositeOperator.Over);
             baseImage.Composite(stars, Gravity.Northwest, x, 100 + (int)(x / 120f), CompositeOperator.Over);
@@ -458,16 +459,16 @@ public static class AmogusHelper
     /// <returns>A <see cref="MemoryStream"/> containing the Amogus Ejected Gif</returns>
     public static MagickImageCollection GenerateEjectionGif(string name, AmogusColour? colour = null, AmogusRole? role = null, AmogusSkin? skin = null, bool addStars = true)
     {
-        if (role is null) role = Extensions.GetRandomEnumValue<AmogusRole>();
+        if (role is null) role = EnumHelper.GetRandomEnumValue<AmogusRole>();
 
         return GenerateCustomEjectionGif(GenerateEjectionMessage(name, role.Value), colour, role, skin, addStars);
     }
 
     public static MagickImageCollection GenerateCustomEjectionGif(string text, AmogusColour? colour = null, AmogusRole? role = null, AmogusSkin? skin = null, bool addStars = true)
     {
-        if (colour is null) colour = Extensions.GetRandomEnumValue<AmogusColour>();
-        if (role is null) role = Extensions.GetRandomEnumValue<AmogusRole>();
-        if (skin is null) skin = Extensions.GetRandomEnumValue<AmogusSkin>();
+        if (colour is null) colour = EnumHelper.GetRandomEnumValue<AmogusColour>();
+        if (role is null) role = EnumHelper.GetRandomEnumValue<AmogusRole>();
+        if (skin is null) skin = EnumHelper.GetRandomEnumValue<AmogusSkin>();
         
         var crewmate = GenerateCrewmate(colour.Value, skin.Value);
         crewmate = MakeSquare(crewmate);
@@ -497,7 +498,7 @@ public static class AmogusHelper
             stars3.BackgroundColor = MagickColors.Transparent;
         }
 
-        var range = Extensions.Range(-120, background.Width * 3, 12);
+        var range = CollectionExtensions.Range(-120, background.Width * 3, 12);
 
         MagickImageCollection gifFrames = new MagickImageCollection();
         

src/Managers/ImageManager.Generation.cs

@@ -1,21 +1,43 @@
+using System.Collections.Immutable;
 using Exsersewo.Common.Utilities;
 using ImageMagick;
 using Kynareth.Models;
+using Kynareth.Extensions;
 
 namespace Kynareth.Managers;
 
 public static partial class ImageManager
 {
 	private static List<ImageGenerationEndpoint> GenerationEndpoints;
+	private static IReadOnlyList<string> sourceFiles;
 
 	private static string GenerationTemplateBaseFolder;
 	
 	static void ConfigureGeneration(IConfiguration configuration, IWebHostEnvironment _appEnvironment)
 	{
+		sourceFiles = Directory.EnumerateFiles(Path.Combine(_appEnvironment.WebRootPath, configuration.GetValue<string>("ShitpostBot:Folder"), "..", "random")).ToImmutableList();
 		GenerationTemplateBaseFolder = Path.Combine(_appEnvironment.WebRootPath, configuration.GetValue<string>("ShitpostBot:Folder"));
 		GenerationEndpoints = configuration.GetSection("ShitpostBot:Templates").Get<List<ImageGenerationEndpoint>>();
 	}
 
+	public static async Task<Object> GenerateImageAsync(string template, string variant, CancellationToken cancellationToken)
+	{
+		ImageGenerationImage imageTemplate = null;
+
+		var endpoint = GenerationEndpoints.FirstOrDefault(e => e.Name.ToLowerInvariant().Equals(template.ToLowerInvariant()));
+
+		if (endpoint is null)
+		{
+			var ex = new ArgumentException($"Couldn't find endpoint named \"{template}\"", nameof(template));
+
+			return GetResult(StatusCodes.Status404NotFound, EventResult.FromFailureException(ex.Message, ex));
+		}
+
+		var sources = sourceFiles.GetRandomAmount(endpoint.SourcesRequired) as string[];
+
+		return await GenerateImageAsync(template, variant, sources, cancellationToken);
+	}
+	
 	public static async Task<object> GenerateImageAsync(string template, string variant, string[] sources, CancellationToken cancellationToken)
 	{
 		while (true)
@@ -102,7 +124,17 @@ public static partial class ImageManager
 			{
 				var position = template.Positions.ElementAtOrDefault(img);
 
-				using MagickImage srcImg = new MagickImage(await HttpWebClient.GetStreamAsync(new Uri(src)));
+				Stream imageData = null;
+				if (File.Exists(src))
+				{
+					imageData = new MemoryStream(await File.ReadAllBytesAsync(src));
+				}
+				else if (src.StartsWith("http"))
+				{
+					imageData = await HttpWebClient.GetStreamAsync(new Uri(src));
+				}
+
+				using MagickImage srcImg = new MagickImage(imageData);
 
 				srcImg.Resize(position.Width, position.Height);
 
@@ -121,6 +153,8 @@ public static partial class ImageManager
 
 				img++;
 			}
+
+			return;
 		}
 	}