Merge pull request #2467 from pixelfed/staging

PostComponent fixes

CHANGELOG.md

@@ -104,6 +104,8 @@
 - Updated DiscoverController, fix trending api. ([2ab2c9a](https://github.com/pixelfed/pixelfed/commit/2ab2c9a))
 - Updated Dark Mode layout. ([d6f8170](https://github.com/pixelfed/pixelfed/commit/d6f8170))
 - Updated federation config, make sharedInbox enabled by default. ([6e3522c0](https://github.com/pixelfed/pixelfed/commit/6e3522c0))
+- Updated PostComponent, change timestamp format. ([e51665f6](https://github.com/pixelfed/pixelfed/commit/e51665f6))
+- Updated PostComponent, use proper username context for reply mentions. Fixes ([#2421](https://github.com/pixelfed/pixelfed/issues/2421)). ([dac06088](https://github.com/pixelfed/pixelfed/commit/dac06088))
 
 ## [v0.10.9 (2020-04-17)](https://github.com/pixelfed/pixelfed/compare/v0.10.8...v0.10.9)
 ### Added

public/mix-manifest.json

@@ -25,7 +25,7 @@
     "/js/rempos.js": "/js/rempos.js?id=0c655b6b8dca92d06c79",
     "/js/rempro.js": "/js/rempro.js?id=d26f22f402cd6aab5f20",
     "/js/search.js": "/js/search.js?id=2af4d1de55be62523b71",
-    "/js/status.js": "/js/status.js?id=b744f13cca28d1e9964e",
+    "/js/status.js": "/js/status.js?id=142b5d5d938c67abdcf6",
     "/js/story-compose.js": "/js/story-compose.js?id=6308c4b7cb5baa4517d3",
     "/js/theme-monokai.js": "/js/theme-monokai.js?id=ece67a5ba28761df4d88",
     "/js/timeline.js": "/js/timeline.js?id=97f92ccb18f86c57dfad"

resources/assets/js/components/PostComponent.vue

@@ -245,7 +245,7 @@
                   </span>
                 </div>
                 <div class="timestamp pt-2 d-flex align-items-bottom justify-content-between">
-                  <a v-bind:href="statusUrl" class="small text-muted">
+                  <a v-bind:href="statusUrl" class="small text-muted" :title="status.created_at">
                     {{timestampFormat()}}
                   </a>
                   <span class="small text-muted text-capitalize cursor-pointer" v-on:click="visibilityModal">{{status.visibility}}</span>
@@ -831,7 +831,7 @@ export default {
 
       timestampFormat() {
           let ts = new Date(this.status.created_at);
-          return ts.toDateString() + ' ' + ts.toLocaleTimeString();
+          return ts.toDateString();
       },
 
       fetchData() {
@@ -1149,8 +1149,10 @@ export default {
           this.replyToIndex = index;
           this.replyingToId = e.id;
           this.reply_to_profile_id = e.account.id;
+          let username = e.account.local ? '@' + e.account.username + ' '
+            : '@' + e.account.acct + ' ';
           if(prependUsername == true) {
-            this.replyText = '@' + e.account.username + ' ';
+            this.replyText = username;
           }
           $('textarea[name="comment"]').focus();
       },