aljaz/ditto
1
0
Fork 0
mirror of https://github.com/aljazceru/ditto.git synced 2026-01-22 14:54:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Delete nostr-to-mastoapi.ts, add notifications.ts and relationships.ts

Browse Source
This commit is contained in:
Alex Gleason
2023-10-06 15:40:34 -05:00
parent d49c63bb1a
commit 45d42f7ea4
5 changed files with 58 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/controllers/api/accounts.ts
View File

@@ -11,9 +11,9 @@ import { isFollowing, lookupAccount, nostrNow, Time } from '@/utils.ts';
import { paginated, paginationSchema, parseBody } from '@/utils/web.ts';
import { createEvent } from '@/utils/web.ts';
import { renderEventAccounts } from '@/views.ts';
import { renderAccount } from '@/views/mastodon/accounts.ts';
import { accountFromPubkey, renderAccount } from '@/views/mastodon/accounts.ts';
import { renderRelationship } from '@/views/mastodon/relationships.ts';
import { renderStatus } from '@/views/mastodon/statuses.ts';
import { accountFromPubkey, toRelationship } from '@/views/nostr-to-mastoapi.ts';
const usernameSchema = z
.string().min(1).max(30)
@@ -117,7 +117,7 @@ const relationshipsController: AppController = async (c) => {
return c.json({ error: 'Missing `id[]` query parameters.' }, 422);
}
const result = await Promise.all(ids.data.map((id) => toRelationship(pubkey, id)));
const result = await Promise.all(ids.data.map((id) => renderRelationship(pubkey, id)));
return c.json(result);
};
@@ -222,7 +222,7 @@ const followController: AppController = async (c) => {
}, c);
}
const relationship = await toRelationship(sourcePubkey, targetPubkey);
const relationship = await renderRelationship(sourcePubkey, targetPubkey);
return c.json(relationship);
};

4
src/controllers/api/notifications.ts
View File

@@ -2,7 +2,7 @@ import { type AppController } from '@/app.ts';
import * as mixer from '@/mixer.ts';
import { Time } from '@/utils.ts';
import { paginated, paginationSchema } from '@/utils/web.ts';
import { toNotification } from '@/views/nostr-to-mastoapi.ts';
import { renderNotification } from '@/views/mastodon/notifications.ts';
const notificationsController: AppController = async (c) => {
const pubkey = c.get('pubkey')!;
@@ -13,7 +13,7 @@ const notificationsController: AppController = async (c) => {
{ timeout: Time.seconds(3) },
);
const statuses = await Promise.all(events.map((event) => toNotification(event, pubkey)));
const statuses = await Promise.all(events.map((event) => renderNotification(event, pubkey)));
return paginated(c, events, statuses);
};