diff --git a/app/controllers/api/v1/accounts/antennas_controller.rb b/app/controllers/api/v1/accounts/antennas_controller.rb new file mode 100644 index 0000000000..957a4fb555 --- /dev/null +++ b/app/controllers/api/v1/accounts/antennas_controller.rb @@ -0,0 +1,18 @@ +# frozen_string_literal: true + +class Api::V1::Accounts::AntennasController < Api::BaseController + before_action -> { doorkeeper_authorize! :read, :'read:lists' } + before_action :require_user! + before_action :set_account + + def index + @antennas = @account.suspended? ? [] : @account.joined_antennas.where(account: current_account) + render json: @antennas, each_serializer: REST::AntennaSerializer + end + + private + + def set_account + @account = Account.find(params[:account_id]) + end +end diff --git a/app/controllers/api/v1/antennas/accounts_controller.rb b/app/controllers/api/v1/antennas/accounts_controller.rb new file mode 100644 index 0000000000..d7e6fad895 --- /dev/null +++ b/app/controllers/api/v1/antennas/accounts_controller.rb @@ -0,0 +1,82 @@ +# frozen_string_literal: true + +class Api::V1::Antennas::AccountsController < Api::BaseController + before_action -> { doorkeeper_authorize! :read, :'read:lists' }, only: [:show] + before_action -> { doorkeeper_authorize! :write, :'write:lists' }, except: [:show] + + before_action :require_user! + before_action :set_antenna + + after_action :insert_pagination_headers, only: :show + + def create + ApplicationRecord.transaction do + antenna_accounts.each do |account| + @antenna.antenna_accounts.create!(account: account, exclude: false) + @antenna.update!(any_accounts: false) + end + end + + render_empty + end + + def destroy + AntennaAccount.where(antenna: @antenna, account_id: account_ids).destroy_all + @antenna.update!(any_accounts: true) if !@antenna.antenna_accounts.where(exclude: false).any? + render_empty + end + + private + + def set_antenna + @antenna = Antenna.where(account: current_account).find(params[:antenna_id]) + end + + def antenna_accounts + Account.find(account_ids) + end + + def account_ids + Array(resource_params[:account_ids]) + end + + def resource_params + params.permit(account_ids: []) + end + + def insert_pagination_headers + set_pagination_headers(next_path, prev_path) + end + + def next_path + return if unlimited? + + api_v1_list_accounts_url pagination_params(max_id: pagination_max_id) if records_continue? + end + + def prev_path + return if unlimited? + + api_v1_list_accounts_url pagination_params(since_id: pagination_since_id) unless @accounts.empty? + end + + def pagination_max_id + @accounts.last.id + end + + def pagination_since_id + @accounts.first.id + end + + def records_continue? + @accounts.size == limit_param(DEFAULT_ACCOUNTS_LIMIT) + end + + def pagination_params(core_params) + params.slice(:limit).permit(:limit).merge(core_params) + end + + def unlimited? + params[:limit] == '0' + end +end diff --git a/app/controllers/api/v1/antennas_controller.rb b/app/controllers/api/v1/antennas_controller.rb new file mode 100644 index 0000000000..2e47af4a44 --- /dev/null +++ b/app/controllers/api/v1/antennas_controller.rb @@ -0,0 +1,28 @@ +# frozen_string_literal: true + +class Api::V1::AntennasController < Api::BaseController + before_action -> { doorkeeper_authorize! :read, :'read:lists' }, only: [:index, :show] + before_action -> { doorkeeper_authorize! :write, :'write:lists' }, except: [:index, :show] + + before_action :require_user! + before_action :set_antenna, except: [:index] + + rescue_from ArgumentError do |e| + render json: { error: e.to_s }, status: 422 + end + + def index + @antennas = Antenna.where(account: current_account).all + render json: @antennas, each_serializer: REST::AntennaSerializer + end + + def show + render json: @antenna, serializer: REST::AntennaSerializer + end + + private + + def set_antenna + @antenna = Antenna.where(account: current_account).find(params[:id]) + end +end diff --git a/app/javascript/mastodon/actions/antennas.js b/app/javascript/mastodon/actions/antennas.js new file mode 100644 index 0000000000..6bb0de369c --- /dev/null +++ b/app/javascript/mastodon/actions/antennas.js @@ -0,0 +1,179 @@ +import api from '../api'; +import { importFetchedAccounts } from './importer'; + +export const ANTENNAS_FETCH_REQUEST = 'ANTENNAS_FETCH_REQUEST'; +export const ANTENNAS_FETCH_SUCCESS = 'ANTENNAS_FETCH_SUCCESS'; +export const ANTENNAS_FETCH_FAIL = 'ANTENNAS_FETCH_FAIL'; + +export const ANTENNA_ACCOUNTS_FETCH_REQUEST = 'ANTENNA_ACCOUNTS_FETCH_REQUEST'; +export const ANTENNA_ACCOUNTS_FETCH_SUCCESS = 'ANTENNA_ACCOUNTS_FETCH_SUCCESS'; +export const ANTENNA_ACCOUNTS_FETCH_FAIL = 'ANTENNA_ACCOUNTS_FETCH_FAIL'; + +export const ANTENNA_EDITOR_ADD_ACCOUNT_REQUEST = 'ANTENNA_EDITOR_ADD_ACCOUNT_REQUEST'; +export const ANTENNA_EDITOR_ADD_ACCOUNT_SUCCESS = 'ANTENNA_EDITOR_ADD_ACCOUNT_SUCCESS'; +export const ANTENNA_EDITOR_ADD_ACCOUNT_FAIL = 'ANTENNA_EDITOR_ADD_ACCOUNT_FAIL'; + +export const ANTENNA_EDITOR_REMOVE_ACCOUNT_REQUEST = 'ANTENNA_EDITOR_REMOVE_ACCOUNT_REQUEST'; +export const ANTENNA_EDITOR_REMOVE_ACCOUNT_SUCCESS = 'ANTENNA_EDITOR_REMOVE_ACCOUNT_SUCCESS'; +export const ANTENNA_EDITOR_REMOVE_ACCOUNT_FAIL = 'ANTENNA_EDITOR_REMOVE_ACCOUNT_FAIL'; + +export const ANTENNA_ADDER_ANTENNAS_FETCH_REQUEST = 'ANTENNA_ADDER_ANTENNAS_FETCH_REQUEST'; +export const ANTENNA_ADDER_ANTENNAS_FETCH_SUCCESS = 'ANTENNA_ADDER_ANTENNAS_FETCH_SUCCESS'; +export const ANTENNA_ADDER_ANTENNAS_FETCH_FAIL = 'ANTENNA_ADDER_ANTENNAS_FETCH_FAIL'; + +export const ANTENNA_ADDER_RESET = 'ANTENNA_ADDER_RESET'; +export const ANTENNA_ADDER_SETUP = 'ANTENNA_ADDER_SETUP'; + +export const fetchAntennas = () => (dispatch, getState) => { + dispatch(fetchAntennasRequest()); + + api(getState).get('/api/v1/antennas') + .then(({ data }) => dispatch(fetchAntennasSuccess(data))) + .catch(err => dispatch(fetchAntennasFail(err))); +}; + +export const fetchAntennasRequest = () => ({ + type: ANTENNAS_FETCH_REQUEST, +}); + +export const fetchAntennasSuccess = antennas => ({ + type: ANTENNAS_FETCH_SUCCESS, + antennas, +}); + +export const fetchAntennasFail = error => ({ + type: ANTENNAS_FETCH_FAIL, + error, +}); + +export const fetchAntennaAccounts = antennaId => (dispatch, getState) => { + dispatch(fetchAntennaAccountsRequest(antennaId)); + + api(getState).get(`/api/v1/antennas/${antennaId}/accounts`, { params: { limit: 0 } }).then(({ data }) => { + dispatch(importFetchedAccounts(data)); + dispatch(fetchAntennaAccountsSuccess(antennaId, data)); + }).catch(err => dispatch(fetchAntennaAccountsFail(antennaId, err))); +}; + +export const fetchAntennaAccountsRequest = id => ({ + type: ANTENNA_ACCOUNTS_FETCH_REQUEST, + id, +}); + +export const fetchAntennaAccountsSuccess = (id, accounts, next) => ({ + type: ANTENNA_ACCOUNTS_FETCH_SUCCESS, + id, + accounts, + next, +}); + +export const fetchAntennaAccountsFail = (id, error) => ({ + type: ANTENNA_ACCOUNTS_FETCH_FAIL, + id, + error, +}); + +export const addAccountToAntenna = (antennaId, accountId) => (dispatch, getState) => { + dispatch(addAccountToAntennaRequest(antennaId, accountId)); + + api(getState).post(`/api/v1/antennas/${antennaId}/accounts`, { account_ids: [accountId] }) + .then(() => dispatch(addAccountToAntennaSuccess(antennaId, accountId))) + .catch(err => dispatch(addAccountToAntennaFail(antennaId, accountId, err))); +}; + +export const addAccountToAntennaRequest = (antennaId, accountId) => ({ + type: ANTENNA_EDITOR_ADD_ACCOUNT_REQUEST, + antennaId, + accountId, +}); + +export const addAccountToAntennaSuccess = (antennaId, accountId) => ({ + type: ANTENNA_EDITOR_ADD_ACCOUNT_SUCCESS, + antennaId, + accountId, +}); + +export const addAccountToAntennaFail = (antennaId, accountId, error) => ({ + type: ANTENNA_EDITOR_ADD_ACCOUNT_FAIL, + antennaId, + accountId, + error, +}); + +export const removeAccountFromAntennaEditor = accountId => (dispatch, getState) => { + dispatch(removeAccountFromAntenna(getState().getIn(['antennaEditor', 'antennaId']), accountId)); +}; + +export const removeAccountFromAntenna = (antennaId, accountId) => (dispatch, getState) => { + dispatch(removeAccountFromAntennaRequest(antennaId, accountId)); + + api(getState).delete(`/api/v1/antennas/${antennaId}/accounts`, { params: { account_ids: [accountId] } }) + .then(() => dispatch(removeAccountFromAntennaSuccess(antennaId, accountId))) + .catch(err => dispatch(removeAccountFromAntennaFail(antennaId, accountId, err))); +}; + +export const removeAccountFromAntennaRequest = (antennaId, accountId) => ({ + type: ANTENNA_EDITOR_REMOVE_ACCOUNT_REQUEST, + antennaId, + accountId, +}); + +export const removeAccountFromAntennaSuccess = (antennaId, accountId) => ({ + type: ANTENNA_EDITOR_REMOVE_ACCOUNT_SUCCESS, + antennaId, + accountId, +}); + +export const removeAccountFromAntennaFail = (antennaId, accountId, error) => ({ + type: ANTENNA_EDITOR_REMOVE_ACCOUNT_FAIL, + antennaId, + accountId, + error, +}); + +export const addToAntennaAdder = antennaId => (dispatch, getState) => { + dispatch(addAccountToAntenna(antennaId, getState().getIn(['antennaAdder', 'accountId']))); +}; + +export const removeFromAntennaAdder = antennaId => (dispatch, getState) => { + dispatch(removeAccountFromAntenna(antennaId, getState().getIn(['antennaAdder', 'accountId']))); +}; + +export const fetchAccountAntennas = accountId => (dispatch, getState) => { + dispatch(fetchAccountAntennasRequest(accountId)); + + api(getState).get(`/api/v1/accounts/${accountId}/antennas`) + .then(({ data }) => dispatch(fetchAccountAntennasSuccess(accountId, data))) + .catch(err => dispatch(fetchAccountAntennasFail(accountId, err))); +}; + +export const fetchAccountAntennasRequest = id => ({ + type: ANTENNA_ADDER_ANTENNAS_FETCH_REQUEST, + id, +}); + +export const fetchAccountAntennasSuccess = (id, antennas) => ({ + type: ANTENNA_ADDER_ANTENNAS_FETCH_SUCCESS, + id, + antennas, +}); + +export const fetchAccountAntennasFail = (id, err) => ({ + type: ANTENNA_ADDER_ANTENNAS_FETCH_FAIL, + id, + err, +}); + +export const resetAntennaAdder = () => ({ + type: ANTENNA_ADDER_RESET, +}); + +export const setupAntennaAdder = accountId => (dispatch, getState) => { + dispatch({ + type: ANTENNA_ADDER_SETUP, + account: getState().getIn(['accounts', accountId]), + }); + dispatch(fetchAntennas()); + dispatch(fetchAccountAntennas(accountId)); +}; + diff --git a/app/javascript/mastodon/features/account/components/header.jsx b/app/javascript/mastodon/features/account/components/header.jsx index 72eb7e6b65..548a0b4d16 100644 --- a/app/javascript/mastodon/features/account/components/header.jsx +++ b/app/javascript/mastodon/features/account/components/header.jsx @@ -53,6 +53,7 @@ const messages = defineMessages({ endorse: { id: 'account.endorse', defaultMessage: 'Feature on profile' }, unendorse: { id: 'account.unendorse', defaultMessage: 'Don\'t feature on profile' }, add_or_remove_from_list: { id: 'account.add_or_remove_from_list', defaultMessage: 'Add or Remove from lists' }, + add_or_remove_from_antenna: { id: 'account.add_or_remove_from_antenna', defaultMessage: 'Add or Remove from antennas' }, admin_account: { id: 'status.admin_account', defaultMessage: 'Open moderation interface for @{name}' }, admin_domain: { id: 'status.admin_domain', defaultMessage: 'Open moderation interface for {domain}' }, languages: { id: 'account.languages', defaultMessage: 'Change subscribed languages' }, @@ -97,6 +98,7 @@ class Header extends ImmutablePureComponent { onUnblockDomain: PropTypes.func.isRequired, onEndorseToggle: PropTypes.func.isRequired, onAddToList: PropTypes.func.isRequired, + onAddToAntenna: PropTypes.func.isRequired, onEditAccountNote: PropTypes.func.isRequired, onChangeLanguages: PropTypes.func.isRequired, onInteractionModal: PropTypes.func.isRequired, @@ -262,8 +264,9 @@ class Header extends ImmutablePureComponent { menu.push({ text: intl.formatMessage(account.getIn(['relationship', 'endorsed']) ? messages.unendorse : messages.endorse), action: this.props.onEndorseToggle }); menu.push({ text: intl.formatMessage(messages.add_or_remove_from_list), action: this.props.onAddToList }); - menu.push(null); } + menu.push({ text: intl.formatMessage(messages.add_or_remove_from_antenna), action: this.props.onAddToAntenna }); + menu.push(null); if (account.getIn(['relationship', 'muting'])) { menu.push({ text: intl.formatMessage(messages.unmute, { name: account.get('username') }), action: this.props.onMute }); diff --git a/app/javascript/mastodon/features/account_timeline/components/header.jsx b/app/javascript/mastodon/features/account_timeline/components/header.jsx index c008f0342d..667c5c21c7 100644 --- a/app/javascript/mastodon/features/account_timeline/components/header.jsx +++ b/app/javascript/mastodon/features/account_timeline/components/header.jsx @@ -23,6 +23,7 @@ export default class Header extends ImmutablePureComponent { onUnblockDomain: PropTypes.func.isRequired, onEndorseToggle: PropTypes.func.isRequired, onAddToList: PropTypes.func.isRequired, + onAddToAntenna: PropTypes.func.isRequired, onChangeLanguages: PropTypes.func.isRequired, onInteractionModal: PropTypes.func.isRequired, onOpenAvatar: PropTypes.func.isRequired, @@ -91,6 +92,10 @@ export default class Header extends ImmutablePureComponent { this.props.onAddToList(this.props.account); }; + handleAddToAntenna = () => { + this.props.onAddToAntenna(this.props.account); + }; + handleEditAccountNote = () => { this.props.onEditAccountNote(this.props.account); }; @@ -133,6 +138,7 @@ export default class Header extends ImmutablePureComponent { onUnblockDomain={this.handleUnblockDomain} onEndorseToggle={this.handleEndorseToggle} onAddToList={this.handleAddToList} + onAddToAntenna={this.handleAddToAntenna} onEditAccountNote={this.handleEditAccountNote} onChangeLanguages={this.handleChangeLanguages} onInteractionModal={this.handleInteractionModal} diff --git a/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx b/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx index f53cd24807..ad35adeda7 100644 --- a/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx +++ b/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx @@ -146,6 +146,12 @@ const mapDispatchToProps = (dispatch, { intl }) => ({ })); }, + onAddToAntenna (account) { + dispatch(openModal('ANTENNA_ADDER', { + accountId: account.get('id'), + })); + }, + onChangeLanguages (account) { dispatch(openModal('SUBSCRIBED_LANGUAGES', { accountId: account.get('id'), diff --git a/app/javascript/mastodon/features/antenna_adder/components/account.jsx b/app/javascript/mastodon/features/antenna_adder/components/account.jsx new file mode 100644 index 0000000000..034ed0edc9 --- /dev/null +++ b/app/javascript/mastodon/features/antenna_adder/components/account.jsx @@ -0,0 +1,43 @@ +import React from 'react'; +import { connect } from 'react-redux'; +import { makeGetAccount } from '../../../selectors'; +import ImmutablePureComponent from 'react-immutable-pure-component'; +import ImmutablePropTypes from 'react-immutable-proptypes'; +import Avatar from '../../../components/avatar'; +import DisplayName from '../../../components/display_name'; +import { injectIntl } from 'react-intl'; + +const makeMapStateToProps = () => { + const getAccount = makeGetAccount(); + + const mapStateToProps = (state, { accountId }) => ({ + account: getAccount(state, accountId), + }); + + return mapStateToProps; +}; + + +class Account extends ImmutablePureComponent { + + static propTypes = { + account: ImmutablePropTypes.map.isRequired, + }; + + render () { + const { account } = this.props; + return ( +
+
+
+
+ +
+
+
+ ); + } + +} + +export default connect(makeMapStateToProps)(injectIntl(Account)); diff --git a/app/javascript/mastodon/features/antenna_adder/components/antenna.jsx b/app/javascript/mastodon/features/antenna_adder/components/antenna.jsx new file mode 100644 index 0000000000..15008ee218 --- /dev/null +++ b/app/javascript/mastodon/features/antenna_adder/components/antenna.jsx @@ -0,0 +1,69 @@ +import React from 'react'; +import PropTypes from 'prop-types'; +import { connect } from 'react-redux'; +import ImmutablePureComponent from 'react-immutable-pure-component'; +import ImmutablePropTypes from 'react-immutable-proptypes'; +import IconButton from '../../../components/icon_button'; +import { defineMessages, injectIntl } from 'react-intl'; +import { removeFromAntennaAdder, addToAntennaAdder } from '../../../actions/antennas'; +import Icon from 'mastodon/components/icon'; + +const messages = defineMessages({ + remove: { id: 'lists.account.remove', defaultMessage: 'Remove from list' }, + add: { id: 'lists.account.add', defaultMessage: 'Add to list' }, +}); + +const MapStateToProps = (state, { antennaId, added }) => ({ + antenna: state.get('antennas').get(antennaId), + added: typeof added === 'undefined' ? state.getIn(['antennaAdder', 'antennas', 'items']).includes(antennaId) : added, +}); + +const mapDispatchToProps = (dispatch, { antennaId }) => ({ + onRemove: () => dispatch(removeFromAntennaAdder(antennaId)), + onAdd: () => dispatch(addToAntennaAdder(antennaId)), +}); + +class Antenna extends ImmutablePureComponent { + + static propTypes = { + antenna: ImmutablePropTypes.map.isRequired, + intl: PropTypes.object.isRequired, + onRemove: PropTypes.func.isRequired, + onAdd: PropTypes.func.isRequired, + added: PropTypes.bool, + }; + + static defaultProps = { + added: false, + }; + + render () { + const { antenna, intl, onRemove, onAdd, added } = this.props; + + let button; + + if (added) { + button = ; + } else { + button = ; + } + + return ( +
+
+
+ + {antenna.get('title')} +
+ +
+ {button} +
+
+
+ ); + } + +} + +export default connect(MapStateToProps, mapDispatchToProps)(injectIntl(Antenna)); diff --git a/app/javascript/mastodon/features/antenna_adder/index.jsx b/app/javascript/mastodon/features/antenna_adder/index.jsx new file mode 100644 index 0000000000..cc1ea3c206 --- /dev/null +++ b/app/javascript/mastodon/features/antenna_adder/index.jsx @@ -0,0 +1,69 @@ +import React from 'react'; +import PropTypes from 'prop-types'; +import ImmutablePropTypes from 'react-immutable-proptypes'; +import { connect } from 'react-redux'; +import ImmutablePureComponent from 'react-immutable-pure-component'; +import { injectIntl } from 'react-intl'; +import { setupAntennaAdder, resetAntennaAdder } from '../../actions/antennas'; +import { createSelector } from 'reselect'; +import Antenna from './components/antenna'; +import Account from './components/account'; +// hack + +const getOrderedAntennas = createSelector([state => state.get('antennas')], antennas => { + if (!antennas) { + return antennas; + } + + return antennas.toList().filter(item => !!item).sort((a, b) => a.get('title').localeCompare(b.get('title'))); +}); + +const mapStateToProps = state => ({ + antennaIds: getOrderedAntennas(state).map(antenna=>antenna.get('id')), +}); + +const mapDispatchToProps = dispatch => ({ + onInitialize: accountId => dispatch(setupAntennaAdder(accountId)), + onReset: () => dispatch(resetAntennaAdder()), +}); + +class AntennaAdder extends ImmutablePureComponent { + + static propTypes = { + accountId: PropTypes.string.isRequired, + onClose: PropTypes.func.isRequired, + intl: PropTypes.object.isRequired, + onInitialize: PropTypes.func.isRequired, + onReset: PropTypes.func.isRequired, + antennaIds: ImmutablePropTypes.list.isRequired, + }; + + componentDidMount () { + const { onInitialize, accountId } = this.props; + onInitialize(accountId); + } + + componentWillUnmount () { + const { onReset } = this.props; + onReset(); + } + + render () { + const { accountId, antennaIds } = this.props; + + return ( +
+
+ +
+ +
+ {antennaIds.map(AntennaId => )} +
+
+ ); + } + +} + +export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(AntennaAdder)); diff --git a/app/javascript/mastodon/features/ui/components/modal_root.jsx b/app/javascript/mastodon/features/ui/components/modal_root.jsx index c252e6caac..715803b302 100644 --- a/app/javascript/mastodon/features/ui/components/modal_root.jsx +++ b/app/javascript/mastodon/features/ui/components/modal_root.jsx @@ -20,6 +20,7 @@ import { EmbedModal, ListEditor, ListAdder, + AntennaAdder, CompareHistoryModal, FilterModal, InteractionModal, @@ -43,6 +44,7 @@ const MODAL_COMPONENTS = { 'LIST_EDITOR': ListEditor, 'FOCAL_POINT': () => Promise.resolve({ default: FocalPointModal }), 'LIST_ADDER': ListAdder, + 'ANTENNA_ADDER': AntennaAdder, 'COMPARE_HISTORY': CompareHistoryModal, 'FILTER': FilterModal, 'SUBSCRIBED_LANGUAGES': SubscribedLanguagesModal, diff --git a/app/javascript/mastodon/features/ui/util/async-components.js b/app/javascript/mastodon/features/ui/util/async-components.js index 24867962de..3f61f64aca 100644 --- a/app/javascript/mastodon/features/ui/util/async-components.js +++ b/app/javascript/mastodon/features/ui/util/async-components.js @@ -146,6 +146,10 @@ export function ListAdder () { return import(/*webpackChunkName: "features/list_adder" */'../../list_adder'); } +export function AntennaAdder () { + return import(/*webpackChunkName: "features/antenna_adder" */'../../antenna_adder'); +} + export function Tesseract () { return import(/*webpackChunkName: "tesseract" */'tesseract.js'); } diff --git a/app/javascript/mastodon/reducers/antenna_adder.js b/app/javascript/mastodon/reducers/antenna_adder.js new file mode 100644 index 0000000000..d3b98d63fd --- /dev/null +++ b/app/javascript/mastodon/reducers/antenna_adder.js @@ -0,0 +1,47 @@ +import { Map as ImmutableMap, List as ImmutableList } from 'immutable'; +import { + ANTENNA_ADDER_RESET, + ANTENNA_ADDER_SETUP, + ANTENNA_ADDER_ANTENNAS_FETCH_REQUEST, + ANTENNA_ADDER_ANTENNAS_FETCH_SUCCESS, + ANTENNA_ADDER_ANTENNAS_FETCH_FAIL, + ANTENNA_EDITOR_ADD_ACCOUNT_SUCCESS, + ANTENNA_EDITOR_REMOVE_ACCOUNT_SUCCESS, +} from '../actions/antennas'; + +const initialState = ImmutableMap({ + accountId: null, + + antennas: ImmutableMap({ + items: ImmutableList(), + loaded: false, + isLoading: false, + }), +}); + +export default function antennaAdderReducer(state = initialState, action) { + switch(action.type) { + case ANTENNA_ADDER_RESET: + return initialState; + case ANTENNA_ADDER_SETUP: + return state.withMutations(map => { + map.set('accountId', action.account.get('id')); + }); + case ANTENNA_ADDER_ANTENNAS_FETCH_REQUEST: + return state.setIn(['antennas', 'isLoading'], true); + case ANTENNA_ADDER_ANTENNAS_FETCH_FAIL: + return state.setIn(['antennas', 'isLoading'], false); + case ANTENNA_ADDER_ANTENNAS_FETCH_SUCCESS: + return state.update('antennas', antennas => antennas.withMutations(map => { + map.set('isLoading', false); + map.set('loaded', true); + map.set('items', ImmutableList(action.antennas.map(item => item.id))); + })); + case ANTENNA_EDITOR_ADD_ACCOUNT_SUCCESS: + return state.updateIn(['antennas', 'items'], antenna => antenna.unshift(action.antennaId)); + case ANTENNA_EDITOR_REMOVE_ACCOUNT_SUCCESS: + return state.updateIn(['antennas', 'items'], antenna => antenna.filterNot(item => item === action.antennaId)); + default: + return state; + } +} diff --git a/app/javascript/mastodon/reducers/antenna_editor.js b/app/javascript/mastodon/reducers/antenna_editor.js new file mode 100644 index 0000000000..2219aa7dfc --- /dev/null +++ b/app/javascript/mastodon/reducers/antenna_editor.js @@ -0,0 +1,36 @@ +import { Map as ImmutableMap, List as ImmutableList } from 'immutable'; +import { + ANTENNA_ACCOUNTS_FETCH_REQUEST, + ANTENNA_ACCOUNTS_FETCH_SUCCESS, + ANTENNA_ACCOUNTS_FETCH_FAIL, +} from '../actions/antennas'; + +const initialState = ImmutableMap({ + antennaId: null, + isSubmitting: false, + isChanged: false, + title: '', + + accounts: ImmutableMap({ + items: ImmutableList(), + loaded: false, + isLoading: false, + }), +}); + +export default function antennaEditorReducer(state = initialState, action) { + switch(action.type) { + case ANTENNA_ACCOUNTS_FETCH_REQUEST: + return state.setIn(['accounts', 'isLoading'], true); + case ANTENNA_ACCOUNTS_FETCH_FAIL: + return state.setIn(['accounts', 'isLoading'], false); + case ANTENNA_ACCOUNTS_FETCH_SUCCESS: + return state.update('accounts', accounts => accounts.withMutations(map => { + map.set('isLoading', false); + map.set('loaded', true); + map.set('items', ImmutableList(action.accounts.map(item => item.id))); + })); + default: + return state; + } +} diff --git a/app/javascript/mastodon/reducers/antennas.js b/app/javascript/mastodon/reducers/antennas.js new file mode 100644 index 0000000000..e20cab981a --- /dev/null +++ b/app/javascript/mastodon/reducers/antennas.js @@ -0,0 +1,25 @@ +import { + ANTENNAS_FETCH_SUCCESS, +} from '../actions/antennas'; +import { Map as ImmutableMap, fromJS } from 'immutable'; + +const initialState = ImmutableMap(); + +const normalizeAntenna = (state, antenna) => state.set(antenna.id, fromJS(antenna)); + +const normalizeAntennas = (state, antennas) => { + antennas.forEach(antenna => { + state = normalizeAntenna(state, antenna); + }); + + return state; +}; + +export default function antennas(state = initialState, action) { + switch(action.type) { + case ANTENNAS_FETCH_SUCCESS: + return normalizeAntennas(state, action.antennas); + default: + return state; + } +} diff --git a/app/javascript/mastodon/reducers/index.js b/app/javascript/mastodon/reducers/index.js index 69771ad1b3..61fe90a63e 100644 --- a/app/javascript/mastodon/reducers/index.js +++ b/app/javascript/mastodon/reducers/index.js @@ -28,6 +28,9 @@ import custom_emojis from './custom_emojis'; import lists from './lists'; import listEditor from './list_editor'; import listAdder from './list_adder'; +import antennas from './antennas'; +import antennaEditor from './antenna_editor'; +import antennaAdder from './antenna_adder'; import filters from './filters'; import conversations from './conversations'; import suggestions from './suggestions'; @@ -74,6 +77,9 @@ const reducers = { lists, listEditor, listAdder, + antennas, + antennaEditor, + antennaAdder, filters, conversations, suggestions, diff --git a/app/models/antenna_account.rb b/app/models/antenna_account.rb index d92e5535f9..38e2f83b67 100644 --- a/app/models/antenna_account.rb +++ b/app/models/antenna_account.rb @@ -14,4 +14,6 @@ class AntennaAccount < ApplicationRecord belongs_to :antenna belongs_to :account + validates :account_id, uniqueness: { scope: :antenna_id } + end diff --git a/app/models/concerns/account_associations.rb b/app/models/concerns/account_associations.rb index 00c57f00d9..c284f5ce57 100644 --- a/app/models/concerns/account_associations.rb +++ b/app/models/concerns/account_associations.rb @@ -48,6 +48,10 @@ module AccountAssociations has_many :account_warnings, dependent: :destroy, inverse_of: :account has_many :strikes, class_name: 'AccountWarning', foreign_key: :target_account_id, dependent: :destroy, inverse_of: :target_account + # Antennas (that the account is on, not owned by the account) + has_many :antenna_accounts, inverse_of: :account, dependent: :destroy + has_many :joined_antennas, class_name: 'Antenna', through: :antenna_accounts, source: :antenna + # Lists (that the account is on, not owned by the account) has_many :list_accounts, inverse_of: :account, dependent: :destroy has_many :lists, through: :list_accounts diff --git a/app/serializers/rest/antenna_serializer.rb b/app/serializers/rest/antenna_serializer.rb new file mode 100644 index 0000000000..4a4a148669 --- /dev/null +++ b/app/serializers/rest/antenna_serializer.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class REST::AntennaSerializer < ActiveModel::Serializer + attributes :id, :title + + def id + object.id.to_s + end +end diff --git a/config/routes.rb b/config/routes.rb index 6f1b1ad555..7563f186f6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -603,6 +603,7 @@ Rails.application.routes.draw do resources :followers, only: :index, controller: 'accounts/follower_accounts' resources :following, only: :index, controller: 'accounts/following_accounts' resources :lists, only: :index, controller: 'accounts/lists' + resources :antennas, only: :index, controller: 'accounts/antennas' resources :identity_proofs, only: :index, controller: 'accounts/identity_proofs' resources :featured_tags, only: :index, controller: 'accounts/featured_tags' @@ -634,6 +635,10 @@ Rails.application.routes.draw do resource :accounts, only: [:show, :create, :destroy], controller: 'lists/accounts' end + resources :antennas, only: [:index, :create, :show, :update, :destroy] do + resource :accounts, only: [:show, :create, :destroy], controller: 'antennas/accounts' + end + namespace :featured_tags do get :suggestions, to: 'suggestions#index' end