diff --git a/app/javascript/mastodon/features/compose/components/search.jsx b/app/javascript/mastodon/features/compose/components/search.jsx
index 7badb0774f..682f8d3c8c 100644
--- a/app/javascript/mastodon/features/compose/components/search.jsx
+++ b/app/javascript/mastodon/features/compose/components/search.jsx
@@ -139,10 +139,6 @@ class Search extends PureComponent {
this.setState({ expanded: false, selectedOption: -1 });
};
- findTarget = () => {
- return this.searchForm;
- };
-
handleHashtagClick = () => {
const { router } = this.context;
const { value, onClickSearchResult } = this.props;
diff --git a/app/javascript/mastodon/features/home_timeline/components/explore_prompt.tsx b/app/javascript/mastodon/features/home_timeline/components/explore_prompt.tsx
index 47113d9b8e..9eeec00e34 100644
--- a/app/javascript/mastodon/features/home_timeline/components/explore_prompt.tsx
+++ b/app/javascript/mastodon/features/home_timeline/components/explore_prompt.tsx
@@ -22,7 +22,7 @@ export const ExplorePrompt = () => (
diff --git a/app/javascript/mastodon/features/interaction_modal/index.jsx b/app/javascript/mastodon/features/interaction_modal/index.jsx
index 4722c130e7..6e17ab0194 100644
--- a/app/javascript/mastodon/features/interaction_modal/index.jsx
+++ b/app/javascript/mastodon/features/interaction_modal/index.jsx
@@ -1,95 +1,296 @@
import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
+import React from 'react';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
import classNames from 'classnames';
import { connect } from 'react-redux';
+import { throttle, escapeRegExp } from 'lodash';
+
import { openModal, closeModal } from 'mastodon/actions/modal';
+import api from 'mastodon/api';
+import Button from 'mastodon/components/button';
import { Icon } from 'mastodon/components/icon';
import { registrationsOpen } from 'mastodon/initial_state';
+const messages = defineMessages({
+ loginPrompt: { id: 'interaction_modal.login.prompt', defaultMessage: 'Domain of your home server, e.g. mastodon.social' },
+});
+
const mapStateToProps = (state, { accountId }) => ({
displayNameHtml: state.getIn(['accounts', accountId, 'display_name_html']),
- signupUrl: state.getIn(['server', 'server', 'registrations', 'url'], null) || '/auth/sign_up',
});
const mapDispatchToProps = (dispatch) => ({
onSignupClick() {
- dispatch(closeModal({
- modalType: undefined,
- ignoreFocus: false,
- }));
- dispatch(openModal({ modalType: 'CLOSED_REGISTRATIONS' }));
+ dispatch(closeModal());
+ dispatch(openModal('CLOSED_REGISTRATIONS'));
},
});
-class Copypaste extends PureComponent {
+const PERSISTENCE_KEY = 'mastodon_home';
+
+const isValidDomain = value => {
+ const url = new URL('https:///path');
+ url.hostname = value;
+ return url.hostname === value;
+};
+
+const valueToDomain = value => {
+ // If the user starts typing an URL
+ if (/^https?:\/\//.test(value)) {
+ try {
+ const url = new URL(value);
+
+ // Consider that if there is a path, the URL is more meaningful than a bare domain
+ if (url.pathname.length > 1) {
+ return '';
+ }
+
+ return url.host;
+ } catch {
+ return undefined;
+ }
+ // If the user writes their full handle including username
+ } else if (value.includes('@')) {
+ if (value.replace(/^@/, '').split('@').length > 2) {
+ return undefined;
+ }
+ return '';
+ }
+
+ return value;
+};
+
+const addInputToOptions = (value, options) => {
+ value = value.trim();
+
+ if (value.includes('.') && isValidDomain(value)) {
+ return [value].concat(options.filter((x) => x !== value));
+ }
+
+ return options;
+};
+
+class LoginForm extends React.PureComponent {
static propTypes = {
- value: PropTypes.string,
+ resourceUrl: PropTypes.string,
+ intl: PropTypes.object.isRequired,
};
state = {
- copied: false,
+ value: localStorage ? (localStorage.getItem(PERSISTENCE_KEY) || '') : '',
+ expanded: false,
+ selectedOption: -1,
+ isLoading: false,
+ isSubmitting: false,
+ error: false,
+ options: [],
+ networkOptions: [],
};
setRef = c => {
this.input = c;
};
- handleInputClick = () => {
- this.setState({ copied: false });
- this.input.focus();
- this.input.select();
- this.input.setSelectionRange(0, this.input.value.length);
+ handleChange = ({ target }) => {
+ this.setState(state => ({ value: target.value, isLoading: true, error: false, options: addInputToOptions(target.value, state.networkOptions) }), () => this._loadOptions());
};
- handleButtonClick = () => {
- const { value } = this.props;
- navigator.clipboard.writeText(value);
- this.input.blur();
- this.setState({ copied: true });
- this.timeout = setTimeout(() => this.setState({ copied: false }), 700);
+ handleMessage = (event) => {
+ const { resourceUrl } = this.props;
+
+ if (event.origin !== window.origin || event.source !== this.iframeRef.contentWindow) {
+ return;
+ }
+
+ if (event.data?.type === 'fetchInteractionURL-failure') {
+ this.setState({ isSubmitting: false, error: true });
+ } else if (event.data?.type === 'fetchInteractionURL-success') {
+ if (/^https?:\/\//.test(event.data.template)) {
+ if (localStorage) {
+ localStorage.setItem(PERSISTENCE_KEY, event.data.uri_or_domain);
+ }
+
+ window.location.href = event.data.template.replace('{uri}', encodeURIComponent(resourceUrl));
+ } else {
+ this.setState({ isSubmitting: false, error: true });
+ }
+ }
};
- componentWillUnmount () {
- if (this.timeout) clearTimeout(this.timeout);
+ componentDidMount () {
+ window.addEventListener('message', this.handleMessage);
}
+ componentWillUnmount () {
+ window.removeEventListener('message', this.handleMessage);
+ }
+
+ handleSubmit = () => {
+ const { value } = this.state;
+
+ this.setState({ isSubmitting: true });
+
+ this.iframeRef.contentWindow.postMessage({
+ type: 'fetchInteractionURL',
+ uri_or_domain: value.trim(),
+ }, window.origin);
+ };
+
+ setIFrameRef = (iframe) => {
+ this.iframeRef = iframe;
+ }
+
+ handleFocus = () => {
+ this.setState({ expanded: true });
+ };
+
+ handleBlur = () => {
+ this.setState({ expanded: false });
+ };
+
+ handleKeyDown = (e) => {
+ const { options, selectedOption } = this.state;
+
+ switch(e.key) {
+ case 'ArrowDown':
+ e.preventDefault();
+
+ if (options.length > 0) {
+ this.setState({ selectedOption: Math.min(selectedOption + 1, options.length - 1) });
+ }
+
+ break;
+ case 'ArrowUp':
+ e.preventDefault();
+
+ if (options.length > 0) {
+ this.setState({ selectedOption: Math.max(selectedOption - 1, -1) });
+ }
+
+ break;
+ case 'Enter':
+ e.preventDefault();
+
+ if (selectedOption === -1) {
+ this.handleSubmit();
+ } else if (options.length > 0) {
+ this.setState({ value: options[selectedOption], error: false }, () => this.handleSubmit());
+ }
+
+ break;
+ }
+ };
+
+ handleOptionClick = e => {
+ const index = Number(e.currentTarget.getAttribute('data-index'));
+ const option = this.state.options[index];
+
+ e.preventDefault();
+ this.setState({ selectedOption: index, value: option, error: false }, () => this.handleSubmit());
+ };
+
+ _loadOptions = throttle(() => {
+ const { value } = this.state;
+
+ const domain = valueToDomain(value.trim());
+
+ if (typeof domain === 'undefined') {
+ this.setState({ options: [], networkOptions: [], isLoading: false, error: true });
+ return;
+ }
+
+ if (domain.length === 0) {
+ this.setState({ options: [], networkOptions: [], isLoading: false });
+ return;
+ }
+
+ api().get('/api/v1/peers/search', { params: { q: domain } }).then(({ data }) => {
+ if (!data) {
+ data = [];
+ }
+
+ this.setState((state) => ({ networkOptions: data, options: addInputToOptions(state.value, data), isLoading: false }));
+ }).catch(() => {
+ this.setState({ isLoading: false });
+ });
+ }, 200, { leading: true, trailing: true });
+
render () {
- const { value } = this.props;
- const { copied } = this.state;
+ const { intl } = this.props;
+ const { value, expanded, options, selectedOption, error, isSubmitting } = this.state;
+ const domain = (valueToDomain(value) || '').trim();
+ const domainRegExp = new RegExp(`(${escapeRegExp(domain)})`, 'gi');
+ const hasPopOut = domain.length > 0 && options.length > 0;
return (
-
-
+
+
-
+
+
+
+
+
+
+ {hasPopOut && (
+
+
+ {options.map((option, i) => (
+
+ ))}
+
+
+ )}
);
}
}
-class InteractionModal extends PureComponent {
+const IntlLoginForm = injectIntl(LoginForm);
+
+class InteractionModal extends React.PureComponent {
static propTypes = {
displayNameHtml: PropTypes.string,
url: PropTypes.string,
type: PropTypes.oneOf(['reply', 'reblog', 'favourite', 'follow']),
onSignupClick: PropTypes.func.isRequired,
- signupUrl: PropTypes.string.isRequired,
};
handleSignupClick = () => {
@@ -97,7 +298,7 @@ class InteractionModal extends PureComponent {
};
render () {
- const { url, type, displayNameHtml, signupUrl } = this.props;
+ const { url, type, displayNameHtml } = this.props;
const name =
;
@@ -130,13 +331,13 @@ class InteractionModal extends PureComponent {
if (registrationsOpen) {
signupButton = (
-
+
);
} else {
signupButton = (
-