Mizah/Sharkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolve conflicts

Browse source
This commit is contained in:
syuilo 2018-03-29 14:48:47 +09:00
parent 281b388e39
commit bfc193d8cd
308 changed files with 3045 additions and 3200 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/server/api/endpoints/users.ts
View file

@ -29,11 +29,11 @@ module.exports = (params, me) => new Promise(async (res, rej) => {
if (sort) {
if (sort == '+follower') {
_sort = {
followers_count: -1
followersCount: -1
};
} else if (sort == '-follower') {
_sort = {
followers_count: 1
followersCount: 1
};
}
} else {