Merge pull request #2903 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to d0753ec
glitch-soc · Nov 25, 2024 · 3ca5d84 · 3ca5d84
2 parents 916d790 + 217e0f8
commit 3ca5d84
Show file tree

Hide file tree

Showing 215 changed files with 3,544 additions and 4,014 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -95,7 +95,7 @@ GEM
     attr_required (1.0.2)
     awrence (1.2.1)
     aws-eventstream (1.3.0)
-    aws-partitions (1.1009.0)
+    aws-partitions (1.1012.0)
     aws-sdk-core (3.213.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
@@ -104,7 +104,7 @@ GEM
     aws-sdk-kms (1.96.0)
       aws-sdk-core (~> 3, >= 3.210.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.172.0)
+    aws-sdk-s3 (1.173.0)
       aws-sdk-core (~> 3, >= 3.210.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
@@ -200,7 +200,7 @@ GEM
       activerecord (>= 4.2, < 9.0)
     docile (1.4.1)
     domain_name (0.6.20240107)
-    doorkeeper (5.7.1)
+    doorkeeper (5.8.0)
       railties (>= 5)
     dotenv (3.1.4)
     drb (2.2.1)

diff --git a/app/javascript/flavours/glitch/actions/accounts.js b/app/javascript/flavours/glitch/actions/accounts.js
@@ -74,19 +74,6 @@ export const FOLLOW_REQUEST_AUTHORIZE_FAIL    = 'FOLLOW_REQUEST_AUTHORIZE_FAIL';
 export const FOLLOW_REQUEST_REJECT_REQUEST = 'FOLLOW_REQUEST_REJECT_REQUEST';
 export const FOLLOW_REQUEST_REJECT_FAIL    = 'FOLLOW_REQUEST_REJECT_FAIL';
 
-export const PINNED_ACCOUNTS_FETCH_REQUEST = 'PINNED_ACCOUNTS_FETCH_REQUEST';
-export const PINNED_ACCOUNTS_FETCH_SUCCESS = 'PINNED_ACCOUNTS_FETCH_SUCCESS';
-export const PINNED_ACCOUNTS_FETCH_FAIL    = 'PINNED_ACCOUNTS_FETCH_FAIL';
-
-export const PINNED_ACCOUNTS_SUGGESTIONS_FETCH_REQUEST  = 'PINNED_ACCOUNTS_SUGGESTIONS_FETCH_REQUEST';
-export const PINNED_ACCOUNTS_SUGGESTIONS_FETCH_SUCCESS  = 'PINNED_ACCOUNTS_SUGGESTIONS_FETCH_SUCCESS';
-export const PINNED_ACCOUNTS_SUGGESTIONS_FETCH_FAIL     = 'PINNED_ACCOUNTS_SUGGESTIONS_FETCH_FAIL';
-
-export const PINNED_ACCOUNTS_EDITOR_SUGGESTIONS_CLEAR  = 'PINNED_ACCOUNTS_EDITOR_SUGGESTIONS_CLEAR';
-export const PINNED_ACCOUNTS_EDITOR_SUGGESTIONS_CHANGE = 'PINNED_ACCOUNTS_EDITOR_SUGGESTIONS_CHANGE';
-
-export const PINNED_ACCOUNTS_EDITOR_RESET = 'PINNED_ACCOUNTS_EDITOR_RESET';
-
 export const ACCOUNT_REVEAL = 'ACCOUNT_REVEAL';
 
 export * from './accounts_typed';
@@ -686,38 +673,6 @@ export function unpinAccountFail(error) {
   };
 }
 
-export function fetchPinnedAccounts() {
-  return (dispatch) => {
-    dispatch(fetchPinnedAccountsRequest());
-
-    api().get('/api/v1/endorsements', { params: { limit: 0 } }).then(response => {
-      dispatch(importFetchedAccounts(response.data));
-      dispatch(fetchPinnedAccountsSuccess(response.data));
-    }).catch(err => dispatch(fetchPinnedAccountsFail(err)));
-  };
-}
-
-export function fetchPinnedAccountsRequest() {
-  return {
-    type: PINNED_ACCOUNTS_FETCH_REQUEST,
-  };
-}
-
-export function fetchPinnedAccountsSuccess(accounts, next) {
-  return {
-    type: PINNED_ACCOUNTS_FETCH_SUCCESS,
-    accounts,
-    next,
-  };
-}
-
-export function fetchPinnedAccountsFail(error) {
-  return {
-    type: PINNED_ACCOUNTS_FETCH_FAIL,
-    error,
-  };
-}
-
 export const updateAccount = ({ displayName, note, avatar, header, discoverable, indexable }) => (dispatch) => {
   const data = new FormData();
 
@@ -736,68 +691,9 @@ export const updateAccount = ({ displayName, note, avatar, header, discoverable,
 export const navigateToProfile = (accountId) => {
   return (_dispatch, getState) => {
     const acct = getState().accounts.getIn([accountId, 'acct']);
-  
+
     if (acct) {
       browserHistory.push(`/@${acct}`);
     }
   };
 };
-
-export function fetchPinnedAccountsSuggestions(q) {
-  return (dispatch) => {
-    dispatch(fetchPinnedAccountsSuggestionsRequest());
-
-    const params = {
-      q,
-      resolve: false,
-      limit: 4,
-      following: true,
-    };
-
-    api().get('/api/v1/accounts/search', { params }).then(response => {
-      dispatch(importFetchedAccounts(response.data));
-      dispatch(fetchPinnedAccountsSuggestionsSuccess(q, response.data));
-    }).catch(err => dispatch(fetchPinnedAccountsSuggestionsFail(err)));
-  };
-}
-
-export function fetchPinnedAccountsSuggestionsRequest() {
-  return {
-    type: PINNED_ACCOUNTS_SUGGESTIONS_FETCH_REQUEST,
-  };
-}
-
-export function fetchPinnedAccountsSuggestionsSuccess(query, accounts) {
-  return {
-    type: PINNED_ACCOUNTS_SUGGESTIONS_FETCH_SUCCESS,
-    query,
-    accounts,
-  };
-}
-
-export function fetchPinnedAccountsSuggestionsFail(error) {
-  return {
-    type: PINNED_ACCOUNTS_SUGGESTIONS_FETCH_FAIL,
-    error,
-  };
-}
-
-export function clearPinnedAccountsSuggestions() {
-  return {
-    type: PINNED_ACCOUNTS_EDITOR_SUGGESTIONS_CLEAR,
-  };
-}
-
-export function changePinnedAccountsSuggestions(value) {
-  return {
-    type: PINNED_ACCOUNTS_EDITOR_SUGGESTIONS_CHANGE,
-    value,
-  };
-}
-
-export function resetPinnedAccountsEditor() {
-  return {
-    type: PINNED_ACCOUNTS_EDITOR_RESET,
-  };
-}
-