mirror_maker
/
soapbox
mirror of https://gitlab.com/soapbox-pub/soapbox
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Refactor loggedin check

Browse Source
merge-requests/451/head
Alex Gleason 4 years ago
parent a731ac88cf
commit 9cd06a15d5
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
16 changed files with 88 additions and 71 deletions
Show Stats Download Patch File Download Diff File

35
app/soapbox/actions/accounts.js
Unescape View File

@ -6,6 +6,7 @@ import {
importFetchedAccounts, importFetchedAccounts,
importErrorWhileFetchingAccountByUsername, importErrorWhileFetchingAccountByUsername,
} from './importer'; } from './importer';
import { isLoggedIn } from 'soapbox/utils/accounts';
export const ACCOUNT_FETCH_REQUEST = 'ACCOUNT_FETCH_REQUEST'; export const ACCOUNT_FETCH_REQUEST = 'ACCOUNT_FETCH_REQUEST';
export const ACCOUNT_FETCH_SUCCESS = 'ACCOUNT_FETCH_SUCCESS'; export const ACCOUNT_FETCH_SUCCESS = 'ACCOUNT_FETCH_SUCCESS';
@ -162,7 +163,7 @@ export function fetchAccountFail(id, error) {
export function followAccount(id, reblogs = true) { export function followAccount(id, reblogs = true) {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
const alreadyFollowing = getState().getIn(['relationships', id, 'following']); const alreadyFollowing = getState().getIn(['relationships', id, 'following']);
const locked = getState().getIn(['accounts', id, 'locked'], false); const locked = getState().getIn(['accounts', id, 'locked'], false);
@ -179,7 +180,7 @@ export function followAccount(id, reblogs = true) {
export function unfollowAccount(id) { export function unfollowAccount(id) {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(unfollowAccountRequest(id)); dispatch(unfollowAccountRequest(id));
@ -245,7 +246,7 @@ export function unfollowAccountFail(error) {
export function blockAccount(id) { export function blockAccount(id) {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(blockAccountRequest(id)); dispatch(blockAccountRequest(id));
@ -260,7 +261,7 @@ export function blockAccount(id) {
export function unblockAccount(id) { export function unblockAccount(id) {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(unblockAccountRequest(id)); dispatch(unblockAccountRequest(id));
@ -318,7 +319,7 @@ export function unblockAccountFail(error) {
export function muteAccount(id, notifications) { export function muteAccount(id, notifications) {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(muteAccountRequest(id)); dispatch(muteAccountRequest(id));
@ -333,7 +334,7 @@ export function muteAccount(id, notifications) {
export function unmuteAccount(id) { export function unmuteAccount(id) {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(unmuteAccountRequest(id)); dispatch(unmuteAccountRequest(id));
@ -391,7 +392,7 @@ export function unmuteAccountFail(error) {
export function fetchFollowers(id) { export function fetchFollowers(id) {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(fetchFollowersRequest(id)); dispatch(fetchFollowersRequest(id));
@ -433,7 +434,7 @@ export function fetchFollowersFail(id, error) {
export function expandFollowers(id) { export function expandFollowers(id) {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
const url = getState().getIn(['user_lists', 'followers', id, 'next']); const url = getState().getIn(['user_lists', 'followers', id, 'next']);
@ -481,7 +482,7 @@ export function expandFollowersFail(id, error) {
export function fetchFollowing(id) { export function fetchFollowing(id) {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(fetchFollowingRequest(id)); dispatch(fetchFollowingRequest(id));
@ -523,7 +524,7 @@ export function fetchFollowingFail(id, error) {
export function expandFollowing(id) { export function expandFollowing(id) {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
const url = getState().getIn(['user_lists', 'following', id, 'next']); const url = getState().getIn(['user_lists', 'following', id, 'next']);
@ -571,7 +572,7 @@ export function expandFollowingFail(id, error) {
export function fetchRelationships(accountIds) { export function fetchRelationships(accountIds) {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
const loadedRelationships = getState().get('relationships'); const loadedRelationships = getState().get('relationships');
const newAccountIds = accountIds.filter(id => loadedRelationships.get(id, null) === null); const newAccountIds = accountIds.filter(id => loadedRelationships.get(id, null) === null);
@ -616,7 +617,7 @@ export function fetchRelationshipsFail(error) {
export function fetchFollowRequests() { export function fetchFollowRequests() {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(fetchFollowRequestsRequest()); dispatch(fetchFollowRequestsRequest());
@ -651,7 +652,7 @@ export function fetchFollowRequestsFail(error) {
export function expandFollowRequests() { export function expandFollowRequests() {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
const url = getState().getIn(['user_lists', 'follow_requests', 'next']); const url = getState().getIn(['user_lists', 'follow_requests', 'next']);
@ -692,7 +693,7 @@ export function expandFollowRequestsFail(error) {
export function authorizeFollowRequest(id) { export function authorizeFollowRequest(id) {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(authorizeFollowRequestRequest(id)); dispatch(authorizeFollowRequestRequest(id));
@ -728,7 +729,7 @@ export function authorizeFollowRequestFail(id, error) {
export function rejectFollowRequest(id) { export function rejectFollowRequest(id) {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(rejectFollowRequestRequest(id)); dispatch(rejectFollowRequestRequest(id));
@ -763,7 +764,7 @@ export function rejectFollowRequestFail(id, error) {
export function pinAccount(id) { export function pinAccount(id) {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(pinAccountRequest(id)); dispatch(pinAccountRequest(id));
@ -777,7 +778,7 @@ export function pinAccount(id) {
export function unpinAccount(id) { export function unpinAccount(id) {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(unpinAccountRequest(id)); dispatch(unpinAccountRequest(id));

5
app/soapbox/actions/blocks.js
Unescape View File

@ -1,6 +1,7 @@
import api, { getLinks } from '../api'; import api, { getLinks } from '../api';
import { fetchRelationships } from './accounts'; import { fetchRelationships } from './accounts';
import { importFetchedAccounts } from './importer'; import { importFetchedAccounts } from './importer';
import { isLoggedIn } from 'soapbox/utils/accounts';
export const BLOCKS_FETCH_REQUEST = 'BLOCKS_FETCH_REQUEST'; export const BLOCKS_FETCH_REQUEST = 'BLOCKS_FETCH_REQUEST';
export const BLOCKS_FETCH_SUCCESS = 'BLOCKS_FETCH_SUCCESS'; export const BLOCKS_FETCH_SUCCESS = 'BLOCKS_FETCH_SUCCESS';
@ -12,7 +13,7 @@ export const BLOCKS_EXPAND_FAIL = 'BLOCKS_EXPAND_FAIL';
export function fetchBlocks() { export function fetchBlocks() {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(fetchBlocksRequest()); dispatch(fetchBlocksRequest());
@ -48,7 +49,7 @@ export function fetchBlocksFail(error) {
export function expandBlocks() { export function expandBlocks() {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
const url = getState().getIn(['user_lists', 'blocks', 'next']); const url = getState().getIn(['user_lists', 'blocks', 'next']);

7
app/soapbox/actions/compose.js
Unescape View File

@ -13,6 +13,7 @@ import { openModal, closeModal } from './modal';
import { getSettings } from './settings'; import { getSettings } from './settings';
import { getFeatures } from 'soapbox/utils/features'; import { getFeatures } from 'soapbox/utils/features';
import { uploadMedia } from './media'; import { uploadMedia } from './media';
import { isLoggedIn } from 'soapbox/utils/accounts';
let cancelFetchComposeSuggestionsAccounts; let cancelFetchComposeSuggestionsAccounts;
@ -157,7 +158,7 @@ export function handleComposeSubmit(dispatch, getState, response, status) {
export function submitCompose(routerHistory, group) { export function submitCompose(routerHistory, group) {
return function(dispatch, getState) { return function(dispatch, getState) {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
const status = getState().getIn(['compose', 'text'], ''); const status = getState().getIn(['compose', 'text'], '');
const media = getState().getIn(['compose', 'media_attachments']); const media = getState().getIn(['compose', 'media_attachments']);
@ -216,7 +217,7 @@ export function submitComposeFail(error) {
export function uploadCompose(files) { export function uploadCompose(files) {
return function(dispatch, getState) { return function(dispatch, getState) {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
const uploadLimit = getFeatures(getState().get('instance')).attachmentLimit; const uploadLimit = getFeatures(getState().get('instance')).attachmentLimit;
const media = getState().getIn(['compose', 'media_attachments']); const media = getState().getIn(['compose', 'media_attachments']);
@ -254,7 +255,7 @@ export function uploadCompose(files) {
export function changeUploadCompose(id, params) { export function changeUploadCompose(id, params) {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(changeUploadComposeRequest()); dispatch(changeUploadComposeRequest());

5
app/soapbox/actions/conversations.js
Unescape View File

@ -4,6 +4,7 @@ import {
importFetchedStatuses, importFetchedStatuses,
importFetchedStatus, importFetchedStatus,
} from './importer'; } from './importer';
import { isLoggedIn } from 'soapbox/utils/accounts';
export const CONVERSATIONS_MOUNT = 'CONVERSATIONS_MOUNT'; export const CONVERSATIONS_MOUNT = 'CONVERSATIONS_MOUNT';
export const CONVERSATIONS_UNMOUNT = 'CONVERSATIONS_UNMOUNT'; export const CONVERSATIONS_UNMOUNT = 'CONVERSATIONS_UNMOUNT';
@ -24,7 +25,7 @@ export const unmountConversations = () => ({
}); });
export const markConversationRead = conversationId => (dispatch, getState) => { export const markConversationRead = conversationId => (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch({ dispatch({
type: CONVERSATIONS_READ, type: CONVERSATIONS_READ,
@ -35,7 +36,7 @@ export const markConversationRead = conversationId => (dispatch, getState) => {
}; };
export const expandConversations = ({ maxId } = {}) => (dispatch, getState) => { export const expandConversations = ({ maxId } = {}) => (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(expandConversationsRequest()); dispatch(expandConversationsRequest());

9
app/soapbox/actions/domain_blocks.js
Unescape View File

@ -1,4 +1,5 @@
import api, { getLinks } from '../api'; import api, { getLinks } from '../api';
import { isLoggedIn } from 'soapbox/utils/accounts';
export const DOMAIN_BLOCK_REQUEST = 'DOMAIN_BLOCK_REQUEST'; export const DOMAIN_BLOCK_REQUEST = 'DOMAIN_BLOCK_REQUEST';
export const DOMAIN_BLOCK_SUCCESS = 'DOMAIN_BLOCK_SUCCESS'; export const DOMAIN_BLOCK_SUCCESS = 'DOMAIN_BLOCK_SUCCESS';
@ -18,7 +19,7 @@ export const DOMAIN_BLOCKS_EXPAND_FAIL = 'DOMAIN_BLOCKS_EXPAND_FAIL';
export function blockDomain(domain) { export function blockDomain(domain) {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(blockDomainRequest(domain)); dispatch(blockDomainRequest(domain));
@ -57,7 +58,7 @@ export function blockDomainFail(domain, error) {
export function unblockDomain(domain) { export function unblockDomain(domain) {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(unblockDomainRequest(domain)); dispatch(unblockDomainRequest(domain));
@ -102,7 +103,7 @@ export function unblockDomainFail(domain, error) {
export function fetchDomainBlocks() { export function fetchDomainBlocks() {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(fetchDomainBlocksRequest()); dispatch(fetchDomainBlocksRequest());
@ -138,7 +139,7 @@ export function fetchDomainBlocksFail(error) {
export function expandDomainBlocks() { export function expandDomainBlocks() {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
const url = getState().getIn(['domain_lists', 'blocks', 'next']); const url = getState().getIn(['domain_lists', 'blocks', 'next']);

5
app/soapbox/actions/favourites.js
Unescape View File

@ -1,5 +1,6 @@
import api, { getLinks } from '../api'; import api, { getLinks } from '../api';
import { importFetchedStatuses } from './importer'; import { importFetchedStatuses } from './importer';
import { isLoggedIn } from 'soapbox/utils/accounts';
export const FAVOURITED_STATUSES_FETCH_REQUEST = 'FAVOURITED_STATUSES_FETCH_REQUEST'; export const FAVOURITED_STATUSES_FETCH_REQUEST = 'FAVOURITED_STATUSES_FETCH_REQUEST';
export const FAVOURITED_STATUSES_FETCH_SUCCESS = 'FAVOURITED_STATUSES_FETCH_SUCCESS'; export const FAVOURITED_STATUSES_FETCH_SUCCESS = 'FAVOURITED_STATUSES_FETCH_SUCCESS';
@ -11,7 +12,7 @@ export const FAVOURITED_STATUSES_EXPAND_FAIL = 'FAVOURITED_STATUSES_EXPAND_FA
export function fetchFavouritedStatuses() { export function fetchFavouritedStatuses() {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
if (getState().getIn(['status_lists', 'favourites', 'isLoading'])) { if (getState().getIn(['status_lists', 'favourites', 'isLoading'])) {
return; return;
@ -55,7 +56,7 @@ export function fetchFavouritedStatusesFail(error) {
export function expandFavouritedStatuses() { export function expandFavouritedStatuses() {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
const url = getState().getIn(['status_lists', 'favourites', 'next'], null); const url = getState().getIn(['status_lists', 'favourites', 'next'], null);

3
app/soapbox/actions/filters.js
Unescape View File

@ -1,5 +1,6 @@
import api from '../api'; import api from '../api';
import snackbar from 'soapbox/actions/snackbar'; import snackbar from 'soapbox/actions/snackbar';
import { isLoggedIn } from 'soapbox/utils/accounts';
export const FILTERS_FETCH_REQUEST = 'FILTERS_FETCH_REQUEST'; export const FILTERS_FETCH_REQUEST = 'FILTERS_FETCH_REQUEST';
export const FILTERS_FETCH_SUCCESS = 'FILTERS_FETCH_SUCCESS'; export const FILTERS_FETCH_SUCCESS = 'FILTERS_FETCH_SUCCESS';
@ -14,7 +15,7 @@ export const FILTERS_DELETE_SUCCESS = 'FILTERS_DELETE_SUCCESS';
export const FILTERS_DELETE_FAIL = 'FILTERS_DELETE_FAIL'; export const FILTERS_DELETE_FAIL = 'FILTERS_DELETE_FAIL';
export const fetchFilters = () => (dispatch, getState) => { export const fetchFilters = () => (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch({ dispatch({
type: FILTERS_FETCH_REQUEST, type: FILTERS_FETCH_REQUEST,

5
app/soapbox/actions/group_editor.js
Unescape View File

@ -1,4 +1,5 @@
import api from '../api'; import api from '../api';
import { isLoggedIn } from 'soapbox/utils/accounts';
export const GROUP_CREATE_REQUEST = 'GROUP_CREATE_REQUEST'; export const GROUP_CREATE_REQUEST = 'GROUP_CREATE_REQUEST';
export const GROUP_CREATE_SUCCESS = 'GROUP_CREATE_SUCCESS'; export const GROUP_CREATE_SUCCESS = 'GROUP_CREATE_SUCCESS';
@ -27,7 +28,7 @@ export const submit = (routerHistory) => (dispatch, getState) => {
export const create = (title, description, coverImage, routerHistory) => (dispatch, getState) => { export const create = (title, description, coverImage, routerHistory) => (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(createRequest()); dispatch(createRequest());
@ -62,7 +63,7 @@ export const createFail = error => ({
}); });
export const update = (groupId, title, description, coverImage, routerHistory) => (dispatch, getState) => { export const update = (groupId, title, description, coverImage, routerHistory) => (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(updateRequest()); dispatch(updateRequest());

25
app/soapbox/actions/groups.js
Unescape View File

@ -1,6 +1,7 @@
import api, { getLinks } from '../api'; import api, { getLinks } from '../api';
import { importFetchedAccounts } from './importer'; import { importFetchedAccounts } from './importer';
import { fetchRelationships } from './accounts'; import { fetchRelationships } from './accounts';
import { isLoggedIn } from 'soapbox/utils/accounts';
export const GROUP_FETCH_REQUEST = 'GROUP_FETCH_REQUEST'; export const GROUP_FETCH_REQUEST = 'GROUP_FETCH_REQUEST';
export const GROUP_FETCH_SUCCESS = 'GROUP_FETCH_SUCCESS'; export const GROUP_FETCH_SUCCESS = 'GROUP_FETCH_SUCCESS';
@ -51,7 +52,7 @@ export const GROUP_REMOVE_STATUS_SUCCESS = 'GROUP_REMOVE_STATUS_SUCCESS';
export const GROUP_REMOVE_STATUS_FAIL = 'GROUP_REMOVE_STATUS_FAIL'; export const GROUP_REMOVE_STATUS_FAIL = 'GROUP_REMOVE_STATUS_FAIL';
export const fetchGroup = id => (dispatch, getState) => { export const fetchGroup = id => (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(fetchGroupRelationships([id])); dispatch(fetchGroupRelationships([id]));
@ -84,7 +85,7 @@ export const fetchGroupFail = (id, error) => ({
export function fetchGroupRelationships(groupIds) { export function fetchGroupRelationships(groupIds) {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
const loadedRelationships = getState().get('group_relationships'); const loadedRelationships = getState().get('group_relationships');
const newGroupIds = groupIds.filter(id => loadedRelationships.get(id, null) === null); const newGroupIds = groupIds.filter(id => loadedRelationships.get(id, null) === null);
@ -128,7 +129,7 @@ export function fetchGroupRelationshipsFail(error) {
}; };
export const fetchGroups = (tab) => (dispatch, getState) => { export const fetchGroups = (tab) => (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(fetchGroupsRequest()); dispatch(fetchGroupsRequest());
@ -157,7 +158,7 @@ export const fetchGroupsFail = error => ({
export function joinGroup(id) { export function joinGroup(id) {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(joinGroupRequest(id)); dispatch(joinGroupRequest(id));
@ -171,7 +172,7 @@ export function joinGroup(id) {
export function leaveGroup(id) { export function leaveGroup(id) {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(leaveGroupRequest(id)); dispatch(leaveGroupRequest(id));
@ -227,7 +228,7 @@ export function leaveGroupFail(error) {
export function fetchMembers(id) { export function fetchMembers(id) {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(fetchMembersRequest(id)); dispatch(fetchMembersRequest(id));
@ -269,7 +270,7 @@ export function fetchMembersFail(id, error) {
export function expandMembers(id) { export function expandMembers(id) {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
const url = getState().getIn(['user_lists', 'groups', id, 'next']); const url = getState().getIn(['user_lists', 'groups', id, 'next']);
@ -317,7 +318,7 @@ export function expandMembersFail(id, error) {
export function fetchRemovedAccounts(id) { export function fetchRemovedAccounts(id) {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(fetchRemovedAccountsRequest(id)); dispatch(fetchRemovedAccountsRequest(id));
@ -359,7 +360,7 @@ export function fetchRemovedAccountsFail(id, error) {
export function expandRemovedAccounts(id) { export function expandRemovedAccounts(id) {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
const url = getState().getIn(['user_lists', 'groups_removed_accounts', id, 'next']); const url = getState().getIn(['user_lists', 'groups_removed_accounts', id, 'next']);
@ -407,7 +408,7 @@ export function expandRemovedAccountsFail(id, error) {
export function removeRemovedAccount(groupId, id) { export function removeRemovedAccount(groupId, id) {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(removeRemovedAccountRequest(groupId, id)); dispatch(removeRemovedAccountRequest(groupId, id));
@ -446,7 +447,7 @@ export function removeRemovedAccountFail(groupId, id, error) {
export function createRemovedAccount(groupId, id) { export function createRemovedAccount(groupId, id) {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(createRemovedAccountRequest(groupId, id)); dispatch(createRemovedAccountRequest(groupId, id));
@ -485,7 +486,7 @@ export function createRemovedAccountFail(groupId, id, error) {
export function groupRemoveStatus(groupId, id) { export function groupRemoveStatus(groupId, id) {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(groupRemoveStatusRequest(groupId, id)); dispatch(groupRemoveStatusRequest(groupId, id));

17
app/soapbox/actions/interactions.js
Unescape View File

@ -1,6 +1,7 @@
import api from '../api'; import api from '../api';
import { importFetchedAccounts, importFetchedStatus } from './importer'; import { importFetchedAccounts, importFetchedStatus } from './importer';
import snackbar from 'soapbox/actions/snackbar'; import snackbar from 'soapbox/actions/snackbar';
import { isLoggedIn } from 'soapbox/utils/accounts';
export const REBLOG_REQUEST = 'REBLOG_REQUEST'; export const REBLOG_REQUEST = 'REBLOG_REQUEST';
export const REBLOG_SUCCESS = 'REBLOG_SUCCESS'; export const REBLOG_SUCCESS = 'REBLOG_SUCCESS';
@ -44,7 +45,7 @@ export const UNBOOKMARK_FAIL = 'UNBOOKMARKED_FAIL';
export function reblog(status) { export function reblog(status) {
return function(dispatch, getState) { return function(dispatch, getState) {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(reblogRequest(status)); dispatch(reblogRequest(status));
@ -61,7 +62,7 @@ export function reblog(status) {
export function unreblog(status) { export function unreblog(status) {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(unreblogRequest(status)); dispatch(unreblogRequest(status));
@ -126,7 +127,7 @@ export function unreblogFail(status, error) {
export function favourite(status) { export function favourite(status) {
return function(dispatch, getState) { return function(dispatch, getState) {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(favouriteRequest(status)); dispatch(favouriteRequest(status));
@ -141,7 +142,7 @@ export function favourite(status) {
export function unfavourite(status) { export function unfavourite(status) {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(unfavouriteRequest(status)); dispatch(unfavouriteRequest(status));
@ -280,7 +281,7 @@ export function unbookmarkFail(status, error) {
export function fetchReblogs(id) { export function fetchReblogs(id) {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(fetchReblogsRequest(id)); dispatch(fetchReblogsRequest(id));
@ -317,7 +318,7 @@ export function fetchReblogsFail(id, error) {
export function fetchFavourites(id) { export function fetchFavourites(id) {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(fetchFavouritesRequest(id)); dispatch(fetchFavouritesRequest(id));
@ -354,7 +355,7 @@ export function fetchFavouritesFail(id, error) {
export function pin(status) { export function pin(status) {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(pinRequest(status)); dispatch(pinRequest(status));
@ -394,7 +395,7 @@ export function pinFail(status, error) {
export function unpin(status) { export function unpin(status) {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(unpinRequest(status)); dispatch(unpinRequest(status));

21
app/soapbox/actions/lists.js
Unescape View File

@ -1,6 +1,7 @@
import api from '../api'; import api from '../api';
import { importFetchedAccounts } from './importer'; import { importFetchedAccounts } from './importer';
import { showAlertForError } from './alerts'; import { showAlertForError } from './alerts';
import { isLoggedIn } from 'soapbox/utils/accounts';
export const LIST_FETCH_REQUEST = 'LIST_FETCH_REQUEST'; export const LIST_FETCH_REQUEST = 'LIST_FETCH_REQUEST';
export const LIST_FETCH_SUCCESS = 'LIST_FETCH_SUCCESS'; export const LIST_FETCH_SUCCESS = 'LIST_FETCH_SUCCESS';
@ -50,7 +51,7 @@ export const LIST_ADDER_LISTS_FETCH_SUCCESS = 'LIST_ADDER_LISTS_FETCH_SUCCESS';
export const LIST_ADDER_LISTS_FETCH_FAIL = 'LIST_ADDER_LISTS_FETCH_FAIL'; export const LIST_ADDER_LISTS_FETCH_FAIL = 'LIST_ADDER_LISTS_FETCH_FAIL';
export const fetchList = id => (dispatch, getState) => { export const fetchList = id => (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
if (getState().getIn(['lists', id])) { if (getState().getIn(['lists', id])) {
return; return;
@ -80,7 +81,7 @@ export const fetchListFail = (id, error) => ({
}); });
export const fetchLists = () => (dispatch, getState) => { export const fetchLists = () => (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(fetchListsRequest()); dispatch(fetchListsRequest());
@ -129,7 +130,7 @@ export const changeListEditorTitle = value => ({
}); });
export const createList = (title, shouldReset) => (dispatch, getState) => { export const createList = (title, shouldReset) => (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(createListRequest()); dispatch(createListRequest());
@ -157,7 +158,7 @@ export const createListFail = error => ({
}); });
export const updateList = (id, title, shouldReset) => (dispatch, getState) => { export const updateList = (id, title, shouldReset) => (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(updateListRequest(id)); dispatch(updateListRequest(id));
@ -191,7 +192,7 @@ export const resetListEditor = () => ({
}); });
export const deleteList = id => (dispatch, getState) => { export const deleteList = id => (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(deleteListRequest(id)); dispatch(deleteListRequest(id));
@ -217,7 +218,7 @@ export const deleteListFail = (id, error) => ({
}); });
export const fetchListAccounts = listId => (dispatch, getState) => { export const fetchListAccounts = listId => (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(fetchListAccountsRequest(listId)); dispatch(fetchListAccountsRequest(listId));
@ -246,7 +247,7 @@ export const fetchListAccountsFail = (id, error) => ({
}); });
export const fetchListSuggestions = q => (dispatch, getState) => { export const fetchListSuggestions = q => (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
const params = { const params = {
q, q,
@ -281,7 +282,7 @@ export const addToListEditor = accountId => (dispatch, getState) => {
}; };
export const addToList = (listId, accountId) => (dispatch, getState) => { export const addToList = (listId, accountId) => (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(addToListRequest(listId, accountId)); dispatch(addToListRequest(listId, accountId));
@ -314,7 +315,7 @@ export const removeFromListEditor = accountId => (dispatch, getState) => {
}; };
export const removeFromList = (listId, accountId) => (dispatch, getState) => { export const removeFromList = (listId, accountId) => (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(removeFromListRequest(listId, accountId)); dispatch(removeFromListRequest(listId, accountId));
@ -356,7 +357,7 @@ export const setupListAdder = accountId => (dispatch, getState) => {
}; };
export const fetchAccountLists = accountId => (dispatch, getState) => { export const fetchAccountLists = accountId => (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(fetchAccountListsRequest(accountId)); dispatch(fetchAccountListsRequest(accountId));

5
app/soapbox/actions/mutes.js
Unescape View File

@ -2,6 +2,7 @@ import api, { getLinks } from '../api';
import { fetchRelationships } from './accounts'; import { fetchRelationships } from './accounts';
import { importFetchedAccounts } from './importer'; import { importFetchedAccounts } from './importer';
import { openModal } from './modal'; import { openModal } from './modal';
import { isLoggedIn } from 'soapbox/utils/accounts';
export const MUTES_FETCH_REQUEST = 'MUTES_FETCH_REQUEST'; export const MUTES_FETCH_REQUEST = 'MUTES_FETCH_REQUEST';
export const MUTES_FETCH_SUCCESS = 'MUTES_FETCH_SUCCESS'; export const MUTES_FETCH_SUCCESS = 'MUTES_FETCH_SUCCESS';
@ -16,7 +17,7 @@ export const MUTES_TOGGLE_HIDE_NOTIFICATIONS = 'MUTES_TOGGLE_HIDE_NOTIFICATIONS'
export function fetchMutes() { export function fetchMutes() {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(fetchMutesRequest()); dispatch(fetchMutesRequest());
@ -52,7 +53,7 @@ export function fetchMutesFail(error) {
export function expandMutes() { export function expandMutes() {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
const url = getState().getIn(['user_lists', 'mutes', 'next']); const url = getState().getIn(['user_lists', 'mutes', 'next']);

5
app/soapbox/actions/notifications.js
Unescape View File

@ -17,6 +17,7 @@ import {
} from 'immutable'; } from 'immutable';
import { unescapeHTML } from '../utils/html'; import { unescapeHTML } from '../utils/html';
import { getFilters, regexFromFilters } from '../selectors'; import { getFilters, regexFromFilters } from '../selectors';
import { isLoggedIn } from 'soapbox/utils/accounts';
export const NOTIFICATIONS_UPDATE = 'NOTIFICATIONS_UPDATE'; export const NOTIFICATIONS_UPDATE = 'NOTIFICATIONS_UPDATE';
export const NOTIFICATIONS_UPDATE_NOOP = 'NOTIFICATIONS_UPDATE_NOOP'; export const NOTIFICATIONS_UPDATE_NOOP = 'NOTIFICATIONS_UPDATE_NOOP';
@ -156,7 +157,7 @@ const noOp = () => {};
export function expandNotifications({ maxId } = {}, done = noOp) { export function expandNotifications({ maxId } = {}, done = noOp) {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
const activeFilter = getSettings(getState()).getIn(['notifications', 'quickFilter', 'active']); const activeFilter = getSettings(getState()).getIn(['notifications', 'quickFilter', 'active']);
const notifications = getState().get('notifications'); const notifications = getState().get('notifications');
@ -222,7 +223,7 @@ export function expandNotificationsFail(error, isLoadingMore) {
export function clearNotifications() { export function clearNotifications() {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch({ dispatch({
type: NOTIFICATIONS_CLEAR, type: NOTIFICATIONS_CLEAR,

7
app/soapbox/actions/statuses.js
Unescape View File

@ -4,6 +4,7 @@ import { evictStatus } from '../storage/modifier';
import { deleteFromTimelines } from './timelines'; import { deleteFromTimelines } from './timelines';
import { importFetchedStatus, importFetchedStatuses, importAccount, importStatus } from './importer'; import { importFetchedStatus, importFetchedStatuses, importAccount, importStatus } from './importer';
import { openModal } from './modal'; import { openModal } from './modal';
import { isLoggedIn } from 'soapbox/utils/accounts';
export const STATUS_FETCH_REQUEST = 'STATUS_FETCH_REQUEST'; export const STATUS_FETCH_REQUEST = 'STATUS_FETCH_REQUEST';
export const STATUS_FETCH_SUCCESS = 'STATUS_FETCH_SUCCESS'; export const STATUS_FETCH_SUCCESS = 'STATUS_FETCH_SUCCESS';
@ -141,7 +142,7 @@ export function redraft(status, raw_text) {
export function deleteStatus(id, routerHistory, withRedraft = false) { export function deleteStatus(id, routerHistory, withRedraft = false) {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
let status = getState().getIn(['statuses', id]); let status = getState().getIn(['statuses', id]);
@ -233,7 +234,7 @@ export function fetchContextFail(id, error) {
export function muteStatus(id) { export function muteStatus(id) {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(muteStatusRequest(id)); dispatch(muteStatusRequest(id));
@ -269,7 +270,7 @@ export function muteStatusFail(id, error) {
export function unmuteStatus(id) { export function unmuteStatus(id) {
return (dispatch, getState) => { return (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch(unmuteStatusRequest(id)); dispatch(unmuteStatusRequest(id));

3
app/soapbox/actions/suggestions.js
Unescape View File

@ -1,5 +1,6 @@
import api from '../api'; import api from '../api';
import { importFetchedAccounts } from './importer'; import { importFetchedAccounts } from './importer';
import { isLoggedIn } from 'soapbox/utils/accounts';
export const SUGGESTIONS_FETCH_REQUEST = 'SUGGESTIONS_FETCH_REQUEST'; export const SUGGESTIONS_FETCH_REQUEST = 'SUGGESTIONS_FETCH_REQUEST';
export const SUGGESTIONS_FETCH_SUCCESS = 'SUGGESTIONS_FETCH_SUCCESS'; export const SUGGESTIONS_FETCH_SUCCESS = 'SUGGESTIONS_FETCH_SUCCESS';
@ -43,7 +44,7 @@ export function fetchSuggestionsFail(error) {
}; };
export const dismissSuggestion = accountId => (dispatch, getState) => { export const dismissSuggestion = accountId => (dispatch, getState) => {
if (!getState().get('me')) return; if (!isLoggedIn(getState)) return;
dispatch({ dispatch({
type: SUGGESTIONS_DISMISS, type: SUGGESTIONS_DISMISS,

2
app/soapbox/utils/accounts.js
Unescape View File

@ -49,3 +49,5 @@ export const isLocal = account => {
export const isVerified = account => ( export const isVerified = account => (
account.getIn(['pleroma', 'tags'], ImmutableList()).includes('verified') account.getIn(['pleroma', 'tags'], ImmutableList()).includes('verified')
); );
export const isLoggedIn = getState => typeof getState().get('me') === 'string';

Write Preview
Loading…
Cancel
Save