From 10928182034f1db668de422cda6461bd31aaaa73 Mon Sep 17 00:00:00 2001 From: Satsuki Yanagi <17376330+u1-liquid@users.noreply.github.com> Date: Wed, 22 May 2019 05:06:52 +0900 Subject: Add group update / transfer API --- src/server/api/endpoints/users/groups/transfer.ts | 86 +++++++++++++++++++++++ src/server/api/endpoints/users/groups/update.ts | 62 ++++++++++++++++ 2 files changed, 148 insertions(+) create mode 100644 src/server/api/endpoints/users/groups/transfer.ts create mode 100644 src/server/api/endpoints/users/groups/update.ts (limited to 'src/server/api') diff --git a/src/server/api/endpoints/users/groups/transfer.ts b/src/server/api/endpoints/users/groups/transfer.ts new file mode 100644 index 0000000000..3baa182abf --- /dev/null +++ b/src/server/api/endpoints/users/groups/transfer.ts @@ -0,0 +1,86 @@ +import $ from 'cafy'; +import { ID } from '../../../../../misc/cafy-id'; +import define from '../../../define'; +import { ApiError } from '../../../error'; +import { getUser } from '../../../common/getters'; +import { UserGroups, UserGroupJoinings } from '../../../../../models'; + +export const meta = { + desc: { + 'ja-JP': '指定したユーザーグループを指定したユーザーグループ内のユーザーに譲渡します。', + 'en-US': 'Transfer user group ownership to another user in group.' + }, + + tags: ['groups', 'users'], + + requireCredential: true, + + kind: 'write:user-groups', + + params: { + groupId: { + validator: $.type(ID), + }, + + userId: { + validator: $.type(ID), + desc: { + 'ja-JP': '対象のユーザーのID', + 'en-US': 'Target user ID' + } + }, + }, + + errors: { + noSuchGroup: { + message: 'No such group.', + code: 'NO_SUCH_GROUP', + id: '8e31d36b-2f88-4ccd-a438-e2d78a9162db' + }, + + noSuchUser: { + message: 'No such user.', + code: 'NO_SUCH_USER', + id: '711f7ebb-bbb9-4dfa-b540-b27809fed5e9' + }, + + noSuchGroupMember: { + message: 'No such group member.', + code: 'NO_SUCH_GROUP_MEMBER', + id: 'd31bebee-196d-42c2-9a3e-9474d4be6cc4' + }, + } +}; + +export default define(meta, async (ps, me) => { + // Fetch the group + const userGroup = await UserGroups.findOne({ + id: ps.groupId, + userId: me.id, + }); + + if (userGroup == null) { + throw new ApiError(meta.errors.noSuchGroup); + } + + // Fetch the user + const user = await getUser(ps.userId).catch(e => { + if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser); + throw e; + }); + + const joining = await UserGroupJoinings.findOne({ + userGroupId: userGroup.id, + userId: user.id + }); + + if (!joining) { + throw new ApiError(meta.errors.noSuchGroupMember); + } + + await UserGroups.update(userGroup.id, { + userId: ps.userId + }); + + return await UserGroups.pack(userGroup.id); +}); diff --git a/src/server/api/endpoints/users/groups/update.ts b/src/server/api/endpoints/users/groups/update.ts new file mode 100644 index 0000000000..ad9a1faa23 --- /dev/null +++ b/src/server/api/endpoints/users/groups/update.ts @@ -0,0 +1,62 @@ +import $ from 'cafy'; +import { ID } from '../../../../../misc/cafy-id'; +import define from '../../../define'; +import { ApiError } from '../../../error'; +import { UserGroups } from '../../../../../models'; + +export const meta = { + desc: { + 'ja-JP': '指定したユーザーグループを更新します。', + 'en-US': 'Update a user group' + }, + + tags: ['groups'], + + requireCredential: true, + + kind: 'write:user-groups', + + params: { + groupId: { + validator: $.type(ID), + desc: { + 'ja-JP': '対象となるユーザーグループのID', + 'en-US': 'ID of target user group' + } + }, + + name: { + validator: $.str.range(1, 100), + desc: { + 'ja-JP': 'このユーザーグループの名前', + 'en-US': 'name of this user group' + } + } + }, + + errors: { + noSuchGroup: { + message: 'No such group.', + code: 'NO_SUCH_GROUP', + id: '9081cda3-7a9e-4fac-a6ce-908d70f282f6' + }, + } +}; + +export default define(meta, async (ps, me) => { + // Fetch the group + const userGroup = await UserGroups.findOne({ + id: ps.groupId, + userId: me.id + }); + + if (userGroup == null) { + throw new ApiError(meta.errors.noSuchGroup); + } + + await UserGroups.update(userGroup.id, { + name: ps.name + }); + + return await UserGroups.pack(userGroup.id); +}); -- cgit v1.2.3-freya From eed9266ecbc26282dcc349eaacaa49d8d3a812e1 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 22 May 2019 12:58:53 +0900 Subject: align format --- src/server/api/endpoints/users/groups/transfer.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/server/api') diff --git a/src/server/api/endpoints/users/groups/transfer.ts b/src/server/api/endpoints/users/groups/transfer.ts index 3baa182abf..ca0ab9ab29 100644 --- a/src/server/api/endpoints/users/groups/transfer.ts +++ b/src/server/api/endpoints/users/groups/transfer.ts @@ -74,7 +74,7 @@ export default define(meta, async (ps, me) => { userId: user.id }); - if (!joining) { + if (joining == null) { throw new ApiError(meta.errors.noSuchGroupMember); } -- cgit v1.2.3-freya From 9d75ec799b15758b6da69575ab8355735e036f28 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 22 May 2019 13:00:36 +0900 Subject: Better deninition --- src/server/api/endpoints/users/groups/transfer.ts | 7 +++++++ src/server/api/endpoints/users/groups/update.ts | 7 +++++++ 2 files changed, 14 insertions(+) (limited to 'src/server/api') diff --git a/src/server/api/endpoints/users/groups/transfer.ts b/src/server/api/endpoints/users/groups/transfer.ts index ca0ab9ab29..b4284ab484 100644 --- a/src/server/api/endpoints/users/groups/transfer.ts +++ b/src/server/api/endpoints/users/groups/transfer.ts @@ -4,6 +4,7 @@ import define from '../../../define'; import { ApiError } from '../../../error'; import { getUser } from '../../../common/getters'; import { UserGroups, UserGroupJoinings } from '../../../../../models'; +import { types, bool } from '../../../../../misc/schema'; export const meta = { desc: { @@ -31,6 +32,12 @@ export const meta = { }, }, + res: { + type: types.object, + optional: bool.false, nullable: bool.false, + ref: 'UserGroup', + }, + errors: { noSuchGroup: { message: 'No such group.', diff --git a/src/server/api/endpoints/users/groups/update.ts b/src/server/api/endpoints/users/groups/update.ts index ad9a1faa23..bc974621a3 100644 --- a/src/server/api/endpoints/users/groups/update.ts +++ b/src/server/api/endpoints/users/groups/update.ts @@ -3,6 +3,7 @@ import { ID } from '../../../../../misc/cafy-id'; import define from '../../../define'; import { ApiError } from '../../../error'; import { UserGroups } from '../../../../../models'; +import { types, bool } from '../../../../../misc/schema'; export const meta = { desc: { @@ -34,6 +35,12 @@ export const meta = { } }, + res: { + type: types.object, + optional: bool.false, nullable: bool.false, + ref: 'UserGroup', + }, + errors: { noSuchGroup: { message: 'No such group.', -- cgit v1.2.3-freya From 9c8d26affad32fadba91ca733fdcce8578e93db6 Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 23 May 2019 14:11:42 +0900 Subject: Resolve #4967 --- src/client/app/admin/views/logs.vue | 11 +++++++++++ src/server/api/endpoints/admin/delete-logs.ts | 13 +++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 src/server/api/endpoints/admin/delete-logs.ts (limited to 'src/server/api') diff --git a/src/client/app/admin/views/logs.vue b/src/client/app/admin/views/logs.vue index 5c2cfdb396..cb54318187 100644 --- a/src/client/app/admin/views/logs.vue +++ b/src/client/app/admin/views/logs.vue @@ -26,6 +26,8 @@ + + {{ $t('delete-all') }} @@ -78,6 +80,15 @@ export default Vue.extend({ }).then(logs => { this.logs = logs.reverse(); }); + }, + + deleteAll() { + this.$root.api('admin/delete-logs').then(() => { + this.$root.dialog({ + type: 'success', + splash: true + }); + }); } } }); diff --git a/src/server/api/endpoints/admin/delete-logs.ts b/src/server/api/endpoints/admin/delete-logs.ts new file mode 100644 index 0000000000..26cf13c1f6 --- /dev/null +++ b/src/server/api/endpoints/admin/delete-logs.ts @@ -0,0 +1,13 @@ +import define from '../../define'; +import { Logs } from '../../../../models'; + +export const meta = { + tags: ['admin'], + + requireCredential: true, + requireModerator: true, +}; + +export default define(meta, async (ps) => { + await Logs.delete({}); +}); -- cgit v1.2.3-freya From dda7b0c80e1785e1979b088a32d7b47a763bb6a3 Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 23 May 2019 23:46:10 +0900 Subject: Refactor --- src/server/api/endpoints/i/update-email.ts | 33 ++------------------------- src/services/send-email.ts | 36 ++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 31 deletions(-) create mode 100644 src/services/send-email.ts (limited to 'src/server/api') diff --git a/src/server/api/endpoints/i/update-email.ts b/src/server/api/endpoints/i/update-email.ts index d4b9721d82..56284499d3 100644 --- a/src/server/api/endpoints/i/update-email.ts +++ b/src/server/api/endpoints/i/update-email.ts @@ -1,15 +1,13 @@ import $ from 'cafy'; import { publishMainStream } from '../../../../services/stream'; import define from '../../define'; -import * as nodemailer from 'nodemailer'; -import { fetchMeta } from '../../../../misc/fetch-meta'; import rndstr from 'rndstr'; import config from '../../../../config'; import * as ms from 'ms'; import * as bcrypt from 'bcryptjs'; -import { apiLogger } from '../../logger'; import { Users, UserProfiles } from '../../../../models'; import { ensure } from '../../../../prelude/ensure'; +import { sendEmail } from '../../../../services/send-email'; export const meta = { requireCredential: true, @@ -63,36 +61,9 @@ export default define(meta, async (ps, user) => { emailVerifyCode: code }); - const meta = await fetchMeta(true); - - const enableAuth = meta.smtpUser != null && meta.smtpUser !== ''; - - const transporter = nodemailer.createTransport({ - host: meta.smtpHost, - port: meta.smtpPort, - secure: meta.smtpSecure, - ignoreTLS: !enableAuth, - auth: enableAuth ? { - user: meta.smtpUser, - pass: meta.smtpPass - } : undefined - } as any); - const link = `${config.url}/verify-email/${code}`; - transporter.sendMail({ - from: meta.email!, - to: ps.email, - subject: meta.name || 'Misskey', - text: `To verify email, please click this link: ${link}` - }, (error, info) => { - if (error) { - apiLogger.error(error); - return; - } - - apiLogger.info('Message sent: %s', info.messageId); - }); + sendEmail(ps.email, 'Email verification', `To verify email, please click this link: ${link}`); } return iObj; diff --git a/src/services/send-email.ts b/src/services/send-email.ts new file mode 100644 index 0000000000..8818c5fcde --- /dev/null +++ b/src/services/send-email.ts @@ -0,0 +1,36 @@ +import * as nodemailer from 'nodemailer'; +import { fetchMeta } from '../misc/fetch-meta'; +import Logger from './logger'; + +export const logger = new Logger('email'); + +export async function sendEmail(to: string, subject: string, text: string) { + const meta = await fetchMeta(true); + + const enableAuth = meta.smtpUser != null && meta.smtpUser !== ''; + + const transporter = nodemailer.createTransport({ + host: meta.smtpHost, + port: meta.smtpPort, + secure: meta.smtpSecure, + ignoreTLS: !enableAuth, + auth: enableAuth ? { + user: meta.smtpUser, + pass: meta.smtpPass + } : undefined + } as any); + + try { + const info = await transporter.sendMail({ + from: meta.email!, + to: to, + subject: subject || 'Misskey', + text: text + }); + + logger.info('Message sent: %s', info.messageId); + } catch (e) { + logger.error(e); + throw e; + } +} -- cgit v1.2.3-freya From 7e7f94d685b0158e1f5fb800dcbc9b863b6bd6bd Mon Sep 17 00:00:00 2001 From: Satsuki Yanagi <17376330+u1-liquid@users.noreply.github.com> Date: Sat, 25 May 2019 08:35:16 +0900 Subject: Enable query result cache for meta / stats / hashtags trend (#4978) --- src/db/postgre.ts | 12 ++++++++++++ src/server/api/endpoints/hashtags/trend.ts | 3 +++ src/server/api/endpoints/meta.ts | 2 +- src/server/api/endpoints/stats.ts | 8 ++++---- 4 files changed, 20 insertions(+), 5 deletions(-) (limited to 'src/server/api') diff --git a/src/db/postgre.ts b/src/db/postgre.ts index 04893efe2c..8e2d585e99 100644 --- a/src/db/postgre.ts +++ b/src/db/postgre.ts @@ -96,6 +96,18 @@ export function initDb(justBorrow = false, sync = false, log = false) { extra: config.db.extra, synchronize: process.env.NODE_ENV === 'test' || sync, dropSchema: process.env.NODE_ENV === 'test' && !justBorrow, + cache: { + type: 'redis', + options: { + host: config.redis.host, + port: config.redis.port, + options:{ + auth_pass: config.redis.pass, + prefix: config.redis.prefix, + db: config.redis.db || 0 + } + } + }, logging: log, logger: log ? new MyCustomLogger() : undefined, entities: [ diff --git a/src/server/api/endpoints/hashtags/trend.ts b/src/server/api/endpoints/hashtags/trend.ts index 05d571851e..53a3514718 100644 --- a/src/server/api/endpoints/hashtags/trend.ts +++ b/src/server/api/endpoints/hashtags/trend.ts @@ -59,6 +59,7 @@ export default define(meta, async () => { .where(`note.createdAt > :date`, { date: new Date(Date.now() - rangeA) }) .andWhere(`note.tags != '{}'`) .select(['note.tags', 'note.userId']) + .cache(60000) // 1 min .getMany(); if (tagNotes.length === 0) { @@ -108,6 +109,7 @@ export default define(meta, async () => { .where(':tag = ANY(note.tags)', { tag: tag }) .andWhere('note.createdAt < :lt', { lt: new Date(Date.now() - (interval * i)) }) .andWhere('note.createdAt > :gt', { gt: new Date(Date.now() - (interval * (i + 1))) }) + .cache(60000) // 1 min .getRawOne() .then(x => parseInt(x.count, 10)) ))); @@ -119,6 +121,7 @@ export default define(meta, async () => { .select('count(distinct note.userId)') .where(':tag = ANY(note.tags)', { tag: tag }) .andWhere('note.createdAt > :gt', { gt: new Date(Date.now() - (interval * range)) }) + .cache(60000) // 1 min .getRawOne() .then(x => parseInt(x.count, 10)) )); diff --git a/src/server/api/endpoints/meta.ts b/src/server/api/endpoints/meta.ts index 4f418c63c1..d18543f56a 100644 --- a/src/server/api/endpoints/meta.ts +++ b/src/server/api/endpoints/meta.ts @@ -94,7 +94,7 @@ export const meta = { export default define(meta, async (ps, me) => { const instance = await fetchMeta(true); - const emojis = await Emojis.find({ host: null }); + const emojis = await Emojis.find({ where: { host: null }, cache: 3600000 }); // 1 hour const response: any = { maintainerName: instance.maintainerName, diff --git a/src/server/api/endpoints/stats.ts b/src/server/api/endpoints/stats.ts index f85109b4b4..4dca62445f 100644 --- a/src/server/api/endpoints/stats.ts +++ b/src/server/api/endpoints/stats.ts @@ -57,10 +57,10 @@ export default define(meta, async () => { driveUsageLocal, driveUsageRemote ] = await Promise.all([ - Notes.count(), - Notes.count({ userHost: null }), - Users.count(), - Users.count({ host: null }), + Notes.count({ cache: 3600000 }), // 1 hour + Notes.count({ where: { userHost: null }, cache: 3600000 }), + Users.count({ cache: 3600000 }), + Users.count({ where: { host: null }, cache: 3600000 }), federationChart.getChart('hour', 1).then(chart => chart.instance.total[0]), driveChart.getChart('hour', 1).then(chart => chart.local.totalSize[0]), driveChart.getChart('hour', 1).then(chart => chart.remote.totalSize[0]), -- cgit v1.2.3-freya