Release v1.10.0

wb14123 · wb14123 · commit e92482c7850a · 2025-06-08T17:35:54.000-04:00
diff --git a/build.sbt b/build.sbt
@@ -135,7 +135,7 @@ libraryDependencies ++= Seq(
   "ch.qos.logback" % "logback-classic" % "1.2.10",
 
   // grpc
-  "me.binwang.scala2grpc" %% "generator" % "1.2.0",
+  "me.binwang.scala2grpc" %% "generator" % "1.3.0-SNAPSHOT",
 
   // http server
   "org.http4s" %% "http4s-ember-client" % http4sVersion,
diff --git a/js/css/main.css b/js/css/main.css
@@ -34,6 +34,7 @@ body {
   min-height: 100vh;
   background: var(--pico-background-color);
   color: var(--pico-color);
+  overflow-x: hidden;  /* disable scroll to out of view content when sidebar is open */
 }
 
 a {
diff --git a/js/package-lock.json b/js/package-lock.json
diff --git a/js/package.json b/js/package.json
@@ -16,7 +16,7 @@
     "htmx.org": "^1.9.12",
     "imgs-html": "^0.0.4",
     "lite-youtube-embed": "^0.3.3",
-    "somment": "^0.0.3",
+    "somment": "^0.0.6",
     "toastify-js": "^1.12.0",
     "viewerjs": "^1.11.6"
   },
diff --git a/project/plugin.sbt b/project/plugin.sbt
@@ -3,7 +3,7 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.0")
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
 
 addSbtPlugin("org.typelevel" % "sbt-fs2-grpc" % "2.7.21")
-addSbtPlugin("me.binwang.scala2grpc" % "plugin" % "1.2.0")
+addSbtPlugin("me.binwang.scala2grpc" % "plugin" % "1.3.0-SNAPSHOT")
 
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.2.0")
 
diff --git a/src/main/protobuf/grpc-api.proto b/src/main/protobuf/grpc-api.proto
@@ -1,6 +1,7 @@
 
 syntax = "proto3";
 
+option go_package = "binwang.me/rss/grpc";
 option java_multiple_files = true;
 option java_package = "me.binwang.rss.grpc";
 
diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf
@@ -24,7 +24,7 @@ redis {
 }
 
 api {
-    version = "1.9.0"
+    version = "1.10.0"
 }
 
 grpc {
diff --git a/src/main/scala/me/binwang/rss/grpc/generator/GenerateGRPC.scala b/src/main/scala/me/binwang/rss/grpc/generator/GenerateGRPC.scala
@@ -24,6 +24,7 @@ import scala.reflect.runtime.universe.{Type, typeOf}
 object GenerateGRPC extends GRPCGenerator {
   override val protoJavaPackage: String = "me.binwang.rss.grpc"
   override val protoPackage: String = "rss"
+  override val header: Option[String] = Some("""option go_package = "binwang.me/rss/grpc";""")
 
   override val customTypeMap: Map[String, Type] = Map(
     typeOf[ZonedDateTime].toString -> typeOf[Long],
diff --git a/src/main/scala/me/binwang/rss/parser/RSSParser.scala b/src/main/scala/me/binwang/rss/parser/RSSParser.scala
@@ -24,7 +24,13 @@ object RSSParser {
     }
 
     val htmlUrl = (channel \ "link").text
-    val iconUrl = ArticleParserHelper.getIcon(htmlUrl)
+    val iconUrl = (channel \\ "icon")
+      .find(_.prefix == "webfeeds")
+      .map(_.text)
+      .find(x => x != null && x.nonEmpty)
+      .orElse(Some((channel \ "image" \ "url").text))
+      .find(x => x != null && x.nonEmpty)
+      .orElse(ArticleParserHelper.getIcon(htmlUrl))
 
     val source = Source(
       id = id,
diff --git a/src/test/resources/test-feed-mastodon-jepsen.xml b/src/test/resources/test-feed-mastodon-jepsen.xml
diff --git a/src/test/scala/me/binwang/rss/parser/SourceParserSpec.scala b/src/test/scala/me/binwang/rss/parser/SourceParserSpec.scala
@@ -44,6 +44,18 @@ class SourceParserSpec extends AnyFunSpec with BeforeAndAfterEach with Matchers
       ArticleParserHelper.getIcon("") shouldBe None
     }
 
+    it(s"should parse rss icon if there is webfeeds:icon") {
+      val testFeedFile = "/test-feed-mastodon-jepsen.xml"
+      val (source, _) = SourceParser.parse(testFeedUrl, inputStream(testFeedFile)).unsafeRunSync()
+      source.iconUrl shouldBe Some("https://cdn.masto.host/mastodonjepsenio/accounts/avatars/000/000/001/original/729178b67437abd9.png")
+    }
+
+    it(s"should parse rss icon if there is image url") {
+      val testFeedFile = "/test-feed.xml"
+      val (source, _) = SourceParser.parse(testFeedUrl, inputStream(testFeedFile)).unsafeRunSync()
+      source.iconUrl shouldBe Some("https://www.cbc.ca/rss/image/cbc_144.gif")
+    }
+
     it(s"should parse rss feed") {
       val testFeedFile = "/test-feed.xml"
       val now = ZonedDateTime.now().withNano(0)

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ body {`
`34`	`34`	`min-height: 100vh;`
`35`	`35`	`background: var(--pico-background-color);`
`36`	`36`	`color: var(--pico-color);`
	`37`	`+ overflow-x: hidden; /* disable scroll to out of view content when sidebar is open */`
`37`	`38`	`}`
`38`	`39`
`39`	`40`	`a {`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ redis {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`api {`
`27`		`- version = "1.9.0"`
	`27`	`+ version = "1.10.0"`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`grpc {`