Render /me messages properly
This commit is contained in:
parent
4ac0b5f074
commit
8e2e7d4764
1 changed files with 23 additions and 1 deletions
|
|
@ -17,16 +17,34 @@ pub struct Message {
|
||||||
pub content: String,
|
pub content: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn as_me(content: &str) -> Option<&str> {
|
||||||
|
content.strip_prefix("/me")
|
||||||
|
}
|
||||||
|
|
||||||
|
fn style_me() -> ContentStyle {
|
||||||
|
ContentStyle::default().grey().italic()
|
||||||
|
}
|
||||||
|
|
||||||
fn styled_nick(nick: &str) -> Styled {
|
fn styled_nick(nick: &str) -> Styled {
|
||||||
Styled::new_plain("[")
|
Styled::new_plain("[")
|
||||||
.then(nick, util::nick_style(nick))
|
.then(nick, util::nick_style(nick))
|
||||||
.then_plain("]")
|
.then_plain("]")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn styled_nick_me(nick: &str) -> Styled {
|
||||||
|
let style = style_me();
|
||||||
|
Styled::new("*", style).then(nick, util::nick_style(nick).italic())
|
||||||
|
}
|
||||||
|
|
||||||
fn styled_content(content: &str) -> Styled {
|
fn styled_content(content: &str) -> Styled {
|
||||||
Styled::new_plain(content.trim())
|
Styled::new_plain(content.trim())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn styled_content_me(content: &str) -> Styled {
|
||||||
|
let style = style_me();
|
||||||
|
Styled::new(content.trim(), style).then("*", style)
|
||||||
|
}
|
||||||
|
|
||||||
impl Msg for Message {
|
impl Msg for Message {
|
||||||
type Id = Snowflake;
|
type Id = Snowflake;
|
||||||
|
|
||||||
|
|
@ -57,6 +75,10 @@ impl ChatMsg for Message {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn pseudo(nick: &str, content: &str) -> (Styled, Styled) {
|
fn pseudo(nick: &str, content: &str) -> (Styled, Styled) {
|
||||||
(styled_nick(nick), styled_content(content))
|
if let Some(content) = as_me(content) {
|
||||||
|
(styled_nick_me(nick), styled_content_me(content))
|
||||||
|
} else {
|
||||||
|
(styled_nick(nick), styled_content(content))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue