Release v1.5.0

js/css/main.css

@@ -974,3 +974,38 @@ popover-content a:hover {
   padding: 0 0 0 0;
   font-size: 0; /* needed for Chrome */
 }
+
+/* nsfw */
+.article-desc-nsfw {
+    font-size: 18px;
+    color: var(--pico-code-color);
+    display: none;
+}
+
+.nsfw-blur .nsfw .article-media img {
+    filter: blur(20px);
+}
+
+.nsfw-blur .nsfw .article-desc {
+    display: none;
+}
+
+.nsfw-blur .nsfw .article-desc-nsfw {
+    display: block;
+}
+
+.nsfw-hide .nsfw .article-media img {
+    display: none;
+}
+
+.nsfw-hide .nsfw .article-desc {
+    display: none;
+}
+
+.nsfw-hide .nsfw .article-desc-nsfw {
+    display: block;
+}
+
+.nsfw-show .nsfw .article-desc-nsfw {
+    display: none;
+}

js/package.json

@@ -15,7 +15,7 @@
     "htmx.org": "^1.9.12",
     "imgs-html": "^0.0.4",
     "lite-youtube-embed": "^0.3.3",
-    "somment": "^0.0.1",
+    "somment": "^0.0.2",
     "toastify-js": "^1.12.0",
     "viewerjs": "^1.11.6"
   },

js/src/error-handler.js

