From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Sun, 24 Oct 2021 11:52:06 +0000 (+0200)
Subject: 🎨 Replace HeldentageFilter with Kotlin version
X-Git-Tag: v2~67
X-Git-Url: https://git.pterodactylus.net/?p=rhynodge.git;a=commitdiff_plain;h=fae0810b2d4165afcfac30e8ed6a0cfba4621629

🎨 Replace HeldentageFilter with Kotlin version
---

diff --git a/src/main/java/net/pterodactylus/rhynodge/filters/comics/HeldentageFilter.java b/src/main/java/net/pterodactylus/rhynodge/filters/comics/HeldentageFilter.java
deleted file mode 100644
index 7081656..0000000
--- a/src/main/java/net/pterodactylus/rhynodge/filters/comics/HeldentageFilter.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package net.pterodactylus.rhynodge.filters.comics;
-
-import static com.google.common.base.Optional.absent;
-import static com.google.common.base.Optional.of;
-import static java.util.Collections.emptyList;
-import static java.util.stream.Collectors.toList;
-
-import java.util.List;
-
-import net.pterodactylus.rhynodge.filters.ComicSiteFilter;
-
-import com.google.common.base.Optional;
-import org.jsoup.nodes.Document;
-
-/**
- * {@link ComicSiteFilter} implementation that can parse “Heldentage” comics.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
- */
-public class HeldentageFilter extends ComicSiteFilter {
-
-	@Override
-	protected Optional<String> extractTitle(Document document) {
-		return extractImageUrls(document).isEmpty() ? absent() : of("");
-	}
-
-	@Override
-	protected List<String> extractImageUrls(Document document) {
-		return document.select("#mod_jheldentage_display_latest img").stream().map(element -> element.attr("src")).collect(toList());
-	}
-
-	@Override
-	protected List<String> extractImageComments(Document document) {
-		return emptyList();
-	}
-
-}
diff --git a/src/main/kotlin/net/pterodactylus/rhynodge/filters/comics/HeldentageFilter.kt b/src/main/kotlin/net/pterodactylus/rhynodge/filters/comics/HeldentageFilter.kt
new file mode 100644
index 0000000..9319a2f
--- /dev/null
+++ b/src/main/kotlin/net/pterodactylus/rhynodge/filters/comics/HeldentageFilter.kt
@@ -0,0 +1,28 @@
+package net.pterodactylus.rhynodge.filters.comics
+
+import com.google.common.base.Optional
+import com.google.common.base.Optional.absent
+import com.google.common.base.Optional.fromNullable
+import com.google.common.base.Optional.of
+import net.pterodactylus.rhynodge.filters.ComicSiteFilter
+import net.pterodactylus.rhynodge.utils.asOptional
+import org.jsoup.nodes.Document
+import org.jsoup.nodes.Element
+import java.util.stream.Collectors
+
+/**
+ * [ComicSiteFilter] implementation that can parse “Heldentage” comics.
+ */
+class HeldentageFilter : ComicSiteFilter() {
+
+	override fun extractTitle(document: Document): Optional<String> =
+		if (extractImageUrls(document).isEmpty()) absent() else of("")
+
+	override fun extractImageUrls(document: Document): List<String> =
+		document.select("#mod_jheldentage_display_latest img")
+			.map { it.attr("src") }
+
+	override fun extractImageComments(document: Document): List<String> =
+		emptyList()
+
+}