dofus3

dofusdude · Dec 2, 2024 · 5d6f457 · 5d6f457
1 parent 6e191c9
commit 5d6f457
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/docker-java-publish.yml b/.github/workflows/docker-java-publish.yml
@@ -2,11 +2,6 @@ name: Docker
 
 on:
   push:
-    # Publish `main` as Docker `latest` image.
-    branches:
-      - main
-
-    # Publish `v1.2.3` tags as releases.
     tags:
       - v*
 

diff --git a/src/main/java/com/dofusdude/almanax/boundary/OfferingResourceV2.java b/src/main/java/com/dofusdude/almanax/boundary/OfferingResourceV2.java
@@ -48,7 +48,7 @@
 @RequestScoped
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
-@Path("/dofus2")
+@Path("/dofus3")
 public class OfferingResourceV2 {
 
     private OfferingRepository offeringRepository;

diff --git a/src/main/java/com/dofusdude/almanax/clients/EncObjectSwitch.java b/src/main/java/com/dofusdude/almanax/clients/EncObjectSwitch.java
@@ -38,7 +38,7 @@ public ItemObjectDTO get(String url, String language) {
         Integer ankamaId = Integer.parseInt(split[split.length - 1].trim());
         String ankamaEnGeneral = "https://www.dofus.com/en/mmorpg/encyclopedia";
         ApiClient defaultClient = Configuration.getDefaultApiClient();
-        String game = "dofus2";
+        String game = "dofus3";
 
         if (url.contains("resources")) {
             ResourcesApi resourcesApi = new ResourcesApi(defaultClient);
@@ -103,7 +103,7 @@ public ItemDTOV2 getV2(String url, String language) {
         String[] split = url.split("/");
         Integer ankamaId = Integer.parseInt(split[split.length - 1].trim());
         ApiClient defaultClient = Configuration.getDefaultApiClient();
-        String game = "dofus2";
+        String game = "dofus3";
 
         if (url.contains("resources")) {
             try {

diff --git a/src/main/java/com/dofusdude/almanax/gateway/OfferingRepository.java b/src/main/java/com/dofusdude/almanax/gateway/OfferingRepository.java
@@ -141,6 +141,10 @@ private boolean offeringChanged(CreateOfferingDTO newOffering, Offering persiste
             return true;
         }
 
+        if (!newOffering.itemPicture.equals(persistentOffering.getItem().getPictureUrl())) {
+            return true;
+        }
+
         return false;
     }
 
@@ -179,7 +183,8 @@ public void persist(CreateOfferingDTO offeringDTO, String language, boolean recr
         GameApi apiInstance = new GameApi(defaultClient);
 
         try {
-            List<ItemsListEntryTyped> items = apiInstance.getItemsAllSearch(language, "dofus2",
+            // TODO disallow quest item subtypes using "-quest" filter
+            List<ItemsListEntryTyped> items = apiInstance.getItemsAllSearch(language, "dofus3",
                     offeringDTO.item,
                     null, null, null, null);
 
@@ -191,7 +196,7 @@ public void persist(CreateOfferingDTO offeringDTO, String language, boolean recr
             }
 
             ItemsListEntryTyped item = items.get(i);
-            resUrl = defaultClient.getBasePath() + "/dofus2/" + offeringDTO.language + "/items/" + item.getItemSubtype()
+            resUrl = defaultClient.getBasePath() + "/dofus3/v1/" + offeringDTO.language + "/items/" + item.getItemSubtype()
                     + "/"
                     + Integer.toString(item.getAnkamaId());
             offeringDTO.itemPicture = item.getImageUrls().getSd() == null ? item.getImageUrls().getIcon()
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,11 +2,6 @@ name: Docker @@
     on:
       push:
-        # Publish `main` as Docker `latest` image.
-        branches:
-          - main
-        # Publish `v1.2.3` tags as releases.
         tags:
           - v*
@@ Expand Down @@