Merge branch 'develop' into user_management
because
This commit is contained in:
commit
eb3d75e6de
29 changed files with 637 additions and 497 deletions
|
|
@ -352,7 +352,7 @@ const unmuteConversation = ({ id, credentials }) => {
|
|||
const blockUser = ({ id, expiresIn, credentials }) => {
|
||||
const payload = {}
|
||||
if (expiresIn) {
|
||||
payload.expires_in = expiresIn
|
||||
payload.duration = expiresIn
|
||||
}
|
||||
|
||||
return promisedRequest({
|
||||
|
|
|
|||
|
|
@ -18,8 +18,7 @@ const mastoApiNotificationTypes = new Set([
|
|||
'move',
|
||||
'poll',
|
||||
'pleroma:emoji_reaction',
|
||||
'pleroma:report',
|
||||
'test'
|
||||
'pleroma:report'
|
||||
])
|
||||
|
||||
const fetchAndUpdate = ({ store, credentials, older = false, since }) => {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue