release 6.1.1

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [6.1.1]
+
+- Fix old starred entries not loading if they were marked as read (#2031)
+
 ## [6.1.0]
 
 - When clicking on the password reset link, a random password is no longer generated automatically. The user is now redirected to a page where they can set their own password (#2023)

commafeed-client/package.json

@@ -70,7 +70,7 @@
         "vite": "^7.3.1",
         "vite-plugin-checker": "^0.12.0",
         "vite-tsconfig-paths": "^6.0.4",
-        "vitest": "^4.0.17",
+        "vitest": "^4.0.18",
         "yaml": "^2.8.2"
     },
     "overrides": {

commafeed-client/pom.xml

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

commafeed-client/src/app/entries/thunks.ts

@@ -40,7 +40,9 @@ export const loadMoreEntries = createAppAsyncThunk("entries/loadMore", async (_,
     const state = thunkApi.getState()
     const { source } = state.entries
     const offset =
-        state.user.settings?.readingMode === "all" ? state.entries.entries.length : state.entries.entries.filter(e => !e.read).length
+        state.user.settings?.readingMode === "all" || (source.type === "category" && source.id === "starred")
+            ? state.entries.entries.length
+            : state.entries.entries.filter(e => !e.read).length
     const endpoint = getEndpoint(state.entries.source.type)
     const result = await endpoint(buildGetEntriesPaginatedRequest(state, source, offset))
     return result.data

commafeed-server/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.commafeed</groupId>
 		<artifactId>commafeed</artifactId>
-		<version>6.1.0</version>
+		<version>6.1.1</version>
 	</parent>
 	<artifactId>commafeed-server</artifactId>
 	<name>CommaFeed Server</name>
@@ -219,61 +219,6 @@
 					</dependency>
 				</dependencies>
 			</plugin>
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.8.14</version>
-				<configuration>
-					<!-- excluding SACParserCSS21TokenManager because it causes a "Method too large" exception -->
-					<excludes>
-						<exclude>com/steadystate/css/parser/SACParserCSS21TokenManager</exclude>
-					</excludes>
-				</configuration>
-				<executions>
-					<execution>
-						<id>unit-tests-agent</id>
-						<goals>
-							<goal>prepare-agent</goal>
-						</goals>
-						<configuration>
-							<destFile>${project.build.directory}/jacoco-output/jacoco-unit-tests.exec</destFile>
-						</configuration>
-					</execution>
-					<execution>
-						<id>integration-tests-agent</id>
-						<goals>
-							<goal>prepare-agent-integration</goal>
-						</goals>
-						<configuration>
-							<destFile>${project.build.directory}/jacoco-output/jacoco-integration-tests.exec</destFile>
-						</configuration>
-					</execution>
-					<execution>
-						<id>merge</id>
-						<phase>post-integration-test</phase>
-						<goals>
-							<goal>merge</goal>
-						</goals>
-						<configuration>
-							<fileSets>
-								<fileSet>
-									<directory>${project.build.directory}/jacoco-output</directory>
-									<includes>
-										<include>*.exec</include>
-									</includes>
-								</fileSet>
-							</fileSets>
-						</configuration>
-					</execution>
-					<execution>
-						<id>generate-code-coverage-report</id>
-						<phase>post-integration-test</phase>
-						<goals>
-							<goal>report</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<groupId>io.github.git-commit-id</groupId>
 				<artifactId>git-commit-id-maven-plugin</artifactId>
@@ -359,7 +304,7 @@
 		<dependency>
 			<groupId>com.commafeed</groupId>
 			<artifactId>commafeed-client</artifactId>
-			<version>6.1.0</version>
+			<version>6.1.1</version>
 		</dependency>
 
 		<!-- compile-time processors -->
@@ -427,7 +372,7 @@
 		<dependency>
 			<groupId>io.dropwizard.metrics</groupId>
 			<artifactId>metrics-json</artifactId>
-			<version>4.2.37</version>
+			<version>4.2.38</version>
 		</dependency>
 		<dependency>
 			<groupId>io.github.openfeign.querydsl</groupId>
@@ -533,11 +478,6 @@
 			<artifactId>quarkus-junit5-mockito</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>io.quarkus</groupId>
-			<artifactId>quarkus-jacoco</artifactId>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>io.quarkiverse.playwright</groupId>
 			<artifactId>quarkus-playwright</artifactId>

commafeed-server/src/test/resources/application.properties

@@ -1,2 +0,0 @@
-# we generate the jacoco report ourselves by aggregating the unit tests and integration tests jacoco.exec files
-quarkus.jacoco.report=false

pom.xml

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