youwen/iamb
1
0
Fork 0
mirror of https://github.com/youwen5/iamb.git synced 2025-06-21 06:09:52 -07:00
Code Issues Projects Releases Packages Wiki Activity

Support reacting literally with non-Emojis (#320)

Browse source
This commit is contained in:
Ulyssa 2024-08-12 23:21:11 -07:00 • committed by GitHub
parent 6d80b516f8
commit d44961c461
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 54 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/windows/room/chat.rs
View file

@ -358,7 +358,22 @@ impl ChatState {
Ok(None)
},
MessageAction::React(emoji) => {
MessageAction::React(reaction, literal) => {
let emoji = if literal {
reaction
} else if let Some(emoji) =
emojis::get(&reaction).or_else(|| emojis::get_by_shortcode(&reaction))
{
emoji.to_string()
} else {
let msg = format!("{reaction:?} is not a known Emoji shortcode; do you want to react with exactly {reaction:?}?");
let act = IambAction::Message(MessageAction::React(reaction, true));
let prompt = PromptYesNo::new(msg, vec![Action::from(act)]);
let prompt = Box::new(prompt);
return Err(UIError::NeedConfirm(prompt));
};
let room = self.get_joined(&store.application.worker)?;
let event_id = match &msg.event {
MessageEvent::EncryptedOriginal(ev) => ev.event_id.clone(),
@ -422,7 +437,27 @@ impl ChatState {
Ok(None)
},
MessageAction::Unreact(emoji) => {
MessageAction::Unreact(reaction, literal) => {
let emoji = match reaction {
reaction if literal => reaction,
Some(reaction) => {
if let Some(emoji) =
emojis::get(&reaction).or_else(|| emojis::get_by_shortcode(&reaction))
{
Some(emoji.to_string())
} else {
let msg = format!("{reaction:?} is not a known Emoji shortcode; do you want to remove exactly {reaction:?}?");
let act =
IambAction::Message(MessageAction::Unreact(Some(reaction), true));
let prompt = PromptYesNo::new(msg, vec![Action::from(act)]);
let prompt = Box::new(prompt);
return Err(UIError::NeedConfirm(prompt));
}
},
None => None,
};
let room = self.get_joined(&store.application.worker)?;
let event_id = match &msg.event {
MessageEvent::EncryptedOriginal(ev) => ev.event_id.clone(),