Merge branch 'master' into glitch-soc/merge-upstream

Conflicts: - app/models/form/admin_settings.rb - config/locales/ja.yml
2023-08-25 08:33:12 +02:00 · 2019-04-01 21:28:31 +02:00 · 2019-04-01 21:28:31 +02:00 · 12dae9d583
commit 12dae9d583
parent 925830d11b 120544067f
33 changed files with 259 additions and 116 deletions
--- a/app/controllers/activitypub/inboxes_controller.rb
+++ b/app/controllers/activitypub/inboxes_controller.rb
@ -32,7 +32,10 @@ class ActivityPub::InboxesController < Api::BaseController
  end

  def body
-    @body ||= request.body.read.force_encoding('UTF-8')
+    return @body if defined?(@body)
+    @body = request.body.read.force_encoding('UTF-8')
+    request.body.rewind if request.body.respond_to?(:rewind)
+    @body
  end

  def upgrade_account
--- a/app/controllers/api/v1/accounts/follower_accounts_controller.rb
+++ b/app/controllers/api/v1/accounts/follower_accounts_controller.rb
@ -25,7 +25,7 @@ class Api::V1::Accounts::FollowerAccountsController < Api::BaseController
  end

  def default_accounts
-    Account.includes(:active_relationships, :account_stat).references(:active_relationships)
+    Account.without_blocking(current_account).includes(:active_relationships, :account_stat).references(:active_relationships)
  end

  def paginated_follows
--- a/app/controllers/api/v1/accounts/following_accounts_controller.rb
+++ b/app/controllers/api/v1/accounts/following_accounts_controller.rb
@ -25,7 +25,7 @@ class Api::V1::Accounts::FollowingAccountsController < Api::BaseController
  end

  def default_accounts
-    Account.includes(:passive_relationships, :account_stat).references(:passive_relationships)
+    Account.without_blocking(current_account).includes(:passive_relationships, :account_stat).references(:passive_relationships)
  end

  def paginated_follows
--- a/app/controllers/api/v1/accounts/statuses_controller.rb
+++ b/app/controllers/api/v1/accounts/statuses_controller.rb
@ -3,6 +3,8 @@
 class Api::V1::Accounts::StatusesController < Api::BaseController
  before_action -> { authorize_if_got_token! :read, :'read:statuses' }
  before_action :set_account
+  before_action :check_account_suspension
+  before_action :check_account_block
  after_action :insert_pagination_headers

  respond_to :json
@ -18,6 +20,14 @@ class Api::V1::Accounts::StatusesController < Api::BaseController
    @account = Account.find(params[:account_id])
  end

+  def check_account_suspension
+    gone if @account.suspended?
+  end
+
+  def check_account_block
+    gone if current_account.present? && @account.blocking?(current_account)
+  end
+
  def load_statuses
    cached_account_statuses
  end
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@ -10,6 +10,7 @@ class Api::V1::AccountsController < Api::BaseController
  before_action :require_user!, except: [:show, :create]
  before_action :set_account, except: [:create]
  before_action :check_account_suspension, only: [:show]
+  before_action :check_account_block, only: [:show]
  before_action :check_enabled_registrations, only: [:create]

  respond_to :json
@ -75,6 +76,10 @@ class Api::V1::AccountsController < Api::BaseController
    gone if @account.suspended?
  end

+  def check_account_block
+    gone if current_account.present? && @account.blocking?(current_account)
+  end
+
  def account_params
    params.permit(:username, :email, :password, :agreement, :locale)
  end
--- a/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb
+++ b/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb
@ -22,6 +22,7 @@ class Api::V1::Statuses::FavouritedByAccountsController < Api::BaseController

  def default_accounts
    Account
+      .without_blocking(current_account)
      .includes(:favourites, :account_stat)
      .references(:favourites)
      .where(favourites: { status_id: @status.id })
--- a/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb
+++ b/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb
@ -21,7 +21,7 @@ class Api::V1::Statuses::RebloggedByAccountsController < Api::BaseController
  end

  def default_accounts
-    Account.includes(:statuses, :account_stat).references(:statuses)
+    Account.without_blocking(current_account).includes(:statuses, :account_stat).references(:statuses)
  end

  def paginated_statuses
--- a/app/javascript/mastodon/features/account/components/header.js
+++ b/app/javascript/mastodon/features/account/components/header.js
@ -111,7 +111,7 @@ class Header extends ImmutablePureComponent {
      } else if (account.getIn(['relationship', 'requested'])) {
        actionBtn = <Button className='logo-button' text={intl.formatMessage(messages.requested)} onClick={this.props.onFollow} />;
      } else if (!account.getIn(['relationship', 'blocking'])) {
-        actionBtn = <Button disabled={account.getIn(['relationship', 'blocked_by'])} className={classNames('logo-button', { 'button--destructive': account.getIn(['relationship', 'following']) })} text={intl.formatMessage(account.getIn(['relationship', 'following']) ? messages.unfollow : messages.follow)} onClick={this.props.onFollow} />;
+        actionBtn = <Button className={classNames('logo-button', { 'button--destructive': account.getIn(['relationship', 'following']) })} text={intl.formatMessage(account.getIn(['relationship', 'following']) ? messages.unfollow : messages.follow)} onClick={this.props.onFollow} />;
      } else if (account.getIn(['relationship', 'blocking'])) {
        actionBtn = <Button className='logo-button' text={intl.formatMessage(messages.unblock, { name: account.get('username') })} onClick={this.props.onBlock} />;
      }
--- a/app/javascript/mastodon/features/account_timeline/index.js
+++ b/app/javascript/mastodon/features/account_timeline/index.js
@ -14,17 +14,14 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 import { FormattedMessage } from 'react-intl';
 import { fetchAccountIdentityProofs } from '../../actions/identity_proofs';

