treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Move flavours/glitch/util/api to flavours/glitch/api

remotes/1703361221475462875/rebase/4.0.0rc1
Claire 2022-10-11 10:32:31 +02:00
parent 64342a87b4
commit c285546052
39 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/flavours/glitch/actions/account_notes.js
View File

@ -1,4 +1,4 @@
import api from 'flavours/glitch/util/api';
import api from '../api';
export const ACCOUNT_NOTE_SUBMIT_REQUEST = 'ACCOUNT_NOTE_SUBMIT_REQUEST';
export const ACCOUNT_NOTE_SUBMIT_SUCCESS = 'ACCOUNT_NOTE_SUBMIT_SUCCESS';

2
app/javascript/flavours/glitch/actions/accounts.js
View File

@ -1,4 +1,4 @@
import api, { getLinks } from 'flavours/glitch/util/api';
import api, { getLinks } from '../api';
import { importAccount, importFetchedAccount, importFetchedAccounts } from './importer';
export const ACCOUNT_FETCH_REQUEST = 'ACCOUNT_FETCH_REQUEST';

2
app/javascript/flavours/glitch/actions/announcements.js
View File

@ -1,4 +1,4 @@
import api from 'flavours/glitch/util/api';
import api from '../api';
import { normalizeAnnouncement } from './importer/normalizer';
export const ANNOUNCEMENTS_FETCH_REQUEST = 'ANNOUNCEMENTS_FETCH_REQUEST';

2
app/javascript/flavours/glitch/actions/blocks.js
View File

@ -1,4 +1,4 @@
import api, { getLinks } from 'flavours/glitch/util/api';
import api, { getLinks } from '../api';
import { fetchRelationships } from './accounts';
import { importFetchedAccounts } from './importer';
import { openModal } from './modal';

2
app/javascript/flavours/glitch/actions/bookmarks.js
View File

@ -1,4 +1,4 @@
import api, { getLinks } from 'flavours/glitch/util/api';
import api, { getLinks } from '../api';
import { importFetchedStatuses } from './importer';
export const BOOKMARKED_STATUSES_FETCH_REQUEST = 'BOOKMARKED_STATUSES_FETCH_REQUEST';

2
app/javascript/flavours/glitch/actions/compose.js
View File

@ -1,4 +1,4 @@
import api from 'flavours/glitch/util/api';
import api from '../api';
import { CancelToken, isCancel } from 'axios';
import { throttle } from 'lodash';
import { search as emojiSearch } from 'flavours/glitch/util/emoji/emoji_mart_search_light';

2
app/javascript/flavours/glitch/actions/conversations.js
View File

