Progress

2020-12-16 02:39:07 -05:00
parent d1ff39bb81
commit 8f94ffad9c
64 changed files with 958 additions and 870 deletions
--- a/app/javascript/gabsocial/actions/bookmarks.js
+++ b/app/javascript/gabsocial/actions/bookmarks.js
@@ -24,79 +24,92 @@ export const BOOKMARK_COLLECTIONS_REMOVE_REQUEST = 'BOOKMARK_COLLECTIONS_REMOVE_
 export const BOOKMARK_COLLECTIONS_REMOVE_SUCCESS = 'BOOKMARK_COLLECTIONS_REMOVE_SUCCESS'
 export const BOOKMARK_COLLECTIONS_REMOVE_FAIL = 'BOOKMARK_COLLECTIONS_REMOVE_FAIL'

+//
+
+export const UPDATE_BOOKMARK_COLLECTION_FAIL = 'UPDATE_BOOKMARK_COLLECTION_FAIL'
+export const UPDATE_BOOKMARK_COLLECTION_REQUEST = 'UPDATE_BOOKMARK_COLLECTION_REQUEST'
+export const UPDATE_BOOKMARK_COLLECTION_SUCCESS = 'UPDATE_BOOKMARK_COLLECTION_SUCCESS'
+
+export const UPDATE_BOOKMARK_COLLECTION_STATUS_FAIL = 'UPDATE_BOOKMARK_COLLECTION_STATUS_FAIL'
+export const UPDATE_BOOKMARK_COLLECTION_STATUS_REQUEST = 'UPDATE_BOOKMARK_COLLECTION_STATUS_REQUEST'
+export const UPDATE_BOOKMARK_COLLECTION_STATUS_SUCCESS = 'UPDATE_BOOKMARK_COLLECTION_STATUS_SUCCESS'
+
 /**
 * 
 */
