From f809d925e3a0410ccb1fe56adfdc76c2e5fb09ab Mon Sep 17 00:00:00 2001
From: highemerly <high.emerly.ytfin@gmail.com>
Date: Fri, 13 Sep 2019 18:19:59 +0900
Subject: [PATCH 01/19] =?UTF-8?q?[Change]=20=E6=97=A5=E6=9C=AC=E8=AA=9E?=
 =?UTF-8?q?=E6=A4=9C=E7=B4=A2=E3=81=AB=E9=96=A2=E3=81=99=E3=82=8B=E6=9C=80?=
 =?UTF-8?q?=E9=81=A9=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 検索クエリを分かち書きを行わない言語に最適化
- 形態素解析を行うためにElasticsearch側にkuromojiを導入
- 検索結果をマッチ度順ではなく日付順に変更
---
 app/chewy/statuses_index.rb    | 27 +++++++++------------------
 app/services/search_service.rb |  4 +++-
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/app/chewy/statuses_index.rb b/app/chewy/statuses_index.rb
index 47cb856ea944a4..89d6607c62c3f4 100644
--- a/app/chewy/statuses_index.rb
+++ b/app/chewy/statuses_index.rb
@@ -2,30 +2,21 @@
 
 class StatusesIndex < Chewy::Index
   settings index: { refresh_interval: '15m' }, analysis: {
-    filter: {
-      english_stop: {
-        type: 'stop',
-        stopwords: '_english_',
-      },
-      english_stemmer: {
-        type: 'stemmer',
-        language: 'english',
-      },
-      english_possessive_stemmer: {
-        type: 'stemmer',
-        language: 'possessive_english',
+    tokenizer: {
+      kuromoji_user_dict: {
+        type: 'kuromoji_tokenizer',
+        user_dictionary: 'userdic.txt',
       },
     },
     analyzer: {
       content: {
-        tokenizer: 'uax_url_email',
+        type: 'custom',
+        tokenizer: 'kuromoji_user_dict',
         filter: %w(
-          english_possessive_stemmer
-          lowercase
-          asciifolding
+          kuromoji_baseform
+          kuromoji_stemmer
           cjk_width
-          english_stop
-          english_stemmer
+          lowercase
         ),
       },
     },
diff --git a/app/services/search_service.rb b/app/services/search_service.rb
index 1a76cbb388316c..d340789602ada0 100644
--- a/app/services/search_service.rb
+++ b/app/services/search_service.rb
@@ -35,7 +35,9 @@ def perform_accounts_search!
   end
 
   def perform_statuses_search!
-    definition = parsed_query.apply(StatusesIndex.filter(term: { searchable_by: @account.id }))
+    definition = StatusesIndex.filter(term: { searchable_by: @account.id })
+                              .query(match: { 'text.stemmed': { query: @query, operator: 'and'}})
+                              .order(id: { order: 'desc' })
 
     if @options[:account_id].present?
       definition = definition.filter(term: { account_id: @options[:account_id] })

From f17bf7e1542adb392a44ffa97005ed9235ea77cd Mon Sep 17 00:00:00 2001
From: highemerly <high.emerly.ytfin@gmail.com>
Date: Fri, 13 Sep 2019 18:21:10 +0900
Subject: [PATCH 02/19] =?UTF-8?q?[Change]=20=E6=8A=95=E7=A5=A8=E6=8A=95?=
 =?UTF-8?q?=E7=A8=BF=E6=99=82=E3=81=AEWeb/API=E4=B8=8A=E3=81=AE=E3=83=91?=
 =?UTF-8?q?=E3=83=A9=E3=83=A1=E3=83=BC=E3=82=BF=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 投票作成時，その選択肢の数の上限を4から16に変更
- 投票作成時，その有効期限をより細かく設定出来るように変更
---
 .../mastodon/features/compose/components/poll_form.js       | 5 ++++-
 app/validators/poll_validator.rb                            | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/javascript/mastodon/features/compose/components/poll_form.js b/app/javascript/mastodon/features/compose/components/poll_form.js
index db49f90eb4cb95..f322298a827acd 100644
--- a/app/javascript/mastodon/features/compose/components/poll_form.js
+++ b/app/javascript/mastodon/features/compose/components/poll_form.js
@@ -157,13 +157,16 @@ class PollForm extends ImmutablePureComponent {
         </ul>
 
         <div className='poll__footer'>
-          <button disabled={options.size >= 4} className='button button-secondary' onClick={this.handleAddOption}><Icon id='plus' /> <FormattedMessage {...messages.add_option} /></button>
+          <button disabled={options.size >= 16} className='button button-secondary' onClick={this.handleAddOption}><Icon id='plus' /> <FormattedMessage {...messages.add_option} /></button>
 
           {/* eslint-disable-next-line jsx-a11y/no-onchange */}
           <select value={expiresIn} onChange={this.handleSelectDuration}>
+            <option value={60}>{intl.formatMessage(messages.minutes, { number: 1 })}</option>
             <option value={300}>{intl.formatMessage(messages.minutes, { number: 5 })}</option>
+            <option value={600}>{intl.formatMessage(messages.minutes, { number: 10 })}</option>
             <option value={1800}>{intl.formatMessage(messages.minutes, { number: 30 })}</option>
             <option value={3600}>{intl.formatMessage(messages.hours, { number: 1 })}</option>
+            <option value={7200}>{intl.formatMessage(messages.hours, { number: 2 })}</option>
             <option value={21600}>{intl.formatMessage(messages.hours, { number: 6 })}</option>
             <option value={86400}>{intl.formatMessage(messages.days, { number: 1 })}</option>
             <option value={259200}>{intl.formatMessage(messages.days, { number: 3 })}</option>
diff --git a/app/validators/poll_validator.rb b/app/validators/poll_validator.rb
index a3272779638747..20da7dae6717c0 100644
--- a/app/validators/poll_validator.rb
+++ b/app/validators/poll_validator.rb
@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 class PollValidator < ActiveModel::Validator
-  MAX_OPTIONS      = 4
-  MAX_OPTION_CHARS = 50
+  MAX_OPTIONS      = 16
+  MAX_OPTION_CHARS = 50 
   MAX_EXPIRATION   = 1.month.freeze
-  MIN_EXPIRATION   = 5.minutes.freeze
+  MIN_EXPIRATION   = 1.minutes.freeze
 
   def validate(poll)
     current_time = Time.now.utc

From 2835853ac7c07dce0d3ca1234c55c640b1633bfc Mon Sep 17 00:00:00 2001
From: highemerly <high.emerly.ytfin@gmail.com>
Date: Fri, 13 Sep 2019 18:24:22 +0900
Subject: [PATCH 03/19] =?UTF-8?q?[Add]=20Announcement=E6=A9=9F=E8=83=BD?=
 =?UTF-8?q?=E3=82=92=E3=83=9E=E3=83=BC=E3=82=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Announcement機能をマージ（lindwurm/mastodon）
---
 app/javascript/mastodon/components/status.js  |   4 +-
 .../compose/components/announcements.js       | 120 ++++++++++++++++++
 .../mastodon/features/compose/index.js        |   3 +-
 .../features/ui/components/compose_panel.js   |   2 +
 app/javascript/styles/application.scss        |   2 +
 app/javascript/styles/mods/announcements.scss |  30 +++++
 public/announcements.json                     |   6 +
 7 files changed, 164 insertions(+), 3 deletions(-)
 create mode 100644 app/javascript/mastodon/features/compose/components/announcements.js
 create mode 100644 app/javascript/styles/mods/announcements.scss
 create mode 100644 public/announcements.json

diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index 295e83f5819607..24ffa0103878ea 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -464,8 +464,8 @@ class Status extends ImmutablePureComponent {
         <div className={classNames('status__wrapper', `status__wrapper-${status.get('visibility')}`, { 'status__wrapper-reply': !!status.get('in_reply_to_id'), unread, focusable: !this.props.muted })} tabIndex={this.props.muted ? null : 0} data-featured={featured ? 'true' : null} aria-label={textForScreenReader(intl, status, rebloggedByText)} ref={this.handleRef}>
           {prepend}
 
-          <div className={classNames('status', `status-${status.get('visibility')}`, { 'status-reply': !!status.get('in_reply_to_id'), muted: this.props.muted })} data-id={status.get('id')}>
-            <div className='status__expand' onClick={this.handleExpandClick} role='presentation' />
+          <div className={classNames('status', `status-${status.get('visibility')}`, { 'status-reply': !!status.get('in_reply_to_id'), muted: this.props.muted, read: unread === false })} data-id={status.get('id')}>
+            <div className='status__expand' onClick={this.handleClick} role='presentation' />
             <div className='status__info'>
               <a href={status.get('url')} className='status__relative-time' target='_blank' rel='noopener noreferrer'>
                 <span className='status__visibility-icon'><Icon id={visibilityIcon.icon} title={visibilityIcon.text} /></span>
diff --git a/app/javascript/mastodon/features/compose/components/announcements.js b/app/javascript/mastodon/features/compose/components/announcements.js
new file mode 100644
index 00000000000000..f9ab4eea2002c5
--- /dev/null
+++ b/app/javascript/mastodon/features/compose/components/announcements.js
@@ -0,0 +1,120 @@
+import React from 'react';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import Immutable from 'immutable';
+import { Link } from 'react-router-dom';
+import axios from 'axios';
+import classnames from 'classnames';
+
+class Announcement extends React.PureComponent {
+
+  static propTypes = {
+    item: ImmutablePropTypes.map,
+  }
+
+  render() {
+    const { item } = this.props;
+
+    const contents = [];
+    contents.push(<div key='body' className='announcements__body'>{item.get('body')}</div>);
+    if (item.get('icon')) {
+      contents.push(
+        <div key='icon' className='announcements__icon'>
+          <img src={item.get('icon')} alt='' />
+        </div>
+      );
+    }
+
+    const href = item.get('href');
+
+    const classname = classnames({
+      'announcements__item': true,
+      'announcements__item--clickable': !!href,
+    });
+
+    if (!href) {
+      return (<div className={classname}>{contents}</div>);
+    } else if (href.startsWith('/web/')) {
+      return (<Link to={item.get('href').slice(4)} className={classname}>{contents}</Link>);
+    } else {
+      return (<a href={item.get('href')} target='_blank' className={classname}>{contents}</a>);
+    }
+  }
+
+}
+
+export default class Announcements extends React.PureComponent {
+
+  state = {
+    items: Announcements.cache || Immutable.Map(),
+  }
+
+  static isCacheControlled = false
+  static lastDate = null
+  static cache = null
+
+  constructor () {
+    super();
+    this.refresh();
+  }
+
+  componentWillUnmount() {
+    this.cancelPolling();
+  }
+
+  setPolling = () => {
+    this.timer = setTimeout(this.refresh, 2 * 60 * 1000);
+  }
+
+  cancelPolling = () => {
+    if (this.timer !== null) {
+      clearTimeout(this.timer);
+      this.timer = null;
+    }
+  }
+
+  deleteServiceWorkerCache = () => {
+    // files in /system/ will be cached by SW
+    if (self.caches) {
+      return caches.open('mastodon-system')
+        .then(cache => cache.delete(window.origin + '/system/announcements.json'))
+        .catch(() => {});
+    } else {
+      return Promise.resolve();
+    }
+  }
+
+  refresh = () => {
+    this.timer = null;
+
+    axios.get('/announcements.json', {
+      headers: {
+        'If-Modified-Since': !Announcements.isCacheControlled && Announcements.lastDate || '',
+      },
+    })
+      .then(resp => {
+        Announcements.isCacheControlled = !!resp.headers['cache-control'];
+        Announcements.lastDate = resp.headers['last-modified'];
+        return resp;
+      })
+      .then(resp => this.setState({ items: Announcements.cache = Immutable.fromJS(resp.data) || {} }))
+      .catch(err => err.response.status !== 304 && console.warn(err))
+      .then(this.deleteServiceWorkerCache)
+      .then(this.setPolling)
+      .catch(err => err && console.warn(err));
+  }
+
+  render() {
+    const { items } = this.state;
+
+    return (
+      <ul className='announcements'>
+        {items.entrySeq().map(([key, item]) =>
+          (<li key={key}>
+            <Announcement item={item} />
+          </li>)
+        )}
+      </ul>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/compose/index.js b/app/javascript/mastodon/features/compose/index.js
index e2de8b0e6a20d1..fae80b4cc7d396 100644
--- a/app/javascript/mastodon/features/compose/index.js
+++ b/app/javascript/mastodon/features/compose/index.js
@@ -16,6 +16,7 @@ import { openModal } from 'mastodon/actions/modal';
 import elephantUIPlane from '../../../images/elephant_ui_plane.svg';
 import { mascot } from '../../initial_state';
 import Icon from 'mastodon/components/icon';
+import Announcements from './components/announcements';
 import { logOut } from 'mastodon/utils/log_out';
 
 const messages = defineMessages({
@@ -127,7 +128,7 @@ class Compose extends React.PureComponent {
             <NavigationContainer onClose={this.onBlur} />
 
             <ComposeFormContainer />
-
+            <Announcements />
             <div className='drawer__inner__mastodon'>
               <img alt='' draggable='false' src={mascot || elephantUIPlane} />
             </div>
diff --git a/app/javascript/mastodon/features/ui/components/compose_panel.js b/app/javascript/mastodon/features/ui/components/compose_panel.js
index 3d0c48c7a9687c..13d99972a06188 100644
--- a/app/javascript/mastodon/features/ui/components/compose_panel.js
+++ b/app/javascript/mastodon/features/ui/components/compose_panel.js
@@ -5,6 +5,7 @@ import SearchContainer from 'mastodon/features/compose/containers/search_contain
 import ComposeFormContainer from 'mastodon/features/compose/containers/compose_form_container';
 import NavigationContainer from 'mastodon/features/compose/containers/navigation_container';
 import LinkFooter from './link_footer';
+import Announcements from 'mastodon/features/compose/components/announcements';
 import { changeComposing } from 'mastodon/actions/compose';
 
 export default @connect()
@@ -28,6 +29,7 @@ class ComposePanel extends React.PureComponent {
         <SearchContainer openInRoute />
         <NavigationContainer onClose={this.onBlur} />
         <ComposeFormContainer singleColumn />
+        <Announcements />
         <LinkFooter withHotkeys />
       </div>
     );
diff --git a/app/javascript/styles/application.scss b/app/javascript/styles/application.scss
index 8ebc45b62d1ae8..718d0d78f5b799 100644
--- a/app/javascript/styles/application.scss
+++ b/app/javascript/styles/application.scss
@@ -26,3 +26,5 @@
 @import 'mastodon/dashboard';
 @import 'mastodon/rtl';
 @import 'mastodon/accessibility';
+
+@import 'mods/announcements.scss'
diff --git a/app/javascript/styles/mods/announcements.scss b/app/javascript/styles/mods/announcements.scss
new file mode 100644
index 00000000000000..4482ca5f25b461
--- /dev/null
+++ b/app/javascript/styles/mods/announcements.scss
@@ -0,0 +1,30 @@
+.announcements__item {
+  display: flex;
+  padding: 10px;
+  margin: 10px;
+  background: $simple-background-color;
+  color: $inverted-text-color;
+  box-shadow: 0 0 15px rgba(0,0,0,.2);
+  border-radius: 4px;
+  text-decoration: none;
+
+  &--clickable {
+    cursor: pointer;
+  }
+}
+
+.announcements__body {
+  flex: 1 1 auto;
+}
+
+.announcements__icon {
+  flex: 0 0 auto;
+  height: 40px;
+  width: 40px;
+  text-align: center;
+
+  > img {
+    max-width: 100%;
+    max-height: 100%;
+  }
+}
diff --git a/public/announcements.json b/public/announcements.json
new file mode 100644
index 00000000000000..518e8c93c34226
--- /dev/null
+++ b/public/announcements.json
@@ -0,0 +1,6 @@
+{
+  "emergency_20200411": {
+    "body": "⚠ 新型コロナウイルスに関する情報は政府など公的機関のWebページを参照してください。",
+    "href": "https://corona.go.jp/"
+  }
+}

From 0d87a2c9ac468dfed778c01515508bbb0fb02d4a Mon Sep 17 00:00:00 2001
From: highemerly <highemerly@me.com>
Date: Sat, 30 Nov 2019 16:11:55 +0900
Subject: [PATCH 04/19] =?UTF-8?q?[Change]=20.gitignore=E3=81=AB=E7=8B=AC?=
 =?UTF-8?q?=E8=87=AA=E9=96=A2=E9=80=A3=E6=A9=9F=E8=83=BD=E9=96=A2=E9=80=A3?=
 =?UTF-8?q?=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index b4d2712ffc5677..67323f8e2b5752 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,3 +65,7 @@ yarn-debug.log
 
 # Ignore Docker option files
 docker-compose.override.yml
+
+# Add by highemerly
+public/announcements.json
+public/server-info.html

From ebe716835bb6e64228a0dcd3d9ed968ea41b8460 Mon Sep 17 00:00:00 2001
From: highemerly <highemerly@me.com>
Date: Sun, 26 Jan 2020 15:45:28 +0900
Subject: [PATCH 05/19] =?UTF-8?q?[Fix]=20=E6=9C=AC=E5=AE=B6announcements?=
 =?UTF-8?q?=E3=81=AE=E5=B0=8E=E5=85=A5=E3=81=AB=E4=BC=B4=E3=81=86CSS?=
 =?UTF-8?q?=E3=81=AEclass=20name=E7=A9=BA=E9=96=93=E9=87=8D=E8=A4=87?=
 =?UTF-8?q?=E3=81=AB=E9=96=A2=E3=81=99=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 元々導入していたhotaさんのannouncements機能と，本家announcements機能において，CSSのみ競合が発生
- class名が両方とも「announcements」となっており重複していた
- 元々のannouncementsの方を「announcements2」に変更
---
 .../features/compose/components/announcements.js       | 10 +++++-----
 app/javascript/styles/mods/announcements.scss          |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/javascript/mastodon/features/compose/components/announcements.js b/app/javascript/mastodon/features/compose/components/announcements.js
index f9ab4eea2002c5..08d45ff181fd00 100644
--- a/app/javascript/mastodon/features/compose/components/announcements.js
+++ b/app/javascript/mastodon/features/compose/components/announcements.js
@@ -15,10 +15,10 @@ class Announcement extends React.PureComponent {
     const { item } = this.props;
 
     const contents = [];
-    contents.push(<div key='body' className='announcements__body'>{item.get('body')}</div>);
+    contents.push(<div key='body' className='announcements2__body'>{item.get('body')}</div>);
     if (item.get('icon')) {
       contents.push(
-        <div key='icon' className='announcements__icon'>
+        <div key='icon' className='announcements2__icon'>
           <img src={item.get('icon')} alt='' />
         </div>
       );
@@ -27,8 +27,8 @@ class Announcement extends React.PureComponent {
     const href = item.get('href');
 
     const classname = classnames({
-      'announcements__item': true,
-      'announcements__item--clickable': !!href,
+      'announcements2__item': true,
+      'announcements2__item--clickable': !!href,
     });
 
     if (!href) {
@@ -107,7 +107,7 @@ export default class Announcements extends React.PureComponent {
     const { items } = this.state;
 
     return (
-      <ul className='announcements'>
+      <ul className='announcements2'>
         {items.entrySeq().map(([key, item]) =>
           (<li key={key}>
             <Announcement item={item} />
diff --git a/app/javascript/styles/mods/announcements.scss b/app/javascript/styles/mods/announcements.scss
index 4482ca5f25b461..c51de50a49c251 100644
--- a/app/javascript/styles/mods/announcements.scss
+++ b/app/javascript/styles/mods/announcements.scss
@@ -1,4 +1,4 @@
-.announcements__item {
+.announcements2__item {
   display: flex;
   padding: 10px;
   margin: 10px;
@@ -13,11 +13,11 @@
   }
 }
 
-.announcements__body {
+.announcements2__body {
   flex: 1 1 auto;
 }
 
-.announcements__icon {
+.announcements2__icon {
   flex: 0 0 auto;
   height: 40px;
   width: 40px;

From 06ef07e9577358324a690bcc728fccd07bc67abd Mon Sep 17 00:00:00 2001
From: highemerly <highemerly@me.com>
Date: Sun, 26 Jan 2020 16:37:30 +0900
Subject: [PATCH 06/19] =?UTF-8?q?[Add]=20=E3=82=B5=E3=82=A4=E3=83=88?=
 =?UTF-8?q?=E3=83=86=E3=83=BC=E3=83=9E=E3=81=ABInstanceTicker=20type12=20(?=
 =?UTF-8?q?=E3=81=94=E3=81=BE=E5=91=B3)=20=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/javascript/styles/contrast-instance-ticker-type12.scss | 5 +++++
 app/javascript/styles/mastodon-instance-ticker-type12.scss | 3 +++
 .../styles/mastodon-light-instance-ticker-type12.scss      | 5 +++++
 app/javascript/styles/mods/instance-ticker.scss            | 6 ++++++
 config/initializers/content_security_policy.rb             | 7 +++++--
 config/locales/en.yml                                      | 3 +++
 config/locales/ja.yml                                      | 3 +++
 config/themes.yml                                          | 4 ++++
 8 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 app/javascript/styles/contrast-instance-ticker-type12.scss
 create mode 100644 app/javascript/styles/mastodon-instance-ticker-type12.scss
 create mode 100644 app/javascript/styles/mastodon-light-instance-ticker-type12.scss
 create mode 100644 app/javascript/styles/mods/instance-ticker.scss

diff --git a/app/javascript/styles/contrast-instance-ticker-type12.scss b/app/javascript/styles/contrast-instance-ticker-type12.scss
new file mode 100644
index 00000000000000..37feb3da84dc3d
--- /dev/null
+++ b/app/javascript/styles/contrast-instance-ticker-type12.scss
@@ -0,0 +1,5 @@
+@import 'contrast/variables';
+@import 'application';
+@import 'contrast/diff';
+@import 'mods/instance-ticker';
+@import url("https://miy.pw/css/12.css");
diff --git a/app/javascript/styles/mastodon-instance-ticker-type12.scss b/app/javascript/styles/mastodon-instance-ticker-type12.scss
new file mode 100644
index 00000000000000..9c9e47bba56ad2
--- /dev/null
+++ b/app/javascript/styles/mastodon-instance-ticker-type12.scss
@@ -0,0 +1,3 @@
+@import 'application';
+@import 'mods/instance-ticker';
+@import url("https://miy.pw/css/12.css");
diff --git a/app/javascript/styles/mastodon-light-instance-ticker-type12.scss b/app/javascript/styles/mastodon-light-instance-ticker-type12.scss
new file mode 100644
index 00000000000000..457995243a0858
--- /dev/null
+++ b/app/javascript/styles/mastodon-light-instance-ticker-type12.scss
@@ -0,0 +1,5 @@
+@import 'mastodon-light/variables';
+@import 'application';
+@import 'mastodon-light/diff';
+@import 'mods/instance-ticker';
+@import url("https://miy.pw/css/12.css");
diff --git a/app/javascript/styles/mods/instance-ticker.scss b/app/javascript/styles/mods/instance-ticker.scss
new file mode 100644
index 00000000000000..15bf676ec6ccdc
--- /dev/null
+++ b/app/javascript/styles/mods/instance-ticker.scss
@@ -0,0 +1,6 @@
+.status a[href^='https://handon.club/'] .display-name::after {
+    display: none !important ;
+}
+.status a[href^='https://dev.handon.club/'] .display-name::after {
+    display: none !important ;
+}
diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb
index b377b7b4d187c3..1f53a10236ae85 100644
--- a/config/initializers/content_security_policy.rb
+++ b/config/initializers/content_security_policy.rb
@@ -16,13 +16,16 @@ def host_to_url(str)
 media_host ||= host_to_url(ENV['S3_HOSTNAME']) if ENV['S3_ENABLED'] == 'true'
 media_host ||= assets_host
 
+instance_ticker_host     = 'https://miy.pw'
+instance_ticker_img_host = 'https://res.cloudinary.com'
+
 Rails.application.config.content_security_policy do |p|
   p.base_uri        :none
   p.default_src     :none
   p.frame_ancestors :none
   p.font_src        :self, assets_host
-  p.img_src         :self, :https, :data, :blob, assets_host
-  p.style_src       :self, assets_host
+  p.img_src         :self, :https, :data, :blob, assets_host, instance_ticker_img_host
+  p.style_src       :self, assets_host, instance_ticker_host
   p.media_src       :self, :https, :data, assets_host
   p.frame_src       :self, :https
   p.manifest_src    :self, assets_host
diff --git a/config/locales/en.yml b/config/locales/en.yml
index d8ad5bd84a5bae..f9bb7c5818828f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1372,6 +1372,9 @@ en:
       <p>Originally adapted from the <a href="https://github.com/discourse/discourse">Discourse privacy policy</a>.</p>
     title: "%{instance} Terms of Service and Privacy Policy"
   themes:
+    mastodon-instance-ticker-type12: Mastodon (Dark) with InstanceTicker
+    mastodon-light-instance-ticker-type12: Mastodon (Light) with InstanceTicker
+    contrast-instance-ticker-type12: Mastodon (High contrast) with InstanceTicker
     contrast: Mastodon (High contrast)
     default: Mastodon (Dark)
     mastodon-light: Mastodon (Light)
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 435c39c7240f04..2b716d749a6ca6 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1350,6 +1350,9 @@ ja:
       <p>オリジナルの出典: <a href="https://github.com/discourse/discourse">Discourse privacy policy</a></p>
     title: "%{instance} 利用規約・プライバシーポリシー"
   themes:
+    mastodon-instance-ticker-type12: Mastodon (ダーク) + InstanceTicker
+    mastodon-light-instance-ticker-type12: Mastodon (ライト) + InstanceTicker
+    contrast-instance-ticker-type12: Mastodon (ハイコントラスト) + InstanceTicker
     contrast: Mastodon (ハイコントラスト)
     default: Mastodon (ダーク)
     mastodon-light: Mastodon (ライト)
diff --git a/config/themes.yml b/config/themes.yml
index 9c21c9459f3bcf..3159893b29fc33 100644
--- a/config/themes.yml
+++ b/config/themes.yml
@@ -1,3 +1,7 @@
 default: styles/application.scss
 contrast: styles/contrast.scss
 mastodon-light: styles/mastodon-light.scss
+mastodon-instance-ticker-type12: styles/mastodon-instance-ticker-type12.scss
+contrast-instance-ticker-type12: styles/contrast-instance-ticker-type12.scss
+mastodon-light-instance-ticker-type12: styles/mastodon-light-instance-ticker-type12.scss
+

From 286e6710b83507d1e5986a5c3682e27290fbf2ee Mon Sep 17 00:00:00 2001
From: highemerly <highemerly@me.com>
Date: Tue, 28 Jan 2020 22:48:25 +0900
Subject: [PATCH 07/19] =?UTF-8?q?[Change]=20=E3=82=BF=E3=82=A4=E3=83=A0?=
 =?UTF-8?q?=E3=83=A9=E3=82=A4=E3=83=B3=E5=8F=96=E5=BE=97=E4=B8=8A=E9=99=90?=
 =?UTF-8?q?=E5=80=A4=E3=82=92400=E3=81=8B=E3=82=891200=E3=81=AB=E5=A4=89?=
 =?UTF-8?q?=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/lib/feed_manager.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index d5e435216a38a3..c509931669a6cf 100644
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@@ -7,7 +7,7 @@ class FeedManager
   include Redisable
 
   # Maximum number of items stored in a single feed
-  MAX_ITEMS = 400
+  MAX_ITEMS = 1200
 
   # Number of items in the feed since last reblog of status
   # before the new reblog will be inserted. Must be <= MAX_ITEMS

From b9d4ce7e701afbf5d4b04cea81fa2449abaead00 Mon Sep 17 00:00:00 2001
From: highemerly <highemerly@me.com>
Date: Tue, 28 Jan 2020 23:35:27 +0900
Subject: [PATCH 08/19] =?UTF-8?q?[Add]=20=E7=8B=AC=E8=87=AACSS=E3=82=92=20?=
 =?UTF-8?q?mods/handon.scss=20=E3=81=A8=E3=81=97=E3=81=A6=E7=B5=84?=
 =?UTF-8?q?=E3=81=BF=E8=BE=BC=E3=81=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/javascript/styles/application.scss |  1 +
 app/javascript/styles/mods/handon.scss | 28 ++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 app/javascript/styles/mods/handon.scss

diff --git a/app/javascript/styles/application.scss b/app/javascript/styles/application.scss
index 718d0d78f5b799..87fa0c5ed36abf 100644
--- a/app/javascript/styles/application.scss
+++ b/app/javascript/styles/application.scss
@@ -27,4 +27,5 @@
 @import 'mastodon/rtl';
 @import 'mastodon/accessibility';
 
+@import 'mods/handon';
 @import 'mods/announcements.scss'
diff --git a/app/javascript/styles/mods/handon.scss b/app/javascript/styles/mods/handon.scss
new file mode 100644
index 00000000000000..14e45357ba5f12
--- /dev/null
+++ b/app/javascript/styles/mods/handon.scss
@@ -0,0 +1,28 @@
+/**** visibility ****/
+/* Change visibility icon color (Followers-only)  */
+.status .fa-lock:before {
+  color: #fffacd !important ;
+}
+.detailed-status .fa-lock:before {
+  color: #fffacd !important ;
+}
+/* Change visibility icon color (Direct) */
+.detailed-status .fa-envelope::before {
+    color: #FD0 !important ;
+}
+/* Disable visibility icon when it is public */
+.status-public .fa-globe:before {
+  display: none !important ;
+}
+/**** misc ****/
+/* Change color of display-name who is belong to handon.club */
+.status a[href^="https://handon.club/"] .display-name {
+  color:#ff6347 !important ;
+}
+/* Enlarge custom emojis */
+p > .emojione[alt^=":"]:only-child {
+  width: 2.5em; height: 2.5em; margin: 0;
+}
+p > .emojione[alt^=":"]:active {
+  width: 7em; height: 7em; margin: 0;
+}

From bf9aaf483c5963d6c511598a548b018af241913d Mon Sep 17 00:00:00 2001
From: highemerly <highemerly@me.com>
Date: Sun, 16 Feb 2020 19:40:21 +0900
Subject: [PATCH 09/19] =?UTF-8?q?[Change]=20=E3=82=A2=E3=82=AB=E3=82=A6?=
 =?UTF-8?q?=E3=83=B3=E3=83=88=E7=99=BB=E9=8C=B2=E7=94=B3=E8=AB=8B=E7=90=86?=
 =?UTF-8?q?=E7=94=B1=E3=81=AB=E9=96=A2=E3=81=99=E3=82=8B=E8=A1=A8=E7=8F=BE?=
 =?UTF-8?q?=E3=82=92=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/locales/simple_form.en.yml | 2 +-
 config/locales/simple_form.ja.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index c4388ffc529152..76e93a10e3744c 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -70,7 +70,7 @@ en:
       imports:
         data: CSV file exported from another Mastodon server
       invite_request:
-        text: This will help us review your application
+        text: This will help us review your application. Please include a information of the reason why you know handon.club. If this is null, we will NOT accepet your request
       ip_block:
         comment: Optional. Remember why you added this rule.
         expires_in: IP addresses are a finite resource, they are sometimes shared and often change hands. For this reason, indefinite IP blocks are not recommended.
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index a4e5a2984e5bfb..7fb69989f889bc 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -70,7 +70,7 @@ ja:
       imports:
         data: 他の Mastodon サーバーからエクスポートしたCSVファイルを選択して下さい
       invite_request:
-        text: このサーバーは現在承認制です。申請を承認する際に役立つメッセージを添えてください
+        text: このサーバーは現在承認制です。申請を承認する際に役立つメッセージを添えてください。その際，このサーバをどこで知ったかという情報を含めて頂くと，承認できる可能性が高くなります。この欄が空欄の場合は承認しません
       ip_block:
         comment: オプションです。このルールを追加した理由の覚え書きにご利用ください。
         expires_in: IPアドレスは有限のリソースです。複数人で共有されたり変更されることもあります。そのため無期限にIPアドレスをブロックするのは推奨されません。

From 1654e7295060b9cfe6206a6e237f79b504baddbb Mon Sep 17 00:00:00 2001
From: highemerly <highemerly@me.com>
Date: Sun, 5 Apr 2020 23:38:11 +0900
Subject: [PATCH 10/19] =?UTF-8?q?[Change]=20=E3=83=88=E3=83=AC=E3=83=B3?=
 =?UTF-8?q?=E3=83=89=E3=82=BF=E3=82=B0=E3=81=AE=E9=81=B8=E5=87=BA=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E3=82=92=E7=B7=A9=E3=81=8F=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- ユニークユーザ5人以上で選出されるものを2人以上で選出されるよう変更
---
 app/models/trending_tags.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/trending_tags.rb b/app/models/trending_tags.rb
index 31890b0824616d..bb4a437aabaf52 100644
--- a/app/models/trending_tags.rb
+++ b/app/models/trending_tags.rb
@@ -4,7 +4,7 @@ class TrendingTags
   KEY                  = 'trending_tags'
   EXPIRE_HISTORY_AFTER = 7.days.seconds
   EXPIRE_TRENDS_AFTER  = 1.day.seconds
-  THRESHOLD            = 5
+  THRESHOLD            = 2 
   LIMIT                = 10
   REVIEW_THRESHOLD     = 3
   MAX_SCORE_COOLDOWN   = 2.days.freeze

From 6af343f26893f91b303b35c3a0054911fb33b3ce Mon Sep 17 00:00:00 2001
From: highemerly <high.emerly.ytfin@gmail.com>
Date: Sun, 9 May 2021 01:40:28 +0900
Subject: [PATCH 11/19] =?UTF-8?q?=E3=83=97=E3=83=AD=E3=83=95=E3=82=A3?=
 =?UTF-8?q?=E3=83=BC=E3=83=AB=E7=B5=B5=E6=96=87=E5=AD=97=E3=82=92=E8=BF=BD?=
 =?UTF-8?q?=E5=8A=A0=20(best-friends/mastodon)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- カスタム絵文字としてユーザのアイコンが使える機能
- 対象はトゥート，投票の選択肢，お知らせ，アカウントプロフィール欄
- 自サーバの人が他サーバのアカウントのプロフィール絵文字を使うことはできる
- 他サーバの人がプロフィール絵文字を使うことはできない

Conflicts:
	app/models/account.rb
---
 app/javascript/mastodon/actions/compose.js    |  9 ++-
 app/lib/entity_cache.rb                       |  2 +
 app/lib/friends/profile_emoji.rb              | 10 +++
 .../profile_emoji/account_extension.rb        | 21 +++++++
 .../profile_emoji/announcements_extension.rb  | 13 ++++
 app/lib/friends/profile_emoji/emoji.rb        | 62 +++++++++++++++++++
 .../profile_emoji/entity_cache_extension.rb   | 15 +++++
 .../friends/profile_emoji/poll_extension.rb   | 11 ++++
 .../profile_emoji/serializer_extension.rb     | 11 ++++
 .../friends/profile_emoji/status_extension.rb | 16 +++++
 app/models/account.rb                         |  6 +-
 app/models/announcement.rb                    |  4 +-
 app/models/poll.rb                            |  4 +-
 app/models/status.rb                          |  4 +-
 app/serializers/rest/account_serializer.rb    |  2 +
 .../rest/announcement_serializer.rb           |  2 +
 app/serializers/rest/poll_serializer.rb       |  2 +
 app/serializers/rest/status_serializer.rb     |  2 +
 config/initializers/customize.rb              |  1 +
 19 files changed, 191 insertions(+), 6 deletions(-)
 create mode 100644 app/lib/friends/profile_emoji.rb
 create mode 100644 app/lib/friends/profile_emoji/account_extension.rb
 create mode 100644 app/lib/friends/profile_emoji/announcements_extension.rb
 create mode 100644 app/lib/friends/profile_emoji/emoji.rb
 create mode 100644 app/lib/friends/profile_emoji/entity_cache_extension.rb
 create mode 100644 app/lib/friends/profile_emoji/poll_extension.rb
 create mode 100644 app/lib/friends/profile_emoji/serializer_extension.rb
 create mode 100644 app/lib/friends/profile_emoji/status_extension.rb
 create mode 100644 config/initializers/customize.rb

diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js
index 891403969e2f1d..5bf70e5324f4c6 100644
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@@ -451,7 +451,11 @@ export function fetchComposeSuggestions(token) {
   return (dispatch, getState) => {
     switch (token[0]) {
     case ':':
-      fetchComposeSuggestionsEmojis(dispatch, getState, token);
+      if (token[1] == '@') {
+        fetchComposeSuggestionsAccounts(dispatch, getState, token.substr(1, token.length));
+      } else {
+        fetchComposeSuggestionsEmojis(dispatch, getState, token);
+      }
       break;
     case '#':
       fetchComposeSuggestionsTags(dispatch, getState, token);
@@ -500,6 +504,9 @@ export function selectComposeSuggestion(position, token, suggestion, path) {
     } else if (suggestion.type === 'account') {
       completion    = getState().getIn(['accounts', suggestion.id, 'acct']);
       startPosition = position;
+      if (token[0] == ':') {
+        completion = `@${completion}:`;
+      }
     }
 
     dispatch({
diff --git a/app/lib/entity_cache.rb b/app/lib/entity_cache.rb
index 80b0046eeaf9ed..212bcf05039f84 100644
--- a/app/lib/entity_cache.rb
+++ b/app/lib/entity_cache.rb
@@ -37,4 +37,6 @@ def emoji(shortcodes, domain)
   def to_key(type, *ids)
     "#{type}:#{ids.compact.map(&:downcase).join(':')}"
   end
+
+  include Friends::ProfileEmoji::EntityCacheExtension
 end
diff --git a/app/lib/friends/profile_emoji.rb b/app/lib/friends/profile_emoji.rb
new file mode 100644
index 00000000000000..e78fac7295db8a
--- /dev/null
+++ b/app/lib/friends/profile_emoji.rb
@@ -0,0 +1,10 @@
+require 'friends/profile_emoji/emoji'
+require 'friends/profile_emoji/account_extension'
+require 'friends/profile_emoji/status_extension'
+require 'friends/profile_emoji/serializer_extension'
+require 'friends/profile_emoji/entity_cache_extension'
+require 'friends/profile_emoji/announcements_extension'
+
+module Friends
+  module ProfileEmoji ; end
+end
diff --git a/app/lib/friends/profile_emoji/account_extension.rb b/app/lib/friends/profile_emoji/account_extension.rb
new file mode 100644
index 00000000000000..3534c87a69f232
--- /dev/null
+++ b/app/lib/friends/profile_emoji/account_extension.rb
@@ -0,0 +1,21 @@
+module Friends
+  module ProfileEmoji
+    module AccountExtension
+      extend ActiveSupport::Concern
+
+      included do
+        after_commit :clear_avatar_cache
+      end
+
+      def profile_emojis
+        @profile_emojis ||= Friends::ProfileEmoji::Emoji.from_text(emojifiable_text, domain)
+      end
+
+      private
+
+      def clear_avatar_cache
+        EntityCache.instance.clear_avatar(username, domain)
+      end
+    end
+  end
+end
diff --git a/app/lib/friends/profile_emoji/announcements_extension.rb b/app/lib/friends/profile_emoji/announcements_extension.rb
new file mode 100644
index 00000000000000..b59a2949575cfb
--- /dev/null
+++ b/app/lib/friends/profile_emoji/announcements_extension.rb
@@ -0,0 +1,13 @@
+module Friends
+  module ProfileEmoji
+    module AnnouncementsExtension
+      extend ActiveSupport::Concern
+
+      def profile_emojis
+        return @profile_emojis if defined?(@profile_emojis)
+
+        @profile_emojis = Friends::ProfileEmoji::Emoji.from_text(text, nil)
+      end
+    end
+  end
+end
diff --git a/app/lib/friends/profile_emoji/emoji.rb b/app/lib/friends/profile_emoji/emoji.rb
new file mode 100644
index 00000000000000..59669af453608f
--- /dev/null
+++ b/app/lib/friends/profile_emoji/emoji.rb
@@ -0,0 +1,62 @@
+module Friends
+  module ProfileEmoji
+    class FalsyLoaded
+      def loaded?
+        false
+      end
+    end
+    class Emoji < ActiveModelSerializers::Model
+      SHORTCODE_RE_FRAGMENT = /@(#{Account::USERNAME_RE})(?:@([a-z0-9\.\-]+[a-z0-9]+))?/i
+
+      SCAN_RE = /(:#{SHORTCODE_RE_FRAGMENT}:)/x        
+      attributes :account, :shortcode
+
+      Image = Struct.new(:source) do
+        def url(type = :original)
+          type = :original unless source.content_type == 'image/gif'
+          source.url(type)
+        end
+      end
+
+      def serializer_class
+        REST::CustomEmojiSerializer
+      end
+
+      def image
+        @image ||= Image.new(account.avatar)
+      end
+
+      def visible_in_picker
+        false
+      end
+
+      def has_attribute?(attr)
+        true
+      end
+
+      def account_id
+        account.id
+      end
+
+      def association(*_args)
+        FalsyLoaded.new
+      end
+      
+      class << self
+        def from_text(text, domain)
+          return [] if text.blank?
+
+          shortcodes = text.scan(SCAN_RE).uniq
+
+          return [] if shortcodes.empty?
+
+          shortcodes.map { |shortcode, username, _, server|
+            server ||= domain
+            server = nil if server == Rails.configuration.x.local_domain
+            [EntityCache.instance.avatar(username, server), shortcode[1..-2]]
+          }.map { |account, shortcode| account ? new(account: account, shortcode: shortcode) : nil }.compact
+        end
+      end
+    end
+  end
+end
diff --git a/app/lib/friends/profile_emoji/entity_cache_extension.rb b/app/lib/friends/profile_emoji/entity_cache_extension.rb
new file mode 100644
index 00000000000000..cc762792096005
--- /dev/null
+++ b/app/lib/friends/profile_emoji/entity_cache_extension.rb
@@ -0,0 +1,15 @@
+module Friends
+  module ProfileEmoji
+    module EntityCacheExtension
+      extend ActiveSupport::Concern
+
+      def avatar(username, domain)
+        Rails.cache.fetch(to_key(:avatar, username, domain), expires_in: EntityCache::MAX_EXPIRATION) { Account.select(:id, :username, :domain, :avatar_file_name, :avatar_storage_schema_version).find_remote(username, domain) }
+      end
+
+      def clear_avatar(username, domain)
+        Rails.cache.delete(to_key(:avatar, username, domain))
+      end
+    end
+  end
+end
diff --git a/app/lib/friends/profile_emoji/poll_extension.rb b/app/lib/friends/profile_emoji/poll_extension.rb
new file mode 100644
index 00000000000000..792c9cf5bd4cc8
--- /dev/null
+++ b/app/lib/friends/profile_emoji/poll_extension.rb
@@ -0,0 +1,11 @@
+module Friends
+  module ProfileEmoji
+    module PollExtension
+      extend ActiveSupport::Concern
+
+      def profile_emojis
+        @profile_emojis ||= Friends::ProfileEmoji::Emoji.from_text(options.join(' '), account.domain)
+      end
+    end
+  end
+end
diff --git a/app/lib/friends/profile_emoji/serializer_extension.rb b/app/lib/friends/profile_emoji/serializer_extension.rb
new file mode 100644
index 00000000000000..d958624256d5a1
--- /dev/null
+++ b/app/lib/friends/profile_emoji/serializer_extension.rb
@@ -0,0 +1,11 @@
+module Friends
+  module ProfileEmoji
+    module SerializerExtension
+      extend ActiveSupport::Concern
+
+      included do
+        has_many :profile_emojis, serializer: REST::CustomEmojiSerializer
+      end
+    end
+  end
+end
diff --git a/app/lib/friends/profile_emoji/status_extension.rb b/app/lib/friends/profile_emoji/status_extension.rb
new file mode 100644
index 00000000000000..e3e73908242f80
--- /dev/null
+++ b/app/lib/friends/profile_emoji/status_extension.rb
@@ -0,0 +1,16 @@
+module Friends
+  module ProfileEmoji
+    module StatusExtension
+      extend ActiveSupport::Concern
+
+      def profile_emojis
+        return @profile_emojis if defined?(@profile_emojis)
+
+        fields = [spoiler_text, text]
+        fields += preloadable_poll.options unless preloadable_poll.nil?
+
+        @profile_emojis = Friends::ProfileEmoji::Emoji.from_text(fields.join(' '), account.domain)
+      end
+    end
+  end
+end
diff --git a/app/models/account.rb b/app/models/account.rb
index 2c5455d8e57f4c..f94cbc8dd4f3d0 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -59,7 +59,7 @@ class Account < ApplicationRecord
   )
 
   USERNAME_RE = /[a-z0-9_]+([a-z0-9_\.-]+[a-z0-9_]+)?/i
-  MENTION_RE  = /(?<=^|[^\/[:word:]])@((#{USERNAME_RE})(?:@[[:word:]\.\-]+[a-z0-9]+)?)/i
+  MENTION_RE  = /(?<=^|[^\/[:word:]:])@((#{USERNAME_RE})(?:@[[:word:]\.\-]+[a-z0-9]+)?)/i
 
   include AccountAssociations
   include AccountAvatar
@@ -526,7 +526,7 @@ def generate_query_for_search(terms)
   end
 
   def emojis
-    @emojis ||= CustomEmoji.from_text(emojifiable_text, domain)
+    @emojis ||= CustomEmoji.from_text(emojifiable_text, domain) + profile_emojis
   end
 
   before_create :generate_keys
@@ -578,4 +578,6 @@ def destroy_canonical_email_block!
 
     CanonicalEmailBlock.where(reference_account: self).delete_all
   end
+
+  include Friends::ProfileEmoji::AccountExtension
 end
diff --git a/app/models/announcement.rb b/app/models/announcement.rb
index f8183aabce4767..5c7bf14a1388c5 100644
--- a/app/models/announcement.rb
+++ b/app/models/announcement.rb
@@ -65,7 +65,7 @@ def tags
   end
 
   def emojis
-    @emojis ||= CustomEmoji.from_text(text)
+    @emojis ||= CustomEmoji.from_text(text) + profile_emojis
   end
 
   def reactions(account = nil)
@@ -95,4 +95,6 @@ def set_published
     self.published = true
     self.published_at = Time.now.utc
   end
+
+  include Friends::ProfileEmoji::AnnouncementsExtension
 end
diff --git a/app/models/poll.rb b/app/models/poll.rb
index d2a17277b2b1ed..9e201a510e1003 100644
--- a/app/models/poll.rb
+++ b/app/models/poll.rb
@@ -66,7 +66,7 @@ def remote?
   end
 
   def emojis
-    @emojis ||= CustomEmoji.from_text(options.join(' '), account.domain)
+    @emojis ||= CustomEmoji.from_text(options.join(' '), account.domain) + profile_emojis
   end
 
   class Option < ActiveModelSerializers::Model
@@ -112,4 +112,6 @@ def time_passed_since_last_fetch?
   def show_totals_now?
     expired? || !hide_totals?
   end
+
+  include Friends::ProfileEmoji::PollExtension
 end
diff --git a/app/models/status.rb b/app/models/status.rb
index 847921ac233dfb..592e24fcc8f966 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -229,7 +229,7 @@ def emojis
     fields  = [spoiler_text, text]
     fields += preloadable_poll.options unless preloadable_poll.nil?
 
-    @emojis = CustomEmoji.from_text(fields.join(' '), account.domain)
+    @emojis = CustomEmoji.from_text(fields.join(' '), account.domain) + profile_emojis
   end
 
   def replies_count
@@ -443,4 +443,6 @@ def unlink_from_conversations
       AccountConversation.remove_status(inbox_owner, self)
     end
   end
+
+  include Friends::ProfileEmoji::StatusExtension
 end
diff --git a/app/serializers/rest/account_serializer.rb b/app/serializers/rest/account_serializer.rb
index a78ec45073ada2..552bbcb7e8a2ed 100644
--- a/app/serializers/rest/account_serializer.rb
+++ b/app/serializers/rest/account_serializer.rb
@@ -100,4 +100,6 @@ def suspended
   def moved_and_not_nested?
     object.moved? && object.moved_to_account.moved_to_account_id.nil?
   end
+  
+  include Friends::ProfileEmoji::SerializerExtension
 end
diff --git a/app/serializers/rest/announcement_serializer.rb b/app/serializers/rest/announcement_serializer.rb
index 9343b97d223077..f46fe20dd1bb02 100644
--- a/app/serializers/rest/announcement_serializer.rb
+++ b/app/serializers/rest/announcement_serializer.rb
@@ -59,4 +59,6 @@ def url
       ActivityPub::TagManager.instance.url_for(object)
     end
   end
+
+  include Friends::ProfileEmoji::SerializerExtension
 end
diff --git a/app/serializers/rest/poll_serializer.rb b/app/serializers/rest/poll_serializer.rb
index df6ebd0d44676c..39cbcfce2d592d 100644
--- a/app/serializers/rest/poll_serializer.rb
+++ b/app/serializers/rest/poll_serializer.rb
@@ -33,4 +33,6 @@ def current_user?
   class OptionSerializer < ActiveModel::Serializer
     attributes :title, :votes_count
   end
+
+  include Friends::ProfileEmoji::SerializerExtension
 end
diff --git a/app/serializers/rest/status_serializer.rb b/app/serializers/rest/status_serializer.rb
index bb6df90b7a61f5..6097782cdca8ad 100644
--- a/app/serializers/rest/status_serializer.rb
+++ b/app/serializers/rest/status_serializer.rb
@@ -166,4 +166,6 @@ def url
       tag_url(object)
     end
   end
+
+  include Friends::ProfileEmoji::SerializerExtension
 end
diff --git a/config/initializers/customize.rb b/config/initializers/customize.rb
new file mode 100644
index 00000000000000..20797586179a16
--- /dev/null
+++ b/config/initializers/customize.rb
@@ -0,0 +1 @@
+require 'friends/profile_emoji'

From a1c0217efc0052d49efc32bf3f416aa4d5857587 Mon Sep 17 00:00:00 2001
From: highemerly <high.emerly.ytfin@gmail.com>
Date: Tue, 3 Nov 2020 20:21:06 +0900
Subject: [PATCH 12/19] =?UTF-8?q?[Add]=20=E3=82=AB=E3=82=B9=E3=82=BF?=
 =?UTF-8?q?=E3=83=A0=E7=B5=B5=E6=96=87=E5=AD=97=E3=81=AE=E3=81=BF=E3=81=AE?=
 =?UTF-8?q?=E6=8A=95=E7=A8=BF=E3=82=92=E3=82=B9=E3=82=BF=E3=83=B3=E3=83=97?=
 =?UTF-8?q?=E3=81=AE=E3=82=88=E3=81=86=E3=81=AB=E6=8B=A1=E5=A4=A7=E8=A1=A8?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 投稿に，文字の投稿が含まれず，かつカスタム絵文字が1つだけの場合に特大表示(7em)する
- それに伴ってカスタム絵文字が段落に1つしか含まれない場合にちょっと大きく表示(4em)する機能は削除
---
 app/javascript/mastodon/features/emoji/emoji.js | 15 +++++++++++++--
 app/javascript/styles/mods/handon.scss          |  8 +++++---
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/app/javascript/mastodon/features/emoji/emoji.js b/app/javascript/mastodon/features/emoji/emoji.js
index fb1a3804c52718..7adfc736c033e2 100644
--- a/app/javascript/mastodon/features/emoji/emoji.js
+++ b/app/javascript/mastodon/features/emoji/emoji.js
@@ -23,9 +23,11 @@ const emojify = (str, customEmojis = {}) => {
   const tagCharsWithoutEmojis = '<&';
   const tagCharsWithEmojis = Object.keys(customEmojis).length ? '<&:' : '<&';
   let rtn = '', tagChars = tagCharsWithEmojis, invisible = 0;
+  let contentNaturalFlag, contentEmojiFlag = false;
   for (;;) {
     let match, i = 0, tag;
     while (i < str.length && (tag = tagChars.indexOf(str[i])) === -1 && (invisible || !(match = trie.search(str.slice(i))))) {
+      contentNaturalFlag = true;
       i += str.codePointAt(i) < 65536 ? 1 : 2;
     }
     let rend, replacement = '';
@@ -42,7 +44,9 @@ const emojify = (str, customEmojis = {}) => {
         // if you want additional emoji handler, add statements below which set replacement and return true.
         if (shortname in customEmojis) {
           const filename = autoPlayGif ? customEmojis[shortname].url : customEmojis[shortname].static_url;
-          replacement = `<img draggable="false" class="emojione custom-emoji" alt="${shortname}" title="${shortname}" src="${filename}" data-original="${customEmojis[shortname].url}" data-static="${customEmojis[shortname].static_url}" />`;
+          const classname = contentEmojiFlag ? 'emojione custom-emoji' : 'emojione handon-emojione-first custom-emoji';
+          contentEmojiFlag = true;
+          replacement = `<img draggable="false" class="${classname}" alt="${shortname}" title="${shortname}" src="${filename}" data-original="${customEmojis[shortname].url}" data-static="${customEmojis[shortname].static_url}" />`;
           return true;
         }
         return false;
@@ -73,7 +77,9 @@ const emojify = (str, customEmojis = {}) => {
     } else { // matched to unicode emoji
       const { filename, shortCode } = unicodeMapping[match];
       const title = shortCode ? `:${shortCode}:` : '';
-      replacement = `<img draggable="false" class="emojione" alt="${match}" title="${title}" src="${assetHost}/emoji/${emojiFilename(filename)}.svg" />`;
+      const classname = contentEmojiFlag ? 'emojione' : 'emojione handon-emojione-first';
+      contentEmojiFlag = true;
+      replacement = `<img draggable="false" class="${classname}" alt="${match}" title="${title}" src="${assetHost}/emoji/${emojiFilename(filename)}.svg" />`;
       rend = i + match.length;
       // If the matched character was followed by VS15 (for selecting text presentation), skip it.
       if (str.codePointAt(rend) === 65038) {
@@ -83,6 +89,11 @@ const emojify = (str, customEmojis = {}) => {
     rtn += str.slice(0, i) + replacement;
     str = str.slice(rend);
   }
+
+  //add stamp feature for emoji
+  if (!contentNaturalFlag) {
+    return '<span class="handon-emoji-only-content">' + rtn + str + '</span>';
+  }
   return rtn + str;
 };
 
diff --git a/app/javascript/styles/mods/handon.scss b/app/javascript/styles/mods/handon.scss
index 14e45357ba5f12..b48b18f8344b06 100644
--- a/app/javascript/styles/mods/handon.scss
+++ b/app/javascript/styles/mods/handon.scss
@@ -20,9 +20,11 @@
   color:#ff6347 !important ;
 }
 /* Enlarge custom emojis */
-p > .emojione[alt^=":"]:only-child {
-  width: 2.5em; height: 2.5em; margin: 0;
-}
 p > .emojione[alt^=":"]:active {
   width: 7em; height: 7em; margin: 0;
 }
+
+/* Stamp feature for emojis */
+span.handon-emoji-only-content > p:only-child > .handon-emojione-first[alt^=":"] {
+  width: 7em; height: 7em; margin: 0;
+}

From 36420c01408f88cfb7dbb101f5435c8a7b3bf286 Mon Sep 17 00:00:00 2001
From: highemerly <high.emerly.ytfin@gmail.com>
Date: Tue, 3 Nov 2020 20:27:30 +0900
Subject: [PATCH 13/19] =?UTF-8?q?[Fix]=20=E9=80=9A=E7=9F=A5=E3=82=AB?=
 =?UTF-8?q?=E3=83=A9=E3=83=A0=E3=81=A7DM=E3=83=9E=E3=83=BC=E3=82=AF?=
 =?UTF-8?q?=E3=81=AE=E8=89=B2=E3=81=8C=E5=A4=89=E3=82=8F=E3=82=89=E3=81=AA?=
 =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=9F=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/javascript/styles/mods/handon.scss | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/javascript/styles/mods/handon.scss b/app/javascript/styles/mods/handon.scss
index b48b18f8344b06..ec81a813125577 100644
--- a/app/javascript/styles/mods/handon.scss
+++ b/app/javascript/styles/mods/handon.scss
@@ -7,8 +7,11 @@
   color: #fffacd !important ;
 }
 /* Change visibility icon color (Direct) */
+.status .fa-envelope::before {
+  color: #FD0 !important ;
+}
 .detailed-status .fa-envelope::before {
-    color: #FD0 !important ;
+  color: #FD0 !important ;
 }
 /* Disable visibility icon when it is public */
 .status-public .fa-globe:before {

From a8b3c6d8a8b0ad3fb41d6562db2634183c8baa26 Mon Sep 17 00:00:00 2001
From: highemerly <high.emerly.ytfin@gmail.com>
Date: Tue, 3 Nov 2020 20:40:31 +0900
Subject: [PATCH 14/19] =?UTF-8?q?[Fix]=20InstanceTicker=E3=82=92=E6=9C=89?=
 =?UTF-8?q?=E5=8A=B9=E3=81=AB=E3=81=97=E3=81=A6=E3=82=82=E8=87=AA=E3=82=A4?=
 =?UTF-8?q?=E3=83=B3=E3=82=B9=E3=82=BF=E3=83=B3=E3=82=B9=E3=81=A7=E3=81=AF?=
 =?UTF-8?q?=E3=83=86=E3=82=A3=E3=83=83=E3=82=AB=E3=83=BC=E3=82=92=E8=A1=A8?=
 =?UTF-8?q?=E7=A4=BA=E3=81=97=E3=81=AA=E3=81=84=E8=A8=AD=E5=AE=9A=E3=82=92?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E6=AC=84=E3=81=AB=E3=82=82=E9=81=A9=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- InstanceTickerを有効にするテーマの場合，はんドンクラブのティッカーは非表示にしていた
- これまでは適用範囲がHTL/FTL/LTLのみだったが，今回それに加えてnotificationも追加した
---
 app/javascript/styles/mods/instance-ticker.scss | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/javascript/styles/mods/instance-ticker.scss b/app/javascript/styles/mods/instance-ticker.scss
index 15bf676ec6ccdc..b69dc6b1a48205 100644
--- a/app/javascript/styles/mods/instance-ticker.scss
+++ b/app/javascript/styles/mods/instance-ticker.scss
@@ -4,3 +4,9 @@
 .status a[href^='https://dev.handon.club/'] .display-name::after {
     display: none !important ;
 }
+.notification a[href^='https://handon.club/'].notification__display-name::after {
+    display: none !important ;
+}
+.notification a[href^='https://dev.handon.club/'].notification__display-name::after {
+    display: none !important ;
+}

From e5de73c3cfab9b859441266ddb523895b6678b25 Mon Sep 17 00:00:00 2001
From: highemerly <high.emerly.ytfin@gmail.com>
Date: Sun, 9 May 2021 01:41:53 +0900
Subject: [PATCH 15/19] =?UTF-8?q?[Add]=20HTL=E4=B8=8A=E3=81=ABDM=E3=82=92?=
 =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=97=E3=81=AA=E3=81=84=E3=82=AA=E3=83=97?=
 =?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=B3=E3=82=92=E8=BF=BD=E5=8A=A0=EF=BC=88?=
 =?UTF-8?q?=E3=81=8B=E3=81=A4=E3=83=87=E3=83=95=E3=82=A9=E3=83=AB=E3=83=88?=
 =?UTF-8?q?=E3=81=AB=E8=A8=AD=E5=AE=9A=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 3.3.0からHTL上にDMを表示するようになった
- きもちわるいので3.2.x以前の表示に戻すオプションをつくり，かつそれを初期値に設定した

Conflicts:
	config/locales/simple_form.en.yml
---
 app/controllers/settings/preferences_controller.rb  | 1 +
 app/lib/feed_manager.rb                             | 5 ++++-
 app/lib/user_settings_decorator.rb                  | 5 +++++
 app/models/user.rb                                  | 6 +++++-
 app/serializers/initial_state_serializer.rb         | 1 +
 app/services/fan_out_on_write_service.rb            | 5 +++--
 app/views/settings/preferences/other/show.html.haml | 3 +++
 config/locales/simple_form.en.yml                   | 2 ++
 config/locales/simple_form.ja.yml                   | 2 ++
 config/settings.yml                                 | 1 +
 10 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb
index 32b5d79487b741..ca02c0932b3dda 100644
--- a/app/controllers/settings/preferences_controller.rb
+++ b/app/controllers/settings/preferences_controller.rb
@@ -53,6 +53,7 @@ def user_settings_params
       :setting_advanced_layout,
       :setting_use_blurhash,
       :setting_use_pending_items,
+      :setting_hidden_direct,
       :setting_trends,
       :setting_crop_images,
       notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account trending_tag),
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index c509931669a6cf..de81f1e2506030 100644
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@@ -55,6 +55,7 @@ def filter?(timeline_type, status, receiver)
   # @param [Status] status
   # @return [Boolean]
   def push_to_home(account, status)
+    return false if (status.direct_visibility? || status.limited_visibility?) && account.user&.hidden_direct?
     return false unless add_to_feed(:home, account.id, status, account.user&.aggregates_reblogs?)
 
     trim(:home, account.id)
@@ -230,9 +231,11 @@ def clear_from_lists(account, target_account)
   def populate_home(account)
     limit        = FeedManager::MAX_ITEMS / 2
     aggregate    = account.user&.aggregates_reblogs?
+    need_direct  = !(account.user&.hidden_direct?)
     timeline_key = key(:home, account.id)
 
-    account.statuses.limit(limit).each do |status|
+    tmp_timeline = need_direct ? account.statuses : account.statuses.where.not(visibility: :direct)
+    tmp_timeline.limit(limit).each do |status|
       add_to_feed(:home, account.id, status, aggregate)
     end
 
diff --git a/app/lib/user_settings_decorator.rb b/app/lib/user_settings_decorator.rb
index e37bc6d9f11437..e0c213e23ab0fa 100644
--- a/app/lib/user_settings_decorator.rb
+++ b/app/lib/user_settings_decorator.rb
@@ -37,6 +37,7 @@ def process_update
     user.settings['advanced_layout']     = advanced_layout_preference if change?('setting_advanced_layout')
     user.settings['use_blurhash']        = use_blurhash_preference if change?('setting_use_blurhash')
     user.settings['use_pending_items']   = use_pending_items_preference if change?('setting_use_pending_items')
+    user.settings['hidden_direct']       = hidden_direct_preference if change?('setting_hidden_direct')
     user.settings['trends']              = trends_preference if change?('setting_trends')
     user.settings['crop_images']         = crop_images_preference if change?('setting_crop_images')
   end
@@ -129,6 +130,10 @@ def use_pending_items_preference
     boolean_cast_setting 'setting_use_pending_items'
   end
 
+  def hidden_direct_preference
+    boolean_cast_setting 'setting_hidden_direct'
+  end
+
   def trends_preference
     boolean_cast_setting 'setting_trends'
   end
diff --git a/app/models/user.rb b/app/models/user.rb
index 4973c68b61bd0b..4d46c1b03f66c7 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -123,7 +123,7 @@ class User < ApplicationRecord
   delegate :auto_play_gif, :default_sensitive, :unfollow_modal, :boost_modal, :delete_modal,
            :reduce_motion, :system_font_ui, :noindex, :theme, :display_media, :hide_network,
            :expand_spoilers, :default_language, :aggregate_reblogs, :show_application,
-           :advanced_layout, :use_blurhash, :use_pending_items, :trends, :crop_images,
+           :advanced_layout, :use_blurhash, :use_pending_items, :hidden_direct, :trends, :crop_images,
            :disable_swiping,
            to: :settings, prefix: :setting, allow_nil: false
 
@@ -272,6 +272,10 @@ def aggregates_reblogs?
     @aggregates_reblogs ||= settings.aggregate_reblogs
   end
 
+  def hidden_direct?
+    settings.hidden_direct
+  end
+
   def shows_application?
     @shows_application ||= settings.show_application
   end
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb
index 70263e0c5768c2..69f3dd0649aaf6 100644
--- a/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@@ -38,6 +38,7 @@ def meta
       store[:use_blurhash]      = object.current_account.user.setting_use_blurhash
       store[:use_pending_items] = object.current_account.user.setting_use_pending_items
       store[:is_staff]          = object.current_account.user.staff?
+      store[:hidden_direct]     = object.current_account.user.setting_hidden_direct
       store[:trends]            = Setting.trends && object.current_account.user.setting_trends
       store[:crop_images]       = object.current_account.user.setting_crop_images
     else
diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb
index b72bb82d3faea4..f7db27a88f5b05 100644
--- a/app/services/fan_out_on_write_service.rb
+++ b/app/services/fan_out_on_write_service.rb
@@ -6,14 +6,15 @@ class FanOutOnWriteService < BaseService
   def call(status)
     raise Mastodon::RaceConditionError if status.visibility.nil?
 
-    deliver_to_self(status) if status.account.local?
-
     if status.direct_visibility?
+      deliver_to_self(status) if status.account.local? && !(status.account.user&.hidden_direct?)
       deliver_to_mentioned_followers(status)
       deliver_to_own_conversation(status)
     elsif status.limited_visibility?
+      deliver_to_self(status) if status.account.local? && !(status.account.user&.hidden_direct?)
       deliver_to_mentioned_followers(status)
     else
+      deliver_to_self(status) if status.account.local?
       deliver_to_followers(status)
       deliver_to_lists(status)
     end
diff --git a/app/views/settings/preferences/other/show.html.haml b/app/views/settings/preferences/other/show.html.haml
index 539a700561e61d..9de6a93c66b014 100644
--- a/app/views/settings/preferences/other/show.html.haml
+++ b/app/views/settings/preferences/other/show.html.haml
@@ -16,6 +16,9 @@
   .fields-group
     = f.input :setting_aggregate_reblogs, as: :boolean, wrapper: :with_label, recommended: true
 
+  .fields-group
+    = f.input :setting_hidden_direct, as: :boolean, wrapper: :with_label, recommended: true
+
   %h4= t 'preferences.posting_defaults'
 
   .fields-row
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 76e93a10e3744c..ea5cdfbe02e092 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -47,6 +47,7 @@ en:
         phrase: Will be matched regardless of casing in text or content warning of a post
         scopes: Which APIs the application will be allowed to access. If you select a top-level scope, you don't need to select individual ones.
         setting_aggregate_reblogs: Do not show new boosts for posts that have been recently boosted (only affects newly-received boosts)
+        hidden_direct: Do not show direct messages in timeline feed.
         setting_default_sensitive: Sensitive media is hidden by default and can be revealed with a click
         setting_display_media_default: Hide media marked as sensitive
         setting_display_media_hide_all: Always hide media
@@ -147,6 +148,7 @@ en:
         phrase: Keyword or phrase
         setting_advanced_layout: Enable advanced web interface
         setting_aggregate_reblogs: Group boosts in timelines
+        setting_hidden_direct: '[ONLY handon] Hide DM in home timeline'
         setting_auto_play_gif: Auto-play animated GIFs
         setting_boost_modal: Show confirmation dialog before boosting
         setting_crop_images: Crop images in non-expanded posts to 16x9
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index 7fb69989f889bc..c9bc38e2c22af0 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -47,6 +47,7 @@ ja:
         phrase: トゥートの大文字小文字や閲覧注意に関係なく一致
         scopes: アプリの API に許可するアクセス権を選択してください。最上位のスコープを選択する場合、個々のスコープを選択する必要はありません。
         setting_aggregate_reblogs: 最近ブーストされたトゥートが新たにブーストされても表示しません (設定後受信したものにのみ影響)
+        setting_hidden_direct: DMを通知でのみ表示し、ホームタイムライン上に表示しません (設定後受信したものにのみ影響)
         setting_default_sensitive: 閲覧注意状態のメディアはデフォルトでは内容が伏せられ、クリックして初めて閲覧できるようになります
         setting_display_media_default: 閲覧注意としてマークされたメディアは隠す
         setting_display_media_hide_all: メディアを常に隠す
@@ -147,6 +148,7 @@ ja:
         phrase: キーワードまたはフレーズ
         setting_advanced_layout: 上級者向け UI を有効にする
         setting_aggregate_reblogs: ブーストをまとめる
+        setting_hidden_direct: '[はんドン独自] DMをホームTLに表示しない'
         setting_auto_play_gif: アニメーションGIFを自動再生する
         setting_boost_modal: ブーストする前に確認ダイアログを表示する
         setting_crop_images: トゥート詳細以外では画像を16:9に切り抜く
diff --git a/config/settings.yml b/config/settings.yml
index 06cee253240fac..ff709385b216f2 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -35,6 +35,7 @@ defaults: &defaults
   advanced_layout: false
   use_blurhash: true
   use_pending_items: false
+  hidden_direct: true
   trends: true
   trendable_by_default: false
   crop_images: true

From f7c72879163c582ef3e209bfb38691a64fb7b168 Mon Sep 17 00:00:00 2001
From: highemerly <high.emerly.ytfin@gmail.com>
Date: Sun, 9 May 2021 12:37:34 +0900
Subject: [PATCH 16/19] =?UTF-8?q?Rails6=E3=81=AEautoload=E5=91=A8=E3=82=8A?=
 =?UTF-8?q?=E3=81=AE=E4=BB=95=E6=A7=98=E3=81=8C=E3=82=88=E3=81=8F=E5=88=86?=
 =?UTF-8?q?=E3=81=8B=E3=82=89=E3=81=AA=E3=81=84=E3=81=AE=E3=81=A7=E6=9A=AB?=
 =?UTF-8?q?=E5=AE=9A=E5=AF=BE=E5=87=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- LOAD_PATHへの追加を有効化
---
 config/application.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/application.rb b/config/application.rb
index 8200a2fcf62f27..3b76713446d662 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -43,7 +43,7 @@ module Mastodon
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
     config.load_defaults 6.1
-    config.add_autoload_paths_to_load_path = false
+    #config.add_autoload_paths_to_load_path = false
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers

From 10ca4238bc18c19b7b150adea598629dd0f04df2 Mon Sep 17 00:00:00 2001
From: highemerly <high.emerly.ytfin@gmail.com>
Date: Sun, 9 May 2021 13:02:33 +0900
Subject: [PATCH 17/19] =?UTF-8?q?[Change]=20TL=E4=B8=8A=E3=81=AB=E3=83=96?=
 =?UTF-8?q?=E3=83=83=E3=82=AF=E3=83=9E=E3=83=BC=E3=82=AF=E7=99=BB=E9=8C=B2?=
 =?UTF-8?q?=E7=94=A8=E3=81=AE=E3=82=A2=E3=82=AF=E3=82=B7=E3=83=A7=E3=83=B3?=
 =?UTF-8?q?=E3=83=9C=E3=82=BF=E3=83=B3=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/javascript/mastodon/components/status_action_bar.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/javascript/mastodon/components/status_action_bar.js b/app/javascript/mastodon/components/status_action_bar.js
index 9981f2449bf2d2..d6dc8350f68e5c 100644
--- a/app/javascript/mastodon/components/status_action_bar.js
+++ b/app/javascript/mastodon/components/status_action_bar.js
@@ -240,14 +240,11 @@ class StatusActionBar extends ImmutablePureComponent {
 
     menu.push(null);
 
-    menu.push({ text: intl.formatMessage(status.get('bookmarked') ? messages.removeBookmark : messages.bookmark), action: this.handleBookmarkClick });
-
     if (writtenByMe && publicStatus) {
       menu.push({ text: intl.formatMessage(status.get('pinned') ? messages.unpin : messages.pin), action: this.handlePinClick });
+      menu.push(null);
     }
 
-    menu.push(null);
-
     if (writtenByMe || withDismiss) {
       menu.push({ text: intl.formatMessage(mutingConversation ? messages.unmuteConversation : messages.muteConversation), action: this.handleConversationMuteClick });
       menu.push(null);
@@ -326,6 +323,7 @@ class StatusActionBar extends ImmutablePureComponent {
         <IconButton className='status__action-bar-button' title={replyTitle} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} counter={status.get('replies_count')} obfuscateCount />
         <IconButton className={classNames('status__action-bar-button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate}  active={status.get('reblogged')} pressed={status.get('reblogged')} title={reblogTitle} icon='retweet' onClick={this.handleReblogClick} />
         <IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} pressed={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} />
+        <IconButton className='status__action-bar-button bookmark-icon' active={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' onClick={this.handleBookmarkClick} />
 
         {shareButton}
 

From 6fc87e3b899ab5339cf7f60adc3dc12c300750e3 Mon Sep 17 00:00:00 2001
From: highemerly <high.emerly.ytfin@gmail.com>
Date: Sun, 16 May 2021 13:25:33 +0900
Subject: [PATCH 18/19] =?UTF-8?q?[Fix]=20Rails6=E3=81=A7=E5=88=A5=E3=83=89?=
 =?UTF-8?q?=E3=83=A1=E3=82=A4=E3=83=B3=E3=81=8B=E3=82=89=E3=81=AE=E3=82=A2?=
 =?UTF-8?q?=E3=82=AF=E3=82=BB=E3=82=B9=E3=82=92=E3=81=AF=E3=81=98=E3=81=8F?=
 =?UTF-8?q?=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/environments/production.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/config/environments/production.rb b/config/environments/production.rb
index df6b07d77df7ae..8469600ea35df9 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,4 +1,10 @@
 Rails.application.configure do
+  # add by highemerly
+  config.hosts << "web1-da-tk2.handon.club"
+  config.hosts << "web1-pa-tk2.handon.club"
+  config.hosts << "web2-da-tk2.handon.club"
+  config.hosts << "web2-pa-tk2.handon.club"
+
   # Settings specified here will take precedence over those in config/application.rb.
 
   # Code is not reloaded between requests.

From 61c48ed5b5584e5e81507df1cc25f08a53fa5d73 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 16 May 2021 04:34:07 +0000
Subject: [PATCH 19/19] Bump faker from 2.17.0 to 2.18.0

Bumps [faker](https://github.com/faker-ruby/faker) from 2.17.0 to 2.18.0.
- [Release notes](https://github.com/faker-ruby/faker/releases)
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faker-ruby/faker/compare/v2.17.0...v2.18.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3a47993472019e..56059f0b51f795 100644
--- a/Gemfile
+++ b/Gemfile
@@ -115,7 +115,7 @@ end
 group :test do
   gem 'capybara', '~> 3.35'
   gem 'climate_control', '~> 0.2'
-  gem 'faker', '~> 2.17'
+  gem 'faker', '~> 2.18'
   gem 'microformats', '~> 4.2'
   gem 'rails-controller-testing', '~> 1.0'
   gem 'rspec-sidekiq', '~> 3.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index 913e40b1e5c48c..e6e30e9d8c789f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -211,7 +211,7 @@ GEM
       tzinfo
     excon (0.76.0)
     fabrication (2.22.0)
-    faker (2.17.0)
+    faker (2.18.0)
       i18n (>= 1.6, < 2)
     faraday (1.3.0)
       faraday-net_http (~> 1.0)
@@ -704,7 +704,7 @@ DEPENDENCIES
   dotenv-rails (~> 2.7)
   ed25519 (~> 1.2)
   fabrication (~> 2.22)
-  faker (~> 2.17)
+  faker (~> 2.18)
   fast_blank (~> 1.0)
   fastimage
   fog-core (<= 2.1.0)