From 410adbf22b862cdd70472a764aed9f7972a06989 Mon Sep 17 00:00:00 2001
From: "(Jip) Willem Wijnia" <applicaties@jipwijnia.nl>
Date: Sun, 2 Jun 2024 15:11:59 +0200
Subject: [PATCH 01/14] Pass the repository URL to the API

---
 .idea/runConfigurations/Main.xml                         | 1 +
 build.gradle                                             | 2 +-
 src/main/java/com/faforever/client/domain/api/Mod.java   | 8 +++++++-
 .../java/com/faforever/client/domain/api/ModVersion.java | 5 ++++-
 .../java/com/faforever/client/mapstruct/ModMapper.java   | 1 +
 src/main/java/com/faforever/client/mod/ModService.java   | 4 ++++
 .../java/com/faforever/client/mod/ModUploadTask.java     | 9 +++++++--
 7 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/.idea/runConfigurations/Main.xml b/.idea/runConfigurations/Main.xml
index 05bd440c11..488f6cf328 100644
--- a/.idea/runConfigurations/Main.xml
+++ b/.idea/runConfigurations/Main.xml
@@ -7,6 +7,7 @@
     </envs>
     <option name="MAIN_CLASS_NAME" value="com.faforever.client.Main" />
     <module name="faf-client.main" />
+    <shortenClasspath name="ARGS_FILE" />
     <option name="VM_PARAMETERS" value="-Dio.netty.allocator.type=unpooled -DnativeDir=build/resources/native -Dprism.forceGPU=true -Xmx1g -XX:MinHeapFreeRatio=15 -XX:MaxHeapFreeRatio=33 -XX:+HeapDumpOnOutOfMemoryError -XX:+UseZGC -XX:+ZGenerational -Djava.net.preferIPv4Stack=true -XX:TieredStopAtLevel=1 --add-opens=java.base/java.lang=ALL-UNNAMED" />
     <RunnerSettings RunnerId="Profile ">
       <option name="myExternalizedOptions" value="additional-options2=onexit\=snapshot,_no_java_version_check" />
