Fixed and tweaked search.

misago/apps/search/views.py

@@ -27,7 +27,7 @@ class ViewBase(object):
     def make_query(self, search_query):
         sqs = SearchQuerySet()
         if self.request.POST.get('search_thread_titles'):
-            sqs = sqs.filter(thread_name=AutoQuery(search_query))
+            sqs = sqs.filter(thread_name=AutoQuery(search_query), start_post=1)
         else:
             sqs = sqs.auto_query(search_query)
 

misago/markdown/extensions/emoji.py

@@ -170,7 +170,6 @@ EMOJIS = (
     'wrench', 'x', 'yellow_heart', 'yen', 'yum', 'zap', 'zero', 'zzz',
 )
 
-
 class EmojiPattern(SubstituteTagPattern):
     def __init__ (self, emo):
         super(SubstituteTagPattern, self).__init__(r':%s:' % emo, '')

misago/search_indexes.py

@@ -5,8 +5,9 @@ class PostIndex(indexes.SearchIndex, indexes.Indexable):
     text = indexes.CharField(document=True, use_template=True)
     forum = indexes.IntegerField(model_attr='forum_id')
     thread = indexes.IntegerField(model_attr='thread_id')
-    thread_name = indexes.CharField(model_attr='thread')
-    thread_starter = indexes.IntegerField(model_attr='thread_id')
+    thread_name = indexes.CharField()
+    start_post = indexes.IntegerField()
+    thread_starter = indexes.IntegerField(default=0)
     username = indexes.CharField(model_attr='user_name')
     date = indexes.DateTimeField(model_attr='date')
 
@@ -16,15 +17,18 @@ class PostIndex(indexes.SearchIndex, indexes.Indexable):
     def prepare_thread_name(self, obj):
         return obj.thread.name
 
+    def prepare_start_post(self, obj):
+        return 1 if obj.thread.start_post_id == obj.pk else 0
+
     def prepare_thread_starter(self, obj):
-        return obj.thread.start_poster_id
+        return obj.thread.start_poster_id or 0
 
     def get_updated_field(self):
         return 'current_date'
 
     def should_update(self, instance, **kwargs):
         if (instance.deleted or instance.moderated
-                or instance.thread.deletedor or instance.thread.moderated):
+                or instance.thread.deleted or instance.thread.moderated):
             self.remove_object(instance, **kwargs)
             return False
         return True

templates/cranefly/editor.html

@@ -34,7 +34,13 @@
       ed_lang_enter_image_url = "{% trans %}Enter image address{% endtrans %}";
       ed_lang_enter_image_label = "{% trans %}Enter image label{% endtrans %}";
       ed_emojis = ['{{ ("', '".join(emojis))|safe }}'];
+      ed_emoji_tpl = "<li data-value='${key}'><img src='{{ STATIC_URL }}emojis/${name}.png' height='20' width='20'/> ${name} </li>";
+      ed_emojis_list = $.map(ed_emojis, function(value, i) {
+        return {'id':i, 'key':value+":", 'name':value};
+      });
     });
   </script>
+  <script src="{{ STATIC_URL }}cranefly/js/jquery.caret.js"></script>
+  <script src="{{ STATIC_URL }}cranefly/js/jquery.atwho.js"></script>
   <script src="{{ STATIC_URL }}cranefly/js/editor.js"></script>
 {% endmacro %}

templates/cranefly/search/results.html

@@ -14,7 +14,7 @@
           {% if result.user_id %}
           <a href="{{ url('user', user=result.user.pk, username=result.user.username_slug) }}"><img src="{{ result.user.get_avatar(70) }}" alt=""></a>
           {% else %}
-          <img src="{{ macros.avatar_guest(80) }}" alt="{{ resut.user_name }}">
+          <img src="{{ macros.avatar_guest(80) }}" alt="{{ result.user_name }}">
           {% endif %}
         </div>
         <div class="result-content">