Added support for mentions without username

2016-07-01 20:05:24 +03:00 · 2016-07-01 20:05:24 +03:00 · 114024b7f7
commit 114024b7f7
parent a5ab8f0937
5 changed files with 85 additions and 27 deletions
--- a/app/js/controllers.js
+++ b/app/js/controllers.js
@ -2291,11 +2291,8 @@ angular.module('myApp.controllers', ['myApp.i18n'])
            return
          }
          done[userID] = true
-          var user = AppUsersManager.getUser(userID)
-          if (user.username) {
-            mentionUsers.push(user)
-            SearchIndexManager.indexObject(user.id, AppUsersManager.getUserSearchText(user.id), mentionIndex)
-          }
+          mentionUsers.push(AppUsersManager.getUser(userID))
+          SearchIndexManager.indexObject(userID, AppUsersManager.getUserSearchText(userID), mentionIndex)
        })

        safeReplaceObject($scope.mentions, {
--- a/app/js/lib/ng_utils.js
+++ b/app/js/lib/ng_utils.js
@ -1227,7 +1227,7 @@ angular.module('izhukov.utils', [])
    var soundcloudRegExp = /^https?:\/\/(?:soundcloud\.com|snd\.sc)\/([a-zA-Z0-9%\-\_]+)\/([a-zA-Z0-9%\-\_]+)/i
    var spotifyRegExp = /(https?:\/\/(open\.spotify\.com|play\.spotify\.com|spoti\.fi)\/(.+)|spotify:(.+))/i

-    var markdownRegExp = /(^|\s)(````?)([\s\S]+?)(````?)([\s\n\.,:?!;]|$)|(^|\s)`([^\n]+?)`([\s\.,:?!;]|$)/
+    var markdownRegExp = /(^|\s)(````?)([\s\S]+?)(````?)([\s\n\.,:?!;]|$)|(^|\s)`([^\n]+?)`([\s\.,:?!;]|$)|@(\d+)\s*\((.+?)\)/

    var siteHashtags = {
      Telegram: 'tg://search_hashtag?hashtag={1}',
@ -1403,7 +1403,7 @@ angular.module('izhukov.utils', [])
        matchIndex = rawOffset + match.index
        newText.push(raw.substr(0, match.index))

-        var text = (match[3] || match[7])
+        var text = (match[3] || match[7] || match[10])
        rawOffset -= text.length
        text = text.replace(/^\s+|\s+$/g, '')
        rawOffset += text.length
@ -1424,7 +1424,7 @@ angular.module('izhukov.utils', [])
            length: text.length
          })
          rawOffset -= match[2].length + match[4].length
-        } else { // code
+        } else if (match[7]) { // code
          newText.push(match[6] + text + match[8])
          entities.push({
            _: 'messageEntityCode',
@ -1432,6 +1432,15 @@ angular.module('izhukov.utils', [])
            length: text.length
          })
          rawOffset -= 2
+        } else if (match[10]) { // custom mention
+          newText.push(text)
+          entities.push({
+            _: 'messageEntityMentionName',
+            user_id: match[9],
+            offset: matchIndex,
+            length: text.length
+          })
+          rawOffset -= match[0] - text.length
        }
        raw = raw.substr(match.index + match[0].length)
        rawOffset += match.index + match[0].length
@ -1584,6 +1593,21 @@ angular.module('izhukov.utils', [])
            )
            break

+          case 'messageEntityMentionName':
+            if (!options.noLinks) {
+              skipEntity = true
+              break
+            }
+            var username = entityText.substr(1)
+            html.push(
+              '<a href="#/im?p=u',
+              encodeURIComponent(entity.user_id),
+              '">',
+              encodeEntities(entityText),
+              '</a>'
+            )
+            break
+
          case 'messageEntityHashtag':
            var contextUrl = !options.noLinks && siteHashtags[contextSite]
            if (!contextUrl) {
@ -1780,6 +1804,12 @@ angular.module('izhukov.utils', [])
            )
            break

+          case 'messageEntityMentionName':
+            code.push(
+              '@', entity.user_id, ' (', entityText, ')'
+            )
+            break
+
          default:
            skipEntity = true
        }
