From 418e656c9ea91c29f89c477752950c6a9bd34b74 Mon Sep 17 00:00:00 2001
From: Alexander Skvortsov <38059171+askvortsov1@users.noreply.github.com>
Date: Wed, 23 Sep 2020 22:56:13 -0400
Subject: [PATCH] Mithril 2 Update (#19)

Update for Mithril 2
---
 extensions/sticky/js/src/forum/addStickyControl.js            | 3 +--
 extensions/sticky/js/src/forum/addStickyExcerpt.js            | 4 ++--
 .../sticky/js/src/forum/components/DiscussionStickiedPost.js  | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/extensions/sticky/js/src/forum/addStickyControl.js b/extensions/sticky/js/src/forum/addStickyControl.js
index c9ba2a5b1..19d663fb2 100644
--- a/extensions/sticky/js/src/forum/addStickyControl.js
+++ b/extensions/sticky/js/src/forum/addStickyControl.js
@@ -7,10 +7,9 @@ export default function addStickyControl() {
   extend(DiscussionControls, 'moderationControls', function(items, discussion) {
     if (discussion.canSticky()) {
       items.add('sticky', Button.component({
-        children: app.translator.trans(discussion.isSticky() ? 'flarum-sticky.forum.discussion_controls.unsticky_button' : 'flarum-sticky.forum.discussion_controls.sticky_button'),
         icon: 'fas fa-thumbtack',
         onclick: this.stickyAction.bind(discussion)
-      }));
+      }, app.translator.trans(discussion.isSticky() ? 'flarum-sticky.forum.discussion_controls.unsticky_button' : 'flarum-sticky.forum.discussion_controls.sticky_button')));
     }
   });
 
diff --git a/extensions/sticky/js/src/forum/addStickyExcerpt.js b/extensions/sticky/js/src/forum/addStickyExcerpt.js
index c91056745..add5c17ee 100644
--- a/extensions/sticky/js/src/forum/addStickyExcerpt.js
+++ b/extensions/sticky/js/src/forum/addStickyExcerpt.js
@@ -9,9 +9,9 @@ export default function addStickyControl() {
   });
 
   extend(DiscussionListItem.prototype, 'infoItems', function(items) {
-    const discussion = this.props.discussion;
+    const discussion = this.attrs.discussion;
 
-    if (discussion.isSticky() && !this.props.params.q && !discussion.lastReadPostNumber()) {
+    if (discussion.isSticky() && !this.attrs.params.q && !discussion.lastReadPostNumber()) {
       const firstPost = discussion.firstPost();
 
       if (firstPost) {
diff --git a/extensions/sticky/js/src/forum/components/DiscussionStickiedPost.js b/extensions/sticky/js/src/forum/components/DiscussionStickiedPost.js
index f3e3736fd..c4e28dc96 100644
--- a/extensions/sticky/js/src/forum/components/DiscussionStickiedPost.js
+++ b/extensions/sticky/js/src/forum/components/DiscussionStickiedPost.js
@@ -6,7 +6,7 @@ export default class DiscussionStickiedPost extends EventPost {
   }
 
   descriptionKey() {
-    return this.props.post.content().sticky
+    return this.attrs.post.content().sticky
       ? 'flarum-sticky.forum.post_stream.discussion_stickied_text'
       : 'flarum-sticky.forum.post_stream.discussion_unstickied_text';
   }