oscar-surf/misskey
oscar-surf/misskey
0
0
Fork 0
Code Issues Activity

Resolve #6806 (#6935)

Browse source 
* ✌️

* ✌️

* Update privacy.vue
This commit is contained in:
syuilo 2020-12-11 21:16:20 +09:00 • committed by GitHub
parent 488e6feed9
commit 69c3c4e3dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 52 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/server/api/endpoints/i/update.ts
View file

@ -92,6 +92,10 @@ export const meta = {
}
},
isExplorable: {
validator: $.optional.bool,
},
carefulBot: {
validator: $.optional.bool,
desc: {
@ -208,6 +212,7 @@ export default define(meta, async (ps, user, token) => {
}
if (ps.mutingNotificationTypes !== undefined) profileUpdates.mutingNotificationTypes = ps.mutingNotificationTypes as typeof notificationTypes[number][];
if (typeof ps.isLocked === 'boolean') updates.isLocked = ps.isLocked;
if (typeof ps.isExplorable === 'boolean') updates.isExplorable = ps.isExplorable;
if (typeof ps.isBot === 'boolean') updates.isBot = ps.isBot;
if (typeof ps.carefulBot === 'boolean') profileUpdates.carefulBot = ps.carefulBot;
if (typeof ps.autoAcceptFollowed === 'boolean') profileUpdates.autoAcceptFollowed = ps.autoAcceptFollowed;

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

@ -64,12 +64,13 @@ export const meta = {
export default define(meta, async (ps, me) => {
const query = Users.createQueryBuilder('user');
query.where('user.isExplorable = TRUE');
switch (ps.state) {
case 'admin': query.where('user.isAdmin = TRUE'); break;
case 'moderator': query.where('user.isModerator = TRUE'); break;
case 'adminOrModerator': query.where('user.isAdmin = TRUE OR isModerator = TRUE'); break;
case 'alive': query.where('user.updatedAt > :date', { date: new Date(Date.now() - 1000 * 60 * 60 * 24 * 5) }); break;
case 'admin': query.andWhere('user.isAdmin = TRUE'); break;
case 'moderator': query.andWhere('user.isModerator = TRUE'); break;
case 'adminOrModerator': query.andWhere('user.isAdmin = TRUE OR isModerator = TRUE'); break;
case 'alive': query.andWhere('user.updatedAt > :date', { date: new Date(Date.now() - 1000 * 60 * 60 * 24 * 5) }); break;
}
switch (ps.origin) {

1
src/server/api/endpoints/users/recommendation.ts
View file

@ -42,6 +42,7 @@ export const meta = {
export default define(meta, async (ps, me) => {
const query = Users.createQueryBuilder('user')
.where('user.isLocked = FALSE')
.andWhere('user.isExplorable = TRUE')
.andWhere('user.host IS NULL')
.andWhere('user.updatedAt >= :date', { date: new Date(Date.now() - ms('7days')) })
.andWhere('user.id != :meId', { meId: me.id })