Bump puma from 5.6.5 to 6.1.1

.gitignore

@@ -69,3 +69,7 @@ yarn-debug.log
 
 # Ignore Docker option files
 docker-compose.override.yml
+
+# Add by highemerly
+public/announcements.json
+public/server-info.html

Gemfile

@@ -6,7 +6,7 @@ ruby '>= 2.6.0', '< 3.1.0'
 gem 'pkg-config', '~> 1.4'
 gem 'rexml', '~> 3.2'
 
-gem 'puma', '~> 5.6'
+gem 'puma', '~> 6.1'
 gem 'rails', '~> 6.1.7'
 gem 'sprockets', '~> 3.7.2'
 gem 'thor', '~> 1.2'

Gemfile.lock

@@ -477,7 +477,7 @@ GEM
     pry-rails (0.3.9)
       pry (>= 0.10.4)
     public_suffix (5.0.0)
-    puma (5.6.5)
+    puma (6.1.1)
       nio4r (~> 2.0)
     pundit (2.2.0)
       activesupport (>= 3.0.0)
@@ -810,7 +810,7 @@ DEPENDENCIES
   private_address_check (~> 0.5)
   pry-byebug (~> 3.10)
   pry-rails (~> 0.3)
-  puma (~> 5.6)
+  puma (~> 6.1)
   pundit (~> 2.2)
   rack (~> 2.2.4)
   rack-attack (~> 6.6)

app/chewy/statuses_index.rb

@@ -4,30 +4,21 @@ class StatusesIndex < Chewy::Index
   include FormattingHelper
 
   settings index: { refresh_interval: '30s' }, 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
         ),
       },
     },

app/controllers/settings/preferences_controller.rb

@@ -52,6 +52,7 @@ def user_settings_params
       :setting_advanced_layout,
       :setting_use_blurhash,
       :setting_use_pending_items,
+      :setting_hidden_direct,
       :setting_trends,
       :setting_crop_images,
       :setting_always_send_emails,

app/javascript/mastodon/actions/compose.js

