Introducing: Mastodon GO!

Added app/javascript for imports

.eslintrc.yml

@@ -29,6 +29,11 @@ settings:
   import/ignore:
   - node_modules
   - \\.(css|scss|json)$
+  import/resolver:
+    node:
+      moduleDirectory:
+        - node_modules
+        - app/javascript
 
 rules:
   brace-style: warn

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "app/javascript/themes/mastodon-go"]
+	path = app/javascript/themes/mastodon-go
+	url = https://github.com/marrus-sh/mastodon-go

Vagrantfile

@@ -83,7 +83,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   config.vm.provider :virtualbox do |vb|
     vb.name = "mastodon"
-    vb.customize ["modifyvm", :id, "--memory", "2048"]
+    vb.customize ["modifyvm", :id, "--memory", "4096"]
 
     # Disable VirtualBox DNS proxy to skip long-delay IPv6 resolutions.
     # https://github.com/mitchellh/vagrant/issues/1172

app/javascript/mastodon/components/__tests__/__snapshots__/button-test.js.snap

@@ -112,3 +112,19 @@ exports[`<Button /> renders the props.text instead of children 1`] = `
   foo
 </button>
 `;
+
+exports[`<Button /> renders title if props.title is given 1`] = `
+<button
+  className="button"
+  disabled={undefined}
+  onClick={[Function]}
+  style={
+    Object {
+      "height": "36px",
+      "lineHeight": "36px",
+      "padding": "0 16px",
+    }
+  }
+  title="foo"
+/>
+`;

app/javascript/mastodon/components/__tests__/button-test.js

@@ -72,4 +72,11 @@ describe('<Button />', () => {
 
     expect(tree).toMatchSnapshot();
   });
+
+  it('renders title if props.title is given', () => {
+    const component = renderer.create(<Button title='foo' />);
+    const tree      = component.toJSON();
+
+    expect(tree).toMatchSnapshot();
+  });
 });

app/javascript/mastodon/components/button.js

