mirror of
https://github.com/misskey-dev/misskey
synced 2024-12-22 10:38:28 +09:00
f0a29721c9
* wip * Update note.ts * Update timeline.ts * Update core.ts * wip * Update generate-visibility-query.ts * wip * wip * wip * wip * wip * Update global-timeline.ts * wip * wip * wip * Update vote.ts * wip * wip * Update create.ts * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * Update files.ts * wip * wip * Update CONTRIBUTING.md * wip * wip * wip * wip * wip * wip * wip * wip * Update read-notification.ts * wip * wip * wip * wip * wip * wip * wip * Update cancel.ts * wip * wip * wip * Update show.ts * wip * wip * Update gen-id.ts * Update create.ts * Update id.ts * wip * wip * wip * wip * wip * wip * wip * Docker: Update files about Docker (#4599) * Docker: Use cache if files used by `yarn install` was not updated This patch reduces the number of times to installing node_modules. For example, `yarn install` step will be skipped when only ".config/default.yml" is updated. * Docker: Migrate MongoDB to Postgresql Misskey uses Postgresql as a database instead of Mongodb since version 11. * Docker: Uncomment about data persistence This patch will save a lot of databases. * wip * wip * wip * Update activitypub.ts * wip * wip * wip * Update logs.ts * wip * Update drive-file.ts * Update register.ts * wip * wip * Update mentions.ts * wip * wip * wip * Update recommendation.ts * wip * Update index.ts * wip * Update recommendation.ts * Doc: Update docker.ja.md and docker.en.md (#1) (#4608) Update how to set up misskey. * wip * ✌️ * wip * Update note.ts * Update postgre.ts * wip * wip * wip * wip * Update add-file.ts * wip * wip * wip * Clean up * Update logs.ts * wip * 🍕 * wip * Ad notes * wip * Update api-visibility.ts * Update note.ts * Update add-file.ts * tests * tests * Update postgre.ts * Update utils.ts * wip * wip * Refactor * wip * Refactor * wip * wip * Update show-users.ts * Update update-instance.ts * wip * Update feed.ts * Update outbox.ts * Update outbox.ts * Update user.ts * wip * Update list.ts * Update update-hashtag.ts * wip * Update update-hashtag.ts * Refactor * Update update.ts * wip * wip * ✌️ * clean up * docs * Update push.ts * wip * Update api.ts * wip * ✌️ * Update make-pagination-query.ts * ✌️ * Delete hashtags.ts * Update instances.ts * Update instances.ts * Update create.ts * Update search.ts * Update reversi-game.ts * Update signup.ts * Update user.ts * id * Update example.yml * 🎨 * objectid * fix * reversi * reversi * Fix bug of chart engine * Add test of chart engine * Improve test * Better testing * Improve chart engine * Refactor * Add test of chart engine * Refactor * Add chart test * Fix bug * コミットし忘れ * Refactoring * ✌️ * Add tests * Add test * Extarct note tests * Refactor * 存在しないユーザーにメンションできなくなっていた問題を修正 * Fix bug * Update update-meta.ts * Fix bug * Update mention.vue * Fix bug * Update meta.ts * Update CONTRIBUTING.md * Fix bug * Fix bug * Fix bug * Clean up * Clean up * Update notification.ts * Clean up * Add mute tests * Add test * Refactor * Add test * Fix test * Refactor * Refactor * Add tests * Update utils.ts * Update utils.ts * Fix test * Update package.json * Update update.ts * Update manifest.ts * Fix bug * Fix bug * Add test * 🎨 * Update endpoint permissions * Updaye permisison * Update person.ts #4299 * データベースと同期しないように * Fix bug * Fix bug * Update reversi-game.ts * Use a feature of Node v11.7.0 to extract a public key (#4644) * wip * wip * ✌️ * Refactoring #1540 * test * test * test * test * test * test * test * Fix bug * Fix test * 🍣 * wip * #4471 * Add test for #4335 * Refactor * Fix test * Add tests * 🕓 * Fix bug * Add test * Add test * rename * Fix bug
89 lines
1.8 KiB
TypeScript
89 lines
1.8 KiB
TypeScript
import $ from 'cafy';
|
|
import { ID } from '../../../../misc/cafy-id';
|
|
import * as ms from 'ms';
|
|
import deleteBlocking from '../../../../services/blocking/delete';
|
|
import define from '../../define';
|
|
import { ApiError } from '../../error';
|
|
import { getUser } from '../../common/getters';
|
|
import { Blockings } from '../../../../models';
|
|
|
|
export const meta = {
|
|
stability: 'stable',
|
|
|
|
desc: {
|
|
'ja-JP': '指定したユーザーのブロックを解除します。',
|
|
'en-US': 'Unblock a user.'
|
|
},
|
|
|
|
tags: ['blocking', 'users'],
|
|
|
|
limit: {
|
|
duration: ms('1hour'),
|
|
max: 100
|
|
},
|
|
|
|
requireCredential: true,
|
|
|
|
kind: 'write:blocks',
|
|
|
|
params: {
|
|
userId: {
|
|
validator: $.type(ID),
|
|
desc: {
|
|
'ja-JP': '対象のユーザーのID',
|
|
'en-US': 'Target user ID'
|
|
}
|
|
}
|
|
},
|
|
|
|
errors: {
|
|
noSuchUser: {
|
|
message: 'No such user.',
|
|
code: 'NO_SUCH_USER',
|
|
id: '8621d8bf-c358-4303-a066-5ea78610eb3f'
|
|
},
|
|
|
|
blockeeIsYourself: {
|
|
message: 'Blockee is yourself.',
|
|
code: 'BLOCKEE_IS_YOURSELF',
|
|
id: '06f6fac6-524b-473c-a354-e97a40ae6eac'
|
|
},
|
|
|
|
notBlocking: {
|
|
message: 'You are not blocking that user.',
|
|
code: 'NOT_BLOCKING',
|
|
id: '291b2efa-60c6-45c0-9f6a-045c8f9b02cd'
|
|
},
|
|
}
|
|
};
|
|
|
|
export default define(meta, async (ps, user) => {
|
|
const blocker = user;
|
|
|
|
// Check if the blockee is yourself
|
|
if (user.id === ps.userId) {
|
|
throw new ApiError(meta.errors.blockeeIsYourself);
|
|
}
|
|
|
|
// Get blockee
|
|
const blockee = await getUser(ps.userId).catch(e => {
|
|
if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
|
|
throw e;
|
|
});
|
|
|
|
// Check not blocking
|
|
const exist = await Blockings.findOne({
|
|
blockerId: blocker.id,
|
|
blockeeId: blockee.id
|
|
});
|
|
|
|
if (exist == null) {
|
|
throw new ApiError(meta.errors.notBlocking);
|
|
}
|
|
|
|
// Delete blocking
|
|
await deleteBlocking(blocker, blockee);
|
|
|
|
return await Blockings.pack(blockee.id, user);
|
|
});
|