From 75384d50a7872c38cf7b2c8b3d271b9df80c9211 Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@online.de>
Date: Fri, 8 Apr 2016 01:19:51 +0200
Subject: [PATCH] Improve search and mentions suggestions

---
 app/assets/javascripts/app/views/search_base_view.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/app/views/search_base_view.js b/app/assets/javascripts/app/views/search_base_view.js
index 0d5c8f306..d70f21ceb 100644
--- a/app/assets/javascripts/app/views/search_base_view.js
+++ b/app/assets/javascripts/app/views/search_base_view.js
@@ -18,9 +18,11 @@ app.views.SearchBase = app.views.Base.extend({
   setupBloodhound: function(options) {
     var bloodhoundOptions = {
       datumTokenizer: function(datum) {
-        var nameTokens = this.bloodhoundTokenizer(datum.name);
-        var handleTokens = datum.handle ? this.bloodhoundTokenizer(datum.handle) : [];
-        return nameTokens.concat(handleTokens);
+        // hashtags
+        if(typeof datum.handle === "undefined") { return [datum.name]; }
+        // people
+        if(datum.name === datum.handle) { return [datum.handle]; }
+        return this.bloodhoundTokenizer(datum.name).concat(datum.handle);
       }.bind(this),
       queryTokenizer: Bloodhound.tokenizers.whitespace,
       prefetch: {