Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mastofe
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Haelwenn
mastofe
Commits
b08ab329
Commit
b08ab329
authored
Apr 04, 2018
by
Isatis
Committed by
Eugen Rochko
Apr 04, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
retrieve custom emoji list via API instead of before page load (#7047)
parent
f1867a73
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
49 additions
and
15 deletions
+49
-15
app/javascript/mastodon/actions/custom_emojis.js
app/javascript/mastodon/actions/custom_emojis.js
+37
-0
app/javascript/mastodon/containers/mastodon.js
app/javascript/mastodon/containers/mastodon.js
+4
-0
app/javascript/mastodon/reducers/custom_emojis.js
app/javascript/mastodon/reducers/custom_emojis.js
+8
-9
app/serializers/initial_state_serializer.rb
app/serializers/initial_state_serializer.rb
+0
-6
No files found.
app/javascript/mastodon/actions/custom_emojis.js
0 → 100644
View file @
b08ab329
import
api
from
'
../api
'
;
export
const
CUSTOM_EMOJIS_FETCH_REQUEST
=
'
CUSTOM_EMOJIS_FETCH_REQUEST
'
;
export
const
CUSTOM_EMOJIS_FETCH_SUCCESS
=
'
CUSTOM_EMOJIS_FETCH_SUCCESS
'
;
export
const
CUSTOM_EMOJIS_FETCH_FAIL
=
'
CUSTOM_EMOJIS_FETCH_FAIL
'
;
export
function
fetchCustomEmojis
()
{
return
(
dispatch
,
getState
)
=>
{
dispatch
(
fetchCustomEmojisRequest
());
api
(
getState
).
get
(
'
/api/v1/custom_emojis
'
).
then
(
response
=>
{
dispatch
(
fetchCustomEmojisSuccess
(
response
.
data
));
}).
catch
(
error
=>
{
dispatch
(
fetchCustomEmojisFail
(
error
));
});
};
};
export
function
fetchCustomEmojisRequest
()
{
return
{
type
:
CUSTOM_EMOJIS_FETCH_REQUEST
,
};
};
export
function
fetchCustomEmojisSuccess
(
custom_emojis
)
{
return
{
type
:
CUSTOM_EMOJIS_FETCH_SUCCESS
,
custom_emojis
,
};
};
export
function
fetchCustomEmojisFail
(
error
)
{
return
{
type
:
CUSTOM_EMOJIS_FETCH_FAIL
,
error
,
};
};
app/javascript/mastodon/containers/mastodon.js
View file @
b08ab329
...
...
@@ -6,6 +6,7 @@ import { showOnboardingOnce } from '../actions/onboarding';
import
{
BrowserRouter
,
Route
}
from
'
react-router-dom
'
;
import
{
ScrollContext
}
from
'
react-router-scroll-4
'
;
import
UI
from
'
../features/ui
'
;
import
{
fetchCustomEmojis
}
from
'
../actions/custom_emojis
'
;
import
{
hydrateStore
}
from
'
../actions/store
'
;
import
{
connectUserStream
}
from
'
../actions/streaming
'
;
import
{
IntlProvider
,
addLocaleData
}
from
'
react-intl
'
;
...
...
@@ -19,6 +20,9 @@ export const store = configureStore();
const
hydrateAction
=
hydrateStore
(
initialState
);
store
.
dispatch
(
hydrateAction
);
// load custom emojis
store
.
dispatch
(
fetchCustomEmojis
());
export
default
class
Mastodon
extends
React
.
PureComponent
{
static
propTypes
=
{
...
...
app/javascript/mastodon/reducers/custom_emojis.js
View file @
b08ab329
import
{
List
as
ImmutableList
}
from
'
immutable
'
;
import
{
STORE_HYDRATE
}
from
'
../actions/store
'
;
import
{
List
as
ImmutableList
,
fromJS
as
ConvertToImmutable
}
from
'
immutable
'
;
import
{
CUSTOM_EMOJIS_FETCH_SUCCESS
}
from
'
../actions/custom_emojis
'
;
import
{
search
as
emojiSearch
}
from
'
../features/emoji/emoji_mart_search_light
'
;
import
{
buildCustomEmojis
}
from
'
../features/emoji/emoji
'
;
const
initialState
=
ImmutableList
();
const
initialState
=
ImmutableList
(
[]
);
export
default
function
custom_emojis
(
state
=
initialState
,
action
)
{
switch
(
action
.
type
)
{
case
STORE_HYDRATE
:
emojiSearch
(
''
,
{
custom
:
buildCustomEmojis
(
action
.
state
.
get
(
'
custom_emojis
'
,
[]))
});
return
action
.
state
.
get
(
'
custom_emojis
'
);
default
:
return
state
;
if
(
action
.
type
===
CUSTOM_EMOJIS_FETCH_SUCCESS
)
{
state
=
ConvertToImmutable
(
action
.
custom_emojis
);
emojiSearch
(
''
,
{
custom
:
buildCustomEmojis
(
state
)
});
}
return
state
;
};
app/serializers/initial_state_serializer.rb
View file @
b08ab329
...
...
@@ -4,12 +4,6 @@ class InitialStateSerializer < ActiveModel::Serializer
attributes
:meta
,
:compose
,
:accounts
,
:media_attachments
,
:settings
,
:push_subscription
has_many
:custom_emojis
,
serializer:
REST
::
CustomEmojiSerializer
def
custom_emojis
CustomEmoji
.
local
.
where
(
disabled:
false
)
end
def
meta
store
=
{
streaming_api_base_url:
Rails
.
configuration
.
x
.
streaming_api_base_url
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment