Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

6 files changed, 175 insertions, 33 deletions

diff --git a/app/javascript/mastodon/actions/importer/normalizer.js b/app/javascript/mastodon/actions/importer/normalizer.js
index c015d3a99..10a39e050 100644
--- a/app/javascript/mastodon/actions/importer/normalizer.js
+++ b/app/javascript/mastodon/actions/importer/normalizer.js
@@ -50,13 +50,14 @@ export function normalizeStatus(status, normalOldStatus) {
     normalStatus.spoilerHtml = normalOldStatus.get('spoilerHtml');
     normalStatus.hidden = normalOldStatus.get('hidden');
   } else {
-    const searchContent = [status.spoiler_text, status.content].join('\n\n').replace(/<br\s*\/?>/g, '\n').replace(/<\/p><p>/g, '\n\n');
-    const emojiMap = makeEmojiMap(normalStatus);
+    const spoilerText   = normalStatus.spoiler_text || '';
+    const searchContent = [spoilerText, status.content].join('\n\n').replace(/<br\s*\/?>/g, '\n').replace(/<\/p><p>/g, '\n\n');
+    const emojiMap      = makeEmojiMap(normalStatus);
 
     normalStatus.search_index = domParser.parseFromString(searchContent, 'text/html').documentElement.textContent;
     normalStatus.contentHtml  = emojify(normalStatus.content, emojiMap);
-    normalStatus.spoilerHtml  = emojify(escapeTextContentForBrowser(normalStatus.spoiler_text || ''), emojiMap);
-    normalStatus.hidden       = normalStatus.sensitive;
+    normalStatus.spoilerHtml  = emojify(escapeTextContentForBrowser(spoilerText), emojiMap);
+    normalStatus.hidden       = spoilerText.length > 0 || normalStatus.sensitive;
   }
 
   return normalStatus;
