From aaae786fb73687dfccbd91e904ccdd55ac3fed3e Mon Sep 17 00:00:00 2001
From: "Kevin \"Ilphrin\" Pellet" <ilphrin@autistici.org>
Date: Wed, 25 Jul 2018 21:22:42 +0200
Subject: [PATCH] Implement new function to Blog for the view

Added Blog::to_json and Blog::get_fqn
---
 plume-models/src/blogs.rs | 15 +++++++++++++++
 plume-models/src/posts.rs |  3 +--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/plume-models/src/blogs.rs b/plume-models/src/blogs.rs
index 7123d36a..59991be6 100644
--- a/plume-models/src/blogs.rs
+++ b/plume-models/src/blogs.rs
@@ -248,6 +248,21 @@ impl Blog {
             }
         })
     }
+
+    pub fn get_fqn(&self, conn: &PgConnection) -> String {
+        if self.instance_id == Instance::local_id(conn) {
+            self.actor_id.clone()
+        } else {
+            format!("{}@{}", self.actor_id, self.get_instance(conn).public_domain)
+        }
+    }
+
+    pub fn to_json(&self, conn: &PgConnection) -> serde_json::Value {
+        let mut json = serde_json::to_value(self).unwrap();
+        let formatted = serde_json::Value::String(format!("/~/{}",self.get_fqn(conn)));
+        json["fqn"] = formatted;
+        json
+    }
 }
 
 impl IntoId for Blog {
diff --git a/plume-models/src/posts.rs b/plume-models/src/posts.rs
index 22f02442..3c0f1eb1 100644
--- a/plume-models/src/posts.rs
+++ b/plume-models/src/posts.rs
@@ -187,8 +187,7 @@ impl Post {
             "author": self.get_authors(conn)[0].to_json(conn),
             "url": format!("/~/{}/{}/", blog.actor_id, self.slug),
             "date": self.creation_date.timestamp(),
-            "blog": blog,
-            "blog_url": format!("/~/{}", blog.actor_id)
+            "blog": blog.to_json(conn)
         })
     }