mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-31 09:32:25 -05:00 
			
		
		
		
	[frogend] Settings refactor (#1318)
* yakshave new form field structure * fully refactor user profile settings form * use rtk query api for profile settings * refactor user post settings * refactor password change form * refactor admin settings * FormWithData structure for user forms * admin actions refactor * whitespace * fix user settings data prop * remove superfluous logging * cleanup old code * refactor federation/suspend (overview, detail) * mostly abstracted (emoji) checkbox list * refactor parse-from-toot * refactor custom-emoji, progress on federation bulk * loading icon styling to prevent big spinny * refactor federation import-export interface * cleanup old files * [chore] Update/add license headers for 2023 * redux fixes * text-field exports * appease the linter * refactor authentication with RTK Query * fix login/logout state transition weirdness * fixes/cleanup * small linter-related fixes * add eslint license header check, fix existing files * remove old code, clarify comment * clarify suspend on subdomains * collapse if/else * fa-fw width info comment
This commit is contained in:
		
					parent
					
						
							
								974ec80a20
							
						
					
				
			
			
				commit
				
					
						9b139b6320
					
				
			
		
					 69 changed files with 3129 additions and 2663 deletions
				
			
		|  | @ -1,35 +1,57 @@ | |||
| /* | ||||
| 	 GoToSocial | ||||
| 	 Copyright (C) 2021-2023 GoToSocial Authors admin@gotosocial.org | ||||
| 	GoToSocial | ||||
| 	Copyright (C) 2021-2023 GoToSocial Authors admin@gotosocial.org | ||||
| 
 | ||||
| 	 This program is free software: you can redistribute it and/or modify | ||||
| 	 it under the terms of the GNU Affero General Public License as published by | ||||
| 	 the Free Software Foundation, either version 3 of the License, or | ||||
| 	 (at your option) any later version. | ||||
| 	This program is free software: you can redistribute it and/or modify | ||||
| 	it under the terms of the GNU Affero General Public License as published by | ||||
| 	the Free Software Foundation, either version 3 of the License, or | ||||
| 	(at your option) any later version. | ||||
| 
 | ||||
| 	 This program is distributed in the hope that it will be useful, | ||||
| 	 but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||
| 	 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | ||||
| 	 GNU Affero General Public License for more details. | ||||
| 	This program is distributed in the hope that it will be useful, | ||||
| 	but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||
| 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | ||||
| 	GNU Affero General Public License for more details. | ||||
| 
 | ||||
| 	 You should have received a copy of the GNU Affero General Public License | ||||
| 	 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | ||||
| 	You should have received a copy of the GNU Affero General Public License | ||||
| 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | ||||
| */ | ||||
| 
 | ||||
| "use strict"; | ||||
| 
 | ||||
| const { createApi, fetchBaseQuery } = require("@reduxjs/toolkit/query/react"); | ||||
| const { isPlainObject } = require("is-plain-object"); | ||||
| 
 | ||||
| const { convertToForm } = require("../api"); | ||||
| function convertToForm(obj) { | ||||
| 	const formData = new FormData(); | ||||
| 	Object.entries(obj).forEach(([key, val]) => { | ||||
| 		if (isPlainObject(val)) { | ||||
| 			Object.entries(val).forEach(([key2, val2]) => { | ||||
| 				if (val2 != undefined) { | ||||
| 					formData.set(`${key}[${key2}]`, val2); | ||||
| 				} | ||||
| 			}); | ||||
| 		} else if (val != undefined) { | ||||
| 			formData.set(key, val); | ||||
| 		} | ||||
| 	}); | ||||
| 	return formData; | ||||
| } | ||||
| 
 | ||||
| function instanceBasedQuery(args, api, extraOptions) { | ||||
| 	const state = api.getState(); | ||||
| 	const {instance, token} = state.oauth; | ||||
| 	const { instance, token } = state.oauth; | ||||
| 
 | ||||
| 	if (args.baseUrl == undefined) { | ||||
| 		args.baseUrl = instance; | ||||
| 	} | ||||
| 
 | ||||
| 	if (args.discardEmpty) { | ||||
| 		if (args.body == undefined || Object.keys(args.body).length == 0) { | ||||
| 			return { data: null }; | ||||
| 		} | ||||
| 		delete args.discardEmpty; | ||||
| 	} | ||||
| 
 | ||||
| 	if (args.asForm) { | ||||
| 		delete args.asForm; | ||||
| 		args.body = convertToForm(args.body); | ||||
|  | @ -50,6 +72,12 @@ function instanceBasedQuery(args, api, extraOptions) { | |||
| module.exports = createApi({ | ||||
| 	reducerPath: "api", | ||||
| 	baseQuery: instanceBasedQuery, | ||||
| 	tagTypes: ["Emojis"], | ||||
| 	endpoints: () => ({}) | ||||
| 	tagTypes: ["Auth"], | ||||
| 	endpoints: (build) => ({ | ||||
| 		instance: build.query({ | ||||
| 			query: () => ({ | ||||
| 				url: `/api/v1/instance` | ||||
| 			}) | ||||
| 		}) | ||||
| 	}) | ||||
| }); | ||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue