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

@@ -33,8 +33,8 @@ const allowedAroundShortCode = '><\u0085\u0020\u00a0\u1680\u2000\u2001\u2002\u20
 const messages = defineMessages({
   placeholder: { id: 'compose_form.placeholder', defaultMessage: 'What is on your mind?' },
   spoiler_placeholder: { id: 'compose_form.spoiler_placeholder', defaultMessage: 'Write your warning here' },
-  publish: { id: 'compose_form.publish', defaultMessage: 'Toot' },
+  publish: { id: 'compose_form.publish', defaultMessage: 'Publish' },
-  publishLoud: { id: 'compose_form.publish_loud', defaultMessage: 'TOOT!' },
+  publishLoud: { id: 'compose_form.publish_loud', defaultMessage: '{publish}!' },
   saveChanges: { id: 'compose_form.save_changes', defaultMessage: 'Save changes' },
 });
 
@@ -100,7 +100,7 @@ class ComposeForm extends ImmutablePureComponent {
     const fulltext = this.getFulltextForCharacterCounting();
     const isOnlyWhitespace = fulltext.length !== 0 && fulltext.trim().length === 0;
 
-    return !(isSubmitting || isUploading || isChangingUpload || length(fulltext) > 5000 || (isOnlyWhitespace && !anyMedia));
+    return !(isSubmitting || isUploading || isChangingUpload || length(fulltext) > 500 || (isOnlyWhitespace && !anyMedia));
   };
 
   handleSubmit = (e) => {
@@ -232,9 +232,9 @@ class ComposeForm extends ImmutablePureComponent {
     if (this.props.isEditing) {
       publishText = intl.formatMessage(messages.saveChanges);
     } else if (this.props.privacy === 'private' || this.props.privacy === 'direct') {
-      publishText = <span className='compose-form__publish-private'><Icon id='lock' /> toot</span>;
+      publishText = <span className='compose-form__publish-private'><Icon id='lock' /> {intl.formatMessage(messages.publish)}</span>;
     } else {
-      publishText = this.props.privacy !== 'unlisted' ? 'TOOT!' : 'toot';
+      publishText = this.props.privacy !== 'unlisted' ? intl.formatMessage(messages.publishLoud, { publish: intl.formatMessage(messages.publish) }) : intl.formatMessage(messages.publish);
     }
 
     return (
@@ -297,7 +297,7 @@ class ComposeForm extends ImmutablePureComponent {
             </div>
 
             <div className='character-counter__wrapper'>
-              <CharacterCounter max={5000} text={this.getFulltextForCharacterCounting()} />
+              <CharacterCounter max={500} text={this.getFulltextForCharacterCounting()} />
             </div>
           </div>
         </div>

app/javascript/styles/etr.scss

@@ -1,54 +0,0 @@
-@import 'mastodon/mixins';
-@import 'etr/variables';
-@import 'fonts/roboto';
-@import 'fonts/roboto-mono';
-
-@import 'mastodon/reset';
-@import 'mastodon/basics';
-@import 'mastodon/branding';
-@import 'mastodon/containers';
-@import 'mastodon/lists';
-@import 'mastodon/widgets';
-@import 'mastodon/forms';
-@import 'mastodon/accounts';
-@import 'mastodon/statuses';
-@import 'mastodon/boost';
-@import 'etr/components';
-@import 'mastodon/polls';
-@import 'mastodon/modal';
-@import 'mastodon/emoji_picker';
-@import 'mastodon/about';
-@import 'mastodon/tables';
-@import 'mastodon/admin';
-@import 'mastodon/dashboard';
-@import 'mastodon/rtl';
-@import 'mastodon/accessibility';
-@import 'mastodon/rich_text';
-
-// The following "fixes" the mobile layout
-// in conjunction with the edits in `features/ui/components/header.jsx`
-// NOTE: $no-gap-breakpoint is when the UI becomes 3 columns
-.navigation-panel__logo,
-.ui__header__logo {
-  display: none;
-}
-@media screen and (max-width: $no-gap-breakpoint) {
-  .columns-area__panels__pane--navigational,
-  .navigation-panel__sign-in-banner,
-  .navigation-panel__legal > hr,
-  .column-link > span {
-    display: none;
-  }
-
-  .navigation-panel {
-    flex-direction: row;
-  }
-
-  .ui__header__links {
-    flex-shrink: unset;
-  }
-
-  .ui__header {
-    justify-content: center;
-  }
-}

app/javascript/styles/etr/variables.scss

@@ -1,99 +0,0 @@
-// Commonly used web colors
-$black: #242424; // Black
-$white: #ddc5ac; // White
-$red-600: #b7253d !default; // Deep Carmine
-$red-500: #df405a !default; // Cerise
-$grey-600: #4e4c5a; // Trout
-$grey-100: #dadaf3; // Topaz
-
-$success-green: #62b651 !default;
-$error-red: #a32a3e !default;
-$warning-red: #a73030 !default;
-$gold-star: #ff782c !default;
-
-$red-bookmark: $warning-red;
-
-// Values from the classic Mastodon UI
-$classic-base-color: #122712;
-$classic-primary-color: #67975a;
-$classic-secondary-color: #94b44a;
-$classic-highlight-color: #de7a31;
-
-// Variables for defaults in UI
-$base-shadow-color: $black !default;
-$base-overlay-background: $black !default;
-$base-border-color: $white !default;
-$simple-background-color: $white !default;
-$valid-value-color: $success-green !default;
-$error-value-color: $error-red !default;
-
-// Tell UI to use selected colors
-$ui-base-color: $classic-base-color !default; // Darkest
-$ui-base-lighter-color: lighten(
-  $ui-base-color,
-  26%
-) !default; // Lighter darkest
-$ui-primary-color: $classic-primary-color !default; // Lighter
-$ui-secondary-color: $classic-secondary-color !default; // Lightest
-$ui-highlight-color: $classic-highlight-color !default;
-$ui-button-color: #ffffff !default;
-$ui-button-background-color: $ui-highlight-color !default;
-$ui-button-focus-background-color: $ui-highlight-color !default;
-$ui-button-focus-outline-color: $ui-highlight-color !default;
-$ui-button-focus-outline: solid 2px $ui-button-focus-outline-color !default;
-
-$ui-button-secondary-color: $grey-100 !default;
-$ui-button-secondary-border-color: $grey-100 !default;
-$ui-button-secondary-focus-background-color: $grey-600 !default;
-$ui-button-secondary-focus-color: $white !default;
-
-$ui-button-tertiary-color: $ui-highlight-color !default;
-$ui-button-tertiary-border-color: $ui-highlight-color !default;
-$ui-button-tertiary-focus-background-color: $ui-highlight-color !default;
-$ui-button-tertiary-focus-color: $white !default;
-
-$ui-button-destructive-background-color: $red-500 !default;
-$ui-button-destructive-focus-background-color: $red-600 !default;
-
-$ui-button-icon-focus-outline: $ui-button-focus-outline !default;
-$ui-button-icon-hover-background-color: rgba(140, 141, 255, 40%) !default;
-
-// Variables for texts
-$primary-text-color: #ffffff !default;
-$darker-text-color: $ui-primary-color !default;
-$dark-text-color: $ui-base-lighter-color !default;
-$secondary-text-color: $ui-secondary-color !default;
-$highlight-text-color: lighten($ui-highlight-color, 8%) !default;
-$action-button-color: $ui-base-lighter-color !default;
-$action-button-focus-color: lighten($ui-base-lighter-color, 4%) !default;
-$passive-text-color: $gold-star !default;
-$active-passive-text-color: $success-green !default;
-
-// For texts on inverted backgrounds
-$inverted-text-color: $ui-base-color !default;
-$lighter-text-color: $ui-base-lighter-color !default;
-$light-text-color: $ui-primary-color !default;
-
-// Language codes that uses CJK fonts
-$cjk-langs: ja, ko, zh-CN, zh-HK, zh-TW;
-
-// Variables for components
-$media-modal-media-max-width: 100%;
-
-// put margins on top and bottom of image to avoid the screen covered by image.
-$media-modal-media-max-height: 80%;
-
-$no-gap-breakpoint: 1175px;
-
-$font-sans-serif: 'mastodon-font-sans-serif' !default;
-$font-display: 'mastodon-font-display' !default;
-$font-monospace: 'mastodon-font-monospace' !default;
-
-:root {
-  --dropdown-border-color: #{lighten($ui-base-color, 12%)};
-  --dropdown-background-color: #{lighten($ui-base-color, 4%)};
-  --dropdown-shadow: 0 20px 25px -5px #{rgba($base-shadow-color, 0.25)},
-    0 8px 10px -6px #{rgba($base-shadow-color, 0.25)};
-  --modal-background-color: #{darken($ui-base-color, 4%)};
-  --modal-border-color: #{lighten($ui-base-color, 4%)};
-}

app/validators/status_length_validator.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class StatusLengthValidator < ActiveModel::Validator
-  MAX_CHARS = 5000
+  MAX_CHARS = 500
   URL_PLACEHOLDER_CHARS = 23
   URL_PLACEHOLDER = 'x' * 23
 

config/themes.yml

@@ -1,4 +1,3 @@
 default: styles/application.scss
 contrast: styles/contrast.scss
 mastodon-light: styles/mastodon-light.scss
-eat-the-rich: styles/etr.scss

public/assets/500.html

@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html style="background-color:#183518" lang="en">
-<head><title>SOWWY T.T</title></head>
-<body>
-<marquee><img src="http://www.textfiles.com/underconstruction/paparisjardin8801graphicsbuttonsconstruct.gif" alt="paintbrush spelling out renovating"> ETR is migrating to ArdvarKey</marquee>
-<h1 style="color:#fff">sowwy,,,, ETR is currently undergoing maintenyance..,.</h1>
-<p style="color:#3c823c">thank u for your patience kittens :&lt;</p>
-<img src="http://www.textfiles.com/underconstruction/silverstar592001construction.gif" alt="anime girls holding strobe wands next to an under construction sign">
-</body>
-</html>