Progress

app/javascript/gabsocial/features/groups/create/index.js

@@ -1,111 +0,0 @@
-import { changeValue, submit, reset } from '../../../actions/group_editor';
-import Icon from '../../../components/icon';
-import { defineMessages, injectIntl } from 'react-intl';
-import classNames from 'classnames';
-
-const messages = defineMessages({
-	title: { id: 'groups.form.title', defaultMessage: 'Enter a new group title' },
-	description: { id: 'groups.form.description', defaultMessage: 'Enter the group description' },
-	coverImage: { id: 'groups.form.coverImage', defaultMessage: 'Upload a banner image' },
-	coverImageChange: { id: 'groups.form.coverImageChange', defaultMessage: 'Banner image selected' },
-	create: { id: 'groups.form.create', defaultMessage: 'Create group' },
-});
-
-const mapStateToProps = state => ({
-	title: state.getIn(['group_editor', 'title']),
-	description: state.getIn(['group_editor', 'description']),
-	coverImage: state.getIn(['group_editor', 'coverImage']),
-	disabled: state.getIn(['group_editor', 'isSubmitting']),
-});
-
-const mapDispatchToProps = dispatch => ({
-	onTitleChange: value => dispatch(changeValue('title', value)),
-	onDescriptionChange: value => dispatch(changeValue('description', value)),
-	onCoverImageChange: value => dispatch(changeValue('coverImage', value)),
-	onSubmit: routerHistory => dispatch(submit(routerHistory)),
-	reset: () => dispatch(reset()),
-});
-
-export default
-@connect(mapStateToProps, mapDispatchToProps)
-@injectIntl
-class Create extends PureComponent {
-
-	static contextTypes = {
-		router: PropTypes.object
-	}
-
-	static propTypes = {
-		title: PropTypes.string.isRequired,
-		description: PropTypes.string.isRequired,
-		coverImage: PropTypes.object,
-		disabled: PropTypes.bool,
-		intl: PropTypes.object.isRequired,
-		onTitleChange: PropTypes.func.isRequired,
-		onSubmit: PropTypes.func.isRequired,
-	};
-
-	componentWillMount() {
-		this.props.reset();
-	}
-
-	handleTitleChange = e => {
-		this.props.onTitleChange(e.target.value);
-	}
-
-	handleDescriptionChange = e => {
-		this.props.onDescriptionChange(e.target.value);
-	}
-
-	handleCoverImageChange = e => {
-		this.props.onCoverImageChange(e.target.files[0]);
-	}
-
-	handleSubmit = e => {
-		e.preventDefault();
-		this.props.onSubmit(this.context.router.history);
-	}
-
-	render () {
-		const { title, description, coverImage, disabled, intl } = this.props;
-
-		return (
-			<form className='group-form' onSubmit={this.handleSubmit}>
-				<div>
-					<input
-						className='standard'
-						type='text'
-						value={title}
-						disabled={disabled}
-						onChange={this.handleTitleChange}
-						placeholder={intl.formatMessage(messages.title)}
-					/>
-				</div>
-				<div>
-					<textarea
-						className='standard'
-						type='text'
-						value={description}
-						disabled={disabled}
-						onChange={this.handleDescriptionChange}
-						placeholder={intl.formatMessage(messages.description)}
-					/>
-				</div>
-				<div>
-					<label htmlFor='group_cover_image' className={classNames('group-form__file-label', { 'group-form__file-label--selected': coverImage !== null })}>
-						{intl.formatMessage(coverImage === null ? messages.coverImage : messages.coverImageChange)}
-					</label>
-					<input
-						type='file'
-						className='group-form__file'
-						id='group_cover_image'
-						disabled={disabled}
-						onChange={this.handleCoverImageChange}
-					/>
-					<button className='button'>{intl.formatMessage(messages.create)}</button>
-				</div>
-			</form>
-		);
-	}
-
-}

