{
diff --git a/app/javascript/gabsocial/components/panel/profile_stats_panel.js b/app/javascript/gabsocial/components/panel/profile_stats_panel.js
index 896441cb..e2320ba6 100644
--- a/app/javascript/gabsocial/components/panel/profile_stats_panel.js
+++ b/app/javascript/gabsocial/components/panel/profile_stats_panel.js
@@ -32,35 +32,27 @@ class ProfileStatsPanel extends ImmutablePureComponent {
!!account &&
- {
- account.get('id') === me &&
-
- }
}
diff --git a/app/javascript/gabsocial/components/popover/chat_conversation_options_popover.js b/app/javascript/gabsocial/components/popover/chat_conversation_options_popover.js
index 70fdcf19..df1429f4 100644
--- a/app/javascript/gabsocial/components/popover/chat_conversation_options_popover.js
+++ b/app/javascript/gabsocial/components/popover/chat_conversation_options_popover.js
@@ -53,6 +53,12 @@ class ChatConversationOptionsPopover extends ImmutablePureComponent {
subtitle: 'Hide until next message',
onClick: () => this.handleOnHide(),
},
+ {
+ hideArrow: true,
+ title: 'Mute Conversation',
+ subtitle: "Don't get notified of new messages",
+ onClick: () => this.handleOnHide(),
+ },
{},
{
hideArrow: true,
diff --git a/app/javascript/gabsocial/components/popover/chat_message_options_popover.js b/app/javascript/gabsocial/components/popover/chat_message_options_popover.js
index 9ce25bef..0b86521d 100644
--- a/app/javascript/gabsocial/components/popover/chat_message_options_popover.js
+++ b/app/javascript/gabsocial/components/popover/chat_message_options_popover.js
@@ -4,14 +4,11 @@ import { connect } from 'react-redux'
import { closePopover } from '../../actions/popover'
import { deleteChatMessage } from '../../actions/chat_messages'
import {
- isChatMessengerBlocked,
- isChatMessengerMuted,
blockChatMessenger,
unblockChatMessenger,
- muteChatMessenger,
- unmuteChatMessenger,
reportChatMessage,
} from '../../actions/chat_conversation_accounts'
+import { fetchRelationships } from '../../actions/accounts'
import { makeGetChatMessage } from '../../selectors'
import { me } from '../../initial_state'
import PopoverLayout from './popover_layout'
@@ -21,6 +18,12 @@ import Text from '../text'
class ChatMessageOptionsPopover extends React.PureComponent {
+ componentDidMount() {
+ if (!this.props.isMine) {
+ this.props.onFetchRelationships(this.props.fromAccountId)
+ }
+ }
+
handleOnDelete = () => {
this.props.onDeleteChatMessage(this.props.chatMessageId)
}
@@ -31,17 +34,9 @@ class ChatMessageOptionsPopover extends React.PureComponent {
handleOnBlock = () => {
if (this.props.isBlocked) {
- this.props.unblockChatMessenger(this.props.fromAccountId)
+ this.props.onUnblock(this.props.fromAccountId)
} else {
- this.props.blockChatMessenger(this.props.fromAccountId)
- }
- }
-
- handleOnMute = () => {
- if (this.props.isMuted) {
- this.props.unmuteChatMessenger(this.props.fromAccountId)
- } else {
- this.props.muteChatMessenger(this.props.fromAccountId)
+ this.props.onBlock(this.props.fromAccountId)
}
}
@@ -53,7 +48,6 @@ class ChatMessageOptionsPopover extends React.PureComponent {
const {
isXS,
isMine,
- isMuted,
isBlocked,
} = this.props
@@ -76,12 +70,6 @@ class ChatMessageOptionsPopover extends React.PureComponent {
subtitle: isBlocked ? '' : 'The messenger will not be able to message you.',
onClick: () => this.handleOnBlock(),
},
- {
- hideArrow: true,
- title: isMuted ? 'Unmute Messenger' : 'Mute Messenger',
- subtitle: isMuted ? '' : 'You will not be notified of new messsages',
- onClick: () => this.handleOnMute(),
- },
]
return (
@@ -96,12 +84,15 @@ class ChatMessageOptionsPopover extends React.PureComponent {
}
}
-const mapStateToProps = (state, { chatMessageId }) => ({
- isMine: state.getIn(['chat_messages', chatMessageId, 'from_account_id']) === me,
- fromAccountId: state.getIn(['chat_messages', chatMessageId, 'from_account_id']),
- isBlocked: state.getIn(['chat_messages', chatMessageId, 'from_account_id']),
- isMuted: state.getIn(['chat_messages', chatMessageId, 'from_account_id']),
-})
+const mapStateToProps = (state, { chatMessageId }) => {
+ const fromAccountId = state.getIn(['chat_messages', chatMessageId, 'from_account_id'])
+
+ return {
+ fromAccountId,
+ isMine: fromAccountId === me,
+ isBlocked: state.getIn(['relationships', fromAccountId, 'chat_blocked_by'], false),
+ }
+}
const mapDispatchToProps = (dispatch) => ({
onDeleteChatMessage(chatMessageId) {
@@ -114,15 +105,12 @@ const mapDispatchToProps = (dispatch) => ({
onUnblock(accountId) {
dispatch(unblockChatMessenger(accountId))
},
- onMute(accountId) {
- dispatch(muteChatMessenger(accountId))
- },
- onUnmute(accountId) {
- dispatch(unmuteChatMessenger(accountId))
- },
onReportChatMessage(chatMessageId) {
dispatch(reportChatMessage(chatMessageId))
},
+ onFetchRelationships(accountId) {
+ // dispatch(fetchRelationships(accountId))
+ },
onClosePopover() {
dispatch(closePopover())
},
@@ -130,9 +118,9 @@ const mapDispatchToProps = (dispatch) => ({
ChatMessageOptionsPopover.propTypes = {
isXS: PropTypes.bool,
+ isMine: PropTypes.bool,
chatMessageId: PropTypes.string.isRequired,
isBlocked: PropTypes.bool.isRequired,
- isMuted: PropTypes.bool.isRequired,
onDeleteChatMessage: PropTypes.func.isRequired,
}
diff --git a/app/javascript/gabsocial/components/popover/compose_post_destination_popover.js b/app/javascript/gabsocial/components/popover/compose_post_destination_popover.js
index 998898ca..586f3d91 100644
--- a/app/javascript/gabsocial/components/popover/compose_post_destination_popover.js
+++ b/app/javascript/gabsocial/components/popover/compose_post_destination_popover.js
@@ -4,6 +4,7 @@ import { connect } from 'react-redux'
import { closePopover } from '../../actions/popover'
import PopoverLayout from './popover_layout'
import List from '../list'
+import Button from '../button'
import Text from '../text'
class ComposePostDesinationPopover extends React.PureComponent {
@@ -38,8 +39,20 @@ class ComposePostDesinationPopover extends React.PureComponent {
isXS={isXS}
onClose={this.handleOnClosePopover}
>
-
Post to:
-
+
+ Post to:
+
+
+
+
+
+ Select group:
+
+
+
)
}
diff --git a/app/javascript/gabsocial/components/popover/status_options_popover.js b/app/javascript/gabsocial/components/popover/status_options_popover.js
index 7ce05ba8..0170caf2 100644
--- a/app/javascript/gabsocial/components/popover/status_options_popover.js
+++ b/app/javascript/gabsocial/components/popover/status_options_popover.js
@@ -78,6 +78,7 @@ class StatusOptionsPopover extends ImmutablePureComponent {
handleGroupRemoveAccount = () => {
const { status } = this.props
+ // : todo : check
this.props.onGroupRemoveAccount(status.getIn(['group', 'id']), status.getIn(['account', 'id']))
}
diff --git a/app/javascript/gabsocial/components/profile_header.js b/app/javascript/gabsocial/components/profile_header.js
index 4c7bca18..081d4b6e 100644
--- a/app/javascript/gabsocial/components/profile_header.js
+++ b/app/javascript/gabsocial/components/profile_header.js
@@ -107,7 +107,7 @@ class ProfileHeader extends ImmutablePureComponent {
title: intl.formatMessage(messages.comments),
},
{
- to: `/${account.get('acct')}/photos`,
+ to: `/${account.get('acct')}/albums`,
title: intl.formatMessage(messages.photos),
},
{
@@ -119,7 +119,11 @@ class ProfileHeader extends ImmutablePureComponent {
const isMyProfile = !account ? false : account.get('id') === me
if (isMyProfile) {
tabs.push({
- to: `/${account.get('acct')}/bookmarks`,
+ to: `/${account.get('acct')}/likes`,
+ title: 'Likes',
+ })
+ tabs.push({
+ to: `/${account.get('acct')}/bookmark_collections`,
title: intl.formatMessage(messages.bookmarks),
})
}
@@ -149,21 +153,12 @@ class ProfileHeader extends ImmutablePureComponent {
displayNone: stickied,
})
- const mobileAvatarContainerClasses = CX({
- d: 1,
- circle: 1,
- boxShadowProfileAvatar: 1,
- mtNeg50PX: !headerMissing,
- })
-
const mobileDescriptionContainerClasses = CX({
d: 1,
w100PC: 1,
px15: 1,
- mt5: !!me,
mb10: 1,
pt15: !!me,
- pb10: 1,
})
return (
@@ -174,10 +169,10 @@ class ProfileHeader extends ImmutablePureComponent {
{
!headerMissing &&
-
+
@@ -185,85 +180,80 @@ class ProfileHeader extends ImmutablePureComponent {
}
{
headerMissing &&
-
+
}
-
-
-
+
+
+
+ {
+ account && account.get('id') === me &&
+
+
+
+ }
+
+ {
+ account && account.get('id') !== me && !!me &&
+
+ }
-
-
- {
- account && account.get('id') === me &&
-
-
-
- }
-
- {
- account && account.get('id') !== me && !!me &&
-
- }
-
{children}
-
diff --git a/app/javascript/gabsocial/components/sidebar/deck_sidebar.js b/app/javascript/gabsocial/components/sidebar/deck_sidebar.js
index 456d2140..235f6fbc 100644
--- a/app/javascript/gabsocial/components/sidebar/deck_sidebar.js
+++ b/app/javascript/gabsocial/components/sidebar/deck_sidebar.js
@@ -89,18 +89,12 @@ class DeckSidebar extends ImmutablePureComponent {
{
+ /*
!!gabDeckOrder && gabDeckOrder.map((item, i) => (
-
+
))
- }
+ */
+ }
diff --git a/app/javascript/gabsocial/components/user_stat.js b/app/javascript/gabsocial/components/user_stat.js
index f91b7ca5..119b80ef 100644
--- a/app/javascript/gabsocial/components/user_stat.js
+++ b/app/javascript/gabsocial/components/user_stat.js
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types'
import { NavLink } from 'react-router-dom'
import { CX } from '../constants'
import Text from './text'
+import DotTextSeperator from './dot_text_seperator'
/**
* Renders a user stat component
@@ -30,17 +31,29 @@ class UserStat extends React.PureComponent {
title,
value,
isCentered,
+ isInline,
+ isLast,
} = this.props
const { hovering } = this.state
const align = isCentered ? 'center' : 'left'
+ const titleSize = isInline ? 'normal' : 'extraLarge'
+ const subtitleSize = isInline ? 'normal' : 'small'
+
const containerClasses = CX({
d: 1,
cursorPointer: 1,
noUnderline: 1,
flexNormal: isCentered,
- flexGrow1: !isCentered,
- pr15: !isCentered,
+ flexGrow1: !isCentered && !isInline,
+ flexRow: isInline,
+ aiCenter: isInline,
+ pr15: !isCentered && !isInline,
+ pr10: !isCentered && isInline,
+ })
+ const subtitleClasses = CX({
+ pr5: isInline,
+ pl5: isInline,
})
return (
@@ -51,12 +64,13 @@ class UserStat extends React.PureComponent {
onMouseEnter={this.handleOnMouseEnter}
onMouseLeave={this.handleOnMouseLeave}
>
-
+
{value}
-
+
{title}
+ { !isLast && isInline && }
)
}
@@ -72,6 +86,8 @@ UserStat.propTypes = {
PropTypes.object,
]).isRequired,
isCentered: PropTypes.bool,
+ isInline: PropTypes.bool,
+ isLast: PropTypes.bool,
}
export default UserStat
\ No newline at end of file
diff --git a/app/javascript/gabsocial/constants.js b/app/javascript/gabsocial/constants.js
index 31c593a7..ef3f4e57 100644
--- a/app/javascript/gabsocial/constants.js
+++ b/app/javascript/gabsocial/constants.js
@@ -46,11 +46,12 @@ export const POPOVER_TIMELINE_INJECTION_OPTIONS = 'TIMELINE_INJECTION_OPTIONS'
export const POPOVER_USER_INFO = 'USER_INFO'
export const POPOVER_VIDEO_STATS = 'VIDEO_STATS'
+export const MODAL_ALBUM_CREATE = 'ALBUM_CREATE'
export const MODAL_BLOCK_ACCOUNT = 'BLOCK_ACCOUNT'
+export const MODAL_BOOKMARK_COLLECTION_CREATE = 'BOOKMARK_COLLECTION_CREATE'
export const MODAL_BOOST = 'BOOST'
export const MODAL_CHAT_CONVERSATION_CREATE = 'CHAT_CONVERSATION_CREATE'
export const MODAL_CHAT_CONVERSATION_DELETE = 'CHAT_CONVERSATION_DELETE'
-export const MODAL_COMMUNITY_TIMELINE_SETTINGS = 'COMMUNITY_TIMELINE_SETTINGS'
export const MODAL_COMPOSE = 'COMPOSE'
export const MODAL_CONFIRM = 'CONFIRM'
export const MODAL_DECK_COLUMN_ADD = 'DECK_COLUMN_ADD'
@@ -62,7 +63,6 @@ export const MODAL_EMAIL_CONFIRMATION_REMINDER = 'EMAIL_CONFIRMATION_REMINDER'
export const MODAL_GROUP_CREATE = 'GROUP_CREATE'
export const MODAL_GROUP_DELETE = 'GROUP_DELETE'
export const MODAL_GROUP_PASSWORD = 'GROUP_PASSWORD'
-export const MODAL_HASHTAG_TIMELINE_SETTINGS = 'HASHTAG_TIMELINE_SETTINGS'
export const MODAL_HOME_TIMELINE_SETTINGS = 'HOME_TIMELINE_SETTINGS'
export const MODAL_HOTKEYS = 'HOTKEYS'
export const MODAL_LIST_ADD_USER = 'LIST_ADD_USER'
diff --git a/app/javascript/gabsocial/features/account_albums.js b/app/javascript/gabsocial/features/account_albums.js
new file mode 100644
index 00000000..5f7f7fd6
--- /dev/null
+++ b/app/javascript/gabsocial/features/account_albums.js
@@ -0,0 +1,150 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import { connect } from 'react-redux'
+import ImmutablePropTypes from 'react-immutable-proptypes'
+import ImmutablePureComponent from 'react-immutable-pure-component'
+import { injectIntl, defineMessages } from 'react-intl'
+import { expandAccountMediaTimeline } from '../actions/timelines'
+import { getAccountGallery } from '../selectors'
+import ColumnIndicator from '../components/column_indicator'
+import MediaItem from '../components/media_item'
+import LoadMore from '../components/load_more'
+import Block from '../components/block'
+import MediaGalleryPlaceholder from '../components/placeholder/media_gallery_placeholder'
+
+class AccountAlbums extends ImmutablePureComponent {
+
+ componentDidMount() {
+ const { accountId, mediaType } = this.props
+
+ if (accountId && accountId !== -1) {
+ this.props.dispatch(expandAccountMediaTimeline(accountId, { mediaType }))
+ }
+ }
+
+ componentWillReceiveProps(nextProps) {
+ if (
+ (nextProps.accountId && nextProps.accountId !== this.props.accountId) ||
+ (nextProps.accountId && nextProps.mediaType !== this.props.mediaType)
+ ) {
+ this.props.dispatch(expandAccountMediaTimeline(nextProps.accountId, {
+ mediaType: nextProps.mediaType,
+ }))
+ }
+ }
+
+ handleScrollToBottom = () => {
+ if (this.props.hasMore) {
+ this.handleLoadMore(this.props.attachments.size > 0 ? this.props.attachments.last().getIn(['status', 'id']) : undefined)
+ }
+ }
+
+ handleScroll = (e) => {
+ const { scrollTop, scrollHeight, clientHeight } = e.target
+ const offset = scrollHeight - scrollTop - clientHeight
+
+ if (150 > offset && !this.props.isLoading) {
+ this.handleScrollToBottom()
+ }
+ }
+
+ handleLoadMore = (maxId) => {
+ if (this.props.accountId && this.props.accountId !== -1) {
+ this.props.dispatch(expandAccountMediaTimeline(this.props.accountId, {
+ maxId,
+ mediaType: this.props.mediaType,
+ }))
+ }
+ }
+
+ handleLoadOlder = (e) => {
+ e.preventDefault()
+ this.handleScrollToBottom()
+ }
+
+ render() {
+ const {
+ attachments,
+ isLoading,
+ hasMore,
+ intl,
+ account,
+ } = this.props
+
+ if (!account) return null
+
+ return (
+
+
+
+ {
+ attachments.map((attachment, i) => (
+
+ ))
+ }
+
+ {
+ isLoading && attachments.size === 0 &&
+
+
+
+ }
+
+ {
+ !isLoading && attachments.size === 0 &&
+
+ }
+
+
+
+
+ Bookmark Collections
+
+
+
+
)
}
@@ -49,6 +76,9 @@ const mapStateToProps = (state) => ({
})
const mapDispatchToProps = (dispatch) => ({
+ onOpenModal() {
+ dispatch(openModal(MODAL_BOOKMARK_COLLECTION_CREATE))
+ },
onFetchBookmarkCollections() {
dispatch(fetchBookmarkCollections())
},
@@ -58,6 +88,7 @@ BookmarkCollections.propTypes = {
isLoading: PropTypes.bool.isRequired,
isError: PropTypes.bool.isRequired,
onFetchBookmarkCollections: PropTypes.func.isRequired,
+ onOpenModal: PropTypes.func.isRequired,
bookmarkCollections: ImmutablePropTypes.list,
}
diff --git a/app/javascript/gabsocial/features/bookmarked_statuses.js b/app/javascript/gabsocial/features/bookmarked_statuses.js
index df826eb9..59a6683f 100644
--- a/app/javascript/gabsocial/features/bookmarked_statuses.js
+++ b/app/javascript/gabsocial/features/bookmarked_statuses.js
@@ -13,11 +13,11 @@ import ColumnIndicator from '../components/column_indicator'
class BookmarkedStatuses extends ImmutablePureComponent {
componentWillMount() {
- this.props.dispatch(fetchBookmarkedStatuses())
+ this.props.dispatch(fetchBookmarkedStatuses(this.props.bookmarkCollectionId))
}
handleLoadMore = debounce(() => {
- this.props.dispatch(expandBookmarkedStatuses())
+ this.props.dispatch(expandBookmarkedStatuses(this.props.bookmarkCollectionId))
}, 300, { leading: true })
render() {
@@ -46,14 +46,13 @@ class BookmarkedStatuses extends ImmutablePureComponent {
}
-const mapStateToProps = (state, { params: { username } }) => {
- return {
- isMyAccount: (username.toLowerCase() === meUsername.toLowerCase()),
- statusIds: state.getIn(['status_lists', 'bookmarks', 'items']),
- isLoading: state.getIn(['status_lists', 'bookmarks', 'isLoading'], true),
- hasMore: !!state.getIn(['status_lists', 'bookmarks', 'next']),
- }
-}
+const mapStateToProps = (state, { params: { username, bookmarkCollectionId } }) => ({
+ bookmarkCollectionId,
+ isMyAccount: (username.toLowerCase() === meUsername.toLowerCase()),
+ statusIds: state.getIn(['status_lists', 'bookmarks', 'items']),
+ isLoading: state.getIn(['status_lists', 'bookmarks', 'isLoading'], true),
+ hasMore: !!state.getIn(['status_lists', 'bookmarks', 'next']),
+})
BookmarkedStatuses.propTypes = {
dispatch: PropTypes.func.isRequired,
diff --git a/app/javascript/gabsocial/features/chat_conversation_create.js b/app/javascript/gabsocial/features/chat_conversation_create.js
index 6d99053f..4e7660be 100644
--- a/app/javascript/gabsocial/features/chat_conversation_create.js
+++ b/app/javascript/gabsocial/features/chat_conversation_create.js
@@ -21,7 +21,6 @@ class ChatConversationCreate extends React.PureComponent {
}
handleOnCreateChatConversation = (accountId) => {
- console.log("handleOnCreateChatConversation:", accountId)
this.props.onCreateChatConversation(accountId)
}
@@ -69,7 +68,6 @@ const mapStateToProps = (state) => ({
const mapDispatchToProps = (dispatch) => ({
onChange: (value) => {
- console.log("value", value)
dispatch(fetchChatConversationAccountSuggestions(value))
},
onCreateChatConversation: (accountId) => {
diff --git a/app/javascript/gabsocial/features/chat_conversation_muted_accounts.js b/app/javascript/gabsocial/features/chat_conversation_muted_accounts.js
deleted file mode 100644
index 29057928..00000000
--- a/app/javascript/gabsocial/features/chat_conversation_muted_accounts.js
+++ /dev/null
@@ -1,87 +0,0 @@
-import React from 'react'
-import PropTypes from 'prop-types'
-import { connect } from 'react-redux'
-import { injectIntl, FormattedMessage } from 'react-intl'
-import ImmutablePureComponent from 'react-immutable-pure-component'
-import ImmutablePropTypes from 'react-immutable-proptypes'
-import debounce from 'lodash.debounce'
-import { me } from '../initial_state'
-import {
- fetchChatMessengerMutes,
- expandChatMessengerMutes,
- unmuteChatMessenger,
-} from '../actions/chat_conversation_accounts'
-import Account from '../components/account'
-import Block from '../components/block'
-import BlockHeading from '../components/block_heading'
-import ScrollableList from '../components/scrollable_list'
-
-class ChatConversationMutedAccounts extends ImmutablePureComponent {
-
- componentWillMount() {
- this.props.onFetchMutes()
- }
-
- handleLoadMore = debounce(() => {
- this.props.onExpandMutes()
- }, 300, { leading: true })
-
- render() {
- const {
- accountIds,
- hasMore,
- isLoading,
- } = this.props
-
- return (
-
-
- } />
-
-
}
- >
- {
- accountIds && accountIds.map((id) =>
-
this.props.onRemove(id)}
- actionTitle='Remove'
- />
- )
- }
-
-
-
-
-
+ {
+ !isIntroduction &&
+
+
+
+ }
{
- !isModal &&
+ !isModal && !isIntroduction &&
{ !edit &&
}
-
-
+ { !isIntroduction &&
}
+ { !isIntroduction &&
}
{ !hidePro && !edit &&
}
{ !hidePro && !edit &&
}
{ !hidePro && !isXS &&
}
diff --git a/app/javascript/gabsocial/features/compose/components/compose_form.js b/app/javascript/gabsocial/features/compose/components/compose_form.js
index ec27aa32..3a3bfc6b 100644
--- a/app/javascript/gabsocial/features/compose/components/compose_form.js
+++ b/app/javascript/gabsocial/features/compose/components/compose_form.js
@@ -273,7 +273,7 @@ class ComposeForm extends ImmutablePureComponent {
-
+
diff --git a/app/javascript/gabsocial/features/deck.js b/app/javascript/gabsocial/features/deck.js
index 28e2f55a..8f852737 100644
--- a/app/javascript/gabsocial/features/deck.js
+++ b/app/javascript/gabsocial/features/deck.js
@@ -25,7 +25,9 @@ import Text from '../components/text'
import {
AccountTimeline,
Compose,
+ GroupTimeline,
LikedStatuses,
+ ListTimeline,
HomeTimeline,
Notifications,
HashtagTimeline,
@@ -73,7 +75,7 @@ class Deck extends React.PureComponent {
let Component = null
let componentParams = {}
- let title, icon = ''
+ let title, subtitle, icon = ''
switch (deckColumn) {
case 'notifications':
@@ -123,18 +125,32 @@ class Deck extends React.PureComponent {
break
}
- // : todo :
if (!Component) {
if (deckColumn.indexOf('user.') > -1) {
} else if (deckColumn.indexOf('list.') > -1) {
-
+ const listId = deckColumn.replace('list.', '')
+ title = 'List'
+ subtitle = listId
+ icon = 'list'
+ Component = ListTimeline
+ componentParams = { params: { id: listId }}
} else if (deckColumn.indexOf('group.') > -1) {
-
+ const groupId = deckColumn.replace('group.', '')
+ title = 'Group'
+ subtitle = groupId
+ icon = 'group'
+ Component = GroupTimeline
+ componentParams = { params: { id: groupId }}
} else if (deckColumn.indexOf('news.') > -1) {
-
+ // : todo :
} else if (deckColumn.indexOf('hashtag.') > -1) {
-
+ const hashtag = deckColumn.replace('hashtag.', '')
+ title = 'Hashtag'
+ subtitle = hashtag
+ icon = 'apps'
+ Component = HashtagTimeline
+ componentParams = { params: { id: hashtag }}
}
}
@@ -146,7 +162,7 @@ class Deck extends React.PureComponent {
index={index}
sortIndex={index}
>
-
+
@@ -158,6 +174,8 @@ class Deck extends React.PureComponent {
const isEmpty = gabDeckOrder.size === 0
+ console.log("gabDeckOrder:", gabDeckOrder)
+
return (
diff --git a/app/javascript/gabsocial/features/ui/ui.js b/app/javascript/gabsocial/features/ui/ui.js
index d28a8b51..b8931842 100644
--- a/app/javascript/gabsocial/features/ui/ui.js
+++ b/app/javascript/gabsocial/features/ui/ui.js
@@ -56,16 +56,17 @@ import {
AccountGallery,
AccountTimeline,
AccountCommentsTimeline,
+ AlbumCreate,
Assets,
BlockedAccounts,
BookmarkCollections,
+ BookmarkCollectionCreate,
BookmarkedStatuses,
CaliforniaConsumerProtection,
CaliforniaConsumerProtectionContact,
ChatConversationCreate,
ChatConversationRequests,
ChatConversationBlockedAccounts,
- ChatConversationMutedAccounts,
CommunityTimeline,
Compose,
Deck,
@@ -219,7 +220,6 @@ class SwitchingArea extends React.PureComponent {
-
@@ -278,9 +278,13 @@ class SwitchingArea extends React.PureComponent {
+
+
+
-
-
+
+
+
diff --git a/app/javascript/gabsocial/features/ui/util/async_components.js b/app/javascript/gabsocial/features/ui/util/async_components.js
index 24667426..26590bda 100644
--- a/app/javascript/gabsocial/features/ui/util/async_components.js
+++ b/app/javascript/gabsocial/features/ui/util/async_components.js
@@ -3,10 +3,14 @@ export function AboutSidebar() { return import(/* webpackChunkName: "components/
export function AccountTimeline() { return import(/* webpackChunkName: "features/account_timeline" */'../../account_timeline') }
export function AccountCommentsTimeline() { return import(/* webpackChunkName: "features/account_comments_timeline" */'../../account_comments_timeline') }
export function AccountGallery() { return import(/* webpackChunkName: "features/account_gallery" */'../../account_gallery') }
+export function AlbumCreate() { return import(/* webpackChunkName: "features/album_create" */'../../album_create') }
+export function AlbumCreateModal() { return import(/* webpackChunkName: "components/album_create_modal" */'../../../components/modal/album_create_modal') }
export function Assets() { return import(/* webpackChunkName: "features/about/assets" */'../../about/assets') }
export function BlockAccountModal() { return import(/* webpackChunkName: "components/block_account_modal" */'../../../components/modal/block_account_modal') }
export function BlockedAccounts() { return import(/* webpackChunkName: "features/blocked_accounts" */'../../blocked_accounts') }
export function BookmarkCollections() { return import(/* webpackChunkName: "features/bookmark_collections" */'../../bookmark_collections') }
+export function BookmarkCollectionCreate() { return import(/* webpackChunkName: "features/bookmark_collection_create" */'../../bookmark_collection_create') }
+export function BookmarkCollectionCreateModal() { return import(/* webpackChunkName: "components/bookmark_collection_create_modal" */'../../../components/modal/bookmark_collection_create_modal') }
export function BookmarkedStatuses() { return import(/* webpackChunkName: "features/bookmarked_statuses" */'../../bookmarked_statuses') }
export function BoostModal() { return import(/* webpackChunkName: "components/boost_modal" */'../../../components/modal/boost_modal') }
export function CaliforniaConsumerProtection() { return import(/* webpackChunkName: "features/california_consumer_protection" */'../../about/california_consumer_protection') }
@@ -15,13 +19,11 @@ export function ChatConversationBlockedAccounts() { return import(/* webpackChun
export function ChatConversationCreate() { return import(/* webpackChunkName: "features/chat_conversation_create" */'../../chat_conversation_create') }
export function ChatConversationCreateModal() { return import(/* webpackChunkName: "components/chat_conversation_create_modal" */'../../../components/modal/chat_conversation_create_modal') }
export function ChatConversationDeleteModal() { return import(/* webpackChunkName: "components/chat_conversation_delete_modal" */'../../../components/modal/chat_conversation_delete_modal') }
-export function ChatConversationMutedAccounts() { return import(/* webpackChunkName: "features/chat_conversation_muted_accounts" */'../../chat_conversation_muted_accounts') }
export function ChatConversationOptionsPopover() { return import(/* webpackChunkName: "components/chat_conversation_options_popover" */'../../../components/popover/chat_conversation_options_popover') }
export function ChatConversationRequests() { return import(/* webpackChunkName: "features/chat_conversation_requests" */'../../chat_conversation_requests') }
export function ChatMessageOptionsPopover() { return import(/* webpackChunkName: "components/chat_message_options_popover" */'../../../components/popover/chat_message_options_popover') }
export function CommentSortingOptionsPopover() { return import(/* webpackChunkName: "components/comment_sorting_options_popover" */'../../../components/popover/comment_sorting_options_popover') }
export function CommunityTimeline() { return import(/* webpackChunkName: "features/community_timeline" */'../../community_timeline') }
-export function CommunityTimelineSettingsModal() { return import(/* webpackChunkName: "components/community_timeline_settings_modal" */'../../../components/modal/community_timeline_settings_modal') }
export function Compose() { return import(/* webpackChunkName: "features/compose" */'../../compose') }
export function ComposeForm() { return import(/* webpackChunkName: "components/compose_form" */'../../compose/components/compose_form') }
export function ComposeModal() { return import(/* webpackChunkName: "components/compose_modal" */'../../../components/modal/compose_modal') }
@@ -70,7 +72,6 @@ export function GroupsCategories() { return import(/* webpackChunkName: "feature
export function GroupCategory() { return import(/* webpackChunkName: "features/group_category" */'../../group_category') }
export function GroupTag() { return import(/* webpackChunkName: "features/group_tag" */'../../group_tag') }
export function HashtagTimeline() { return import(/* webpackChunkName: "features/hashtag_timeline" */'../../hashtag_timeline') }
-export function HashtagTimelineSettingsModal() { return import(/* webpackChunkName: "components/hashtag_timeline_settings_modal" */'../../../components/modal/hashtag_timeline_settings_modal') }
export function HomeTimeline() { return import(/* webpackChunkName: "features/home_timeline" */'../../home_timeline') }
export function HomeTimelineSettingsModal() { return import(/* webpackChunkName: "components/home_timeline_settings_modal" */'../../../components/modal/home_timeline_settings_modal') }
export function HotkeysModal() { return import(/* webpackChunkName: "components/hotkeys_modal" */'../../../components/modal/hotkeys_modal') }
diff --git a/app/javascript/gabsocial/layouts/deck_layout.js b/app/javascript/gabsocial/layouts/deck_layout.js
index 5b7844b4..f687a229 100644
--- a/app/javascript/gabsocial/layouts/deck_layout.js
+++ b/app/javascript/gabsocial/layouts/deck_layout.js
@@ -41,7 +41,7 @@ class DeckLayout extends React.PureComponent {
if (isXS) {
return (
-
+
Gab Deck is not available on mobile or tablet devices. Please only access using a desktop computer.
diff --git a/app/javascript/gabsocial/layouts/profile_layout.js b/app/javascript/gabsocial/layouts/profile_layout.js
index 892d24c5..7027072c 100644
--- a/app/javascript/gabsocial/layouts/profile_layout.js
+++ b/app/javascript/gabsocial/layouts/profile_layout.js
@@ -110,7 +110,7 @@ class ProfileLayout extends ImmutablePureComponent {
-
diff --git a/app/javascript/gabsocial/pages/community_page.js b/app/javascript/gabsocial/pages/community_page.js
index 9ce14539..7b59c541 100644
--- a/app/javascript/gabsocial/pages/community_page.js
+++ b/app/javascript/gabsocial/pages/community_page.js
@@ -1,11 +1,8 @@
import React from 'react'
import PropTypes from 'prop-types'
-import { connect } from 'react-redux'
import { defineMessages, injectIntl } from 'react-intl'
-import { openModal } from '../actions/modal'
import PageTitle from '../features/ui/util/page_title'
import DefaultLayout from '../layouts/default_layout'
-import { MODAL_COMMUNITY_TIMELINE_SETTINGS } from '../constants'
import {
LinkFooter,
GroupsPanel,
@@ -16,10 +13,6 @@ import {
class CommunityPage extends React.PureComponent {
- onOpenCommunityPageSettingsModal = () => {
- this.props.dispatch(openModal(MODAL_COMMUNITY_TIMELINE_SETTINGS))
- }
-
render() {
const { children, intl } = this.props
@@ -29,12 +22,6 @@ class CommunityPage extends React.PureComponent {
{
- const { params } = this.props
-
- const hashtag = isObject(params) ? params.id : ''
- if (!hashtag) return
-
- this.props.dispatch(openModal(MODAL_HASHTAG_TIMELINE_SETTINGS, {
- hashtag,
- }))
- }
-
render() {
const {
children,
@@ -41,12 +27,6 @@ class HashtagPage extends React.PureComponent {
showBackBtn
title={intl.formatMessage(messages.hashtagTimeline)}
page={`hashtag.${hashtag}`}
- actions={[
- {
- icon: 'ellipsis',
- onClick: this.onOpenHashtagPageSettingsModal,
- },
- ]}
layout={[
ProgressPanel,
TrendsBreakingPanel,
@@ -73,4 +53,4 @@ HashtagPage.propTypes = {
params: PropTypes.object.isRequired,
}
-export default injectIntl(connect()(HashtagPage))
\ No newline at end of file
+export default injectIntl(HashtagPage)
\ No newline at end of file
diff --git a/app/javascript/gabsocial/reducers/relationships.js b/app/javascript/gabsocial/reducers/relationships.js
index e2a08d17..6e804054 100644
--- a/app/javascript/gabsocial/reducers/relationships.js
+++ b/app/javascript/gabsocial/reducers/relationships.js
@@ -10,41 +10,47 @@ import {
ACCOUNT_MUTE_SUCCESS,
ACCOUNT_UNMUTE_SUCCESS,
RELATIONSHIPS_FETCH_SUCCESS,
-} from '../actions/accounts';
-import { Map as ImmutableMap, fromJS } from 'immutable';
+} from '../actions/accounts'
+import {
+ BLOCK_CHAT_MESSAGER_SUCCESS,
+ UNBLOCK_CHAT_MESSAGER_SUCCESS,
+} from '../actions/chat_conversation_accounts'
+import { Map as ImmutableMap, fromJS } from 'immutable'
-const normalizeRelationship = (state, relationship) => state.set(relationship.id, fromJS(relationship));
+const normalizeRelationship = (state, relationship) => state.set(relationship.id, fromJS(relationship))
const normalizeRelationships = (state, relationships) => {
relationships.forEach(relationship => {
- state = normalizeRelationship(state, relationship);
- });
+ state = normalizeRelationship(state, relationship)
+ })
- return state;
-};
+ return state
+}
-const initialState = ImmutableMap();
+const initialState = ImmutableMap()
export default function relationships(state = initialState, action) {
switch(action.type) {
case ACCOUNT_FOLLOW_REQUEST:
- return state.setIn([action.id, action.locked ? 'requested' : 'following'], true);
+ return state.setIn([action.id, action.locked ? 'requested' : 'following'], true)
case ACCOUNT_FOLLOW_FAIL:
- return state.setIn([action.id, action.locked ? 'requested' : 'following'], false);
+ return state.setIn([action.id, action.locked ? 'requested' : 'following'], false)
case ACCOUNT_UNFOLLOW_REQUEST:
- return state.setIn([action.id, 'following'], false);
+ return state.setIn([action.id, 'following'], false)
case ACCOUNT_UNFOLLOW_FAIL:
- return state.setIn([action.id, 'following'], true);
+ return state.setIn([action.id, 'following'], true)
case ACCOUNT_FOLLOW_SUCCESS:
case ACCOUNT_UNFOLLOW_SUCCESS:
case ACCOUNT_BLOCK_SUCCESS:
case ACCOUNT_UNBLOCK_SUCCESS:
case ACCOUNT_MUTE_SUCCESS:
case ACCOUNT_UNMUTE_SUCCESS:
- return normalizeRelationship(state, action.relationship);
+ case BLOCK_CHAT_MESSAGER_SUCCESS:
+ case UNBLOCK_CHAT_MESSAGER_SUCCESS:
+ return normalizeRelationship(state, action.relationship)
case RELATIONSHIPS_FETCH_SUCCESS:
- return normalizeRelationships(state, action.relationships);
+ return normalizeRelationships(state, action.relationships)
default:
- return state;
+ return state
}
-};
+}
\ No newline at end of file
diff --git a/app/javascript/gabsocial/reducers/settings.js b/app/javascript/gabsocial/reducers/settings.js
index 4080a673..513d9d1b 100644
--- a/app/javascript/gabsocial/reducers/settings.js
+++ b/app/javascript/gabsocial/reducers/settings.js
@@ -50,18 +50,12 @@ const initialState = ImmutableMap({
theme: 'white',
}),
- home: ImmutableMap({
- shows: ImmutableMap({
- reply: true,
- repost: true,
- }),
- }),
-
- community: ImmutableMap({
- shows: ImmutableMap({
- onlyMedia: false,
- }),
- }),
+ // home: ImmutableMap({
+ // shows: ImmutableMap({
+ // reply: true,
+ // repost: true,
+ // }),
+ // }),
})
const defaultColumns = fromJS([
diff --git a/app/javascript/gabsocial/reducers/toasts.js b/app/javascript/gabsocial/reducers/toasts.js
index 8e5479dc..a52d32fa 100644
--- a/app/javascript/gabsocial/reducers/toasts.js
+++ b/app/javascript/gabsocial/reducers/toasts.js
@@ -5,14 +5,19 @@ import {
} from '../actions/toasts'
import { Map as ImmutableMap, List as ImmutableList } from 'immutable'
+const makeMessageFromData = (data) => {
+ return `${data.type}`.split('_').join(' ').toLowerCase()
+}
+
const initialState = ImmutableList([])
export default function toasts(state = initialState, action) {
switch(action.type) {
case TOAST_SHOW:
+ console.log("action:", action)
return state.set(state.size, ImmutableMap({
key: state.size > 0 ? state.last().get('key') + 1 : 0,
- message: 'action.message',
+ message: makeMessageFromData(action.toastData),
type: action.toastType,
}))
case TOAST_DISMISS:
diff --git a/app/javascript/gabsocial/reducers/user_lists.js b/app/javascript/gabsocial/reducers/user_lists.js
index 7b68b822..637ccf08 100644
--- a/app/javascript/gabsocial/reducers/user_lists.js
+++ b/app/javascript/gabsocial/reducers/user_lists.js
@@ -62,13 +62,6 @@ import {
CHAT_MESSENGER_BLOCKS_EXPAND_REQUEST,
CHAT_MESSENGER_BLOCKS_EXPAND_SUCCESS,
CHAT_MESSENGER_BLOCKS_EXPAND_FAIL,
-
- CHAT_MESSENGER_MUTES_FETCH_REQUEST,
- CHAT_MESSENGER_MUTES_FETCH_SUCCESS,
- CHAT_MESSENGER_MUTES_FETCH_FAIL,
- CHAT_MESSENGER_MUTES_EXPAND_REQUEST,
- CHAT_MESSENGER_MUTES_EXPAND_SUCCESS,
- CHAT_MESSENGER_MUTES_EXPAND_FAIL,
} from '../actions/chat_conversation_accounts'
import {
GROUP_MEMBERS_FETCH_SUCCESS,
@@ -243,17 +236,6 @@ export default function userLists(state = initialState, action) {
case CHAT_MESSENGER_BLOCKS_EXPAND_FAIL:
return setListFailed(state, 'chat_blocks', me)
- case CHAT_MESSENGER_MUTES_FETCH_REQUEST:
- case CHAT_MESSENGER_MUTES_EXPAND_REQUEST:
- return state.setIn(['chat_mutes', me, 'isLoading'], true)
- case CHAT_MESSENGER_MUTES_FETCH_SUCCESS:
- return normalizeList(state, 'chat_mutes', me, action.accounts, action.next)
- case CHAT_MESSENGER_MUTES_EXPAND_SUCCESS:
- return appendToList(state, 'chat_mutes', me, action.accounts, action.next)
- case CHAT_MESSENGER_MUTES_FETCH_FAIL:
- case CHAT_MESSENGER_MUTES_EXPAND_FAIL:
- return setListFailed(state, 'chat_mutes', me)
-
default:
return state;
}
diff --git a/app/javascript/gabsocial/selectors/index.js b/app/javascript/gabsocial/selectors/index.js
index de94a738..e9838f5c 100644
--- a/app/javascript/gabsocial/selectors/index.js
+++ b/app/javascript/gabsocial/selectors/index.js
@@ -232,7 +232,7 @@ export const getToasts = createSelector([
let arr = []
- base.forEach(item => {
+ base.forEach((item) => {
arr.push({
message: item.get('message'),
type: item.get('type'),
@@ -241,4 +241,20 @@ export const getToasts = createSelector([
})
return arr
+})
+
+export const getListOfGroups = createSelector([
+ (state) => state.get('groups'),
+ (state, { type }) => state.getIn(['group_lists', type, 'items']),
+], (groups, groupIds) => {
+ console.log("groupIds:", groupIds)
+ let list = ImmutableList()
+ groupIds.forEach((id, i) => {
+ const group = groups.get(`${id}`)
+ console.log("groupIds:", id, i, group)
+ list = list.set(i, group)
+ })
+ console.log("list:", list)
+
+ return list
})
\ No newline at end of file
diff --git a/app/javascript/styles/global.css b/app/javascript/styles/global.css
index 5aecc1dc..20efb9dd 100644
--- a/app/javascript/styles/global.css
+++ b/app/javascript/styles/global.css
@@ -576,6 +576,7 @@ pre {
.h220PX { height: 220px; }
.h215PX { height: 215px; }
.h200PX { height: 200px; }
+.h172PX { height: 172px; }
.h158PX { height: 158px; }
.h122PX { height: 122px; }
.h60PX { height: 60px; }
diff --git a/app/models/chat_conversation_account.rb b/app/models/chat_conversation_account.rb
index 629f749b..fd89dcf0 100644
--- a/app/models/chat_conversation_account.rb
+++ b/app/models/chat_conversation_account.rb
@@ -14,6 +14,7 @@
# updated_at :datetime not null
# unread_count :bigint(8) default(0), not null
# chat_message_expiration_policy :string
+# is_muted :boolean default(FALSE), not null
#
# : todo : expires
diff --git a/app/models/chat_mute.rb b/app/models/chat_mute.rb
deleted file mode 100644
index 6c648a02..00000000
--- a/app/models/chat_mute.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-# == Schema Information
-#
-# Table name: chat_mutes
-#
-# id :bigint(8) not null, primary key
-# account_id :integer not null
-# target_account_id :integer not null
-# created_at :datetime not null
-# updated_at :datetime not null
-#
-
-class ChatMute < ApplicationRecord
- include Paginable
- include RelationshipCacheable
-
- belongs_to :account
- belongs_to :target_account, class_name: 'Account'
-
- validates :account_id, uniqueness: { scope: :target_account_id }
-
- after_commit :remove_blocking_cache
-
- private
-
- def remove_blocking_cache
- Rails.cache.delete("exclude_chat_account_ids_for:#{account_id}")
- end
-end
diff --git a/app/models/link_block.rb b/app/models/link_block.rb
index 8655276f..95e22a30 100644
--- a/app/models/link_block.rb
+++ b/app/models/link_block.rb
@@ -22,6 +22,9 @@ class LinkBlock < ApplicationRecord
Addressable::URI.parse(array[0]).normalize
}
url = urls.first
+
+ return false if url.nil?
+
link_for_fetch = TagManager.instance.normalize_link(url)
link_for_fetch = link_for_fetch.chomp("/")
diff --git a/app/presenters/account_relationships_presenter.rb b/app/presenters/account_relationships_presenter.rb
index 02929e45..bdc26997 100644
--- a/app/presenters/account_relationships_presenter.rb
+++ b/app/presenters/account_relationships_presenter.rb
@@ -27,6 +27,9 @@ class AccountRelationshipsPresenter
private
+ # : todo :
+ # chat muting, chat blocking
+
def cached
return @cached if defined?(@cached)
diff --git a/app/serializers/rest/chat_conversation_account_serializer.rb b/app/serializers/rest/chat_conversation_account_serializer.rb
index f1ea1b42..307de39c 100644
--- a/app/serializers/rest/chat_conversation_account_serializer.rb
+++ b/app/serializers/rest/chat_conversation_account_serializer.rb
@@ -3,7 +3,7 @@
class REST::ChatConversationAccountSerializer < ActiveModel::Serializer
attributes :id, :is_hidden, :is_approved, :unread_count,
:is_unread, :chat_conversation_id, :created_at,
- :is_blocked, :is_muted, :chat_message_expiration_policy
+ :is_muted, :chat_message_expiration_policy
has_many :participant_accounts, key: :other_accounts, serializer: REST::AccountSerializer
has_one :last_chat_message, serializer: REST::ChatMessageSerializer, unless: :last_chat_message_id?
@@ -24,12 +24,4 @@ class REST::ChatConversationAccountSerializer < ActiveModel::Serializer
object.unread_count > 0
end
- def is_blocked
- false
- end
-
- def is_muted
- false
- end
-
end
diff --git a/app/services/mute_chat_messenger_service.rb b/app/services/mute_chat_messenger_service.rb
deleted file mode 100644
index 52210d5d..00000000
--- a/app/services/mute_chat_messenger_service.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class MuteChatMessengerService < BaseService
- def call(account, target_account)
- return if account.id == target_account.id
- mute = account.chat_mute!(target_account)
- mute
- end
-end
diff --git a/app/services/post_chat_message_service.rb b/app/services/post_chat_message_service.rb
index 2b2cfcbc..084b61a3 100644
--- a/app/services/post_chat_message_service.rb
+++ b/app/services/post_chat_message_service.rb
@@ -52,16 +52,17 @@ class PostChatMessageService < BaseService
@chat_conversation_recipients_accounts = ChatConversationAccount.where(chat_conversation: @chat_conversation)
@chat_conversation_recipients_accounts.each do |recipient|
recipient.last_chat_message_id = @chat.id
- recipient.is_hidden = false # reset to show unless blocked
+ recipient.is_hidden = false # : todo : reset to show unless blocked
# Get not mine
if @account_conversation.id != recipient.id
recipient.unread_count = recipient.unread_count + 1
- # : todo :
- # check if muting, redis
- payload = InlineRenderer.render(@chat, recipient.account, :chat_message)
- Redis.current.publish("chat_messages:#{recipient.account.id}", Oj.dump(event: :notification, payload: payload))
+ # check if muting
+ unless recipient.is_muted
+ payload = InlineRenderer.render(@chat, recipient.account, :chat_message)
+ Redis.current.publish("chat_messages:#{recipient.account.id}", Oj.dump(event: :notification, payload: payload))
+ end
else
recipient.unread_count = 0
end
@@ -80,8 +81,10 @@ class PostChatMessageService < BaseService
raise ActiveRecord::RecordInvalid
end
- def set_message_expiration_date
- case @account_conversation.expiration_policy
+ def set_message_expiration_date!
+ @expires_at = nil
+
+ case @account_conversation.chat_message_expiration_policy
when :five_minutes
@expires_at = 5.minutes
when :sixty_minutes
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index 5a8eae2b..dcb5ccc6 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -111,6 +111,8 @@ class PostStatusService < BaseService
return if group_id.blank?
return if @autoJoinGroup
+ # : todo : check removedaccounts if exist dont allow
+
raise GabSocial::ValidationError, I18n.t('statuses.not_a_member_of_group') if not GroupAccount.where(account: @account, group_id: group_id).exists?
end
diff --git a/app/services/unmute_chat_messenger_service.rb b/app/services/unmute_chat_messenger_service.rb
deleted file mode 100644
index 95e65dc2..00000000
--- a/app/services/unmute_chat_messenger_service.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-class UnmuteChatMessengerService < BaseService
- def call(account, target_account)
- return unless account.chat_muting?(target_account)
- account.chat_unmute!(target_account)
- end
-end
diff --git a/config/routes.rb b/config/routes.rb
index ca2019e5..e045cbd8 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -228,15 +228,14 @@ Rails.application.routes.draw do
resource :chat_conversation_accounts, only: :show do
resource :blocked_chat_accounts, only: :show, controller: 'chat_conversation_accounts/blocked_chat_accounts'
- resource :muted_chat_accounts, only: :show, controller: 'chat_conversation_accounts/muted_chat_accounts'
member do
get :is_messenger_blocked
get :is_messenger_muted
post :block_messenger
post :unblock_messenger
- post :mute_messenger
- post :unmute_messenger
+ post :mute_chat_conversation
+ post :unmute_chat_conversation
post :set_expiration_policy
end
end
@@ -392,6 +391,13 @@ Rails.application.routes.draw do
get '/', to: 'react#react', as: :homepage
+ get '/about', to: 'react#react'
+ get '/about/tos', to: 'react#react'
+ get '/about/privacy', to: 'react#react'
+ get '/about/investors', to: 'react#react'
+ get '/about/dmca', to: 'react#react'
+ get '/about/sales', to: 'react#react'
+
match '*unmatched_route',
via: :all,
to: 'application#raise_not_found',
diff --git a/db/migrate/20201216045306_add_is_muted_to_chat_conversation_accounts.rb b/db/migrate/20201216045306_add_is_muted_to_chat_conversation_accounts.rb
new file mode 100644
index 00000000..dedb5315
--- /dev/null
+++ b/db/migrate/20201216045306_add_is_muted_to_chat_conversation_accounts.rb
@@ -0,0 +1,9 @@
+class AddIsMutedToChatConversationAccounts < ActiveRecord::Migration[5.2]
+ def up
+ safety_assured { add_column :chat_conversation_accounts, :is_muted, :bool, default: false, null: false }
+ end
+
+ def down
+ remove_column :chat_conversation_accounts, :is_muted
+ end
+end
diff --git a/db/migrate/20201216051551_remove_chat_mutes.rb b/db/migrate/20201216051551_remove_chat_mutes.rb
new file mode 100644
index 00000000..7635292d
--- /dev/null
+++ b/db/migrate/20201216051551_remove_chat_mutes.rb
@@ -0,0 +1,5 @@
+class RemoveChatMutes < ActiveRecord::Migration[5.2]
+ def change
+ drop_table :chat_mutes
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index ca75cd76..5ba6db65 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 2020_12_15_203113) do
+ActiveRecord::Schema.define(version: 2020_12_16_051551) do
# These are extensions that must be enabled in order to support this database
enable_extension "pg_stat_statements"
@@ -214,6 +214,7 @@ ActiveRecord::Schema.define(version: 2020_12_15_203113) do
t.datetime "updated_at", null: false
t.bigint "unread_count", default: 0, null: false
t.string "chat_message_expiration_policy"
+ t.boolean "is_muted", default: false, null: false
t.index ["account_id"], name: "index_chat_conversation_accounts_on_account_id"
t.index ["chat_conversation_id"], name: "index_chat_conversation_accounts_on_chat_conversation_id"
end
@@ -234,14 +235,6 @@ ActiveRecord::Schema.define(version: 2020_12_15_203113) do
t.index ["from_account_id", "chat_conversation_id"], name: "index_chat_messages_on_from_account_id_and_chat_conversation_id"
end
- create_table "chat_mutes", force: :cascade do |t|
- t.integer "account_id", null: false
- t.integer "target_account_id", null: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
- t.index ["account_id", "target_account_id"], name: "index_chat_mutes_on_account_id_and_target_account_id", unique: true
- end
-
create_table "conversations", force: :cascade do |t|
t.string "uri"
t.datetime "created_at", null: false