.
+
+*/
+
+ render () {
+ const { Message } = this;
+ const { type } = this.props;
+
+ return !type ? null : (
+
+ );
+ }
+
+}
diff --git a/app/javascript/glitch/components/status/visibility_icon.js b/app/javascript/glitch/components/status/visibility_icon.js
new file mode 100644
index 00000000000..017b69cbb4e
--- /dev/null
+++ b/app/javascript/glitch/components/status/visibility_icon.js
@@ -0,0 +1,48 @@
+// Package imports //
+import React from 'react';
+import PropTypes from 'prop-types';
+import { defineMessages, injectIntl } from 'react-intl';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+
+const messages = defineMessages({
+ public: { id: 'privacy.public.short', defaultMessage: 'Public' },
+ unlisted: { id: 'privacy.unlisted.short', defaultMessage: 'Unlisted' },
+ private: { id: 'privacy.private.short', defaultMessage: 'Followers-only' },
+ direct: { id: 'privacy.direct.short', defaultMessage: 'Direct' },
+});
+
+@injectIntl
+export default class VisibilityIcon extends ImmutablePureComponent {
+
+ static propTypes = {
+ visibility: PropTypes.string,
+ intl: PropTypes.object.isRequired,
+ withLabel: PropTypes.bool,
+ };
+
+ render() {
+ const { withLabel, visibility, intl } = this.props;
+
+ const visibilityClass = {
+ public: 'globe',
+ unlisted: 'unlock-alt',
+ private: 'lock',
+ direct: 'envelope',
+ }[visibility];
+
+ const label = intl.formatMessage(messages[visibility]);
+
+ const icon = ({icon} {label} );
+ } else {
+ return icon;
+ }
+ }
+
+}
diff --git a/app/javascript/glitch/locales/en.json b/app/javascript/glitch/locales/en.json
new file mode 100644
index 00000000000..69aa291082b
--- /dev/null
+++ b/app/javascript/glitch/locales/en.json
@@ -0,0 +1,44 @@
+{
+ "getting_started.open_source_notice": "Glitchsoc is free open source software forked from {Mastodon}. You can contribute or report issues on GitHub at {github}.",
+ "layout.auto": "Auto",
+ "layout.current_is": "Your current layout is:",
+ "layout.desktop": "Desktop",
+ "layout.mobile": "Mobile",
+ "navigation_bar.app_settings": "App settings",
+ "getting_started.onboarding": "Show me around",
+ "onboarding.page_one.federation": "{domain} is an 'instance' of Mastodon. Mastodon is a network of independent servers joining up to make one larger social network. We call these servers instances.",
+ "onboarding.page_one.welcome": "Welcome to {domain}!",
+ "onboarding.page_six.github": "{domain} runs on Glitchsoc. Glitchsoc is a friendly {fork} of {Mastodon}, and is compatible with any Mastodon instance or app. Glitchsoc is entirely free and open-source. You can report bugs, request features, or contribute to the code on {github}.",
+ "settings.auto_collapse": "Automatic collapsing",
+ "settings.auto_collapse_all": "Everything",
+ "settings.auto_collapse_lengthy": "Lengthy toots",
+ "settings.auto_collapse_media": "Toots with media",
+ "settings.auto_collapse_notifications": "Notifications",
+ "settings.auto_collapse_reblogs": "Boosts",
+ "settings.auto_collapse_replies": "Replies",
+ "settings.close": "Close",
+ "settings.collapsed_statuses": "Collapsed toots",
+ "settings.enable_collapsed": "Enable collapsed toots",
+ "settings.general": "General",
+ "settings.image_backgrounds": "Image backgrounds",
+ "settings.image_backgrounds_media": "Preview collapsed toot media",
+ "settings.image_backgrounds_users": "Give collapsed toots an image background",
+ "settings.media": "Media",
+ "settings.media_letterbox": "Letterbox media",
+ "settings.media_fullwidth": "Full-width media previews",
+ "settings.preferences": "User preferences",
+ "settings.wide_view": "Wide view (Desktop mode only)",
+ "settings.navbar_under": "Navbar at the bottom (Mobile only)",
+ "status.collapse": "Collapse",
+ "status.uncollapse": "Uncollapse",
+
+ "notification.markForDeletion": "Mark for deletion",
+ "notifications.clear": "Clear all my notifications",
+ "notifications.marked_clear_confirmation": "Are you sure you want to permanently clear all selected notifications?",
+ "notifications.marked_clear": "Clear selected notifications",
+
+ "notification_purge.btn_all": "Select\nall",
+ "notification_purge.btn_none": "Select\nnone",
+ "notification_purge.btn_invert": "Invert\nselection",
+ "notification_purge.btn_apply": "Clear\nselected"
+}
diff --git a/app/javascript/glitch/reducers/local_settings.js b/app/javascript/glitch/reducers/local_settings.js
new file mode 100644
index 00000000000..03654fbe22a
--- /dev/null
+++ b/app/javascript/glitch/reducers/local_settings.js
@@ -0,0 +1,126 @@
+/*
+
+`reducers/local_settings`
+========================
+
+> For more information on the contents of this file, please contact:
+>
+> - kibigo! [@kibi@glitch.social]
+
+This file provides our Redux reducers related to local settings. The
+associated actions are:
+
+ - __`STORE_HYDRATE` :__
+ Used to hydrate the store with its initial values.
+
+ - __`LOCAL_SETTING_CHANGE` :__
+ Used to change the value of a local setting in the store.
+
+*/
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+
+/*
+
+Imports:
+--------
+
+*/
+
+// Package imports //
+import { Map as ImmutableMap } from 'immutable';
+
+// Mastodon imports //
+import { STORE_HYDRATE } from '../../mastodon/actions/store';
+
+// Our imports //
+import { LOCAL_SETTING_CHANGE } from '../actions/local_settings';
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+
+/*
+
+initialState:
+-------------
+
+You can see the default values for all of our local settings here.
+These are only used if no previously-saved values exist.
+
+*/
+
+const initialState = ImmutableMap({
+ layout : 'auto',
+ stretch : true,
+ navbar_under : false,
+ side_arm : 'none',
+ collapsed : ImmutableMap({
+ enabled : true,
+ auto : ImmutableMap({
+ all : false,
+ notifications : true,
+ lengthy : true,
+ reblogs : false,
+ replies : false,
+ media : false,
+ }),
+ backgrounds : ImmutableMap({
+ user_backgrounds : false,
+ preview_images : false,
+ }),
+ }),
+ media : ImmutableMap({
+ letterbox : true,
+ fullwidth : true,
+ }),
+});
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+
+/*
+
+Helper functions:
+-----------------
+
+### `hydrate(state, localSettings)`
+
+`hydrate()` is used to hydrate the `local_settings` part of our store
+with its initial values. The `state` will probably just be the
+`initialState`, and the `localSettings` should be whatever we pulled
+from `localStorage`.
+
+*/
+
+const hydrate = (state, localSettings) => state.mergeDeep(localSettings);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+
+/*
+
+`localSettings(state = initialState, action)`:
+----------------------------------------------
+
+This function holds our actual reducer.
+
+If our action is `STORE_HYDRATE`, then we call `hydrate()` with the
+`local_settings` property of the provided `action.state`.
+
+If our action is `LOCAL_SETTING_CHANGE`, then we set `action.key` in
+our state to the provided `action.value`. Note that `action.key` MUST
+be an array, since we use `setIn()`.
+
+> __Note :__
+> We call this function `localSettings`, but its associated object
+> in the store is `local_settings`.
+
+*/
+
+export default function localSettings(state = initialState, action) {
+ switch(action.type) {
+ case STORE_HYDRATE:
+ return hydrate(state, action.state.get('local_settings'));
+ case LOCAL_SETTING_CHANGE:
+ return state.setIn(action.key, action.value);
+ default:
+ return state;
+ }
+};
diff --git a/app/javascript/glitch/util/bio_metadata.js b/app/javascript/glitch/util/bio_metadata.js
new file mode 100644
index 00000000000..599ec20e21d
--- /dev/null
+++ b/app/javascript/glitch/util/bio_metadata.js
@@ -0,0 +1,331 @@
+/*
+
+`util/bio_metadata`
+===================
+
+> For more information on the contents of this file, please contact:
+>
+> - kibigo! [@kibi@glitch.social]
+
+This file provides two functions for dealing with bio metadata. The
+functions are:
+
+ - __`processBio(content)` :__
+ Processes `content` to extract any frontmatter. The returned
+ object has two properties: `text`, which contains the text of
+ `content` sans-frontmatter, and `metadata`, which is an array
+ of key-value pairs (in two-element array format). If no
+ frontmatter was provided in `content`, then `metadata` will be
+ an empty array.
+
+ - __`createBio(note, data)` :__
+ Reverses the process in `processBio()`; takes a `note` and an
+ array of two-element arrays (which should give keys and values)
+ and outputs a string containing a well-formed bio with
+ frontmatter.
+
+*/
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+
+/*********************************************************************\
+
+ To my lovely code maintainers,
+
+ The syntax recognized by the Mastodon frontend for its bio metadata
+ feature is a subset of that provided by the YAML 1.2 specification.
+ In particular, Mastodon recognizes metadata which is provided as an
+ implicit YAML map, where each key-value pair takes up only a single
+ line (no multi-line values are permitted). To simplify the level of
+ processing required, Mastodon metadata frontmatter has been limited
+ to only allow those characters in the `c-printable` set, as defined
+ by the YAML 1.2 specification, instead of permitting those from the
+ `nb-json` characters inside double-quoted strings like YAML proper.
+ ¶ It is important to note that Mastodon only borrows the *syntax*
+ of YAML, not its semantics. This is to say, Mastodon won't make any
+ attempt to interpret the data it receives. `true` will not become a
+ boolean; `56` will not be interpreted as a number. Rather, each key
+ and every value will be read as a string, and as a string they will
+ remain. The order of the pairs is unchanged, and any duplicate keys
+ are preserved. However, YAML escape sequences will be replaced with
+ the proper interpretations according to the YAML 1.2 specification.
+ ¶ The implementation provided below interprets ` tag at the beginning of the bio. It replaces
+ the escaped character entities `'` and `"` with single or
+ double quotes, respectively, prior to processing. However, no other
+ escaped characters are replaced, not even those which might have an
+ impact on the syntax otherwise. These minor allowances are provided
+ because the Mastodon backend will insert these things automatically
+ into a bio before sending it through the API, so it is important we
+ account for them. Aside from this, the YAML frontmatter must be the
+ very first thing in the bio, leading with three consecutive hyphen-
+ minues (`---`), and ending with the same or, alternatively, instead
+ with three periods (`...`). No limits have been set with respect to
+ the number of characters permitted in the frontmatter, although one
+ should note that only limited space is provided for them in the UI.
+ ¶ The regular expression used to check the existence of, and then
+ process, the YAML frontmatter has been split into a number of small
+ components in the code below, in the vain hope that it will be much
+ easier to read and to maintain. I leave it to the future readers of
+ this code to determine the extent of my successes in this endeavor.
+
+ UPDATE 19 Oct 2017: We no longer allow character escapes inside our
+ double-quoted strings for ease of processing. We now internally use
+ the name "ƔAML" in our code to clarify that this is Not Quite YAML.
+
+ Sending love + warmth eternal,
+ - kibigo [@kibi@glitch.social]
+
+\*********************************************************************/
+
+/* "u" FLAG COMPATABILITY */
+
+let compat_mode = false;
+try {
+ new RegExp('.', 'u');
+} catch (e) {
+ compat_mode = true;
+}
+
+/* CONVENIENCE FUNCTIONS */
+
+const unirex = str => compat_mode ? new RegExp(str) : new RegExp(str, 'u');
+const rexstr = exp => '(?:' + exp.source + ')';
+
+/* CHARACTER CLASSES */
+
+const DOCUMENT_START = /^/;
+const DOCUMENT_END = /$/;
+const ALLOWED_CHAR = unirex( // `c-printable` in the YAML 1.2 spec.
+ compat_mode ? '[\t\n\r\x20-\x7e\x85\xa0-\ufffd]' : '[\t\n\r\x20-\x7e\x85\xa0-\ud7ff\ue000-\ufffd\u{10000}-\u{10FFFF}]'
+ );
+const WHITE_SPACE = /[ \t]/;
+const LINE_BREAK = /\r?\n|\r|/;
+const INDICATOR = /[-?:,[\]{}&#*!|>'"%@`]/;
+const FLOW_CHAR = /[,[\]{}]/;
+
+/* NEGATED CHARACTER CLASSES */
+
+const NOT_WHITE_SPACE = unirex('(?!' + rexstr(WHITE_SPACE) + ')[^]');
+const NOT_LINE_BREAK = unirex('(?!' + rexstr(LINE_BREAK) + ')[^]');
+const NOT_INDICATOR = unirex('(?!' + rexstr(INDICATOR) + ')[^]');
+const NOT_FLOW_CHAR = unirex('(?!' + rexstr(FLOW_CHAR) + ')[^]');
+const NOT_ALLOWED_CHAR = unirex(
+ '(?!' + rexstr(ALLOWED_CHAR) + ')[^]'
+);
+
+/* BASIC CONSTRUCTS */
+
+const ANY_WHITE_SPACE = unirex(rexstr(WHITE_SPACE) + '*');
+const ANY_ALLOWED_CHARS = unirex(rexstr(ALLOWED_CHAR) + '*');
+const NEW_LINE = unirex(
+ rexstr(ANY_WHITE_SPACE) + rexstr(LINE_BREAK)
+);
+const SOME_NEW_LINES = unirex(
+ '(?:' + rexstr(NEW_LINE) + ')+'
+);
+const POSSIBLE_STARTS = unirex(
+ rexstr(DOCUMENT_START) + rexstr(/]*>/) + '?'
+);
+const POSSIBLE_ENDS = unirex(
+ rexstr(SOME_NEW_LINES) + '|' +
+ rexstr(DOCUMENT_END) + '|' +
+ rexstr(/<\/p>/)
+);
+const QUOTE_CHAR = unirex(
+ '(?=' + rexstr(NOT_LINE_BREAK) + ')[^"]'
+);
+const ANY_QUOTE_CHAR = unirex(
+ rexstr(QUOTE_CHAR) + '*'
+);
+
+const ESCAPED_APOS = unirex(
+ '(?=' + rexstr(NOT_LINE_BREAK) + ')' + rexstr(/[^']|''/)
+);
+const ANY_ESCAPED_APOS = unirex(
+ rexstr(ESCAPED_APOS) + '*'
+);
+const FIRST_KEY_CHAR = unirex(
+ '(?=' + rexstr(NOT_LINE_BREAK) + ')' +
+ '(?=' + rexstr(NOT_WHITE_SPACE) + ')' +
+ rexstr(NOT_INDICATOR) + '|' +
+ rexstr(/[?:-]/) +
+ '(?=' + rexstr(NOT_LINE_BREAK) + ')' +
+ '(?=' + rexstr(NOT_WHITE_SPACE) + ')' +
+ '(?=' + rexstr(NOT_FLOW_CHAR) + ')'
+);
+const FIRST_VALUE_CHAR = unirex(
+ '(?=' + rexstr(NOT_LINE_BREAK) + ')' +
+ '(?=' + rexstr(NOT_WHITE_SPACE) + ')' +
+ rexstr(NOT_INDICATOR) + '|' +
+ rexstr(/[?:-]/) +
+ '(?=' + rexstr(NOT_LINE_BREAK) + ')' +
+ '(?=' + rexstr(NOT_WHITE_SPACE) + ')'
+ // Flow indicators are allowed in values.
+);
+const LATER_KEY_CHAR = unirex(
+ rexstr(WHITE_SPACE) + '|' +
+ '(?=' + rexstr(NOT_LINE_BREAK) + ')' +
+ '(?=' + rexstr(NOT_WHITE_SPACE) + ')' +
+ '(?=' + rexstr(NOT_FLOW_CHAR) + ')' +
+ rexstr(/[^:#]#?/) + '|' +
+ rexstr(/:/) + '(?=' + rexstr(NOT_WHITE_SPACE) + ')'
+);
+const LATER_VALUE_CHAR = unirex(
+ rexstr(WHITE_SPACE) + '|' +
+ '(?=' + rexstr(NOT_LINE_BREAK) + ')' +
+ '(?=' + rexstr(NOT_WHITE_SPACE) + ')' +
+ // Flow indicators are allowed in values.
+ rexstr(/[^:#]#?/) + '|' +
+ rexstr(/:/) + '(?=' + rexstr(NOT_WHITE_SPACE) + ')'
+);
+
+/* YAML CONSTRUCTS */
+
+const ƔAML_START = unirex(
+ rexstr(ANY_WHITE_SPACE) + '---'
+);
+const ƔAML_END = unirex(
+ rexstr(ANY_WHITE_SPACE) + '(?:---|\.\.\.)'
+);
+const ƔAML_LOOKAHEAD = unirex(
+ '(?=' +
+ rexstr(ƔAML_START) +
+ rexstr(ANY_ALLOWED_CHARS) + rexstr(NEW_LINE) +
+ rexstr(ƔAML_END) + rexstr(POSSIBLE_ENDS) +
+ ')'
+);
+const ƔAML_DOUBLE_QUOTE = unirex(
+ '"' + rexstr(ANY_QUOTE_CHAR) + '"'
+);
+const ƔAML_SINGLE_QUOTE = unirex(
+ '\'' + rexstr(ANY_ESCAPED_APOS) + '\''
+);
+const ƔAML_SIMPLE_KEY = unirex(
+ rexstr(FIRST_KEY_CHAR) + rexstr(LATER_KEY_CHAR) + '*'
+);
+const ƔAML_SIMPLE_VALUE = unirex(
+ rexstr(FIRST_VALUE_CHAR) + rexstr(LATER_VALUE_CHAR) + '*'
+);
+const ƔAML_KEY = unirex(
+ rexstr(ƔAML_DOUBLE_QUOTE) + '|' +
+ rexstr(ƔAML_SINGLE_QUOTE) + '|' +
+ rexstr(ƔAML_SIMPLE_KEY)
+);
+const ƔAML_VALUE = unirex(
+ rexstr(ƔAML_DOUBLE_QUOTE) + '|' +
+ rexstr(ƔAML_SINGLE_QUOTE) + '|' +
+ rexstr(ƔAML_SIMPLE_VALUE)
+);
+const ƔAML_SEPARATOR = unirex(
+ rexstr(ANY_WHITE_SPACE) +
+ ':' + rexstr(WHITE_SPACE) +
+ rexstr(ANY_WHITE_SPACE)
+);
+const ƔAML_LINE = unirex(
+ '(' + rexstr(ƔAML_KEY) + ')' +
+ rexstr(ƔAML_SEPARATOR) +
+ '(' + rexstr(ƔAML_VALUE) + ')'
+);
+
+/* FRONTMATTER REGEX */
+
+const ƔAML_FRONTMATTER = unirex(
+ rexstr(POSSIBLE_STARTS) +
+ rexstr(ƔAML_LOOKAHEAD) +
+ rexstr(ƔAML_START) + rexstr(SOME_NEW_LINES) +
+ '(?:' +
+ rexstr(ANY_WHITE_SPACE) + rexstr(ƔAML_LINE) + rexstr(SOME_NEW_LINES) +
+ '){0,5}' +
+ rexstr(ƔAML_END) + rexstr(POSSIBLE_ENDS)
+);
+
+/* SEARCHES */
+
+const FIND_ƔAML_LINE = unirex(
+ rexstr(NEW_LINE) + rexstr(ANY_WHITE_SPACE) + rexstr(ƔAML_LINE)
+);
+
+/* STRING PROCESSING */
+
+function processString (str) {
+ switch (str.charAt(0)) {
+ case '"':
+ return str.substring(1, str.length - 1);
+ case '\'':
+ return str
+ .substring(1, str.length - 1)
+ .replace(/''/g, '\'');
+ default:
+ return str;
+ }
+}
+
+/* BIO PROCESSING */
+
+export function processBio(content) {
+ content = content.replace(/"/g, '"').replace(/'/g, '\'');
+ let result = {
+ text: content,
+ metadata: [],
+ };
+ let ɣaml = content.match(ƔAML_FRONTMATTER);
+ if (!ɣaml) {
+ return result;
+ } else {
+ ɣaml = ɣaml[0];
+ }
+ const start = content.search(ƔAML_START);
+ const end = start + ɣaml.length - ɣaml.search(ƔAML_START);
+ result.text = content.substr(end);
+ let metadata = null;
+ let query = new RegExp(rexstr(FIND_ƔAML_LINE), 'g'); // Some browsers don't allow flags unless both args are strings
+ while ((metadata = query.exec(ɣaml))) {
+ result.metadata.push([
+ processString(metadata[1]),
+ processString(metadata[2]),
+ ]);
+ }
+ return result;
+}
+
+/* BIO CREATION */
+
+export function createBio(note, data) {
+ if (!note) note = '';
+ let frontmatter = '';
+ if ((data && data.length) || note.match(/^\s*---\s+/)) {
+ if (!data) frontmatter = '---\n...\n';
+ else {
+ frontmatter += '---\n';
+ for (let i = 0; i < data.length; i++) {
+ let key = '' + data[i][0];
+ let val = '' + data[i][1];
+
+ // Key processing
+ if (key === (key.match(ƔAML_SIMPLE_KEY) || [])[0]) /* do nothing */;
+ else if (key === (key.match(ANY_QUOTE_CHAR) || [])[0]) key = '"' + key + '"';
+ else {
+ key = key
+ .replace(/'/g, '\'\'')
+ .replace(new RegExp(rexstr(NOT_ALLOWED_CHAR), compat_mode ? 'g' : 'gu'), '�');
+ key = '\'' + key + '\'';
+ }
+
+ // Value processing
+ if (val === (val.match(ƔAML_SIMPLE_VALUE) || [])[0]) /* do nothing */;
+ else if (val === (val.match(ANY_QUOTE_CHAR) || [])[0]) val = '"' + val + '"';
+ else {
+ key = key
+ .replace(/'/g, '\'\'')
+ .replace(new RegExp(rexstr(NOT_ALLOWED_CHAR), compat_mode ? 'g' : 'gu'), '�');
+ key = '\'' + key + '\'';
+ }
+
+ frontmatter += key + ': ' + val + '\n';
+ }
+ frontmatter += '...\n';
+ }
+ }
+ return frontmatter + note;
+}
diff --git a/app/javascript/images/mastodon-getting-started.png b/app/javascript/images/mastodon-getting-started.png
index e05dd493fe8..8fe0df76aa0 100644
Binary files a/app/javascript/images/mastodon-getting-started.png and b/app/javascript/images/mastodon-getting-started.png differ
diff --git a/app/javascript/mastodon/actions/accounts.js b/app/javascript/mastodon/actions/accounts.js
index fbaebf786dd..f63325658d6 100644
--- a/app/javascript/mastodon/actions/accounts.js
+++ b/app/javascript/mastodon/actions/accounts.js
@@ -105,12 +105,13 @@ export function fetchAccountFail(id, error) {
};
};
-export function followAccount(id) {
+export function followAccount(id, reblogs = true) {
return (dispatch, getState) => {
+ const alreadyFollowing = getState().getIn(['relationships', id, 'following']);
dispatch(followAccountRequest(id));
- api(getState).post(`/api/v1/accounts/${id}/follow`).then(response => {
- dispatch(followAccountSuccess(response.data));
+ api(getState).post(`/api/v1/accounts/${id}/follow`, { reblogs }).then(response => {
+ dispatch(followAccountSuccess(response.data, alreadyFollowing));
}).catch(error => {
dispatch(followAccountFail(error));
});
@@ -136,10 +137,11 @@ export function followAccountRequest(id) {
};
};
-export function followAccountSuccess(relationship) {
+export function followAccountSuccess(relationship, alreadyFollowing) {
return {
type: ACCOUNT_FOLLOW_SUCCESS,
relationship,
+ alreadyFollowing,
};
};
diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js
index 8a35049b32c..3ee9e1e7bb2 100644
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@@ -8,6 +8,7 @@ import {
refreshHomeTimeline,
refreshCommunityTimeline,
refreshPublicTimeline,
+ refreshDirectTimeline,
} from './timelines';
export const COMPOSE_CHANGE = 'COMPOSE_CHANGE';
@@ -31,6 +32,7 @@ export const COMPOSE_SUGGESTION_SELECT = 'COMPOSE_SUGGESTION_SELECT';
export const COMPOSE_MOUNT = 'COMPOSE_MOUNT';
export const COMPOSE_UNMOUNT = 'COMPOSE_UNMOUNT';
+export const COMPOSE_ADVANCED_OPTIONS_CHANGE = 'COMPOSE_ADVANCED_OPTIONS_CHANGE';
export const COMPOSE_SENSITIVITY_CHANGE = 'COMPOSE_SENSITIVITY_CHANGE';
export const COMPOSE_SPOILERNESS_CHANGE = 'COMPOSE_SPOILERNESS_CHANGE';
export const COMPOSE_SPOILER_TEXT_CHANGE = 'COMPOSE_SPOILER_TEXT_CHANGE';
@@ -44,6 +46,8 @@ export const COMPOSE_UPLOAD_CHANGE_REQUEST = 'COMPOSE_UPLOAD_UPDATE_REQUEST'
export const COMPOSE_UPLOAD_CHANGE_SUCCESS = 'COMPOSE_UPLOAD_UPDATE_SUCCESS';
export const COMPOSE_UPLOAD_CHANGE_FAIL = 'COMPOSE_UPLOAD_UPDATE_FAIL';
+export const COMPOSE_DOODLE_SET = 'COMPOSE_DOODLE_SET';
+
export function changeCompose(text) {
return {
type: COMPOSE_CHANGE,
@@ -91,14 +95,16 @@ export function mentionCompose(account, router) {
export function submitCompose() {
return function (dispatch, getState) {
- const status = getState().getIn(['compose', 'text'], '');
+ let status = getState().getIn(['compose', 'text'], '');
if (!status || !status.length) {
return;
}
dispatch(submitComposeRequest());
-
+ if (getState().getIn(['compose', 'advanced_options', 'do_not_federate'])) {
+ status = status + ' 👁️';
+ }
api(getState).post('/api/v1/statuses', {
status,
in_reply_to_id: getState().getIn(['compose', 'in_reply_to'], null),
@@ -128,6 +134,8 @@ export function submitCompose() {
if (response.data.in_reply_to_id === null && response.data.visibility === 'public') {
insertOrRefresh('community', refreshCommunityTimeline);
insertOrRefresh('public', refreshPublicTimeline);
+ } else if (response.data.visibility === 'direct') {
+ insertOrRefresh('direct', refreshDirectTimeline);
}
}).catch(function (error) {
dispatch(submitComposeFail(error));
@@ -155,6 +163,13 @@ export function submitComposeFail(error) {
};
};
+export function doodleSet(options) {
+ return {
+ type: COMPOSE_DOODLE_SET,
+ options: options,
+ };
+};
+
export function uploadCompose(files) {
return function (dispatch, getState) {
if (getState().getIn(['compose', 'media_attachments']).size > 3) {
@@ -334,6 +349,13 @@ export function unmountCompose() {
};
};
+export function toggleComposeAdvancedOption(option) {
+ return {
+ type: COMPOSE_ADVANCED_OPTIONS_CHANGE,
+ option: option,
+ };
+}
+
export function changeComposeSensitivity() {
return {
type: COMPOSE_SENSITIVITY_CHANGE,
diff --git a/app/javascript/mastodon/actions/notifications.js b/app/javascript/mastodon/actions/notifications.js
index b24ac8b7338..4a4462e1d32 100644
--- a/app/javascript/mastodon/actions/notifications.js
+++ b/app/javascript/mastodon/actions/notifications.js
@@ -6,6 +6,17 @@ import { defineMessages } from 'react-intl';
export const NOTIFICATIONS_UPDATE = 'NOTIFICATIONS_UPDATE';
+// tracking the notif cleaning request
+export const NOTIFICATIONS_DELETE_MARKED_REQUEST = 'NOTIFICATIONS_DELETE_MARKED_REQUEST';
+export const NOTIFICATIONS_DELETE_MARKED_SUCCESS = 'NOTIFICATIONS_DELETE_MARKED_SUCCESS';
+export const NOTIFICATIONS_DELETE_MARKED_FAIL = 'NOTIFICATIONS_DELETE_MARKED_FAIL';
+export const NOTIFICATIONS_MARK_ALL_FOR_DELETE = 'NOTIFICATIONS_MARK_ALL_FOR_DELETE';
+export const NOTIFICATIONS_ENTER_CLEARING_MODE = 'NOTIFICATIONS_ENTER_CLEARING_MODE'; // arg: yes
+// Unmark notifications (when the cleaning mode is left)
+export const NOTIFICATIONS_UNMARK_ALL_FOR_DELETE = 'NOTIFICATIONS_UNMARK_ALL_FOR_DELETE';
+// Mark one for delete
+export const NOTIFICATION_MARK_FOR_DELETE = 'NOTIFICATION_MARK_FOR_DELETE';
+
export const NOTIFICATIONS_REFRESH_REQUEST = 'NOTIFICATIONS_REFRESH_REQUEST';
export const NOTIFICATIONS_REFRESH_SUCCESS = 'NOTIFICATIONS_REFRESH_SUCCESS';
export const NOTIFICATIONS_REFRESH_FAIL = 'NOTIFICATIONS_REFRESH_FAIL';
@@ -188,3 +199,67 @@ export function scrollTopNotifications(top) {
top,
};
};
+
+export function deleteMarkedNotifications() {
+ return (dispatch, getState) => {
+ dispatch(deleteMarkedNotificationsRequest());
+
+ let ids = [];
+ getState().getIn(['notifications', 'items']).forEach((n) => {
+ if (n.get('markedForDelete')) {
+ ids.push(n.get('id'));
+ }
+ });
+
+ if (ids.length === 0) {
+ return;
+ }
+
+ api(getState).delete(`/api/v1/notifications/destroy_multiple?ids[]=${ids.join('&ids[]=')}`).then(() => {
+ dispatch(deleteMarkedNotificationsSuccess());
+ }).catch(error => {
+ console.error(error);
+ dispatch(deleteMarkedNotificationsFail(error));
+ });
+ };
+};
+
+export function enterNotificationClearingMode(yes) {
+ return {
+ type: NOTIFICATIONS_ENTER_CLEARING_MODE,
+ yes: yes,
+ };
+};
+
+export function markAllNotifications(yes) {
+ return {
+ type: NOTIFICATIONS_MARK_ALL_FOR_DELETE,
+ yes: yes, // true, false or null. null = invert
+ };
+};
+
+export function deleteMarkedNotificationsRequest() {
+ return {
+ type: NOTIFICATIONS_DELETE_MARKED_REQUEST,
+ };
+};
+
+export function deleteMarkedNotificationsFail() {
+ return {
+ type: NOTIFICATIONS_DELETE_MARKED_FAIL,
+ };
+};
+
+export function markNotificationForDelete(id, yes) {
+ return {
+ type: NOTIFICATION_MARK_FOR_DELETE,
+ id: id,
+ yes: yes,
+ };
+};
+
+export function deleteMarkedNotificationsSuccess() {
+ return {
+ type: NOTIFICATIONS_DELETE_MARKED_SUCCESS,
+ };
+};
diff --git a/app/javascript/mastodon/actions/streaming.js b/app/javascript/mastodon/actions/streaming.js
index dcce048cab5..e60ddacd9ea 100644
--- a/app/javascript/mastodon/actions/streaming.js
+++ b/app/javascript/mastodon/actions/streaming.js
@@ -51,3 +51,4 @@ export const connectCommunityStream = () => connectTimelineStream('community', '
export const connectMediaStream = () => connectTimelineStream('community', 'public:local');
export const connectPublicStream = () => connectTimelineStream('public', 'public');
export const connectHashtagStream = (tag) => connectTimelineStream(`hashtag:${tag}`, `hashtag&tag=${tag}`);
+export const connectDirectStream = () => connectTimelineStream('direct', 'direct');
diff --git a/app/javascript/mastodon/actions/timelines.js b/app/javascript/mastodon/actions/timelines.js
index 09abe2702a5..935bbb6f0b7 100644
--- a/app/javascript/mastodon/actions/timelines.js
+++ b/app/javascript/mastodon/actions/timelines.js
@@ -115,6 +115,7 @@ export function refreshTimeline(timelineId, path, params = {}) {
export const refreshHomeTimeline = () => refreshTimeline('home', '/api/v1/timelines/home');
export const refreshPublicTimeline = () => refreshTimeline('public', '/api/v1/timelines/public');
export const refreshCommunityTimeline = () => refreshTimeline('community', '/api/v1/timelines/public', { local: true });
+export const refreshDirectTimeline = () => refreshTimeline('direct', '/api/v1/timelines/direct');
export const refreshAccountTimeline = accountId => refreshTimeline(`account:${accountId}`, `/api/v1/accounts/${accountId}/statuses`);
export const refreshAccountMediaTimeline = accountId => refreshTimeline(`account:${accountId}:media`, `/api/v1/accounts/${accountId}/statuses`, { only_media: true });
export const refreshHashtagTimeline = hashtag => refreshTimeline(`hashtag:${hashtag}`, `/api/v1/timelines/tag/${hashtag}`);
@@ -155,6 +156,7 @@ export function expandTimeline(timelineId, path, params = {}) {
export const expandHomeTimeline = () => expandTimeline('home', '/api/v1/timelines/home');
export const expandPublicTimeline = () => expandTimeline('public', '/api/v1/timelines/public');
export const expandCommunityTimeline = () => expandTimeline('community', '/api/v1/timelines/public', { local: true });
+export const expandDirectTimeline = () => expandTimeline('direct', '/api/v1/timelines/direct');
export const expandAccountTimeline = accountId => expandTimeline(`account:${accountId}`, `/api/v1/accounts/${accountId}/statuses`);
export const expandAccountMediaTimeline = accountId => expandTimeline(`account:${accountId}:media`, `/api/v1/accounts/${accountId}/statuses`, { only_media: true });
export const expandHashtagTimeline = hashtag => expandTimeline(`hashtag:${hashtag}`, `/api/v1/timelines/tag/${hashtag}`);
diff --git a/app/javascript/mastodon/components/__tests__/__snapshots__/avatar-test.js.snap b/app/javascript/mastodon/components/__tests__/__snapshots__/avatar-test.js.snap
index 76ab3374ae8..4005c860f1a 100644
--- a/app/javascript/mastodon/components/__tests__/__snapshots__/avatar-test.js.snap
+++ b/app/javascript/mastodon/components/__tests__/__snapshots__/avatar-test.js.snap
@@ -3,6 +3,7 @@
exports[`
Autoplay renders a animated avatar 1`] = `
exports[`
renders the props.text instead of children 1`] = `
foo
`;
+
+exports[`
renders title if props.title is given 1`] = `
+
+`;
diff --git a/app/javascript/mastodon/components/__tests__/button-test.js b/app/javascript/mastodon/components/__tests__/button-test.js
index 160cd3cbc75..924ba39dc61 100644
--- a/app/javascript/mastodon/components/__tests__/button-test.js
+++ b/app/javascript/mastodon/components/__tests__/button-test.js
@@ -72,4 +72,11 @@ describe('
', () => {
expect(tree).toMatchSnapshot();
});
+
+ it('renders title if props.title is given', () => {
+ const component = renderer.create(
);
+ const tree = component.toJSON();
+
+ expect(tree).toMatchSnapshot();
+ });
});
diff --git a/app/javascript/mastodon/components/account.js b/app/javascript/mastodon/components/account.js
index 724b10980aa..2c3a0006425 100644
--- a/app/javascript/mastodon/components/account.js
+++ b/app/javascript/mastodon/components/account.js
@@ -15,8 +15,8 @@ const messages = defineMessages({
requested: { id: 'account.requested', defaultMessage: 'Awaiting approval' },
unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' },
unmute: { id: 'account.unmute', defaultMessage: 'Unmute @{name}' },
- mute_notifications: { id: 'account.mute_notifications', defaultMessage: 'Mute notifications from @{name}' },
- unmute_notifications: { id: 'account.unmute_notifications', defaultMessage: 'Unmute notifications from @{name}' },
+ mute_notifications: { id: 'account.mute_notifications', defaultMessage: 'You are not currently muting notifications from @{name}. Click to mute notifications' },
+ unmute_notifications: { id: 'account.unmute_notifications', defaultMessage: 'You are currently muting notifications from @{name}. Click to unmute notifications' },
});
@injectIntl
@@ -93,7 +93,7 @@ export default class Account extends ImmutablePureComponent {
);
} else {
- buttons =
+
{this.props.text || this.props.children}
);
diff --git a/app/javascript/mastodon/components/column.js b/app/javascript/mastodon/components/column.js
index e81236d265f..2e1467595fc 100644
--- a/app/javascript/mastodon/components/column.js
+++ b/app/javascript/mastodon/components/column.js
@@ -7,6 +7,8 @@ export default class Column extends React.PureComponent {
static propTypes = {
children: PropTypes.node,
+ extraClasses: PropTypes.string,
+ name: PropTypes.string,
};
scrollTop () {
@@ -40,10 +42,10 @@ export default class Column extends React.PureComponent {
}
render () {
- const { children } = this.props;
+ const { children, extraClasses, name } = this.props;
return (
-
+
{children}
);
diff --git a/app/javascript/mastodon/components/column_back_button.js b/app/javascript/mastodon/components/column_back_button.js
index 8a60c4192a9..50c3bf11fcf 100644
--- a/app/javascript/mastodon/components/column_back_button.js
+++ b/app/javascript/mastodon/components/column_back_button.js
@@ -9,7 +9,8 @@ export default class ColumnBackButton extends React.PureComponent {
};
handleClick = () => {
- if (window.history && window.history.length === 1) {
+ // if history is exhausted, or we would leave mastodon, just go to root.
+ if (window.history && (window.history.length === 1 || window.history.length === window._mastoInitialHistoryLen)) {
this.context.router.history.push('/');
} else {
this.context.router.history.goBack();
diff --git a/app/javascript/mastodon/components/column_back_button_slim.js b/app/javascript/mastodon/components/column_back_button_slim.js
index 3b4f46d99f4..2cdf1b25b16 100644
--- a/app/javascript/mastodon/components/column_back_button_slim.js
+++ b/app/javascript/mastodon/components/column_back_button_slim.js
@@ -9,8 +9,12 @@ export default class ColumnBackButtonSlim extends React.PureComponent {
};
handleClick = () => {
- if (window.history && window.history.length === 1) this.context.router.history.push('/');
- else this.context.router.history.goBack();
+ // if history is exhausted, or we would leave mastodon, just go to root.
+ if (window.history && (window.history.length === 1 || window.history.length === window._mastoInitialHistoryLen)) {
+ this.context.router.history.push('/');
+ } else {
+ this.context.router.history.goBack();
+ }
}
render () {
diff --git a/app/javascript/mastodon/components/column_header.js b/app/javascript/mastodon/components/column_header.js
index 80a8fbdb3a6..71530ffdd68 100644
--- a/app/javascript/mastodon/components/column_header.js
+++ b/app/javascript/mastodon/components/column_header.js
@@ -1,13 +1,18 @@
import React from 'react';
import PropTypes from 'prop-types';
import classNames from 'classnames';
-import { FormattedMessage, injectIntl, defineMessages } from 'react-intl';
+import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+
+// Glitch imports
+import NotificationPurgeButtonsContainer from '../../glitch/components/column/notif_cleaning_widget/container';
const messages = defineMessages({
show: { id: 'column_header.show_settings', defaultMessage: 'Show settings' },
hide: { id: 'column_header.hide_settings', defaultMessage: 'Hide settings' },
moveLeft: { id: 'column_header.moveLeft_settings', defaultMessage: 'Move column to the left' },
moveRight: { id: 'column_header.moveRight_settings', defaultMessage: 'Move column to the right' },
+ enterNotifCleaning : { id: 'notification_purge.start', defaultMessage: 'Enter notification cleaning mode' },
});
@injectIntl
@@ -22,14 +27,19 @@ export default class ColumnHeader extends React.PureComponent {
title: PropTypes.node.isRequired,
icon: PropTypes.string.isRequired,
active: PropTypes.bool,
+ localSettings : ImmutablePropTypes.map,
multiColumn: PropTypes.bool,
focusable: PropTypes.bool,
showBackButton: PropTypes.bool,
+ notifCleaning: PropTypes.bool, // true only for the notification column
+ notifCleaningActive: PropTypes.bool,
+ onEnterCleaningMode: PropTypes.func,
children: PropTypes.node,
pinned: PropTypes.bool,
onPin: PropTypes.func,
onMove: PropTypes.func,
onClick: PropTypes.func,
+ intl: PropTypes.object.isRequired,
};
static defaultProps = {
@@ -39,6 +49,7 @@ export default class ColumnHeader extends React.PureComponent {
state = {
collapsed: true,
animating: false,
+ animatingNCD: false,
};
handleToggleClick = (e) => {
@@ -59,17 +70,32 @@ export default class ColumnHeader extends React.PureComponent {
}
handleBackClick = () => {
- if (window.history && window.history.length === 1) this.context.router.history.push('/');
- else this.context.router.history.goBack();
+ // if history is exhausted, or we would leave mastodon, just go to root.
+ if (window.history && (window.history.length === 1 || window.history.length === window._mastoInitialHistoryLen)) {
+ this.context.router.history.push('/');
+ } else {
+ this.context.router.history.goBack();
+ }
}
handleTransitionEnd = () => {
this.setState({ animating: false });
}
+ handleTransitionEndNCD = () => {
+ this.setState({ animatingNCD: false });
+ }
+
+ onEnterCleaningMode = () => {
+ this.setState({ animatingNCD: true });
+ this.props.onEnterCleaningMode(!this.props.notifCleaningActive);
+ }
+
render () {
- const { title, icon, active, children, pinned, onPin, multiColumn, focusable, showBackButton, intl: { formatMessage } } = this.props;
- const { collapsed, animating } = this.state;
+ const { intl, icon, active, children, pinned, onPin, multiColumn, focusable, showBackButton, intl: { formatMessage }, notifCleaning, notifCleaningActive } = this.props;
+ const { collapsed, animating, animatingNCD } = this.state;
+
+ let title = this.props.title;
const wrapperClassName = classNames('column-header__wrapper', {
'active': active,
@@ -88,8 +114,20 @@ export default class ColumnHeader extends React.PureComponent {
'active': !collapsed,
});
+ const notifCleaningButtonClassName = classNames('column-header__button', {
+ 'active': notifCleaningActive,
+ });
+
+ const notifCleaningDrawerClassName = classNames('ncd column-header__collapsible', {
+ 'collapsed': !notifCleaningActive,
+ 'animating': animatingNCD,
+ });
+
let extraContent, pinButton, moveButtons, backButton, collapseButton;
+ //*glitch
+ const msgEnterNotifCleaning = intl.formatMessage(messages.enterNotifCleaning);
+
if (children) {
extraContent = (
@@ -140,13 +178,30 @@ export default class ColumnHeader extends React.PureComponent {
{title}
-
{backButton}
+ { notifCleaning ? (
+
+
+ ) : null}
{collapseButton}
+ { notifCleaning ? (
+
+
+ {(notifCleaningActive || animatingNCD) ? (
+
+ ) : null}
+
{(!collapsed || animating) && collapsedContent}
diff --git a/app/javascript/mastodon/components/icon_button.js b/app/javascript/mastodon/components/icon_button.js
index 06f53841d23..d0c1b049f89 100644
--- a/app/javascript/mastodon/components/icon_button.js
+++ b/app/javascript/mastodon/components/icon_button.js
@@ -20,8 +20,10 @@ export default class IconButton extends React.PureComponent {
disabled: PropTypes.bool,
inverted: PropTypes.bool,
animate: PropTypes.bool,
+ flip: PropTypes.bool,
overlay: PropTypes.bool,
tabIndex: PropTypes.string,
+ label: PropTypes.string,
};
static defaultProps = {
@@ -42,14 +44,18 @@ export default class IconButton extends React.PureComponent {
}
render () {
- const style = {
+ let style = {
fontSize: `${this.props.size}px`,
- width: `${this.props.size * 1.28571429}px`,
height: `${this.props.size * 1.28571429}px`,
lineHeight: `${this.props.size}px`,
...this.props.style,
...(this.props.active ? this.props.activeStyle : {}),
};
+ if (!this.props.label) {
+ style.width = `${this.props.size * 1.28571429}px`;
+ } else {
+ style.textAlign = 'left';
+ }
const {
active,
@@ -59,6 +65,7 @@ export default class IconButton extends React.PureComponent {
expanded,
icon,
inverted,
+ flip,
overlay,
pressed,
tabIndex,
@@ -72,6 +79,21 @@ export default class IconButton extends React.PureComponent {
overlayed: overlay,
});
+ const flipDeg = flip ? -180 : -360;
+ const rotateDeg = active ? flipDeg : 0;
+
+ const motionDefaultStyle = {
+ rotate: rotateDeg,
+ };
+
+ const springOpts = {
+ stiffness: this.props.flip ? 60 : 120,
+ damping: 7,
+ };
+ const motionStyle = {
+ rotate: animate ? spring(rotateDeg, springOpts) : 0,
+ };
+
if (!animate) {
// Perf optimization: avoid unnecessary
components unless
// we actually need to animate.
@@ -92,7 +114,7 @@ export default class IconButton extends React.PureComponent {
}
return (
-
+
{({ rotate }) =>
}
diff --git a/app/javascript/mastodon/components/media_gallery.js b/app/javascript/mastodon/components/media_gallery.js
index 20febdb1669..5ed46dc93c5 100644
--- a/app/javascript/mastodon/components/media_gallery.js
+++ b/app/javascript/mastodon/components/media_gallery.js
@@ -1,3 +1,6 @@
+// THIS FILE EXISTS FOR UPSTREAM COMPATIBILITY & SHOULDN'T BE USED !!
+// SEE INSTEAD : glitch/components/status/gallery
+
import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types';
diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index d23ff87fafc..5a01c0cdd55 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -1,3 +1,6 @@
+// THIS FILE EXISTS FOR UPSTREAM COMPATIBILITY & SHOULDN'T BE USED !!
+// SEE INSTEAD : glitch/components/status
+
import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types';
diff --git a/app/javascript/mastodon/components/status_action_bar.js b/app/javascript/mastodon/components/status_action_bar.js
index 7021c198ee2..35daf70b9e2 100644
--- a/app/javascript/mastodon/components/status_action_bar.js
+++ b/app/javascript/mastodon/components/status_action_bar.js
@@ -1,3 +1,6 @@
+// THIS FILE EXISTS FOR UPSTREAM COMPATIBILITY & SHOULDN'T BE USED !!
+// SEE INSTEAD : glitch/components/status/action_bar
+
import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types';
diff --git a/app/javascript/mastodon/components/status_content.js b/app/javascript/mastodon/components/status_content.js
index 3b815563295..0f7f15dfc1e 100644
--- a/app/javascript/mastodon/components/status_content.js
+++ b/app/javascript/mastodon/components/status_content.js
@@ -1,3 +1,6 @@
+// THIS FILE EXISTS FOR UPSTREAM COMPATIBILITY & SHOULDN'T BE USED !!
+// SEE INSTEAD : glitch/components/status/content
+
import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types';
diff --git a/app/javascript/mastodon/components/status_list.js b/app/javascript/mastodon/components/status_list.js
index 58a7b228a94..21495559153 100644
--- a/app/javascript/mastodon/components/status_list.js
+++ b/app/javascript/mastodon/components/status_list.js
@@ -1,7 +1,7 @@
import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types';
-import StatusContainer from '../containers/status_container';
+import StatusContainer from '../../glitch/components/status/container';
import ImmutablePureComponent from 'react-immutable-pure-component';
import ScrollableList from './scrollable_list';
diff --git a/app/javascript/mastodon/containers/status_container.js b/app/javascript/mastodon/containers/status_container.js
index b225402041a..b9c461f3157 100644
--- a/app/javascript/mastodon/containers/status_container.js
+++ b/app/javascript/mastodon/containers/status_container.js
@@ -1,3 +1,6 @@
+// THIS FILE EXISTS FOR UPSTREAM COMPATIBILITY & SHOULDN'T BE USED !!
+// SEE INSTEAD : glitch/components/status/container
+
import React from 'react';
import { connect } from 'react-redux';
import Status from '../components/status';
diff --git a/app/javascript/mastodon/features/account/components/action_bar.js b/app/javascript/mastodon/features/account/components/action_bar.js
index e375131d4dd..389296c42b8 100644
--- a/app/javascript/mastodon/features/account/components/action_bar.js
+++ b/app/javascript/mastodon/features/account/components/action_bar.js
@@ -20,6 +20,8 @@ const messages = defineMessages({
media: { id: 'account.media', defaultMessage: 'Media' },
blockDomain: { id: 'account.block_domain', defaultMessage: 'Hide everything from {domain}' },
unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unhide {domain}' },
+ hideReblogs: { id: 'account.hide_reblogs', defaultMessage: 'Hide boosts from @{name}' },
+ showReblogs: { id: 'account.show_reblogs', defaultMessage: 'Show boosts from @{name}' },
});
@injectIntl
@@ -30,6 +32,7 @@ export default class ActionBar extends React.PureComponent {
onFollow: PropTypes.func,
onBlock: PropTypes.func.isRequired,
onMention: PropTypes.func.isRequired,
+ onReblogToggle: PropTypes.func.isRequired,
onReport: PropTypes.func.isRequired,
onMute: PropTypes.func.isRequired,
onBlockDomain: PropTypes.func.isRequired,
@@ -60,6 +63,15 @@ export default class ActionBar extends React.PureComponent {
if (account.get('id') === me) {
menu.push({ text: intl.formatMessage(messages.edit_profile), href: '/settings/profile' });
} else {
+ const following = account.getIn(['relationship', 'following']);
+ if (following) {
+ if (following.get('reblogs')) {
+ menu.push({ text: intl.formatMessage(messages.hideReblogs, { name: account.get('username') }), action: this.props.onReblogToggle });
+ } else {
+ menu.push({ text: intl.formatMessage(messages.showReblogs, { name: account.get('username') }), action: this.props.onReblogToggle });
+ }
+ }
+
if (account.getIn(['relationship', 'muting'])) {
menu.push({ text: intl.formatMessage(messages.unmute, { name: account.get('username') }), action: this.props.onMute });
} else {
diff --git a/app/javascript/mastodon/features/account/components/header.js b/app/javascript/mastodon/features/account/components/header.js
index f0d2d481fc5..b3a73a59097 100644
--- a/app/javascript/mastodon/features/account/components/header.js
+++ b/app/javascript/mastodon/features/account/components/header.js
@@ -1,3 +1,6 @@
+// THIS FILE EXISTS FOR UPSTREAM COMPATIBILITY & SHOULDN'T BE USED !!
+// SEE INSTEAD : glitch/components/account/header
+
import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types';
diff --git a/app/javascript/mastodon/features/account_timeline/components/header.js b/app/javascript/mastodon/features/account_timeline/components/header.js
index 8cf7b92ca2a..9a087e922ae 100644
--- a/app/javascript/mastodon/features/account_timeline/components/header.js
+++ b/app/javascript/mastodon/features/account_timeline/components/header.js
@@ -1,7 +1,7 @@
import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types';
-import InnerHeader from '../../account/components/header';
+import InnerHeader from '../../../../glitch/components/account/header';
import ActionBar from '../../account/components/action_bar';
import MissingIndicator from '../../../components/missing_indicator';
import ImmutablePureComponent from 'react-immutable-pure-component';
@@ -13,6 +13,7 @@ export default class Header extends ImmutablePureComponent {
onFollow: PropTypes.func.isRequired,
onBlock: PropTypes.func.isRequired,
onMention: PropTypes.func.isRequired,
+ onReblogToggle: PropTypes.func.isRequired,
onReport: PropTypes.func.isRequired,
onMute: PropTypes.func.isRequired,
onBlockDomain: PropTypes.func.isRequired,
@@ -39,6 +40,10 @@ export default class Header extends ImmutablePureComponent {
this.props.onReport(this.props.account);
}
+ handleReblogToggle = () => {
+ this.props.onReblogToggle(this.props.account);
+ }
+
handleMute = () => {
this.props.onMute(this.props.account);
}
@@ -77,6 +82,7 @@ export default class Header extends ImmutablePureComponent {
account={account}
onBlock={this.handleBlock}
onMention={this.handleMention}
+ onReblogToggle={this.handleReblogToggle}
onReport={this.handleReport}
onMute={this.handleMute}
onBlockDomain={this.handleBlockDomain}
diff --git a/app/javascript/mastodon/features/account_timeline/containers/header_container.js b/app/javascript/mastodon/features/account_timeline/containers/header_container.js
index 8e50ec405cc..b41eb19d475 100644
--- a/app/javascript/mastodon/features/account_timeline/containers/header_container.js
+++ b/app/javascript/mastodon/features/account_timeline/containers/header_container.js
@@ -67,6 +67,14 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
dispatch(mentionCompose(account, router));
},
+ onReblogToggle (account) {
+ if (account.getIn(['relationship', 'following', 'reblogs'])) {
+ dispatch(followAccount(account.get('id'), false));
+ } else {
+ dispatch(followAccount(account.get('id'), true));
+ }
+ },
+
onReport (account) {
dispatch(initReport(account));
},
diff --git a/app/javascript/mastodon/features/account_timeline/index.js b/app/javascript/mastodon/features/account_timeline/index.js
index f8c85c296d9..3ad370e328f 100644
--- a/app/javascript/mastodon/features/account_timeline/index.js
+++ b/app/javascript/mastodon/features/account_timeline/index.js
@@ -59,7 +59,7 @@ export default class AccountTimeline extends ImmutablePureComponent {
}
return (
-
+
+
diff --git a/app/javascript/mastodon/features/community_timeline/index.js b/app/javascript/mastodon/features/community_timeline/index.js
index 596a89412db..62b1c8ee954 100644
--- a/app/javascript/mastodon/features/community_timeline/index.js
+++ b/app/javascript/mastodon/features/community_timeline/index.js
@@ -79,7 +79,7 @@ export default class CommunityTimeline extends React.PureComponent {
const pinned = !!columnId;
return (
-
+
{
+ this.props.onPrivacyChange(this.props.settings.get('side_arm'));
+ this.handleSubmit();
+ }
+
handleSubmit = () => {
if (this.props.text !== this.autosuggestTextarea.textarea.value) {
// Something changed the text inside the textarea (e.g. browser extensions like Grammarly)
@@ -144,16 +155,58 @@ export default class ComposeForm extends ImmutablePureComponent {
render () {
const { intl, onPaste, showSearch } = this.props;
const disabled = this.props.is_submitting;
- const text = [this.props.spoiler_text, countableText(this.props.text)].join('');
+ const maybeEye = (this.props.advanced_options && this.props.advanced_options.do_not_federate) ? ' 👁️' : '';
+ const text = [this.props.spoiler_text, countableText(this.props.text), maybeEye].join('');
+
+ const secondaryVisibility = this.props.settings.get('side_arm');
+ let showSideArm = secondaryVisibility !== 'none';
let publishText = '';
+ let publishText2 = '';
+ let title = '';
+ let title2 = '';
- if (this.props.privacy === 'private' || this.props.privacy === 'direct') {
- publishText =
+ {
+
+ );
+
+ title2 = `${intl.formatMessage(messages.publish)}: ${intl.formatMessage({ id: `privacy.${secondaryVisibility}.short` })}`;
+ publishText2 = (
+
@@ -192,17 +245,35 @@ export default class ComposeForm extends ImmutablePureComponent {
-
-
+
-
-
-
500 || (text.length !== 0 && text.trim().length === 0)} block />
+
+
+
+ {
+ showSideArm ?
+
diff --git a/app/javascript/mastodon/features/compose/components/search_results.js b/app/javascript/mastodon/features/compose/components/search_results.js
index 8350d20a5b4..a3e68643feb 100644
--- a/app/javascript/mastodon/features/compose/components/search_results.js
+++ b/app/javascript/mastodon/features/compose/components/search_results.js
@@ -2,7 +2,7 @@ import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes';
import { FormattedMessage } from 'react-intl';
import AccountContainer from '../../../containers/account_container';
-import StatusContainer from '../../../containers/status_container';
+import StatusContainer from '../../../../glitch/components/status/container';
import { Link } from 'react-router-dom';
import ImmutablePureComponent from 'react-immutable-pure-component';
diff --git a/app/javascript/mastodon/features/compose/containers/compose_form_container.js b/app/javascript/mastodon/features/compose/containers/compose_form_container.js
index 5f5509dbea5..dfe8241c6d9 100644
--- a/app/javascript/mastodon/features/compose/containers/compose_form_container.js
+++ b/app/javascript/mastodon/features/compose/containers/compose_form_container.js
@@ -1,6 +1,6 @@
import { connect } from 'react-redux';
import ComposeForm from '../components/compose_form';
-import { uploadCompose } from '../../../actions/compose';
+import { changeComposeVisibility, uploadCompose } from '../../../actions/compose';
import {
changeCompose,
submitCompose,
@@ -15,6 +15,7 @@ const mapStateToProps = state => ({
text: state.getIn(['compose', 'text']),
suggestion_token: state.getIn(['compose', 'suggestion_token']),
suggestions: state.getIn(['compose', 'suggestions']),
+ advanced_options: state.getIn(['compose', 'advanced_options']),
spoiler: state.getIn(['compose', 'spoiler']),
spoiler_text: state.getIn(['compose', 'spoiler_text']),
privacy: state.getIn(['compose', 'privacy']),
@@ -23,6 +24,8 @@ const mapStateToProps = state => ({
is_submitting: state.getIn(['compose', 'is_submitting']),
is_uploading: state.getIn(['compose', 'is_uploading']),
showSearch: state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden']),
+ settings: state.get('local_settings'),
+ filesAttached: state.getIn(['compose', 'media_attachments']).size > 0,
});
const mapDispatchToProps = (dispatch) => ({
@@ -31,6 +34,10 @@ const mapDispatchToProps = (dispatch) => ({
dispatch(changeCompose(text));
},
+ onPrivacyChange (value) {
+ dispatch(changeComposeVisibility(value));
+ },
+
onSubmit () {
dispatch(submitCompose());
},
diff --git a/app/javascript/mastodon/features/compose/index.js b/app/javascript/mastodon/features/compose/index.js
index 0c66585c98d..a487f2c89d6 100644
--- a/app/javascript/mastodon/features/compose/index.js
+++ b/app/javascript/mastodon/features/compose/index.js
@@ -5,6 +5,8 @@ import PropTypes from 'prop-types';
import ImmutablePropTypes from 'react-immutable-proptypes';
import { connect } from 'react-redux';
import { mountCompose, unmountCompose } from '../../actions/compose';
+import { openModal } from '../../actions/modal';
+import { changeLocalSetting } from '../../../glitch/actions/local_settings';
import { Link } from 'react-router-dom';
import { injectIntl, defineMessages } from 'react-intl';
import SearchContainer from './containers/search_container';
@@ -19,7 +21,7 @@ const messages = defineMessages({
notifications: { id: 'tabs_bar.notifications', defaultMessage: 'Notifications' },
public: { id: 'navigation_bar.public_timeline', defaultMessage: 'Federated timeline' },
community: { id: 'navigation_bar.community_timeline', defaultMessage: 'Local timeline' },
- preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
+ settings: { id: 'navigation_bar.app_settings', defaultMessage: 'App settings' },
logout: { id: 'navigation_bar.logout', defaultMessage: 'Logout' },
});
@@ -48,6 +50,16 @@ export default class Compose extends React.PureComponent {
this.props.dispatch(unmountCompose());
}
+ onLayoutClick = (e) => {
+ const layout = e.currentTarget.getAttribute('data-mastodon-layout');
+ this.props.dispatch(changeLocalSetting(['layout'], layout));
+ e.preventDefault();
+ }
+
+ openSettings = () => {
+ this.props.dispatch(openModal('SETTINGS', {}));
+ }
+
onFocus = () => {
this.props.dispatch(changeComposing(true));
}
@@ -78,12 +90,14 @@ export default class Compose extends React.PureComponent {
{!columns.some(column => column.get('id') === 'PUBLIC') && (
)}
-
+
);
}
+
+
return (
{header}
@@ -91,7 +105,7 @@ export default class Compose extends React.PureComponent {
-
+
@@ -104,6 +118,7 @@ export default class Compose extends React.PureComponent {
}
+
);
}
diff --git a/app/javascript/mastodon/features/direct_timeline/containers/column_settings_container.js b/app/javascript/mastodon/features/direct_timeline/containers/column_settings_container.js
new file mode 100644
index 00000000000..1833f69e5c2
--- /dev/null
+++ b/app/javascript/mastodon/features/direct_timeline/containers/column_settings_container.js
@@ -0,0 +1,17 @@
+import { connect } from 'react-redux';
+import ColumnSettings from '../../community_timeline/components/column_settings';
+import { changeSetting } from '../../../actions/settings';
+
+const mapStateToProps = state => ({
+ settings: state.getIn(['settings', 'direct']),
+});
+
+const mapDispatchToProps = dispatch => ({
+
+ onChange (key, checked) {
+ dispatch(changeSetting(['direct', ...key], checked));
+ },
+
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(ColumnSettings);
diff --git a/app/javascript/mastodon/features/direct_timeline/index.js b/app/javascript/mastodon/features/direct_timeline/index.js
new file mode 100644
index 00000000000..05e092ee01f
--- /dev/null
+++ b/app/javascript/mastodon/features/direct_timeline/index.js
@@ -0,0 +1,107 @@
+import React from 'react';
+import { connect } from 'react-redux';
+import PropTypes from 'prop-types';
+import StatusListContainer from '../ui/containers/status_list_container';
+import Column from '../../components/column';
+import ColumnHeader from '../../components/column_header';
+import {
+ refreshDirectTimeline,
+ expandDirectTimeline,
+} from '../../actions/timelines';
+import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import ColumnSettingsContainer from './containers/column_settings_container';
+import { connectDirectStream } from '../../actions/streaming';
+
+const messages = defineMessages({
+ title: { id: 'column.direct', defaultMessage: 'Direct messages' },
+});
+
+const mapStateToProps = state => ({
+ hasUnread: state.getIn(['timelines', 'direct', 'unread']) > 0,
+});
+
+@connect(mapStateToProps)
+@injectIntl
+export default class DirectTimeline extends React.PureComponent {
+
+ static propTypes = {
+ dispatch: PropTypes.func.isRequired,
+ columnId: PropTypes.string,
+ intl: PropTypes.object.isRequired,
+ hasUnread: PropTypes.bool,
+ multiColumn: PropTypes.bool,
+ };
+
+ handlePin = () => {
+ const { columnId, dispatch } = this.props;
+
+ if (columnId) {
+ dispatch(removeColumn(columnId));
+ } else {
+ dispatch(addColumn('DIRECT', {}));
+ }
+ }
+
+ handleMove = (dir) => {
+ const { columnId, dispatch } = this.props;
+ dispatch(moveColumn(columnId, dir));
+ }
+
+ handleHeaderClick = () => {
+ this.column.scrollTop();
+ }
+
+ componentDidMount () {
+ const { dispatch } = this.props;
+
+ dispatch(refreshDirectTimeline());
+ this.disconnect = dispatch(connectDirectStream());
+ }
+
+ componentWillUnmount () {
+ if (this.disconnect) {
+ this.disconnect();
+ this.disconnect = null;
+ }
+ }
+
+ setRef = c => {
+ this.column = c;
+ }
+
+ handleLoadMore = () => {
+ this.props.dispatch(expandDirectTimeline());
+ }
+
+ render () {
+ const { intl, hasUnread, columnId, multiColumn } = this.props;
+ const pinned = !!columnId;
+
+ return (
+
+
+
+
+
+ );
+ }
+
+}
diff --git a/app/javascript/mastodon/features/favourited_statuses/index.js b/app/javascript/mastodon/features/favourited_statuses/index.js
index 1e1f5873c23..8135527c913 100644
--- a/app/javascript/mastodon/features/favourited_statuses/index.js
+++ b/app/javascript/mastodon/features/favourited_statuses/index.js
@@ -68,7 +68,7 @@ export default class Favourites extends ImmutablePureComponent {
const pinned = !!columnId;
return (
-
+
+
);
}
return (
-
+
diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js
index 4b4ae694703..2f7d9281edb 100644
--- a/app/javascript/mastodon/features/getting_started/index.js
+++ b/app/javascript/mastodon/features/getting_started/index.js
@@ -4,6 +4,7 @@ import ColumnLink from '../ui/components/column_link';
import ColumnSubheading from '../ui/components/column_subheading';
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import { connect } from 'react-redux';
+import { openModal } from '../../actions/modal';
import PropTypes from 'prop-types';
import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
@@ -17,13 +18,16 @@ const messages = defineMessages({
navigation_subheading: { id: 'column_subheading.navigation', defaultMessage: 'Navigation' },
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' },
+ settings: { id: 'navigation_bar.app_settings', defaultMessage: 'App settings' },
follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
sign_out: { id: 'navigation_bar.logout', defaultMessage: 'Logout' },
favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favourites' },
blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocked users' },
mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Muted users' },
info: { id: 'navigation_bar.info', defaultMessage: 'Extended information' },
+ show_me_around: { id: 'getting_started.onboarding', defaultMessage: 'Show me around' },
pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned toots' },
});
@@ -41,8 +45,18 @@ export default class GettingStarted extends ImmutablePureComponent {
myAccount: ImmutablePropTypes.map.isRequired,
columns: ImmutablePropTypes.list,
multiColumn: PropTypes.bool,
+ dispatch: PropTypes.func.isRequired,
};
+ openSettings = () => {
+ this.props.dispatch(openModal('SETTINGS', {}));
+ }
+
+ openOnboardingModal = (e) => {
+ e.preventDefault();
+ this.props.dispatch(openModal('ONBOARDING'));
+ }
+
render () {
const { intl, myAccount, columns, multiColumn } = this.props;
@@ -66,43 +80,62 @@ export default class GettingStarted extends ImmutablePureComponent {
}
}
- navItems = navItems.concat([
-
-
-
+
+
+
+
-
-
-
-
-
- tootsuite/mastodon }}
- />
-
+
+
+
+
+ •
+
+ •
+
+
+
+
+ glitch-soc/mastodon,
+ Mastodon: Mastodon ,
+ }}
+ />
+
+
diff --git a/app/javascript/mastodon/features/hashtag_timeline/index.js b/app/javascript/mastodon/features/hashtag_timeline/index.js
index 5fe21ce90e2..2077b7cdf4f 100644
--- a/app/javascript/mastodon/features/hashtag_timeline/index.js
+++ b/app/javascript/mastodon/features/hashtag_timeline/index.js
@@ -91,7 +91,7 @@ export default class HashtagTimeline extends React.PureComponent {
const pinned = !!columnId;
return (
-
+
+
+
diff --git a/app/javascript/mastodon/features/notifications/components/notification.js b/app/javascript/mastodon/features/notifications/components/notification.js
index 9d170cad532..9035268224a 100644
--- a/app/javascript/mastodon/features/notifications/components/notification.js
+++ b/app/javascript/mastodon/features/notifications/components/notification.js
@@ -1,3 +1,6 @@
+// THIS FILE EXISTS FOR UPSTREAM COMPATIBILITY & SHOULDN'T BE USED !!
+// SEE INSTEAD : glitch/components/notification
+
import React from 'react';
import PropTypes from 'prop-types';
import ImmutablePropTypes from 'react-immutable-proptypes';
diff --git a/app/javascript/mastodon/features/notifications/containers/notification_container.js b/app/javascript/mastodon/features/notifications/containers/notification_container.js
index 921aa460f52..fd16c4331c5 100644
--- a/app/javascript/mastodon/features/notifications/containers/notification_container.js
+++ b/app/javascript/mastodon/features/notifications/containers/notification_container.js
@@ -1,3 +1,6 @@
+// THIS FILE EXISTS FOR UPSTREAM COMPATIBILITY & SHOULDN'T BE USED !!
+// SEE INSTEAD : glitch/components/notification/container
+
import { connect } from 'react-redux';
import { makeGetNotification } from '../../../selectors';
import Notification from '../components/notification';
diff --git a/app/javascript/mastodon/features/notifications/index.js b/app/javascript/mastodon/features/notifications/index.js
index 35b430bfb51..9c6802482ea 100644
--- a/app/javascript/mastodon/features/notifications/index.js
+++ b/app/javascript/mastodon/features/notifications/index.js
@@ -4,9 +4,13 @@ import PropTypes from 'prop-types';
import ImmutablePropTypes from 'react-immutable-proptypes';
import Column from '../../components/column';
import ColumnHeader from '../../components/column_header';
-import { expandNotifications, scrollTopNotifications } from '../../actions/notifications';
+import {
+ enterNotificationClearingMode,
+ expandNotifications,
+ scrollTopNotifications,
+} from '../../actions/notifications';
import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
-import NotificationContainer from './containers/notification_container';
+import NotificationContainer from '../../../glitch/components/notification/container';
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import ColumnSettingsContainer from './containers/column_settings_container';
import { createSelector } from 'reselect';
@@ -25,12 +29,22 @@ const getNotifications = createSelector([
const mapStateToProps = state => ({
notifications: getNotifications(state),
+ localSettings: state.get('local_settings'),
isLoading: state.getIn(['notifications', 'isLoading'], true),
isUnread: state.getIn(['notifications', 'unread']) > 0,
hasMore: !!state.getIn(['notifications', 'next']),
+ notifCleaningActive: state.getIn(['notifications', 'cleaningMode']),
});
-@connect(mapStateToProps)
+/* glitch */
+const mapDispatchToProps = dispatch => ({
+ onEnterCleaningMode(yes) {
+ dispatch(enterNotificationClearingMode(yes));
+ },
+ dispatch,
+});
+
+@connect(mapStateToProps, mapDispatchToProps)
@injectIntl
export default class Notifications extends React.PureComponent {
@@ -44,6 +58,9 @@ export default class Notifications extends React.PureComponent {
isUnread: PropTypes.bool,
multiColumn: PropTypes.bool,
hasMore: PropTypes.bool,
+ localSettings: ImmutablePropTypes.map,
+ notifCleaningActive: PropTypes.bool,
+ onEnterCleaningMode: PropTypes.func,
};
static defaultProps = {
@@ -146,7 +163,11 @@ export default class Notifications extends React.PureComponent {
);
return (
-
+
diff --git a/app/javascript/mastodon/features/public_timeline/index.js b/app/javascript/mastodon/features/public_timeline/index.js
index 193489c6305..1821bc4487e 100644
--- a/app/javascript/mastodon/features/public_timeline/index.js
+++ b/app/javascript/mastodon/features/public_timeline/index.js
@@ -79,7 +79,7 @@ export default class PublicTimeline extends React.PureComponent {
const pinned = !!columnId;
return (
-
+
{
- this.props.onOpenVideo(this.props.status.getIn(['media_attachments', 0]), startTime);
- }
+ // handleOpenVideo = startTime => {
+ // this.props.onOpenVideo(this.props.status.getIn(['media_attachments', 0]), startTime);
+ // }
render () {
const status = this.props.status.get('reblog') ? this.props.status.get('reblog') : this.props.status;
+ const { settings } = this.props;
let media = '';
+ let mediaIcon = null;
let applicationLink = '';
let reblogLink = '';
let reblogIcon = 'retweet';
@@ -49,32 +54,32 @@ export default class DetailedStatus extends ImmutablePureComponent {
if (status.get('media_attachments').some(item => item.get('type') === 'unknown')) {
media = · {status.getIn(['application', 'name'])} ;
@@ -104,9 +109,11 @@ export default class DetailedStatus extends ImmutablePureComponent {
diff --git a/app/javascript/mastodon/features/ui/components/boost_modal.js b/app/javascript/mastodon/features/ui/components/boost_modal.js
index 0e9592c977f..dfd1284e933 100644
--- a/app/javascript/mastodon/features/ui/components/boost_modal.js
+++ b/app/javascript/mastodon/features/ui/components/boost_modal.js
@@ -3,7 +3,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types';
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import Button from '../../../components/button';
-import StatusContent from '../../../components/status_content';
+import StatusContent from '../../../../glitch/components/status/content';
import Avatar from '../../../components/avatar';
import RelativeTimestamp from '../../../components/relative_timestamp';
import DisplayName from '../../../components/display_name';
diff --git a/app/javascript/mastodon/features/ui/components/column.js b/app/javascript/mastodon/features/ui/components/column.js
index 15538ea387a..c1700f86e0c 100644
--- a/app/javascript/mastodon/features/ui/components/column.js
+++ b/app/javascript/mastodon/features/ui/components/column.js
@@ -13,6 +13,7 @@ export default class Column extends React.PureComponent {
children: PropTypes.node,
active: PropTypes.bool,
hideHeadingOnMobile: PropTypes.bool,
+ name: PropTypes.string,
};
handleHeaderClick = () => {
@@ -47,7 +48,7 @@ export default class Column extends React.PureComponent {
}
render () {
- const { heading, icon, children, active, hideHeadingOnMobile } = this.props;
+ const { heading, icon, children, active, hideHeadingOnMobile, name } = this.props;
const showHeading = heading && (!hideHeadingOnMobile || (hideHeadingOnMobile && !isMobile(window.innerWidth)));
@@ -59,6 +60,7 @@ export default class Column extends React.PureComponent {
{
+const ColumnLink = ({ icon, text, to, onClick, href, method }) => {
if (href) {
return (
@@ -10,13 +10,20 @@ const ColumnLink = ({ icon, text, to, href, method }) => {
{text}
);
- } else {
+ } else if (to) {
return (
{text}
);
+ } else {
+ return (
+
+
+ );
}
};
@@ -24,9 +31,9 @@ ColumnLink.propTypes = {
icon: PropTypes.string.isRequired,
text: PropTypes.string.isRequired,
to: PropTypes.string,
+ onClick: PropTypes.func,
href: PropTypes.string,
method: PropTypes.string,
- hideOnMobile: PropTypes.bool,
};
export default ColumnLink;
diff --git a/app/javascript/mastodon/features/ui/components/columns_area.js b/app/javascript/mastodon/features/ui/components/columns_area.js
index 5610095b999..ee1064229dd 100644
--- a/app/javascript/mastodon/features/ui/components/columns_area.js
+++ b/app/javascript/mastodon/features/ui/components/columns_area.js
@@ -11,7 +11,7 @@ import BundleContainer from '../containers/bundle_container';
import ColumnLoading from './column_loading';
import DrawerLoading from './drawer_loading';
import BundleColumnError from './bundle_column_error';
-import { Compose, Notifications, HomeTimeline, CommunityTimeline, PublicTimeline, HashtagTimeline, FavouritedStatuses } from '../../ui/util/async-components';
+import { Compose, Notifications, HomeTimeline, CommunityTimeline, PublicTimeline, HashtagTimeline, DirectTimeline, FavouritedStatuses } from '../../ui/util/async-components';
import detectPassiveEvents from 'detect-passive-events';
import { scrollRight } from '../../../scroll';
@@ -23,6 +23,7 @@ const componentMap = {
'PUBLIC': PublicTimeline,
'COMMUNITY': CommunityTimeline,
'HASHTAG': HashtagTimeline,
+ 'DIRECT': DirectTimeline,
'FAVOURITES': FavouritedStatuses,
};
diff --git a/app/javascript/mastodon/features/ui/components/doodle_modal.js b/app/javascript/mastodon/features/ui/components/doodle_modal.js
new file mode 100644
index 00000000000..4efc9d2e6cf
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/components/doodle_modal.js
@@ -0,0 +1,614 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import Button from '../../../components/button';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import Atrament from 'atrament'; // the doodling library
+import { connect } from 'react-redux';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import { doodleSet, uploadCompose } from '../../../actions/compose';
+import IconButton from '../../../components/icon_button';
+import { debounce, mapValues } from 'lodash';
+import classNames from 'classnames';
+
+// palette nicked from MyPaint, CC0
+const palette = [
+ ['rgb( 0, 0, 0)', 'Black'],
+ ['rgb( 38, 38, 38)', 'Gray 15'],
+ ['rgb( 77, 77, 77)', 'Grey 30'],
+ ['rgb(128, 128, 128)', 'Grey 50'],
+ ['rgb(171, 171, 171)', 'Grey 67'],
+ ['rgb(217, 217, 217)', 'Grey 85'],
+ ['rgb(255, 255, 255)', 'White'],
+ ['rgb(128, 0, 0)', 'Maroon'],
+ ['rgb(209, 0, 0)', 'English-red'],
+ ['rgb(255, 54, 34)', 'Tomato'],
+ ['rgb(252, 60, 3)', 'Orange-red'],
+ ['rgb(255, 140, 105)', 'Salmon'],
+ ['rgb(252, 232, 32)', 'Cadium-yellow'],
+ ['rgb(243, 253, 37)', 'Lemon yellow'],
+ ['rgb(121, 5, 35)', 'Dark crimson'],
+ ['rgb(169, 32, 62)', 'Deep carmine'],
+ ['rgb(255, 140, 0)', 'Orange'],
+ ['rgb(255, 168, 18)', 'Dark tangerine'],
+ ['rgb(217, 144, 88)', 'Persian orange'],
+ ['rgb(194, 178, 128)', 'Sand'],
+ ['rgb(255, 229, 180)', 'Peach'],
+ ['rgb(100, 54, 46)', 'Bole'],
+ ['rgb(108, 41, 52)', 'Dark cordovan'],
+ ['rgb(163, 65, 44)', 'Chestnut'],
+ ['rgb(228, 136, 100)', 'Dark salmon'],
+ ['rgb(255, 195, 143)', 'Apricot'],
+ ['rgb(255, 219, 188)', 'Unbleached silk'],
+ ['rgb(242, 227, 198)', 'Straw'],
+ ['rgb( 53, 19, 13)', 'Bistre'],
+ ['rgb( 84, 42, 14)', 'Dark chocolate'],
+ ['rgb(102, 51, 43)', 'Burnt sienna'],
+ ['rgb(184, 66, 0)', 'Sienna'],
+ ['rgb(216, 153, 12)', 'Yellow ochre'],
+ ['rgb(210, 180, 140)', 'Tan'],
+ ['rgb(232, 204, 144)', 'Dark wheat'],
+ ['rgb( 0, 49, 83)', 'Prussian blue'],
+ ['rgb( 48, 69, 119)', 'Dark grey blue'],
+ ['rgb( 0, 71, 171)', 'Cobalt blue'],
+ ['rgb( 31, 117, 254)', 'Blue'],
+ ['rgb(120, 180, 255)', 'Bright french blue'],
+ ['rgb(171, 200, 255)', 'Bright steel blue'],
+ ['rgb(208, 231, 255)', 'Ice blue'],
+ ['rgb( 30, 51, 58)', 'Medium jungle green'],
+ ['rgb( 47, 79, 79)', 'Dark slate grey'],
+ ['rgb( 74, 104, 93)', 'Dark grullo green'],
+ ['rgb( 0, 128, 128)', 'Teal'],
+ ['rgb( 67, 170, 176)', 'Turquoise'],
+ ['rgb(109, 174, 199)', 'Cerulean frost'],
+ ['rgb(173, 217, 186)', 'Tiffany green'],
+ ['rgb( 22, 34, 29)', 'Gray-asparagus'],
+ ['rgb( 36, 48, 45)', 'Medium dark teal'],
+ ['rgb( 74, 104, 93)', 'Xanadu'],
+ ['rgb(119, 198, 121)', 'Mint'],
+ ['rgb(175, 205, 182)', 'Timberwolf'],
+ ['rgb(185, 245, 246)', 'Celeste'],
+ ['rgb(193, 255, 234)', 'Aquamarine'],
+ ['rgb( 29, 52, 35)', 'Cal Poly Pomona'],
+ ['rgb( 1, 68, 33)', 'Forest green'],
+ ['rgb( 42, 128, 0)', 'Napier green'],
+ ['rgb(128, 128, 0)', 'Olive'],
+ ['rgb( 65, 156, 105)', 'Sea green'],
+ ['rgb(189, 246, 29)', 'Green-yellow'],
+ ['rgb(231, 244, 134)', 'Bright chartreuse'],
+ ['rgb(138, 23, 137)', 'Purple'],
+ ['rgb( 78, 39, 138)', 'Violet'],
+ ['rgb(193, 75, 110)', 'Dark thulian pink'],
+ ['rgb(222, 49, 99)', 'Cerise'],
+ ['rgb(255, 20, 147)', 'Deep pink'],
+ ['rgb(255, 102, 204)', 'Rose pink'],
+ ['rgb(255, 203, 219)', 'Pink'],
+ ['rgb(255, 255, 255)', 'White'],
+ ['rgb(229, 17, 1)', 'RGB Red'],
+ ['rgb( 0, 255, 0)', 'RGB Green'],
+ ['rgb( 0, 0, 255)', 'RGB Blue'],
+ ['rgb( 0, 255, 255)', 'CMYK Cyan'],
+ ['rgb(255, 0, 255)', 'CMYK Magenta'],
+ ['rgb(255, 255, 0)', 'CMYK Yellow'],
+];
+
+// re-arrange to the right order for display
+let palReordered = [];
+for (let row = 0; row < 7; row++) {
+ for (let col = 0; col < 11; col++) {
+ palReordered.push(palette[col * 7 + row]);
+ }
+ palReordered.push(null); // null indicates a
+}
+
+// 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 (
+
+
+
+
+
+
+
+
+
+
+ Smoothing
+
+
+
+
+ Adaptive
+
+
+
+
+ Weight
+
+
+
+
+
+ { Object.values(mapValues(DOODLE_SIZES, (val, k) =>
+ {val[2]}
+ )) }
+
+
+
+
+
+
+ {
+ palReordered.map((c, i) =>
+ c === null ?
+
+
+
+ );
+ }
+
+}
diff --git a/app/javascript/mastodon/features/ui/components/modal_root.js b/app/javascript/mastodon/features/ui/components/modal_root.js
index 79d86370ec4..3e56fbf8e12 100644
--- a/app/javascript/mastodon/features/ui/components/modal_root.js
+++ b/app/javascript/mastodon/features/ui/components/modal_root.js
@@ -7,11 +7,13 @@ 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 {
OnboardingModal,
MuteModal,
ReportModal,
+ SettingsModal,
EmbedModal,
} from '../../../features/ui/util/async-components';
@@ -20,9 +22,11 @@ const MODAL_COMPONENTS = {
'ONBOARDING': OnboardingModal,
'VIDEO': () => Promise.resolve({ default: VideoModal }),
'BOOST': () => Promise.resolve({ default: BoostModal }),
+ 'DOODLE': () => Promise.resolve({ default: DoodleModal }),
'CONFIRM': () => Promise.resolve({ default: ConfirmationModal }),
'MUTE': MuteModal,
'REPORT': ReportModal,
+ 'SETTINGS': SettingsModal,
'ACTIONS': () => Promise.resolve({ default: ActionsModal }),
'EMBED': EmbedModal,
};
@@ -41,7 +45,7 @@ export default class ModalRoot extends React.PureComponent {
handleKeyUp = (e) => {
if ((e.key === 'Escape' || e.key === 'Esc' || e.keyCode === 27)
- && !!this.props.type) {
+ && !!this.props.type && !this.props.props.noEsc) {
this.props.onClose();
}
}
@@ -86,7 +90,7 @@ export default class ModalRoot extends React.PureComponent {
}
renderLoading = modalId => () => {
- return ['MEDIA', 'VIDEO', 'BOOST', 'CONFIRM', 'ACTIONS'].indexOf(modalId) === -1 ?
: null;
+ return ['MEDIA', 'VIDEO', 'BOOST', 'DOODLE', 'CONFIRM', 'ACTIONS'].indexOf(modalId) === -1 ?
: null;
}
renderError = (props) => {
diff --git a/app/javascript/mastodon/features/ui/components/onboarding_modal.js b/app/javascript/mastodon/features/ui/components/onboarding_modal.js
index 54673e223e5..1f9f0cd03b2 100644
--- a/app/javascript/mastodon/features/ui/components/onboarding_modal.js
+++ b/app/javascript/mastodon/features/ui/components/onboarding_modal.js
@@ -10,7 +10,10 @@ import ComposeForm from '../../compose/components/compose_form';
import Search from '../../compose/components/search';
import NavigationBar from '../../compose/components/navigation_bar';
import ColumnHeader from './column_header';
-import { List as ImmutableList } from 'immutable';
+import {
+ List as ImmutableList,
+ Map as ImmutableMap,
+} from 'immutable';
import { me } from '../../../initial_state';
const noop = () => { };
@@ -29,8 +32,8 @@ const PageOne = ({ acct, domain }) => (
-
-
+
+
@{acct}@{domain} }} />
@@ -45,7 +48,7 @@ const PageTwo = ({ myAccount }) => (
-
(
onClearSuggestions={noop}
onFetchSuggestions={noop}
onSuggestionSelected={noop}
+ onPrivacyChange={noop}
showSearch
+ settings={ImmutableMap.of('side_arm', 'none')}
/>
@@ -84,7 +89,7 @@ const PageThree = ({ myAccount }) => (
/>
-
@@ -149,8 +154,8 @@ const PageSix = ({ admin, domain }) => {
{adminSection}
-
GitHub }} />
-
+
fork, Mastodon: Mastodon , github: GitHub }} />
+
);
diff --git a/app/javascript/mastodon/features/ui/index.js b/app/javascript/mastodon/features/ui/index.js
index f28b3709926..fc51df163c4 100644
--- a/app/javascript/mastodon/features/ui/index.js
+++ b/app/javascript/mastodon/features/ui/index.js
@@ -15,6 +15,7 @@ import { clearHeight } from '../../actions/height_cache';
import { WrappedSwitch, WrappedRoute } from './util/react_router_helpers';
import UploadArea from './components/upload_area';
import ColumnsAreaContainer from './containers/columns_area_container';
+import classNames from 'classnames';
import {
Compose,
Status,
@@ -28,6 +29,7 @@ import {
Following,
Reblogs,
Favourites,
+ DirectTimeline,
HashtagTimeline,
Notifications,
FollowRequests,
@@ -43,7 +45,7 @@ import { defineMessages, injectIntl } from 'react-intl';
// Dummy import, to make sure that
-
-
+
+ {navbarUnder ? null : (
)}
-
+
/
+ ESCAPE_CHAR = /[0abt\tnvfre "\/\\N_LP]/
+ HEXADECIMAL_CHARS = /[0-9a-fA-F]/
+ INDICATOR = /[-?:,\[\]{}&#*!|>'"%@`]/
+ FLOW_CHAR = /[,\[\]{}]/
+
+ # NEGATED CHARACTER CLASSES #
+
+ NOT_WHITE_SPACE = unirex '(?!' + rexstr(WHITE_SPACE) + ').'
+ NOT_LINE_BREAK = unirex '(?!' + rexstr(LINE_BREAK) + ').'
+ NOT_INDICATOR = unirex '(?!' + rexstr(INDICATOR) + ').'
+ NOT_FLOW_CHAR = unirex '(?!' + rexstr(FLOW_CHAR) + ').'
+ NOT_ALLOWED_CHAR = unirex '(?!' + rexstr(ALLOWED_CHAR) + ').'
+
+ # BASIC CONSTRUCTS #
+
+ ANY_WHITE_SPACE = unirex rexstr(WHITE_SPACE) + '*'
+ ANY_ALLOWED_CHARS = unirex rexstr(ALLOWED_CHAR) + '*'
+ NEW_LINE = unirex(
+ rexstr(ANY_WHITE_SPACE) + rexstr(LINE_BREAK)
+ )
+ SOME_NEW_LINES = unirex(
+ '(?:' + rexstr(ANY_WHITE_SPACE) + rexstr(LINE_BREAK) + ')+'
+ )
+ POSSIBLE_STARTS = unirex(
+ rexstr(DOCUMENT_START) + rexstr(/]*>/) + '?'
+ )
+ POSSIBLE_ENDS = unirex(
+ rexstr(SOME_NEW_LINES) + '|' +
+ rexstr(DOCUMENT_END) + '|' +
+ rexstr(/<\/p>/)
+ )
+ CHARACTER_ESCAPE = unirex(
+ rexstr(/\\/) +
+ '(?:' +
+ rexstr(ESCAPE_CHAR) + '|' +
+ rexstr(/x/) + rexstr(HEXADECIMAL_CHARS) + '{2}' + '|' +
+ rexstr(/u/) + rexstr(HEXADECIMAL_CHARS) + '{4}' + '|' +
+ rexstr(/U/) + rexstr(HEXADECIMAL_CHARS) + '{8}' +
+ ')'
+ )
+ ESCAPED_CHAR = unirex(
+ rexstr(/(?!["\\])/) + rexstr(NOT_LINE_BREAK) + '|' +
+ rexstr(CHARACTER_ESCAPE)
+ )
+ ANY_ESCAPED_CHARS = unirex(
+ rexstr(ESCAPED_CHAR) + '*'
+ )
+ ESCAPED_APOS = unirex(
+ '(?=' + rexstr(NOT_LINE_BREAK) + ')' + rexstr(/[^']|''/)
+ )
+ ANY_ESCAPED_APOS = unirex(
+ rexstr(ESCAPED_APOS) + '*'
+ )
+ FIRST_KEY_CHAR = unirex(
+ '(?=' + rexstr(NOT_LINE_BREAK) + ')' +
+ '(?=' + rexstr(NOT_WHITE_SPACE) + ')' +
+ rexstr(NOT_INDICATOR) + '|' +
+ rexstr(/[?:-]/) +
+ '(?=' + rexstr(NOT_LINE_BREAK) + ')' +
+ '(?=' + rexstr(NOT_WHITE_SPACE) + ')' +
+ '(?=' + rexstr(NOT_FLOW_CHAR) + ')'
+ )
+ FIRST_VALUE_CHAR = unirex(
+ '(?=' + rexstr(NOT_LINE_BREAK) + ')' +
+ '(?=' + rexstr(NOT_WHITE_SPACE) + ')' +
+ rexstr(NOT_INDICATOR) + '|' +
+ rexstr(/[?:-]/) +
+ '(?=' + rexstr(NOT_LINE_BREAK) + ')' +
+ '(?=' + rexstr(NOT_WHITE_SPACE) + ')'
+ # Flow indicators are allowed in values.
+ )
+ LATER_KEY_CHAR = unirex(
+ rexstr(WHITE_SPACE) + '|' +
+ '(?=' + rexstr(NOT_LINE_BREAK) + ')' +
+ '(?=' + rexstr(NOT_WHITE_SPACE) + ')' +
+ '(?=' + rexstr(NOT_FLOW_CHAR) + ')' +
+ rexstr(/[^:#]#?/) + '|' +
+ rexstr(/:/) + '(?=' + rexstr(NOT_WHITE_SPACE) + ')'
+ )
+ LATER_VALUE_CHAR = unirex(
+ rexstr(WHITE_SPACE) + '|' +
+ '(?=' + rexstr(NOT_LINE_BREAK) + ')' +
+ '(?=' + rexstr(NOT_WHITE_SPACE) + ')' +
+ # Flow indicators are allowed in values.
+ rexstr(/[^:#]#?/) + '|' +
+ rexstr(/:/) + '(?=' + rexstr(NOT_WHITE_SPACE) + ')'
+ )
+
+ # YAML CONSTRUCTS #
+
+ YAML_START = unirex(
+ rexstr(ANY_WHITE_SPACE) + rexstr(/---/)
+ )
+ YAML_END = unirex(
+ rexstr(ANY_WHITE_SPACE) + rexstr(/(?:---|\.\.\.)/)
+ )
+ YAML_LOOKAHEAD = unirex(
+ '(?=' +
+ rexstr(YAML_START) +
+ rexstr(ANY_ALLOWED_CHARS) + rexstr(NEW_LINE) +
+ rexstr(YAML_END) + rexstr(POSSIBLE_ENDS) +
+ ')'
+ )
+ YAML_DOUBLE_QUOTE = unirex(
+ rexstr(/"/) + rexstr(ANY_ESCAPED_CHARS) + rexstr(/"/)
+ )
+ YAML_SINGLE_QUOTE = unirex(
+ rexstr(/'/) + rexstr(ANY_ESCAPED_APOS) + rexstr(/'/)
+ )
+ YAML_SIMPLE_KEY = unirex(
+ rexstr(FIRST_KEY_CHAR) + rexstr(LATER_KEY_CHAR) + '*'
+ )
+ YAML_SIMPLE_VALUE = unirex(
+ rexstr(FIRST_VALUE_CHAR) + rexstr(LATER_VALUE_CHAR) + '*'
+ )
+ YAML_KEY = unirex(
+ rexstr(YAML_DOUBLE_QUOTE) + '|' +
+ rexstr(YAML_SINGLE_QUOTE) + '|' +
+ rexstr(YAML_SIMPLE_KEY)
+ )
+ YAML_VALUE = unirex(
+ rexstr(YAML_DOUBLE_QUOTE) + '|' +
+ rexstr(YAML_SINGLE_QUOTE) + '|' +
+ rexstr(YAML_SIMPLE_VALUE)
+ )
+ YAML_SEPARATOR = unirex(
+ rexstr(ANY_WHITE_SPACE) +
+ ':' + rexstr(WHITE_SPACE) +
+ rexstr(ANY_WHITE_SPACE)
+ )
+ YAML_LINE = unirex(
+ '(' + rexstr(YAML_KEY) + ')' +
+ rexstr(YAML_SEPARATOR) +
+ '(' + rexstr(YAML_VALUE) + ')'
+ )
+
+ # FRONTMATTER REGEX #
+
+ YAML_FRONTMATTER = unirex(
+ rexstr(POSSIBLE_STARTS) +
+ rexstr(YAML_LOOKAHEAD) +
+ rexstr(YAML_START) + rexstr(SOME_NEW_LINES) +
+ '(?:' +
+ '(' + rexstr(INDENTATION) + ')' +
+ rexstr(YAML_LINE) + rexstr(SOME_NEW_LINES) +
+ '(?:' +
+ '\\1' + rexstr(YAML_LINE) + rexstr(SOME_NEW_LINES) +
+ '){0,4}' +
+ ')?' +
+ rexstr(YAML_END) + rexstr(POSSIBLE_ENDS)
+ )
+
+ # SEARCHES #
+
+ FIND_YAML_LINES = unirex(
+ rexstr(NEW_LINE) + rexstr(INDENTATION) + rexstr(YAML_LINE)
+ )
+
+ # STRING PROCESSING #
+
+ def process_string(str)
+ case str[0]
+ when '"'
+ str[1..-2]
+ .gsub(/\\0/, "\u{00}")
+ .gsub(/\\a/, "\u{07}")
+ .gsub(/\\b/, "\u{08}")
+ .gsub(/\\t/, "\u{09}")
+ .gsub(/\\\u{09}/, "\u{09}")
+ .gsub(/\\n/, "\u{0a}")
+ .gsub(/\\v/, "\u{0b}")
+ .gsub(/\\f/, "\u{0c}")
+ .gsub(/\\r/, "\u{0d}")
+ .gsub(/\\e/, "\u{1b}")
+ .gsub(/\\ /, "\u{20}")
+ .gsub(/\\"/, "\u{22}")
+ .gsub(/\\\//, "\u{2f}")
+ .gsub(/\\\\/, "\u{5c}")
+ .gsub(/\\N/, "\u{85}")
+ .gsub(/\\_/, "\u{a0}")
+ .gsub(/\\L/, "\u{2028}")
+ .gsub(/\\P/, "\u{2029}")
+ .gsub(/\\x([0-9a-fA-F]{2})/mu) {|s| $1.to_i.chr Encoding::UTF_8}
+ .gsub(/\\u([0-9a-fA-F]{4})/mu) {|s| $1.to_i.chr Encoding::UTF_8}
+ .gsub(/\\U([0-9a-fA-F]{8})/mu) {|s| $1.to_i.chr Encoding::UTF_8}
+ when "'"
+ str[1..-2].gsub(/''/, "'")
+ else
+ str
+ end
+ end
+
+ # BIO PROCESSING #
+
+ def process_bio content
+ result = {
+ text: content.gsub(/"/, '"').gsub(/'/, "'"),
+ metadata: []
+ }
+ yaml = YAML_FRONTMATTER.match(result[:text])
+ return result unless yaml
+ yaml = yaml[0]
+ start = YAML_START =~ result[:text]
+ ending = start + yaml.length - (YAML_START =~ yaml)
+ result[:text][start..ending - 1] = ''
+ metadata = nil
+ index = 0
+ while metadata = FIND_YAML_LINES.match(yaml, index) do
+ index = metadata.end(0)
+ result[:metadata].push [
+ process_string(metadata[1]), process_string(metadata[2])
+ ]
+ end
+ return result
+ end
+
+end
diff --git a/app/lib/themes.rb b/app/lib/themes.rb
index 243ffb9ab97..2dd188297ea 100644
--- a/app/lib/themes.rb
+++ b/app/lib/themes.rb
@@ -7,7 +7,14 @@ class Themes
include Singleton
def initialize
- @conf = YAML.load_file(Rails.root.join('config', 'themes.yml'))
+ result = Hash.new
+ Dir.glob(Rails.root.join('app', 'javascript', 'themes', '*', 'theme.yml')) do |path|
+ data = YAML.load_file(path)
+ if data['pack'] && data['name']
+ result[data['name']] = data
+ end
+ end
+ @conf = result
end
def names
diff --git a/app/lib/user_settings_decorator.rb b/app/lib/user_settings_decorator.rb
index d48e1da65a7..d86959c0bb1 100644
--- a/app/lib/user_settings_decorator.rb
+++ b/app/lib/user_settings_decorator.rb
@@ -76,7 +76,7 @@ class UserSettingsDecorator
def theme_preference
settings['setting_theme']
end
-
+
def boolean_cast_setting(key)
settings[key] == '1'
end
diff --git a/app/models/account.rb b/app/models/account.rb
index 6f6010f7af1..863bfaa25f6 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -54,6 +54,8 @@ class Account < ApplicationRecord
include Attachmentable
include Remotable
+ MAX_NOTE_LENGTH = 500
+
enum protocol: [:ostatus, :activitypub]
# Local users
@@ -68,7 +70,7 @@ class Account < ApplicationRecord
validates :username, format: { with: /\A[a-z0-9_]+\z/i }, uniqueness: { scope: :domain, case_sensitive: false }, length: { maximum: 30 }, if: -> { local? && will_save_change_to_username? }
validates_with UnreservedUsernameValidator, if: -> { local? && will_save_change_to_username? }
validates :display_name, length: { maximum: 30 }, if: -> { local? && will_save_change_to_display_name? }
- validates :note, length: { maximum: 160 }, if: -> { local? && will_save_change_to_note? }
+ validate :note_length_does_not_exceed_length_limit, if: -> { local? && will_save_change_to_note? }
# Timelines
has_many :stream_entries, inverse_of: :account, dependent: :destroy
@@ -307,6 +309,22 @@ class Account < ApplicationRecord
self.public_key = keypair.public_key.to_pem
end
+ YAML_START = "---\r\n"
+ YAML_END = "\r\n...\r\n"
+
+ def note_length_does_not_exceed_length_limit
+ note_without_metadata = note
+ if note.start_with? YAML_START
+ idx = note.index YAML_END
+ unless idx.nil?
+ note_without_metadata = note[(idx + YAML_END.length) .. -1]
+ end
+ end
+ if note_without_metadata.mb_chars.grapheme_length > MAX_NOTE_LENGTH
+ errors.add(:note, "can't be longer than 500 graphemes")
+ end
+ end
+
def normalize_domain
return if local?
diff --git a/app/models/concerns/account_interactions.rb b/app/models/concerns/account_interactions.rb
index 55ad812b227..c41f92581b1 100644
--- a/app/models/concerns/account_interactions.rb
+++ b/app/models/concerns/account_interactions.rb
@@ -5,7 +5,11 @@ module AccountInteractions
class_methods do
def following_map(target_account_ids, account_id)
- follow_mapping(Follow.where(target_account_id: target_account_ids, account_id: account_id), :target_account_id)
+ Follow.where(target_account_id: target_account_ids, account_id: account_id).each_with_object({}) do |follow, mapping|
+ mapping[follow.target_account_id] = {
+ reblogs: follow.show_reblogs?
+ }
+ end
end
def followed_by_map(target_account_ids, account_id)
@@ -25,7 +29,11 @@ module AccountInteractions
end
def requested_map(target_account_ids, account_id)
- follow_mapping(FollowRequest.where(target_account_id: target_account_ids, account_id: account_id), :target_account_id)
+ FollowRequest.where(target_account_id: target_account_ids, account_id: account_id).each_with_object({}) do |follow_request, mapping|
+ mapping[follow_request.target_account_id] = {
+ reblogs: follow_request.show_reblogs?
+ }
+ end
end
def domain_blocking_map(target_account_ids, account_id)
@@ -66,8 +74,12 @@ module AccountInteractions
has_many :domain_blocks, class_name: 'AccountDomainBlock', dependent: :destroy
end
- def follow!(other_account)
- active_relationships.find_or_create_by!(target_account: other_account)
+ def follow!(other_account, reblogs: nil)
+ reblogs = true if reblogs.nil?
+ rel = active_relationships.create_with(show_reblogs: reblogs).find_or_create_by!(target_account: other_account)
+ rel.update!(show_reblogs: reblogs)
+
+ rel
end
def block!(other_account)
@@ -140,6 +152,10 @@ module AccountInteractions
mute_relationships.where(target_account: other_account, hide_notifications: true).exists?
end
+ def muting_reblogs?(other_account)
+ active_relationships.where(target_account: other_account, show_reblogs: false).exists?
+ end
+
def requested?(other_account)
follow_requests.where(target_account: other_account).exists?
end
diff --git a/app/models/follow.rb b/app/models/follow.rb
index 3d5447fb1f0..ea00a377a23 100644
--- a/app/models/follow.rb
+++ b/app/models/follow.rb
@@ -5,9 +5,10 @@
#
# created_at :datetime not null
# updated_at :datetime not null
-# account_id :bigint not null
-# id :bigint not null, primary key
-# target_account_id :bigint not null
+# account_id :bigint not null
+# id :bigint not null, primary key
+# target_account_id :bigint not null
+# show_reblogs :boolean default(TRUE), not null
#
class Follow < ApplicationRecord
diff --git a/app/models/follow_request.rb b/app/models/follow_request.rb
index ce27fc92149..962b6141130 100644
--- a/app/models/follow_request.rb
+++ b/app/models/follow_request.rb
@@ -5,9 +5,10 @@
#
# created_at :datetime not null
# updated_at :datetime not null
-# account_id :bigint not null
-# id :bigint not null, primary key
-# target_account_id :bigint not null
+# account_id :bigint not null
+# id :bigint not null, primary key
+# target_account_id :bigint not null
+# show_reblogs :boolean default(TRUE), not null
#
class FollowRequest < ApplicationRecord
@@ -21,7 +22,7 @@ class FollowRequest < ApplicationRecord
validates :account_id, uniqueness: { scope: :target_account_id }
def authorize!
- account.follow!(target_account)
+ account.follow!(target_account, reblogs: show_reblogs)
MergeWorker.perform_async(target_account.id, account.id)
destroy!
diff --git a/app/models/glitch.rb b/app/models/glitch.rb
new file mode 100644
index 00000000000..0e497babcce
--- /dev/null
+++ b/app/models/glitch.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Glitch
+ def self.table_name_prefix
+ 'glitch_'
+ end
+end
diff --git a/app/models/glitch/keyword_mute.rb b/app/models/glitch/keyword_mute.rb
new file mode 100644
index 00000000000..009de1880b8
--- /dev/null
+++ b/app/models/glitch/keyword_mute.rb
@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+# == Schema Information
+#
+# Table name: glitch_keyword_mutes
+#
+# id :integer not null, primary key
+# account_id :integer not null
+# keyword :string not null
+# whole_word :boolean default(TRUE), not null
+# created_at :datetime not null
+# updated_at :datetime not null
+#
+
+class Glitch::KeywordMute < ApplicationRecord
+ belongs_to :account, required: true
+
+ validates_presence_of :keyword
+
+ after_commit :invalidate_cached_matcher
+
+ def self.matcher_for(account_id)
+ Matcher.new(account_id)
+ end
+
+ private
+
+ def invalidate_cached_matcher
+ Rails.cache.delete("keyword_mutes:regex:#{account_id}")
+ end
+
+ class Matcher
+ attr_reader :account_id
+ attr_reader :regex
+
+ def initialize(account_id)
+ @account_id = account_id
+ regex_text = Rails.cache.fetch("keyword_mutes:regex:#{account_id}") { regex_text_for_account }
+ @regex = /#{regex_text}/
+ end
+
+ def =~(str)
+ regex =~ str
+ end
+
+ private
+
+ def keywords
+ Glitch::KeywordMute.where(account_id: account_id).select(:keyword, :id, :whole_word)
+ end
+
+ def regex_text_for_account
+ kws = keywords.find_each.with_object([]) do |kw, a|
+ a << (kw.whole_word ? boundary_regex_for_keyword(kw.keyword) : kw.keyword)
+ end
+
+ Regexp.union(kws).source
+ end
+
+ def boundary_regex_for_keyword(keyword)
+ sb = keyword =~ /\A[[:word:]]/ ? '\b' : ''
+ eb = keyword =~ /[[:word:]]\Z/ ? '\b' : ''
+
+ /(?mix:#{sb}#{Regexp.escape(keyword)}#{eb})/
+ end
+ end
+end
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb
index f0541892551..7a553f7032d 100644
--- a/app/models/media_attachment.rb
+++ b/app/models/media_attachment.rb
@@ -24,15 +24,32 @@ require 'mime/types'
class MediaAttachment < ApplicationRecord
self.inheritance_column = nil
- enum type: [:image, :gifv, :video, :unknown]
+ enum type: [:image, :gifv, :video, :audio, :unknown]
IMAGE_FILE_EXTENSIONS = ['.jpg', '.jpeg', '.png', '.gif'].freeze
VIDEO_FILE_EXTENSIONS = ['.webm', '.mp4', '.m4v'].freeze
+ AUDIO_FILE_EXTENSIONS = ['.mp3', '.m4a', '.wav', '.ogg'].freeze
IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif'].freeze
VIDEO_MIME_TYPES = ['video/webm', 'video/mp4'].freeze
+ AUDIO_MIME_TYPES = ['audio/mpeg', 'audio/mp4', 'audio/vnd.wav', 'audio/wav', 'audio/x-wav', 'audio/x-wave', 'audio/ogg',].freeze
IMAGE_STYLES = { original: '1280x1280>', small: '400x400>' }.freeze
+ AUDIO_STYLES = {
+ original: {
+ format: 'mp4',
+ convert_options: {
+ output: {
+ filter_complex: '"[0:a]compand,showwaves=s=640x360:mode=line,format=yuv420p[v]"',
+ map: '"[v]" -map 0:a',
+ threads: 2,
+ vcodec: 'libx264',
+ acodec: 'aac',
+ movflags: '+faststart',
+ },
+ },
+ },
+ }.freeze
VIDEO_STYLES = {
small: {
convert_options: {
@@ -55,7 +72,7 @@ class MediaAttachment < ApplicationRecord
include Remotable
- validates_attachment_content_type :file, content_type: IMAGE_MIME_TYPES + VIDEO_MIME_TYPES
+ validates_attachment_content_type :file, content_type: IMAGE_MIME_TYPES + VIDEO_MIME_TYPES + AUDIO_MIME_TYPES
validates_attachment_size :file, less_than: 8.megabytes
validates :account, presence: true
@@ -110,6 +127,8 @@ class MediaAttachment < ApplicationRecord
}
elsif IMAGE_MIME_TYPES.include? f.instance.file_content_type
IMAGE_STYLES
+ elsif AUDIO_MIME_TYPES.include? f.instance.file_content_type
+ AUDIO_STYLES
else
VIDEO_STYLES
end
@@ -120,6 +139,8 @@ class MediaAttachment < ApplicationRecord
[:gif_transcoder]
elsif VIDEO_MIME_TYPES.include? f.file_content_type
[:video_transcoder]
+ elsif AUDIO_MIME_TYPES.include? f.file_content_type
+ [:audio_transcoder]
else
[:thumbnail]
end
@@ -144,8 +165,8 @@ class MediaAttachment < ApplicationRecord
end
def set_type_and_extension
- self.type = VIDEO_MIME_TYPES.include?(file_content_type) ? :video : :image
- extension = appropriate_extension
+ self.type = VIDEO_MIME_TYPES.include?(file_content_type) ? :video : AUDIO_MIME_TYPES.include?(file_content_type) ? :audio : :image
+ extension = AUDIO_MIME_TYPES.include?(file_content_type) ? '.mp4' : appropriate_extension
basename = Paperclip::Interpolations.basename(file, :original)
file.instance_write :file_name, [basename, extension].delete_if(&:blank?).join('.')
end
diff --git a/app/models/mute.rb b/app/models/mute.rb
index 105696da63a..74b445c0b92 100644
--- a/app/models/mute.rb
+++ b/app/models/mute.rb
@@ -3,11 +3,11 @@
#
# Table name: mutes
#
-# id :integer not null, primary key
+# id :bigint not null, primary key
# created_at :datetime not null
# updated_at :datetime not null
-# account_id :integer not null
-# target_account_id :integer not null
+# account_id :bigint not null
+# target_account_id :bigint not null
# hide_notifications :boolean default(TRUE), not null
#
diff --git a/app/models/status.rb b/app/models/status.rb
index b4f31431178..1dda6594e60 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -154,6 +154,14 @@ class Status < ApplicationRecord
where(account: [account] + account.following).where(visibility: [:public, :unlisted, :private])
end
+ def as_direct_timeline(account)
+ query = joins("LEFT OUTER JOIN mentions ON statuses.id = mentions.status_id AND mentions.account_id = #{account.id}")
+ .where("mentions.account_id = #{account.id} OR statuses.account_id = #{account.id}")
+ .where(visibility: [:direct])
+
+ apply_timeline_filters(query, account, false)
+ end
+
def as_public_timeline(account = nil, local_only = false)
query = timeline_scope(local_only).without_replies
@@ -261,6 +269,11 @@ class Status < ApplicationRecord
end
end
+ def local_only?
+ # match both with and without U+FE0F (the emoji variation selector)
+ /👁\ufe0f?\z/.match?(content)
+ end
+
private
def store_uri
diff --git a/app/models/stream_entry.rb b/app/models/stream_entry.rb
index 50b900c3cbb..2b812d82627 100644
--- a/app/models/stream_entry.rb
+++ b/app/models/stream_entry.rb
@@ -27,7 +27,7 @@ class StreamEntry < ApplicationRecord
scope :recent, -> { reorder(id: :desc) }
scope :with_includes, -> { includes(:account, status: STATUS_INCLUDES) }
- delegate :target, :title, :content, :thread,
+ delegate :target, :title, :content, :thread, :local_only?,
to: :status,
allow_nil: true
diff --git a/app/policies/status_policy.rb b/app/policies/status_policy.rb
index 0373fdf04fc..8e0c1eef18f 100644
--- a/app/policies/status_policy.rb
+++ b/app/policies/status_policy.rb
@@ -6,6 +6,8 @@ class StatusPolicy < ApplicationPolicy
end
def show?
+ return false if local_only? && account.nil?
+
if direct?
owned? || record.mentions.where(account: current_account).exists?
elsif private?
@@ -46,4 +48,8 @@ class StatusPolicy < ApplicationPolicy
def author
record.account
end
+
+ def local_only?
+ record.local_only?
+ end
end
diff --git a/app/presenters/instance_presenter.rb b/app/presenters/instance_presenter.rb
index 4c1124d5999..1c08fb3bc05 100644
--- a/app/presenters/instance_presenter.rb
+++ b/app/presenters/instance_presenter.rb
@@ -32,6 +32,15 @@ class InstancePresenter
Mastodon::Version
end
+ def commit_hash
+ current_release_file = Pathname.new('CURRENT_RELEASE').expand_path
+ if current_release_file.file?
+ IO.read(current_release_file).strip!
+ else
+ ''
+ end
+ end
+
def source_url
Mastodon::Version.source_url
end
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb
index 4fa1981ed40..787c5add33c 100644
--- a/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@@ -53,6 +53,6 @@ class InitialStateSerializer < ActiveModel::Serializer
end
def media_attachments
- { accept_content_types: MediaAttachment::IMAGE_FILE_EXTENSIONS + MediaAttachment::VIDEO_FILE_EXTENSIONS + MediaAttachment::IMAGE_MIME_TYPES + MediaAttachment::VIDEO_MIME_TYPES }
+ { accept_content_types: MediaAttachment::IMAGE_FILE_EXTENSIONS + MediaAttachment::VIDEO_FILE_EXTENSIONS + MediaAttachment::AUDIO_FILE_EXTENSIONS + MediaAttachment::IMAGE_MIME_TYPES + MediaAttachment::VIDEO_MIME_TYPES + MediaAttachment::AUDIO_MIME_TYPES }
end
end
diff --git a/app/serializers/rest/mute_serializer.rb b/app/serializers/rest/mute_serializer.rb
new file mode 100644
index 00000000000..043a2f05969
--- /dev/null
+++ b/app/serializers/rest/mute_serializer.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class REST::MuteSerializer < ActiveModel::Serializer
+ include RoutingHelper
+
+ attributes :id, :account, :target_account, :created_at, :hide_notifications
+
+ def account
+ REST::AccountSerializer.new(object.account)
+ end
+
+ def target_account
+ REST::AccountSerializer.new(object.target_account)
+ end
+end
\ No newline at end of file
diff --git a/app/services/batched_remove_status_service.rb b/app/services/batched_remove_status_service.rb
index 5d83771c9dd..aa2229f13b6 100644
--- a/app/services/batched_remove_status_service.rb
+++ b/app/services/batched_remove_status_service.rb
@@ -40,6 +40,7 @@ class BatchedRemoveStatusService < BaseService
# Cannot be batched
statuses.each do |status|
unpush_from_public_timelines(status)
+ unpush_from_direct_timelines(status) if status.direct_visibility?
batch_salmon_slaps(status) if status.local?
end
@@ -100,6 +101,16 @@ class BatchedRemoveStatusService < BaseService
end
end
+ def unpush_from_direct_timelines(status)
+ payload = @json_payloads[status.id]
+ redis.pipelined do
+ @mentions[status.id].each do |mention|
+ redis.publish("timeline:direct:#{mention.account.id}", payload) if mention.account.local?
+ end
+ redis.publish("timeline:direct:#{status.account.id}", payload) if status.account.local?
+ end
+ end
+
def batch_salmon_slaps(status)
return if @mentions[status.id].empty?
diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb
index 47a47a73546..2214d73dd6d 100644
--- a/app/services/fan_out_on_write_service.rb
+++ b/app/services/fan_out_on_write_service.rb
@@ -10,15 +10,17 @@ class FanOutOnWriteService < BaseService
deliver_to_self(status) if status.account.local?
+ render_anonymous_payload(status)
+
if status.direct_visibility?
deliver_to_mentioned_followers(status)
+ deliver_to_direct_timelines(status)
else
deliver_to_followers(status)
end
return if status.account.silenced? || !status.public_visibility? || status.reblog?
- render_anonymous_payload(status)
deliver_to_hashtags(status)
return if status.reply? && status.in_reply_to_account_id != status.account_id
@@ -73,4 +75,13 @@ class FanOutOnWriteService < BaseService
Redis.current.publish('timeline:public', @payload)
Redis.current.publish('timeline:public:local', @payload) if status.local?
end
+
+ def deliver_to_direct_timelines(status)
+ Rails.logger.debug "Delivering status #{status.id} to direct timelines"
+
+ status.mentions.includes(:account).each do |mention|
+ Redis.current.publish("timeline:direct:#{mention.account.id}", @payload) if mention.account.local?
+ end
+ Redis.current.publish("timeline:direct:#{status.account.id}", @payload) if status.account.local?
+ end
end
diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb
index 791773f250b..20579ca63a2 100644
--- a/app/services/follow_service.rb
+++ b/app/services/follow_service.rb
@@ -6,25 +6,38 @@ class FollowService < BaseService
# Follow a remote user, notify remote user about the follow
# @param [Account] source_account From which to follow
# @param [String, Account] uri User URI to follow in the form of username@domain (or account record)
- def call(source_account, uri)
+ # @param [true, false, nil] reblogs Whether or not to show reblogs, defaults to true
+ def call(source_account, uri, reblogs: nil)
+ reblogs = true if reblogs.nil?
target_account = uri.is_a?(Account) ? uri : ResolveRemoteAccountService.new.call(uri)
raise ActiveRecord::RecordNotFound if target_account.nil? || target_account.id == source_account.id || target_account.suspended?
raise Mastodon::NotPermittedError if target_account.blocking?(source_account) || source_account.blocking?(target_account)
- return if source_account.following?(target_account) || source_account.requested?(target_account)
+ if source_account.following?(target_account)
+ # We're already following this account, but we'll call follow! again to
+ # make sure the reblogs status is set correctly.
+ source_account.follow!(target_account, reblogs: reblogs)
+ return
+ elsif source_account.requested?(target_account)
+ # This isn't managed by a method in AccountInteractions, so we modify it
+ # ourselves if necessary.
+ req = follow_requests.find_by(target_account: other_account)
+ req.update!(show_reblogs: reblogs)
+ return
+ end
if target_account.locked? || target_account.activitypub?
- request_follow(source_account, target_account)
+ request_follow(source_account, target_account, reblogs: reblogs)
else
- direct_follow(source_account, target_account)
+ direct_follow(source_account, target_account, reblogs: reblogs)
end
end
private
- def request_follow(source_account, target_account)
- follow_request = FollowRequest.create!(account: source_account, target_account: target_account)
+ def request_follow(source_account, target_account, reblogs: true)
+ follow_request = FollowRequest.create!(account: source_account, target_account: target_account, show_reblogs: reblogs)
if target_account.local?
NotifyService.new.call(target_account, follow_request)
@@ -38,8 +51,8 @@ class FollowService < BaseService
follow_request
end
- def direct_follow(source_account, target_account)
- follow = source_account.follow!(target_account)
+ def direct_follow(source_account, target_account, reblogs: true)
+ follow = source_account.follow!(target_account, reblogs: reblogs)
if target_account.local?
NotifyService.new.call(target_account, follow)
diff --git a/app/services/mute_service.rb b/app/services/mute_service.rb
index 9b7cbd81f26..547b2efa1a1 100644
--- a/app/services/mute_service.rb
+++ b/app/services/mute_service.rb
@@ -3,7 +3,6 @@
class MuteService < BaseService
def call(account, target_account, notifications: nil)
return if account.id == target_account.id
- FeedManager.instance.clear_from_timeline(account, target_account)
mute = account.mute!(target_account, notifications: notifications)
BlockWorker.perform_async(account.id, target_account.id)
mute
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index 8a77f2f38ac..d5960c3adc6 100644
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -29,7 +29,7 @@ class NotifyService < BaseService
end
def blocked_reblog?
- false
+ @recipient.muting_reblogs?(@notification.from_account)
end
def blocked_follow_request?
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index de350f8e6f4..974c586f2e9 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -39,9 +39,13 @@ class PostStatusService < BaseService
LinkCrawlWorker.perform_async(status.id) unless status.spoiler_text?
DistributionWorker.perform_async(status.id)
- Pubsubhubbub::DistributionWorker.perform_async(status.stream_entry.id)
- ActivityPub::DistributionWorker.perform_async(status.id)
- ActivityPub::ReplyDistributionWorker.perform_async(status.id) if status.reply? && status.thread.account.local?
+
+ # match both with and without U+FE0F (the emoji variation selector)
+ unless /👁\ufe0f?\z/.match?(status.content)
+ Pubsubhubbub::DistributionWorker.perform_async(status.stream_entry.id)
+ ActivityPub::DistributionWorker.perform_async(status.id)
+ ActivityPub::ReplyDistributionWorker.perform_async(status.id) if status.reply? && status.thread.account.local?
+ end
if options[:idempotency].present?
redis.setex("idempotency:status:#{account.id}:#{options[:idempotency]}", 3_600, status.id)
diff --git a/app/services/reblog_service.rb b/app/services/reblog_service.rb
index 3c4e5847f30..52e3ba0e054 100644
--- a/app/services/reblog_service.rb
+++ b/app/services/reblog_service.rb
@@ -20,8 +20,11 @@ class ReblogService < BaseService
reblog = account.statuses.create!(reblog: reblogged_status, text: '')
DistributionWorker.perform_async(reblog.id)
- Pubsubhubbub::DistributionWorker.perform_async(reblog.stream_entry.id)
- ActivityPub::DistributionWorker.perform_async(reblog.id)
+
+ unless /👁$/.match?(reblogged_status.content)
+ Pubsubhubbub::DistributionWorker.perform_async(reblog.stream_entry.id)
+ ActivityPub::DistributionWorker.perform_async(reblog.id)
+ end
create_notification(reblog)
reblog
diff --git a/app/services/remove_status_service.rb b/app/services/remove_status_service.rb
index 96d9208cce0..8eef3e57e7d 100644
--- a/app/services/remove_status_service.rb
+++ b/app/services/remove_status_service.rb
@@ -18,6 +18,7 @@ class RemoveStatusService < BaseService
remove_reblogs
remove_from_hashtags
remove_from_public
+ remove_from_direct if status.direct_visibility?
@status.destroy!
@@ -121,6 +122,13 @@ class RemoveStatusService < BaseService
Redis.current.publish('timeline:public:local', @payload) if @status.local?
end
+ def remove_from_direct
+ @mentions.each do |mention|
+ Redis.current.publish("timeline:direct:#{mention.account.id}", @payload) if mention.account.local?
+ end
+ Redis.current.publish("timeline:direct:#{@account.id}", @payload) if @account.local?
+ end
+
def redis
Redis.current
end
diff --git a/app/validators/status_length_validator.rb b/app/validators/status_length_validator.rb
index 77be3f1f543..2ce5d1ee999 100644
--- a/app/validators/status_length_validator.rb
+++ b/app/validators/status_length_validator.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
class StatusLengthValidator < ActiveModel::Validator
- MAX_CHARS = 500
+ MAX_CHARS = 512
def validate(status)
return unless status.local? && !status.reblog?
diff --git a/app/views/about/more.html.haml b/app/views/about/more.html.haml
index b012606ce99..7ffa5ecc35d 100644
--- a/app/views/about/more.html.haml
+++ b/app/views/about/more.html.haml
@@ -55,4 +55,8 @@
.container
%p
= link_to t('about.source_code'), @instance_presenter.source_url
- = " (#{@instance_presenter.version_number})"
+ - if @instance_presenter.commit_hash == ""
+ %strong= " (#{@instance_presenter.version_number})"
+ - else
+ %strong= "#{@instance_presenter.version_number}, "
+ %strong= "#{@instance_presenter.commit_hash}"
diff --git a/app/views/about/show.html.haml b/app/views/about/show.html.haml
index f8f90ce2431..385b0b1dc37 100644
--- a/app/views/about/show.html.haml
+++ b/app/views/about/show.html.haml
@@ -47,6 +47,13 @@
%p= t('about.closed_registrations')
- else
= @instance_presenter.closed_registrations_message.html_safe
+
+ = simple_form_for(:user, html: { style: 'margin-left: -20px' }, url: session_path(:user)) do |f|
+ = f.input :email, autofocus: true, placeholder: t('simple_form.labels.defaults.email'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.email') }
+ = f.input :password, placeholder: t('simple_form.labels.defaults.password'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.password'), :autocomplete => 'off' }
+
+ .actions
+ = f.button :button, t('auth.login'), type: :submit
= link_to t('about.find_another_instance'), 'https://joinmastodon.org/', class: 'button button-alternative button--block'
.about-short
@@ -68,4 +75,8 @@
.container
%p
= link_to t('about.source_code'), @instance_presenter.source_url
- = " (#{@instance_presenter.version_number})"
+ - if @instance_presenter.commit_hash == ""
+ %strong= " (#{@instance_presenter.version_number})"
+ - else
+ %strong= " (#{@instance_presenter.version_number}, "
+ %strong= " #{@instance_presenter.commit_hash})"
diff --git a/app/views/accounts/_header.html.haml b/app/views/accounts/_header.html.haml
index 5530fcc200a..47ee02cf049 100644
--- a/app/views/accounts/_header.html.haml
+++ b/app/views/accounts/_header.html.haml
@@ -1,3 +1,4 @@
+- processed_bio = FrontmatterHandler.instance.process_bio Formatter.instance.simplified_format account
.card.h-card.p-author{ style: "background-image: url(#{account.header.url(:original)})" }
.card__illustration
- unless account.memorial?
@@ -31,9 +32,14 @@
.roles
.account-role
= t 'accounts.roles.admin'
-
.bio
- .account__header__content.p-note.emojify= Formatter.instance.simplified_format(account)
+ .account__header__content.p-note.emojify!=processed_bio[:text]
+ - if processed_bio[:metadata].length > 0
+ %table.metadata<
+ - processed_bio[:metadata].each do |i|
+ %tr.metadata-item><
+ %th.emojify>!=i[0]
+ %td.emojify>!=i[1]
.details-counters
.counter{ class: active_nav_class(short_account_url(account)) }
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
index 8c88d2d64fe..878ffb03251 100644
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@ -6,7 +6,8 @@
%meta{name: 'applicationServerKey', content: Rails.configuration.x.vapid_public_key}
%script#initial-state{ type: 'application/json' }!= json_escape(@initial_state_json)
- = javascript_pack_tag 'application', integrity: true, crossorigin: 'anonymous'
+ = javascript_pack_tag "themes/#{current_theme}", integrity: true, crossorigin: 'anonymous'
+ = stylesheet_pack_tag "themes/#{current_theme}", integrity: true, media: 'all'
.app-holder#mastodon{ data: { props: Oj.dump(default_props) } }
%noscript
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index ee995c987e8..24b74c787c0 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -19,11 +19,13 @@
= title
= stylesheet_pack_tag 'common', media: 'all'
- = stylesheet_pack_tag current_theme, media: 'all'
= javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous'
= javascript_pack_tag "locale_#{I18n.locale}", integrity: true, crossorigin: 'anonymous'
= csrf_meta_tags
+ - if controller_name != 'home'
+ = stylesheet_pack_tag 'application', integrity: true, media: 'all'
+
= yield :header_tags
- body_classes ||= @body_classes || ''
diff --git a/app/views/layouts/embedded.html.haml b/app/views/layouts/embedded.html.haml
index ac11cfbe72e..5fc60be170b 100644
--- a/app/views/layouts/embedded.html.haml
+++ b/app/views/layouts/embedded.html.haml
@@ -5,8 +5,8 @@
%meta{ name: 'robots', content: 'noindex' }/
= stylesheet_pack_tag 'common', media: 'all'
- = stylesheet_pack_tag Setting.default_settings['theme'], media: 'all'
= javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous'
+ = stylesheet_pack_tag 'application', integrity: true, media: 'all'
= javascript_pack_tag "locale_#{I18n.locale}", integrity: true, crossorigin: 'anonymous'
= javascript_pack_tag 'public', integrity: true, crossorigin: 'anonymous'
%body.embed
diff --git a/app/views/layouts/error.html.haml b/app/views/layouts/error.html.haml
index 37359b89b95..d0eae44346c 100644
--- a/app/views/layouts/error.html.haml
+++ b/app/views/layouts/error.html.haml
@@ -6,7 +6,7 @@
%title= safe_join([yield(:page_title), Setting.default_settings['site_title']], ' - ')
%meta{ content: 'width=device-width,initial-scale=1', name: 'viewport' }/
= stylesheet_pack_tag 'common', media: 'all'
- = stylesheet_pack_tag Setting.default_settings['theme'], media: 'all'
+ = stylesheet_pack_tag 'application', integrity: true, media: 'all'
%body.error
.dialog
%img{ alt: Setting.default_settings['site_title'], src: '/oops.gif' }/
diff --git a/app/views/settings/keyword_mutes/_fields.html.haml b/app/views/settings/keyword_mutes/_fields.html.haml
new file mode 100644
index 00000000000..892676f180e
--- /dev/null
+++ b/app/views/settings/keyword_mutes/_fields.html.haml
@@ -0,0 +1,11 @@
+.fields-group
+ = f.input :keyword
+ = f.check_box :whole_word
+ = f.label :whole_word, t('keyword_mutes.match_whole_word')
+
+.actions
+ - if f.object.persisted?
+ = f.button :button, t('generic.save_changes'), type: :submit
+ = link_to t('keyword_mutes.remove'), settings_keyword_mute_path(f.object), class: 'negative button', method: :delete, data: { confirm: t('admin.accounts.are_you_sure') }
+ - else
+ = f.button :button, t('keyword_mutes.add_keyword'), type: :submit
diff --git a/app/views/settings/keyword_mutes/_keyword_mute.html.haml b/app/views/settings/keyword_mutes/_keyword_mute.html.haml
new file mode 100644
index 00000000000..c45cc64fbff
--- /dev/null
+++ b/app/views/settings/keyword_mutes/_keyword_mute.html.haml
@@ -0,0 +1,10 @@
+%tr
+ %td
+ = keyword_mute.keyword
+ %td
+ - if keyword_mute.whole_word
+ %i.fa.fa-check
+ %td
+ = table_link_to 'edit', t('keyword_mutes.edit'), edit_settings_keyword_mute_path(keyword_mute)
+ %td
+ = table_link_to 'times', t('keyword_mutes.remove'), settings_keyword_mute_path(keyword_mute), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') }
diff --git a/app/views/settings/keyword_mutes/edit.html.haml b/app/views/settings/keyword_mutes/edit.html.haml
new file mode 100644
index 00000000000..af3949be2a5
--- /dev/null
+++ b/app/views/settings/keyword_mutes/edit.html.haml
@@ -0,0 +1,6 @@
+- content_for :page_title do
+ = t('keyword_mutes.edit_keyword')
+
+= simple_form_for @keyword_mute, url: settings_keyword_mute_path(@keyword_mute), as: :keyword_mute do |f|
+ = render 'shared/error_messages', object: @keyword_mute
+ = render 'fields', f: f
diff --git a/app/views/settings/keyword_mutes/index.html.haml b/app/views/settings/keyword_mutes/index.html.haml
new file mode 100644
index 00000000000..9ef8d55bc72
--- /dev/null
+++ b/app/views/settings/keyword_mutes/index.html.haml
@@ -0,0 +1,18 @@
+- content_for :page_title do
+ = t('settings.keyword_mutes')
+
+.table-wrapper
+ %table.table
+ %thead
+ %tr
+ %th= t('keyword_mutes.keyword')
+ %th= t('keyword_mutes.match_whole_word')
+ %th
+ %th
+ %tbody
+ = render partial: 'keyword_mute', collection: @keyword_mutes, as: :keyword_mute
+
+= paginate @keyword_mutes
+.simple_form
+ = link_to t('keyword_mutes.add_keyword'), new_settings_keyword_mute_path, class: 'button'
+ = link_to t('keyword_mutes.remove_all'), destroy_all_settings_keyword_mutes_path, class: 'button negative', method: :delete, data: { confirm: t('admin.accounts.are_you_sure') }
diff --git a/app/views/settings/keyword_mutes/new.html.haml b/app/views/settings/keyword_mutes/new.html.haml
new file mode 100644
index 00000000000..5c999c8d2eb
--- /dev/null
+++ b/app/views/settings/keyword_mutes/new.html.haml
@@ -0,0 +1,6 @@
+- content_for :page_title do
+ = t('keyword_mutes.add_keyword')
+
+= simple_form_for @keyword_mute, url: settings_keyword_mutes_path, as: :keyword_mute do |f|
+ = render 'shared/error_messages', object: @keyword_mute
+ = render 'fields', f: f
diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml
index 7a06cd0146b..551a7ca4935 100644
--- a/app/views/settings/profiles/show.html.haml
+++ b/app/views/settings/profiles/show.html.haml
@@ -6,7 +6,7 @@
.fields-group
= f.input :display_name, placeholder: t('simple_form.labels.defaults.display_name'), hint: t('simple_form.hints.defaults.display_name', count: 30 - @account.display_name.size).html_safe
- = f.input :note, placeholder: t('simple_form.labels.defaults.note'), hint: t('simple_form.hints.defaults.note', count: 160 - @account.note.size).html_safe
+ = f.input :note, placeholder: t('simple_form.labels.defaults.note'), hint: t('simple_form.hints.defaults.note', count: 500 - @account.note.size).html_safe
.card.compact{ style: "background-image: url(#{@account.header.url(:original)})", data: { original_src: @account.header.url(:original) } }
.avatar= image_tag @account.avatar.url(:original), data: { original_src: @account.avatar.url(:original) }
diff --git a/app/views/stream_entries/_content_spoiler.html.haml b/app/views/stream_entries/_content_spoiler.html.haml
index 798dfce670d..fb42d3f5727 100644
--- a/app/views/stream_entries/_content_spoiler.html.haml
+++ b/app/views/stream_entries/_content_spoiler.html.haml
@@ -1,4 +1,4 @@
-.media-spoiler-wrapper{ class: sensitive == false && 'media-spoiler-wrapper__visible' }
+.media-spoiler-wrapper{ class: sensitive == false && 'media-spoiler-wrapper__visible' }><
.spoiler-button
.icon-button.overlayed
%i.fa.fa-fw.fa-eye
diff --git a/app/views/stream_entries/_detailed_status.html.haml b/app/views/stream_entries/_detailed_status.html.haml
index 3119ebf4b93..b488bd9ba73 100644
--- a/app/views/stream_entries/_detailed_status.html.haml
+++ b/app/views/stream_entries/_detailed_status.html.haml
@@ -17,16 +17,16 @@
%p{ style: 'margin-bottom: 0' }<
%span.p-summary> #{Formatter.instance.format_spoiler(status)}
%a.status__content__spoiler-link{ href: '#' }= t('statuses.show_more')
- .e-content{ lang: status.language, style: "display: #{status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }= Formatter.instance.format(status, custom_emojify: true)
-
- - if !status.media_attachments.empty?
- - if status.media_attachments.first.video?
- - video = status.media_attachments.first
- %div{ data: { component: 'Video', props: Oj.dump(src: video.file.url(:original), preview: video.file.url(:small), sensitive: status.sensitive?, width: 670, height: 380) }}
- - else
- %div{ data: { component: 'MediaGallery', props: Oj.dump(height: 380, sensitive: status.sensitive?, standalone: true, 'autoPlayGif': current_account&.user&.setting_auto_play_gif, 'reduceMotion': current_account&.user&.setting_reduce_motion, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json }) }}
- - elsif status.preview_cards.first
- %div{ data: { component: 'Card', props: Oj.dump('maxDescription': 160, card: ActiveModelSerializers::SerializableResource.new(status.preview_cards.first, serializer: REST::PreviewCardSerializer).as_json) }}
+ .e-content{ lang: status.language, style: "display: #{status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }<
+ = Formatter.instance.format(status, custom_emojify: true)
+ - if !status.media_attachments.empty?
+ - if status.media_attachments.first.video?
+ - video = status.media_attachments.first
+ %div{ data: { component: 'Video', props: Oj.dump(src: video.file.url(:original), preview: video.file.url(:small), sensitive: status.sensitive?, width: 670, height: 380) }}<
+ - else
+ %div{ data: { component: 'MediaGallery', props: Oj.dump(height: 380, sensitive: status.sensitive?, standalone: true, 'autoPlayGif': current_account&.user&.setting_auto_play_gif, 'reduceMotion': current_account&.user&.setting_reduce_motion, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json }) }}<
+ - elsif status.preview_cards.first
+ %div{ data: { component: 'Card', props: Oj.dump('maxDescription': 160, card: ActiveModelSerializers::SerializableResource.new(status.preview_cards.first, serializer: REST::PreviewCardSerializer).as_json) }}<
.detailed-status__meta
%data.dt-published{ value: status.created_at.to_time.iso8601 }
diff --git a/app/views/stream_entries/_media.html.haml b/app/views/stream_entries/_media.html.haml
index 779f02c8d91..32d024cf60c 100644
--- a/app/views/stream_entries/_media.html.haml
+++ b/app/views/stream_entries/_media.html.haml
@@ -1,4 +1,4 @@
-.media-item
+.media-item><
= link_to media.remote_url.blank? ? media.file.url(:original) : media.remote_url, style: media.image? ? "background-image: url(#{media.file.url(:original)})" : '', target: '_blank', rel: 'noopener', class: "u-#{media.video? || media.gifv? ? 'video' : 'photo'}" do
- unless media.image?
%video{ src: media.file.url(:original), autoplay: true, loop: true }/
diff --git a/app/views/stream_entries/_simple_status.html.haml b/app/views/stream_entries/_simple_status.html.haml
index b594c9da606..0b45ff30810 100644
--- a/app/views/stream_entries/_simple_status.html.haml
+++ b/app/views/stream_entries/_simple_status.html.haml
@@ -18,11 +18,12 @@
%p{ style: 'margin-bottom: 0' }<
%span.p-summary> #{Formatter.instance.format_spoiler(status)}
%a.status__content__spoiler-link{ href: '#' }= t('statuses.show_more')
- .e-content{ lang: status.language, style: "display: #{status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }= Formatter.instance.format(status, custom_emojify: true)
+ .e-content{ lang: status.language, style: "display: #{status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }<
+ = Formatter.instance.format(status, custom_emojify: true)
- - unless status.media_attachments.empty?
- - if status.media_attachments.first.video?
- - video = status.media_attachments.first
- %div{ data: { component: 'Video', props: Oj.dump(src: video.file.url(:original), preview: video.file.url(:small), sensitive: status.sensitive?, width: 610, height: 343) }}
- - else
- %div{ data: { component: 'MediaGallery', props: Oj.dump(height: 343, sensitive: status.sensitive?, 'autoPlayGif': current_account&.user&.setting_auto_play_gif, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json }) }}
+ - unless status.media_attachments.empty?
+ - if status.media_attachments.first.video?
+ - video = status.media_attachments.first
+ %div{ data: { component: 'Video', props: Oj.dump(src: video.file.url(:original), preview: video.file.url(:small), sensitive: status.sensitive?, width: 610, height: 343) }}><
+ - else
+ %div{ data: { component: 'MediaGallery', props: Oj.dump(height: 343, sensitive: status.sensitive?, 'autoPlayGif': current_account&.user&.setting_auto_play_gif, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json }) }}><
diff --git a/config/application.rb b/config/application.rb
index 0879d3c6ac0..b54ea1c40ee 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -9,6 +9,7 @@ Bundler.require(*Rails.groups)
require_relative '../app/lib/exceptions'
require_relative '../lib/paperclip/gif_transcoder'
require_relative '../lib/paperclip/video_transcoder'
+require_relative '../lib/paperclip/audio_transcoder'
require_relative '../lib/mastodon/snowflake'
require_relative '../lib/mastodon/version'
@@ -70,12 +71,17 @@ module Mastodon
config.active_job.queue_adapter = :sidekiq
+ #config.middleware.insert_before 0, Rack::Cors, debug: true, logger: (-> { Rails.logger }) do
config.middleware.insert_before 0, Rack::Cors do
allow do
origins '*'
resource '/@:username', headers: :any, methods: [:get], credentials: false
resource '/api/*', headers: :any, methods: [:post, :put, :delete, :get, :patch, :options], credentials: false, expose: ['Link', 'X-RateLimit-Reset', 'X-RateLimit-Limit', 'X-RateLimit-Remaining', 'X-Request-Id']
resource '/oauth/token', headers: :any, methods: [:post], credentials: false
+ resource '/assets/*', headers: :any, methods: [:get, :head, :options]
+ resource '/stylesheets/*', headers: :any, methods: [:get, :head, :options]
+ resource '/javascripts/*', headers: :any, methods: [:get, :head, :options]
+ resource '/packs/*', headers: :any, methods: [:get, :head, :options]
end
end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 5705ffcfe9e..f7cb4b08a08 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -91,9 +91,14 @@ Rails.application.configure do
config.action_mailer.delivery_method = ENV.fetch('SMTP_DELIVERY_METHOD', 'smtp').to_sym
config.action_dispatch.default_headers = {
- 'Server' => 'Mastodon',
- 'X-Frame-Options' => 'DENY',
- 'X-Content-Type-Options' => 'nosniff',
- 'X-XSS-Protection' => '1; mode=block',
+ 'Server' => 'Mastodon',
+ 'X-Frame-Options' => 'DENY',
+ 'X-Content-Type-Options' => 'nosniff',
+ 'X-XSS-Protection' => '1; mode=block',
+ 'Content-Security-Policy' => "frame-ancestors 'none'; object-src 'none'; script-src 'self' https://dev-static.glitch.social 'unsafe-inline'; base-uri 'none';" ,
+ 'Referrer-Policy' => 'no-referrer, strict-origin-when-cross-origin',
+ 'Strict-Transport-Security' => 'max-age=63072000; includeSubDomains; preload',
+ 'X-Clacks-Overhead' => 'GNU Natalie Nguyen'
+
}
end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e941653172b..a590b189f72 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -393,6 +393,14 @@ en:
muting: Muting list
upload: Upload
in_memoriam_html: In Memoriam.
+ keyword_mutes:
+ add_keyword: Add keyword
+ edit: Edit
+ edit_keyword: Edit keyword
+ keyword: Keyword
+ match_whole_word: Match whole word
+ remove: Remove
+ remove_all: Remove all
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:
@@ -511,6 +519,7 @@ en:
export: Data export
followers: Authorized followers
import: Import
+ keyword_mutes: Muted keywords
notifications: Notifications
preferences: Preferences
settings: Settings
diff --git a/config/navigation.rb b/config/navigation.rb
index 5b4800f076b..16c48849b35 100644
--- a/config/navigation.rb
+++ b/config/navigation.rb
@@ -7,6 +7,7 @@ SimpleNavigation::Configuration.run do |navigation|
primary.item :settings, safe_join([fa_icon('cog fw'), t('settings.settings')]), settings_profile_url do |settings|
settings.item :profile, safe_join([fa_icon('user fw'), t('settings.edit_profile')]), settings_profile_url
settings.item :preferences, safe_join([fa_icon('sliders fw'), t('settings.preferences')]), settings_preferences_url
+ settings.item :keyword_mutes, safe_join([fa_icon('volume-off fw'), t('settings.keyword_mutes')]), settings_keyword_mutes_url
settings.item :notifications, safe_join([fa_icon('bell fw'), t('settings.notifications')]), settings_notifications_url
settings.item :password, safe_join([fa_icon('lock fw'), t('auth.change_password')]), edit_user_registration_url, highlights_on: %r{/auth/edit|/settings/delete}
settings.item :two_factor_authentication, safe_join([fa_icon('mobile fw'), t('settings.two_factor_authentication')]), settings_two_factor_authentication_url, highlights_on: %r{/settings/two_factor_authentication}
diff --git a/config/routes.rb b/config/routes.rb
index 9301a4e507c..78b96b0e4c0 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -66,6 +66,13 @@ Rails.application.routes.draw do
namespace :settings do
resource :profile, only: [:show, :update]
+
+ resources :keyword_mutes do
+ collection do
+ delete :destroy_all
+ end
+ end
+
resource :preferences, only: [:show, :update]
resource :notifications, only: [:show, :update]
resource :import, only: [:show, :create]
@@ -203,6 +210,7 @@ Rails.application.routes.draw do
end
namespace :timelines do
+ resource :direct, only: :show, controller: :direct
resource :home, only: :show, controller: :home
resource :public, only: :show, controller: :public
resources :tag, only: :show
@@ -216,7 +224,11 @@ Rails.application.routes.draw do
resources :follows, only: [:create]
resources :media, only: [:create, :update]
resources :blocks, only: [:index]
- resources :mutes, only: [:index]
+ resources :mutes, only: [:index] do
+ collection do
+ get 'details'
+ end
+ end
resources :favourites, only: [:index]
resources :reports, only: [:index, :create]
@@ -236,10 +248,11 @@ Rails.application.routes.draw do
end
end
- resources :notifications, only: [:index, :show] do
+ resources :notifications, only: [:index, :show, :destroy] do
collection do
post :clear
post :dismiss
+ delete :destroy_multiple
end
end
diff --git a/config/settings.yml b/config/settings.yml
index a4df4094de2..1b8a6673e19 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -7,7 +7,7 @@
# For more information, see docs/Running-Mastodon/Administration-guide.md
#
defaults: &defaults
- site_title: Mastodon
+ site_title: 'dev.glitch.social'
site_description: ''
site_extended_description: ''
site_terms: ''
@@ -16,7 +16,7 @@ defaults: &defaults
open_registrations: true
closed_registrations_message: ''
open_deletion: true
- timeline_preview: true
+ timeline_preview: false
default_sensitive: false
unfollow_modal: false
boost_modal: false
diff --git a/config/themes.yml b/config/themes.yml
deleted file mode 100644
index a1049fae7de..00000000000
--- a/config/themes.yml
+++ /dev/null
@@ -1 +0,0 @@
-default: styles/application.scss
diff --git a/config/webpack/configuration.js b/config/webpack/configuration.js
index 8223294905f..606eb97f1ac 100644
--- a/config/webpack/configuration.js
+++ b/config/webpack/configuration.js
@@ -1,16 +1,27 @@
// Common configuration for webpacker loaded from config/webpacker.yml
-const { join, resolve } = require('path');
+const { dirname, join, resolve } = require('path');
const { env } = require('process');
const { safeLoad } = require('js-yaml');
const { readFileSync } = require('fs');
+const glob = require('glob');
const configPath = resolve('config', 'webpacker.yml');
const loadersDir = join(__dirname, 'loaders');
const settings = safeLoad(readFileSync(configPath), 'utf8')[env.NODE_ENV];
+const themeFiles = glob.sync('app/javascript/themes/*/theme.yml');
+const themes = {};
-const themePath = resolve('config', 'themes.yml');
-const themes = safeLoad(readFileSync(themePath), 'utf8');
+for (let i = 0; i < themeFiles.length; i++) {
+ const themeFile = themeFiles[i];
+ const data = safeLoad(readFileSync(themeFile), 'utf8');
+ if (!data.pack_directory) {
+ data.pack_directory = dirname(themeFile);
+ }
+ if (data.name && data.pack) {
+ themes[data.name] = data;
+ }
+}
function removeOuterSlashes(string) {
return string.replace(/^\/*/, '').replace(/\/*$/, '');
diff --git a/config/webpack/generateLocalePacks.js b/config/webpack/generateLocalePacks.js
index b71cf2ade3c..cd3bed50c0e 100644
--- a/config/webpack/generateLocalePacks.js
+++ b/config/webpack/generateLocalePacks.js
@@ -34,6 +34,23 @@ locales.forEach(locale => {
].filter(filename => fs.existsSync(path.join(outPath, filename)))
.map(filename => filename.replace(/..\/..\/node_modules\//, ''))[0];
+ let glitchInject = `
+const mergedMessages = messages;
+`;
+
+ const glitchPath = `../../app/javascript/glitch/locales/${locale}.json`;
+ if (fs.existsSync(path.join(outPath, glitchPath))) {
+ glitchInject = `
+import glitchMessages from ${JSON.stringify(glitchPath)};
+
+let mergedMessages = messages;
+Object.keys(glitchMessages).forEach(function (key) {
+ mergedMessages[key] = glitchMessages[key];
+});
+
+`;
+ }
+
const localeContent = `//
// locale_${locale}.js
// automatically generated by generateLocalePacks.js
@@ -41,7 +58,8 @@ locales.forEach(locale => {
import messages from '../../app/javascript/mastodon/locales/${locale}.json';
import localeData from ${JSON.stringify(localeDataPath)};
import { setLocale } from '../../app/javascript/mastodon/locales';
-setLocale({messages, localeData});
+${glitchInject}
+setLocale({messages: mergedMessages, localeData: localeData});
`;
fs.writeFileSync(localePath, localeContent, 'utf8');
outPaths.push(localePath);
diff --git a/config/webpack/loaders/babel.js b/config/webpack/loaders/babel.js
index e17d2fa7013..770c89aa703 100644
--- a/config/webpack/loaders/babel.js
+++ b/config/webpack/loaders/babel.js
@@ -7,7 +7,8 @@ module.exports = {
exclude: /node_modules/,
loader: 'babel-loader',
options: {
- forceEnv: env,
+ forceEnv: process.env.NODE_ENV || 'development',
+ sourceRoot: 'app/javascript',
cacheDirectory: env === 'development' ? false : resolve(__dirname, '..', '..', '..', 'tmp', 'cache', 'babel-loader'),
},
};
diff --git a/config/webpack/loaders/sass.js b/config/webpack/loaders/sass.js
index 88d94c6846a..96ad7abe8c3 100644
--- a/config/webpack/loaders/sass.js
+++ b/config/webpack/loaders/sass.js
@@ -9,7 +9,7 @@ module.exports = {
{ loader: 'css-loader', options: { minimize: env.NODE_ENV === 'production' } },
{ loader: 'postcss-loader', options: { sourceMap: true } },
'resolve-url-loader',
- 'sass-loader',
+ { loader: 'sass-loader', options: { includePaths: ['app/javascript'] } },
],
}),
};
diff --git a/config/webpack/shared.js b/config/webpack/shared.js
index 50fa4817594..5d176db4eb3 100644
--- a/config/webpack/shared.js
+++ b/config/webpack/shared.js
@@ -1,7 +1,7 @@
// Note: You must restart bin/webpack-dev-server for changes to take effect
const webpack = require('webpack');
-const { basename, dirname, join, relative, resolve, sep } = require('path');
+const { basename, dirname, join, relative, resolve } = require('path');
const { sync } = require('glob');
const ExtractTextPlugin = require('extract-text-webpack-plugin');
const ManifestPlugin = require('webpack-manifest-plugin');
@@ -26,10 +26,13 @@ module.exports = {
localMap[basename(entry, extname(entry, extname(entry)))] = resolve(entry);
return localMap;
}, {}),
- Object.keys(themes).reduce((themePaths, name) => {
- themePaths[name] = resolve(join(settings.source_path, themes[name]));
- return themePaths;
- }, {})
+ Object.keys(themes).reduce(
+ (themePaths, name) => {
+ const themeData = themes[name];
+ themePaths[`themes/${name}`] = resolve(themeData.pack_directory, themeData.pack);
+ return themePaths;
+ }, {}
+ )
),
output: {
@@ -52,25 +55,17 @@ module.exports = {
resource.request = resource.request.replace(/^history/, 'history/es');
}
),
- new ExtractTextPlugin(env.NODE_ENV === 'production' ? '[name]-[contenthash].css' : '[name].css'),
+ new ExtractTextPlugin({
+ filename: env.NODE_ENV === 'production' ? '[name]-[contenthash].css' : '[name].css',
+ allChunks: true,
+ }),
new ManifestPlugin({
publicPath: output.publicPath,
writeToFileEmit: true,
}),
new webpack.optimize.CommonsChunkPlugin({
name: 'common',
- minChunks: (module, count) => {
- const reactIntlPathRegexp = new RegExp(`node_modules\\${sep}react-intl`);
-
- if (module.resource && reactIntlPathRegexp.test(module.resource)) {
- // skip react-intl because it's useless to put in the common chunk,
- // e.g. because "shared" modules between zh-TW and zh-CN will never
- // be loaded together
- return false;
- }
-
- return count >= 2;
- },
+ minChunks: Infinity, // It doesn't make sense to use common chunks with multiple frontend support.
}),
],
diff --git a/db/migrate/20170716191202_add_hide_notifications_to_mute.rb b/db/migrate/20170716191202_add_hide_notifications_to_mute.rb
index 0410938c9b8..de7d2a4a21f 100644
--- a/db/migrate/20170716191202_add_hide_notifications_to_mute.rb
+++ b/db/migrate/20170716191202_add_hide_notifications_to_mute.rb
@@ -1,15 +1,5 @@
-require Rails.root.join('lib', 'mastodon', 'migration_helpers')
-
class AddHideNotificationsToMute < ActiveRecord::Migration[5.1]
- include Mastodon::MigrationHelpers
-
- disable_ddl_transaction!
-
- def up
- add_column_with_default :mutes, :hide_notifications, :boolean, default: true, allow_null: false
- end
-
- def down
- remove_column :mutes, :hide_notifications
+ def change
+ add_column :mutes, :hide_notifications, :boolean, default: false, null: false
end
end
diff --git a/db/migrate/20170914032032_default_existing_mutes_to_hiding_notifications.rb b/db/migrate/20170914032032_default_existing_mutes_to_hiding_notifications.rb
new file mode 100644
index 00000000000..8e6cac45599
--- /dev/null
+++ b/db/migrate/20170914032032_default_existing_mutes_to_hiding_notifications.rb
@@ -0,0 +1,8 @@
+class DefaultExistingMutesToHidingNotifications < ActiveRecord::Migration[5.1]
+ def up
+ change_column_default :mutes, :hide_notifications, from: false, to: true
+
+ # Unfortunately if this is applied sometime after the one to add the table we lose some data, so this is irreversible.
+ Mute.update_all(hide_notifications: true)
+ end
+end
diff --git a/db/migrate/20171009222537_create_keyword_mutes.rb b/db/migrate/20171009222537_create_keyword_mutes.rb
new file mode 100644
index 00000000000..ec0c756fbf3
--- /dev/null
+++ b/db/migrate/20171009222537_create_keyword_mutes.rb
@@ -0,0 +1,12 @@
+class CreateKeywordMutes < ActiveRecord::Migration[5.1]
+ def change
+ create_table :keyword_mutes do |t|
+ t.references :account, null: false
+ t.string :keyword, null: false
+ t.boolean :whole_word, null: false, default: true
+ t.timestamps
+ end
+
+ add_foreign_key :keyword_mutes, :accounts, on_delete: :cascade
+ end
+end
diff --git a/db/migrate/20171021191900_move_keyword_mutes_into_glitch_namespace.rb b/db/migrate/20171021191900_move_keyword_mutes_into_glitch_namespace.rb
new file mode 100644
index 00000000000..269bb49d648
--- /dev/null
+++ b/db/migrate/20171021191900_move_keyword_mutes_into_glitch_namespace.rb
@@ -0,0 +1,7 @@
+class MoveKeywordMutesIntoGlitchNamespace < ActiveRecord::Migration[5.1]
+ def change
+ safety_assured do
+ rename_table :keyword_mutes, :glitch_keyword_mutes
+ end
+ end
+end
diff --git a/db/migrate/20171028221157_add_reblogs_to_follows.rb b/db/migrate/20171028221157_add_reblogs_to_follows.rb
new file mode 100644
index 00000000000..eb4640a2010
--- /dev/null
+++ b/db/migrate/20171028221157_add_reblogs_to_follows.rb
@@ -0,0 +1,21 @@
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class AddReblogsToFollows < ActiveRecord::Migration[5.1]
+ include Mastodon::MigrationHelpers
+
+ safety_assured do
+ disable_ddl_transaction!
+ end
+
+ def up
+ safety_assured do
+ add_column_with_default :follows, :show_reblogs, :boolean, default: true, allow_null: false
+ add_column_with_default :follow_requests, :show_reblogs, :boolean, default: true, allow_null: false
+ end
+ end
+
+ def down
+ remove_column :follows, :show_reblogs
+ remove_column :follow_requests, :show_reblogs
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 2d763e2f4fc..0691c4220b6 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -147,6 +147,7 @@ ActiveRecord::Schema.define(version: 20171114080328) do
t.datetime "updated_at", null: false
t.bigint "account_id", null: false
t.bigint "target_account_id", null: false
+ t.boolean "show_reblogs", default: true, null: false
t.index ["account_id", "target_account_id"], name: "index_follow_requests_on_account_id_and_target_account_id", unique: true
end
@@ -155,9 +156,19 @@ ActiveRecord::Schema.define(version: 20171114080328) do
t.datetime "updated_at", null: false
t.bigint "account_id", null: false
t.bigint "target_account_id", null: false
+ t.boolean "show_reblogs", default: true, null: false
t.index ["account_id", "target_account_id"], name: "index_follows_on_account_id_and_target_account_id", unique: true
end
+ create_table "glitch_keyword_mutes", force: :cascade do |t|
+ t.bigint "account_id", null: false
+ t.string "keyword", null: false
+ t.boolean "whole_word", default: true, null: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.index ["account_id"], name: "index_glitch_keyword_mutes_on_account_id"
+ end
+
create_table "imports", force: :cascade do |t|
t.integer "type", null: false
t.boolean "approved", default: false, null: false
@@ -201,6 +212,7 @@ ActiveRecord::Schema.define(version: 20171114080328) do
create_table "mutes", force: :cascade do |t|
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
+ t.boolean "hide_notifications", default: true, null: false
t.bigint "account_id", null: false
t.bigint "target_account_id", null: false
t.boolean "hide_notifications", default: true, null: false
@@ -477,6 +489,7 @@ ActiveRecord::Schema.define(version: 20171114080328) do
add_foreign_key "follow_requests", "accounts", name: "fk_76d644b0e7", on_delete: :cascade
add_foreign_key "follows", "accounts", column: "target_account_id", name: "fk_745ca29eac", on_delete: :cascade
add_foreign_key "follows", "accounts", name: "fk_32ed1b5560", on_delete: :cascade
+ add_foreign_key "glitch_keyword_mutes", "accounts", on_delete: :cascade
add_foreign_key "imports", "accounts", name: "fk_6db1b6e408", on_delete: :cascade
add_foreign_key "media_attachments", "accounts", name: "fk_96dd81e81b", on_delete: :nullify
add_foreign_key "media_attachments", "statuses", on_delete: :nullify
diff --git a/lib/paperclip/audio_transcoder.rb b/lib/paperclip/audio_transcoder.rb
new file mode 100644
index 00000000000..631ccb0be00
--- /dev/null
+++ b/lib/paperclip/audio_transcoder.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Paperclip
+ class AudioTranscoder < Paperclip::Processor
+ def make
+ meta = ::Av.cli.identify(@file.path)
+ # {:length=>"0:00:02.14", :duration=>2.14, :audio_encode=>"mp3", :audio_bitrate=>"44100 Hz", :audio_channels=>"mono"}
+ if meta[:duration] > 60.0
+ raise Mastodon::ValidationError, "Audio uploads must be less than 60 seconds in length."
+ end
+
+ final_file = Paperclip::Transcoder.make(file, options, attachment)
+
+ attachment.instance.file_file_name = 'media.mp4'
+ attachment.instance.file_content_type = 'video/mp4'
+ attachment.instance.type = MediaAttachment.types[:video]
+
+ final_file
+ end
+ end
+end
diff --git a/package.json b/package.json
index cd088e5c0c4..159181030bb 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
"private": true,
"dependencies": {
"array-includes": "^3.0.3",
+ "atrament": "^0.2.3",
"autoprefixer": "^7.1.6",
"axios": "~0.16.2",
"babel-core": "^6.25.0",
diff --git a/public/500.html b/public/500.html
deleted file mode 120000
index 45a9078080f..00000000000
--- a/public/500.html
+++ /dev/null
@@ -1 +0,0 @@
-assets/500.html
\ No newline at end of file
diff --git a/public/500.html b/public/500.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/public/background-cybre.png b/public/background-cybre.png
new file mode 100644
index 00000000000..151fd558491
Binary files /dev/null and b/public/background-cybre.png differ
diff --git a/public/clock.js b/public/clock.js
new file mode 100644
index 00000000000..ffb9beae80c
--- /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/logo-cybre-glitch.gif b/public/logo-cybre-glitch.gif
new file mode 100644
index 00000000000..abe9b2a9a27
Binary files /dev/null and b/public/logo-cybre-glitch.gif differ
diff --git a/public/riot-glitch.png b/public/riot-glitch.png
new file mode 100644
index 00000000000..1c97ce5f134
Binary files /dev/null and b/public/riot-glitch.png differ
diff --git a/spec/controllers/api/v1/accounts/credentials_controller_spec.rb b/spec/controllers/api/v1/accounts/credentials_controller_spec.rb
index 461b8b34bb6..247420d0832 100644
--- a/spec/controllers/api/v1/accounts/credentials_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/credentials_controller_spec.rb
@@ -51,7 +51,9 @@ describe Api::V1::Accounts::CredentialsController do
describe 'with invalid data' do
before do
- patch :update, params: { note: 'This is too long. ' * 10 }
+ note = 'This is too long. '
+ note = note + 'a' * (Account::MAX_NOTE_LENGTH - note.length + 1)
+ patch :update, params: { note: note }
end
it 'returns http unprocessable entity' do
diff --git a/spec/controllers/api/v1/accounts/relationships_controller_spec.rb b/spec/controllers/api/v1/accounts/relationships_controller_spec.rb
index 431fc219414..f25b86ac161 100644
--- a/spec/controllers/api/v1/accounts/relationships_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/relationships_controller_spec.rb
@@ -32,7 +32,7 @@ describe Api::V1::Accounts::RelationshipsController do
json = body_as_json
expect(json).to be_a Enumerable
- expect(json.first[:following]).to be true
+ expect(json.first[:following]).to be_truthy
expect(json.first[:followed_by]).to be false
end
end
@@ -51,7 +51,7 @@ describe Api::V1::Accounts::RelationshipsController do
expect(json).to be_a Enumerable
expect(json.first[:id]).to eq simon.id.to_s
- expect(json.first[:following]).to be true
+ expect(json.first[:following]).to be_truthy
expect(json.first[:followed_by]).to be false
expect(json.first[:muting]).to be false
expect(json.first[:requested]).to be false
diff --git a/spec/controllers/api/v1/accounts_controller_spec.rb b/spec/controllers/api/v1/accounts_controller_spec.rb
index 053c53e5af1..f3b8794212a 100644
--- a/spec/controllers/api/v1/accounts_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts_controller_spec.rb
@@ -31,10 +31,10 @@ RSpec.describe Api::V1::AccountsController, type: :controller do
expect(response).to have_http_status(:success)
end
- it 'returns JSON with following=true and requested=false' do
+ it 'returns JSON with following=truthy and requested=false' do
json = body_as_json
- expect(json[:following]).to be true
+ expect(json[:following]).to be_truthy
expect(json[:requested]).to be false
end
@@ -50,11 +50,11 @@ RSpec.describe Api::V1::AccountsController, type: :controller do
expect(response).to have_http_status(:success)
end
- it 'returns JSON with following=false and requested=true' do
+ it 'returns JSON with following=false and requested=truthy' do
json = body_as_json
expect(json[:following]).to be false
- expect(json[:requested]).to be true
+ expect(json[:requested]).to be_truthy
end
it 'creates a follow request relation between user and target user' do
diff --git a/spec/controllers/api/v1/mutes_controller_spec.rb b/spec/controllers/api/v1/mutes_controller_spec.rb
index 97d6c277382..7387b9d2d4b 100644
--- a/spec/controllers/api/v1/mutes_controller_spec.rb
+++ b/spec/controllers/api/v1/mutes_controller_spec.rb
@@ -18,4 +18,24 @@ RSpec.describe Api::V1::MutesController, type: :controller do
expect(response).to have_http_status(:success)
end
end
+
+ describe 'GET #details' do
+ before do
+ get :details, params: { limit: 1 }
+ end
+
+ let(:mutes) { JSON.parse(response.body) }
+
+ it 'returns http success' do
+ expect(response).to have_http_status(:success)
+ end
+
+ it 'returns one mute' do
+ expect(mutes.size).to be(1)
+ end
+
+ it 'returns whether the mute hides notifications' do
+ expect(mutes.first["hide_notifications"]).to be(false)
+ end
+ end
end
diff --git a/spec/controllers/settings/keyword_mutes_controller_spec.rb b/spec/controllers/settings/keyword_mutes_controller_spec.rb
new file mode 100644
index 00000000000..a8c37a072f5
--- /dev/null
+++ b/spec/controllers/settings/keyword_mutes_controller_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Settings::KeywordMutesController, type: :controller do
+
+end
diff --git a/spec/fabricators/glitch_keyword_mute_fabricator.rb b/spec/fabricators/glitch_keyword_mute_fabricator.rb
new file mode 100644
index 00000000000..20d393320d6
--- /dev/null
+++ b/spec/fabricators/glitch_keyword_mute_fabricator.rb
@@ -0,0 +1,2 @@
+Fabricator('Glitch::KeywordMute') do
+end
diff --git a/spec/helpers/settings/keyword_mutes_helper_spec.rb b/spec/helpers/settings/keyword_mutes_helper_spec.rb
new file mode 100644
index 00000000000..a19d518ddd7
--- /dev/null
+++ b/spec/helpers/settings/keyword_mutes_helper_spec.rb
@@ -0,0 +1,15 @@
+require 'rails_helper'
+
+# Specs in this file have access to a helper object that includes
+# the Settings::KeywordMutesHelper. For example:
+#
+# describe Settings::KeywordMutesHelper do
+# describe "string concat" do
+# it "concats two strings with spaces" do
+# expect(helper.concat_strings("this","that")).to eq("this that")
+# end
+# end
+# end
+RSpec.describe Settings::KeywordMutesHelper, type: :helper do
+ pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/lib/feed_manager_spec.rb b/spec/lib/feed_manager_spec.rb
index 0f97a579e30..715d853067a 100644
--- a/spec/lib/feed_manager_spec.rb
+++ b/spec/lib/feed_manager_spec.rb
@@ -56,6 +56,13 @@ RSpec.describe FeedManager do
expect(FeedManager.instance.filter?(:home, reblog, bob.id)).to be true
end
+ it 'returns true for reblog from account with reblogs disabled' do
+ status = Fabricate(:status, text: 'Hello world', account: jeff)
+ reblog = Fabricate(:status, reblog: status, account: alice)
+ bob.follow!(alice, reblogs: false)
+ expect(FeedManager.instance.filter?(:home, reblog, bob.id)).to be true
+ end
+
it 'returns false for reply by followee to another followee' do
status = Fabricate(:status, text: 'Hello world', account: jeff)
reply = Fabricate(:status, text: 'Nay', thread: status, account: alice)
@@ -105,6 +112,13 @@ RSpec.describe FeedManager do
expect(FeedManager.instance.filter?(:home, status, bob.id)).to be true
end
+ it 'returns true for status by followee mentioning muted account' do
+ bob.mute!(jeff)
+ bob.follow!(alice)
+ status = PostStatusService.new.call(alice, 'Hey @jeff')
+ expect(FeedManager.instance.filter?(:home, status, bob.id)).to be true
+ end
+
it 'returns true for reblog of a personally blocked domain' do
alice.block_domain!('example.com')
alice.follow!(jeff)
@@ -112,6 +126,44 @@ RSpec.describe FeedManager do
reblog = Fabricate(:status, reblog: status, account: jeff)
expect(FeedManager.instance.filter?(:home, reblog, alice.id)).to be true
end
+
+ it 'returns true for a status containing a muted keyword' do
+ Fabricate('Glitch::KeywordMute', account: alice, keyword: 'take')
+ status = Fabricate(:status, text: 'This is a hot take', account: bob)
+
+ expect(FeedManager.instance.filter?(:home, status, alice.id)).to be true
+ end
+
+ it 'returns true for a reply containing a muted keyword' do
+ Fabricate('Glitch::KeywordMute', account: alice, keyword: 'take')
+ s1 = Fabricate(:status, text: 'Something', account: alice)
+ s2 = Fabricate(:status, text: 'This is a hot take', thread: s1, account: bob)
+
+ expect(FeedManager.instance.filter?(:home, s2, alice.id)).to be true
+ end
+
+ it 'returns true for a status whose spoiler text contains a muted keyword' do
+ Fabricate('Glitch::KeywordMute', account: alice, keyword: 'take')
+ status = Fabricate(:status, spoiler_text: 'This is a hot take', account: bob)
+
+ expect(FeedManager.instance.filter?(:home, status, alice.id)).to be true
+ end
+
+ it 'returns true for a reblog containing a muted keyword' do
+ Fabricate('Glitch::KeywordMute', account: alice, keyword: 'take')
+ status = Fabricate(:status, text: 'This is a hot take', account: bob)
+ reblog = Fabricate(:status, reblog: status, account: jeff)
+
+ expect(FeedManager.instance.filter?(:home, reblog, alice.id)).to be true
+ end
+
+ it 'returns true for a reblog whose spoiler text contains a muted keyword' do
+ Fabricate('Glitch::KeywordMute', account: alice, keyword: 'take')
+ status = Fabricate(:status, spoiler_text: 'This is a hot take', account: bob)
+ reblog = Fabricate(:status, reblog: status, account: jeff)
+
+ expect(FeedManager.instance.filter?(:home, reblog, alice.id)).to be true
+ end
end
context 'for mentions feed' do
@@ -140,6 +192,13 @@ RSpec.describe FeedManager do
bob.follow!(alice)
expect(FeedManager.instance.filter?(:mentions, status, bob.id)).to be false
end
+
+ it 'returns true for status that contains a muted keyword' do
+ Fabricate('Glitch::KeywordMute', account: bob, keyword: 'take')
+ status = Fabricate(:status, text: 'This is a hot take', account: alice)
+ bob.follow!(alice)
+ expect(FeedManager.instance.filter?(:mentions, status, bob.id)).to be true
+ end
end
end
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 9c1492c90e9..7501c498ce6 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -636,8 +636,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 500 characters' do
+ account = Fabricate.build(:account, note: Faker::Lorem.characters(501))
account.valid?
expect(account).to model_have_error_on_field(:note)
end
@@ -676,8 +676,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 500 characters' do
+ account = Fabricate.build(:account, domain: 'domain', note: Faker::Lorem.characters(501))
account.valid?
expect(account).not_to model_have_error_on_field(:note)
end
diff --git a/spec/models/concerns/account_interactions_spec.rb b/spec/models/concerns/account_interactions_spec.rb
index a468549d831..1e238e27c30 100644
--- a/spec/models/concerns/account_interactions_spec.rb
+++ b/spec/models/concerns/account_interactions_spec.rb
@@ -31,7 +31,44 @@ describe AccountInteractions do
end
it 'does mute notifications' do
- expect(me.muting_notifications?(you)).to be true
+ expect(me.muting_notifications?(you)).to be true
+ end
+ end
+ end
+
+ describe 'ignoring reblogs from an account' do
+ before do
+ @me = Fabricate(:account, username: 'Me')
+ @you = Fabricate(:account, username: 'You')
+ end
+
+ context 'with the reblogs option unspecified' do
+ before do
+ @me.follow!(@you)
+ end
+
+ it 'defaults to showing reblogs' do
+ expect(@me.muting_reblogs?(@you)).to be(false)
+ end
+ end
+
+ context 'with the reblogs option set to false' do
+ before do
+ @me.follow!(@you, reblogs: false)
+ end
+
+ it 'does mute reblogs' do
+ expect(@me.muting_reblogs?(@you)).to be(true)
+ end
+ end
+
+ context 'with the reblogs option set to true' do
+ before do
+ @me.follow!(@you, reblogs: true)
+ end
+
+ it 'does not mute reblogs' do
+ expect(@me.muting_reblogs?(@you)).to be(false)
end
end
end
diff --git a/spec/models/follow_request_spec.rb b/spec/models/follow_request_spec.rb
index 1436501e99d..7bc93a2aae8 100644
--- a/spec/models/follow_request_spec.rb
+++ b/spec/models/follow_request_spec.rb
@@ -7,10 +7,31 @@ RSpec.describe FollowRequest, type: :model do
let(:target_account) { Fabricate(:account) }
it 'calls Account#follow!, MergeWorker.perform_async, and #destroy!' do
- expect(account).to receive(:follow!).with(target_account)
+ expect(account).to receive(:follow!).with(target_account, reblogs: true)
expect(MergeWorker).to receive(:perform_async).with(target_account.id, account.id)
expect(follow_request).to receive(:destroy!)
follow_request.authorize!
end
+
+ it 'generates a Follow' do
+ follow_request = Fabricate.create(:follow_request)
+ follow_request.authorize!
+ target = follow_request.target_account
+ expect(follow_request.account.following?(target)).to be true
+ end
+
+ it 'correctly passes show_reblogs when true' do
+ follow_request = Fabricate.create(:follow_request, show_reblogs: true)
+ follow_request.authorize!
+ target = follow_request.target_account
+ expect(follow_request.account.muting_reblogs?(target)).to be false
+ end
+
+ it 'correctly passes show_reblogs when false' do
+ follow_request = Fabricate.create(:follow_request, show_reblogs: false)
+ follow_request.authorize!
+ target = follow_request.target_account
+ expect(follow_request.account.muting_reblogs?(target)).to be true
+ end
end
end
diff --git a/spec/models/glitch/keyword_mute_spec.rb b/spec/models/glitch/keyword_mute_spec.rb
new file mode 100644
index 00000000000..9685c649385
--- /dev/null
+++ b/spec/models/glitch/keyword_mute_spec.rb
@@ -0,0 +1,96 @@
+require 'rails_helper'
+
+RSpec.describe Glitch::KeywordMute, type: :model do
+ let(:alice) { Fabricate(:account, username: 'alice').tap(&:save!) }
+ let(:bob) { Fabricate(:account, username: 'bob').tap(&:save!) }
+
+ describe '.matcher_for' do
+ let(:matcher) { Glitch::KeywordMute.matcher_for(alice) }
+
+ describe 'with no mutes' do
+ before do
+ Glitch::KeywordMute.delete_all
+ end
+
+ it 'does not match' do
+ expect(matcher =~ 'This is a hot take').to be_falsy
+ end
+ end
+
+ describe 'with mutes' do
+ it 'does not match keywords set by a different account' do
+ Glitch::KeywordMute.create!(account: bob, keyword: 'take')
+
+ expect(matcher =~ 'This is a hot take').to be_falsy
+ end
+
+ it 'does not match if no keywords match the status text' do
+ Glitch::KeywordMute.create!(account: alice, keyword: 'cold')
+
+ expect(matcher =~ 'This is a hot take').to be_falsy
+ end
+
+ it 'considers word boundaries when matching' do
+ Glitch::KeywordMute.create!(account: alice, keyword: 'bob', whole_word: true)
+
+ expect(matcher =~ 'bobcats').to be_falsy
+ end
+
+ it 'matches substrings if whole_word is false' do
+ Glitch::KeywordMute.create!(account: alice, keyword: 'take', whole_word: false)
+
+ expect(matcher =~ 'This is a shiitake mushroom').to be_truthy
+ end
+
+ it 'matches keywords at the beginning of the text' do
+ Glitch::KeywordMute.create!(account: alice, keyword: 'take')
+
+ expect(matcher =~ 'Take this').to be_truthy
+ end
+
+ it 'matches keywords at the end of the text' do
+ Glitch::KeywordMute.create!(account: alice, keyword: 'take')
+
+ expect(matcher =~ 'This is a hot take').to be_truthy
+ end
+
+ it 'matches if at least one keyword case-insensitively matches the text' do
+ Glitch::KeywordMute.create!(account: alice, keyword: 'hot')
+
+ expect(matcher =~ 'This is a HOT take').to be_truthy
+ end
+
+ it 'maintains case-insensitivity when combining keywords into a single matcher' do
+ Glitch::KeywordMute.create!(account: alice, keyword: 'hot')
+ Glitch::KeywordMute.create!(account: alice, keyword: 'cold')
+
+ expect(matcher =~ 'This is a HOT take').to be_truthy
+ end
+
+ it 'matches keywords surrounded by non-alphanumeric ornamentation' do
+ Glitch::KeywordMute.create!(account: alice, keyword: 'hot')
+
+ expect(matcher =~ '(hot take)').to be_truthy
+ end
+
+ it 'escapes metacharacters in keywords' do
+ Glitch::KeywordMute.create!(account: alice, keyword: '(hot take)')
+
+ expect(matcher =~ '(hot take)').to be_truthy
+ end
+
+ it 'uses case-folding rules appropriate for more than just English' do
+ Glitch::KeywordMute.create!(account: alice, keyword: 'großeltern')
+
+ expect(matcher =~ 'besuch der grosseltern').to be_truthy
+ end
+
+ it 'matches keywords that are composed of multiple words' do
+ Glitch::KeywordMute.create!(account: alice, keyword: 'a shiitake')
+
+ expect(matcher =~ 'This is a shiitake').to be_truthy
+ expect(matcher =~ 'This is shiitake').to_not be_truthy
+ end
+ end
+ end
+end
diff --git a/spec/models/status_spec.rb b/spec/models/status_spec.rb
index 0b8ed66f6ea..91fd13c94d9 100644
--- a/spec/models/status_spec.rb
+++ b/spec/models/status_spec.rb
@@ -262,6 +262,55 @@ RSpec.describe Status, type: :model do
end
end
+ describe '.as_direct_timeline' do
+ let(:account) { Fabricate(:account) }
+ let(:followed) { Fabricate(:account) }
+ let(:not_followed) { Fabricate(:account) }
+
+ before do
+ Fabricate(:follow, account: account, target_account: followed)
+
+ @self_public_status = Fabricate(:status, account: account, visibility: :public)
+ @self_direct_status = Fabricate(:status, account: account, visibility: :direct)
+ @followed_public_status = Fabricate(:status, account: followed, visibility: :public)
+ @followed_direct_status = Fabricate(:status, account: followed, visibility: :direct)
+ @not_followed_direct_status = Fabricate(:status, account: not_followed, visibility: :direct)
+
+ @results = Status.as_direct_timeline(account)
+ end
+
+ it 'does not include public statuses from self' do
+ expect(@results).to_not include(@self_public_status)
+ end
+
+ it 'includes direct statuses from self' do
+ expect(@results).to include(@self_direct_status)
+ end
+
+ it 'does not include public statuses from followed' do
+ expect(@results).to_not include(@followed_public_status)
+ end
+
+ it 'includes direct statuses mentioning recipient from followed' do
+ Fabricate(:mention, account: account, status: @followed_direct_status)
+ expect(@results).to include(@followed_direct_status)
+ end
+
+ it 'does not include direct statuses not mentioning recipient from followed' do
+ expect(@results).to_not include(@followed_direct_status)
+ end
+
+ it 'includes direct statuses mentioning recipient from non-followed' do
+ Fabricate(:mention, account: account, status: @not_followed_direct_status)
+ expect(@results).to include(@not_followed_direct_status)
+ end
+
+ it 'does not include direct statuses not mentioning recipient from non-followed' do
+ expect(@results).to_not include(@not_followed_direct_status)
+ end
+
+ end
+
describe '.as_public_timeline' do
it 'only includes statuses with public visibility' do
public_status = Fabricate(:status, visibility: :public)
diff --git a/spec/services/follow_service_spec.rb b/spec/services/follow_service_spec.rb
index ceb39e5e6ea..e59a2f1a628 100644
--- a/spec/services/follow_service_spec.rb
+++ b/spec/services/follow_service_spec.rb
@@ -13,8 +13,20 @@ RSpec.describe FollowService do
subject.call(sender, bob.acct)
end
- it 'creates a follow request' do
- expect(FollowRequest.find_by(account: sender, target_account: bob)).to_not be_nil
+ it 'creates a follow request with reblogs' do
+ expect(FollowRequest.find_by(account: sender, target_account: bob, show_reblogs: true)).to_not be_nil
+ end
+ end
+
+ describe 'locked account, no reblogs' do
+ let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, locked: true, username: 'bob')).account }
+
+ before do
+ subject.call(sender, bob.acct, reblogs: false)
+ end
+
+ it 'creates a follow request without reblogs' do
+ expect(FollowRequest.find_by(account: sender, target_account: bob, show_reblogs: false)).to_not be_nil
end
end
@@ -25,8 +37,22 @@ RSpec.describe FollowService do
subject.call(sender, bob.acct)
end
- it 'creates a following relation' do
+ it 'creates a following relation with reblogs' do
expect(sender.following?(bob)).to be true
+ expect(sender.muting_reblogs?(bob)).to be false
+ end
+ end
+
+ describe 'unlocked account, no reblogs' do
+ let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+
+ before do
+ subject.call(sender, bob.acct, reblogs: false)
+ end
+
+ it 'creates a following relation without reblogs' do
+ expect(sender.following?(bob)).to be true
+ expect(sender.muting_reblogs?(bob)).to be true
end
end
@@ -42,6 +68,32 @@ RSpec.describe FollowService do
expect(sender.following?(bob)).to be true
end
end
+
+ describe 'already followed account, turning reblogs off' do
+ let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+
+ before do
+ sender.follow!(bob, reblogs: true)
+ subject.call(sender, bob.acct, reblogs: false)
+ end
+
+ it 'disables reblogs' do
+ expect(sender.muting_reblogs?(bob)).to be true
+ end
+ end
+
+ describe 'already followed account, turning reblogs on' do
+ let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+
+ before do
+ sender.follow!(bob, reblogs: false)
+ subject.call(sender, bob.acct, reblogs: true)
+ end
+
+ it 'disables reblogs' do
+ expect(sender.muting_reblogs?(bob)).to be false
+ end
+ end
end
context 'remote OStatus account' do
diff --git a/spec/services/notify_service_spec.rb b/spec/services/notify_service_spec.rb
index fad0dd36955..a8ebc16b832 100644
--- a/spec/services/notify_service_spec.rb
+++ b/spec/services/notify_service_spec.rb
@@ -48,6 +48,26 @@ RSpec.describe NotifyService do
is_expected.to_not change(Notification, :count)
end
+ describe 'reblogs' do
+ let(:status) { Fabricate(:status, account: Fabricate(:account)) }
+ let(:activity) { Fabricate(:status, account: sender, reblog: status) }
+
+ it 'shows reblogs by default' do
+ recipient.follow!(sender)
+ is_expected.to change(Notification, :count)
+ end
+
+ it 'shows reblogs when explicitly enabled' do
+ recipient.follow!(sender, reblogs: true)
+ is_expected.to change(Notification, :count)
+ end
+
+ it 'hides reblogs when disabled' do
+ recipient.follow!(sender, reblogs: false)
+ is_expected.to_not change(Notification, :count)
+ end
+ end
+
context 'for direct messages' do
let(:activity) { Fabricate(:mention, account: recipient, status: Fabricate(:status, account: sender, visibility: :direct)) }
diff --git a/spec/validators/status_length_validator_spec.rb b/spec/validators/status_length_validator_spec.rb
index e2d1a15ec96..9355c7e3f6e 100644
--- a/spec/validators/status_length_validator_spec.rb
+++ b/spec/validators/status_length_validator_spec.rb
@@ -7,26 +7,31 @@ describe StatusLengthValidator do
it 'does not add errors onto remote statuses'
it 'does not add errors onto local reblogs'
- it 'adds an error when content warning is over 500 characters' do
- status = double(spoiler_text: 'a' * 520, text: '', errors: double(add: nil), local?: true, reblog?: false)
+ it 'adds an error when content warning is over MAX_CHARS characters' do
+ chars = StatusLengthValidator::MAX_CHARS + 1
+ status = double(spoiler_text: 'a' * chars, text: '', errors: double(add: nil), local?: true, reblog?: false)
subject.validate(status)
expect(status.errors).to have_received(:add)
end
- it 'adds an error when text is over 500 characters' do
- status = double(spoiler_text: '', text: 'a' * 520, errors: double(add: nil), local?: true, reblog?: false)
+ it 'adds an error when text is over MAX_CHARS characters' do
+ chars = StatusLengthValidator::MAX_CHARS + 1
+ status = double(spoiler_text: '', text: 'a' * chars, errors: double(add: nil), local?: true, reblog?: false)
subject.validate(status)
expect(status.errors).to have_received(:add)
end
- it 'adds an error when text and content warning are over 500 characters total' do
- status = double(spoiler_text: 'a' * 250, text: 'b' * 251, errors: double(add: nil), local?: true, reblog?: false)
+ it 'adds an error when text and content warning are over MAX_CHARS characters total' do
+ chars1 = 20
+ chars2 = StatusLengthValidator::MAX_CHARS + 1 - chars1
+ status = double(spoiler_text: 'a' * chars1, text: 'b' * chars2, errors: double(add: nil), local?: true, reblog?: false)
subject.validate(status)
expect(status.errors).to have_received(:add)
end
it 'counts URLs as 23 characters flat' do
- text = ('a' * 476) + " http://#{'b' * 30}.com/example"
+ chars = StatusLengthValidator::MAX_CHARS - 1 - 23
+ text = ('a' * chars) + " http://#{'b' * 30}.com/example"
status = double(spoiler_text: '', text: text, errors: double(add: nil), local?: true, reblog?: false)
subject.validate(status)
@@ -34,7 +39,9 @@ describe StatusLengthValidator do
end
it 'counts only the front part of remote usernames' do
- text = ('a' * 475) + " @alice@#{'b' * 30}.com"
+ username = '@alice'
+ chars = StatusLengthValidator::MAX_CHARS - 1 - username.length
+ text = ('a' * 475) + " #{username}@#{'b' * 30}.com"
status = double(spoiler_text: '', text: text, errors: double(add: nil), local?: true, reblog?: false)
subject.validate(status)
diff --git a/spec/views/about/show.html.haml_spec.rb b/spec/views/about/show.html.haml_spec.rb
index 724643cbcd2..ca59fa9e3b5 100644
--- a/spec/views/about/show.html.haml_spec.rb
+++ b/spec/views/about/show.html.haml_spec.rb
@@ -3,6 +3,8 @@
require 'rails_helper'
describe 'about/show.html.haml', without_verify_partial_doubles: true do
+ let(:commit_hash) { '8925731c9869f55780644304e4420a1998e52607' }
+
before do
allow(view).to receive(:site_hostname).and_return('example.com')
allow(view).to receive(:site_title).and_return('example site')
@@ -16,7 +18,9 @@ describe 'about/show.html.haml', without_verify_partial_doubles: true do
source_url: 'https://github.com/tootsuite/mastodon',
open_registrations: false,
thumbnail: nil,
- closed_registrations_message: 'yes')
+ closed_registrations_message: 'yes',
+ commit_hash: commit_hash)
+
assign(:instance_presenter, instance_presenter)
render
diff --git a/streaming/index.js b/streaming/index.js
index 83903b89b2e..8adc5174a12 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -402,6 +402,10 @@ const startWorker = (workerId) => {
streamFrom('timeline:public:local', req, streamToHttp(req, res), streamHttpEnd(req), true);
});
+ app.get('/api/v1/streaming/direct', (req, res) => {
+ streamFrom(`timeline:direct:${req.accountId}`, req, streamToHttp(req, res), streamHttpEnd(req), true);
+ });
+
app.get('/api/v1/streaming/hashtag', (req, res) => {
streamFrom(`timeline:hashtag:${req.query.tag.toLowerCase()}`, req, streamToHttp(req, res), streamHttpEnd(req), true);
});
@@ -437,6 +441,9 @@ const startWorker = (workerId) => {
case 'public:local':
streamFrom('timeline:public:local', req, streamToWs(req, ws), streamWsEnd(req, ws), true);
break;
+ case 'direct':
+ streamFrom(`timeline:direct:${req.accountId}`, req, streamToWs(req, ws), streamWsEnd(req, ws), true);
+ break;
case 'hashtag':
streamFrom(`timeline:hashtag:${location.query.tag.toLowerCase()}`, req, streamToWs(req, ws), streamWsEnd(req, ws), true);
break;
diff --git a/yarn.lock b/yarn.lock
index b7aa18a0173..0805e8af3ab 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -301,6 +301,10 @@ atob@~1.1.0:
version "1.1.3"
resolved "https://registry.yarnpkg.com/atob/-/atob-1.1.3.tgz#95f13629b12c3a51a5d215abdce2aa9f32f80773"
+atrament@^0.2.3:
+ version "0.2.3"
+ resolved "https://registry.yarnpkg.com/atrament/-/atrament-0.2.3.tgz#6ccbc0daa6d3f25e5aeaeb31befeb78e86980348"
+
autoprefixer@^6.3.1:
version "6.7.7"
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014"