Merge branch 'alpha' of github.com:withspectrum/spectrum into 2.2.14

.gitignore

@@ -33,3 +33,5 @@ api/.env
 mobile/.expo
 test-results.json
 public/uploads
+cypress/screenshots/
+cypress/videos/

api/queries/thread/content.js

@@ -0,0 +1,25 @@
+// @flow
+import type { GraphQLContext } from '../../';
+import type { DBThread } from 'shared/types';
+
+export default ({ content }: DBThread, _: any, ctx: GraphQLContext) => {
+  const defaultDraftState = JSON.stringify({
+    blocks: [
+      {
+        key: 'foo',
+        text: '',
+        type: 'unstyled',
+        depth: 0,
+        inlineStyleRanges: [],
+        entityRanges: [],
+        data: {},
+      },
+    ],
+    entityMap: {},
+  });
+
+  return {
+    title: content.title,
+    body: content.body ? content.body : defaultDraftState,
+  };
+};

api/queries/thread/index.js

@@ -14,6 +14,7 @@ import author from './author';
 import creator from './creator';
 import messageCount from './messageCount';
 import currentUserLastSeen from './currentUserLastSeen';
+import content from './content';
 
 module.exports = {
   Query: {
@@ -33,5 +34,6 @@ module.exports = {
     creator, // deprecated
     messageCount,
     currentUserLastSeen,
+    content,
   },
 };

mobile/components/Login/index.js

@@ -5,6 +5,7 @@ import { Text, View, Button } from 'react-native';
 import { AuthSession, SecureStore } from 'expo';
 import { authenticate } from '../../actions/authentication';
 import { DEV_BASE_URI } from '../../../shared/graphql/constants.native';
+import type { Dispatch } from 'redux';
 import {
   Container,
   Emoji,
@@ -26,7 +27,7 @@ const API_URL =
 type Provider = 'twitter' | 'facebook' | 'google' | 'github';
 
 type Props = {
-  dispatch: Function,
+  dispatch: Dispatch<Object>,
 };
 
 class Login extends React.Component<Props> {

src/actions/toasts.js

@@ -1,4 +1,5 @@
 // @flow
+import type { Dispatch } from 'redux';
 type Toasts = 'success' | 'error' | 'neutral';
 
 const addToast = (
@@ -24,7 +25,7 @@ const removeToast = (id: number) => {
 
 let nextToastId = 0;
 export const addToastWithTimeout = (kind: Toasts, message: string) => (
-  dispatch: Function
+  dispatch: Dispatch<Object>
 ) => {
   const timeout = kind === 'success' ? 2000 : 4000;
   const id = nextToastId++;

src/components/avatar/hoverProfile.js

@@ -12,6 +12,7 @@ import addProtocolToString from 'shared/normalize-url';
 import { Card } from '../card';
 import { initNewThreadWithUser } from '../../actions/directMessageThreads';
 import AvatarImage from './image';
+import type { Dispatch } from 'redux';
 import {
   Container,
   CoverLink,
@@ -27,7 +28,7 @@ import { HoverWrapper } from './style';
 type ProfileProps = {
   user: Object,
   community: ?Object,
-  dispatch: Function,
+  dispatch: Dispatch<Object>,
   source: string,
   currentUser: ?Object,
   top: ?Boolean,

src/components/badges/index.js

@@ -3,6 +3,7 @@ import * as React from 'react';
 import compose from 'recompose/compose';
 import { connect } from 'react-redux';
 import { openModal } from '../../actions/modals';
+import type { Dispatch } from 'redux';
 import {
   Span,
   ProBadge,
@@ -15,7 +16,7 @@ type Props = {
   onClick?: Function,
   tipText: string,
   currentUser: ?Object,
-  dispatch: Function,
+  dispatch: Dispatch<Object>,
 };
 
 class Badge extends React.Component<Props> {

src/components/chatInput/index.js

@@ -36,6 +36,7 @@ import sendDirectMessage from 'shared/graphql/mutations/message/sendDirectMessag
 import { getMessageById } from 'shared/graphql/queries/message/getMessage';
 import MediaUploader from './components/mediaUploader';
 import { QuotedMessage as QuotedMessageComponent } from '../message/view';
+import type { Dispatch } from 'redux';
 
 const QuotedMessage = connect()(
   getMessageById(props => {
@@ -72,7 +73,7 @@ type State = {
 type Props = {
   onRef: Function,
   currentUser: Object,
-  dispatch: Function,
+  dispatch: Dispatch<Object>,
   onChange: Function,
   state: Object,
   createThread: Function,

src/components/composer/index.js

@@ -28,6 +28,7 @@ import { TextButton, Button } from '../buttons';
 import { FlexRow } from '../../components/globals';
 import { LoadingSelect } from '../loading';
 import Titlebar from '../../views/titlebar';
+import type { Dispatch } from 'redux';
 import {
   Container,
   ThreadDescription,
@@ -69,7 +70,7 @@ type Props = {
     loading: boolean,
   },
   isOpen: boolean,
-  dispatch: Function,
+  dispatch: Dispatch<Object>,
   publishThread: Function,
   history: Object,
   location: Object,

src/components/emailInvitationForm/index.js

@@ -11,6 +11,7 @@ import sendCommunityEmailInvitations from 'shared/graphql/mutations/community/se
 import { Button } from '../buttons';
 import { Error } from '../formElements';
 import { SectionCardFooter } from '../settingsViews/style';
+import type { Dispatch } from 'redux';
 import {
   EmailInviteForm,
   EmailInviteInput,

src/components/gallery/browser.js

@@ -3,6 +3,7 @@ import * as React from 'react';
 import { connect } from 'react-redux';
 import { closeGallery } from '../../actions/gallery';
 import type { GetMediaMessagesForThreadType } from 'shared/graphql/queries/message/getMediaMessagesForThread';
+import type { Dispatch } from 'redux';
 import {
   Overlay,
   ActiveImage,
@@ -20,7 +21,7 @@ type State = {
 };
 
 type Props = {
-  dispatch: Function,
+  dispatch: Dispatch<Object>,
   data: {
     messages?: GetMediaMessagesForThreadType,
   },

src/components/granularUserProfile/index.js

@@ -9,6 +9,7 @@ import Reputation from '../reputation';
 import Badge from '../badges';
 import Icon from '../icons';
 import { initNewThreadWithUser } from '../../actions/directMessageThreads';
+import type { Dispatch } from 'redux';
 import {
   Row,
   Name,
@@ -35,7 +36,7 @@ type Props = {
   children?: React.Node,
   onlineSize?: 'small' | 'large',
   history: Object,
-  dispatch: Function,
+  dispatch: Dispatch<Object>,
 };
 
 // Each prop both provides data AND indicates that the element should be included in the instance of the profile,

src/components/message/index.js

@@ -10,6 +10,7 @@ import { openModal } from '../../actions/modals';
 import { replyToMessage } from '../../actions/message';
 import { track, events } from 'src/helpers/analytics';
 
+import type { Dispatch } from 'redux';
 import type { MessageInfoType } from 'shared/graphql/fragments/message/messageInfo';
 import type { UserInfoType } from 'shared/graphql/fragments/user/userInfo';
 
@@ -18,7 +19,7 @@ type Props = {
   threadId: string,
   threadType: string,
   selectedId: string,
-  dispatch: Function,
+  dispatch: Dispatch<Object>,
   canModerate: boolean,
   currentUser: UserInfoType,
   me: boolean,

src/components/messageGroup/index.js

@@ -6,6 +6,7 @@ import { convertTimestampToDate } from '../../helpers/utils';
 import Badge from '../badges';
 import Avatar from '../avatar';
 import Message from '../message';
+import type { Dispatch } from 'redux';
 
 import {
   Byline,
@@ -70,7 +71,7 @@ type MessageGroupProps = {
   thread: Object, // TODO: Refine type
   isModerator: boolean,
   toggleReaction: Function,
-  dispatch: Function,
+  dispatch: Dispatch<Object>,
   selectedId: string,
   changeSelection: Function,
   lastSeen?: number | Date,

src/components/modals/AdminEmailAddressVerificationModal/index.js

@@ -15,9 +15,10 @@ import getCommunitySettings, {
 import AdministratorEmailForm from 'src/views/communityBilling/components/administratorEmailForm';
 import viewNetworkHandler from 'src/components/viewNetworkHandler';
 import ViewError from 'src/components/viewError';
+import type { Dispatch } from 'redux';
 
 type Props = {
-  dispatch: Function,
+  dispatch: Dispatch<Object>,
   isOpen: boolean,
   currentUser: Object,
   input: Object,

src/components/modals/ChangeChannelModal/index.js

@@ -13,10 +13,11 @@ import Icon from '../../icons';
 import { IconContainer } from '../RepExplainerModal/style';
 import { Actions, modalStyles, Section, Title, Subtitle } from './style';
 import ChannelSelector from './channelSelector';
+import type { Dispatch } from 'redux';
 
 type Props = {
   thread: any,
-  dispatch: Function,
+  dispatch: Dispatch<Object>,
   isOpen: boolean,
   moveThread: Function,
 };

src/components/modals/ChatInputLoginModal/index.js

@@ -9,9 +9,10 @@ import { modalStyles } from '../styles';
 import LoginButtonSet from 'src/components/loginButtonSet';
 import { Container } from './style';
 import { track, events } from 'src/helpers/analytics';
+import type { Dispatch } from 'redux';
 
 type Props = {
-  dispatch: Function,
+  dispatch: Dispatch<Object>,
   isOpen: boolean,
   modalProps: any,
 };

src/components/modals/CreateChannelModal/index.js

@@ -16,6 +16,7 @@ import type { GetCommunityType } from 'shared/graphql/queries/community/getCommu
 import createChannelMutation from 'shared/graphql/mutations/channel/createChannel';
 import StripeModalWell from 'src/components/stripeCardForm/modalWell';
 import { track, events, transformations } from 'src/helpers/analytics';
+import type { Dispatch } from 'redux';
 
 import ModalContainer from '../modalContainer';
 import { TextButton, Button } from '../../buttons';
@@ -45,7 +46,7 @@ type State = {
 
 type Props = {
   client: Object,
-  dispatch: Function,
+  dispatch: Dispatch<Object>,
   isOpen: boolean,
   community: GetCommunityType,
   createChannel: Function,

src/components/modals/DeleteDoubleCheckModal/index.js

@@ -22,6 +22,7 @@ import { modalStyles } from '../styles';
 import { Actions, Message } from './style';
 import cancelSubscription from 'shared/graphql/mutations/community/cancelSubscription';
 import disableCommunityAnalytics from 'shared/graphql/mutations/community/disableCommunityAnalytics';
+import type { Dispatch } from 'redux';
 
 /*
   Generic component that should be used to confirm any 'delete' action.
@@ -42,7 +43,7 @@ type State = {
 };
 
 type Props = {
-  dispatch: Function,
+  dispatch: Dispatch<Object>,
   modalProps: {
     id: string,
     entity: string,
@@ -58,7 +59,7 @@ type Props = {
   cancelSubscription: Function,
   disableCommunityAnalytics: Function,
   archiveChannel: Function,
-  dispatch: Function,
+  dispatch: Dispatch<Object>,
   isOpen: boolean,
 };
 

src/components/modals/RestoreChannelModal/index.js

@@ -12,9 +12,10 @@ import ModalContainer from '../modalContainer';
 import { TextButton, Button } from '../../buttons';
 import { modalStyles, Description } from '../styles';
 import { Form, Actions } from './style';
+import type { Dispatch } from 'redux';
 
 type Props = {
-  dispatch: Function,
+  dispatch: Dispatch<Object>,
   isOpen: boolean,
   channel: GetChannelType,
   id: string,

src/components/modals/UpgradeAnalyticsModal/index.js

@@ -14,9 +14,10 @@ import StripeCardForm from 'src/components/stripeCardForm';
 import enableCommunityAnalytics from 'shared/graphql/mutations/community/enableCommunityAnalytics';
 import type { GetCommunitySettingsType } from 'shared/graphql/queries/community/getCommunitySettings';
 import PoweredByStripe from '../components/poweredByStripe';
+import type { Dispatch } from 'redux';
 
 type Props = {
-  dispatch: Function,
+  dispatch: Dispatch<Object>,
   isOpen: boolean,
   currentUser: Object,
   community: GetCommunitySettingsType,

src/components/modals/UpgradeModal/index.js

@@ -9,6 +9,7 @@ import { addToastWithTimeout } from '../../../actions/toasts';
 import { connect } from 'react-redux';
 import { Button, OutlineButton } from '../../buttons';
 import { UpsellUpgradeToPro } from '../../upsell';
+import type { Dispatch } from 'redux';
 import {
   modalStyles,
   Section,
@@ -20,7 +21,7 @@ import {
 import { track, events } from 'src/helpers/analytics';
 
 type Props = {
-  dispatch: Function,
+  dispatch: Dispatch<Object>,
   downgradeFromPro: Function,
   isOpen: boolean,
   user: Object,

src/components/modals/UpgradeModeratorSeatModal/index.js

@@ -14,9 +14,10 @@ import StripeCardForm from 'src/components/stripeCardForm';
 import addCommunityModerator from 'shared/graphql/mutations/communityMember/addCommunityModerator';
 import type { GetCommunitySettingsType } from 'shared/graphql/queries/community/getCommunitySettings';
 import PoweredByStripe from '../components/poweredByStripe';
+import type { Dispatch } from 'redux';
 
 type Props = {
-  dispatch: Function,
+  dispatch: Dispatch<Object>,
   isOpen: boolean,
   currentUser: Object,
   input: Object,

src/components/profile/channel.js

@@ -17,14 +17,15 @@ import {
 import Icon from '../icons';
 import { Button } from '../buttons';
 import { LoadingListItem } from '../loading';
+import type { Dispatch } from 'redux';
 import { FullTitle, FullDescription, ProfileCard, FullProfile } from './style';
 
 type State = {
   isLoading: boolean,
 };
 
 type Props = {
-  dispatch: Function,
+  dispatch: Dispatch<Object>,
   toggleChannelSubscription: Function,
   profileSize: string,
   currentUser: Object,

src/components/profile/community.js

@@ -13,6 +13,7 @@ import Avatar from '../avatar';
 import { Button, OutlineButton } from '../buttons';
 import type { GetCommunityType } from 'shared/graphql/queries/community/getCommunity';
 import ToggleCommunityMembership from '../toggleCommunityMembership';
+import type { Dispatch } from 'redux';
 import {
   ProfileHeader,
   ProfileHeaderLink,
@@ -38,7 +39,7 @@ type Props = {
   onLeave: Function,
   joinedCommunity?: Function,
   joinedFirstCommunity?: Function,
-  dispatch: Function,
+  dispatch: Dispatch<Object>,
   data: {
     community: GetCommunityType,
     loading: boolean,