therwi/sunkkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into 'feat/conversation-muting'

Browse source 
# Conflicts:
#   src/components/extra_buttons/extra_buttons.js
#   src/components/extra_buttons/extra_buttons.vue
This commit is contained in:
Shpuld Shpludson 2019-07-26 12:44:32 +00:00
commit d3f6b581d1
28 changed files with 638 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/services/backend_interactor_service/backend_interactor_service.js
View file

@ -152,6 +152,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,
@ -216,7 +217,8 @@ const backendInteractorService = credentials => {
retweet,
unretweet,
updateNotificationSettings,
search2
search2,
searchUsers
}
return backendInteractorServiceInstance