-const emptyList = ImmutableList();
-
 const mapStateToProps = (state, { params: { accountId }, withReplies = false }) => {
  const path = withReplies ? `${accountId}:with_replies` : accountId;

  return {
-    statusIds: state.getIn(['timelines', `account:${path}`, 'items'], emptyList),
-    featuredStatusIds: withReplies ? ImmutableList() : state.getIn(['timelines', `account:${accountId}:pinned`, 'items'], emptyList),
+    statusIds: state.getIn(['timelines', `account:${path}`, 'items'], ImmutableList()),
+    featuredStatusIds: withReplies ? ImmutableList() : state.getIn(['timelines', `account:${accountId}:pinned`, 'items'], ImmutableList()),
    isLoading: state.getIn(['timelines', `account:${path}`, 'isLoading']),
-    hasMore: state.getIn(['timelines', `account:${path}`, 'hasMore']),
-    blockedBy: state.getIn(['relationships', accountId, 'blocked_by'], false),
+    hasMore:   state.getIn(['timelines', `account:${path}`, 'hasMore']),
  };
 };

@ -40,7 +37,6 @@ class AccountTimeline extends ImmutablePureComponent {
    isLoading: PropTypes.bool,
    hasMore: PropTypes.bool,
    withReplies: PropTypes.bool,
-    blockedBy: PropTypes.bool,
  };

  componentWillMount () {
@ -48,11 +44,9 @@ class AccountTimeline extends ImmutablePureComponent {

    this.props.dispatch(fetchAccount(accountId));
    this.props.dispatch(fetchAccountIdentityProofs(accountId));
-
    if (!withReplies) {
      this.props.dispatch(expandAccountFeaturedTimeline(accountId));
    }
-
    this.props.dispatch(expandAccountTimeline(accountId, { withReplies }));
  }

@ -60,11 +54,9 @@ class AccountTimeline extends ImmutablePureComponent {
    if ((nextProps.params.accountId !== this.props.params.accountId && nextProps.params.accountId) || nextProps.withReplies !== this.props.withReplies) {
      this.props.dispatch(fetchAccount(nextProps.params.accountId));
      this.props.dispatch(fetchAccountIdentityProofs(nextProps.params.accountId));
-
      if (!nextProps.withReplies) {
        this.props.dispatch(expandAccountFeaturedTimeline(nextProps.params.accountId));
      }
-
      this.props.dispatch(expandAccountTimeline(nextProps.params.accountId, { withReplies: nextProps.params.withReplies }));
    }
  }
@ -74,7 +66,7 @@ class AccountTimeline extends ImmutablePureComponent {
  }

  render () {
-    const { shouldUpdateScroll, statusIds, featuredStatusIds, isLoading, hasMore, blockedBy } = this.props;
+    const { shouldUpdateScroll, statusIds, featuredStatusIds, isLoading, hasMore } = this.props;

    if (!statusIds && isLoading) {
      return (
@ -84,8 +76,6 @@ class AccountTimeline extends ImmutablePureComponent {
      );
    }

-    const emptyMessage = blockedBy ? <FormattedMessage id='empty_column.account_timeline_blocked' defaultMessage='You are blocked' /> : <FormattedMessage id='empty_column.account_timeline' defaultMessage='No toots here!' />;
-
    return (
      <Column>
        <ColumnBackButton />
@ -94,13 +84,13 @@ class AccountTimeline extends ImmutablePureComponent {
          prepend={<HeaderContainer accountId={this.props.params.accountId} />}
          alwaysPrepend
          scrollKey='account_timeline'
-          statusIds={blockedBy ? emptyList : statusIds}
+          statusIds={statusIds}
          featuredStatusIds={featuredStatusIds}
          isLoading={isLoading}
          hasMore={hasMore}
          onLoadMore={this.handleLoadMore}
          shouldUpdateScroll={shouldUpdateScroll}
-          emptyMessage={emptyMessage}
+          emptyMessage={<FormattedMessage id='empty_column.account_timeline' defaultMessage='No toots here!' />}
        />
      </Column>
    );
--- a/app/javascript/mastodon/features/followers/index.js
+++ b/app/javascript/mastodon/features/followers/index.js
@ -20,7 +20,6 @@ import ScrollableList from '../../components/scrollable_list';
 const mapStateToProps = (state, props) => ({
  accountIds: state.getIn(['user_lists', 'followers', props.params.accountId, 'items']),
  hasMore: !!state.getIn(['user_lists', 'followers', props.params.accountId, 'next']),
-  blockedBy: state.getIn(['relationships', props.params.accountId, 'blocked_by'], false),
 });

 export default @connect(mapStateToProps)
@ -32,7 +31,6 @@ class Followers extends ImmutablePureComponent {
    shouldUpdateScroll: PropTypes.func,
    accountIds: ImmutablePropTypes.list,
    hasMore: PropTypes.bool,
-    blockedBy: PropTypes.bool,
  };

  componentWillMount () {
@ -52,7 +50,7 @@ class Followers extends ImmutablePureComponent {
  }, 300, { leading: true });

  render () {
-    const { shouldUpdateScroll, accountIds, hasMore, blockedBy } = this.props;
+    const { shouldUpdateScroll, accountIds, hasMore } = this.props;

    if (!accountIds) {
      return (
@ -62,7 +60,7 @@ class Followers extends ImmutablePureComponent {
      );
    }

-    const emptyMessage = blockedBy ? <FormattedMessage id='empty_column.account_timeline_blocked' defaultMessage='You are blocked' /> : <FormattedMessage id='account.followers.empty' defaultMessage='No one follows this user yet.' />;
+    const emptyMessage = <FormattedMessage id='account.followers.empty' defaultMessage='No one follows this user yet.' />;

    return (
      <Column>
@ -77,7 +75,7 @@ class Followers extends ImmutablePureComponent {
          alwaysPrepend
          emptyMessage={emptyMessage}
        >
-          {blockedBy ? [] : accountIds.map(id =>
+          {accountIds.map(id =>
            <AccountContainer key={id} id={id} withNote={false} />
          )}
        </ScrollableList>
--- a/app/javascript/mastodon/features/following/index.js
+++ b/app/javascript/mastodon/features/following/index.js
@ -20,7 +20,6 @@ import ScrollableList from '../../components/scrollable_list';
 const mapStateToProps = (state, props) => ({
  accountIds: state.getIn(['user_lists', 'following', props.params.accountId, 'items']),
  hasMore: !!state.getIn(['user_lists', 'following', props.params.accountId, 'next']),
-  blockedBy: state.getIn(['relationships', props.params.accountId, 'blocked_by'], false),
 });

 export default @connect(mapStateToProps)
@ -32,7 +31,6 @@ class Following extends ImmutablePureComponent {
    shouldUpdateScroll: PropTypes.func,
    accountIds: ImmutablePropTypes.list,
    hasMore: PropTypes.bool,
-    blockedBy: PropTypes.bool,
  };

  componentWillMount () {
@ -52,7 +50,7 @@ class Following extends ImmutablePureComponent {
  }, 300, { leading: true });

  render () {
-    const { shouldUpdateScroll, accountIds, hasMore, blockedBy } = this.props;
+    const { shouldUpdateScroll, accountIds, hasMore } = this.props;

    if (!accountIds) {
      return (
@ -62,7 +60,7 @@ class Following extends ImmutablePureComponent {
      );
    }

-    const emptyMessage = blockedBy ? <FormattedMessage id='empty_column.account_timeline_blocked' defaultMessage='You are blocked' /> : <FormattedMessage id='account.follows.empty' defaultMessage="This user doesn't follow anyone yet." />;
+    const emptyMessage = <FormattedMessage id='account.follows.empty' defaultMessage="This user doesn't follow anyone yet." />;

    return (
      <Column>
@ -77,7 +75,7 @@ class Following extends ImmutablePureComponent {
          alwaysPrepend
          emptyMessage={emptyMessage}
        >
-          {blockedBy ? [] : accountIds.map(id =>
+          {accountIds.map(id =>
            <AccountContainer key={id} id={id} withNote={false} />
          )}
        </ScrollableList>
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@ -551,6 +551,10 @@
  },
  {
    "descriptors": [
+      {
+        "defaultMessage": "You are blocked",
+        "id": "empty_column.account_timeline_blocked"
+      },
      {
        "defaultMessage": "No toots here!",
        "id": "empty_column.account_timeline"
@ -1251,6 +1255,10 @@
  },
  {
    "descriptors": [
+      {
+        "defaultMessage": "You are blocked",
+        "id": "empty_column.account_timeline_blocked"
+      },
      {
        "defaultMessage": "No one follows this user yet.",
        "id": "account.followers.empty"
@ -1260,6 +1268,10 @@
  },
  {
    "descriptors": [
+      {
+        "defaultMessage": "You are blocked",
+        "id": "empty_column.account_timeline_blocked"
+      },
      {
        "defaultMessage": "This user doesn't follow anyone yet.",
        "id": "account.follows.empty"
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@ -121,6 +121,7 @@
  "emoji_button.symbols": "Symbols",
  "emoji_button.travel": "Travel & Places",
  "empty_column.account_timeline": "No toots here!",
+  "empty_column.account_timeline_blocked": "You are blocked",
  "empty_column.blocks": "You haven't blocked any users yet.",
  "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@ -1,12 +1,12 @@
 {
-  "account.add_or_remove_from_list": "リストに追加または外す",
+  "account.add_or_remove_from_list": "リストから追加または外す",
  "account.badges.bot": "Bot",
  "account.block": "@{name}さんをブロック",
  "account.block_domain": "{domain}全体を非表示",
  "account.blocked": "ブロック済み",
  "account.direct": "@{name}さんにダイレクトメッセージ",
  "account.domain_blocked": "ドメイン非表示中",
-  "account.edit_profile": "プロフィールを編集",
+  "account.edit_profile": "プロフィール編集",
  "account.endorse": "プロフィールで紹介する",
  "account.follow": "フォロー",
  "account.followers": "フォロワー",
@ -16,7 +16,7 @@
  "account.follows_you": "フォローされています",
  "account.hide_reblogs": "@{name}さんからのブーストを非表示",
  "account.link_verified_on": "このリンクの所有権は{date}に確認されました",
-  "account.locked_info": "このアカウントは承認制アカウントです。相手が確認するまでフォローは完了しません。",
+  "account.locked_info": "このアカウントは承認制アカウントです。相手が承認するまでフォローは完了しません。",
  "account.media": "メディア",
  "account.mention": "@{name}さんにトゥート",
  "account.moved_to": "{name}さんは引っ越しました:",
@ -30,7 +30,7 @@
  "account.share": "@{name}さんのプロフィールを共有する",
  "account.show_reblogs": "@{name}さんからのブーストを表示",
  "account.unblock": "@{name}さんのブロックを解除",
-  "account.unblock_domain": "{domain}を表示",
+  "account.unblock_domain": "{domain}の非表示を解除",
  "account.unendorse": "プロフィールから外す",
  "account.unfollow": "フォロー解除",
  "account.unmute": "@{name}さんのミュートを解除",
@ -71,14 +71,14 @@
  "community.column_settings.media_only": "メディアのみ表示",
  "compose_form.direct_message_warning": "このトゥートはメンションされた人にのみ送信されます。",
  "compose_form.direct_message_warning_learn_more": "もっと詳しく",
-  "compose_form.hashtag_warning": "このトゥートは未収載なのでハッシュタグの一覧に表示されません。公開トゥートだけがハッシュタグで検索できます。",
+  "compose_form.hashtag_warning": "このトゥートは公開設定ではないのでハッシュタグの一覧に表示されません。公開トゥートだけがハッシュタグで検索できます。",
  "compose_form.lock_disclaimer": "あなたのアカウントは{locked}になっていません。誰でもあなたをフォローすることができ、フォロワー限定の投稿を見ることができます。",
  "compose_form.lock_disclaimer.lock": "承認制",
  "compose_form.placeholder": "今なにしてる？",
-  "compose_form.poll.add_option": "Add a choice",
-  "compose_form.poll.duration": "投票期間",
-  "compose_form.poll.option_placeholder": "Choice {number}",
-  "compose_form.poll.remove_option": "Remove this choice",
+  "compose_form.poll.add_option": "追加",
+  "compose_form.poll.duration": "アンケート期間",
+  "compose_form.poll.option_placeholder": "選択肢 {number}",
+  "compose_form.poll.remove_option": "この選択肢を削除",
  "compose_form.publish": "トゥート",
  "compose_form.publish_loud": "{publish}！",
  "compose_form.sensitive.marked": "メディアに閲覧注意が設定されています",
@ -87,7 +87,7 @@
  "compose_form.spoiler.unmarked": "閲覧注意が設定されていません",
  "compose_form.spoiler_placeholder": "ここに警告を書いてください",
  "confirmation_modal.cancel": "キャンセル",
-  "confirmations.block.block_and_report": "Block & Report",
+  "confirmations.block.block_and_report": "ブロックし通報",
  "confirmations.block.confirm": "ブロック",
  "confirmations.block.message": "本当に{name}さんをブロックしますか？",
  "confirmations.delete.confirm": "削除",
@ -121,6 +121,7 @@
  "emoji_button.symbols": "記号",
  "emoji_button.travel": "旅行と場所",
  "empty_column.account_timeline": "トゥートがありません！",
+  "empty_column.account_timeline_blocked": "ブロックされています",
  "empty_column.blocks": "まだ誰もブロックしていません。",
  "empty_column.community": "ローカルタイムラインはまだ使われていません。何か書いてみましょう！",
  "empty_column.direct": "ダイレクトメッセージはまだありません。ダイレクトメッセージをやりとりすると、ここに表示されます。",
@ -158,8 +159,8 @@
  "home.column_settings.basic": "基本設定",
  "home.column_settings.show_reblogs": "ブースト表示",
  "home.column_settings.show_replies": "返信表示",
-  "intervals.full.days": "{number, plural, one {# day} other {# days}}",
-  "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
+  "intervals.full.days": "{number}日",
+  "intervals.full.hours": "{number}時間",
  "intervals.full.minutes": "{number}分",
  "introduction.federation.action": "次へ",
  "introduction.federation.federated.headline": "連合タイムライン",
@ -177,7 +178,7 @@
  "introduction.interactions.reply.text": "自身や人々のトゥートに返信することで、一連の会話に繋げることができます。",
  "introduction.welcome.action": "はじめる！",
  "introduction.welcome.headline": "はじめに",
-  "introduction.welcome.text": "Fediverseの世界へようこそ！あと少しでメッセージを配信したり、さまざまなサーバーを越えた友達と話せるようになります。ところでここ{domain}は特別なサーバーです…あなたのプロフィールを持つ主体のサーバーですので、名前を覚えておきましょう。",
+  "introduction.welcome.text": "Fediverseの世界へようこそ！あと少しでメッセージを配信したり、さまざまなサーバーを越えた友達と話せるようになります。ところで、ここ{domain}は特別なサーバーです…あなたのプロフィールを持つ主体のサーバーですので、名前を覚えておきましょう。",
  "keyboard_shortcuts.back": "戻る",
  "keyboard_shortcuts.blocked": "ブロックしたユーザーのリストを開く",
  "keyboard_shortcuts.boost": "ブースト",
@ -251,7 +252,7 @@
  "notification.favourite": "{name}さんがあなたのトゥートをお気に入りに登録しました",
  "notification.follow": "{name}さんにフォローされました",
  "notification.mention": "{name}さんがあなたに返信しました",
-  "notification.poll": "A poll you have voted in has ended",
+  "notification.poll": "アンケートが終了しました",
  "notification.reblog": "{name}さんがあなたのトゥートをブーストしました",
  "notifications.clear": "通知を消去",
  "notifications.clear_confirmation": "本当に通知を消去しますか？",
@ -262,7 +263,7 @@
  "notifications.column_settings.filter_bar.show": "表示",
  "notifications.column_settings.follow": "新しいフォロワー:",
  "notifications.column_settings.mention": "返信:",
-  "notifications.column_settings.poll": "Poll results:",
+  "notifications.column_settings.poll": "アンケート結果:",
  "notifications.column_settings.push": "プッシュ通知",
  "notifications.column_settings.reblog": "ブースト:",
  "notifications.column_settings.show": "カラムに表示",
@ -272,14 +273,14 @@
  "notifications.filter.favourites": "お気に入り",
  "notifications.filter.follows": "フォロー",
  "notifications.filter.mentions": "返信",
-  "notifications.filter.polls": "Poll results",
+  "notifications.filter.polls": "アンケート結果",
  "notifications.group": "{count} 件の通知",
  "poll.closed": "終了",
  "poll.refresh": "更新",
  "poll.total_votes": "{count}票",
-  "poll.vote": "Vote",
-  "poll_button.add_poll": "Add a poll",
-  "poll_button.remove_poll": "投票を削除",
+  "poll.vote": "投票",
+  "poll_button.add_poll": "アンケートを追加",
+  "poll_button.remove_poll": "アンケートを削除",
  "privacy.change": "公開範囲を変更",
  "privacy.direct.long": "メンションしたユーザーだけに公開",
  "privacy.direct.short": "ダイレクト",
@ -371,7 +372,7 @@
  "upload_area.title": "ドラッグ＆ドロップでアップロード",
  "upload_button.label": "メディアを追加 (JPEG, PNG, GIF, WebM, MP4, MOV)",
  "upload_error.limit": "アップロードできる上限を超えています。",
-  "upload_error.poll": "File upload not allowed with polls.",
+  "upload_error.poll": "アンケートではファイルをアップロードできません。",
  "upload_form.description": "視覚障害者のための説明",
  "upload_form.focus": "プレビューを変更",
  "upload_form.undo": "削除",
--- a/app/javascript/styles/mastodon/stream_entries.scss
+++ b/app/javascript/styles/mastodon/stream_entries.scss
@ -99,9 +99,9 @@
    }
  }

-  &:active:not(:disabled),
-  &:focus:not(:disabled),
-  &:hover:not(:disabled) {
+  &:active,
+  &:focus,
+  &:hover {
    background: lighten($ui-highlight-color, 10%);

    svg path:last-child {
--- a/app/models/account.rb
+++ b/app/models/account.rb
@ -102,6 +102,7 @@ class Account < ApplicationRecord
  scope :tagged_with, ->(tag) { joins(:accounts_tags).where(accounts_tags: { tag_id: tag }) }
  scope :by_recent_status, -> { order(Arel.sql('(case when account_stats.last_status_at is null then 1 else 0 end) asc, account_stats.last_status_at desc')) }
  scope :popular, -> { order('account_stats.followers_count desc') }
+  scope :without_blocking, ->(account) { account.nil? ? all : where.not(id: Block.where(target_account_id: account.id).pluck(:account_id)) }

  delegate :email,
           :unconfirmed_email,
--- a/app/models/form/admin_settings.rb
+++ b/app/models/form/admin_settings.rb
@ -28,6 +28,9 @@ class Form::AdminSettings
    profile_directory
    hide_followers_count
    flavour_and_skin
+    thumbnail
+    hero
+    mascot
  ).freeze

  BOOLEAN_KEYS = %i(
@ -73,7 +76,7 @@ class Form::AdminSettings
      next if PSEUDO_KEYS.include?(key)
      value = instance_variable_get("@#{key}")

-      if UPLOAD_KEYS.include?(key)
+      if UPLOAD_KEYS.include?(key) && !value.nil?
        upload = SiteUpload.where(var: key).first_or_initialize(var: key)
        upload.update(file: value)
      else
--- a/app/models/site_upload.rb
+++ b/app/models/site_upload.rb
@ -18,6 +18,7 @@ class SiteUpload < ApplicationRecord
  has_attached_file :file

  validates_attachment_content_type :file, content_type: /\Aimage\/.*\z/
+  validates :file, presence: true
  validates :var, presence: true, uniqueness: true

  before_save :set_meta
--- a/app/presenters/account_relationships_presenter.rb
+++ b/app/presenters/account_relationships_presenter.rb
@ -1,7 +1,7 @@
 # frozen_string_literal: true

 class AccountRelationshipsPresenter
-  attr_reader :following, :followed_by, :blocking, :blocked_by,
+  attr_reader :following, :followed_by, :blocking,
              :muting, :requested, :domain_blocking,
              :endorsed

@ -12,7 +12,6 @@ class AccountRelationshipsPresenter
    @following       = cached[:following].merge(Account.following_map(@uncached_account_ids, @current_account_id))
    @followed_by     = cached[:followed_by].merge(Account.followed_by_map(@uncached_account_ids, @current_account_id))
    @blocking        = cached[:blocking].merge(Account.blocking_map(@uncached_account_ids, @current_account_id))
-    @blocked_by      = cached[:blocked_by].merge(Account.blocked_by_map(@uncached_account_ids, @current_account_id))
    @muting          = cached[:muting].merge(Account.muting_map(@uncached_account_ids, @current_account_id))
    @requested       = cached[:requested].merge(Account.requested_map(@uncached_account_ids, @current_account_id))
    @domain_blocking = cached[:domain_blocking].merge(Account.domain_blocking_map(@uncached_account_ids, @current_account_id))
@ -23,7 +22,6 @@ class AccountRelationshipsPresenter
    @following.merge!(options[:following_map] || {})
    @followed_by.merge!(options[:followed_by_map] || {})
    @blocking.merge!(options[:blocking_map] || {})
-    @blocked_by.merge!(options[:blocked_by_map] || {})
    @muting.merge!(options[:muting_map] || {})
    @requested.merge!(options[:requested_map] || {})
    @domain_blocking.merge!(options[:domain_blocking_map] || {})
@ -39,7 +37,6 @@ class AccountRelationshipsPresenter
      following: {},
      followed_by: {},
      blocking: {},
-      blocked_by: {},
      muting: {},
      requested: {},
      domain_blocking: {},
@ -67,7 +64,6 @@ class AccountRelationshipsPresenter
        following:       { account_id => following[account_id] },
        followed_by:     { account_id => followed_by[account_id] },
        blocking:        { account_id => blocking[account_id] },
-        blocked_by:      { account_id => blocked_by[account_id] },
        muting:          { account_id => muting[account_id] },
        requested:       { account_id => requested[account_id] },
        domain_blocking: { account_id => domain_blocking[account_id] },
--- a/app/serializers/rest/relationship_serializer.rb
+++ b/app/serializers/rest/relationship_serializer.rb
@ -1,7 +1,7 @@
 # frozen_string_literal: true

 class REST::RelationshipSerializer < ActiveModel::Serializer
-  attributes :id, :following, :showing_reblogs, :followed_by, :blocking, :blocked_by,
+  attributes :id, :following, :showing_reblogs, :followed_by, :blocking,
             :muting, :muting_notifications, :requested, :domain_blocking,
             :endorsed

@ -27,10 +27,6 @@ class REST::RelationshipSerializer < ActiveModel::Serializer
    instance_options[:relationships].blocking[object.id] || false
  end

-  def blocked_by
-    instance_options[:relationships].blocked_by[object.id] || false
-  end
-
  def muting
    instance_options[:relationships].muting[object.id] ? true : false
  end
--- a/app/services/account_search_service.rb
+++ b/app/services/account_search_service.rb
@ -10,7 +10,15 @@ class AccountSearchService < BaseService
    @options = options
    @account = account

-    search_service_results
+    results = search_service_results
+
+    unless account.nil?
+      account_ids    = results.map(&:id)
+      blocked_by_map = Account.blocked_by_map(account_ids, account.id)
+      results.reject! { |item| blocked_by_map[item.id] }
+    end
+
+    results
  end

  private
--- a/app/services/search_service.rb
+++ b/app/services/search_service.rb
@ -12,6 +12,8 @@ class SearchService < BaseService
    default_results.tap do |results|
      if url_query?
        results.merge!(url_resource_results) unless url_resource.nil?
+        results[:accounts].reject! { |item| item.blocking?(@account) }
+        results[:statuses].reject! { |status| StatusFilter.new(status, @account).filtered? }
      elsif @query.present?
        results[:accounts] = perform_accounts_search! if account_searchable?
        results[:statuses] = perform_statuses_search! if full_text_searchable?
--- a/config/locales/activerecord.ja.yml
+++ b/config/locales/activerecord.ja.yml
@ -2,6 +2,9 @@
 ja:
  activerecord:
    attributes:
+      poll:
+        expires_at: 期限
+        options: 選択肢
      user:
        email: メールアドレス
    errors:
@ -9,8 +12,8 @@ ja:
        account:
          attributes:
            username:
-              invalid: アルファベット・数値・アンダーバー(_)で入力してください
+              invalid: アルファベット・数字・アンダーバーの組み合わせで入力してください
        status:
          attributes:
            reblog:
-              taken: のブーストはすでに存在します
+              taken: は既にブーストされています
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@ -636,6 +636,7 @@ en:
    all: All
    changes_saved_msg: Changes successfully saved!
    copy: Copy
+    order_by: Order by
    save_changes: Save changes
    use_this: Use this
    validation_errors:
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@ -163,8 +163,8 @@ ja:
      search: 検索
      shared_inbox_url: Shared inbox URL
      show:
-        created_reports: このアカウントで作られたレポート
-        targeted_reports: このアカウントについてのレポート
+        created_reports: このアカウントで作られた通報
+        targeted_reports: このアカウントについての通報
      silence: サイレンス
      silenced: サイレンス済み
      statuses: トゥート数
@ -180,7 +180,7 @@ ja:
      web: Web
    action_logs:
      actions:
-        assigned_to_self_report: "%{name} さんがレポート %{target} を自身の担当に割り当てました"
+        assigned_to_self_report: "%{name} さんが通報 %{target} を自身の担当に割り当てました"
        change_email_user: "%{name} さんが %{target} さんのメールアドレスを変更しました"
        confirm_user: "%{name} さんが %{target} さんのメールアドレスを確認済みにしました"
        create_account_warning: "%{name} さんが %{target} さんに警告メールを送信しました"
@ -200,12 +200,12 @@ ja:
        memorialize_account: "%{name} さんが %{target} さんを追悼アカウントページに登録しました"
        promote_user: "%{name} さんが %{target} さんを昇格しました"
        remove_avatar_user: "%{name} さんが %{target} さんのアイコンを削除しました"
-        reopen_report: "%{name} さんがレポート %{target} を再び開きました"
+        reopen_report: "%{name} さんが通報 %{target} を再び開きました"
        reset_password_user: "%{name} さんが %{target} さんのパスワードをリセットしました"
-        resolve_report: "%{name} さんがレポート %{target} を解決済みにしました"
+        resolve_report: "%{name} さんが通報 %{target} を解決済みにしました"
        silence_account: "%{name} さんが %{target} さんをサイレンスにしました"
        suspend_account: "%{name} さんが %{target} さんを停止しました"
-        unassigned_report: "%{name} さんがレポート %{target} の担当を外しました"
+        unassigned_report: "%{name} さんが通報 %{target} の担当を外しました"
        unsilence_account: "%{name} さんが %{target} さんのサイレンスを解除しました"
        unsuspend_account: "%{name} さんが %{target} さんの停止を解除しました"
        update_custom_emoji: "%{name} さんがカスタム絵文字 %{target} を更新しました"
@ -245,9 +245,10 @@ ja:
      feature_profile_directory: ディレクトリ
      feature_registrations: 新規登録
      feature_relay: 連合リレー
+      feature_timeline_preview: タイムラインプレビュー
      features: 機能
      hidden_service: 秘匿サービスとの連合
-      open_reports: 未解決のレポート
+      open_reports: 未解決の通報
      recent_users: 最近登録したユーザー
      search: 全文検索
      single_user_mode: シングルユーザーモード
@ -275,10 +276,10 @@ ja:
        title: 新規ドメインブロック
      reject_media: メディアファイルを拒否
      reject_media_hint: ローカルに保存されたメディアファイルを削除し、今後のダウンロードを拒否します。停止とは無関係です
-      reject_reports: レポートを拒否
-      reject_reports_hint: このドメインからのレポートをすべて無視します。停止とは無関係です
+      reject_reports: 通報を拒否
+      reject_reports_hint: このドメインからの通報をすべて無視します。停止とは無関係です
      rejecting_media: メディアファイルを拒否中
-      rejecting_reports: レポートを拒否中
+      rejecting_reports: 通報を拒否中
      severity:
        silence: サイレンス中
        suspend: 停止中
@ -319,7 +320,7 @@ ja:
      total_blocked_by_us: ブロック合計
      total_followed_by_them: 被フォロー合計
      total_followed_by_us: フォロー合計
-      total_reported: レポート合計
+      total_reported: 通報合計
      total_storage: 添付されたメディア
    invites:
      deactivate_all: すべて無効化
@ -345,19 +346,19 @@ ja:
      status: ステータス
      title: リレー
    report_notes:
-      created_msg: レポートメモを書き込みました！
-      destroyed_msg: レポートメモを削除しました！
+      created_msg: 通報メモを書き込みました！
+      destroyed_msg: 通報メモを削除しました！
    reports:
      account:
        note: メモ
-        report: レポート
-      action_taken_by: レポート処理者
+        report: 通報
+      action_taken_by: 通報処理者
      are_you_sure: 本当に実行しますか？
      assign_to_self: 担当になる
      assigned: 担当者
      comment:
        none: なし
-      created_at: レポート日時
+      created_at: 通報日時
      mark_as_resolved: 解決済みとしてマーク
      mark_as_unresolved: 未解決として再び開く
      notes:
@ -367,13 +368,13 @@ ja:
        delete: 削除
        placeholder: どのような措置が取られたか、または関連する更新を記述してください…
      reopen: 再び開く
-      report: レポート#%{id}
+      report: 通報#%{id}
      reported_account: 報告対象アカウント
      reported_by: 報告者
      resolved: 解決済み
-      resolved_msg: レポートを解決済みにしました！
+      resolved_msg: 通報を解決済みにしました！
      status: ステータス
-      title: レポート
+      title: 通報
      unassign: 担当を外す
      unresolved: 未解決
      updated_at: 更新日時
@ -386,7 +387,7 @@ ja:
        title: 新規ユーザーが自動フォローするアカウント
      contact_information:
        email: ビジネスメールアドレス
-        username: 連絡先のユーザー名
+        username: 連絡先ユーザー名
      custom_css:
        desc_html: 全ページに適用されるCSSの編集
        title: カスタムCSS
@ -586,6 +587,9 @@ ja:
      content: もうしわけありませんが、なにかが間違っています。
      title: このページは正しくありません
    noscript_html: Mastodonのウェブアプリケーションを利用する場合はJavaScriptを有効にしてください。またはあなたのプラットフォーム向けの<a href="%{apps_path}">Mastodonネイティブアプリ</a>を探すことができます。
+  existing_username_validator:
+    not_found: そのようなユーザー名はローカルに見つかりませんでした
+    not_found_multiple: "%{usernames} は見つかりませんでした"
  exports:
    archive_takeout:
      date: 日時
@ -629,11 +633,32 @@ ja:
    all: すべて
    changes_saved_msg: 正常に変更されました！
    copy: コピー
+    order_by: 並び順
    save_changes: 変更を保存
    use_this: これを使う
    validation_errors:
      one: エラーが発生しました！ 以下のエラーを確認してください
      other: エラーが発生しました！ 以下の%{count}個のエラーを確認してください
+  html_validator:
+    invalid_markup: '無効なHTMLマークアップが含まれています: %{error}'
+  identity_proofs:
+    active: アクティブ
+    authorize: 許可する
+    authorize_connection_prompt: この暗号化接続を許可しますか？
+    errors:
+      failed: 暗号化接続に失敗しました。%{provider}からもう一度やり直してください。
+      keybase:
+        invalid_token: Keybaseトークンは16進数で66文字のハッシュである必要があります
+        verification_failed: KeybaseはこのトークンをKeybaseユーザー%{kb_username}の署名として認識しませんでした。Keybaseから再試行してください。
+      wrong_user: "%{current}としてログインしている間%{proving}の証明を作成することはできません。%{proving}としてログインし、もう一度やり直してください。"
+    explanation_html: ここではKeybaseのような他のサービスのアカウントと暗号化し関連づけることができます。これにより他の人が暗号化されたメッセージを送信したり、その内容を信用できるようになります。
+    i_am_html: I am %{username} on %{service}.
+    identity: Identity
+    inactive: 非アクティブ
+    publicize_checkbox: 'そしてこれをトゥートしてください:'
+    publicize_toot: 'It is proven! I am %{username} on %{service}: %{url}'
+    status: 認証状態
+    view_proof: 証明を表示
  imports:
    modes:
      merge: 統合
@ -737,10 +762,11 @@ ja:
    truncate: "&hellip;"
  polls:
    errors:
+      already_voted: このアンケートには投票済みです
      duplicate_options: に同じものがあります
      duration_too_long: が長過ぎます
      duration_too_short: が短過ぎます
-      expired: 既に終了している投票です
+      expired: アンケートは既に終了しました
      over_character_limit: は%{max}文字より長くすることはできません
      too_few_options: は複数必要です
      too_many_options: は%{max}個までです
@ -749,6 +775,19 @@ ja:
    other: その他
    publishing: 投稿
    web: ウェブ
+  relationships:
+    activity: 活動
+    dormant: 非アクティブ
+    last_active: 最後の活動
+    most_recent: 新着
+    moved: 引っ越し済み
+    mutual: 相互
+    primary: 標準
+    relationship: 関係性
+    remove_selected_domains: 選択したドメインのフォロワーを全て解除
+    remove_selected_followers: 選択したフォロワーを解除
+    remove_selected_follows: 選択したユーザーをフォロー解除
+    status: 状態
  remote_follow:
    acct: あなたの ユーザー名@ドメイン を入力してください
    missing_resource: リダイレクト先が見つかりませんでした
@ -824,10 +863,12 @@ ja:
    export: データのエクスポート
    featured_tags: 注目のハッシュタグ
    flavours: フレーバー
+    identity_proofs: Identity proofs
    import: データのインポート
    migrate: アカウントの引っ越し
    notifications: 通知
    preferences: ユーザー設定
+    relationships: フォロー・フォロワー
    settings: 設定
    two_factor_authentication: 二段階認証
    your_apps: アプリ
@ -852,12 +893,12 @@ ja:
      limit: 固定できるトゥート数の上限に達しました
      ownership: 他人のトゥートを固定することはできません
      private: 非公開のトゥートを固定することはできません
-      reblog: ブーストされたトゥートを固定することはできません
+      reblog: ブーストを固定することはできません
    poll:
      total_votes:
-        one: "%{count} vote"
-        other: "%{count} votes"
-      vote: Vote
+        one: "%{count}票"
+        other: "%{count}票"
+      vote: 投票
    show_more: もっと見る
    sign_in_to_participate: ログインして会話に参加
    title: '%{name}: "%{quote}"'
--- a/lib/mastodon/accounts_cli.rb
+++ b/lib/mastodon/accounts_cli.rb
@ -236,11 +236,7 @@ module Mastodon
        end

        if [404, 410].include?(code)
-          unless options[:dry_run]
-            SuspendAccountService.new.call(account)
-            account.destroy
-          end
-
+          SuspendAccountService.new.call(account, destroy: true) unless options[:dry_run]
          culled += 1
          say('+', :green, false)
        else
--- a/spec/controllers/api/v1/accounts/follower_accounts_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/follower_accounts_controller_spec.rb
@ -7,15 +7,40 @@ describe Api::V1::Accounts::FollowerAccountsController do
  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:accounts') }

  before do
-    Fabricate(:follow, target_account: user.account)
    allow(controller).to receive(:doorkeeper_token) { token }
  end

  describe 'GET #index' do
+    let(:simon) { Fabricate(:account, username: 'simon') }
+    let(:lewis) { Fabricate(:account, username: 'lewis') }
+
+    before do
+      simon.follow!(lewis)
+    end
+
    it 'returns http success' do
-      get :index, params: { account_id: user.account.id, limit: 1 }
+      get :index, params: { account_id: lewis.id, limit: 1 }

      expect(response).to have_http_status(200)
    end
+
+    it 'returns JSON with correct data' do
+      get :index, params: { account_id: lewis.id, limit: 1 }
+
+      json = body_as_json
+
+      expect(json).to be_a Enumerable
+      expect(json.first[:username]).to eq 'simon'
+    end
+
+    it 'does not return accounts blocking you' do
+      simon.block!(user.account)
+      get :index, params: { account_id: lewis.id, limit: 1 }
+
+      json = body_as_json
+
+      expect(json).to be_a Enumerable
+      expect(json.size).to eq 0
+    end
  end
 end
--- a/spec/controllers/api/v1/accounts/following_accounts_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/following_accounts_controller_spec.rb
@ -7,15 +7,40 @@ describe Api::V1::Accounts::FollowingAccountsController do
  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:accounts') }

  before do
-    Fabricate(:follow, account: user.account)
    allow(controller).to receive(:doorkeeper_token) { token }
  end

  describe 'GET #index' do
+    let(:simon) { Fabricate(:account, username: 'simon') }
+    let(:lewis) { Fabricate(:account, username: 'lewis') }
+
+    before do
+      lewis.follow!(simon)
+    end
+
    it 'returns http success' do
-      get :index, params: { account_id: user.account.id, limit: 1 }
+      get :index, params: { account_id: lewis.id, limit: 1 }

      expect(response).to have_http_status(200)
    end
+
+    it 'returns JSON with correct data' do
+      get :index, params: { account_id: lewis.id, limit: 1 }
+
+      json = body_as_json
+
+      expect(json).to be_a Enumerable
+      expect(json.first[:username]).to eq 'simon'
+    end
+
+    it 'does not return accounts blocking you' do
+      simon.block!(user.account)
+      get :index, params: { account_id: lewis.id, limit: 1 }
+
+      json = body_as_json
+
+      expect(json).to be_a Enumerable
+      expect(json.size).to eq 0
+    end
  end
 end
--- a/spec/fabricators/assets/TEAPOT
+++ b/spec/fabricators/assets/TEAPOT
@ -0,0 +1,6 @@
+This "Utah teapot" photograph is licensed under the Creative Commons
+Attribution-Share Alike 3.0 Unported license:
+  https://creativecommons.org/licenses/by-sa/3.0/deed.en
+
+Original source of work:
+  https://commons.wikimedia.org/wiki/File:Utah_teapot_simple_2.png
--- a/spec/fabricators/assets/utah_teapot.png
+++ b/spec/fabricators/assets/utah_teapot.png
--- a/spec/fabricators/site_upload_fabricator.rb
+++ b/spec/fabricators/site_upload_fabricator.rb
@ -1,2 +1,3 @@
 Fabricator(:site_upload) do
+  file { File.open(File.join(Rails.root, 'spec', 'fabricators', 'assets', 'utah_teapot.png')) }
 end
--- a/spec/services/account_search_service_spec.rb
+++ b/spec/services/account_search_service_spec.rb
@ -156,5 +156,22 @@ describe AccountSearchService, type: :service do
        expect(results).to eq []
      end
    end
+
+    describe 'should not include accounts blocking the requester' do
+      let!(:blocked) { Fabricate(:account) }
+      let!(:blocker) { Fabricate(:account, username: 'exact') }
+
+      before do
+        blocker.block!(blocked)
+      end
+
+      it 'returns the fuzzy match first, and does not return suspended exacts' do
+        partial = Fabricate(:account, username: 'exactness')
+
+        results = subject.call('exact', blocked, limit: 10)
+        expect(results.size).to eq 1
+        expect(results).to eq [partial]
+      end
+    end
  end
 end
--- a/spec/services/search_service_spec.rb
+++ b/spec/services/search_service_spec.rb
@ -3,6 +3,8 @@
 require 'rails_helper'

 describe SearchService, type: :service do
+  let(:current_account) { Fabricate(:user).account }
+
  subject { described_class.new }

  describe '#call' do
@ -10,7 +12,7 @@ describe SearchService, type: :service do
      it 'returns empty results without searching' do
        allow(AccountSearchService).to receive(:new)
        allow(Tag).to receive(:search_for)
-        results = subject.call('', nil, 10)
+        results = subject.call('', current_account, 10)

        expect(results).to eq(empty_results)
        expect(AccountSearchService).not_to have_received(:new)
@ -27,33 +29,33 @@ describe SearchService, type: :service do
        it 'returns the empty results' do
          service = double(call: nil)
          allow(ResolveURLService).to receive(:new).and_return(service)
-          results = subject.call(@query, nil, 10)
+          results = subject.call(@query, current_account, 10)

-          expect(service).to have_received(:call).with(@query, on_behalf_of: nil)
+          expect(service).to have_received(:call).with(@query, on_behalf_of: current_account)
          expect(results).to eq empty_results
        end
      end

      context 'that finds an account' do
        it 'includes the account in the results' do
-          account = Account.new
+          account = Fabricate(:account)
          service = double(call: account)
          allow(ResolveURLService).to receive(:new).and_return(service)

-          results = subject.call(@query, nil, 10)
-          expect(service).to have_received(:call).with(@query, on_behalf_of: nil)
+          results = subject.call(@query, current_account, 10)
+          expect(service).to have_received(:call).with(@query, on_behalf_of: current_account)
          expect(results).to eq empty_results.merge(accounts: [account])
        end
      end

      context 'that finds a status' do
        it 'includes the status in the results' do
-          status = Status.new
+          status = Fabricate(:status)
          service = double(call: status)
          allow(ResolveURLService).to receive(:new).and_return(service)

-          results = subject.call(@query, nil, 10)
-          expect(service).to have_received(:call).with(@query, on_behalf_of: nil)
+          results = subject.call(@query, current_account, 10)
+          expect(service).to have_received(:call).with(@query, on_behalf_of: current_account)
          expect(results).to eq empty_results.merge(statuses: [status])
        end
      end
@ -63,12 +65,12 @@ describe SearchService, type: :service do
      context 'that matches an account' do
        it 'includes the account in the results' do
          query = 'username'
-          account = Account.new
+          account = Fabricate(:account)
          service = double(call: [account])
          allow(AccountSearchService).to receive(:new).and_return(service)

-          results = subject.call(query, nil, 10)
-          expect(service).to have_received(:call).with(query, nil, limit: 10, offset: 0, resolve: false)
+          results = subject.call(query, current_account, 10)
+          expect(service).to have_received(:call).with(query, current_account, limit: 10, offset: 0, resolve: false)
          expect(results).to eq empty_results.merge(accounts: [account])
        end
      end
@ -79,7 +81,7 @@ describe SearchService, type: :service do
          tag = Tag.new
          allow(Tag).to receive(:search_for).with('tag', 10, 0).and_return([tag])

-          results = subject.call(query, nil, 10)
+          results = subject.call(query, current_account, 10)
          expect(Tag).to have_received(:search_for).with('tag', 10, 0)
          expect(results).to eq empty_results.merge(hashtags: [tag])
        end
@ -87,7 +89,7 @@ describe SearchService, type: :service do
          query = '@username'
          allow(Tag).to receive(:search_for)

-          results = subject.call(query, nil, 10)
+          results = subject.call(query, current_account, 10)
          expect(Tag).not_to have_received(:search_for)
          expect(results).to eq empty_results
        end