{children}
diff --git a/app/javascript/gabsocial/components/popover/status_options_popover.js b/app/javascript/gabsocial/components/popover/status_options_popover.js
index 3557c676..6746a66d 100644
--- a/app/javascript/gabsocial/components/popover/status_options_popover.js
+++ b/app/javascript/gabsocial/components/popover/status_options_popover.js
@@ -1,7 +1,28 @@
import ImmutablePropTypes from 'react-immutable-proptypes'
import ImmutablePureComponent from 'react-immutable-pure-component'
-import { defineMessages, injectIntl } from 'react-intl'
-import { me, isStaff } from '../../initial_state'
+import { FormattedMessage, defineMessages, injectIntl } from 'react-intl'
+import { me, isStaff, boostModal, deleteModal } from '../../initial_state'
+import {
+ repost,
+ unrepost,
+ pin,
+ unpin,
+} from '../../actions/interactions';
+import {
+ muteStatus,
+ unmuteStatus,
+ deleteStatus,
+ editStatus,
+} from '../../actions/statuses';
+import {
+ fetchGroupRelationships,
+ createRemovedAccount,
+ groupRemoveStatus,
+} from '../../actions/groups'
+import { initMuteModal } from '../../actions/mutes'
+import { initReport } from '../../actions/reports'
+import { openModal } from '../../actions/modal'
+import { closePopover } from '../../actions/popover'
import PopoverLayout from './popover_layout'
import List from '../list'
@@ -16,7 +37,7 @@ const messages = defineMessages({
replyAll: { id: 'status.replyAll', defaultMessage: 'Reply to thread' },
repost: { id: 'repost', defaultMessage: 'Repost' },
quote: { id: 'status.quote', defaultMessage: 'Quote' },
- repost_private: { id: 'status.repost_private', defaultMessage: 'Repost to original audience' },
+ repost_private: { id: 'status.repost', defaultMessage: 'Repost' },
cancel_repost_private: { id: 'status.cancel_repost_private', defaultMessage: 'Remove Repost' },
cannot_repost: { id: 'status.cannot_repost', defaultMessage: 'This post cannot be reposted' },
cannot_quote: { id: 'status.cannot_quote', defaultMessage: 'This post cannot be quoted' },
@@ -30,14 +51,128 @@ const messages = defineMessages({
admin_status: { id: 'status.admin_status', defaultMessage: 'Open this status in the moderation interface' },
group_remove_account: { id: 'status.remove_account_from_group', defaultMessage: 'Remove account from group' },
group_remove_post: { id: 'status.remove_post_from_group', defaultMessage: 'Remove status from group' },
+ repostWithComment: { id: 'repost_with_comment', defaultMessage: 'Repost with comment' },
})
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state, { status }) => {
+ if (!me) return null
-})
+ const groupId = status ? status.getIn(['group', 'id']) : undefined
+ const groupRelationships = state.getIn(['group_relationships', groupId])
+
+ return {
+ groupId,
+ groupRelationships,
+ }
+}
const mapDispatchToProps = (dispatch) => ({
+ onMuteConversation(status) {
+ dispatch(closePopover())
+
+ if (status.get('muted')) {
+ dispatch(unmuteStatus(status.get('id')))
+ } else {
+ dispatch(muteStatus(status.get('id')))
+ }
+ },
+
+ onPin(status) {
+ dispatch(closePopover())
+
+ if (status.get('pinned')) {
+ dispatch(unpin(status))
+ } else {
+ dispatch(pin(status))
+ }
+ },
+
+ onQuote(status, router) {
+ dispatch(closePopover())
+
+ dispatch((_, getState) => {
+ const state = getState()
+ if (state.getIn(['compose', 'text']).trim().length !== 0) {
+ dispatch(openModal(MODAL_CONFIRM, {
+ message: intl.formatMessage(messages.quoteMessage),
+ confirm: intl.formatMessage(messages.quoteConfirm),
+ onConfirm: () => dispatch(quoteCompose(status, router)),
+ }))
+ } else {
+ dispatch(quoteCompose(status, router))
+ }
+ })
+ },
+
+ onRepost(status) {
+ dispatch(closePopover())
+ const alreadyReposted = status.get('reblogged')
+
+ if (boostModal && !alreadyReposted) {
+ dispatch(openModal(MODAL_BOOST, {
+ status,
+ onRepost: () => dispatch(repost(status)),
+ }))
+ } else {
+ if (alreadyReposted) {
+ dispatch(unrepost(status))
+ } else {
+ dispatch(repost(status))
+ }
+ }
+ },
+
+ onDelete(status, history) {
+ dispatch(closePopover())
+
+ if (!deleteModal) {
+ dispatch(deleteStatus(status.get('id'), history))
+ } else {
+ dispatch(openModal('CONFIRM', {
+ message:
,
+ confirm:
,
+ onConfirm: () => dispatch(deleteStatus(status.get('id'), history)),
+ }))
+ }
+ },
+
+ onEdit(status) {
+ dispatch(closePopover())
+ dispatch(editStatus(status))
+ },
+
+ onMute(account) {
+ dispatch(closePopover())
+ dispatch(initMuteModal(account))
+ },
+
+ onBlock(status) {
+ dispatch(closePopover())
+ const account = status.get('account')
+ dispatch(openModal('BLOCK_ACCOUNT', {
+ accountId: account.get('id'),
+ }))
+ },
+
+ onReport(status) {
+ dispatch(closePopover())
+ dispatch(initReport(status.get('account'), status))
+ },
+
+ onGroupRemoveAccount(groupId, accountId) {
+ dispatch(closePopover())
+ dispatch(createRemovedAccount(groupId, accountId))
+ },
+
+ onGroupRemoveStatus(groupId, statusId) {
+ dispatch(closePopover())
+ dispatch(groupRemoveStatus(groupId, statusId))
+ },
+
+ onFetchGroupRelationships(groupId) {
+ dispatch(fetchGroupRelationships([groupId]))
+ }
})
export default
@@ -47,184 +182,187 @@ class StatusOptionsPopover extends ImmutablePureComponent {
static propTypes = {
status: ImmutablePropTypes.map.isRequired,
- account: ImmutablePropTypes.map.isRequired,
- onOpenUnauthorizedModal: PropTypes.func.isRequired,
- onOpenStatusSharePopover: PropTypes.func.isRequired,
- onReply: PropTypes.func,
- onQuote: PropTypes.func,
- onFavorite: PropTypes.func,
- onRepost: PropTypes.func,
- onDelete: PropTypes.func,
- onMention: PropTypes.func,
- onMute: PropTypes.func,
- onBlock: PropTypes.func,
- onReport: PropTypes.func,
- onMuteConversation: PropTypes.func,
- onPin: PropTypes.func,
+ groupRelationships: ImmutablePropTypes.map,
+ groupId: PropTypes.string,
+ onQuote: PropTypes.func.isRequired,
+ onRepost: PropTypes.func.isRequired,
+ onDelete: PropTypes.func.isRequired,
+ onMute: PropTypes.func.isRequired,
+ onBlock: PropTypes.func.isRequired,
+ onReport: PropTypes.func.isRequired,
+ onMuteConversation: PropTypes.func.isRequired,
+ onPin: PropTypes.func.isRequired,
intl: PropTypes.object.isRequired,
+ onFetchGroupRelationships: PropTypes.func.isRequired,
}
updateOnProps = [
'status',
- 'account',
+ 'groupRelationships',
]
- handleConversationMuteClick = () => {
- this.props.onMuteConversation(this.props.status);
+ componentDidMount() {
+ if (!this.props.groupRelationships && this.props.groupId) {
+ this.props.onFetchGroupRelationships(this.props.groupId)
+ }
}
-
- handleGroupRemoveAccount = () => {
- const { status } = this.props;
- this.props.onGroupRemoveAccount(status.getIn(['group', 'id']), status.getIn(['account', 'id']));
+ handleConversationMuteClick = () => {
+ this.props.onMuteConversation(this.props.status)
+ }
+
+ handleGroupRemoveAccount = () => {
+ const { status } = this.props
+
+ this.props.onGroupRemoveAccount(status.getIn(['group', 'id']), status.getIn(['account', 'id']))
}
handleGroupRemovePost = () => {
- const { status } = this.props;
+ const { status } = this.props
- this.props.onGroupRemoveStatus(status.getIn(['group', 'id']), status.get('id'));
+ this.props.onGroupRemoveStatus(status.getIn(['group', 'id']), status.get('id'))
}
handleReport = () => {
- this.props.onReport(this.props.status);
+ this.props.onReport(this.props.status)
}
handleBlockClick = () => {
- this.props.onBlock(this.props.status);
+ this.props.onBlock(this.props.status)
}
handleMuteClick = () => {
- this.props.onMute(this.props.status.get('account'));
- }
-
- handleMentionClick = () => {
- this.props.onMention(this.props.status.get('account'), this.context.router.history);
+ this.props.onMute(this.props.status.get('account'))
}
handlePinClick = () => {
- this.props.onPin(this.props.status);
+ this.props.onPin(this.props.status)
}
handleDeleteClick = () => {
- this.props.onDelete(this.props.status, this.context.router.history);
+ this.props.onDelete(this.props.status)
}
handleEditClick = () => {
- this.props.onEdit(this.props.status);
+ this.props.onEdit(this.props.status)
}
handleRepostClick = (e) => {
- if (me) {
- // this.props.onRepost(this.props.status, e)
- this.props.onQuote(this.props.status, this.context.router.history)
- } else {
- this.props.onOpenUnauthorizedModal()
- }
+ this.props.onRepost(this.props.status, e)
}
render() {
const {
status,
intl,
- account,
+ groupRelationships,
} = this.props
const mutingConversation = status.get('muted')
const publicStatus = ['public', 'unlisted'].includes(status.get('visibility'))
+ const isReply = !!status.get('in_reply_to_id')
+ const withGroupAdmin = !!groupRelationships ? groupRelationships.get('admin') : false
+ console.log("withGroupAdmin:", withGroupAdmin, groupRelationships ? groupRelationships.get('admin') : '')
- let menu = [];
+ let menu = []
if (me) {
- // if (status.getIn(['account', 'id']) === me) {
+ if (status.getIn(['account', 'id']) === me) {
menu.push({
icon: 'audio-mute',
hideArrow: true,
title: intl.formatMessage(mutingConversation ? messages.unmuteConversation : messages.muteConversation),
onClick: this.handleConversationMuteClick,
})
- // }
+ }
- // if (status.getIn(['account', 'id']) === me) {
- // if (publicStatus) {
+ if (isReply) {
+ menu.push({
+ icon: 'repost',
+ hideArrow: true,
+ title: intl.formatMessage(status.get('reblogged') ? messages.cancel_repost_private : messages.repost_private),
+ onClick: this.handleRepostClick,
+ })
+ menu.push({
+ icon: 'pencil',
+ hideArrow: true,
+ title: intl.formatMessage(messages.repostWithComment),
+ onClick: this.handleRepostClick,
+ })
+ }
+
+ if (status.getIn(['account', 'id']) === me) {
+ if (publicStatus) {
menu.push({
icon: 'pin',
hideArrow: true,
title: intl.formatMessage(status.get('pinned') ? messages.unpin : messages.pin),
onClick: this.handlePinClick,
})
- // } else {
- // if (status.get('visibility') === 'private') {
- menu.push({
- icon: 'repost',
- hideArrow: true,
- title: intl.formatMessage(status.get('reblogged') ? messages.cancel_repost_private : messages.repost_private),
- onClick: this.handleRepostClick
- })
- // }
- // }
+ }
+
menu.push({
icon: 'trash',
hideArrow: true,
title: intl.formatMessage(messages.delete),
- action: this.handleDeleteClick
- });
+ onClick: this.handleDeleteClick,
+ })
menu.push({
icon: 'pencil',
hideArrow: true,
- title: intl.formatMessage(messages.edit), action:
- this.handleEditClick
- });
- // } else {
+ title: intl.formatMessage(messages.edit),
+ onClick: this.handleEditClick,
+ })
+ } else {
menu.push({
icon: 'audio-mute',
hideArrow: true,
title: intl.formatMessage(messages.mute, { name: status.getIn(['account', 'username']) }),
- action: this.handleMuteClick
- });
+ onClick: this.handleMuteClick,
+ })
menu.push({
- icon: 'circle',
+ icon: 'block',
hideArrow: true,
title: intl.formatMessage(messages.block, { name: status.getIn(['account', 'username']) }),
- action: this.handleBlockClick
- });
+ onClick: this.handleBlockClick,
+ })
menu.push({
- icon: 'circle',
+ icon: 'warning',
hideArrow: true,
title: intl.formatMessage(messages.report, { name: status.getIn(['account', 'username']) }),
- action: this.handleReport
- });
+ onClick: this.handleReport,
+ })
- // : todo :
- // if (withGroupAdmin) {
+ if (withGroupAdmin) {
menu.push({
- icon: 'circle',
+ icon: 'trash',
hideArrow: true,
title: intl.formatMessage(messages.group_remove_account),
- action: this.handleGroupRemoveAccount
- });
+ onClick: this.handleGroupRemoveAccount,
+ })
menu.push({
- icon: 'circle',
+ icon: 'trash',
hideArrow: true,
title: intl.formatMessage(messages.group_remove_post),
- action: this.handleGroupRemovePost
- });
- // }
+ onClick: this.handleGroupRemovePost,
+ })
+ }
- // if (isStaff) {
+ if (isStaff) {
menu.push({
title: intl.formatMessage(messages.admin_account, { name: status.getIn(['account', 'username']) }),
href: `/admin/accounts/${status.getIn(['account', 'id'])}`
- });
+ })
menu.push({
title: intl.formatMessage(messages.admin_status),
href: `/admin/accounts/${status.getIn(['account', 'id'])}/statuses/${status.get('id')}`
- });
- // }
- // }
+ })
+ }
+ }
}
return (
-
+
-
+
{
return html
}
-export default class Card extends ImmutablePureComponent {
+export default class StatusCard extends ImmutablePureComponent {
static propTypes = {
card: ImmutablePropTypes.map,
onOpenMedia: PropTypes.func.isRequired,
defaultWidth: PropTypes.number,
cacheWidth: PropTypes.func,
+ isReduced: PropTypes.bool,
}
state = {
@@ -129,7 +130,7 @@ export default class Card extends ImmutablePureComponent {
}
render() {
- const { card } = this.props
+ const { card, isReduced } = this.props
const { width, embedded } = this.state
if (card === null) return null
@@ -199,22 +200,25 @@ export default class Card extends ImmutablePureComponent {
return (
-
-
- {!!embed && embed}
- {!embed && thumbnail}
- {!embed &&
-
-
-
- }
+ {
+ !isReduced &&
+
+
+ {!!embed && embed}
+ {!embed && thumbnail}
+ {!embed &&
+
+
+
+ }
+
-
+ }
{description}
@@ -245,7 +249,7 @@ export default class Card extends ImmutablePureComponent {
classNames={[_s.default, _s.flexRow, _s.width100PC].join(' ')}
classNamesSmall={!cardImg ? undefined : [_s.default, _s.width100PC].join(' ')}
>
- {embed}
+ {!isReduced && embed}
{description}
diff --git a/app/javascript/gabsocial/components/status_content.js b/app/javascript/gabsocial/components/status_content.js
index b4086210..853257ad 100644
--- a/app/javascript/gabsocial/components/status_content.js
+++ b/app/javascript/gabsocial/components/status_content.js
@@ -230,6 +230,7 @@ class StatusContent extends ImmutablePureComponent {
statusContent: 1,
px15: !isComment,
outlineNone: 1,
+ mt5: isComment,
})
return (
@@ -290,8 +291,10 @@ class StatusContent extends ImmutablePureComponent {
const statusContentClasses = cx({
statusContent: 1,
- height215PX: collapsed,
+ height215PX: collapsed & !isComment,
+ height122PX: collapsed && isComment,
overflowHidden: collapsed,
+ mt5: isComment,
})
return (
diff --git a/app/javascript/gabsocial/components/status_list.js b/app/javascript/gabsocial/components/status_list.js
index 92af3b73..c854eb30 100644
--- a/app/javascript/gabsocial/components/status_list.js
+++ b/app/javascript/gabsocial/components/status_list.js
@@ -25,6 +25,8 @@ const makeGetStatusIds = () => createSelector([
const statusForId = statuses.get(id);
let showStatus = true;
+ console.log("columnSettings:", columnSettings)
+
if (columnSettings.getIn(['shows', 'reblog']) === false) {
showStatus = showStatus && statusForId.get('reblog') === null;
}
@@ -91,7 +93,6 @@ class StatusList extends ImmutablePureComponent {
queuedItemSize: PropTypes.number,
onDequeueTimeline: PropTypes.func,
group: ImmutablePropTypes.map,
- withGroupAdmin: PropTypes.bool,
onScrollToTop: PropTypes.func,
onScroll: PropTypes.func,
promotion: PropTypes.object, // : todo :
@@ -164,7 +165,19 @@ class StatusList extends ImmutablePureComponent {
}
render () {
- const { statusIds, featuredStatusIds, onLoadMore, timelineId, totalQueuedItemsCount, isLoading, isPartial, withGroupAdmin, group, promotion, promotedStatus, ...other } = this.props;
+ const {
+ statusIds,
+ featuredStatusIds,
+ onLoadMore,
+ timelineId,
+ totalQueuedItemsCount,
+ isLoading,
+ isPartial,
+ group,
+ promotion,
+ promotedStatus,
+ ...other
+ } = this.props
if (isPartial) {
return
@@ -185,9 +198,6 @@ class StatusList extends ImmutablePureComponent {
onMoveUp={this.handleMoveUp}
onMoveDown={this.handleMoveDown}
contextType={timelineId}
- // : todo :
- // group={group}
- // withGroupAdmin={withGroupAdmin}
commentsLimited
/>
))
diff --git a/app/javascript/gabsocial/components/status_media.js b/app/javascript/gabsocial/components/status_media.js
index d70858b1..35a3d359 100644
--- a/app/javascript/gabsocial/components/status_media.js
+++ b/app/javascript/gabsocial/components/status_media.js
@@ -22,6 +22,7 @@ export default class StatusMedia extends ImmutablePureComponent {
visible: PropTypes.bool,
defaultWidth: PropTypes.number,
cacheWidth: PropTypes.number,
+ isComposeModalOpen: PropTypes.bool,
}
// Avoid checking props that are functions (and whose equality will always
@@ -34,6 +35,7 @@ export default class StatusMedia extends ImmutablePureComponent {
'defaultWidth',
'visible',
'width',
+ 'isComposeModalOpen',
]
renderLoadingMedia() {
@@ -52,6 +54,7 @@ export default class StatusMedia extends ImmutablePureComponent {
visible,
defaultWidth,
cacheWidth,
+ isComposeModalOpen,
} = this.props
if (!status) return null
@@ -113,6 +116,7 @@ export default class StatusMedia extends ImmutablePureComponent {
cacheWidth={cacheWidth}
defaultWidth={defaultWidth}
isComment={isComment}
+ isReduced={isComposeModalOpen}
/>
)
}
diff --git a/app/javascript/gabsocial/components/timeline_compose_block.js b/app/javascript/gabsocial/components/timeline_compose_block.js
index 3d7872ea..22f21f1a 100644
--- a/app/javascript/gabsocial/components/timeline_compose_block.js
+++ b/app/javascript/gabsocial/components/timeline_compose_block.js
@@ -42,6 +42,7 @@ class TimelineComposeBlock extends ImmutablePureComponent {
} = this.props
if (modal) {
+ console.log("modal timeline composer: ", this.props)
return (
diff --git a/app/javascript/gabsocial/containers/status_container.js b/app/javascript/gabsocial/containers/status_container.js
index 21cca25a..aacdd8bc 100644
--- a/app/javascript/gabsocial/containers/status_container.js
+++ b/app/javascript/gabsocial/containers/status_container.js
@@ -9,29 +9,17 @@ import {
favorite,
unrepost,
unfavorite,
- pin,
- unpin,
} from '../actions/interactions';
import {
- muteStatus,
- unmuteStatus,
- deleteStatus,
- editStatus,
hideStatus,
revealStatus,
fetchComments,
fetchContext,
} from '../actions/statuses';
-import { initMuteModal } from '../actions/mutes';
-import { initReport } from '../actions/reports';
import { openModal } from '../actions/modal';
import { openPopover } from '../actions/popover';
-import { me, deleteModal } from '../initial_state';
-import {
- createRemovedAccount,
- groupRemoveStatus,
-} from '../actions/groups';
-import { makeGetStatus } from '../selectors';
+import { me } from '../initial_state';
+import { makeGetStatus } from '../selectors'
import Status from '../components/status';
const getDescendants = (state, status, highlightStatusId) => {
@@ -123,6 +111,7 @@ const makeMapStateToProps = () => {
ancestorStatus,
descendantsIds,
isComment,
+ isComposeModalOpen: state.getIn(['modal', 'modalType']) === 'COMPOSE',
}
}
@@ -195,36 +184,6 @@ const mapDispatchToProps = (dispatch) => ({
}
},
- onPin (status) {
- if (!me) return dispatch(openModal('UNAUTHORIZED'))
-
- if (status.get('pinned')) {
- dispatch(unpin(status));
- } else {
- dispatch(pin(status));
- }
- },
-
- onDelete (status, history) {
- if (!me) return dispatch(openModal('UNAUTHORIZED'))
-
- if (!deleteModal) {
- dispatch(deleteStatus(status.get('id'), history));
- } else {
- dispatch(openModal('CONFIRM', {
- message:
,
- confirm:
,
- onConfirm: () => dispatch(deleteStatus(status.get('id'), history)),
- }));
- }
- },
-
- onEdit (status) {
- if (!me) return dispatch(openModal('UNAUTHORIZED'))
-
- dispatch(editStatus(status));
- },
-
onMention (account, router) {
if (!me) return dispatch(openModal('UNAUTHORIZED'))
@@ -239,35 +198,6 @@ const mapDispatchToProps = (dispatch) => ({
dispatch(openModal('VIDEO', { media, time }));
},
- onBlock (status) {
- if (!me) return dispatch(openModal('UNAUTHORIZED'))
-
- const account = status.get('account')
- dispatch(openModal('BLOCK_ACCOUNT', {
- accountId: account.get('id'),
- }))
- },
-
- onReport (status) {
- if (!me) return dispatch(openModal('UNAUTHORIZED'))
-
- dispatch(initReport(status.get('account'), status));
- },
-
- onMute (account) {
- if (!me) return dispatch(openModal('UNAUTHORIZED'))
-
- dispatch(initMuteModal(account));
- },
-
- onMuteConversation (status) {
- if (status.get('muted')) {
- dispatch(unmuteStatus(status.get('id')));
- } else {
- dispatch(muteStatus(status.get('id')));
- }
- },
-
onToggleHidden (status) {
if (!me) return dispatch(openModal('UNAUTHORIZED'))
@@ -278,18 +208,6 @@ const mapDispatchToProps = (dispatch) => ({
}
},
- onGroupRemoveAccount(groupId, accountId) {
- if (!me) return dispatch(openModal('UNAUTHORIZED'))
-
- dispatch(createRemovedAccount(groupId, accountId));
- },
-
- onGroupRemoveStatus(groupId, statusId) {
- if (!me) return dispatch(openModal('UNAUTHORIZED'))
-
- dispatch(groupRemoveStatus(groupId, statusId));
- },
-
onFetchComments(statusId) {
dispatch(fetchComments(statusId))
},
diff --git a/app/javascript/gabsocial/features/compose/components/compose_form.js b/app/javascript/gabsocial/features/compose/components/compose_form.js
index f938d52a..b3ebf9e6 100644
--- a/app/javascript/gabsocial/features/compose/components/compose_form.js
+++ b/app/javascript/gabsocial/features/compose/components/compose_form.js
@@ -14,27 +14,25 @@ import Avatar from '../../../components/avatar'
import Button from '../../../components/button'
import CharacterCounter from '../../../components/character_counter'
import EmojiPickerButton from './emoji_picker_button'
-import GifSelectorButton from './gif_selector_button'
import PollButton from './poll_button'
import PollForm from './poll_form'
-import RichTextEditorButton from './rich_text_editor_button'
import SchedulePostButton from './schedule_post_button'
import SpoilerButton from './spoiler_button'
import StatusContainer from '../../../containers/status_container'
import StatusVisibilityButton from './status_visibility_button'
import UploadButton from './media_upload_button'
import UploadForm from './upload_form'
-import GifForm from './gif_form'
import Input from '../../../components/input'
const messages = defineMessages({
placeholder: { id: 'compose_form.placeholder', defaultMessage: "What's on your mind?" },
commentPlaceholder: { id: 'compose_form.comment_placeholder', defaultMessage: "Write a comment..." },
spoiler_placeholder: { id: 'compose_form.spoiler_placeholder', defaultMessage: 'Write your warning here' },
- publish: { id: 'compose_form.publish', defaultMessage: 'Gab' },
+ publish: { id: 'compose_form.publish', defaultMessage: 'Publish' },
+ publishEdit: { id: 'compose_form.publish_edit', defaultMessage: 'Publish Edit' },
publishLoud: { id: 'compose_form.publish_loud', defaultMessage: '{publish}' },
schedulePost: { id: 'compose_form.schedule_post', defaultMessage: 'Schedule Post' },
-});
+})
export default
@injectIntl
@@ -194,7 +192,7 @@ class ComposeForm extends ImmutablePureComponent {
}
// this.autosuggestTextarea.textbox.setSelectionRange(selectionStart, selectionEnd);
- // this.autosuggestTextarea.textbox.focus();
+ // this.autosuggestTextarea.textbox.focus();
}
}
@@ -241,7 +239,7 @@ class ComposeForm extends ImmutablePureComponent {
const text = [this.props.spoilerText, countableText(this.props.text)].join('');
const disabledButton = disabled || isUploading || isChangingUpload || length(text) > MAX_POST_CHARACTER_COUNT || (length(text) !== 0 && length(text.trim()) === 0 && !anyMedia);
const shouldAutoFocus = autoFocus && !showSearch && !isMobile(window.innerWidth)
-
+
const parentContainerClasses = CX({
default: 1,
width100PC: 1,
@@ -278,160 +276,212 @@ class ComposeForm extends ImmutablePureComponent {
})
return (
-
-
- {
- shouldCondense &&
-
-
+
+ {
+ shouldCondense &&
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {
+ (isUploading || anyMedia) &&
+
+
+
+ }
- }
+
+ }
-
-
- {
- !!reduxReplyToId && isModalOpen && !shouldCondense &&
-
-
-
- }
-
- {
- !!spoiler &&
-
-
-
- }
-
-
-
- {
- (isUploading || anyMedia) &&
-
-
-
- }
-
- {
- /* : todo :
- !!selectedGifSrc && !anyMedia &&
-
-
-
- */
- }
-
- {
- !edit && hasPoll &&
-
- }
-
- {
- !!quoteOfId && isModalOpen &&
-
-
-
- }
-
-
-
-
-
-
-
- { /*
*/ }
-
- {
- !edit && !shouldCondense &&
-
- }
-
- { !shouldCondense &&
}
- { !shouldCondense &&
}
- { !shouldCondense &&
}
- { /* !shouldCondense &&
*/ }
+ {
+ !shouldCondense &&
+
+
+
{
- shouldCondense &&
-
-
+ !!reduxReplyToId && isModalOpen &&
+
+
}
+
+ {
+ !!spoiler &&
+
+
+
+ }
+
+
+
+ {
+ (isUploading || anyMedia) &&
+
+
+
+ }
+
+ {
+ /* : todo :
+ !!selectedGifSrc && !anyMedia &&
+
+
+
+ */
+ }
+
+ {
+ !edit && hasPoll &&
+
+ }
+
+ {
+ !!quoteOfId && isModalOpen &&
+
+
+
+ }
+
+
+
+
+
+
+
+ { /*
*/}
+
+ {
+ !edit &&
+
+ }
+
+
+
+
+ { /* !shouldCondense &&
*/}
+
+
+
+
+
+
+
-
- {
- !shouldCondense &&
-
- }
-
- {
- !shouldCondense &&
-
- }
-
-
+ }
)
}
-}
+}
\ No newline at end of file
diff --git a/app/javascript/gabsocial/features/compose/components/upload_form.js b/app/javascript/gabsocial/features/compose/components/upload_form.js
index ca850436..502f27ed 100644
--- a/app/javascript/gabsocial/features/compose/components/upload_form.js
+++ b/app/javascript/gabsocial/features/compose/components/upload_form.js
@@ -15,8 +15,9 @@ export default
class UploadForm extends ImmutablePureComponent {
static propTypes = {
- mediaIds: ImmutablePropTypes.list.isRequired,
+ isModalOpen: PropTypes.bool,
isUploading: PropTypes.bool,
+ mediaIds: ImmutablePropTypes.list.isRequired,
uploadProgress: PropTypes.number,
};
diff --git a/app/javascript/gabsocial/features/compose/containers/compose_form_container.js b/app/javascript/gabsocial/features/compose/containers/compose_form_container.js
index b8c56fc2..0fc94670 100644
--- a/app/javascript/gabsocial/features/compose/containers/compose_form_container.js
+++ b/app/javascript/gabsocial/features/compose/containers/compose_form_container.js
@@ -15,12 +15,24 @@ import { me } from '../../../initial_state'
const mapStateToProps = (state, { replyToId }) => {
const reduxReplyToId = state.getIn(['compose', 'in_reply_to'])
- let isMatch = !!reduxReplyToId
- if (!isMatch) isMatch = replyToId ? reduxReplyToId === replyToId : true
+ const isModalOpen = state.getIn(['modal', 'modalType']) === 'COMPOSE'
+ let isMatch;
+
+ if (!!reduxReplyToId && !!replyToId && replyToId === reduxReplyToId) {
+ isMatch = true
+ } else if (!reduxReplyToId && !replyToId) {
+ isMatch = true
+ } else {
+ isMatch = false
+ }
+
+ if (isModalOpen) isMatch = true
if (!isMatch) {
return {
isMatch,
+ isModalOpen,
+ reduxReplyToId,
edit: null,
text: '',
suggestions: ImmutableList(),
@@ -35,20 +47,22 @@ const mapStateToProps = (state, { replyToId }) => {
isUploading: false,
showSearch: false,
anyMedia: false,
- isModalOpen: false,
quoteOfId: null,
scheduledAt: null,
account: state.getIn(['accounts', me]),
hasPoll: false,
selectedGifSrc: null,
- reduxReplyToId
}
}
// console.log("isMatch:", isMatch, reduxReplyToId, replyToId, state.getIn(['compose', 'text']))
+ // console.log("reduxReplyToId:", reduxReplyToId, isModalOpen)
+
return {
isMatch,
+ isModalOpen,
+ reduxReplyToId,
edit: state.getIn(['compose', 'id']) !== null,
text: state.getIn(['compose', 'text']),
suggestions: state.getIn(['compose', 'suggestions']),
@@ -63,21 +77,17 @@ const mapStateToProps = (state, { replyToId }) => {
isUploading: state.getIn(['compose', 'is_uploading']),
showSearch: state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden']),
anyMedia: state.getIn(['compose', 'media_attachments']).size > 0,
- isModalOpen: state.getIn(['modal', 'modalType']) === 'COMPOSE',
quoteOfId: state.getIn(['compose', 'quote_of_id']),
scheduledAt: state.getIn(['compose', 'scheduled_at']),
account: state.getIn(['accounts', me]),
hasPoll: state.getIn(['compose', 'poll']),
selectedGifSrc: state.getIn(['tenor', 'selectedGif', 'src']),
- reduxReplyToId,
}
}
const mapDispatchToProps = (dispatch, { reduxReplyToId, replyToId }) => ({
onChange(text, markdown, newReplyToId) {
- // : todo :
- console.log("text:", text, newReplyToId, replyToId, reduxReplyToId)
dispatch(changeCompose(text, markdown, newReplyToId))
},
diff --git a/app/javascript/gabsocial/features/group_timeline.js b/app/javascript/gabsocial/features/group_timeline.js
index a9174744..4a9190ee 100644
--- a/app/javascript/gabsocial/features/group_timeline.js
+++ b/app/javascript/gabsocial/features/group_timeline.js
@@ -91,7 +91,6 @@ class GroupTimeline extends ImmutablePureComponent {
timelineId={`group:${id}`}
onLoadMore={this.handleLoadMore}
group={group}
- withGroupAdmin={relationships && relationships.get('admin')}
emptyMessage={intl.formatMessage(messages.empty)}
/>
)
diff --git a/app/javascript/gabsocial/layouts/layout.js b/app/javascript/gabsocial/layouts/layout.js
index df0bc669..dbbb4e86 100644
--- a/app/javascript/gabsocial/layouts/layout.js
+++ b/app/javascript/gabsocial/layouts/layout.js
@@ -78,7 +78,7 @@ export default class Layout extends PureComponent {
{
!!tabs &&
-
+
diff --git a/app/javascript/gabsocial/pages/home_page.js b/app/javascript/gabsocial/pages/home_page.js
index 38bb4191..5f57a461 100644
--- a/app/javascript/gabsocial/pages/home_page.js
+++ b/app/javascript/gabsocial/pages/home_page.js
@@ -72,11 +72,10 @@ class HomePage extends PureComponent {
diff --git a/app/javascript/gabsocial/reducers/compose.js b/app/javascript/gabsocial/reducers/compose.js
index c7c92b18..1414e5ac 100644
--- a/app/javascript/gabsocial/reducers/compose.js
+++ b/app/javascript/gabsocial/reducers/compose.js
@@ -269,14 +269,8 @@ export default function compose(state = initialState, action) {
map.set('caretPosition', null);
map.set('preselectDate', new Date());
map.set('idempotencyKey', uuid());
-
- if (action.status.get('spoiler_text').length > 0) {
- map.set('spoiler', true);
- map.set('spoiler_text', action.status.get('spoiler_text'));
- } else {
- map.set('spoiler', false);
- map.set('spoiler_text', '');
- }
+ map.set('spoiler', false);
+ map.set('spoiler_text', '');
});
case COMPOSE_QUOTE:
return state.withMutations(map => {
@@ -287,14 +281,8 @@ export default function compose(state = initialState, action) {
map.set('caretPosition', null);
map.set('preselectDate', new Date());
map.set('idempotencyKey', uuid());
-
- if (action.status.get('spoiler_text').length > 0) {
- map.set('spoiler', true);
- map.set('spoiler_text', action.status.get('spoiler_text'));
- } else {
- map.set('spoiler', false);
- map.set('spoiler_text', '');
- }
+ map.set('spoiler', false);
+ map.set('spoiler_text', '');
});
case COMPOSE_REPLY_CANCEL:
case COMPOSE_RESET:
diff --git a/app/javascript/styles/global.css b/app/javascript/styles/global.css
index 518d8d60..d0148015 100644
--- a/app/javascript/styles/global.css
+++ b/app/javascript/styles/global.css
@@ -238,6 +238,7 @@ body {
}
.overflowYHidden { overflow-y: hidden; }
+.overflowXScroll { overflow-x: scroll; }
.textOverflowEllipsis {
max-width: 100%;
@@ -439,6 +440,7 @@ body {
.height158PX { height: 158px; }
.height122PX { height: 122px; }
.height72PX { height: 72px; }
+.height60PX { height: 60px; }
.height53PX { height: 53px; }
.height40PX { height: 40px; }
.height24PX { height: 24px; }
@@ -451,6 +453,7 @@ body {
.maxWidth100PC { max-width: 100%; }
.maxWidth640PX { max-width: 640px; }
+.maxWidth180PX { max-width: 180px; }
.maxWidth100PC42PX { max-width: calc(100% - 42px); }
.width100PC { width: 100%; }
@@ -466,6 +469,7 @@ body {
.width160PX { width: 160px; }
.width84PX { width: 84px; }
.width72PX { width: 72px; }
+.width60PX { width: 60px; }
.width50PX { width: 50px; }
.width20PX { width: 20px; }
.width10PX { width: 10px; }
@@ -659,6 +663,7 @@ body {
.pb10 { padding-bottom: 10px; }
.pb5 { padding-bottom: 5px; }
+.pl35 { padding-left: 35px; }
.pl25 { padding-left: 25px; }
.pl15 { padding-left: 15px; }
.pl10 { padding-left: 10px; }
@@ -830,6 +835,14 @@ body {
color: rgba(255,255,255,0.65);
}
+.noScrollbar::-webkit-scrollbar {
+ display: none;
+}
+
+.noScrollbar {
+ -ms-overflow-style: none;
+}
+
/**
* Rich Text Editor
*/