Remove image urls from data

Author: TheEpicBlock

common/src/main/java/net/modfest/platform/pojo/SubmissionData.java

@@ -15,7 +15,6 @@ public record SubmissionData(@NonNull String id,
 							 @NonNull String description,
 							 @NonNull Set<String> authors,
 							 SubmissionData.@NonNull AssociatedData platform,
-							 SubmissionResponseData.@NonNull Images images,
 							 @Nullable String source,
 							 @NonNull Awards awards
 	) implements Data {

common/src/main/java/net/modfest/platform/pojo/SubmissionResponseData.java

@@ -21,15 +21,15 @@ public record SubmissionResponseData(@NonNull String id,
 	public record Images(@Nullable String icon, @Nullable String screenshot) {
 	}
 
-	public static SubmissionResponseData fromData(SubmissionData data) {
+	public static SubmissionResponseData fromData(SubmissionData data, Images images) {
 		return new SubmissionResponseData(
 			data.id(),
 			data.event(),
 			data.name(),
 			data.description(),
 			data.authors(),
 			data.platform(),
-			data.images(),
+			images,
 			data.source(),
 			data.awards()
 		);

platform_api/src/main/java/net/modfest/platform/controller/EventController.java

@@ -1,5 +1,6 @@
 package net.modfest.platform.controller;
 
+import jakarta.servlet.http.HttpServletRequest;
 import net.modfest.platform.pojo.*;
 import net.modfest.platform.security.PermissionUtils;
 import net.modfest.platform.security.Permissions;
@@ -80,17 +81,17 @@ public void setRegistration(@PathVariable String id, @RequestBody String userId,
 	}
 
 	@GetMapping("/event/{eventId}/submissions")
-	public List<SubmissionResponseData> getSubmissions(@PathVariable String eventId) {
+	public List<SubmissionResponseData> getSubmissions(HttpServletRequest request, @PathVariable String eventId) {
 		var event = getEvent(eventId);
 		return service
 			.getSubmissionsFromEvent(event)
-			.map(SubmissionResponseData::fromData)
+			.map(s -> service.addResponseInfo(request, s))
 			.toList();
 	}
 
 	@PostMapping(value = "/event/{eventId}/submissions", params = "type=other")
 	@RequiresPermissions(Permissions.Event.SUBMIT)
-	public SubmissionResponseData makeSubmissionOther(@PathVariable String eventId, @RequestBody SubmitRequestOther submission) {
+	public SubmissionResponseData makeSubmissionOther(HttpServletRequest request, @PathVariable String eventId, @RequestBody SubmitRequestOther submission) {
 		var event = getEvent(eventId);
 		var subject = SecurityUtils.getSubject();
 		var bypass = subject.isPermitted(Permissions.Event.SUBMIT_BYPASS);
@@ -110,12 +111,12 @@ public SubmissionResponseData makeSubmissionOther(@PathVariable String eventId,
 				"You don't have permissions to submit for people other than yourself");
 		}
 
-		return SubmissionResponseData.fromData(service.makeSubmissionOther(event, authors, submission));
+		return service.addResponseInfo(request, service.makeSubmissionOther(event, authors, submission));
 	}
 
-		@PostMapping(value = "/event/{eventId}/submissions", params = "type=modrinth")
+	@PostMapping(value = "/event/{eventId}/submissions", params = "type=modrinth")
 	@RequiresPermissions(Permissions.Event.SUBMIT)
-	public SubmissionResponseData makeSubmissionModrinth(@PathVariable String eventId, @RequestBody SubmitRequestModrinth submission) {
+	public SubmissionResponseData makeSubmissionModrinth(HttpServletRequest request, @PathVariable String eventId, @RequestBody SubmitRequestModrinth submission) {
 		var event = getEvent(eventId);
 		var subject = SecurityUtils.getSubject();
 		var bypass = subject.isPermitted(Permissions.Event.SUBMIT_BYPASS);
@@ -137,7 +138,7 @@ public SubmissionResponseData makeSubmissionModrinth(@PathVariable String eventI
 				"You don't have permissions to submit for people other than yourself");
 		}
 
-		return SubmissionResponseData.fromData(service.makeSubmissionModrinth(eventId, submission.modrinthProject()));
+		return service.addResponseInfo(request, service.makeSubmissionModrinth(eventId, submission.modrinthProject()));
 	}
 
 	@PatchMapping("/event/{eventId}/submission/{subId}")

platform_api/src/main/java/net/modfest/platform/controller/ImageCdn.java

@@ -2,8 +2,11 @@
 
 import net.modfest.platform.repository.ImageRepository;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Condition;
+import org.springframework.context.annotation.ConditionContext;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.core.io.FileSystemResource;
+import org.springframework.core.type.AnnotatedTypeMetadata;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -14,7 +17,7 @@
 
 // This controller will only be active if no image cdn was specified.
 // In prod, you should specify an image cdn
-@ConditionalOnProperty(name = "platform.image-cdn-url", matchIfMissing = true)
+@Conditional(ImageCdn.ImageCdnCondition.class)
 @RestController
 public class ImageCdn {
 	@Autowired
@@ -50,4 +53,13 @@ public ResponseEntity<FileSystemResource> getImage(@PathVariable String path) {
 		}
 		return response.body(new FileSystemResource(resolvedPath));
 	}
+
+	static class ImageCdnCondition implements Condition {
+		@Override
+		public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
+			System.out.println("eee "+context.getEnvironment().containsProperty("platform.imagecdnurl"));
+			System.out.println("fff "+context.getEnvironment().containsProperty("platform.image-cdn-url"));
+			return !context.getEnvironment().containsProperty("platform.imagecdnurl");
+		}
+	}
 }

platform_api/src/main/java/net/modfest/platform/controller/UserController.java

@@ -1,5 +1,6 @@
 package net.modfest.platform.controller;
 
+import jakarta.servlet.http.HttpServletRequest;
 import net.modfest.platform.misc.EventSource;
 import net.modfest.platform.misc.ModrinthIdUtils;
 import net.modfest.platform.misc.PlatformStandardException;
@@ -126,7 +127,7 @@ public UserData getSingleUser(@PathVariable String id) {
 	}
 
 	@GetMapping("/user/{id}/submissions")
-	public List<SubmissionResponseData> getUserSubmissions(@PathVariable String id, @RequestParam(required = false) String eventFilter) {
+	public List<SubmissionResponseData> getUserSubmissions(HttpServletRequest request, @PathVariable String id, @RequestParam(required = false) String eventFilter) {
 		var user = getSingleUser(id);
 		EventData filter = null;
 		if (eventFilter != null) {
@@ -135,7 +136,7 @@ public List<SubmissionResponseData> getUserSubmissions(@PathVariable String id,
 		}
 		return submissionService
 			.getSubmissionsFromUser(user, filter)
-			.map(SubmissionResponseData::fromData)
+			.map(s -> submissionService.addResponseInfo(request, s))
 			.toList();
 	}
 

platform_api/src/main/java/net/modfest/platform/migrations/Migrator.java

@@ -19,7 +19,7 @@
  * Contains ad-hoc migrations to our json format
  */
 public record Migrator(JsonUtil json, Path root) {
-	static final int CURRENT_VERSION = 6;
+	static final int CURRENT_VERSION = 7;
 	static final Map<Integer,MigrationManager.Migration> MIGRATIONS = new HashMap<>();
 
 	static {
@@ -29,6 +29,7 @@ public record Migrator(JsonUtil json, Path root) {
 		MIGRATIONS.put(4, Migrator::migrateTo4);
 		MIGRATIONS.put(5, Migrator::migrateTo5);
 		MIGRATIONS.put(6, Migrator::migrateTo6);
+		MIGRATIONS.put(7, Migrator::migrateTo7);
 	}
 
 
@@ -287,6 +288,22 @@ public void migrateTo6() {
 				}
 			});
 		});
+	}
 
+	/**
+	 * V7
+	 * Images are now stored directly inside platform instead of storing links to the images.
+	 * Unfortunately a lot of links are dead, so this migration makes no attempt at retrieving them.
+	 * Please get a list of images beforehand.
+	 */
+	public void migrateTo7() {
+		var submissions = root.resolve("submissions");
+		MigratorUtils.executeForAllFiles(submissions, eventDir -> {
+			MigratorUtils.executeForAllFiles(eventDir, submissionFile -> {
+				var submission = json.readJson(submissionFile, JsonObject.class);
+				submission.remove("images");
+				json.writeJson(submissionFile, submission);
+			});
+		});
 	}
 }

platform_api/src/main/java/net/modfest/platform/service/ImageService.java

@@ -34,11 +34,8 @@ public String getImageUrl(HttpServletRequest request, SubmissionRepository.Submi
 		String imageCdn = config.getImageCdnUrl();
 		if (imageCdn == null) {
 			// Platform will be acting as the cdn
-			var baseUrl = request.getRequestURL().toString();
-			if (baseUrl.endsWith("/")) {
-				baseUrl = baseUrl.substring(0, baseUrl.length()-1);
-			}
-			imageCdn = baseUrl+"/imagecdn";
+			var baseUrl = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort();
+			imageCdn = baseUrl+"/imagecdn/";
 		}
 		return imageCdn+getImageLocationKey(subKey, type)+"."+imageInfo.extension();
 	}

platform_api/src/main/java/net/modfest/platform/service/SubmissionService.java

@@ -1,5 +1,6 @@
 package net.modfest.platform.service;
 
+import jakarta.servlet.http.HttpServletRequest;
 import net.modfest.platform.pojo.*;
 import net.modfest.platform.repository.SubmissionRepository;
 import nl.theepicblock.dukerinth.ModrinthApi;
@@ -114,7 +115,6 @@ public SubmissionData makeSubmissionOther(EventData event, Set<UserData> authors
 					submitData.downloadUrl()
 				)
 			),
