Run 'cargo fmt' to format code (#489)
This commit is contained in:
committed by
Baptiste Gelez
parent
732f514da7
commit
b945d1f602
@@ -37,11 +37,15 @@ impl Mention {
|
||||
}
|
||||
|
||||
pub fn get_post(&self, conn: &Connection) -> Result<Post> {
|
||||
self.post_id.ok_or(Error::NotFound).and_then(|id| Post::get(conn, id))
|
||||
self.post_id
|
||||
.ok_or(Error::NotFound)
|
||||
.and_then(|id| Post::get(conn, id))
|
||||
}
|
||||
|
||||
pub fn get_comment(&self, conn: &Connection) -> Result<Comment> {
|
||||
self.comment_id.ok_or(Error::NotFound).and_then(|id| Comment::get(conn, id))
|
||||
self.comment_id
|
||||
.ok_or(Error::NotFound)
|
||||
.and_then(|id| Comment::get(conn, id))
|
||||
}
|
||||
|
||||
pub fn get_user(&self, conn: &Connection) -> Result<User> {
|
||||
@@ -54,21 +58,15 @@ impl Mention {
|
||||
pub fn build_activity(conn: &Connection, ment: &str) -> Result<link::Mention> {
|
||||
let user = User::find_by_fqn(conn, ment)?;
|
||||
let mut mention = link::Mention::default();
|
||||
mention
|
||||
.link_props
|
||||
.set_href_string(user.ap_url)?;
|
||||
mention
|
||||
.link_props
|
||||
.set_name_string(format!("@{}", ment))?;
|
||||
mention.link_props.set_href_string(user.ap_url)?;
|
||||
mention.link_props.set_name_string(format!("@{}", ment))?;
|
||||
Ok(mention)
|
||||
}
|
||||
|
||||
pub fn to_activity(&self, conn: &Connection) -> Result<link::Mention> {
|
||||
let user = self.get_mentioned(conn)?;
|
||||
let mut mention = link::Mention::default();
|
||||
mention
|
||||
.link_props
|
||||
.set_href_string(user.ap_url.clone())?;
|
||||
mention.link_props.set_href_string(user.ap_url.clone())?;
|
||||
mention
|
||||
.link_props
|
||||
.set_name_string(format!("@{}", user.fqn))?;
|
||||
@@ -141,6 +139,7 @@ impl Notify<Connection> for Mention {
|
||||
object_id: self.id,
|
||||
user_id: m.id,
|
||||
},
|
||||
).map(|_| ())
|
||||
)
|
||||
.map(|_| ())
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user