--- a/app/js/message_composer.js
+++ b/app/js/message_composer.js
@ -777,7 +777,7 @@ MessageComposer.prototype.setUpAutoComplete = function () {
      EmojiHelper.pushPopularEmoji(code)
    }
    if (mention = target.attr('data-mention')) {
-      self.onMentionSelected(mention)
+      self.onMentionSelected(mention, target.attr('data-name'))
    }
    if (command = target.attr('data-command')) {
      if (self.onCommandSelected) {
@ -903,7 +903,7 @@ MessageComposer.prototype.onKeyEvent = function (e) {
          return cancelEvent(e)
        }
        if (mention = currentSel.attr('data-mention')) {
-          this.onMentionSelected(mention)
+          this.onMentionSelected(mention, currentSel.attr('data-name'))
          return cancelEvent(e)
        }
        if (command = currentSel.attr('data-command')) {
@ -1272,7 +1272,14 @@ MessageComposer.prototype.onMentionsUpdated = function (username) {
  }
 }

-MessageComposer.prototype.onMentionSelected = function (username) {
+MessageComposer.prototype.onMentionSelected = function (username, firstName) {
+  var hasUsername = true;
+  if (username.charAt(0) == '#') {
+    hasUsername = false;
+    username = username.substr(1);
+    firstName = firstName.replace(/\(\)@/, '')
+  }
+
  if (this.richTextareaEl) {
    var textarea = this.richTextareaEl[0]
    if (!this.isActive) {
@ -1293,20 +1300,26 @@ MessageComposer.prototype.onMentionSelected = function (username) {
    } else {
      newValuePrefix = prefix + '@' + username
    }
-    textarea.value = newValue

    var html
-    if (suffix.length) {
-      this.selId = (this.selId || 0) + 1
-      html = this.getRichHtml(newValuePrefix) + '&nbsp;<span id="composer_sel' + this.selId + '"></span>' + this.getRichHtml(suffix)
-      this.richTextareaEl.html(html)
-      setRichFocus(textarea, $('#composer_sel' + this.selId)[0])
+    if (hasUsername) {
+      if (suffix.length) {
+        this.selId = (this.selId || 0) + 1
+        html = this.getRichHtml(newValuePrefix) + '&nbsp;<span id="composer_sel' + this.selId + '"></span>' + this.getRichHtml(suffix)
+        this.richTextareaEl.html(html)
+        setRichFocus(textarea, $('#composer_sel' + this.selId)[0])
+      } else {
+        html = this.getRichHtml(newValuePrefix) + '&nbsp;'
+        this.richTextareaEl.html(html)
+        setRichFocus(textarea)
+      }
    } else {
-      html = this.getRichHtml(newValuePrefix) + '&nbsp;'
+      this.selId = (this.selId || 0) + 1
+      html = this.getRichHtml(newValuePrefix) + '&nbsp;(<span id="composer_sel' + this.selId + '">' + encodeEntities(firstName) + '</span>)&nbsp;' + this.getRichHtml(suffix)
      this.richTextareaEl.html(html)
-      setRichFocus(textarea)
+      setRichFocus(textarea, $('#composer_sel' + this.selId)[0], true)
    }
-  }else {
+  } else {
    var textarea = this.textareaEl[0]
    var fullValue = textarea.value
    var pos = this.isActive ? getFieldSelection(textarea) : fullValue.length
@ -1314,15 +1327,26 @@ MessageComposer.prototype.onMentionSelected = function (username) {
    var prefix = fullValue.substr(0, pos)
    var matches = prefix.match(/@([A-Za-z0-9\-\+\*_]*)$/)

+    var newValuePrefix
+    var newValue
+    var newPos
+    var newPosTo
    if (matches && matches[0]) {
-      var newValue = prefix.substr(0, matches.index) + '@' + username + ' ' + suffix
-      var newPos = matches.index + username.length + 2
+      newValuePrefix = prefix.substr(0, matches.index) + '@' + username
    } else {
-      var newValue = prefix + ':' + username + ': ' + suffix
-      var newPos = prefix.length + username.length + 2
+      newValuePrefix = prefix + '@' + username
+    }
+
+    if (hasUsername) {
+      newValue = newValuePrefix + '@' + username + ' ' + suffix
+      newPos = matches.index + username.length + 2
+    } else {
+      newValue = newValuePrefix + '@' + username + ' (' + firstName + ') ' + suffix
+      newPos = matches.index + username.length + 2
+      newPosTo = newPos + firstName.length
    }
    textarea.value = newValue
-    setFieldSelection(textarea, newPos)
+    setFieldSelection(textarea, newPos, newPosTo)
  }

  this.hideSuggestions()
--- a/app/js/messages_manager.js
+++ b/app/js/messages_manager.js
@ -1258,6 +1258,13 @@ angular.module('myApp.services')
      if (!options.viaBotID) {
        text = RichTextProcessor.parseMarkdown(text, entities)
      }
+      angular.forEach(entities, function (entity) {
+        if (entity._ == 'messageEntityMentionName') {
+          entity._ = 'inputMessageEntityMentionName'
+          entity.user_id = AppUsersManager.getUserInput(entity.user_id)
+        }
+      })
+
      if (!text.length) {
        return
      }
--- a/app/partials/desktop/composer_dropdown.html
+++ b/app/partials/desktop/composer_dropdown.html
@ -2,10 +2,10 @@

  <ul ng-switch-when="mentions" class="composer_dropdown">
    <li ng-repeat="user in mentionUsers">
-      <a class="composer_mention_option" data-mention="{{user.username}}">
+      <a class="composer_mention_option" data-mention="{{user.username.length > 0 ? user.username : ('#' + user.id)}}" data-name="{{user.first_name}}">
        <span class="composer_user_photo" my-peer-photolink="user.id" img-class="composer_user_photo"></span>
        <span class="composer_user_name" ng-bind-html="user.rFullName"></span>
-        <span class="composer_user_mention" ng-bind="'@' + user.username"></span>
+        <span class="composer_user_mention" ng-if="user.username.length > 0" ng-bind="'@' + user.username"></span>
      </a>
    </li>
  </ul>