Release v0.0.6 (#48)

Fix files never downloading (unless it has been downloaded in the past
and using `!` force flag).

The logic should be:

* If file does not exist, or `!` force flag used, then download it
* Else if neither `!` or `:open` flag used, then error out

and then return downloaded-message or open-and-message.

I.e. `:open` should still open the file if it has already been
downloaded. Otherwise the only way to open it is to use `!` and
re-download it.

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout code
-      uses: actions/checkout@v1
+      uses: actions/checkout@v3
       with:
         submodules: true
     - name: Install Rust
@@ -35,7 +35,7 @@ jobs:
     runs-on: ${{ matrix.platform }}
     steps:
     - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         submodules: true
     - name: Install Rust
@@ -45,7 +45,7 @@ jobs:
           override: true
           components: rustfmt, clippy
     - name: Cache cargo registry
-      uses: actions/cache@v1
+      uses: actions/cache@v3
       with:
         path: ~/.cargo/registry
         key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "iamb"
-version = "0.0.2"
+version = "0.0.6"
 edition = "2018"
 authors = ["Ulyssa <git@ulyssa.dev>"]
 repository = "https://github.com/ulyssa/iamb"
@@ -10,23 +10,27 @@ description = "A Matrix chat client that uses Vim keybindings"
 license = "Apache-2.0"
 exclude = [".github", "CONTRIBUTING.md"]
 keywords = ["matrix", "chat", "tui", "vim"]
+categories = ["command-line-utilities"]
 rust-version = "1.66"
 
 [dependencies]
+bitflags = "1.3.2"
 chrono = "0.4"
 clap = {version = "4.0", features = ["derive"]}
+css-color-parser = "0.1.2"
 dirs = "4.0.0"
-futures = "0.3.21"
+emojis = "~0.5.2"
 gethostname = "0.4.1"
-matrix-sdk = {version = "0.6", default-features = false, features = ["e2e-encryption", "sled", "rustls-tls"]}
-modalkit = "0.0.9"
+html5ever = "0.26.0"
+markup5ever_rcdom = "0.2.0"
+mime = "^0.3.16"
+mime_guess = "^2.0.4"
+open = "3.2.0"
 regex = "^1.5"
 rpassword = "^7.2"
 serde = "^1.0"
 serde_json = "^1.0"
-sled = "0.34"
 thiserror = "^1.0.37"
-tokio = {version = "1.17.0", features = ["full"]}
 tracing = "~0.1.36"
 tracing-appender = "~0.2.2"
 tracing-subscriber = "0.3.16"
@@ -34,5 +38,17 @@ unicode-segmentation = "^1.7"
 unicode-width = "0.1.10"
 url = {version = "^2.2.2", features = ["serde"]}
 
+[dependencies.modalkit]
+version = "0.0.13"
+
+[dependencies.matrix-sdk]
+version = "0.6"
+default-features = false
+features = ["e2e-encryption", "markdown", "sled", "rustls-tls"]
+
+[dependencies.tokio]
+version = "1.24.1"
+features = ["macros", "net", "rt-multi-thread", "sync", "time"]
+
 [dev-dependencies]
 lazy_static = "1.4.0"

README.md

@@ -1,5 +1,9 @@
 # iamb
 
+[![Build Status](https://github.com/ulyssa/iamb/workflows/CI/badge.svg)](https://github.com/ulyssa/iamb/actions?query=workflow%3ACI+)
+[![License: Apache 2.0](https://img.shields.io/crates/l/iamb.svg?logo=apache)](https://crates.io/crates/iamb)
+[![Latest Version](https://img.shields.io/crates/v/iamb.svg?logo=rust)](https://crates.io/crates/iamb)
+
 ## About
 
 `iamb` is a Matrix client for the terminal that uses Vim keybindings.
@@ -7,6 +11,8 @@
 This project is a work-in-progress, and there's still a lot to be implemented,
 but much of the basic client functionality is already present.
 
+![Example Usage](https://iamb.chat/static/images/iamb-demo.gif)
+
 ## Documentation
 
 You can find documentation for installing, configuring, and using iamb on its
@@ -17,7 +23,7 @@ website, [iamb.chat].
 Install Rust and Cargo, and then run:
 
 ```
-cargo install iamb
+cargo install --locked iamb
 ```
 
 ## Configuration
@@ -42,38 +48,38 @@ Matrix website's [features comparison table][client-comparison-matrix], showing
 two other TUI clients and Element Web:
 
 |                                         | iamb        | [gomuks] | [weechat-matrix] | Element Web/Desktop |
-| --------------------------------------- | :----------------- | :----------------: | :----------------: | :-----------------: |
-| Room directory                          | :x: ([#14])        | :x:                | :heavy_check_mark: | :heavy_check_mark:  |
-| Room tag showing                        | :x: ([#15])        | :heavy_check_mark: | :x:                | :heavy_check_mark:  |
-| Room tag editing                        | :x: ([#15])        | :heavy_check_mark: | :x:                | :heavy_check_mark:  |
-| Search joined rooms                     | :x: ([#16])        | :heavy_check_mark: | :x:                | :heavy_check_mark:  |
-| Room user list                          | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark:  |
-| Display Room Description                | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark:  |
-| Edit Room Description                   | :heavy_check_mark: | :x:                | :heavy_check_mark: | :heavy_check_mark:  |
-| Highlights                              | :x: ([#8])         | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark:  |
-| Pushrules                               | :x:                | :heavy_check_mark: | :x:                | :heavy_check_mark:  |
-| Send read markers                       | :x: ([#11])        | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark:  |
-| Display read markers                    | :x: ([#11])        | :x:                | :x:                | :heavy_check_mark:  |
-| Sending Invites                         | :x: ([#7])         | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark:  |
-| Accepting Invites                       | :x: ([#7])         | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark:  |
-| Typing Notification                     | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark:  |
-| E2E                                     | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark:  |
-| Replies                                 | :x: ([#3])         | :heavy_check_mark: | :x:                | :heavy_check_mark:  |
-| Attachment uploading                    | :x: ([#13])        | :x:                | :heavy_check_mark: | :heavy_check_mark:  |
-| Attachment downloading                  | :x: ([#13])        | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark:  |
-| Send stickers                           | :x:                | :x:                | :x:                | :heavy_check_mark:  |
-| Send formatted messages (markdown)      | :x: ([#10])        | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark:  |
-| Rich Text Editor for formatted messages | :x:                | :x:                | :x:                | :heavy_check_mark:  |
-| Display formatted messages              | :x: ([#10])        | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark:  |
-| Redacting                               | :x: ([#5])         | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark:  |
-| Multiple Matrix Accounts                | :heavy_check_mark: | :x:                | :heavy_check_mark: | :x:                 |
-| New user registration                   | :x:                | :x:                | :x:                | :heavy_check_mark:  |
-| VOIP                                    | :x:                | :x:                | :x:                | :heavy_check_mark:  |
-| Reactions                               | :x: ([#2])         | :heavy_check_mark: | :x:                | :heavy_check_mark:  |
-| Message editing                         | :x: ([#4])         | :heavy_check_mark: | :x:                | :heavy_check_mark:  |
-| Room upgrades                           | :x:                | :heavy_check_mark: | :x:                | :heavy_check_mark:  |
-| Localisations                           | :x:                | 1                  | :x:                | 44                  |
-| SSO Support                             | :x:                | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark:  |
+| --------------------------------------- | :---------- | :------: | :--------------: | :-----------------: |
+| Room directory                          | ❌  ([#14]) | ❌       | ✔️                | ✔️                   |
+| Room tag showing                        | ✔️           | ✔️        | ❌               | ✔️                   |
+| Room tag editing                        | ✔️           | ✔️        | ❌               | ✔️                   |
+| Search joined rooms                     | ❌  ([#16]) | ✔️        | ❌               | ✔️                   |
+| Room user list                          | ✔️           | ✔️        | ✔️                | ✔️                   |
+| Display Room Description                | ✔️           | ✔️        | ✔️                | ✔️                   |
+| Edit Room Description                   | ✔️           | ❌       | ✔️                | ✔️                   |
+| Highlights                              | ❌  ([#8])  | ✔️        | ✔️                | ✔️                   |
+| Pushrules                               | ❌          | ✔️        | ❌               | ✔️                   |
+| Send read markers                       | ✔️           | ✔️        | ✔️                | ✔️                   |
+| Display read markers                    | ✔️           | ❌       | ❌               | ✔️                   |
+| Sending Invites                         | ✔️           | ✔️        | ✔️                | ✔️                   |
+| Accepting Invites                       | ✔️           | ✔️        | ✔️                | ✔️                   |
+| Typing Notification                     | ✔️           | ✔️        | ✔️                | ✔️                   |
+| E2E                                     | ✔️           | ✔️        | ✔️                | ✔️                   |
+| Replies                                 | ✔️           | ✔️        | ❌               | ✔️                   |
+| Attachment uploading                    | ✔️           | ❌       | ✔️                | ✔️                   |
+| Attachment downloading                  | ✔️           | ✔️        | ✔️                | ✔️                   |
+| Send stickers                           | ❌          | ❌       | ❌               | ✔️                   |
+| Send formatted messages (markdown)      | ✔️           | ✔️        | ✔️                | ✔️                   |
+| Rich Text Editor for formatted messages | ❌          | ❌       | ❌               | ✔️                   |
+| Display formatted messages              | ✔️           | ✔️        | ✔️                | ✔️                   |
+| Redacting                               | ✔️           | ✔️        | ✔️                | ✔️                   |
+| Multiple Matrix Accounts                | ✔️           | ❌       | ✔️                | ❌                  |
+| New user registration                   | ❌          | ❌       | ❌               | ✔️                   |
+| VOIP                                    | ❌          | ❌       | ❌               | ✔️                   |
+| Reactions                               | ✔️           | ✔️        | ❌               | ✔️                   |
+| Message editing                         | ✔️           | ✔️        | ❌               | ✔️                   |
+| Room upgrades                           | ❌ ([#41])  | ✔️        | ❌               | ✔️                   |
+| Localisations                           | ❌          | 1        | ❌               | 44                  |
+| SSO Support                             | ❌          | ✔️        | ✔️                | ✔️                   |
                                                                                        
 ## License
 
@@ -84,18 +90,7 @@ iamb is released under the [Apache License, Version 2.0].
 [iamb.chat]: https://iamb.chat
 [gomuks]: https://github.com/tulir/gomuks
 [weechat-matrix]: https://github.com/poljar/weechat-matrix
-[#2]: https://github.com/ulyssa/iamb/issues/2
-[#3]: https://github.com/ulyssa/iamb/issues/3
-[#4]: https://github.com/ulyssa/iamb/issues/4
-[#5]: https://github.com/ulyssa/iamb/issues/5
-[#6]: https://github.com/ulyssa/iamb/issues/6
-[#7]: https://github.com/ulyssa/iamb/issues/7
 [#8]: https://github.com/ulyssa/iamb/issues/8
-[#9]: https://github.com/ulyssa/iamb/issues/9
-[#10]: https://github.com/ulyssa/iamb/issues/10
-[#11]: https://github.com/ulyssa/iamb/issues/11
-[#12]: https://github.com/ulyssa/iamb/issues/12
-[#13]: https://github.com/ulyssa/iamb/issues/13
 [#14]: https://github.com/ulyssa/iamb/issues/14
-[#15]: https://github.com/ulyssa/iamb/issues/15
 [#16]: https://github.com/ulyssa/iamb/issues/16
+[#41]: https://github.com/ulyssa/iamb/issues/41

src/base.rs

@@ -1,14 +1,38 @@
+use std::borrow::Cow;
 use std::collections::{HashMap, HashSet};
 use std::hash::Hash;
+use std::str::FromStr;
 use std::sync::Arc;
 use std::time::{Duration, Instant};
 
+use emojis::Emoji;
 use tokio::sync::Mutex as AsyncMutex;
 use tracing::warn;
 
 use matrix_sdk::{
     encryption::verification::SasVerification,
-    ruma::{OwnedRoomId, OwnedUserId, RoomId},
+    room::Joined,
+    ruma::{
+        events::{
+            reaction::ReactionEvent,
+            room::message::{
+                OriginalRoomMessageEvent,
+                Relation,
+                Replacement,
+                RoomMessageEvent,
+                RoomMessageEventContent,
+            },
+            tag::{TagName, Tags},
+            AnyMessageLikeEvent,
+            MessageLikeEvent,
+        },
+        presence::PresenceState,
+        EventId,
+        OwnedEventId,
+        OwnedRoomId,
+        OwnedUserId,
+        RoomId,
+    },
 };
 
 use modalkit::{
@@ -22,11 +46,15 @@ use modalkit::{
             ApplicationStore,
             ApplicationWindowId,
         },
+        base::{CommandType, WordStyle},
+        completion::{complete_path, CompletionMap},
         context::EditContext,
+        cursor::Cursor,
+        rope::EditRope,
         store::Store,
     },
     env::vim::{
-        command::{CommandContext, VimCommand, VimCommandMachine},
+        command::{CommandContext, CommandDescription, VimCommand, VimCommandMachine},
         keybindings::VimMachine,
         VimContext,
     },
@@ -41,12 +69,26 @@ use modalkit::{
 };
 
 use crate::{
-    message::{user_style, Message, Messages},
+    message::{Message, MessageEvent, MessageKey, MessageTimeStamp, Messages},
     worker::Requester,
     ApplicationSettings,
 };
 
-const ROOM_FETCH_DEBOUNCE: Duration = Duration::from_secs(3);
+pub const MATRIX_ID_WORD: WordStyle = WordStyle::CharSet(is_mxid_char);
+
+/// Find the boundaries for a Matrix username, room alias, or room ID.
+///
+/// Technically "[" and "]" should be here since IPv6 addresses are allowed
+/// in the server name, but in practice that should be uncommon, and people
+/// can just use `gf` and friends in Visual mode instead.
+fn is_mxid_char(c: char) -> bool {
+    return c >= 'a' && c <= 'z' ||
+        c >= 'A' && c <= 'Z' ||
+        c >= '0' && c <= '9' ||
+        ":-./@_#!".contains(c);
+}
+
+const ROOM_FETCH_DEBOUNCE: Duration = Duration::from_secs(2);
 
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub enum IambInfo {}
@@ -60,43 +102,141 @@ pub enum VerifyAction {
 }
 
 #[derive(Clone, Debug, Eq, PartialEq)]
-pub enum SetRoomField {
-    Name(String),
-    Topic(String),
+pub enum MessageAction {
+    /// Cance the current reply or edit.
+    Cancel,
+
+    /// Download an attachment to the given path.
+    ///
+    /// The second argument controls whether to overwrite any already existing file at the
+    /// destination path, or to open the attachment after downloading.
+    Download(Option<String>, DownloadFlags),
+
+    /// Edit a sent message.
+    Edit,
+
+    /// React to a message with an Emoji.
+    React(String),
+
+    /// Redact a message, with an optional reason.
+    Redact(Option<String>),
+
+    /// Reply to a message.
+    Reply,
+
+    /// Unreact to a message.
+    ///
+    /// If no specific Emoji to remove to is specified, then all reactions from the user on the
+    /// message are removed.
+    Unreact(Option<String>),
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub enum CreateRoomType {
+    /// A direct message room.
+    Direct(OwnedUserId),
+
+    /// A standard chat room.
+    Room,
+
+    /// A Matrix space.
+    Space,
+}
+
+bitflags::bitflags! {
+    pub struct CreateRoomFlags: u32 {
+        const NONE = 0b00000000;
+
+        /// Make the room public.
+        const PUBLIC = 0b00000001;
+
+        /// Encrypt this room.
+        const ENCRYPTED = 0b00000010;
+    }
+}
+
+bitflags::bitflags! {
+    pub struct DownloadFlags: u32 {
+        const NONE = 0b00000000;
+
+        /// Overwrite file if it already exists.
+        const FORCE = 0b00000001;
+
+        /// Open file after downloading.
+        const OPEN = 0b00000010;
+    }
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub enum RoomField {
+    Name,
+    Tag(TagName),
+    Topic,
 }
 
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub enum RoomAction {
+    InviteAccept,
+    InviteReject,
+    InviteSend(OwnedUserId),
     Members(Box<CommandContext<ProgramContext>>),
-    Set(SetRoomField),
+    Set(RoomField, String),
+    Unset(RoomField),
 }
 
-impl From<SetRoomField> for RoomAction {
-    fn from(act: SetRoomField) -> Self {
-        RoomAction::Set(act)
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub enum SendAction {
+    Submit,
+    Upload(String),
 }
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub enum HomeserverAction {
+    CreateRoom(Option<String>, CreateRoomType, CreateRoomFlags),
 }
 
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub enum IambAction {
+    Homeserver(HomeserverAction),
+    Message(MessageAction),
     Room(RoomAction),
+    Send(SendAction),
     Verify(VerifyAction, String),
     VerifyRequest(String),
-    SendMessage(OwnedRoomId, String),
     ToggleScrollbackFocus,
 }
 
+impl From<HomeserverAction> for IambAction {
+    fn from(act: HomeserverAction) -> Self {
+        IambAction::Homeserver(act)
+    }
+}
+
+impl From<MessageAction> for IambAction {
+    fn from(act: MessageAction) -> Self {
+        IambAction::Message(act)
+    }
+}
+
 impl From<RoomAction> for IambAction {
     fn from(act: RoomAction) -> Self {
         IambAction::Room(act)
     }
 }
 
+impl From<SendAction> for IambAction {
+    fn from(act: SendAction) -> Self {
+        IambAction::Send(act)
+    }
+}
+
 impl ApplicationAction for IambAction {
     fn is_edit_sequence<C: EditContext>(&self, _: &C) -> SequenceStatus {
         match self {
+            IambAction::Homeserver(..) => SequenceStatus::Break,
+            IambAction::Message(..) => SequenceStatus::Break,
             IambAction::Room(..) => SequenceStatus::Break,
-            IambAction::SendMessage(..) => SequenceStatus::Break,
+            IambAction::Send(..) => SequenceStatus::Break,
             IambAction::ToggleScrollbackFocus => SequenceStatus::Break,
             IambAction::Verify(..) => SequenceStatus::Break,
             IambAction::VerifyRequest(..) => SequenceStatus::Break,
@@ -105,8 +245,10 @@ impl ApplicationAction for IambAction {
 
     fn is_last_action<C: EditContext>(&self, _: &C) -> SequenceStatus {
         match self {
+            IambAction::Homeserver(..) => SequenceStatus::Atom,
+            IambAction::Message(..) => SequenceStatus::Atom,
             IambAction::Room(..) => SequenceStatus::Atom,
-            IambAction::SendMessage(..) => SequenceStatus::Atom,
+            IambAction::Send(..) => SequenceStatus::Atom,
             IambAction::ToggleScrollbackFocus => SequenceStatus::Atom,
             IambAction::Verify(..) => SequenceStatus::Atom,
             IambAction::VerifyRequest(..) => SequenceStatus::Atom,
@@ -115,8 +257,10 @@ impl ApplicationAction for IambAction {
 
     fn is_last_selection<C: EditContext>(&self, _: &C) -> SequenceStatus {
         match self {
+            IambAction::Homeserver(..) => SequenceStatus::Ignore,
+            IambAction::Message(..) => SequenceStatus::Ignore,
             IambAction::Room(..) => SequenceStatus::Ignore,
-            IambAction::SendMessage(..) => SequenceStatus::Ignore,
+            IambAction::Send(..) => SequenceStatus::Ignore,
             IambAction::ToggleScrollbackFocus => SequenceStatus::Ignore,
             IambAction::Verify(..) => SequenceStatus::Ignore,
             IambAction::VerifyRequest(..) => SequenceStatus::Ignore,
@@ -125,8 +269,10 @@ impl ApplicationAction for IambAction {
 
     fn is_switchable<C: EditContext>(&self, _: &C) -> bool {
         match self {
+            IambAction::Homeserver(..) => false,
+            IambAction::Message(..) => false,
             IambAction::Room(..) => false,
-            IambAction::SendMessage(..) => false,
+            IambAction::Send(..) => false,
             IambAction::ToggleScrollbackFocus => false,
             IambAction::Verify(..) => false,
             IambAction::VerifyRequest(..) => false,
@@ -134,6 +280,12 @@ impl ApplicationAction for IambAction {
     }
 }
 
+impl From<RoomAction> for ProgramAction {
+    fn from(act: RoomAction) -> Self {
+        IambAction::from(act).into()
+    }
+}
+
 impl From<IambAction> for ProgramAction {
     fn from(act: IambAction) -> Self {
         Action::Application(act)
@@ -150,9 +302,17 @@ pub type AsyncProgramStore = Arc<AsyncMutex<ProgramStore>>;
 
 pub type IambResult<T> = UIResult<T, IambInfo>;
 
+/// Reaction events for some message.
+///
+/// The event identifier used as a key here is the ID for the reaction, and not for the message
+/// it's reacting to.
+pub type MessageReactions = HashMap<OwnedEventId, (String, OwnedUserId)>;
+
+pub type Receipts = HashMap<OwnedEventId, Vec<OwnedUserId>>;
+
 #[derive(thiserror::Error, Debug)]
 pub enum IambError {
-    #[error("Unknown room identifier: {0}")]
+    #[error("Invalid user identifier: {0}")]
     InvalidUserId(String),
 
     #[error("Invalid verification user/device pair: {0}")]
@@ -173,6 +333,24 @@ pub enum IambError {
     #[error("Serialization/deserialization error: {0}")]
     Serde(#[from] serde_json::Error),
 
+    #[error("Selected message does not have any attachments")]
+    NoAttachment,
+
+    #[error("No message currently selected")]
+    NoSelectedMessage,
+
+    #[error("Current window is not a room or space")]
+    NoSelectedRoomOrSpace,
+
+    #[error("Current window is not a room")]
+    NoSelectedRoom,
+
+    #[error("You do not have a current invitation to this room")]
+    NotInvited,
+
+    #[error("You need to join the room before you can do that")]
+    NotJoined,
+
     #[error("Unknown room identifier: {0}")]
     UnknownRoom(OwnedRoomId),
 
@@ -196,16 +374,152 @@ pub enum RoomFetchStatus {
     NotStarted,
 }
 
+pub enum EventLocation {
+    Message(MessageKey),
+    Reaction(OwnedEventId),
+}
+
+impl EventLocation {
+    fn to_message_key(&self) -> Option<&MessageKey> {
+        if let EventLocation::Message(key) = self {
+            Some(key)
+        } else {
+            None
+        }
+    }
+}
+
 #[derive(Default)]
 pub struct RoomInfo {
+    /// The display name for this room.
     pub name: Option<String>,
+
+    /// The tags placed on this room.
+    pub tags: Option<Tags>,
+
+    /// A map of event IDs to where they are stored in this struct.
+    pub keys: HashMap<OwnedEventId, EventLocation>,
+
+    /// The messages loaded for this room.
     pub messages: Messages,
+
+    /// A map of read markers to display on different events.
+    pub receipts: HashMap<OwnedEventId, Vec<OwnedUserId>>,
+
+    /// An event ID for where we should indicate we've read up to.
+    pub read_till: Option<OwnedEventId>,
+
+    /// A map of message identifiers to a map of reaction events.
+    pub reactions: HashMap<OwnedEventId, MessageReactions>,
+
+    /// Where to continue fetching from when we continue loading scrollback history.
     pub fetch_id: RoomFetchStatus,
+
+    /// The time that we last fetched scrollback for this room.
     pub fetch_last: Option<Instant>,
+
+    /// Users currently typing in this room, and when we received notification of them doing so.
     pub users_typing: Option<(Instant, Vec<OwnedUserId>)>,
 }
 
 impl RoomInfo {
+    pub fn get_reactions(&self, event_id: &EventId) -> Vec<(&str, usize)> {
+        if let Some(reacts) = self.reactions.get(event_id) {
+            let mut counts = HashMap::new();
+
+            for (key, _) in reacts.values() {
+                let count = counts.entry(key.as_str()).or_default();
+                *count += 1;
+            }
+
+            let mut reactions = counts.into_iter().collect::<Vec<_>>();
+            reactions.sort();
+
+            reactions
+        } else {
+            vec![]
+        }
+    }
+
+    pub fn get_event(&self, event_id: &EventId) -> Option<&Message> {
+        self.messages.get(self.keys.get(event_id)?.to_message_key()?)
+    }
+
+    pub fn insert_reaction(&mut self, react: ReactionEvent) {
+        match react {
+            MessageLikeEvent::Original(react) => {
+                let rel_id = react.content.relates_to.event_id;
+                let key = react.content.relates_to.key;
+
+                let message = self.reactions.entry(rel_id.clone()).or_default();
+                let event_id = react.event_id;
+                let user_id = react.sender;
+
+                message.insert(event_id.clone(), (key, user_id));
+
+                let loc = EventLocation::Reaction(rel_id);
+                self.keys.insert(event_id, loc);
+            },
+            MessageLikeEvent::Redacted(_) => {
+                return;
+            },
+        }
+    }
+
+    pub fn insert_edit(&mut self, msg: Replacement) {
+        let event_id = msg.event_id;
+        let new_content = msg.new_content;
+
+        let key = if let Some(EventLocation::Message(k)) = self.keys.get(&event_id) {
+            k
+        } else {
+            return;
+        };
+
+        let msg = if let Some(msg) = self.messages.get_mut(key) {
+            msg
+        } else {
+            return;
+        };
+
+        match &mut msg.event {
+            MessageEvent::Original(orig) => {
+                orig.content = *new_content;
+            },
+            MessageEvent::Local(_, content) => {
+                *content = new_content;
+            },
+            MessageEvent::Redacted(_) => {
+                return;
+            },
+        }
+
+        msg.html = msg.event.html();
+    }
+
+    pub fn insert_message(&mut self, msg: RoomMessageEvent) {
+        let event_id = msg.event_id().to_owned();
+        let key = (msg.origin_server_ts().into(), event_id.clone());
+
+        self.keys.insert(event_id.clone(), EventLocation::Message(key.clone()));
+        self.messages.insert(key, msg.into());
+
+        // Remove any echo.
+        let key = (MessageTimeStamp::LocalEcho, event_id);
+        let _ = self.messages.remove(&key);
+    }
+
+    pub fn insert(&mut self, msg: RoomMessageEvent) {
+        match msg {
+            RoomMessageEvent::Original(OriginalRoomMessageEvent {
+                content:
+                    RoomMessageEventContent { relates_to: Some(Relation::Replacement(repl)), .. },
+                ..
+            }) => self.insert_edit(repl),
+            _ => self.insert_message(msg),
+        }
+    }
+
     fn recently_fetched(&self) -> bool {
         self.fetch_last.map_or(false, |i| i.elapsed() < ROOM_FETCH_DEBOUNCE)
     }
@@ -222,24 +536,20 @@ impl RoomInfo {
         }
     }
 
-    fn get_typing_spans(&self) -> Spans {
+    fn get_typing_spans<'a>(&'a self, settings: &'a ApplicationSettings) -> Spans<'a> {
         let typers = self.get_typers();
         let n = typers.len();
 
         match n {
             0 => Spans(vec![]),
             1 => {
-                let user = typers[0].as_str();
-                let user = Span::styled(user, user_style(user));
+                let user = settings.get_user_span(typers[0].as_ref());
 
                 Spans(vec![user, Span::from(" is typing...")])
             },
             2 => {
-                let user1 = typers[0].as_str();
-                let user1 = Span::styled(user1, user_style(user1));
-
-                let user2 = typers[1].as_str();
-                let user2 = Span::styled(user2, user_style(user2));
+                let user1 = settings.get_user_span(typers[0].as_ref());
+                let user2 = settings.get_user_span(typers[1].as_ref());
 
                 Spans(vec![
                     user1,
@@ -274,7 +584,7 @@ impl RoomInfo {
         let top = Rect::new(area.x, area.y, area.width, area.height - 1);
         let bar = Rect::new(area.x, area.y + top.height, area.width, 1);
 
-        Paragraph::new(self.get_typing_spans())
+        Paragraph::new(self.get_typing_spans(settings))
             .alignment(Alignment::Center)
             .render(bar, buf);
 
@@ -282,13 +592,28 @@ impl RoomInfo {
     }
 }
 
+fn emoji_map() -> CompletionMap<String, &'static Emoji> {
+    let mut emojis = CompletionMap::default();
+
+    for emoji in emojis::iter() {
+        for shortcode in emoji.shortcodes() {
+            emojis.insert(shortcode.to_string(), emoji);
+        }
+    }
+
+    return emojis;
+}
+
 pub struct ChatStore {
+    pub cmds: ProgramCommands,
     pub worker: Requester,
-    pub rooms: HashMap<OwnedRoomId, RoomInfo>,
-    pub names: HashMap<String, OwnedRoomId>,
+    pub rooms: CompletionMap<OwnedRoomId, RoomInfo>,
+    pub names: CompletionMap<String, OwnedRoomId>,
+    pub presences: CompletionMap<OwnedUserId, PresenceState>,
     pub verifications: HashMap<String, SasVerification>,
     pub settings: ApplicationSettings,
     pub need_load: HashSet<OwnedRoomId>,
+    pub emojis: CompletionMap<String, &'static Emoji>,
 }
 
 impl ChatStore {
@@ -297,13 +622,20 @@ impl ChatStore {
             worker,
             settings,
 
+            cmds: crate::commands::setup_commands(),
             names: Default::default(),
             rooms: Default::default(),
+            presences: Default::default(),
             verifications: Default::default(),
             need_load: Default::default(),
+            emojis: emoji_map(),
         }
     }
 
+    pub fn get_joined_room(&self, room_id: &RoomId) -> Option<Joined> {
+        self.worker.client.get_joined_room(room_id)
+    }
+
     pub fn get_room_title(&self, room_id: &RoomId) -> String {
         self.rooms
             .get(room_id)
@@ -312,15 +644,35 @@ impl ChatStore {
             .unwrap_or_else(|| "Untitled Matrix Room".to_string())
     }
 
+    pub async fn set_receipts(&mut self, receipts: Vec<(OwnedRoomId, Receipts)>) {
+        let mut updates = vec![];
+
+        for (room_id, receipts) in receipts.into_iter() {
+            if let Some(info) = self.rooms.get_mut(&room_id) {
+                info.receipts = receipts;
+
+                if let Some(read_till) = info.read_till.take() {
+                    updates.push((room_id, read_till));
+                }
+            }
+        }
+
+        for (room_id, read_till) in updates.into_iter() {
+            if let Some(room) = self.worker.client.get_joined_room(&room_id) {
+                let _ = room.read_receipt(read_till.as_ref()).await;
+            }
+        }
+    }
+
     pub fn mark_for_load(&mut self, room_id: OwnedRoomId) {
         self.need_load.insert(room_id);
     }
 
     pub fn load_older(&mut self, limit: u32) {
-        let ChatStore { need_load, rooms, worker, .. } = self;
+        let ChatStore { need_load, presences, rooms, worker, .. } = self;
 
         for room_id in std::mem::take(need_load).into_iter() {
-            let info = rooms.entry(room_id.clone()).or_default();
+            let info = rooms.get_or_default(room_id.clone());
 
             if info.recently_fetched() {
                 need_load.insert(room_id);
@@ -340,9 +692,18 @@ impl ChatStore {
             match res {
                 Ok((fetch_id, msgs)) => {
                     for msg in msgs.into_iter() {
-                        let key = (msg.origin_server_ts().into(), msg.event_id().to_owned());
+                        let sender = msg.sender().to_owned();
+                        let _ = presences.get_or_default(sender);
 
-                        info.messages.insert(key, Message::from(msg));
+                        match msg {
+                            AnyMessageLikeEvent::RoomMessage(msg) => {
+                                info.insert(msg);
+                            },
+                            AnyMessageLikeEvent::Reaction(ev) => {
+                                info.insert_reaction(ev);
+                            },
+                            _ => continue,
+                        }
                     }
 
                     info.fetch_id =
@@ -363,11 +724,11 @@ impl ChatStore {
     }
 
     pub fn get_room_info(&mut self, room_id: OwnedRoomId) -> &mut RoomInfo {
-        self.rooms.entry(room_id).or_default()
+        self.rooms.get_or_default(room_id)
     }
 
     pub fn set_room_name(&mut self, room_id: &RoomId, name: &str) {
-        self.rooms.entry(room_id.to_owned()).or_default().name = name.to_string().into();
+        self.rooms.get_or_default(room_id.to_owned()).name = name.to_string().into();
     }
 
     pub fn insert_sas(&mut self, sas: SasVerification) {
@@ -410,7 +771,7 @@ impl RoomFocus {
 
 #[derive(Clone, Debug, Eq, Hash, PartialEq)]
 pub enum IambBufferId {
-    Command,
+    Command(CommandType),
     Room(OwnedRoomId, RoomFocus),
     DirectList,
     MemberList(OwnedRoomId),
@@ -423,7 +784,7 @@ pub enum IambBufferId {
 impl IambBufferId {
     pub fn to_window(&self) -> Option<IambId> {
         match self {
-            IambBufferId::Command => None,
+            IambBufferId::Command(_) => None,
             IambBufferId::Room(room, _) => Some(IambId::Room(room.clone())),
             IambBufferId::DirectList => Some(IambId::DirectList),
             IambBufferId::MemberList(room) => Some(IambId::MemberList(room.clone())),
@@ -443,16 +804,146 @@ impl ApplicationInfo for IambInfo {
     type Action = IambAction;
     type WindowId = IambId;
     type ContentId = IambBufferId;
+
+    fn complete(
+        text: &EditRope,
+        cursor: &mut Cursor,
+        content: &IambBufferId,
+        store: &mut ProgramStore,
+    ) -> Vec<String> {
+        match content {
+            IambBufferId::Command(CommandType::Command) => complete_cmdbar(text, cursor, store),
+            IambBufferId::Command(CommandType::Search) => vec![],
+
+            IambBufferId::Room(_, RoomFocus::MessageBar) => {
+                complete_matrix_names(text, cursor, store)
+            },
+            IambBufferId::Room(_, RoomFocus::Scrollback) => vec![],
+
+            IambBufferId::DirectList => vec![],
+            IambBufferId::MemberList(_) => vec![],
+            IambBufferId::RoomList => vec![],
+            IambBufferId::SpaceList => vec![],
+            IambBufferId::VerifyList => vec![],
+            IambBufferId::Welcome => vec![],
+        }
+    }
+
+    fn content_of_command(ct: CommandType) -> IambBufferId {
+        IambBufferId::Command(ct)
+    }
+}
+
+fn complete_users(text: &EditRope, cursor: &mut Cursor, store: &ProgramStore) -> Vec<String> {
+    let id = text
+        .get_prefix_word_mut(cursor, &MATRIX_ID_WORD)
+        .unwrap_or_else(EditRope::empty);
+    let id = Cow::from(&id);
+
+    store
+        .application
+        .presences
+        .complete(id.as_ref())
+        .into_iter()
+        .map(|i| i.to_string())
+        .collect()
+}
+
+fn complete_matrix_names(
+    text: &EditRope,
+    cursor: &mut Cursor,
+    store: &ProgramStore,
+) -> Vec<String> {
+    let id = text
+        .get_prefix_word_mut(cursor, &MATRIX_ID_WORD)
+        .unwrap_or_else(EditRope::empty);
+    let id = Cow::from(&id);
+
+    let list = store.application.names.complete(id.as_ref());
+    if !list.is_empty() {
+        return list;
+    }
+
+    let list = store.application.presences.complete(id.as_ref());
+    if !list.is_empty() {
+        return list.into_iter().map(|i| i.to_string()).collect();
+    }
+
+    store
+        .application
+        .rooms
+        .complete(id.as_ref())
+        .into_iter()
+        .map(|i| i.to_string())
+        .collect()
+}
+
+fn complete_emoji(text: &EditRope, cursor: &mut Cursor, store: &ProgramStore) -> Vec<String> {
+    let sc = text.get_prefix_word_mut(cursor, &WordStyle::Little);
+    let sc = sc.unwrap_or_else(EditRope::empty);
+    let sc = Cow::from(&sc);
+
+    store.application.emojis.complete(sc.as_ref())
+}
+
+fn complete_cmdarg(
+    desc: CommandDescription,
+    text: &EditRope,
+    cursor: &mut Cursor,
+    store: &ProgramStore,
+) -> Vec<String> {
+    let cmd = match store.application.cmds.get(desc.command.as_str()) {
+        Ok(cmd) => cmd,
+        Err(_) => return vec![],
+    };
+
+    match cmd.name.as_str() {
+        "cancel" | "dms" | "edit" | "redact" | "reply" => vec![],
+        "members" | "rooms" | "spaces" | "welcome" => vec![],
+        "download" | "open" | "upload" => complete_path(text, cursor),
+        "react" | "unreact" => complete_emoji(text, cursor, store),
+
+        "invite" => complete_users(text, cursor, store),
+        "join" => complete_matrix_names(text, cursor, store),
+        "room" => vec![],
+        "verify" => vec![],
+        _ => panic!("unknown command {}", cmd.name.as_str()),
+    }
+}
+
+fn complete_cmdbar(text: &EditRope, cursor: &mut Cursor, store: &ProgramStore) -> Vec<String> {
+    let eo = text.cursor_to_offset(cursor);
+    let slice = text.slice(0.into(), eo, false);
+    let cow = Cow::from(&slice);
+
+    match CommandDescription::from_str(cow.as_ref()) {
+        Ok(desc) => {
+            if desc.arg.untrimmed.is_empty() {
+                // Complete command name and set cursor position.
+                let _ = text.get_prefix_word_mut(cursor, &WordStyle::Little);
+                store.application.cmds.complete_name(desc.command.as_str())
+            } else {
+                // Complete command argument.
+                complete_cmdarg(desc, text, cursor, store)
+            }
+        },
+
+        // Can't parse command text, so return zero completions.
+        Err(_) => vec![],
+    }
 }
 
 #[cfg(test)]
 pub mod tests {
     use super::*;
+    use crate::config::user_style_from_color;
     use crate::tests::*;
+    use modalkit::tui::style::Color;
 
     #[test]
     fn test_typing_spans() {
         let mut info = RoomInfo::default();
+        let settings = mock_settings();
 
         let users0 = vec![];
         let users1 = vec![TEST_USER1.clone()];
@@ -473,18 +964,18 @@ pub mod tests {
 
         // Nothing set.
         assert_eq!(info.users_typing, None);
-        assert_eq!(info.get_typing_spans(), Spans(vec![]));
+        assert_eq!(info.get_typing_spans(&settings), Spans(vec![]));
 
         // Empty typing list.
         info.set_typing(users0);
         assert!(info.users_typing.is_some());
-        assert_eq!(info.get_typing_spans(), Spans(vec![]));
+        assert_eq!(info.get_typing_spans(&settings), Spans(vec![]));
 
         // Single user typing.
         info.set_typing(users1);
         assert!(info.users_typing.is_some());
         assert_eq!(
-            info.get_typing_spans(),
+            info.get_typing_spans(&settings),
             Spans(vec![
                 Span::styled("@user1:example.com", user_style("@user1:example.com")),
                 Span::from(" is typing...")
@@ -495,7 +986,7 @@ pub mod tests {
         info.set_typing(users2);
         assert!(info.users_typing.is_some());
         assert_eq!(
-            info.get_typing_spans(),
+            info.get_typing_spans(&settings),
             Spans(vec![
                 Span::styled("@user1:example.com", user_style("@user1:example.com")),
                 Span::raw(" and "),
@@ -507,11 +998,62 @@ pub mod tests {
         // Four users typing.
         info.set_typing(users4);
         assert!(info.users_typing.is_some());
-        assert_eq!(info.get_typing_spans(), Spans::from("Several people are typing..."));
+        assert_eq!(info.get_typing_spans(&settings), Spans::from("Several people are typing..."));
 
         // Five users typing.
         info.set_typing(users5);
         assert!(info.users_typing.is_some());
-        assert_eq!(info.get_typing_spans(), Spans::from("Many people are typing..."));
+        assert_eq!(info.get_typing_spans(&settings), Spans::from("Many people are typing..."));
+
+        // Test that USER5 gets rendered using the configured color and name.
+        info.set_typing(vec![TEST_USER5.clone()]);
+        assert!(info.users_typing.is_some());
+        assert_eq!(
+            info.get_typing_spans(&settings),
+            Spans(vec![
+                Span::styled("USER 5", user_style_from_color(Color::Black)),
+                Span::from(" is typing...")
+            ])
+        );
+    }
+
+    #[tokio::test]
+    async fn test_complete_cmdbar() {
+        let store = mock_store().await;
+
+        let text = EditRope::from("invite    ");
+        let mut cursor = Cursor::new(0, 7);
+        let id = text
+            .get_prefix_word_mut(&mut cursor, &MATRIX_ID_WORD)
+            .unwrap_or_else(EditRope::empty);
+        assert_eq!(id.to_string(), "");
+        assert_eq!(cursor, Cursor::new(0, 7));
+
+        let text = EditRope::from("invite    ");
+        let mut cursor = Cursor::new(0, 7);
+        let res = complete_cmdbar(&text, &mut cursor, &store);
+        assert_eq!(res, vec![
+            "@user1:example.com",
+            "@user2:example.com",
+            "@user3:example.com",
+            "@user4:example.com",
+            "@user5:example.com"
+        ]);
+
+        let text = EditRope::from("invite ignored");
+        let mut cursor = Cursor::new(0, 7);
+        let res = complete_cmdbar(&text, &mut cursor, &store);
+        assert_eq!(res, vec![
+            "@user1:example.com",
+            "@user2:example.com",
+            "@user3:example.com",
+            "@user4:example.com",
+            "@user5:example.com"
+        ]);
+
+        let text = EditRope::from("invite @user1ignored");
+        let mut cursor = Cursor::new(0, 13);
+        let res = complete_cmdbar(&text, &mut cursor, &store);
+        assert_eq!(res, vec!["@user1:example.com"]);
     }
 }

src/commands.rs

@@ -1,24 +1,105 @@
+use std::convert::TryFrom;
+
+use matrix_sdk::ruma::{events::tag::TagName, OwnedUserId};
+
 use modalkit::{
     editing::base::OpenTarget,
-    env::vim::command::{CommandContext, CommandDescription},
+    env::vim::command::{CommandContext, CommandDescription, OptionType},
     input::commands::{CommandError, CommandResult, CommandStep},
     input::InputContext,
 };
 
 use crate::base::{
+    CreateRoomFlags,
+    CreateRoomType,
+    DownloadFlags,
+    HomeserverAction,
     IambAction,
     IambId,
+    MessageAction,
     ProgramCommand,
     ProgramCommands,
     ProgramContext,
     RoomAction,
-    SetRoomField,
+    RoomField,
+    SendAction,
     VerifyAction,
 };
 
 type ProgContext = CommandContext<ProgramContext>;
 type ProgResult = CommandResult<ProgramCommand>;
 
+/// Convert strings the user types into a tag name.
+fn tag_name(name: String) -> Result<TagName, CommandError> {
+    let tag = match name.as_str() {
+        "fav" | "favorite" | "favourite" | "m.favourite" => TagName::Favorite,
+        "low" | "lowpriority" | "low_priority" | "low-priority" | "m.lowpriority" => {
+            TagName::LowPriority
+        },
+        "servernotice" | "server_notice" | "server-notice" | "m.server_notice" => {
+            TagName::ServerNotice
+        },
+        _ => {
+            if let Ok(tag) = name.parse() {
+                TagName::User(tag)
+            } else {
+                let msg = format!("Invalid user tag name: {name}");
+
+                return Err(CommandError::Error(msg));
+            }
+        },
+    };
+
+    Ok(tag)
+}
+
+fn iamb_invite(desc: CommandDescription, ctx: &mut ProgContext) -> ProgResult {
+    let args = desc.arg.strings()?;
+
+    if args.is_empty() {
+        return Err(CommandError::InvalidArgument);
+    }
+
+    let ract = match args[0].as_str() {
+        "accept" => {
+            if args.len() != 1 {
+                return Err(CommandError::InvalidArgument);
+            }
+
+            RoomAction::InviteAccept
+        },
+        "reject" => {
+            if args.len() != 1 {
+                return Err(CommandError::InvalidArgument);
+            }
+
+            RoomAction::InviteReject
+        },
+        "send" => {
+            if args.len() != 2 {
+                return Err(CommandError::InvalidArgument);
+            }
+
+            if let Ok(user) = OwnedUserId::try_from(args[1].as_str()) {
+                RoomAction::InviteSend(user)
+            } else {
+                let msg = format!("Invalid user identifier: {}", args[1]);
+                let err = CommandError::Error(msg);
+
+                return Err(err);
+            }
+        },
+        _ => {
+            return Err(CommandError::InvalidArgument);
+        },
+    };
+
+    let iact = IambAction::from(ract);
+    let step = CommandStep::Continue(iact.into(), ctx.context.take());
+
+    return Ok(step);
+}
+
 fn iamb_verify(desc: CommandDescription, ctx: &mut ProgContext) -> ProgResult {
     let mut args = desc.arg.strings()?;
 
@@ -80,6 +161,99 @@ fn iamb_members(desc: CommandDescription, ctx: &mut ProgContext) -> ProgResult {
     return Ok(step);
 }
 
+fn iamb_cancel(desc: CommandDescription, ctx: &mut ProgContext) -> ProgResult {
+    if !desc.arg.text.is_empty() {
+        return Result::Err(CommandError::InvalidArgument);
+    }
+
+    let mact = IambAction::from(MessageAction::Cancel);
+    let step = CommandStep::Continue(mact.into(), ctx.context.take());
+
+    return Ok(step);
+}
+
+fn iamb_edit(desc: CommandDescription, ctx: &mut ProgContext) -> ProgResult {
+    if !desc.arg.text.is_empty() {
+        return Result::Err(CommandError::InvalidArgument);
+    }
+
+    let mact = IambAction::from(MessageAction::Edit);
+    let step = CommandStep::Continue(mact.into(), ctx.context.take());
+
+    return Ok(step);
+}
+
+fn iamb_react(desc: CommandDescription, ctx: &mut ProgContext) -> ProgResult {
+    let args = desc.arg.strings()?;
+
+    if args.len() != 1 {
+        return Result::Err(CommandError::InvalidArgument);
+    }
+
+    let k = args[0].as_str();
+
+    if let Some(emoji) = emojis::get(k).or_else(|| emojis::get_by_shortcode(k)) {
+        let mact = IambAction::from(MessageAction::React(emoji.to_string()));
+        let step = CommandStep::Continue(mact.into(), ctx.context.take());
+
+        return Ok(step);
+    } else {
+        let msg = format!("Invalid Emoji or shortcode: {k}");
+
+        return Result::Err(CommandError::Error(msg));
+    }
+}
+
+fn iamb_unreact(desc: CommandDescription, ctx: &mut ProgContext) -> ProgResult {
+    let mut args = desc.arg.strings()?;
+
+    if args.len() > 1 {
+        return Result::Err(CommandError::InvalidArgument);
+    }
+
+    let mact = if let Some(k) = args.pop() {
+        let k = k.as_str();
+
+        if let Some(emoji) = emojis::get(k).or_else(|| emojis::get_by_shortcode(k)) {
+            IambAction::from(MessageAction::Unreact(Some(emoji.to_string())))
+        } else {
+            let msg = format!("Invalid Emoji or shortcode: {k}");
+
+            return Result::Err(CommandError::Error(msg));
+        }
+    } else {
+        IambAction::from(MessageAction::Unreact(None))
+    };
+
+    let step = CommandStep::Continue(mact.into(), ctx.context.take());
+
+    return Ok(step);
+}
+
+fn iamb_redact(desc: CommandDescription, ctx: &mut ProgContext) -> ProgResult {
+    let args = desc.arg.strings()?;
+
+    if args.len() > 1 {
+        return Result::Err(CommandError::InvalidArgument);
+    }
+
+    let ract = IambAction::from(MessageAction::Redact(args.into_iter().next()));
+    let step = CommandStep::Continue(ract.into(), ctx.context.take());
+
+    return Ok(step);
+}
+
+fn iamb_reply(desc: CommandDescription, ctx: &mut ProgContext) -> ProgResult {
+    if !desc.arg.text.is_empty() {
+        return Result::Err(CommandError::InvalidArgument);
+    }
+
+    let ract = IambAction::from(MessageAction::Reply);
+    let step = CommandStep::Continue(ract.into(), ctx.context.take());
+
+    return Ok(step);
+}
+
 fn iamb_rooms(desc: CommandDescription, ctx: &mut ProgContext) -> ProgResult {
     if !desc.arg.text.is_empty() {
         return Result::Err(CommandError::InvalidArgument);
@@ -126,22 +300,93 @@ fn iamb_join(desc: CommandDescription, ctx: &mut ProgContext) -> ProgResult {
     return Ok(step);
 }
 
-fn iamb_set(desc: CommandDescription, ctx: &mut ProgContext) -> ProgResult {
+fn iamb_create(desc: CommandDescription, ctx: &mut ProgContext) -> ProgResult {
+    let args = desc.arg.options()?;
+    let mut flags = CreateRoomFlags::NONE;
+    let mut alias = None;
+    let mut ct = CreateRoomType::Room;
+
+    for arg in args {
+        match arg {
+            OptionType::Flag(name, Some(arg)) => {
+                match name.as_str() {
+                    "alias" => {
+                        if alias.is_some() {
+                            let msg = "Multiple ++alias arguments are not allowed";
+                            let err = CommandError::Error(msg.into());
+
+                            return Err(err);
+                        } else {
+                            alias = Some(arg);
+                        }
+                    },
+                    _ => return Err(CommandError::InvalidArgument),
+                }
+            },
+            OptionType::Flag(name, None) => {
+                match name.as_str() {
+                    "public" => flags |= CreateRoomFlags::PUBLIC,
+                    "space" => ct = CreateRoomType::Space,
+                    "enc" | "encrypted" => flags |= CreateRoomFlags::ENCRYPTED,
+                    _ => return Err(CommandError::InvalidArgument),
+                }
+            },
+            OptionType::Positional(_) => {
+                let msg = ":create doesn't take any positional arguments";
+                let err = CommandError::Error(msg.into());
+
+                return Err(err);
+            },
+        }
+    }
+
+    let hact = HomeserverAction::CreateRoom(alias, ct, flags);
+    let iact = IambAction::from(hact);
+    let step = CommandStep::Continue(iact.into(), ctx.context.take());
+
+    return Ok(step);
+}
+
+fn iamb_room(desc: CommandDescription, ctx: &mut ProgContext) -> ProgResult {
     let mut args = desc.arg.strings()?;
 
-    if args.len() != 2 {
+    if args.len() < 2 {
         return Result::Err(CommandError::InvalidArgument);
     }
 
     let field = args.remove(0);
-    let value = args.remove(0);
+    let action = args.remove(0);
 
-    let act: IambAction = match field.as_str() {
-        "room.name" => RoomAction::Set(SetRoomField::Name(value)).into(),
-        "room.topic" => RoomAction::Set(SetRoomField::Topic(value)).into(),
-        _ => {
+    if args.len() > 1 {
         return Result::Err(CommandError::InvalidArgument);
-        },
+    }
+
+    let act: IambAction = match (field.as_str(), action.as_str(), args.pop()) {
+        // :room name set <room-name>
+        ("name", "set", Some(s)) => RoomAction::Set(RoomField::Name, s).into(),
+        ("name", "set", None) => return Result::Err(CommandError::InvalidArgument),
+
+        // :room name unset
+        ("name", "unset", None) => RoomAction::Unset(RoomField::Name).into(),
+        ("name", "unset", Some(_)) => return Result::Err(CommandError::InvalidArgument),
+
+        // :room topic set <topic>
+        ("topic", "set", Some(s)) => RoomAction::Set(RoomField::Topic, s).into(),
+        ("topic", "set", None) => return Result::Err(CommandError::InvalidArgument),
+
+        // :room topic unset
+        ("topic", "unset", None) => RoomAction::Unset(RoomField::Topic).into(),
+        ("topic", "unset", Some(_)) => return Result::Err(CommandError::InvalidArgument),
+
+        // :room tag set <tag-name>
+        ("tag", "set", Some(s)) => RoomAction::Set(RoomField::Tag(tag_name(s)?), "".into()).into(),
+        ("tag", "set", None) => return Result::Err(CommandError::InvalidArgument),
+
+        // :room tag unset <tag-name>
+        ("tag", "unset", Some(s)) => RoomAction::Unset(RoomField::Tag(tag_name(s)?)).into(),
+        ("tag", "unset", None) => return Result::Err(CommandError::InvalidArgument),
+
+        _ => return Result::Err(CommandError::InvalidArgument),
     };
 
     let step = CommandStep::Continue(act.into(), ctx.context.take());
@@ -149,15 +394,132 @@ fn iamb_set(desc: CommandDescription, ctx: &mut ProgContext) -> ProgResult {
     return Ok(step);
 }
 
+fn iamb_upload(desc: CommandDescription, ctx: &mut ProgContext) -> ProgResult {
+    let mut args = desc.arg.strings()?;
+
+    if args.len() != 1 {
+        return Result::Err(CommandError::InvalidArgument);
+    }
+
+    let sact = SendAction::Upload(args.remove(0));
+    let iact = IambAction::from(sact);
+    let step = CommandStep::Continue(iact.into(), ctx.context.take());
+
+    return Ok(step);
+}
+
+fn iamb_download(desc: CommandDescription, ctx: &mut ProgContext) -> ProgResult {
+    let mut args = desc.arg.strings()?;
+
+    if args.len() > 1 {
+        return Result::Err(CommandError::InvalidArgument);
+    }
+
+    let mut flags = DownloadFlags::NONE;
+    if desc.bang {
+        flags |= DownloadFlags::FORCE;
+    };
+    let mact = MessageAction::Download(args.pop(), flags);
+    let iact = IambAction::from(mact);
+    let step = CommandStep::Continue(iact.into(), ctx.context.take());
+
+    return Ok(step);
+}
+
+fn iamb_open(desc: CommandDescription, ctx: &mut ProgContext) -> ProgResult {
+    let mut args = desc.arg.strings()?;
+
+    if args.len() > 1 {
+        return Result::Err(CommandError::InvalidArgument);
+    }
+
+    let mut flags = DownloadFlags::OPEN;
+    if desc.bang {
+        flags |= DownloadFlags::FORCE;
+    };
+    let mact = MessageAction::Download(args.pop(), flags);
+    let iact = IambAction::from(mact);
+    let step = CommandStep::Continue(iact.into(), ctx.context.take());
+
+    return Ok(step);
+}
+
 fn add_iamb_commands(cmds: &mut ProgramCommands) {
-    cmds.add_command(ProgramCommand { names: vec!["dms".into()], f: iamb_dms });
-    cmds.add_command(ProgramCommand { names: vec!["join".into()], f: iamb_join });
-    cmds.add_command(ProgramCommand { names: vec!["members".into()], f: iamb_members });
-    cmds.add_command(ProgramCommand { names: vec!["rooms".into()], f: iamb_rooms });
-    cmds.add_command(ProgramCommand { names: vec!["set".into()], f: iamb_set });
-    cmds.add_command(ProgramCommand { names: vec!["spaces".into()], f: iamb_spaces });
-    cmds.add_command(ProgramCommand { names: vec!["verify".into()], f: iamb_verify });
-    cmds.add_command(ProgramCommand { names: vec!["welcome".into()], f: iamb_welcome });
+    cmds.add_command(ProgramCommand {
+        name: "cancel".into(),
+        aliases: vec![],
+        f: iamb_cancel,
+    });
+    cmds.add_command(ProgramCommand {
+        name: "create".into(),
+        aliases: vec![],
+        f: iamb_create,
+    });
+    cmds.add_command(ProgramCommand { name: "dms".into(), aliases: vec![], f: iamb_dms });
+    cmds.add_command(ProgramCommand {
+        name: "download".into(),
+        aliases: vec![],
+        f: iamb_download,
+    });
+    cmds.add_command(ProgramCommand { name: "open".into(), aliases: vec![], f: iamb_open });
+    cmds.add_command(ProgramCommand { name: "edit".into(), aliases: vec![], f: iamb_edit });
+    cmds.add_command(ProgramCommand {
+        name: "invite".into(),
+        aliases: vec![],
+        f: iamb_invite,
+    });
+    cmds.add_command(ProgramCommand { name: "join".into(), aliases: vec![], f: iamb_join });
+    cmds.add_command(ProgramCommand {
+        name: "members".into(),
+        aliases: vec![],
+        f: iamb_members,
+    });
+    cmds.add_command(ProgramCommand {
+        name: "react".into(),
+        aliases: vec![],
+        f: iamb_react,
+    });
+    cmds.add_command(ProgramCommand {
+        name: "redact".into(),
+        aliases: vec![],
+        f: iamb_redact,
+    });
+    cmds.add_command(ProgramCommand {
+        name: "reply".into(),
+        aliases: vec![],
+        f: iamb_reply,
+    });
+    cmds.add_command(ProgramCommand {
+        name: "rooms".into(),
+        aliases: vec![],
+        f: iamb_rooms,
+    });
+    cmds.add_command(ProgramCommand { name: "room".into(), aliases: vec![], f: iamb_room });
+    cmds.add_command(ProgramCommand {
+        name: "spaces".into(),
+        aliases: vec![],
+        f: iamb_spaces,
+    });
+    cmds.add_command(ProgramCommand {
+        name: "unreact".into(),
+        aliases: vec![],
+        f: iamb_unreact,
+    });
+    cmds.add_command(ProgramCommand {
+        name: "upload".into(),
+        aliases: vec![],
+        f: iamb_upload,
+    });
+    cmds.add_command(ProgramCommand {
+        name: "verify".into(),
+        aliases: vec![],
+        f: iamb_verify,
+    });
+    cmds.add_command(ProgramCommand {
+        name: "welcome".into(),
+        aliases: vec![],
+        f: iamb_welcome,
+    });
 }
 
 pub fn setup_commands() -> ProgramCommands {
@@ -171,6 +533,7 @@ pub fn setup_commands() -> ProgramCommands {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use matrix_sdk::ruma::user_id;
     use modalkit::editing::action::WindowAction;
 
     #[test]
@@ -241,46 +604,284 @@ mod tests {
     }
 
     #[test]
-    fn test_cmd_set() {
+    fn test_cmd_room_invalid() {
+        let mut cmds = setup_commands();
+        let ctx = ProgramContext::default();
+
+        let res = cmds.input_cmd("room", ctx.clone());
+        assert_eq!(res, Err(CommandError::InvalidArgument));
+
+        let res = cmds.input_cmd("room foo", ctx.clone());
+        assert_eq!(res, Err(CommandError::InvalidArgument));
+
+        let res = cmds.input_cmd("room set topic", ctx.clone());
+        assert_eq!(res, Err(CommandError::InvalidArgument));
+    }
+
+    #[test]
+    fn test_cmd_room_topic_set() {
         let mut cmds = setup_commands();
         let ctx = ProgramContext::default();
 
         let res = cmds
-            .input_cmd("set room.topic \"Lots of fun discussion!\"", ctx.clone())
+            .input_cmd("room topic set \"Lots of fun discussion!\"", ctx.clone())
             .unwrap();
-        let act = IambAction::Room(SetRoomField::Topic("Lots of fun discussion!".into()).into());
+        let act = RoomAction::Set(RoomField::Topic, "Lots of fun discussion!".into());
         assert_eq!(res, vec![(act.into(), ctx.clone())]);
 
         let res = cmds
-            .input_cmd("set room.topic The\\ Discussion\\ Room", ctx.clone())
+            .input_cmd("room topic set The\\ Discussion\\ Room", ctx.clone())
             .unwrap();
-        let act = IambAction::Room(SetRoomField::Topic("The Discussion Room".into()).into());
+        let act = RoomAction::Set(RoomField::Topic, "The Discussion Room".into());
         assert_eq!(res, vec![(act.into(), ctx.clone())]);
 
-        let res = cmds.input_cmd("set room.topic Development", ctx.clone()).unwrap();
-        let act = IambAction::Room(SetRoomField::Topic("Development".into()).into());
+        let res = cmds.input_cmd("room topic set Development", ctx.clone()).unwrap();
+        let act = RoomAction::Set(RoomField::Topic, "Development".into());
         assert_eq!(res, vec![(act.into(), ctx.clone())]);
 
-        let res = cmds.input_cmd("set room.name Development", ctx.clone()).unwrap();
-        let act = IambAction::Room(SetRoomField::Name("Development".into()).into());
+        let res = cmds.input_cmd("room topic", ctx.clone());
+        assert_eq!(res, Err(CommandError::InvalidArgument));
+
+        let res = cmds.input_cmd("room topic set", ctx.clone());
+        assert_eq!(res, Err(CommandError::InvalidArgument));
+
+        let res = cmds.input_cmd("room topic set A B C", ctx.clone());
+        assert_eq!(res, Err(CommandError::InvalidArgument));
+    }
+
+    #[test]
+    fn test_cmd_room_name_invalid() {
+        let mut cmds = setup_commands();
+        let ctx = ProgramContext::default();
+
+        let res = cmds.input_cmd("room name", ctx.clone());
+        assert_eq!(res, Err(CommandError::InvalidArgument));
+
+        let res = cmds.input_cmd("room name foo", ctx.clone());
+        assert_eq!(res, Err(CommandError::InvalidArgument));
+    }
+
+    #[test]
+    fn test_cmd_room_name_set() {
+        let mut cmds = setup_commands();
+        let ctx = ProgramContext::default();
+
+        let res = cmds.input_cmd("room name set Development", ctx.clone()).unwrap();
+        let act = RoomAction::Set(RoomField::Name, "Development".into());
         assert_eq!(res, vec![(act.into(), ctx.clone())]);
 
         let res = cmds
-            .input_cmd("set room.name \"Application Development\"", ctx.clone())
+            .input_cmd("room name set \"Application Development\"", ctx.clone())
             .unwrap();
-        let act = IambAction::Room(SetRoomField::Name("Application Development".into()).into());
+        let act = RoomAction::Set(RoomField::Name, "Application Development".into());
         assert_eq!(res, vec![(act.into(), ctx.clone())]);
 
-        let res = cmds.input_cmd("set", ctx.clone());
+        let res = cmds.input_cmd("room name set", ctx.clone());
+        assert_eq!(res, Err(CommandError::InvalidArgument));
+    }
+
+    #[test]
+    fn test_cmd_room_name_unset() {
+        let mut cmds = setup_commands();
+        let ctx = ProgramContext::default();
+
+        let res = cmds.input_cmd("room name unset", ctx.clone()).unwrap();
+        let act = RoomAction::Unset(RoomField::Name);
+        assert_eq!(res, vec![(act.into(), ctx.clone())]);
+
+        let res = cmds.input_cmd("room name unset foo", ctx.clone());
+        assert_eq!(res, Err(CommandError::InvalidArgument));
+    }
+
+    #[test]
+    fn test_cmd_room_tag_set() {
+        let mut cmds = setup_commands();
+        let ctx = ProgramContext::default();
+
+        let res = cmds.input_cmd("room tag set favourite", ctx.clone()).unwrap();
+        let act = RoomAction::Set(RoomField::Tag(TagName::Favorite), "".into());
+        assert_eq!(res, vec![(act.into(), ctx.clone())]);
+
+        let res = cmds.input_cmd("room tag set favorite", ctx.clone()).unwrap();
+        let act = RoomAction::Set(RoomField::Tag(TagName::Favorite), "".into());
+        assert_eq!(res, vec![(act.into(), ctx.clone())]);
+
+        let res = cmds.input_cmd("room tag set fav", ctx.clone()).unwrap();
+        let act = RoomAction::Set(RoomField::Tag(TagName::Favorite), "".into());
+        assert_eq!(res, vec![(act.into(), ctx.clone())]);
+
+        let res = cmds.input_cmd("room tag set low_priority", ctx.clone()).unwrap();
+        let act = RoomAction::Set(RoomField::Tag(TagName::LowPriority), "".into());
+        assert_eq!(res, vec![(act.into(), ctx.clone())]);
+
+        let res = cmds.input_cmd("room tag set low-priority", ctx.clone()).unwrap();
+        let act = RoomAction::Set(RoomField::Tag(TagName::LowPriority), "".into());
+        assert_eq!(res, vec![(act.into(), ctx.clone())]);
+
+        let res = cmds.input_cmd("room tag set low", ctx.clone()).unwrap();
+        let act = RoomAction::Set(RoomField::Tag(TagName::LowPriority), "".into());
+        assert_eq!(res, vec![(act.into(), ctx.clone())]);
+
+        let res = cmds.input_cmd("room tag set servernotice", ctx.clone()).unwrap();
+        let act = RoomAction::Set(RoomField::Tag(TagName::ServerNotice), "".into());
+        assert_eq!(res, vec![(act.into(), ctx.clone())]);
+
+        let res = cmds.input_cmd("room tag set server_notice", ctx.clone()).unwrap();
+        let act = RoomAction::Set(RoomField::Tag(TagName::ServerNotice), "".into());
+        assert_eq!(res, vec![(act.into(), ctx.clone())]);
+
+        let res = cmds.input_cmd("room tag set server_notice", ctx.clone()).unwrap();
+        let act = RoomAction::Set(RoomField::Tag(TagName::ServerNotice), "".into());
+        assert_eq!(res, vec![(act.into(), ctx.clone())]);
+
+        let res = cmds.input_cmd("room tag set u.custom-tag", ctx.clone()).unwrap();
+        let act = RoomAction::Set(
+            RoomField::Tag(TagName::User("u.custom-tag".parse().unwrap())),
+            "".into(),
+        );
+        assert_eq!(res, vec![(act.into(), ctx.clone())]);
+
+        let res = cmds.input_cmd("room tag set u.irc", ctx.clone()).unwrap();
+        let act =
+            RoomAction::Set(RoomField::Tag(TagName::User("u.irc".parse().unwrap())), "".into());
+        assert_eq!(res, vec![(act.into(), ctx.clone())]);
+
+        let res = cmds.input_cmd("room tag", ctx.clone());
         assert_eq!(res, Err(CommandError::InvalidArgument));
 
-        let res = cmds.input_cmd("set room.name", ctx.clone());
+        let res = cmds.input_cmd("room tag set", ctx.clone());
         assert_eq!(res, Err(CommandError::InvalidArgument));
 
-        let res = cmds.input_cmd("set room.topic", ctx.clone());
+        let res = cmds.input_cmd("room tag set unknown", ctx.clone());
+        assert_eq!(res, Err(CommandError::Error("Invalid user tag name: unknown".into())));
+
+        let res = cmds.input_cmd("room tag set needs-leading-u-dot", ctx.clone());
+        assert_eq!(
+            res,
+            Err(CommandError::Error("Invalid user tag name: needs-leading-u-dot".into()))
+        );
+    }
+
+    #[test]
+    fn test_cmd_room_tag_unset() {
+        let mut cmds = setup_commands();
+        let ctx = ProgramContext::default();
+
+        let res = cmds.input_cmd("room tag unset favourite", ctx.clone()).unwrap();
+        let act = RoomAction::Unset(RoomField::Tag(TagName::Favorite));
+        assert_eq!(res, vec![(act.into(), ctx.clone())]);
+
+        let res = cmds.input_cmd("room tag unset favorite", ctx.clone()).unwrap();
+        let act = RoomAction::Unset(RoomField::Tag(TagName::Favorite));
+        assert_eq!(res, vec![(act.into(), ctx.clone())]);
+
+        let res = cmds.input_cmd("room tag unset fav", ctx.clone()).unwrap();
+        let act = RoomAction::Unset(RoomField::Tag(TagName::Favorite));
+        assert_eq!(res, vec![(act.into(), ctx.clone())]);
+
+        let res = cmds.input_cmd("room tag unset low_priority", ctx.clone()).unwrap();
+        let act = RoomAction::Unset(RoomField::Tag(TagName::LowPriority));
+        assert_eq!(res, vec![(act.into(), ctx.clone())]);
+
+        let res = cmds.input_cmd("room tag unset low-priority", ctx.clone()).unwrap();
+        let act = RoomAction::Unset(RoomField::Tag(TagName::LowPriority));
+        assert_eq!(res, vec![(act.into(), ctx.clone())]);
+
+        let res = cmds.input_cmd("room tag unset low", ctx.clone()).unwrap();
+        let act = RoomAction::Unset(RoomField::Tag(TagName::LowPriority));
+        assert_eq!(res, vec![(act.into(), ctx.clone())]);
+
+        let res = cmds.input_cmd("room tag unset servernotice", ctx.clone()).unwrap();
+        let act = RoomAction::Unset(RoomField::Tag(TagName::ServerNotice));
+        assert_eq!(res, vec![(act.into(), ctx.clone())]);
+
+        let res = cmds.input_cmd("room tag unset server_notice", ctx.clone()).unwrap();
+        let act = RoomAction::Unset(RoomField::Tag(TagName::ServerNotice));
+        assert_eq!(res, vec![(act.into(), ctx.clone())]);
+
+        let res = cmds.input_cmd("room tag unset server_notice", ctx.clone()).unwrap();
+        let act = RoomAction::Unset(RoomField::Tag(TagName::ServerNotice));
+        assert_eq!(res, vec![(act.into(), ctx.clone())]);
+
+        let res = cmds.input_cmd("room tag unset u.custom-tag", ctx.clone()).unwrap();
+        let act = RoomAction::Unset(RoomField::Tag(TagName::User("u.custom-tag".parse().unwrap())));
+        assert_eq!(res, vec![(act.into(), ctx.clone())]);
+
+        let res = cmds.input_cmd("room tag unset u.irc", ctx.clone()).unwrap();
+        let act = RoomAction::Unset(RoomField::Tag(TagName::User("u.irc".parse().unwrap())));
+        assert_eq!(res, vec![(act.into(), ctx.clone())]);
+
+        let res = cmds.input_cmd("room tag", ctx.clone());
         assert_eq!(res, Err(CommandError::InvalidArgument));
 
-        let res = cmds.input_cmd("set room.topic A B C", ctx.clone());
+        let res = cmds.input_cmd("room tag set", ctx.clone());
+        assert_eq!(res, Err(CommandError::InvalidArgument));
+
+        let res = cmds.input_cmd("room tag unset unknown", ctx.clone());
+        assert_eq!(res, Err(CommandError::Error("Invalid user tag name: unknown".into())));
+
+        let res = cmds.input_cmd("room tag unset needs-leading-u-dot", ctx.clone());
+        assert_eq!(
+            res,
+            Err(CommandError::Error("Invalid user tag name: needs-leading-u-dot".into()))
+        );
+    }
+
+    #[test]
+    fn test_cmd_invite() {
+        let mut cmds = setup_commands();
+        let ctx = ProgramContext::default();
+
+        let res = cmds.input_cmd("invite accept", ctx.clone()).unwrap();
+        let act = IambAction::Room(RoomAction::InviteAccept);
+        assert_eq!(res, vec![(act.into(), ctx.clone())]);
+
+        let res = cmds.input_cmd("invite reject", ctx.clone()).unwrap();
+        let act = IambAction::Room(RoomAction::InviteReject);
+        assert_eq!(res, vec![(act.into(), ctx.clone())]);
+
+        let res = cmds.input_cmd("invite send @user:example.com", ctx.clone()).unwrap();
+        let act =
+            IambAction::Room(RoomAction::InviteSend(user_id!("@user:example.com").to_owned()));
+        assert_eq!(res, vec![(act.into(), ctx.clone())]);
+
+        let res = cmds.input_cmd("invite", ctx.clone());
+        assert_eq!(res, Err(CommandError::InvalidArgument));
+
+        let res = cmds.input_cmd("invite foo", ctx.clone());
+        assert_eq!(res, Err(CommandError::InvalidArgument));
+
+        let res = cmds.input_cmd("invite accept @user:example.com", ctx.clone());
+        assert_eq!(res, Err(CommandError::InvalidArgument));
+
+        let res = cmds.input_cmd("invite reject @user:example.com", ctx.clone());
+        assert_eq!(res, Err(CommandError::InvalidArgument));
+
+        let res = cmds.input_cmd("invite send", ctx.clone());
+        assert_eq!(res, Err(CommandError::InvalidArgument));
+
+        let res = cmds.input_cmd("invite @user:example.com", ctx.clone());
+        assert_eq!(res, Err(CommandError::InvalidArgument));
+    }
+
+    #[test]
+    fn test_cmd_redact() {
+        let mut cmds = setup_commands();
+        let ctx = ProgramContext::default();
+
+        let res = cmds.input_cmd("redact", ctx.clone()).unwrap();
+        let act = IambAction::Message(MessageAction::Redact(None));
+        assert_eq!(res, vec![(act.into(), ctx.clone())]);
+
+        let res = cmds.input_cmd("redact Removed", ctx.clone()).unwrap();
+        let act = IambAction::Message(MessageAction::Redact(Some("Removed".into())));
+        assert_eq!(res, vec![(act.into(), ctx.clone())]);
+
+        let res = cmds.input_cmd("redact \"Removed\"", ctx.clone()).unwrap();
+        let act = IambAction::Message(MessageAction::Redact(Some("Removed".into())));
+        assert_eq!(res, vec![(act.into(), ctx.clone())]);
+
+        let res = cmds.input_cmd("redact Removed Removed", ctx.clone());
         assert_eq!(res, Err(CommandError::InvalidArgument));
     }
 }

src/config.rs

@@ -1,14 +1,23 @@
+use std::borrow::Cow;
+use std::collections::hash_map::DefaultHasher;
 use std::collections::HashMap;
+use std::fmt;
 use std::fs::File;
+use std::hash::{Hash, Hasher};
 use std::io::BufReader;
 use std::path::{Path, PathBuf};
 use std::process;
 
 use clap::Parser;
-use matrix_sdk::ruma::OwnedUserId;
-use serde::Deserialize;
+use matrix_sdk::ruma::{OwnedUserId, UserId};
+use serde::{de::Error as SerdeError, de::Visitor, Deserialize, Deserializer};
 use url::Url;
 
+use modalkit::tui::{
+    style::{Color, Modifier as StyleModifier, Style},
+    text::Span,
+};
+
 macro_rules! usage {
     ( $($args: tt)* ) => {
         println!($($args)*);
@@ -16,6 +25,34 @@ macro_rules! usage {
     }
 }
 
+const COLORS: [Color; 13] = [
+    Color::Blue,
+    Color::Cyan,
+    Color::Green,
+    Color::LightBlue,
+    Color::LightGreen,
+    Color::LightCyan,
+    Color::LightMagenta,
+    Color::LightRed,
+    Color::LightYellow,
+    Color::Magenta,
+    Color::Red,
+    Color::Reset,
+    Color::Yellow,
+];
+
+pub fn user_color(user: &str) -> Color {
+    let mut hasher = DefaultHasher::new();
+    user.hash(&mut hasher);
+    let color = hasher.finish() as usize % COLORS.len();
+
+    COLORS[color]
+}
+
+pub fn user_style_from_color(color: Color) -> Style {
+    Style::default().fg(color).add_modifier(StyleModifier::BOLD)
+}
+
 fn is_profile_char(c: char) -> bool {
     c.is_ascii_alphanumeric() || c == '.' || c == '-'
 }
@@ -69,30 +106,126 @@ pub enum ConfigError {
     Invalid(#[from] serde_json::Error),
 }
 
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct UserColor(pub Color);
+pub struct UserColorVisitor;
+
+impl<'de> Visitor<'de> for UserColorVisitor {
+    type Value = UserColor;
+
+    fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        formatter.write_str("a valid color")
+    }
+
+    fn visit_str<E>(self, value: &str) -> Result<Self::Value, E>
+    where
+        E: SerdeError,
+    {
+        match value {
+            "none" => Ok(UserColor(Color::Reset)),
+            "red" => Ok(UserColor(Color::Red)),
+            "black" => Ok(UserColor(Color::Black)),
+            "green" => Ok(UserColor(Color::Green)),
+            "yellow" => Ok(UserColor(Color::Yellow)),
+            "blue" => Ok(UserColor(Color::Blue)),
+            "magenta" => Ok(UserColor(Color::Magenta)),
+            "cyan" => Ok(UserColor(Color::Cyan)),
+            "gray" => Ok(UserColor(Color::Gray)),
+            "dark-gray" => Ok(UserColor(Color::DarkGray)),
+            "light-red" => Ok(UserColor(Color::LightRed)),
+            "light-green" => Ok(UserColor(Color::LightGreen)),
+            "light-yellow" => Ok(UserColor(Color::LightYellow)),
+            "light-blue" => Ok(UserColor(Color::LightBlue)),
+            "light-magenta" => Ok(UserColor(Color::LightMagenta)),
+            "light-cyan" => Ok(UserColor(Color::LightCyan)),
+            "white" => Ok(UserColor(Color::White)),
+            _ => Err(E::custom("Could not parse color")),
+        }
+    }
+}
+
+impl<'de> Deserialize<'de> for UserColor {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        deserializer.deserialize_str(UserColorVisitor)
+    }
+}
+
+#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq)]
+pub struct UserDisplayTunables {
+    pub color: Option<UserColor>,
+    pub name: Option<String>,
+}
+
+pub type UserOverrides = HashMap<OwnedUserId, UserDisplayTunables>;
+
+fn merge_users(a: Option<UserOverrides>, b: Option<UserOverrides>) -> Option<UserOverrides> {
+    match (a, b) {
+        (Some(a), None) => Some(a),
+        (None, Some(b)) => Some(b),
+        (Some(mut a), Some(b)) => {
+            for (k, v) in b {
+                a.insert(k, v);
+            }
+
+            Some(a)
+        },
+        (None, None) => None,
+    }
+}
+
 #[derive(Clone)]
 pub struct TunableValues {
-    pub typing_notice: bool,
+    pub reaction_display: bool,
+    pub reaction_shortcode_display: bool,
+    pub read_receipt_send: bool,
+    pub read_receipt_display: bool,
+    pub typing_notice_send: bool,
     pub typing_notice_display: bool,
+    pub users: UserOverrides,
+    pub default_room: Option<String>,
 }
 
 #[derive(Clone, Default, Deserialize)]
 pub struct Tunables {
-    pub typing_notice: Option<bool>,
+    pub reaction_display: Option<bool>,
+    pub reaction_shortcode_display: Option<bool>,
+    pub read_receipt_send: Option<bool>,
+    pub read_receipt_display: Option<bool>,
+    pub typing_notice_send: Option<bool>,
     pub typing_notice_display: Option<bool>,
+    pub users: Option<UserOverrides>,
+    pub default_room: Option<String>,
 }
 
 impl Tunables {
     fn merge(self, other: Self) -> Self {
         Tunables {
-            typing_notice: self.typing_notice.or(other.typing_notice),
+            reaction_display: self.reaction_display.or(other.reaction_display),
+            reaction_shortcode_display: self
+                .reaction_shortcode_display
+                .or(other.reaction_shortcode_display),
+            read_receipt_send: self.read_receipt_send.or(other.read_receipt_send),
+            read_receipt_display: self.read_receipt_display.or(other.read_receipt_display),
+            typing_notice_send: self.typing_notice_send.or(other.typing_notice_send),
             typing_notice_display: self.typing_notice_display.or(other.typing_notice_display),
+            users: merge_users(self.users, other.users),
+            default_room: self.default_room.or(other.default_room),
         }
     }
 
     fn values(self) -> TunableValues {
         TunableValues {
-            typing_notice: self.typing_notice.unwrap_or(true),
-            typing_notice_display: self.typing_notice.unwrap_or(true),
+            reaction_display: self.reaction_display.unwrap_or(true),
+            reaction_shortcode_display: self.reaction_shortcode_display.unwrap_or(false),
+            read_receipt_send: self.read_receipt_send.unwrap_or(true),
+            read_receipt_display: self.read_receipt_display.unwrap_or(true),
+            typing_notice_send: self.typing_notice_send.unwrap_or(true),
+            typing_notice_display: self.typing_notice_display.unwrap_or(true),
+            users: self.users.unwrap_or_default(),
+            default_room: self.default_room,
         }
     }
 }
@@ -123,7 +256,11 @@ impl Directories {
     fn values(self) -> DirectoryValues {
         let cache = self
             .cache
-            .or_else(dirs::cache_dir)
+            .or_else(|| {
+                let mut dir = dirs::cache_dir()?;
+                dir.push("iamb");
+                dir.into()
+            })
             .expect("no dirs.cache value configured!");
 
         let logs = self.logs.unwrap_or_else(|| {
@@ -255,11 +392,49 @@ impl ApplicationSettings {
 
         Ok(settings)
     }
+
+    pub fn get_user_char_span<'a>(&self, user_id: &'a UserId) -> Span<'a> {
+        let (color, c) = self
+            .tunables
+            .users
+            .get(user_id)
+            .map(|user| {
+                (
+                    user.color.as_ref().map(|c| c.0),
+                    user.name.as_ref().and_then(|s| s.chars().next()),
+                )
+            })
+            .unwrap_or_default();
+
+        let color = color.unwrap_or_else(|| user_color(user_id.as_str()));
+        let style = user_style_from_color(color);
+
+        let c = c.unwrap_or_else(|| user_id.localpart().chars().next().unwrap_or(' '));
+
+        Span::styled(String::from(c), style)
+    }
+
+    pub fn get_user_span<'a>(&self, user_id: &'a UserId) -> Span<'a> {
+        let (color, name) = self
+            .tunables
+            .users
+            .get(user_id)
+            .map(|user| (user.color.as_ref().map(|c| c.0), user.name.clone().map(Cow::Owned)))
+            .unwrap_or_default();
+
+        let user_id = user_id.as_str();
+        let color = color.unwrap_or_else(|| user_color(user_id));
+        let style = user_style_from_color(color);
+        let name = name.unwrap_or(Cow::Borrowed(user_id));
+
+        Span::styled(name, style)
+    }
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
+    use matrix_sdk::ruma::user_id;
 
     #[test]
     fn test_profile_name_invalid() {
@@ -283,4 +458,74 @@ mod tests {
         assert_eq!(validate_profile_name("a.b-c"), true);
         assert_eq!(validate_profile_name("a.B-c"), true);
     }
+
+    #[test]
+    fn test_merge_users() {
+        let a = None;
+        let b = vec![(user_id!("@a:b.c").to_owned(), UserDisplayTunables {
+            color: Some(UserColor(Color::Red)),
+            name: Some("Hello".into()),
+        })]
+        .into_iter()
+        .collect::<HashMap<_, _>>();
+        let c = vec![(user_id!("@a:b.c").to_owned(), UserDisplayTunables {
+            color: Some(UserColor(Color::Green)),
+            name: Some("World".into()),
+        })]
+        .into_iter()
+        .collect::<HashMap<_, _>>();
+
+        let res = merge_users(a.clone(), a.clone());
+        assert_eq!(res, None);
+
+        let res = merge_users(a.clone(), Some(b.clone()));
+        assert_eq!(res, Some(b.clone()));
+
+        let res = merge_users(Some(b.clone()), a.clone());
+        assert_eq!(res, Some(b.clone()));
+
+        let res = merge_users(Some(b.clone()), Some(b.clone()));
+        assert_eq!(res, Some(b.clone()));
+
+        let res = merge_users(Some(b.clone()), Some(c.clone()));
+        assert_eq!(res, Some(c.clone()));
+
+        let res = merge_users(Some(c.clone()), Some(b.clone()));
+        assert_eq!(res, Some(b.clone()));
+    }
+
+    #[test]
+    fn test_parse_tunables() {
+        let res: Tunables = serde_json::from_str("{}").unwrap();
+        assert_eq!(res.typing_notice_send, None);
+        assert_eq!(res.typing_notice_display, None);
+        assert_eq!(res.users, None);
+
+        let res: Tunables = serde_json::from_str("{\"typing_notice_send\": true}").unwrap();
+        assert_eq!(res.typing_notice_send, Some(true));
+        assert_eq!(res.typing_notice_display, None);
+        assert_eq!(res.users, None);
+
+        let res: Tunables = serde_json::from_str("{\"typing_notice_send\": false}").unwrap();
+        assert_eq!(res.typing_notice_send, Some(false));
+        assert_eq!(res.typing_notice_display, None);
+        assert_eq!(res.users, None);
+
+        let res: Tunables = serde_json::from_str("{\"users\": {}}").unwrap();
+        assert_eq!(res.typing_notice_send, None);
+        assert_eq!(res.typing_notice_display, None);
+        assert_eq!(res.users, Some(HashMap::new()));
+
+        let res: Tunables = serde_json::from_str(
+            "{\"users\": {\"@a:b.c\": {\"color\": \"black\", \"name\": \"Tim\"}}}",
+        )
+        .unwrap();
+        assert_eq!(res.typing_notice_send, None);
+        assert_eq!(res.typing_notice_display, None);
+        let users = vec![(user_id!("@a:b.c").to_owned(), UserDisplayTunables {
+            color: Some(UserColor(Color::Black)),
+            name: Some("Tim".into()),
+        })];
+        assert_eq!(res.users, Some(users.into_iter().collect()));
+    }
 }

src/keybindings.rs

@@ -1,32 +1,21 @@
 use modalkit::{
     editing::action::WindowAction,
-    editing::base::WordStyle,
     env::vim::keybindings::{InputStep, VimBindings},
     env::vim::VimMode,
     input::bindings::{EdgeEvent, EdgeRepeat, InputBindings},
     input::key::TerminalKey,
 };
 
-use crate::base::{IambAction, Keybindings};
+use crate::base::{IambAction, IambInfo, Keybindings, MATRIX_ID_WORD};
 
-/// Find the boundaries for a Matrix username, room alias, or room ID.
-///
-/// Technically "[" and "]" should be here since IPv6 addresses are allowed
-/// in the server name, but in practice that should be uncommon, and people
-/// can just use `gf` and friends in Visual mode instead.
-fn is_mxid_char(c: char) -> bool {
-    return c >= 'a' && c <= 'z' ||
-        c >= 'A' && c <= 'Z' ||
-        c >= '0' && c <= '9' ||
-        ":-./@_#!".contains(c);
-}
+type IambStep = InputStep<IambInfo>;
 
 pub fn setup_keybindings() -> Keybindings {
     let mut ism = Keybindings::empty();
 
     let vim = VimBindings::default()
         .submit_on_enter()
-        .cursor_open(WordStyle::CharSet(is_mxid_char));
+        .cursor_open(MATRIX_ID_WORD.clone());
 
     vim.setup(&mut ism);
 
@@ -44,19 +33,27 @@ pub fn setup_keybindings() -> Keybindings {
         (EdgeRepeat::Once, ctrl_w.clone()),
         (EdgeRepeat::Once, ctrl_z),
     ];
-    let zoom = InputStep::new().actions(vec![WindowAction::ZoomToggle.into()]);
+    let zoom = IambStep::new()
+        .actions(vec![WindowAction::ZoomToggle.into()])
+        .goto(VimMode::Normal);
 
     ism.add_mapping(VimMode::Normal, &cwz, &zoom);
+    ism.add_mapping(VimMode::Visual, &cwz, &zoom);
     ism.add_mapping(VimMode::Normal, &cwcz, &zoom);
+    ism.add_mapping(VimMode::Visual, &cwcz, &zoom);
 
     let cwm = vec![
         (EdgeRepeat::Once, ctrl_w.clone()),
         (EdgeRepeat::Once, key_m_lc),
     ];
     let cwcm = vec![(EdgeRepeat::Once, ctrl_w), (EdgeRepeat::Once, ctrl_m)];
-    let stoggle = InputStep::new().actions(vec![IambAction::ToggleScrollbackFocus.into()]);
+    let stoggle = IambStep::new()
+        .actions(vec![IambAction::ToggleScrollbackFocus.into()])
+        .goto(VimMode::Normal);
     ism.add_mapping(VimMode::Normal, &cwm, &stoggle);
+    ism.add_mapping(VimMode::Visual, &cwm, &stoggle);
     ism.add_mapping(VimMode::Normal, &cwcm, &stoggle);
+    ism.add_mapping(VimMode::Visual, &cwcm, &stoggle);
 
     return ism;
 }

src/main.rs

@@ -9,6 +9,7 @@ use std::fs::{create_dir_all, File};
 use std::io::{stdout, BufReader, Stdout};
 use std::ops::DerefMut;
 use std::process;
+use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::Arc;
 use std::time::Duration;
 
@@ -22,7 +23,7 @@ use matrix_sdk::ruma::OwnedUserId;
 use modalkit::crossterm::{
     self,
     cursor::Show as CursorShow,
-    event::{poll, read, Event},
+    event::{poll, read, DisableBracketedPaste, EnableBracketedPaste, Event},
     execute,
     terminal::{EnterAlternateScreen, LeaveAlternateScreen, SetTitle},
 };
@@ -41,6 +42,7 @@ mod commands;
 mod config;
 mod keybindings;
 mod message;
+mod util;
 mod windows;
 mod worker;
 
@@ -51,21 +53,19 @@ use crate::{
     base::{
         AsyncProgramStore,
         ChatStore,
+        HomeserverAction,
         IambAction,
-        IambBufferId,
         IambError,
         IambId,
         IambInfo,
         IambResult,
         ProgramAction,
-        ProgramCommands,
         ProgramContext,
         ProgramStore,
     },
     config::{ApplicationSettings, Iamb},
-    message::{Message, MessageContent, MessageTimeStamp},
     windows::IambWindow,
-    worker::{ClientWorker, LoginStyle, Requester},
+    worker::{create_room, ClientWorker, LoginStyle, Requester},
 };
 
 use modalkit::{
@@ -76,6 +76,8 @@ use modalkit::{
             EditError,
             EditInfo,
             Editable,
+            EditorAction,
+            InsertTextAction,
             Jumpable,
             Promptable,
             Scrollable,
@@ -84,7 +86,7 @@ use modalkit::{
             WindowAction,
             WindowContainer,
         },
-        base::{OpenTarget, RepeatType},
+        base::{MoveDir1D, OpenTarget, RepeatType},
         context::Resolve,
         key::KeyManager,
         store::Store,
@@ -99,13 +101,20 @@ use modalkit::{
     },
 };
 
+const MIN_MSG_LOAD: u32 = 50;
+
+fn msg_load_req(area: Rect) -> u32 {
+    let n = area.height as u32;
+
+    n.max(MIN_MSG_LOAD)
+}
+
 struct Application {
     store: AsyncProgramStore,
     worker: Requester,
     terminal: Terminal<CrosstermBackend<Stdout>>,
     bindings: KeyManager<TerminalKey, ProgramAction, RepeatType, ProgramContext>,
     actstack: VecDeque<(ProgramAction, ProgramContext)>,
-    cmds: ProgramCommands,
     screen: ScreenState<IambWindow, IambInfo>,
 }
 
@@ -117,6 +126,7 @@ impl Application {
         let mut stdout = stdout();
         crossterm::terminal::enable_raw_mode()?;
         crossterm::execute!(stdout, EnterAlternateScreen)?;
+        crossterm::execute!(stdout, EnableBracketedPaste)?;
 
         let title = format!("iamb ({})", settings.profile.user_id);
         crossterm::execute!(stdout, SetTitle(title))?;
@@ -126,11 +136,17 @@ impl Application {
 
         let bindings = crate::keybindings::setup_keybindings();
         let bindings = KeyManager::new(bindings);
-        let cmds = crate::commands::setup_commands();
 
         let mut locked = store.lock().await;
-        let win = IambWindow::open(IambId::Welcome, locked.deref_mut()).unwrap();
-        let cmd = CommandBarState::new(IambBufferId::Command, locked.deref_mut());
+
+        let win = settings
+            .tunables
+            .default_room
+            .and_then(|room| IambWindow::find(room, locked.deref_mut()).ok())
+            .or_else(|| IambWindow::open(IambId::Welcome, locked.deref_mut()).ok())
+            .unwrap();
+
+        let cmd = CommandBarState::new(locked.deref_mut());
         let screen = ScreenState::new(win, cmd);
 
         let worker = locked.application.worker.clone();
@@ -144,7 +160,6 @@ impl Application {
             terminal,
             bindings,
             actstack,
-            cmds,
             screen,
         })
     }
@@ -176,7 +191,7 @@ impl Application {
                 f.set_cursor(cx, cy);
             }
 
-            store.application.load_older(area.height as u32);
+            store.application.load_older(msg_load_req(area));
         })?;
 
         Ok(())
@@ -186,7 +201,8 @@ impl Application {
         loop {
             self.redraw(false, self.store.clone().lock().await.deref_mut())?;
 
-            if !poll(Duration::from_millis(500))? {
+            if !poll(Duration::from_secs(1))? {
+                // Redraw in case there's new messages to show.
                 continue;
             }
 
@@ -201,8 +217,21 @@ impl Application {
                 Event::Resize(_, _) => {
                     // We'll redraw for the new size next time step() is called.
                 },
-                Event::Paste(_) => {
-                    // Do nothing for now.
+                Event::Paste(s) => {
+                    let act = InsertTextAction::Transcribe(s, MoveDir1D::Previous, 1.into());
+                    let act = EditorAction::from(act);
+                    let ctx = ProgramContext::default();
+                    let mut store = self.store.lock().await;
+
+                    match self.screen.editor_command(&act, &ctx, store.deref_mut()) {
+                        Ok(None) => {},
+                        Ok(Some(info)) => {
+                            self.screen.push_info(info);
+                        },
+                        Err(e) => {
+                            self.screen.push_error(e);
+                        },
+                    }
                 },
             }
         }
@@ -226,7 +255,7 @@ impl Application {
         }
     }
 
-    fn action_run(
+    async fn action_run(
         &mut self,
         action: ProgramAction,
         ctx: ProgramContext,
@@ -257,7 +286,7 @@ impl Application {
             },
 
             // Simple delegations.
-            Action::Application(act) => self.iamb_run(act, ctx, store)?,
+            Action::Application(act) => self.iamb_run(act, ctx, store).await?,
             Action::CommandBar(act) => self.screen.command_bar(&act, &ctx)?,
             Action::Macro(act) => self.bindings.macro_command(&act, &ctx, store)?,
             Action::Scroll(style) => self.screen.scroll(&style, &ctx, store)?,
@@ -288,7 +317,7 @@ impl Application {
                 None
             },
             Action::Command(act) => {
-                let acts = self.cmds.command(&act, &ctx)?;
+                let acts = store.application.cmds.command(&act, &ctx)?;
                 self.action_prepend(acts);
 
                 None
@@ -314,7 +343,7 @@ impl Application {
         return Ok(info);
     }
 
-    fn iamb_run(
+    async fn iamb_run(
         &mut self,
         action: IambAction,
         ctx: ProgramContext,
@@ -327,24 +356,25 @@ impl Application {
                 None
             },
 
-            IambAction::Room(act) => {
-                let acts = self.screen.current_window_mut()?.room_command(act, ctx, store)?;
+            IambAction::Homeserver(act) => {
+                let acts = self.homeserver_command(act, ctx, store).await?;
                 self.action_prepend(acts);
 
                 None
             },
-
-            IambAction::SendMessage(room_id, msg) => {
-                let (event_id, msg) = self.worker.send_message(room_id.clone(), msg)?;
-                let user = store.application.settings.profile.user_id.clone();
-                let info = store.application.get_room_info(room_id);
-                let key = (MessageTimeStamp::LocalEcho, event_id);
-                let msg = MessageContent::Original(msg.into());
-                let msg = Message::new(msg, user, MessageTimeStamp::LocalEcho);
-                info.messages.insert(key, msg);
+            IambAction::Message(act) => {
+                self.screen.current_window_mut()?.message_command(act, ctx, store).await?
+            },
+            IambAction::Room(act) => {
+                let acts = self.screen.current_window_mut()?.room_command(act, ctx, store).await?;
+                self.action_prepend(acts);
 
                 None
             },
+            IambAction::Send(act) => {
+                self.screen.current_window_mut()?.send_command(act, ctx, store).await?
+            },
+
             IambAction::Verify(act, user_dev) => {
                 if let Some(sas) = store.application.verifications.get(&user_dev) {
                     self.worker.verify(act, sas.clone())?
@@ -364,6 +394,25 @@ impl Application {
         Ok(info)
     }
 
+    async fn homeserver_command(
+        &mut self,
+        action: HomeserverAction,
+        ctx: ProgramContext,
+        store: &mut ProgramStore,
+    ) -> IambResult<Vec<(Action<IambInfo>, ProgramContext)>> {
+        match action {
+            HomeserverAction::CreateRoom(alias, vis, flags) => {
+                let client = &store.application.worker.client;
+                let room_id = create_room(client, alias.as_deref(), vis, flags).await?;
+                let room = IambId::Room(room_id);
+                let target = OpenTarget::Application(room);
+                let action = WindowAction::Switch(target);
+
+                Ok(vec![(action.into(), ctx)])
+            },
+        }
+    }
+
     pub async fn run(&mut self) -> Result<(), std::io::Error> {
         self.terminal.clear()?;
 
@@ -378,7 +427,7 @@ impl Application {
             let mut keyskip = false;
 
             while let Some((action, ctx)) = self.action_pop(keyskip) {
-                match self.action_run(action, ctx, locked.deref_mut()) {
+                match self.action_run(action, ctx, locked.deref_mut()).await {
                     Ok(None) => {
                         // Continue processing.
                         continue;
@@ -408,7 +457,7 @@ impl Application {
     }
 }
 
-fn login(worker: Requester, settings: &ApplicationSettings) -> IambResult<()> {
+async fn login(worker: Requester, settings: &ApplicationSettings) -> IambResult<()> {
     println!("Logging in for {}...", settings.profile.user_id);
 
     if settings.session_json.is_file() {
@@ -427,13 +476,13 @@ fn login(worker: Requester, settings: &ApplicationSettings) -> IambResult<()> {
         match worker.login(LoginStyle::Password(password)) {
             Ok(info) => {
                 if let Some(msg) = info {
-                    println!("{}", msg);
+                    println!("{msg}");
                 }
 
                 break;
             },
             Err(err) => {
-                println!("Failed to login: {}", err);
+                println!("Failed to login: {err}");
                 continue;
             },
         }
@@ -443,12 +492,40 @@ fn login(worker: Requester, settings: &ApplicationSettings) -> IambResult<()> {
 }
 
 fn print_exit<T: Display, N>(v: T) -> N {
-    println!("{}", v);
+    println!("{v}");
     process::exit(2);
 }
 
-#[tokio::main]
-async fn main() -> IambResult<()> {
+async fn run(settings: ApplicationSettings) -> IambResult<()> {
+    // Set up the async worker thread and global store.
+    let worker = ClientWorker::spawn(settings.clone()).await;
+    let store = ChatStore::new(worker.clone(), settings.clone());
+    let store = Store::new(store);
+    let store = Arc::new(AsyncMutex::new(store));
+    worker.init(store.clone());
+
+    login(worker, &settings).await.unwrap_or_else(print_exit);
+
+    // Make sure panics clean up the terminal properly.
+    let orig_hook = std::panic::take_hook();
+    std::panic::set_hook(Box::new(move |panic_info| {
+        let _ = crossterm::terminal::disable_raw_mode();
+        let _ = crossterm::execute!(stdout(), DisableBracketedPaste);
+        let _ = crossterm::execute!(stdout(), LeaveAlternateScreen);
+        let _ = crossterm::execute!(stdout(), CursorShow);
+        orig_hook(panic_info);
+        process::exit(1);
+    }));
+
+    let mut application = Application::new(settings, store).await?;
+
+    // We can now run the application.
+    application.run().await?;
+
+    Ok(())
+}
+
+fn main() -> IambResult<()> {
     // Parse command-line flags.
     let iamb = Iamb::parse();
 
@@ -463,37 +540,26 @@ async fn main() -> IambResult<()> {
     create_dir_all(log_dir)?;
 
     let appender = tracing_appender::rolling::daily(log_dir, log_prefix);
-    let (appender, _) = tracing_appender::non_blocking(appender);
+    let (appender, guard) = tracing_appender::non_blocking(appender);
 
     let subscriber = FmtSubscriber::builder()
         .with_writer(appender)
-        .with_max_level(Level::WARN)
+        .with_max_level(Level::INFO)
         .finish();
     tracing::subscriber::set_global_default(subscriber).expect("setting default subscriber failed");
 
-    // Set up the async worker thread and global store.
-    let worker = ClientWorker::spawn(settings.clone());
-    let store = ChatStore::new(worker.clone(), settings.clone());
-    let store = Store::new(store);
-    let store = Arc::new(AsyncMutex::new(store));
-    worker.init(store.clone());
+    let rt = tokio::runtime::Builder::new_multi_thread()
+        .enable_all()
+        .thread_name_fn(|| {
+            static ATOMIC_ID: AtomicUsize = AtomicUsize::new(0);
+            let id = ATOMIC_ID.fetch_add(1, Ordering::SeqCst);
+            format!("iamb-worker-{id}")
+        })
+        .build()
+        .unwrap();
 
-    login(worker, &settings).unwrap_or_else(print_exit);
-
-    // Make sure panics clean up the terminal properly.
-    let orig_hook = std::panic::take_hook();
-    std::panic::set_hook(Box::new(move |panic_info| {
-        let _ = crossterm::terminal::disable_raw_mode();
-        let _ = crossterm::execute!(stdout(), LeaveAlternateScreen);
-        let _ = crossterm::execute!(stdout(), CursorShow);
-        orig_hook(panic_info);
-        process::exit(1);
-    }));
-
-    let mut application = Application::new(settings, store).await?;
-
-    // We can now run the application.
-    application.run().await?;
+    rt.block_on(async move { run(settings).await })?;
 
+    drop(guard);
     process::exit(0);
 }

src/message.rs

@@ -1,650 +0,0 @@
-use std::borrow::Cow;
-use std::cmp::{Ord, Ordering, PartialOrd};
-use std::collections::hash_map::DefaultHasher;
-use std::collections::BTreeMap;
-use std::convert::TryFrom;
-use std::hash::{Hash, Hasher};
-use std::str::Lines;
-
-use chrono::{DateTime, NaiveDateTime, Utc};
-use unicode_segmentation::UnicodeSegmentation;
-use unicode_width::UnicodeWidthStr;
-
-use matrix_sdk::ruma::{
-    events::{
-        room::message::{MessageType, RoomMessageEventContent},
-        MessageLikeEvent,
-    },
-    MilliSecondsSinceUnixEpoch,
-    OwnedEventId,
-    OwnedUserId,
-    UInt,
-};
-
-use modalkit::tui::{
-    style::{Color, Modifier as StyleModifier, Style},
-    text::{Span, Spans, Text},
-};
-
-use modalkit::editing::{base::ViewportContext, cursor::Cursor};
-
-use crate::base::{IambResult, RoomInfo};
-
-pub type MessageEvent = MessageLikeEvent<RoomMessageEventContent>;
-pub type MessageFetchResult = IambResult<(Option<String>, Vec<MessageEvent>)>;
-pub type MessageKey = (MessageTimeStamp, OwnedEventId);
-pub type Messages = BTreeMap<MessageKey, Message>;
-
-const COLORS: [Color; 13] = [
-    Color::Blue,
-    Color::Cyan,
-    Color::Green,
-    Color::LightBlue,
-    Color::LightGreen,
-    Color::LightCyan,
-    Color::LightMagenta,
-    Color::LightRed,
-    Color::LightYellow,
-    Color::Magenta,
-    Color::Red,
-    Color::Reset,
-    Color::Yellow,
-];
-
-const USER_GUTTER: usize = 30;
-const TIME_GUTTER: usize = 12;
-const MIN_MSG_LEN: usize = 30;
-
-const USER_GUTTER_EMPTY: &str = "                              ";
-const USER_GUTTER_EMPTY_SPAN: Span<'static> = Span {
-    content: Cow::Borrowed(USER_GUTTER_EMPTY),
-    style: Style {
-        fg: None,
-        bg: None,
-        add_modifier: StyleModifier::empty(),
-        sub_modifier: StyleModifier::empty(),
-    },
-};
-
-pub(crate) fn user_color(user: &str) -> Color {
-    let mut hasher = DefaultHasher::new();
-    user.hash(&mut hasher);
-    let color = hasher.finish() as usize % COLORS.len();
-
-    COLORS[color]
-}
-
-pub(crate) fn user_style(user: &str) -> Style {
-    Style::default().fg(user_color(user)).add_modifier(StyleModifier::BOLD)
-}
-
-struct WrappedLinesIterator<'a> {
-    iter: Lines<'a>,
-    curr: Option<&'a str>,
-    width: usize,
-}
-
-impl<'a> WrappedLinesIterator<'a> {
-    fn new(input: &'a str, width: usize) -> Self {
-        WrappedLinesIterator { iter: input.lines(), curr: None, width }
-    }
-}
-
-impl<'a> Iterator for WrappedLinesIterator<'a> {
-    type Item = (&'a str, usize);
-
-    fn next(&mut self) -> Option<Self::Item> {
-        if self.curr.is_none() {
-            self.curr = self.iter.next();
-        }
-
-        if let Some(s) = self.curr.take() {
-            let width = UnicodeWidthStr::width(s);
-
-            if width <= self.width {
-                return Some((s, width));
-            } else {
-                // Find where to split the line.
-                let mut width = 0;
-                let mut idx = 0;
-
-                for (i, g) in UnicodeSegmentation::grapheme_indices(s, true) {
-                    let gw = UnicodeWidthStr::width(g);
-                    idx = i;
-
-                    if width + gw > self.width {
-                        break;
-                    }
-
-                    width += gw;
-                }
-
-                self.curr = Some(&s[idx..]);
-
-                return Some((&s[..idx], width));
-            }
-        } else {
-            return None;
-        }
-    }
-}
-
-fn wrap(input: &str, width: usize) -> WrappedLinesIterator<'_> {
-    WrappedLinesIterator::new(input, width)
-}
-
-fn space(width: usize) -> String {
-    " ".repeat(width)
-}
-
-#[derive(thiserror::Error, Debug)]
-pub enum TimeStampIntError {
-    #[error("Integer conversion error: {0}")]
-    IntError(#[from] std::num::TryFromIntError),
-
-    #[error("UInt conversion error: {0}")]
-    UIntError(<UInt as TryFrom<u64>>::Error),
-}
-
-#[derive(Clone, Copy, Debug, Eq, PartialEq)]
-pub enum MessageTimeStamp {
-    OriginServer(UInt),
-    LocalEcho,
-}
-
-impl MessageTimeStamp {
-    fn show(&self) -> Option<Span> {
-        match self {
-            MessageTimeStamp::OriginServer(ts) => {
-                let time = i64::from(*ts) / 1000;
-                let time = NaiveDateTime::from_timestamp_opt(time, 0)?;
-                let time = DateTime::<Utc>::from_utc(time, Utc);
-                let time = time.format("%T");
-                let time = format!("  [{}]", time);
-
-                Span::raw(time).into()
-            },
-            MessageTimeStamp::LocalEcho => None,
-        }
-    }
-
-    fn is_local_echo(&self) -> bool {
-        matches!(self, MessageTimeStamp::LocalEcho)
-    }
-}
-
-impl Ord for MessageTimeStamp {
-    fn cmp(&self, other: &Self) -> Ordering {
-        match (self, other) {
-            (MessageTimeStamp::OriginServer(_), MessageTimeStamp::LocalEcho) => Ordering::Less,
-            (MessageTimeStamp::OriginServer(a), MessageTimeStamp::OriginServer(b)) => a.cmp(b),
-            (MessageTimeStamp::LocalEcho, MessageTimeStamp::OriginServer(_)) => Ordering::Greater,
-            (MessageTimeStamp::LocalEcho, MessageTimeStamp::LocalEcho) => Ordering::Equal,
-        }
-    }
-}
-
-impl PartialOrd for MessageTimeStamp {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        self.cmp(other).into()
-    }
-}
-
-impl From<MilliSecondsSinceUnixEpoch> for MessageTimeStamp {
-    fn from(millis: MilliSecondsSinceUnixEpoch) -> Self {
-        MessageTimeStamp::OriginServer(millis.0)
-    }
-}
-
-impl TryFrom<&MessageTimeStamp> for usize {
-    type Error = TimeStampIntError;
-
-    fn try_from(ts: &MessageTimeStamp) -> Result<Self, Self::Error> {
-        let n = match ts {
-            MessageTimeStamp::LocalEcho => 0,
-            MessageTimeStamp::OriginServer(u) => usize::try_from(u64::from(*u))?,
-        };
-
-        Ok(n)
-    }
-}
-
-impl TryFrom<usize> for MessageTimeStamp {
-    type Error = TimeStampIntError;
-
-    fn try_from(u: usize) -> Result<Self, Self::Error> {
-        if u == 0 {
-            Ok(MessageTimeStamp::LocalEcho)
-        } else {
-            let n = u64::try_from(u)?;
-            let n = UInt::try_from(n).map_err(TimeStampIntError::UIntError)?;
-
-            Ok(MessageTimeStamp::OriginServer(n))
-        }
-    }
-}
-
-#[derive(Clone, Debug, Default, Eq, PartialEq)]
-pub struct MessageCursor {
-    /// When timestamp is None, the corner is determined by moving backwards from
-    /// the most recently received message.
-    pub timestamp: Option<MessageKey>,
-
-    /// A row within the [Text] representation of a [Message].
-    pub text_row: usize,
-}
-
-impl MessageCursor {
-    pub fn new(timestamp: MessageKey, text_row: usize) -> Self {
-        MessageCursor { timestamp: Some(timestamp), text_row }
-    }
-
-    /// Get a cursor that refers to the most recent message.
-    pub fn latest() -> Self {
-        MessageCursor::default()
-    }
-
-    pub fn to_key<'a>(&'a self, info: &'a RoomInfo) -> Option<&'a MessageKey> {
-        if let Some(ref key) = self.timestamp {
-            Some(key)
-        } else {
-            Some(info.messages.last_key_value()?.0)
-        }
-    }
-
-    pub fn from_cursor(cursor: &Cursor, info: &RoomInfo) -> Option<Self> {
-        let ev_hash = u64::try_from(cursor.get_x()).ok()?;
-        let ev_term = OwnedEventId::try_from("$").ok()?;
-
-        let ts_start = MessageTimeStamp::try_from(cursor.get_y()).ok()?;
-        let start = (ts_start, ev_term);
-        let mut mc = None;
-
-        for ((ts, event_id), _) in info.messages.range(start..) {
-            let mut hasher = DefaultHasher::new();
-            event_id.hash(&mut hasher);
-
-            if hasher.finish() == ev_hash {
-                mc = Self::from((*ts, event_id.clone())).into();
-                break;
-            }
-
-            if mc.is_none() {
-                mc = Self::from((*ts, event_id.clone())).into();
-            }
-
-            if ts > &ts_start {
-                break;
-            }
-        }
-
-        return mc;
-    }
-
-    pub fn to_cursor(&self, info: &RoomInfo) -> Option<Cursor> {
-        let (ts, event_id) = self.to_key(info)?;
-
-        let y: usize = usize::try_from(ts).ok()?;
-
-        let mut hasher = DefaultHasher::new();
-        event_id.hash(&mut hasher);
-        let x = usize::try_from(hasher.finish()).ok()?;
-
-        Cursor::new(y, x).into()
-    }
-}
-
-impl From<Option<MessageKey>> for MessageCursor {
-    fn from(key: Option<MessageKey>) -> Self {
-        MessageCursor { timestamp: key, text_row: 0 }
-    }
-}
-
-impl From<MessageKey> for MessageCursor {
-    fn from(key: MessageKey) -> Self {
-        MessageCursor { timestamp: Some(key), text_row: 0 }
-    }
-}
-
-impl Ord for MessageCursor {
-    fn cmp(&self, other: &Self) -> Ordering {
-        match (&self.timestamp, &other.timestamp) {
-            (None, None) => self.text_row.cmp(&other.text_row),
-            (None, Some(_)) => Ordering::Greater,
-            (Some(_), None) => Ordering::Less,
-            (Some(st), Some(ot)) => {
-                let pcmp = st.cmp(ot);
-                let tcmp = self.text_row.cmp(&other.text_row);
-
-                pcmp.then(tcmp)
-            },
-        }
-    }
-}
-
-impl PartialOrd for MessageCursor {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        self.cmp(other).into()
-    }
-}
-
-#[derive(Clone)]
-pub enum MessageContent {
-    Original(Box<RoomMessageEventContent>),
-    Redacted,
-}
-
-impl AsRef<str> for MessageContent {
-    fn as_ref(&self) -> &str {
-        match self {
-            MessageContent::Original(ev) => {
-                match &ev.msgtype {
-                    MessageType::Text(content) => {
-                        return content.body.as_ref();
-                    },
-                    MessageType::Emote(content) => {
-                        return content.body.as_ref();
-                    },
-                    MessageType::Notice(content) => {
-                        return content.body.as_str();
-                    },
-                    MessageType::ServerNotice(_) => {
-                        // XXX: implement
-
-                        return "[server notice]";
-                    },
-                    MessageType::VerificationRequest(_) => {
-                        // XXX: implement
-
-                        return "[verification request]";
-                    },
-                    MessageType::Audio(..) => {
-                        return "[audio]";
-                    },
-                    MessageType::File(..) => {
-                        return "[file]";
-                    },
-                    MessageType::Image(..) => {
-                        return "[image]";
-                    },
-                    MessageType::Video(..) => {
-                        return "[video]";
-                    },
-                    _ => return "[unknown message type]",
-                }
-            },
-            MessageContent::Redacted => "[redacted]",
-        }
-    }
-}
-
-#[derive(Clone)]
-pub struct Message {
-    pub content: MessageContent,
-    pub sender: OwnedUserId,
-    pub timestamp: MessageTimeStamp,
-}
-
-impl Message {
-    pub fn new(content: MessageContent, sender: OwnedUserId, timestamp: MessageTimeStamp) -> Self {
-        Message { content, sender, timestamp }
-    }
-
-    pub fn show(&self, selected: bool, vwctx: &ViewportContext<MessageCursor>) -> Text {
-        let width = vwctx.get_width();
-        let msg = self.as_ref();
-
-        let mut lines = vec![];
-
-        let mut style = Style::default();
-
-        if selected {
-            style = style.add_modifier(StyleModifier::REVERSED)
-        }
-
-        if self.timestamp.is_local_echo() {
-            style = style.add_modifier(StyleModifier::ITALIC);
-        }
-
-        if USER_GUTTER + TIME_GUTTER + MIN_MSG_LEN <= width {
-            let lw = width - USER_GUTTER - TIME_GUTTER;
-
-            for (i, (line, w)) in wrap(msg, lw).enumerate() {
-                let line = Span::styled(line, style);
-                let trailing = Span::styled(space(lw.saturating_sub(w)), style);
-
-                if i == 0 {
-                    let user = self.show_sender(true);
-
-                    if let Some(time) = self.timestamp.show() {
-                        lines.push(Spans(vec![user, line, trailing, time]))
-                    } else {
-                        lines.push(Spans(vec![user, line, trailing]))
-                    }
-                } else {
-                    let space = USER_GUTTER_EMPTY_SPAN;
-
-                    lines.push(Spans(vec![space, line, trailing]))
-                }
-            }
-        } else if USER_GUTTER + MIN_MSG_LEN <= width {
-            let lw = width - USER_GUTTER;
-
-            for (i, (line, w)) in wrap(msg, lw).enumerate() {
-                let line = Span::styled(line, style);
-                let trailing = Span::styled(space(lw.saturating_sub(w)), style);
-
-                let prefix = if i == 0 {
-                    self.show_sender(true)
-                } else {
-                    USER_GUTTER_EMPTY_SPAN
-                };
-
-                lines.push(Spans(vec![prefix, line, trailing]))
-            }
-        } else {
-            lines.push(Spans::from(self.show_sender(false)));
-
-            for (line, _) in wrap(msg, width.saturating_sub(2)) {
-                let line = format!("  {}", line);
-                let line = Span::styled(line, style);
-
-                lines.push(Spans(vec![line]))
-            }
-        }
-
-        return Text { lines };
-    }
-
-    fn show_sender(&self, align_right: bool) -> Span {
-        let sender = self.sender.to_string();
-        let style = user_style(sender.as_str());
-
-        let sender = if align_right {
-            format!("{: >width$}  ", sender, width = 28)
-        } else {
-            format!("{: <width$}  ", sender, width = 28)
-        };
-
-        Span::styled(sender, style)
-    }
-}
-
-impl From<MessageEvent> for Message {
-    fn from(event: MessageEvent) -> Self {
-        match event {
-            MessageLikeEvent::Original(ev) => {
-                let content = MessageContent::Original(ev.content.into());
-
-                Message::new(content, ev.sender, ev.origin_server_ts.into())
-            },
-            MessageLikeEvent::Redacted(ev) => {
-                Message::new(MessageContent::Redacted, ev.sender, ev.origin_server_ts.into())
-            },
-        }
-    }
-}
-
-impl AsRef<str> for Message {
-    fn as_ref(&self) -> &str {
-        self.content.as_ref()
-    }
-}
-
-impl ToString for Message {
-    fn to_string(&self) -> String {
-        self.as_ref().to_string()
-    }
-}
-
-#[cfg(test)]
-pub mod tests {
-    use super::*;
-    use crate::tests::*;
-
-    #[test]
-    fn test_wrapped_lines_ascii() {
-        let s = "hello world!\nabcdefghijklmnopqrstuvwxyz\ngoodbye";
-
-        let mut iter = wrap(s, 100);
-        assert_eq!(iter.next(), Some(("hello world!", 12)));
-        assert_eq!(iter.next(), Some(("abcdefghijklmnopqrstuvwxyz", 26)));
-        assert_eq!(iter.next(), Some(("goodbye", 7)));
-        assert_eq!(iter.next(), None);
-
-        let mut iter = wrap(s, 5);
-        assert_eq!(iter.next(), Some(("hello", 5)));
-        assert_eq!(iter.next(), Some((" worl", 5)));
-        assert_eq!(iter.next(), Some(("d!", 2)));
-        assert_eq!(iter.next(), Some(("abcde", 5)));
-        assert_eq!(iter.next(), Some(("fghij", 5)));
-        assert_eq!(iter.next(), Some(("klmno", 5)));
-        assert_eq!(iter.next(), Some(("pqrst", 5)));
-        assert_eq!(iter.next(), Some(("uvwxy", 5)));
-        assert_eq!(iter.next(), Some(("z", 1)));
-        assert_eq!(iter.next(), Some(("goodb", 5)));
-        assert_eq!(iter.next(), Some(("ye", 2)));
-        assert_eq!(iter.next(), None);
-    }
-
-    #[test]
-    fn test_wrapped_lines_unicode() {
-        let s = "ＣＨＩＣＫＥＮ";
-
-        let mut iter = wrap(s, 14);
-        assert_eq!(iter.next(), Some((s, 14)));
-        assert_eq!(iter.next(), None);
-
-        let mut iter = wrap(s, 5);
-        assert_eq!(iter.next(), Some(("ＣＨ", 4)));
-        assert_eq!(iter.next(), Some(("ＩＣ", 4)));
-        assert_eq!(iter.next(), Some(("ＫＥ", 4)));
-        assert_eq!(iter.next(), Some(("Ｎ", 2)));
-        assert_eq!(iter.next(), None);
-    }
-
-    #[test]
-    fn test_mc_cmp() {
-        let mc1 = MessageCursor::from(MSG1_KEY.clone());
-        let mc2 = MessageCursor::from(MSG2_KEY.clone());
-        let mc3 = MessageCursor::from(MSG3_KEY.clone());
-        let mc4 = MessageCursor::from(MSG4_KEY.clone());
-        let mc5 = MessageCursor::from(MSG5_KEY.clone());
-
-        // Everything is equal to itself.
-        assert_eq!(mc1.cmp(&mc1), Ordering::Equal);
-        assert_eq!(mc2.cmp(&mc2), Ordering::Equal);
-        assert_eq!(mc3.cmp(&mc3), Ordering::Equal);
-        assert_eq!(mc4.cmp(&mc4), Ordering::Equal);
-        assert_eq!(mc5.cmp(&mc5), Ordering::Equal);
-
-        // Local echo is always greater than an origin server timestamp.
-        assert_eq!(mc1.cmp(&mc2), Ordering::Greater);
-        assert_eq!(mc1.cmp(&mc3), Ordering::Greater);
-        assert_eq!(mc1.cmp(&mc4), Ordering::Greater);
-        assert_eq!(mc1.cmp(&mc5), Ordering::Greater);
-
-        // mc2 is the smallest timestamp.
-        assert_eq!(mc2.cmp(&mc1), Ordering::Less);
-        assert_eq!(mc2.cmp(&mc3), Ordering::Less);
-        assert_eq!(mc2.cmp(&mc4), Ordering::Less);
-        assert_eq!(mc2.cmp(&mc5), Ordering::Less);
-
-        // mc3 should be less than mc4 because of its event ID.
-        assert_eq!(mc3.cmp(&mc1), Ordering::Less);
-        assert_eq!(mc3.cmp(&mc2), Ordering::Greater);
-        assert_eq!(mc3.cmp(&mc4), Ordering::Less);
-        assert_eq!(mc3.cmp(&mc5), Ordering::Less);
-
-        // mc4 should be greater than mc3 because of its event ID.
-        assert_eq!(mc4.cmp(&mc1), Ordering::Less);
-        assert_eq!(mc4.cmp(&mc2), Ordering::Greater);
-        assert_eq!(mc4.cmp(&mc3), Ordering::Greater);
-        assert_eq!(mc4.cmp(&mc5), Ordering::Less);
-
-        // mc5 is the greatest OriginServer timestamp.
-        assert_eq!(mc5.cmp(&mc1), Ordering::Less);
-        assert_eq!(mc5.cmp(&mc2), Ordering::Greater);
-        assert_eq!(mc5.cmp(&mc3), Ordering::Greater);
-        assert_eq!(mc5.cmp(&mc4), Ordering::Greater);
-    }
-
-    #[test]
-    fn test_mc_to_key() {
-        let info = mock_room();
-        let mc1 = MessageCursor::from(MSG1_KEY.clone());
-        let mc2 = MessageCursor::from(MSG2_KEY.clone());
-        let mc3 = MessageCursor::from(MSG3_KEY.clone());
-        let mc4 = MessageCursor::from(MSG4_KEY.clone());
-        let mc5 = MessageCursor::from(MSG5_KEY.clone());
-        let mc6 = MessageCursor::latest();
-
-        let k1 = mc1.to_key(&info).unwrap();
-        let k2 = mc2.to_key(&info).unwrap();
-        let k3 = mc3.to_key(&info).unwrap();
-        let k4 = mc4.to_key(&info).unwrap();
-        let k5 = mc5.to_key(&info).unwrap();
-        let k6 = mc6.to_key(&info).unwrap();
-
-        // These should all be equal to their MSGN_KEYs.
-        assert_eq!(k1, &MSG1_KEY.clone());
-        assert_eq!(k2, &MSG2_KEY.clone());
-        assert_eq!(k3, &MSG3_KEY.clone());
-        assert_eq!(k4, &MSG4_KEY.clone());
-        assert_eq!(k5, &MSG5_KEY.clone());
-
-        // MessageCursor::latest() turns into the largest key (our local echo message).
-        assert_eq!(k6, &MSG1_KEY.clone());
-
-        // MessageCursor::latest() fails to convert for a room w/o messages.
-        let info_empty = RoomInfo::default();
-        assert_eq!(mc6.to_key(&info_empty), None);
-    }
-
-    #[test]
-    fn test_mc_to_from_cursor() {
-        let info = mock_room();
-        let mc1 = MessageCursor::from(MSG1_KEY.clone());
-        let mc2 = MessageCursor::from(MSG2_KEY.clone());
-        let mc3 = MessageCursor::from(MSG3_KEY.clone());
-        let mc4 = MessageCursor::from(MSG4_KEY.clone());
-        let mc5 = MessageCursor::from(MSG5_KEY.clone());
-        let mc6 = MessageCursor::latest();
-
-        let identity = |mc: &MessageCursor| {
-            let c = mc.to_cursor(&info).unwrap();
-
-            MessageCursor::from_cursor(&c, &info).unwrap()
-        };
-
-        // These should all convert to a Cursor and back to the original value.
-        assert_eq!(identity(&mc1), mc1);
-        assert_eq!(identity(&mc2), mc2);
-        assert_eq!(identity(&mc3), mc3);
-        assert_eq!(identity(&mc4), mc4);
-        assert_eq!(identity(&mc5), mc5);
-
-        // MessageCursor::latest() should point at the most recent message after conversion.
-        assert_eq!(identity(&mc6), mc1);
-    }
-}

src/message/mod.rs

@@ -0,0 +1,918 @@
+use std::borrow::Cow;
+use std::cmp::{Ord, Ordering, PartialOrd};
+use std::collections::hash_map::DefaultHasher;
+use std::collections::BTreeMap;
+use std::convert::TryFrom;
+use std::hash::{Hash, Hasher};
+use std::slice::Iter;
+
+use chrono::{DateTime, Local as LocalTz, NaiveDateTime, TimeZone};
+use unicode_width::UnicodeWidthStr;
+
+use matrix_sdk::ruma::{
+    events::{
+        room::{
+            message::{
+                FormattedBody,
+                MessageFormat,
+                MessageType,
+                OriginalRoomMessageEvent,
+                RedactedRoomMessageEvent,
+                Relation,
+                RoomMessageEvent,
+                RoomMessageEventContent,
+            },
+            redaction::SyncRoomRedactionEvent,
+        },
+        AnyMessageLikeEvent,
+        Redact,
+    },
+    EventId,
+    MilliSecondsSinceUnixEpoch,
+    OwnedEventId,
+    OwnedUserId,
+    RoomVersionId,
+    UInt,
+};
+
+use modalkit::tui::{
+    style::{Modifier as StyleModifier, Style},
+    symbols::line::THICK_VERTICAL,
+    text::{Span, Spans, Text},
+};
+
+use modalkit::editing::{base::ViewportContext, cursor::Cursor};
+
+use crate::{
+    base::{IambResult, RoomInfo},
+    config::ApplicationSettings,
+    message::html::{parse_matrix_html, StyleTree},
+    util::{space_span, wrapped_text},
+};
+
+mod html;
+mod printer;
+
+pub type MessageFetchResult = IambResult<(Option<String>, Vec<AnyMessageLikeEvent>)>;
+pub type MessageKey = (MessageTimeStamp, OwnedEventId);
+pub type Messages = BTreeMap<MessageKey, Message>;
+
+const fn span_static(s: &'static str) -> Span<'static> {
+    Span {
+        content: Cow::Borrowed(s),
+        style: Style {
+            fg: None,
+            bg: None,
+            add_modifier: StyleModifier::empty(),
+            sub_modifier: StyleModifier::empty(),
+        },
+    }
+}
+
+const BOLD_STYLE: Style = Style {
+    fg: None,
+    bg: None,
+    add_modifier: StyleModifier::BOLD,
+    sub_modifier: StyleModifier::empty(),
+};
+
+const USER_GUTTER: usize = 30;
+const TIME_GUTTER: usize = 12;
+const READ_GUTTER: usize = 5;
+const MIN_MSG_LEN: usize = 30;
+
+const USER_GUTTER_EMPTY: &str = "                              ";
+const USER_GUTTER_EMPTY_SPAN: Span<'static> = span_static(USER_GUTTER_EMPTY);
+
+const TIME_GUTTER_EMPTY: &str = "            ";
+const TIME_GUTTER_EMPTY_SPAN: Span<'static> = span_static(TIME_GUTTER_EMPTY);
+
+#[inline]
+fn millis_to_datetime(ms: UInt) -> DateTime<LocalTz> {
+    let time = i64::from(ms) / 1000;
+    let time = NaiveDateTime::from_timestamp_opt(time, 0).unwrap_or_default();
+
+    LocalTz.from_utc_datetime(&time)
+}
+
+#[derive(thiserror::Error, Debug)]
+pub enum TimeStampIntError {
+    #[error("Integer conversion error: {0}")]
+    IntError(#[from] std::num::TryFromIntError),
+
+    #[error("UInt conversion error: {0}")]
+    UIntError(<UInt as TryFrom<u64>>::Error),
+}
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub enum MessageTimeStamp {
+    OriginServer(UInt),
+    LocalEcho,
+}
+
+impl MessageTimeStamp {
+    fn as_datetime(&self) -> DateTime<LocalTz> {
+        match self {
+            MessageTimeStamp::OriginServer(ms) => millis_to_datetime(*ms),
+            MessageTimeStamp::LocalEcho => LocalTz::now(),
+        }
+    }
+
+    fn same_day(&self, other: &Self) -> bool {
+        let dt1 = self.as_datetime();
+        let dt2 = other.as_datetime();
+
+        dt1.date_naive() == dt2.date_naive()
+    }
+
+    fn show_date(&self) -> Option<Span> {
+        let time = self.as_datetime().format("%A, %B %d %Y").to_string();
+
+        Span::styled(time, BOLD_STYLE).into()
+    }
+
+    fn show_time(&self) -> Option<Span> {
+        match self {
+            MessageTimeStamp::OriginServer(ms) => {
+                let time = millis_to_datetime(*ms).format("%T");
+                let time = format!("  [{time}]");
+
+                Span::raw(time).into()
+            },
+            MessageTimeStamp::LocalEcho => None,
+        }
+    }
+
+    fn is_local_echo(&self) -> bool {
+        matches!(self, MessageTimeStamp::LocalEcho)
+    }
+
+    pub fn as_millis(&self) -> Option<MilliSecondsSinceUnixEpoch> {
+        match self {
+            MessageTimeStamp::OriginServer(ms) => MilliSecondsSinceUnixEpoch(*ms).into(),
+            MessageTimeStamp::LocalEcho => None,
+        }
+    }
+}
+
+impl Ord for MessageTimeStamp {
+    fn cmp(&self, other: &Self) -> Ordering {
+        match (self, other) {
+            (MessageTimeStamp::OriginServer(_), MessageTimeStamp::LocalEcho) => Ordering::Less,
+            (MessageTimeStamp::OriginServer(a), MessageTimeStamp::OriginServer(b)) => a.cmp(b),
+            (MessageTimeStamp::LocalEcho, MessageTimeStamp::OriginServer(_)) => Ordering::Greater,
+            (MessageTimeStamp::LocalEcho, MessageTimeStamp::LocalEcho) => Ordering::Equal,
+        }
+    }
+}
+
+impl PartialOrd for MessageTimeStamp {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        self.cmp(other).into()
+    }
+}
+
+impl From<UInt> for MessageTimeStamp {
+    fn from(millis: UInt) -> Self {
+        MessageTimeStamp::OriginServer(millis)
+    }
+}
+
+impl From<MilliSecondsSinceUnixEpoch> for MessageTimeStamp {
+    fn from(millis: MilliSecondsSinceUnixEpoch) -> Self {
+        MessageTimeStamp::OriginServer(millis.0)
+    }
+}
+
+impl TryFrom<&MessageTimeStamp> for usize {
+    type Error = TimeStampIntError;
+
+    fn try_from(ts: &MessageTimeStamp) -> Result<Self, Self::Error> {
+        let n = match ts {
+            MessageTimeStamp::LocalEcho => 0,
+            MessageTimeStamp::OriginServer(u) => usize::try_from(u64::from(*u))?,
+        };
+
+        Ok(n)
+    }
+}
+
+impl TryFrom<usize> for MessageTimeStamp {
+    type Error = TimeStampIntError;
+
+    fn try_from(u: usize) -> Result<Self, Self::Error> {
+        if u == 0 {
+            Ok(MessageTimeStamp::LocalEcho)
+        } else {
+            let n = u64::try_from(u)?;
+            let n = UInt::try_from(n).map_err(TimeStampIntError::UIntError)?;
+
+            Ok(MessageTimeStamp::from(n))
+        }
+    }
+}
+
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct MessageCursor {
+    /// When timestamp is None, the corner is determined by moving backwards from
+    /// the most recently received message.
+    pub timestamp: Option<MessageKey>,
+
+    /// A row within the [Text] representation of a [Message].
+    pub text_row: usize,
+}
+
+impl MessageCursor {
+    pub fn new(timestamp: MessageKey, text_row: usize) -> Self {
+        MessageCursor { timestamp: Some(timestamp), text_row }
+    }
+
+    /// Get a cursor that refers to the most recent message.
+    pub fn latest() -> Self {
+        MessageCursor::default()
+    }
+
+    pub fn to_key<'a>(&'a self, info: &'a RoomInfo) -> Option<&'a MessageKey> {
+        if let Some(ref key) = self.timestamp {
+            Some(key)
+        } else {
+            Some(info.messages.last_key_value()?.0)
+        }
+    }
+
+    pub fn from_cursor(cursor: &Cursor, info: &RoomInfo) -> Option<Self> {
+        let ev_hash = u64::try_from(cursor.get_x()).ok()?;
+        let ev_term = OwnedEventId::try_from("$").ok()?;
+
+        let ts_start = MessageTimeStamp::try_from(cursor.get_y()).ok()?;
+        let start = (ts_start, ev_term);
+        let mut mc = None;
+
+        for ((ts, event_id), _) in info.messages.range(start..) {
+            let mut hasher = DefaultHasher::new();
+            event_id.hash(&mut hasher);
+
+            if hasher.finish() == ev_hash {
+                mc = Self::from((*ts, event_id.clone())).into();
+                break;
+            }
+
+            if mc.is_none() {
+                mc = Self::from((*ts, event_id.clone())).into();
+            }
+
+            if ts > &ts_start {
+                break;
+            }
+        }
+
+        return mc;
+    }
+
+    pub fn to_cursor(&self, info: &RoomInfo) -> Option<Cursor> {
+        let (ts, event_id) = self.to_key(info)?;
+
+        let y: usize = usize::try_from(ts).ok()?;
+
+        let mut hasher = DefaultHasher::new();
+        event_id.hash(&mut hasher);
+        let x = usize::try_from(hasher.finish()).ok()?;
+
+        Cursor::new(y, x).into()
+    }
+}
+
+impl From<Option<MessageKey>> for MessageCursor {
+    fn from(key: Option<MessageKey>) -> Self {
+        MessageCursor { timestamp: key, text_row: 0 }
+    }
+}
+
+impl From<MessageKey> for MessageCursor {
+    fn from(key: MessageKey) -> Self {
+        MessageCursor { timestamp: Some(key), text_row: 0 }
+    }
+}
+
+impl Ord for MessageCursor {
+    fn cmp(&self, other: &Self) -> Ordering {
+        match (&self.timestamp, &other.timestamp) {
+            (None, None) => self.text_row.cmp(&other.text_row),
+            (None, Some(_)) => Ordering::Greater,
+            (Some(_), None) => Ordering::Less,
+            (Some(st), Some(ot)) => {
+                let pcmp = st.cmp(ot);
+                let tcmp = self.text_row.cmp(&other.text_row);
+
+                pcmp.then(tcmp)
+            },
+        }
+    }
+}
+
+impl PartialOrd for MessageCursor {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        self.cmp(other).into()
+    }
+}
+
+#[derive(Clone)]
+pub enum MessageEvent {
+    Original(Box<OriginalRoomMessageEvent>),
+    Redacted(Box<RedactedRoomMessageEvent>),
+    Local(OwnedEventId, Box<RoomMessageEventContent>),
+}
+
+impl MessageEvent {
+    pub fn event_id(&self) -> &EventId {
+        match self {
+            MessageEvent::Original(ev) => ev.event_id.as_ref(),
+            MessageEvent::Redacted(ev) => ev.event_id.as_ref(),
+            MessageEvent::Local(event_id, _) => event_id.as_ref(),
+        }
+    }
+
+    pub fn body(&self) -> Cow<'_, str> {
+        match self {
+            MessageEvent::Original(ev) => body_cow_content(&ev.content),
+            MessageEvent::Redacted(ev) => {
+                let reason = ev
+                    .unsigned
+                    .redacted_because
+                    .as_ref()
+                    .and_then(|e| e.as_original())
+                    .and_then(|r| r.content.reason.as_ref());
+
+                if let Some(r) = reason {
+                    Cow::Owned(format!("[Redacted: {r:?}]"))
+                } else {
+                    Cow::Borrowed("[Redacted]")
+                }
+            },
+            MessageEvent::Local(_, content) => body_cow_content(content),
+        }
+    }
+
+    pub fn html(&self) -> Option<StyleTree> {
+        let content = match self {
+            MessageEvent::Original(ev) => &ev.content,
+            MessageEvent::Redacted(_) => return None,
+            MessageEvent::Local(_, content) => content,
+        };
+
+        if let MessageType::Text(content) = &content.msgtype {
+            if let Some(FormattedBody { format: MessageFormat::Html, body }) = &content.formatted {
+                Some(parse_matrix_html(body.as_str()))
+            } else {
+                None
+            }
+        } else {
+            None
+        }
+    }
+
+    pub fn redact(&mut self, redaction: SyncRoomRedactionEvent, version: &RoomVersionId) {
+        match self {
+            MessageEvent::Redacted(_) => return,
+            MessageEvent::Local(_, _) => return,
+            MessageEvent::Original(ev) => {
+                let redacted = ev.clone().redact(redaction, version);
+                *self = MessageEvent::Redacted(Box::new(redacted));
+            },
+        }
+    }
+}
+
+fn body_cow_content(content: &RoomMessageEventContent) -> Cow<'_, str> {
+    let s = match &content.msgtype {
+        MessageType::Text(content) => content.body.as_str(),
+        MessageType::VerificationRequest(_) => "[Verification Request]",
+        MessageType::Emote(content) => content.body.as_ref(),
+        MessageType::Notice(content) => content.body.as_str(),
+        MessageType::ServerNotice(content) => content.body.as_str(),
+
+        MessageType::Audio(content) => {
+            return Cow::Owned(format!("[Attached Audio: {}]", content.body));
+        },
+        MessageType::File(content) => {
+            return Cow::Owned(format!("[Attached File: {}]", content.body));
+        },
+        MessageType::Image(content) => {
+            return Cow::Owned(format!("[Attached Image: {}]", content.body));
+        },
+        MessageType::Video(content) => {
+            return Cow::Owned(format!("[Attached Video: {}]", content.body));
+        },
+        _ => {
+            return Cow::Owned(format!("[Unknown message type: {:?}]", content.msgtype()));
+        },
+    };
+
+    Cow::Borrowed(s)
+}
+
+enum MessageColumns {
+    /// Four columns: sender, message, timestamp, read receipts.
+    Four,
+
+    /// Three columns: sender, message, timestamp.
+    Three,
+
+    /// Two columns: sender, message.
+    Two,
+
+    /// One column: message with sender on line before the message.
+    One,
+}
+
+struct MessageFormatter<'a> {
+    settings: &'a ApplicationSettings,
+
+    /// How many columns to print.
+    cols: MessageColumns,
+
+    /// The full, original width.
+    orig: usize,
+
+    /// The width that the message contents need to fill.
+    fill: usize,
+
+    /// The formatted Span for the message sender.
+    user: Option<Span<'a>>,
+
+    /// The time the message was sent.
+    time: Option<Span<'a>>,
+
+    /// The date the message was sent.
+    date: Option<Span<'a>>,
+
+    /// Iterator over the users who have read up to this message.
+    read: Iter<'a, OwnedUserId>,
+}
+
+impl<'a> MessageFormatter<'a> {
+    fn width(&self) -> usize {
+        self.fill
+    }
+
+    #[inline]
+    fn push_spans(&mut self, spans: Spans<'a>, style: Style, text: &mut Text<'a>) {
+        if let Some(date) = self.date.take() {
+            let len = date.content.as_ref().len();
+            let padding = self.orig.saturating_sub(len);
+            let leading = space_span(padding / 2, Style::default());
+            let trailing = space_span(padding.saturating_sub(padding / 2), Style::default());
+
+            text.lines.push(Spans(vec![leading, date, trailing]));
+        }
+
+        match self.cols {
+            MessageColumns::Four => {
+                let settings = self.settings;
+                let user = self.user.take().unwrap_or(USER_GUTTER_EMPTY_SPAN);
+                let time = self.time.take().unwrap_or(TIME_GUTTER_EMPTY_SPAN);
+
+                let mut line = vec![user];
+                line.extend(spans.0);
+                line.push(time);
+
+                // Show read receipts.
+                let user_char =
+                    |user: &'a OwnedUserId| -> Span<'a> { settings.get_user_char_span(user) };
+
+                let a = self.read.next().map(user_char).unwrap_or_else(|| Span::raw(" "));
+                let b = self.read.next().map(user_char).unwrap_or_else(|| Span::raw(" "));
+                let c = self.read.next().map(user_char).unwrap_or_else(|| Span::raw(" "));
+
+                line.push(Span::raw(" "));
+                line.push(c);
+                line.push(b);
+                line.push(a);
+                line.push(Span::raw(" "));
+
+                text.lines.push(Spans(line))
+            },
+            MessageColumns::Three => {
+                let user = self.user.take().unwrap_or(USER_GUTTER_EMPTY_SPAN);
+                let time = self.time.take().unwrap_or_else(|| Span::from(""));
+
+                let mut line = vec![user];
+                line.extend(spans.0);
+                line.push(time);
+
+                text.lines.push(Spans(line))
+            },
+            MessageColumns::Two => {
+                let user = self.user.take().unwrap_or(USER_GUTTER_EMPTY_SPAN);
+                let mut line = vec![user];
+                line.extend(spans.0);
+
+                text.lines.push(Spans(line));
+            },
+            MessageColumns::One => {
+                if let Some(user) = self.user.take() {
+                    text.lines.push(Spans(vec![user]));
+                }
+
+                let leading = space_span(2, style);
+                let mut line = vec![leading];
+                line.extend(spans.0);
+
+                text.lines.push(Spans(line));
+            },
+        }
+    }
+
+    fn push_text(&mut self, append: Text<'a>, style: Style, text: &mut Text<'a>) {
+        for line in append.lines.into_iter() {
+            self.push_spans(line, style, text);
+        }
+    }
+}
+
+pub struct Message {
+    pub event: MessageEvent,
+    pub sender: OwnedUserId,
+    pub timestamp: MessageTimeStamp,
+    pub downloaded: bool,
+    pub html: Option<StyleTree>,
+}
+
+impl Message {
+    pub fn new(event: MessageEvent, sender: OwnedUserId, timestamp: MessageTimeStamp) -> Self {
+        let html = event.html();
+        let downloaded = false;
+
+        Message { event, sender, timestamp, downloaded, html }
+    }
+
+    pub fn reply_to(&self) -> Option<OwnedEventId> {
+        let content = match &self.event {
+            MessageEvent::Local(_, content) => content,
+            MessageEvent::Original(ev) => &ev.content,
+            MessageEvent::Redacted(_) => return None,
+        };
+
+        if let Some(Relation::Reply { in_reply_to }) = &content.relates_to {
+            Some(in_reply_to.event_id.clone())
+        } else {
+            None
+        }
+    }
+
+    fn get_render_style(&self, selected: bool) -> Style {
+        let mut style = Style::default();
+
+        if selected {
+            style = style.add_modifier(StyleModifier::REVERSED)
+        }
+
+        if self.timestamp.is_local_echo() {
+            style = style.add_modifier(StyleModifier::ITALIC);
+        }
+
+        return style;
+    }
+
+    fn get_render_format<'a>(
+        &'a self,
+        prev: Option<&Message>,
+        width: usize,
+        info: &'a RoomInfo,
+        settings: &'a ApplicationSettings,
+    ) -> MessageFormatter<'a> {
+        let orig = width;
+        let date = match &prev {
+            Some(prev) if prev.timestamp.same_day(&self.timestamp) => None,
+            _ => self.timestamp.show_date(),
+        };
+
+        if USER_GUTTER + TIME_GUTTER + READ_GUTTER + MIN_MSG_LEN <= width &&
+            settings.tunables.read_receipt_display
+        {
+            let cols = MessageColumns::Four;
+            let fill = width - USER_GUTTER - TIME_GUTTER - READ_GUTTER;
+            let user = self.show_sender(prev, true, settings);
+            let time = self.timestamp.show_time();
+            let read = match info.receipts.get(self.event.event_id()) {
+                Some(read) => read.iter(),
+                None => [].iter(),
+            };
+
+            MessageFormatter { settings, cols, orig, fill, user, date, time, read }
+        } else if USER_GUTTER + TIME_GUTTER + MIN_MSG_LEN <= width {
+            let cols = MessageColumns::Three;
+            let fill = width - USER_GUTTER - TIME_GUTTER;
+            let user = self.show_sender(prev, true, settings);
+            let time = self.timestamp.show_time();
+            let read = [].iter();
+
+            MessageFormatter { settings, cols, orig, fill, user, date, time, read }
+        } else if USER_GUTTER + MIN_MSG_LEN <= width {
+            let cols = MessageColumns::Two;
+            let fill = width - USER_GUTTER;
+            let user = self.show_sender(prev, true, settings);
+            let time = None;
+            let read = [].iter();
+
+            MessageFormatter { settings, cols, orig, fill, user, date, time, read }
+        } else {
+            let cols = MessageColumns::One;
+            let fill = width.saturating_sub(2);
+            let user = self.show_sender(prev, false, settings);
+            let time = None;
+            let read = [].iter();
+
+            MessageFormatter { settings, cols, orig, fill, user, date, time, read }
+        }
+    }
+
+    pub fn show<'a>(
+        &'a self,
+        prev: Option<&Message>,
+        selected: bool,
+        vwctx: &ViewportContext<MessageCursor>,
+        info: &'a RoomInfo,
+        settings: &'a ApplicationSettings,
+    ) -> Text<'a> {
+        let width = vwctx.get_width();
+
+        let style = self.get_render_style(selected);
+        let mut fmt = self.get_render_format(prev, width, info, settings);
+        let mut text = Text { lines: vec![] };
+        let width = fmt.width();
+
+        // Show the message that this one replied to, if any.
+        let reply = self.reply_to().and_then(|e| info.get_event(&e));
+
+        if let Some(r) = &reply {
+            let w = width.saturating_sub(2);
+            let mut replied = r.show_msg(w, style, true);
+            let mut sender = r.sender_span(settings);
+            let sender_width = UnicodeWidthStr::width(sender.content.as_ref());
+            let trailing = w.saturating_sub(sender_width + 1);
+
+            sender.style = sender.style.patch(style);
+
+            fmt.push_spans(
+                Spans(vec![
+                    Span::styled(" ", style),
+                    Span::styled(THICK_VERTICAL, style),
+                    sender,
+                    Span::styled(":", style),
+                    space_span(trailing, style),
+                ]),
+                style,
+                &mut text,
+            );
+
+            for line in replied.lines.iter_mut() {
+                line.0.insert(0, Span::styled(THICK_VERTICAL, style));
+                line.0.insert(0, Span::styled(" ", style));
+            }
+
+            fmt.push_text(replied, style, &mut text);
+        }
+
+        // Now show the message contents, and the inlined reply if we couldn't find it above.
+        let msg = self.show_msg(width, style, reply.is_some());
+        fmt.push_text(msg, style, &mut text);
+
+        if text.lines.is_empty() {
+            // If there was nothing in the body, just show an empty message.
+            fmt.push_spans(space_span(width, style).into(), style, &mut text);
+        }
+
+        if settings.tunables.reaction_display {
+            let mut emojis = printer::TextPrinter::new(width, style, false);
+            let mut reactions = 0;
+
+            for (key, count) in info.get_reactions(self.event.event_id()).into_iter() {
+                if reactions != 0 {
+                    emojis.push_str(" ", style);
+                }
+
+                let name = if settings.tunables.reaction_shortcode_display {
+                    if let Some(emoji) = emojis::get(key) {
+                        if let Some(short) = emoji.shortcode() {
+                            short
+                        } else {
+                            // No ASCII shortcode name to show.
+                            continue;
+                        }
+                    } else if key.chars().all(|c| c.is_ascii_alphanumeric()) {
+                        key
+                    } else {
+                        // Not an Emoji or a printable ASCII string.
+                        continue;
+                    }
+                } else {
+                    key
+                };
+
+                emojis.push_str("[", style);
+                emojis.push_str(name, style);
+                emojis.push_str(" ", style);
+                emojis.push_span_nobreak(Span::styled(count.to_string(), style));
+                emojis.push_str("]", style);
+
+                reactions += 1;
+            }
+
+            if reactions > 0 {
+                fmt.push_text(emojis.finish(), style, &mut text);
+            }
+        }
+
+        return text;
+    }
+
+    pub fn show_msg(&self, width: usize, style: Style, hide_reply: bool) -> Text {
+        if let Some(html) = &self.html {
+            html.to_text(width, style, hide_reply)
+        } else {
+            let mut msg = self.event.body();
+
+            if self.downloaded {
+                msg.to_mut().push_str(" \u{2705}");
+            }
+
+            wrapped_text(msg, width, style)
+        }
+    }
+
+    fn sender_span(&self, settings: &ApplicationSettings) -> Span {
+        settings.get_user_span(self.sender.as_ref())
+    }
+
+    fn show_sender(
+        &self,
+        prev: Option<&Message>,
+        align_right: bool,
+        settings: &ApplicationSettings,
+    ) -> Option<Span> {
+        if let Some(prev) = prev {
+            if self.sender == prev.sender && self.timestamp.same_day(&prev.timestamp) {
+                return None;
+            }
+        }
+
+        let Span { content, style } = self.sender_span(settings);
+        let stop = content.len().min(28);
+        let s = &content[..stop];
+
+        let sender = if align_right {
+            format!("{: >width$}  ", s, width = 28)
+        } else {
+            format!("{: <width$}  ", s, width = 28)
+        };
+
+        Span::styled(sender, style).into()
+    }
+}
+
+impl From<OriginalRoomMessageEvent> for Message {
+    fn from(event: OriginalRoomMessageEvent) -> Self {
+        let timestamp = event.origin_server_ts.into();
+        let user_id = event.sender.clone();
+        let content = MessageEvent::Original(event.into());
+
+        Message::new(content, user_id, timestamp)
+    }
+}
+
+impl From<RedactedRoomMessageEvent> for Message {
+    fn from(event: RedactedRoomMessageEvent) -> Self {
+        let timestamp = event.origin_server_ts.into();
+        let user_id = event.sender.clone();
+        let content = MessageEvent::Redacted(event.into());
+
+        Message::new(content, user_id, timestamp)
+    }
+}
+
+impl From<RoomMessageEvent> for Message {
+    fn from(event: RoomMessageEvent) -> Self {
+        match event {
+            RoomMessageEvent::Original(ev) => ev.into(),
+            RoomMessageEvent::Redacted(ev) => ev.into(),
+        }
+    }
+}
+
+impl ToString for Message {
+    fn to_string(&self) -> String {
+        self.event.body().into_owned()
+    }
+}
+
+#[cfg(test)]
+pub mod tests {
+    use super::*;
+    use crate::tests::*;
+
+    #[test]
+    fn test_mc_cmp() {
+        let mc1 = MessageCursor::from(MSG1_KEY.clone());
+        let mc2 = MessageCursor::from(MSG2_KEY.clone());
+        let mc3 = MessageCursor::from(MSG3_KEY.clone());
+        let mc4 = MessageCursor::from(MSG4_KEY.clone());
+        let mc5 = MessageCursor::from(MSG5_KEY.clone());
+
+        // Everything is equal to itself.
+        assert_eq!(mc1.cmp(&mc1), Ordering::Equal);
+        assert_eq!(mc2.cmp(&mc2), Ordering::Equal);
+        assert_eq!(mc3.cmp(&mc3), Ordering::Equal);
+        assert_eq!(mc4.cmp(&mc4), Ordering::Equal);
+        assert_eq!(mc5.cmp(&mc5), Ordering::Equal);
+
+        // Local echo is always greater than an origin server timestamp.
+        assert_eq!(mc1.cmp(&mc2), Ordering::Greater);
+        assert_eq!(mc1.cmp(&mc3), Ordering::Greater);
+        assert_eq!(mc1.cmp(&mc4), Ordering::Greater);
+        assert_eq!(mc1.cmp(&mc5), Ordering::Greater);
+
+        // mc2 is the smallest timestamp.
+        assert_eq!(mc2.cmp(&mc1), Ordering::Less);
+        assert_eq!(mc2.cmp(&mc3), Ordering::Less);
+        assert_eq!(mc2.cmp(&mc4), Ordering::Less);
+        assert_eq!(mc2.cmp(&mc5), Ordering::Less);
+
+        // mc3 should be less than mc4 because of its event ID.
+        assert_eq!(mc3.cmp(&mc1), Ordering::Less);
+        assert_eq!(mc3.cmp(&mc2), Ordering::Greater);
+        assert_eq!(mc3.cmp(&mc4), Ordering::Less);
+        assert_eq!(mc3.cmp(&mc5), Ordering::Less);
+
+        // mc4 should be greater than mc3 because of its event ID.
+        assert_eq!(mc4.cmp(&mc1), Ordering::Less);
+        assert_eq!(mc4.cmp(&mc2), Ordering::Greater);
+        assert_eq!(mc4.cmp(&mc3), Ordering::Greater);
+        assert_eq!(mc4.cmp(&mc5), Ordering::Less);
+
+        // mc5 is the greatest OriginServer timestamp.
+        assert_eq!(mc5.cmp(&mc1), Ordering::Less);
+        assert_eq!(mc5.cmp(&mc2), Ordering::Greater);
+        assert_eq!(mc5.cmp(&mc3), Ordering::Greater);
+        assert_eq!(mc5.cmp(&mc4), Ordering::Greater);
+    }
+
+    #[test]
+    fn test_mc_to_key() {
+        let info = mock_room();
+        let mc1 = MessageCursor::from(MSG1_KEY.clone());
+        let mc2 = MessageCursor::from(MSG2_KEY.clone());
+        let mc3 = MessageCursor::from(MSG3_KEY.clone());
+        let mc4 = MessageCursor::from(MSG4_KEY.clone());
+        let mc5 = MessageCursor::from(MSG5_KEY.clone());
+        let mc6 = MessageCursor::latest();
+
+        let k1 = mc1.to_key(&info).unwrap();
+        let k2 = mc2.to_key(&info).unwrap();
+        let k3 = mc3.to_key(&info).unwrap();
+        let k4 = mc4.to_key(&info).unwrap();
+        let k5 = mc5.to_key(&info).unwrap();
+        let k6 = mc6.to_key(&info).unwrap();
+
+        // These should all be equal to their MSGN_KEYs.
+        assert_eq!(k1, &MSG1_KEY.clone());
+        assert_eq!(k2, &MSG2_KEY.clone());
+        assert_eq!(k3, &MSG3_KEY.clone());
+        assert_eq!(k4, &MSG4_KEY.clone());
+        assert_eq!(k5, &MSG5_KEY.clone());
+
+        // MessageCursor::latest() turns into the largest key (our local echo message).
+        assert_eq!(k6, &MSG1_KEY.clone());
+
+        // MessageCursor::latest() fails to convert for a room w/o messages.
+        let info_empty = RoomInfo::default();
+        assert_eq!(mc6.to_key(&info_empty), None);
+    }
+
+    #[test]
+    fn test_mc_to_from_cursor() {
+        let info = mock_room();
+        let mc1 = MessageCursor::from(MSG1_KEY.clone());
+        let mc2 = MessageCursor::from(MSG2_KEY.clone());
+        let mc3 = MessageCursor::from(MSG3_KEY.clone());
+        let mc4 = MessageCursor::from(MSG4_KEY.clone());
+        let mc5 = MessageCursor::from(MSG5_KEY.clone());
+        let mc6 = MessageCursor::latest();
+
+        let identity = |mc: &MessageCursor| {
+            let c = mc.to_cursor(&info).unwrap();
+
+            MessageCursor::from_cursor(&c, &info).unwrap()
+        };
+
+        // These should all convert to a Cursor and back to the original value.
+        assert_eq!(identity(&mc1), mc1);
+        assert_eq!(identity(&mc2), mc2);
+        assert_eq!(identity(&mc3), mc3);
+        assert_eq!(identity(&mc4), mc4);
+        assert_eq!(identity(&mc5), mc5);
+
+        // MessageCursor::latest() should point at the most recent message after conversion.
+        assert_eq!(identity(&mc6), mc1);
+    }
+}

src/message/printer.rs

@@ -0,0 +1,207 @@
+use std::borrow::Cow;
+
+use modalkit::tui::layout::Alignment;
+use modalkit::tui::style::Style;
+use modalkit::tui::text::{Span, Spans, Text};
+use unicode_segmentation::UnicodeSegmentation;
+use unicode_width::UnicodeWidthStr;
+
+use crate::util::{space_span, take_width};
+
+pub struct TextPrinter<'a> {
+    text: Text<'a>,
+    width: usize,
+    base_style: Style,
+    hide_reply: bool,
+
+    alignment: Alignment,
+    curr_spans: Vec<Span<'a>>,
+    curr_width: usize,
+}
+
+impl<'a> TextPrinter<'a> {
+    pub fn new(width: usize, base_style: Style, hide_reply: bool) -> Self {
+        TextPrinter {
+            text: Text::default(),
+            width,
+            base_style,
+            hide_reply,
+
+            alignment: Alignment::Left,
+            curr_spans: vec![],
+            curr_width: 0,
+        }
+    }
+
+    pub fn align(mut self, alignment: Alignment) -> Self {
+        self.alignment = alignment;
+        self
+    }
+
+    pub fn hide_reply(&self) -> bool {
+        self.hide_reply
+    }
+
+    pub fn width(&self) -> usize {
+        self.width
+    }
+
+    pub fn sub(&self, indent: usize) -> Self {
+        TextPrinter {
+            text: Text::default(),
+            width: self.width.saturating_sub(indent),
+            base_style: self.base_style,
+            hide_reply: self.hide_reply,
+
+            alignment: self.alignment,
+            curr_spans: vec![],
+            curr_width: 0,
+        }
+    }
+
+    fn remaining(&self) -> usize {
+        self.width - self.curr_width
+    }
+
+    pub fn commit(&mut self) {
+        if self.curr_width > 0 {
+            self.push_break();
+        }
+    }
+
+    fn push(&mut self) {
+        self.curr_width = 0;
+        self.text.lines.push(Spans(std::mem::take(&mut self.curr_spans)));
+    }
+
+    pub fn push_break(&mut self) {
+        if self.curr_width == 0 && self.text.lines.is_empty() {
+            // Disallow leading breaks.
+            return;
+        }
+
+        let remaining = self.remaining();
+
+        if remaining > 0 {
+            match self.alignment {
+                Alignment::Left => {
+                    let tspan = space_span(remaining, self.base_style);
+                    self.curr_spans.push(tspan);
+                },
+                Alignment::Center => {
+                    let trailing = remaining / 2;
+                    let leading = remaining - trailing;
+
+                    let tspan = space_span(trailing, self.base_style);
+                    let lspan = space_span(leading, self.base_style);
+
+                    self.curr_spans.push(tspan);
+                    self.curr_spans.insert(0, lspan);
+                },
+                Alignment::Right => {
+                    let lspan = space_span(remaining, self.base_style);
+                    self.curr_spans.insert(0, lspan);
+                },
+            }
+        }
+
+        self.push();
+    }
+
+    fn push_str_wrapped<T>(&mut self, s: T, style: Style)
+    where
+        T: Into<Cow<'a, str>>,
+    {
+        let style = self.base_style.patch(style);
+        let mut cow = s.into();
+
+        loop {
+            let sw = UnicodeWidthStr::width(cow.as_ref());
+
+            if self.curr_width + sw <= self.width {
+                // The text fits within the current line.
+                self.curr_spans.push(Span::styled(cow, style));
+                self.curr_width += sw;
+                break;
+            }
+
+            // Take a leading portion of the text that fits in the line.
+            let ((s0, w), s1) = take_width(cow, self.remaining());
+            cow = s1;
+
+            self.curr_spans.push(Span::styled(s0, style));
+            self.curr_width += w;
+
+            self.commit();
+        }
+
+        if self.curr_width == self.width {
+            // If the last bit fills the full line, start a new one.
+            self.push();
+        }
+    }
+
+    pub fn push_span_nobreak(&mut self, span: Span<'a>) {
+        let sw = UnicodeWidthStr::width(span.content.as_ref());
+
+        if self.curr_width + sw > self.width {
+            // Span doesn't fit on this line, so start a new one.
+            self.commit();
+        }
+
+        self.curr_spans.push(span);
+        self.curr_width += sw;
+    }
+
+    pub fn push_str(&mut self, s: &'a str, style: Style) {
+        let style = self.base_style.patch(style);
+
+        for word in UnicodeSegmentation::split_word_bounds(s) {
+            if self.width == 0 && word.chars().all(char::is_whitespace) {
+                // Drop leading whitespace.
+                continue;
+            }
+
+            let sw = UnicodeWidthStr::width(word);
+
+            if sw > self.width {
+                self.push_str_wrapped(word, style);
+                continue;
+            }
+
+            if self.curr_width + sw > self.width {
+                // Word doesn't fit on this line, so start a new one.
+                self.commit();
+
+                if word.chars().all(char::is_whitespace) {
+                    // Drop leading whitespace.
+                    continue;
+                }
+            }
+
+            let span = Span::styled(word, style);
+            self.curr_spans.push(span);
+            self.curr_width += sw;
+        }
+
+        if self.curr_width == self.width {
+            // If the last bit fills the full line, start a new one.
+            self.push();
+        }
+    }
+
+    pub fn push_line(&mut self, spans: Spans<'a>) {
+        self.commit();
+        self.text.lines.push(spans);
+    }
+
+    pub fn push_text(&mut self, text: Text<'a>) {
+        self.commit();
+        self.text.lines.extend(text.lines);
+    }
+
+    pub fn finish(mut self) -> Text<'a> {
+        self.commit();
+        self.text
+    }
+}

src/tests.rs

@@ -1,29 +1,39 @@
-use std::collections::BTreeMap;
+use std::collections::{BTreeMap, HashMap};
+use std::path::PathBuf;
 
 use matrix_sdk::ruma::{
     event_id,
-    events::room::message::RoomMessageEventContent,
+    events::room::message::{OriginalRoomMessageEvent, RoomMessageEventContent},
     server_name,
     user_id,
     EventId,
+    OwnedEventId,
     OwnedRoomId,
     OwnedUserId,
     RoomId,
     UInt,
 };
 
-use std::path::PathBuf;
-use std::sync::mpsc::sync_channel;
+use lazy_static::lazy_static;
+use modalkit::tui::style::{Color, Style};
+use tokio::sync::mpsc::unbounded_channel;
 use url::Url;
 
-use lazy_static::lazy_static;
-
 use crate::{
-    base::{ChatStore, ProgramStore, RoomFetchStatus, RoomInfo},
-    config::{ApplicationSettings, DirectoryValues, ProfileConfig, TunableValues},
+    base::{ChatStore, EventLocation, ProgramStore, RoomFetchStatus, RoomInfo},
+    config::{
+        user_color,
+        user_style_from_color,
+        ApplicationSettings,
+        DirectoryValues,
+        ProfileConfig,
+        TunableValues,
+        UserColor,
+        UserDisplayTunables,
+    },
     message::{
         Message,
-        MessageContent,
+        MessageEvent,
         MessageKey,
         MessageTimeStamp::{LocalEcho, OriginServer},
         Messages,
@@ -35,57 +45,88 @@ lazy_static! {
     pub static ref TEST_ROOM1_ID: OwnedRoomId = RoomId::new(server_name!("example.com")).to_owned();
     pub static ref TEST_USER1: OwnedUserId = user_id!("@user1:example.com").to_owned();
     pub static ref TEST_USER2: OwnedUserId = user_id!("@user2:example.com").to_owned();
-    pub static ref TEST_USER3: OwnedUserId = user_id!("@user2:example.com").to_owned();
-    pub static ref TEST_USER4: OwnedUserId = user_id!("@user2:example.com").to_owned();
-    pub static ref TEST_USER5: OwnedUserId = user_id!("@user2:example.com").to_owned();
-    pub static ref MSG1_KEY: MessageKey = (LocalEcho, EventId::new(server_name!("example.com")));
-    pub static ref MSG2_KEY: MessageKey =
-        (OriginServer(UInt::new(1).unwrap()), EventId::new(server_name!("example.com")));
-    pub static ref MSG3_KEY: MessageKey = (
-        OriginServer(UInt::new(2).unwrap()),
-        event_id!("$5jRz3KfVhaUzXtVj7k:example.com").to_owned()
-    );
-    pub static ref MSG4_KEY: MessageKey = (
-        OriginServer(UInt::new(2).unwrap()),
-        event_id!("$JP6qFV7WyXk5ZnexM3:example.com").to_owned()
-    );
-    pub static ref MSG5_KEY: MessageKey =
-        (OriginServer(UInt::new(8).unwrap()), EventId::new(server_name!("example.com")));
+    pub static ref TEST_USER3: OwnedUserId = user_id!("@user3:example.com").to_owned();
+    pub static ref TEST_USER4: OwnedUserId = user_id!("@user4:example.com").to_owned();
+    pub static ref TEST_USER5: OwnedUserId = user_id!("@user5:example.com").to_owned();
+    pub static ref MSG1_EVID: OwnedEventId = EventId::new(server_name!("example.com"));
+    pub static ref MSG2_EVID: OwnedEventId = EventId::new(server_name!("example.com"));
+    pub static ref MSG3_EVID: OwnedEventId =
+        event_id!("$5jRz3KfVhaUzXtVj7k:example.com").to_owned();
+    pub static ref MSG4_EVID: OwnedEventId =
+        event_id!("$JP6qFV7WyXk5ZnexM3:example.com").to_owned();
+    pub static ref MSG5_EVID: OwnedEventId = EventId::new(server_name!("example.com"));
+    pub static ref MSG1_KEY: MessageKey = (LocalEcho, MSG1_EVID.clone());
+    pub static ref MSG2_KEY: MessageKey = (OriginServer(UInt::new(1).unwrap()), MSG2_EVID.clone());
+    pub static ref MSG3_KEY: MessageKey = (OriginServer(UInt::new(2).unwrap()), MSG3_EVID.clone());
+    pub static ref MSG4_KEY: MessageKey = (OriginServer(UInt::new(2).unwrap()), MSG4_EVID.clone());
+    pub static ref MSG5_KEY: MessageKey = (OriginServer(UInt::new(8).unwrap()), MSG5_EVID.clone());
+}
+
+pub fn user_style(user: &str) -> Style {
+    user_style_from_color(user_color(user))
+}
+
+pub fn mock_room1_message(
+    content: RoomMessageEventContent,
+    sender: OwnedUserId,
+    key: MessageKey,
+) -> Message {
+    let origin_server_ts = key.0.as_millis().unwrap();
+    let event_id = key.1;
+
+    let event = OriginalRoomMessageEvent {
+        content,
+        event_id,
+        sender,
+        origin_server_ts,
+        room_id: TEST_ROOM1_ID.clone(),
+        unsigned: Default::default(),
+    };
+
+    event.into()
 }
 
 pub fn mock_message1() -> Message {
     let content = RoomMessageEventContent::text_plain("writhe");
-    let content = MessageContent::Original(content.into());
+    let content = MessageEvent::Local(MSG1_EVID.clone(), content.into());
 
     Message::new(content, TEST_USER1.clone(), MSG1_KEY.0)
 }
 
 pub fn mock_message2() -> Message {
     let content = RoomMessageEventContent::text_plain("helium");
-    let content = MessageContent::Original(content.into());
 
-    Message::new(content, TEST_USER2.clone(), MSG2_KEY.0)
+    mock_room1_message(content, TEST_USER2.clone(), MSG2_KEY.clone())
 }
 
 pub fn mock_message3() -> Message {
     let content = RoomMessageEventContent::text_plain("this\nis\na\nmultiline\nmessage");
-    let content = MessageContent::Original(content.into());
 
-    Message::new(content, TEST_USER2.clone(), MSG3_KEY.0)
+    mock_room1_message(content, TEST_USER2.clone(), MSG3_KEY.clone())
 }
 
 pub fn mock_message4() -> Message {
     let content = RoomMessageEventContent::text_plain("help");
-    let content = MessageContent::Original(content.into());
 
-    Message::new(content, TEST_USER1.clone(), MSG4_KEY.0)
+    mock_room1_message(content, TEST_USER1.clone(), MSG4_KEY.clone())
 }
 
 pub fn mock_message5() -> Message {
     let content = RoomMessageEventContent::text_plain("character");
-    let content = MessageContent::Original(content.into());
 
-    Message::new(content, TEST_USER2.clone(), MSG5_KEY.0)
+    mock_room1_message(content, TEST_USER2.clone(), MSG4_KEY.clone())
+}
+
+pub fn mock_keys() -> HashMap<OwnedEventId, EventLocation> {
+    let mut keys = HashMap::new();
+
+    keys.insert(MSG1_EVID.clone(), EventLocation::Message(MSG1_KEY.clone()));
+    keys.insert(MSG2_EVID.clone(), EventLocation::Message(MSG2_KEY.clone()));
+    keys.insert(MSG3_EVID.clone(), EventLocation::Message(MSG3_KEY.clone()));
+    keys.insert(MSG4_EVID.clone(), EventLocation::Message(MSG4_KEY.clone()));
+    keys.insert(MSG5_EVID.clone(), EventLocation::Message(MSG5_KEY.clone()));
+
+    keys
 }
 
 pub fn mock_messages() -> Messages {
@@ -103,7 +144,15 @@ pub fn mock_messages() -> Messages {
 pub fn mock_room() -> RoomInfo {
     RoomInfo {
         name: Some("Watercooler Discussion".into()),
+        tags: None,
+
+        keys: mock_keys(),
         messages: mock_messages(),
+
+        receipts: HashMap::new(),
+        read_till: None,
+        reactions: HashMap::new(),
+
         fetch_id: RoomFetchStatus::NotStarted,
         fetch_last: None,
         users_typing: None,
@@ -118,6 +167,24 @@ pub fn mock_dirs() -> DirectoryValues {
     }
 }
 
+pub fn mock_tunables() -> TunableValues {
+    TunableValues {
+        default_room: None,
+        reaction_display: true,
+        reaction_shortcode_display: false,
+        read_receipt_send: true,
+        read_receipt_display: true,
+        typing_notice_send: true,
+        typing_notice_display: true,
+        users: vec![(TEST_USER5.clone(), UserDisplayTunables {
+            color: Some(UserColor(Color::Black)),
+            name: Some("USER 5".into()),
+        })]
+        .into_iter()
+        .collect::<HashMap<_, _>>(),
+    }
+}
+
 pub fn mock_settings() -> ApplicationSettings {
     ApplicationSettings {
         matrix_dir: PathBuf::new(),
@@ -129,16 +196,26 @@ pub fn mock_settings() -> ApplicationSettings {
             settings: None,
             dirs: None,
         },
-        tunables: TunableValues { typing_notice: true, typing_notice_display: true },
+        tunables: mock_tunables(),
         dirs: mock_dirs(),
     }
 }
 
-pub fn mock_store() -> ProgramStore {
-    let (tx, _) = sync_channel(5);
-    let worker = Requester { tx };
+pub async fn mock_store() -> ProgramStore {
+    let (tx, _) = unbounded_channel();
+    let homeserver = Url::parse("https://localhost").unwrap();
+    let client = matrix_sdk::Client::new(homeserver).await.unwrap();
+    let worker = Requester { tx, client };
 
     let mut store = ChatStore::new(worker, mock_settings());
+
+    // Add presence information.
+    store.presences.get_or_default(TEST_USER1.clone());
+    store.presences.get_or_default(TEST_USER2.clone());
+    store.presences.get_or_default(TEST_USER3.clone());
+    store.presences.get_or_default(TEST_USER4.clone());
+    store.presences.get_or_default(TEST_USER5.clone());
+
     let room_id = TEST_ROOM1_ID.clone();
     let info = mock_room();
 

src/util.rs

@@ -0,0 +1,191 @@
+use std::borrow::Cow;
+
+use unicode_segmentation::UnicodeSegmentation;
+use unicode_width::UnicodeWidthStr;
+
+use modalkit::tui::style::Style;
+use modalkit::tui::text::{Span, Spans, Text};
+
+pub fn split_cow(cow: Cow<'_, str>, idx: usize) -> (Cow<'_, str>, Cow<'_, str>) {
+    match cow {
+        Cow::Borrowed(s) => {
+            let s1 = Cow::Borrowed(&s[idx..]);
+            let s0 = Cow::Borrowed(&s[..idx]);
+
+            (s0, s1)
+        },
+        Cow::Owned(mut s) => {
+            let s1 = Cow::Owned(s.split_off(idx));
+            let s0 = Cow::Owned(s);
+
+            (s0, s1)
+        },
+    }
+}
+
+pub fn take_width(s: Cow<'_, str>, width: usize) -> ((Cow<'_, str>, usize), Cow<'_, str>) {
+    // Find where to split the line.
+    let mut idx = 0;
+    let mut w = 0;
+
+    for (i, g) in UnicodeSegmentation::grapheme_indices(s.as_ref(), true) {
+        let gw = UnicodeWidthStr::width(g);
+        idx = i;
+
+        if w + gw > width {
+            break;
+        }
+
+        w += gw;
+    }
+
+    let (s0, s1) = split_cow(s, idx);
+
+    ((s0, w), s1)
+}
+
+pub struct WrappedLinesIterator<'a> {
+    iter: std::vec::IntoIter<Cow<'a, str>>,
+    curr: Option<Cow<'a, str>>,
+    width: usize,
+}
+
+impl<'a> WrappedLinesIterator<'a> {
+    fn new<T>(input: T, width: usize) -> Self
+    where
+        T: Into<Cow<'a, str>>,
+    {
+        let width = width.max(2);
+
+        let cows: Vec<Cow<'a, str>> = match input.into() {
+            Cow::Borrowed(s) => s.lines().map(Cow::Borrowed).collect(),
+            Cow::Owned(s) => s.lines().map(ToOwned::to_owned).map(Cow::Owned).collect(),
+        };
+
+        WrappedLinesIterator { iter: cows.into_iter(), curr: None, width }
+    }
+}
+
+impl<'a> Iterator for WrappedLinesIterator<'a> {
+    type Item = (Cow<'a, str>, usize);
+
+    fn next(&mut self) -> Option<Self::Item> {
+        if self.curr.is_none() {
+            self.curr = self.iter.next();
+        }
+
+        if let Some(s) = self.curr.take() {
+            let width = UnicodeWidthStr::width(s.as_ref());
+
+            if width <= self.width {
+                return Some((s, width));
+            } else {
+                let (prefix, s1) = take_width(s, self.width);
+                self.curr = Some(s1);
+                return Some(prefix);
+            }
+        } else {
+            return None;
+        }
+    }
+}
+
+pub fn wrap<'a, T>(input: T, width: usize) -> WrappedLinesIterator<'a>
+where
+    T: Into<Cow<'a, str>>,
+{
+    WrappedLinesIterator::new(input, width)
+}
+
+pub fn wrapped_text<'a, T>(s: T, width: usize, style: Style) -> Text<'a>
+where
+    T: Into<Cow<'a, str>>,
+{
+    let mut text = Text::default();
+
+    for (line, w) in wrap(s, width) {
+        let space = space_span(width.saturating_sub(w), style);
+        let spans = Spans(vec![Span::styled(line, style), space]);
+
+        text.lines.push(spans);
+    }
+
+    return text;
+}
+
+pub fn space(width: usize) -> String {
+    " ".repeat(width)
+}
+
+pub fn space_span(width: usize, style: Style) -> Span<'static> {
+    Span::styled(space(width), style)
+}
+
+pub fn space_text(width: usize, style: Style) -> Text<'static> {
+    space_span(width, style).into()
+}
+
+pub fn join_cell_text<'a>(texts: Vec<(Text<'a>, usize)>, join: Span<'a>, style: Style) -> Text<'a> {
+    let height = texts.iter().map(|t| t.0.height()).max().unwrap_or(0);
+    let mut text = Text { lines: vec![Spans(vec![join.clone()]); height] };
+
+    for (mut t, w) in texts.into_iter() {
+        for i in 0..height {
+            if let Some(spans) = t.lines.get_mut(i) {
+                text.lines[i].0.append(&mut spans.0);
+            } else {
+                text.lines[i].0.push(space_span(w, style));
+            }
+
+            text.lines[i].0.push(join.clone());
+        }
+    }
+
+    text
+}
+
+#[cfg(test)]
+pub mod tests {
+    use super::*;
+
+    #[test]
+    fn test_wrapped_lines_ascii() {
+        let s = "hello world!\nabcdefghijklmnopqrstuvwxyz\ngoodbye";
+
+        let mut iter = wrap(s, 100);
+        assert_eq!(iter.next(), Some((Cow::Borrowed("hello world!"), 12)));
+        assert_eq!(iter.next(), Some((Cow::Borrowed("abcdefghijklmnopqrstuvwxyz"), 26)));
+        assert_eq!(iter.next(), Some((Cow::Borrowed("goodbye"), 7)));
+        assert_eq!(iter.next(), None);
+
+        let mut iter = wrap(s, 5);
+        assert_eq!(iter.next(), Some((Cow::Borrowed("hello"), 5)));
+        assert_eq!(iter.next(), Some((Cow::Borrowed(" worl"), 5)));
+        assert_eq!(iter.next(), Some((Cow::Borrowed("d!"), 2)));
+        assert_eq!(iter.next(), Some((Cow::Borrowed("abcde"), 5)));
+        assert_eq!(iter.next(), Some((Cow::Borrowed("fghij"), 5)));
+        assert_eq!(iter.next(), Some((Cow::Borrowed("klmno"), 5)));
+        assert_eq!(iter.next(), Some((Cow::Borrowed("pqrst"), 5)));
+        assert_eq!(iter.next(), Some((Cow::Borrowed("uvwxy"), 5)));
+        assert_eq!(iter.next(), Some((Cow::Borrowed("z"), 1)));
+        assert_eq!(iter.next(), Some((Cow::Borrowed("goodb"), 5)));
+        assert_eq!(iter.next(), Some((Cow::Borrowed("ye"), 2)));
+        assert_eq!(iter.next(), None);
+    }
+
+    #[test]
+    fn test_wrapped_lines_unicode() {
+        let s = "ＣＨＩＣＫＥＮ";
+
+        let mut iter = wrap(s, 14);
+        assert_eq!(iter.next(), Some((Cow::Borrowed(s), 14)));
+        assert_eq!(iter.next(), None);
+
+        let mut iter = wrap(s, 5);
+        assert_eq!(iter.next(), Some((Cow::Borrowed("ＣＨ"), 4)));
+        assert_eq!(iter.next(), Some((Cow::Borrowed("ＩＣ"), 4)));
+        assert_eq!(iter.next(), Some((Cow::Borrowed("ＫＥ"), 4)));
+        assert_eq!(iter.next(), Some((Cow::Borrowed("Ｎ"), 2)));
+        assert_eq!(iter.next(), None);
+    }
+}

src/windows/mod.rs

@@ -1,10 +1,14 @@
 use std::cmp::{Ord, Ordering, PartialOrd};
-use std::collections::hash_map::Entry;
 
 use matrix_sdk::{
     encryption::verification::{format_emojis, SasVerification},
     room::{Room as MatrixRoom, RoomMember},
-    ruma::{events::room::member::MembershipState, OwnedRoomId, RoomId},
+    ruma::{
+        events::room::member::MembershipState,
+        events::tag::{TagName, Tags},
+        OwnedRoomId,
+        RoomId,
+    },
     DisplayName,
 };
 
@@ -40,7 +44,9 @@ use modalkit::{
             ScrollStyle,
             ViewportContext,
             WordStyle,
+            WriteFlags,
         },
+        completion::CompletionList,
     },
     widgets::{
         list::{List, ListCursor, ListItem, ListState},
@@ -51,19 +57,19 @@ use modalkit::{
     },
 };
 
-use crate::{
-    base::{
+use crate::base::{
     ChatStore,
     IambBufferId,
+    IambError,
     IambId,
     IambInfo,
     IambResult,
+    MessageAction,
     ProgramAction,
     ProgramContext,
     ProgramStore,
     RoomAction,
-    },
-    message::user_style,
+    SendAction,
 };
 
 use self::{room::RoomState, welcome::WelcomeState};
@@ -105,6 +111,71 @@ fn selected_text(s: &str, selected: bool) -> Text {
     Text::from(selected_span(s, selected))
 }
 
+fn room_cmp(a: &MatrixRoom, b: &MatrixRoom) -> Ordering {
+    let ca1 = a.canonical_alias();
+    let ca2 = b.canonical_alias();
+
+    let ord = match (ca1, ca2) {
+        (None, None) => Ordering::Equal,
+        (None, Some(_)) => Ordering::Greater,
+        (Some(_), None) => Ordering::Less,
+        (Some(ca1), Some(ca2)) => ca1.cmp(&ca2),
+    };
+
+    ord.then_with(|| a.room_id().cmp(b.room_id()))
+}
+
+fn tag_cmp(a: &Option<Tags>, b: &Option<Tags>) -> Ordering {
+    let (fava, lowa) = a
+        .as_ref()
+        .map(|tags| {
+            (tags.contains_key(&TagName::Favorite), tags.contains_key(&TagName::LowPriority))
+        })
+        .unwrap_or((false, false));
+
+    let (favb, lowb) = b
+        .as_ref()
+        .map(|tags| {
+            (tags.contains_key(&TagName::Favorite), tags.contains_key(&TagName::LowPriority))
+        })
+        .unwrap_or((false, false));
+
+    // If a has Favorite and b doesn't, it should sort earlier in room list.
+    let cmpf = favb.cmp(&fava);
+
+    // If a has LowPriority and b doesn't, it should sort later in room list.
+    let cmpl = lowa.cmp(&lowb);
+
+    cmpl.then(cmpf)
+}
+
+fn append_tags<'a>(tags: &'a Tags, spans: &mut Vec<Span<'a>>, style: Style) {
+    if tags.is_empty() {
+        return;
+    }
+
+    spans.push(Span::styled(" (", style));
+
+    for (i, tag) in tags.keys().enumerate() {
+        if i > 0 {
+            spans.push(Span::styled(", ", style));
+        }
+
+        match tag {
+            TagName::Favorite => spans.push(Span::styled("Favorite", style)),
+            TagName::LowPriority => spans.push(Span::styled("Low Priority", style)),
+            TagName::ServerNotice => spans.push(Span::styled("Server Notice", style)),
+            TagName::User(tag) => {
+                spans.push(Span::styled("User Tag: ", style));
+                spans.push(Span::styled(tag.as_ref(), style));
+            },
+            tag => spans.push(Span::styled(format!("{tag:?}"), style)),
+        }
+    }
+
+    spans.push(Span::styled(")", style));
+}
+
 #[inline]
 fn room_prompt(
     room_id: &RoomId,
@@ -168,19 +239,42 @@ impl IambWindow {
         }
     }
 
-    pub fn room_command(
+    pub async fn message_command(
+        &mut self,
+        act: MessageAction,
+        ctx: ProgramContext,
+        store: &mut ProgramStore,
+    ) -> IambResult<EditInfo> {
+        if let IambWindow::Room(w) = self {
+            w.message_command(act, ctx, store).await
+        } else {
+            return Err(IambError::NoSelectedRoom.into());
+        }
+    }
+
+    pub async fn room_command(
         &mut self,
         act: RoomAction,
         ctx: ProgramContext,
         store: &mut ProgramStore,
     ) -> IambResult<Vec<(Action<IambInfo>, ProgramContext)>> {
         if let IambWindow::Room(w) = self {
-            w.room_command(act, ctx, store)
+            w.room_command(act, ctx, store).await
         } else {
-            let msg = "No room currently focused!";
-            let err = UIError::Failure(msg.into());
+            return Err(IambError::NoSelectedRoomOrSpace.into());
+        }
+    }
 
-            return Err(err);
+    pub async fn send_command(
+        &mut self,
+        act: SendAction,
+        ctx: ProgramContext,
+        store: &mut ProgramStore,
+    ) -> IambResult<EditInfo> {
+        if let IambWindow::Room(w) = self {
+            w.send_command(act, ctx, store).await
+        } else {
+            return Err(IambError::NoSelectedRoom.into());
         }
     }
 }
@@ -284,8 +378,13 @@ impl WindowOps<IambInfo> for IambWindow {
             IambWindow::Room(state) => state.draw(area, buf, focused, store),
             IambWindow::DirectList(state) => {
                 let dms = store.application.worker.direct_messages();
-                let items = dms.into_iter().map(|(id, name)| DirectItem::new(id, name, store));
-                state.set(items.collect());
+                let mut items = dms
+                    .into_iter()
+                    .map(|(id, name, tags)| DirectItem::new(id, name, tags, store))
+                    .collect::<Vec<_>>();
+                items.sort();
+
+                state.set(items);
 
                 List::new(store)
                     .empty_message("No direct messages yet!")
@@ -306,9 +405,14 @@ impl WindowOps<IambInfo> for IambWindow {
                     .render(area, buf, state);
             },
             IambWindow::RoomList(state) => {
-                let joined = store.application.worker.joined_rooms();
-                let items = joined.into_iter().map(|(id, name)| RoomItem::new(id, name, store));
-                state.set(items.collect());
+                let joined = store.application.worker.active_rooms();
+                let mut items = joined
+                    .into_iter()
+                    .map(|(room, name, tags)| RoomItem::new(room, name, tags, store))
+                    .collect::<Vec<_>>();
+                items.sort();
+
+                state.set(items);
 
                 List::new(store)
                     .empty_message("You haven't joined any rooms yet")
@@ -366,6 +470,19 @@ impl WindowOps<IambInfo> for IambWindow {
         delegate!(self, w => w.close(flags, store))
     }
 
+    fn write(
+        &mut self,
+        path: Option<&str>,
+        flags: WriteFlags,
+        store: &mut ProgramStore,
+    ) -> IambResult<EditInfo> {
+        delegate!(self, w => w.write(path, flags, store))
+    }
+
+    fn get_completions(&self) -> Option<CompletionList> {
+        delegate!(self, w => w.get_completions())
+    }
+
     fn get_cursor_word(&self, style: &WordStyle) -> Option<String> {
         delegate!(self, w => w.get_cursor_word(style))
     }
@@ -429,8 +546,8 @@ impl Window<IambInfo> for IambWindow {
     fn open(id: IambId, store: &mut ProgramStore) -> IambResult<Self> {
         match id {
             IambId::Room(room_id) => {
-                let (room, name) = store.application.worker.get_room(room_id)?;
-                let room = RoomState::new(room, name, store);
+                let (room, name, tags) = store.application.worker.get_room(room_id)?;
+                let room = RoomState::new(room, name, tags, store);
 
                 return Ok(room.into());
             },
@@ -472,26 +589,23 @@ impl Window<IambInfo> for IambWindow {
     fn find(name: String, store: &mut ProgramStore) -> IambResult<Self> {
         let ChatStore { names, worker, .. } = &mut store.application;
 
-        match names.entry(name) {
-            Entry::Vacant(v) => {
-                let room_id = worker.join_room(v.key().to_string())?;
-                v.insert(room_id.clone());
-
-                let (room, name) = store.application.worker.get_room(room_id)?;
-                let room = RoomState::new(room, name, store);
-
-                Ok(room.into())
-            },
-            Entry::Occupied(o) => {
-                let id = IambId::Room(o.get().clone());
+        if let Some(room) = names.get_mut(&name) {
+            let id = IambId::Room(room.clone());
 
             IambWindow::open(id, store)
-            },
+        } else {
+            let room_id = worker.join_room(name.clone())?;
+            names.insert(name, room_id.clone());
+
+            let (room, name, tags) = store.application.worker.get_room(room_id)?;
+            let room = RoomState::new(room, name, tags, store);
+
+            Ok(room.into())
         }
     }
 
     fn posn(index: usize, _: &mut ProgramStore) -> IambResult<Self> {
-        let msg = format!("Cannot find indexed buffer (index = {})", index);
+        let msg = format!("Cannot find indexed buffer (index = {index})");
         let err = UIError::Unimplemented(msg);
 
         Err(err)
@@ -505,16 +619,49 @@ impl Window<IambInfo> for IambWindow {
 #[derive(Clone)]
 pub struct RoomItem {
     room: MatrixRoom,
+    tags: Option<Tags>,
     name: String,
 }
 
 impl RoomItem {
-    fn new(room: MatrixRoom, name: DisplayName, store: &mut ProgramStore) -> Self {
+    fn new(
+        room: MatrixRoom,
+        name: DisplayName,
+        tags: Option<Tags>,
+        store: &mut ProgramStore,
+    ) -> Self {
         let name = name.to_string();
+        let room_id = room.room_id();
 
-        store.application.set_room_name(room.room_id(), name.as_str());
+        let info = store.application.get_room_info(room_id.to_owned());
+        info.name = name.clone().into();
+        info.tags = tags.clone();
 
-        RoomItem { room, name }
+        if let Some(alias) = room.canonical_alias() {
+            store.application.names.insert(alias.to_string(), room_id.to_owned());
+        }
+
+        RoomItem { room, tags, name }
+    }
+}
+
+impl PartialEq for RoomItem {
+    fn eq(&self, other: &Self) -> bool {
+        self.room.room_id() == other.room.room_id()
+    }
+}
+
+impl Eq for RoomItem {}
+
+impl Ord for RoomItem {
+    fn cmp(&self, other: &Self) -> Ordering {
+        tag_cmp(&self.tags, &other.tags).then_with(|| room_cmp(&self.room, &other.room))
+    }
+}
+
+impl PartialOrd for RoomItem {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        self.cmp(other).into()
     }
 }
 
@@ -526,8 +673,17 @@ impl ToString for RoomItem {
 
 impl ListItem<IambInfo> for RoomItem {
     fn show(&self, selected: bool, _: &ViewportContext<ListCursor>, _: &mut ProgramStore) -> Text {
+        if let Some(tags) = &self.tags {
+            let style = selected_style(selected);
+            let mut spans = vec![Span::styled(self.name.as_str(), style)];
+
+            append_tags(tags, &mut spans, style);
+
+            Text::from(Spans(spans))
+        } else {
             selected_text(self.name.as_str(), selected)
         }
+    }
 
     fn get_word(&self) -> Option<String> {
         self.room.room_id().to_string().into()
@@ -548,16 +704,22 @@ impl Promptable<ProgramContext, ProgramStore, IambInfo> for RoomItem {
 #[derive(Clone)]
 pub struct DirectItem {
     room: MatrixRoom,
+    tags: Option<Tags>,
     name: String,
 }
 
 impl DirectItem {
-    fn new(room: MatrixRoom, name: DisplayName, store: &mut ProgramStore) -> Self {
+    fn new(
+        room: MatrixRoom,
+        name: DisplayName,
+        tags: Option<Tags>,
+        store: &mut ProgramStore,
+    ) -> Self {
         let name = name.to_string();
 
         store.application.set_room_name(room.room_id(), name.as_str());
 
-        DirectItem { room, name }
+        DirectItem { room, tags, name }
     }
 }
 
@@ -569,14 +731,43 @@ impl ToString for DirectItem {
 
 impl ListItem<IambInfo> for DirectItem {
     fn show(&self, selected: bool, _: &ViewportContext<ListCursor>, _: &mut ProgramStore) -> Text {
+        if let Some(tags) = &self.tags {
+            let style = selected_style(selected);
+            let mut spans = vec![Span::styled(self.name.as_str(), style)];
+
+            append_tags(tags, &mut spans, style);
+
+            Text::from(Spans(spans))
+        } else {
             selected_text(self.name.as_str(), selected)
         }
+    }
 
     fn get_word(&self) -> Option<String> {
         self.room.room_id().to_string().into()
     }
 }
 
+impl PartialEq for DirectItem {
+    fn eq(&self, other: &Self) -> bool {
+        self.room.room_id() == other.room.room_id()
+    }
+}
+
+impl Eq for DirectItem {}
+
+impl Ord for DirectItem {
+    fn cmp(&self, other: &Self) -> Ordering {
+        tag_cmp(&self.tags, &other.tags).then_with(|| room_cmp(&self.room, &other.room))
+    }
+}
+
+impl PartialOrd for DirectItem {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        self.cmp(other).into()
+    }
+}
+
 impl Promptable<ProgramContext, ProgramStore, IambInfo> for DirectItem {
     fn prompt(
         &mut self,
@@ -597,13 +788,38 @@ pub struct SpaceItem {
 impl SpaceItem {
     fn new(room: MatrixRoom, name: DisplayName, store: &mut ProgramStore) -> Self {
         let name = name.to_string();
+        let room_id = room.room_id();
 
-        store.application.set_room_name(room.room_id(), name.as_str());
+        store.application.set_room_name(room_id, name.as_str());
+
+        if let Some(alias) = room.canonical_alias() {
+            store.application.names.insert(alias.to_string(), room_id.to_owned());
+        }
 
         SpaceItem { room, name }
     }
 }
 
+impl PartialEq for SpaceItem {
+    fn eq(&self, other: &Self) -> bool {
+        self.room.room_id() == other.room.room_id()
+    }
+}
+
+impl Eq for SpaceItem {}
+
+impl Ord for SpaceItem {
+    fn cmp(&self, other: &Self) -> Ordering {
+        room_cmp(&self.room, &other.room)
+    }
+}
+
+impl PartialOrd for SpaceItem {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        self.cmp(other).into()
+    }
+}
+
 impl ToString for SpaceItem {
     fn to_string(&self) -> String {
         return self.room.room_id().to_string();
@@ -657,7 +873,7 @@ impl VerifyItem {
             let device = self.sasv1.other_device();
 
             if let Some(display_name) = device.display_name() {
-                format!("Device verification with {} ({})", display_name, state)
+                format!("Device verification with {display_name} ({state})")
             } else {
                 format!("Device verification with device {} ({})", device.device_id(), state)
             }
@@ -763,7 +979,7 @@ impl ListItem<IambInfo> for VerifyItem {
             lines.push(Spans::from(""));
 
             for line in format_emojis(emoji).lines() {
-                lines.push(Spans::from(format!("    {}", line)));
+                lines.push(Spans::from(format!("    {line}")));
             }
 
             lines.push(Spans::from(""));
@@ -845,15 +1061,18 @@ impl ToString for MemberItem {
 }
 
 impl ListItem<IambInfo> for MemberItem {
-    fn show(&self, selected: bool, _: &ViewportContext<ListCursor>, _: &mut ProgramStore) -> Text {
-        let mut style = user_style(self.member.user_id().as_str());
+    fn show(
+        &self,
+        selected: bool,
+        _: &ViewportContext<ListCursor>,
+        store: &mut ProgramStore,
+    ) -> Text {
+        let mut user = store.application.settings.get_user_span(self.member.user_id());
 
         if selected {
-            style = style.add_modifier(StyleModifier::REVERSED);
+            user.style = user.style.add_modifier(StyleModifier::REVERSED);
         }
 
-        let user = Span::styled(self.to_string(), style);
-
         let state = match self.member.membership() {
             MembershipState::Ban => Span::raw(" (banned)").into(),
             MembershipState::Invite => Span::raw(" (invited)").into(),

src/windows/room/chat.rs

@@ -1,11 +1,38 @@
+use std::borrow::Cow;
+use std::ffi::OsStr;
+use std::fs;
+use std::ops::Deref;
+use std::path::{Path, PathBuf};
+
+use tokio;
+
 use matrix_sdk::{
-    room::Room as MatrixRoom,
-    ruma::{OwnedRoomId, RoomId},
+    attachment::AttachmentConfig,
+    media::{MediaFormat, MediaRequest},
+    room::{Joined, Room as MatrixRoom},
+    ruma::{
+        events::reaction::{ReactionEventContent, Relation as Reaction},
+        events::room::message::{
+            MessageType,
+            OriginalRoomMessageEvent,
+            Relation,
+            Replacement,
+            RoomMessageEventContent,
+            TextMessageEventContent,
+        },
+        EventId,
+        OwnedRoomId,
+        RoomId,
+    },
 };
 
-use modalkit::tui::{buffer::Buffer, layout::Rect, widgets::StatefulWidget};
-
 use modalkit::{
+    tui::{
+        buffer::Buffer,
+        layout::Rect,
+        text::{Span, Spans},
+        widgets::{Paragraph, StatefulWidget, Widget},
+    },
     widgets::textbox::{TextBox, TextBoxState},
     widgets::TerminalCursor,
     widgets::{PromptActions, WindowOps},
@@ -18,28 +45,39 @@ use modalkit::editing::{
         EditResult,
         Editable,
         EditorAction,
+        InfoMessage,
         Jumpable,
         PromptAction,
         Promptable,
         Scrollable,
+        UIError,
     },
-    base::{CloseFlags, Count, MoveDir1D, PositionList, ScrollStyle, WordStyle},
+    base::{CloseFlags, Count, MoveDir1D, PositionList, ScrollStyle, WordStyle, WriteFlags},
+    completion::CompletionList,
     context::Resolve,
     history::{self, HistoryList},
     rope::EditRope,
 };
 
 use crate::base::{
+    DownloadFlags,
     IambAction,
     IambBufferId,
+    IambError,
     IambInfo,
     IambResult,
+    MessageAction,
     ProgramAction,
     ProgramContext,
     ProgramStore,
     RoomFocus,
+    RoomInfo,
+    SendAction,
 };
 
+use crate::message::{Message, MessageEvent, MessageKey, MessageTimeStamp};
+use crate::worker::Requester;
+
 use super::scrollback::{Scrollback, ScrollbackState};
 
 pub struct ChatState {
@@ -52,6 +90,9 @@ pub struct ChatState {
 
     scrollback: ScrollbackState,
     focus: RoomFocus,
+
+    reply_to: Option<MessageKey>,
+    editing: Option<MessageKey>,
 }
 
 impl ChatState {
@@ -72,9 +113,360 @@ impl ChatState {
 
             scrollback,
             focus: RoomFocus::MessageBar,
+
+            reply_to: None,
+            editing: None,
         }
     }
 
+    fn get_joined(&self, worker: &Requester) -> Result<Joined, IambError> {
+        worker.client.get_joined_room(self.id()).ok_or(IambError::NotJoined)
+    }
+
+    fn get_reply_to<'a>(&self, info: &'a RoomInfo) -> Option<&'a OriginalRoomMessageEvent> {
+        let key = self.reply_to.as_ref()?;
+        let msg = info.messages.get(key)?;
+
+        if let MessageEvent::Original(ev) = &msg.event {
+            Some(ev)
+        } else {
+            None
+        }
+    }
+
+    fn reset(&mut self) -> EditRope {
+        self.reply_to = None;
+        self.editing = None;
+        self.tbox.reset()
+    }
+
+    pub fn refresh_room(&mut self, store: &mut ProgramStore) {
+        if let Some(room) = store.application.worker.client.get_room(self.id()) {
+            self.room = room;
+        }
+    }
+
+    pub async fn message_command(
+        &mut self,
+        act: MessageAction,
+        _: ProgramContext,
+        store: &mut ProgramStore,
+    ) -> IambResult<EditInfo> {
+        let client = &store.application.worker.client;
+
+        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)?;
+
+        match act {
+            MessageAction::Cancel => {
+                self.reply_to = None;
+                self.editing = None;
+
+                Ok(None)
+            },
+            MessageAction::Download(filename, flags) => {
+                if let MessageEvent::Original(ev) = &msg.event {
+                    let media = client.media();
+
+                    let mut filename = match filename {
+                        Some(f) => PathBuf::from(f),
+                        None => settings.dirs.downloads.clone(),
+                    };
+
+                    let source = match &ev.content.msgtype {
+                        MessageType::Audio(c) => {
+                            if filename.is_dir() {
+                                filename.push(c.body.as_str());
+                            }
+
+                            c.source.clone()
+                        },
+                        MessageType::File(c) => {
+                            if filename.is_dir() {
+                                if let Some(name) = &c.filename {
+                                    filename.push(name);
+                                } else {
+                                    filename.push(c.body.as_str());
+                                }
+                            }
+
+                            c.source.clone()
+                        },
+                        MessageType::Image(c) => {
+                            if filename.is_dir() {
+                                filename.push(c.body.as_str());
+                            }
+
+                            c.source.clone()
+                        },
+                        MessageType::Video(c) => {
+                            if filename.is_dir() {
+                                filename.push(c.body.as_str());
+                            }
+
+                            c.source.clone()
+                        },
+                        _ => {
+                            return Err(IambError::NoAttachment.into());
+                        },
+                    };
+
+                    if !filename.exists() || flags.contains(DownloadFlags::FORCE) {
+                        let req = MediaRequest { source, format: MediaFormat::File };
+
+                        let bytes =
+                            media.get_media_content(&req, true).await.map_err(IambError::from)?;
+
+                        fs::write(filename.as_path(), bytes.as_slice())?;
+
+                        msg.downloaded = true;
+                    } else if !flags.contains(DownloadFlags::OPEN) {
+                        let msg = format!(
+                            "The file {} already exists; add ! to end of command to overwrite it.",
+                            filename.display()
+                        );
+                        let err = UIError::Failure(msg);
+
+                        return Err(err);
+                    }
+
+                    let info = if flags.contains(DownloadFlags::OPEN) {
+                        // open::that may not return until the spawned program closes.
+                        let target = filename.clone().into_os_string();
+                        tokio::task::spawn_blocking(move || open::that(target));
+
+                        InfoMessage::from(format!(
+                            "Attachment downloaded to {} and opened",
+                            filename.display()
+                        ))
+                    } else {
+                        InfoMessage::from(format!(
+                            "Attachment downloaded to {}",
+                            filename.display()
+                        ))
+                    };
+
+                    return Ok(info.into());
+                }
+
+                Err(IambError::NoAttachment.into())
+            },
+            MessageAction::Edit => {
+                if msg.sender != settings.profile.user_id {
+                    let msg = "Cannot edit messages sent by someone else";
+                    let err = UIError::Failure(msg.into());
+
+                    return Err(err);
+                }
+
+                let ev = match &msg.event {
+                    MessageEvent::Original(ev) => &ev.content,
+                    MessageEvent::Local(_, ev) => ev.deref(),
+                    _ => {
+                        let msg = "Cannot edit a redacted message";
+                        let err = UIError::Failure(msg.into());
+
+                        return Err(err);
+                    },
+                };
+
+                let text = match &ev.msgtype {
+                    MessageType::Text(msg) => msg.body.as_str(),
+                    _ => {
+                        let msg = "Cannot edit a non-text message";
+                        let err = UIError::Failure(msg.into());
+
+                        return Err(err);
+                    },
+                };
+
+                self.tbox.set_text(text);
+                self.editing = self.scrollback.get_key(info);
+                self.focus = RoomFocus::MessageBar;
+
+                Ok(None)
+            },
+            MessageAction::React(emoji) => {
+                let room = self.get_joined(&store.application.worker)?;
+                let event_id = match &msg.event {
+                    MessageEvent::Original(ev) => ev.event_id.clone(),
+                    MessageEvent::Local(event_id, _) => event_id.clone(),
+                    MessageEvent::Redacted(_) => {
+                        let msg = "Cannot react to a redacted message";
+                        let err = UIError::Failure(msg.into());
+
+                        return Err(err);
+                    },
+                };
+
+                let reaction = Reaction::new(event_id, emoji);
+                let msg = ReactionEventContent::new(reaction);
+                let _ = room.send(msg, None).await.map_err(IambError::from)?;
+
+                Ok(None)
+            },
+            MessageAction::Redact(reason) => {
+                let room = self.get_joined(&store.application.worker)?;
+                let event_id = match &msg.event {
+                    MessageEvent::Original(ev) => ev.event_id.clone(),
+                    MessageEvent::Local(event_id, _) => event_id.clone(),
+                    MessageEvent::Redacted(_) => {
+                        let msg = "Cannot redact already redacted message";
+                        let err = UIError::Failure(msg.into());
+
+                        return Err(err);
+                    },
+                };
+
+                let event_id = event_id.as_ref();
+                let reason = reason.as_deref();
+                let _ = room.redact(event_id, reason, None).await.map_err(IambError::from)?;
+
+                Ok(None)
+            },
+            MessageAction::Reply => {
+                self.reply_to = self.scrollback.get_key(info);
+                self.focus = RoomFocus::MessageBar;
+
+                Ok(None)
+            },
+            MessageAction::Unreact(emoji) => {
+                let room = self.get_joined(&store.application.worker)?;
+                let event_id: &EventId = match &msg.event {
+                    MessageEvent::Original(ev) => ev.event_id.as_ref(),
+                    MessageEvent::Local(event_id, _) => event_id.as_ref(),
+                    MessageEvent::Redacted(_) => {
+                        let msg = "Cannot unreact to a redacted message";
+                        let err = UIError::Failure(msg.into());
+
+                        return Err(err);
+                    },
+                };
+
+                let reactions = match info.reactions.get(event_id) {
+                    Some(r) => r,
+                    None => return Ok(None),
+                };
+
+                let reactions = reactions.iter().filter_map(|(event_id, (reaction, user_id))| {
+                    if user_id != &settings.profile.user_id {
+                        return None;
+                    }
+
+                    if let Some(emoji) = &emoji {
+                        if emoji == reaction {
+                            return Some(event_id);
+                        } else {
+                            return None;
+                        }
+                    } else {
+                        return Some(event_id);
+                    }
+                });
+
+                for reaction in reactions {
+                    let _ = room.redact(reaction, None, None).await.map_err(IambError::from)?;
+                }
+
+                Ok(None)
+            },
+        }
+    }
+
+    pub async fn send_command(
+        &mut self,
+        act: SendAction,
+        _: ProgramContext,
+        store: &mut ProgramStore,
+    ) -> IambResult<EditInfo> {
+        let room = store
+            .application
+            .worker
+            .client
+            .get_joined_room(self.id())
+            .ok_or(IambError::NotJoined)?;
+        let info = store.application.rooms.get_or_default(self.id().to_owned());
+        let mut show_echo = true;
+
+        let (event_id, msg) = match act {
+            SendAction::Submit => {
+                let msg = self.tbox.get_text();
+
+                if msg.is_empty() {
+                    return Ok(None);
+                }
+
+                let msg = TextMessageEventContent::markdown(msg);
+                let msg = MessageType::Text(msg);
+
+                let mut msg = RoomMessageEventContent::new(msg);
+
+                if let Some((_, event_id)) = &self.editing {
+                    msg.relates_to = Some(Relation::Replacement(Replacement::new(
+                        event_id.clone(),
+                        Box::new(msg.clone()),
+                    )));
+
+                    show_echo = false;
+                } else if let Some(m) = self.get_reply_to(info) {
+                    // XXX: Switch to RoomMessageEventContent::reply() once it's stable?
+                    msg = msg.make_reply_to(m);
+                }
+
+                // XXX: second parameter can be a locally unique transaction id.
+                // Useful for doing retries.
+                let resp = room.send(msg.clone(), None).await.map_err(IambError::from)?;
+                let event_id = resp.event_id;
+
+                // Reset message bar state now that it's been sent.
+                self.reset();
+
+                (event_id, msg)
+            },
+            SendAction::Upload(file) => {
+                let path = Path::new(file.as_str());
+                let mime = mime_guess::from_path(path).first_or(mime::APPLICATION_OCTET_STREAM);
+
+                let bytes = fs::read(path)?;
+                let name = path
+                    .file_name()
+                    .map(OsStr::to_string_lossy)
+                    .unwrap_or_else(|| Cow::from("Attachment"));
+                let config = AttachmentConfig::new();
+
+                let resp = room
+                    .send_attachment(name.as_ref(), &mime, bytes.as_ref(), config)
+                    .await
+                    .map_err(IambError::from)?;
+
+                // Mock up the local echo message for the scrollback.
+                let msg = TextMessageEventContent::plain(format!("[Attached File: {name}]"));
+                let msg = MessageType::Text(msg);
+                let msg = RoomMessageEventContent::new(msg);
+
+                (resp.event_id, msg)
+            },
+        };
+
+        if show_echo {
+            let user = store.application.settings.profile.user_id.clone();
+            let key = (MessageTimeStamp::LocalEcho, event_id.clone());
+            let msg = MessageEvent::Local(event_id, msg.into());
+            let msg = Message::new(msg, user, MessageTimeStamp::LocalEcho);
+            info.messages.insert(key, msg);
+        }
+
+        // Jump to the end of the scrollback to show the message.
+        self.scrollback.goto_latest();
+
+        Ok(None)
+    }
+
     pub fn focus_toggle(&mut self) {
         self.focus = match self.focus {
             RoomFocus::Scrollback => RoomFocus::MessageBar,
@@ -100,7 +492,7 @@ impl ChatState {
             return;
         }
 
-        if !store.application.settings.tunables.typing_notice {
+        if !store.application.settings.tunables.typing_notice_send {
             return;
         }
 
@@ -147,6 +539,9 @@ impl WindowOps<IambInfo> for ChatState {
 
             scrollback: self.scrollback.dup(store),
             focus: self.focus,
+
+            reply_to: None,
+            editing: None,
         }
     }
 
@@ -156,6 +551,21 @@ impl WindowOps<IambInfo> for ChatState {
         true
     }
 
+    fn write(
+        &mut self,
+        _: Option<&str>,
+        _: WriteFlags,
+        _: &mut ProgramStore,
+    ) -> IambResult<EditInfo> {
+        // XXX: what's the right writing behaviour for a room?
+        // Should write send a message?
+        Ok(None)
+    }
+
+    fn get_completions(&self) -> Option<CompletionList> {
+        delegate!(self, w => w.get_completions())
+    }
+
     fn get_cursor_word(&self, style: &WordStyle) -> Option<String> {
         delegate!(self, w => w.get_cursor_word(style))
     }
@@ -229,17 +639,9 @@ impl PromptActions<ProgramContext, ProgramStore, IambInfo> for ChatState {
         ctx: &ProgramContext,
         _: &mut ProgramStore,
     ) -> EditResult<Vec<(ProgramAction, ProgramContext)>, IambInfo> {
-        let txt = self.tbox.reset_text();
+        let act = SendAction::Submit;
 
-        let act = if txt.is_empty() {
-            vec![]
-        } else {
-            let act = IambAction::SendMessage(self.room_id.clone(), txt).into();
-
-            vec![(act, ctx.clone())]
-        };
-
-        Ok(act)
+        Ok(vec![(IambAction::from(act).into(), ctx.clone())])
     }
 
     fn abort(
@@ -254,7 +656,7 @@ impl PromptActions<ProgramContext, ProgramStore, IambInfo> for ChatState {
             return Ok(vec![]);
         }
 
-        let text = self.tbox.reset().trim();
+        let text = self.reset().trim();
 
         if text.is_empty() {
             let _ = self.sent.end();
@@ -328,15 +730,40 @@ impl<'a> StatefulWidget for Chat<'a> {
         let lines = state.tbox.has_lines(5).max(1) as u16;
         let drawh = area.height;
         let texth = lines.min(drawh).clamp(1, 5);
-        let scrollh = drawh.saturating_sub(texth);
+        let desch = if state.reply_to.is_some() {
+            drawh.saturating_sub(texth).min(1)
+        } else {
+            0
+        };
+        let scrollh = drawh.saturating_sub(texth).saturating_sub(desch);
 
         let scrollarea = Rect::new(area.x, area.y, area.width, scrollh);
-        let textarea = Rect::new(scrollarea.x, scrollarea.y + scrollh, scrollarea.width, texth);
+        let descarea = Rect::new(area.x, scrollarea.y + scrollh, area.width, desch);
+        let textarea = Rect::new(area.x, descarea.y + desch, area.width, texth);
 
         let scrollback_focused = state.focus.is_scrollback() && self.focused;
         let scrollback = Scrollback::new(self.store).focus(scrollback_focused);
         scrollback.render(scrollarea, buf, &mut state.scrollback);
 
+        let desc_spans = match (&state.editing, &state.reply_to) {
+            (None, None) => None,
+            (Some(_), _) => Some(Spans::from("Editing message")),
+            (_, 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 user = self.store.application.settings.get_user_span(msg.sender.as_ref());
+                    let spans = Spans(vec![Span::from("Replying to "), user]);
+
+                    spans.into()
+                })
+            },
+        };
+
+        if let Some(desc_spans) = desc_spans {
+            Paragraph::new(desc_spans).render(descarea, buf);
+        }
+
         let prompt = if self.focused { "> " } else { "  " };
 
         let tbox = TextBox::new().prompt(prompt);

src/windows/room/mod.rs

@@ -1,13 +1,21 @@
-use matrix_sdk::room::Room as MatrixRoom;
-use matrix_sdk::ruma::RoomId;
-use matrix_sdk::DisplayName;
+use matrix_sdk::{
+    room::{Invited, Room as MatrixRoom},
+    ruma::{
+        events::{
+            room::{name::RoomNameEventContent, topic::RoomTopicEventContent},
+            tag::{TagInfo, Tags},
+        },
+        RoomId,
+    },
+    DisplayName,
+};
 
 use modalkit::tui::{
     buffer::Buffer,
-    layout::Rect,
+    layout::{Alignment, Rect},
     style::{Modifier as StyleModifier, Style},
-    text::{Span, Spans},
-    widgets::StatefulWidget,
+    text::{Span, Spans, Text},
+    widgets::{Paragraph, StatefulWidget, Widget},
 };
 
 use modalkit::{
@@ -21,6 +29,7 @@ use modalkit::{
         PromptAction,
         Promptable,
         Scrollable,
+        UIError,
     },
     editing::base::{
         Axis,
@@ -31,19 +40,25 @@ use modalkit::{
         PositionList,
         ScrollStyle,
         WordStyle,
+        WriteFlags,
     },
+    editing::completion::CompletionList,
     input::InputContext,
     widgets::{TermOffset, TerminalCursor, WindowOps},
 };
 
 use crate::base::{
+    IambError,
     IambId,
     IambInfo,
     IambResult,
+    MessageAction,
     ProgramAction,
     ProgramContext,
     ProgramStore,
     RoomAction,
+    RoomField,
+    SendAction,
 };
 
 use self::chat::ChatState;
@@ -80,10 +95,16 @@ impl From<SpaceState> for RoomState {
 }
 
 impl RoomState {
-    pub fn new(room: MatrixRoom, name: DisplayName, store: &mut ProgramStore) -> Self {
+    pub fn new(
+        room: MatrixRoom,
+        name: DisplayName,
+        tags: Option<Tags>,
+        store: &mut ProgramStore,
+    ) -> Self {
         let room_id = room.room_id().to_owned();
         let info = store.application.get_room_info(room_id);
         info.name = name.to_string().into();
+        info.tags = tags;
 
         if room.is_space() {
             SpaceState::new(room).into()
@@ -92,13 +113,111 @@ impl RoomState {
         }
     }
 
-    pub fn room_command(
+    pub fn refresh_room(&mut self, store: &mut ProgramStore) {
+        match self {
+            RoomState::Chat(chat) => chat.refresh_room(store),
+            RoomState::Space(space) => space.refresh_room(store),
+        }
+    }
+
+    fn draw_invite(
+        &self,
+        invited: Invited,
+        area: Rect,
+        buf: &mut Buffer,
+        store: &mut ProgramStore,
+    ) {
+        let inviter = store.application.worker.get_inviter(invited.clone());
+
+        let name = match invited.canonical_alias() {
+            Some(alias) => alias.to_string(),
+            None => format!("{:?}", store.application.get_room_title(self.id())),
+        };
+
+        let mut invited = vec![Span::from(format!("You have been invited to join {name}"))];
+
+        if let Ok(Some(inviter)) = &inviter {
+            invited.push(Span::from(" by "));
+            invited.push(store.application.settings.get_user_span(inviter.user_id()));
+        }
+
+        let l1 = Spans(invited);
+        let l2 = Spans::from(
+            "You can run `:invite accept` or `:invite reject` to accept or reject this invitation.",
+        );
+        let text = Text { lines: vec![l1, l2] };
+
+        Paragraph::new(text).alignment(Alignment::Center).render(area, buf);
+
+        return;
+    }
+
+    pub async fn message_command(
+        &mut self,
+        act: MessageAction,
+        ctx: ProgramContext,
+        store: &mut ProgramStore,
+    ) -> IambResult<EditInfo> {
+        match self {
+            RoomState::Chat(chat) => chat.message_command(act, ctx, store).await,
+            RoomState::Space(_) => Err(IambError::NoSelectedMessage.into()),
+        }
+    }
+
+    pub async fn send_command(
+        &mut self,
+        act: SendAction,
+        ctx: ProgramContext,
+        store: &mut ProgramStore,
+    ) -> IambResult<EditInfo> {
+        match self {
+            RoomState::Chat(chat) => chat.send_command(act, ctx, store).await,
+            RoomState::Space(_) => Err(IambError::NoSelectedRoom.into()),
+        }
+    }
+
+    pub async fn room_command(
         &mut self,
         act: RoomAction,
         _: ProgramContext,
         store: &mut ProgramStore,
     ) -> IambResult<Vec<(Action<IambInfo>, ProgramContext)>> {
         match act {
+            RoomAction::InviteAccept => {
+                if let Some(room) = store.application.worker.client.get_invited_room(self.id()) {
+                    let details = room.invite_details().await.map_err(IambError::from)?;
+                    let details = details.invitee.event().original_content();
+                    let is_direct = details.and_then(|ev| ev.is_direct).unwrap_or_default();
+
+                    room.accept_invitation().await.map_err(IambError::from)?;
+
+                    if is_direct {
+                        room.set_is_direct(true).await.map_err(IambError::from)?;
+                    }
+
+                    Ok(vec![])
+                } else {
+                    Err(IambError::NotInvited.into())
+                }
+            },
+            RoomAction::InviteReject => {
+                if let Some(room) = store.application.worker.client.get_invited_room(self.id()) {
+                    room.reject_invitation().await.map_err(IambError::from)?;
+
+                    Ok(vec![])
+                } else {
+                    Err(IambError::NotInvited.into())
+                }
+            },
+            RoomAction::InviteSend(user) => {
+                if let Some(room) = store.application.worker.client.get_joined_room(self.id()) {
+                    room.invite_user_by_id(user.as_ref()).await.map_err(IambError::from)?;
+
+                    Ok(vec![])
+                } else {
+                    Err(IambError::NotJoined.into())
+                }
+            },
             RoomAction::Members(mut cmd) => {
                 let width = Count::Exact(30);
                 let act =
@@ -109,8 +228,50 @@ impl RoomState {
 
                 Ok(vec![(act, cmd.context.take())])
             },
-            RoomAction::Set(field) => {
-                store.application.worker.set_room(self.id().to_owned(), field)?;
+            RoomAction::Set(field, value) => {
+                let room = store
+                    .application
+                    .get_joined_room(self.id())
+                    .ok_or(UIError::Application(IambError::NotJoined))?;
+
+                match field {
+                    RoomField::Name => {
+                        let ev = RoomNameEventContent::new(value.into());
+                        let _ = room.send_state_event(ev).await.map_err(IambError::from)?;
+                    },
+                    RoomField::Tag(tag) => {
+                        let mut info = TagInfo::new();
+                        info.order = Some(1.0);
+
+                        let _ = room.set_tag(tag, info).await.map_err(IambError::from)?;
+                    },
+                    RoomField::Topic => {
+                        let ev = RoomTopicEventContent::new(value);
+                        let _ = room.send_state_event(ev).await.map_err(IambError::from)?;
+                    },
+                }
+
+                Ok(vec![])
+            },
+            RoomAction::Unset(field) => {
+                let room = store
+                    .application
+                    .get_joined_room(self.id())
+                    .ok_or(UIError::Application(IambError::NotJoined))?;
+
+                match field {
+                    RoomField::Name => {
+                        let ev = RoomNameEventContent::new(None);
+                        let _ = room.send_state_event(ev).await.map_err(IambError::from)?;
+                    },
+                    RoomField::Tag(tag) => {
+                        let _ = room.remove_tag(tag).await.map_err(IambError::from)?;
+                    },
+                    RoomField::Topic => {
+                        let ev = RoomTopicEventContent::new("".into());
+                        let _ = room.send_state_event(ev).await.map_err(IambError::from)?;
+                    },
+                }
 
                 Ok(vec![])
             },
@@ -209,6 +370,14 @@ impl TerminalCursor for RoomState {
 
 impl WindowOps<IambInfo> for RoomState {
     fn draw(&mut self, area: Rect, buf: &mut Buffer, focused: bool, store: &mut ProgramStore) {
+        if let MatrixRoom::Invited(_) = self.room() {
+            self.refresh_room(store);
+        }
+
+        if let MatrixRoom::Invited(invited) = self.room() {
+            self.draw_invite(invited.clone(), area, buf, store);
+        }
+
         match self {
             RoomState::Chat(chat) => chat.draw(area, buf, focused, store),
             RoomState::Space(space) => {
@@ -224,10 +393,30 @@ impl WindowOps<IambInfo> for RoomState {
         }
     }
 
-    fn close(&mut self, _: CloseFlags, _: &mut ProgramStore) -> bool {
-        // XXX: what's the right closing behaviour for a room?
-        // Should write send a message?
-        true
+    fn close(&mut self, flags: CloseFlags, store: &mut ProgramStore) -> bool {
+        match self {
+            RoomState::Chat(chat) => chat.close(flags, store),
+            RoomState::Space(space) => space.close(flags, store),
+        }
+    }
+
+    fn write(
+        &mut self,
+        path: Option<&str>,
+        flags: WriteFlags,
+        store: &mut ProgramStore,
+    ) -> IambResult<EditInfo> {
+        match self {
+            RoomState::Chat(chat) => chat.write(path, flags, store),
+            RoomState::Space(space) => space.write(path, flags, store),
+        }
+    }
+
+    fn get_completions(&self) -> Option<CompletionList> {
+        match self {
+            RoomState::Chat(chat) => chat.get_completions(),
+            RoomState::Space(space) => space.get_completions(),
+        }
     }
 
     fn get_cursor_word(&self, style: &WordStyle) -> Option<String> {

src/windows/room/scrollback.rs

@@ -32,6 +32,9 @@ use modalkit::editing::{
     base::{
         Axis,
         CloseFlags,
+        CompletionDisplay,
+        CompletionSelection,
+        CompletionType,
         Count,
         EditRange,
         EditTarget,
@@ -51,7 +54,9 @@ use modalkit::editing::{
         TargetShape,
         ViewportContext,
         WordStyle,
+        WriteFlags,
     },
+    completion::CompletionList,
     context::{EditContext, Resolve},
     cursor::{CursorGroup, CursorState},
     history::HistoryList,
@@ -60,8 +65,9 @@ use modalkit::editing::{
 };
 
 use crate::{
-    base::{IambBufferId, IambInfo, ProgramContext, ProgramStore, RoomFocus, RoomInfo},
-    message::{Message, MessageCursor, MessageKey},
+    base::{IambBufferId, IambInfo, IambResult, ProgramContext, ProgramStore, RoomFocus, RoomInfo},
+    config::ApplicationSettings,
+    message::{Message, MessageCursor, MessageKey, Messages},
 };
 
 fn nth_key_before(pos: MessageKey, n: usize, info: &RoomInfo) -> MessageKey {
@@ -102,12 +108,31 @@ fn nth_after(pos: MessageKey, n: usize, info: &RoomInfo) -> MessageCursor {
     nth_key_after(pos, n, info).into()
 }
 
+fn prevmsg<'a>(key: &MessageKey, info: &'a RoomInfo) -> Option<&'a Message> {
+    info.messages.range(..key).next_back().map(|(_, v)| v)
+}
+
 pub struct ScrollbackState {
+    /// The room identifier.
     room_id: OwnedRoomId,
+
+    /// The buffer identifier used for saving marks, etc.
     id: IambBufferId,
+
+    /// The currently selected message in the scrollback.
     cursor: MessageCursor,
+
+    /// Contextual info about the viewport used during rendering.
     viewctx: ViewportContext<MessageCursor>,
+
+    /// The jumplist of visited messages.
     jumped: HistoryList<MessageCursor>,
+
+    /// Whether the full message should be drawn during the next render() call.
+    ///
+    /// This is used to ensure that ^E/^Y work nicely when the cursor is currently
+    /// on a multiline message.
+    show_full_on_redraw: bool,
 }
 
 impl ScrollbackState {
@@ -116,8 +141,20 @@ impl ScrollbackState {
         let cursor = MessageCursor::default();
         let viewctx = ViewportContext::default();
         let jumped = HistoryList::default();
+        let show_full_on_redraw = false;
 
-        ScrollbackState { room_id, id, cursor, viewctx, jumped }
+        ScrollbackState {
+            room_id,
+            id,
+            cursor,
+            viewctx,
+            jumped,
+            show_full_on_redraw,
+        }
+    }
+
+    pub fn goto_latest(&mut self) {
+        self.cursor = MessageCursor::latest();
     }
 
     /// Set the dimensions and placement within the terminal window for this list.
@@ -125,6 +162,21 @@ impl ScrollbackState {
         self.viewctx.dimensions = (area.width as usize, area.height as usize);
     }
 
+    pub fn get_key(&self, info: &mut RoomInfo) -> Option<MessageKey> {
+        self.cursor
+            .timestamp
+            .clone()
+            .or_else(|| info.messages.last_key_value().map(|kv| kv.0.clone()))
+    }
+
+    pub fn get_mut<'a>(&mut self, messages: &'a mut Messages) -> Option<&'a mut Message> {
+        if let Some(k) = &self.cursor.timestamp {
+            messages.get_mut(k)
+        } else {
+            messages.last_entry().map(|o| o.into_mut())
+        }
+    }
+
     pub fn messages<'a>(
         &self,
         range: EditRange<MessageCursor>,
@@ -148,7 +200,13 @@ impl ScrollbackState {
         }
     }
 
-    fn scrollview(&mut self, idx: MessageKey, pos: MovePosition, info: &RoomInfo) {
+    fn scrollview(
+        &mut self,
+        idx: MessageKey,
+        pos: MovePosition,
+        info: &RoomInfo,
+        settings: &ApplicationSettings,
+    ) {
         let selidx = if let Some(key) = self.cursor.to_key(info) {
             key
         } else {
@@ -165,7 +223,8 @@ impl ScrollbackState {
 
                 for (key, item) in info.messages.range(..=&idx).rev() {
                     let sel = selidx == key;
-                    let len = item.show(sel, &self.viewctx).lines.len();
+                    let prev = prevmsg(key, info);
+                    let len = item.show(prev, sel, &self.viewctx, info, settings).lines.len();
 
                     if key == &idx {
                         lines += len / 2;
@@ -187,7 +246,8 @@ impl ScrollbackState {
 
                 for (key, item) in info.messages.range(..=&idx).rev() {
                     let sel = key == selidx;
-                    let len = item.show(sel, &self.viewctx).lines.len();
+                    let prev = prevmsg(key, info);
+                    let len = item.show(prev, sel, &self.viewctx, info, settings).lines.len();
 
                     lines += len;
 
@@ -202,7 +262,7 @@ impl ScrollbackState {
         }
     }
 
-    fn shift_cursor(&mut self, info: &RoomInfo) {
+    fn shift_cursor(&mut self, info: &RoomInfo, settings: &ApplicationSettings) {
         let last_key = if let Some(k) = info.messages.last_key_value() {
             k.0
         } else {
@@ -220,6 +280,7 @@ impl ScrollbackState {
         let mut lines = 0;
 
         let cursor_key = self.cursor.timestamp.as_ref().unwrap_or(last_key);
+        let mut prev = prevmsg(cursor_key, info);
 
         for (idx, item) in info.messages.range(corner_key.clone()..) {
             if idx == cursor_key {
@@ -227,13 +288,15 @@ impl ScrollbackState {
                 break;
             }
 
-            lines += item.show(false, &self.viewctx).height().max(1);
+            lines += item.show(prev, false, &self.viewctx, info, settings).height().max(1);
 
             if lines >= self.viewctx.get_height() {
                 // We've reached the end of the viewport; move cursor into it.
                 self.cursor = idx.clone().into();
                 break;
             }
+
+            prev = Some(item);
         }
     }
 
@@ -382,7 +445,7 @@ impl ScrollbackState {
                 continue;
             }
 
-            if needle.is_match(msg.as_ref()) {
+            if needle.is_match(msg.event.body().as_ref()) {
                 mc = MessageCursor::from(key.clone()).into();
                 count -= 1;
             }
@@ -406,7 +469,7 @@ impl ScrollbackState {
                 break;
             }
 
-            if needle.is_match(msg.as_ref()) {
+            if needle.is_match(msg.event.body().as_ref()) {
                 mc = MessageCursor::from(key.clone()).into();
                 count -= 1;
             }
@@ -447,6 +510,7 @@ impl WindowOps<IambInfo> for ScrollbackState {
             cursor: self.cursor.clone(),
             viewctx: self.viewctx.clone(),
             jumped: self.jumped.clone(),
+            show_full_on_redraw: false,
         }
     }
 
@@ -456,6 +520,23 @@ impl WindowOps<IambInfo> for ScrollbackState {
         true
     }
 
+    fn write(
+        &mut self,
+        _: Option<&str>,
+        flags: WriteFlags,
+        _: &mut ProgramStore,
+    ) -> IambResult<EditInfo> {
+        if flags.contains(WriteFlags::FORCE) {
+            Ok(None)
+        } else {
+            Err(EditError::ReadOnly.into())
+        }
+    }
+
+    fn get_completions(&self) -> Option<CompletionList> {
+        None
+    }
+
     fn get_cursor_word(&self, _: &WordStyle) -> Option<String> {
         None
     }
@@ -473,7 +554,7 @@ impl EditorActions<ProgramContext, ProgramStore, IambInfo> for ScrollbackState {
         ctx: &ProgramContext,
         store: &mut ProgramStore,
     ) -> EditResult<EditInfo, IambInfo> {
-        let info = store.application.rooms.entry(self.room_id.clone()).or_default();
+        let info = store.application.rooms.get_or_default(self.room_id.clone());
         let key = if let Some(k) = self.cursor.to_key(info) {
             k.clone()
         } else {
@@ -532,7 +613,7 @@ impl EditorActions<ProgramContext, ProgramStore, IambInfo> for ScrollbackState {
                         let needle = match ctx.get_search_regex() {
                             Some(re) => re,
                             None => {
-                                let lsearch = store.registers.get(&Register::LastSearch);
+                                let lsearch = store.registers.get(&Register::LastSearch)?;
                                 let lsearch = lsearch.value.to_string();
 
                                 Regex::new(lsearch.as_ref())?
@@ -556,7 +637,7 @@ impl EditorActions<ProgramContext, ProgramStore, IambInfo> for ScrollbackState {
                     },
 
                     _ => {
-                        let msg = format!("Unknown editing target: {:?}", motion);
+                        let msg = format!("Unknown editing target: {motion:?}");
                         let err = EditError::Unimplemented(msg);
 
                         return Err(err);
@@ -567,6 +648,8 @@ impl EditorActions<ProgramContext, ProgramStore, IambInfo> for ScrollbackState {
                     self.cursor = pos;
                 }
 
+                self.show_full_on_redraw = true;
+
                 return Ok(None);
             },
             EditAction::Yank => {
@@ -616,7 +699,7 @@ impl EditorActions<ProgramContext, ProgramStore, IambInfo> for ScrollbackState {
                         let needle = match ctx.get_search_regex() {
                             Some(re) => re,
                             None => {
-                                let lsearch = store.registers.get(&Register::LastSearch);
+                                let lsearch = store.registers.get(&Register::LastSearch)?;
                                 let lsearch = lsearch.value.to_string();
 
                                 Regex::new(lsearch.as_ref())?
@@ -641,7 +724,7 @@ impl EditorActions<ProgramContext, ProgramStore, IambInfo> for ScrollbackState {
                     },
 
                     _ => {
-                        let msg = format!("Unknown motion: {:?}", motion);
+                        let msg = format!("Unknown motion: {motion:?}");
                         let err = EditError::Unimplemented(msg);
 
                         return Err(err);
@@ -652,7 +735,7 @@ impl EditorActions<ProgramContext, ProgramStore, IambInfo> for ScrollbackState {
                     let mut yanked = EditRope::from("");
 
                     for (_, msg) in self.messages(range, info) {
-                        yanked += EditRope::from(msg.as_ref());
+                        yanked += EditRope::from(msg.event.body());
                         yanked += EditRope::from('\n');
                     }
 
@@ -664,7 +747,7 @@ impl EditorActions<ProgramContext, ProgramStore, IambInfo> for ScrollbackState {
                         flags |= RegisterPutFlags::APPEND;
                     }
 
-                    store.registers.put(&register, cell, flags);
+                    store.registers.put(&register, cell, flags)?;
                 }
 
                 return Ok(None);
@@ -672,7 +755,7 @@ impl EditorActions<ProgramContext, ProgramStore, IambInfo> for ScrollbackState {
 
             // Everything else is a modifying action.
             EditAction::ChangeCase(_) => Err(EditError::ReadOnly),
-            EditAction::ChangeNumber(_) => Err(EditError::ReadOnly),
+            EditAction::ChangeNumber(_, _) => Err(EditError::ReadOnly),
             EditAction::Delete => Err(EditError::ReadOnly),
             EditAction::Format => Err(EditError::ReadOnly),
             EditAction::Indent(_) => Err(EditError::ReadOnly),
@@ -701,6 +784,17 @@ impl EditorActions<ProgramContext, ProgramStore, IambInfo> for ScrollbackState {
         }
     }
 
+    fn complete(
+        &mut self,
+        _: &CompletionType,
+        _: &CompletionSelection,
+        _: &CompletionDisplay,
+        _: &ProgramContext,
+        _: &mut ProgramStore,
+    ) -> EditResult<EditInfo, IambInfo> {
+        Err(EditError::ReadOnly)
+    }
+
     fn insert_text(
         &mut self,
         _: &InsertTextAction,
@@ -729,7 +823,7 @@ impl EditorActions<ProgramContext, ProgramStore, IambInfo> for ScrollbackState {
             HistoryAction::Checkpoint => Ok(None),
             HistoryAction::Undo(_) => Err(EditError::Failure("Nothing to undo".into())),
             HistoryAction::Redo(_) => Err(EditError::Failure("Nothing to redo".into())),
-            _ => Err(EditError::Unimplemented(format!("Unknown action: {:?}", act))),
+            _ => Err(EditError::Unimplemented(format!("Unknown action: {act:?}"))),
         }
     }
 
@@ -786,7 +880,7 @@ impl EditorActions<ProgramContext, ProgramStore, IambInfo> for ScrollbackState {
 
                 Ok(None)
             },
-            _ => Err(EditError::Unimplemented(format!("Unknown action: {:?}", act))),
+            _ => Err(EditError::Unimplemented(format!("Unknown action: {act:?}"))),
         }
     }
 }
@@ -806,14 +900,14 @@ impl Editable<ProgramContext, ProgramStore, IambInfo> for ScrollbackState {
             EditorAction::Mark(name) => self.mark(ctx.resolve(name), ctx, store),
             EditorAction::Selection(act) => self.selection_command(act, ctx, store),
 
-            EditorAction::Complete(_, _) => {
-                let msg = "";
-                let err = EditError::Unimplemented(msg.into());
+            EditorAction::Complete(_, _, _) => {
+                let msg = "Nothing to complete in message scrollback";
+                let err = EditError::Failure(msg.into());
 
                 Err(err)
             },
 
-            _ => Err(EditError::Unimplemented(format!("Unknown action: {:?}", act))),
+            _ => Err(EditError::Unimplemented(format!("Unknown action: {act:?}"))),
         }
     }
 }
@@ -912,7 +1006,7 @@ impl Promptable<ProgramContext, ProgramStore, IambInfo> for ScrollbackState {
                 return Err(err);
             },
             _ => {
-                let msg = format!("Messages scrollback doesn't support {:?}", act);
+                let msg = format!("Messages scrollback doesn't support {act:?}");
                 let err = EditError::Unimplemented(msg);
 
                 return Err(err);
@@ -930,7 +1024,8 @@ impl ScrollActions<ProgramContext, ProgramStore, IambInfo> for ScrollbackState {
         ctx: &ProgramContext,
         store: &mut ProgramStore,
     ) -> EditResult<EditInfo, IambInfo> {
-        let info = store.application.get_room_info(self.room_id.clone());
+        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 last_key = if let Some(k) = info.messages.last_key_value() {
@@ -956,7 +1051,8 @@ impl ScrollActions<ProgramContext, ProgramStore, IambInfo> for ScrollbackState {
 
                 for (key, item) in info.messages.range(..=&corner_key).rev() {
                     let sel = key == cursor_key;
-                    let txt = item.show(sel, &self.viewctx);
+                    let prev = prevmsg(key, info);
+                    let txt = item.show(prev, sel, &self.viewctx, info, settings);
                     let len = txt.height().max(1);
                     let max = len.saturating_sub(1);
 
@@ -980,12 +1076,16 @@ impl ScrollActions<ProgramContext, ProgramStore, IambInfo> for ScrollbackState {
                 }
             },
             MoveDir2D::Down => {
+                let mut prev = prevmsg(&corner_key, info);
+
                 for (key, item) in info.messages.range(&corner_key..) {
                     let sel = key == cursor_key;
-                    let txt = item.show(sel, &self.viewctx);
+                    let txt = item.show(prev, sel, &self.viewctx, info, settings);
                     let len = txt.height().max(1);
                     let max = len.saturating_sub(1);
 
+                    prev = Some(item);
+
                     if key != &corner_key {
                         corner.text_row = 0;
                     }
@@ -1018,7 +1118,7 @@ impl ScrollActions<ProgramContext, ProgramStore, IambInfo> for ScrollbackState {
         }
 
         self.viewctx.corner = corner;
-        self.shift_cursor(info);
+        self.shift_cursor(info, settings);
 
         Ok(None)
     }
@@ -1038,10 +1138,11 @@ impl ScrollActions<ProgramContext, ProgramStore, IambInfo> for ScrollbackState {
                 Err(err)
             },
             Axis::Vertical => {
-                let info = store.application.get_room_info(self.room_id.clone());
+                let info = store.application.rooms.get_or_default(self.room_id.clone());
+                let settings = &store.application.settings;
 
                 if let Some(key) = self.cursor.to_key(info).cloned() {
-                    self.scrollview(key, pos, info);
+                    self.scrollview(key, pos, info, settings);
                 }
 
                 Ok(None)
@@ -1125,7 +1226,8 @@ impl<'a> StatefulWidget for Scrollback<'a> {
     type State = ScrollbackState;
 
     fn render(self, area: Rect, buf: &mut Buffer, state: &mut Self::State) {
-        let info = self.store.application.rooms.entry(state.room_id.clone()).or_default();
+        let info = self.store.application.rooms.get_or_default(state.room_id.clone());
+        let settings = &self.store.application.settings;
         let area = info.render_typing(area, buf, &self.store.application.settings);
 
         state.set_term_info(area);
@@ -1149,21 +1251,28 @@ impl<'a> StatefulWidget for Scrollback<'a> {
         };
 
         let corner = &state.viewctx.corner;
-        let corner_key = match (&corner.timestamp, &cursor.timestamp) {
-            (_, None) => nth_key_before(cursor_key.clone(), height, info),
-            (None, _) => nth_key_before(cursor_key.clone(), height, info),
-            (Some(k), _) => k.clone(),
+        let corner_key = if let Some(k) = &corner.timestamp {
+            k.clone()
+        } else {
+            nth_key_before(cursor_key.clone(), height, info)
         };
 
+        let foc = self.focused || cursor.timestamp.is_some();
+        let full = std::mem::take(&mut state.show_full_on_redraw) || cursor.timestamp.is_none();
         let mut lines = vec![];
         let mut sawit = false;
+        let mut prev = prevmsg(&corner_key, info);
 
         for (key, item) in info.messages.range(&corner_key..) {
             let sel = key == cursor_key;
-            let txt = item.show(self.focused && sel, &state.viewctx);
+            let txt = item.show(prev, foc && sel, &state.viewctx, info, settings);
+
+            prev = Some(item);
+
+            let incomplete_ok = !full || !sel;
 
             for (row, line) in txt.lines.into_iter().enumerate() {
-                if sawit && lines.len() >= height {
+                if sawit && lines.len() >= height && incomplete_ok {
                     // Check whether we've seen the first line of the
                     // selected message and can fill the screen.
                     break;
@@ -1198,7 +1307,13 @@ impl<'a> StatefulWidget for Scrollback<'a> {
             y += 1;
         }
 
-        let first_key = info.messages.first_key_value().map(|f| f.0.clone());
+        if settings.tunables.read_receipt_send && state.cursor.timestamp.is_none() {
+            // If the cursor is at the last message, then update the read marker.
+            info.read_till = info.messages.last_key_value().map(|(k, _)| k.1.clone());
+        }
+
+        // Check whether we should load older messages for this room.
+        let first_key = info.messages.first_key_value().map(|(k, _)| k.clone());
         if first_key == state.viewctx.corner.timestamp {
             // If the top of the screen is the older message, load more.
             self.store.application.mark_for_load(state.room_id.clone());
@@ -1211,10 +1326,10 @@ mod tests {
     use super::*;
     use crate::tests::*;
 
-    #[test]
-    fn test_search_messages() {
+    #[tokio::test]
+    async fn test_search_messages() {
         let room_id = TEST_ROOM1_ID.clone();
-        let mut store = mock_store();
+        let mut store = mock_store().await;
         let mut scrollback = ScrollbackState::new(room_id.clone());
         let ctx = ProgramContext::default();
 
@@ -1255,9 +1370,9 @@ mod tests {
         assert_eq!(scrollback.cursor, MSG1_KEY.clone().into());
     }
 
-    #[test]
-    fn test_movement() {
-        let mut store = mock_store();
+    #[tokio::test]
+    async fn test_movement() {
+        let mut store = mock_store().await;
         let mut scrollback = ScrollbackState::new(TEST_ROOM1_ID.clone());
         let ctx = ProgramContext::default();
 
@@ -1289,9 +1404,9 @@ mod tests {
         assert_eq!(scrollback.cursor, MSG1_KEY.clone().into());
     }
 
-    #[test]
-    fn test_dirscroll() {
-        let mut store = mock_store();
+    #[tokio::test]
+    async fn test_dirscroll() {
+        let mut store = mock_store().await;
         let mut scrollback = ScrollbackState::new(TEST_ROOM1_ID.clone());
         let ctx = ProgramContext::default();
 
@@ -1305,10 +1420,11 @@ mod tests {
         assert_eq!(scrollback.viewctx.dimensions, (0, 0));
         assert_eq!(scrollback.viewctx.corner, MessageCursor::latest());
 
-        // Set a terminal width of 60, and height of 3, rendering in scrollback as:
+        // Set a terminal width of 60, and height of 4, rendering in scrollback as:
         //
         //       |------------------------------------------------------------|
-        // MSG2: |           @user2:example.com  helium                       |
+        // MSG2: |                Wednesday, December 31 1969                 |
+        //       |           @user2:example.com  helium                       |
         // MSG3: |           @user2:example.com  this                         |
         //       |                               is                           |
         //       |                               a                            |
@@ -1316,14 +1432,15 @@ mod tests {
         //       |                               message                      |
         // MSG4: |           @user1:example.com  help                         |
         // MSG5: |           @user2:example.com  character                    |
-        // MSG1: |           @user1:example.com  writhe                       |
+        // MSG1: |                   XXXday, Month NN 20XX                    |
+        //       |           @user1:example.com  writhe                       |
         //       |------------------------------------------------------------|
-        let area = Rect::new(0, 0, 60, 3);
+        let area = Rect::new(0, 0, 60, 4);
         let mut buffer = Buffer::empty(area);
         scrollback.draw(area, &mut buffer, true, &mut store);
 
         assert_eq!(scrollback.cursor, MessageCursor::latest());
-        assert_eq!(scrollback.viewctx.dimensions, (60, 3));
+        assert_eq!(scrollback.viewctx.dimensions, (60, 4));
         assert_eq!(scrollback.viewctx.corner, MessageCursor::new(MSG4_KEY.clone(), 0));
 
         // Scroll up a line at a time until we hit the first message.
@@ -1352,6 +1469,11 @@ mod tests {
             .unwrap();
         assert_eq!(scrollback.viewctx.corner, MessageCursor::new(MSG3_KEY.clone(), 0));
 
+        scrollback
+            .dirscroll(prev, ScrollSize::Cell, &1.into(), &ctx, &mut store)
+            .unwrap();
+        assert_eq!(scrollback.viewctx.corner, MessageCursor::new(MSG2_KEY.clone(), 1));
+
         scrollback
             .dirscroll(prev, ScrollSize::Cell, &1.into(), &ctx, &mut store)
             .unwrap();
@@ -1364,6 +1486,11 @@ mod tests {
         assert_eq!(scrollback.viewctx.corner, MessageCursor::new(MSG2_KEY.clone(), 0));
 
         // Now scroll back down one line at a time.
+        scrollback
+            .dirscroll(next, ScrollSize::Cell, &1.into(), &ctx, &mut store)
+            .unwrap();
+        assert_eq!(scrollback.viewctx.corner, MessageCursor::new(MSG2_KEY.clone(), 1));
+
         scrollback
             .dirscroll(next, ScrollSize::Cell, &1.into(), &ctx, &mut store)
             .unwrap();
@@ -1404,28 +1531,33 @@ mod tests {
             .unwrap();
         assert_eq!(scrollback.viewctx.corner, MessageCursor::new(MSG1_KEY.clone(), 0));
 
+        scrollback
+            .dirscroll(next, ScrollSize::Cell, &1.into(), &ctx, &mut store)
+            .unwrap();
+        assert_eq!(scrollback.viewctx.corner, MessageCursor::new(MSG1_KEY.clone(), 1));
+
         // Cannot scroll down any further.
         scrollback
             .dirscroll(next, ScrollSize::Cell, &1.into(), &ctx, &mut store)
             .unwrap();
-        assert_eq!(scrollback.viewctx.corner, MessageCursor::new(MSG1_KEY.clone(), 0));
+        assert_eq!(scrollback.viewctx.corner, MessageCursor::new(MSG1_KEY.clone(), 1));
 
-        // Scroll up two Pages (six lines).
+        // Scroll up two Pages (eight lines).
         scrollback
             .dirscroll(prev, ScrollSize::Page, &2.into(), &ctx, &mut store)
             .unwrap();
-        assert_eq!(scrollback.viewctx.corner, MessageCursor::new(MSG3_KEY.clone(), 1));
+        assert_eq!(scrollback.viewctx.corner, MessageCursor::new(MSG3_KEY.clone(), 0));
 
-        // Scroll down two HalfPages (three lines).
+        // Scroll down two HalfPages (four lines).
         scrollback
             .dirscroll(next, ScrollSize::HalfPage, &2.into(), &ctx, &mut store)
             .unwrap();
         assert_eq!(scrollback.viewctx.corner, MessageCursor::new(MSG3_KEY.clone(), 4));
     }
 
-    #[test]
-    fn test_cursorpos() {
-        let mut store = mock_store();
+    #[tokio::test]
+    async fn test_cursorpos() {
+        let mut store = mock_store().await;
         let mut scrollback = ScrollbackState::new(TEST_ROOM1_ID.clone());
         let ctx = ProgramContext::default();
 
@@ -1435,7 +1567,8 @@ mod tests {
         // Set a terminal width of 60, and height of 3, rendering in scrollback as:
         //
         //       |------------------------------------------------------------|
-        // MSG2: |           @user2:example.com  helium                       |
+        // MSG2: |                Wednesday, December 31 1969                 |
+        //       |           @user2:example.com  helium                       |
         // MSG3: |           @user2:example.com  this                         |
         //       |                               is                           |
         //       |                               a                            |
@@ -1443,7 +1576,8 @@ mod tests {
         //       |                               message                      |
         // MSG4: |           @user1:example.com  help                         |
         // MSG5: |           @user2:example.com  character                    |
-        // MSG1: |           @user1:example.com  writhe                       |
+        // MSG1: |                   XXXday, Month NN 20XX                    |
+        //       |           @user1:example.com  writhe                       |
         //       |------------------------------------------------------------|
         let area = Rect::new(0, 0, 60, 3);
         let mut buffer = Buffer::empty(area);

src/windows/room/space.rs

@@ -31,6 +31,12 @@ impl SpaceState {
         SpaceState { room_id, room, list }
     }
 
+    pub fn refresh_room(&mut self, store: &mut ProgramStore) {
+        if let Some(room) = store.application.worker.client.get_room(self.id()) {
+            self.room = room;
+        }
+    }
+
     pub fn room(&self) -> &MatrixRoom {
         &self.room
     }
@@ -88,14 +94,20 @@ impl<'a> StatefulWidget for Space<'a> {
     type State = SpaceState;
 
     fn render(self, area: Rect, buffer: &mut Buffer, state: &mut Self::State) {
-        let members = self.store.application.worker.space_members(state.room_id.clone()).unwrap();
+        let members =
+            if let Ok(m) = self.store.application.worker.space_members(state.room_id.clone()) {
+                m
+            } else {
+                return;
+            };
+
         let items = members
             .into_iter()
             .filter_map(|id| {
-                let (room, name) = self.store.application.worker.get_room(id.clone()).ok()?;
+                let (room, name, tags) = self.store.application.worker.get_room(id.clone()).ok()?;
 
                 if id != state.room_id {
-                    Some(RoomItem::new(room, name, self.store))
+                    Some(RoomItem::new(room, name, tags, self.store))
                 } else {
                     None
                 }

src/windows/welcome.rs

@@ -8,9 +8,11 @@ use modalkit::{
     widgets::{TermOffset, TerminalCursor},
 };
 
-use modalkit::editing::base::{CloseFlags, WordStyle};
+use modalkit::editing::action::EditInfo;
+use modalkit::editing::base::{CloseFlags, WordStyle, WriteFlags};
+use modalkit::editing::completion::CompletionList;
 
-use crate::base::{IambBufferId, IambInfo, ProgramStore};
+use crate::base::{IambBufferId, IambInfo, IambResult, ProgramStore};
 
 const WELCOME_TEXT: &str = include_str!("welcome.md");
 
@@ -63,6 +65,19 @@ impl WindowOps<IambInfo> for WelcomeState {
         self.tbox.close(flags, store)
     }
 
+    fn write(
+        &mut self,
+        path: Option<&str>,
+        flags: WriteFlags,
+        store: &mut ProgramStore,
+    ) -> IambResult<EditInfo> {
+        self.tbox.write(path, flags, store)
+    }
+
+    fn get_completions(&self) -> Option<CompletionList> {
+        self.tbox.get_completions()
+    }
+
     fn get_cursor_word(&self, style: &WordStyle) -> Option<String> {
         self.tbox.get_cursor_word(style)
     }

src/worker.rs

@@ -1,12 +1,14 @@
 use std::convert::TryFrom;
+use std::fmt::{Debug, Formatter};
 use std::fs::File;
 use std::io::BufWriter;
 use std::str::FromStr;
-use std::sync::mpsc::{sync_channel, Receiver, RecvTimeoutError, SyncSender};
+use std::sync::mpsc::{sync_channel, Receiver, SyncSender};
 use std::sync::Arc;
 use std::time::Duration;
 
 use gethostname::gethostname;
+use tokio::sync::mpsc::{unbounded_channel, UnboundedReceiver, UnboundedSender};
 use tokio::task::JoinHandle;
 use tracing::error;
 
@@ -15,13 +17,14 @@ use matrix_sdk::{
     encryption::verification::{SasVerification, Verification},
     event_handler::Ctx,
     reqwest,
-    room::{Messages, MessagesOptions, Room as MatrixRoom, RoomMember},
+    room::{Invited, Messages, MessagesOptions, Room as MatrixRoom, RoomMember},
     ruma::{
         api::client::{
-            room::create_room::v3::{Request as CreateRoomRequest, RoomPreset},
+            room::create_room::v3::{CreationContent, Request as CreateRoomRequest, RoomPreset},
             room::Visibility,
             space::get_hierarchy::v1::Request as SpaceHierarchyRequest,
         },
+        assign,
         events::{
             key::verification::{
                 done::{OriginalSyncKeyVerificationDoneEvent, ToDeviceKeyVerificationDoneEvent},
@@ -30,21 +33,30 @@ use matrix_sdk::{
                 start::{OriginalSyncKeyVerificationStartEvent, ToDeviceKeyVerificationStartEvent},
                 VerificationMethod,
             },
+            presence::PresenceEvent,
+            reaction::ReactionEventContent,
             room::{
-                message::{MessageType, RoomMessageEventContent, TextMessageEventContent},
+                encryption::RoomEncryptionEventContent,
+                message::{MessageType, RoomMessageEventContent},
                 name::RoomNameEventContent,
-                topic::RoomTopicEventContent,
+                redaction::{OriginalSyncRoomRedactionEvent, SyncRoomRedactionEvent},
             },
+            tag::Tags,
             typing::SyncTypingEvent,
-            AnyMessageLikeEvent,
+            AnyInitialStateEvent,
             AnyTimelineEvent,
+            EmptyStateKey,
+            InitialStateEvent,
             SyncMessageLikeEvent,
             SyncStateEvent,
         },
-        OwnedEventId,
+        room::RoomType,
+        serde::Raw,
+        EventEncryptionAlgorithm,
         OwnedRoomId,
         OwnedRoomOrAliasId,
         OwnedUserId,
+        RoomVersionId,
     },
     Client,
     DisplayName,
@@ -54,8 +66,17 @@ use matrix_sdk::{
 use modalkit::editing::action::{EditInfo, InfoMessage, UIError};
 
 use crate::{
-    base::{AsyncProgramStore, IambError, IambResult, SetRoomField, VerifyAction},
-    message::{Message, MessageFetchResult, MessageTimeStamp},
+    base::{
+        AsyncProgramStore,
+        CreateRoomFlags,
+        CreateRoomType,
+        EventLocation,
+        IambError,
+        IambResult,
+        Receipts,
+        VerifyAction,
+    },
+    message::MessageFetchResult,
     ApplicationSettings,
 };
 
@@ -67,6 +88,78 @@ fn initial_devname() -> String {
     format!("{} on {}", IAMB_DEVICE_NAME, gethostname().to_string_lossy())
 }
 
+pub async fn create_room(
+    client: &Client,
+    room_alias_name: Option<&str>,
+    rt: CreateRoomType,
+    flags: CreateRoomFlags,
+) -> IambResult<OwnedRoomId> {
+    let mut creation_content = None;
+    let mut initial_state = vec![];
+    let mut is_direct = false;
+    let mut preset = None;
+    let mut invite = vec![];
+
+    let visibility = if flags.contains(CreateRoomFlags::PUBLIC) {
+        Visibility::Public
+    } else {
+        Visibility::Private
+    };
+
+    match rt {
+        CreateRoomType::Direct(user) => {
+            invite.push(user);
+            is_direct = true;
+            preset = Some(RoomPreset::TrustedPrivateChat);
+        },
+        CreateRoomType::Space => {
+            let mut cc = CreationContent::new();
+            cc.room_type = Some(RoomType::Space);
+
+            let raw_cc = Raw::new(&cc).map_err(IambError::from)?;
+            creation_content = Some(raw_cc);
+        },
+        CreateRoomType::Room => {},
+    }
+
+    // Set up encryption.
+    if flags.contains(CreateRoomFlags::ENCRYPTED) {
+        // XXX: Once matrix-sdk uses ruma 0.8, then this can skip the cast.
+        let algo = EventEncryptionAlgorithm::MegolmV1AesSha2;
+        let content = RoomEncryptionEventContent::new(algo);
+        let encr = InitialStateEvent { content, state_key: EmptyStateKey };
+        let encr_raw = Raw::new(&encr).map_err(IambError::from)?;
+        let encr_raw = encr_raw.cast::<AnyInitialStateEvent>();
+        initial_state.push(encr_raw);
+    }
+
+    let request = assign!(CreateRoomRequest::new(), {
+        room_alias_name,
+        creation_content,
+        initial_state: initial_state.as_slice(),
+        invite: invite.as_slice(),
+        is_direct,
+        visibility,
+        preset,
+    });
+
+    let resp = client.create_room(request).await.map_err(IambError::from)?;
+
+    if is_direct {
+        if let Some(room) = client.get_room(&resp.room_id) {
+            room.set_is_direct(true).await.map_err(IambError::from)?;
+        } else {
+            error!(
+                room_id = resp.room_id.as_str(),
+                "Couldn't set is_direct for new direct message room"
+            );
+        }
+    }
+
+    return Ok(resp.room_id);
+}
+
+#[derive(Debug)]
 pub enum LoginStyle {
     SessionRestore(Session),
     Password(String),
@@ -95,29 +188,133 @@ fn oneshot<T>() -> (ClientReply<T>, ClientResponse<T>) {
     return (reply, response);
 }
 
-type EchoPair = (OwnedEventId, RoomMessageEventContent);
+async fn update_receipts(client: &Client) -> Vec<(OwnedRoomId, Receipts)> {
+    let mut rooms = vec![];
+
+    for room in client.joined_rooms() {
+        if let Ok(users) = room.active_members_no_sync().await {
+            let mut receipts = Receipts::new();
+
+            for member in users {
+                let res = room.user_read_receipt(member.user_id()).await;
+
+                if let Ok(Some((event_id, _))) = res {
+                    let user_id = member.user_id().to_owned();
+                    receipts.entry(event_id).or_default().push(user_id);
+                }
+            }
+
+            rooms.push((room.room_id().to_owned(), receipts));
+        }
+    }
+
+    return rooms;
+}
+
+pub type FetchedRoom = (MatrixRoom, DisplayName, Option<Tags>);
 
 pub enum WorkerTask {
-    DirectMessages(ClientReply<Vec<(MatrixRoom, DisplayName)>>),
+    ActiveRooms(ClientReply<Vec<FetchedRoom>>),
+    DirectMessages(ClientReply<Vec<FetchedRoom>>),
     Init(AsyncProgramStore, ClientReply<()>),
     LoadOlder(OwnedRoomId, Option<String>, u32, ClientReply<MessageFetchResult>),
     Login(LoginStyle, ClientReply<IambResult<EditInfo>>),
-    GetRoom(OwnedRoomId, ClientReply<IambResult<(MatrixRoom, DisplayName)>>),
+    GetInviter(Invited, ClientReply<IambResult<Option<RoomMember>>>),
+    GetRoom(OwnedRoomId, ClientReply<IambResult<FetchedRoom>>),
     JoinRoom(String, ClientReply<IambResult<OwnedRoomId>>),
-    JoinedRooms(ClientReply<Vec<(MatrixRoom, DisplayName)>>),
     Members(OwnedRoomId, ClientReply<IambResult<Vec<RoomMember>>>),
     SpaceMembers(OwnedRoomId, ClientReply<IambResult<Vec<OwnedRoomId>>>),
     Spaces(ClientReply<Vec<(MatrixRoom, DisplayName)>>),
-    SendMessage(OwnedRoomId, String, ClientReply<IambResult<EchoPair>>),
-    SetRoom(OwnedRoomId, SetRoomField, ClientReply<IambResult<()>>),
     TypingNotice(OwnedRoomId),
     Verify(VerifyAction, SasVerification, ClientReply<IambResult<EditInfo>>),
     VerifyRequest(OwnedUserId, ClientReply<IambResult<EditInfo>>),
 }
 
+impl Debug for WorkerTask {
+    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), std::fmt::Error> {
+        match self {
+            WorkerTask::ActiveRooms(_) => {
+                f.debug_tuple("WorkerTask::ActiveRooms").field(&format_args!("_")).finish()
+            },
+            WorkerTask::DirectMessages(_) => {
+                f.debug_tuple("WorkerTask::DirectMessages")
+                    .field(&format_args!("_"))
+                    .finish()
+            },
+            WorkerTask::Init(_, _) => {
+                f.debug_tuple("WorkerTask::Init")
+                    .field(&format_args!("_"))
+                    .field(&format_args!("_"))
+                    .finish()
+            },
+            WorkerTask::LoadOlder(room_id, from, n, _) => {
+                f.debug_tuple("WorkerTask::LoadOlder")
+                    .field(room_id)
+                    .field(from)
+                    .field(n)
+                    .field(&format_args!("_"))
+                    .finish()
+            },
+            WorkerTask::Login(style, _) => {
+                f.debug_tuple("WorkerTask::Login")
+                    .field(style)
+                    .field(&format_args!("_"))
+                    .finish()
+            },
+            WorkerTask::GetInviter(invite, _) => {
+                f.debug_tuple("WorkerTask::GetInviter").field(invite).finish()
+            },
+            WorkerTask::GetRoom(room_id, _) => {
+                f.debug_tuple("WorkerTask::GetRoom")
+                    .field(room_id)
+                    .field(&format_args!("_"))
+                    .finish()
+            },
+            WorkerTask::JoinRoom(s, _) => {
+                f.debug_tuple("WorkerTask::JoinRoom")
+                    .field(s)
+                    .field(&format_args!("_"))
+                    .finish()
+            },
+            WorkerTask::Members(room_id, _) => {
+                f.debug_tuple("WorkerTask::Members")
+                    .field(room_id)
+                    .field(&format_args!("_"))
+                    .finish()
+            },
+            WorkerTask::SpaceMembers(room_id, _) => {
+                f.debug_tuple("WorkerTask::SpaceMembers")
+                    .field(room_id)
+                    .field(&format_args!("_"))
+                    .finish()
+            },
+            WorkerTask::Spaces(_) => {
+                f.debug_tuple("WorkerTask::Spaces").field(&format_args!("_")).finish()
+            },
+            WorkerTask::TypingNotice(room_id) => {
+                f.debug_tuple("WorkerTask::TypingNotice").field(room_id).finish()
+            },
+            WorkerTask::Verify(act, sasv1, _) => {
+                f.debug_tuple("WorkerTask::Verify")
+                    .field(act)
+                    .field(sasv1)
+                    .field(&format_args!("_"))
+                    .finish()
+            },
+            WorkerTask::VerifyRequest(user_id, _) => {
+                f.debug_tuple("WorkerTask::VerifyRequest")
+                    .field(user_id)
+                    .field(&format_args!("_"))
+                    .finish()
+            },
+        }
+    }
+}
+
 #[derive(Clone)]
 pub struct Requester {
-    pub tx: SyncSender<WorkerTask>,
+    pub client: Client,
+    pub tx: UnboundedSender<WorkerTask>,
 }
 
 impl Requester {
@@ -152,15 +349,7 @@ impl Requester {
         return response.recv();
     }
 
-    pub fn send_message(&self, room_id: OwnedRoomId, msg: String) -> IambResult<EchoPair> {
-        let (reply, response) = oneshot();
-
-        self.tx.send(WorkerTask::SendMessage(room_id, msg, reply)).unwrap();
-
-        return response.recv();
-    }
-
-    pub fn direct_messages(&self) -> Vec<(MatrixRoom, DisplayName)> {
+    pub fn direct_messages(&self) -> Vec<FetchedRoom> {
         let (reply, response) = oneshot();
 
         self.tx.send(WorkerTask::DirectMessages(reply)).unwrap();
@@ -168,7 +357,15 @@ impl Requester {
         return response.recv();
     }
 
-    pub fn get_room(&self, room_id: OwnedRoomId) -> IambResult<(MatrixRoom, DisplayName)> {
+    pub fn get_inviter(&self, invite: Invited) -> IambResult<Option<RoomMember>> {
+        let (reply, response) = oneshot();
+
+        self.tx.send(WorkerTask::GetInviter(invite, reply)).unwrap();
+
+        return response.recv();
+    }
+
+    pub fn get_room(&self, room_id: OwnedRoomId) -> IambResult<FetchedRoom> {
         let (reply, response) = oneshot();
 
         self.tx.send(WorkerTask::GetRoom(room_id, reply)).unwrap();
@@ -184,10 +381,10 @@ impl Requester {
         return response.recv();
     }
 
-    pub fn joined_rooms(&self) -> Vec<(MatrixRoom, DisplayName)> {
+    pub fn active_rooms(&self) -> Vec<FetchedRoom> {
         let (reply, response) = oneshot();
 
-        self.tx.send(WorkerTask::JoinedRooms(reply)).unwrap();
+        self.tx.send(WorkerTask::ActiveRooms(reply)).unwrap();
 
         return response.recv();
     }
@@ -208,14 +405,6 @@ impl Requester {
         return response.recv();
     }
 
-    pub fn set_room(&self, room_id: OwnedRoomId, ev: SetRoomField) -> IambResult<()> {
-        let (reply, response) = oneshot();
-
-        self.tx.send(WorkerTask::SetRoom(room_id, ev, reply)).unwrap();
-
-        return response.recv();
-    }
-
     pub fn spaces(&self) -> Vec<(MatrixRoom, DisplayName)> {
         let (reply, response) = oneshot();
 
@@ -250,13 +439,12 @@ pub struct ClientWorker {
     settings: ApplicationSettings,
     client: Client,
     sync_handle: Option<JoinHandle<()>>,
+    rcpt_handle: Option<JoinHandle<()>>,
 }
 
 impl ClientWorker {
-    pub fn spawn(settings: ApplicationSettings) -> Requester {
-        let (tx, rx) = sync_channel(5);
-
-        let _ = tokio::spawn(async move {
+    pub async fn spawn(settings: ApplicationSettings) -> Requester {
+        let (tx, rx) = unbounded_channel();
         let account = &settings.profile;
 
         // Set up a custom client that only uses HTTP/1.
@@ -265,9 +453,10 @@ impl ClientWorker {
         // will need to be revisited in the future.
         let http = reqwest::Client::builder()
             .user_agent(IAMB_USER_AGENT)
-                .timeout(Duration::from_secs(60))
-                .pool_idle_timeout(Duration::from_secs(120))
-                .pool_max_idle_per_host(5)
+            .timeout(Duration::from_secs(30))
+            .pool_idle_timeout(Duration::from_secs(60))
+            .pool_max_idle_per_host(10)
+            .tcp_keepalive(Duration::from_secs(10))
             .http1_only()
             .build()
             .unwrap();
@@ -279,9 +468,7 @@ impl ClientWorker {
             .store_config(StoreConfig::default())
             .sled_store(settings.matrix_dir.as_path(), None)
             .expect("Failed to setup up sled store for Matrix SDK")
-                .request_config(
-                    RequestConfig::new().timeout(REQ_TIMEOUT).retry_timeout(REQ_TIMEOUT),
-                )
+            .request_config(RequestConfig::new().timeout(REQ_TIMEOUT).retry_timeout(REQ_TIMEOUT))
             .build()
             .await
             .expect("Failed to instantiate Matrix client");
@@ -289,24 +476,25 @@ impl ClientWorker {
         let mut worker = ClientWorker {
             initialized: false,
             settings,
-                client,
+            client: client.clone(),
             sync_handle: None,
+            rcpt_handle: None,
         };
 
+        tokio::spawn(async move {
             worker.work(rx).await;
         });
 
-        return Requester { tx };
+        return Requester { client, tx };
     }
 
-    async fn work(&mut self, rx: Receiver<WorkerTask>) {
+    async fn work(&mut self, mut rx: UnboundedReceiver<WorkerTask>) {
         loop {
-            let t = rx.recv_timeout(Duration::from_secs(1));
+            let t = rx.recv().await;
 
             match t {
-                Ok(task) => self.run(task).await,
-                Err(RecvTimeoutError::Timeout) => {},
-                Err(RecvTimeoutError::Disconnected) => {
+                Some(task) => self.run(task).await,
+                None => {
                     break;
                 },
             }
@@ -315,6 +503,10 @@ impl ClientWorker {
         if let Some(handle) = self.sync_handle.take() {
             handle.abort();
         }
+
+        if let Some(handle) = self.rcpt_handle.take() {
+            handle.abort();
+        }
     }
 
     async fn run(&mut self, task: WorkerTask) {
@@ -332,13 +524,17 @@ impl ClientWorker {
                 assert!(self.initialized);
                 reply.send(self.join_room(room_id).await);
             },
+            WorkerTask::GetInviter(invited, reply) => {
+                assert!(self.initialized);
+                reply.send(self.get_inviter(invited).await);
+            },
             WorkerTask::GetRoom(room_id, reply) => {
                 assert!(self.initialized);
                 reply.send(self.get_room(room_id).await);
             },
-            WorkerTask::JoinedRooms(reply) => {
+            WorkerTask::ActiveRooms(reply) => {
                 assert!(self.initialized);
-                reply.send(self.joined_rooms().await);
+                reply.send(self.active_rooms().await);
             },
             WorkerTask::LoadOlder(room_id, fetch_id, limit, reply) => {
                 assert!(self.initialized);
@@ -352,10 +548,6 @@ impl ClientWorker {
                 assert!(self.initialized);
                 reply.send(self.members(room_id).await);
             },
-            WorkerTask::SetRoom(room_id, field, reply) => {
-                assert!(self.initialized);
-                reply.send(self.set_room(room_id, field).await);
-            },
             WorkerTask::SpaceMembers(space, reply) => {
                 assert!(self.initialized);
                 reply.send(self.space_members(space).await);
@@ -364,10 +556,6 @@ impl ClientWorker {
                 assert!(self.initialized);
                 reply.send(self.spaces().await);
             },
-            WorkerTask::SendMessage(room_id, msg, reply) => {
-                assert!(self.initialized);
-                reply.send(self.send_message(room_id, msg).await);
-            },
             WorkerTask::TypingNotice(room_id) => {
                 assert!(self.initialized);
                 self.typing_notice(room_id).await;
@@ -384,7 +572,7 @@ impl ClientWorker {
     }
 
     async fn init(&mut self, store: AsyncProgramStore) {
-        self.client.add_event_handler_context(store);
+        self.client.add_event_handler_context(store.clone());
 
         let _ = self.client.add_event_handler(
             |ev: SyncTypingEvent, room: MatrixRoom, store: Ctx<AsyncProgramStore>| {
@@ -404,6 +592,15 @@ impl ClientWorker {
             },
         );
 
+        let _ =
+            self.client
+                .add_event_handler(|ev: PresenceEvent, store: Ctx<AsyncProgramStore>| {
+                    async move {
+                        let mut locked = store.lock().await;
+                        locked.application.presences.insert(ev.sender, ev.content.presence);
+                    }
+                });
+
         let _ = self.client.add_event_handler(
             |ev: SyncStateEvent<RoomNameEventContent>,
              room: MatrixRoom,
@@ -414,8 +611,7 @@ impl ClientWorker {
                             let room_id = room.room_id().to_owned();
                             let room_name = Some(room_name.to_string());
                             let mut locked = store.lock().await;
-                            let mut info =
-                                locked.application.rooms.entry(room_id.to_owned()).or_default();
+                            let mut info = locked.application.rooms.get_or_default(room_id.clone());
                             info.name = room_name;
                         }
                     }
@@ -430,8 +626,6 @@ impl ClientWorker {
              store: Ctx<AsyncProgramStore>| {
                 async move {
                     let room_id = room.room_id();
-                    let room_name = room.display_name().await.ok();
-                    let room_name = room_name.as_ref().map(ToString::to_string);
 
                     if let Some(msg) = ev.as_original() {
                         if let MessageType::VerificationRequest(_) = msg.content.msgtype {
@@ -446,17 +640,62 @@ impl ClientWorker {
                     }
 
                     let mut locked = store.lock().await;
-                    let mut info = locked.application.get_room_info(room_id.to_owned());
-                    info.name = room_name;
 
-                    let event_id = ev.event_id().to_owned();
-                    let key = (ev.origin_server_ts().into(), event_id.clone());
-                    let msg = Message::from(ev.into_full_event(room_id.to_owned()));
-                    info.messages.insert(key, msg);
+                    let sender = ev.sender().to_owned();
+                    let _ = locked.application.presences.get_or_default(sender);
 
-                    // Remove the echo.
-                    let key = (MessageTimeStamp::LocalEcho, event_id);
-                    let _ = info.messages.remove(&key);
+                    let info = locked.application.get_room_info(room_id.to_owned());
+                    info.insert(ev.into_full_event(room_id.to_owned()));
+                }
+            },
+        );
+
+        let _ = self.client.add_event_handler(
+            |ev: SyncMessageLikeEvent<ReactionEventContent>,
+             room: MatrixRoom,
+             store: Ctx<AsyncProgramStore>| {
+                async move {
+                    let room_id = room.room_id();
+
+                    let mut locked = store.lock().await;
+
+                    let sender = ev.sender().to_owned();
+                    let _ = locked.application.presences.get_or_default(sender);
+
+                    let info = locked.application.get_room_info(room_id.to_owned());
+                    info.insert_reaction(ev.into_full_event(room_id.to_owned()));
+                }
+            },
+        );
+
+        let _ = self.client.add_event_handler(
+            |ev: OriginalSyncRoomRedactionEvent,
+             room: MatrixRoom,
+             store: Ctx<AsyncProgramStore>| {
+                async move {
+                    let room_id = room.room_id();
+                    let room_info = room.clone_info();
+                    let room_version = room_info.room_version().unwrap_or(&RoomVersionId::V1);
+
+                    let mut locked = store.lock().await;
+                    let info = locked.application.get_room_info(room_id.to_owned());
+
+                    match info.keys.get(&ev.redacts) {
+                        None => return,
+                        Some(EventLocation::Message(key)) => {
+                            if let Some(msg) = info.messages.get_mut(key) {
+                                let ev = SyncRoomRedactionEvent::Original(ev);
+                                msg.event.redact(ev, room_version);
+                            }
+                        },
+                        Some(EventLocation::Reaction(event_id)) => {
+                            if let Some(reactions) = info.reactions.get_mut(event_id) {
+                                reactions.remove(&ev.redacts);
+                            }
+
+                            info.keys.remove(&ev.redacts);
+                        },
+                    }
                 }
             },
         );
@@ -573,6 +812,21 @@ impl ClientWorker {
             },
         );
 
+        let client = self.client.clone();
+
+        self.rcpt_handle = tokio::spawn(async move {
+            // Update the displayed read receipts ever 5 seconds.
+            let mut interval = tokio::time::interval(Duration::from_secs(5));
+
+            loop {
+                interval.tick().await;
+
+                let receipts = update_receipts(&client).await;
+                store.lock().await.application.set_receipts(receipts).await;
+            }
+        })
+        .into();
+
         self.initialized = true;
     }
 
@@ -615,49 +869,18 @@ impl ClientWorker {
         Ok(Some(InfoMessage::from("Successfully logged in!")))
     }
 
-    async fn send_message(&mut self, room_id: OwnedRoomId, msg: String) -> IambResult<EchoPair> {
-        let room = if let r @ Some(_) = self.client.get_joined_room(&room_id) {
-            r
-        } else if self.client.join_room_by_id(&room_id).await.is_ok() {
-            self.client.get_joined_room(&room_id)
-        } else {
-            None
-        };
-
-        if let Some(room) = room {
-            let msg = TextMessageEventContent::plain(msg);
-            let msg = MessageType::Text(msg);
-            let msg = RoomMessageEventContent::new(msg);
-
-            // XXX: second parameter can be a locally unique transaction id.
-            // Useful for doing retries.
-            let resp = room.send(msg.clone(), None).await.map_err(IambError::from)?;
-            let event_id = resp.event_id;
-
-            // XXX: need to either give error messages and retry when needed!
-
-            return Ok((event_id, msg));
-        } else {
-            Err(IambError::UnknownRoom(room_id).into())
-        }
-    }
-
-    async fn direct_message(&mut self, user: OwnedUserId) -> IambResult<(MatrixRoom, DisplayName)> {
-        for (room, name) in self.direct_messages().await {
+    async fn direct_message(&mut self, user: OwnedUserId) -> IambResult<FetchedRoom> {
+        for (room, name, tags) in self.direct_messages().await {
             if room.get_member(user.as_ref()).await.map_err(IambError::from)?.is_some() {
-                return Ok((room, name));
+                return Ok((room, name, tags));
             }
         }
 
-        let mut request = CreateRoomRequest::new();
-        let invite = [user.clone()];
-        request.is_direct = true;
-        request.invite = &invite;
-        request.visibility = Visibility::Private;
-        request.preset = Some(RoomPreset::PrivateChat);
+        let rt = CreateRoomType::Direct(user.clone());
+        let flags = CreateRoomFlags::ENCRYPTED;
 
-        match self.client.create_room(request).await {
-            Ok(resp) => self.get_room(resp.room_id).await,
+        match create_room(&self.client, None, rt, flags).await {
+            Ok(room_id) => self.get_room(room_id).await,
             Err(e) => {
                 error!(
                     user_id = user.as_str(),
@@ -665,7 +888,7 @@ impl ClientWorker {
                     "Failed to create direct message room"
                 );
 
-                let msg = format!("Could not open a room with {}", user);
+                let msg = format!("Could not open a room with {user}");
                 let err = UIError::Failure(msg);
 
                 Err(err)
@@ -673,11 +896,18 @@ impl ClientWorker {
         }
     }
 
-    async fn get_room(&mut self, room_id: OwnedRoomId) -> IambResult<(MatrixRoom, DisplayName)> {
+    async fn get_inviter(&mut self, invited: Invited) -> IambResult<Option<RoomMember>> {
+        let details = invited.invite_details().await.map_err(IambError::from)?;
+
+        Ok(details.inviter)
+    }
+
+    async fn get_room(&mut self, room_id: OwnedRoomId) -> IambResult<FetchedRoom> {
         if let Some(room) = self.client.get_room(&room_id) {
             let name = room.display_name().await.map_err(IambError::from)?;
+            let tags = room.tags().await.map_err(IambError::from)?;
 
-            Ok((room, name))
+            Ok((room, name, tags))
         } else {
             Err(IambError::UnknownRoom(room_id).into())
         }
@@ -706,33 +936,57 @@ impl ClientWorker {
         }
     }
 
-    async fn direct_messages(&mut self) -> Vec<(MatrixRoom, DisplayName)> {
+    async fn direct_messages(&self) -> Vec<FetchedRoom> {
         let mut rooms = vec![];
 
-        for room in self.client.joined_rooms().into_iter() {
-            if room.is_space() || !room.is_direct() {
+        for room in self.client.invited_rooms().into_iter() {
+            if !room.is_direct() {
                 continue;
             }
 
-            if let Ok(name) = room.display_name().await {
-                rooms.push((MatrixRoom::from(room), name))
+            let name = room.display_name().await.unwrap_or(DisplayName::Empty);
+            let tags = room.tags().await.unwrap_or_default();
+
+            rooms.push((room.into(), name, tags));
         }
+
+        for room in self.client.joined_rooms().into_iter() {
+            if !room.is_direct() {
+                continue;
+            }
+
+            let name = room.display_name().await.unwrap_or(DisplayName::Empty);
+            let tags = room.tags().await.unwrap_or_default();
+
+            rooms.push((room.into(), name, tags));
         }
 
         return rooms;
     }
 
-    async fn joined_rooms(&mut self) -> Vec<(MatrixRoom, DisplayName)> {
+    async fn active_rooms(&self) -> Vec<FetchedRoom> {
         let mut rooms = vec![];
 
+        for room in self.client.invited_rooms().into_iter() {
+            if room.is_space() || room.is_direct() {
+                continue;
+            }
+
+            let name = room.display_name().await.unwrap_or(DisplayName::Empty);
+            let tags = room.tags().await.unwrap_or_default();
+
+            rooms.push((room.into(), name, tags));
+        }
+
         for room in self.client.joined_rooms().into_iter() {
             if room.is_space() || room.is_direct() {
                 continue;
             }
 
-            if let Ok(name) = room.display_name().await {
-                rooms.push((MatrixRoom::from(room), name))
-            }
+            let name = room.display_name().await.unwrap_or(DisplayName::Empty);
+            let tags = room.tags().await.unwrap_or_default();
+
+            rooms.push((room.into(), name, tags));
         }
 
         return rooms;
@@ -755,13 +1009,7 @@ impl ClientWorker {
 
             let msgs = chunk.into_iter().filter_map(|ev| {
                 match ev.event.deserialize() {
-                    Ok(AnyTimelineEvent::MessageLike(msg)) => {
-                        if let AnyMessageLikeEvent::RoomMessage(msg) = msg {
-                            Some(msg)
-                        } else {
-                            None
-                        }
-                    },
+                    Ok(AnyTimelineEvent::MessageLike(msg)) => Some(msg),
                     Ok(AnyTimelineEvent::State(_)) => None,
                     Err(_) => None,
                 }
@@ -781,27 +1029,6 @@ impl ClientWorker {
         }
     }
 
-    async fn set_room(&mut self, room_id: OwnedRoomId, field: SetRoomField) -> IambResult<()> {
-        let room = if let Some(r) = self.client.get_joined_room(&room_id) {
-            r
-        } else {
-            return Err(IambError::UnknownRoom(room_id).into());
-        };
-
-        match field {
-            SetRoomField::Name(name) => {
-                let ev = RoomNameEventContent::new(name.into());
-                let _ = room.send_state_event(ev).await.map_err(IambError::from)?;
-            },
-            SetRoomField::Topic(topic) => {
-                let ev = RoomTopicEventContent::new(topic);
-                let _ = room.send_state_event(ev).await.map_err(IambError::from)?;
-            },
-        }
-
-        Ok(())
-    }
-
     async fn space_members(&mut self, space: OwnedRoomId) -> IambResult<Vec<OwnedRoomId>> {
         let mut req = SpaceHierarchyRequest::new(&space);
         req.limit = Some(1000u32.into());
@@ -814,17 +1041,27 @@ impl ClientWorker {
         Ok(rooms)
     }
 
-    async fn spaces(&mut self) -> Vec<(MatrixRoom, DisplayName)> {
+    async fn spaces(&self) -> Vec<(MatrixRoom, DisplayName)> {
         let mut spaces = vec![];
 
+        for room in self.client.invited_rooms().into_iter() {
+            if !room.is_space() {
+                continue;
+            }
+
+            let name = room.display_name().await.unwrap_or(DisplayName::Empty);
+
+            spaces.push((room.into(), name));
+        }
+
         for room in self.client.joined_rooms().into_iter() {
             if !room.is_space() {
                 continue;
             }
 
-            if let Ok(name) = room.display_name().await {
-                spaces.push((MatrixRoom::from(room), name));
-            }
+            let name = room.display_name().await.unwrap_or(DisplayName::Empty);
+
+            spaces.push((room.into(), name));
         }
 
         return spaces;
@@ -890,12 +1127,12 @@ impl ClientWorker {
                 let methods = vec![VerificationMethod::SasV1];
                 let request = identity.request_verification_with_methods(methods);
                 let _req = request.await.map_err(IambError::from)?;
-                let info = format!("Sent verification request to {}", user_id);
+                let info = format!("Sent verification request to {user_id}");
 
                 Ok(InfoMessage::from(info).into())
             },
             None => {
-                let msg = format!("Could not find identity information for {}", user_id);
+                let msg = format!("Could not find identity information for {user_id}");
                 let err = UIError::Failure(msg);
 
                 Err(err)