From 21dfb964527b11e37a3aa8a5a4c6ea862d1f077f Mon Sep 17 00:00:00 2001 From: xtrafrancyz Date: Mon, 7 Sep 2020 14:19:05 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=203=D0=B4=20=D0=B3=D0=BE=D0=BB=D0=BE=D0=B2?= =?UTF-8?q?=D1=8B=20=D0=B4=D0=BB=D1=8F=20=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20?= =?UTF-8?q?=D0=B8=D0=B7=20=D1=86=D0=B8=D1=84=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../skinservice/pippo/SkinApplication.java | 72 ++++++++++--------- 1 file changed, 38 insertions(+), 34 deletions(-) diff --git a/src/main/java/net/xtrafrancyz/skinservice/pippo/SkinApplication.java b/src/main/java/net/xtrafrancyz/skinservice/pippo/SkinApplication.java index 0cffd70..723537b 100644 --- a/src/main/java/net/xtrafrancyz/skinservice/pippo/SkinApplication.java +++ b/src/main/java/net/xtrafrancyz/skinservice/pippo/SkinApplication.java @@ -32,44 +32,48 @@ public SkinApplication(SkinService service) { } // ### /head - GET("/head/{username: [a-zA-z0-9_-]+}\\.png", context -> { - String username = context.getParameter("username").toString(); - writeImage(context, Humanizer.head(username, 160)); - }); - GET("/head/{username: [a-zA-z0-9_-]+}/{size: [0-9]+}\\.png", context -> { - int size = context.getParameter("size").toInt(160); - String username = context.getParameter("username").toString(); - writeImage(context, Humanizer.head(username, size)); - }); - GET("/head/3d/{username: [a-zA-z0-9_-]+}\\.png", context -> { - String username = context.getParameter("username").toString(); - writeImage(context, Perspective.head(username, 160, false)); - }); - GET("/head/3d/{username: [a-zA-z0-9_-]+}/{size: [0-9]+}\\.png", context -> { - int size = context.getParameter("size").toInt(160); - String username = context.getParameter("username").toString(); - writeImage(context, Perspective.head(username, size, false)); + addRouteGroup("/head", group -> { + group.GET("/3d/{username: [a-zA-z0-9_-]+}\\.png", context -> { + String username = context.getParameter("username").toString(); + writeImage(context, Perspective.head(username, 160, false)); + }); + group.GET("/3d/{username: [a-zA-z0-9_-]+}/{size: [0-9]+}\\.png", context -> { + int size = context.getParameter("size").toInt(160); + String username = context.getParameter("username").toString(); + writeImage(context, Perspective.head(username, size, false)); + }); + group.GET("/{username: [a-zA-z0-9_-]+}\\.png", context -> { + String username = context.getParameter("username").toString(); + writeImage(context, Humanizer.head(username, 160)); + }); + group.GET("/{username: [a-zA-z0-9_-]+}/{size: [0-9]+}\\.png", context -> { + int size = context.getParameter("size").toInt(160); + String username = context.getParameter("username").toString(); + writeImage(context, Humanizer.head(username, size)); + }); }); // ### /helm - GET("/helm/{username: [a-zA-z0-9_-]+}\\.png", context -> { - String username = context.getParameter("username").toString(); - writeImage(context, Humanizer.helm(username, 160)); - }); - GET("/helm/{username: [a-zA-z0-9_-]+}/{size: [0-9]+}\\.png", context -> { - int size = context.getParameter("size").toInt(160); - String username = context.getParameter("username").toString(); - writeImage(context, Humanizer.helm(username, size)); - }); - GET("/helm/3d/{username: [a-zA-z0-9_-]+}\\.png", context -> { - String username = context.getParameter("username").toString(); - writeImage(context, Perspective.head(username, 160, true)); - }); - GET("/helm/3d/{username: [a-zA-z0-9_-]+}/{size: [0-9]+}\\.png", context -> { - int size = context.getParameter("size").toInt(160); - String username = context.getParameter("username").toString(); - writeImage(context, Perspective.head(username, size, true)); + addRouteGroup("/helm", group -> { + group.GET("/3d/{username: [a-zA-z0-9_-]+}\\.png", context -> { + String username = context.getParameter("username").toString(); + writeImage(context, Perspective.head(username, 160, true)); + }); + group.GET("/3d/{username: [a-zA-z0-9_-]+}/{size: [0-9]+}\\.png", context -> { + int size = context.getParameter("size").toInt(160); + String username = context.getParameter("username").toString(); + writeImage(context, Perspective.head(username, size, true)); + }); + group.GET("/{username: [a-zA-z0-9_-]+}\\.png", context -> { + String username = context.getParameter("username").toString(); + writeImage(context, Humanizer.helm(username, 160)); + }); + group.GET("/{username: [a-zA-z0-9_-]+}/{size: [0-9]+}\\.png", context -> { + int size = context.getParameter("size").toInt(160); + String username = context.getParameter("username").toString(); + writeImage(context, Humanizer.helm(username, size)); + }); });