diff --git a/src/app.ts b/src/app.ts index a3b507f..5d29f8c 100644 --- a/src/app.ts +++ b/src/app.ts @@ -13,25 +13,25 @@ import { accountLookupController, accountSearchController, accountStatusesController, - blockController, createAccountController, favouritesController, followController, followersController, followingController, + muteController, relationshipsController, - unblockController, unfollowController, + unmuteController, updateCredentialsController, verifyCredentialsController, } from '@/controllers/api/accounts.ts'; import { adminAccountsController } from '@/controllers/api/admin.ts'; import { appCredentialsController, createAppController } from '@/controllers/api/apps.ts'; -import { blocksController } from '@/controllers/api/blocks.ts'; import { bookmarksController } from '@/controllers/api/bookmarks.ts'; import { emptyArrayController, emptyObjectController, notImplementedController } from '@/controllers/api/fallback.ts'; import { instanceController } from '@/controllers/api/instance.ts'; import { mediaController } from '@/controllers/api/media.ts'; +import { mutesController } from '@/controllers/api/mutes.ts'; import { notificationsController } from '@/controllers/api/notifications.ts'; import { createTokenController, oauthAuthorizeController, oauthController } from '@/controllers/api/oauth.ts'; import { @@ -139,8 +139,8 @@ app.patch('/api/v1/accounts/update_credentials', requirePubkey, updateCredential app.get('/api/v1/accounts/search', accountSearchController); app.get('/api/v1/accounts/lookup', accountLookupController); app.get('/api/v1/accounts/relationships', requirePubkey, relationshipsController); -app.post('/api/v1/accounts/:pubkey{[0-9a-f]{64}}/block', requirePubkey, blockController); -app.post('/api/v1/accounts/:pubkey{[0-9a-f]{64}}/unblock', requirePubkey, unblockController); +app.post('/api/v1/accounts/:pubkey{[0-9a-f]{64}}/mute', requirePubkey, muteController); +app.post('/api/v1/accounts/:pubkey{[0-9a-f]{64}}/unmute', requirePubkey, unmuteController); app.post('/api/v1/accounts/:pubkey{[0-9a-f]{64}}/follow', requirePubkey, followController); app.post('/api/v1/accounts/:pubkey{[0-9a-f]{64}}/unfollow', requirePubkey, unfollowController); app.get('/api/v1/accounts/:pubkey{[0-9a-f]{64}}/followers', followersController); @@ -182,7 +182,7 @@ app.get('/api/v1/trends', cache({ cacheName: 'web', expires: Time.minutes(15) }) app.get('/api/v1/notifications', requirePubkey, notificationsController); app.get('/api/v1/favourites', requirePubkey, favouritesController); app.get('/api/v1/bookmarks', requirePubkey, bookmarksController); -app.get('/api/v1/blocks', requirePubkey, blocksController); +app.get('/api/v1/mutes', requirePubkey, mutesController); app.get('/api/v1/admin/accounts', requireRole('admin'), adminAccountsController); app.get('/api/v1/pleroma/admin/config', requireRole('admin'), configController); diff --git a/src/controllers/api/accounts.ts b/src/controllers/api/accounts.ts index bdcd1a0..93455b7 100644 --- a/src/controllers/api/accounts.ts +++ b/src/controllers/api/accounts.ts @@ -272,8 +272,8 @@ const followingController: AppController = async (c) => { return renderAccounts(c, pubkeys); }; -/** https://docs.joinmastodon.org/methods/accounts/#block */ -const blockController: AppController = async (c) => { +/** https://docs.joinmastodon.org/methods/accounts/#mute */ +const muteController: AppController = async (c) => { const sourcePubkey = c.get('pubkey')!; const targetPubkey = c.req.param('pubkey'); @@ -287,8 +287,8 @@ const blockController: AppController = async (c) => { return c.json(relationship); }; -/** https://docs.joinmastodon.org/methods/accounts/#unblock */ -const unblockController: AppController = async (c) => { +/** https://docs.joinmastodon.org/methods/accounts/#unmute */ +const unmuteController: AppController = async (c) => { const sourcePubkey = c.get('pubkey')!; const targetPubkey = c.req.param('pubkey'); @@ -328,15 +328,15 @@ export { accountLookupController, accountSearchController, accountStatusesController, - blockController, createAccountController, favouritesController, followController, followersController, followingController, + muteController, relationshipsController, - unblockController, unfollowController, + unmuteController, updateCredentialsController, verifyCredentialsController, }; diff --git a/src/controllers/api/blocks.ts b/src/controllers/api/mutes.ts similarity index 79% rename from src/controllers/api/blocks.ts rename to src/controllers/api/mutes.ts index 16fa5cb..77b60e3 100644 --- a/src/controllers/api/blocks.ts +++ b/src/controllers/api/mutes.ts @@ -3,8 +3,8 @@ import { Storages } from '@/storages.ts'; import { getTagSet } from '@/tags.ts'; import { renderAccounts } from '@/views.ts'; -/** https://docs.joinmastodon.org/methods/blocks/#get */ -const blocksController: AppController = async (c) => { +/** https://docs.joinmastodon.org/methods/mutes/#get */ +const mutesController: AppController = async (c) => { const pubkey = c.get('pubkey')!; const { signal } = c.req.raw; @@ -21,4 +21,4 @@ const blocksController: AppController = async (c) => { } }; -export { blocksController }; +export { mutesController };