diff --git a/build.gradle b/build.gradle
index d3ff158fa3..9ccd4d8edd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -230,7 +230,7 @@ dependencies {
   implementation("io.projectreactor.addons:reactor-extra")
   implementation("io.projectreactor:reactor-tools")
 
-  def commonsVersion = "1013d75fc9"
+  def commonsVersion = "9c1978d235"
 
   implementation("com.github.FAForever.faf-java-commons:faf-commons-data:${commonsVersion}") {
             exclude module: 'guava'
diff --git a/src/main/java/com/faforever/client/domain/api/Mod.java b/src/main/java/com/faforever/client/domain/api/Mod.java
index 942c80208a..7ebdfa7d96 100644
--- a/src/main/java/com/faforever/client/domain/api/Mod.java
+++ b/src/main/java/com/faforever/client/domain/api/Mod.java
@@ -2,8 +2,14 @@
 
 import com.faforever.client.domain.server.PlayerInfo;
 
+import java.net.URL;
+
 public record Mod(
     Integer id,
     String displayName,
-    boolean recommended, String author, PlayerInfo uploader, ReviewsSummary reviewsSummary
+    URL repositoryURL,
+    boolean recommended,
+    String author,
+    PlayerInfo uploader,
+    ReviewsSummary reviewsSummary
 ) {}
diff --git a/src/main/java/com/faforever/client/domain/api/ModVersion.java b/src/main/java/com/faforever/client/domain/api/ModVersion.java
index 74c9af6c8e..4209a74aef 100644
--- a/src/main/java/com/faforever/client/domain/api/ModVersion.java
+++ b/src/main/java/com/faforever/client/domain/api/ModVersion.java
@@ -12,7 +12,10 @@ public record ModVersion(
     ComparableVersion version,
     URL thumbnailUrl,
     URL downloadUrl,
-    ModType modType, boolean ranked, boolean hidden, Mod mod,
+    ModType modType,
+    boolean ranked,
+    boolean hidden,
+    Mod mod,
     OffsetDateTime createTime,
     OffsetDateTime updateTime
 ) {}
diff --git a/src/main/java/com/faforever/client/mapstruct/ModMapper.java b/src/main/java/com/faforever/client/mapstruct/ModMapper.java
index 483d0e41d5..163b4e2c11 100644
--- a/src/main/java/com/faforever/client/mapstruct/ModMapper.java
+++ b/src/main/java/com/faforever/client/mapstruct/ModMapper.java
@@ -18,6 +18,7 @@ public interface ModMapper {
   @Mapping(target = "modType", source = "modInfo.uiOnly")
   @Mapping(target = "mod", expression = "java(new ModBean())")
   @Mapping(target = "mod.displayName", source = "modInfo.name")
+  @Mapping(target = "mod.repositoryURL", source = "modInfo.url")
   ModVersion map(com.faforever.commons.mod.Mod modInfo, Path basePath);
 
   default ModType mapModType(boolean isUIOnly) {
diff --git a/src/main/java/com/faforever/client/mod/ModService.java b/src/main/java/com/faforever/client/mod/ModService.java
index 6d08da9e55..87d155de17 100644
--- a/src/main/java/com/faforever/client/mod/ModService.java
+++ b/src/main/java/com/faforever/client/mod/ModService.java
@@ -337,6 +337,10 @@ public CompletableTask<Void> uploadMod(Path modPath) {
     ModUploadTask modUploadTask = modUploadTaskFactory.getObject();
     modUploadTask.setModPath(modPath);
 
+    // retrieve information from the mod_info.lua to send to the API
+    ModVersion modVersion = extractModInfo(modPath);
+    modUploadTask.setRepositoryURL(modVersion.mod().repositoryURL());
+
     return taskService.submitTask(modUploadTask);
   }
 
diff --git a/src/main/java/com/faforever/client/mod/ModUploadTask.java b/src/main/java/com/faforever/client/mod/ModUploadTask.java
index c329bda64b..b4a73f6946 100644
--- a/src/main/java/com/faforever/client/mod/ModUploadTask.java
+++ b/src/main/java/com/faforever/client/mod/ModUploadTask.java
@@ -8,6 +8,7 @@
 import com.faforever.client.util.Validator;
 import com.faforever.commons.io.ByteCountListener;
 import com.faforever.commons.io.Zipper;
+import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -15,6 +16,7 @@
 import org.springframework.stereotype.Component;
 
 import java.io.OutputStream;
+import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Locale;
@@ -35,6 +37,9 @@ public class ModUploadTask extends CompletableTask<Void> {
 
   private Path modPath;
 
+  @Setter
+  private URL repositoryURL;
+
   @Autowired
   public ModUploadTask(FafApiAccessor fafApiAccessor, I18n i18n, DataPrefs dataPrefs) {
     super(Priority.HIGH);
@@ -72,7 +77,7 @@ protected Void call() throws Exception {
       log.debug("Uploading mod `{}` as `{}`", modPath, tmpFile);
       updateTitle(i18n.get("modVault.upload.uploading"));
 
-      return fafApiAccessor.uploadFile("/mods/upload", tmpFile, byteListener, Map.of()).block();
+      return fafApiAccessor.uploadFile("/mods/upload", tmpFile, byteListener, Map.of("metadata", Map.of("repositoryUrl", repositoryURL))).block();
     } finally {
       Files.delete(tmpFile);
       ResourceLocks.freeUploadLock();
@@ -82,4 +87,4 @@ protected Void call() throws Exception {
   public void setModPath(Path modPath) {
     this.modPath = modPath;
   }
-}
+}
\ No newline at end of file

From 1212cdd1629527b01bde49176dd43a1601b1d916 Mon Sep 17 00:00:00 2001
From: "(Jip) Willem Wijnia" <applicaties@jipwijnia.nl>
Date: Sun, 2 Jun 2024 15:23:02 +0200
Subject: [PATCH 02/14] Check if the URL exists before sending it

---
 src/main/java/com/faforever/client/mod/ModUploadTask.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/faforever/client/mod/ModUploadTask.java b/src/main/java/com/faforever/client/mod/ModUploadTask.java
index b4a73f6946..15778546dd 100644
--- a/src/main/java/com/faforever/client/mod/ModUploadTask.java
+++ b/src/main/java/com/faforever/client/mod/ModUploadTask.java
@@ -19,6 +19,7 @@
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 
@@ -77,7 +78,12 @@ protected Void call() throws Exception {
       log.debug("Uploading mod `{}` as `{}`", modPath, tmpFile);
       updateTitle(i18n.get("modVault.upload.uploading"));
 
-      return fafApiAccessor.uploadFile("/mods/upload", tmpFile, byteListener, Map.of("metadata", Map.of("repositoryUrl", repositoryURL))).block();
+      HashMap<String, String> parameters = new HashMap<>();
+      if (repositoryURL != null) {
+        parameters.put("repositoryUrl", repositoryURL.toString());
+      }
+
+      return fafApiAccessor.uploadFile("/mods/upload", tmpFile, byteListener, Map.of("metadata", parameters)).block();
     } finally {
       Files.delete(tmpFile);
       ResourceLocks.freeUploadLock();

From e197e6703a380976ac67465755acd11f3e14da34 Mon Sep 17 00:00:00 2001
From: "(Jip) Willem Wijnia" <applicaties@jipwijnia.nl>
Date: Sun, 2 Jun 2024 15:27:10 +0200
Subject: [PATCH 03/14] Add a try-catch around interpretating `mod_info.lua`

---
 src/main/java/com/faforever/client/mod/ModService.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/faforever/client/mod/ModService.java b/src/main/java/com/faforever/client/mod/ModService.java
index 87d155de17..2d69c4ed1d 100644
--- a/src/main/java/com/faforever/client/mod/ModService.java
+++ b/src/main/java/com/faforever/client/mod/ModService.java
@@ -338,8 +338,12 @@ public CompletableTask<Void> uploadMod(Path modPath) {
     modUploadTask.setModPath(modPath);
 
     // retrieve information from the mod_info.lua to send to the API
-    ModVersion modVersion = extractModInfo(modPath);
-    modUploadTask.setRepositoryURL(modVersion.mod().repositoryURL());
+    try {
+      ModVersion modVersion = extractModInfo(modPath);
+      modUploadTask.setRepositoryURL(modVersion.mod().repositoryURL());
+    } catch (Exception e) {
+      // ???, do nothing?
+    }
 
     return taskService.submitTask(modUploadTask);
   }

From 26166cbea6053b7adadf9a7e0d04725516fd7942 Mon Sep 17 00:00:00 2001
From: "(Jip) Willem Wijnia" <applicaties@jipwijnia.nl>
Date: Sun, 2 Jun 2024 15:47:50 +0200
Subject: [PATCH 04/14] Process the mod info in the upload task

---
 src/main/java/com/faforever/client/mod/ModService.java |  8 --------
 .../java/com/faforever/client/mod/ModUploadTask.java   | 10 +++++++++-
 .../faforever/client/mod/ModUploadControllerTest.java  |  2 +-
 .../com/faforever/client/mod/ModUploadTaskTest.java    |  6 +++++-
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/faforever/client/mod/ModService.java b/src/main/java/com/faforever/client/mod/ModService.java
index 2d69c4ed1d..6d08da9e55 100644
--- a/src/main/java/com/faforever/client/mod/ModService.java
+++ b/src/main/java/com/faforever/client/mod/ModService.java
@@ -337,14 +337,6 @@ public CompletableTask<Void> uploadMod(Path modPath) {
     ModUploadTask modUploadTask = modUploadTaskFactory.getObject();
     modUploadTask.setModPath(modPath);
 
-    // retrieve information from the mod_info.lua to send to the API
-    try {
-      ModVersion modVersion = extractModInfo(modPath);
-      modUploadTask.setRepositoryURL(modVersion.mod().repositoryURL());
-    } catch (Exception e) {
-      // ???, do nothing?
-    }
-
     return taskService.submitTask(modUploadTask);
   }
 
diff --git a/src/main/java/com/faforever/client/mod/ModUploadTask.java b/src/main/java/com/faforever/client/mod/ModUploadTask.java
index 15778546dd..970c1446c3 100644
--- a/src/main/java/com/faforever/client/mod/ModUploadTask.java
+++ b/src/main/java/com/faforever/client/mod/ModUploadTask.java
@@ -1,6 +1,7 @@
 package com.faforever.client.mod;
 
 import com.faforever.client.api.FafApiAccessor;
+import com.faforever.client.domain.api.ModVersion;
 import com.faforever.client.i18n.I18n;
 import com.faforever.client.preferences.DataPrefs;
 import com.faforever.client.task.CompletableTask;
@@ -32,6 +33,7 @@
 @Slf4j
 public class ModUploadTask extends CompletableTask<Void> {
 
+  private final ModService modService;
   private final FafApiAccessor fafApiAccessor;
   private final I18n i18n;
   private final DataPrefs dataPrefs;
@@ -42,8 +44,9 @@ public class ModUploadTask extends CompletableTask<Void> {
   private URL repositoryURL;
 
   @Autowired
-  public ModUploadTask(FafApiAccessor fafApiAccessor, I18n i18n, DataPrefs dataPrefs) {
+  public ModUploadTask(ModService modService, FafApiAccessor fafApiAccessor, I18n i18n, DataPrefs dataPrefs) {
     super(Priority.HIGH);
+    this.modService = modService;
     this.dataPrefs = dataPrefs;
     this.fafApiAccessor = fafApiAccessor;
     this.i18n = i18n;
@@ -75,6 +78,11 @@ protected Void call() throws Exception {
             .zip();
       }
 
+      // retrieve information from the mod_info.lua to send to the API
+
+      ModVersion modVersionInfo = modService.extractModInfo(modPath);
+      URL repositoryURL = modVersionInfo.mod().repositoryURL();
+
       log.debug("Uploading mod `{}` as `{}`", modPath, tmpFile);
       updateTitle(i18n.get("modVault.upload.uploading"));
 
diff --git a/src/test/java/com/faforever/client/mod/ModUploadControllerTest.java b/src/test/java/com/faforever/client/mod/ModUploadControllerTest.java
index 6cfece37a1..bb1b7fc755 100644
--- a/src/test/java/com/faforever/client/mod/ModUploadControllerTest.java
+++ b/src/test/java/com/faforever/client/mod/ModUploadControllerTest.java
@@ -69,7 +69,7 @@ public void setUp() throws Exception {
       return null;
     }).when(executorService).execute(any());
 
-    modUploadTask = new ModUploadTask(fafApiAccessor, i18n, dataPrefs) {
+    modUploadTask = new ModUploadTask(modService, fafApiAccessor, i18n, dataPrefs) {
       @Override
       protected Void call() {
         return null;
diff --git a/src/test/java/com/faforever/client/mod/ModUploadTaskTest.java b/src/test/java/com/faforever/client/mod/ModUploadTaskTest.java
index 25de65e723..e05d0eb155 100644
--- a/src/test/java/com/faforever/client/mod/ModUploadTaskTest.java
+++ b/src/test/java/com/faforever/client/mod/ModUploadTaskTest.java
@@ -26,8 +26,12 @@ public class ModUploadTaskTest extends PlatformTest {
   @TempDir
   public Path tempDirectory;
 
+
   private ModUploadTask instance;
 
+  @Mock
+  private ModService modService;
+
   @Mock
   private FafApiAccessor fafApiAccessor;
   @Mock
@@ -37,7 +41,7 @@ public class ModUploadTaskTest extends PlatformTest {
 
   @BeforeEach
   public void setUp() throws Exception {
-    instance = new ModUploadTask(fafApiAccessor, i18n, dataPrefs);
+    instance = new ModUploadTask(modService, fafApiAccessor, i18n, dataPrefs);
     dataPrefs.setBaseDataDirectory(tempDirectory);
 
     Files.createDirectories(dataPrefs.getCacheDirectory());

From 9a63647c1b0b0618d58ab639d38d06decc5098e3 Mon Sep 17 00:00:00 2001
From: "(Jip) Willem Wijnia" <applicaties@jipwijnia.nl>
Date: Sun, 2 Jun 2024 16:04:22 +0200
Subject: [PATCH 05/14] Add a mod_info.lua test

---
 .../java/com/faforever/client/mod/ModUploadTaskTest.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/test/java/com/faforever/client/mod/ModUploadTaskTest.java b/src/test/java/com/faforever/client/mod/ModUploadTaskTest.java
index e05d0eb155..4341b7e3a3 100644
--- a/src/test/java/com/faforever/client/mod/ModUploadTaskTest.java
+++ b/src/test/java/com/faforever/client/mod/ModUploadTaskTest.java
@@ -13,6 +13,7 @@
 
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Objects;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.collection.IsArrayWithSize.emptyArray;
@@ -62,8 +63,14 @@ public void testProgressListenerNull() throws Exception {
 
   @Test
   public void testCall() throws Exception {
-    instance.setModPath(Files.createDirectories(tempDirectory.resolve("test-mod")));
 
+    Path pathToMod =tempDirectory.resolve("test-mod");
+    Path pathToModInfo = tempDirectory.resolve("test-mod/mod_info.lua");
+
+    Files.createDirectories(pathToMod);
+    Files.copy(Objects.requireNonNull(getClass().getResourceAsStream("/mods/eco_manager_mod_info.lua")), pathToModInfo);
+
+    instance.setModPath(pathToMod);
     instance.call();
 
     verify(fafApiAccessor).uploadFile(any(), any(), any(), any());

From 57ff0b36dea0f583c9a3bf526364eb194051d2e4 Mon Sep 17 00:00:00 2001
From: "(Jip) Willem Wijnia" <applicaties@jipwijnia.nl>
Date: Sun, 2 Jun 2024 16:05:57 +0200
Subject: [PATCH 06/14] Remove repositoryURL field as it is no longer necessary

---
 src/main/java/com/faforever/client/mod/ModUploadTask.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/main/java/com/faforever/client/mod/ModUploadTask.java b/src/main/java/com/faforever/client/mod/ModUploadTask.java
index 970c1446c3..6dbc24eff7 100644
--- a/src/main/java/com/faforever/client/mod/ModUploadTask.java
+++ b/src/main/java/com/faforever/client/mod/ModUploadTask.java
@@ -40,9 +40,6 @@ public class ModUploadTask extends CompletableTask<Void> {
 
   private Path modPath;
 
-  @Setter
-  private URL repositoryURL;
-
   @Autowired
   public ModUploadTask(ModService modService, FafApiAccessor fafApiAccessor, I18n i18n, DataPrefs dataPrefs) {
     super(Priority.HIGH);
@@ -79,7 +76,6 @@ protected Void call() throws Exception {
       }
 
       // retrieve information from the mod_info.lua to send to the API
-
       ModVersion modVersionInfo = modService.extractModInfo(modPath);
       URL repositoryURL = modVersionInfo.mod().repositoryURL();
 

From 77b8cb43e2f0ae133b55571135d34f3aa2c0688d Mon Sep 17 00:00:00 2001
From: "(Jip) Willem Wijnia" <applicaties@jipwijnia.nl>
Date: Sun, 2 Jun 2024 16:23:09 +0200
Subject: [PATCH 07/14] Simplify the path resolves

---
 src/test/java/com/faforever/client/mod/ModUploadTaskTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/java/com/faforever/client/mod/ModUploadTaskTest.java b/src/test/java/com/faforever/client/mod/ModUploadTaskTest.java
index 4341b7e3a3..aa802f2a59 100644
--- a/src/test/java/com/faforever/client/mod/ModUploadTaskTest.java
+++ b/src/test/java/com/faforever/client/mod/ModUploadTaskTest.java
@@ -64,8 +64,8 @@ public void testProgressListenerNull() throws Exception {
   @Test
   public void testCall() throws Exception {
 
-    Path pathToMod =tempDirectory.resolve("test-mod");
-    Path pathToModInfo = tempDirectory.resolve("test-mod/mod_info.lua");
+    Path pathToMod = tempDirectory.resolve("test-mod");
+    Path pathToModInfo = pathToMod.resolve("mod_info.lua");
 
     Files.createDirectories(pathToMod);
     Files.copy(Objects.requireNonNull(getClass().getResourceAsStream("/mods/eco_manager_mod_info.lua")), pathToModInfo);

From 01afae1089e4f0bf3e36c59f4b498ed5984da82c Mon Sep 17 00:00:00 2001
From: "(Jip) Willem Wijnia" <applicaties@jipwijnia.nl>
Date: Sun, 2 Jun 2024 17:08:19 +0200
Subject: [PATCH 08/14] Mock the `extractModInfo` function of the `ModService`
 class

---
 src/main/java/com/faforever/client/mod/ModUploadTask.java | 3 +++
 .../java/com/faforever/client/mod/ModUploadTaskTest.java  | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/faforever/client/mod/ModUploadTask.java b/src/main/java/com/faforever/client/mod/ModUploadTask.java
index 6dbc24eff7..9915b482e4 100644
--- a/src/main/java/com/faforever/client/mod/ModUploadTask.java
+++ b/src/main/java/com/faforever/client/mod/ModUploadTask.java
@@ -77,6 +77,9 @@ protected Void call() throws Exception {
 
       // retrieve information from the mod_info.lua to send to the API
       ModVersion modVersionInfo = modService.extractModInfo(modPath);
+      if (modVersionInfo != null) {
+
+      }
       URL repositoryURL = modVersionInfo.mod().repositoryURL();
 
       log.debug("Uploading mod `{}` as `{}`", modPath, tmpFile);
diff --git a/src/test/java/com/faforever/client/mod/ModUploadTaskTest.java b/src/test/java/com/faforever/client/mod/ModUploadTaskTest.java
index aa802f2a59..44b9b4882b 100644
--- a/src/test/java/com/faforever/client/mod/ModUploadTaskTest.java
+++ b/src/test/java/com/faforever/client/mod/ModUploadTaskTest.java
@@ -1,6 +1,8 @@
 package com.faforever.client.mod;
 
 import com.faforever.client.api.FafApiAccessor;
+import com.faforever.client.domain.api.Mod;
+import com.faforever.client.domain.api.ModVersion;
 import com.faforever.client.i18n.I18n;
 import com.faforever.client.preferences.DataPrefs;
 import com.faforever.client.test.PlatformTest;
@@ -11,6 +13,7 @@
 import org.mockito.Spy;
 import reactor.core.publisher.Mono;
 
+import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Objects;
@@ -48,6 +51,9 @@ public void setUp() throws Exception {
     Files.createDirectories(dataPrefs.getCacheDirectory());
     lenient().when(i18n.get(any())).thenReturn("");
     lenient().when(fafApiAccessor.uploadFile(any(), any(), any(), any())).thenReturn(Mono.empty());
+    lenient().when(modService.extractModInfo(any()))
+             .thenReturn(new ModVersion(-1, "uid", "description", null, null, null, null, false, false,
+                                        new Mod(null, null, null, false, null, null, null), null, null));
   }
 
   @Test
@@ -67,7 +73,7 @@ public void testCall() throws Exception {
     Path pathToMod = tempDirectory.resolve("test-mod");
     Path pathToModInfo = pathToMod.resolve("mod_info.lua");
 
-    Files.createDirectories(pathToMod);
+    Files.createDirectory(pathToMod);
     Files.copy(Objects.requireNonNull(getClass().getResourceAsStream("/mods/eco_manager_mod_info.lua")), pathToModInfo);
 
     instance.setModPath(pathToMod);

From 67e5a064873d3e38d886b9898618a819dbd993ef Mon Sep 17 00:00:00 2001
From: "(Jip) Willem Wijnia" <applicaties@jipwijnia.nl>
Date: Sun, 2 Jun 2024 17:10:38 +0200
Subject: [PATCH 09/14] Improve code style

---
 .../java/com/faforever/client/mod/ModUploadTask.java  | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/faforever/client/mod/ModUploadTask.java b/src/main/java/com/faforever/client/mod/ModUploadTask.java
index 9915b482e4..add900dc02 100644
--- a/src/main/java/com/faforever/client/mod/ModUploadTask.java
+++ b/src/main/java/com/faforever/client/mod/ModUploadTask.java
@@ -75,16 +75,13 @@ protected Void call() throws Exception {
             .zip();
       }
 
-      // retrieve information from the mod_info.lua to send to the API
-      ModVersion modVersionInfo = modService.extractModInfo(modPath);
-      if (modVersionInfo != null) {
-
-      }
-      URL repositoryURL = modVersionInfo.mod().repositoryURL();
-
       log.debug("Uploading mod `{}` as `{}`", modPath, tmpFile);
       updateTitle(i18n.get("modVault.upload.uploading"));
 
+      // retrieve information from `mod_info.lua`
+      ModVersion modVersionInfo = modService.extractModInfo(modPath);
+      URL repositoryURL = modVersionInfo.mod().repositoryURL();
+
       HashMap<String, String> parameters = new HashMap<>();
       if (repositoryURL != null) {
         parameters.put("repositoryUrl", repositoryURL.toString());

From 8332c86722b383ae720ffa7ca09c5d2472581f63 Mon Sep 17 00:00:00 2001
From: "(Jip) Willem Wijnia" <applicaties@jipwijnia.nl>
Date: Sun, 2 Jun 2024 17:15:05 +0200
Subject: [PATCH 10/14] Add a log statement

---
 .../faforever/client/mod/ModUploadTask.java   | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/faforever/client/mod/ModUploadTask.java b/src/main/java/com/faforever/client/mod/ModUploadTask.java
index add900dc02..53935881bb 100644
--- a/src/main/java/com/faforever/client/mod/ModUploadTask.java
+++ b/src/main/java/com/faforever/client/mod/ModUploadTask.java
@@ -59,6 +59,16 @@ protected Void call() throws Exception {
     Path tmpFile = createTempFile(cacheDirectory, "mod", ".zip");
 
     try {
+
+      log.debug("Retrieve information from mod_info.lua at: {}", modPath);
+      ModVersion modVersionInfo = modService.extractModInfo(modPath);
+      URL repositoryURL = modVersionInfo.mod().repositoryURL();
+
+      HashMap<String, String> parameters = new HashMap<>();
+      if (repositoryURL != null) {
+        parameters.put("repositoryUrl", repositoryURL.toString());
+      }
+
       log.debug("Zipping mod `{}` to `{}`", modPath, tmpFile);
       updateTitle(i18n.get("modVault.upload.compressing"));
 
@@ -78,15 +88,6 @@ protected Void call() throws Exception {
       log.debug("Uploading mod `{}` as `{}`", modPath, tmpFile);
       updateTitle(i18n.get("modVault.upload.uploading"));
 
-      // retrieve information from `mod_info.lua`
-      ModVersion modVersionInfo = modService.extractModInfo(modPath);
-      URL repositoryURL = modVersionInfo.mod().repositoryURL();
-
-      HashMap<String, String> parameters = new HashMap<>();
-      if (repositoryURL != null) {
-        parameters.put("repositoryUrl", repositoryURL.toString());
-      }
-
       return fafApiAccessor.uploadFile("/mods/upload", tmpFile, byteListener, Map.of("metadata", parameters)).block();
     } finally {
       Files.delete(tmpFile);

From 5def4c6bea17a98b96c858cb41205d39f42c8a93 Mon Sep 17 00:00:00 2001
From: "(Jip) Willem Wijnia" <applicaties@jipwijnia.nl>
Date: Sun, 2 Jun 2024 18:11:12 +0200
Subject: [PATCH 11/14] Show the repository URL in the interface

---
 .../faforever/client/mapstruct/ModMapper.java |  1 +
 .../client/mod/ModDetailController.java       | 25 ++++++
 src/main/resources/i18n/messages.properties   |  1 +
 .../resources/theme/vault/mod/mod_detail.fxml | 78 +++++++------------
 4 files changed, 56 insertions(+), 49 deletions(-)

diff --git a/src/main/java/com/faforever/client/mapstruct/ModMapper.java b/src/main/java/com/faforever/client/mapstruct/ModMapper.java
index 163b4e2c11..51fe6b1cc8 100644
--- a/src/main/java/com/faforever/client/mapstruct/ModMapper.java
+++ b/src/main/java/com/faforever/client/mapstruct/ModMapper.java
@@ -34,6 +34,7 @@ default Path mapImagePath(com.faforever.commons.mod.Mod modInfo, Path basePath)
   }
 
   @Mapping(target = "reviewsSummary", source = "modReviewsSummary")
+  @Mapping(target = "repositoryURL", source = "repositoryUrl")
   Mod map(com.faforever.commons.api.dto.Mod dto);
 
   @InheritInverseConfiguration
diff --git a/src/main/java/com/faforever/client/mod/ModDetailController.java b/src/main/java/com/faforever/client/mod/ModDetailController.java
index 804b765081..d42dce10ac 100644
--- a/src/main/java/com/faforever/client/mod/ModDetailController.java
+++ b/src/main/java/com/faforever/client/mod/ModDetailController.java
@@ -9,6 +9,7 @@
 import com.faforever.client.fx.ImageViewHelper;
 import com.faforever.client.fx.JavaFxUtil;
 import com.faforever.client.fx.NodeController;
+import com.faforever.client.fx.PlatformService;
 import com.faforever.client.fx.SimpleChangeListener;
 import com.faforever.client.fx.contextmenu.ContextMenuBuilder;
 import com.faforever.client.i18n.I18n;
@@ -29,6 +30,7 @@
 import javafx.collections.ObservableList;
 import javafx.scene.Node;
 import javafx.scene.control.Button;
+import javafx.scene.control.Hyperlink;
 import javafx.scene.control.Label;
 import javafx.scene.control.ProgressBar;
 import javafx.scene.control.ScrollPane;
@@ -43,12 +45,16 @@
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
+import java.net.URL;
+import java.util.Objects;
+
 @Component
 @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 @Slf4j
 @RequiredArgsConstructor
 public class ModDetailController extends NodeController<Node> {
 
+  private final PlatformService platformService;
   private final ModService modService;
   private final NotificationService notificationService;
   private final I18n i18n;
@@ -81,6 +87,7 @@ public class ModDetailController extends NodeController<Node> {
   public Node modDetailRoot;
   public ReviewsController<ModVersionReview> reviewsController;
   public Label authorLabel;
+  public Hyperlink urlHyperlink;
 
   @Override
   protected void onInitialize() {
@@ -98,6 +105,20 @@ protected void onInitialize() {
     bindProperties();
     modVersion.addListener((SimpleChangeListener<ModVersion>) this::onModVersionChanged);
 
+    urlHyperlink.setOnAction(event -> {
+      ModVersion modVersionCurrent = modVersion.get();
+      if (modVersionCurrent == null) {
+        return;
+      }
+
+      URL repositoryURL = modVersionCurrent.mod().repositoryURL();
+      if (repositoryURL ==  null) {
+        return;
+      }
+
+      platformService.showDocument(repositoryURL.toString());
+    });
+
     // TODO hidden until dependencies are available
     dependenciesTitle.setManaged(false);
     dependenciesContainer.setManaged(false);
@@ -109,7 +130,11 @@ private void bindProperties() {
         .bind(modVersion.map(modService::loadThumbnail)
             .flatMap(imageViewHelper::createPlaceholderImageOnErrorObservable)
             .when(showing));
+
     nameLabel.textProperty().bind(modObservable.map(Mod::displayName).when(showing));
+
+    urlHyperlink.visibleProperty().bind(modObservable.map(Mod::repositoryURL).map(Objects::nonNull).when(showing));
+
     authorLabel.textProperty().bind(modObservable.map(Mod::author)
             .map(author -> i18n.get("modVault.details.author", author))
             .when(showing));
diff --git a/src/main/resources/i18n/messages.properties b/src/main/resources/i18n/messages.properties
index 557e057f88..dcace79337 100644
--- a/src/main/resources/i18n/messages.properties
+++ b/src/main/resources/i18n/messages.properties
@@ -753,6 +753,7 @@ map.versionId = Map version ID
 vault.replays.ownReplays = Your replays
 modVault.details.uploader = Uploaded by\: {0}
 modVault.details.author = Authored by\: {0}
+modVault.details.source =  Source
 gameSelect.select.invalidPath = Invalid path
 gamePath.select.noneChosen = You did not select a game location\!
 gamePath.select.noValidExe = The specified location does not contain a valid Supreme Commander.exe and is therefore is no valid Forged Alliance installation.
diff --git a/src/main/resources/theme/vault/mod/mod_detail.fxml b/src/main/resources/theme/vault/mod/mod_detail.fxml
index 5862fb173a..fe7937b20e 100644
--- a/src/main/resources/theme/vault/mod/mod_detail.fxml
+++ b/src/main/resources/theme/vault/mod/mod_detail.fxml
@@ -1,20 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.ProgressBar?>
-<?import javafx.scene.control.ScrollPane?>
-<?import javafx.scene.control.Separator?>
-<?import javafx.scene.image.ImageView?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.Region?>
-<?import javafx.scene.layout.RowConstraints?>
-<?import javafx.scene.layout.VBox?>
-<?import java.lang.String?>
-<AnchorPane fx:id="modDetailRoot" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" onMouseClicked="#onDimmerClicked" styleClass="dimmer" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.faforever.client.mod.ModDetailController">
+<?import java.lang.*?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.image.*?>
+<?import javafx.scene.layout.*?>
+
+<AnchorPane fx:id="modDetailRoot" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" onMouseClicked="#onDimmerClicked" styleClass="dimmer" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.faforever.client.mod.ModDetailController">
     <children>
         <AnchorPane onMouseClicked="#onContentPaneClicked" styleClass="modal-popup" AnchorPane.bottomAnchor="50.0" AnchorPane.leftAnchor="50.0" AnchorPane.rightAnchor="50.0" AnchorPane.topAnchor="50.0">
             <children>
@@ -30,54 +22,42 @@
                                         <ColumnConstraints />
                                     </columnConstraints>
                                     <rowConstraints>
-                                        <RowConstraints minHeight="10.0" vgrow="NEVER"/>
-                                        <RowConstraints minHeight="10.0" vgrow="NEVER"/>
-                                        <RowConstraints fillHeight="false" minHeight="10.0" vgrow="ALWAYS"/>
-                                        <RowConstraints fillHeight="false" minHeight="10.0" vgrow="ALWAYS"/>
-                                        <RowConstraints fillHeight="false" minHeight="10.0" vgrow="ALWAYS"/>
+                                        <RowConstraints minHeight="10.0" vgrow="NEVER" />
+                                        <RowConstraints minHeight="10.0" vgrow="NEVER" />
+                                        <RowConstraints fillHeight="false" minHeight="10.0" vgrow="ALWAYS" />
+                                        <RowConstraints fillHeight="false" minHeight="10.0" vgrow="ALWAYS" />
+                                        <RowConstraints fillHeight="false" minHeight="10.0" vgrow="ALWAYS" />
                                     </rowConstraints>
                                     <children>
-                                        <Label fx:id="nameLabel" maxWidth="1.7976931348623157E308" styleClass="h1"
-                                               text="&lt;Name&gt;" GridPane.columnIndex="1" GridPane.columnSpan="2"/>
-                                        <ImageView fx:id="thumbnailImageView" fitHeight="128.0" fitWidth="128.0"
-                                                   pickOnBounds="true" preserveRatio="true" GridPane.rowSpan="2"/>
-                                        <VBox fx:id="progressPane" alignment="CENTER_LEFT" maxWidth="300.0"
-                                              GridPane.columnIndex="2" GridPane.halignment="RIGHT"
-                                              GridPane.rowIndex="1">
+                                        <Label fx:id="nameLabel" maxWidth="1.7976931348623157E308" styleClass="h1" text="&lt;Name&gt;" GridPane.columnIndex="1" GridPane.columnSpan="2" />
+                                        <ImageView fx:id="thumbnailImageView" fitHeight="128.0" fitWidth="128.0" pickOnBounds="true" preserveRatio="true" GridPane.rowSpan="2" />
+                                        <VBox fx:id="progressPane" alignment="CENTER_LEFT" maxWidth="300.0" GridPane.columnIndex="2" GridPane.halignment="RIGHT" GridPane.rowIndex="1">
                                             <children>
-                                                <Label fx:id="progressLabel" text=""/>
-                                                <ProgressBar fx:id="progressBar" maxWidth="1.7976931348623157E308"
-                                                             progress="0.0"/>
+                                                <Label fx:id="progressLabel" text="" />
+                                                <ProgressBar fx:id="progressBar" maxWidth="1.7976931348623157E308" progress="0.0" />
                                             </children>
                                         </VBox>
-                                        <Button fx:id="uninstallButton" mnemonicParsing="false" styleClass="uninstall-button"
-                                                onAction="#onUninstallButtonClicked" text="%modVault.uninstall"
-                                                GridPane.columnIndex="3" GridPane.halignment="RIGHT"
-                                                GridPane.rowIndex="1"/>
-                                        <Button fx:id="installButton" defaultButton="true" mnemonicParsing="false"
-                                                onAction="#onInstallButtonClicked" styleClass="highlighted-button"
-                                                text="%modVault.installButtonFormat" GridPane.columnIndex="3"
-                                                GridPane.halignment="RIGHT" GridPane.rowIndex="1"/>
+                                        <Button fx:id="uninstallButton" mnemonicParsing="false" onAction="#onUninstallButtonClicked" styleClass="uninstall-button" text="%modVault.uninstall" GridPane.columnIndex="3" GridPane.halignment="RIGHT" GridPane.rowIndex="1" />
+                                        <Button fx:id="installButton" defaultButton="true" mnemonicParsing="false" onAction="#onInstallButtonClicked" styleClass="highlighted-button" text="%modVault.installButtonFormat" GridPane.columnIndex="3" GridPane.halignment="RIGHT" GridPane.rowIndex="1" />
                                         <VBox GridPane.columnIndex="1" GridPane.rowIndex="1">
                                             <children>
-                                                <Label fx:id="authorLabel" text="&lt;Author&gt;"/>
-                                                <Label fx:id="idLabel" text="&lt;ID&gt;"/>
-                                                <Label fx:id="uploaderLabel" text="&lt;Uploader&gt;" wrapText="true"/>
+                                                <Label fx:id="authorLabel" text="&lt;Author&gt;" />
+                                                <Label fx:id="idLabel" text="&lt;ID&gt;" />
+                                                <Label fx:id="uploaderLabel" text="&lt;Uploader&gt;" wrapText="true" />
+                                    <Hyperlink fx:id="urlHyperlink" text="%modVault.details.source" />
                                             </children>
                                         </VBox>
                                     </children>
                                 </GridPane>
-                                <Label fx:id="modDescriptionLabel" maxHeight="1.7976931348623157E308"
-                                       maxWidth="1.7976931348623157E308" text="&lt;Description&gt;" wrapText="true"
-                                       GridPane.vgrow="ALWAYS"/>
-                                <Separator layoutX="10.0" layoutY="251.0" maxWidth="1.7976931348623157E308"/>
+                                <Label fx:id="modDescriptionLabel" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" text="&lt;Description&gt;" wrapText="true" GridPane.vgrow="ALWAYS" />
+                                <Separator layoutX="10.0" layoutY="251.0" maxWidth="1.7976931348623157E308" />
                                 <VBox alignment="TOP_CENTER" maxWidth="640.0">
                                     <children>
-                                        <fx:include fx:id="reviews" source="../review/reviews.fxml"/>
+                                        <fx:include fx:id="reviews" source="../review/reviews.fxml" />
                                     </children>
                                 </VBox>
-                                <Separator prefWidth="200.0"/>
-                                <Label layoutX="10.0" layoutY="204.0" styleClass="h2" text="%mod.detail.moreInfo"/>
+                                <Separator prefWidth="200.0" />
+                                <Label layoutX="10.0" layoutY="204.0" styleClass="h2" text="%mod.detail.moreInfo" />
                                 <GridPane hgap="20.0" maxWidth="640.0">
                                     <columnConstraints>
                                         <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
@@ -108,7 +88,7 @@
                 </ScrollPane>
                 <Button cancelButton="true" focusTraversable="false" onAction="#onCloseButtonClicked" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                     <graphic>
-                        <Region styleClass="icon,close-icon"/>
+                        <Region styleClass="icon,close-icon" />
                     </graphic>
                     <styleClass>
                         <String fx:value="window-button" />

From a405d7e9b8960233a0ff16ae4226302ac9582499 Mon Sep 17 00:00:00 2001
From: "(Jip) Willem Wijnia" <applicaties@jipwijnia.nl>
Date: Sun, 2 Jun 2024 20:20:41 +0200
Subject: [PATCH 12/14] Attempt at creating UI tests

---
 .../client/mod/ModDetailControllerTest.java   | 35 ++++++++++++++++---
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/test/java/com/faforever/client/mod/ModDetailControllerTest.java b/src/test/java/com/faforever/client/mod/ModDetailControllerTest.java
index 015f788d34..0b624cb44d 100644
--- a/src/test/java/com/faforever/client/mod/ModDetailControllerTest.java
+++ b/src/test/java/com/faforever/client/mod/ModDetailControllerTest.java
@@ -24,6 +24,7 @@
 import javafx.scene.image.Image;
 import javafx.scene.input.MouseEvent;
 import org.instancio.Instancio;
+import org.instancio.TargetSelector;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
@@ -34,6 +35,9 @@
 import reactor.core.scheduler.Schedulers;
 
 import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
 import java.util.concurrent.CompletableFuture;
 
 import static org.instancio.Select.field;
@@ -157,6 +161,28 @@ public void testSetModWithNoUploader() {
     verify(modService).loadThumbnail(modVersion);
   }
 
+  @Test
+  public void testWithRepositoryURL() throws MalformedURLException {
+    modVersion = Instancio.of(ModVersion.class)
+                                     .set(field(Mod::repositoryURL),
+                                          URI.create("https://github.com/FAForever/fa").toURL())
+                                     .create();
+
+    WaitForAsyncUtils.waitForFxEvents();
+
+    assertTrue(instance.urlHyperlink.isVisible());
+  }
+
+  @Test
+  public void testWithoutRepositoryURL() {
+    modVersion = Instancio.of(ModVersion.class).set(field(Mod::repositoryURL), null).create();
+
+    WaitForAsyncUtils.waitForFxEvents();
+
+    assertFalse(instance.urlHyperlink.isVisible());
+  }
+
+
   @Test
   public void testSetModNoThumbnailLoadsDefault() {
     Image image = new Image(InputStream.nullInputStream());
@@ -191,7 +217,8 @@ public void testOnInstallButtonClickedInstallingModThrowsException() {
     WaitForAsyncUtils.waitForFxEvents();
 
     verify(modService).downloadIfNecessary(any(ModVersion.class), any(), any());
-    verify(notificationService).addImmediateErrorNotification(any(Throwable.class), anyString(), anyString(), anyString());
+    verify(notificationService).addImmediateErrorNotification(any(Throwable.class), anyString(), anyString(),
+                                                              anyString());
   }
 
   @Test
@@ -229,7 +256,8 @@ public void testOnUninstallButtonClickedThrowsException() {
     WaitForAsyncUtils.waitForFxEvents();
 
     verify(modService).uninstallMod(modVersion);
-    verify(notificationService).addImmediateErrorNotification(any(Throwable.class), anyString(), anyString(), anyString());
+    verify(notificationService).addImmediateErrorNotification(any(Throwable.class), anyString(), anyString(),
+                                                              anyString());
   }
 
   @Test
@@ -270,8 +298,7 @@ public void testSetOwnedMod() {
     installed.set(true);
     ModVersion modVersion = Instancio.of(ModVersion.class)
                                      .set(field(Mod::uploader).within(scope(Mod.class)), currentPlayer)
-                                     .set(field(Mod::author).within(scope(Mod.class)),
-                                              currentPlayer.getUsername())
+                                     .set(field(Mod::author).within(scope(Mod.class)), currentPlayer.getUsername())
                                      .create();
     runOnFxThreadAndWait(() -> instance.setModVersion(modVersion));
 

From 621d138eb84ed1285a95ae485b24e097cf35aed9 Mon Sep 17 00:00:00 2001
From: "(Jip) Willem Wijnia" <applicaties@jipwijnia.nl>
Date: Sun, 2 Jun 2024 20:27:48 +0200
Subject: [PATCH 13/14] Update the mod version and apply the changes

---
 .../java/com/faforever/client/mod/ModDetailControllerTest.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/test/java/com/faforever/client/mod/ModDetailControllerTest.java b/src/test/java/com/faforever/client/mod/ModDetailControllerTest.java
index 0b624cb44d..2de1aae310 100644
--- a/src/test/java/com/faforever/client/mod/ModDetailControllerTest.java
+++ b/src/test/java/com/faforever/client/mod/ModDetailControllerTest.java
@@ -167,7 +167,7 @@ public void testWithRepositoryURL() throws MalformedURLException {
                                      .set(field(Mod::repositoryURL),
                                           URI.create("https://github.com/FAForever/fa").toURL())
                                      .create();
-
+    runOnFxThreadAndWait(() -> instance.setModVersion(modVersion));
     WaitForAsyncUtils.waitForFxEvents();
 
     assertTrue(instance.urlHyperlink.isVisible());
@@ -177,6 +177,7 @@ public void testWithRepositoryURL() throws MalformedURLException {
   public void testWithoutRepositoryURL() {
     modVersion = Instancio.of(ModVersion.class).set(field(Mod::repositoryURL), null).create();
 
+    runOnFxThreadAndWait(() -> instance.setModVersion(modVersion));
     WaitForAsyncUtils.waitForFxEvents();
 
     assertFalse(instance.urlHyperlink.isVisible());

From 23ab26f875ea07ac10fe75181bc01b1b4813ba03 Mon Sep 17 00:00:00 2001
From: "(Jip) Willem Wijnia" <applicaties@jipwijnia.nl>
Date: Mon, 3 Jun 2024 08:12:46 +0200
Subject: [PATCH 14/14] Do not wait twice during the test

---
 .../java/com/faforever/client/mod/ModDetailControllerTest.java  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/test/java/com/faforever/client/mod/ModDetailControllerTest.java b/src/test/java/com/faforever/client/mod/ModDetailControllerTest.java
index 2de1aae310..5e3bae6811 100644
--- a/src/test/java/com/faforever/client/mod/ModDetailControllerTest.java
+++ b/src/test/java/com/faforever/client/mod/ModDetailControllerTest.java
@@ -168,7 +168,6 @@ public void testWithRepositoryURL() throws MalformedURLException {
                                           URI.create("https://github.com/FAForever/fa").toURL())
                                      .create();
     runOnFxThreadAndWait(() -> instance.setModVersion(modVersion));
-    WaitForAsyncUtils.waitForFxEvents();
 
     assertTrue(instance.urlHyperlink.isVisible());
   }
@@ -178,7 +177,6 @@ public void testWithoutRepositoryURL() {
     modVersion = Instancio.of(ModVersion.class).set(field(Mod::repositoryURL), null).create();
 
     runOnFxThreadAndWait(() -> instance.setModVersion(modVersion));
-    WaitForAsyncUtils.waitForFxEvents();
 
     assertFalse(instance.urlHyperlink.isVisible());
   }