-			new SubmissionResponseData.Images(null, null),
 			submitData.sourceUrl(),
 			new SubmissionData.Awards(
 				Set.of(),
@@ -143,6 +143,10 @@ public SubmissionData makeSubmissionModrinth(String eventId, String mrProjectId)
 		}
 
 		imageService.downloadSubmissionImage(project.iconUrl, subKey, ImageService.SubmissionImageType.ICON);
+		var galleryUrl = getGalleryUrl(project);
+		if (galleryUrl != null) {
+			imageService.downloadSubmissionImage(galleryUrl, subKey, ImageService.SubmissionImageType.SCREENSHOT);
+		}
 		submissionRepository.save(
 			new SubmissionData(
 				subId,
@@ -156,7 +160,6 @@ public SubmissionData makeSubmissionModrinth(String eventId, String mrProjectId)
 						latest.id
 					)
 				),
-				getImages(project),
 				project.sourceUrl,
 				new SubmissionData.Awards(
 					Set.of(),
@@ -167,11 +170,13 @@ public SubmissionData makeSubmissionModrinth(String eventId, String mrProjectId)
 		return submissionRepository.get(subKey);
 	}
 
-	private static SubmissionResponseData.Images getImages(Project mrProject) {
-		return new SubmissionResponseData.Images(
-			mrProject.iconUrl,
-			mrProject.gallery.stream().filter(item -> item.featured).map(item -> item.url).findFirst().orElse(null)
-		);
+	private static @Nullable String getGalleryUrl(Project mrProject) {
+		return mrProject.gallery
+			.stream()
+			.filter(item -> item.featured)
+			.map(item -> item.url)
+			.findFirst()
+			.orElse(null);
 	}
 
 	/**
@@ -186,4 +191,18 @@ private static SubmissionResponseData.Images getImages(Project mrProject) {
 			.max(Comparator.comparing(v -> v.datePublished))
 			.orElse(null);
 	}
+
+	/**
+	 * Adds data which is only available in the http response, but not actually stored
+	 */
+	public SubmissionResponseData addResponseInfo(HttpServletRequest request, SubmissionData data) {
+		var subKey = new SubmissionRepository.SubmissionId(data.event(), data.id());
+		return SubmissionResponseData.fromData(
+			data,
+			new SubmissionResponseData.Images(
+				imageService.getImageUrl(request, subKey, ImageService.SubmissionImageType.ICON),
+				imageService.getImageUrl(request, subKey, ImageService.SubmissionImageType.SCREENSHOT)
+			)
+		);
+	}
 }