moon
/
ditto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

accounts: followers/following & status counts 

Fixes https://gitlab.com/soapbox-pub/ditto/-/issues/68
This commit is contained in:
Alex Gleason 2023-08-30 09:49:06 -05:00
parent 62ea00dc6a
commit 728f0bd657
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
2 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/queries.ts
View File

@ -87,4 +87,14 @@ async function syncUser(pubkey: string): Promise<void> {
], { timeout: 5000 }); ], { timeout: 5000 });
} }
export { getAncestors, getAuthor, getDescendants, getEvent, getFeedPubkeys, getFollows, isLocallyFollowed, syncUser }; export {
getAncestors,
getAuthor,
getDescendants,
getEvent,
getFeedPubkeys,
getFollowedPubkeys,
getFollows,
isLocallyFollowed,
syncUser,
};

28
src/transformers/nostr-to-mastoapi.ts
View File

@ -5,7 +5,7 @@ import * as eventsDB from '@/db/events.ts';
import { type Event, findReplyTag, lodash, nip19, sanitizeHtml, TTLCache, unfurl, z } from '@/deps.ts'; import { type Event, findReplyTag, lodash, nip19, sanitizeHtml, TTLCache, unfurl, z } from '@/deps.ts';
import { verifyNip05Cached } from '@/nip05.ts'; import { verifyNip05Cached } from '@/nip05.ts';
import { getMediaLinks, type MediaLink, parseNoteContent } from '@/note.ts'; import { getMediaLinks, type MediaLink, parseNoteContent } from '@/note.ts';
import { getAuthor, getFollows } from '@/queries.ts'; import { getAuthor, getFollowedPubkeys, getFollows } from '@/queries.ts';
import { emojiTagSchema, filteredArray } from '@/schema.ts'; import { emojiTagSchema, filteredArray } from '@/schema.ts';
import { jsonMetaContentSchema } from '@/schemas/nostr.ts'; import { jsonMetaContentSchema } from '@/schemas/nostr.ts';
import { isFollowing, type Nip05, nostrDate, parseNip05, Time } from '@/utils.ts'; import { isFollowing, type Nip05, nostrDate, parseNip05, Time } from '@/utils.ts';
@ -24,14 +24,12 @@ async function toAccount(event: Event<0>, opts: ToAccountOpts = {}) {
const { name, nip05, picture, banner, about } = jsonMetaContentSchema.parse(event.content); const { name, nip05, picture, banner, about } = jsonMetaContentSchema.parse(event.content);
const npub = nip19.npubEncode(pubkey); const npub = nip19.npubEncode(pubkey);
let parsed05: Nip05 | undefined; const [parsed05, followersCount, followingCount, statusesCount] = await Promise.all([
try { parseAndVerifyNip05(nip05, pubkey),
if (nip05 && await verifyNip05Cached(nip05, pubkey)) { eventsDB.countFilters([{ kinds: [3], '#p': [pubkey] }]),
parsed05 = parseNip05(nip05); getFollowedPubkeys(pubkey).then((pubkeys) => pubkeys.length),
} eventsDB.countFilters([{ kinds: [1], authors: [pubkey] }]),
} catch (_e) { ]);
//
}
return { return {
id: pubkey, id: pubkey,
@ -45,8 +43,8 @@ async function toAccount(event: Event<0>, opts: ToAccountOpts = {}) {
emojis: toEmojis(event), emojis: toEmojis(event),
fields: [], fields: [],
follow_requests_count: 0, follow_requests_count: 0,
followers_count: 0, followers_count: followersCount,
following_count: 0, following_count: followingCount,
fqn: parsed05?.handle || npub, fqn: parsed05?.handle || npub,
header: banner || DEFAULT_BANNER, header: banner || DEFAULT_BANNER,
header_static: banner || DEFAULT_BANNER, header_static: banner || DEFAULT_BANNER,
@ -64,12 +62,18 @@ async function toAccount(event: Event<0>, opts: ToAccountOpts = {}) {
follow_requests_count: 0, follow_requests_count: 0,
} }
: undefined, : undefined,
statuses_count: 0, statuses_count: statusesCount,
url: Conf.local(`/users/${pubkey}`), url: Conf.local(`/users/${pubkey}`),
username: parsed05?.nickname || npub.substring(0, 8), username: parsed05?.nickname || npub.substring(0, 8),
}; };
} }
async function parseAndVerifyNip05(nip05: string | undefined, pubkey: string): Promise<Nip05 | undefined> {
if (nip05 && await verifyNip05Cached(nip05, pubkey)) {
return parseNip05(nip05);
}
}
async function toMention(pubkey: string) { async function toMention(pubkey: string) {
const profile = await getAuthor(pubkey); const profile = await getAuthor(pubkey);
const account = profile ? await toAccount(profile) : undefined; const account = profile ? await toAccount(profile) : undefined;