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
pleroma-fe
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
Joseph Nuthalapati
pleroma-fe
Commits
619608ea
Commit
619608ea
authored
Jul 18, 2019
by
Shpuld Shpludson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix issues caused by merges in usersearch on @
parent
029dc740
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
3 deletions
+19
-3
src/components/emoji-input/suggestor.js
src/components/emoji-input/suggestor.js
+1
-1
src/services/api/api.service.js
src/services/api/api.service.js
+15
-1
src/services/backend_interactor_service/backend_interactor_service.js
.../backend_interactor_service/backend_interactor_service.js
+3
-1
static/gtr.png
static/gtr.png
+0
-0
static/shpposter_club.jpg
static/shpposter_club.jpg
+0
-0
No files found.
src/components/emoji-input/suggestor.js
View file @
619608ea
...
...
@@ -13,7 +13,7 @@ import { debounce } from 'lodash'
const
debounceUserSearch
=
debounce
((
data
,
input
)
=>
{
data
.
updateUsersList
(
input
)
},
500
,
{
leading
:
true
,
trailing
:
false
})
},
500
,
{
leading
:
true
,
trailing
:
false
})
export
default
data
=>
input
=>
{
const
firstChar
=
input
[
0
]
...
...
src/services/api/api.service.js
View file @
619608ea
...
...
@@ -68,6 +68,7 @@ const MASTODON_REPORT_USER_URL = '/api/v1/reports'
const
MASTODON_PIN_OWN_STATUS
=
id
=>
`
/api/v1/statuses/
${
id
}
/pin
`
const
MASTODON_UNPIN_OWN_STATUS
=
id
=>
`
/api/v1/statuses/
${
id
}
/unpin
`
const
MASTODON_SEARCH_2
=
`
/api/v2/search
`
const
MASTODON_USER_SEARCH_URL
=
'
/api/v1/accounts/search
'
const
oldfetch
=
window
.
fetch
...
...
@@ -853,6 +854,18 @@ const reportUser = ({ credentials, userId, statusIds, comment, forward }) => {
})
}
const
searchUsers
=
({
credentials
,
query
})
=>
{
return
promisedRequest
({
url
:
MASTODON_USER_SEARCH_URL
,
params
:
{
q
:
query
,
resolve
:
true
},
credentials
})
.
then
((
data
)
=>
data
.
map
(
parseUser
))
}
const
search2
=
({
credentials
,
q
,
resolve
,
limit
,
offset
,
following
})
=>
{
let
url
=
MASTODON_SEARCH_2
let
params
=
[]
...
...
@@ -960,7 +973,8 @@ const apiService = {
fetchRebloggedByUsers
,
reportUser
,
updateNotificationSettings
,
search2
search2
,
searchUsers
}
export
default
apiService
src/services/backend_interactor_service/backend_interactor_service.js
View file @
619608ea
...
...
@@ -150,6 +150,7 @@ const backendInteractorService = credentials => {
const
unretweet
=
(
id
)
=>
apiService
.
unretweet
({
id
,
credentials
})
const
search2
=
({
q
,
resolve
,
limit
,
offset
,
following
})
=>
apiService
.
search2
({
credentials
,
q
,
resolve
,
limit
,
offset
,
following
})
const
searchUsers
=
(
query
)
=>
apiService
.
searchUsers
({
query
,
credentials
})
const
backendInteractorServiceInstance
=
{
fetchStatus
,
...
...
@@ -212,7 +213,8 @@ const backendInteractorService = credentials => {
retweet
,
unretweet
,
updateNotificationSettings
,
search2
search2
,
searchUsers
}
return
backendInteractorServiceInstance
...
...
static/gtr.png
0 → 100644
View file @
619608ea
4.2 KB
static/shpposter_club.jpg
0 → 100644
View file @
619608ea
178 KB
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