backport fixes for Imx and ImageBam

pom.xml

@@ -4,12 +4,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>tn.mnlr</groupId>
     <artifactId>vripper</artifactId>
-    <version>3.5.4</version>
+    <version>3.6.0</version>
     <packaging>pom</packaging>
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.4.5</version>
+        <version>3.5.6</version>
         <relativePath/>
     </parent>
     <modules>

vripper-electron/package.json

@@ -1,10 +1,10 @@
 {
   "name": "vripper-electron",
-  "version": "3.5.4",
+  "version": "3.6.0",
   "description": "A ripper for vipergirls.to built using web technolgies",
   "main": "main.js",
-  "author": "death-claw <53543762+death-claw@users.noreply.github.com>",
-  "homepage": "https://github.com/death-claw/vripper-project",
+  "author": "dev-claw",
+  "homepage": "https://github.com/dev-claw/vripper-project",
   "license": "ISC",
   "build": {
     "appId": "tn.mnlr.vripper",

vripper-electron/pom.xml

@@ -6,10 +6,11 @@
     <parent>
         <groupId>tn.mnlr</groupId>
         <artifactId>vripper</artifactId>
-        <version>3.5.4</version>
+        <version>3.6.0</version>
     </parent>
     <artifactId>vripper-electron</artifactId>
     <name>vripper-electron</name>
+    <packaging>pom</packaging>
     <build>
         <plugins>
             <plugin>

vripper-server/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>tn.mnlr</groupId>
         <artifactId>vripper</artifactId>
-        <version>3.5.4</version>
+        <version>3.6.0</version>
     </parent>
     <artifactId>vripper-server</artifactId>
     <name>vripper-server</name>
@@ -55,6 +55,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
+            <version>4.5.14</version>
         </dependency>
         <dependency>
             <groupId>net.sourceforge.htmlcleaner</groupId>
@@ -79,14 +80,29 @@
             <artifactId>vripper-ui</artifactId>
             <version>${project.version}</version>
             <scope>runtime</scope>
+            <type>pom</type>
             <classifier>${buildClassifier}</classifier>
         </dependency>
     </dependencies>
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.14.0</version>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
             <plugin>
                 <artifactId>maven-jar-plugin</artifactId>
+                <version>3.4.2</version>
                 <configuration>
                     <classifier>${buildClassifier}</classifier>
                     <archive>
@@ -112,6 +128,11 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-install-plugin</artifactId>
+                <version>2.5.2</version>
+            </plugin>
         </plugins>
     </build>
 

vripper-server/src/main/java/tn/mnlr/vripper/download/DownloadJob.java

@@ -1,5 +1,15 @@
 package tn.mnlr.vripper.download;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
+import java.util.*;
+import javax.imageio.ImageIO;
+import javax.imageio.ImageReader;
+import javax.imageio.stream.ImageInputStream;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import net.jodah.failsafe.function.CheckedRunnable;
@@ -19,17 +29,6 @@ import tn.mnlr.vripper.jpa.domain.enums.Status;
 import tn.mnlr.vripper.services.*;
 import tn.mnlr.vripper.services.domain.Settings;
 
-import javax.imageio.ImageIO;
-import javax.imageio.ImageReader;
-import javax.imageio.stream.ImageInputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.StandardCopyOption;
-import java.util.*;
-
 @Slf4j
 public class DownloadJob implements CheckedRunnable {
 
@@ -98,7 +97,7 @@ public class DownloadJob implements CheckedRunnable {
       log.debug(
           String.format(
               "Getting image url and name from %s using %s", image.getUrl(), image.getHost()));
-      HostService.NameUrl nameAndUrl = image.getHost().getNameAndUrl(image.getUrl(), context);
+      HostService.NameUrl nameAndUrl = image.getHost().getNameAndUrl(image, context);
       log.debug(String.format("Resolved name for %s: %s", image.getUrl(), nameAndUrl.getName()));
       log.debug(
           String.format("Resolved image url for %s: %s", image.getUrl(), nameAndUrl.getUrl()));

vripper-server/src/main/java/tn/mnlr/vripper/download/DownloadService.java

@@ -1,5 +1,12 @@
 package tn.mnlr.vripper.download;
 
+import jakarta.annotation.PostConstruct;
+import java.util.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,14 +20,6 @@ import tn.mnlr.vripper.services.MetadataService;
 import tn.mnlr.vripper.services.SettingsService;
 import tn.mnlr.vripper.services.domain.Settings;
 
-import javax.annotation.PostConstruct;
-import java.util.*;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
-
 @Service
 @Slf4j
 public class DownloadService {

vripper-server/src/main/java/tn/mnlr/vripper/event/EventBus.java

@@ -1,11 +1,10 @@
 package tn.mnlr.vripper.event;
 
+import jakarta.annotation.PreDestroy;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Sinks;
 
-import javax.annotation.PreDestroy;
-
 @Service
 public class EventBus {
 

vripper-server/src/main/java/tn/mnlr/vripper/host/AcidimgHost.java

@@ -1,5 +1,7 @@
 package tn.mnlr.vripper.host;
 
+import java.util.ArrayList;
+import java.util.List;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.NameValuePair;
 import org.apache.http.client.HttpClient;
@@ -15,14 +17,12 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import tn.mnlr.vripper.exception.HostException;
 import tn.mnlr.vripper.exception.XpathException;
+import tn.mnlr.vripper.jpa.domain.Image;
 import tn.mnlr.vripper.services.ConnectionService;
 import tn.mnlr.vripper.services.HostService;
 import tn.mnlr.vripper.services.HtmlProcessorService;
 import tn.mnlr.vripper.services.XpathService;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @Service
 @Slf4j
 public class AcidimgHost extends Host {
@@ -59,24 +59,26 @@ public class AcidimgHost extends Host {
   }
 
   @Override
-  public HostService.NameUrl getNameAndUrl(final String url, final HttpClientContext context)
+  public HostService.NameUrl getNameAndUrl(final Image image, final HttpClientContext context)
       throws HostException {
 
-    Document doc = hostService.getResponse(url, context).getDocument();
+    Document doc = hostService.getResponse(image.getUrl(), context).getDocument();
 
     Node contDiv;
     try {
-      log.debug(String.format("Looking for xpath expression %s in %s", CONTINUE_BUTTON_XPATH, url));
+      log.debug(
+          String.format(
+              "Looking for xpath expression %s in %s", CONTINUE_BUTTON_XPATH, image.getUrl()));
       contDiv = xpathService.getAsNode(doc, CONTINUE_BUTTON_XPATH);
     } catch (XpathException e) {
       throw new HostException(e);
     }
 
     if (contDiv != null) {
-      log.debug(String.format("Click button found for %s", url));
+      log.debug(String.format("Click button found for %s", image.getUrl()));
       HttpClient client = cm.getClient().build();
-      HttpPost httpPost = cm.buildHttpPost(url, context);
-      httpPost.addHeader("Referer", url);
+      HttpPost httpPost = cm.buildHttpPost(image.getUrl(), context);
+      httpPost.addHeader("Referer", image.getUrl());
       List<NameValuePair> params = new ArrayList<>();
       params.add(new BasicNameValuePair("imgContinue", "Continue to your image"));
       try {
@@ -98,7 +100,7 @@ public class AcidimgHost extends Host {
 
     Node imgNode;
     try {
-      log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url));
+      log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, image.getUrl()));
       imgNode = xpathService.getAsNode(doc, IMG_XPATH);
     } catch (XpathException e) {
       throw new HostException(e);
@@ -109,7 +111,7 @@ public class AcidimgHost extends Host {
     }
 
     try {
-      log.debug(String.format("Resolving name and image url for %s", url));
+      log.debug(String.format("Resolving name and image url for %s", image.getUrl()));
       String imgTitle = imgNode.getAttributes().getNamedItem("alt").getTextContent().trim();
       String imgUrl = imgNode.getAttributes().getNamedItem("src").getTextContent().trim();
 

vripper-server/src/main/java/tn/mnlr/vripper/host/DPicMeHost.java

@@ -1,5 +1,7 @@
 package tn.mnlr.vripper.host;
 
+import java.util.Optional;
+import java.util.UUID;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.protocol.HttpClientContext;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -8,12 +10,10 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import tn.mnlr.vripper.exception.HostException;
 import tn.mnlr.vripper.exception.XpathException;
+import tn.mnlr.vripper.jpa.domain.Image;
 import tn.mnlr.vripper.services.HostService;
 import tn.mnlr.vripper.services.XpathService;
 
-import java.util.Optional;
-import java.util.UUID;
-
 @Service
 @Slf4j
 public class DPicMeHost extends Host {
@@ -41,27 +41,28 @@ public class DPicMeHost extends Host {
   }
 
   @Override
-  public HostService.NameUrl getNameAndUrl(final String url, final HttpClientContext context)
+  public HostService.NameUrl getNameAndUrl(final Image image, final HttpClientContext context)
       throws HostException {
 
     HostService.Response response =
-        hostService.getResponse(url.replace("http://", "https://"), context);
+        hostService.getResponse(image.getUrl().replace("http://", "https://"), context);
     Document doc = response.getDocument();
 
     Node imgNode;
     try {
-      log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url));
+      log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, image.getUrl()));
       imgNode = xpathService.getAsNode(doc, IMG_XPATH);
     } catch (XpathException e) {
       throw new HostException(e);
     }
 
     if (imgNode == null) {
-      throw new HostException(String.format("Xpath '%s' cannot be found in '%s'", IMG_XPATH, url));
+      throw new HostException(
+          String.format("Xpath '%s' cannot be found in '%s'", IMG_XPATH, image.getUrl()));
     }
 
     try {
-      log.debug(String.format("Resolving name and image url for %s", url));
+      log.debug(String.format("Resolving name and image url for %s", image.getUrl()));
       String imgTitle =
           Optional.ofNullable(imgNode.getAttributes().getNamedItem("alt"))
               .map(e -> e.getTextContent().trim())

vripper-server/src/main/java/tn/mnlr/vripper/host/Host.java

@@ -1,13 +1,13 @@
 package tn.mnlr.vripper.host;
 
+import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.protocol.HttpClientContext;
 import org.springframework.stereotype.Service;
 import tn.mnlr.vripper.exception.HostException;
+import tn.mnlr.vripper.jpa.domain.Image;
 import tn.mnlr.vripper.services.HostService;
 
-import java.util.Objects;
-
 @Service
 @Slf4j
 public abstract class Host {
@@ -21,7 +21,7 @@ public abstract class Host {
   }
 
   public abstract HostService.NameUrl getNameAndUrl(
-      final String url, final HttpClientContext context) throws HostException;
+      final Image image, final HttpClientContext context) throws HostException;
 
   @Override
   public boolean equals(Object o) {

vripper-server/src/main/java/tn/mnlr/vripper/host/ImageBamHost.java

@@ -1,19 +1,21 @@
 package tn.mnlr.vripper.host;
 
+import java.util.Optional;
+import java.util.UUID;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.impl.client.BasicCookieStore;
+import org.apache.http.impl.cookie.BasicClientCookie;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import tn.mnlr.vripper.exception.HostException;
 import tn.mnlr.vripper.exception.XpathException;
+import tn.mnlr.vripper.jpa.domain.Image;
 import tn.mnlr.vripper.services.HostService;
 import tn.mnlr.vripper.services.XpathService;
 
-import java.util.Optional;
-import java.util.UUID;
-
 @Service
 @Slf4j
 public class ImageBamHost extends Host {
@@ -42,17 +44,22 @@ public class ImageBamHost extends Host {
   }
 
   @Override
-  public HostService.NameUrl getNameAndUrl(final String url, final HttpClientContext context)
+  public HostService.NameUrl getNameAndUrl(final Image image, final HttpClientContext context)
       throws HostException {
+    context.setCookieStore(new BasicCookieStore());
+    BasicClientCookie cookie = new BasicClientCookie("nsfw_inter", "1");
+    cookie.setDomain("www.imagebam.com");
+    context.getCookieStore().addCookie(cookie);
 
-    HostService.Response response = hostService.getResponse(url, context);
+    HostService.Response response = hostService.getResponse(image.getUrl(), context);
     Document doc = response.getDocument();
 
     try {
-      log.debug(String.format("Looking for xpath expression %s in %s", CONTINUE_XPATH, url));
+      log.debug(
+          String.format("Looking for xpath expression %s in %s", CONTINUE_XPATH, image.getUrl()));
       if (xpathService.getAsNode(doc, CONTINUE_XPATH) != null) {
         // Button detected. No need to actually click it, just make the call again.
-        response = hostService.getResponse(url, context);
+        response = hostService.getResponse(image.getUrl(), context);
         doc = response.getDocument();
       }
     } catch (XpathException e) {
@@ -61,18 +68,19 @@ public class ImageBamHost extends Host {
 
     Node imgNode;
     try {
-      log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url));
+      log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, image.getUrl()));
       imgNode = xpathService.getAsNode(doc, IMG_XPATH);
     } catch (XpathException e) {
       throw new HostException(e);
     }
 
     if (imgNode == null) {
-      throw new HostException(String.format("Xpath '%s' cannot be found in '%s'", IMG_XPATH, url));
+      throw new HostException(
+          String.format("Xpath '%s' cannot be found in '%s'", IMG_XPATH, image.getUrl()));
     }
 
     try {
-      log.debug(String.format("Resolving name and image url for %s", url));
+      log.debug(String.format("Resolving name and image url for %s", image.getUrl()));
       String imgTitle =
           Optional.ofNullable(imgNode.getAttributes().getNamedItem("alt"))
               .map(e -> e.getTextContent().trim())

vripper-server/src/main/java/tn/mnlr/vripper/host/ImageTwistHost.java

@@ -1,5 +1,6 @@
 package tn.mnlr.vripper.host;
 
+import java.util.Optional;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.protocol.HttpClientContext;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -8,11 +9,10 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import tn.mnlr.vripper.exception.HostException;
 import tn.mnlr.vripper.exception.XpathException;
+import tn.mnlr.vripper.jpa.domain.Image;
 import tn.mnlr.vripper.services.HostService;
 import tn.mnlr.vripper.services.XpathService;
 
-import java.util.Optional;
-
 @Service
 @Slf4j
 public class ImageTwistHost extends Host {
@@ -40,21 +40,21 @@ public class ImageTwistHost extends Host {
   }
 
   @Override
-  public HostService.NameUrl getNameAndUrl(final String url, final HttpClientContext context)
+  public HostService.NameUrl getNameAndUrl(final Image image, final HttpClientContext context)
       throws HostException {
 
-    Document doc = hostService.getResponse(url, context).getDocument();
+    Document doc = hostService.getResponse(image.getUrl(), context).getDocument();
 
     Node imgNode;
     try {
-      log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url));
+      log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, image.getUrl()));
       imgNode = xpathService.getAsNode(doc, IMG_XPATH);
     } catch (XpathException e) {
       throw new HostException(e);
     }
 
     try {
-      log.debug(String.format("Resolving name and image url for %s", url));
+      log.debug(String.format("Resolving name and image url for %s", image.getUrl()));
       String imgTitle =
           Optional.ofNullable(imgNode.getAttributes().getNamedItem("alt"))
               .map(Node::getTextContent)

vripper-server/src/main/java/tn/mnlr/vripper/host/ImageVenueHost.java

@@ -8,6 +8,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import tn.mnlr.vripper.exception.HostException;
 import tn.mnlr.vripper.exception.XpathException;
+import tn.mnlr.vripper.jpa.domain.Image;
 import tn.mnlr.vripper.services.HostService;
 import tn.mnlr.vripper.services.XpathService;
 
@@ -39,10 +40,10 @@ public class ImageVenueHost extends Host {
   }
 
   @Override
-  public HostService.NameUrl getNameAndUrl(final String _url, final HttpClientContext context)
+  public HostService.NameUrl getNameAndUrl(final Image image, final HttpClientContext context)
       throws HostException {
 
-    String url = _url.replace("http://", "https://");
+    String url = image.getUrl().replace("http://", "https://");
 
     HostService.Response resp = hostService.getResponse(url, context);
     Document doc = resp.getDocument();

vripper-server/src/main/java/tn/mnlr/vripper/host/ImageZillaHost.java

@@ -8,6 +8,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import tn.mnlr.vripper.exception.HostException;
 import tn.mnlr.vripper.exception.XpathException;
+import tn.mnlr.vripper.jpa.domain.Image;
 import tn.mnlr.vripper.services.HostService;
 import tn.mnlr.vripper.services.XpathService;
 
@@ -39,16 +40,16 @@ public class ImageZillaHost extends Host {
   }
 
   @Override
-  public HostService.NameUrl getNameAndUrl(final String url, final HttpClientContext context)
+  public HostService.NameUrl getNameAndUrl(final Image image, final HttpClientContext context)
       throws HostException {
 
-    Document doc = hostService.getResponse(url, context).getDocument();
+    Document doc = hostService.getResponse(image.getUrl(), context).getDocument();
 
     String title;
     try {
-      log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url));
+      log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, image.getUrl()));
       Node titleNode = xpathService.getAsNode(doc, IMG_XPATH).getAttributes().getNamedItem("title");
-      log.debug(String.format("Resolving name for %s", url));
+      log.debug(String.format("Resolving name for %s", image.getUrl()));
       if (titleNode != null) {
         title = titleNode.getTextContent().trim();
       } else {
@@ -59,11 +60,11 @@ public class ImageZillaHost extends Host {
     }
 
     if (title == null || title.isEmpty()) {
-      title = hostService.getDefaultImageName(url);
+      title = hostService.getDefaultImageName(image.getUrl());
     }
 
     try {
-      return new HostService.NameUrl(title, url.replace("show", "images"));
+      return new HostService.NameUrl(title, image.getUrl().replace("show", "images"));
     } catch (Exception e) {
       throw new HostException("Unexpected error occurred", e);
     }

vripper-server/src/main/java/tn/mnlr/vripper/host/ImgSpiceHost.java

@@ -8,6 +8,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import tn.mnlr.vripper.exception.HostException;
 import tn.mnlr.vripper.exception.XpathException;
+import tn.mnlr.vripper.jpa.domain.Image;
 import tn.mnlr.vripper.services.HostService;
 import tn.mnlr.vripper.services.XpathService;
 
@@ -38,10 +39,10 @@ public class ImgSpiceHost extends Host {
   }
 
   @Override
-  public HostService.NameUrl getNameAndUrl(final String _url, final HttpClientContext context)
+  public HostService.NameUrl getNameAndUrl(final Image image, final HttpClientContext context)
       throws HostException {
 
-    String url = _url.replace("http://", "https://");
+    String url = image.getUrl().replace("http://", "https://");
     HostService.Response resp = hostService.getResponse(url, context);
     Document doc = resp.getDocument();
 

vripper-server/src/main/java/tn/mnlr/vripper/host/ImgboxHost.java

@@ -8,6 +8,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import tn.mnlr.vripper.exception.HostException;
 import tn.mnlr.vripper.exception.XpathException;
+import tn.mnlr.vripper.jpa.domain.Image;
 import tn.mnlr.vripper.services.HostService;
 import tn.mnlr.vripper.services.XpathService;
 
@@ -38,21 +39,21 @@ public class ImgboxHost extends Host {
   }
 
   @Override
-  public HostService.NameUrl getNameAndUrl(final String url, final HttpClientContext context)
+  public HostService.NameUrl getNameAndUrl(final Image image, final HttpClientContext context)
       throws HostException {
 
-    Document doc = hostService.getResponse(url, context).getDocument();
+    Document doc = hostService.getResponse(image.getUrl(), context).getDocument();
 
     Node imgNode;
     try {
-      log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url));
+      log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, image.getUrl()));
       imgNode = xpathService.getAsNode(doc, IMG_XPATH);
     } catch (XpathException e) {
       throw new HostException(e);
     }
 
     try {
-      log.debug(String.format("Resolving name and image url for %s", url));
+      log.debug(String.format("Resolving name and image url for %s", image.getUrl()));
       String imgTitle = imgNode.getAttributes().getNamedItem("title").getTextContent().trim();
       String imgUrl = imgNode.getAttributes().getNamedItem("src").getTextContent().trim();
 

vripper-server/src/main/java/tn/mnlr/vripper/host/ImxHost.java

@@ -1,54 +1,17 @@
 package tn.mnlr.vripper.host;
 
 import lombok.extern.slf4j.Slf4j;
-import org.apache.http.NameValuePair;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.message.BasicNameValuePair;
-import org.apache.http.util.EntityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
 import tn.mnlr.vripper.exception.HostException;
-import tn.mnlr.vripper.exception.HtmlProcessorException;
-import tn.mnlr.vripper.exception.XpathException;
-import tn.mnlr.vripper.services.ConnectionService;
+import tn.mnlr.vripper.jpa.domain.Image;
 import tn.mnlr.vripper.services.HostService;
-import tn.mnlr.vripper.services.HtmlProcessorService;
-import tn.mnlr.vripper.services.XpathService;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 
 @Service
 @Slf4j
 public class ImxHost extends Host {
 
   private static final String host = "imx.to";
-  private static final String CONTINUE_BUTTON_XPATH = "//*[@name='imgContinue']";
-  private static final String IMG_XPATH = "//img[@class='centred']";
-
-  private final HostService hostService;
-  private final XpathService xpathService;
-  private final ConnectionService cm;
-  private final HtmlProcessorService htmlProcessorService;
-
-  @Autowired
-  public ImxHost(
-      HostService hostService,
-      XpathService xpathService,
-      ConnectionService cm,
-      HtmlProcessorService htmlProcessorService) {
-    this.hostService = hostService;
-    this.xpathService = xpathService;
-    this.cm = cm;
-    this.htmlProcessorService = htmlProcessorService;
-  }
 
   @Override
   public String getHost() {
@@ -61,69 +24,17 @@ public class ImxHost extends Host {
   }
 
   @Override
-  public HostService.NameUrl getNameAndUrl(final String _url, final HttpClientContext context)
+  public HostService.NameUrl getNameAndUrl(final Image image, final HttpClientContext context)
       throws HostException {
 
-    String url = _url.replace("http://", "https://");
-    HostService.Response resp = hostService.getResponse(url, context);
-    Document doc = resp.getDocument();
-
-    Node contDiv;
-    String value = null;
-    try {
-      log.debug(String.format("Looking for xpath expression %s in %s", CONTINUE_BUTTON_XPATH, url));
-      contDiv = xpathService.getAsNode(doc, CONTINUE_BUTTON_XPATH);
-      if (contDiv == null) {
-        throw new HostException(CONTINUE_BUTTON_XPATH + " cannot be found");
-      }
-      Node node = contDiv.getAttributes().getNamedItem("value");
-      if (node != null) {
-        value = node.getTextContent();
-      }
-    } catch (XpathException e) {
-      throw new HostException(e);
-    }
-
-    if (value == null) {
-      throw new HostException("Failed to obtain value attribute from continue input");
-    }
-    log.debug(String.format("Click button found for %s", url));
-    HttpClient client = cm.getClient().build();
-    HttpPost httpPost = cm.buildHttpPost(url, context);
-    List<NameValuePair> params = new ArrayList<>();
-    params.add(new BasicNameValuePair("imgContinue", value));
-    try {
-      httpPost.setEntity(new UrlEncodedFormEntity(params));
-    } catch (Exception e) {
-      throw new HostException(e);
-    }
-    log.debug(String.format("Requesting %s", httpPost));
-    try (CloseableHttpResponse response =
-        (CloseableHttpResponse) client.execute(httpPost, context)) {
-      log.debug(String.format("Cleaning response for %s", httpPost));
-      doc = htmlProcessorService.clean(EntityUtils.toString(response.getEntity()));
-      EntityUtils.consumeQuietly(response.getEntity());
-    } catch (IOException | HtmlProcessorException e) {
-      throw new HostException(e);
-    }
-
-    Node imgNode;
-    try {
-      log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url));
-      imgNode = xpathService.getAsNode(doc, IMG_XPATH);
-    } catch (XpathException e) {
-      throw new HostException(e);
-    }
-
-    try {
-      log.debug(String.format("Resolving name and image url for %s", url));
-      String imgTitle = imgNode.getAttributes().getNamedItem("alt").getTextContent().trim();
-      String imgUrl = imgNode.getAttributes().getNamedItem("src").getTextContent().trim();
-
-      return new HostService.NameUrl(
-          imgTitle.isEmpty() ? imgUrl.substring(imgUrl.lastIndexOf('/') + 1) : imgTitle, imgUrl);
-    } catch (Exception e) {
-      throw new HostException("Unexpected error occurred", e);
-    }
+    log.debug(String.format("Resolving name and image url for %s", image.getUrl()));
+    String imgTitle = String.format("IMG_%04d", image.getIndex() + 1);
+    String imgUrl =
+        image
+            .getThumbUrl()
+            .replace("http:", "https:")
+            .replace("upload/small/", "u/i/")
+            .replace("u/t/", "u/i/");
+    return new HostService.NameUrl(imgTitle, imgUrl);
   }
 }

vripper-server/src/main/java/tn/mnlr/vripper/host/PimpandhostHost.java

@@ -8,6 +8,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import tn.mnlr.vripper.exception.HostException;
 import tn.mnlr.vripper.exception.XpathException;
+import tn.mnlr.vripper.jpa.domain.Image;
 import tn.mnlr.vripper.services.HostService;
 import tn.mnlr.vripper.services.XpathService;
 
@@ -39,12 +40,12 @@ public class PimpandhostHost extends Host {
   }
 
   @Override
-  public HostService.NameUrl getNameAndUrl(final String _url, final HttpClientContext context)
+  public HostService.NameUrl getNameAndUrl(final Image image, final HttpClientContext context)
       throws HostException {
 
     String url;
     try {
-      url = hostService.appendUri(_url.replace("http://", "https://"), "size=original");
+      url = hostService.appendUri(image.getUrl().replace("http://", "https://"), "size=original");
     } catch (Exception e) {
       throw new HostException(e);
     }

vripper-server/src/main/java/tn/mnlr/vripper/host/PixRouteHost.java

@@ -8,6 +8,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import tn.mnlr.vripper.exception.HostException;
 import tn.mnlr.vripper.exception.XpathException;
+import tn.mnlr.vripper.jpa.domain.Image;
 import tn.mnlr.vripper.services.HostService;
 import tn.mnlr.vripper.services.XpathService;
 
@@ -38,10 +39,10 @@ public class PixRouteHost extends Host {
   }
 
   @Override
-  public HostService.NameUrl getNameAndUrl(final String _url, final HttpClientContext context)
+  public HostService.NameUrl getNameAndUrl(final Image image, final HttpClientContext context)
       throws HostException {
 
-    String url = _url.replace("http://", "https://");
+    String url = image.getUrl().replace("http://", "https://");
     Document doc = hostService.getResponse(url, context).getDocument();
 
     Node imgNode;

vripper-server/src/main/java/tn/mnlr/vripper/host/PixhostHost.java

@@ -8,6 +8,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import tn.mnlr.vripper.exception.HostException;
 import tn.mnlr.vripper.exception.XpathException;
+import tn.mnlr.vripper.jpa.domain.Image;
 import tn.mnlr.vripper.services.HostService;
 import tn.mnlr.vripper.services.XpathService;
 
@@ -39,21 +40,21 @@ public class PixhostHost extends Host {
   }
 
   @Override
-  public HostService.NameUrl getNameAndUrl(final String url, final HttpClientContext context)
+  public HostService.NameUrl getNameAndUrl(final Image image, final HttpClientContext context)
       throws HostException {
 
-    Document doc = hostService.getResponse(url, context).getDocument();
+    Document doc = hostService.getResponse(image.getUrl(), context).getDocument();
 
     Node imgNode;
     try {
-      log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url));
+      log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, image.getUrl()));
       imgNode = xpathService.getAsNode(doc, IMG_XPATH);
     } catch (XpathException e) {
       throw new HostException(e);
     }
 
     try {
-      log.debug(String.format("Resolving name and image url for %s", url));
+      log.debug(String.format("Resolving name and image url for %s", image.getUrl()));
       String imgTitle = imgNode.getAttributes().getNamedItem("alt").getTextContent().trim();
       String imgUrl = imgNode.getAttributes().getNamedItem("src").getTextContent().trim();
 

vripper-server/src/main/java/tn/mnlr/vripper/host/PixxxelsHost.java

@@ -8,6 +8,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import tn.mnlr.vripper.exception.HostException;
 import tn.mnlr.vripper.exception.XpathException;
+import tn.mnlr.vripper.jpa.domain.Image;
 import tn.mnlr.vripper.services.HostService;
 import tn.mnlr.vripper.services.XpathService;
 
@@ -39,10 +40,10 @@ public class PixxxelsHost extends Host {
   }
 
   @Override
-  public HostService.NameUrl getNameAndUrl(final String _url, final HttpClientContext context)
+  public HostService.NameUrl getNameAndUrl(final Image image, final HttpClientContext context)
       throws HostException {
 
-    String url = _url.replace("http://", "https://");
+    String url = image.getUrl().replace("http://", "https://");
     HostService.Response resp = hostService.getResponse(url, context);
     Document doc = resp.getDocument();
 

vripper-server/src/main/java/tn/mnlr/vripper/host/PostImgHost.java

@@ -1,5 +1,6 @@
 package tn.mnlr.vripper.host;
 
+import java.util.Optional;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.protocol.HttpClientContext;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -8,11 +9,10 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import tn.mnlr.vripper.exception.HostException;
 import tn.mnlr.vripper.exception.XpathException;
+import tn.mnlr.vripper.jpa.domain.Image;
 import tn.mnlr.vripper.services.HostService;
 import tn.mnlr.vripper.services.XpathService;
 
-import java.util.Optional;
-
 @Service
 @Slf4j
 public class PostImgHost extends Host {
@@ -41,10 +41,10 @@ public class PostImgHost extends Host {
   }
 
   @Override
-  public HostService.NameUrl getNameAndUrl(final String _url, final HttpClientContext context)
+  public HostService.NameUrl getNameAndUrl(final Image image, final HttpClientContext context)
       throws HostException {
 
-    String url = _url.replace("http://", "https://");
+    String url = image.getUrl().replace("http://", "https://");
     Document doc = hostService.getResponse(url, context).getDocument();
 
     Node urlNode, titleNode;

vripper-server/src/main/java/tn/mnlr/vripper/host/TurboImageHost.java

@@ -8,6 +8,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import tn.mnlr.vripper.exception.HostException;
 import tn.mnlr.vripper.exception.XpathException;
+import tn.mnlr.vripper.jpa.domain.Image;
 import tn.mnlr.vripper.services.HostService;
 import tn.mnlr.vripper.services.XpathService;
 
@@ -39,16 +40,17 @@ public class TurboImageHost extends Host {
   }
 
   @Override
-  public HostService.NameUrl getNameAndUrl(final String url, final HttpClientContext context)
+  public HostService.NameUrl getNameAndUrl(final Image image, final HttpClientContext context)
       throws HostException {
 
-    Document doc = hostService.getResponse(url, context).getDocument();
+    Document doc = hostService.getResponse(image.getUrl(), context).getDocument();
 
     String title;
     try {
-      log.debug(String.format("Looking for xpath expression %s in %s", TITLE_XPATH, url));
+      log.debug(
+          String.format("Looking for xpath expression %s in %s", TITLE_XPATH, image.getUrl()));
       Node titleNode = xpathService.getAsNode(doc, TITLE_XPATH);
-      log.debug(String.format("Resolving name for %s", url));
+      log.debug(String.format("Resolving name for %s", image.getUrl()));
       if (titleNode != null) {
         title = titleNode.getTextContent().trim();
       } else {
@@ -59,7 +61,7 @@ public class TurboImageHost extends Host {
     }
 
     if (title == null || title.isEmpty()) {
-      title = hostService.getDefaultImageName(url);
+      title = hostService.getDefaultImageName(image.getUrl());
     }
 
     try {

vripper-server/src/main/java/tn/mnlr/vripper/host/ViprImHost.java

@@ -1,5 +1,6 @@
 package tn.mnlr.vripper.host;
 
+import java.util.Optional;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.protocol.HttpClientContext;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -8,11 +9,10 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import tn.mnlr.vripper.exception.HostException;
 import tn.mnlr.vripper.exception.XpathException;
+import tn.mnlr.vripper.jpa.domain.Image;
 import tn.mnlr.vripper.services.HostService;
 import tn.mnlr.vripper.services.XpathService;
 
-import java.util.Optional;
-
 @Service
 @Slf4j
 public class ViprImHost extends Host {
@@ -40,21 +40,21 @@ public class ViprImHost extends Host {
   }
 
   @Override
-  public HostService.NameUrl getNameAndUrl(final String url, final HttpClientContext context)
+  public HostService.NameUrl getNameAndUrl(final Image image, final HttpClientContext context)
       throws HostException {
 
-    Document doc = hostService.getResponse(url, context).getDocument();
+    Document doc = hostService.getResponse(image.getUrl(), context).getDocument();
 
     Node imgNode;
     try {
-      log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, url));
+      log.debug(String.format("Looking for xpath expression %s in %s", IMG_XPATH, image.getUrl()));
       imgNode = xpathService.getAsNode(doc, IMG_XPATH);
     } catch (XpathException e) {
       throw new HostException(e);
     }
 
     try {
-      log.debug(String.format("Resolving name and image url for %s", url));
+      log.debug(String.format("Resolving name and image url for %s", image.getUrl()));
       String imgTitle =
           Optional.ofNullable(imgNode.getAttributes().getNamedItem("alt"))
               .map(Node::getTextContent)

vripper-server/src/main/java/tn/mnlr/vripper/jpa/Management.java

@@ -1,15 +1,7 @@
 package tn.mnlr.vripper.jpa;
 
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-import tn.mnlr.vripper.download.DownloadService;
-import tn.mnlr.vripper.services.ThreadPoolService;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.io.File;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -17,6 +9,13 @@ import java.time.format.DateTimeFormatter;
 import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import tn.mnlr.vripper.download.DownloadService;
+import tn.mnlr.vripper.services.ThreadPoolService;
 
 @Component
 @EnableScheduling

vripper-server/src/main/java/tn/mnlr/vripper/jpa/domain/Image.java

@@ -1,6 +1,7 @@
 package tn.mnlr.vripper.jpa.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import java.util.Objects;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -8,8 +9,6 @@ import lombok.ToString;
 import tn.mnlr.vripper.host.Host;
 import tn.mnlr.vripper.jpa.domain.enums.Status;
 
-import java.util.Objects;
-
 @Getter
 @Setter
 @ToString
@@ -22,6 +21,8 @@ public class Image {
 
   private String url;
 
+  private String thumbUrl;
+
   private int index;
 
   private long current = 0;
@@ -34,9 +35,10 @@ public class Image {
 
   @JsonIgnore private Long postIdRef;
 
-  public Image(String postId, String url, Host host, int index) {
+  public Image(String postId, String url, String thumbUrl, Host host, int index) {
     this.postId = postId;
     this.url = url;
+    this.thumbUrl = thumbUrl;
     this.host = host;
     this.index = index;
     status = Status.STOPPED;

vripper-server/src/main/java/tn/mnlr/vripper/jpa/repositories/impl/ImageRepository.java

@@ -1,5 +1,9 @@
 package tn.mnlr.vripper.jpa.repositories.impl;
 
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.List;
+import java.util.Optional;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
@@ -12,11 +16,6 @@ import tn.mnlr.vripper.jpa.domain.Image;
 import tn.mnlr.vripper.jpa.domain.enums.Status;
 import tn.mnlr.vripper.jpa.repositories.IImageRepository;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.List;
-import java.util.Optional;
-
 @Service
 public class ImageRepository implements IImageRepository {
 
@@ -37,7 +36,7 @@ public class ImageRepository implements IImageRepository {
   public Image save(Image image) {
     long id = nextId();
     jdbcTemplate.update(
-        "INSERT INTO IMAGE (ID, CURRENT, HOST, INDEX, POST_ID, STATUS, TOTAL, URL, POST_ID_REF) VALUES (?,?,?,?,?,?,?,?,?)",
+        "INSERT INTO IMAGE (ID, CURRENT, HOST, INDEX, POST_ID, STATUS, TOTAL, URL, THUMB_URL, POST_ID_REF) VALUES (?,?,?,?,?,?,?,?,?,?)",
         id,
         image.getCurrent(),
         image.getHost().getHost(),
@@ -46,6 +45,7 @@ public class ImageRepository implements IImageRepository {
         image.getStatus().name(),
         image.getTotal(),
         image.getUrl(),
+        image.getThumbUrl(),
         image.getPostIdRef());
     image.setId(id);
     eventBus.publishEvent(Event.wrap(Event.Kind.IMAGE_UPDATE, id));
@@ -145,6 +145,7 @@ class ImageRowMapper implements RowMapper<Image> {
             .findAny()
             .orElse(null));
     image.setUrl(rs.getString("URL"));
+    image.setThumbUrl(rs.getString("THUMB_URL"));
     image.setIndex(rs.getInt("INDEX"));
     image.setCurrent(rs.getLong("CURRENT"));
     image.setTotal(rs.getLong("TOTAL"));

vripper-server/src/main/java/tn/mnlr/vripper/services/ConnectionService.java

@@ -1,5 +1,10 @@
 package tn.mnlr.vripper.services;
 
+import jakarta.annotation.PreDestroy;
+import java.net.URI;
+import java.time.temporal.ChronoUnit;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import net.jodah.failsafe.RetryPolicy;
@@ -22,12 +27,6 @@ import tn.mnlr.vripper.event.Event;
 import tn.mnlr.vripper.event.EventBus;
 import tn.mnlr.vripper.services.domain.Settings;
 
-import javax.annotation.PreDestroy;
-import java.net.URI;
-import java.time.temporal.ChronoUnit;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
 @Service
 @EnableScheduling
 @Slf4j

vripper-server/src/main/java/tn/mnlr/vripper/services/DataService.java

@@ -1,5 +1,7 @@
 package tn.mnlr.vripper.services;
 
+import java.util.*;
+import java.util.stream.Collectors;
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,10 +15,6 @@ import tn.mnlr.vripper.jpa.repositories.IPostRepository;
 import tn.mnlr.vripper.jpa.repositories.IQueuedRepository;
 import tn.mnlr.vripper.jpa.repositories.impl.LogEventRepository;
 
-import javax.annotation.PostConstruct;
-import java.util.*;
-import java.util.stream.Collectors;
-
 @Service
 @Transactional
 @Slf4j

vripper-server/src/main/java/tn/mnlr/vripper/services/PostService.java

@@ -2,6 +2,10 @@ package tn.mnlr.vripper.services;
 
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
+import jakarta.annotation.PreDestroy;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -14,11 +18,6 @@ import tn.mnlr.vripper.services.domain.MultiPostScanResult;
 import tn.mnlr.vripper.tasks.AddPostRunnable;
 import tn.mnlr.vripper.tasks.AddQueuedRunnable;
 
-import javax.annotation.PreDestroy;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-
 @Service
 @Slf4j
 public class PostService {

vripper-server/src/main/java/tn/mnlr/vripper/services/SettingsService.java

@@ -1,9 +1,24 @@
 package tn.mnlr.vripper.services;
 
+import static java.nio.file.StandardOpenOption.*;
+
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.InvalidPathException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -18,22 +33,6 @@ import tn.mnlr.vripper.event.EventBus;
 import tn.mnlr.vripper.exception.ValidationException;
 import tn.mnlr.vripper.services.domain.Settings;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.InvalidPathException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import static java.nio.file.StandardOpenOption.*;
-
 @Service
 @Setter
 @Slf4j

vripper-server/src/main/java/tn/mnlr/vripper/services/VGAuthService.java

@@ -1,5 +1,9 @@
 package tn.mnlr.vripper.services;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import java.util.ArrayList;
+import java.util.List;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.NameValuePair;
@@ -21,11 +25,6 @@ import tn.mnlr.vripper.exception.VripperException;
 import tn.mnlr.vripper.jpa.domain.Post;
 import tn.mnlr.vripper.tasks.LeaveThanksRunnable;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import java.util.ArrayList;
-import java.util.List;
-
 @Service
 @Slf4j
 public class VGAuthService {

vripper-server/src/main/java/tn/mnlr/vripper/services/domain/PostScanHandler.java

@@ -1,5 +1,10 @@
 package tn.mnlr.vripper.services.domain;
 
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
 import org.xml.sax.Attributes;
 import org.xml.sax.helpers.DefaultHandler;
@@ -9,12 +14,6 @@ import tn.mnlr.vripper.jpa.domain.Image;
 import tn.mnlr.vripper.jpa.domain.Post;
 import tn.mnlr.vripper.services.SettingsService;
 
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 @Slf4j
 class PostScanHandler extends DefaultHandler {
 
@@ -72,10 +71,9 @@ class PostScanHandler extends DefaultHandler {
         break;
       case "image":
         index++;
+        String thumbUrl = attributes.getValue("thumb_url").trim();
         if (previews.size() < 4) {
-          Optional.ofNullable(attributes.getValue("thumb_url"))
-              .map(String::trim)
-              .ifPresent(previews::add);
+          previews.add(thumbUrl);
         }
 
         String mainUrl =
@@ -91,7 +89,7 @@ class PostScanHandler extends DefaultHandler {
                 String.format(
                     "Found supported host %s for %s",
                     foundHost.getClass().getSimpleName(), mainUrl));
-            images.add(new Image(postId, mainUrl, foundHost, index));
+            images.add(new Image(postId, mainUrl, thumbUrl, foundHost, index));
           } else {
             log.warn(String.format("unsupported host for %s, skipping", mainUrl));
           }

vripper-server/src/main/java/tn/mnlr/vripper/web/wsendpoints/DataBroadcast.java

@@ -1,5 +1,13 @@
 package tn.mnlr.vripper.web.wsendpoints;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.messaging.simp.SimpMessagingTemplate;
@@ -12,15 +20,6 @@ import tn.mnlr.vripper.services.DataService;
 import tn.mnlr.vripper.services.domain.DownloadSpeed;
 import tn.mnlr.vripper.services.domain.GlobalState;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import java.time.Duration;
-import java.time.temporal.ChronoUnit;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
 @Service
 @Slf4j
 public class DataBroadcast {

vripper-server/src/main/resources/db/changelog/db.changelog-master.xml

@@ -175,4 +175,11 @@
             </column>
         </addColumn>
     </changeSet>
+    <changeSet id="1759157222" author="death-claw">
+        <addColumn tableName="IMAGE">
+            <column name="THUMB_URL" type="VARCHAR(3000)" defaultValue="https://example.com">
+                <constraints nullable="false"/>
+            </column>
+        </addColumn>
+    </changeSet>
 </databaseChangeLog>

vripper-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vripper-ui",
-  "version": "3.5.4",
+  "version": "3.6.0",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",

vripper-ui/pom.xml

@@ -5,14 +5,16 @@
   <parent>
     <groupId>tn.mnlr</groupId>
     <artifactId>vripper</artifactId>
-    <version>3.5.4</version>
+    <version>3.6.0</version>
   </parent>
   <artifactId>vripper-ui</artifactId>
   <name>vripper-ui</name>
+  <packaging>pom</packaging>
   <build>
     <plugins>
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
+        <version>3.4.2</version>
         <configuration>
           <classifier>${buildClassifier}</classifier>
         </configuration>

vripper-ui/src/app/about/about-component.html

@@ -11,14 +11,7 @@
       </mat-card-header>
       <mat-card-content>
         <section class="section">
-          Due to the lack of cross platform Ripper for vipergirls.to and the official one being no longer maintained,
-          this application was created as a personal project of mine to fulfill the old one's tasks.<br/>
-          Soon after, people were interested in it and i released it to the public.<br/>
-          This project is built to be a robust and clean replacement of the old one, using modern technologies to
-          conveniently download photo galleries from the forum.<br/>
-          I aim to provide you with a software that is easy to use have a nice and intuitive design and interface.<br/>
-          The project is currently maintained by me 'theghooost', a member of the vipergirls.to forum, feel free to PM
-          if you need anything.<br/>
+          Developed by dev-claw and VRipper working group
         </section>
         <mat-divider></mat-divider>
         <section class="section">
@@ -31,11 +24,11 @@
           </span>
           You can contribute to the project by testing new releases, raising bug reports or coding.<br/>
           The project is open source and is hosted in github.com.<br/>
-          <h4 class="no-bottom-margin">Github: </h4><a (click)="goTo('https://github.com/death-claw/vripper-project')"
-                                                       class="about-link" href="javascript:void(0)">https://github.com/death-claw/vripper-project</a>
+          <h4 class="no-bottom-margin">Github: </h4><a (click)="goTo('https://github.com/dev-claw/vripper-project')"
+                                                       class="about-link" href="javascript:void(0)">https://github.com/dev-claw/vripper-project</a>
           <h4 class="no-bottom-margin">Issues: </h4><a
-          (click)="goTo('https://github.com/death-claw/vripper-project/issues')" class="about-link"
-          href="javascript:void(0)">https://github.com/death-claw/vripper-project/issues</a>
+          (click)="goTo('https://github.com/dev-claw/vripper-project/issues')" class="about-link"
+          href="javascript:void(0)">https://github.com/dev-claw/vripper-project/issues</a>
           <h4 class="no-bottom-margin">PM: </h4><a (click)="goTo('https://vipergirls.to/members/244439-theghooost')"
                                                    class="about-link" href="javascript:void(0)">https://vipergirls.to/members/244439-theghooost</a>
         </section>
@@ -50,12 +43,17 @@
           </span>
           If you feel generous and want to support me, you can toss me some coins, and I would be very grateful <span
           style="font-size: 20px">🙏</span><br/>
-          You can send me donations through paypal to the following email address
+          You can send me donations through the following methods<br/>
           <div fxLayout="row">
-            <a (click)="goTo('https://www.paypal.com/myaccount/transfer/homepage/buy/preview')" style="cursor: pointer">
-              <div class="paypal-image"></div>
+            <a (click)="goTo('https://buymeacoffee.com/devclaw')" style="cursor: pointer">
+              <div class="buymeacoffee-image"></div>
             </a>
-            <h3>dev.vripper@gmail.com</h3>
+          </div>
+          <div fxLayout="row">
+            <h3><label>ETH: </label>0xDdac82B16dC5E3D742fc915ffF583D8548A301cA</h3>
+          </div>
+          <div fxLayout="row">
+            <h3><label>BTC: </label>bc1qcqudnkrndwyadsjwrxww42svkf8trnzx3c8vlr</h3>
           </div>
         </section>
       </mat-card-content>

vripper-ui/src/app/about/about-component.scss

@@ -3,11 +3,11 @@
   background-image: url('../../assets/v.svg');
 }
 
-.paypal-image {
-  width: 64px;
-  height: 64px;
+.buymeacoffee-image {
+  width: 170px;
+  height: 37px;
   background-size: cover;
-  background-image: url('../../assets/paypal.svg');
+  background-image: url('../../assets/buymeacoffee-logo.png');
 }
 
 .section {

vripper-ui/src/environments/environment.prod.ts

@@ -2,5 +2,5 @@ export const environment = {
   production: true,
   localhost: `${window.location.protocol}//${window.location.host}`,
   ws: `${window.location.protocol === 'http:' ? 'ws:' : 'wss:'}//${window.location.host}`,
-  version: '3.5.4'
+  version: '3.6.0'
 };

vripper-ui/src/environments/environment.ts

@@ -6,7 +6,7 @@ export const environment = {
   production: false,
   localhost: 'http://localhost:8080',
   ws: 'ws://localhost:8080',
-  version: '3.5.4'
+  version: '3.6.0'
 };
 
 /*