Add a getInstanceMetadata function to DRY a few controllers
This commit is contained in:
parent
928ae4ec22
commit
bdfa6f8826
|
@ -1,25 +1,19 @@
|
||||||
import { NSchema as n } from '@nostrify/nostrify';
|
import { AppController } from '@/app.ts';
|
||||||
|
|
||||||
import { type AppController } from '@/app.ts';
|
|
||||||
import { Conf } from '@/config.ts';
|
import { Conf } from '@/config.ts';
|
||||||
import { serverMetaSchema } from '@/schemas/nostr.ts';
|
import { getInstanceMetadata } from '@/utils/instance.ts';
|
||||||
import { Storages } from '@/storages.ts';
|
|
||||||
|
|
||||||
const instanceController: AppController = async (c) => {
|
const instanceController: AppController = async (c) => {
|
||||||
const { host, protocol } = Conf.url;
|
const { host, protocol } = Conf.url;
|
||||||
const { signal } = c.req.raw;
|
const meta = await getInstanceMetadata(c.req.raw.signal);
|
||||||
|
|
||||||
const [event] = await Storages.db.query([{ kinds: [0], authors: [Conf.pubkey], limit: 1 }], { signal });
|
|
||||||
const meta = n.json().pipe(serverMetaSchema).catch({}).parse(event?.content);
|
|
||||||
|
|
||||||
/** Protocol to use for WebSocket URLs, depending on the protocol of the `LOCAL_DOMAIN`. */
|
/** Protocol to use for WebSocket URLs, depending on the protocol of the `LOCAL_DOMAIN`. */
|
||||||
const wsProtocol = protocol === 'http:' ? 'ws:' : 'wss:';
|
const wsProtocol = protocol === 'http:' ? 'ws:' : 'wss:';
|
||||||
|
|
||||||
return c.json({
|
return c.json({
|
||||||
uri: host,
|
uri: host,
|
||||||
title: meta.name ?? 'Ditto',
|
title: meta.name,
|
||||||
description: meta.about ?? 'Nostr and the Fediverse',
|
description: meta.about,
|
||||||
short_description: meta.tagline ?? meta.about ?? 'Nostr and the Fediverse',
|
short_description: meta.tagline,
|
||||||
registrations: true,
|
registrations: true,
|
||||||
max_toot_chars: Conf.postCharLimit,
|
max_toot_chars: Conf.postCharLimit,
|
||||||
configuration: {
|
configuration: {
|
||||||
|
@ -59,7 +53,7 @@ const instanceController: AppController = async (c) => {
|
||||||
streaming_api: `${wsProtocol}//${host}`,
|
streaming_api: `${wsProtocol}//${host}`,
|
||||||
},
|
},
|
||||||
version: '0.0.0 (compatible; Ditto 0.0.1)',
|
version: '0.0.0 (compatible; Ditto 0.0.1)',
|
||||||
email: meta.email ?? `postmaster@${host}`,
|
email: meta.email,
|
||||||
nostr: {
|
nostr: {
|
||||||
pubkey: Conf.pubkey,
|
pubkey: Conf.pubkey,
|
||||||
relay: `${wsProtocol}//${host}/relay`,
|
relay: `${wsProtocol}//${host}/relay`,
|
||||||
|
|
|
@ -1,20 +1,15 @@
|
||||||
import { NSchema as n } from '@nostrify/nostrify';
|
|
||||||
|
|
||||||
import { AppController } from '@/app.ts';
|
import { AppController } from '@/app.ts';
|
||||||
import { Conf } from '@/config.ts';
|
import { Conf } from '@/config.ts';
|
||||||
import { serverMetaSchema } from '@/schemas/nostr.ts';
|
import { getInstanceMetadata } from '@/utils/instance.ts';
|
||||||
import { Storages } from '@/storages.ts';
|
|
||||||
|
|
||||||
const relayInfoController: AppController = async (c) => {
|
const relayInfoController: AppController = async (c) => {
|
||||||
const { signal } = c.req.raw;
|
const meta = await getInstanceMetadata(c.req.raw.signal);
|
||||||
const [event] = await Storages.db.query([{ kinds: [0], authors: [Conf.pubkey], limit: 1 }], { signal });
|
|
||||||
const meta = n.json().pipe(serverMetaSchema).catch({}).parse(event?.content);
|
|
||||||
|
|
||||||
return c.json({
|
return c.json({
|
||||||
name: meta.name ?? 'Ditto',
|
name: meta.name,
|
||||||
description: meta.about ?? 'Nostr and the Fediverse.',
|
description: meta.about,
|
||||||
pubkey: Conf.pubkey,
|
pubkey: Conf.pubkey,
|
||||||
contact: `mailto:${meta.email ?? `postmaster@${Conf.url.host}`}`,
|
contact: meta.email,
|
||||||
supported_nips: [1, 5, 9, 11, 16, 45, 50, 46, 98],
|
supported_nips: [1, 5, 9, 11, 16, 45, 50, 46, 98],
|
||||||
software: 'Ditto',
|
software: 'Ditto',
|
||||||
version: '0.0.0',
|
version: '0.0.0',
|
||||||
|
|
|
@ -0,0 +1,37 @@
|
||||||
|
import { NostrEvent, NostrMetadata, NSchema as n } from '@nostrify/nostrify';
|
||||||
|
|
||||||
|
import { Conf } from '@/config.ts';
|
||||||
|
import { serverMetaSchema } from '@/schemas/nostr.ts';
|
||||||
|
import { Storages } from '@/storages.ts';
|
||||||
|
|
||||||
|
/** Like NostrMetadata, but some fields are required and also contains some extra fields. */
|
||||||
|
export interface InstanceMetadata extends NostrMetadata {
|
||||||
|
name: string;
|
||||||
|
about: string;
|
||||||
|
tagline: string;
|
||||||
|
email: string;
|
||||||
|
event?: NostrEvent;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Get and parse instance metadata from the kind 0 of the admin user. */
|
||||||
|
export async function getInstanceMetadata(signal?: AbortSignal): Promise<InstanceMetadata> {
|
||||||
|
const [event] = await Storages.db.query(
|
||||||
|
[{ kinds: [0], authors: [Conf.pubkey], limit: 1 }],
|
||||||
|
{ signal },
|
||||||
|
);
|
||||||
|
|
||||||
|
const meta = n
|
||||||
|
.json()
|
||||||
|
.pipe(serverMetaSchema)
|
||||||
|
.catch({})
|
||||||
|
.parse(event?.content);
|
||||||
|
|
||||||
|
return {
|
||||||
|
...meta,
|
||||||
|
name: meta.name ?? 'Ditto',
|
||||||
|
about: meta.about ?? 'Nostr community server',
|
||||||
|
tagline: meta.tagline ?? meta.about ?? 'Nostr community server',
|
||||||
|
email: meta.email ?? `postmaster@${Conf.url.host}`,
|
||||||
|
event,
|
||||||
|
};
|
||||||
|
}
|
Loading…
Reference in New Issue