buttons/views: Show reaction_count in EmojiPicker view.

The EmojiPicker view now shows the count of reactions of a
particular emoji, beside emoji_name. The emoji_list is also
sorted in descending order of emoji_count, then in ascending
order of emoji_names, if the count is equal.
The search mechanism is also refactored to use the
generate_emoji_buttons function to generate the updated list
of emoji for every new search text.

Tests amended.

Author: zee-bit

tests/ui_tools/test_buttons.py

@@ -328,6 +328,8 @@ def test_init_emoji_button(self, mocker, width, emoji_name,
         controller.model.has_user_reacted_to_msg = mocker.Mock(
             return_value=False
         )
+        update_widget = mocker.patch(
+            BUTTONS + '.EmojiButton.update_widget')
         top_button = mocker.patch(TOPBUTTON + '.__init__')
         emoji_button = EmojiButton(controller, width, emoji_name,
                                    message, count)
@@ -360,7 +362,7 @@ def test_keypress_emoji_button(self, mocker, key, widget_size):
         update_widget = mocker.patch(
             BUTTONS + '.EmojiButton.update_widget')
         emoji_button = EmojiButton(controller, 20, 'thumbs_up',
-                                   message)
+                                   message, 2)
         size = widget_size(emoji_button)
 
         emoji_button.keypress(size, key)

zulipterminal/ui_tools/buttons.py

@@ -323,8 +323,10 @@ def __init__(self, controller: Any, width: int, emoji_name: str,
             prefix_character='',
             show_function=self._toggle_message_reaction,
             width=width)
-        if self.has_user_reacted_to_msg():
-            self.update_widget((None, f' {CHECK_MARK} '), None)
+
+        self.update_widget(
+            (None, self.get_update_widget_text(
+                self.has_user_reacted_to_msg())), None)
 
     def _toggle_message_reaction(self) -> None:
         self.controller.model.toggle_message_reaction(
@@ -334,13 +336,22 @@ def has_user_reacted_to_msg(self) -> bool:
         return self.controller.model.has_user_reacted_to_msg(
             self.emoji_name, self.message)
 
+    def get_update_widget_text(self, user_reacted: bool) -> str:
+        count_text = (str(self.reaction_count)
+                      if self.reaction_count > 0 else '')
+        reacted_check = CHECK_MARK if user_reacted else ''
+        return f' {reacted_check} {count_text} '
+
     def keypress(self, size: urwid_Size, key: str) -> Optional[str]:
+        # Note that this is called before toggle_message_reaction.
         if is_command_key('ENTER', key):
-            # Note that this is called before toggle_message_reaction.
-            if self.has_user_reacted_to_msg():
-                self.update_widget((None, ''), None)
-            else:
-                self.update_widget((None, f' {CHECK_MARK} '), None)
+            self.reaction_count = (
+                (self.reaction_count - 1)
+                if self.has_user_reacted_to_msg()
+                else (self.reaction_count + 1))
+            self.update_widget(
+                (None, self.get_update_widget_text(
+                    not self.has_user_reacted_to_msg())), None)
         return super().keypress(size, key)
 
 

zulipterminal/ui_tools/views.py

@@ -1591,15 +1591,17 @@ def update_emoji_list(self, search_box: Any=None,
 
         with self.search_lock:
             if new_text and new_text != self.emoji_search.search_text:
-                self.emojis_display = [
-                    searched_emoji for searched_emoji in self.emoji_buttons
+                emoji_names_searched = [
+                    searched_emoji.emoji_name
+                    for searched_emoji in self.emoji_buttons
                     if match_emoji(searched_emoji.emoji_name, new_text)
                 ]
+                self.emojis_display = self.generate_emoji_buttons(
+                    emoji_names_searched)
             else:
                 self.emojis_display = self.emoji_buttons
 
             self.empty_search = (len(self.emojis_display) == 0)
-
             body_content = self.emojis_display
             if self.empty_search:
                 body_content = [self.emoji_search.search_error]