Support GET /api/v1/blocks

This commit is contained in:
Alex Gleason 2024-01-01 12:43:53 -06:00
parent 0c311732d3
commit 5b7c3a1d5e
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
4 changed files with 39 additions and 11 deletions

View File

@ -34,6 +34,7 @@ import {
verifyCredentialsController,
} from './controllers/api/accounts.ts';
import { appCredentialsController, createAppController } from './controllers/api/apps.ts';
import { blocksController } from './controllers/api/blocks.ts';
import { emptyArrayController, emptyObjectController, notImplementedController } from './controllers/api/fallback.ts';
import { instanceController } from './controllers/api/instance.ts';
import { mediaController } from './controllers/api/media.ts';
@ -168,6 +169,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/blocks', requirePubkey, blocksController);
app.post('/api/v1/pleroma/admin/config', requireRole('admin'), updateConfigController);
@ -175,7 +177,6 @@ app.post('/api/v1/pleroma/admin/config', requireRole('admin'), updateConfigContr
app.get('/api/v1/bookmarks', emptyArrayController);
app.get('/api/v1/custom_emojis', emptyArrayController);
app.get('/api/v1/filters', emptyArrayController);
app.get('/api/v1/blocks', emptyArrayController);
app.get('/api/v1/mutes', emptyArrayController);
app.get('/api/v1/domain_blocks', emptyArrayController);
app.get('/api/v1/markers', emptyObjectController);

View File

@ -12,7 +12,7 @@ import { uploadFile } from '@/upload.ts';
import { lookupAccount, nostrNow } from '@/utils.ts';
import { paginated, paginationSchema, parseBody, updateListEvent } from '@/utils/web.ts';
import { createEvent } from '@/utils/web.ts';
import { renderEventAccounts } from '@/views.ts';
import { renderAccounts, renderEventAccounts } from '@/views.ts';
import { accountFromPubkey, renderAccount } from '@/views/mastodon/accounts.ts';
import { renderRelationship } from '@/views/mastodon/relationships.ts';
import { renderStatus } from '@/views/mastodon/statuses.ts';
@ -236,16 +236,10 @@ const followersController: AppController = (c) => {
const followingController: AppController = async (c) => {
const pubkey = c.req.param('pubkey');
const pubkeys = await getFollowedPubkeys(pubkey);
// TODO: pagination by offset.
const accounts = await Promise.all(pubkeys.map(async (pubkey) => {
const event = await getAuthor(pubkey);
return event ? await renderAccount(event) : undefined;
}));
return c.json(accounts.filter(Boolean));
return renderAccounts(c, pubkeys);
};
/** https://docs.joinmastodon.org/methods/accounts/#block */
const blockController: AppController = async (c) => {
const sourcePubkey = c.get('pubkey')!;
const targetPubkey = c.req.param('pubkey');

View File

@ -0,0 +1,22 @@
import { type AppController } from '@/app.ts';
import { eventsDB } from '@/db/events.ts';
import { getTagSet } from '@/tags.ts';
import { renderAccounts } from '@/views.ts';
/** https://docs.joinmastodon.org/methods/blocks/#get */
const blocksController: AppController = async (c) => {
const pubkey = c.get('pubkey')!;
const [event10000] = await eventsDB.getEvents([
{ kinds: [10000], authors: [pubkey], limit: 1 },
]);
if (event10000) {
const pubkeys = getTagSet(event10000.tags, 'p');
return renderAccounts(c, [...pubkeys].reverse());
} else {
return c.json([]);
}
};
export { blocksController };

View File

@ -24,4 +24,15 @@ async function renderEventAccounts(c: AppContext, filters: Filter[]) {
return paginated(c, events, accounts);
}
export { renderEventAccounts };
async function renderAccounts(c: AppContext, pubkeys: string[]) {
// TODO: pagination by offset.
// FIXME: this is very inefficient!
const accounts = await Promise.all(pubkeys.map(async (pubkey) => {
const event = await getAuthor(pubkey);
return event ? await renderAccount(event) : undefined;
}));
return c.json(accounts.filter(Boolean));
}
export { renderAccounts, renderEventAccounts };