random-mirrors/gab-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updating files after merge

Browse Source
This commit is contained in:
mgabdev
2020-01-29 11:45:17 -05:00
parent 8c9cac2beb
commit 2bd01457a6
48 changed files with 106 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/gabsocial/actions/blocks.js
View File

@@ -1,7 +1,7 @@
import api, { getLinks } from '../api';
import { fetchRelationships } from './accounts';
import { importFetchedAccounts } from './importer';
import { me } from 'gabsocial/initial_state';
import { me } from '../initial_state';
export const BLOCKS_FETCH_REQUEST = 'BLOCKS_FETCH_REQUEST';
export const BLOCKS_FETCH_SUCCESS = 'BLOCKS_FETCH_SUCCESS';

2
app/javascript/gabsocial/actions/compose.js
View File

@@ -12,7 +12,7 @@ import { showAlertForError } from './alerts';
import { showAlert } from './alerts';
import { defineMessages } from 'react-intl';
import { openModal, closeModal } from './modal';
import { me } from 'gabsocial/initial_state';
import { me } from '../initial_state';
let cancelFetchComposeSuggestionsAccounts;

2
app/javascript/gabsocial/actions/conversations.js
View File

@@ -4,7 +4,7 @@ import {
importFetchedStatuses,
importFetchedStatus,
} from './importer';
import { me } from 'gabsocial/initial_state';
import { me } from '../initial_state';
export const CONVERSATIONS_MOUNT = 'CONVERSATIONS_MOUNT';
export const CONVERSATIONS_UNMOUNT = 'CONVERSATIONS_UNMOUNT';

2
app/javascript/gabsocial/actions/domain_blocks.js
View File

@@ -1,5 +1,5 @@
import api, { getLinks } from '../api';
import { me } from 'gabsocial/initial_state';
import { me } from '../initial_state';
export const DOMAIN_BLOCK_REQUEST = 'DOMAIN_BLOCK_REQUEST';
export const DOMAIN_BLOCK_SUCCESS = 'DOMAIN_BLOCK_SUCCESS';

2
app/javascript/gabsocial/actions/favourites.js
View File

@@ -1,6 +1,6 @@
import api, { getLinks } from '../api';
import { importFetchedStatuses } from './importer';
import { me } from 'gabsocial/initial_state';
import { me } from '../initial_state';
export const FAVOURITED_STATUSES_FETCH_REQUEST = 'FAVOURITED_STATUSES_FETCH_REQUEST';
export const FAVOURITED_STATUSES_FETCH_SUCCESS = 'FAVOURITED_STATUSES_FETCH_SUCCESS';

2
app/javascript/gabsocial/actions/filters.js
View File

@@ -1,5 +1,5 @@
import api from '../api';
import { me } from 'gabsocial/initial_state';
import { me } from '../initial_state';
export const FILTERS_FETCH_REQUEST = 'FILTERS_FETCH_REQUEST';
export const FILTERS_FETCH_SUCCESS = 'FILTERS_FETCH_SUCCESS';

2
app/javascript/gabsocial/actions/group_editor.js
View File

@@ -1,5 +1,5 @@
import api from '../api';
import { me } from 'gabsocial/initial_state';
import { me } from '../initial_state';
export const GROUP_CREATE_REQUEST = 'GROUP_CREATE_REQUEST';
export const GROUP_CREATE_SUCCESS = 'GROUP_CREATE_SUCCESS';

2
app/javascript/gabsocial/actions/groups.js
View File

@@ -1,5 +1,5 @@
import api, { getLinks } from '../api';
import { me } from 'gabsocial/initial_state';
import { me } from '../initial_state';
import { importFetchedAccounts } from './importer';
import { fetchRelationships } from './accounts';

2
app/javascript/gabsocial/actions/interactions.js
View File

@@ -1,6 +1,6 @@
import api from '../api';
import { importFetchedAccounts, importFetchedStatus } from './importer';
import { me } from 'gabsocial/initial_state';
import { me } from '../initial_state';
export const REBLOG_REQUEST = 'REBLOG_REQUEST';
export const REBLOG_SUCCESS = 'REBLOG_SUCCESS';

2
app/javascript/gabsocial/actions/lists.js
View File

@@ -1,7 +1,7 @@
import api from '../api';
import { importFetchedAccounts } from './importer';
import { showAlertForError } from './alerts';
import { me } from 'gabsocial/initial_state'
import { me } from '../initial_state'
export const LIST_FETCH_REQUEST = 'LIST_FETCH_REQUEST';
export const LIST_FETCH_SUCCESS = 'LIST_FETCH_SUCCESS';

2
app/javascript/gabsocial/actions/notifications.js
View File

@@ -12,7 +12,7 @@ import { defineMessages } from 'react-intl';
import { List as ImmutableList } from 'immutable';
import { unescapeHTML } from '../utils/html';
import { getFilters, regexFromFilters } from '../selectors';
import { me } from 'gabsocial/initial_state';
import { me } from '../initial_state';
export const NOTIFICATIONS_INITIALIZE = 'NOTIFICATIONS_INITIALIZE';
export const NOTIFICATIONS_UPDATE = 'NOTIFICATIONS_UPDATE';

2
app/javascript/gabsocial/actions/pin_statuses.js
View File

@@ -1,6 +1,6 @@
import api from '../api';
import { importFetchedStatuses } from './importer';
import { me } from 'gabsocial/initial_state';
import { me } from '../initial_state';
export const PINNED_STATUSES_FETCH_REQUEST = 'PINNED_STATUSES_FETCH_REQUEST';
export const PINNED_STATUSES_FETCH_SUCCESS = 'PINNED_STATUSES_FETCH_SUCCESS';

2
app/javascript/gabsocial/actions/settings.js
View File

@@ -1,7 +1,7 @@
import api from '../api';
import { debounce } from 'lodash';
import { showAlertForError } from './alerts';
import { me } from 'gabsocial/initial_state';
import { me } from '../initial_state';
export const SETTING_CHANGE = 'SETTING_CHANGE';
export const SETTING_SAVE = 'SETTING_SAVE';

2
app/javascript/gabsocial/actions/statuses.js
View File

@@ -4,7 +4,7 @@ import { evictStatus } from '../storage/modifier';
import { deleteFromTimelines } from './timelines';
import { importFetchedStatus, importFetchedStatuses, importAccount, importStatus } from './importer';
import { openModal } from './modal';
import { me } from 'gabsocial/initial_state';
import { me } from '../initial_state';
export const STATUS_FETCH_REQUEST = 'STATUS_FETCH_REQUEST';
export const STATUS_FETCH_SUCCESS = 'STATUS_FETCH_SUCCESS';