diff --git a/app/javascript/mastodon/features/compose/components/action_bar.js b/app/javascript/mastodon/features/compose/components/action_bar.js
new file mode 100644
index 000000000..d6dcf51e0
--- /dev/null
+++ b/app/javascript/mastodon/features/compose/components/action_bar.js
@@ -0,0 +1,53 @@
+import React from 'react';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import PropTypes from 'prop-types';
+import DropdownMenuContainer from '../../../containers/dropdown_menu_container';
+import { defineMessages, injectIntl } from 'react-intl';
+
+const messages = defineMessages({
+  edit_profile: { id: 'account.edit_profile', defaultMessage: 'Edit profile' },
+  pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned toots' },
+  preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
+  follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
+  favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favourites' },
+  lists: { id: 'navigation_bar.lists', defaultMessage: 'Lists' },
+  blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocked users' },
+  domain_blocks: { id: 'navigation_bar.domain_blocks', defaultMessage: 'Hidden domains' },
+  mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Muted users' },
+});
+
+@injectIntl
+export default class ActionBar extends React.PureComponent {
+
+  static propTypes = {
+    account: ImmutablePropTypes.map.isRequired,
+    intl: PropTypes.object.isRequired,
+  };
+
+  render () {
+    const { intl } = this.props;
+
+    let menu = [];
+
+    menu.push({ text: intl.formatMessage(messages.edit_profile), href: '/settings/profile' });
+    menu.push({ text: intl.formatMessage(messages.preferences), href: '/settings/preferences' });
+    menu.push({ text: intl.formatMessage(messages.pins), to: '/pinned' });
+    menu.push(null);
+    menu.push({ text: intl.formatMessage(messages.follow_requests), to: '/follow_requests' });
+    menu.push({ text: intl.formatMessage(messages.favourites), to: '/favourites' });
+    menu.push({ text: intl.formatMessage(messages.lists), to: '/lists' });
+    menu.push(null);
+    menu.push({ text: intl.formatMessage(messages.mutes), to: '/mutes' });
+    menu.push({ text: intl.formatMessage(messages.blocks), to: '/blocks' });
+    menu.push({ text: intl.formatMessage(messages.domain_blocks), to: '/domain_blocks' });
+
+    return (
+      <div className='compose__action-bar'>
+        <div className='compose__action-bar-dropdown'>
+          <DropdownMenuContainer items={menu} icon='ellipsis-v' size={24} direction='right' />
+        </div>
+      </div>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/compose/components/navigation_bar.js b/app/javascript/mastodon/features/compose/components/navigation_bar.js
index 3014c4033..9910eb4f9 100644
--- a/app/javascript/mastodon/features/compose/components/navigation_bar.js
+++ b/app/javascript/mastodon/features/compose/components/navigation_bar.js
@@ -1,9 +1,10 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
+import ActionBar from './action_bar';
 import Avatar from '../../../components/avatar';
-import IconButton from '../../../components/icon_button';
 import Permalink from '../../../components/permalink';
+import IconButton from '../../../components/icon_button';
 import { FormattedMessage } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
@@ -30,7 +31,10 @@ export default class NavigationBar extends ImmutablePureComponent {
           <a href='/settings/profile' className='navigation-bar__profile-edit'><FormattedMessage id='navigation_bar.edit_profile' defaultMessage='Edit profile' /></a>
         </div>
 
-        <IconButton title='' icon='close' onClick={this.props.onClose} />
+        <div className='navigation-bar__actions'>
+          <IconButton className='close' title='' icon='close' onClick={this.props.onClose} />
+          <ActionBar account={this.props.account} />
+        </div>
       </div>
     );
   }
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 58f1d6835..718c0c680 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1510,9 +1510,21 @@ a.account__display-name {
     text-decoration: none;
   }
 
-  .icon-button {
-    pointer-events: none;
-    opacity: 0;
+  .navigation-bar__actions {
+    position: relative;
+
+    .icon-button.close {
+      position: absolute;
+      pointer-events: none;
+      transform: scale(0.0, 1.0) translate(-100%, 0);
+      opacity: 0;
+    }
+
+    .compose__action-bar .icon-button {
+      pointer-events: auto;
+      transform: scale(1.0, 1.0) translate(0, 0);
+      opacity: 1;
+    }
   }
 }
 
@@ -4932,9 +4944,18 @@ noscript {
       transition: margin-top $duration $delay;
     }
 
-    & > .icon-button {
-      will-change: opacity;
-      transition: opacity $duration $delay;
+    .navigation-bar__actions {
+      & > .icon-button.close {
+        will-change: opacity transform;
+        transition: opacity $duration * 0.5 $delay,
+                    transform $duration $delay;
+      }
+
+      & > .compose__action-bar .icon-button {
+        will-change: opacity transform;
+        transition: opacity $duration * 0.5 $delay + $duration * 0.5,
+                    transform $duration $delay;
+      }
     }
   }
 
@@ -4961,9 +4982,18 @@ noscript {
         margin-top: -50px;
       }
 
-      .icon-button {
-        pointer-events: auto;
-        opacity: 1;
+      .navigation-bar__actions {
+        .icon-button.close {
+          pointer-events: auto;
+          opacity: 1;
+          transform: scale(1.0, 1.0) translate(0, 0);
+        }
+
+        .compose__action-bar .icon-button {
+          pointer-events: none;
+          opacity: 0;
+          transform: scale(0.0, 1.0) translate(100%, 0);
+        }
       }
     }
   }
diff --git a/spec/controllers/follower_accounts_controller_spec.rb b/spec/controllers/follower_accounts_controller_spec.rb
index 3a42a6e18..83032ab64 100644
--- a/spec/controllers/follower_accounts_controller_spec.rb
+++ b/spec/controllers/follower_accounts_controller_spec.rb
@@ -8,18 +8,45 @@ describe FollowerAccountsController do
   let(:follower1) { Fabricate(:account) }
 
   describe 'GET #index' do
-    it 'assigns follows' do
-      follow0 = follower0.follow!(alice)
-      follow1 = follower1.follow!(alice)
+    let!(:follow0) { follower0.follow!(alice) }
+    let!(:follow1) { follower1.follow!(alice) }
 
-      get :index, params: { account_username: alice.username }
+    context 'when format is html' do
+      subject(:response) { get :index, params: { account_username: alice.username, format: :html } }
 
-      assigned = assigns(:follows).to_a
-      expect(assigned.size).to eq 2
-      expect(assigned[0]).to eq follow1
-      expect(assigned[1]).to eq follow0
+      it 'assigns follows' do
+        expect(response).to have_http_status(200)
 
-      expect(response).to have_http_status(200)
+        assigned = assigns(:follows).to_a
+        expect(assigned.size).to eq 2
+        expect(assigned[0]).to eq follow1
+        expect(assigned[1]).to eq follow0
+      end
+    end
+
+    context 'when format is json' do
+      subject(:response) { get :index, params: { account_username: alice.username, page: page, format: :json } }
+      subject(:body) { JSON.parse(response.body) }
+
+      context 'with page' do
+        let(:page) { 1 }
+
+        it 'returns followers' do
+          expect(response).to have_http_status(200)
+          expect(body['totalItems']).to eq 2
+          expect(body['partOf']).to be_present
+        end
+      end
+
+      context 'without page' do
+        let(:page) { nil }
+
+        it 'returns followers' do
+          expect(response).to have_http_status(200)
+          expect(body['totalItems']).to eq 2
+          expect(body['partOf']).to be_blank
+        end
+      end
     end
   end
 end
diff --git a/spec/controllers/following_accounts_controller_spec.rb b/spec/controllers/following_accounts_controller_spec.rb
index 33376365d..d5e4ee587 100644
--- a/spec/controllers/following_accounts_controller_spec.rb
+++ b/spec/controllers/following_accounts_controller_spec.rb
@@ -8,18 +8,45 @@ describe FollowingAccountsController do
   let(:followee1) { Fabricate(:account) }
 
   describe 'GET #index' do
-    it 'assigns followees' do
-      follow0 = alice.follow!(followee0)
-      follow1 = alice.follow!(followee1)
+    let!(:follow0) { alice.follow!(followee0) }
+    let!(:follow1) { alice.follow!(followee1) }
 
-      get :index, params: { account_username: alice.username }
+    context 'when format is html' do
+      subject(:response) { get :index, params: { account_username: alice.username, format: :html } }
 
-      assigned = assigns(:follows).to_a
-      expect(assigned.size).to eq 2
-      expect(assigned[0]).to eq follow1
-      expect(assigned[1]).to eq follow0
+      it 'assigns follows' do
+        expect(response).to have_http_status(200)
 
-      expect(response).to have_http_status(200)
+        assigned = assigns(:follows).to_a
+        expect(assigned.size).to eq 2
+        expect(assigned[0]).to eq follow1
+        expect(assigned[1]).to eq follow0
+      end
+    end
+
+    context 'when format is json' do
+      subject(:response) { get :index, params: { account_username: alice.username, page: page, format: :json } }
+      subject(:body) { JSON.parse(response.body) }
+
+      context 'with page' do
+        let(:page) { 1 }
+
+        it 'returns followers' do
+          expect(response).to have_http_status(200)
+          expect(body['totalItems']).to eq 2
+          expect(body['partOf']).to be_present
+        end
+      end
+
+      context 'without page' do
+        let(:page) { nil }
+
+        it 'returns followers' do
+          expect(response).to have_http_status(200)
+          expect(body['totalItems']).to eq 2
+          expect(body['partOf']).to be_blank
+        end
+      end
     end
   end
 end