fix(rss): update item URLs for English feed

datasektionen · Aug 7, 2024 · c2d6e72 · c2d6e72
1 parent dd9061e
commit c2d6e72
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/src/main/java/se/datasektionen/calypso/controllers/admin/ActivityController.java b/src/main/java/se/datasektionen/calypso/controllers/admin/ActivityController.java
@@ -1,7 +1,6 @@
 package se.datasektionen.calypso.controllers.admin;
 
 import java.time.format.DateTimeFormatter;
-import java.util.Optional;
 
 import javax.validation.Valid;
 

diff --git a/src/main/java/se/datasektionen/calypso/feeds/IcalFeed.java b/src/main/java/se/datasektionen/calypso/feeds/IcalFeed.java
@@ -18,7 +18,6 @@
 import static se.datasektionen.calypso.feeds.DateUtils.ldtToDate;
 
 import java.time.LocalDateTime;
-import java.util.Optional;
 import java.util.TimeZone;
 
 @Service

diff --git a/src/main/java/se/datasektionen/calypso/feeds/rss/RssConstants.java b/src/main/java/se/datasektionen/calypso/feeds/rss/RssConstants.java
@@ -1,18 +1,21 @@
 package se.datasektionen.calypso.feeds.rss;
 
+import java.util.function.Function;
+
 public class RssConstants {
 
 	public static class Swedish {
 		public static final String TITLE = "Datasektionen.se - RSS";
 		public static final String DESCRIPTION = "Nyheter och event från Datasektionen.se";
-		public static final String LINK_BASE_URL = "https://datasektionen.se/nyheter/";
+		public static final Function<Long, String> LINKER = id -> "https://datasektionen.se/nyheter/" + id;
 		public static final String FEED_URL = "/feed/rss";
 	}
 
 	public static class English {
 		public static final String TITLE = "Datasektionen.se - RSS (English)";
 		public static final String DESCRIPTION = "News and events from Datasektionen.se";
-		public static final String LINK_BASE_URL = "https://datasektionen.se/en/news/";
+		public static final Function<Long, String> LINKER = id -> "https://datasektionen.se/nyheter/"
+				+ id + "?lang=en";
 		public static final String FEED_URL = "/feed/rss_en";
 	}
 

diff --git a/src/main/java/se/datasektionen/calypso/feeds/rss/RssFeeds.java b/src/main/java/se/datasektionen/calypso/feeds/rss/RssFeeds.java
@@ -40,14 +40,14 @@ private List<com.rometools.rome.feed.rss.Item> fetchAndConvertSwedishItems() {
 		return fetchAndConvertItems(Item::getTitleSwedish,
 				Item::getAuthorDisplay,
 				Item::getContentSwedishProcessed,
-				i -> RssConstants.Swedish.LINK_BASE_URL + i.getId());
+				i -> RssConstants.Swedish.LINKER.apply(i.getId()));
 	}
 
 	private List<com.rometools.rome.feed.rss.Item> fetchAndConvertEnglishItems() {
 		return fetchAndConvertItems(Item::getTitleEnglish,
 				Item::getAuthorDisplay,
 				Item::getContentEnglishProcessed,
-				i -> RssConstants.English.LINK_BASE_URL + i.getId());
+				i -> RssConstants.English.LINKER.apply(i.getId()));
 	}
 
 	private List<com.rometools.rome.feed.rss.Item> fetchAndConvertItems(Function<Item, String> titleMapper,