diff --git a/app/javascript/mastodon/features/compose/components/attach_options.js b/app/javascript/mastodon/features/compose/components/attach_options.js
new file mode 100644
index 000000000..1a26087e7
--- /dev/null
+++ b/app/javascript/mastodon/features/compose/components/attach_options.js
@@ -0,0 +1,133 @@
+// Package imports //
+import React from 'react';
+import PropTypes from 'prop-types';
+import { connect } from 'react-redux';
+import { injectIntl, defineMessages } from 'react-intl';
+
+// Our imports //
+import ComposeDropdown from './compose_dropdown';
+import { uploadCompose } from '../../../actions/compose';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import { openModal } from '../../../actions/modal';
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+
+const messages = defineMessages({
+ upload :
+ { id: 'compose.attach.upload', defaultMessage: 'Upload a file' },
+ doodle :
+ { id: 'compose.attach.doodle', defaultMessage: 'Draw something' },
+ attach :
+ { id: 'compose.attach', defaultMessage: 'Attach...' },
+});
+
+const mapStateToProps = state => ({
+ // This horrible expression is copied from vanilla upload_button_container
+ disabled: state.getIn(['compose', 'is_uploading']) || (state.getIn(['compose', 'media_attachments']).size > 3 || state.getIn(['compose', 'media_attachments']).some(m => m.get('type') === 'video')),
+ resetFileKey: state.getIn(['compose', 'resetFileKey']),
+ acceptContentTypes: state.getIn(['media_attachments', 'accept_content_types']),
+});
+
+const mapDispatchToProps = dispatch => ({
+ onSelectFile (files) {
+ dispatch(uploadCompose(files));
+ },
+ onOpenDoodle () {
+ dispatch(openModal('DOODLE', { noEsc: true }));
+ },
+});
+
+@injectIntl
+@connect(mapStateToProps, mapDispatchToProps)
+export default class ComposeAttachOptions extends ImmutablePureComponent {
+
+ static propTypes = {
+ intl : PropTypes.object.isRequired,
+ resetFileKey: PropTypes.number,
+ acceptContentTypes: ImmutablePropTypes.listOf(PropTypes.string).isRequired,
+ disabled: PropTypes.bool,
+ onSelectFile: PropTypes.func.isRequired,
+ onOpenDoodle: PropTypes.func.isRequired,
+ };
+
+ handleItemClick = bt => {
+ if (bt === 'upload') {
+ this.fileElement.click();
+ }
+
+ if (bt === 'doodle') {
+ this.props.onOpenDoodle();
+ }
+
+ this.dropdown.setState({ open: false });
+ };
+
+ handleFileChange = (e) => {
+ if (e.target.files.length > 0) {
+ this.props.onSelectFile(e.target.files);
+ }
+ }
+
+ setFileRef = (c) => {
+ this.fileElement = c;
+ }
+
+ setDropdownRef = (c) => {
+ this.dropdown = c;
+ }
+
+ render () {
+ const { intl, resetFileKey, disabled, acceptContentTypes } = this.props;
+
+ const options = [
+ { icon: 'cloud-upload', text: messages.upload, name: 'upload' },
+ { icon: 'paint-brush', text: messages.doodle, name: 'doodle' },
+ ];
+
+ const optionElems = options.map((item) => {
+ const hdl = () => this.handleItemClick(item.name);
+ return (
+
+
+ );
+ });
+
+ return (
+
+
+
+
+
+ {intl.formatMessage(item.text)}
+
+
+
+ {optionElems}
+
+
+
+ );
+ }
+
+}
diff --git a/app/javascript/mastodon/features/compose/components/compose_dropdown.js b/app/javascript/mastodon/features/compose/components/compose_dropdown.js
new file mode 100644
index 000000000..3158f32d4
--- /dev/null
+++ b/app/javascript/mastodon/features/compose/components/compose_dropdown.js
@@ -0,0 +1,76 @@
+// Package imports //
+import React from 'react';
+import PropTypes from 'prop-types';
+
+// Mastodon imports //
+import IconButton from '../../../components/icon_button';
+
+const iconStyle = {
+ height : null,
+ lineHeight : '27px',
+};
+
+export default class ComposeDropdown extends React.PureComponent {
+
+ static propTypes = {
+ title: PropTypes.string.isRequired,
+ icon: PropTypes.string,
+ highlight: PropTypes.bool,
+ disabled: PropTypes.bool,
+ children: PropTypes.arrayOf(PropTypes.node).isRequired,
+ };
+
+ state = {
+ open: false,
+ };
+
+ onGlobalClick = (e) => {
+ if (e.target !== this.node && !this.node.contains(e.target) && this.state.open) {
+ this.setState({ open: false });
+ }
+ };
+
+ componentDidMount () {
+ window.addEventListener('click', this.onGlobalClick);
+ window.addEventListener('touchstart', this.onGlobalClick);
+ }
+ componentWillUnmount () {
+ window.removeEventListener('click', this.onGlobalClick);
+ window.removeEventListener('touchstart', this.onGlobalClick);
+ }
+
+ onToggleDropdown = () => {
+ if (this.props.disabled) return;
+ this.setState({ open: !this.state.open });
+ };
+
+ setRef = (c) => {
+ this.node = c;
+ };
+
+ render () {
+ const { open } = this.state;
+ let { highlight, title, icon, disabled } = this.props;
+
+ if (!icon) icon = 'ellipsis-h';
+
+ return (
+
+
+ );
+ }
+}
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js
index 294dcb5c1..561c7d901 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.js
+++ b/app/javascript/mastodon/features/compose/components/compose_form.js
@@ -5,7 +5,6 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types';
import ReplyIndicatorContainer from '../containers/reply_indicator_container';
import AutosuggestTextarea from '../../../components/autosuggest_textarea';
-import UploadButtonContainer from '../containers/upload_button_container';
import { defineMessages, injectIntl } from 'react-intl';
import SpoilerButtonContainer from '../containers/spoiler_button_container';
import PrivacyDropdownContainer from '../containers/privacy_dropdown_container';
@@ -17,6 +16,7 @@ import { isMobile } from '../../../is_mobile';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { length } from 'stringz';
import { countableText } from '../util/counter';
+import ComposeAttachOptions from './attach_options';
const allowedAroundShortCode = '><\u0085\u0020\u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029\u0009\u000a\u000b\u000c\u000d';
@@ -85,7 +85,7 @@ class ComposeForm extends ImmutablePureComponent {
const { is_submitting, is_changing_upload, is_uploading, anyMedia } = this.props;
const fulltext = [this.props.spoiler_text, countableText(this.props.text)].join('');
- if (is_submitting || is_uploading || is_changing_upload || length(fulltext) > 500 || (fulltext.length !== 0 && fulltext.trim().length === 0 && !anyMedia)) {
+ if (is_submitting || is_uploading || is_changing_upload || length(fulltext) > 512 || (fulltext.length !== 0 && fulltext.trim().length === 0 && !anyMedia)) {
return;
}
@@ -161,7 +161,7 @@ class ComposeForm extends ImmutablePureComponent {
const { intl, onPaste, showSearch, anyMedia } = this.props;
const disabled = this.props.is_submitting;
const text = [this.props.spoiler_text, countableText(this.props.text)].join('');
- const disabledButton = disabled || this.props.is_uploading || this.props.is_changing_upload || length(text) > 500 || (text.length !== 0 && text.trim().length === 0 && !anyMedia);
+ const disabledButton = disabled || this.props.is_uploading || this.props.is_changing_upload || length(text) > 512 || (text.length !== 0 && text.trim().length === 0 && !anyMedia);
let publishText = '';
if (this.props.privacy === 'private' || this.props.privacy === 'direct') {
@@ -208,12 +208,13 @@ class ComposeForm extends ImmutablePureComponent {
+
+
+ {this.props.children}
+
+
-
-
diff --git a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
index c1429c756..38dbd4d40 100644
--- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
+++ b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
@@ -357,8 +357,8 @@ class EmojiPickerDropdown extends React.PureComponent {
diff --git a/app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js b/app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js
index 5ec937a39..4c1332153 100644
--- a/app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js
+++ b/app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js
@@ -12,13 +12,13 @@ const DEFAULTS = [
'+1',
'grinning',
'kissing_heart',
- 'heart_eyes',
+ 'vhs',
'laughing',
- 'stuck_out_tongue_winking_eye',
+ 'floppy_disk',
'sweat_smile',
'joy',
'yum',
- 'disappointed',
+ 'computer',
'thinking_face',
'weary',
'sob',
diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js
index 709a3aa96..87b21263e 100644
--- a/app/javascript/mastodon/features/getting_started/index.js
+++ b/app/javascript/mastodon/features/getting_started/index.js
@@ -14,20 +14,20 @@ import { Link } from 'react-router-dom';
import NavigationBar from '../compose/components/navigation_bar';
const messages = defineMessages({
- home_timeline: { id: 'tabs_bar.home', defaultMessage: 'Home' },
- notifications: { id: 'tabs_bar.notifications', defaultMessage: 'Notifications' },
- public_timeline: { id: 'navigation_bar.public_timeline', defaultMessage: 'Federated timeline' },
+ home_timeline: { id: 'tabs_bar.home', defaultMessage: '/timelines/home' },
+ notifications: { id: 'tabs_bar.notifications', defaultMessage: '~/.notifications' },
+ public_timeline: { id: 'navigation_bar.public_timeline', defaultMessage: '/timelines/federated' },
settings_subheading: { id: 'column_subheading.settings', defaultMessage: 'Settings' },
- community_timeline: { id: 'navigation_bar.community_timeline', defaultMessage: 'Local timeline' },
- direct: { id: 'navigation_bar.direct', defaultMessage: 'Direct messages' },
- preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
- follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
- favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favourites' },
- blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocked users' },
- domain_blocks: { id: 'navigation_bar.domain_blocks', defaultMessage: 'Hidden domains' },
- mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Muted users' },
- pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned toots' },
- lists: { id: 'navigation_bar.lists', defaultMessage: 'Lists' },
+ community_timeline: { id: 'navigation_bar.community_timeline', defaultMessage: '/timelines/local' },
+ direct: { id: 'navigation_bar.direct', defaultMessage: '~/.dms' },
+ preferences: { id: 'navigation_bar.preferences', defaultMessage: 'edit ~/.config' },
+ follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: '~/.follow-requests' },
+ favourites: { id: 'navigation_bar.favourites', defaultMessage: '~/.florps' },
+ blocks: { id: 'navigation_bar.blocks', defaultMessage: '~/.blocked' },
+ domain_blocks: { id: 'navigation_bar.domain_blocks', defaultMessage: '~/.muted/domains' },
+ mutes: { id: 'navigation_bar.mutes', defaultMessage: '~/.muted' },
+ pins: { id: 'navigation_bar.pins', defaultMessage: '~/.pinned' },
+ lists: { id: 'navigation_bar.lists', defaultMessage: '~/.lists' },
discover: { id: 'navigation_bar.discover', defaultMessage: 'Discover' },
personal: { id: 'navigation_bar.personal', defaultMessage: 'Personal' },
security: { id: 'navigation_bar.security', defaultMessage: 'Security' },
@@ -158,11 +158,8 @@ class GettingStarted extends ImmutablePureComponent {
@@ -171,7 +168,7 @@ class GettingStarted extends ImmutablePureComponent {
tootsuite/mastodon (v{version}) }}
+ values={{ github: cybrespace/mastodon }}
/>
diff --git a/app/javascript/mastodon/features/notifications/components/notification.js b/app/javascript/mastodon/features/notifications/components/notification.js
index 24843a2b6..265df8aa7 100644
--- a/app/javascript/mastodon/features/notifications/components/notification.js
+++ b/app/javascript/mastodon/features/notifications/components/notification.js
@@ -148,7 +148,7 @@ class Notification extends ImmutablePureComponent {
-
+
diff --git a/app/javascript/mastodon/features/status/components/action_bar.js b/app/javascript/mastodon/features/status/components/action_bar.js
index d3b725283..e1d52a330 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.js
+++ b/app/javascript/mastodon/features/status/components/action_bar.js
@@ -175,7 +175,7 @@ class ActionBar extends React.PureComponent {
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index b0ee398d0..55eaedbd5 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -172,7 +172,7 @@ export default class DetailedStatus extends ImmutablePureComponent {
if (this.context.router) {
favouriteLink = (
-
+
+} + +// Utility for converting base64 image to binary for upload +// https://stackoverflow.com/questions/35940290/how-to-convert-base64-string-to-javascript-file-object-like-as-from-file-input-f +function dataURLtoFile(dataurl, filename) { + let arr = dataurl.split(','), mime = arr[0].match(/:(.*?);/)[1], + bstr = atob(arr[1]), n = bstr.length, u8arr = new Uint8Array(n); + while(n--){ + u8arr[n] = bstr.charCodeAt(n); + } + return new File([u8arr], filename, { type: mime }); +} + +const DOODLE_SIZES = { + normal: [500, 500, 'Square 500'], + tootbanner: [702, 330, 'Tootbanner'], + s640x480: [640, 480, '640×480 - 480p'], + s800x600: [800, 600, '800×600 - SVGA'], + s720x480: [720, 405, '720x405 - 16:9'], +}; + + +const mapStateToProps = state => ({ + options: state.getIn(['compose', 'doodle']), +}); + +const mapDispatchToProps = dispatch => ({ + /** Set options in the redux store */ + setOpt: (opts) => dispatch(doodleSet(opts)), + /** Submit doodle for upload */ + submit: (file) => dispatch(uploadCompose([file])), +}); + +/** + * Doodling dialog with drawing canvas + * + * Keyboard shortcuts: + * - Delete: Clear screen, fill with background color + * - Backspace, Ctrl+Z: Undo one step + * - Ctrl held while drawing: Use background color + * - Shift held while clicking screen: Use fill tool + * + * Palette: + * - Left mouse button: pick foreground + * - Ctrl + left mouse button: pick background + * - Right mouse button: pick background + */ +@connect(mapStateToProps, mapDispatchToProps) +export default class DoodleModal extends ImmutablePureComponent { + + static propTypes = { + options: ImmutablePropTypes.map, + onClose: PropTypes.func.isRequired, + setOpt: PropTypes.func.isRequired, + submit: PropTypes.func.isRequired, + }; + + //region Option getters/setters + + /** Foreground color */ + get fg () { + return this.props.options.get('fg'); + } + set fg (value) { + this.props.setOpt({ fg: value }); + } + + /** Background color */ + get bg () { + return this.props.options.get('bg'); + } + set bg (value) { + this.props.setOpt({ bg: value }); + } + + /** Swap Fg and Bg for drawing */ + get swapped () { + return this.props.options.get('swapped'); + } + set swapped (value) { + this.props.setOpt({ swapped: value }); + } + + /** Mode - 'draw' or 'fill' */ + get mode () { + return this.props.options.get('mode'); + } + set mode (value) { + this.props.setOpt({ mode: value }); + } + + /** Base line weight */ + get weight () { + return this.props.options.get('weight'); + } + set weight (value) { + this.props.setOpt({ weight: value }); + } + + /** Drawing opacity */ + get opacity () { + return this.props.options.get('opacity'); + } + set opacity (value) { + this.props.setOpt({ opacity: value }); + } + + /** Adaptive stroke - change width with speed */ + get adaptiveStroke () { + return this.props.options.get('adaptiveStroke'); + } + set adaptiveStroke (value) { + this.props.setOpt({ adaptiveStroke: value }); + } + + /** Smoothing (for mouse drawing) */ + get smoothing () { + return this.props.options.get('smoothing'); + } + set smoothing (value) { + this.props.setOpt({ smoothing: value }); + } + + /** Size preset */ + get size () { + return this.props.options.get('size'); + } + set size (value) { + this.props.setOpt({ size: value }); + } + + //endregion + + /** Key up handler */ + handleKeyUp = (e) => { + if (e.target.nodeName === 'INPUT') return; + + if (e.key === 'Delete') { + e.preventDefault(); + this.handleClearBtn(); + return; + } + + if (e.key === 'Backspace' || (e.key === 'z' && (e.ctrlKey || e.metaKey))) { + e.preventDefault(); + this.undo(); + } + + if (e.key === 'Control' || e.key === 'Meta') { + this.controlHeld = false; + this.swapped = false; + } + + if (e.key === 'Shift') { + this.shiftHeld = false; + this.mode = 'draw'; + } + }; + + /** Key down handler */ + handleKeyDown = (e) => { + if (e.key === 'Control' || e.key === 'Meta') { + this.controlHeld = true; + this.swapped = true; + } + + if (e.key === 'Shift') { + this.shiftHeld = true; + this.mode = 'fill'; + } + }; + + /** + * Component installed in the DOM, do some initial set-up + */ + componentDidMount () { + this.controlHeld = false; + this.shiftHeld = false; + this.swapped = false; + window.addEventListener('keyup', this.handleKeyUp, false); + window.addEventListener('keydown', this.handleKeyDown, false); + }; + + /** + * Tear component down + */ + componentWillUnmount () { + window.removeEventListener('keyup', this.handleKeyUp, false); + window.removeEventListener('keydown', this.handleKeyDown, false); + if (this.sketcher) this.sketcher.destroy(); + } + + /** + * Set reference to the canvas element. + * This is called during component init + * + * @param elem - canvas element + */ + setCanvasRef = (elem) => { + this.canvas = elem; + if (elem) { + elem.addEventListener('dirty', () => { + this.saveUndo(); + this.sketcher._dirty = false; + }); + + elem.addEventListener('click', () => { + // sketcher bug - does not fire dirty on fill + if (this.mode === 'fill') { + this.saveUndo(); + } + }); + + // prevent context menu + elem.addEventListener('contextmenu', (e) => { + e.preventDefault(); + }); + + elem.addEventListener('mousedown', (e) => { + if (e.button === 2) { + this.swapped = true; + } + }); + + elem.addEventListener('mouseup', (e) => { + if (e.button === 2) { + this.swapped = this.controlHeld; + } + }); + + this.initSketcher(elem); + this.mode = 'draw'; // Reset mode - it's confusing if left at 'fill' + } + }; + + /** + * Set up the sketcher instance + * + * @param canvas - canvas element. Null if we're just resizing + */ + initSketcher (canvas = null) { + const sizepreset = DOODLE_SIZES[this.size]; + + if (this.sketcher) this.sketcher.destroy(); + this.sketcher = new Atrament(canvas || this.canvas, sizepreset[0], sizepreset[1]); + + if (canvas) { + this.ctx = this.sketcher.context; + this.updateSketcherSettings(); + } + + this.clearScreen(); + } + + /** + * Done button handler + */ + onDoneButton = () => { + const dataUrl = this.sketcher.toImage(); + const file = dataURLtoFile(dataUrl, 'doodle.png'); + this.props.submit(file); + this.props.onClose(); // close dialog + }; + + /** + * Cancel button handler + */ + onCancelButton = () => { + if (this.undos.length > 1 && !confirm('Discard doodle? All changes will be lost!')) { + return; + } + + this.props.onClose(); // close dialog + }; + + /** + * Update sketcher options based on state + */ + updateSketcherSettings () { + if (!this.sketcher) return; + + if (this.oldSize !== this.size) this.initSketcher(); + + this.sketcher.color = (this.swapped ? this.bg : this.fg); + this.sketcher.opacity = this.opacity; + this.sketcher.weight = this.weight; + this.sketcher.mode = this.mode; + this.sketcher.smoothing = this.smoothing; + this.sketcher.adaptiveStroke = this.adaptiveStroke; + + this.oldSize = this.size; + } + + /** + * Fill screen with background color + */ + clearScreen = () => { + this.ctx.fillStyle = this.bg; + this.ctx.fillRect(-1, -1, this.canvas.width+2, this.canvas.height+2); + this.undos = []; + + this.doSaveUndo(); + }; + + /** + * Undo one step + */ + undo = () => { + if (this.undos.length > 1) { + this.undos.pop(); + const buf = this.undos.pop(); + + this.sketcher.clear(); + this.ctx.putImageData(buf, 0, 0); + this.doSaveUndo(); + } + }; + + /** + * Save canvas content into the undo buffer immediately + */ + doSaveUndo = () => { + this.undos.push(this.ctx.getImageData(0, 0, this.canvas.width, this.canvas.height)); + }; + + /** + * Called on each canvas change. + * Saves canvas content to the undo buffer after some period of inactivity. + */ + saveUndo = debounce(() => { + this.doSaveUndo(); + }, 100); + + /** + * Palette left click. + * Selects Fg color (or Bg, if Control/Meta is held) + * + * @param e - event + */ + onPaletteClick = (e) => { + const c = e.target.dataset.color; + + if (this.controlHeld) { + this.bg = c; + } else { + this.fg = c; + } + + e.target.blur(); + e.preventDefault(); + }; + + /** + * Palette right click. + * Selects Bg color + * + * @param e - event + */ + onPaletteRClick = (e) => { + this.bg = e.target.dataset.color; + e.target.blur(); + e.preventDefault(); + }; + + /** + * Handle click on the Draw mode button + * + * @param e - event + */ + setModeDraw = (e) => { + this.mode = 'draw'; + e.target.blur(); + }; + + /** + * Handle click on the Fill mode button + * + * @param e - event + */ + setModeFill = (e) => { + this.mode = 'fill'; + e.target.blur(); + }; + + /** + * Handle click on Smooth checkbox + * + * @param e - event + */ + tglSmooth = (e) => { + this.smoothing = !this.smoothing; + e.target.blur(); + }; + + /** + * Handle click on Adaptive checkbox + * + * @param e - event + */ + tglAdaptive = (e) => { + this.adaptiveStroke = !this.adaptiveStroke; + e.target.blur(); + }; + + /** + * Handle change of the Weight input field + * + * @param e - event + */ + setWeight = (e) => { + this.weight = +e.target.value || 1; + }; + + /** + * Set size - clalback from the select box + * + * @param e - event + */ + changeSize = (e) => { + let newSize = e.target.value; + if (newSize === this.oldSize) return; + + if (this.undos.length > 1 && !confirm('Change size? This will erase your drawing!')) { + return; + } + + this.size = newSize; + }; + + handleClearBtn = () => { + if (this.undos.length > 1 && !confirm('Clear screen? This will erase your drawing!')) { + return; + } + + this.clearScreen(); + }; + + /** + * Render the component + */ + render () { + this.updateSketcherSettings(); + + return ( +
#282c37
+ #1ea21e
diff --git a/public/clock.js b/public/clock.js
new file mode 100644
index 000000000..ffb9beae8
--- /dev/null
+++ b/public/clock.js
@@ -0,0 +1,54 @@
+document.addEventListener("DOMContentLoaded", function(event) {
+ updateClock();
+ setInterval(updateClock, 1000);
+});
+
+function getNextOpen(now) {
+ var days = [[0, 14], [4, 18], [8, 22], [12], [2, 16], [6, 20], [10]]
+ var nowday = now.getUTCDay();
+ var nour = now.getUTCHours();
+
+ var open_hour = -1;
+ var d = 0;
+
+ while (open_hour == -1) {
+ var times = days[(nowday + d) % 7];
+ for (var i = 0; i < times.length; ++i) {
+ var time = times[i];
+ if (time == nour) {
+ return "refresh";
+ } else if (time > nour || d > 0) {
+ open_hour = time;
+ break;
+ }
+ }
+ if (open_hour == -1) {
+ d += 1;
+ nour = -1;
+ }
+ }
+
+ var open = new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate() + d));
+ var ts = open.setUTCHours(open_hour);
+ return open;
+}
+
+function updateClock() {
+ var clock = document.querySelector(".closed-registrations-message .clock");
+ var now = new Date();
+ var open = getNextOpen(now);
+
+ if (open == "refresh") {
+ location.reload();
+ return;
+ }
+
+ var until = open - now;
+ var ms = until % 1000;
+ var s = Math.floor((until / 1000)) % 60;
+ var m = Math.floor((until / 1000 / 60)) % 60;
+ var h = Math.floor((until / 1000 / 60 / 60));
+ if (m < 10) m = "0" + m;
+ if (s < 10) s = "0" + s;
+ clock.innerHTML = h + ":" + m + ":" + s;
+}
diff --git a/public/emoji/1f418.svg b/public/emoji/1f418.svg
index fb9656cd1..3852006c5 100644
--- a/public/emoji/1f418.svg
+++ b/public/emoji/1f418.svg
@@ -1 +1,17 @@
-
\ No newline at end of file
+
diff --git a/public/favicon.ico b/public/favicon.ico
index 79000c9cc..887128534 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/public/header.jpeg b/public/header.jpeg
new file mode 100644
index 000000000..e9d7b336f
Binary files /dev/null and b/public/header.jpeg differ
diff --git a/public/logo-cybre-glitch.gif b/public/logo-cybre-glitch.gif
new file mode 100644
index 000000000..abe9b2a9a
Binary files /dev/null and b/public/logo-cybre-glitch.gif differ
diff --git a/public/logo-cybre.png b/public/logo-cybre.png
new file mode 100644
index 000000000..41dd8fd4c
Binary files /dev/null and b/public/logo-cybre.png differ
diff --git a/public/mstile-150x150.png b/public/mstile-150x150.png
index a4994062d..a79f11992 100644
Binary files a/public/mstile-150x150.png and b/public/mstile-150x150.png differ
diff --git a/public/riot-glitch.png b/public/riot-glitch.png
new file mode 100644
index 000000000..1c97ce5f1
Binary files /dev/null and b/public/riot-glitch.png differ
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index f7f78d34c..c98530b58 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -596,8 +596,8 @@ RSpec.describe Account, type: :model do
expect(account).to model_have_error_on_field(:display_name)
end
- it 'is invalid if the note is longer than 160 characters' do
- account = Fabricate.build(:account, note: Faker::Lorem.characters(161))
+ it 'is invalid if the note is longer than 413 characters' do
+ account = Fabricate.build(:account, note: Faker::Lorem.characters(414))
account.valid?
expect(account).to model_have_error_on_field(:note)
end
@@ -642,8 +642,8 @@ RSpec.describe Account, type: :model do
expect(account).not_to model_have_error_on_field(:display_name)
end
- it 'is valid even if the note is longer than 160 characters' do
- account = Fabricate.build(:account, domain: 'domain', note: Faker::Lorem.characters(161))
+ it 'is valid even if the note is longer than 413 characters' do
+ account = Fabricate.build(:account, domain: 'domain', note: Faker::Lorem.characters(414))
account.valid?
expect(account).not_to model_have_error_on_field(:note)
end
diff --git a/yarn.lock b/yarn.lock
index 9ff12a712..0325035f4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1272,6 +1272,10 @@ atob@^2.1.1:
resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
+atrament@^0.2.3:
+ version "0.2.3"
+ resolved "https://registry.yarnpkg.com/atrament/-/atrament-0.2.3.tgz#6ccbc0daa6d3f25e5aeaeb31befeb78e86980348"
+
autoprefixer@^9.4.3:
version "9.4.3"
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.3.tgz#c97384a8fd80477b78049163a91bbc725d9c41d9"
@@ -9607,6 +9611,10 @@ websocket.js@^0.1.12:
dependencies:
backoff "^2.4.1"
+what-input@^4.3.1:
+ version "4.3.1"
+ resolved "https://registry.yarnpkg.com/what-input/-/what-input-4.3.1.tgz#b8ea7554ba1d9171887c4c6addf28185fec3d31d"
+
whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3:
version "1.0.5"
resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0"
+} + +// Utility for converting base64 image to binary for upload +// https://stackoverflow.com/questions/35940290/how-to-convert-base64-string-to-javascript-file-object-like-as-from-file-input-f +function dataURLtoFile(dataurl, filename) { + let arr = dataurl.split(','), mime = arr[0].match(/:(.*?);/)[1], + bstr = atob(arr[1]), n = bstr.length, u8arr = new Uint8Array(n); + while(n--){ + u8arr[n] = bstr.charCodeAt(n); + } + return new File([u8arr], filename, { type: mime }); +} + +const DOODLE_SIZES = { + normal: [500, 500, 'Square 500'], + tootbanner: [702, 330, 'Tootbanner'], + s640x480: [640, 480, '640×480 - 480p'], + s800x600: [800, 600, '800×600 - SVGA'], + s720x480: [720, 405, '720x405 - 16:9'], +}; + + +const mapStateToProps = state => ({ + options: state.getIn(['compose', 'doodle']), +}); + +const mapDispatchToProps = dispatch => ({ + /** Set options in the redux store */ + setOpt: (opts) => dispatch(doodleSet(opts)), + /** Submit doodle for upload */ + submit: (file) => dispatch(uploadCompose([file])), +}); + +/** + * Doodling dialog with drawing canvas + * + * Keyboard shortcuts: + * - Delete: Clear screen, fill with background color + * - Backspace, Ctrl+Z: Undo one step + * - Ctrl held while drawing: Use background color + * - Shift held while clicking screen: Use fill tool + * + * Palette: + * - Left mouse button: pick foreground + * - Ctrl + left mouse button: pick background + * - Right mouse button: pick background + */ +@connect(mapStateToProps, mapDispatchToProps) +export default class DoodleModal extends ImmutablePureComponent { + + static propTypes = { + options: ImmutablePropTypes.map, + onClose: PropTypes.func.isRequired, + setOpt: PropTypes.func.isRequired, + submit: PropTypes.func.isRequired, + }; + + //region Option getters/setters + + /** Foreground color */ + get fg () { + return this.props.options.get('fg'); + } + set fg (value) { + this.props.setOpt({ fg: value }); + } + + /** Background color */ + get bg () { + return this.props.options.get('bg'); + } + set bg (value) { + this.props.setOpt({ bg: value }); + } + + /** Swap Fg and Bg for drawing */ + get swapped () { + return this.props.options.get('swapped'); + } + set swapped (value) { + this.props.setOpt({ swapped: value }); + } + + /** Mode - 'draw' or 'fill' */ + get mode () { + return this.props.options.get('mode'); + } + set mode (value) { + this.props.setOpt({ mode: value }); + } + + /** Base line weight */ + get weight () { + return this.props.options.get('weight'); + } + set weight (value) { + this.props.setOpt({ weight: value }); + } + + /** Drawing opacity */ + get opacity () { + return this.props.options.get('opacity'); + } + set opacity (value) { + this.props.setOpt({ opacity: value }); + } + + /** Adaptive stroke - change width with speed */ + get adaptiveStroke () { + return this.props.options.get('adaptiveStroke'); + } + set adaptiveStroke (value) { + this.props.setOpt({ adaptiveStroke: value }); + } + + /** Smoothing (for mouse drawing) */ + get smoothing () { + return this.props.options.get('smoothing'); + } + set smoothing (value) { + this.props.setOpt({ smoothing: value }); + } + + /** Size preset */ + get size () { + return this.props.options.get('size'); + } + set size (value) { + this.props.setOpt({ size: value }); + } + + //endregion + + /** Key up handler */ + handleKeyUp = (e) => { + if (e.target.nodeName === 'INPUT') return; + + if (e.key === 'Delete') { + e.preventDefault(); + this.handleClearBtn(); + return; + } + + if (e.key === 'Backspace' || (e.key === 'z' && (e.ctrlKey || e.metaKey))) { + e.preventDefault(); + this.undo(); + } + + if (e.key === 'Control' || e.key === 'Meta') { + this.controlHeld = false; + this.swapped = false; + } + + if (e.key === 'Shift') { + this.shiftHeld = false; + this.mode = 'draw'; + } + }; + + /** Key down handler */ + handleKeyDown = (e) => { + if (e.key === 'Control' || e.key === 'Meta') { + this.controlHeld = true; + this.swapped = true; + } + + if (e.key === 'Shift') { + this.shiftHeld = true; + this.mode = 'fill'; + } + }; + + /** + * Component installed in the DOM, do some initial set-up + */ + componentDidMount () { + this.controlHeld = false; + this.shiftHeld = false; + this.swapped = false; + window.addEventListener('keyup', this.handleKeyUp, false); + window.addEventListener('keydown', this.handleKeyDown, false); + }; + + /** + * Tear component down + */ + componentWillUnmount () { + window.removeEventListener('keyup', this.handleKeyUp, false); + window.removeEventListener('keydown', this.handleKeyDown, false); + if (this.sketcher) this.sketcher.destroy(); + } + + /** + * Set reference to the canvas element. + * This is called during component init + * + * @param elem - canvas element + */ + setCanvasRef = (elem) => { + this.canvas = elem; + if (elem) { + elem.addEventListener('dirty', () => { + this.saveUndo(); + this.sketcher._dirty = false; + }); + + elem.addEventListener('click', () => { + // sketcher bug - does not fire dirty on fill + if (this.mode === 'fill') { + this.saveUndo(); + } + }); + + // prevent context menu + elem.addEventListener('contextmenu', (e) => { + e.preventDefault(); + }); + + elem.addEventListener('mousedown', (e) => { + if (e.button === 2) { + this.swapped = true; + } + }); + + elem.addEventListener('mouseup', (e) => { + if (e.button === 2) { + this.swapped = this.controlHeld; + } + }); + + this.initSketcher(elem); + this.mode = 'draw'; // Reset mode - it's confusing if left at 'fill' + } + }; + + /** + * Set up the sketcher instance + * + * @param canvas - canvas element. Null if we're just resizing + */ + initSketcher (canvas = null) { + const sizepreset = DOODLE_SIZES[this.size]; + + if (this.sketcher) this.sketcher.destroy(); + this.sketcher = new Atrament(canvas || this.canvas, sizepreset[0], sizepreset[1]); + + if (canvas) { + this.ctx = this.sketcher.context; + this.updateSketcherSettings(); + } + + this.clearScreen(); + } + + /** + * Done button handler + */ + onDoneButton = () => { + const dataUrl = this.sketcher.toImage(); + const file = dataURLtoFile(dataUrl, 'doodle.png'); + this.props.submit(file); + this.props.onClose(); // close dialog + }; + + /** + * Cancel button handler + */ + onCancelButton = () => { + if (this.undos.length > 1 && !confirm('Discard doodle? All changes will be lost!')) { + return; + } + + this.props.onClose(); // close dialog + }; + + /** + * Update sketcher options based on state + */ + updateSketcherSettings () { + if (!this.sketcher) return; + + if (this.oldSize !== this.size) this.initSketcher(); + + this.sketcher.color = (this.swapped ? this.bg : this.fg); + this.sketcher.opacity = this.opacity; + this.sketcher.weight = this.weight; + this.sketcher.mode = this.mode; + this.sketcher.smoothing = this.smoothing; + this.sketcher.adaptiveStroke = this.adaptiveStroke; + + this.oldSize = this.size; + } + + /** + * Fill screen with background color + */ + clearScreen = () => { + this.ctx.fillStyle = this.bg; + this.ctx.fillRect(-1, -1, this.canvas.width+2, this.canvas.height+2); + this.undos = []; + + this.doSaveUndo(); + }; + + /** + * Undo one step + */ + undo = () => { + if (this.undos.length > 1) { + this.undos.pop(); + const buf = this.undos.pop(); + + this.sketcher.clear(); + this.ctx.putImageData(buf, 0, 0); + this.doSaveUndo(); + } + }; + + /** + * Save canvas content into the undo buffer immediately + */ + doSaveUndo = () => { + this.undos.push(this.ctx.getImageData(0, 0, this.canvas.width, this.canvas.height)); + }; + + /** + * Called on each canvas change. + * Saves canvas content to the undo buffer after some period of inactivity. + */ + saveUndo = debounce(() => { + this.doSaveUndo(); + }, 100); + + /** + * Palette left click. + * Selects Fg color (or Bg, if Control/Meta is held) + * + * @param e - event + */ + onPaletteClick = (e) => { + const c = e.target.dataset.color; + + if (this.controlHeld) { + this.bg = c; + } else { + this.fg = c; + } + + e.target.blur(); + e.preventDefault(); + }; + + /** + * Palette right click. + * Selects Bg color + * + * @param e - event + */ + onPaletteRClick = (e) => { + this.bg = e.target.dataset.color; + e.target.blur(); + e.preventDefault(); + }; + + /** + * Handle click on the Draw mode button + * + * @param e - event + */ + setModeDraw = (e) => { + this.mode = 'draw'; + e.target.blur(); + }; + + /** + * Handle click on the Fill mode button + * + * @param e - event + */ + setModeFill = (e) => { + this.mode = 'fill'; + e.target.blur(); + }; + + /** + * Handle click on Smooth checkbox + * + * @param e - event + */ + tglSmooth = (e) => { + this.smoothing = !this.smoothing; + e.target.blur(); + }; + + /** + * Handle click on Adaptive checkbox + * + * @param e - event + */ + tglAdaptive = (e) => { + this.adaptiveStroke = !this.adaptiveStroke; + e.target.blur(); + }; + + /** + * Handle change of the Weight input field + * + * @param e - event + */ + setWeight = (e) => { + this.weight = +e.target.value || 1; + }; + + /** + * Set size - clalback from the select box + * + * @param e - event + */ + changeSize = (e) => { + let newSize = e.target.value; + if (newSize === this.oldSize) return; + + if (this.undos.length > 1 && !confirm('Change size? This will erase your drawing!')) { + return; + } + + this.size = newSize; + }; + + handleClearBtn = () => { + if (this.undos.length > 1 && !confirm('Clear screen? This will erase your drawing!')) { + return; + } + + this.clearScreen(); + }; + + /** + * Render the component + */ + render () { + this.updateSketcherSettings(); + + return ( +
+
+ );
+ }
+
+}
diff --git a/app/javascript/mastodon/features/ui/components/modal_root.js b/app/javascript/mastodon/features/ui/components/modal_root.js
index cc2ab6c8c..493dc92e7 100644
--- a/app/javascript/mastodon/features/ui/components/modal_root.js
+++ b/app/javascript/mastodon/features/ui/components/modal_root.js
@@ -8,6 +8,7 @@ import ActionsModal from './actions_modal';
import MediaModal from './media_modal';
import VideoModal from './video_modal';
import BoostModal from './boost_modal';
+import DoodleModal from './doodle_modal';
import ConfirmationModal from './confirmation_modal';
import FocalPointModal from './focal_point_modal';
import {
@@ -22,6 +23,7 @@ const MODAL_COMPONENTS = {
'MEDIA': () => Promise.resolve({ default: MediaModal }),
'VIDEO': () => Promise.resolve({ default: VideoModal }),
'BOOST': () => Promise.resolve({ default: BoostModal }),
+ 'DOODLE': () => Promise.resolve({ default: DoodleModal }),
'CONFIRM': () => Promise.resolve({ default: ConfirmationModal }),
'MUTE': MuteModal,
'REPORT': ReportModal,
@@ -43,6 +45,16 @@ export default class ModalRoot extends React.PureComponent {
getSnapshotBeforeUpdate () {
return { visible: !!this.props.type };
}
+ state = {
+ revealed: false,
+ };
+
+ handleKeyUp = (e) => {
+ if ((e.key === 'Escape' || e.key === 'Esc' || e.keyCode === 27)
+ && !!this.props.type && !this.props.props.noEsc) {
+ this.props.onClose();
+ }
+ }
componentDidUpdate (prevProps, prevState, { visible }) {
if (visible) {
@@ -53,7 +65,7 @@ export default class ModalRoot extends React.PureComponent {
}
renderLoading = modalId => () => {
- return ['MEDIA', 'VIDEO', 'BOOST', 'CONFIRM', 'ACTIONS'].indexOf(modalId) === -1 ?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {
+ palReordered.map((c, i) =>
+ c === null ?
+
: + + ) + } +
+ : + + ) + } +
A good place for rules
+The extended description has not been set up yet.
+ features: + humane_approach_body: Learning from failures of other networks, Mastodon aims to make ethical design choices to combat the misuse of social media. + humane_approach_title: A more humane approach + not_a_product_body: Mastodon is not a commercial network. No advertising, no data mining, no walled gardens. There is no central authority. + not_a_product_title: You’re a person, not a product + real_conversation_body: With 512 characters at your disposal and support for granular content and media warnings, you can express yourself the way you want to. + real_conversation_title: Built for real conversation + within_reach_body: Multiple apps for iOS, Android, and other platforms thanks to a developer-friendly API ecosystem allow you to keep up with your friends anywhere. + within_reach_title: Always within reach + find_another_instance: Find another instance + generic_description: "%{domain} is one server in the network" + hosted_on: Mastodon hosted on %{domain} + learn_more: Learn more + other_instances: Instance list + source_code: Source code + status_count_after: pings + status_count_before: Who authored + user_count_after: users + user_count_before: Home to + what_is_mastodon: What is Mastodon? + accounts: + follow: Follow + followers: Followers + following: Following + media: Media + nothing_here: There is nothing here! + people_followed_by: People whom %{name} follows + people_who_follow: People who follow %{name} + posts: Pings + posts_with_replies: Pings with replies + remote_follow: Remote follow + reserved_username: The username is reserved + roles: + admin: Admin + unfollow: Unfollow + admin: + accounts: + are_you_sure: Are you sure? + confirm: Confirm + confirmed: Confirmed + disable_two_factor_authentication: Disable 2FA + display_name: Display name + domain: Domain + edit: Edit + email: E-mail + feed_url: Feed URL + followers: Followers + follows: Follows + inbox_url: Inbox URL + ip: IP + location: + all: All + local: Local + remote: Remote + title: Location + media_attachments: Media attachments + moderation: + all: All + silenced: Silenced + suspended: Suspended + title: Moderation + most_recent_activity: Most recent activity + most_recent_ip: Most recent IP + not_subscribed: Not subscribed + order: + alphabetic: Alphabetic + most_recent: Most recent + title: Order + outbox_url: Outbox URL + perform_full_suspension: Perform full suspension + profile_url: Profile URL + protocol: Protocol + public: Public + push_subscription_expires: PuSH subscription expires + redownload: Refresh avatar + reset: Reset + reset_password: Reset password + resubscribe: Resubscribe + salmon_url: Salmon URL + search: Search + show: + created_reports: Reports created by this account + report: report + targeted_reports: Reports made about this account + silence: Silence + statuses: Statuses + subscribe: Subscribe + title: Accounts + undo_silenced: Undo silence + undo_suspension: Undo suspension + unsubscribe: Unsubscribe + username: Username + web: Web + domain_blocks: + add_new: Add new + created_msg: Domain block is now being processed + destroyed_msg: Domain block has been undone + domain: Domain + new: + create: Create block + hint: The domain block will not prevent creation of account entries in the database, but will retroactively and automatically apply specific moderation methods on those accounts. + severity: + desc_html: "Silence will make the account's posts invisible to anyone who isn't following them. Suspend will remove all of the account's content, media, and profile data. Use None if you just want to reject media files." + noop: None + silence: Silence + suspend: Suspend + title: New domain block + reject_media: Reject media files + reject_media_hint: Removes locally stored media files and refuses to download any in the future. Irrelevant for suspensions + severities: + noop: None + silence: Silence + suspend: Suspend + severity: Severity + show: + affected_accounts: + one: One account in the database affected + other: "%{count} accounts in the database affected" + retroactive: + silence: Unsilence all existing accounts from this domain + suspend: Unsuspend all existing accounts from this domain + title: Undo domain block for %{domain} + undo: Undo + title: Domain Blocks + undo: Undo + instances: + account_count: Known accounts + domain_name: Domain + title: Known Instances + reports: + action_taken_by: Action taken by + are_you_sure: Are you sure? + comment: + label: Comment + none: None + delete: Delete + id: ID + mark_as_resolved: Mark as resolved + nsfw: + 'false': Unhide media attachments + 'true': Hide media attachments + report: 'Report #%{id}' + report_contents: Contents + reported_account: Reported account + reported_by: Reported by + resolved: Resolved + silence_account: Silence account + status: Status + suspend_account: Suspend account + target: Target + title: Reports + unresolved: Unresolved + view: View + settings: + bootstrap_timeline_accounts: + desc_html: Separate multiple usernames by comma. Only local and unlocked accounts will work. Default when empty is all local admins. + title: Default follows for new users + contact_information: + email: Business e-mail + username: Contact username + registrations: + closed_message: + desc_html: Displayed on frontpage when registrations are closed. You can use HTML tags + title: Closed registration message + deletion: + desc_html: Allow anyone to delete their account + title: Open account deletion + open: + desc_html: Allow anyone to create an account + title: Open registration + site_description: + desc_html: Introductory paragraph on the frontpage and in meta tags. You can use HTML tags, in particular<a> and <em>.
+ title: Instance description
+ site_description_extended:
+ desc_html: A good place for your code of conduct, rules, guidelines and other things that set your instance apart. You can use HTML tags
+ title: Custom extended information
+ site_terms:
+ desc_html: You can write your own privacy policy, terms of service or other legalese. You can use HTML tags
+ title: Custom terms of service
+ site_title: Instance name
+ timeline_preview:
+ desc_html: Display public timeline on landing page
+ title: Timeline preview
+ title: Site Settings
+ statuses:
+ back_to_account: Back to account page
+ batch:
+ delete: Delete
+ nsfw_off: NSFW OFF
+ nsfw_on: NSFW ON
+ execute: Execute
+ failed_to_execute: Failed to execute
+ media:
+ hide: Hide media
+ show: Show media
+ title: Media
+ no_media: No media
+ title: Account statuses
+ with_media: With media
+ subscriptions:
+ callback_url: Callback URL
+ confirmed: Confirmed
+ expires_in: Expires in
+ last_delivery: Last delivery
+ title: WebSub
+ topic: Topic
+ title: Administration
+ admin_mailer:
+ new_report:
+ body: "%{reporter} has reported %{target}"
+ subject: New report for %{instance} (#%{id})
+ application_mailer:
+ salutation: "%{name},"
+ settings: 'Change e-mail preferences: %{link}'
+ signature: Mastodon notifications from %{instance}
+ view: 'View:'
+ applications:
+ created: Application successfully created
+ destroyed: Application successfully deleted
+ invalid_url: The provided URL is invalid
+ regenerate_token: Regenerate access token
+ token_regenerated: Access token successfully regenerated
+ warning: Be very careful with this data. Never share it with anyone!
+ your_token: Your access token
+ auth:
+ agreement_html: By signing up you agree to our terms of service and privacy policy.
+ change_password: Security
+ delete_account: Delete account
+ delete_account_html: If you wish to delete your account, you can proceed here. You will be asked for confirmation.
+ didnt_get_confirmation: Didn't receive confirmation instructions?
+ forgot_password: Forgot your password?
+ invalid_reset_password_token: Password reset token is invalid or expired. Please try again.
+ login: Jack in
+ logout: Jack out
+ register: Apply for upload
+ resend_confirmation: Resend confirmation instructions
+ reset_password: Reset password
+ set_new_password: Set new password
+ authorize_follow:
+ error: Unfortunately, there was an error looking up the remote account
+ follow: Follow
+ follow_request: 'You have sent a follow request to:'
+ following: 'Success! You are now following:'
+ post_follow:
+ close: Or, you can just close this window.
+ return: Return to the user's profile
+ web: Go to web
+ title: Follow %{acct}
+ datetime:
+ distance_in_words:
+ about_x_hours: "%{count}h"
+ about_x_months: "%{count}mo"
+ about_x_years: "%{count}y"
+ almost_x_years: "%{count}y"
+ half_a_minute: Just now
+ less_than_x_minutes: "%{count}m"
+ less_than_x_seconds: Just now
+ over_x_years: "%{count}y"
+ x_days: "%{count}d"
+ x_minutes: "%{count}m"
+ x_months: "%{count}mo"
+ x_seconds: "%{count}s"
+ deletes:
+ bad_password_msg: Nice try, hackers! Incorrect password
+ confirm_password: Enter your current password to verify your identity
+ description_html: This will permanently, irreversibly remove content from your account and deactivate it. Your username will remain reserved to prevent future impersonations.
+ proceed: Delete account
+ success_msg: Your account was successfully deleted
+ warning_html: Only deletion of content from this particular instance is guaranteed. Content that has been widely shared is likely to leave traces. Offline servers and servers that have unsubscribed from your updates will not update their databases.
+ warning_title: Disseminated content availability
+ errors:
+ '403': You don't have permission to view this page.
+ '404': The page you were looking for doesn't exist.
+ '410': The page you were looking for doesn't exist anymore.
+ '422':
+ content: Security verification failed. Are you blocking cookies?
+ title: Security verification failed
+ '429': Throttled
+ noscript_html: To use the Mastodon web application, please enable JavaScript. Alternatively, try one of the native apps for Mastodon for your platform.
+ exports:
+ blocks: You block
+ csv: CSV
+ follows: You follow
+ mutes: You mute
+ storage: Media storage
+ followers:
+ domain: Domain
+ explanation_html: If you want to ensure the privacy of your pings , you must be aware of who is following you. Your private pings are delivered to all instances where you have followers. You may wish to review them, and remove followers if you do not trust your privacy to be respected by the staff or software of those instances.
+ followers_count: Number of followers
+ lock_link: Lock your account
+ purge: Remove from followers
+ success:
+ one: In the process of soft-blocking followers from one domain...
+ other: In the process of soft-blocking followers from %{count} domains...
+ true_privacy_html: Please mind that true privacy can only be achieved with end-to-end encryption.
+ unlocked_warning_html: Anyone can follow you to immediately view your private pings. %{lock_link} to be able to review and reject followers.
+ unlocked_warning_title: Your account is not locked
+ generic:
+ changes_saved_msg: Changes successfully saved!
+ powered_by: powered by %{link}
+ save_changes: Save changes
+ validation_errors:
+ one: Something isn't quite right yet! Please review the error below
+ other: Something isn't quite right yet! Please review %{count} errors below
+ imports:
+ preface: You can import data that you have exported from another instance, such as a list of the people you are following or blocking.
+ success: Your data was successfully uploaded and will now be processed in due time
+ types:
+ blocking: Blocking list
+ following: Following list
+ muting: Muting list
+ upload: Upload
+ landing_strip_html: "%{name} is a user on %{link_to_root_path}. You can follow them or interact with them if you have an account anywhere in the fediverse."
+ landing_strip_signup_html: If you don't, you can sign up here.
+ media_attachments:
+ validations:
+ images_and_video: Cannot attach a video to a ping that already contains images
+ too_many: Cannot attach more than 4 files
+ notification_mailer:
+ digest:
+ body: 'Here is a brief summary of what you missed on %{instance} since your last visit on %{since}:'
+ mention: "%{name} mentioned you in:"
+ new_followers_summary:
+ one: You have acquired one new follower! Yay!
+ other: You have gotten %{count} new followers! Amazing!
+ subject:
+ one: "1 new notification since your last visit \U0001F418"
+ other: "%{count} new notifications since your last visit \U0001F418"
+ favourite:
+ body: 'Your ping was florped by %{name}:'
+ subject: "%{name} florped your ping"
+ follow:
+ body: "%{name} is now following you!"
+ subject: "%{name} is now following you"
+ follow_request:
+ body: "%{name} has requested to follow you"
+ subject: 'Pending follower: %{name}'
+ mention:
+ body: 'You were mentioned by %{name} in:'
+ subject: You were mentioned by %{name}
+ reblog:
+ body: 'Your ping was relayed by %{name}:'
+ subject: "%{name} relayed your ping"
+ number:
+ human:
+ decimal_units:
+ format: "%n%u"
+ units:
+ billion: B
+ million: M
+ quadrillion: Q
+ thousand: K
+ trillion: T
+ unit: ''
+ pagination:
+ next: Next
+ prev: Prev
+ truncate: "…"
+ push_notifications:
+ favourite:
+ title: "%{name} favourited your status"
+ follow:
+ title: "%{name} is now following you"
+ group:
+ title: "%{count} notifications"
+ mention:
+ action_boost: Boost
+ action_expand: Show more
+ action_favourite: Favourite
+ title: "%{name} mentioned you"
+ reblog:
+ title: "%{name} boosted your status"
+ remote_follow:
+ acct: Enter your username@domain you want to follow from
+ missing_resource: Could not find the required redirect URL for your account
+ proceed: Proceed to follow
+ prompt: 'You are going to follow:'
+ sessions:
+ activity: Last activity
+ browser: Browser
+ browsers:
+ alipay: Alipay
+ blackberry: Blackberry
+ chrome: Chrome
+ edge: Microsoft Edge
+ firefox: Firefox
+ generic: Unknown browser
+ ie: Internet Explorer
+ micro_messenger: MicroMessenger
+ nokia: Nokia S40 Ovi Browser
+ opera: Opera
+ phantom_js: PhantomJS
+ qq: QQ Browser
+ safari: Safari
+ uc_browser: UCBrowser
+ weibo: Weibo
+ current_session: Current session
+ description: "%{browser} on %{platform}"
+ explanation: These are the web browsers currently logged in to your cybre.space account.
+ ip: IP
+ platforms:
+ adobe_air: Adobe Air
+ android: Android
+ blackberry: Blackberry
+ chrome_os: ChromeOS
+ firefox_os: Firefox OS
+ ios: iOS
+ linux: Linux
+ mac: Mac
+ other: unknown platform
+ windows: Windows
+ windows_mobile: Windows Mobile
+ windows_phone: Windows Phone
+ revoke: Revoke
+ revoke_success: Session successfully revoked
+ title: Sessions
+ settings:
+ authorized_apps: Authorized apps
+ back: Back to Mastodon
+ delete: Account deletion
+ development: Development
+ edit_profile: edit ~/.profile
+ export: Data export
+ followers: Authorized followers
+ import: Import
+ preferences: Preferences
+ settings: Settings
+ two_factor_authentication: Two-factor Authentication
+ your_apps: Your applications
+ statuses:
+ open_in_web: Open in web
+ over_character_limit: character limit of %{max} exceeded
+ pin_errors:
+ limit: You have already pinned the maximum number of pings
+ ownership: Someone else's ping cannot be pinned
+ private: Non-public pings cannot be pinned
+ reblog: A boost cannot be pinned
+ show_more: Show more
+ visibilities:
+ private: Followers-only
+ private_long: Only show to followers
+ public: Public
+ public_long: Everyone can see
+ unlisted: Unlisted
+ unlisted_long: Everyone can see, but not listed on public timelines
+ stream_entries:
+ click_to_show: Click to show
+ pinned: Pinned ping
+ reblogged: relayed
+ sensitive_content: Sensitive content
+ terms:
+ body_html: |
+ Privacy Policy
+ +What information do we collect?
+ +We collect information from you when you register on our site and gather data when you participate in the forum by reading, writing, and evaluating the content shared here.
+ +When registering on our site, you may be asked to enter your name and e-mail address. You may, however, visit our site without registering. Your e-mail address will be verified by an email containing a unique link. If that link is visited, we know that you control the e-mail address.
+ +When registered and posting, we record the IP address that the post originated from. We also may retain server logs which include the IP address of every request to our server.
+ +What do we use your information for?
+ +Any of the information we collect from you may be used in one of the following ways:
+ +-
+
- To personalize your experience — your information helps us to better respond to your individual needs. +
- To improve our site — we continually strive to improve our site offerings based on the information and feedback we receive from you. +
- To improve customer service — your information helps us to more effectively respond to your customer service requests and support needs. +
- To send periodic emails — The email address you provide may be used to send you information, notifications that you request about changes to topics or in response to your user name, respond to inquiries, and/or other requests or questions. +
How do we protect your information?
+ +We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information.
+ +What is your data retention policy?
+ +We will make a good faith effort to:
+ +-
+
- Retain server logs containing the IP address of all requests to this server no more than 90 days. +
- Retain the IP addresses associated with registered users and their posts no more than 5 years. +
Do we use cookies?
+ +Yes. Cookies are small files that a site or its service provider transfers to your computer's hard drive through your Web browser (if you allow). These cookies enable the site to recognize your browser and, if you have a registered account, associate it with your registered account.
+ +We use cookies to understand and save your preferences for future visits and compile aggregate data about site traffic and site interaction so that we can offer better site experiences and tools in the future. We may contract with third-party service providers to assist us in better understanding our site visitors. These service providers are not permitted to use the information collected on our behalf except to help us conduct and improve our business.
+ +Do we disclose any information to outside parties?
+ +We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety. However, non-personally identifiable visitor information may be provided to other parties for marketing, advertising, or other uses.
+ +Third party links
+ +Occasionally, at our discretion, we may include or offer third party products or services on our site. These third party sites have separate and independent privacy policies. We therefore have no responsibility or liability for the content and activities of these linked sites. Nonetheless, we seek to protect the integrity of our site and welcome any feedback about these sites.
+ +Children's Online Privacy Protection Act Compliance
+ +Our site, products and services are all directed to people who are at least 13 years old. If this server is in the USA, and you are under the age of 13, per the requirements of COPPA (Children's Online Privacy Protection Act) do not use this site.
+ +Online Privacy Policy Only
+ +This online privacy policy applies only to information collected through our site and not to information collected offline.
+ +Your Consent
+ +By using our site, you consent to our web site privacy policy.
+ +Changes to our Privacy Policy
+ +If we decide to change our privacy policy, we will post those changes on this page.
+ +This document is CC-BY-SA. It was last updated May 31, 2013.
+ +Originally adapted from the Discourse privacy policy.
+ title: "%{instance} Terms of Service and Privacy Policy" + themes: + default: Cybrespace + mastodon: Mastodon + win95: Ｍａｓｔｏ 95 + time: + formats: + default: "%b %d, %Y, %H:%M" + two_factor_authentication: + code_hint: Enter the code generated by your authenticator app to confirm + description_html: If you enable two-factor authentication, logging in will require you to be in possession of your phone, which will generate tokens for you to enter. + disable: Disable + enable: Enable + enabled: Two-factor authentication is enabled + enabled_success: Two-factor authentication successfully enabled + generate_recovery_codes: Generate recovery codes + instructions_html: "Scan this QR code into Google Authenticator or a similiar TOTP app on your phone. From now on, that app will generate tokens that you will have to enter when logging in." + lost_recovery_codes: Recovery codes allow you to regain access to your account if you lose your phone. If you've lost your recovery codes, you can regenerate them here. Your old recovery codes will be invalidated. + manual_instructions: 'If you can''t scan the QR code and need to enter it manually, here is the plain-text secret:' + recovery_codes: Backup recovery codes + recovery_codes_regenerated: Recovery codes successfully regenerated + recovery_instructions_html: If you ever lose access to your phone, you can use one of the recovery codes below to regain access to your account. Keep the recovery codes safe. For example, you may print them and store them with other important documents. + setup: Set up + wrong_code: The entered code was invalid! Are server time and device time correct? + users: + invalid_email: The e-mail address is invalid + invalid_otp_token: Invalid two-factor code + signed_in_as: 'Signed in as:' diff --git a/config/locales/en.yml b/config/locales/en.yml index a6e7e70a5..f8dc59160 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -931,8 +931,11 @@ en: title: "%{instance} Terms of Service and Privacy Policy" themes: contrast: Mastodon (High contrast) - default: Mastodon (Dark) - mastodon-light: Mastodon (Light) + default: Cybrespace + mastodon: Mastodon (Dark) + mastodon-light: Mastodon (light) + win95: Windows 95 + light: Cybre Lite time: formats: default: "%b %d, %Y, %H:%M" diff --git a/config/locales/simple_form.en-CY.yml b/config/locales/simple_form.en-CY.yml new file mode 100644 index 000000000..44acd8a39 --- /dev/null +++ b/config/locales/simple_form.en-CY.yml @@ -0,0 +1,127 @@ +--- +en-CY: + simple_form: + hints: + account_warning_preset: + text: You can use ping syntax, such as URLs, hashtags and mentions + admin_account_action: + send_email_notification: The user will receive an explanation of what happened with their account + text_html: Optional. You can use ping syntax. You can add warning presets to save time + type_html: Choose what to do with %{acct} + warning_preset_id: Optional. You can still add custom text to end of the preset + defaults: + autofollow: People who sign up through the invite will automatically follow you + avatar: PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px + bot: This account mainly performs automated actions and might not be monitored + context: One or multiple contexts where the filter should apply + digest: Only sent after a long period of inactivity and only if you have received any personal messages in your absence + discoverable_html: The directory lets people find accounts based on interests and activity. Requires at least %{min_followers} followers + email: You will be sent a confirmation e-mail + fields: You can have up to 4 items displayed as a table on your profile + header: PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px + inbox_url: Copy the URL from the frontpage of the relay you want to use + irreversible: Filtered pings will disappear irreversibly, even if filter is later removed + locale: The language of the user interface, e-mails and push notifications + locked: Requires you to manually approve followers + password: Use at least 8 characters + phrase: Will be matched regardless of casing in text or content warning of a pings + 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 relays for pings that have been recently relayed (only affects newly-received relays) + setting_default_language: The language of your pings can be detected automatically, but it's not always accurate + setting_display_media_default: Hide media marked as sensitive + setting_display_media_hide_all: Always hide all media + setting_display_media_show_all: Always show media marked as sensitive + setting_hide_network: Who you follow and who follows you will not be shown on your profile + setting_noindex: Affects your public profile and status pages + setting_theme: Affects how Mastodon looks when you're logged in from any device. + username: Your username will be unique on %{domain} + whole_word: When the keyword or phrase is alphanumeric only, it will only be applied if it matches the whole word + imports: + data: CSV file exported from another Mastodon instance + sessions: + otp: 'Enter the two-factor code generated by your phone app or use one of your recovery codes:' + user: + chosen_languages: When checked, only pings in selected languages will be displayed in public timelines + labels: + account: + fields: + name: Label + value: Content + account_warning_preset: + text: Preset text + admin_account_action: + send_email_notification: Notify the user per e-mail + text: Custom warning + type: Action + types: + disable: Disable + none: Do nothing + silence: Silence + suspend: Suspend and irreversibly delete account data + warning_preset_id: Use a warning preset + defaults: + autofollow: Invite to follow your account + avatar: Avatar + bot: This is a bot account + chosen_languages: Filter languages + confirm_new_password: Confirm new password + confirm_password: Confirm password + context: Filter contexts + current_password: Current password + data: Data + discoverable: List this account on the directory + display_name: Display name + email: E-mail address + expires_in: Expire after + fields: Profile metadata + header: Header + inbox_url: URL of the relay inbox + irreversible: Drop instead of hide + locale: Interface language + locked: Lock account + max_uses: Max number of uses + new_password: New password + note: Bio + otp_attempt: Two-factor code + password: Password + phrase: Keyword or phrase + setting_aggregate_reblogs: Group relays in timelines + setting_auto_play_gif: Auto-play animated GIFs + setting_boost_modal: Show confirmation dialog before relaying + setting_default_language: Posting language + setting_default_privacy: Post privacy + setting_default_sensitive: Always mark media as sensitive + setting_delete_modal: Show confirmation dialog before deleting a ping + setting_display_media: Media display + setting_display_media_default: Default + setting_display_media_hide_all: Hide all + setting_display_media_show_all: Show all + setting_expand_spoilers: Always expand pings marked with content warnings + setting_hide_network: Hide your network + setting_noindex: Opt-out of search engine indexing + setting_reduce_motion: Reduce motion in animations + setting_system_font_ui: Use system's default font + setting_theme: Site theme + setting_unfollow_modal: Show confirmation dialog before unfollowing someone + severity: Severity + type: Import type + username: Username + username_or_email: Username or Email + whole_word: Whole word + interactions: + must_be_follower: Block notifications from non-followers + must_be_following: Block notifications from people you don't follow + must_be_following_dm: Block direct messages from people you don't follow + notification_emails: + digest: Send digest e-mails + favourite: Send e-mail when someone favourites your status + follow: Send e-mail when someone follows you + follow_request: Send e-mail when someone requests to follow you + mention: Send e-mail when someone mentions you + reblog: Send e-mail when someone relays your status + report: Send e-mail when a new report is submitted + 'no': 'No' + required: + mark: "*" + text: required + 'yes': 'Yes' diff --git a/config/settings.yml b/config/settings.yml index 4f7c2c8f3..4f0aa9481 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -2,7 +2,7 @@ # important settings can be changed from the admin interface. defaults: &defaults - site_title: Mastodon + site_title: 'Cybrespace' site_short_description: '' site_description: '' site_extended_description: '' diff --git a/config/themes.yml b/config/themes.yml index 9c21c9459..05e7943be 100644 --- a/config/themes.yml +++ b/config/themes.yml @@ -1,3 +1,6 @@ -default: styles/application.scss +default: styles/cybre.scss +mastodon: styles/application.scss contrast: styles/contrast.scss mastodon-light: styles/mastodon-light.scss +light: styles/cybre-light.scss +win95: styles/win95.scss diff --git a/db/migrate/20171026200500_en_to_en_cy.rb b/db/migrate/20171026200500_en_to_en_cy.rb new file mode 100644 index 000000000..0035e1dcd --- /dev/null +++ b/db/migrate/20171026200500_en_to_en_cy.rb @@ -0,0 +1,17 @@ +class EnToEnCy < ActiveRecord::Migration[5.1] + def up + User.find_each do |user| + if user.locale == 'en' + user.update(locale: 'en-CY') + end + end + end + + def down + User.find_each do |user| + if user.locale == 'en-CY' + user.update(locale: 'en') + end + end + end +end diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake index ee9657b0e..9538a5e0d 100644 --- a/lib/tasks/mastodon.rake +++ b/lib/tasks/mastodon.rake @@ -388,6 +388,28 @@ namespace :mastodon do end end + desc 'Machine-readably add a user by providing their email, username and initial password.' \ + 'The user will receive a confirmation email.' + task add_user_automatic: :environment do + print 'Enter email: ' + email = STDIN.gets.chomp + + print 'Enter username: ' + username = STDIN.gets.chomp + + print 'Enter password: ' + password = STDIN.gets.chomp + + user = User.new(email: email, password: password, account_attributes: { username: username }) + if user.save + puts 'User added and confirmation mail sent to user\'s email address.' + else + user.errors.each do |key, val| + STDERR.puts "#{key}: #{val}" + end + end + end + namespace :webpush do desc 'Generate VAPID key' task generate_vapid_key: :environment do diff --git a/package.json b/package.json index 5fa6fa8b7..96f451679 100644 --- a/package.json +++ b/package.json @@ -40,6 +40,7 @@ "@babel/runtime": "^7.2.0", "@gfx/zopfli": "^1.0.10", "array-includes": "^3.0.3", + "atrament": "^0.2.3", "autoprefixer": "^9.4.3", "axios": "^0.18.0", "babel-core": "^7.0.0-bridge.0", @@ -134,7 +135,8 @@ "webpack-bundle-analyzer": "^3.0.3", "webpack-cli": "^3.1.2", "webpack-merge": "^4.1.5", - "websocket.js": "^0.1.12" + "websocket.js": "^0.1.12", + "what-input": "^4.3.1" }, "devDependencies": { "babel-eslint": "^10.0.1", diff --git a/public/android-chrome-192x192.png b/public/android-chrome-192x192.png index 7a99a1964..8e9c26b58 100644 Binary files a/public/android-chrome-192x192.png and b/public/android-chrome-192x192.png differ diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png index b12aa55a3..691c1f20a 100644 Binary files a/public/apple-touch-icon.png and b/public/apple-touch-icon.png differ diff --git a/public/background-cybre.png b/public/background-cybre.png new file mode 100644 index 000000000..151fd5584 Binary files /dev/null and b/public/background-cybre.png differ diff --git a/public/browserconfig.xml b/public/browserconfig.xml index 7fdab5058..fcf794bc2 100644 --- a/public/browserconfig.xml +++ b/public/browserconfig.xml @@ -3,7 +3,7 @@