@@ -520,7 +520,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);
@@ -569,6 +573,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}:`;
+      }
     }
 
     // We don't want to replace hashtags that vary only in case due to accessibility, but we need to fire off an event so that

app/javascript/mastodon/components/display_name.js

@@ -62,8 +62,14 @@ export default class DisplayName extends React.PureComponent {
         acct = `${acct}@${localDomain}`;
       }
 
+      let suffixClassName = 'display-name__account';
+
+      if (acct.indexOf('@') === -1) {
+        suffixClassName = suffixClassName + ' handon-local-account';
+      }
+
       displayName = <bdi><strong className='display-name__html' dangerouslySetInnerHTML={{ __html: account.get('display_name_html') }} /></bdi>;
-      suffix      = <span className='display-name__account'>@{acct}</span>;
+      suffix      = <span className={suffixClassName}>@{acct}</span>;
     } else {
       displayName = <bdi><strong className='display-name__html'><Skeleton width='10ch' /></strong></bdi>;
       suffix = <span className='display-name__account'><Skeleton width='7ch' /></span>;

app/javascript/mastodon/components/logo.js

@@ -1,10 +1,7 @@
 import React from 'react';
 
 const Logo = () => (
-  <svg viewBox='0 0 261 66' className='logo' role='img'>
-    <title>Mastodon</title>
-    <use xlinkHref='#logo-symbol-wordmark' />
-  </svg>
+  <img src='/handon-header.png' width='165px' />
 );
 
 export default Logo;

app/javascript/mastodon/components/status.js

@@ -510,6 +510,7 @@ class Status extends ImmutablePureComponent {
           {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.handleClick} role='presentation' />
             <div className='status__info'>
               <a onClick={this.handleClick} href={`/@${status.getIn(['account', 'acct'])}\/${status.get('id')}`} className='status__relative-time' target='_blank' rel='noopener noreferrer'>
                 <span className='status__visibility-icon'><Icon id={visibilityIcon.icon} title={visibilityIcon.text} /></span>

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='announcements2__body'>{item.get('body')}</div>);
+    if (item.get('icon')) {
+      contents.push(
+        <div key='icon' className='announcements2__icon'>
+          <img src={item.get('icon')} alt='' />
+        </div>
+      );
+    }
+
+    const href = item.get('href');
+
+    const classname = classnames({
+      'announcements2__item': true,
+      'announcements2__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='announcements2'>
+        {items.entrySeq().map(([key, item]) =>
+          (<li key={key}>
+            <Announcement item={item} />
+          </li>)
+        )}
+      </ul>
+    );
+  }
+
+}

app/javascript/mastodon/features/compose/components/poll_form.js

@@ -157,13 +157,16 @@ class PollForm extends ImmutablePureComponent {
         </ul>
 
         <div className='poll__footer'>
-          <button type='button' disabled={options.size >= 4} className='button button-secondary' onClick={this.handleAddOption}><Icon id='plus' /> <FormattedMessage {...messages.add_option} /></button>
+          <button type='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>

app/javascript/mastodon/features/compose/index.js

@@ -15,6 +15,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';
 import Column from 'mastodon/components/column';
 import { Helmet } from 'react-helmet';
@@ -116,7 +117,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>
@@ -130,7 +131,7 @@ class Compose extends React.PureComponent {
               )}
             </Motion>
           </div>
-        </div>
+      </div>
       );
     }
 

app/javascript/mastodon/features/emoji/emoji.js

@@ -21,8 +21,10 @@ const emojiFilename = (filename) => {
 
 const domParser = new DOMParser();
 
-const emojifyTextNode = (node, customEmojis) => {
+const emojifyTextNode = (node, customEmojis, natural) => {
   let str = node.textContent;
+  let contentNaturalFlag = natural;
+  let contentEmojiFlag = false;
 
   const fragment = new DocumentFragment();
 
@@ -31,10 +33,12 @@ const emojifyTextNode = (node, customEmojis) => {
 
     if (customEmojis === null) {
       while (i < str.length && !(match = trie.search(str.slice(i)))) {
+        contentNaturalFlag = true;
         i += str.codePointAt(i) < 65536 ? 1 : 2;
       }
     } else {
       while (i < str.length && str[i] !== ':' && !(match = trie.search(str.slice(i)))) {
+        contentNaturalFlag = true;
         i += str.codePointAt(i) < 65536 ? 1 : 2;
       }
     }
@@ -51,7 +55,9 @@ const emojifyTextNode = (node, 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 custom-emoji handon-emojione-first'
+          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;
@@ -77,30 +83,37 @@ const emojifyTextNode = (node, customEmojis) => {
 
   fragment.append(document.createTextNode(str));
   node.parentElement.replaceChild(fragment, node);
+  return contentNaturalFlag;
 };
 
-const emojifyNode = (node, customEmojis) => {
+const emojifyNode = (node, customEmojis, contentNaturalFlag) => {
   for (const child of node.childNodes) {
     switch(child.nodeType) {
     case Node.TEXT_NODE:
-      emojifyTextNode(child, customEmojis);
+      contentNaturalFlag = emojifyTextNode(child, customEmojis, contentNaturalFlag);
       break;
     case Node.ELEMENT_NODE:
       if (!child.classList.contains('invisible'))
-        emojifyNode(child, customEmojis);
+        contentNaturalFlag = emojifyNode(child, customEmojis, contentNaturalFlag);
       break;
     }
   }
+  return contentNaturalFlag;
 };
 
 const emojify = (str, customEmojis = {}) => {
+  let contentNatural;
   const wrapper = document.createElement('div');
   wrapper.innerHTML = str;
 
   if (!Object.keys(customEmojis).length)
     customEmojis = null;
 
-  emojifyNode(wrapper, customEmojis);
+  contentNatural = emojifyNode(wrapper, customEmojis, false);
+
+  if (!contentNatural) {
+    wrapper.innerHTML = '<span class="handon-emoji-only-content">' + wrapper.innerHTML + '</span>';
+  }
 
   return wrapper.innerHTML;
 };