@@ -14,6 +14,7 @@ export default class Button extends React.PureComponent {
     className: PropTypes.string,
     style: PropTypes.object,
     children: PropTypes.node,
+    title: PropTypes.string,
   };
 
   static defaultProps = {
@@ -35,26 +36,26 @@ export default class Button extends React.PureComponent {
   }
 
   render () {
-    const style = {
+    let attrs = {
+      className: classNames('button', this.props.className, {
+        'button-secondary': this.props.secondary,
+        'button--block': this.props.block,
+      }),
+      disabled: this.props.disabled,
+      onClick: this.handleClick,
+      ref: this.setRef,
+      style: {
         padding: `0 ${this.props.size / 2.25}px`,
         height: `${this.props.size}px`,
         lineHeight: `${this.props.size}px`,
         ...this.props.style,
+      },
     };
 
-    const className = classNames('button', this.props.className, {
+    if (this.props.title) attrs.title = this.props.title;
-      'button-secondary': this.props.secondary,
-      'button--block': this.props.block,
-    });
 
     return (
-      <button
+      <button {...attrs}>
-        className={className}
-        disabled={this.props.disabled}
-        onClick={this.handleClick}
-        ref={this.setRef}
-        style={style}
-      >
         {this.props.text || this.props.children}
       </button>
     );

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

@@ -164,6 +164,8 @@ export default class ComposeForm extends ImmutablePureComponent {
 
     let publishText = '';
     let publishText2 = '';
+    let title = '';
+    let title2 = '';
 
     const privacyIcons = {
       none: '',
@@ -173,7 +175,10 @@ export default class ComposeForm extends ImmutablePureComponent {
       direct: 'envelope',
     };
 
+    title = `${intl.formatMessage(messages.publish)}: ${intl.formatMessage({ id: `privacy.${this.props.privacy}.short` })}`;
+
     if (showSideArm) {
+      // Enhanced behavior with dual toot buttons
       publishText = (
         <span>
           {
@@ -185,13 +190,15 @@ export default class ComposeForm extends ImmutablePureComponent {
         </span>
       );
 
+      title2 = `${intl.formatMessage(messages.publish)}: ${intl.formatMessage({ id: `privacy.${secondaryVisibility}.short` })}`;
       publishText2 = (
         <i
           className={`fa fa-${privacyIcons[secondaryVisibility]}`}
-          aria-label={`${intl.formatMessage(messages.publish)}: ${intl.formatMessage({ id: `privacy.${secondaryVisibility}.short` })}`}
+          aria-label={title2}
         />
       );
     } else {
+      // Original vanilla behavior - no icon if public or unlisted
       if (this.props.privacy === 'private' || this.props.privacy === 'direct') {
         publishText = <span className='compose-form__publish-private'><i className='fa fa-lock' /> {intl.formatMessage(messages.publish)}</span>;
       } else {
@@ -256,6 +263,7 @@ export default class ComposeForm extends ImmutablePureComponent {
                 <Button
                   className='compose-form__publish__side-arm'
                   text={publishText2}
+                  title={title2}
                   onClick={this.handleSubmit2}
                   disabled={submitDisabled}
                 /> : ''
@@ -263,6 +271,7 @@ export default class ComposeForm extends ImmutablePureComponent {
             <Button
               className='compose-form__publish__primary'
               text={publishText}
+              title={title}
               onClick={this.handleSubmit}
               disabled={submitDisabled}
             />

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

@@ -68,7 +68,7 @@ export default class Upload extends ImmutablePureComponent {
       <div className='compose-form__upload' onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}>
         <Motion defaultStyle={{ scale: 0.8 }} style={{ scale: spring(1, { stiffness: 180, damping: 12 }) }}>
           {({ scale }) => (
-            <div className='compose-form__upload-thumbnail' style={{ transform: `translateZ(0) scale(${scale})`, backgroundImage: `url(${media.get('preview_url')})` }}>
+            <div className='compose-form__upload-thumbnail' style={{ transform: `scale(${scale})`, backgroundImage: `url(${media.get('preview_url')})` }}>
               <IconButton icon='times' title={intl.formatMessage(messages.undo)} size={36} onClick={this.handleUndoClick} />
 
               <div className={classNames('compose-form__upload-description', { active })}>

app/javascript/mastodon/features/compose/containers/sensitive_button_container.js

@@ -47,7 +47,7 @@ class SensitiveButton extends React.PureComponent {
             'compose-form__sensitive-button--visible': visible,
           });
           return (
-            <div className={className} style={{ transform: `translateZ(0) scale(${scale})` }}>
+            <div className={className} style={{ transform: `scale(${scale})` }}>
               <IconButton
                 className='compose-form__sensitive-button__icon'
                 title={intl.formatMessage(messages.title)}

app/javascript/mastodon/features/ui/components/upload_area.js

@@ -40,7 +40,7 @@ export default class UploadArea extends React.PureComponent {
         {({ backgroundOpacity, backgroundScale }) =>
           <div className='upload-area' style={{ visibility: active ? 'visible' : 'hidden', opacity: backgroundOpacity }}>
             <div className='upload-area__drop'>
-              <div className='upload-area__background' style={{ transform: `translateZ(0) scale(${backgroundScale})` }} />
+              <div className='upload-area__background' style={{ transform: `scale(${backgroundScale})` }} />
               <div className='upload-area__content'><FormattedMessage id='upload_area.title' defaultMessage='Drag & drop to upload' /></div>
             </div>
           </div>

app/javascript/mastodon/locales/pl.json

@@ -159,11 +159,11 @@
   "privacy.public.short": "Publiczny",
   "privacy.unlisted.long": "Niewidoczny na publicznych osiach czasu",
   "privacy.unlisted.short": "Niewidoczny",
-  "relative_time.days": "{number}d",
+  "relative_time.days": "{number} dni",
-  "relative_time.hours": "{number}h",
+  "relative_time.hours": "{number} godz.",
-  "relative_time.just_now": "now",
+  "relative_time.just_now": "teraz",
-  "relative_time.minutes": "{number}m",
+  "relative_time.minutes": "{number} min.",
-  "relative_time.seconds": "{number}s",
+  "relative_time.seconds": "{number} s.",
   "reply_indicator.cancel": "Anuluj",
   "report.placeholder": "Dodatkowe komentarze",
   "report.submit": "Wyślij",

app/javascript/styles/mastodon/components.scss

@@ -3402,21 +3402,21 @@ button.icon-button.active i.fa-retweet {
   }
 
   .fa-search {
-    transform: translateZ(0) rotate(90deg);
+    transform: rotate(90deg);
 
     &.active {
       pointer-events: none;
-      transform: translateZ(0) rotate(0deg);
+      transform: rotate(0deg);
     }
   }
 
   .fa-times-circle {
     top: 11px;
-    transform: translateZ(0) rotate(0deg);
+    transform: rotate(0deg);
     cursor: pointer;
 
     &.active {
-      transform: translateZ(0) rotate(90deg);
+      transform: rotate(90deg);
     }
 
     &:hover {

package.json

@@ -135,22 +135,5 @@
   },
   "optionalDependencies": {
     "fsevents": "*"
-  },
-  "jest": {
-    "projects": [
-      "<rootDir>/app/javascript/mastodon"
-    ],
-    "testPathIgnorePatterns": [
-      "<rootDir>/node_modules/",
-      "<rootDir>/vendor/",
-      "<rootDir>/config/",
-      "<rootDir>/log/",
-      "<rootDir>/public/",
-      "<rootDir>/tmp/"
-    ],
-    "setupFiles": [
-      "raf/polyfill"
-    ],
-    "setupTestFrameworkScriptFile": "<rootDir>/app/javascript/mastodon/test_setup.js"
   }
 }