-export const fetchBookmarkedStatuses = () => (dispatch, getState) => {
+export const fetchBookmarkedStatuses = (bookmarkCollectionId) => (dispatch, getState) => {
  if (!me) return

  if (getState().getIn(['status_lists', 'bookmarks', 'isLoading'])) {
    return
  }

-  dispatch(fetchBookmarkedStatusesRequest())
+  dispatch(fetchBookmarkedStatusesRequest(bookmarkCollectionId))

  api(getState).get('/api/v1/bookmarks').then((response) => {
    const next = getLinks(response).refs.find(link => link.rel === 'next')
    dispatch(importFetchedStatuses(response.data))
-    dispatch(fetchBookmarkedStatusesSuccess(response.data, next ? next.uri : null))
+    dispatch(fetchBookmarkedStatusesSuccess(response.data, bookmarkCollectionId, next ? next.uri : null))
  }).catch((error) => {
-    dispatch(fetchBookmarkedStatusesFail(error))
+    dispatch(fetchBookmarkedStatusesFail(bookmarkCollectionId, error))
  })
 }

-const fetchBookmarkedStatusesRequest = () => ({
+const fetchBookmarkedStatusesRequest = (bookmarkCollectionId) => ({
  type: BOOKMARKED_STATUSES_FETCH_REQUEST,
 })

-const fetchBookmarkedStatusesSuccess = (statuses, next) => ({
+const fetchBookmarkedStatusesSuccess = (statuses, bookmarkCollectionId, next) => ({
  type: BOOKMARKED_STATUSES_FETCH_SUCCESS,
+  bookmarkCollectionId,
  statuses,
  next,
 })

-const fetchBookmarkedStatusesFail = (error) => ({
+const fetchBookmarkedStatusesFail = (bookmarkCollectionId, error) => ({
  type: BOOKMARKED_STATUSES_FETCH_FAIL,
  showToast: true,
+  bookmarkCollectionId,
  error,
 })

 /**
 * 
 */
-export const expandBookmarkedStatuses = () => (dispatch, getState) => {
+export const expandBookmarkedStatuses = (bookmarkCollectionId) => (dispatch, getState) => {
  if (!me) return

-  const url = getState().getIn(['status_lists', 'bookmarks', 'next'], null)
+  const url = getState().getIn(['status_lists', 'bookmarks', bookmarkCollectionId, 'next'], null)

-  if (url === null || getState().getIn(['status_lists', 'bookmarks', 'isLoading'])) {
+  if (url === null || getState().getIn(['status_lists', 'bookmarks', bookmarkCollectionId, 'isLoading'])) {
    return
  }

-  dispatch(expandBookmarkedStatusesRequest())
+  dispatch(expandBookmarkedStatusesRequest(bookmarkCollectionId))

  api(getState).get(url).then((response) => {
    const next = getLinks(response).refs.find(link => link.rel === 'next')
    dispatch(importFetchedStatuses(response.data))
-    dispatch(expandBookmarkedStatusesSuccess(response.data, next ? next.uri : null))
+    dispatch(expandBookmarkedStatusesSuccess(response.data, bookmarkCollectionId, next ? next.uri : null))
  }).catch((error) => {
-    dispatch(expandBookmarkedStatusesFail(error))
+    dispatch(expandBookmarkedStatusesFail(bookmarkCollectionId, error))
  })
 }

-const expandBookmarkedStatusesRequest = () => ({
+const expandBookmarkedStatusesRequest = (bookmarkCollectionId) => ({
  type: BOOKMARKED_STATUSES_EXPAND_REQUEST,
 })

-const expandBookmarkedStatusesSuccess = (statuses, next) => ({
+const expandBookmarkedStatusesSuccess = (statuses, bookmarkCollectionId, next) => ({
  type: BOOKMARKED_STATUSES_EXPAND_SUCCESS,
  statuses,
  next,
 })

-const expandBookmarkedStatusesFail = (error) => ({
+const expandBookmarkedStatusesFail = (bookmarkCollectionId, error) => ({
  type: BOOKMARKED_STATUSES_EXPAND_FAIL,
  showToast: true,
+  bookmarkCollectionId,
  error,
 })

@@ -190,4 +203,64 @@ const removeBookmarkCollectionFail = (error) => ({
  type: BOOKMARK_COLLECTIONS_CREATE_FAIL,
  showToast: true,
  error,
-})
+})
+
+/**
+ * 
+ */
+export const updateBookmarkCollection = (bookmarkCollectionId, title) => (dispatch, getState) => {
+  if (!me || !statusId) return
+
+  dispatch(updateBookmarkCollectionRequest())
+
+  api(getState).post('/api/v1/bookmark_collections', { title }).then((response) => {
+    dispatch(updateBookmarkCollectionSuccess(response.data))
+  }).catch((error) => {
+    dispatch(updateBookmarkCollectionFail(error))
+  })
+}
+
+const updateBookmarkCollectionRequest = () => ({
+  type: UPDATE_BOOKMARK_COLLECTION_REQUEST,
+})
+
+const updateBookmarkCollectionSuccess = (bookmarkCollection) => ({
+  type: UPDATE_BOOKMARK_COLLECTION_SUCCESS,
+  bookmarkCollection,
+})
+
+const updateBookmarkCollectionFail = (error) => ({
+  type: UPDATE_BOOKMARK_COLLECTION_FAIL,
+  showToast: true,
+  error,
+})
+
+/**
+ * 
+ */
+export const updateBookmarkCollectionStatus = (statusId, bookmarkCollectionId) => (dispatch, getState) => {
+  if (!me || !statusId) return
+
+  dispatch(updateBookmarkCollectionStatusRequest())
+
+  api(getState).post('/api/v1/bookmark_collections', { title }).then((response) => {
+    dispatch(updateBookmarkCollectionStatusSuccess(response.data))
+  }).catch((error) => {
+    dispatch(updateBookmarkCollectionStatusFail(error))
+  })
+}
+
+const updateBookmarkCollectionStatusRequest = () => ({
+  type: UPDATE_BOOKMARK_COLLECTION_STATUS_REQUEST,
+})
+
+const updateBookmarkCollectionStatusSuccess = (bookmarkCollection) => ({
+  type: UPDATE_BOOKMARK_COLLECTION_STATUS_SUCCESS,
+  bookmarkCollection,
+})
+
+const updateBookmarkCollectionStatusFail = (error) => ({
+  type: UPDATE_BOOKMARK_COLLECTION_STATUS_FAIL,
+  showToast: true,
+  error,
+})
--- a/app/javascript/gabsocial/actions/chat_conversation_accounts.js
+++ b/app/javascript/gabsocial/actions/chat_conversation_accounts.js
@@ -24,23 +24,13 @@ export const IS_CHAT_MESSENGER_BLOCKED_SUCCESS = 'IS_CHAT_MESSENGER_BLOCKED_SUCC

 //

-export const CHAT_MESSENGER_MUTES_FETCH_REQUEST = 'CHAT_MESSENGER_MUTES_FETCH_REQUEST'
-export const CHAT_MESSENGER_MUTES_FETCH_SUCCESS = 'CHAT_MESSENGER_MUTES_FETCH_SUCCESS'
-export const CHAT_MESSENGER_MUTES_FETCH_FAIL    = 'CHAT_MESSENGER_MUTES_FETCH_FAIL'
+export const MUTE_CHAT_CONVERSATION_REQUEST = 'MUTE_CHAT_CONVERSATION_REQUEST'
+export const MUTE_CHAT_CONVERSATION_SUCCESS = 'MUTE_CHAT_CONVERSATION_SUCCESS'
+export const MUTE_CHAT_CONVERSATION_FAIL    = 'MUTE_CHAT_CONVERSATION_FAIL'

-export const CHAT_MESSENGER_MUTES_EXPAND_REQUEST = 'CHAT_MESSENGER_MUTES_EXPAND_REQUEST'
-export const CHAT_MESSENGER_MUTES_EXPAND_SUCCESS = 'CHAT_MESSENGER_MUTES_EXPAND_SUCCESS'
-export const CHAT_MESSENGER_MUTES_EXPAND_FAIL    = 'CHAT_MESSENGER_MUTES_EXPAND_FAIL'
-
-export const MUTE_CHAT_MESSAGER_REQUEST = 'MUTE_CHAT_MESSAGER_REQUEST'
-export const MUTE_CHAT_MESSAGER_SUCCESS = 'MUTE_CHAT_MESSAGER_SUCCESS'
-export const MUTE_CHAT_MESSAGER_FAIL    = 'MUTE_CHAT_MESSAGER_FAIL'
-
-export const UNMUTE_CHAT_MESSAGER_REQUEST = 'UNMUTE_CHAT_MESSAGER_REQUEST'
-export const UNMUTE_CHAT_MESSAGER_SUCCESS = 'UNMUTE_CHAT_MESSAGER_SUCCESS'
-export const UNMUTE_CHAT_MESSAGER_FAIL    = 'UNMUTE_CHAT_MESSAGER_FAIL'
-
-export const IS_CHAT_MESSENGER_MUTED_SUCCESS = 'IS_CHAT_MESSENGER_MUTED_SUCCESS'
+export const UNMUTE_CHAT_CONVERSATION_REQUEST = 'UNMUTE_CHAT_CONVERSATION_REQUEST'
+export const UNMUTE_CHAT_CONVERSATION_SUCCESS = 'UNMUTE_CHAT_CONVERSATION_SUCCESS'
+export const UNMUTE_CHAT_CONVERSATION_FAIL    = 'UNMUTE_CHAT_CONVERSATION_FAIL'

 /**
 * 
@@ -96,12 +86,12 @@ const unblockChatMessengerRequest = (accountId) => ({
 })

 const unblockChatMessengerSuccess = () => ({
-  type: UNBLOCK_CHAT_MESSAGER_REQUEST,
+  type: UNBLOCK_CHAT_MESSAGER_SUCCESS,
  showToast: true,
 })

 const unblockChatMessengerFail = (accountId, error) => ({
-  type: UNBLOCK_CHAT_MESSAGER_REQUEST,
+  type: UNBLOCK_CHAT_MESSAGER_FAIL,
  showToast: true,
  accountId,
  error,
@@ -195,147 +185,64 @@ export const expandChatMessengerBlocksFail = (error) => ({
 /**
 * 
 */
-export const muteChatMessenger = (accountId) => (dispatch, getState) => {
-  if (!me || !accountId) return
+export const muteChatConversation = (chatConversationId) => (dispatch, getState) => {
+  if (!me || !chatConversationId) return

-  dispatch(muteChatMessengerRequest(accountId))
+  dispatch(muteChatConversationRequest(chatConversationId))
  
-  api(getState).post(`/api/v1/chat_conversation_accounts/${accountId}/mute_messenger`).then((response) => {
-    dispatch(muteChatMessengerSuccess())
+  api(getState).post(`/api/v1/chat_conversation_accounts/${chatConversationId}/mute_chat_conversation`).then((response) => {
+    dispatch(muteChatConversationSuccess(response.data))
  }).catch((error) => {
-    dispatch(muteChatMessengerFail(accountId, error))
+    dispatch(muteChatMessengerFail(error))
  })
 }

-const muteChatMessengerRequest = (accountId) => ({
-  type: MUTE_CHAT_MESSAGER_REQUEST,
+const muteChatConversationRequest = (accountId) => ({
+  type: MUTE_CHAT_CONVERSATION_REQUEST,
  accountId,
 })

-const muteChatMessengerSuccess = () => ({
-  type: MUTE_CHAT_MESSAGER_SUCCESS,
+const muteChatConversationSuccess = (chatConversation) => ({
+  type: MUTE_CHAT_CONVERSATION_SUCCESS,
+  chatConversation,
  showToast: true,
 })

-const muteChatMessengerFail = (accountId, error) => ({
-  type: MUTE_CHAT_MESSAGER_FAIL,
+const muteChatConversationFail = (error) => ({
+  type: MUTE_CHAT_CONVERSATION_FAIL,
  showToast: true,
-  accountId,
  error,
 })

 /**
 *
 */
-export const unmuteChatMessenger = (accountId) => (dispatch, getState) => {
-  if (!me || !accountId) return
+export const unmuteChatConversation = (chatConversationId) => (dispatch, getState) => {
+  if (!me || !chatConversationId) return

-  dispatch(unmuteChatMessengerRequest(accountId))
+  dispatch(unmuteChatConversationRequest(chatConversationId))

-  api(getState).post(`/api/v1/chat_conversation_accounts/${accountId}/unmute_messenger`).then((response) => {
-    dispatch(unmuteChatMessengerSuccess())
+  api(getState).post(`/api/v1/chat_conversation_accounts/${chatConversationId}/unmute_chat_conversation`).then((response) => {
+    dispatch(unmuteChatConversationSuccess(response.data))
  }).catch((error) => {
-    dispatch(unmuteChatMessengerFail(accountId, error))
+    dispatch(unmuteChatConversationFail(error))
  })
 }

-const unmuteChatMessengerRequest = (accountId) => ({
-  type: UNMUTE_CHAT_MESSAGER_REQUEST,
+const unmuteChatConversationRequest = (accountId) => ({
+  type: UNMUTE_CHAT_CONVERSATION_REQUEST,
  accountId,
 })

-const unmuteChatMessengerSuccess = () => ({
-  type: UNMUTE_CHAT_MESSAGER_REQUEST,
+const unmuteChatConversationSuccess = (chatConversation) => ({
+  type: UNMUTE_CHAT_CONVERSATION_SUCCESS,
+  chatConversation,
  showToast: true,
 })

-const unmuteChatMessengerFail = (accountId, error) => ({
-  type: UNMUTE_CHAT_MESSAGER_REQUEST,
+const unmuteChatConversationFail = (accountId, error) => ({
+  type: UNMUTE_CHAT_CONVERSATION_FAIL,
  showToast: true,
  accountId,
  error,
 })
-
-/**
- * @description Check if a chat messenger is muted by the current user account.
- * @param {String} accountId
- */
-export const isChatMessengerMuted = (accountId) => (dispatch, getState) => {
-  if (!me || !accountId) return
-
-  api(getState).post(`/api/v1/chat_conversation_accounts/${accountId}/is_messenger_muted`).then((response) => {
-    dispatch(isChatMessengerMutedSuccess(response.data))
-  })
-}
-
-const isChatMessengerMutedSuccess = (data) => ({
-  type: IS_CHAT_MESSENGER_MUTED_SUCCESS,
-  data,
-})
-
-/**
- * 
- */
-export const fetchChatMessengerMutes = () => (dispatch, getState) => {
-  if (!me) return
-
-  dispatch(fetchChatMessengerMutesRequest())
-
-  api(getState).get('/api/v1/chat_conversation_accounts/muted_chat_accounts').then(response => {
-    const next = getLinks(response).refs.find(link => link.rel === 'next')
-    dispatch(importFetchedAccounts(response.data))
-    dispatch(fetchChatMessengerMutesSuccess(response.data, next ? next.uri : null))
-  }).catch(error => dispatch(fetchChatMessengerMutesFail(error)))
-}
-
-export const fetchChatMessengerMutesRequest = () => ({
-  type: CHAT_MESSENGER_MUTES_FETCH_REQUEST,
-})
-
-export const fetchChatMessengerMutesSuccess = (accounts, next) => ({
-  type: CHAT_MESSENGER_MUTES_FETCH_SUCCESS,
-  accounts,
-  next,
-})
-
-export const fetchChatMessengerMutesFail = (error) => ({
-  type: CHAT_MESSENGER_MUTES_FETCH_FAIL,
-  showToast: true,
-  error,
-})
-
-/**
- * 
- */
-export const expandChatMessengerMutes = () => (dispatch, getState) => {
-  if (!me) return
-  
-  const url = getState().getIn(['user_lists', 'chat_mutes', me, 'next'])
-  const isLoading = getState().getIn(['user_lists', 'chat_mutes', me, 'isLoading'])
-
-  if (url === null || isLoading) return
-
-  dispatch(expandChatMessengerMutesRequest())
-
-  api(getState).get(url).then(response => {
-    const next = getLinks(response).refs.find(link => link.rel === 'next')
-    dispatch(importFetchedAccounts(response.data))
-    dispatch(expandChatMessengerMutesSuccess(response.data, next ? next.uri : null))
-  }).catch(error => dispatch(expandChatMessengerMutesFail(error)))
-}
-
-export const expandChatMessengerMutesRequest = () => ({
-  type: CHAT_MESSENGER_MUTES_EXPAND_REQUEST,
-})
-
-export const expandChatMessengerMutesSuccess = (accounts, next) => ({
-  type: CHAT_MESSENGER_MUTES_EXPAND_SUCCESS,
-  accounts,
-  next,
-})
-
-export const expandChatMessengerMutesFail = (error) => ({
-  type: CHAT_MESSENGER_MUTES_EXPAND_FAIL,
-  error,
-})
-
--- a/app/javascript/gabsocial/actions/chats.js
+++ b/app/javascript/gabsocial/actions/chats.js
@@ -11,6 +11,8 @@ export const SET_CHAT_CONVERSATION_SELECTED = 'SET_CHAT_CONVERSATION_SELECTED'
 * 
 */
 export const fetchChatConversationAccountSuggestions = (query) => throttle((dispatch, getState) => {
+  if (!query) return
+  
  api(getState).get('/api/v1/accounts/search', {
    params: {
      q: query,