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

Merge branch 'fix-reblog-account-timeline' into 'main' 

fix: render reblog in account timeline

See merge request soapbox-pub/ditto!364
This commit is contained in:
Alex Gleason 2024-06-06 20:59:54 +00:00
parent 4361c340b0 ae01a19725
commit d2cf2e2e27
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,7 @@ import { lookupAccount } from '@/utils/lookup.ts';
import { renderAccounts, renderEventAccounts, renderStatuses } 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 { renderReblog, renderStatus } from '@/views/mastodon/statuses.ts';
import { hydrateEvents } from '@/storages/hydrate.ts'; import { hydrateEvents } from '@/storages/hydrate.ts';
import { bech32ToPubkey } from '@/utils.ts'; import { bech32ToPubkey } from '@/utils.ts';
import { addTag, deleteTag, findReplyTag, getTagSet } from '@/utils/tags.ts'; import { addTag, deleteTag, findReplyTag, getTagSet } from '@/utils/tags.ts';
@ -192,7 +192,7 @@ const accountStatusesController: AppController = async (c) => {
const filter: NostrFilter = { const filter: NostrFilter = {
authors: [pubkey], authors: [pubkey],
kinds: [1], kinds: [1, 6],
since, since,
until, until,
limit, limit,
@ -206,7 +206,10 @@ const accountStatusesController: AppController = async (c) => {
.then((events) => hydrateEvents({ events, store, signal })) .then((events) => hydrateEvents({ events, store, signal }))
.then((events) => { .then((events) => {
if (exclude_replies) { if (exclude_replies) {
return events.filter((event) => !findReplyTag(event.tags)); return events.filter((event) => {
if (event.kind === 1) return !findReplyTag(event.tags);
return true;
});
} }
return events; return events;
}); });
@ -214,7 +217,10 @@ const accountStatusesController: AppController = async (c) => {
const viewerPubkey = await c.get('signer')?.getPublicKey(); const viewerPubkey = await c.get('signer')?.getPublicKey();
const statuses = await Promise.all( const statuses = await Promise.all(
events.map((event) => renderStatus(event, { viewerPubkey })), events.map((event) => {
if (event.kind === 6) return renderReblog(event, { viewerPubkey });
return renderStatus(event, { viewerPubkey });
}),
); );
return paginated(c, events, statuses); return paginated(c, events, statuses);
}; };