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

Fix entering thread view when there's no messages yet (#224)

Browse source
This commit is contained in:
Ulyssa 2024-03-23 19:20:06 -07:00 • committed by GitHub
parent 1e9b6cc271
commit 2ac71da9a6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 262 additions and 238 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -28,7 +28,6 @@ use matrix_sdk::{
RoomMessageEventContent,
TextMessageEventContent,
},
EventId,
OwnedEventId,
OwnedRoomId,
RoomId,
@ -72,7 +71,6 @@ use modalkit::prelude::*;
use crate::base::{
DownloadFlags,
EventLocation,
IambAction,
IambBufferId,
IambError,
@ -148,32 +146,10 @@ impl ChatState {
}
}
fn get_thread_last<'a>(
&self,
thread_root: &OwnedEventId,
info: &'a RoomInfo,
) -> Option<&'a OriginalRoomMessageEvent> {
let last = info.threads.get(thread_root).and_then(|t| Some(t.last_key_value()?.1));
let msg = if let Some(last) = last {
&last.event
} else if let EventLocation::Message(_, key) = info.keys.get(thread_root)? {
let msg = info.messages.get(key)?;
&msg.event
} else {
return None;
};
if let MessageEvent::Original(ev) = &msg {
Some(ev)
} else {
None
}
}
fn get_reply_to<'a>(&self, info: &'a RoomInfo) -> Option<&'a OriginalRoomMessageEvent> {
let thread = self.scrollback.get_thread(info)?;
let key = self.reply_to.as_ref()?;
let msg = info.messages.get(key)?;
let msg = thread.get(key)?;
if let MessageEvent::Original(ev) = &msg.event {
Some(ev)
@ -205,10 +181,7 @@ impl ChatState {
let settings = &store.application.settings;
let info = store.application.rooms.get_or_default(self.room_id.clone());
let msg = self
.scrollback
.get_mut(&mut info.messages)
.ok_or(IambError::NoSelectedMessage)?;
let msg = self.scrollback.get_mut(info).ok_or(IambError::NoSelectedMessage)?;
match act {
MessageAction::Cancel(skip_confirm) => {
@ -441,11 +414,11 @@ impl ChatState {
},
MessageAction::Unreact(emoji) => {
let room = self.get_joined(&store.application.worker)?;
let event_id: &EventId = match &msg.event {
MessageEvent::EncryptedOriginal(ev) => ev.event_id.as_ref(),
MessageEvent::EncryptedRedacted(ev) => ev.event_id.as_ref(),
MessageEvent::Original(ev) => ev.event_id.as_ref(),
MessageEvent::Local(event_id, _) => event_id.as_ref(),
let event_id = match &msg.event {
MessageEvent::EncryptedOriginal(ev) => ev.event_id.clone(),
MessageEvent::EncryptedRedacted(ev) => ev.event_id.clone(),
MessageEvent::Original(ev) => ev.event_id.clone(),
MessageEvent::Local(event_id, _) => event_id.clone(),
MessageEvent::Redacted(_) => {
let msg = "Cannot unreact to a redacted message";
let err = UIError::Failure(msg.into());
@ -454,7 +427,7 @@ impl ChatState {
},
};
let reactions = match info.reactions.get(event_id) {
let reactions = match info.reactions.get(&event_id) {
Some(r) => r,
None => return Ok(None),
};
@ -518,7 +491,7 @@ impl ChatState {
} else if let Some(thread_root) = self.scrollback.thread() {
if let Some(m) = self.get_reply_to(info) {
msg = msg.make_for_thread(m, ReplyWithinThread::Yes, AddMentions::No);
} else if let Some(m) = self.get_thread_last(thread_root, info) {
} else if let Some(m) = info.get_thread_last(thread_root) {
msg = msg.make_for_thread(m, ReplyWithinThread::No, AddMentions::No);
} else {
// Internal state is wonky?
@ -884,19 +857,21 @@ impl<'a> StatefulWidget for Chat<'a> {
fn render(self, area: Rect, buf: &mut Buffer, state: &mut Self::State) {
// Determine whether we have a description to show for the message bar.
let desc_spans = match (&state.editing, &state.reply_to) {
(None, None) => None,
(Some(_), None) => Some(Line::from("Editing message")),
(editing, Some(_)) => {
state.reply_to.as_ref().and_then(|k| {
let room = self.store.application.rooms.get(state.id())?;
let msg = room.messages.get(k)?;
let desc_spans = match (&state.editing, &state.reply_to, state.thread()) {
(None, None, None) => None,
(None, None, Some(_)) => Some(Line::from("Replying in thread")),
(Some(_), None, None) => Some(Line::from("Editing message")),
(Some(_), None, Some(_)) => Some(Line::from("Editing message in thread")),
(editing, Some(_), thread) => {
self.store.application.rooms.get(state.id()).and_then(|room| {
let msg = state.get_reply_to(room)?;
let user =
self.store.application.settings.get_user_span(msg.sender.as_ref(), room);
let prefix = if editing.is_some() {
Span::from("Editing reply to ")
} else {
Span::from("Replying to ")
let prefix = match (editing.is_some(), thread.is_some()) {
(true, false) => Span::from("Editing reply to "),
(true, true) => Span::from("Editing reply in thread to "),
(false, false) => Span::from("Replying to "),
(false, true) => Span::from("Replying in thread to "),
};
let spans = Line::from(vec![prefix, user]);

104
src/windows/room/scrollback.rs
View file

@ -1,5 +1,4 @@
//! Message scrollback
use ratatui_image::Image;
use regex::Regex;
@ -59,6 +58,11 @@ use crate::{
message::{Message, MessageCursor, MessageKey, Messages},
};
fn no_msgs() -> EditError<IambInfo> {
let msg = "No messages to select.";
EditError::Failure(msg.to_string())
}
fn nth_key_before(pos: MessageKey, n: usize, thread: &Messages) -> MessageKey {
let mut end = &pos;
let iter = thread.range(..=&pos).rev().enumerate();
@ -159,14 +163,16 @@ impl ScrollbackState {
self.cursor
.timestamp
.clone()
.or_else(|| self.get_thread(info).last_key_value().map(|kv| kv.0.clone()))
.or_else(|| self.get_thread(info)?.last_key_value().map(|kv| kv.0.clone()))
}
pub fn get_mut<'a>(&mut self, messages: &'a mut Messages) -> Option<&'a mut Message> {
pub fn get_mut<'a>(&mut self, info: &'a mut RoomInfo) -> Option<&'a mut Message> {
let thread = self.get_thread_mut(info);
if let Some(k) = &self.cursor.timestamp {
messages.get_mut(k)
thread.get_mut(k)
} else {
messages.last_entry().map(|o| o.into_mut())
thread.last_entry().map(|o| o.into_mut())
}
}
@ -174,20 +180,12 @@ impl ScrollbackState {
self.thread.as_ref()
}
pub fn get_thread<'a>(&self, info: &'a RoomInfo) -> &'a Messages {
if let Some(thread_root) = self.thread.as_ref() {
info.threads.get(thread_root).unwrap_or(&info.messages)
} else {
&info.messages
}
pub fn get_thread<'a>(&self, info: &'a RoomInfo) -> Option<&'a Messages> {
info.get_thread(self.thread.as_deref())
}
pub fn get_thread_mut<'a>(&self, info: &'a mut RoomInfo) -> &'a mut Messages {
if let Some(thread_root) = self.thread.as_ref() {
info.threads.get_mut(thread_root).unwrap_or(&mut info.messages)
} else {
&mut info.messages
}
info.get_thread_mut(self.thread.clone())
}
pub fn messages<'a>(
@ -195,7 +193,10 @@ impl ScrollbackState {
range: EditRange<MessageCursor>,
info: &'a RoomInfo,
) -> impl Iterator<Item = (&'a MessageKey, &'a Message)> {
let thread = self.get_thread(info);
let Some(thread) = self.get_thread(info) else {
return Default::default();
};
let start = range.start.to_key(thread);
let end = range.end.to_key(thread);
@ -223,7 +224,7 @@ impl ScrollbackState {
_ => {},
}
let first_key = self.get_thread(info).first_key_value().map(|(k, _)| k);
let first_key = self.get_thread(info).and_then(|t| t.first_key_value()).map(|(k, _)| k);
let at_top = first_key == self.viewctx.corner.timestamp.as_ref();
match (at_top, self.thread.as_ref()) {
@ -254,7 +255,10 @@ impl ScrollbackState {
info: &RoomInfo,
settings: &ApplicationSettings,
) {
let thread = self.get_thread(info);
let Some(thread) = self.get_thread(info) else {
return;
};
let selidx = if let Some(key) = self.cursor.to_key(thread) {
key
} else {
@ -319,7 +323,9 @@ impl ScrollbackState {
}
fn shift_cursor(&mut self, info: &RoomInfo, settings: &ApplicationSettings) {
let thread = self.get_thread(info);
let Some(thread) = self.get_thread(info) else {
return;
};
let last_key = if let Some(k) = thread.last_key_value() {
k.0
@ -389,7 +395,7 @@ impl ScrollbackState {
MoveType::BufferLineOffset => None,
MoveType::BufferLinePercent => None,
MoveType::BufferPos(MovePosition::Beginning) => {
let start = self.get_thread(info).first_key_value()?.0.clone();
let start = self.get_thread(info)?.first_key_value()?.0.clone();
Some(start.into())
},
@ -402,7 +408,7 @@ impl ScrollbackState {
MoveType::ParagraphBegin(dir) |
MoveType::SectionBegin(dir) |
MoveType::SectionEnd(dir) => {
let thread = self.get_thread(info);
let thread = self.get_thread(info)?;
match dir {
MoveDir1D::Previous => nth_before(pos, count, thread).into(),
@ -455,14 +461,14 @@ impl ScrollbackState {
RangeType::XmlTag => None,
RangeType::Buffer => {
let thread = self.get_thread(info);
let thread = self.get_thread(info)?;
let start = thread.first_key_value()?.0.clone();
let end = thread.last_key_value()?.0.clone();
Some(EditRange::inclusive(start.into(), end.into(), TargetShape::LineWise))
},
RangeType::Line | RangeType::Paragraph | RangeType::Sentence => {
let thread = self.get_thread(info);
let thread = self.get_thread(info)?;
let count = ctx.resolve(count);
if count == 0 {
@ -496,7 +502,7 @@ impl ScrollbackState {
mut count: usize,
info: &RoomInfo,
) -> Option<MessageCursor> {
let thread = self.get_thread(info);
let thread = self.get_thread(info)?;
let mut mc = None;
for (key, msg) in thread.range(&start..) {
@ -524,9 +530,12 @@ impl ScrollbackState {
mut count: usize,
info: &RoomInfo,
) -> (Option<MessageCursor>, bool) {
let thread = self.get_thread(info);
let mut mc = None;
let Some(thread) = self.get_thread(info) else {
return (None, false);
};
for (key, msg) in thread.range(..&end).rev() {
if count == 0 {
break;
@ -614,14 +623,8 @@ impl EditorActions<ProgramContext, ProgramStore, IambInfo> for ScrollbackState {
store: &mut ProgramStore,
) -> EditResult<EditInfo, IambInfo> {
let info = store.application.rooms.get_or_default(self.room_id.clone());
let thread = self.get_thread(info);
let key = if let Some(k) = self.cursor.to_key(thread) {
k.clone()
} else {
let msg = "No messages to select.";
let err = EditError::Failure(msg.to_string());
return Err(err);
};
let thread = self.get_thread(info).ok_or_else(no_msgs)?;
let key = self.cursor.to_key(thread).ok_or_else(no_msgs)?.clone();
match operation {
EditAction::Motion => {
@ -644,7 +647,6 @@ impl EditorActions<ProgramContext, ProgramStore, IambInfo> for ScrollbackState {
EditTarget::CharJump(mark) | EditTarget::LineJump(mark) => {
let mark = ctx.resolve(mark);
let cursor = store.cursors.get_mark(self.id.clone(), mark)?;
let thread = self.get_thread(info);
if let Some(mc) = MessageCursor::from_cursor(&cursor, thread) {
Some(mc)
@ -723,7 +725,6 @@ impl EditorActions<ProgramContext, ProgramStore, IambInfo> for ScrollbackState {
EditTarget::CharJump(mark) | EditTarget::LineJump(mark) => {
let mark = ctx.resolve(mark);
let cursor = store.cursors.get_mark(self.id.clone(), mark)?;
let thread = self.get_thread(info);
if let Some(c) = MessageCursor::from_cursor(&cursor, thread) {
self._range_to(c).into()
@ -821,18 +822,11 @@ impl EditorActions<ProgramContext, ProgramStore, IambInfo> for ScrollbackState {
store: &mut ProgramStore,
) -> EditResult<EditInfo, IambInfo> {
let info = store.application.get_room_info(self.room_id.clone());
let thread = self.get_thread(info);
let thread = self.get_thread(info).ok_or_else(no_msgs)?;
let cursor = self.cursor.to_cursor(thread).ok_or_else(no_msgs)?;
store.cursors.set_mark(self.id.clone(), name, cursor);
if let Some(cursor) = self.cursor.to_cursor(thread) {
store.cursors.set_mark(self.id.clone(), name, cursor);
Ok(None)
} else {
let msg = "Failed to set mark for message";
let err = EditError::Failure(msg.into());
Err(err)
}
Ok(None)
}
fn complete(
@ -884,6 +878,7 @@ impl EditorActions<ProgramContext, ProgramStore, IambInfo> for ScrollbackState {
store: &mut ProgramStore,
) -> EditResult<EditInfo, IambInfo> {
let info = store.application.get_room_info(self.room_id.clone());
let thread = self.get_thread(info).ok_or_else(no_msgs)?;
match act {
CursorAction::Close(_) => Ok(None),
@ -901,8 +896,6 @@ impl EditorActions<ProgramContext, ProgramStore, IambInfo> for ScrollbackState {
self.push_jump();
}
let thread = self.get_thread(info);
if let Some(mc) = MessageCursor::from_cursor(ngroup.leader.cursor(), thread) {
self.cursor = mc;
@ -916,7 +909,6 @@ impl EditorActions<ProgramContext, ProgramStore, IambInfo> for ScrollbackState {
},
CursorAction::Save(_) => {
let reg = ctx.get_register().unwrap_or(Register::UnnamedCursorGroup);
let thread = self.get_thread(info);
// Lists don't have groups; override any previously saved group.
let cursor = self.cursor.to_cursor(thread).ok_or_else(|| {
@ -1019,7 +1011,7 @@ impl Promptable<ProgramContext, ProgramStore, IambInfo> for ScrollbackState {
store: &mut ProgramStore,
) -> EditResult<Vec<(Action<IambInfo>, ProgramContext)>, IambInfo> {
let info = store.application.get_room_info(self.room_id.clone());
let thread = self.get_thread(info);
let thread = self.get_thread(info).ok_or_else(no_msgs)?;
let Some(key) = self.cursor.to_key(thread) else {
let msg = "No message currently selected";
@ -1068,7 +1060,7 @@ impl ScrollActions<ProgramContext, ProgramStore, IambInfo> for ScrollbackState {
let info = store.application.rooms.get_or_default(self.room_id.clone());
let settings = &store.application.settings;
let mut corner = self.viewctx.corner.clone();
let thread = self.get_thread(info);
let thread = self.get_thread(info).ok_or_else(no_msgs)?;
let last_key = if let Some(k) = thread.last_key_value() {
k.0
@ -1182,7 +1174,7 @@ impl ScrollActions<ProgramContext, ProgramStore, IambInfo> for ScrollbackState {
Axis::Vertical => {
let info = store.application.rooms.get_or_default(self.room_id.clone());
let settings = &store.application.settings;
let thread = self.get_thread(info);
let thread = self.get_thread(info).ok_or_else(no_msgs)?;
if let Some(key) = self.cursor.to_key(thread).cloned() {
self.scrollview(key, pos, info, settings);
@ -1315,12 +1307,14 @@ impl<'a> StatefulWidget for Scrollback<'a> {
return;
}
let Some(thread) = state.get_thread(info) else {
return;
};
if state.cursor.timestamp < state.viewctx.corner.timestamp {
state.viewctx.corner = state.cursor.clone();
}
let thread = state.get_thread(info);
let cursor = &state.cursor;
let cursor_key = if let Some(k) = cursor.to_key(thread) {
k