@@ -87,10 +135,26 @@ class MessagesLayout extends ImmutablePureComponent {
}
-MessagesLayout.propTypes = {
- children: PropTypes.node,
- showBackBtn: PropTypes.bool,
- title: PropTypes.string,
+const mapStateToProps = (state) => {
+ const selectedId = state.getIn(['chats', 'selectedChatConversationId'], null)
+ const currentConversationIsRequest = selectedId ? !state.getIn(['chat_conversations', selectedId, 'is_approved'], true) : false
+
+ return { currentConversationIsRequest }
}
-export default MessagesLayout
\ No newline at end of file
+const mapDispatchToProps = (dispatch) => ({
+ onOpenChatConversationCreateModal() {
+ dispatch(openModal(MODAL_CHAT_CONVERSATION_CREATE))
+ }
+})
+
+MessagesLayout.propTypes = {
+ title: PropTypes.string,
+ children: PropTypes.node,
+ isSettings: PropTypes.bool,
+ showBackBtn: PropTypes.bool,
+ source: PropTypes.string,
+ onOpenChatConversationCreateModal: PropTypes.func.isRequired,
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(MessagesLayout)
\ No newline at end of file
diff --git a/app/javascript/gabsocial/layouts/profile_layout.js b/app/javascript/gabsocial/layouts/profile_layout.js
index c34c99f7..892d24c5 100644
--- a/app/javascript/gabsocial/layouts/profile_layout.js
+++ b/app/javascript/gabsocial/layouts/profile_layout.js
@@ -177,7 +177,7 @@ class ProfileLayout extends ImmutablePureComponent {
-
+
diff --git a/app/javascript/gabsocial/pages/messages_page.js b/app/javascript/gabsocial/pages/messages_page.js
index 81522420..df92a571 100644
--- a/app/javascript/gabsocial/pages/messages_page.js
+++ b/app/javascript/gabsocial/pages/messages_page.js
@@ -1,38 +1,37 @@
import React from 'react'
import PropTypes from 'prop-types'
-import { connect } from 'react-redux'
-import { defineMessages, injectIntl } from 'react-intl'
import PageTitle from '../features/ui/util/page_title'
import MessagesLayout from '../layouts/messages_layout'
class MessagesPage extends React.PureComponent {
render() {
- const { children, intl } = this.props
-
- const title = intl.formatMessage(messages.chats)
+ const {
+ children,
+ isSettings,
+ source,
+ } = this.props
return (
-
-
+
+ {children}
)
}
}
-const messages = defineMessages({
- chats: { id: 'chats', defaultMessage: 'Chats' },
-})
MessagesPage.propTypes = {
- intl: PropTypes.object.isRequired,
children: PropTypes.node.isRequired,
- dispatch: PropTypes.func.isRequired,
+ isSettings: PropTypes.func,
+ source: PropTypes.string,
}
-export default injectIntl(connect()(MessagesPage))
\ No newline at end of file
+export default MessagesPage
\ No newline at end of file
diff --git a/app/javascript/gabsocial/reducers/chat_compose.js b/app/javascript/gabsocial/reducers/chat_compose.js
deleted file mode 100644
index 32296f41..00000000
--- a/app/javascript/gabsocial/reducers/chat_compose.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import {
- MESSAGE_INPUT_CHANGE,
- MESSAGE_INPUT_RESET,
- MESSAGE_SEND_REQUEST,
- MESSAGE_SEND_SUCCESS,
- MESSAGE_SEND_FAIL,
- MESSAGE_DELETE_REQUEST,
- MESSAGE_DELETE_SUCCESS,
- MESSAGE_DELETE_FAIL,
-} from '../actions/lists'
-import { Map as ImmutableMap, fromJS } from 'immutable'
-
-const initialState = ImmutableMap({
- text: '',
- conversationId: null,
- idempotencyKey: null,
-})
-
-const normalizeList = (state, list) => state.set(list.id, fromJS(list))
-
-const normalizeLists = (state, lists) => {
- lists.forEach(list => {
- state = normalizeList(state, list)
- })
-
- return state
-}
-
-export default function lists(state = initialState, action) {
- switch(action.type) {
- case LIST_FETCH_SUCCESS:
- case LIST_CREATE_SUCCESS:
- case LIST_UPDATE_SUCCESS:
- return normalizeList(state, action.list);
- case LISTS_FETCH_SUCCESS:
- return normalizeLists(state, action.lists);
- case LIST_DELETE_SUCCESS:
- case LIST_FETCH_FAIL:
- return state.set(action.id, false);
- default:
- return state;
- }
-}
diff --git a/app/javascript/gabsocial/reducers/chat_conversation_lists.js b/app/javascript/gabsocial/reducers/chat_conversation_lists.js
new file mode 100644
index 00000000..371bae18
--- /dev/null
+++ b/app/javascript/gabsocial/reducers/chat_conversation_lists.js
@@ -0,0 +1,85 @@
+import { Map as ImmutableMap, List as ImmutableList } from 'immutable'
+import {
+ CHAT_CONVERSATIONS_APPROVED_FETCH_REQUEST,
+ CHAT_CONVERSATIONS_APPROVED_FETCH_SUCCESS,
+ CHAT_CONVERSATIONS_APPROVED_FETCH_FAIL,
+ CHAT_CONVERSATIONS_APPROVED_EXPAND_REQUEST,
+ CHAT_CONVERSATIONS_APPROVED_EXPAND_SUCCESS,
+ CHAT_CONVERSATIONS_APPROVED_EXPAND_FAIL,
+
+ CHAT_CONVERSATIONS_REQUESTED_FETCH_REQUEST,
+ CHAT_CONVERSATIONS_REQUESTED_FETCH_SUCCESS,
+ CHAT_CONVERSATIONS_REQUESTED_FETCH_FAIL,
+ CHAT_CONVERSATIONS_REQUESTED_EXPAND_REQUEST,
+ CHAT_CONVERSATIONS_REQUESTED_EXPAND_SUCCESS,
+ CHAT_CONVERSATIONS_REQUESTED_EXPAND_FAIL,
+
+ CHAT_CONVERSATION_REQUEST_APPROVE_SUCCESS,
+} from '../actions/chat_conversations'
+
+const initialState = ImmutableMap({
+ approved: ImmutableMap({
+ next: null,
+ isLoading: false,
+ items: ImmutableList(),
+ }),
+ requested: ImmutableMap({
+ next: null,
+ isLoading: false,
+ items: ImmutableList(),
+ }),
+})
+
+const normalizeList = (state, source, chatConversations, next) => {
+ return state.update(source, listMap => listMap.withMutations(map => {
+ map.set('next', next)
+ map.set('loaded', true)
+ map.set('isLoading', false)
+ map.set('items', ImmutableList(chatConversations.map(chatConversation => chatConversation.chat_conversation_id)))
+ }))
+}
+
+const appendToList = (state, source, chatConversations, next) => {
+ return state.update(source, listMap => listMap.withMutations(map => {
+ map.set('next', next)
+ map.set('isLoading', false)
+ map.set('items', map.get('items').concat(chatConversations.map(chatConversation => chatConversation.chat_conversation_id)))
+ }))
+}
+
+const removeOneFromList = (state, source, chatConversationId) => {
+ return state.update(source, listMap => listMap.withMutations(map => {
+ map.set('items', map.get('items').filter(id => id !== chatConversationId))
+ }))
+}
+
+export default function chat_conversation_lists(state = initialState, action) {
+ switch (action.type) {
+ case CHAT_CONVERSATIONS_APPROVED_FETCH_REQUEST:
+ case CHAT_CONVERSATIONS_APPROVED_EXPAND_REQUEST:
+ return state.setIn(['approved', 'isLoading'], true)
+ case CHAT_CONVERSATIONS_APPROVED_FETCH_FAIL:
+ case CHAT_CONVERSATIONS_APPROVED_EXPAND_FAIL:
+ return state.setIn(['approved', 'isLoading'], false)
+ case CHAT_CONVERSATIONS_APPROVED_FETCH_SUCCESS:
+ return normalizeList(state, 'approved', action.chatConversations, action.next)
+ case CHAT_CONVERSATIONS_APPROVED_EXPAND_SUCCESS:
+ return appendToList(state, 'approved', action.chatConversations, action.next)
+
+ case CHAT_CONVERSATIONS_REQUESTED_FETCH_REQUEST:
+ case CHAT_CONVERSATIONS_REQUESTED_EXPAND_REQUEST:
+ return state.setIn(['requested', 'isLoading'], true)
+ case CHAT_CONVERSATIONS_REQUESTED_FETCH_FAIL:
+ case CHAT_CONVERSATIONS_REQUESTED_EXPAND_FAIL:
+ return state.setIn(['requested', 'isLoading'], false)
+ case CHAT_CONVERSATIONS_REQUESTED_FETCH_SUCCESS:
+ return normalizeList(state, 'requested', action.chatConversations, action.next)
+ case CHAT_CONVERSATIONS_REQUESTED_EXPAND_SUCCESS:
+ return appendToList(state, 'requested', action.chatConversations, action.next)
+
+ case CHAT_CONVERSATION_REQUEST_APPROVE_SUCCESS:
+ return removeOneFromList(state, 'requested', action.chatConversation.chat_conversation_id)
+ default:
+ return state
+ }
+}
diff --git a/app/javascript/gabsocial/reducers/chat_conversation_messages.js b/app/javascript/gabsocial/reducers/chat_conversation_messages.js
new file mode 100644
index 00000000..6822b43b
--- /dev/null
+++ b/app/javascript/gabsocial/reducers/chat_conversation_messages.js
@@ -0,0 +1,105 @@
+import {
+ List as ImmutableList,
+ Map as ImmutableMap,
+ fromJS,
+} from 'immutable'
+import compareId from '../utils/compare_id'
+import {
+ CHAT_MESSAGES_SEND_SUCCESS,
+ CHAT_MESSAGES_DELETE_REQUEST,
+} from '../actions/chat_messages'
+import {
+ CHAT_CONVERSATION_MESSAGES_EXPAND_REQUEST,
+ CHAT_CONVERSATION_MESSAGES_EXPAND_SUCCESS,
+ CHAT_CONVERSATION_MESSAGES_EXPAND_FAIL,
+ CHAT_CONVERSATION_MESSAGES_CONNECT,
+ CHAT_CONVERSATION_MESSAGES_DISCONNECT,
+ CHAT_CONVERSATION_MESSAGES_CLEAR,
+} from '../actions/chat_conversation_messages'
+
+const initialState = ImmutableMap()
+
+const initialConversation = ImmutableMap({
+ unread: 0,
+ online: false,
+ top: true,
+ isLoading: false,
+ isError: false,
+ hasMore: true,
+ items: ImmutableList(),
+})
+
+const expandNormalizedChatConversation = (state, chatConversationId, chatMessages, next, isPartial, isLoadingRecent) => {
+ return state.update(chatConversationId, initialConversation, map => map.withMutations((mMap) => {
+ mMap.set('isLoading', false)
+ mMap.set('isPartial', isPartial)
+
+ if (!next && !isLoadingRecent) mMap.set('hasMore', false)
+
+ if (!!chatMessages && !chatMessages.isEmpty()) {
+ mMap.update('items', ImmutableList(), oldIds => {
+ const newIds = chatMessages.map(chatMessage => chatMessage.get('id'));
+
+ const lastIndex = oldIds.findLastIndex((id) => id !== null && compareId(id, newIds.last()) >= 0) + 1;
+ const firstIndex = oldIds.take(lastIndex).findLastIndex(id => id !== null && compareId(id, newIds.first()) > 0);
+
+ if (firstIndex < 0) {
+ return (isPartial ? newIds.unshift(null) : newIds).concat(oldIds.skip(lastIndex));
+ }
+
+ return oldIds.take(firstIndex + 1).concat(
+ isPartial && oldIds.get(firstIndex) !== null ? newIds.unshift(null) : newIds,
+ oldIds.skip(lastIndex)
+ );
+ });
+ }
+ }));
+};
+
+const updateChatMessageConversation = (state, chatConversationId, chatMessage) => {
+ const top = state.getIn([chatConversationId, 'top']);
+ const ids = state.getIn([chatConversationId, 'items'], ImmutableList());
+ const includesId = ids.includes(chatMessage.get('id'));
+ const unread = state.getIn([chatConversationId, 'unread'], 0);
+
+ if (includesId) {
+ return state;
+ }
+
+ let newIds = ids;
+
+ return state.update(chatConversationId, initialConversation, map => map.withMutations(mMap => {
+ if (!top) mMap.set('unread', unread + 1);
+ // if (top && ids.size > 40) newIds = newIds.take(20);
+ mMap.set('items', newIds.unshift(chatMessage.get('id')));
+ }));
+};
+
+export default function chat_conversation_messages(state = initialState, action) {
+ switch (action.type) {
+ case CHAT_CONVERSATION_MESSAGES_CONNECT:
+ return state.update(action.chatConversationId, initialConversation, map => map.set('online', true))
+ case CHAT_CONVERSATION_MESSAGES_DISCONNECT:
+ return state.update(
+ action.chatConversationId,
+ initialConversation,
+ map => map.set('online', false).update('items', items => items.first() ? items.unshift(null) : items)
+ )
+ case CHAT_CONVERSATION_MESSAGES_CLEAR:
+ return state.set(chatConversationId, initialTimeline)
+ case CHAT_CONVERSATION_MESSAGES_EXPAND_REQUEST:
+ return state.update(action.chatConversationId, initialConversation, map => map.set('isLoading', true))
+ case CHAT_CONVERSATION_MESSAGES_EXPAND_FAIL:
+ return state.update(action.chatConversationId, initialConversation, map => map.withMutations((mMap) => {
+ map.set('isLoading', false)
+ map.set('isError', true)
+ }))
+ case CHAT_CONVERSATION_MESSAGES_EXPAND_SUCCESS:
+ return expandNormalizedChatConversation(state, action.chatConversationId, fromJS(action.chatMessages), action.next, action.partial, action.isLoadingRecent)
+ case CHAT_MESSAGES_SEND_SUCCESS:
+ return updateChatMessageConversation(state, action.chatConversationId, fromJS(action.chatMessage))
+ // CHAT_MESSAGES_DELETE_REQUEST
+ default:
+ return state
+ }
+}
diff --git a/app/javascript/gabsocial/reducers/chat_conversations.js b/app/javascript/gabsocial/reducers/chat_conversations.js
index e69de29b..55c1600a 100644
--- a/app/javascript/gabsocial/reducers/chat_conversations.js
+++ b/app/javascript/gabsocial/reducers/chat_conversations.js
@@ -0,0 +1,43 @@
+import {
+ Map as ImmutableMap,
+ List as ImmutableList,
+ fromJS,
+} from 'immutable'
+import { me } from '../initial_state'
+import {
+ CHAT_CONVERSATIONS_APPROVED_FETCH_SUCCESS,
+ CHAT_CONVERSATIONS_APPROVED_EXPAND_SUCCESS,
+ CHAT_CONVERSATIONS_REQUESTED_FETCH_SUCCESS,
+ CHAT_CONVERSATIONS_REQUESTED_EXPAND_SUCCESS,
+ CHAT_CONVERSATION_REQUEST_APPROVE_SUCCESS,
+} from '../actions/chat_conversations'
+
+const initialState = ImmutableMap()
+
+export const normalizeChatConversation = (chatConversation) => {
+ const { other_accounts, ...rest } = chatConversation
+ return fromJS({
+ ...rest,
+ other_account_ids: other_accounts.map((a) => a.id),
+ })
+}
+
+const importChatConversation = (state, chatConversation) => state.set(chatConversation.chat_conversation_id, normalizeChatConversation(chatConversation))
+
+const importChatConversations = (state, chatConversations) => {
+ return state.withMutations((mutable) => chatConversations.forEach((chatConversation) => importChatConversation(mutable, chatConversation)))
+}
+
+export default function chat_conversations(state = initialState, action) {
+ switch(action.type) {
+ case CHAT_CONVERSATION_REQUEST_APPROVE_SUCCESS:
+ return importChatConversation(state, action.chatConversation)
+ case CHAT_CONVERSATIONS_APPROVED_FETCH_SUCCESS:
+ case CHAT_CONVERSATIONS_APPROVED_EXPAND_SUCCESS:
+ case CHAT_CONVERSATIONS_REQUESTED_FETCH_SUCCESS:
+ case CHAT_CONVERSATIONS_REQUESTED_EXPAND_SUCCESS:
+ return importChatConversations(state, action.chatConversations)
+ default:
+ return state
+ }
+}
diff --git a/app/javascript/gabsocial/reducers/chat_messages.js b/app/javascript/gabsocial/reducers/chat_messages.js
index a4a5d5d6..4f3e5647 100644
--- a/app/javascript/gabsocial/reducers/chat_messages.js
+++ b/app/javascript/gabsocial/reducers/chat_messages.js
@@ -1,84 +1,32 @@
+import { Map as ImmutableMap, fromJS } from 'immutable'
import {
- REPOST_REQUEST,
- UNREPOST_REQUEST,
- REPOST_FAIL,
- FAVORITE_REQUEST,
- FAVORITE_FAIL,
- UNFAVORITE_REQUEST,
-} from '../actions/interactions';
+ CHAT_MESSAGES_SEND_SUCCESS,
+ CHAT_MESSAGES_DELETE_REQUEST,
+} from '../actions/chat_messages'
import {
- STATUS_REVEAL,
- STATUS_HIDE,
- UPDATE_STATUS_STATS,
-} from '../actions/statuses';
-import { TIMELINE_DELETE } from '../actions/timelines';
-import { STATUS_IMPORT, STATUSES_IMPORT } from '../actions/importer';
-import { Map as ImmutableMap, fromJS } from 'immutable';
+ CHAT_MESSAGES_IMPORT,
+} from '../actions/importer'
-const importStatus = (state, status) => state.set(status.id, fromJS(status));
+const importChatMessage = (state, chatMessage) => state.set(chatMessage.id, fromJS(chatMessage))
-const importStatuses = (state, statuses) =>
- state.withMutations(mutable => statuses.forEach(status => importStatus(mutable, status)));
+const importChatMessages = (state, chatMessages) =>
+ state.withMutations((mutable) => chatMessages.forEach((chatMessage) => importChatMessage(mutable, chatMessage)))
-const deleteStatus = (state, id, references) => {
- references.forEach(ref => {
- state = deleteStatus(state, ref[0], []);
- });
+const deleteChatMessage = (state, id) => {
+ return state.delete(id)
+}
- return state.delete(id);
-};
+const initialState = ImmutableMap()
-const initialState = ImmutableMap();
-
-export default function statuses(state = initialState, action) {
+export default function chat_messages(state = initialState, action) {
switch(action.type) {
- case STATUS_IMPORT:
- return importStatus(state, action.status);
- case STATUSES_IMPORT:
- return importStatuses(state, action.statuses);
- case FAVORITE_REQUEST:
- return state.setIn([action.status.get('id'), 'favourited'], true);
- case FAVORITE_FAIL:
- return state.get(action.status.get('id')) === undefined ? state : state.setIn([action.status.get('id'), 'favourited'], false);
- case UNFAVORITE_REQUEST:
- return state.setIn([action.status.get('id'), 'favourited'], false);
- case REPOST_REQUEST:
- return state.setIn([action.status.get('id'), 'reblogged'], true);
- case UNREPOST_REQUEST:
- return state.setIn([action.status.get('id'), 'reblogged'], false);
- case REPOST_FAIL:
- return state.get(action.status.get('id')) === undefined ? state : state.setIn([action.status.get('id'), 'reblogged'], false);
- case STATUS_REVEAL:
- return state.withMutations((map) => {
- action.ids.forEach(id => {
- if (!(state.get(id) === undefined)) {
- map.setIn([id, 'hidden'], false);
- }
- });
- });
- case STATUS_HIDE:
- return state.withMutations((map) => {
- action.ids.forEach(id => {
- if (!(state.get(id) === undefined)) {
- map.setIn([id, 'hidden'], true);
- }
- });
- });
- case TIMELINE_DELETE:
- return deleteStatus(state, action.id, action.references);
- case UPDATE_STATUS_STATS:
- const { status_id } = action.data
- return state.withMutations((map) => {
- if (action.data.favourited !== undefined) map.setIn([status_id, 'favourited'], action.data.favourited)
- if (action.data.favourites_count !== undefined) map.setIn([status_id, 'favourites_count'], action.data.favourites_count)
- if (action.data.reblogged !== undefined) map.setIn([status_id, 'reblogged'], action.data.reblogged)
- if (action.data.reblogs_count !== undefined) map.setIn([status_id, 'reblogs_count'], action.data.reblogs_count)
- if (action.data.replies_count !== undefined) map.setIn([status_id, 'replies_count'], action.data.replies_count)
- if (action.data.pinned !== undefined) map.setIn([status_id, 'pinned'], action.data.pinned)
- if (action.data.pinned_by_group !== undefined) map.setIn([status_id, 'pinned_by_group'], action.data.pinned_by_group)
- if (action.data.bookmarked !== undefined) map.setIn([status_id, 'bookmarked'], action.data.bookmarked)
- })
+ case CHAT_MESSAGES_IMPORT:
+ return importChatMessages(state, action.chatMessages)
+ case CHAT_MESSAGES_SEND_SUCCESS:
+ return importChatMessage(state, action.chatMessage)
+ case CHAT_MESSAGES_DELETE_REQUEST:
+ return deleteChatMessage(state, action.chatMessageId)
default:
- return state;
+ return state
}
-};
+}
diff --git a/app/javascript/gabsocial/reducers/chats.js b/app/javascript/gabsocial/reducers/chats.js
new file mode 100644
index 00000000..63826ff5
--- /dev/null
+++ b/app/javascript/gabsocial/reducers/chats.js
@@ -0,0 +1,38 @@
+import {
+ Map as ImmutableMap,
+ List as ImmutableList,
+ fromJS,
+} from 'immutable'
+import { me } from '../initial_state'
+import {
+ CHAT_CONVERSATION_CREATE_SEARCH_ACCOUNTS_SUCCESS,
+ SET_CHAT_CONVERSATION_SELECTED,
+} from '../actions/chats'
+import {
+ CHAT_CONVERSATION_REQUESTED_COUNT_FETCH_SUCCESS,
+} from '../actions/chat_conversations'
+import {
+ CHAT_MESSAGES_SEND_SUCCESS,
+ CHAT_MESSAGES_DELETE_REQUEST,
+ CHAT_MESSAGES_FETCH_SUCCESS,
+ CHAT_CONVERSATION_MESSAGES_EXPAND_SUCCESS,
+} from '../actions/chat_messages'
+
+const initialState = ImmutableMap({
+ createChatConversationSuggestionIds: ImmutableList(),
+ selectedChatConversationId: null,
+ chatConversationRequestCount: 0,
+})
+
+export default function chats(state = initialState, action) {
+ switch(action.type) {
+ case CHAT_CONVERSATION_CREATE_SEARCH_ACCOUNTS_SUCCESS:
+ return state.set('createChatConversationSuggestionIds', ImmutableList(action.accounts.map((item) => item.id)))
+ case SET_CHAT_CONVERSATION_SELECTED:
+ return state.set('selectedChatConversationId', action.chatConversationId)
+ case CHAT_CONVERSATION_REQUESTED_COUNT_FETCH_SUCCESS:
+ return state.set('chatConversationRequestCount', action.count)
+ default:
+ return state
+ }
+}
diff --git a/app/javascript/gabsocial/reducers/index.js b/app/javascript/gabsocial/reducers/index.js
index e1cebf6c..adcdef37 100644
--- a/app/javascript/gabsocial/reducers/index.js
+++ b/app/javascript/gabsocial/reducers/index.js
@@ -2,7 +2,9 @@ import { combineReducers } from 'redux-immutable'
import { loadingBarReducer } from 'react-redux-loading-bar'
import accounts from './accounts'
import accounts_counters from './accounts_counters'
-import chat_compose from './chat_compose'
+import chats from './chats'
+import chat_conversation_lists from './chat_conversation_lists'
+import chat_conversation_messages from './chat_conversation_messages'
import chat_conversations from './chat_conversations'
import chat_messages from './chat_messages'
import compose from './compose'
@@ -49,6 +51,9 @@ import user_lists from './user_lists'
const reducers = {
accounts,
accounts_counters,
+ chats,
+ chat_conversation_lists,
+ chat_conversation_messages,
chat_conversations,
chat_messages,
compose,
@@ -88,10 +93,10 @@ const reducers = {
status_revisions,
suggestions,
timelines,
- timeline_injections,
- toasts,
- user,
- user_lists,
+ // timeline_injections,
+ // toasts,
+ // user,
+ // user_lists,
}
export default combineReducers(reducers)
diff --git a/app/javascript/gabsocial/reducers/timelines.js b/app/javascript/gabsocial/reducers/timelines.js
index 6d9764df..aaa54fca 100644
--- a/app/javascript/gabsocial/reducers/timelines.js
+++ b/app/javascript/gabsocial/reducers/timelines.js
@@ -62,7 +62,6 @@ const expandNormalizedTimeline = (state, timeline, statuses, next, isPartial, is
const firstIndex = oldIds.take(lastIndex).findLastIndex(id => id !== null && compareId(id, newIds.first()) > 0);
if (firstIndex < 0) {
- console.log("----2")
return (isPartial ? newIds.unshift(null) : newIds).concat(oldIds.skip(lastIndex));
}
diff --git a/app/javascript/gabsocial/reducers/user.js b/app/javascript/gabsocial/reducers/user.js
index d66dc8d1..3b23a7b1 100644
--- a/app/javascript/gabsocial/reducers/user.js
+++ b/app/javascript/gabsocial/reducers/user.js
@@ -19,7 +19,6 @@ export default function (state = initialState, action) {
case SAVE_USER_PROFILE_INFORMATION_FETCH_SUCCESS:
return state
case SAVE_USER_PROFILE_INFORMATION_FETCH_FAIL:
- alert('Failed to update your profile. Max profile image size is 2MB. Please update and try again.')
return state.set('isError', true)
case RESEND_USER_CONFIRMATION_EMAIL_SUCCESS:
return state.set('emailConfirmationResends', state.get('emailConfirmationResends') + 1)
diff --git a/app/javascript/gabsocial/selectors/index.js b/app/javascript/gabsocial/selectors/index.js
index d044ccfd..de94a738 100644
--- a/app/javascript/gabsocial/selectors/index.js
+++ b/app/javascript/gabsocial/selectors/index.js
@@ -20,6 +20,49 @@ export const makeGetAccount = () => {
});
};
+export const makeGetChatMessage = () => {
+ return createSelector(
+ [
+ (state) => state,
+ (state, { id }) => state.getIn(['chat_messages', id]),
+ (state, { id }) => state.getIn(['accounts', `${state.getIn(['chat_messages', `${id}`, 'from_account_id'])}`]),
+ ],
+ (state, base, account) => {
+ if (!base) return null
+ return base.withMutations((map) => {
+ map.set('account', account)
+ })
+ }
+ )
+}
+
+export const makeGetChatConversation = () => {
+ return createSelector(
+ [
+ (state) => state,
+ (state, { id }) => state.getIn(['chat_conversations', `${id}`]),
+ (state) => state.get('accounts'),
+ ],
+ (state, base, allAccounts) => {
+ if (!base) return null
+
+ let otherAccounts = ImmutableList()
+ if (allAccounts) {
+ base.get('other_account_ids').forEach((acctId) => {
+ const acct = allAccounts.get(`${acctId}`, null)
+ if (acct) {
+ otherAccounts = otherAccounts.set(otherAccounts.size, acct)
+ }
+ })
+ }
+
+ return base.withMutations((map) => {
+ map.set('other_accounts', otherAccounts)
+ })
+ }
+ )
+}
+
const toServerSideType = columnType => {
switch (columnType) {
case 'home':
diff --git a/app/javascript/gabsocial/stream.js b/app/javascript/gabsocial/stream.js
index 68aa37e8..4ec2d036 100644
--- a/app/javascript/gabsocial/stream.js
+++ b/app/javascript/gabsocial/stream.js
@@ -43,6 +43,7 @@ export function connectStream(path, pollingRefresh = null, callbacks = () => ({
},
received(data) {
+ console.log("received:", data)
onReceive(data);
},
diff --git a/app/javascript/gabsocial/utils/numbers.js b/app/javascript/gabsocial/utils/numbers.js
index 89971a79..727d5483 100644
--- a/app/javascript/gabsocial/utils/numbers.js
+++ b/app/javascript/gabsocial/utils/numbers.js
@@ -2,11 +2,15 @@ import React from 'react'
import { FormattedNumber } from 'react-intl'
export const shortNumberFormat = (number) => {
+ if (isNaN(number)) {
+ return
+ }
+
if (number < 1000) {
try {
return (
).props.value
} catch (error) {
- return
+ return
}
}
diff --git a/app/javascript/styles/global.css b/app/javascript/styles/global.css
index 9f82d06c..377d867d 100644
--- a/app/javascript/styles/global.css
+++ b/app/javascript/styles/global.css
@@ -35,10 +35,12 @@
--solid_color_tertiary: #f5f5f7;
--solid_color_block: #f5f8fa;
--solid_color_highlight: rgba(224, 234, 66, .125);
+ --solid_color_toast: #232425;
--text_color_primary: #2d3436;
--text_color_secondary: #4b4f55;
--text_color_tertiary: #777;
+ --text_color_alt: var(--solid_color_secondary);
--border_color_secondary: #ececed;
@@ -91,10 +93,12 @@
--solid_color_secondary-dark: #424343 !important;
--solid_color_tertiary: #333 !important;
--solid_color_block: #2d2d2d !important;
-
+ --solid_color_toast: #fcfcfc !important;
+
--text_color_primary: #fff !important;
--text_color_secondary: #999 !important;
--text_color_tertiary: #656565 !important;
+ --text_color_alt: var(----solid_color_primary);
--border_color_secondary: #424141 !important;
@@ -116,14 +120,16 @@
--solid_color_secondary-dark: #282828 !important;
--solid_color_tertiary: #000 !important;
--solid_color_block: #202327 !important;
+ --solid_color_toast: #fcfcfc !important;
--text_color_primary: #cccbcb !important;
--text_color_secondary: #888 !important;
--text_color_tertiary: #656565 !important;
+ --text_color_alt: var(----solid_color_primary);
--border_color_secondary: #343434 !important;
- --color_input_placeholder: var(--text_color_secondary);
+ --color_input_placeholder: var(--text_color_secondary) !important;
/* Navigation bar. Only themes. Non-editable */
--navigation_background: #000 !important;
@@ -423,6 +429,8 @@ pre {
.bgTertiary { background-color: var(--solid_color_tertiary); }
+.bgToast { background-color: var(--solid_color_toast); }
+
.bgPrimary { background-color: var(--solid_color_primary); }
.bgPrimaryOpaque { background-color: var(--solid_color_primary-opaque) }
@@ -459,6 +467,7 @@ pre {
/* */
+.cAlt { color: var(--text_color_alt); }
.cPrimary { color: var(--text_color_primary); }
.cBlack { color: var(--color_black); }
@@ -582,6 +591,7 @@ pre {
.w330PX { width: 330px; }
.w300PX { width: 300px; }
.w240PX { width: 240px; }
+.w228PX { width: 228px; }
.w208PX { width: 208px; }
.w115PX { width: 115px; }
.w84PX { width: 84px; }
@@ -892,6 +902,7 @@ pre {
.boxShadowPopover { box-shadow: 0 0 15px -5px rgba(0,0,0,0.15); }
.boxShadowBlock { box-shadow: 0 1px 2px rgba(0,0,0,0.2); }
.boxShadowDot { box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 6px #000; }
+.boxShadowToast { box-shadow: 0px 0px 10px -2px rgba(0, 0, 0, .2), 0px 0px 2px -1px rgba(0, 0, 0, 0.4); }
.boxShadowNone .boxShadowBlock {
box-shadow: none !important;
diff --git a/app/lib/entity_cache.rb b/app/lib/entity_cache.rb
index d2a21630..31a84b73 100644
--- a/app/lib/entity_cache.rb
+++ b/app/lib/entity_cache.rb
@@ -21,7 +21,7 @@ class EntityCache
end
unless uncached_ids.empty?
- uncached = CustomEmoji.where(shortcode: shortcodes, domain: domain, disabled: false).each_with_object({}) { |item, h| h[item.shortcode] = item }
+ uncached = CustomEmoji.where(shortcode: shortcodes, domain: domain).each_with_object({}) { |item, h| h[item.shortcode] = item }
uncached.each_value { |item| Rails.cache.write(to_key(:emoji, item.shortcode, domain), item, expires_in: MAX_EXPIRATION) }
end
diff --git a/app/models/account.rb b/app/models/account.rb
index 41840714..4895449d 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -297,6 +297,11 @@ class Account < ApplicationRecord
username
end
+ def excluded_from_chat_account_ids
+ # : todo :
+ # Rails.cache.fetch("exclude_account_ids_for:#{id}") { blocking.pluck(:target_account_id) + blocked_by.pluck(:account_id) + muting.pluck(:target_account_id) }
+ end
+
def excluded_from_timeline_account_ids
Rails.cache.fetch("exclude_account_ids_for:#{id}") { blocking.pluck(:target_account_id) + blocked_by.pluck(:account_id) + muting.pluck(:target_account_id) }
end
diff --git a/app/models/chat_block.rb b/app/models/chat_block.rb
new file mode 100644
index 00000000..d5557691
--- /dev/null
+++ b/app/models/chat_block.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+# == Schema Information
+#
+# Table name: chat_blocks
+#
+# id :bigint(8) not null, primary key
+# created_at :datetime not null
+# updated_at :datetime not null
+# account_id :bigint(8) not null
+# target_account_id :bigint(8) not null
+#
+
+class ChatBlock < 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}")
+ Rails.cache.delete("exclude_chat_account_ids_for:#{target_account_id}")
+ end
+end
diff --git a/app/models/chat_conversation.rb b/app/models/chat_conversation.rb
new file mode 100644
index 00000000..b341151c
--- /dev/null
+++ b/app/models/chat_conversation.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+# == Schema Information
+#
+# Table name: chat_conversations
+#
+# id :bigint(8) not null, primary key
+# created_at :datetime not null
+# updated_at :datetime not null
+#
+
+class ChatConversation < ApplicationRecord
+
+end
diff --git a/app/models/chat_conversation_account.rb b/app/models/chat_conversation_account.rb
new file mode 100644
index 00000000..e78f7955
--- /dev/null
+++ b/app/models/chat_conversation_account.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+# == Schema Information
+#
+# Table name: chat_conversation_accounts
+#
+# id :bigint(8) not null, primary key
+# account_id :bigint(8)
+# chat_conversation_id :bigint(8)
+# participant_account_ids :bigint(8) default([]), not null, is an Array
+# last_chat_message_id :bigint(8)
+# is_unread :boolean default(FALSE), not null
+# is_hidden :boolean default(FALSE), not null
+# is_approved :boolean default(FALSE), not null
+# created_at :datetime not null
+# updated_at :datetime not null
+#
+
+class ChatConversationAccount < ApplicationRecord
+ include Paginable
+
+ belongs_to :account
+ belongs_to :chat_conversation
+ belongs_to :last_chat_message, class_name: 'ChatMessage', optional: true
+
+ # before_validation :set_last_chat_message
+
+ def participant_accounts
+ if participant_account_ids.empty?
+ [account]
+ else
+ # : todo : dont include current_account
+ participants = Account.where(id: participant_account_ids)
+ participants.empty? ? [account] : participants
+ end
+ end
+
+ private
+
+ def set_last_chat_message
+ self.last_chat_message_id = nil # : todo :
+ end
+
+end
diff --git a/app/models/chat_message.rb b/app/models/chat_message.rb
new file mode 100644
index 00000000..12d5febd
--- /dev/null
+++ b/app/models/chat_message.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+# == Schema Information
+#
+# Table name: chat_messages
+#
+# id :bigint(8) not null, primary key
+# account_id :bigint(8) not null
+# chat_conversation_id :bigint(8) not null
+# text :text default(""), not null
+# language :string
+# created_at :datetime not null
+# updated_at :datetime not null
+#
+
+class ChatMessage < ApplicationRecord
+ include Paginable
+
+ belongs_to :from_account, class_name: 'Account'
+ belongs_to :chat_conversation
+
+ validates_with ChatMessageLengthValidator
+
+ default_scope { recent }
+
+ scope :recent, -> { reorder(created_at: :desc) }
+
+end
diff --git a/app/models/chat_mute.rb b/app/models/chat_mute.rb
new file mode 100644
index 00000000..cfce994d
--- /dev/null
+++ b/app/models/chat_mute.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+# == Schema Information
+#
+# Table name: chat_mutes
+#
+# id :bigint(8) not null, primary key
+# created_at :datetime not null
+# updated_at :datetime not null
+# account_id :bigint(8) not null
+# target_account_id :bigint(8) 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/serializers/rest/chat_conversation_account_serializer.rb b/app/serializers/rest/chat_conversation_account_serializer.rb
new file mode 100644
index 00000000..a50ae20d
--- /dev/null
+++ b/app/serializers/rest/chat_conversation_account_serializer.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class REST::ChatConversationAccountSerializer < ActiveModel::Serializer
+ attributes :id, :is_hidden, :is_approved, :is_unread, :chat_conversation_id, :created_at
+
+ has_many :participant_accounts, key: :other_accounts, serializer: REST::AccountSerializer
+ has_one :last_chat_message, serializer: REST::ChatMessageSerializer, unless: :last_chat_message_id?
+
+ def id
+ object.id.to_s
+ end
+
+ def chat_conversation_id
+ object.chat_conversation_id.to_s
+ end
+
+ def last_chat_message_id?
+ object.last_chat_message_id.nil?
+ end
+
+end
diff --git a/app/serializers/rest/chat_message_serializer.rb b/app/serializers/rest/chat_message_serializer.rb
new file mode 100644
index 00000000..aa693903
--- /dev/null
+++ b/app/serializers/rest/chat_message_serializer.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class REST::ChatMessageSerializer < ActiveModel::Serializer
+ attributes :id, :text, :language, :from_account_id,
+ :chat_conversation_id, :created_at
+
+ def id
+ object.id.to_s
+ end
+end
diff --git a/app/services/account_search_service.rb b/app/services/account_search_service.rb
index 9c6b63c9..c28abe16 100644
--- a/app/services/account_search_service.rb
+++ b/app/services/account_search_service.rb
@@ -4,6 +4,7 @@ class AccountSearchService < BaseService
attr_reader :query, :limit, :offset, :options, :account
def call(query, account = nil, options = {})
+ puts "query:"+query.inspect
@query = query.strip
@limit = options[:limit].to_i
@offset = options[:offset].to_i
diff --git a/app/validators/chat_message_length_validator.rb b/app/validators/chat_message_length_validator.rb
new file mode 100644
index 00000000..e82aeb60
--- /dev/null
+++ b/app/validators/chat_message_length_validator.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class ChatMessageLengthValidator < ActiveModel::Validator
+ MAX_CHARS = 1600
+
+ def validate(chatMessage)
+ status.errors.add(:text, I18n.t('statuses.over_character_limit', max: MAX_CHARS)) if chatMessage.text.length > MAX_CHARS
+ status.errors.add(:text, I18n.t('statuses.over_character_limit', max: MAX_CHARS)) if chatMessage.text.length === 0
+ end
+end
diff --git a/app/validators/poll_validator.rb b/app/validators/poll_validator.rb
index 9d7321ca..7b5b9eef 100644
--- a/app/validators/poll_validator.rb
+++ b/app/validators/poll_validator.rb
@@ -2,7 +2,7 @@
class PollValidator < ActiveModel::Validator
MAX_OPTIONS = 4
- MAX_OPTION_CHARS = 25
+ MAX_OPTION_CHARS = 160
MAX_EXPIRATION = 1.month.freeze
MIN_EXPIRATION = 5.minutes.freeze
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
index 2a963b32..52b51c62 100644
--- a/config/initializers/doorkeeper.rb
+++ b/config/initializers/doorkeeper.rb
@@ -69,6 +69,7 @@ Doorkeeper.configure do
:'write:notifications',
:'write:reports',
:'write:statuses',
+ :'write:chats',
:read,
:'read:accounts',
:'read:blocks',
@@ -81,6 +82,7 @@ Doorkeeper.configure do
:'read:notifications',
:'read:search',
:'read:statuses',
+ :'read:chats',
:follow,
:push
diff --git a/config/routes.rb b/config/routes.rb
index 0453716c..1c6f7995 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -221,15 +221,33 @@ Rails.application.routes.draw do
resource :explore, only: :show, controller: :explore
end
- namespace :messages do
- resource :conversations, only: [:show, :create]
- resource :chats, only: [:show, :create]
-
+ resources :chat_conversation_accounts, only: :show do
+ resources :blocked_accounts, only: :index
+ resources :muted_accounts, only: :index
+
member do
- post :block
- post :unblock
- post :mute
- post :unmute
+ post :block_messenger
+ post :unblock_messenger
+ post :mute_messenger
+ post :unmute_messenger
+ end
+ end
+
+ namespace :chat_conversations do
+ resources :messages, only: :show
+ resources :approved_conversations
+ resources :requested_conversations, only: :index do
+ collection do
+ get :count
+ end
+ end
+ end
+
+ resources :chat_conversation, only: [:show, :create] do
+ member do
+ post :mark_chat_conversation_approved
+ post :mark_chat_conversation_unread
+ post :mark_chat_conversation_hidden
end
end
@@ -241,6 +259,7 @@ Rails.application.routes.draw do
resources :scheduled_statuses, only: [:index, :show, :update, :destroy]
resources :preferences, only: [:index]
resources :group_categories, only: [:index]
+ resources :chat_messages, only: [:create, :destroy]
get '/search', to: 'search#index', as: :search
get '/account_by_username/:username', to: 'account_by_username#show', username: username_regex
diff --git a/db/migrate/20201127051070_create_chat_conversations.rb b/db/migrate/20201127051070_create_chat_conversations.rb
new file mode 100644
index 00000000..7ec3c2d7
--- /dev/null
+++ b/db/migrate/20201127051070_create_chat_conversations.rb
@@ -0,0 +1,9 @@
+class CreateChatConversations < ActiveRecord::Migration[5.2]
+ def change
+ create_table :chat_conversations do |t|
+ t.timestamps null: false
+ end
+ end
+end
+
+
diff --git a/db/migrate/20201127051071_create_chat_blocks.rb b/db/migrate/20201127051071_create_chat_blocks.rb
new file mode 100644
index 00000000..4ef185b5
--- /dev/null
+++ b/db/migrate/20201127051071_create_chat_blocks.rb
@@ -0,0 +1,14 @@
+class CreateChatBlocks < ActiveRecord::Migration[5.2]
+ def change
+ create_table :chat_blocks do |t|
+ t.integer :account_id, null: false
+ t.integer :target_account_id, null: false
+
+ t.timestamps null: false
+ end
+
+ add_index :chat_blocks, [:account_id, :target_account_id], unique: true
+ end
+end
+
+
diff --git a/db/migrate/20201127051072_create_chat_mutes.rb b/db/migrate/20201127051072_create_chat_mutes.rb
new file mode 100644
index 00000000..fc1fe6be
--- /dev/null
+++ b/db/migrate/20201127051072_create_chat_mutes.rb
@@ -0,0 +1,12 @@
+class CreateChatMutes < ActiveRecord::Migration[5.2]
+ def change
+ create_table :chat_mutes do |t|
+ t.integer :account_id, null: false
+ t.integer :target_account_id, null: false
+
+ t.timestamps null: false
+ end
+
+ add_index :chat_mutes, [:account_id, :target_account_id], unique: true
+ end
+end
diff --git a/db/migrate/20201127051073_create_chat_conversation_accounts.rb b/db/migrate/20201127051073_create_chat_conversation_accounts.rb
new file mode 100644
index 00000000..1df49979
--- /dev/null
+++ b/db/migrate/20201127051073_create_chat_conversation_accounts.rb
@@ -0,0 +1,16 @@
+class CreateChatConversationAccounts < ActiveRecord::Migration[5.2]
+ def change
+ create_table :chat_conversation_accounts do |t|
+ t.belongs_to :account, foreign_key: { on_delete: :cascade }
+ t.belongs_to :chat_conversation, foreign_key: { on_delete: :cascade }
+ t.bigint :participant_account_ids, array: true, null: false, default: []
+ t.bigint :last_chat_message_id, null: true, default: nil
+ t.boolean :is_unread, null: false, default: false
+ t.boolean :is_hidden, null: false, default: false
+ t.boolean :is_approved, null: false, default: false
+ t.timestamps null: false
+ end
+ end
+end
+
+
diff --git a/db/migrate/20201127051074_create_chat_messages.rb b/db/migrate/20201127051074_create_chat_messages.rb
new file mode 100644
index 00000000..8cc2e1d5
--- /dev/null
+++ b/db/migrate/20201127051074_create_chat_messages.rb
@@ -0,0 +1,14 @@
+class CreateChatMessages < ActiveRecord::Migration[5.2]
+ def change
+ create_table :chat_messages do |t|
+ t.text :text, null: false, default: ''
+ t.text :language, null: false, default: ''
+ t.integer :from_account_id, null: false
+ t.integer :chat_conversation_id, null: false
+
+ t.timestamps null: false
+ end
+
+ add_index :chat_messages, [:from_account_id, :chat_conversation_id]
+ end
+end
diff --git a/db/migrate/20201130171423_remove_disabled_from_custom_emojis.rb b/db/migrate/20201130171423_remove_disabled_from_custom_emojis.rb
new file mode 100644
index 00000000..49c90c75
--- /dev/null
+++ b/db/migrate/20201130171423_remove_disabled_from_custom_emojis.rb
@@ -0,0 +1,5 @@
+class RemoveDisabledFromCustomEmojis < ActiveRecord::Migration[5.2]
+ def change
+ safety_assured { remove_column :custom_emojis, :disabled }
+ end
+end
\ No newline at end of file
diff --git a/db/schema.rb b/db/schema.rb
index 9242e426..bd25509b 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_11_09_233215) do
+ActiveRecord::Schema.define(version: 2020_11_30_172733) do
# These are extensions that must be enabled in order to support this database
enable_extension "pg_stat_statements"
@@ -194,6 +194,51 @@ ActiveRecord::Schema.define(version: 2020_11_09_233215) do
t.boolean "success", default: false, null: false
end
+ create_table "chat_blocks", 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_blocks_on_account_id_and_target_account_id", unique: true
+ end
+
+ create_table "chat_conversation_accounts", force: :cascade do |t|
+ t.bigint "account_id"
+ t.bigint "chat_conversation_id"
+ t.bigint "participant_account_ids", default: [], null: false, array: true
+ t.bigint "last_chat_message_id"
+ t.boolean "is_unread", default: false, null: false
+ t.boolean "is_hidden", default: false, null: false
+ t.boolean "is_approved", default: false, null: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", 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
+
+ create_table "chat_conversations", force: :cascade do |t|
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ end
+
+ create_table "chat_messages", force: :cascade do |t|
+ t.text "text", default: "", null: false
+ t.text "language", default: "", null: false
+ t.integer "from_account_id", null: false
+ t.integer "chat_conversation_id", null: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ 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
@@ -210,7 +255,6 @@ ActiveRecord::Schema.define(version: 2020_11_09_233215) do
t.datetime "image_updated_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
- t.boolean "disabled", default: false, null: false
t.string "uri"
t.string "image_remote_url"
t.boolean "visible_in_picker", default: true, null: false
@@ -810,6 +854,8 @@ ActiveRecord::Schema.define(version: 2020_11_09_233215) do
add_foreign_key "backups", "users", on_delete: :nullify
add_foreign_key "blocks", "accounts", column: "target_account_id", name: "fk_9571bfabc1", on_delete: :cascade
add_foreign_key "blocks", "accounts", name: "fk_4269e03e65", on_delete: :cascade
+ add_foreign_key "chat_conversation_accounts", "accounts", on_delete: :cascade
+ add_foreign_key "chat_conversation_accounts", "chat_conversations", on_delete: :cascade
add_foreign_key "custom_filters", "accounts", on_delete: :cascade
add_foreign_key "favourites", "accounts", name: "fk_5eb6c2b873", on_delete: :cascade
add_foreign_key "favourites", "statuses", name: "fk_b0e856845e", on_delete: :cascade
diff --git a/streaming/index.js b/streaming/index.js
index aaeb285e..e4e137a6 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -537,7 +537,8 @@ const startWorker = (workerId) => {
});
app.get('/api/v1/streaming/chat_messages', (req, res) => {
- const channel = `chat_messages:${req.accountId}`;
+ console.log("tilly hello from inside here:", req)
+ const channel = `chat_messages:${req.chatConversationId}`;
streamFrom(channel, req, streamToHttp(req, res), streamHttpEnd(req, subscriptionHeartbeat(channel)));
});
@@ -550,6 +551,8 @@ const startWorker = (workerId) => {
let channel;
+ console.log("tilly location.query.stream:", location.query.stream)
+
switch (location.query.stream) {
case 'statuscard':
channel = `statuscard:${req.accountId}`;
@@ -563,7 +566,8 @@ const startWorker = (workerId) => {
streamFrom(`timeline:${req.accountId}`, req, streamToWs(req, ws), streamWsEnd(req, ws), false, true);
break;
case 'chat_messages':
- streamFrom(`chat_messages:${req.accountId}`, req, streamToWs(req, ws), streamWsEnd(req, ws), false, true);
+ console.log("tilly incoming chat_messages:", req.chatConversationId, location.query.stream)
+ streamFrom(`chat_messages:${req.chatConversationId}`, req, streamToWs(req, ws), streamWsEnd(req, ws), false, true);
break;
default:
ws.close();