Fixes #1260

h/models.py

@@ -50,7 +50,22 @@ def __acl__(self):
        'text': {'type': 'string'},
        'deleted': {'type': 'boolean'},
        'uri': {'type': 'string', 'index_analyzer': 'uri_index', 'search_analyzer': 'uri_search'},
        'user': {'type': 'string', 'index': 'analyzed', 'analyzer': 'lower_keyword'},
        'user': {
            'type': 'multi_field',
            'path': 'just_name',
            'fields': {
                'user': {
                    'type': 'string',
                    'index': 'analyzed',
                    'analyzer': 'lower_keyword'},
                'username': {
                    'type': 'string',
                    'index': 'analyzed',
                    'index_analyzer': 'username',
                    'search_analyzer': 'lower_keyword'
                }
            }
        },
        'consumer': {'type': 'string', 'index': 'not_analyzed'},
        'target': {
            'properties': {
@@ -130,6 +145,13 @@ def __acl__(self):
                    ]
                }
            },
            'tokenizer': {
                'username': {
                    'type': 'pattern',
                    'group': 1,
                    'pattern': '^acct:(.+)@.*$'
                }
            },
            'analyzer': {
                'thread': {
                    'tokenizer': 'path_hierarchy'
@@ -145,6 +167,10 @@ def __acl__(self):
                },
                'uri_search': {
                    'tokenizer': 'keyword',
                },
                'username': {
                    'tokenizer': 'username',
                    'filter': 'lowercase'
                }
            }
        }

h/static/scripts/controllers.coffee

@@ -810,17 +810,9 @@ class Search
    refresh()


class Notification
  this.inject = ['$scope']
  constructor: (
    $scope
  ) ->


angular.module('h.controllers', imports)
.controller('AppController', App)
.controller('EditorController', Editor)
.controller('ViewerController', Viewer)
.controller('AnnotationViewerController', AnnotationViewer)
.controller('SearchController', Search)
.controller('NotificationController', Notification)

h/static/scripts/searchfilters.coffee

@@ -164,9 +164,7 @@ class SearchFilter
class QueryParser
  rules:
    user:
      formatter: (user) ->
        'acct:' + user + '@' + window.location.hostname
      path: '/user'
      path: '/username'
      exact_match: true
      case_sensitive: false
      and_or: 'or'
@@ -219,13 +217,13 @@ class QueryParser
      exact_match: false
      case_sensitive: false
      and_or: 'and'
      path:   ['/quote', '/tags', '/text', '/uri', '/user']
      path:   ['/quote', '/tags', '/text', '/uri', '/username']
      options:
        es:
         query_type: 'multi_match'
         match_type: 'cross_fields'
         and_or: 'and'
         fields:   ['quote', 'tag', 'text', 'uri', 'user']
         fields:   ['quote', 'tag', 'text', 'uri', 'username']


  parseModels: (models) ->
@@ -256,8 +254,6 @@ class QueryParser
      mapped_field = if rule.path? then rule.path else '/'+category

      if and_or is 'or'
        val_list = ''
        first = true
        oper_part =
          if rule.operator? then rule.operator
          else if exact_match then 'one_of' else 'match_of'

h/streamer.py

@@ -528,7 +528,7 @@ def on_message(self, msg):
def after_action(event):
    try:
        request = event.request
        clientID = request.headers.get('X-Client-Id')
        clientid = request.headers.get('X-Client-Id')

        action = event.action
        if action == 'read':
@@ -540,7 +540,7 @@ def after_action(event):

        manager = request.get_sockjs_manager()
        for session in manager.active_sessions():
            if session.clientID == clientID:
            if session.clientID == clientid:
                continue

            try:
@@ -550,6 +550,9 @@ def after_action(event):
                if 'references' in annotation:
                    annotation['quote'] = annotation['parent']['text']

                if 'user' in annotation:
                    annotation['username'] = re.match('^acct:(.+)@.*$', annotation['user']).group(1)

                flt = session.filter
                if not (flt and flt.match(annotation, action)):
                    continue

h/templates/auth.html

@@ -134,7 +134,7 @@
<!-- / Register -->

<!-- Forgot password -->
<form data-title="Claim an account"
<form data-title="Confirm account"
      data-value="forgot"
      class="form tab-pane"
      name="forgot"

h/templates/help.pt

@@ -35,14 +35,14 @@
      <img height="150px" width="150px"
           src="${request.static_url('h:static/images/helpdocumentation/createanaccount.jpg')}" />

      <h2>Claiming a username:</h2>
      <p>Have you already reserved a username? Use the “Claim your username” tab instead.</p>
      <h2>Confirm an account or Claim a username:</h2>
      <p>Have you already reserved a username? Use the “Confirm account” tab instead.</p>

      <h2>Forgotten Password?</h2>
      <p>Click “Password help” and enter the email address you signed up for your account with.</p>
      <p>Click “Forgotten your password” and enter the email address you signed up for your account with.</p>
      <img height="203px;" width="420px;"
           src="${request.static_url('h:static/images/helpdocumentation/password1.jpg')}" />
      <p>An email will be sent containing an activation code for your account. Click “I have an activation code.</p>
      <p>An email will be sent containing an activation code for your account. Click “have an activation code.”</p>
      <img height="203px;" width="420px;"
           src="${request.static_url('h:static/images/helpdocumentation/password2.jpg')}" />
      <p>Enter the activation code and the new password for your account. Click sign in, and your password will be reset.</p>