Merge branch 'bug/fix-comments-urls' into 'master'

Fix comments URLs

See merge request framasoft/mobilizon!369

js/src/components/Comment/Comment.vue

@@ -13,11 +13,11 @@
                         <strong>{{ comment.actor.name }}</strong>
                         <small v-if="comment.actor.domain">@{{ comment.actor.preferredUsername }}@{{ comment.actor.domain }}</small>
                         <small v-else>@{{ comment.actor.preferredUsername }}</small>
-                        <a class="comment-link has-text-grey" :href="commentId">
+                        <a class="comment-link has-text-grey" :href="commentURL">
                             <small>{{ timeago(new Date(comment.updatedAt)) }}</small>
                         </a>
                     </span>
-                    <a v-else class="comment-link has-text-grey" :href="commentId">
+                    <a v-else class="comment-link has-text-grey" :href="commentURL">
                         <span>{{ $t('[deleted]') }}</span>
                     </a>
                     <span class="icons" v-if="!comment.deletedAt">
@@ -222,6 +222,11 @@ export default class Comment extends Vue {
     return `#comment-${this.comment.uuid}`;
   }
 
+  get commentURL(): String {
+    if (!this.comment.local && this.comment.url) return this.comment.url;
+    return this.commentId;
+  }
+
   reportModal() {
     this.$buefy.modal.open({
       parent: this,

js/src/graphql/comment.ts

@@ -8,6 +8,7 @@ export const COMMENT_FIELDS_FRAGMENT = gql`
         url,
         text,
         visibility,
+        local,
         actor {
             avatar {
                 url

js/src/types/comment.model.ts

@@ -6,6 +6,7 @@ export interface IComment {
   uuid?: string;
   url?: string;
   text: string;
+  local: boolean;
   actor: IActor;
   inReplyToComment?: IComment;
   originComment?: IComment;
@@ -20,6 +21,7 @@ export class CommentModel implements IComment {
   actor: IActor = new Actor();
   id?: string;
   text: string = '';
+  local: boolean = true;
   url?: string;
   uuid?: string;
   inReplyToComment?: IComment = undefined;

lib/mobilizon/events/comment.ex

@@ -39,7 +39,8 @@ defmodule Mobilizon.Events.Comment do
     :in_reply_to_comment_id,
     :origin_comment_id,
     :attributed_to_id,
-    :deleted_at
+    :deleted_at,
+    :local
   ]
   @attrs @required_attrs ++ @optional_attrs