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

Merge branch 'main' into admin-reports-api

Browse Source 
Update local branch & solve conflicts in hydrate.ts
This commit is contained in:
P. Reis
2024-05-04 20:23:16 -03:00
parent 14802dd38a 35360434ef
commit d903a2d0fb
8 changed files with 149 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/views/mastodon/notifications.ts
View File

@@ -2,6 +2,7 @@ import { DittoEvent } from '@/interfaces/DittoEvent.ts';
import { nostrDate } from '@/utils.ts';
import { accountFromPubkey, renderAccount } from '@/views/mastodon/accounts.ts';
import { renderStatus } from '@/views/mastodon/statuses.ts';
import { NostrEvent } from '@nostrify/nostrify';
interface RenderNotificationOpts {
viewerPubkey: string;
@@ -32,7 +33,7 @@ async function renderMention(event: DittoEvent, opts: RenderNotificationOpts) {
if (!status) return;
return {
id: event.id,
id: notificationId(event),
type: 'mention',
created_at: nostrDate(event.created_at).toISOString(),
account: status.account,
@@ -47,7 +48,7 @@ async function renderReblog(event: DittoEvent, opts: RenderNotificationOpts) {
const account = event.author ? await renderAccount(event.author) : accountFromPubkey(event.pubkey);
return {
id: event.id,
id: notificationId(event),
type: 'reblog',
created_at: nostrDate(event.created_at).toISOString(),
account,
@@ -62,7 +63,7 @@ async function renderFavourite(event: DittoEvent, opts: RenderNotificationOpts)
const account = event.author ? await renderAccount(event.author) : accountFromPubkey(event.pubkey);
return {
id: event.id,
id: notificationId(event),
type: 'favourite',
created_at: nostrDate(event.created_at).toISOString(),
account,
@@ -77,7 +78,7 @@ async function renderReaction(event: DittoEvent, opts: RenderNotificationOpts) {
const account = event.author ? await renderAccount(event.author) : accountFromPubkey(event.pubkey);
return {
id: event.id,
id: notificationId(event),
type: 'pleroma:emoji_reaction',
emoji: event.content,
created_at: nostrDate(event.created_at).toISOString(),
@@ -86,4 +87,9 @@ async function renderReaction(event: DittoEvent, opts: RenderNotificationOpts) {
};
}
/** This helps notifications be sorted in the correct order. */
function notificationId({ id, created_at }: NostrEvent): string {
return `${created_at}-${id}`;
}
export { renderNotification };