aitzol/Plume
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unused Mention::from_activity()

Browse Source
This commit is contained in:
Kitaiti Makoto 2022-05-02 23:47:36 +09:00
parent 4ef9350ce7
commit 41ccacc5d3
1 changed files with 6 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
plume-models/src/mentions.rs
View File

@ -2,11 +2,10 @@ use crate::{
comments::Comment, db_conn::DbConn, notifications::*, posts::Post, schema::mentions, comments::Comment, db_conn::DbConn, notifications::*, posts::Post, schema::mentions,
users::User, Connection, Error, Result, users::User, Connection, Error, Result,
}; };
use activitypub::link;
use activitystreams::{ use activitystreams::{
base::BaseExt, base::BaseExt,
iri_string::types::IriString, iri_string::types::IriString,
link::{self as link07, LinkExt}, link::{self, LinkExt},
}; };
use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl}; use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl};
use plume_common::activity_pub::inbox::AsActor; use plume_common::activity_pub::inbox::AsActor;
@ -61,68 +60,25 @@ impl Mention {
} }
} }
pub fn build_activity07(conn: &DbConn, ment: &str) -> Result<link07::Mention> { pub fn build_activity07(conn: &DbConn, ment: &str) -> Result<link::Mention> {
let user = User::find_by_fqn(conn, ment)?; let user = User::find_by_fqn(conn, ment)?;
let mut mention = link07::Mention::new(); let mut mention = link::Mention::new();
mention.set_href(user.ap_url.parse::<IriString>()?); mention.set_href(user.ap_url.parse::<IriString>()?);
mention.set_name(format!("@{}", ment)); mention.set_name(format!("@{}", ment));
Ok(mention) Ok(mention)
} }
pub fn to_activity07(&self, conn: &Connection) -> Result<link07::Mention> { pub fn to_activity07(&self, conn: &Connection) -> Result<link::Mention> {
let user = self.get_mentioned(conn)?; let user = self.get_mentioned(conn)?;
let mut mention = link07::Mention::new(); let mut mention = link::Mention::new();
mention.set_href(user.ap_url.parse::<IriString>()?); mention.set_href(user.ap_url.parse::<IriString>()?);
mention.set_name(format!("@{}", user.fqn)); mention.set_name(format!("@{}", user.fqn));
Ok(mention) Ok(mention)
} }
pub fn from_activity(
conn: &Connection,
ment: &link::Mention,
inside: i32,
in_post: bool,
notify: bool,
) -> Result<Self> {
let ap_url = ment.link_props.href_string().or(Err(Error::NotFound))?;
let mentioned = User::find_by_ap_url(conn, &ap_url)?;
if in_post {
Post::get(conn, inside).and_then(|post| {
let res = Mention::insert(
conn,
NewMention {
mentioned_id: mentioned.id,
post_id: Some(post.id),
comment_id: None,
},
)?;
if notify {
res.notify(conn)?;
}
Ok(res)
})
} else {
Comment::get(conn, inside).and_then(|comment| {
let res = Mention::insert(
conn,
NewMention {
mentioned_id: mentioned.id,
post_id: None,
comment_id: Some(comment.id),
},
)?;
if notify {
res.notify(conn)?;
}
Ok(res)
})
}
}
pub fn from_activity07( pub fn from_activity07(
conn: &Connection, conn: &Connection,
ment: &link07::Mention, ment: &link::Mention,
inside: i32, inside: i32,
in_post: bool, in_post: bool,
notify: bool, notify: bool,