release 5.3.4

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [5.3.4]
+
+- Added support for Internationalized Domain Names (#1588)
+
+## [5.3.3]
+
+- Removed image bottom margins (#1587)
+
 ## [5.3.2]
 
 - Fixed an issue that could cause some images from not being rendered correctly (#1587)

commafeed-client/package-lock.json

@@ -52,7 +52,7 @@
                 "@lingui/cli": "^4.13.0",
                 "@lingui/vite-plugin": "^4.13.0",
                 "@types/mousetrap": "^1.6.15",
-                "@types/react": "^18.3.11",
+                "@types/react": "^18.3.12",
                 "@types/react-dom": "^18.3.1",
                 "@types/react-helmet": "^6.1.11",
                 "@types/react-infinite-scroller": "^1.2.5",
@@ -64,7 +64,7 @@
                 "jsdom": "^25.0.1",
                 "rollup-plugin-visualizer": "^5.12.0",
                 "typescript": "^5.6.3",
-                "vite": "^5.4.9",
+                "vite": "^5.4.10",
                 "vite-plugin-checker": "^0.8.0",
                 "vite-tsconfig-paths": "^5.0.1",
                 "vitest": "^2.1.3",
@@ -2299,9 +2299,9 @@
             "license": "MIT"
         },
         "node_modules/@types/react": {
-            "version": "18.3.11",
+            "version": "18.3.12",
-            "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.11.tgz",
+            "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.12.tgz",
-            "integrity": "sha512-r6QZ069rFTjrEYgFdOck1gK7FLVsgJE7tTz0pQBczlBNUhBNk0MQH4UbnFSwjpQLMkLzgqvBBa+qGpLje16eTQ==",
+            "integrity": "sha512-D2wOSq/d6Agt28q7rSI3jhU7G6aiuzljDGZ2hTZHIkrTLUI+AF3WMeKkEZ9nN2fkBAlcktT6vcZjDFiIhMYEQw==",
             "devOptional": true,
             "license": "MIT",
             "dependencies": {
@@ -8418,9 +8418,9 @@
             "license": "MIT"
         },
         "node_modules/vite": {
-            "version": "5.4.9",
+            "version": "5.4.10",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.9.tgz",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.10.tgz",
-            "integrity": "sha512-20OVpJHh0PAM0oSOELa5GaZNWeDjcAvQjGXy2Uyr+Tp+/D2/Hdz6NLgpJLsarPTA2QJ6v8mX2P1ZfbsSKvdMkg==",
+            "integrity": "sha512-1hvaPshuPUtxeQ0hsVH3Mud0ZanOLwVTneA1EgbAM5LhaZEqyPWGRQ7BtaMvUrTDeEaC8pxtj6a6jku3x4z6SQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {

commafeed-client/package.json

@@ -59,7 +59,7 @@
         "@lingui/cli": "^4.13.0",
         "@lingui/vite-plugin": "^4.13.0",
         "@types/mousetrap": "^1.6.15",
-        "@types/react": "^18.3.11",
+        "@types/react": "^18.3.12",
         "@types/react-dom": "^18.3.1",
         "@types/react-helmet": "^6.1.11",
         "@types/react-infinite-scroller": "^1.2.5",
@@ -71,7 +71,7 @@
         "jsdom": "^25.0.1",
         "rollup-plugin-visualizer": "^5.12.0",
         "typescript": "^5.6.3",
-        "vite": "^5.4.9",
+        "vite": "^5.4.10",
         "vite-plugin-checker": "^0.8.0",
         "vite-tsconfig-paths": "^5.0.1",
         "vitest": "^2.1.3",

commafeed-client/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.commafeed</groupId>
 		<artifactId>commafeed</artifactId>
-		<version>5.3.2</version>
+		<version>5.3.4</version>
 	</parent>
 	<artifactId>commafeed-client</artifactId>
 	<name>CommaFeed Client</name>

commafeed-client/src/components/content/BasicHtmlStyles.tsx

@@ -1,11 +1,24 @@
 import { TypographyStylesProvider } from "@mantine/core"
 import type { ReactNode } from "react"
+import { tss } from "tss"
 
 /**
  * This component is used to provide basic styles to html typography elements.
  *
  * see https://mantine.dev/core/typography-styles-provider/
  */
+
+const useStyles = tss.create(() => ({
+    // override mantine default typography styles
+    content: {
+        paddingLeft: 0,
+        "& img": {
+            marginBottom: 0,
+        },
+    },
+}))
+
 export const BasicHtmlStyles = (props: { children: ReactNode }) => {
-    return <TypographyStylesProvider pl={0}>{props.children}</TypographyStylesProvider>
+    const { classes } = useStyles()
+    return <TypographyStylesProvider className={classes.content}>{props.children}</TypographyStylesProvider>
 }

commafeed-server/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.commafeed</groupId>
 		<artifactId>commafeed</artifactId>
-		<version>5.3.2</version>
+		<version>5.3.4</version>
 	</parent>
 	<artifactId>commafeed-server</artifactId>
 	<name>CommaFeed Server</name>
@@ -43,7 +43,7 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-help-plugin</artifactId>
-				<version>3.5.0</version>
+				<version>3.5.1</version>
 				<executions>
 					<execution>
 						<phase>initialize</phase>
@@ -294,7 +294,7 @@
 		<dependency>
 			<groupId>com.commafeed</groupId>
 			<artifactId>commafeed-client</artifactId>
-			<version>5.3.2</version>
+			<version>5.3.4</version>
 		</dependency>
 
 		<!-- compile-time processors -->

commafeed-server/src/main/java/com/commafeed/backend/HttpGetter.java

@@ -2,7 +2,10 @@ package com.commafeed.backend;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.IDN;
+import java.net.InetAddress;
 import java.net.URI;
+import java.net.UnknownHostException;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
@@ -10,6 +13,8 @@ import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.hc.client5.http.DnsResolver;
+import org.apache.hc.client5.http.SystemDefaultDnsResolver;
 import org.apache.hc.client5.http.config.ConnectionConfig;
 import org.apache.hc.client5.http.config.RequestConfig;
 import org.apache.hc.client5.http.config.TlsConfig;
@@ -191,6 +196,7 @@ public class HttpGetter {
 				.setDefaultTlsConfig(TlsConfig.custom().setHandshakeTimeout(Timeout.of(config.httpClient().sslHandshakeTimeout())).build())
 				.setMaxConnPerRoute(poolSize)
 				.setMaxConnTotal(poolSize)
+				.setDnsResolver(new InternationalizedDomainNameToAsciiDnsResolver(SystemDefaultDnsResolver.INSTANCE))
 				.build();
 
 	}
@@ -227,6 +233,18 @@ public class HttpGetter {
 				.build();
 	}
 
+	private record InternationalizedDomainNameToAsciiDnsResolver(DnsResolver delegate) implements DnsResolver {
+		@Override
+		public InetAddress[] resolve(String host) throws UnknownHostException {
+			return delegate.resolve(IDN.toASCII(host));
+		}
+
+		@Override
+		public String resolveCanonicalHostname(String host) throws UnknownHostException {
+			return delegate.resolveCanonicalHostname(IDN.toASCII(host));
+		}
+	}
+
 	@Getter
 	public static class NotModifiedException extends Exception {
 		private static final long serialVersionUID = 1L;

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.commafeed</groupId>
 	<artifactId>commafeed</artifactId>
-	<version>5.3.2</version>
+	<version>5.3.4</version>
 	<name>CommaFeed</name>
 	<packaging>pom</packaging>