Merge branch 'master' into master

migrations/2018-06-17-200302_notification_add_data/down.sql

@@ -0,0 +1,2 @@
+-- This file should undo anything in `up.sql`
+ALTER TABLE notifications DROP COLUMN data;

migrations/2018-06-17-200302_notification_add_data/up.sql

@@ -0,0 +1,2 @@
+-- Your SQL goes here
+ALTER TABLE notifications ADD COLUMN data VARCHAR;

po/plume.pot

@@ -249,3 +249,17 @@ msgstr ""
 msgid "You need to be logged in order to edit your profile"
 msgstr ""
 
+msgid "By {{ link_1 }}{{ link_2 }}{{ link_3 }}{{ name }}{{ link_4 }}"
+msgstr ""
+
+msgid "{{ data }} reshared your article"
+msgstr ""
+
+msgid "{{ data }} started following you"
+msgstr ""
+
+msgid "{{ data }} liked your article"
+msgstr ""
+
+msgid "{{ data }} commented your article"
+msgstr ""

src/models/comments.rs

@@ -152,7 +152,8 @@ impl Notify<Note> for Comment {
                 for author in comment.clone().get_post(conn).get_authors(conn) {
                     let comment = comment.clone();
                     Notification::insert(conn, NewNotification {
-                        title: format!("{} commented your article", comment.get_author(conn).display_name.clone()),
+                        title: "{{ data }} commented your article".to_string(),
+                        data: Some(comment.get_author(conn).display_name.clone()),
                         content: Some(comment.get_post(conn).title),
                         link: comment.ap_url,
                         user_id: author.id

src/models/follows.rs

@@ -78,7 +78,8 @@ impl Notify<FollowAct> for Follow {
     fn notify(conn: &PgConnection, follow: FollowAct, actor: Id) {
         let follower = User::from_url(conn, actor.into()).unwrap();
         Notification::insert(conn, NewNotification {
-            title: format!("{} started following you", follower.display_name.clone()),
+            title: "{{ data }} started following you".to_string(),
+            data: Some(follower.display_name.clone()),
             content: None,
             link: Some(follower.ap_url),
             user_id: User::from_url(conn, follow.follow_props.object_link::<Id>().unwrap().into()).unwrap().id

src/models/likes.rs

@@ -118,7 +118,8 @@ impl Notify<activity::Like> for Like {
         for author in post.get_authors(conn) {
             let post = post.clone();
             Notification::insert(conn, NewNotification {
-                title: format!("{} liked your article", liker.display_name.clone()),
+                title: "{{ data }} liked your article".to_string(),
+                data: Some(liker.display_name.clone()),
                 content: Some(post.title),
                 link: Some(post.ap_url),
                 user_id: author.id

src/models/notifications.rs

@@ -11,7 +11,8 @@ pub struct Notification {
     pub content: Option<String>,
     pub link: Option<String>,
     pub user_id: i32,
-    pub creation_date: NaiveDateTime
+    pub creation_date: NaiveDateTime,
+    pub data: Option<String>
 }
 
 #[derive(Insertable)]
@@ -20,7 +21,8 @@ pub struct NewNotification {
     pub title: String,
     pub content: Option<String>,
     pub link: Option<String>,
-    pub user_id: i32
+    pub user_id: i32,
+    pub data: Option<String>
 }
 
 impl Notification {

src/models/reshares.rs

@@ -120,7 +120,8 @@ impl Notify<Announce> for Reshare {
         for author in post.get_authors(conn) {
             let post = post.clone();
             Notification::insert(conn, NewNotification {
-                title: format!("{} reshared your article", actor.display_name.clone()),
+                title: "{{ data }} reshared your article".to_string(),
+                data: Some(actor.display_name.clone()),
                 content: Some(post.title),
                 link: Some(post.ap_url),
                 user_id: author.id

src/schema.rs

@@ -74,6 +74,7 @@ table! {
         link -> Nullable<Varchar>,
         user_id -> Int4,
         creation_date -> Timestamp,
+        data -> Nullable<Varchar>,
     }
 }
 

templates/blogs/new.html.tera

@@ -9,7 +9,6 @@
 <form method="post">
     <label for="title">{{ "Title" | _ }}</label>
     <input type="text" id="title" name="title" />
-
+    <input type="submit" value="{{ "Create blog" | _ }}"/>
-    <input type="submit" value="{{ "Create blog"}}" />
 </form>
- | _ {% endblock content %}
+{% endblock content %}

templates/macros.html.tera

@@ -10,7 +10,14 @@
             <p>{{ article.post.content | striptags | truncate(length=200) }}</p>
         </main>
         <p class="author">
-        	By <a href="/@/{{ article.author.fqn }}/">{{ name }}</a> ⋅ {{ article.date | date(format="%B %e") }}
+        	{{ "By {{ link_1 }}{{ link_2 }}{{ link_3 }}{{ name }}{{ link_4 }}" | _(
+                link_1='<a href="/@/',
+                link_2=article.author.fqn,
+                link_3='/">',
+                name=name,
+                link_4="</a>")
+            }}
+            ⋅ {{ article.date | date(format="%B %e") }}
         </p>
     </div>
 {% endmacro post_card %}

templates/notifications/index.html.tera

@@ -9,7 +9,7 @@
     <div class="list">
         {% for notification in notifications %}
             <div class="card">
-                <h3><a href="{% if notification.link %}{{ notification.link }}/{% else %}#{% endif %}">{{ notification.title }}</h3>
+                <h3><a href="{% if notification.link %}{{ notification.link }}/{% else %}#{% endif %}">{{ notification.title | _(data=notification.data) }}</h3>
                 {% if notification.content %}
                     <p>{{ notification.content }}</p>
                 {% endif %}