🎨 MBTI

csfwff · Dec 24, 2023 · 82cf40b · 82cf40b
1 parent 01d6363
commit 82cf40b
Show file tree

Hide file tree

Showing 12 changed files with 88 additions and 27 deletions.
diff --git a/src/main/java/org/b3log/symphony/processor/LoginProcessor.java b/src/main/java/org/b3log/symphony/processor/LoginProcessor.java
@@ -637,6 +637,7 @@ public void register2(final RequestContext context) {
  user.put(UserExt.USER_APP_ROLE, appRole);
  user.put(User.USER_PASSWORD, password);
  user.put(UserExt.USER_STATUS, UserExt.USER_STATUS_C_VALID);
+ user.put("mbti", requestJSONObject.optString("mbti"));
 
  userMgmtService.addUser(user);
 

diff --git a/src/main/java/org/b3log/symphony/processor/SettingsProcessor.java b/src/main/java/org/b3log/symphony/processor/SettingsProcessor.java
@@ -988,10 +988,31 @@ public void updateProfiles(final RequestContext context) {
  userIntro = Escapes.escapeHTML(userIntro);
  String userNickname = StringUtils.trim(requestJSONObject.optString(UserExt.USER_NICKNAME));
  userNickname = Escapes.escapeHTML(userNickname);
+ String mbti = checkMBTI(requestJSONObject.optString("mbti"));
+
+ final JSONObject user = Sessions.getUser();
+ user.put("mbti", mbti);
+ user.put(UserExt.USER_TAGS, userTags);
+ user.put(User.USER_URL, userURL);
+ user.put(UserExt.USER_QQ, userQQ);
+ user.put(UserExt.USER_INTRO, userIntro);
+ user.put(UserExt.USER_NICKNAME, userNickname);
+ user.put(UserExt.USER_AVATAR_TYPE, UserExt.USER_AVATAR_TYPE_C_UPLOAD);
+
+ try {
+ userMgmtService.updateProfiles(user);
+
+ context.renderJSON(StatusCodes.SUCC);
+ } catch (final ServiceException e) {
+ context.renderMsg(e.getMessage());
+ }
+ }
+
+ public static String checkMBTI(String mbti) {
  List<String> mbtiLeftArray = Arrays.asList("INTJ", "INTP", "ENTJ", "ENTP", "INFJ", "INFP", "ENFJ", "ENFP", "ISTJ", "ISFJ", "ESTJ", "ESFJ", "ISTP", "ISFP", "ESTP", "ESFP");
  List<String> mbtiRightArray = Arrays.asList("A", "T");
+ mbti = mbti.toUpperCase();
  String new_mbti = "";
- String mbti = requestJSONObject.optString("mbti");
  try {
  if (!mbti.isEmpty()) {
  if (mbti.contains("-")) {
@@ -1009,23 +1030,7 @@ public void updateProfiles(final RequestContext context) {
  }
  } catch (Exception ignored) {
  }
-
- final JSONObject user = Sessions.getUser();
- user.put("mbti", new_mbti);
- user.put(UserExt.USER_TAGS, userTags);
- user.put(User.USER_URL, userURL);
- user.put(UserExt.USER_QQ, userQQ);
- user.put(UserExt.USER_INTRO, userIntro);
- user.put(UserExt.USER_NICKNAME, userNickname);
- user.put(UserExt.USER_AVATAR_TYPE, UserExt.USER_AVATAR_TYPE_C_UPLOAD);
-
- try {
- userMgmtService.updateProfiles(user);
-
- context.renderJSON(StatusCodes.SUCC);
- } catch (final ServiceException e) {
- context.renderMsg(e.getMessage());
- }
+ return new_mbti;
  }
 
  /**

diff --git a/src/main/java/org/b3log/symphony/service/UserMgmtService.java b/src/main/java/org/b3log/symphony/service/UserMgmtService.java
@@ -43,6 +43,7 @@
 import org.b3log.latke.util.URLs;
 import org.b3log.symphony.model.*;
 import org.b3log.symphony.processor.FileUploadProcessor;
+import org.b3log.symphony.processor.SettingsProcessor;
 import org.b3log.symphony.processor.middleware.validate.UserRegisterValidationMidware;
 import org.b3log.symphony.repository.*;
 import org.b3log.symphony.util.Geos;
@@ -285,6 +286,7 @@ public void updateProfiles(final JSONObject requestJSONObject) throws ServiceExc
  oldUser.put(UserExt.USER_AVATAR_TYPE, requestJSONObject.optString(UserExt.USER_AVATAR_TYPE));
  oldUser.put(UserExt.USER_AVATAR_URL, requestJSONObject.optString(UserExt.USER_AVATAR_URL));
  oldUser.put(UserExt.USER_COMMENT_VIEW_MODE, requestJSONObject.optInt(UserExt.USER_COMMENT_VIEW_MODE));
+ oldUser.put("mbti", requestJSONObject.optString("mbti"));
 
  oldUser.put(UserExt.USER_UPDATE_TIME, System.currentTimeMillis());
 
@@ -359,6 +361,7 @@ public synchronized String addUser(final JSONObject requestJSONObject) throws Se
  final String userEmail = requestJSONObject.optString(User.USER_EMAIL).trim().toLowerCase();
  final String userPhone = requestJSONObject.optString("userPhone");
  final String userName = requestJSONObject.optString(User.USER_NAME);
+ final String mbti = SettingsProcessor.checkMBTI(requestJSONObject.optString("mbti"));
  JSONObject user = userRepository.getByName(userName);
  if (null != user && (UserExt.USER_STATUS_C_VALID == user.optInt(UserExt.USER_STATUS)
  || UserExt.USER_STATUS_C_INVALID == user.optInt(UserExt.USER_STATUS)
@@ -460,6 +463,7 @@ public synchronized String addUser(final JSONObject requestJSONObject) throws Se
  user.put(UserExt.USER_INDEX_REDIRECT_URL, "");
  user.put(UserExt.ONLINE_MINUTE, 0);
  user.put("secret2fa", "");
+ user.put("mbti", mbti);
 
  final JSONObject optionLanguage = optionRepository.get(Option.ID_C_MISC_LANGUAGE);
  final String adminSpecifiedLang = optionLanguage.optString(Option.OPTION_VALUE);

diff --git a/src/main/resources/js/common.js b/src/main/resources/js/common.js
@@ -1515,7 +1515,6 @@ var Util = {
  }
  });
  }
- console.log(data)
  let followerCount = data.followerCount;
  let followingUserCount = data.followingUserCount;
  let oId = data.oId;
@@ -1534,6 +1533,7 @@ var Util = {
  let userNo = data.userNo;
  let userAppRole = data.userAppRole;
  let sysMetal = JSON.parse(data.sysMetal);
+ let mbti = data.mbti;
  // 组合内容
  let html = "" +
  '<div class="user-card" id="userCardContent">\n' +
@@ -1616,7 +1616,20 @@ var Util = {
  '<a target="_blank" href="' + Label.servePath + '/forward?goto=' + userURL + '" class="tooltipped-new tooltipped__n" rel="nofollow"\n' +
  ' aria-label="' + userURL + '">\n' +
  ' <svg>\n' +
- ' <use xlink:href="#ic-url"></use>\n' +
+ ' <use xlink:href="#card-link"></use>\n' +
+ ' </svg>\n' +
+ '</a>\n';
+ }
+ if (mbti !== "") {
+ let leftMbti = mbti;
+ if (mbti.indexOf('-') > 0) {
+ leftMbti = mbti.split('-')[0];
+ }
+ html += '' +
+ '<a target="_blank" href="https://www.16personalities.com/ch/' + leftMbti + '-%E4%BA%BA%E6%A0%BC" class="tooltipped-new tooltipped__n" rel="nofollow"\n' +
+ ' aria-label="TA是 ' + mbti + '">\n' +
+ ' <svg>\n' +
+ ' <use xlink:href="#mbti"></use>\n' +
  ' </svg>\n' +
  '</a>\n';
  }

diff --git a/src/main/resources/js/settings.js b/src/main/resources/js/settings.js
@@ -429,7 +429,7 @@ var Settings = {
  getPhoneCaptcha: function (csrfToken) {
  $('#phoneGetBtn').attr('disabled', 'disabled').css('opacity', '0.3')
  $.ajax({
- url: Label.servePath + '/settings/phone/vc',
+ url: Label.servePath + 'phone/vc',
  type: 'POST',
  headers: {'csrfToken': csrfToken},
  data: JSON.stringify({
@@ -1088,13 +1088,20 @@ var Settings = {
  'min': 0,
  'max': 255,
  'msg': Label.invalidUserIntroLabel,
+ }, {
+ 'target': $('#userMbti'),
+ 'type': 'string',
+ 'min': 0,
+ 'max': 255,
+ 'msg': '错误的MBTI长度',
  }],
  })) {
  return {
  userNickname: $('#userNickname').val().replace(/(^\s*)|(\s*$)/g, ''),
  userTags: $('#userTags').val().replace(/(^\s*)|(\s*$)/g, ''),
  userURL: $('#userURL').val().replace(/(^\s*)|(\s*$)/g, ''),
  userIntro: $('#userIntro').val().replace(/(^\s*)|(\s*$)/g, ''),
+ mbti: $('#userMbti').val().replace(/(^\s*)|(\s*$)/g, ''),
  }
  } else {
  return false

diff --git a/src/main/resources/js/settings.min.js b/src/main/resources/js/settings.min.js
diff --git a/src/main/resources/js/symbol-defs.js b/src/main/resources/js/symbol-defs.js
diff --git a/src/main/resources/js/verify.js b/src/main/resources/js/verify.js
@@ -150,7 +150,8 @@ var Verify = {
  userAppRole: $("input[name=userAppRole]:checked").val(),
  userPassword: calcMD5($("#registerUserPassword2").val()),
  referral: $("#referral2").val(),
- userId: $("#userId2").val()
+ userId: $("#userId2").val(),
+ mbti: $("#mbtiReg").val()
  };
 
  let args = "";

diff --git a/src/main/resources/skins/classic/home/settings/profile.ftl b/src/main/resources/skins/classic/home/settings/profile.ftl
@@ -37,11 +37,17 @@
 
  <label>${userIntroLabel}</label><br/>
  <textarea id="userIntro" placeholder="${selfIntroLabel}">${currentUser.userIntro}</textarea>
- <br>
- <br>
+
+ <label>MBTI</label><br/>
+ <textarea id="userMbti" placeholder="请输入你的MBTI">${currentUser.mbti}</textarea>
+ <label>填写格式错误会导致保存后无显示，请使用英文横杠（只写主要MBTI请忽略），不区分大小写<br>正确示例：<b>ENTP ENFP-A ENTP-T ISTJ ISFJ-A ISTJ-T</b><br>
+ 如果不知道你的MBTI或者不知道MBTI是什么，请<a href="https://www.16personalities.com/ch" target="_blank">点击这里</a></label>
+ <br><br>
+ <br><br>
+ <br><br>
  <div class="tip" id="profilesTip"></div>
  <br>
  <button class="fn-right" onclick="Settings.update('profiles', '${csrfToken}')">${saveLabel}</button>
  </div>
 </div>
-</@home>
+</@home>
diff --git a/src/main/resources/skins/classic/verify/register2.ftl b/src/main/resources/skins/classic/verify/register2.ftl
@@ -51,6 +51,12 @@
  <svg><use xlink:href="#locked"></use></svg>
  <input type="password" id="registerConfirmPassword2" placeholder="${userPasswordLabel2}" />
  </div>
+ <div class="input-wrap">
+ <svg><use xlink:href="#mbti"></use></svg>
+ <input type="text" id="mbtiReg" placeholder="(选填) MBTI" />
+ <label>MBTI填写示例：<b>ENTP ENFP-A ENTP-T ISTJ ISFJ-A ISTJ-T</b><br>
+ <a href="https://www.16personalities.com/ch" target="_blank">什么是MBTI？</a></label>
+ </div>
  <div class="fn-clear">
  <label>${roleLabel}</label>
  <label>&nbsp;&nbsp;&nbsp;&nbsp;<input name="userAppRole" type="radio" value="0" checked="checked" />&nbsp;&nbsp;${programmerLabel}</label>