From ef052d2ae6ff6ff346312edf88a07ca8b54e78c3 Mon Sep 17 00:00:00 2001
From: Mike Dilger <mike@mikedilger.com>
Date: Tue, 6 Aug 2024 11:42:37 +1200
Subject: [PATCH] React with emoji from emoji picker (menu_button isn't ideal,
 but functional for now)

---
 gossip-bin/src/ui/feed/note/mod.rs | 91 ++++++++++++++----------------
 1 file changed, 41 insertions(+), 50 deletions(-)

diff --git a/gossip-bin/src/ui/feed/note/mod.rs b/gossip-bin/src/ui/feed/note/mod.rs
index f691d141..f7746de1 100644
--- a/gossip-bin/src/ui/feed/note/mod.rs
+++ b/gossip-bin/src/ui/feed/note/mod.rs
@@ -909,38 +909,23 @@ pub fn render_note_inner(
 
                                 // Buttons to react and reaction counts
                                 if read_setting!(reactions) && !note.muted() {
-                                    let default_reaction_icon = match note.our_reaction {
-                                        Some(_emoji) => "♥",
-                                        None => "♡",
-                                    };
-                                    let like_count = note
-                                        .reactions
-                                        .iter()
-                                        .find_map(
-                                            |(ch, count)| {
-                                                if *ch == '+' {
-                                                    Some(*count)
-                                                } else {
-                                                    None
-                                                }
-                                            },
-                                        )
-                                        .unwrap_or_default();
-                                    let reaction_count: usize = note
-                                        .reactions
-                                        .iter()
-                                        .filter_map(|(c, s)| if *c == '+' { None } else { Some(s) })
-                                        .sum();
-                                    let mut response = widgets::clickable_label(
-                                        ui,
-                                        can_sign,
-                                        RichText::new(default_reaction_icon).size(20.0),
-                                    );
-                                    response |= widgets::clickable_label(
-                                        ui,
-                                        can_sign,
-                                        format!("{}+{}", like_count, reaction_count),
-                                    );
+                                    if let Some(reaction) = note.our_reaction {
+                                        ui.label(RichText::new(reaction).size(16.0));
+                                    } else if can_sign {
+                                        ui.menu_button(RichText::new('♡').size(20.0), |ui| {
+                                            if let Some(emoji) = crate::ui::components::emoji_picker(ui) {
+                                                let _ =
+                                                    GLOBALS.to_overlord.send(ToOverlordMessage::React(
+                                                        note.event.id,
+                                                        note.event.pubkey,
+                                                        emoji,
+                                                    ));
+                                            }
+                                        });
+                                    } else {
+                                        ui.label(RichText::new('♡').size(20.0));
+                                    }
+
                                     let hover_ui = |ui: &mut Ui| {
                                         ui.horizontal_wrapped(|ui| {
                                             let mut col = 0;
@@ -975,25 +960,31 @@ pub fn render_note_inner(
                                             }
                                         });
                                     };
-                                    if response
+                                    let like_count = note
+                                        .reactions
+                                        .iter()
+                                        .find_map(
+                                            |(ch, count)| {
+                                                if *ch == '+' {
+                                                    Some(*count)
+                                                } else {
+                                                    None
+                                                }
+                                            },
+                                        )
+                                        .unwrap_or_default();
+                                    let reaction_count: usize = note
+                                        .reactions
+                                        .iter()
+                                        .filter_map(|(c, s)| if *c == '+' { None } else { Some(s) })
+                                        .sum();
+
+                                    ui.add(
+                                        Label::new(format!("{}+{}", like_count, reaction_count))
+                                            .sense(Sense::hover())
+                                    )
                                         .on_hover_ui(hover_ui)
-                                        .on_disabled_hover_ui(hover_ui)
-                                        .clicked()
-                                    {
-                                        if !GLOBALS.identity.is_unlocked() {
-                                            GLOBALS
-                                                .status_queue
-                                                .write()
-                                                .write("Your key is not setup.".to_string());
-                                        } else {
-                                            let _ =
-                                                GLOBALS.to_overlord.send(ToOverlordMessage::React(
-                                                    note.event.id,
-                                                    note.event.pubkey,
-                                                    '+',
-                                                ));
-                                        }
-                                    }
+                                        .on_disabled_hover_ui(hover_ui);
                                 }
                             });