✨ b3log#607

qdsearoc · Apr 6, 2018 · a65441d · a65441d
1 parent 588967e
commit a65441d
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 7 deletions.
diff --git a/src/main/java/org/b3log/symphony/model/UserExt.java b/src/main/java/org/b3log/symphony/model/UserExt.java
@@ -26,7 +26,7 @@
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
  * @author Bill Ho
- * @version 2.10.0.0, Apr 1, 2018
+ * @version 2.11.0.0, Apr 6, 2018
  * @see org.b3log.latke.model.User
  * @since 0.2.0
  */
@@ -57,6 +57,11 @@ public final class UserExt {
      */
     public static final String USER_SUB_MAIL_STATUS = "userSubMailStatus";
 
+    /**
+     * Key of user auto watch article after reply status.
+     */
+    public static final String USER_REPLY_WATCH_ARTICLE_STATUS = "userReplyWatchArticleStatus";
+
     /**
      * Key of user subscription mail send time.
      */

diff --git a/src/main/java/org/b3log/symphony/processor/AdminProcessor.java b/src/main/java/org/b3log/symphony/processor/AdminProcessor.java
@@ -110,7 +110,7 @@
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
  * @author Bill Ho
  * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
- * @version 2.26.9.3, Apr 1, 2018
+ * @version 2.26.9.4, Apr 6, 2018
  * @since 1.1.0
  */
 @RequestProcessor
@@ -1307,6 +1307,7 @@ public void updateUser(final HTTPRequestContext context, final HttpServletReques
                 case UserExt.USER_NOTIFY_STATUS:
                 case UserExt.USER_SUB_MAIL_STATUS:
                 case UserExt.USER_KEYBOARD_SHORTCUTS_STATUS:
+                case UserExt.USER_REPLY_WATCH_ARTICLE_STATUS
                 case UserExt.USER_GEO_STATUS:
                 case UserExt.USER_ARTICLE_STATUS:
                 case UserExt.USER_COMMENT_STATUS:

diff --git a/src/main/java/org/b3log/symphony/processor/CommentProcessor.java b/src/main/java/org/b3log/symphony/processor/CommentProcessor.java
@@ -71,7 +71,7 @@
  * </p>
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.7.3.1, Nov 11, 2017
+ * @version 1.7.3.2, Apr 6, 2018
  * @since 0.2.0
  */
 @RequestProcessor
@@ -485,7 +485,8 @@ public void addComment(final HTTPRequestContext context, final HttpServletReques
 
             commentMgmtService.addComment(comment);
 
-            if (!commentAuthorId.equals(articleAuthorId)) {
+            if (!commentAuthorId.equals(articleAuthorId) &&
+                    UserExt.USER_XXX_STATUS_C_ENABLED == currentUser.optInt(UserExt.USER_REPLY_WATCH_ARTICLE_STATUS)) {
                 followMgmtService.watchArticle(commentAuthorId, articleId);
             }
 

diff --git a/src/main/java/org/b3log/symphony/processor/SettingsProcessor.java b/src/main/java/org/b3log/symphony/processor/SettingsProcessor.java
@@ -74,7 +74,7 @@
  * </ul>
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.0.1.3, Apr 1, 2018
+ * @version 1.0.1.4, Apr 6, 2018
  * @since 2.4.0
  */
 @RequestProcessor
@@ -451,6 +451,7 @@ public void updateFunction(final HTTPRequestContext context, final HttpServletRe
         final boolean notifyStatus = requestJSONObject.optBoolean(UserExt.USER_NOTIFY_STATUS);
         final boolean subMailStatus = requestJSONObject.optBoolean(UserExt.USER_SUB_MAIL_STATUS);
         final boolean keyboardShortcutsStatus = requestJSONObject.optBoolean(UserExt.USER_KEYBOARD_SHORTCUTS_STATUS);
+        final boolean userReplyWatchArticleStatus = requestJSONObject.optBoolean(UserExt.USER_REPLY_WATCH_ARTICLE_STATUS);
 
         int userListPageSize;
         try {
@@ -479,6 +480,8 @@ public void updateFunction(final HTTPRequestContext context, final HttpServletRe
                 ? UserExt.USER_XXX_STATUS_C_ENABLED : UserExt.USER_XXX_STATUS_C_DISABLED);
         user.put(UserExt.USER_KEYBOARD_SHORTCUTS_STATUS, keyboardShortcutsStatus
                 ? UserExt.USER_XXX_STATUS_C_ENABLED : UserExt.USER_XXX_STATUS_C_DISABLED);
+        user.put(UserExt.USER_REPLY_WATCH_ARTICLE_STATUS, userReplyWatchArticleStatus
+                ? UserExt.USER_XXX_STATUS_C_ENABLED : UserExt.USER_XXX_STATUS_C_DISABLED);
 
         try {
             userMgmtService.updateUser(user.optString(Keys.OBJECT_ID), user);

diff --git a/src/main/java/org/b3log/symphony/service/UserMgmtService.java b/src/main/java/org/b3log/symphony/service/UserMgmtService.java
@@ -61,7 +61,7 @@
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
  * @author Bill Ho
- * @version 1.15.22.0, Apr 5, 2018
+ * @version 1.15.22.1, Apr 6, 2018
  * @since 0.2.0
  */
 @Service
@@ -505,6 +505,7 @@ public synchronized String addUser(final JSONObject requestJSONObject) throws Se
             user.put(UserExt.USER_AVATAR_VIEW_MODE, UserExt.USER_AVATAR_VIEW_MODE_C_ORIGINAL);
             user.put(UserExt.USER_SUB_MAIL_SEND_TIME, System.currentTimeMillis());
             user.put(UserExt.USER_KEYBOARD_SHORTCUTS_STATUS, UserExt.USER_XXX_STATUS_C_DISABLED);
+            user.put(UserExt.USER_REPLY_WATCH_ARTICLE_STATUS, UserExt.USER_XXX_STATUS_C_ENABLED);
 
             final JSONObject optionLanguage = optionRepository.get(Option.ID_C_MISC_LANGUAGE);
             final String adminSpecifiedLang = optionLanguage.optString(Option.OPTION_VALUE);

diff --git a/src/main/resources/repository.json b/src/main/resources/repository.json
@@ -1,6 +1,6 @@
 {
   "description": "Description of repository structures, for generation of the relational database table and persistence validation.",
-  "version": "4.37.8.27, Apr 1, 2018",
+  "version": "4.37.8.28, Apr 6, 2018",
   "authors": [
     "Liang Ding",
     "Zephyr",
@@ -1586,6 +1586,11 @@
           "type": "int",
           "description": "0：启用键盘快捷键，1：禁用键盘快捷键"
         },
+        {
+          "name": "userReplyWatchArticleStatus",
+          "type": "int",
+          "description": "0：回帖后自动关注帖子，1：回帖后不自动关注帖子"
+        },
         {
           "name": "userLanguage",
           "type": "String",