@ -1,4 +1,4 @@
import api, { getLinks } from 'flavours/glitch/util/api';
import api, { getLinks } from '../api';
import {
importFetchedAccounts,
importFetchedStatuses,

2
app/javascript/flavours/glitch/actions/custom_emojis.js
View File

@ -1,4 +1,4 @@
import api from 'flavours/glitch/util/api';
import api from '../api';
export const CUSTOM_EMOJIS_FETCH_REQUEST = 'CUSTOM_EMOJIS_FETCH_REQUEST';
export const CUSTOM_EMOJIS_FETCH_SUCCESS = 'CUSTOM_EMOJIS_FETCH_SUCCESS';

2
app/javascript/flavours/glitch/actions/directory.js
View File

@ -1,4 +1,4 @@
import api from 'flavours/glitch/util/api';
import api from '../api';
import { importFetchedAccounts } from './importer';
import { fetchRelationships } from './accounts';

2
app/javascript/flavours/glitch/actions/domain_blocks.js
View File

@ -1,4 +1,4 @@
import api, { getLinks } from 'flavours/glitch/util/api';
import api, { getLinks } from '../api';
export const DOMAIN_BLOCK_REQUEST = 'DOMAIN_BLOCK_REQUEST';
export const DOMAIN_BLOCK_SUCCESS = 'DOMAIN_BLOCK_SUCCESS';

2
app/javascript/flavours/glitch/actions/favourites.js
View File

@ -1,4 +1,4 @@
import api, { getLinks } from 'flavours/glitch/util/api';
import api, { getLinks } from '../api';
import { importFetchedStatuses } from './importer';
export const FAVOURITED_STATUSES_FETCH_REQUEST = 'FAVOURITED_STATUSES_FETCH_REQUEST';

2
app/javascript/flavours/glitch/actions/filters.js
View File

@ -1,4 +1,4 @@
import api from 'flavours/glitch/util/api';
import api from '../api';
import { openModal } from './modal';
export const FILTERS_FETCH_REQUEST = 'FILTERS_FETCH_REQUEST';

2
app/javascript/flavours/glitch/actions/history.js
View File

@ -1,4 +1,4 @@
import api from 'flavours/glitch/util/api';
import api from '../api';
import { importFetchedAccounts } from './importer';
export const HISTORY_FETCH_REQUEST = 'HISTORY_FETCH_REQUEST';

2
app/javascript/flavours/glitch/actions/identity_proofs.js
View File

@ -1,4 +1,4 @@
import api from 'flavours/glitch/util/api';
import api from '../api';
export const IDENTITY_PROOFS_ACCOUNT_FETCH_REQUEST = 'IDENTITY_PROOFS_ACCOUNT_FETCH_REQUEST';
export const IDENTITY_PROOFS_ACCOUNT_FETCH_SUCCESS = 'IDENTITY_PROOFS_ACCOUNT_FETCH_SUCCESS';

2
app/javascript/flavours/glitch/actions/interactions.js
View File

@ -1,4 +1,4 @@
import api from 'flavours/glitch/util/api';
import api from '../api';
import { importFetchedAccounts, importFetchedStatus } from './importer';
export const REBLOG_REQUEST = 'REBLOG_REQUEST';

2
app/javascript/flavours/glitch/actions/lists.js
View File

@ -1,4 +1,4 @@
import api from 'flavours/glitch/util/api';
import api from '../api';
import { importFetchedAccounts } from './importer';
import { showAlertForError } from './alerts';

2
app/javascript/flavours/glitch/actions/markers.js
View File

@ -1,4 +1,4 @@
import api from 'flavours/glitch/util/api';
import api from '../api';
import { debounce } from 'lodash';
import compareId from 'flavours/glitch/util/compare_id';
import { List as ImmutableList } from 'immutable';

2
app/javascript/flavours/glitch/actions/mutes.js
View File

@ -1,4 +1,4 @@
import api, { getLinks } from 'flavours/glitch/util/api';
import api, { getLinks } from '../api';
import { fetchRelationships } from './accounts';
import { importFetchedAccounts } from './importer';
import { openModal } from 'flavours/glitch/actions/modal';

2
app/javascript/flavours/glitch/actions/notifications.js
View File

@ -1,4 +1,4 @@
import api, { getLinks } from 'flavours/glitch/util/api';
import api, { getLinks } from '../api';
import IntlMessageFormat from 'intl-messageformat';
import { fetchFollowRequests, fetchRelationships } from './accounts';
import {

2
app/javascript/flavours/glitch/actions/pin_statuses.js
View File

@ -1,4 +1,4 @@
import api from 'flavours/glitch/util/api';
import api from '../api';
import { importFetchedStatuses } from './importer';
export const PINNED_STATUSES_FETCH_REQUEST = 'PINNED_STATUSES_FETCH_REQUEST';

2
app/javascript/flavours/glitch/actions/polls.js
View File

@ -1,4 +1,4 @@
import api from 'flavours/glitch/util/api';
import api from '../api';
import { importFetchedPoll } from './importer';
export const POLL_VOTE_REQUEST = 'POLL_VOTE_REQUEST';

2
app/javascript/flavours/glitch/actions/push_notifications/registerer.js
View File

@ -1,4 +1,4 @@
import api from 'flavours/glitch/util/api';
import api from '../../api';
import { pushNotificationsSetting } from 'flavours/glitch/util/settings';
import { setBrowserSupport, setSubscription, clearSubscription } from './setter';

2
app/javascript/flavours/glitch/actions/reports.js
View File

@ -1,4 +1,4 @@
import api from 'flavours/glitch/util/api';
import api from '../api';
import { openModal } from './modal';
export const REPORT_SUBMIT_REQUEST = 'REPORT_SUBMIT_REQUEST';

2
app/javascript/flavours/glitch/actions/search.js
View File

@ -1,4 +1,4 @@
import api from 'flavours/glitch/util/api';
import api from '../api';
import { fetchRelationships } from './accounts';
import { importFetchedAccounts, importFetchedStatuses } from './importer';

2
app/javascript/flavours/glitch/actions/server.js
View File

@ -1,4 +1,4 @@
import api from 'flavours/glitch/util/api';
import api from '../api';
import { importFetchedAccount } from './importer';
export const SERVER_FETCH_REQUEST = 'Server_FETCH_REQUEST';

2
app/javascript/flavours/glitch/actions/settings.js
View File

@ -1,4 +1,4 @@
import api from 'flavours/glitch/util/api';
import api from '../api';
import { debounce } from 'lodash';
import { showAlertForError } from './alerts';

2
app/javascript/flavours/glitch/actions/statuses.js
View File

@ -1,4 +1,4 @@
import api from 'flavours/glitch/util/api';
import api from '../api';
import { deleteFromTimelines } from './timelines';
import { importFetchedStatus, importFetchedStatuses } from './importer';

2
app/javascript/flavours/glitch/actions/suggestions.js
View File

@ -1,4 +1,4 @@
import api from 'flavours/glitch/util/api';
import api from '../api';
import { importFetchedAccounts } from './importer';
import { fetchRelationships } from './accounts';

2
app/javascript/flavours/glitch/actions/tags.js
View File

@ -1,4 +1,4 @@
import api from 'flavours/glitch/util/api';
import api from '../api';
export const HASHTAG_FETCH_REQUEST = 'HASHTAG_FETCH_REQUEST';
export const HASHTAG_FETCH_SUCCESS = 'HASHTAG_FETCH_SUCCESS';

2
app/javascript/flavours/glitch/actions/timelines.js
View File

@ -1,6 +1,6 @@
import { importFetchedStatus, importFetchedStatuses } from './importer';
import { submitMarkers } from './markers';
import api, { getLinks } from 'flavours/glitch/util/api';
import api, { getLinks } from 'flavours/glitch/api';
import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
import compareId from 'flavours/glitch/util/compare_id';
import { me, usePendingItems as preferPendingItems } from 'flavours/glitch/initial_state';

2
app/javascript/flavours/glitch/actions/trends.js
View File

@ -1,4 +1,4 @@
import api, { getLinks } from 'flavours/glitch/util/api';
import api, { getLinks } from '../api';
import { importFetchedStatuses } from './importer';
export const TRENDS_TAGS_FETCH_REQUEST = 'TRENDS_TAGS_FETCH_REQUEST';

0
app/javascript/flavours/glitch/util/api.js → app/javascript/flavours/glitch/api.js
View File

2
app/javascript/flavours/glitch/components/admin/Counter.js
View File

@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import api from 'flavours/glitch/util/api';
import api from 'flavours/glitch/api';
import { FormattedNumber } from 'react-intl';
import { Sparklines, SparklinesCurve } from 'react-sparklines';
import classNames from 'classnames';

2
app/javascript/flavours/glitch/components/admin/Dimension.js
View File

@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import api from 'flavours/glitch/util/api';
import api from 'flavours/glitch/api';
import { FormattedNumber } from 'react-intl';
import { roundTo10 } from 'flavours/glitch/util/numbers';
import Skeleton from 'flavours/glitch/components/skeleton';

2
app/javascript/flavours/glitch/components/admin/ReportReasonSelector.js
View File

@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import api from 'flavours/glitch/util/api';
import api from 'flavours/glitch/api';
import { injectIntl, defineMessages } from 'react-intl';
import classNames from 'classnames';

2
app/javascript/flavours/glitch/components/admin/Retention.js
View File

@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import api from 'flavours/glitch/util/api';
import api from 'flavours/glitch/api';
import { FormattedMessage, FormattedNumber, FormattedDate } from 'react-intl';
import classNames from 'classnames';
import { roundTo10 } from 'flavours/glitch/util/numbers';

2
app/javascript/flavours/glitch/components/admin/Trends.js
View File

@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import api from 'flavours/glitch/util/api';
import api from 'flavours/glitch/api';
import { FormattedMessage } from 'react-intl';
import classNames from 'classnames';
import Hashtag from 'flavours/glitch/components/hashtag';

2
app/javascript/flavours/glitch/features/hashtag_timeline/containers/column_settings_container.js
View File

@ -1,7 +1,7 @@
import { connect } from 'react-redux';
import ColumnSettings from '../components/column_settings';
import { changeColumnParams } from 'flavours/glitch/actions/columns';
import api from 'flavours/glitch/util/api';
import api from 'flavours/glitch/api';
const mapStateToProps = (state, { columnId }) => {
const columns = state.getIn(['settings', 'columns']);

2
app/javascript/flavours/glitch/features/ui/components/embed_modal.js
View File

@ -2,7 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
import api from 'flavours/glitch/util/api';
import api from 'flavours/glitch/api';
import IconButton from 'flavours/glitch/components/icon_button';
const messages = defineMessages({