diff --git a/Havana-Web/src/main/java/org/alexdev/http/Routes.java b/Havana-Web/src/main/java/org/alexdev/http/Routes.java index e8b981e..bc904b5 100644 --- a/Havana-Web/src/main/java/org/alexdev/http/Routes.java +++ b/Havana-Web/src/main/java/org/alexdev/http/Routes.java @@ -279,7 +279,6 @@ public class Routes { // API RouteManager.addRoute("/api/advertisement/get_img", AdvertisementController::getImg); RouteManager.addRoute("/api/advertisement/get_url", AdvertisementController::getUrl); - RouteManager.addRoute("/photos/my_photos", PhotosController::viewphotos); RouteManager.addRoute("/api/verify/get/*", VerifyController::get); RouteManager.addRoute("/api/verify/clear/*", VerifyController::clear); diff --git a/Havana-Web/src/main/java/org/alexdev/http/controllers/api/PhotosController.java b/Havana-Web/src/main/java/org/alexdev/http/controllers/api/PhotosController.java deleted file mode 100644 index e74a9ca..0000000 --- a/Havana-Web/src/main/java/org/alexdev/http/controllers/api/PhotosController.java +++ /dev/null @@ -1,77 +0,0 @@ -package org.alexdev.http.controllers.api; - -import org.alexdev.duckhttpd.server.connection.WebConnection; -import org.alexdev.havana.game.item.Photo; -import org.alexdev.http.dao.CommunityDao; -import org.alexdev.http.util.HtmlUtil; -import org.alexdev.photorenderer.PhotoRenderer; -import org.alexdev.photorenderer.RenderOption; -import org.alexdev.photorenderer.palettes.GreyscalePalette; -import org.apache.commons.codec.binary.Base64; - -import javax.imageio.ImageIO; -import java.awt.image.BufferedImage; -import java.io.ByteArrayOutputStream; -import java.io.IOException; - -public class PhotosController { - public static void viewphotos(WebConnection webConnection) throws Exception { - if (!webConnection.session().contains("user.id")) { - webConnection.send("Please sign in"); - return; - } - - PhotoRenderer photoViewer = null; - var photos = CommunityDao.getPhotos(webConnection.session().getInt("user.id")); - - StringBuilder stringBuilder = new StringBuilder(); - - var renderOption = RenderOption.GREYSCALE; - - if (webConnection.get().contains("greyscale")) { - renderOption = RenderOption.GREYSCALE; - } - - if (webConnection.get().contains("sepia")) { - renderOption = RenderOption.SEPIA; - } - - if (renderOption != RenderOption.GREYSCALE) { - stringBuilder.append("
View images as greyscale? View Greyscale
"); - } else { - stringBuilder.append("View images as original Sepia? View as Sepia
"); - } - - photoViewer = new PhotoRenderer(GreyscalePalette.getPalette(), renderOption); - - //int i = 1; - for (Photo photo : photos) { - var src = photoViewer.createImage(photo.getData()); - stringBuilder.append("Made by Alex
"); - webConnection.send(stringBuilder.toString()); - } - - -} diff --git a/Havana-Web/src/main/java/org/alexdev/http/dao/CommunityDao.java b/Havana-Web/src/main/java/org/alexdev/http/dao/CommunityDao.java index f964410..1d84026 100644 --- a/Havana-Web/src/main/java/org/alexdev/http/dao/CommunityDao.java +++ b/Havana-Web/src/main/java/org/alexdev/http/dao/CommunityDao.java @@ -2,13 +2,8 @@ package org.alexdev.http.dao; import org.alexdev.havana.dao.Storage; import org.alexdev.havana.dao.mysql.GroupDao; -import org.alexdev.havana.dao.mysql.ItemDao; import org.alexdev.havana.game.groups.Group; -import org.alexdev.havana.game.item.Item; -import org.alexdev.havana.game.item.Photo; -import org.alexdev.http.game.CommunityPhoto; import org.alexdev.http.game.groups.DiscussionTopic; -import org.alexdev.photorenderer.PhotoRenderer; import java.sql.*; import java.util.ArrayList; @@ -117,37 +112,4 @@ public class CommunityDao { return discussionList; } - - public static List