Merge branch 'master' of github.com:Plume-org/Plume

src/models/users.rs

@@ -45,6 +45,7 @@ use models::{
     posts::Post
 };
 use schema::users;
+use safe_string::SafeString;
 
 pub const AUTH_COOKIE: &'static str = "user_id";
 
@@ -56,7 +57,7 @@ pub struct User {
     pub outbox_url: String,
     pub inbox_url: String,
     pub is_admin: bool,
-    pub summary: String,
+    pub summary: SafeString,
     pub email: Option<String>,
     pub hashed_password: Option<String>,
     pub instance_id: i32,
@@ -75,7 +76,7 @@ pub struct NewUser {
     pub outbox_url: String,
     pub inbox_url: String,
     pub is_admin: bool,
-    pub summary: String,
+    pub summary: SafeString,
     pub email: Option<String>,
     pub hashed_password: Option<String>,
     pub instance_id: i32,
@@ -200,7 +201,7 @@ impl User {
             outbox_url: acct["outbox"].as_str().unwrap().to_string(),
             inbox_url: acct["inbox"].as_str().unwrap().to_string(),
             is_admin: false,
-            summary: acct["summary"].as_str().unwrap().to_string(),
+            summary: SafeString::new(&acct["summary"].as_str().unwrap().to_string()),
             email: None,
             hashed_password: None,
             instance_id: instance.id,
@@ -371,7 +372,7 @@ impl APActor for User {
     }
 
     fn get_summary(&self) -> String {
-        self.summary.clone()
+        self.summary.get().clone()
     }
 
     fn get_instance(&self, conn: &PgConnection) -> Instance {
@@ -561,7 +562,7 @@ impl NewUser {
             outbox_url: String::from(""),
             inbox_url: String::from(""),
             is_admin: is_admin,
-            summary: summary,
+            summary: SafeString::new(&summary),
             email: Some(email),
             hashed_password: Some(password),
             instance_id: instance_id,

templates/macros.html.tera

@@ -1,7 +1,12 @@
 {% macro post_card(article) %}
+    {% if article.author.display_name %}
+        {% set name = article.author.display_name %}
+    {% else %}
+        {% set name = article.author.username %}
+    {% endif %}
     <div class="card">
         <h3><a href="{{ article.url }}">{{ article.post.title }}</a></h3>
         <main><p>{{ article.post.content | striptags | truncate(length=200) }}</p></main>
-        <p>By <a href="/@/{{ article.author.fqn }}/">{{ article.author.display_name }}</a> ⋅ {{ article.date | date(format="%B %e") }}</p>
+        <p>By <a href="/@/{{ article.author.fqn }}/">{{ name }}</a> ⋅ {{ article.date | date(format="%B %e") }}</p>
     </div>
 {% endmacro post_card %}

templates/posts/details.html.tera

@@ -8,9 +8,15 @@
     <a href="../">{{ blog.title }}</a>
 {% endblock header %}
 
+{% if author.display_name %}
+    {% set name = author.display_name %}
+{% else %}
+    {% set name = author.username %}
+{% endif %}
+
 {% block content %}
     <p>
-        <b>Written by <a href="/@/{{ author.fqn }}/">{{ author.display_name }}</a></b>
+        <b>Written by <a href="/@/{{ author.fqn }}/">{{ name }}</a></b>
         &mdash;
         <span>{{ date | date(format="%B %e, %Y") }}</span>
     </p>
@@ -49,8 +55,13 @@
         <h2>Comments</h2>
         <div class="list">
             {% for comment in comments %}
+                {% if comment.author.display_name %}
+                    {% set comment_author_name = comment.author.display_name %}
+                {% else %}
+                    {% set comment_author_name = comment.author.username %}
+                {% endif %}
                 <div class="card" id="comment-{{ comment.id }}">
-                    <b>{{ comment.author.display_name }}</b>
+                    <b>{{ comment_author_name }}</b>
                     <div>{{ comment.content | safe }}</div>
                     <a href="comment?responding_to={{ comment.id }}">Respond</a>
                 </div>

templates/users/details.html.tera

@@ -1,14 +1,20 @@
 {% extends "base" %}
 {% import "macros" as macros %}
 
+{% if user.display_name %}
+    {% set name = user.display_name %}
+{% else %}
+    {% set name = user.username %}
+{% endif %}
+
 {% block title %}
-{{ user.display_name }}
+{{ name }}
 {% endblock title %}
 
 {% block content %}
     <div>
         <h1>
-            {{ user.display_name }}
+            {{ name }}
             {% if user.is_admin %}
                 <span class="badge">Admin</span>
             {% endif %}
@@ -28,7 +34,7 @@
     </div>
 
     <div>
-        {{ user.summary }}
+        {{ user.summary | safe }}
     </div>
 
     {% if recents | length != 0 %}    

templates/users/followers.html.tera

@@ -1,13 +1,19 @@
 {% extends "base" %}
 
+{% if user.display_name %}
+    {% set name = user.display_name %}
+{% else %}
+    {% set name = user.username %}
+{% endif %}
+
 {% block title %}
-{{ user.display_name }}'s Followers
+{{ name }}'s Followers
 {% endblock title %}
 
 {% block content %}
     <div>
         <h1>
-            {{ user.display_name }}
+            {{ name }}
             {% if user.is_admin %}
                 <span class="badge">Admin</span>
             {% endif %}
@@ -21,9 +27,14 @@
     <h2>Followers</h2>
     <div class="cards">
     {% for follower in followers %}
+        {% if follower.display_name %}
+            {% set follower_name = follower.display_name %}
+        {% else %}
+            {% set follower_name = follower.username %}
+        {% endif %}
         <div class="card">
-            <h3><a href="{{ follower.ap_url }}/">{{ follower.display_name }}</a> &mdash; @{{ follower.fqn }}</h3>
-            <main><p>{{ follower.summary }}</p></main>
+            <h3><a href="{{ follower.ap_url }}/">{{ follower_name }}</a> &mdash; @{{ follower.fqn }}</h3>
+            <main><p>{{ follower.summary | safe }}</p></main>
         </div>
     {% endfor %}
     </div>