From 3a5604cb467fef530e2d2af78d90a9b5a1cae99f Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 1 Aug 2018 10:05:46 -0400
Subject: [PATCH] FIX: Apply username formatter to solved post

---
 .../extend-for-solved-button.js.es6           | 183 ++++++++++--------
 1 file changed, 105 insertions(+), 78 deletions(-)

diff --git a/assets/javascripts/discourse/initializers/extend-for-solved-button.js.es6 b/assets/javascripts/discourse/initializers/extend-for-solved-button.js.es6
index e484922..af66e96 100644
--- a/assets/javascripts/discourse/initializers/extend-for-solved-button.js.es6
+++ b/assets/javascripts/discourse/initializers/extend-for-solved-button.js.es6
@@ -1,24 +1,27 @@
-import Topic from 'discourse/models/topic';
-import User from 'discourse/models/user';
-import TopicStatus from 'discourse/raw-views/topic-status';
-import { popupAjaxError } from 'discourse/lib/ajax-error';
-import { withPluginApi } from 'discourse/lib/plugin-api';
-import { ajax } from 'discourse/lib/ajax';
-import PostCooked from 'discourse/widgets/post-cooked';
+import Topic from "discourse/models/topic";
+import User from "discourse/models/user";
+import TopicStatus from "discourse/raw-views/topic-status";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { withPluginApi } from "discourse/lib/plugin-api";
+import { ajax } from "discourse/lib/ajax";
+import PostCooked from "discourse/widgets/post-cooked";
+import { formatUsername } from "discourse/lib/utilities";
 
 function clearAccepted(topic) {
-  const posts = topic.get('postStream.posts');
+  const posts = topic.get("postStream.posts");
   posts.forEach(post => {
-    if (post.get('post_number') > 1 ) {
-      post.set('accepted_answer',false);
-      post.set('can_accept_answer',true);
-      post.set('can_unaccept_answer',false);
+    if (post.get("post_number") > 1) {
+      post.set("accepted_answer", false);
+      post.set("can_accept_answer", true);
+      post.set("can_unaccept_answer", false);
     }
   });
 }
 
 function unacceptPost(post) {
-  if (!post.get('can_unaccept_answer')) { return; }
+  if (!post.get("can_unaccept_answer")) {
+    return;
+  }
   const topic = post.topic;
 
   post.setProperties({
@@ -26,11 +29,11 @@ function unacceptPost(post) {
     can_unaccept_answer: false,
     accepted_answer: false
   });
-  topic.set('accepted_answer', undefined);
+  topic.set("accepted_answer", undefined);
 
   ajax("/solution/unaccept", {
-    type: 'POST',
-    data: { id: post.get('id') }
+    type: "POST",
+    data: { id: post.get("id") }
   }).catch(popupAjaxError);
 }
 
@@ -45,83 +48,96 @@ function acceptPost(post) {
     accepted_answer: true
   });
 
-  topic.set('accepted_answer', {
-    username: post.get('username'),
-    post_number: post.get('post_number'),
-    excerpt: post.get('cooked'),
+  topic.set("accepted_answer", {
+    username: post.get("username"),
+    post_number: post.get("post_number"),
+    excerpt: post.get("cooked")
   });
 
   ajax("/solution/accept", {
-    type: 'POST',
-    data: { id: post.get('id') }
+    type: "POST",
+    data: { id: post.get("id") }
   }).catch(popupAjaxError);
 }
 
 function initializeWithApi(api) {
   const currentUser = api.getCurrentUser();
 
-  api.includePostAttributes('can_accept_answer', 'can_unaccept_answer', 'accepted_answer');
+  api.includePostAttributes(
+    "can_accept_answer",
+    "can_unaccept_answer",
+    "accepted_answer"
+  );
 
   if (api.addDiscoveryQueryParam) {
-    api.addDiscoveryQueryParam('solved', {replace: true, refreshModel: true});
+    api.addDiscoveryQueryParam("solved", { replace: true, refreshModel: true });
   }
 
-  api.addPostMenuButton('solved', attrs => {
+  api.addPostMenuButton("solved", attrs => {
     const canAccept = attrs.can_accept_answer;
     const canUnaccept = attrs.can_unaccept_answer;
     const accepted = attrs.accepted_answer;
     const isOp = currentUser && currentUser.id === attrs.topicCreatedById;
-    const position = (!accepted && canAccept && !isOp) ? 'second-last-hidden' : 'first';
+    const position =
+      !accepted && canAccept && !isOp ? "second-last-hidden" : "first";
 
     if (canAccept) {
       return {
-        action: 'acceptAnswer',
-        icon: 'check-square-o',
-        className: 'unaccepted',
-        title: 'solved.accept_answer',
+        action: "acceptAnswer",
+        icon: "check-square-o",
+        className: "unaccepted",
+        title: "solved.accept_answer",
         position
       };
     } else if (canUnaccept || accepted) {
-      const title = canUnaccept ? 'solved.unaccept_answer' : 'solved.accepted_answer';
+      const title = canUnaccept
+        ? "solved.unaccept_answer"
+        : "solved.accepted_answer";
       return {
-        action: 'unacceptAnswer',
-        icon: 'check-square',
+        action: "unacceptAnswer",
+        icon: "check-square",
         title,
-        className: 'accepted fade-out',
+        className: "accepted fade-out",
         position,
         beforeButton(h) {
-          return h('span.accepted-text', I18n.t('solved.solution'));
+          return h("span.accepted-text", I18n.t("solved.solution"));
         }
       };
     }
   });
 
-  api.decorateWidget('post-contents:after-cooked', dec => {
+  api.decorateWidget("post-contents:after-cooked", dec => {
     if (dec.attrs.post_number === 1) {
       const postModel = dec.getModel();
       if (postModel) {
-        const topic = postModel.get('topic');
-        if (topic.get('accepted_answer')) {
-          const hasExcerpt = !!topic.get('accepted_answer').excerpt;
+        const topic = postModel.get("topic");
+        if (topic.get("accepted_answer")) {
+          const hasExcerpt = !!topic.get("accepted_answer").excerpt;
 
           const withExcerpt = `
-            <aside class='quote' data-post="${topic.get('accepted_answer').post_number}" data-topic="${topic.get('id')}">
+            <aside class='quote' data-post="${
+              topic.get("accepted_answer").post_number
+            }" data-topic="${topic.get("id")}">
               <div class='title'>
-                ${topic.get('acceptedAnswerHtml')} <div class="quote-controls"><\/div>
+                ${topic.get(
+                  "acceptedAnswerHtml"
+                )} <div class="quote-controls"><\/div>
               </div>
               <blockquote>
-                ${topic.get('accepted_answer').excerpt}
+                ${topic.get("accepted_answer").excerpt}
               </blockquote>
             </aside>`;
 
           const withoutExcerpt = `
             <aside class='quote'>
               <div class='title title-only'>
-                ${topic.get('acceptedAnswerHtml')}
+                ${topic.get("acceptedAnswerHtml")}
               </div>
             </aside>`;
 
-          var cooked = new PostCooked({ cooked: hasExcerpt ? withExcerpt : withoutExcerpt });
+          var cooked = new PostCooked({
+            cooked: hasExcerpt ? withExcerpt : withoutExcerpt
+          });
 
           var html = cooked.init();
 
@@ -131,50 +147,54 @@ function initializeWithApi(api) {
     }
   });
 
-  api.attachWidgetAction('post', 'acceptAnswer', function() {
+  api.attachWidgetAction("post", "acceptAnswer", function() {
     const post = this.model;
-    const current = post.get('topic.postStream.posts').filter(p => {
-      return p.get('post_number') === 1 || p.get('accepted_answer');
+    const current = post.get("topic.postStream.posts").filter(p => {
+      return p.get("post_number") === 1 || p.get("accepted_answer");
     });
     acceptPost(post);
 
-    current.forEach(p => this.appEvents.trigger('post-stream:refresh', { id: p.id }));
+    current.forEach(p =>
+      this.appEvents.trigger("post-stream:refresh", { id: p.id })
+    );
   });
 
-  api.attachWidgetAction('post', 'unacceptAnswer', function() {
+  api.attachWidgetAction("post", "unacceptAnswer", function() {
     const post = this.model;
-    const op = post.get('topic.postStream.posts').find(p => p.get('post_number') === 1);
+    const op = post
+      .get("topic.postStream.posts")
+      .find(p => p.get("post_number") === 1);
     unacceptPost(post);
-    this.appEvents.trigger('post-stream:refresh', { id: op.get('id') });
+    this.appEvents.trigger("post-stream:refresh", { id: op.get("id") });
   });
 
   if (api.registerConnectorClass) {
-    api.registerConnectorClass('user-activity-bottom', 'solved-list', {
+    api.registerConnectorClass("user-activity-bottom", "solved-list", {
       shouldRender(args, component) {
         return component.siteSettings.solved_enabled;
-      },
+      }
     });
-    api.registerConnectorClass('user-summary-stat', 'solved-count', {
+    api.registerConnectorClass("user-summary-stat", "solved-count", {
       shouldRender(args, component) {
-        return component.siteSettings.solved_enabled && args.model.solved_count > 0;
+        return (
+          component.siteSettings.solved_enabled && args.model.solved_count > 0
+        );
       },
       setupComponent() {
-        this.set('classNames', ['linked-stat']);
+        this.set("classNames", ["linked-stat"]);
       }
     });
   }
-
 }
 
 export default {
-  name: 'extend-for-solved-button',
+  name: "extend-for-solved-button",
   initialize() {
-
     Topic.reopen({
       // keeping this here cause there is complex localization
       acceptedAnswerHtml: function() {
-        const username = this.get('accepted_answer.username');
-        const postNumber = this.get('accepted_answer.post_number');
+        const username = this.get("accepted_answer.username");
+        const postNumber = this.get("accepted_answer.post_number");
 
         if (!username || !postNumber) {
           return "";
@@ -182,40 +202,47 @@ export default {
 
         return I18n.t("solved.accepted_html", {
           username_lower: username.toLowerCase(),
-          username,
-          post_path: this.get('url') + "/" + postNumber,
+          username: formatUsername(username),
+          post_path: this.get("url") + "/" + postNumber,
           post_number: postNumber,
-          user_path: User.create({username: username}).get('path')
+          user_path: User.create({ username }).get("path")
         });
-      }.property('accepted_answer', 'id')
+      }.property("accepted_answer", "id")
     });
 
     TopicStatus.reopen({
-      statuses: function(){
+      statuses: function() {
         const results = this._super();
         if (this.topic.has_accepted_answer) {
           results.push({
-            openTag: 'span',
-            closeTag: 'span',
-            title: I18n.t('solved.has_accepted_answer'),
-            icon: 'check-square-o'
+            openTag: "span",
+            closeTag: "span",
+            title: I18n.t("solved.has_accepted_answer"),
+            icon: "check-square-o"
           });
-        }else if(this.topic.can_have_answer && this.siteSettings.solved_enabled && this.siteSettings.empty_box_on_unsolved){
+        } else if (
+          this.topic.can_have_answer &&
+          this.siteSettings.solved_enabled &&
+          this.siteSettings.empty_box_on_unsolved
+        ) {
           results.push({
-            openTag: 'span',
-            closeTag: 'span',
-            title: I18n.t('solved.has_no_accepted_answer'),
-            icon: 'square-o'
+            openTag: "span",
+            closeTag: "span",
+            title: I18n.t("solved.has_no_accepted_answer"),
+            icon: "square-o"
           });
         }
         return results;
       }.property()
     });
 
-    withPluginApi('0.1', initializeWithApi);
+    withPluginApi("0.1", initializeWithApi);
 
-    withPluginApi('0.8.10', api => {
-      api.replaceIcon('notification.solved.accepted_notification', 'check-square');
+    withPluginApi("0.8.10", api => {
+      api.replaceIcon(
+        "notification.solved.accepted_notification",
+        "check-square"
+      );
     });
   }
 };