vv/fractal
1
0
Fork 0
Code Pull requests Projects Releases Packages Activity

appop loop: remove AddRoomMessage

Browse source
This commit is contained in:
Julian Sparber 2018-12-03 11:24:11 +01:00
parent c72a36d032
commit c5c270b1a2
2 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fractal-gtk/src/app/appop_loop.rs
View file

@ -14,7 +14,6 @@ use types::StickerGroup;
#[derive(Debug)]
pub enum InternalCommand {
AddRoomMessage(Message),
SetView(AppState),
NotifyClicked(Message),
SelectRoom(Room),
@ -36,9 +35,6 @@ pub fn appop_loop(rx: Receiver<InternalCommand>) {
thread::spawn(move || loop {
let recv = rx.recv();
match recv {
Ok(InternalCommand::AddRoomMessage(msg)) => {
APPOP!(add_room_message, (msg));
}
Ok(InternalCommand::ToInvite(member)) => {
APPOP!(add_to_invite, (member));
}

21
fractal-gtk/src/appop/message.rs
View file

@ -48,14 +48,15 @@ impl AppOp {
}
}
pub fn add_room_message(&mut self, msg: Message) {
if msg.room == self.active_room.clone().unwrap_or_default() && !msg.redacted {
if let Some(ui_msg) = self.create_new_room_message(&msg) {
pub fn add_room_message(&mut self, msg: &Message) -> Option<()> {
if &msg.room == self.active_room.as_ref()? && !msg.redacted {
if let Some(ui_msg) = self.create_new_room_message(msg) {
if let Some(ref mut history) = self.history {
history.add_new_message(ui_msg);
}
}
}
None
}
pub fn add_tmp_room_message(&mut self, msg: Message) -> Option<()> {
@ -419,6 +420,7 @@ impl AppOp {
None
}
/* TODO: find a better name for this function */
pub fn show_room_messages(&mut self, newmsgs: Vec<Message>) -> Option<()> {
let mut msgs = vec![];
@ -441,22 +443,19 @@ impl AppOp {
self.notify(msg);
}
let command = InternalCommand::AddRoomMessage(msg.clone());
self.internal.send(command).unwrap();
self.add_room_message(&msg);
self.roomlist.moveup(msg.room.clone());
self.roomlist.set_bold(msg.room.clone(), true);
}
if !msgs.is_empty() {
let active_room = self.active_room.clone().unwrap_or_default();
let active_room = self.active_room.clone()?;
let fs = msgs.iter().filter(|x| x.room == active_room);
if let Some(msg) = fs.last() {
self.mark_as_read(msg, Force(false));
}
let msg = fs.last()?;
self.mark_as_read(msg, Force(false));
}
Some(())
None
}
/* TODO: find a better name for this function */