@ -13,8 +13,9 @@
import { userStore } from '$lib/stores/user-store.js'; import { userStore } from '$lib/stores/user-store.js';
import { fetchUserProfile , extractProfileData } from '$lib/utils/user-profile.js'; import { fetchUserProfile , extractProfileData } from '$lib/utils/user-profile.js';
import { combineRelays } from '$lib/config.js'; import { combineRelays } from '$lib/config.js';
import { KIND , isEphemeralKind , isReplaceableKind } from '$lib/types/nostr.js'; import { KIND , isEphemeralKind , isReplaceableKind , isAddressableKind } from '$lib/types/nostr.js';
import { hasUnlimitedAccess } from '$lib/utils/user-access.js'; import { hasUnlimitedAccess } from '$lib/utils/user-access.js';
import { eventCache } from '$lib/services/nostr/event-cache.js';
const npub = ($page.params as { npub? : string } ).npub || ''; const npub = ($page.params as { npub? : string } ).npub || '';
@ -60,6 +61,48 @@
return quotedEvents.find(e => e.id === eventId); return quotedEvents.find(e => e.id === eventId);
}; };
// Helper to get author name from pubkey
function getAuthorName(pubkey: string): string {
// Try to find profile event in nostrLinkEvents cache
// Check both by profile key and by iterating values
const profileByKey = nostrLinkEvents.get(`profile:${ pubkey } `);
let profileEvent = profileByKey || Array.from(nostrLinkEvents.values()).find(
e => e.kind === 0 & & e.pubkey === pubkey
);
// If not found in nostrLinkEvents, try global eventCache
if (!profileEvent) {
try {
const cachedProfile = eventCache.getProfile(pubkey);
if (cachedProfile) {
profileEvent = cachedProfile;
}
} catch {
// eventCache not available, continue
}
}
if (profileEvent) {
try {
const profile = JSON.parse(profileEvent.content);
const name = profile.display_name || profile.name;
if (name & & name.trim()) return name.trim();
} catch {
// Try tags if JSON parse fails
const nameTag = profileEvent.tags.find(t => t[0] === 'name' || t[0] === 'display_name')?.[1];
if (nameTag & & nameTag.trim()) return nameTag.trim();
}
}
// Fallback to shortened pubkey
try {
const npub = nip19.npubEncode(pubkey);
return npub.slice(0, 12) + '...';
} catch {
return pubkey.slice(0, 8) + '...';
}
}
// Referenced events cache for activity (a-tags and e-tags) - use array for better reactivity // Referenced events cache for activity (a-tags and e-tags) - use array for better reactivity
let referencedEvents = $state< NostrEvent [ ] > ([]); let referencedEvents = $state< NostrEvent [ ] > ([]);
@ -163,6 +206,7 @@
} }
// Fetch events // Fetch events
const loadedEvents: NostrEvent[] = [];
if (eventIds.length > 0) { if (eventIds.length > 0) {
try { try {
const events = await Promise.race([ const events = await Promise.race([
@ -172,6 +216,7 @@
for (const event of events) { for (const event of events) {
nostrLinkEvents.set(event.id, event); nostrLinkEvents.set(event.id, event);
loadedEvents.push(event);
} }
} catch { } catch {
// Ignore fetch errors // Ignore fetch errors
@ -194,6 +239,7 @@
if (events.length > 0) { if (events.length > 0) {
nostrLinkEvents.set(events[0].id, events[0]); nostrLinkEvents.set(events[0].id, events[0]);
loadedEvents.push(events[0]);
} }
} catch { } catch {
// Ignore fetch errors // Ignore fetch errors
@ -201,6 +247,38 @@
} }
} }
} }
// Load profiles for authors of loaded events
if (loadedEvents.length > 0) {
const authorPubkeys = new Set< string > ();
for (const event of loadedEvents) {
if (event.pubkey) {
authorPubkeys.add(event.pubkey);
}
}
// Fetch profiles for all authors
if (authorPubkeys.size > 0) {
try {
const profiles = await Promise.race([
nostrClient.fetchEvents([{ kinds : [ 0 ], authors : Array.from ( authorPubkeys ), limit : authorPubkeys.size } ]),
new Promise< NostrEvent [ ] > ((resolve) => setTimeout(() => resolve([]), 10000))
]);
// Store profiles in cache (use a special key format: `profile:${ pubkey } `)
for (const profile of profiles) {
// Store with a key that includes the pubkey so we can find it
nostrLinkEvents.set(`profile:${ profile . pubkey } `, profile);
// Also store by ID if it has one
if (profile.id) {
nostrLinkEvents.set(profile.id, profile);
}
}
} catch {
// Ignore profile fetch errors
}
}
}
} }
// Get event from nostr: link // Get event from nostr: link
@ -555,6 +633,19 @@ i *
return true; return true;
} }
// Exclude addressable events (30000-39999) that are not repo-related
// Only allow known repo-related addressable events: REPO_ANNOUNCEMENT, REPO_STATE, BRANCH_PROTECTION
if (isAddressableKind(event.kind)) {
const allowedAddressableKinds: number[] = [
KIND.REPO_ANNOUNCEMENT,
KIND.REPO_STATE,
KIND.BRANCH_PROTECTION
];
if (!allowedAddressableKinds.includes(event.kind)) {
return true;
}
}
// Exclude specific regular kinds that are not repo-related: // Exclude specific regular kinds that are not repo-related:
// Kind 1: Keep this one in, just for the user's convenience // Kind 1: Keep this one in, just for the user's convenience
@ -866,41 +957,99 @@ i *
return date.toLocaleDateString(); return date.toLocaleDateString();
} }
// Helper function to check if an event is repo-related
function isRepoRelatedEvent(event: NostrEvent): boolean {
const repoRelatedKinds: number[] = [
KIND.REPO_ANNOUNCEMENT,
KIND.REPO_STATE,
KIND.PATCH,
KIND.PULL_REQUEST,
KIND.PULL_REQUEST_UPDATE,
KIND.ISSUE,
KIND.STATUS_OPEN,
KIND.STATUS_APPLIED,
KIND.STATUS_CLOSED,
KIND.STATUS_DRAFT,
KIND.COMMIT_SIGNATURE,
KIND.OWNERSHIP_TRANSFER,
KIND.RELEASE,
KIND.COMMENT,
KIND.THREAD,
KIND.BRANCH_PROTECTION,
KIND.HIGHLIGHT
];
return repoRelatedKinds.includes(event.kind);
}
// Helper function to check if an event references a repo via a-tag
function eventReferencesRepo(event: NostrEvent, repoATags: Set< string > ): boolean {
const aTags = event.tags.filter(t => t[0] === 'a' & & t[1]);
for (const aTag of aTags) {
if (aTag[1] && repoATags.has(aTag[1])) {
return true;
}
}
return false;
}
// Helper function to check if an event has p-tag or q-tag referencing the user
function eventReferencesUser(event: NostrEvent, userPubkey: string): boolean {
// Check p-tags
const pTags = event.tags.filter(t => t[0] === 'p' & & t[1]);
for (const pTag of pTags) {
if (pTag[1] && pTag[1].toLowerCase() === userPubkey.toLowerCase()) {
return true;
}
}
// Check q-tags
const qTags = event.tags.filter(t => t[0] === 'q' & & t[1]);
for (const qTag of qTags) {
if (qTag[1] && qTag[1].toLowerCase() === userPubkey.toLowerCase()) {
return true;
}
}
return false;
}
async function loadActivity() { async function loadActivity() {
if (!profileOwnerPubkeyHex || loadingActivity || activityLoaded) return; if (!profileOwnerPubkeyHex || loadingActivity || activityLoaded) return;
const userPubkey = profileOwnerPubkeyHex; // Store in local variable for type safety const userPubkey = profileOwnerPubkeyHex; // Store in local variable for type safety
loadingActivity = true; loadingActivity = true;
try { try {
// Step 1: Fetch repo announcements in parallel (reduced limit) // Step 1: Fetch all repo announcements where user is owner or maintainer
const [repoAnnouncements, allAnnouncements] = await Promise.all([ const [repoAnnouncements, allAnnouncements] = await Promise.all([
nostrClient.fetchEvents([ nostrClient.fetchEvents([
{ {
kinds: [KIND.REPO_ANNOUNCEMENT], kinds: [KIND.REPO_ANNOUNCEMENT],
authors: [userPubkey], authors: [userPubkey],
limit: 50 // Reduced from 100 limit: 100
} }
]), ]),
nostrClient.fetchEvents([ nostrClient.fetchEvents([
{ {
kinds: [KIND.REPO_ANNOUNCEMENT], kinds: [KIND.REPO_ANNOUNCEMENT],
'#p': [userPubkey], '#p': [userPubkey],
limit: 50 // Reduced from 100 limit: 100
} }
]) ])
]); ]);
// Step 2: Extract a-tags from repo announcements // Step 2: Extract a-tags from repos where user is owner or maintainer
const aTags = new Set< string > (); const repoATags = new Set< string > ();
// Add a-tags from repos owned by user
for (const announcement of repoAnnouncements) { for (const announcement of repoAnnouncements) {
const dTag = announcement.tags.find(t => t[0] === 'd')?.[1]; const dTag = announcement.tags.find(t => t[0] === 'd')?.[1];
if (dTag) { if (dTag) {
const aTag = `${ KIND . REPO_ANNOUNCEMENT } :${ announcement . pubkey } :${ dTag } `; const aTag = `${ KIND . REPO_ANNOUNCEMENT } :${ announcement . pubkey } :${ dTag } `;
aTags.add(aTag); repoA Tags.add(aTag);
} }
} }
// Step 3: Check for repos where user is a maintainer // Add a-tags from repos where user is a maintainer
for (const announcement of allAnnouncements) { for (const announcement of allAnnouncements) {
const maintainersTag = announcement.tags.find(t => t[0] === 'maintainers'); const maintainersTag = announcement.tags.find(t => t[0] === 'maintainers');
if (maintainersTag) { if (maintainersTag) {
@ -920,43 +1069,95 @@ i *
const dTag = announcement.tags.find(t => t[0] === 'd')?.[1]; const dTag = announcement.tags.find(t => t[0] === 'd')?.[1];
if (dTag) { if (dTag) {
const aTag = `${ KIND . REPO_ANNOUNCEMENT } :${ announcement . pubkey } :${ dTag } `; const aTag = `${ KIND . REPO_ANNOUNCEMENT } :${ announcement . pubkey } :${ dTag } `;
a Tags.add(aTag); repoA Tags.add(aTag);
} }
} }
} }
} }
// Step 4: Fetch events that reference the user or their repos (reduced limits) // If user has no repos, return empty activity
if (repoATags.size === 0) {
activityEvents = [];
activityLoaded = true;
loadingActivity = false;
return;
}
// Step 3: Define repo-related event kinds
const repoRelatedKinds = [
KIND.REPO_ANNOUNCEMENT,
KIND.REPO_STATE,
KIND.PATCH,
KIND.PULL_REQUEST,
KIND.PULL_REQUEST_UPDATE,
KIND.ISSUE,
KIND.STATUS_OPEN,
KIND.STATUS_APPLIED,
KIND.STATUS_CLOSED,
KIND.STATUS_DRAFT,
KIND.COMMIT_SIGNATURE,
KIND.OWNERSHIP_TRANSFER,
KIND.RELEASE,
KIND.COMMENT,
KIND.THREAD,
KIND.BRANCH_PROTECTION,
KIND.HIGHLIGHT
];
// Step 4: Fetch events that:
// - Have p-tags or q-tags referencing the user
// - AND reference repos where user is owner/maintainer (via a-tags)
// - AND are repo-related kinds
const filters: any[] = []; const filters: any[] = [];
// Events with user in p-tag // Events with user in p-tag AND repo a-tags AND repo-related kinds
filters.push({ filters.push({
'#p': [userPubkey], '#p': [userPubkey],
limit: 100 // Reduced from 200 '#a': Array.from(repoATags),
kinds: repoRelatedKinds,
limit: 200
}); });
// Events with user in q-tag // Events with user in q-tag AND repo a-tags AND repo-related kinds
filters.push({ filters.push({
'#q': [userPubkey], '#q': [userPubkey],
limit: 100 // Reduced from 200 '#a': Array.from(repoATags),
kinds: repoRelatedKinds,
limit: 200
}); });
// Events with repo a-tags
if (aTags.size > 0) {
filters.push({
'#a': Array.from(aTags),
limit: 100 // Reduced from 200
});
}
const allActivityEvents = await Promise.race([ const allActivityEvents = await Promise.race([
nostrClient.fetchEvents(filters), nostrClient.fetchEvents(filters),
new Promise< NostrEvent [ ] > ((resolve) => setTimeout(() => resolve([]), 15000)) // 15s timeout new Promise< NostrEvent [ ] > ((resolve) => setTimeout(() => resolve([]), 15000)) // 15s timeout
]); ]);
// Step 5: Deduplicate, filter, and sort by created_at (newest first) // Step 5: Additional filtering to ensure events:
// - Reference the user via p-tag or q-tag
// - Reference a repo the user owns/maintains via a-tag
// - Are repo-related kinds
const eventMap = new Map< string , NostrEvent > (); const eventMap = new Map< string , NostrEvent > ();
for (const event of allActivityEvents) { for (const event of allActivityEvents) {
// Skip user's own events
if (event.pubkey === userPubkey) {
continue;
}
// Must be repo-related
if (!isRepoRelatedEvent(event)) {
continue;
}
// Must reference the user via p-tag or q-tag
if (!eventReferencesUser(event, userPubkey)) {
continue;
}
// Must reference a repo the user owns/maintains
if (!eventReferencesRepo(event, repoATags)) {
continue;
}
// Apply standard exclusions
if (shouldExcludeEvent(event, userPubkey, true)) { if (shouldExcludeEvent(event, userPubkey, true)) {
continue; continue;
} }
@ -967,7 +1168,7 @@ i *
} }
} }
// Sort by created_at descending and limit to 50 (reduced from 200) // Sort by created_at descending and limit to 50
activityEvents = Array.from(eventMap.values()) activityEvents = Array.from(eventMap.values())
.sort((a, b) => b.created_at - a.created_at) .sort((a, b) => b.created_at - a.created_at)
.slice(0, 50); .slice(0, 50);
@ -1925,7 +2126,8 @@ i *
{ #if quotedEvent } { #if quotedEvent }
< div class = "quoted-event" > < div class = "quoted-event" >
< div class = "quoted-event-header" > < div class = "quoted-event-header" >
< UserBadge pubkey = { quotedEvent . pubkey } disableLink= { true } /> < span class = "quoted-event-label" > Quoting:< / span >
< UserBadge pubkey = { quotedEvent . pubkey } disableLink= { true } inline = { true } / >
< span class = "quoted-event-time" > { formatMessageTime ( quotedEvent . created_at )} </ span > < span class = "quoted-event-time" > { formatMessageTime ( quotedEvent . created_at )} </ span >
< / div > < / div >
< div class = "quoted-event-content" > { quotedEvent . content || '(No content)' } </ div > < div class = "quoted-event-content" > { quotedEvent . content || '(No content)' } </ div >
@ -1984,7 +2186,7 @@ i *
{ :else if part . type === 'event' && part . event } { :else if part . type === 'event' && part . event }
< div class = "nostr-link-event" > < div class = "nostr-link-event" >
< div class = "nostr-link-event-header" > < div class = "nostr-link-event-header" >
< UserBadge pubkey = { part . event . pubkey } disableLink= { true } / > < span class = "nostr-link-event-author" > { getAuthorName ( part . event . pubkey )} </ span >
< span class = "nostr-link-event-time" > { formatMessageTime ( part . event . created_at )} </ span > < span class = "nostr-link-event-time" > { formatMessageTime ( part . event . created_at )} </ span >
< / div > < / div >
< div class = "nostr-link-event-content" > { part . event . content || getEventContext ( part . event )} </ div > < div class = "nostr-link-event-content" > { part . event . content || getEventContext ( part . event )} </ div >
@ -2039,13 +2241,22 @@ i *
< div class = "zap-amount" > { zapData . amount } </ div > < div class = "zap-amount" > { zapData . amount } </ div >
< div class = "zap-details" > < div class = "zap-details" >
{ #if zapData . senderPubkey } { #if zapData . senderPubkey }
< span > From < UserBadge pubkey = { zapData . senderPubkey } disableLink= { true } /></ span > < span class = "zap-detail-item" >
< span class = "zap-detail-label" > From< / span >
< span class = "zap-detail-value" > { getAuthorName ( zapData . senderPubkey )} </ span >
< / span >
{ /if } { /if }
{ #if zapData . recipientPubkey && zapData . recipientPubkey !== profileOwnerPubkeyHex } { #if zapData . recipientPubkey && zapData . recipientPubkey !== profileOwnerPubkeyHex }
< span > To < UserBadge pubkey = { zapData . recipientPubkey } disableLink= { true } /></ span > < span class = "zap-detail-item" >
< span class = "zap-detail-label" > To< / span >
< span class = "zap-detail-value" > { getAuthorName ( zapData . recipientPubkey )} </ span >
< / span >
{ /if } { /if }
{ #if zapData . eventId } { #if zapData . eventId }
< span > on event { zapData . eventId . slice ( 0 , 8 )} ...</ span > < span class = "zap-detail-item" >
< span class = "zap-detail-label" > on event< / span >
< span class = "zap-detail-value" > { zapData . eventId . slice ( 0 , 8 )} ...</ span >
< / span >
{ /if } { /if }
{ #if zapData . comment } { #if zapData . comment }
< div class = "zap-comment" > { zapData . comment } </ div > < div class = "zap-comment" > { zapData . comment } </ div >
@ -2078,7 +2289,7 @@ i *
{ :else if part . type === 'event' && part . event } { :else if part . type === 'event' && part . event }
< div class = "nostr-link-event" > < div class = "nostr-link-event" >
< div class = "nostr-link-event-header" > < div class = "nostr-link-event-header" >
< UserBadge pubkey = { part . event . pubkey } disableLink= { true } / > < span class = "nostr-link-event-author" > { getAuthorName ( part . event . pubkey )} </ span >
< span class = "nostr-link-event-time" > { formatMessageTime ( part . event . created_at )} </ span > < span class = "nostr-link-event-time" > { formatMessageTime ( part . event . created_at )} </ span >
< / div > < / div >
< div class = "nostr-link-event-content" > { part . event . content || getEventContext ( part . event )} </ div > < div class = "nostr-link-event-content" > { part . event . content || getEventContext ( part . event )} </ div >
@ -2153,7 +2364,7 @@ i *
{ :else if part . type === 'event' && part . event } { :else if part . type === 'event' && part . event }
< div class = "nostr-link-event" > < div class = "nostr-link-event" >
< div class = "nostr-link-event-header" > < div class = "nostr-link-event-header" >
< UserBadge pubkey = { part . event . pubkey } disableLink= { true } / > < span class = "nostr-link-event-author" > { getAuthorName ( part . event . pubkey )} </ span >
< span class = "nostr-link-event-time" > { formatMessageTime ( part . event . created_at )} </ span > < span class = "nostr-link-event-time" > { formatMessageTime ( part . event . created_at )} </ span >
< / div > < / div >
< div class = "nostr-link-event-content" > { part . event . content || getEventContext ( part . event )} </ div > < div class = "nostr-link-event-content" > { part . event . content || getEventContext ( part . event )} </ div >
@ -3038,17 +3249,33 @@ i *
.message-icon { .message-icon {
width: 1.25rem; width: 1.25rem;
height: 1.25rem; height: 1.25rem;
filter: var(--icon-filter, none); filter: var(--icon-filter, brightness(0) saturate(100%) invert(1));
opacity: 0.8;
}
:global([data-theme="light"]) .message-icon {
filter: brightness(0) saturate(100%);
opacity: 0.7;
}
:global([data-theme="dark"]) .message-icon,
:global([data-theme="black"]) .message-icon {
filter: brightness(0) saturate(100%) invert(1);
opacity: 0.8;
}
.message-action-button:hover .message-icon {
opacity: 1;
} }
.quoted-event { .quoted-event {
margin-bottom: 1rem; margin-bottom: 0.75 rem;
padding: 0.75rem; padding: 0.5rem;
background: var(--bg-secondary); background: var(--bg-secondary, var(--bg-primary) );
border: 1px solid var(--border-color); color: var(--text-muted, var(--text-secondary) );
border-left: 3px solid var(--accent, #007bff); border-radius: 4px ;
border-radius: 0.375rem; border-left: 2px solid var(--border-light, var(--border-color)) ;
font-size: 0.875rem; opacity: 0.8 ;
} }
:global([data-theme="light"]) .quoted-event { :global([data-theme="light"]) .quoted-event {
@ -3069,50 +3296,35 @@ i *
.quoted-event-header { .quoted-event-header {
display: flex; display: flex;
align-items: center; align-items: center;
gap: 0.5rem; gap: 0.375rem;
margin-bottom: 0.5rem; margin-bottom: 0.25rem;
flex-wrap: wrap; font-size: 0.75rem;
color: var(--text-muted, var(--text-secondary));
}
.quoted-event-label {
font-weight: 500;
color: var(--text-muted, var(--text-secondary));
} }
.quoted-event-time { .quoted-event-time {
font-size: 0.75rem; color: var(--text-muted, var(--text-secondary)) ;
color: var(--text-muted); font-size: 0.7rem ;
margin-left: auto; margin-left: auto;
} }
.quoted-event-content { .quoted-event-content {
color: var(--text-secondary); font-size: 0.8rem;
color: var(--text-muted, var(--text-secondary));
line-height: 1.4;
white-space: pre-wrap; white-space: pre-wrap;
word-wrap: break-word; word-wrap: break-word;
overflow-wrap: break-word; overflow-wrap: break-word;
line-height: 1.5;
max-height: 8rem; max-height: 8rem;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
} }
.quoted-event-content::after {
content: '';
position: absolute;
bottom: 0;
left: 0;
right: 0;
height: 2rem;
background: linear-gradient(to bottom, transparent, var(--bg-secondary));
pointer-events: none;
}
:global([data-theme="light"]) .quoted-event-content::after {
background: linear-gradient(to bottom, transparent, #f5f5f5);
}
:global([data-theme="dark"]) .quoted-event-content::after {
background: linear-gradient(to bottom, transparent, rgba(255, 255, 255, 0.05));
}
:global([data-theme="black"]) .quoted-event-content::after {
background: linear-gradient(to bottom, transparent, rgba(255, 255, 255, 0.03));
}
.quoted-event-loading { .quoted-event-loading {
opacity: 0.6; opacity: 0.6;
@ -3331,27 +3543,39 @@ i *
.zap-details { .zap-details {
display: flex; display: flex;
flex-direction: column; flex-wrap: wrap;
gap: 0.25rem; gap: 0.5rem;
font-size: 0.875rem; font-size: 0.7rem;
color: var(--text-primary); color: var(--text-muted, var(--text-secondary));
line-height: 1.5; line-height: 1.4;
margin-top: 0.25rem;
} }
.zap-details span { .zap-detail-item {
display: flex; display: inline- flex;
align-items: center; align-items: center;
gap: 0.5rem; gap: 0.25rem;
}
.zap-detail-label {
color: var(--text-muted, var(--text-secondary));
font-weight: 500;
}
.zap-detail-value {
color: var(--text-muted, var(--text-secondary));
} }
.zap-comment { .zap-comment {
margin-top: 0.5rem; margin-top: 0.37 5rem;
padding: 0.75rem; padding: 0.3 75rem 0. 5rem;
background: var(--bg-secondary); background: var(--bg-secondary, var(--bg-primary) );
border-radius: 0.5rem; border-radius: 4px ;
border-left: 2px solid var(--accent); border-left: 2px solid var(--border-light, var(--border-color) );
font-style: italic; font-style: italic;
color: var(--text-secondary); font-size: 0.75rem;
color: var(--text-muted, var(--text-secondary));
opacity: 0.8;
} }
.zap-receipt { .zap-receipt {
@ -3509,11 +3733,20 @@ i *
align-items: center; align-items: center;
gap: 0.5rem; gap: 0.5rem;
margin-bottom: 0.5rem; margin-bottom: 0.5rem;
line-height: 1;
font-size: 0.75rem;
color: var(--text-muted, var(--text-secondary));
}
.nostr-link-event-author {
font-weight: 500;
color: var(--text-muted, var(--text-secondary));
} }
.nostr-link-event-time { .nostr-link-event-time {
font-size: 0.75rem; font-size: 0.7rem;
color: var(--text-muted); color: var(--text-muted, var(--text-secondary));
margin-left: auto;
} }
.nostr-link-event-content { .nostr-link-event-content {
Silberengel