mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-10-29 08:32:24 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

[frogend] Emoji copy "Steal this look" (#1222)

Browse source 
* split emoji into local and remote, allow looking up remote emoji by toot url

* optimize some/all filtering

* fix local emoji routes

* implement copy action

* shortcode validation, don't wipe form on error

* copy & disable PATCH

* remove local toot acceptance for testing

* unused import

* parse emoji from account and status, get web_url from status uri

* fix url parse

* submit button loading info

* actually send category

* code cleanup, distinguish between account and status responses

* use loading icons

* fix loading icon on federation page

* require Loading element

* remove unused require

* query explanation, small accessibility tweaks
This commit is contained in:
f0x52 2022-12-11 16:00:23 +01:00 • committed by GitHub
commit 4b8d7bd952
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 623 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

9
web/source/settings/index.js
View file

@ -32,6 +32,7 @@ const oauth = require("./redux/reducers/oauth").actions;
const { AuthenticationError } = require("./lib/errors");
const Login = require("./components/login");
const Loading = require("./components/loading");
require("./style.css");
@ -46,7 +47,11 @@ const nav = {
"Instance Settings": require("./admin/settings.js"),
"Actions": require("./admin/actions"),
"Federation": require("./admin/federation.js"),
"Custom Emoji": require("./admin/emoji"),
},
"Custom Emoji": {
adminOnly: true,
"Local": require("./admin/emoji/local"),
"Remote": require("./admin/emoji/remote"),
}
};
@ -167,7 +172,7 @@ function App() {
function Main() {
return (
<Provider store={store}>
<PersistGate loading={"loading..."} persistor={persistor}>
<PersistGate loading={<section><Loading/></section>} persistor={persistor}>
<App />
</PersistGate>
</Provider>