From 3caa5e52e625edd98e7218d54ed2d8497f7632b9 Mon Sep 17 00:00:00 2001
From: AFR <afrastgeek@users.noreply.github.com>
Date: Sat, 24 Feb 2018 05:47:36 +0700
Subject: [PATCH] Adapt to FontAwesome v5.0.6 icon name changes (#15)

---
 extensions/subscriptions/composer.json             |  2 +-
 .../js/forum/src/addSubscriptionBadge.js           |  4 ++--
 .../js/forum/src/addSubscriptionControls.js        |  6 +++---
 .../js/forum/src/addSubscriptionFilter.js          |  2 +-
 .../js/forum/src/components/NewPostNotification.js |  2 +-
 .../js/forum/src/components/SubscriptionMenu.js    | 14 +++++++-------
 .../forum/src/components/SubscriptionMenuItem.js   |  2 +-
 extensions/subscriptions/js/forum/src/main.js      |  2 +-
 8 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/extensions/subscriptions/composer.json b/extensions/subscriptions/composer.json
index 39f19dda1..8aa75e469 100644
--- a/extensions/subscriptions/composer.json
+++ b/extensions/subscriptions/composer.json
@@ -29,7 +29,7 @@
         "flarum-extension": {
             "title": "Subscriptions",
             "icon": {
-                "name": "star",
+                "name": "fa fa-star",
                 "backgroundColor": "#ffea7b",
                 "color": "#de8e00"
             }
diff --git a/extensions/subscriptions/js/forum/src/addSubscriptionBadge.js b/extensions/subscriptions/js/forum/src/addSubscriptionBadge.js
index 4db74d121..898676640 100644
--- a/extensions/subscriptions/js/forum/src/addSubscriptionBadge.js
+++ b/extensions/subscriptions/js/forum/src/addSubscriptionBadge.js
@@ -10,7 +10,7 @@ export default function addSubscriptionBadge() {
       case 'follow':
         badge = Badge.component({
           label: app.translator.trans('flarum-subscriptions.forum.badge.following_tooltip'),
-          icon: 'star',
+          icon: 'fa fa-star',
           type: 'following'
         });
         break;
@@ -18,7 +18,7 @@ export default function addSubscriptionBadge() {
       case 'ignore':
         badge = Badge.component({
           label: app.translator.trans('flarum-subscriptions.forum.badge.ignoring_tooltip'),
-          icon: 'eye-slash',
+          icon: 'far fa-eye-slash',
           type: 'ignoring'
         });
         break;
diff --git a/extensions/subscriptions/js/forum/src/addSubscriptionControls.js b/extensions/subscriptions/js/forum/src/addSubscriptionControls.js
index 196c6ddfc..5390b9a61 100644
--- a/extensions/subscriptions/js/forum/src/addSubscriptionControls.js
+++ b/extensions/subscriptions/js/forum/src/addSubscriptionControls.js
@@ -9,9 +9,9 @@ export default function addSubscriptionControls() {
   extend(DiscussionControls, 'userControls', function(items, discussion, context) {
     if (app.session.user && !(context instanceof DiscussionPage)) {
       const states = {
-        none: {label: app.translator.trans('flarum-subscriptions.forum.discussion_controls.follow_button'), icon: 'star', save: 'follow'},
-        follow: {label: app.translator.trans('flarum-subscriptions.forum.discussion_controls.unfollow_button'), icon: 'star-o', save: false},
-        ignore: {label: app.translator.trans('flarum-subscriptions.forum.discussion_controls.unignore_button'), icon: 'eye', save: false}
+        none: {label: app.translator.trans('flarum-subscriptions.forum.discussion_controls.follow_button'), icon: 'fa fa-star', save: 'follow'},
+        follow: {label: app.translator.trans('flarum-subscriptions.forum.discussion_controls.unfollow_button'), icon: 'far fa-star', save: false},
+        ignore: {label: app.translator.trans('flarum-subscriptions.forum.discussion_controls.unignore_button'), icon: 'fa fa-eye', save: false}
       };
 
       const subscription = discussion.subscription() || 'none';
diff --git a/extensions/subscriptions/js/forum/src/addSubscriptionFilter.js b/extensions/subscriptions/js/forum/src/addSubscriptionFilter.js
index f7ae93ba2..18ae2fccf 100644
--- a/extensions/subscriptions/js/forum/src/addSubscriptionFilter.js
+++ b/extensions/subscriptions/js/forum/src/addSubscriptionFilter.js
@@ -13,7 +13,7 @@ export default function addSubscriptionFilter() {
       items.add('following', LinkButton.component({
         href: app.route('index.filter', params),
         children: app.translator.trans('flarum-subscriptions.forum.index.following_link'),
-        icon: 'star'
+        icon: 'fa fa-star'
       }), 50);
     }
   });
diff --git a/extensions/subscriptions/js/forum/src/components/NewPostNotification.js b/extensions/subscriptions/js/forum/src/components/NewPostNotification.js
index 0f374229a..d38d80fea 100644
--- a/extensions/subscriptions/js/forum/src/components/NewPostNotification.js
+++ b/extensions/subscriptions/js/forum/src/components/NewPostNotification.js
@@ -3,7 +3,7 @@ import username from 'flarum/helpers/username';
 
 export default class NewPostNotification extends Notification {
   icon() {
-    return 'star';
+    return 'fa fa-star';
   }
 
   href() {
diff --git a/extensions/subscriptions/js/forum/src/components/SubscriptionMenu.js b/extensions/subscriptions/js/forum/src/components/SubscriptionMenu.js
index 7c756e831..c87641322 100644
--- a/extensions/subscriptions/js/forum/src/components/SubscriptionMenu.js
+++ b/extensions/subscriptions/js/forum/src/components/SubscriptionMenu.js
@@ -10,19 +10,19 @@ export default class SubscriptionMenu extends Dropdown {
     this.options = [
       {
         subscription: false,
-        icon: 'star-o',
+        icon: 'far fa-star',
         label: app.translator.trans('flarum-subscriptions.forum.sub_controls.not_following_button'),
         description: app.translator.trans('flarum-subscriptions.forum.sub_controls.not_following_text')
       },
       {
         subscription: 'follow',
-        icon: 'star',
+        icon: 'fa fa-star',
         label: app.translator.trans('flarum-subscriptions.forum.sub_controls.following_button'),
         description: app.translator.trans('flarum-subscriptions.forum.sub_controls.following_text')
       },
       {
         subscription: 'ignore',
-        icon: 'eye-slash',
+        icon: 'far fa-eye-slash',
         label: app.translator.trans('flarum-subscriptions.forum.sub_controls.ignoring_button'),
         description: app.translator.trans('flarum-subscriptions.forum.sub_controls.ignoring_text')
       }
@@ -34,18 +34,18 @@ export default class SubscriptionMenu extends Dropdown {
     const subscription = discussion.subscription();
 
     let buttonLabel = app.translator.trans('flarum-subscriptions.forum.sub_controls.follow_button');
-    let buttonIcon = 'star-o';
+    let buttonIcon = 'far fa-star';
     const buttonClass = 'SubscriptionMenu-button--' + subscription;
 
     switch (subscription) {
       case 'follow':
         buttonLabel = app.translator.trans('flarum-subscriptions.forum.sub_controls.following_button');
-        buttonIcon = 'star';
+        buttonIcon = 'fa fa-star';
         break;
 
       case 'ignore':
         buttonLabel = app.translator.trans('flarum-subscriptions.forum.sub_controls.ignoring_button');
-        buttonIcon = 'eye-slash';
+        buttonIcon = 'far fa-eye-slash';
         break;
 
       default:
@@ -85,7 +85,7 @@ export default class SubscriptionMenu extends Dropdown {
         {Button.component(buttonProps)}
 
         <button className={'Dropdown-toggle Button Button--icon ' + buttonClass} data-toggle="dropdown">
-          {icon('caret-down', {className: 'Button-icon'})}
+          {icon('fa fa-caret-down', {className: 'Button-icon'})}
         </button>
 
         <ul className="Dropdown-menu dropdown-menu Dropdown-menu--right">
diff --git a/extensions/subscriptions/js/forum/src/components/SubscriptionMenuItem.js b/extensions/subscriptions/js/forum/src/components/SubscriptionMenuItem.js
index 494034009..5f25b729f 100644
--- a/extensions/subscriptions/js/forum/src/components/SubscriptionMenuItem.js
+++ b/extensions/subscriptions/js/forum/src/components/SubscriptionMenuItem.js
@@ -5,7 +5,7 @@ export default class SubscriptionMenuItem extends Component {
   view() {
     return (
       <button className="SubscriptionMenuItem hasIcon" onclick={this.props.onclick}>
-        {this.props.active ? icon('check', {className: 'Button-icon'}) : ''}
+        {this.props.active ? icon('fa fa-check', {className: 'Button-icon'}) : ''}
         <span className="SubscriptionMenuItem-label">
           {icon(this.props.icon, {className: 'Button-icon'})}
           <strong>{this.props.label}</strong>
diff --git a/extensions/subscriptions/js/forum/src/main.js b/extensions/subscriptions/js/forum/src/main.js
index b14c56f3f..ba73547e4 100644
--- a/extensions/subscriptions/js/forum/src/main.js
+++ b/extensions/subscriptions/js/forum/src/main.js
@@ -24,7 +24,7 @@ app.initializers.add('subscriptions', function() {
   extend(NotificationGrid.prototype, 'notificationTypes', function(items) {
     items.add('newPost', {
       name: 'newPost',
-      icon: 'star',
+      icon: 'fa fa-star',
       label: app.translator.trans('flarum-subscriptions.forum.settings.notify_new_post_label')
     });
   });