@@ -1,7 +1,8 @@
 
 function showErrorMessage(errMsg, details) {
+    const maxLength = 100;
     Toastify({
-        text: errMsg,
+        text: errMsg.substring(0, maxLength),
         className: 'error-toast',
         duration: 30000,
         newWindow: false,

js/src/set-theme.js

@@ -26,4 +26,11 @@ function initTheme() {
     setTheme(getCurrentTheme());
 }
 
+async function loadNSFWClass() {
+    const res = await fetch("/hx/settings/nsfw", {method: 'GET'});
+    const setting = await res.text();
+    return "nsfw-" + setting.toLowerCase();
+}
+window.loadNSFWClass = loadNSFWClass;
+
 initTheme();

src/main/protobuf/grpc-api.proto

@@ -275,6 +275,21 @@ message SourceUpdater {
     optional IconUrlOption iconUrl = 15;
 }
 
+// Define NSFWSetting
+
+enum NSFWSetting {
+    HIDE = 0;
+    BLUR = 1;
+    SHOW = 2;
+}
+
+// Define SearchEngine
+
+message SearchEngine {
+    optional string name = 1;
+    string urlPrefix = 2;
+}
+
 // Define User
 
 message User {
@@ -294,6 +309,8 @@ message User {
     optional string activeCode = 14;
     int64 subscribeEndAt = 15;
     bool subscribed = 16;
+    NSFWSetting nsfwSetting = 17;
+    SearchEngine searchEngine = 18;
 }
 
 // Define UserInfo
@@ -309,6 +326,8 @@ message UserInfo {
     optional string currentFolderID = 8;
     optional string currentSourceID = 9;
     bool subscribed = 10;
+    NSFWSetting nsfwSetting = 11;
+    SearchEngine searchEngine = 12;
 }
 
 // Define UserUpdater
@@ -347,6 +366,8 @@ message UserUpdater {
     optional int64 subscribeEndAt = 11;
     optional bool subscribed = 12;
     optional string username = 13;
+    optional NSFWSetting nsfwSetting = 14;
+    optional SearchEngine searchEngine = 15;
 }
 
 // Define UserSession
@@ -1250,6 +1271,12 @@ message SetCurrentSourceRequest {
     string currentSourceID = 2;
 }
 
+message UpdateUserSettingsRequest {
+    string token = 1;
+    optional NSFWSetting nsfwSetting = 2;
+    optional SearchEngine searchEngine = 3;
+}
+
 message RemoveCurrentFolderAndSourceRequest {
     string token = 1;
 }
@@ -1311,6 +1338,8 @@ message SetCurrentFolderResponse {}
 
 message SetCurrentSourceResponse {}
 
+message UpdateUserSettingsResponse {}
+
 message RemoveCurrentFolderAndSourceResponse {}
 
 message GetPaymentCustomersResponse {
@@ -1337,6 +1366,7 @@ service UserAPI {
     rpc GetRedditSessions (GetRedditSessionsRequest) returns (stream GetRedditSessionsResponse);
     rpc SetCurrentFolder (SetCurrentFolderRequest) returns (SetCurrentFolderResponse);
     rpc SetCurrentSource (SetCurrentSourceRequest) returns (SetCurrentSourceResponse);
+    rpc UpdateUserSettings (UpdateUserSettingsRequest) returns (UpdateUserSettingsResponse);
     rpc RemoveCurrentFolderAndSource (RemoveCurrentFolderAndSourceRequest) returns (RemoveCurrentFolderAndSourceResponse);
     rpc GetPaymentCustomers (GetPaymentCustomersRequest) returns (stream GetPaymentCustomersResponse);
     rpc SendDeleteUserCode (SendDeleteUserCodeRequest) returns (SendDeleteUserCodeResponse);

src/main/resources/application.conf

@@ -24,7 +24,7 @@ redis {
 }
 
 api {
-    version = "1.4.0"
+    version = "1.5.0"
 }
 
 grpc {

src/main/scala/me/binwang/rss/cmd/GRPCAndHttpServer.scala

@@ -49,7 +49,7 @@ object GRPCAndHttpServer extends IOApp {
       new PaymentView(services.userService, services.stripePaymentService).routes <+>
       new ImportFeedView(services.sourceService, services.folderService).routes <+>
       new RecommendationView(services.moreLikeThisService, services.articleService, services.sourceService,
-        services.folderService).routes
+        services.folderService, services.userService).routes
     )))
     HttpServer(httpRoute, config.getString("frontend.ip"), config.getInt("frontend.port"), logBody = false)
   }

src/main/scala/me/binwang/rss/cmd/HttpServer.scala

@@ -6,7 +6,7 @@ import org.http4s.HttpRoutes
 import org.http4s.ember.server.EmberServerBuilder
 import org.http4s.implicits._
 import org.http4s.server.Server
-import org.http4s.server.middleware.{ErrorAction, Logger}
+import org.http4s.server.middleware.{ErrorAction, GZip, Logger}
 import org.typelevel.log4cats.LoggerFactory
 import org.typelevel.log4cats.slf4j.Slf4jFactory
 
@@ -25,7 +25,7 @@ object HttpServer {
     )(routes)
 
     val httpService = ErrorAction.httpRoutes[IO](
-      loggingService,
+      GZip(loggingService),
       (req, thr) => http4sLogger.error(thr)(s"Error when handling request: ${req.uri}")
     ).orNotFound
 

src/main/scala/me/binwang/rss/dao/sql/BaseSqlDao.scala

@@ -14,6 +14,7 @@ import me.binwang.rss.model.EmbeddingUpdateStatus.EmbeddingUpdateStatus
 import me.binwang.rss.model.FetchStatus.FetchStatus
 import me.binwang.rss.model.ID.ID
 import me.binwang.rss.model.MoreLikeThisType.MoreLikeThisType
+import me.binwang.rss.model.NSFWSetting.NSFWSetting
 import me.binwang.rss.model._
 import org.postgresql.util.PGobject
 
@@ -88,15 +89,21 @@ trait BaseSqlDao {
   protected implicit val encodeArticleListLayout: MappedEncoding[ArticleListLayout, String] =
     MappedEncoding[ArticleListLayout, String](_.toString)
 
-  protected implicit val jsonbEncoder: Encoder[MediaGroups] = encoder(java.sql.Types.OTHER, (index, mediaGroups, row) => {
+  protected implicit val decodeNsfwSetting: MappedEncoding[String, NSFWSetting] =
+    MappedEncoding[String, NSFWSetting](NSFWSetting.withName)
+
+  protected implicit val encodeNsfwSetting: MappedEncoding[NSFWSetting, String] =
+    MappedEncoding[NSFWSetting, String](_.toString)
+
+  protected implicit val mediaGroupsEncoder: Encoder[MediaGroups] = encoder(java.sql.Types.OTHER, (index, mediaGroups, row) => {
     val value = io.circe.syntax.EncoderOps(mediaGroups).asJson.toString()
     val pgObj = new PGobject()
     pgObj.setType("jsonb")
     pgObj.setValue(value)
     row.setObject(index, pgObj)
   })
 
-  protected implicit val jsonbDecoder: Decoder[MediaGroups] = decoder { (index, row, _) =>
+  protected implicit val mediaGroupsDecoder: Decoder[MediaGroups] = decoder { (index, row, _) =>
     val defaultMediaGroups = MediaGroups(groups = Seq())
     val pgObj = row.getObject(index).asInstanceOf[PGobject]
     if (pgObj == null) {
@@ -106,6 +113,23 @@ trait BaseSqlDao {
     }
   }
 
+  protected implicit val searchEngineEncoder: Encoder[SearchEngine] = encoder(java.sql.Types.OTHER, (index, searchEngine, row) => {
+    val value = io.circe.syntax.EncoderOps(searchEngine).asJson.toString()
+    val pgObj = new PGobject()
+    pgObj.setType("jsonb")
+    pgObj.setValue(value)
+    row.setObject(index, pgObj)
+  })
+
+  protected implicit val searchEngineDecoder: Decoder[SearchEngine] = decoder { (index, row, _) =>
+    val pgObj = row.getObject(index).asInstanceOf[PGobject]
+    if (pgObj == null) {
+      SearchEngine.DEFAULT
+    } else {
+      parser.parse(pgObj.getValue).flatMap(_.as[SearchEngine]).getOrElse(SearchEngine.DEFAULT)
+    }
+  }
+
 
   def createTable(): IO[Unit]
 

src/main/scala/me/binwang/rss/dao/sql/ConnectionPool.scala

@@ -6,7 +6,8 @@ import com.zaxxer.hikari.HikariConfig
 import doobie.hikari.HikariTransactor
 
 object ConnectionPool {
-  def apply(): Resource[IO, ConnectionPool] = {
+
+  def apply(isolationLevel: String = IsolationLevel.SERIALIZABLE): Resource[IO, ConnectionPool] = {
 
     val config = ConfigFactory.load()
 
@@ -17,6 +18,7 @@ object ConnectionPool {
     hikariConfig.setPassword(config.getString("db.password"))
     hikariConfig.setMaximumPoolSize(config.getInt("db.maxPoolSize"))
     hikariConfig.setMinimumIdle(config.getInt("db.minIdle"))
+    hikariConfig.setTransactionIsolation(isolationLevel)
 
     HikariTransactor.fromHikariConfig[IO](hikariConfig).map(ConnectionPool(_))
   }

src/main/scala/me/binwang/rss/dao/sql/IsolationLevel.scala

@@ -0,0 +1,6 @@
+package me.binwang.rss.dao.sql
+
+object IsolationLevel {
+  val SERIALIZABLE = "TRANSACTION_SERIALIZABLE"
+  val READ_COMMITTED = "TRANSACTION_READ_COMMITTED"
+}

src/main/scala/me/binwang/rss/dao/sql/UserSqlDao.scala

@@ -32,7 +32,9 @@ class UserSqlDao(implicit val connectionPool: ConnectionPool) extends UserDao wi
             currentSourceID char(${ID.maxLength}) default null,
             activeCode char($UUID_LENGTH) unique default null,
             subscribeEndAt timestamp not null,
-            subscribed boolean not null default false
+            subscribed boolean not null default false,
+            nsfwSetting varchar not null default 'BLUR',
+            searchEngine jsonb not null
           )
          """)
       .update
@@ -89,7 +91,9 @@ class UserSqlDao(implicit val connectionPool: ConnectionPool) extends UserDao wi
         setOpt(_.activeCode, updater.activeCode),
         setOpt(_.subscribeEndAt, updater.subscribeEndAt),
         setOpt(_.subscribed, updater.subscribed),
-        setOpt(_.username, updater.username)
+        setOpt(_.username, updater.username),
+        setOpt(_.nsfwSetting, updater.nsfwSetting),
+        setOpt(_.searchEngine, updater.searchEngine),
       )
     run(q).transact(xa).map(_ > 0)
   }

src/main/scala/me/binwang/rss/grpc/generator/GenerateGRPC.scala

@@ -8,6 +8,7 @@ import me.binwang.rss.model.ArticleOrder.ArticleOrder
 import me.binwang.rss.model.FetchStatus.FetchStatus
 import me.binwang.rss.model.ID.ID
 import me.binwang.rss.model.MoreLikeThisType.MoreLikeThisType
+import me.binwang.rss.model.NSFWSetting.NSFWSetting
 import me.binwang.rss.model._
 import me.binwang.rss.service._
 import me.binwang.rss.sourcefinder.SourceResult
@@ -60,6 +61,8 @@ object GenerateGRPC extends GRPCGenerator {
     typeOf[FetchStatus],
     typeOf[Source],
     typeOf[SourceUpdater],
+    typeOf[NSFWSetting],
+    typeOf[SearchEngine],
     typeOf[User],
     typeOf[UserInfo],
     typeOf[UserUpdater],

src/main/scala/me/binwang/rss/model/User.scala

@@ -3,6 +3,29 @@ package me.binwang.rss.model
 import java.time.ZonedDateTime
 import java.util.UUID
 
+import me.binwang.rss.model.NSFWSetting.NSFWSetting
+
+object NSFWSetting extends Enumeration {
+  type NSFWSetting = Value
+  val
+  HIDE,
+  BLUR,
+  SHOW
+  = Value
+}
+
+case class SearchEngine(name: Option[String], urlPrefix: String)
+
+object SearchEngine {
+  val DUCKDUCKGO = SearchEngine(Some("DuckDuckGo"), "https://duckduckgo.com/?q=")
+  val GOOGLE = SearchEngine(Some("Google"), "https://www.google.com/search?q=")
+  val BING = SearchEngine(Some("Bing"), "https://www.bing.com/search?q=")
+  val KAGI = SearchEngine(Some("Kagi"), "https://kagi.com/search?q=")
+
+  val ALL = Seq(DUCKDUCKGO, GOOGLE, BING, KAGI)
+  val DEFAULT = DUCKDUCKGO
+}
+
 case class User (
   id: String,
   username: String,
@@ -20,6 +43,8 @@ case class User (
   activeCode: Option[String] = Some(UUID.randomUUID().toString),
   subscribeEndAt: ZonedDateTime,
   subscribed: Boolean = false,
+  nsfwSetting: NSFWSetting = NSFWSetting.BLUR,
+  searchEngine: SearchEngine = SearchEngine.DEFAULT,
 ) {
 
   def toInfo: UserInfo = {
@@ -34,6 +59,8 @@ case class User (
       isAdmin = isAdmin,
       subscribeEndAt = subscribeEndAt,
       subscribed = subscribed,
+      nsfwSetting = nsfwSetting,
+      searchEngine = searchEngine,
     )
   }
 
@@ -50,6 +77,8 @@ case class UserInfo (
   currentFolderID: Option[String] = None,
   currentSourceID: Option[String] = None,
   subscribed: Boolean = false,
+  nsfwSetting: NSFWSetting = NSFWSetting.BLUR,
+  searchEngine: SearchEngine = SearchEngine.DUCKDUCKGO,
 )
 
 case class UserUpdater (
@@ -66,4 +95,6 @@ case class UserUpdater (
   subscribeEndAt: Option[ZonedDateTime] = None,
   subscribed: Option[Boolean] = None,
   username: Option[String] = None,
+  nsfwSetting: Option[NSFWSetting] = None,
+  searchEngine: Option[SearchEngine] = None,
 )