app/javascript/gabsocial/features/groups/edit/index.js

@@ -6,27 +6,27 @@ import ColumnIndicator from '../../../components/column_indicator';
 import classNames from 'classnames';
 
 const messages = defineMessages({
-  title: { id: 'groups.form.title', defaultMessage: 'Title' },
-  description: { id: 'groups.form.description', defaultMessage: 'Description' },
-  coverImage: { id: 'groups.form.coverImage', defaultMessage: 'Upload new banner image (optional)' },
-  coverImageChange: { id: 'groups.form.coverImageChange', defaultMessage: 'Banner image selected' },
-  update: { id: 'groups.form.update', defaultMessage: 'Update group' },
+	title: { id: 'groups.form.title', defaultMessage: 'Title' },
+	description: { id: 'groups.form.description', defaultMessage: 'Description' },
+	coverImage: { id: 'groups.form.coverImage', defaultMessage: 'Upload new banner image (optional)' },
+	coverImageChange: { id: 'groups.form.coverImageChange', defaultMessage: 'Banner image selected' },
+	update: { id: 'groups.form.update', defaultMessage: 'Update group' },
 });
 
 const mapStateToProps = (state, props) => ({
-  group: state.getIn(['groups', props.params.id]),
-  title: state.getIn(['group_editor', 'title']),
-  description: state.getIn(['group_editor', 'description']),
-  coverImage: state.getIn(['group_editor', 'coverImage']),
-  disabled: state.getIn(['group_editor', 'isSubmitting']),
+	group: state.getIn(['groups', props.params.id]),
+	title: state.getIn(['group_editor', 'title']),
+	description: state.getIn(['group_editor', 'description']),
+	coverImage: state.getIn(['group_editor', 'coverImage']),
+	disabled: state.getIn(['group_editor', 'isSubmitting']),
 });
 
 const mapDispatchToProps = dispatch => ({
-  onTitleChange: value => dispatch(changeValue('title', value)),
-  onDescriptionChange: value => dispatch(changeValue('description', value)),
-  onCoverImageChange: value => dispatch(changeValue('coverImage', value)),
-  onSubmit: routerHistory => dispatch(submit(routerHistory)),
-  setUp: group => dispatch(setUp(group)),
+	onTitleChange: value => dispatch(changeValue('title', value)),
+	onDescriptionChange: value => dispatch(changeValue('description', value)),
+	onCoverImageChange: value => dispatch(changeValue('coverImage', value)),
+	onSubmit: routerHistory => dispatch(submit(routerHistory)),
+	setUp: group => dispatch(setUp(group)),
 });
 
 export default
