Add a fqn field to blogs and users (#457)

Fixes #319

src/api/mod.rs

@@ -49,7 +49,7 @@ pub struct OAuthRequest {
 pub fn oauth(query: Form<OAuthRequest>, conn: DbConn) -> Result<Json<serde_json::Value>, ApiError> {
     let app = App::find_by_client_id(&*conn, &query.client_id)?;
     if app.client_secret == query.client_secret {
-        if let Ok(user) = User::find_local(&*conn, &query.username) {
+        if let Ok(user) = User::find_by_fqn(&*conn, &query.username) {
             if user.auth(&query.password) {
                 let token = ApiToken::insert(&*conn, NewApiToken {
                     app_id: app.id,

src/routes/blogs.rs

@@ -34,7 +34,6 @@ pub fn details(intl: I18n, name: String, conn: DbConn, user: Option<User>, page:
     Ok(render!(blogs::details(
         &(&*conn, &intl.catalog, user.clone()),
         blog.clone(),
-        blog.get_fqn(&*conn),
         authors,
         articles_count,
         page.0,
@@ -46,7 +45,7 @@ pub fn details(intl: I18n, name: String, conn: DbConn, user: Option<User>, page:
 
 #[get("/~/<name>", rank = 1)]
 pub fn activity_details(name: String, conn: DbConn, _ap: ApRequest) -> Option<ActivityStream<CustomGroup>> {
-    let blog = Blog::find_local(&*conn, &name).ok()?;
+    let blog = Blog::find_by_fqn(&*conn, &name).ok()?;
     Some(ActivityStream::new(blog.to_activity(&*conn).ok()?))
 }
 
@@ -90,7 +89,7 @@ pub fn create(conn: DbConn, form: LenientForm<NewBlogForm>, user: User, intl: I1
         Ok(_) => ValidationErrors::new(),
         Err(e) => e
     };
-    if Blog::find_local(&*conn, &slug).is_ok() {
+    if Blog::find_by_fqn(&*conn, &slug).is_ok() {
         errors.add("title", ValidationError {
             code: Cow::from("existing_slug"),
             message: Some(Cow::from("A blog with the same name already exists.")),
@@ -124,7 +123,7 @@ pub fn create(conn: DbConn, form: LenientForm<NewBlogForm>, user: User, intl: I1
 
 #[post("/~/<name>/delete")]
 pub fn delete(conn: DbConn, name: String, user: Option<User>, intl: I18n, searcher: Searcher) -> Result<Redirect, Ructe>{
-    let blog = Blog::find_local(&*conn, &name).expect("blog::delete: blog not found");
+    let blog = Blog::find_by_fqn(&*conn, &name).expect("blog::delete: blog not found");
     if user.clone().and_then(|u| u.is_author_in(&*conn, &blog).ok()).unwrap_or(false) {
         blog.delete(&conn, &searcher).expect("blog::expect: deletion error");
         Ok(Redirect::to(uri!(super::instance::index)))
@@ -139,7 +138,7 @@ pub fn delete(conn: DbConn, name: String, user: Option<User>, intl: I18n, search
 
 #[get("/~/<name>/outbox")]
 pub fn outbox(name: String, conn: DbConn) -> Option<ActivityStream<OrderedCollection>> {
-    let blog = Blog::find_local(&*conn, &name).ok()?;
+    let blog = Blog::find_by_fqn(&*conn, &name).ok()?;
     Some(blog.outbox(&*conn).ok()?)
 }
 

src/routes/posts.rs

@@ -46,14 +46,14 @@ pub fn details(blog: String, slug: String, conn: DbConn, user: Option<User>, res
                 warning: previous.clone().map(|p| p.spoiler_text).unwrap_or_default(),
                 content: previous.clone().and_then(|p| Some(format!(
                     "@{} {}",
-                    p.get_author(&*conn).ok()?.get_fqn(&*conn),
+                    p.get_author(&*conn).ok()?.fqn,
                     Mention::list_for_comment(&*conn, p.id).ok()?
                         .into_iter()
                         .filter_map(|m| {
                             let user = user.clone();
                             if let Ok(mentioned) = m.get_mentioned(&*conn) {
                                 if user.is_none() || mentioned.id != user.expect("posts::details_response: user error while listing mentions").id {
-                                    Some(format!("@{}", mentioned.get_fqn(&*conn)))
+                                    Some(format!("@{}", mentioned.fqn))
                                 } else {
                                     None
                                 }

src/routes/session.rs

@@ -40,7 +40,7 @@ pub struct LoginForm {
 #[post("/login", data = "<form>")]
 pub fn create(conn: DbConn, form: LenientForm<LoginForm>, flash: Option<FlashMessage>, mut cookies: Cookies, intl: I18n) -> Result<Redirect, Ructe> {
     let user = User::find_by_email(&*conn, &form.email_or_name)
-        .or_else(|_| User::find_local(&*conn, &form.email_or_name));
+        .or_else(|_| User::find_by_fqn(&*conn, &form.email_or_name));
     let mut errors = match form.validate() {
         Ok(_) => ValidationErrors::new(),
         Err(e) => e

src/routes/user.rs

@@ -203,7 +203,7 @@ pub fn activity_details(
     conn: DbConn,
     _ap: ApRequest,
 ) -> Option<ActivityStream<CustomPerson>> {
-    let user = User::find_local(&*conn, &name).ok()?;
+    let user = User::find_by_fqn(&*conn, &name).ok()?;
     Some(ActivityStream::new(user.to_activity(&*conn).ok()?))
 }
 
@@ -369,7 +369,7 @@ pub fn create(conn: DbConn, form: LenientForm<NewUserForm>, intl: I18n) -> Resul
 
 #[get("/@/<name>/outbox")]
 pub fn outbox(name: String, conn: DbConn) -> Option<ActivityStream<OrderedCollection>> {
-    let user = User::find_local(&*conn, &name).ok()?;
+    let user = User::find_by_fqn(&*conn, &name).ok()?;
     user.outbox(&*conn).ok()
 }
 
@@ -381,7 +381,7 @@ pub fn inbox(
     headers: Headers,
     searcher: Searcher,
 ) -> Result<String, Option<status::BadRequest<&'static str>>> {
-    let user = User::find_local(&*conn, &name).map_err(|_| None)?;
+    let user = User::find_by_fqn(&*conn, &name).map_err(|_| None)?;
     let act = data.1.into_inner();
     let sig = data.0;
 
@@ -429,7 +429,7 @@ pub fn ap_followers(
     conn: DbConn,
     _ap: ApRequest,
 ) -> Option<ActivityStream<OrderedCollection>> {
-    let user = User::find_local(&*conn, &name).ok()?;
+    let user = User::find_by_fqn(&*conn, &name).ok()?;
     let followers = user
         .get_followers(&*conn).ok()?
         .into_iter()

src/routes/well_known.rs

@@ -39,9 +39,9 @@ impl Resolver<DbConn> for WebfingerResolver {
     }
 
     fn find(acct: String, conn: DbConn) -> Result<Webfinger, ResolverError> {
-        User::find_local(&*conn, &acct)
+        User::find_by_fqn(&*conn, &acct)
             .and_then(|usr| usr.webfinger(&*conn))
-            .or_else(|_| Blog::find_local(&*conn, &acct)
+            .or_else(|_| Blog::find_by_fqn(&*conn, &acct)
                 .and_then(|blog| blog.webfinger(&*conn))
                 .or(Err(ResolverError::NotFound)))
     }

src/template_utils.rs

@@ -29,7 +29,7 @@ macro_rules! render {
 }
 
 pub fn translate_notification(ctx: BaseContext, notif: Notification) -> String {
-    let name = notif.get_actor(ctx.0).unwrap().name(ctx.0);
+    let name = notif.get_actor(ctx.0).unwrap().name();
     match notif.kind.as_ref() {
         notification_kind::COMMENT => i18n!(ctx.1, "{0} commented your article."; &name),
         notification_kind::FOLLOW => i18n!(ctx.1, "{0} is subscribed to you."; &name),
@@ -55,7 +55,7 @@ impl Size {
 }
 
 pub fn avatar(conn: &Connection, user: &User, size: Size, pad: bool, catalog: &Catalog) -> Html<String> {
-    let name = escape(&user.name(conn)).to_string();
+    let name = escape(&user.name()).to_string();
     Html(format!(
         r#"<div class="avatar {size} {padded}"
         style="background-image: url('{url}');"