Merge pull request #2118 from pixelfed/staging

Update PostComponent, fix remote urls

CHANGELOG.md

@@ -4,6 +4,7 @@
 ### Added
 
 ### Updated
+- Updated PostComponent, fix remote urls ([42716ccc](https://github.com/pixelfed/pixelfed/commit/42716ccc))
 
 
 ## [v0.10.9 (2020-04-17)](https://github.com/pixelfed/pixelfed/compare/v0.10.8...v0.10.9)

public/mix-manifest.json

@@ -24,7 +24,7 @@
     "/js/rempos.js": "/js/rempos.js?id=72115a0793a2792beb39",
     "/js/rempro.js": "/js/rempro.js?id=e71bc833e4381e9a7655",
     "/js/search.js": "/js/search.js?id=b19e1df082a4baa25bb8",
-    "/js/status.js": "/js/status.js?id=5ccf0478b608bd250b6e",
+    "/js/status.js": "/js/status.js?id=283e11d6405237c6b8c1",
     "/js/story-compose.js": "/js/story-compose.js?id=86751d072969424c6e30",
     "/js/theme-monokai.js": "/js/theme-monokai.js?id=3b6e62701f12b717cc5c",
     "/js/timeline.js": "/js/timeline.js?id=950c4a752e7b2824cb6d"

resources/assets/js/components/PostComponent.vue

@@ -173,7 +173,7 @@
                                 </span>
                               </p>
                               <p class="">
-                                <a v-once class="text-muted mr-3 text-decoration-none small" style="width: 20px;" v-text="timeAgo(reply.created_at)" :href="reply.url"></a>
+                                <a v-once class="text-muted mr-3 text-decoration-none small" style="width: 20px;" v-text="timeAgo(reply.created_at)" :href="permalinkUrl(reply.url)"></a>
                                 <span v-if="reply.favourites_count" class="text-muted comment-reaction font-weight-bold mr-3">{{reply.favourites_count == 1 ? '1 like' : reply.favourites_count + ' likes'}}</span>
                                 <span class="text-muted comment-reaction font-weight-bold cursor-pointer" v-on:click="replyFocus(reply, index)">Reply</span>
                               </p>
@@ -1210,6 +1210,17 @@ export default {
         this.$refs.embedModal.hide();
       },
 
+      permalinkUrl(reply, showOrigin = false) {
+        let profile = reply.account;
+        if(profile.local == true) {
+          return profile.url;
+        } else {
+          return showOrigin ? 
+            reply.url :
+            '/i/web/post/_/' + profile.id + '/' + reply.id; 
+        }
+      }
+
     },
 }
 </script>