TopicPermissionService -> Scala

maxcom · Oct 29, 2024 · 7fca0f0 · 7fca0f0
1 parent e0d8704
commit 7fca0f0
Show file tree

Hide file tree

Showing 11 changed files with 448 additions and 521 deletions.
diff --git a/src/main/java/ru/org/linux/group/GroupListDao.java b/src/main/java/ru/org/linux/group/GroupListDao.java
@@ -82,7 +82,7 @@ public GroupListDao(UserService userService, TopicTagService topicTagService, Da
         "t.deleted, " +
         "t.postscore as topic_postscore " +
       "FROM topics AS t JOIN comments ON (t.id=comments.topic) " +
-      "WHERE t.postscore IS DISTINCT FROM " + TopicPermissionService.POSTSCORE_HIDE_COMMENTS + " " +
+      "WHERE t.postscore IS DISTINCT FROM " + TopicPermissionService.POSTSCORE_HIDE_COMMENTS() + " " +
         "AND comments.id=(SELECT id FROM comments WHERE NOT deleted AND comments.topic=t.id " +
           "%s" + /* user!=null ? queryCommentIgnored */
           "%s" + // queryAuthorFilter
@@ -291,7 +291,7 @@ private List<TopicsListItem> load(String partFilter, Optional<User> currentUserO
       tags = topicTagService.getTagsForTitle(msgid);
 
       int topicPostscore = (resultSet.getObject("topic_postscore") == null)
-              ? TopicPermissionService.POSTSCORE_UNRESTRICTED
+              ? TopicPermissionService.POSTSCORE_UNRESTRICTED()
               : resultSet.getInt("topic_postscore");
 
       res.add(new TopicsListItem(author, msgid, lastmod, stat1,

diff --git a/src/main/java/ru/org/linux/group/TopicsListItem.java b/src/main/java/ru/org/linux/group/TopicsListItem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2022 Linux.org.ru
+ * Copyright 1998-2024 Linux.org.ru
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
  *    You may obtain a copy of the License at
@@ -108,7 +108,7 @@ public Timestamp getLastmod() {
   }
 
   public int getCommentCount() {
-    if (topicPostscore != TopicPermissionService.POSTSCORE_HIDE_COMMENTS) {
+    if (topicPostscore != TopicPermissionService.POSTSCORE_HIDE_COMMENTS()) {
       return stat1;
     } else {
       return 0;
@@ -176,6 +176,6 @@ public boolean isSticky() {
   }
 
   public boolean isCommentsClosed() {
-    return topicPostscore >= TopicPermissionService.POSTSCORE_MODERATORS_ONLY;
+    return topicPostscore >= TopicPermissionService.POSTSCORE_MODERATORS_ONLY();
   }
 }
diff --git a/src/main/java/ru/org/linux/section/Section.java b/src/main/java/ru/org/linux/section/Section.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2022 Linux.org.ru
+ * Copyright 1998-2024 Linux.org.ru
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
  *    You may obtain a copy of the License at
@@ -62,7 +62,7 @@ public Section(ResultSet rs) throws SQLException {
     if (!rs.wasNull()) {
       topicsRestriction = restrictTopicsValue;
     } else {
-      topicsRestriction = TopicPermissionService.POSTSCORE_UNRESTRICTED;
+      topicsRestriction = TopicPermissionService.POSTSCORE_UNRESTRICTED();
     }
 
     scrollMode = SectionScrollModeEnum.valueOf(rs.getString("scroll_mode"));
@@ -110,7 +110,7 @@ public String getTitle() {
   public static int getCommentPostscore(int id) {
     //TODO move this to database
     if (id == SECTION_NEWS || id == SECTION_FORUM) {
-      return TopicPermissionService.POSTSCORE_UNRESTRICTED;
+      return TopicPermissionService.POSTSCORE_UNRESTRICTED();
     } else if (id == SECTION_ARTICLES || id == SECTION_GALLERY) {
       return 45;
     } else {