Merge branch 'pins' into 'main'
Support pinned statuses See merge request soapbox-pub/ditto!93
This commit is contained in:
commit
1a15c21626
|
@ -53,9 +53,11 @@ import {
|
||||||
createStatusController,
|
createStatusController,
|
||||||
favouriteController,
|
favouriteController,
|
||||||
favouritedByController,
|
favouritedByController,
|
||||||
|
pinController,
|
||||||
rebloggedByController,
|
rebloggedByController,
|
||||||
statusController,
|
statusController,
|
||||||
unbookmarkController,
|
unbookmarkController,
|
||||||
|
unpinController,
|
||||||
} from './controllers/api/statuses.ts';
|
} from './controllers/api/statuses.ts';
|
||||||
import { streamingController } from './controllers/api/streaming.ts';
|
import { streamingController } from './controllers/api/streaming.ts';
|
||||||
import {
|
import {
|
||||||
|
@ -158,6 +160,8 @@ app.get('/api/v1/statuses/:id{[0-9a-f]{64}}', statusController);
|
||||||
app.post('/api/v1/statuses/:id{[0-9a-f]{64}}/favourite', requirePubkey, favouriteController);
|
app.post('/api/v1/statuses/:id{[0-9a-f]{64}}/favourite', requirePubkey, favouriteController);
|
||||||
app.post('/api/v1/statuses/:id{[0-9a-f]{64}}/bookmark', requirePubkey, bookmarkController);
|
app.post('/api/v1/statuses/:id{[0-9a-f]{64}}/bookmark', requirePubkey, bookmarkController);
|
||||||
app.post('/api/v1/statuses/:id{[0-9a-f]{64}}/unbookmark', requirePubkey, unbookmarkController);
|
app.post('/api/v1/statuses/:id{[0-9a-f]{64}}/unbookmark', requirePubkey, unbookmarkController);
|
||||||
|
app.post('/api/v1/statuses/:id{[0-9a-f]{64}}/pin', requirePubkey, pinController);
|
||||||
|
app.post('/api/v1/statuses/:id{[0-9a-f]{64}}/unpin', requirePubkey, unpinController);
|
||||||
app.post('/api/v1/statuses', requirePubkey, createStatusController);
|
app.post('/api/v1/statuses', requirePubkey, createStatusController);
|
||||||
|
|
||||||
app.post('/api/v1/media', requireRole('user', { validatePayload: false }), mediaController);
|
app.post('/api/v1/media', requireRole('user', { validatePayload: false }), mediaController);
|
||||||
|
|
|
@ -7,12 +7,12 @@ import { type DittoFilter } from '@/filter.ts';
|
||||||
import { getAuthor, getFollowedPubkeys } from '@/queries.ts';
|
import { getAuthor, getFollowedPubkeys } from '@/queries.ts';
|
||||||
import { booleanParamSchema, fileSchema } from '@/schema.ts';
|
import { booleanParamSchema, fileSchema } from '@/schema.ts';
|
||||||
import { jsonMetaContentSchema } from '@/schemas/nostr.ts';
|
import { jsonMetaContentSchema } from '@/schemas/nostr.ts';
|
||||||
import { addTag, deleteTag } from '@/tags.ts';
|
import { addTag, deleteTag, getTagSet } from '@/tags.ts';
|
||||||
import { uploadFile } from '@/upload.ts';
|
import { uploadFile } from '@/upload.ts';
|
||||||
import { lookupAccount, nostrNow } from '@/utils.ts';
|
import { lookupAccount, nostrNow } from '@/utils.ts';
|
||||||
import { paginated, paginationSchema, parseBody, updateListEvent } from '@/utils/web.ts';
|
import { paginated, paginationSchema, parseBody, updateListEvent } from '@/utils/web.ts';
|
||||||
import { createEvent } from '@/utils/web.ts';
|
import { createEvent } from '@/utils/web.ts';
|
||||||
import { renderAccounts, renderEventAccounts } from '@/views.ts';
|
import { renderAccounts, renderEventAccounts, renderStatuses } from '@/views.ts';
|
||||||
import { accountFromPubkey, renderAccount } from '@/views/mastodon/accounts.ts';
|
import { accountFromPubkey, renderAccount } from '@/views/mastodon/accounts.ts';
|
||||||
import { renderRelationship } from '@/views/mastodon/relationships.ts';
|
import { renderRelationship } from '@/views/mastodon/relationships.ts';
|
||||||
import { renderStatus } from '@/views/mastodon/statuses.ts';
|
import { renderStatus } from '@/views/mastodon/statuses.ts';
|
||||||
|
@ -134,9 +134,14 @@ const accountStatusesController: AppController = async (c) => {
|
||||||
const { since, until } = paginationSchema.parse(c.req.query());
|
const { since, until } = paginationSchema.parse(c.req.query());
|
||||||
const { pinned, limit, exclude_replies, tagged } = accountStatusesQuerySchema.parse(c.req.query());
|
const { pinned, limit, exclude_replies, tagged } = accountStatusesQuerySchema.parse(c.req.query());
|
||||||
|
|
||||||
// Nostr doesn't support pinned statuses.
|
|
||||||
if (pinned) {
|
if (pinned) {
|
||||||
return c.json([]);
|
const [pinEvent] = await eventsDB.getEvents([{ kinds: [10001], authors: [pubkey], limit: 1 }]);
|
||||||
|
if (pinEvent) {
|
||||||
|
const pinnedEventIds = getTagSet(pinEvent.tags, 'e');
|
||||||
|
return renderStatuses(c, [...pinnedEventIds].reverse());
|
||||||
|
} else {
|
||||||
|
return c.json([]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const filter: DittoFilter<1> = {
|
const filter: DittoFilter<1> = {
|
||||||
|
|
|
@ -207,13 +207,69 @@ const unbookmarkController: AppController = async (c) => {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/** https://docs.joinmastodon.org/methods/statuses/#pin */
|
||||||
|
const pinController: AppController = async (c) => {
|
||||||
|
const pubkey = c.get('pubkey')!;
|
||||||
|
const eventId = c.req.param('id');
|
||||||
|
|
||||||
|
const event = await getEvent(eventId, {
|
||||||
|
kind: 1,
|
||||||
|
relations: ['author', 'event_stats', 'author_stats'],
|
||||||
|
});
|
||||||
|
|
||||||
|
if (event) {
|
||||||
|
await updateListEvent(
|
||||||
|
{ kinds: [10001], authors: [pubkey] },
|
||||||
|
(tags) => addTag(tags, ['e', eventId]),
|
||||||
|
c,
|
||||||
|
);
|
||||||
|
|
||||||
|
const status = await renderStatus(event, pubkey);
|
||||||
|
if (status) {
|
||||||
|
status.pinned = true;
|
||||||
|
}
|
||||||
|
return c.json(status);
|
||||||
|
} else {
|
||||||
|
return c.json({ error: 'Event not found.' }, 404);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
/** https://docs.joinmastodon.org/methods/statuses/#unpin */
|
||||||
|
const unpinController: AppController = async (c) => {
|
||||||
|
const pubkey = c.get('pubkey')!;
|
||||||
|
const eventId = c.req.param('id');
|
||||||
|
|
||||||
|
const event = await getEvent(eventId, {
|
||||||
|
kind: 1,
|
||||||
|
relations: ['author', 'event_stats', 'author_stats'],
|
||||||
|
});
|
||||||
|
|
||||||
|
if (event) {
|
||||||
|
await updateListEvent(
|
||||||
|
{ kinds: [10001], authors: [pubkey] },
|
||||||
|
(tags) => deleteTag(tags, ['e', eventId]),
|
||||||
|
c,
|
||||||
|
);
|
||||||
|
|
||||||
|
const status = await renderStatus(event, pubkey);
|
||||||
|
if (status) {
|
||||||
|
status.pinned = false;
|
||||||
|
}
|
||||||
|
return c.json(status);
|
||||||
|
} else {
|
||||||
|
return c.json({ error: 'Event not found.' }, 404);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
export {
|
export {
|
||||||
bookmarkController,
|
bookmarkController,
|
||||||
contextController,
|
contextController,
|
||||||
createStatusController,
|
createStatusController,
|
||||||
favouriteController,
|
favouriteController,
|
||||||
favouritedByController,
|
favouritedByController,
|
||||||
|
pinController,
|
||||||
rebloggedByController,
|
rebloggedByController,
|
||||||
statusController,
|
statusController,
|
||||||
unbookmarkController,
|
unbookmarkController,
|
||||||
|
unpinController,
|
||||||
};
|
};
|
||||||
|
|
|
@ -4,6 +4,7 @@ import { type Event, findReplyTag } from '@/deps.ts';
|
||||||
import { type AuthorMicrofilter, type DittoFilter, type IdMicrofilter, type Relation } from '@/filter.ts';
|
import { type AuthorMicrofilter, type DittoFilter, type IdMicrofilter, type Relation } from '@/filter.ts';
|
||||||
import { reqmeister } from '@/reqmeister.ts';
|
import { reqmeister } from '@/reqmeister.ts';
|
||||||
import { type DittoEvent } from '@/store.ts';
|
import { type DittoEvent } from '@/store.ts';
|
||||||
|
import { getTagSet } from '@/tags.ts';
|
||||||
|
|
||||||
interface GetEventOpts<K extends number> {
|
interface GetEventOpts<K extends number> {
|
||||||
/** Signal to abort the request. */
|
/** Signal to abort the request. */
|
||||||
|
@ -87,10 +88,7 @@ const getFollows = async (pubkey: string, signal?: AbortSignal): Promise<Event<3
|
||||||
async function getFollowedPubkeys(pubkey: string, signal?: AbortSignal): Promise<string[]> {
|
async function getFollowedPubkeys(pubkey: string, signal?: AbortSignal): Promise<string[]> {
|
||||||
const event = await getFollows(pubkey, signal);
|
const event = await getFollows(pubkey, signal);
|
||||||
if (!event) return [];
|
if (!event) return [];
|
||||||
|
return [...getTagSet(event.tags, 'p')];
|
||||||
return event.tags
|
|
||||||
.filter((tag) => tag[0] === 'p')
|
|
||||||
.map((tag) => tag[1]);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Get pubkeys the user follows, including the user's own pubkey. */
|
/** Get pubkeys the user follows, including the user's own pubkey. */
|
||||||
|
|
|
@ -47,6 +47,10 @@ async function renderAccounts(c: AppContext, authors: string[], signal = AbortSi
|
||||||
|
|
||||||
/** Render statuses by event IDs. */
|
/** Render statuses by event IDs. */
|
||||||
async function renderStatuses(c: AppContext, ids: string[], signal = AbortSignal.timeout(1000)) {
|
async function renderStatuses(c: AppContext, ids: string[], signal = AbortSignal.timeout(1000)) {
|
||||||
|
if (!ids.length) {
|
||||||
|
return c.json([]);
|
||||||
|
}
|
||||||
|
|
||||||
const { limit } = paginationSchema.parse(c.req.query());
|
const { limit } = paginationSchema.parse(c.req.query());
|
||||||
|
|
||||||
const events = await eventsDB.getEvents(
|
const events = await eventsDB.getEvents(
|
||||||
|
|
|
@ -38,6 +38,7 @@ async function renderStatus(event: DittoEvent<1>, viewerPubkey?: string) {
|
||||||
? await eventsDB.getEvents([
|
? await eventsDB.getEvents([
|
||||||
{ kinds: [6], '#e': [event.id], authors: [viewerPubkey], limit: 1 },
|
{ kinds: [6], '#e': [event.id], authors: [viewerPubkey], limit: 1 },
|
||||||
{ kinds: [7], '#e': [event.id], authors: [viewerPubkey], limit: 1 },
|
{ kinds: [7], '#e': [event.id], authors: [viewerPubkey], limit: 1 },
|
||||||
|
{ kinds: [10001], '#e': [event.id], authors: [viewerPubkey], limit: 1 },
|
||||||
{ kinds: [10003], '#e': [event.id], authors: [viewerPubkey], limit: 1 },
|
{ kinds: [10003], '#e': [event.id], authors: [viewerPubkey], limit: 1 },
|
||||||
])
|
])
|
||||||
: [],
|
: [],
|
||||||
|
@ -45,6 +46,7 @@ async function renderStatus(event: DittoEvent<1>, viewerPubkey?: string) {
|
||||||
|
|
||||||
const reactionEvent = relatedEvents.find((event) => event.kind === 6);
|
const reactionEvent = relatedEvents.find((event) => event.kind === 6);
|
||||||
const repostEvent = relatedEvents.find((event) => event.kind === 7);
|
const repostEvent = relatedEvents.find((event) => event.kind === 7);
|
||||||
|
const pinEvent = relatedEvents.find((event) => event.kind === 10001);
|
||||||
const bookmarkEvent = relatedEvents.find((event) => event.kind === 10003);
|
const bookmarkEvent = relatedEvents.find((event) => event.kind === 10003);
|
||||||
|
|
||||||
const content = buildInlineRecipients(mentions) + html;
|
const content = buildInlineRecipients(mentions) + html;
|
||||||
|
@ -79,6 +81,7 @@ async function renderStatus(event: DittoEvent<1>, viewerPubkey?: string) {
|
||||||
reblogged: Boolean(repostEvent),
|
reblogged: Boolean(repostEvent),
|
||||||
muted: false,
|
muted: false,
|
||||||
bookmarked: Boolean(bookmarkEvent),
|
bookmarked: Boolean(bookmarkEvent),
|
||||||
|
pinned: Boolean(pinEvent),
|
||||||
reblog: null,
|
reblog: null,
|
||||||
application: null,
|
application: null,
|
||||||
media_attachments: media.map(renderAttachment),
|
media_attachments: media.map(renderAttachment),
|
||||||
|
|
Loading…
Reference in New Issue