mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-30 23:12:25 -05:00 
			
		
		
		
	[frontend] Custom Emoji Deletion (#994)
* re-add eslint * fix oauth url getting too long * actually attach single emoji get and delete routes * basic emoji details + deletion using rtk query * refactor emoji upload to rtk query * clean up old redux api+reducers for custom emoji * fix validation order * refactor custom emoji form fields * remove unused requires * cleanup, fix most eslint errors * more small eslint fixes * fix max emoji size * tiny bit of function documentation
This commit is contained in:
		
					parent
					
						
							
								be011b1641
							
						
					
				
			
			
				commit
				
					
						eb25739c34
					
				
			
		
					 32 changed files with 1467 additions and 506 deletions
				
			
		
							
								
								
									
										55
									
								
								web/source/settings/lib/query/base.js
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										55
									
								
								web/source/settings/lib/query/base.js
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,55 @@ | |||
| /* | ||||
| 	 GoToSocial | ||||
| 	 Copyright (C) 2021-2022 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 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/>.
 | ||||
| */ | ||||
| 
 | ||||
| "use strict"; | ||||
| 
 | ||||
| const { createApi, fetchBaseQuery } = require("@reduxjs/toolkit/query/react"); | ||||
| 
 | ||||
| const { convertToForm } = require("../api"); | ||||
| 
 | ||||
| function instanceBasedQuery(args, api, extraOptions) { | ||||
| 	const state = api.getState(); | ||||
| 	const {instance, token} = state.oauth; | ||||
| 
 | ||||
| 	if (args.baseUrl == undefined) { | ||||
| 		args.baseUrl = instance; | ||||
| 	} | ||||
| 
 | ||||
| 	if (args.asForm) { | ||||
| 		delete args.asForm; | ||||
| 		args.body = convertToForm(args.body); | ||||
| 	} | ||||
| 
 | ||||
| 	return fetchBaseQuery({ | ||||
| 		baseUrl: args.baseUrl, | ||||
| 		prepareHeaders: (headers) => { | ||||
| 			if (token != undefined) { | ||||
| 				headers.set('Authorization', token); | ||||
| 			} | ||||
| 			headers.set("Accept", "application/json"); | ||||
| 			return headers; | ||||
| 		}, | ||||
| 	})(args, api, extraOptions); | ||||
| } | ||||
| 
 | ||||
| module.exports = createApi({ | ||||
| 	reducerPath: "api", | ||||
| 	baseQuery: instanceBasedQuery, | ||||
| 	tagTypes: ["Emojis"], | ||||
| 	endpoints: () => ({}) | ||||
| }); | ||||
							
								
								
									
										66
									
								
								web/source/settings/lib/query/custom-emoji.js
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										66
									
								
								web/source/settings/lib/query/custom-emoji.js
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,66 @@ | |||
| /* | ||||
| 	 GoToSocial | ||||
| 	 Copyright (C) 2021-2022 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 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/>.
 | ||||
| */ | ||||
| 
 | ||||
| "use strict"; | ||||
| 
 | ||||
| const base = require("./base"); | ||||
| 
 | ||||
| const endpoints = (build) => ({ | ||||
| 	getAllEmoji: build.query({ | ||||
| 		query: (params = {}) => ({ | ||||
| 			url: "/api/v1/admin/custom_emojis", | ||||
| 			params: { | ||||
| 				limit: 0, | ||||
| 				...params | ||||
| 			} | ||||
| 		}), | ||||
| 		providesTags: (res) =>  | ||||
| 			res | ||||
| 				? [...res.map((emoji) => ({type: "Emojis", id: emoji.id})), {type: "Emojis", id: "LIST"}] | ||||
| 				: [{type: "Emojis", id: "LIST"}] | ||||
| 	}), | ||||
| 	getEmoji: build.query({ | ||||
| 		query: (id) => ({ | ||||
| 			url: `/api/v1/admin/custom_emojis/${id}` | ||||
| 		}), | ||||
| 		providesTags: (res, error, id) => [{type: "Emojis", id}] | ||||
| 	}), | ||||
| 	addEmoji: build.mutation({ | ||||
| 		query: (form) => { | ||||
| 			return { | ||||
| 				method: "POST", | ||||
| 				url: `/api/v1/admin/custom_emojis`, | ||||
| 				asForm: true, | ||||
| 				body: form | ||||
| 			}; | ||||
| 		}, | ||||
| 		invalidatesTags: (res) =>  | ||||
| 			res | ||||
| 				? [{type: "Emojis", id: "LIST"}, {type: "Emojis", id: res.id}] | ||||
| 				: [{type: "Emojis", id: "LIST"}] | ||||
| 	}), | ||||
| 	deleteEmoji: build.mutation({ | ||||
| 		query: (id) => ({ | ||||
| 			method: "DELETE", | ||||
| 			url: `/api/v1/admin/custom_emojis/${id}` | ||||
| 		}), | ||||
| 		invalidatesTags: (res, error, id) => [{type: "Emojis", id}] | ||||
| 	}) | ||||
| }); | ||||
| 
 | ||||
| module.exports = base.injectEndpoints({endpoints}); | ||||
							
								
								
									
										24
									
								
								web/source/settings/lib/query/index.js
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										24
									
								
								web/source/settings/lib/query/index.js
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,24 @@ | |||
| /* | ||||
| 	 GoToSocial | ||||
| 	 Copyright (C) 2021-2022 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 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/>.
 | ||||
| */ | ||||
| 
 | ||||
| "use strict"; | ||||
| 
 | ||||
| module.exports = { | ||||
| 	...require("./base"), | ||||
| 	...require("./custom-emoji.js") | ||||
| }; | ||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue