Merge pull request #159 from Ilphrin/master

Add a link to the blog on article cards
This commit is contained in:
Baptiste Gelez 2018-07-25 21:40:27 +02:00 committed by GitHub
commit 16fb439ce9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 2 deletions

View File

@ -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 { impl IntoId for Blog {

View File

@ -202,11 +202,13 @@ impl Post {
} }
pub fn to_json(&self, conn: &PgConnection) -> serde_json::Value { pub fn to_json(&self, conn: &PgConnection) -> serde_json::Value {
let blog = self.get_blog(conn);
json!({ json!({
"post": self, "post": self,
"author": self.get_authors(conn)[0].to_json(conn), "author": self.get_authors(conn)[0].to_json(conn),
"url": format!("/~/{}/{}/", self.get_blog(conn).actor_id, self.slug), "url": format!("/~/{}/{}/", blog.actor_id, self.slug),
"date": self.creation_date.timestamp() "date": self.creation_date.timestamp(),
"blog": blog.to_json(conn)
}) })
} }

View File

@ -18,6 +18,7 @@
link_4="</a>") link_4="</a>")
}} }}
⋅ {{ article.date | date(format="%B %e") }} ⋅ {{ article.date | date(format="%B %e") }}
⋅ <a href="{{ article.blog.fqn }}">{{ article.blog.title }}</a>
</p> </p>
</div> </div>
{% endmacro post_card %} {% endmacro post_card %}