diff --git a/app/javascript/mastodon/actions/suggestions.js b/app/javascript/mastodon/actions/suggestions.js
new file mode 100644
index 00000000000..b15bd916ba6
--- /dev/null
+++ b/app/javascript/mastodon/actions/suggestions.js
@@ -0,0 +1,52 @@
+import api from '../api';
+import { importFetchedAccounts } from './importer';
+
+export const SUGGESTIONS_FETCH_REQUEST = 'SUGGESTIONS_FETCH_REQUEST';
+export const SUGGESTIONS_FETCH_SUCCESS = 'SUGGESTIONS_FETCH_SUCCESS';
+export const SUGGESTIONS_FETCH_FAIL = 'SUGGESTIONS_FETCH_FAIL';
+
+export const SUGGESTIONS_DISMISS = 'SUGGESTIONS_DISMISS';
+
+export function fetchSuggestions() {
+ return (dispatch, getState) => {
+ dispatch(fetchSuggestionsRequest());
+
+ api(getState).get('/api/v1/suggestions').then(response => {
+ dispatch(importFetchedAccounts(response.data));
+ dispatch(fetchSuggestionsSuccess(response.data));
+ }).catch(error => dispatch(fetchSuggestionsFail(error)));
+ };
+};
+
+export function fetchSuggestionsRequest() {
+ return {
+ type: SUGGESTIONS_FETCH_REQUEST,
+ skipLoading: true,
+ };
+};
+
+export function fetchSuggestionsSuccess(accounts) {
+ return {
+ type: SUGGESTIONS_FETCH_SUCCESS,
+ accounts,
+ skipLoading: true,
+ };
+};
+
+export function fetchSuggestionsFail(error) {
+ return {
+ type: SUGGESTIONS_FETCH_FAIL,
+ error,
+ skipLoading: true,
+ skipAlert: true,
+ };
+};
+
+export const dismissSuggestion = accountId => (dispatch, getState) => {
+ dispatch({
+ type: SUGGESTIONS_DISMISS,
+ id: accountId,
+ });
+
+ api(getState).delete(`/api/v1/suggestions/${accountId}`);
+};
diff --git a/app/javascript/mastodon/components/account.js b/app/javascript/mastodon/components/account.js
index c021e32676e..2bcea8b675c 100644
--- a/app/javascript/mastodon/components/account.js
+++ b/app/javascript/mastodon/components/account.js
@@ -30,6 +30,9 @@ class Account extends ImmutablePureComponent {
onMuteNotifications: PropTypes.func.isRequired,
intl: PropTypes.object.isRequired,
hidden: PropTypes.bool,
+ actionIcon: PropTypes.string,
+ actionTitle: PropTypes.string,
+ onActionClick: PropTypes.func,
};
handleFollow = () => {
@@ -52,8 +55,12 @@ class Account extends ImmutablePureComponent {
this.props.onMuteNotifications(this.props.account, false);
}
+ handleAction = () => {
+ this.props.onActionClick(this.props.account);
+ }
+
render () {
- const { account, intl, hidden } = this.props;
+ const { account, intl, hidden, onActionClick, actionIcon, actionTitle } = this.props;
if (!account) {
return
;
@@ -70,7 +77,9 @@ class Account extends ImmutablePureComponent {
let buttons;
- if (account.get('id') !== me && account.get('relationship', null) !== null) {
+ if (onActionClick && actionIcon) {
+ buttons = ;
+ } else if (account.get('id') !== me && account.get('relationship', null) !== null) {
const following = account.getIn(['relationship', 'following']);
const requested = account.getIn(['relationship', 'requested']);
const blocking = account.getIn(['relationship', 'blocking']);
diff --git a/app/javascript/mastodon/features/compose/components/search_results.js b/app/javascript/mastodon/features/compose/components/search_results.js
index c351b84bb3e..f0ddf6d7144 100644
--- a/app/javascript/mastodon/features/compose/components/search_results.js
+++ b/app/javascript/mastodon/features/compose/components/search_results.js
@@ -1,19 +1,56 @@
import React from 'react';
+import PropTypes from 'prop-types';
import ImmutablePropTypes from 'react-immutable-proptypes';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
import AccountContainer from '../../../containers/account_container';
import StatusContainer from '../../../containers/status_container';
import ImmutablePureComponent from 'react-immutable-pure-component';
import Hashtag from '../../../components/hashtag';
-export default class SearchResults extends ImmutablePureComponent {
+const messages = defineMessages({
+ dismissSuggestion: { id: 'suggestions.dismiss', defaultMessage: 'Dismiss suggestion' },
+});
+
+export default @injectIntl
+class SearchResults extends ImmutablePureComponent {
static propTypes = {
results: ImmutablePropTypes.map.isRequired,
+ suggestions: ImmutablePropTypes.list.isRequired,
+ fetchSuggestions: PropTypes.func.isRequired,
+ dismissSuggestion: PropTypes.func.isRequired,
+ intl: PropTypes.object.isRequired,
};
+ componentDidMount () {
+ this.props.fetchSuggestions();
+ }
+
render () {
- const { results } = this.props;
+ const { intl, results, suggestions, dismissSuggestion } = this.props;
+
+ if (results.isEmpty() && !suggestions.isEmpty()) {
+ return (
+
+
+
+
+
+
+
+ {suggestions && suggestions.map(accountId => (
+
+ ))}
+
+
+ );
+ }
let accounts, statuses, hashtags;
let count = 0;
diff --git a/app/javascript/mastodon/features/compose/containers/search_results_container.js b/app/javascript/mastodon/features/compose/containers/search_results_container.js
index 16d95d417e4..f9637861ae7 100644
--- a/app/javascript/mastodon/features/compose/containers/search_results_container.js
+++ b/app/javascript/mastodon/features/compose/containers/search_results_container.js
@@ -1,8 +1,15 @@
import { connect } from 'react-redux';
import SearchResults from '../components/search_results';
+import { fetchSuggestions, dismissSuggestion } from '../../../actions/suggestions';
const mapStateToProps = state => ({
results: state.getIn(['search', 'results']),
+ suggestions: state.getIn(['suggestions', 'items']),
});
-export default connect(mapStateToProps)(SearchResults);
+const mapDispatchToProps = dispatch => ({
+ fetchSuggestions: () => dispatch(fetchSuggestions()),
+ dismissSuggestion: account => dispatch(dismissSuggestion(account.get('id'))),
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(SearchResults);
diff --git a/app/javascript/mastodon/reducers/index.js b/app/javascript/mastodon/reducers/index.js
index d3b98d4f6f1..e98566e260f 100644
--- a/app/javascript/mastodon/reducers/index.js
+++ b/app/javascript/mastodon/reducers/index.js
@@ -28,6 +28,7 @@ import lists from './lists';
import listEditor from './list_editor';
import filters from './filters';
import conversations from './conversations';
+import suggestions from './suggestions';
const reducers = {
dropdown_menu,
@@ -59,6 +60,7 @@ const reducers = {
listEditor,
filters,
conversations,
+ suggestions,
};
export default combineReducers(reducers);
diff --git a/app/javascript/mastodon/reducers/suggestions.js b/app/javascript/mastodon/reducers/suggestions.js
new file mode 100644
index 00000000000..9f4b89d5865
--- /dev/null
+++ b/app/javascript/mastodon/reducers/suggestions.js
@@ -0,0 +1,30 @@
+import {
+ SUGGESTIONS_FETCH_REQUEST,
+ SUGGESTIONS_FETCH_SUCCESS,
+ SUGGESTIONS_FETCH_FAIL,
+ SUGGESTIONS_DISMISS,
+} from '../actions/suggestions';
+import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable';
+
+const initialState = ImmutableMap({
+ items: ImmutableList(),
+ isLoading: false,
+});
+
+export default function suggestionsReducer(state = initialState, action) {
+ switch(action.type) {
+ case SUGGESTIONS_FETCH_REQUEST:
+ return state.set('isLoading', true);
+ case SUGGESTIONS_FETCH_SUCCESS:
+ return state.withMutations(map => {
+ map.set('items', fromJS(action.accounts.map(x => x.id)));
+ map.set('isLoading', false);
+ });
+ case SUGGESTIONS_FETCH_FAIL:
+ return state.set('isLoading', false);
+ case SUGGESTIONS_DISMISS:
+ return state.update('items', list => list.filterNot(id => id === action.id));
+ default:
+ return state;
+ }
+};