@@ -35,103 +35,103 @@ export default
 class Edit extends ImmutablePureComponent {
 
 	static contextTypes = {
-	  router: PropTypes.object,
+		router: PropTypes.object,
 	}
 
 	static propTypes = {
-	  group: ImmutablePropTypes.map,
-	  title: PropTypes.string.isRequired,
-	  description: PropTypes.string.isRequired,
-	  coverImage: PropTypes.object,
-	  disabled: PropTypes.bool,
-	  intl: PropTypes.object.isRequired,
-	  onTitleChange: PropTypes.func.isRequired,
-	  onSubmit: PropTypes.func.isRequired,
+		group: ImmutablePropTypes.map,
+		title: PropTypes.string.isRequired,
+		description: PropTypes.string.isRequired,
+		coverImage: PropTypes.object,
+		disabled: PropTypes.bool,
+		intl: PropTypes.object.isRequired,
+		onTitleChange: PropTypes.func.isRequired,
+		onSubmit: PropTypes.func.isRequired,
 	};
 
 	componentWillMount(nextProps) {
-	  if (this.props.group) {
-	    this.props.setUp(this.props.group);
-	  }
+		if (this.props.group) {
+			this.props.setUp(this.props.group);
+		}
 	}
 
 	componentWillReceiveProps(nextProps) {
-	  if (!this.props.group && nextProps.group) {
-	    this.props.setUp(nextProps.group);
-	  }
+		if (!this.props.group && nextProps.group) {
+			this.props.setUp(nextProps.group);
+		}
 	}
 
 	handleTitleChange = e => {
-	  this.props.onTitleChange(e.target.value);
+		this.props.onTitleChange(e.target.value);
 	}
 
 	handleDescriptionChange = e => {
-	  this.props.onDescriptionChange(e.target.value);
+		this.props.onDescriptionChange(e.target.value);
 	}
 
 	handleCoverImageChange = e => {
-	  this.props.onCoverImageChange(e.target.files[0]);
+		this.props.onCoverImageChange(e.target.files[0]);
 	}
 
 	handleSubmit = e => {
-	  e.preventDefault();
-	  this.props.onSubmit(this.context.router.history);
+		e.preventDefault();
+		this.props.onSubmit(this.context.router.history);
 	}
 
 	handleClick = () => {
-	  this.props.onSubmit(this.context.router.history);
+		this.props.onSubmit(this.context.router.history);
 	}
 
-	render () {
-	  const { group, title, description, coverImage, disabled, intl } = this.props;
+	render() {
+		const { group, title, description, coverImage, disabled, intl } = this.props;
 
-	  if (typeof group === 'undefined') {
-	    return ( <ColumnIndicator type='loading' /> );
-	  } else if (group === false) {
-	    return (<ColumnIndicator type='missing' />);
-	  }
+		if (typeof group === 'undefined') {
+			return <ColumnIndicator type='loading' />
+		} else if (group === false) {
+			return <ColumnIndicator type='missing' />
+		}
 
-	  return (
-	    <form className='group-form' onSubmit={this.handleSubmit}>
-	      <div>
-    <input
-	          className='standard'
-	          type='text'
-	          value={title}
-	          disabled={disabled}
-	          onChange={this.handleTitleChange}
-	          placeholder={intl.formatMessage(messages.title)}
-      />
-  </div>
+		return (
+			<form className='group-form' onSubmit={this.handleSubmit}>
+				<div>
+					<input
+						className='standard'
+						type='text'
+						value={title}
+						disabled={disabled}
+						onChange={this.handleTitleChange}
+						placeholder={intl.formatMessage(messages.title)}
+					/>
+				</div>
 
-	      <div>
-    <textarea
-	          className='standard'
-	          type='text'
-	          value={description}
-	          disabled={disabled}
-	          onChange={this.handleDescriptionChange}
-	          placeholder={intl.formatMessage(messages.description)}
-	        />
-  </div>
+				<div>
+					<textarea
+						className='standard'
+						type='text'
+						value={description}
+						disabled={disabled}
+						onChange={this.handleDescriptionChange}
+						placeholder={intl.formatMessage(messages.description)}
+					/>
+				</div>
 
-    <div>
-	        <label htmlFor='group_cover_image' className={classNames('group-form__file-label', { 'group-form__file-label--selected': coverImage !== null })}>
-	          {intl.formatMessage(coverImage === null ? messages.coverImage : messages.coverImageChange)}
-      </label>
+				<div>
+					<label htmlFor='group_cover_image' className={classNames('group-form__file-label', { 'group-form__file-label--selected': coverImage !== null })}>
+						{intl.formatMessage(coverImage === null ? messages.coverImage : messages.coverImageChange)}
+					</label>
 
-	        <input
-	          type='file'
-	          className='group-form__file'
-	          id='group_cover_image'
-	          disabled={disabled}
-	          onChange={this.handleCoverImageChange}
-      />
+					<input
+						type='file'
+						className='group-form__file'
+						id='group_cover_image'
+						disabled={disabled}
+						onChange={this.handleCoverImageChange}
+					/>
 
-	        <button>{intl.formatMessage(messages.update)}</button>
-	      </div>
-  </form>
-	  );
+					<button>{intl.formatMessage(messages.update)}</button>
+				</div>
+			</form>
+		);
 	}
 
 }

app/javascript/gabsocial/features/groups/index/card.js

@@ -1,53 +0,0 @@
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-import { defineMessages, injectIntl } from 'react-intl';
-import { Link } from 'react-router-dom';
-import { shortNumberFormat } from '../../../utils/numbers';
-
-const messages = defineMessages({
-    members: { id: 'groups.card.members', defaultMessage: 'Members' },
-    view: { id: 'groups.card.view', defaultMessage: 'View' },
-    join: { id: 'groups.card.join', defaultMessage: 'Join' },
-    role_member: { id: 'groups.card.roles.member', defaultMessage: 'You\'re a member' },
-    role_admin: { id: 'groups.card.roles.admin', defaultMessage: 'You\'re an admin' },
-});
-
-const mapStateToProps = (state, { id }) => ({
-	group: state.getIn(['groups', id]),
-	relationships: state.getIn(['group_relationships', id]),
-});
-
-export default
-@connect(mapStateToProps)
-@injectIntl
-class GroupCard extends ImmutablePureComponent {
-    static propTypes = {
-        group: ImmutablePropTypes.map,
-        relationships: ImmutablePropTypes.map,
-    }
-
-    getRole() {
-        const { intl, relationships } = this.props;
-
-        if (!relationships) return null;
-        if (relationships.get('admin')) return intl.formatMessage(messages.role_admin);
-        if (relationships.get('member')) return intl.formatMessage(messages.role_member);
-    }
-
-    render() {
-        const { intl, group } = this.props;
-        const coverImageUrl = group.get('cover_image_url');
-        const role = this.getRole();
-
-        return (
-            <Link to={`/groups/${group.get('id')}`} className="group-card">
-                <div className="group-card__header">{coverImageUrl && <img alt="" src={coverImageUrl} />}</div>
-                <div className="group-card__content">
-                    <div className="group-card__title">{group.get('title')}</div>
-                    <div className="group-card__meta"><strong>{shortNumberFormat(group.get('member_count'))}</strong> {intl.formatMessage(messages.members)}{role && <span> · {role}</span>}</div>
-                    <div className="group-card__description">{group.get('description')}</div>
-                </div>
-            </Link>
-        );
-    }
-}

app/javascript/gabsocial/features/groups/index/index.js

@@ -1,105 +0,0 @@
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import { defineMessages, injectIntl } from 'react-intl';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-import { Link } from 'react-router-dom';
-import classNames from 'classnames';
-import { fetchGroups } from '../../../actions/groups';
-import { openModal } from '../../../actions/modal';
-import { me } from '../../../initial_state';
-import GroupCard from './card';
-import GroupCreate from '../create';
-
-const messages = defineMessages({
-	heading: { id: 'column.groups', defaultMessage: 'Groups' },
-	create: { id: 'groups.create', defaultMessage: 'Create group' },
-	tab_featured: { id: 'groups.tab_featured', defaultMessage: 'Featured' },
-	tab_member: { id: 'groups.tab_member', defaultMessage: 'Member' },
-	tab_admin: { id: 'groups.tab_admin', defaultMessage: 'Manage' },
-});
-
-const mapStateToProps = (state, { activeTab }) => ({
-	groupIds: state.getIn(['group_lists', activeTab]),
-	account: state.getIn(['accounts', me]),
-});
-
-export default
-@connect(mapStateToProps)
-@injectIntl
-class Groups extends ImmutablePureComponent {
-	static propTypes = {
-		params: PropTypes.object.isRequired,
-		activeTab: PropTypes.string.isRequired,
-		showCreateForm: PropTypes.bool,
-		dispatch: PropTypes.func.isRequired,
-		groups: ImmutablePropTypes.map,
-		groupIds: ImmutablePropTypes.list,
-		intl: PropTypes.object.isRequired,
-	};
-
-	componentWillMount () {
-		this.props.dispatch(fetchGroups(this.props.activeTab));
-	}
-
-	componentDidUpdate(oldProps) {
-		if (this.props.activeTab && this.props.activeTab !== oldProps.activeTab) {
-			this.props.dispatch(fetchGroups(this.props.activeTab));
-		}
-	}
-
-	handleOpenProUpgradeModal = () => {
-		this.props.dispatch(openModal('PRO_UPGRADE'));
-	}
-
-	renderHeader() {
-		const { intl, activeTab, account, onOpenProUpgradeModal } = this.props;
-
-		const isPro = account.get('is_pro');
-
-		return (
-			<div className="group-column-header">
-				<div className="group-column-header__cta">
-					{
-						account && isPro &&
-						<Link to="/groups/create" className="button standard-small">{intl.formatMessage(messages.create)}</Link>
-					}
-					{
-						account && !isPro &&
-						<button onClick={this.handleOpenProUpgradeModal} className="button standard-small">{intl.formatMessage(messages.create)}</button>
-					}
-				</div>
-				<div className="group-column-header__title">{intl.formatMessage(messages.heading)}</div>
-
-				<div className="column-header__wrapper">
-					<h1 className="column-header">
-						<Link to='/groups' className={classNames('btn grouped', {'active': 'featured' === activeTab})}>
-							{intl.formatMessage(messages.tab_featured)}
-						</Link>
-
-						<Link to='/groups/browse/member' className={classNames('btn grouped', {'active': 'member' === activeTab})}>
-							{intl.formatMessage(messages.tab_member)}
-						</Link>
-
-						<Link to='/groups/browse/admin' className={classNames('btn grouped', {'active': 'admin' === activeTab})}>
-							{intl.formatMessage(messages.tab_admin)}
-						</Link>
-					</h1>
-				</div>
-			</div>
-		);
-	}
-
-	render () {
-		const { groupIds, showCreateForm } = this.props;
-
-		return (
-			<div>
-				{!showCreateForm && this.renderHeader()}
-				{showCreateForm && <GroupCreate /> }
-
-				<div className="group-card-list">
-					{groupIds.map(id => <GroupCard key={id} id={id} />)}
-				</div>
-			</div>
-		);
-	}
-}

app/javascript/gabsocial/features/groups/members/index.js

@@ -1,83 +0,0 @@
-import ImmutablePureComponent from 'react-immutable-pure-component';
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import { debounce } from 'lodash';
-import {
-	fetchMembers,
-	expandMembers,
-	updateRole,
-	createRemovedAccount,
-} from '../../../actions/groups';
-import { FormattedMessage } from 'react-intl';
-import AccountContainer from '../../../containers/account_container';
-import ScrollableList from '../../../components/scrollable_list';
-
-const mapStateToProps = (state, { params: { id } }) => ({
-	group: state.getIn(['groups', id]),
-	relationships: state.getIn(['group_relationships', id]),
-	accountIds: state.getIn(['user_lists', 'groups', id, 'items']),
-	hasMore: !!state.getIn(['user_lists', 'groups', id, 'next']),
-});
-
-export default
-@connect(mapStateToProps)
-class GroupMembers extends ImmutablePureComponent {
-
-	static propTypes = {
-	  params: PropTypes.object.isRequired,
-	  dispatch: PropTypes.func.isRequired,
-	  accountIds: ImmutablePropTypes.list,
-	  hasMore: PropTypes.bool,
-	};
-
-	componentWillMount () {
-	  const { params: { id } } = this.props;
-
-	  this.props.dispatch(fetchMembers(id));
-	}
-
-	componentWillReceiveProps (nextProps) {
-	  if (nextProps.params.id !== this.props.params.id) {
-	    this.props.dispatch(fetchMembers(nextProps.params.id));
-	  }
-	}
-
-	handleLoadMore = debounce(() => {
-	  this.props.dispatch(expandMembers(this.props.params.id));
-	}, 300, { leading: true });
-
-	render () {
-		const { accountIds, hasMore, group, relationships, dispatch } = this.props;
-		
-		if (!group || !accountIds || !relationships) {
-			return <LoadingIndicator />
-		}
-
-		return (
-				<ScrollableList
-					scrollKey='members'
-					hasMore={hasMore}
-					onLoadMore={this.handleLoadMore}
-					emptyMessage={<FormattedMessage id='group.members.empty' defaultMessage='This group does not has any members.' />}
-				>
-					{accountIds.map(id => {
-						let menu = [];
-
-						if (relationships.get('admin')) {
-							menu = [
-								{ text: 'Remove from group', action: () => dispatch(createRemovedAccount(group.get('id'), id)) },
-								{ text: 'Make administrator', action: () => dispatch(updateRole(group.get('id'), id, 'admin')) },
-							]
-						}
-
-						return (
-							<div className="group-account-wrapper" key={id}>
-								<AccountContainer id={id} withNote={false} actionIcon="none" onActionClick={() => true} />
-								{menu.length > 0 && <DropdownMenuContainer items={menu} icon='ellipsis-h' size={18} direction='right' />}
-							</div>
-						);
-					})}
-				</ScrollableList>
-		);
-	}
-
-}

app/javascript/gabsocial/features/groups/removed_accounts/index.js

@@ -1,78 +0,0 @@
-import ImmutablePureComponent from 'react-immutable-pure-component';
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import { debounce } from 'lodash';
-import ColumnIndicator from '../../../components/column_indicator';
-import {
-	fetchRemovedAccounts,
-	expandRemovedAccounts,
-	removeRemovedAccount,
-} from '../../../actions/groups';
-import { FormattedMessage } from 'react-intl';
-import AccountContainer from '../../../containers/account_container';
-import ScrollableList from '../../../components/scrollable_list';
-import { defineMessages, injectIntl } from 'react-intl';
-
-const messages = defineMessages({
-	remove: { id: 'groups.removed_accounts', defaultMessage: 'Allow joining' },
-});
-
-const mapStateToProps = (state, { params: { id } }) => ({
-	group: state.getIn(['groups', id]),
-	accountIds: state.getIn(['user_lists', 'groups_removed_accounts', id, 'items']),
-	hasMore: !!state.getIn(['user_lists', 'groups_removed_accounts', id, 'next']),
-});
-
-export default
-@connect(mapStateToProps)
-@injectIntl
-class GroupRemovedAccounts extends ImmutablePureComponent {
-
-	static propTypes = {
-		params: PropTypes.object.isRequired,
-		dispatch: PropTypes.func.isRequired,
-		accountIds: ImmutablePropTypes.list,
-		hasMore: PropTypes.bool,
-	};
-
-	componentWillMount() {
-		const { params: { id } } = this.props;
-
-		this.props.dispatch(fetchRemovedAccounts(id));
-	}
-
-	componentWillReceiveProps(nextProps) {
-		if (nextProps.params.id !== this.props.params.id) {
-			this.props.dispatch(fetchRemovedAccounts(nextProps.params.id));
-		}
-	}
-
-	handleLoadMore = debounce(() => {
-		this.props.dispatch(expandRemovedAccounts(this.props.params.id));
-	}, 300, { leading: true });
-
-	render() {
-		const { accountIds, hasMore, group, intl } = this.props;
-
-		if (!group || !accountIds) {
-			return <ColumnIndicator type='loading' />
-		}
-
-		return (
-			<ScrollableList
-				scrollKey='removed_accounts'
-				hasMore={hasMore}
-				onLoadMore={this.handleLoadMore}
-				emptyMessage={<FormattedMessage id='group.removed_accounts.empty' defaultMessage='This group does not has any removed accounts.' />}
-			>
-				{accountIds.map(id => (<AccountContainer
-					key={id}
-					id={id}
-					actionIcon='remove'
-					onActionClick={() => this.props.dispatch(removeRemovedAccount(group.get('id'), id))}
-					actionTitle={intl.formatMessage(messages.remove)}
-				/>))}
-			</ScrollableList>
-		)
-	}
-
-}

app/javascript/gabsocial/features/groups/timeline/index.js

@@ -1,99 +0,0 @@
-import ImmutablePureComponent from 'react-immutable-pure-component'
-import ImmutablePropTypes from 'react-immutable-proptypes'
-import { injectIntl, defineMessages } from 'react-intl'
-import { Link } from 'react-router-dom'
-import classNames from 'classnames'
-import { connectGroupStream } from '../../../actions/streaming'
-import { expandGroupTimeline } from '../../../actions/timelines'
-import StatusListContainer from '../../../containers/status_list_container'
-import ColumnSettingsContainer from './containers/column_settings_container'
-import Icon from '../../../components/icon'
-import ColumnIndicator from '../../../components/column_indicator'
-
-const messages = defineMessages({
-	tabLatest: { id: 'group.timeline.tab_latest', defaultMessage: 'Latest' },
-	show: { id: 'group.timeline.show_settings', defaultMessage: 'Show settings' },
-	hide: { id: 'group.timeline.hide_settings', defaultMessage: 'Hide settings' },
-	empty: { id: 'empty_column.group', defaultMessage: 'There is nothing in this group yet. When members of this group post new statuses, they will appear here.' },
-})
-
-const mapStateToProps = (state, props) => ({
-	group: state.getIn(['groups', props.params.id]),
-	relationships: state.getIn(['group_relationships', props.params.id]),
-	hasUnread: state.getIn(['timelines', `group:${props.params.id}`, 'unread']) > 0,
-})
-
-export default
-@connect(mapStateToProps)
-@injectIntl
-class GroupTimeline extends ImmutablePureComponent {
-
-	static contextTypes = {
-		router: PropTypes.object,
-	}
-
-	static propTypes = {
-		params: PropTypes.object.isRequired,
-		dispatch: PropTypes.func.isRequired,
-		columnId: PropTypes.string,
-		hasUnread: PropTypes.bool,
-		group: PropTypes.oneOfType([ImmutablePropTypes.map, PropTypes.bool]),
-		relationships: ImmutablePropTypes.map,
-		intl: PropTypes.object.isRequired,
-	}
-
-	state = {
-		collapsed: true,
-	}
-
-	componentDidMount() {
-		const { dispatch } = this.props
-		const { id } = this.props.params
-
-		dispatch(expandGroupTimeline(id))
-
-		this.disconnect = dispatch(connectGroupStream(id))
-	}
-
-	componentWillUnmount() {
-		if (this.disconnect) {
-			this.disconnect()
-			this.disconnect = null
-		}
-	}
-
-	handleLoadMore = maxId => {
-		const { id } = this.props.params
-		this.props.dispatch(expandGroupTimeline(id, { maxId }))
-	}
-
-	handleToggleClick = (e) => {
-		e.stopPropagation()
-		this.setState({ collapsed: !this.state.collapsed })
-	}
-
-	render() {
-		const { columnId, group, relationships, account, intl } = this.props
-		const { collapsed } = this.state
-		const { id } = this.props.params
-
-		if (typeof group === 'undefined' || !relationships) {
-			return (<ColumnIndicator type='loading' />)
-		} else if (group === false) {
-			return (<ColumnIndicator type='missing' />)
-		}
-		
-		return (
-			<StatusListContainer
-				alwaysPrepend
-				scrollKey={`group_timeline-${columnId}`}
-				timelineId={`group:${id}`}
-				onLoadMore={this.handleLoadMore}
-				group={group}
-				withGroupAdmin={relationships && relationships.get('admin')}
-				emptyMessage={intl.formatMessage(messages.empty)}
-			/>
-		)
-	}
-
-}