Add arrows to tooltips

app/components/activity-timeline.gjs

@@ -1,85 +0,0 @@
-import Component from '@glimmer/component';
-import { action } from '@ember/object';
-import { tracked } from '@glimmer/tracking';
-import { on } from '@ember/modifier';
-import Icon from './icon';
-import ActivityZapItem from './activity-zap-item';
-import Modal from './modal';
-import NostrConnect from './nostr-connect';
-import not from 'ember-truth-helpers/helpers/not';
-import eq from 'ember-truth-helpers/helpers/eq';
-import restoreScroll from '../modifiers/restore-scroll';
-
-export default class ActivityTimelineComponent extends Component {
-  @tracked isNostrConnectModalOpen = false;
-
-  @action
-  openNostrConnectModal(event) {
-    event.preventDefault();
-    this.isNostrConnectModalOpen = true;
-  }
-
-  @action
-  closeNostrConnectModal() {
-    this.isNostrConnectModalOpen = false;
-  }
-
-  @action
-  onNostrConnected() {
-    this.closeNostrConnectModal();
-    this.args.onNostrConnected?.();
-  }
-
-  <template>
-    <div class="sidebar">
-      <div class="sidebar-header has-back-btn">
-        <button type="button" class="back-btn" {{on "click" @onBack}}>
-          <Icon @name="arrow-left" @size={{20}} @color="#333" />
-        </button>
-        <h2 class="sidebar-header-text-centered">
-          <span class="sidebar-header-icon-wrapper">
-            <Icon @name="activity" @size={{20}} @color="#898989" />
-          </span>
-          Activity
-        </h2>
-        <button type="button" class="close-btn" {{on "click" @onClose}}>
-          <Icon @name="x" @size={{20}} @color="#333" />
-        </button>
-      </div>
-
-      <div class="sidebar-content" {{restoreScroll @scrollTop}}>
-        {{#if @isLoading}}
-          <div class="sidebar-loading">
-            <Icon @name="loading-ring" @size={{24}} @color="#898989" />
-          </div>
-        {{else if (not @isConnected)}}
-          <p class="empty-state">
-            <a
-              href="#"
-              role="button"
-              tabindex="0"
-              {{on "click" this.openNostrConnectModal}}
-            >Connect your Nostr account</a>
-            to see your activity.
-          </p>
-        {{else if (not @items.length)}}
-          <p class="empty-state">No activity yet.</p>
-        {{else}}
-          <ul class="activity-list">
-            {{#each @items as |item|}}
-              {{#if (eq item.type "zap")}}
-                <ActivityZapItem @item={{item}} @onSelect={{@onSelect}} />
-              {{/if}}
-            {{/each}}
-          </ul>
-        {{/if}}
-      </div>
-    </div>
-
-    {{#if this.isNostrConnectModalOpen}}
-      <Modal @onClose={{this.closeNostrConnectModal}}>
-        <NostrConnect @onConnect={{this.onNostrConnected}} />
-      </Modal>
-    {{/if}}
-  </template>
-}

app/components/activity-zap-item.gjs

@@ -1,105 +0,0 @@
-import Component from '@glimmer/component';
-import { on } from '@ember/modifier';
-import { fn } from '@ember/helper';
-import formatRelativeDate from '../helpers/format-relative-date';
-import { npubEncode } from 'applesauce-core/helpers/pointers';
-import Icon from './icon';
-
-export default class ActivityZapItem extends Component {
-  get item() {
-    return this.args.item;
-  }
-
-  get senderName() {
-    return this.item?.senderName;
-  }
-
-  get senderDisplayName() {
-    const name = this.senderName;
-    if (name) return name;
-    const pubkey = this.item?.senderPubkey;
-    if (!pubkey) return 'Someone';
-    try {
-      return `${npubEncode(pubkey).slice(0, 12)}…`;
-    } catch {
-      return `${pubkey.slice(0, 12)}…`;
-    }
-  }
-
-  get senderAvatar() {
-    return this.item?.senderAvatar;
-  }
-
-  get hasPhoto() {
-    return !!this.item?.photo;
-  }
-
-  get photoThumbUrl() {
-    return this.item?.photo?.thumbUrl || this.item?.photo?.url;
-  }
-
-  get placeName() {
-    return this.item?.placeName;
-  }
-
-  get placeNameLoading() {
-    return this.item?.placeNameLoading;
-  }
-
-  <template>
-    <li>
-      <button
-        type="button"
-        class="activity-zap-item"
-        {{on "click" (fn @onSelect @item)}}
-      >
-        <div class="zap-header">
-          <span class="zap-sender-line">
-            <span class="zap-sender-name">{{this.senderDisplayName}}</span>
-            {{! template-lint-disable no-whitespace-for-layout }}
-            <span class="zap-action"> zapped your photo</span>
-          </span>
-          <span class="zap-amount">{{this.item.amountSats}} ⚡</span>
-        </div>
-
-        <div class="zap-context">
-          <div class="zap-context-images">
-            {{#if this.senderAvatar}}
-              <img
-                class="zap-sender-avatar"
-                src={{this.senderAvatar}}
-                alt=""
-                loading="lazy"
-              />
-            {{else}}
-              <div class="zap-sender-avatar-placeholder">
-                <Icon @name="user" @size={{16}} @color="#999" />
-              </div>
-            {{/if}}
-            {{#if this.hasPhoto}}
-              <div class="zap-context-thumb">
-                <img src={{this.photoThumbUrl}} alt="" loading="lazy" />
-              </div>
-            {{/if}}
-          </div>
-          <div class="zap-context-text">
-            <span class="zap-place-name">
-              {{#if this.placeName}}
-                {{this.placeName}}
-              {{else if this.placeNameLoading}}
-                <span class="contribution-name-loading">Loading…</span>
-              {{else}}
-                <span class="contribution-name-loading">Unnamed place</span>
-              {{/if}}
-            </span>
-            <span class="zap-date">{{formatRelativeDate @item.createdAt}}</span>
-          </div>
-        </div>
-
-        {{#if this.item.message}}
-          <div class="zap-message">{{this.item.message}}</div>
-        {{/if}}
-      </button>
-    </li>
-  </template>
-}

app/components/app-menu/home.gjs

@@ -25,15 +25,9 @@ import iconRounded from '../../icons/icon-rounded.svg?raw';
           <span>Collections</span>
         </button>
       </li>
-      <li>
-        <button type="button" {{on "click" @onActivity}}>
-          <Icon @name="activity" @size={{20}} />
-          <span>Activity</span>
-        </button>
-      </li>
       <li>
         <button type="button" {{on "click" @onContributions}}>
-          <Icon @name="user-check" @size={{20}} />
+          <Icon @name="activity" @size={{20}} />
           <span>My Contributions</span>
         </button>
       </li>

app/components/app-menu/index.gjs

@@ -28,11 +28,6 @@ export default class AppMenu extends Component {
     this.router.transitionTo('contributions');
   }
 
-  @action
-  goToActivity() {
-    this.router.transitionTo('activity');
-  }
-
   <template>
     <div class="sidebar app-menu-pane">
       {{#if (eq this.currentView "menu")}}
@@ -41,7 +36,6 @@ export default class AppMenu extends Component {
           @onClose={{@onClose}}
           @onSavedPlaces={{this.goToSavedPlaces}}
           @onContributions={{this.goToContributions}}
-          @onActivity={{this.goToActivity}}
         />
 
       {{else if (eq this.currentView "settings")}}

app/controllers/activity.js

@@ -1,59 +0,0 @@
-import Controller from '@ember/controller';
-import { service } from '@ember/service';
-import { action } from '@ember/object';
-import { task } from 'ember-concurrency';
-
-export default class ActivityController extends Controller {
-  @service router;
-  @service mapUi;
-  @service nostrAuth;
-  @service activity;
-
-  loadTask = task({ restartable: true }, async (pubkey) => {
-    if (!pubkey) return;
-    await this.activity.load(pubkey);
-  });
-
-  get scrollTop() {
-    return this.mapUi.getScrollPosition('activity');
-  }
-
-  get items() {
-    return this.activity.items;
-  }
-
-  get isConnected() {
-    return this.nostrAuth.isConnected;
-  }
-
-  @action
-  selectItem(item) {
-    if (!item || !item.placeIdentifier) return;
-
-    const sidebarContent = document.querySelector('.sidebar-content');
-    if (sidebarContent) {
-      this.mapUi.saveScrollPosition('activity', sidebarContent.scrollTop);
-    }
-
-    this.mapUi.returnToRoute = { name: 'activity' };
-    this.mapUi.showSidebar();
-    this.mapUi.preventNextZoom = true;
-
-    this.router.transitionTo(`/place/${item.placeIdentifier}`);
-  }
-
-  @action
-  onNostrConnected() {
-    this.loadTask.perform(this.nostrAuth.pubkey);
-  }
-
-  @action
-  backToMenu() {
-    this.router.transitionTo('menu');
-  }
-
-  @action
-  close() {
-    this.router.transitionTo('index');
-  }
-}

app/modifiers/tooltip.js

@@ -16,17 +16,30 @@ export default modifier((element) => {
 
     const rect = element.getBoundingClientRect();
     const tipRect = tooltipEl.getBoundingClientRect();
-    const margin = 6;
-    let top = rect.top - tipRect.height - margin;
-    if (top < margin) top = rect.bottom + margin;
+    const arrowSize = 6;
+
+    // Vertical placement: above trigger, flip below if no room
+    let placement = 'top';
+    let top = rect.top - tipRect.height - arrowSize;
+    if (top < arrowSize) {
+      placement = 'bottom';
+      top = rect.bottom + arrowSize;
+    }
+
+    // Horizontal: center on trigger, clamp to viewport
     let left = rect.left + rect.width / 2 - tipRect.width / 2;
     left = Math.max(
-      margin,
-      Math.min(left, window.innerWidth - tipRect.width - margin)
+      arrowSize,
+      Math.min(left, window.innerWidth - tipRect.width - arrowSize)
     );
 
+    // Arrow always points at trigger center, even when clamped
+    const arrowLeft = rect.left + rect.width / 2 - left;
+
+    tooltipEl.dataset.placement = placement;
     tooltipEl.style.top = `${top}px`;
     tooltipEl.style.left = `${left}px`;
+    tooltipEl.style.setProperty('--arrow-left', `${arrowLeft}px`);
   };
 
   const hide = () => {

app/router.js

@@ -15,7 +15,6 @@ Router.map(function () {
     this.route('list', { path: '/:list_id' });
   });
   this.route('contributions');
-  this.route('activity');
   this.route('oauth', function () {
     this.route('osm-callback', { path: '/osm/callback' });
   });

app/routes/activity.js

@@ -1,23 +0,0 @@
-import Route from '@ember/routing/route';
-import { service } from '@ember/service';
-
-export default class ActivityRoute extends Route {
-  @service mapUi;
-  @service nostrAuth;
-  @service activity;
-
-  activate() {
-    this.mapUi.showSidebar();
-  }
-
-  setupController(controller, model) {
-    super.setupController(controller, model);
-    if (controller && controller.loadTask) {
-      controller.loadTask.perform(this.nostrAuth.pubkey);
-    }
-  }
-
-  deactivate() {
-    this.activity.stop();
-  }
-}

app/services/activity.js

@@ -1,206 +0,0 @@
-import Service, { service } from '@ember/service';
-import { tracked } from '@glimmer/tracking';
-import { ProfileModel } from 'applesauce-core/models/profile';
-import { getProfileContent } from 'applesauce-core/helpers/profile';
-import { parseZapReceipt, enrichWithPhoto } from '../utils/activity';
-
-/**
- * Orchestrates loading the user's incoming social activity (zaps received on
- * their photos) and exposing it as a tracked `items` list for the activity
- * timeline.
- *
- * The flow is:
- *   1. Subscribe to `nostrData.store.timeline(...)` for kind 9735 zap receipts
- *      where the user is the recipient (`#p` filter).
- *   2. Parse each receipt into an `ActivityEntry`, filtering to zaps on the
- *      user's own kind 360 photos.
- *   3. Resolve sender profiles asynchronously via a per-sender `ProfileModel`
- *      subscription, updating the tracked entry fields when they load.
- *   4. Resolve place names via the shared `placeNameResolver` service.
- *   5. Update `@tracked items` so the UI renders progressively.
- */
-export default class ActivityService extends Service {
-  @service nostrData;
-  @service nostrAuth;
-  @service placeNameResolver;
-
-  @tracked items = [];
-
-  _sub = null;
-  _profileSubs = new Map();
-  _userPubkey = null;
-
-  /**
-   * Loads the user's incoming zap receipts and subscribes to live updates.
-   *
-   * @param {string} pubkey The user's Nostr pubkey
-   */
-  async load(pubkey) {
-    if (!pubkey) {
-      this.items = [];
-      return;
-    }
-
-    this._userPubkey = pubkey;
-
-    const filters = [{ kinds: [9735], '#p': [pubkey] }];
-
-    console.debug('[activity] Subscribing to zap receipts', {
-      filters,
-      pubkey,
-      activeReadRelays: this.nostrData.activeReadRelays,
-    });
-
-    // Subscribe to the store timeline so we get live updates as receipts
-    // arrive and are added to the store.
-    this._sub = this.nostrData.store.timeline(filters).subscribe((events) => {
-      this._updateItems(events, pubkey);
-    });
-
-    // Ensure the user's kind 360 photo events are in the store first so
-    // enrichWithPhoto can look them up when zap receipts arrive.
-    await this.nostrData.loadMyContributions(pubkey);
-
-    // Then load zap receipts — adding them to the store triggers the
-    // timeline subscription, and by now the photo events are available.
-    await this.nostrData.loadIncomingZaps(pubkey);
-  }
-
-  /**
-   * Stops subscriptions and clears the timeline. Called when leaving the
-   * activity route.
-   */
-  stop() {
-    if (this._sub) {
-      this._sub.unsubscribe();
-      this._sub = null;
-    }
-    this._cleanupProfileSubs();
-    this.items = [];
-    this._userPubkey = null;
-    this.placeNameResolver.reset();
-  }
-
-  willDestroy() {
-    this.stop();
-    super.willDestroy(...arguments);
-  }
-
-  _updateItems(receipts, pubkey) {
-    const entries = [];
-
-    for (const receipt of receipts) {
-      const entry = parseZapReceipt(receipt, pubkey);
-      if (!entry) continue;
-
-      // Only keep zaps for the user's own kind 360 photos
-      if (!enrichWithPhoto(entry, this.nostrData.store, pubkey)) {
-        continue;
-      }
-
-      // Resolve sender profile (async, fire-and-forget)
-      this._resolveSender(entry);
-
-      entries.push(entry);
-    }
-
-    // Sort newest-first by created_at
-    entries.sort((a, b) => b.createdAt - a.createdAt);
-
-    console.debug('[activity] Zap receipts received', {
-      total: receipts.length,
-      matched: entries.length,
-      pubkey,
-    });
-
-    // 2. Bookmark lookup is synchronous — resolve those immediately so the
-    //    first render shows bookmarked place names without a "Loading…" flicker.
-    for (const entry of entries) {
-      if (entry.osmId) {
-        const bookmarkName = this.placeNameResolver.resolveBookmark(
-          entry.osmId
-        );
-        if (bookmarkName) {
-          entry.placeName = bookmarkName;
-          entry.placeNameLoading = false;
-        }
-      }
-    }
-
-    this.items = entries;
-
-    // 3. Async-resolve remaining entries from the IndexedDB name cache and OSM
-    //    cache, then fall through to the network batch for the rest.
-    void this.placeNameResolver.resolveInBackground(entries).then(() => {
-      this.items = [...this.items];
-    });
-  }
-
-  _resolveSender(entry) {
-    const pubkey = entry.senderPubkey;
-    if (!pubkey) return;
-
-    // Set up a ProfileModel subscription for this sender so the entry's
-    // tracked fields update when the profile arrives from cache or network.
-    // The event loader (configured in nostrData) auto-fetches missing kind 0
-    // events from the IDB cache and relays.
-    if (!this._profileSubs.has(pubkey)) {
-      const sub = this.nostrData.store
-        .model(ProfileModel, pubkey)
-        .subscribe((profileContent) => {
-          this._applyProfileToPubkey(pubkey, profileContent);
-        });
-      this._profileSubs.set(pubkey, sub);
-    }
-
-    // Read immediately in case the profile is already cached
-    this._applySenderProfile(entry, pubkey);
-  }
-
-  _applySenderProfile(entry, pubkey) {
-    // Try nostrData's profiles dict first (populated by other parts of the app)
-    let profile = this.nostrData.getProfile(pubkey);
-
-    // Fall back to reading the kind 0 event directly from the store. This
-    // handles the re-open case where the event is already in the store from
-    // a previous load but nostrData.profiles wasn't populated by this service.
-    if (!profile) {
-      const event = this.nostrData.store.getReplaceable(0, pubkey);
-      if (event) {
-        profile = getProfileContent(event);
-      }
-    }
-
-    if (profile) {
-      entry.senderName = profile.name || profile.display_name || null;
-      entry.senderAvatar = profile.picture || null;
-      entry.senderProfileLoading = false;
-    }
-  }
-
-  _applyProfileToPubkey(pubkey, profileContent) {
-    // Update all entries matching this sender
-    let changed = false;
-    for (const entry of this.items) {
-      if (entry.senderPubkey === pubkey) {
-        entry.senderName =
-          profileContent.name || profileContent.display_name || null;
-        entry.senderAvatar = profileContent.picture || null;
-        entry.senderProfileLoading = false;
-        changed = true;
-      }
-    }
-
-    if (changed) {
-      // Trigger re-render
-      this.items = [...this.items];
-    }
-  }
-
-  _cleanupProfileSubs() {
-    for (const sub of this._profileSubs.values()) {
-      sub.unsubscribe();
-    }
-    this._profileSubs.clear();
-  }
-}

app/services/contributions.js

@@ -2,6 +2,8 @@ import Service, { service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { groupPhotoContributions } from '../utils/contributions';
 
+const NAME_CACHE_STORE = 'contributions-name-cache';
+
 /**
  * Orchestrates loading the user's own Nostr contributions, grouping them into
  * timeline entries, and resolving place names from bookmarks or the OSM API.
@@ -23,11 +25,77 @@ import { groupPhotoContributions } from '../utils/contributions';
 export default class ContributionsService extends Service {
   @service nostrData;
   @service nostrAuth;
-  @service placeNameResolver;
+  @service storage;
+  @service osm;
+  @service localForage;
 
   @tracked items = [];
 
   _sub = null;
+  _pendingBatchPromise = null;
+  _lastBatchSignature = '';
+  _unresolvable = new Set();
+
+  /**
+   * Async name resolution. Checks, in order:
+   *   1. Bookmarks (sync, instant).
+   *   2. The persistent IndexedDB name cache (per-entry key).
+   *   3. The OSM service's IndexedDB cache (from place detail visits).
+   *
+   * @param {object} entry A contribution entry with `osmType`, `osmId`, and `placeIdentifier`.
+   * @returns {Promise<string|null>}
+   */
+  async _resolveCachedName(entry) {
+    // 1. Try bookmarks (instant)
+    const bookmark = this.storage.findPlaceById(entry.osmId);
+    if (bookmark?.title) return bookmark.title;
+
+    // 2. Try the persistent name cache (IndexedDB, per-entry, survives sessions)
+    const cachedName = await this.localForage.get(
+      NAME_CACHE_STORE,
+      entry.placeIdentifier
+    );
+    if (cachedName) return cachedName;
+
+    // 3. Try OSM IndexedDB cache (from place detail visits)
+    const cached = await this.osm.getCachedOsmObject(
+      entry.osmType,
+      entry.osmId
+    );
+    return cached?.title || null;
+  }
+
+  /**
+   * Asynchronously resolves names for still-loading entries from the caches.
+   * Falls through to `_maybeBatchFetchNames` for anything that remains
+   * unresolved. Fire-and-forget from `_updateItems` so the list renders
+   * immediately with bookmark-resolved names.
+   *
+   * @param {Array} entries
+   * @returns {Promise<void>}
+   */
+  async _resolveFromCache(entries) {
+    const pending = entries.filter((e) => e.placeNameLoading);
+    if (pending.length === 0) {
+      this._maybeBatchFetchNames(this.items);
+      return;
+    }
+
+    await Promise.all(
+      pending.map(async (entry) => {
+        const name = await this._resolveCachedName(entry);
+        if (name) {
+          entry.placeName = name;
+          entry.placeNameLoading = false;
+        }
+      })
+    );
+
+    // Re-render with whatever resolved, then kick off the network batch for
+    // entries that are still loading.
+    this.items = [...this.items];
+    this._maybeBatchFetchNames(this.items);
+  }
 
   /**
    * Loads the user's contributions and subscribes to live updates.
@@ -63,7 +131,9 @@ export default class ContributionsService extends Service {
       this._sub = null;
     }
     this.items = [];
-    this.placeNameResolver.reset();
+    this._lastBatchSignature = '';
+    this._pendingBatchPromise = null;
+    this._unresolvable.clear();
   }
 
   willDestroy() {
@@ -78,9 +148,9 @@ export default class ContributionsService extends Service {
     // 2. Bookmark lookup is synchronous — resolve those immediately so the
     //    first render shows bookmarked place names without a "Loading…" flicker.
     for (const entry of entries) {
-      const bookmarkName = this.placeNameResolver.resolveBookmark(entry.osmId);
-      if (bookmarkName) {
-        entry.placeName = bookmarkName;
+      const bookmark = this.storage.findPlaceById(entry.osmId);
+      if (bookmark?.title) {
+        entry.placeName = bookmark.title;
         entry.placeNameLoading = false;
       }
     }
@@ -89,8 +159,121 @@ export default class ContributionsService extends Service {
 
     // 3. Async-resolve remaining entries from the IndexedDB name cache and OSM
     //    cache, then fall through to the network batch for the rest.
-    void this.placeNameResolver.resolveInBackground(entries).then(() => {
-      this.items = [...this.items];
-    });
+    void this._resolveFromCache(entries);
+  }
+
+  _isUnresolvable(entry) {
+    return this._unresolvable.has(entry.placeIdentifier);
+  }
+
+  _maybeBatchFetchNames(entries) {
+    const unresolved = entries.filter(
+      (e) => e.placeNameLoading && !this._isUnresolvable(e)
+    );
+
+    // Apply fallbacks for items already marked unresolvable in this session
+    for (const entry of entries) {
+      if (entry.placeNameLoading && this._isUnresolvable(entry)) {
+        entry.placeName = this._fallbackName(entry);
+        entry.placeNameLoading = false;
+      }
+    }
+
+    if (unresolved.length === 0) {
+      if (this.items.some((i) => !i.placeNameLoading)) {
+        this.items = [...this.items];
+      }
+      return;
+    }
+
+    // Build a stable signature so we only fire one batch request per unique set
+    const signature = unresolved
+      .map((e) => e.placeIdentifier)
+      .sort()
+      .join('|');
+    if (signature === this._lastBatchSignature && this._pendingBatchPromise) {
+      return;
+    }
+    this._lastBatchSignature = signature;
+
+    this._pendingBatchPromise = this._batchResolveNames(unresolved)
+      .then((nameMap) => {
+        // Merge resolved names back into the current `items`.
+        for (const item of this.items) {
+          if (!item.placeNameLoading) continue;
+          if (nameMap.has(item.placeIdentifier)) {
+            const name = nameMap.get(item.placeIdentifier);
+            item.placeName = name;
+            item.placeNameLoading = false;
+          } else {
+            // Could not be resolved (deleted object, network error for this item).
+            // Mark as unresolvable for this session and use a fallback.
+            this._unresolvable.add(item.placeIdentifier);
+            item.placeName = this._fallbackName(item);
+            item.placeNameLoading = false;
+          }
+        }
+        // Trigger a re-render
+        this.items = [...this.items];
+      })
+      .catch((e) => {
+        console.error('[contributions] Batch name resolution failed', e);
+        // On a total failure, mark all as unresolvable and apply fallbacks
+        for (const item of this.items) {
+          if (item.placeNameLoading) {
+            this._unresolvable.add(item.placeIdentifier);
+            item.placeName = this._fallbackName(item);
+            item.placeNameLoading = false;
+          }
+        }
+        this.items = [...this.items];
+      })
+      .finally(() => {
+        this._pendingBatchPromise = null;
+      });
+  }
+
+  _fallbackName(item) {
+    return `OSM ${item.osmType} ${item.osmId}`;
+  }
+
+  async _batchResolveNames(entries) {
+    const nameMap = new Map();
+    const toFetch = [];
+
+    // Re-check cache in case it was populated between the trigger and now
+    for (const entry of entries) {
+      const cached = await this._resolveCachedName(entry);
+      if (cached) {
+        nameMap.set(entry.placeIdentifier, cached);
+      } else {
+        toFetch.push({ osmType: entry.osmType, osmId: entry.osmId });
+      }
+    }
+
+    if (toFetch.length === 0) return nameMap;
+
+    const places = await this.osm.fetchOsmObjectsBatch(toFetch);
+
+    // Persist each newly-resolved name to the IndexedDB name cache as its own
+    // entry (per-placeIdentifier key) so we don't re-fetch next session.
+    const writePromises = [];
+    for (const entry of entries) {
+      if (nameMap.has(entry.placeIdentifier)) continue;
+      const cacheKey = `${entry.osmType}:${entry.osmId}`;
+      const place = places.get(cacheKey);
+      if (place?.title) {
+        nameMap.set(entry.placeIdentifier, place.title);
+        writePromises.push(
+          this.localForage.set(
+            NAME_CACHE_STORE,
+            entry.placeIdentifier,
+            place.title
+          )
+        );
+      }
+    }
+    await Promise.all(writePromises);
+    return nameMap;
   }
 }

app/services/nostr-data.js

@@ -5,8 +5,7 @@ import { EMPTY, from, timeout, filter, connect, take, takeUntil } from 'rxjs';
 import { EventStore } from 'applesauce-core/event-store';
 import { ProfileModel } from 'applesauce-core/models/profile';
 import { MailboxesModel } from 'applesauce-core/models/mailboxes';
-import { ContactsModel } from 'applesauce-core/models/contacts';
-import { isEventPointer, npubEncode } from 'applesauce-core/helpers/pointers';
+import { npubEncode } from 'applesauce-core/helpers/pointers';
 import { persistEventsToCache } from 'applesauce-core/helpers/event-cache';
 import { createEventLoaderForStore } from 'applesauce-loaders/loaders';
 import { RelayGroup } from 'applesauce-relay';
@@ -57,7 +56,6 @@ export default class NostrDataService extends Service {
 
   @tracked profile = null;
   @tracked mailboxes = null;
-  @tracked contacts = null;
   @tracked blossomServers = [];
   @tracked placePhotos = [];
   @tracked myContributionEvents = [];
@@ -72,10 +70,6 @@ export default class NostrDataService extends Service {
   _eventRelays = new Map();
   _provenanceReady = null;
 
-  // Set of pubkeys from the user's follow list (kind 3 contacts) for O(1)
-  // trust lookups. Rebuilt whenever contacts change.
-  _contactPubkeys = null;
-
   // Session-only reveal toggle for untrusted content. Not persisted.
   @tracked showUntrustedContent = false;
   // Count of currently-hidden (untrusted) place photos for the selected place.
@@ -84,7 +78,6 @@ export default class NostrDataService extends Service {
 
   _profileSub = null;
   _mailboxesSub = null;
-  _contactsSub = null;
   _blossomSub = null;
   _photosSub = null;
   _contributionsSub = null;
@@ -95,7 +88,6 @@ export default class NostrDataService extends Service {
   _zapReceiptsNetworkSub = null;
   _zapRefreshTimer = null;
   _lastPhotoIds = new Set();
-  _incomingZapsNetworkSub = null;
 
   _requestSub = null;
   _cachePromise = null;
@@ -131,11 +123,10 @@ export default class NostrDataService extends Service {
       this._stopPersisting = persistEventsToCache(
         this.store,
         async (events) => {
-          // Only cache profiles, mailboxes, contacts, blossom servers, place photos, and deletions
+          // Only cache profiles, mailboxes, blossom servers, and place photos, and deletions
           const toCache = events.filter(
             (e) =>
               e.kind === 0 ||
-              e.kind === 3 ||
               e.kind === 5 ||
               e.kind === 10002 ||
               e.kind === 10063 ||
@@ -158,17 +149,20 @@ export default class NostrDataService extends Service {
     // instantly without waiting for relay connections.
     this._provenanceReady = this._hydrateProvenance();
 
-    // Centralized kind-5 deletion handling: the store routes kind-5 events to
-    // its DeleteManager (never into the event database), so listen to the
-    // deletion stream rather than a timeline. Drop provenance entries for
-    // deleted events so the trust map and IDB don't accumulate dead entries.
-    this._deletionsSub = this.store.deletes.deleted$.subscribe(
-      ({ pointer }) => {
-        if (isEventPointer(pointer)) {
-          this._removeProvenance(pointer.id);
+    // Centralized kind-5 deletion handling: when a deletion event enters the
+    // store, drop the provenance entries for the events it deletes so the
+    // trust map and IDB don't accumulate dead entries.
+    this._deletionsSub = this.store
+      .timeline([{ kinds: [5] }])
+      .subscribe((events) => {
+        for (const event of events) {
+          for (const tag of event.tags || []) {
+            if (tag[0] === 'e' && tag[1]) {
+              this._removeProvenance(tag[1]);
+            }
+          }
         }
-      }
-    );
+      });
 
     // Feed events from the relay pool into the event store
     this.nostrRelay.pool.relays$.subscribe(() => {
@@ -247,7 +241,6 @@ export default class NostrDataService extends Service {
   /**
    * Returns true if an event should be considered trusted:
    *   - authored by the connected user (own uploads), OR
-   *   - authored by a pubkey the user follows (kind 3 contacts), OR
    *   - seen on at least one trusted (moderated) relay.
    */
   isTrustedEvent(event) {
@@ -255,8 +248,6 @@ export default class NostrDataService extends Service {
     const myPubkey = this.nostrAuth?.pubkey;
     if (myPubkey && event.pubkey === myPubkey) return true;
 
-    if (this._contactPubkeys?.has(event.pubkey)) return true;
-
     const relays = this._eventRelays.get(event.id);
     if (!relays || relays.size === 0) return false;
     const trusted = this.trustedRelays;
@@ -552,54 +543,6 @@ export default class NostrDataService extends Service {
     );
   }
 
-  /**
-   * Hydrates the store with incoming zap receipts (kind 9735) where the user is
-   * the recipient (`#p` filter). Loads from the IDB cache first (instant), then
-   * fires a network request. Called by the `activity` service.
-   *
-   * @param {string} pubkey The user's Nostr pubkey
-   */
-  async loadIncomingZaps(pubkey) {
-    if (!pubkey) return;
-
-    const filters = [{ kinds: [9735], '#p': [pubkey] }];
-
-    console.debug('[nostr-data] Requesting incoming zap receipts from relays', {
-      filters,
-      relays: this.activeReadRelays,
-    });
-
-    if (this._incomingZapsNetworkSub) {
-      this._incomingZapsNetworkSub.unsubscribe();
-      this._incomingZapsNetworkSub = null;
-    }
-
-    // 1. Populate the store from the local Nostr IDB cache (instant)
-    try {
-      await this._cachePromise;
-
-      const cachedEvents = await this.cache.query(filters);
-
-      if (cachedEvents && cachedEvents.length > 0) {
-        for (const event of cachedEvents) {
-          this.store.add(event);
-        }
-      }
-    } catch (e) {
-      console.warn(
-        '[nostr-data] Failed to read incoming zap receipts from local Nostr IDB cache',
-        e
-      );
-    }
-
-    // 2. Request fresh events from the network in the background
-    this._incomingZapsNetworkSub = this._requestContentWithProvenance(
-      this.activeReadRelays,
-      filters,
-      '[nostr-data] Error fetching incoming zap receipts:'
-    );
-  }
-
   loadProfiles(pubkeys) {
     const newPubkeys = pubkeys.filter(
       (pk) => pk && !this._profileModelSubs.has(pk)
@@ -633,8 +576,6 @@ export default class NostrDataService extends Service {
     // Reset state
     this.profile = null;
     this.mailboxes = null;
-    this.contacts = null;
-    this._contactPubkeys = null;
     this.blossomServers = [];
 
     this._cleanupSubscriptions();
@@ -653,14 +594,6 @@ export default class NostrDataService extends Service {
         this.mailboxes = mailboxesData;
       });
 
-    this._contactsSub = this.store
-      .model(ContactsModel, pubkey)
-      .subscribe((contacts) => {
-        this.contacts = contacts;
-        this._contactPubkeys = new Set(contacts.map((c) => c.pubkey));
-        this._updatePlacePhotos();
-      });
-
     this._blossomSub = this.store
       .replaceable(10063, pubkey)
       .subscribe((event) => {
@@ -690,7 +623,7 @@ export default class NostrDataService extends Service {
       const cachedEvents = await this.cache.query([
         {
           authors: [pubkey],
-          kinds: [0, 3, 10002, 10063],
+          kinds: [0, 10002, 10063],
         },
       ]);
 
@@ -711,7 +644,7 @@ export default class NostrDataService extends Service {
       .request(profileRelays, [
         {
           authors: [pubkey],
-          kinds: [0, 3, 10002, 10063],
+          kinds: [0, 10002, 10063],
         },
       ])
       .subscribe({
@@ -873,11 +806,6 @@ export default class NostrDataService extends Service {
       this._mailboxesSub.unsubscribe();
       this._mailboxesSub = null;
     }
-    if (this._contactsSub) {
-      this._contactsSub.unsubscribe();
-      this._contactsSub = null;
-      this._contactPubkeys = null;
-    }
     if (this._blossomSub) {
       this._blossomSub.unsubscribe();
       this._blossomSub = null;
@@ -892,10 +820,6 @@ export default class NostrDataService extends Service {
     }
     this._cleanupZapReceiptSubs();
     this._clearZapRefreshTimer();
-    if (this._incomingZapsNetworkSub) {
-      this._incomingZapsNetworkSub.unsubscribe();
-      this._incomingZapsNetworkSub = null;
-    }
   }
 
   willDestroy() {
@@ -903,11 +827,6 @@ export default class NostrDataService extends Service {
     this._cleanupSubscriptions();
     this._clearProfileSubs();
 
-    if (this._deletionsSub) {
-      this._deletionsSub.unsubscribe();
-      this._deletionsSub = null;
-    }
-
     if (this._stopPersisting) {
       this._stopPersisting();
     }

app/services/osm.js

@@ -457,11 +457,11 @@ out center;
     // request using comma-separated IDs (max ~50 per request).
     //
     // Note: the multi-fetch endpoint returns ways/relations WITHOUT their child
-    // nodes, so normalized data may lack lat/lon and geometry.
-    // We only write complete results (those with lat/lon) to the general OSM
-    // cache. Nodes from the batch endpoint always include coordinates, so they
-    // are cached. Ways/relations without child node coordinates are not cached,
-    // preserving the full single-object endpoint for place detail navigation.
+    // nodes, so normalized data may lack lat/lon and geometry. We intentionally
+    // do NOT write these results to the general OSM cache — only the returned
+    // Map is used by the caller (the contributions service manages its own
+    // name cache). This prevents incomplete data from breaking place detail
+    // navigation, which needs the full single-object endpoint.
     const MAX_IDS_PER_REQUEST = 50;
 
     for (let i = 0; i < group.length; i += MAX_IDS_PER_REQUEST) {
@@ -488,21 +488,6 @@ out center;
           );
           if (normalized) {
             result.set(item.cacheKey, normalized);
-            // Warm the OSM cache for complete results (nodes always have
-            // lat/lon from the batch endpoint; ways/relations only when
-            // child nodes are included in the response).
-            if (
-              normalized.lat != null &&
-              normalized.lon != null &&
-              normalized.title
-            ) {
-              this._storeInMemoryAndLocalStorage(
-                item.cacheKey,
-                osmType,
-                item.osmId,
-                normalized
-              );
-            }
           }
         }
       } catch (e) {

app/services/place-name-resolver.js

@@ -1,196 +0,0 @@
-import Service, { service } from '@ember/service';
-
-const NAME_CACHE_STORE = 'place-name-cache';
-
-export default class PlaceNameResolverService extends Service {
-  @service storage;
-  @service osm;
-  @service localForage;
-
-  _pendingBatchPromise = null;
-  _lastBatchSignature = '';
-  _unresolvable = new Set();
-
-  /**
-   * Synchronous bookmark lookup. Returns the bookmark title if found, null otherwise.
-   *
-   * @param {string} osmId The OSM entity ID (e.g. "123456")
-   * @returns {string|null}
-   */
-  resolveBookmark(osmId) {
-    const bookmark = this.storage.findPlaceById(osmId);
-    return bookmark?.title || null;
-  }
-
-  /**
-   * Asynchronous name resolution from caches (localForage → OSM IDB cache).
-   * Returns the resolved name or null if not in cache.
-   *
-   * @param {object} entry Entry with placeIdentifier, osmType, osmId
-   * @returns {Promise<string|null>}
-   */
-  async _resolveCachedName(entry) {
-    // 1. Try the persistent name cache (IndexedDB, per-entry, survives sessions)
-    const cachedName = await this.localForage.get(
-      NAME_CACHE_STORE,
-      entry.placeIdentifier
-    );
-    if (cachedName) return cachedName;
-
-    // 2. Try OSM IndexedDB cache (from place detail visits)
-    const cached = await this.osm.getCachedOsmObject(
-      entry.osmType,
-      entry.osmId
-    );
-    return cached?.title || null;
-  }
-
-  /**
-   * Resolves names for entries in the background.
-   * Fire-and-forget: resolves from caches, then falls through to batch OSM fetch
-   * for anything still unresolved. Mutates entry.placeName and entry.placeNameLoading.
-   * The caller is responsible for triggering a re-render (e.g. `this.items = [...this.items]`).
-   *
-   * @param {Array} entries Entries with placeIdentifier, osmType, osmId, placeName, placeNameLoading
-   * @returns {Promise<void>}
-   */
-  async resolveInBackground(entries) {
-    const pending = entries.filter((e) => e.placeNameLoading);
-    if (pending.length === 0) {
-      this._maybeBatchFetchNames(entries);
-      return;
-    }
-
-    await Promise.all(
-      pending.map(async (entry) => {
-        const name = await this._resolveCachedName(entry);
-        if (name) {
-          entry.placeName = name;
-          entry.placeNameLoading = false;
-        }
-      })
-    );
-
-    // Trigger re-render via caller, then kick off the network batch for
-    // entries that are still loading.
-    this._maybeBatchFetchNames(entries);
-  }
-
-  _isUnresolvable(entry) {
-    return this._unresolvable.has(entry.placeIdentifier);
-  }
-
-  _maybeBatchFetchNames(entries) {
-    const unresolved = entries.filter(
-      (e) => e.placeNameLoading && !this._isUnresolvable(e)
-    );
-
-    // Apply fallbacks for items already marked unresolvable in this session
-    for (const entry of entries) {
-      if (entry.placeNameLoading && this._isUnresolvable(entry)) {
-        entry.placeName = this._fallbackName(entry);
-        entry.placeNameLoading = false;
-      }
-    }
-
-    if (unresolved.length === 0) {
-      return;
-    }
-
-    // Build a stable signature so we only fire one batch request per unique set
-    const signature = unresolved
-      .map((e) => e.placeIdentifier)
-      .sort()
-      .join('|');
-    if (signature === this._lastBatchSignature && this._pendingBatchPromise) {
-      return;
-    }
-    this._lastBatchSignature = signature;
-
-    this._pendingBatchPromise = this._batchResolveNames(unresolved)
-      .then((nameMap) => {
-        // Merge resolved names back into the entries
-        for (const entry of entries) {
-          if (!entry.placeNameLoading) continue;
-          if (nameMap.has(entry.placeIdentifier)) {
-            const name = nameMap.get(entry.placeIdentifier);
-            entry.placeName = name;
-            entry.placeNameLoading = false;
-          } else {
-            // Could not be resolved (deleted object, network error for this item).
-            // Mark as unresolvable for this session and use a fallback.
-            this._unresolvable.add(entry.placeIdentifier);
-            entry.placeName = this._fallbackName(entry);
-            entry.placeNameLoading = false;
-          }
-        }
-      })
-      .catch((e) => {
-        console.error('[place-name-resolver] Batch name resolution failed', e);
-        // On a total failure, mark all as unresolvable and apply fallbacks
-        for (const entry of entries) {
-          if (entry.placeNameLoading) {
-            this._unresolvable.add(entry.placeIdentifier);
-            entry.placeName = this._fallbackName(entry);
-            entry.placeNameLoading = false;
-          }
-        }
-      })
-      .finally(() => {
-        this._pendingBatchPromise = null;
-      });
-  }
-
-  _fallbackName(entry) {
-    return `OSM ${entry.osmType} ${entry.osmId}`;
-  }
-
-  async _batchResolveNames(entries) {
-    const nameMap = new Map();
-    const toFetch = [];
-
-    // Re-check cache in case it was populated between the trigger and now
-    for (const entry of entries) {
-      const cached = await this._resolveCachedName(entry);
-      if (cached) {
-        nameMap.set(entry.placeIdentifier, cached);
-      } else {
-        toFetch.push({ osmType: entry.osmType, osmId: entry.osmId });
-      }
-    }
-
-    if (toFetch.length === 0) return nameMap;
-
-    const places = await this.osm.fetchOsmObjectsBatch(toFetch);
-
-    // Persist each newly-resolved name to the IndexedDB name cache as its own
-    // entry (per-placeIdentifier key) so we don't re-fetch next session.
-    const writePromises = [];
-    for (const entry of entries) {
-      if (nameMap.has(entry.placeIdentifier)) continue;
-      const cacheKey = `${entry.osmType}:${entry.osmId}`;
-      const place = places.get(cacheKey);
-      if (place?.title) {
-        nameMap.set(entry.placeIdentifier, place.title);
-        writePromises.push(
-          this.localForage.set(
-            NAME_CACHE_STORE,
-            entry.placeIdentifier,
-            place.title
-          )
-        );
-      }
-    }
-    await Promise.all(writePromises);
-    return nameMap;
-  }
-
-  /**
-   * Resets per-session state. Called when the owning service stops.
-   */
-  reset() {
-    this._unresolvable.clear();
-    this._lastBatchSignature = '';
-    this._pendingBatchPromise = null;
-  }
-}

app/services/storage.js

@@ -61,7 +61,6 @@ export default class StorageService extends Service {
     this.rs.on('connected', () => {
       this.connected = true;
       this.userAddress = this.rs.remote.userAddress;
-      this.initialSyncDone = false;
 
       if (this.isNewConnection) {
         this.toast.show('Remote storage connected', 3000);
@@ -72,7 +71,6 @@ export default class StorageService extends Service {
     });
 
     this.rs.on('not-connected', () => {
-      this.initialSyncDone = true;
       this.loadLists();
     });
 

app/styles/app.css

@@ -728,6 +728,26 @@ body {
   animation: tooltip-fade-in 0.15s ease;
 }
 
+.tooltip::after {
+  content: '';
+  position: absolute;
+  width: 0;
+  height: 0;
+  border: 6px solid transparent;
+  left: var(--arrow-left, 50%);
+  transform: translateX(-50%);
+}
+
+.tooltip[data-placement='top']::after {
+  top: 100%;
+  border-top-color: var(--body-text-color);
+}
+
+.tooltip[data-placement='bottom']::after {
+  bottom: 100%;
+  border-bottom-color: var(--body-text-color);
+}
+
 @keyframes tooltip-fade-in {
   from {
     opacity: 0;
@@ -2660,157 +2680,3 @@ button.create-place {
     color: var(--body-text-color);
   }
 }
-
-/* Activity Timeline — zap activity list rendered in the sidebar */
-.activity-list {
-  list-style: none;
-  padding: 0;
-  margin: -1rem -1rem 0;
-}
-
-.activity-zap-item {
-  width: 100%;
-  text-align: left;
-  border: none;
-  border-bottom: 1px solid var(--divider-color);
-  background: var(--primary-background-color);
-  color: var(--body-text-color);
-  padding: 0.75rem 1rem;
-  cursor: pointer;
-  transition: background 0.2s;
-  font-family: inherit;
-  display: flex;
-  flex-direction: column;
-  gap: 4px;
-
-  &:hover {
-    background: var(--hover-bg);
-  }
-
-  & .zap-sender-avatar {
-    flex-shrink: 0;
-    width: 32px;
-    height: 32px;
-    border-radius: 50%;
-    object-fit: cover;
-    background: #f0f0f0;
-  }
-
-  & .zap-sender-avatar-placeholder {
-    flex-shrink: 0;
-    width: 32px;
-    height: 32px;
-    border-radius: 50%;
-    background: #e0e0e0;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    color: #999;
-  }
-
-  & .zap-header {
-    display: flex;
-    align-items: baseline;
-    justify-content: space-between;
-    gap: 8px;
-  }
-
-  & .zap-sender-line {
-    min-width: 0;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    font-size: 0.95rem;
-
-    & .zap-sender-name {
-      font-weight: bold;
-    }
-
-    & .zap-action {
-      color: #666;
-      font-weight: normal;
-    }
-  }
-
-  & .zap-amount {
-    flex-shrink: 0;
-    font-weight: bold;
-    font-size: 0.95rem;
-    color: var(--body-text-color);
-    white-space: nowrap;
-  }
-
-  & .zap-message {
-    color: var(--body-text-color);
-    font-size: 0.85rem;
-    font-style: italic;
-    position: relative;
-    background: var(--secondary-background-color);
-    border-radius: 8px;
-    padding: 0.5rem 0.75rem;
-    margin-top: 4px;
-
-    &::before {
-      content: '';
-      position: absolute;
-      top: -5px;
-      left: 11px;
-      width: 10px;
-      height: 10px;
-      background: var(--secondary-background-color);
-      transform: rotate(45deg);
-    }
-  }
-
-  & .zap-context {
-    display: flex;
-    align-items: center;
-    gap: 6px;
-    color: #999;
-    font-size: 0.8rem;
-    margin-top: 8px;
-
-    & .zap-context-images {
-      display: flex;
-      align-items: center;
-      gap: 0.5rem;
-    }
-
-    & .zap-context-thumb {
-      flex-shrink: 0;
-      width: 32px;
-      height: 32px;
-      border-radius: 4px;
-      overflow: hidden;
-      background: #f0f0f0;
-
-      & img {
-        width: 100%;
-        height: 100%;
-        object-fit: cover;
-        display: block;
-      }
-    }
-
-    & .zap-context-text {
-      display: flex;
-      align-items: baseline;
-      gap: 6px;
-      flex: 1 1 auto;
-      min-width: 0;
-
-      & .zap-place-name {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        flex: 1 1 auto;
-        min-width: 0;
-      }
-
-      & .zap-date {
-        flex-shrink: 0;
-        white-space: nowrap;
-      }
-    }
-  }
-}

app/templates/activity.gjs

@@ -1,16 +0,0 @@
-import ActivityTimeline from '#components/activity-timeline';
-
-<template>
-  {{#if @controller.mapUi.isSidebarVisible}}
-    <ActivityTimeline
-      @items={{@controller.items}}
-      @isLoading={{@controller.loadTask.isRunning}}
-      @isConnected={{@controller.isConnected}}
-      @scrollTop={{@controller.scrollTop}}
-      @onSelect={{@controller.selectItem}}
-      @onBack={{@controller.backToMenu}}
-      @onClose={{@controller.close}}
-      @onNostrConnected={{@controller.onNostrConnected}}
-    />
-  {{/if}}
-</template>

app/templates/application.gjs

@@ -23,7 +23,6 @@ export default class ApplicationComponent extends Component {
         name === 'search' ||
         name === 'menu' ||
         name === 'contributions' ||
-        name === 'activity' ||
         name.startsWith('lists'))
     );
   }
@@ -52,7 +51,6 @@ export default class ApplicationComponent extends Component {
       name === 'place' ||
       name === 'menu' ||
       name === 'contributions' ||
-      name === 'activity' ||
       name.startsWith('lists')
     ) {
       this.mapUi.clearSelection();
@@ -60,7 +58,6 @@ export default class ApplicationComponent extends Component {
       if (
         name === 'menu' ||
         name === 'contributions' ||
-        name === 'activity' ||
         name.startsWith('lists')
       ) {
         this.router.transitionTo('index');

app/utils/activity.js

@@ -1,142 +0,0 @@
-/**
- * Utilities for parsing social activity events into timeline entries.
- *
- * An `ActivityEntry` represents a single social interaction related to the
- * user's content (e.g. a zap received on one of their photos). Entries are
- * ordered newest-first.
- */
-
-import { tracked } from '@glimmer/tracking';
-import {
-  getZapSender,
-  getZapRecipient,
-  getZapPayment,
-  getZapEventPointer,
-  getZapRequest,
-} from 'applesauce-common/helpers';
-import { parsePhotoFromEvent } from './contributions';
-
-/**
- * A single activity timeline entry.
- *
- * `senderName`, `senderAvatar`, `senderProfileLoading`, `placeName`,
- * and `placeNameLoading` are tracked so the row re-renders when the sender's
- * profile or place name is resolved asynchronously.
- */
-export class ActivityEntry {
-  type = 'zap';
-  photoEventId;
-  photo;
-  placeIdentifier;
-  osmType;
-  osmId;
-  senderPubkey;
-  amountSats;
-  message;
-  createdAt;
-  @tracked senderName = null;
-  @tracked senderAvatar = null;
-  @tracked senderProfileLoading = true;
-  @tracked placeName = null;
-  @tracked placeNameLoading = true;
-
-  constructor({
-    photoEventId,
-    photo,
-    placeIdentifier,
-    senderPubkey,
-    amountSats,
-    message,
-    createdAt,
-  }) {
-    this.photoEventId = photoEventId;
-    this.photo = photo;
-    this.placeIdentifier = placeIdentifier;
-    this.senderPubkey = senderPubkey;
-    this.amountSats = amountSats;
-    this.message = message;
-    this.createdAt = createdAt;
-  }
-}
-
-// TODO: Place-name resolution. Add a shared place-name-resolver util co-used by
-// services/contributions.js and this service. Each ActivityEntry should get
-// @tracked placeName / placeNameLoading, resolved via the existing cascade
-// (bookmarks → localForage cache → osm cache → batch OSM fetch). Extract from
-// contributions.js rather than duplicating.
-
-/**
- * Parses a kind 9735 (Zap Receipt) event into an `ActivityEntry`, given the
- * user's pubkey (to confirm they are the recipient).
- *
- * Returns `null` if the receipt is malformed, not directed at the user, or
- * does not reference a zapped event (kind 360 photo).
- *
- * @param {object} receipt A NIP-57 zap receipt event (kind 9735)
- * @param {string} userPubkey The logged-in user's pubkey
- * @returns {ActivityEntry|null}
- */
-export function parseZapReceipt(receipt, userPubkey) {
-  if (!receipt || receipt.kind !== 9735) return null;
-
-  const recipient = getZapRecipient(receipt);
-  if (!recipient || recipient !== userPubkey) return null;
-
-  const sender = getZapSender(receipt);
-  if (!sender) return null;
-
-  const payment = getZapPayment(receipt);
-  if (!payment || !payment.amount) return null;
-  const amountSats = Math.round(payment.amount / 1000);
-
-  const eventPointer = getZapEventPointer(receipt);
-  if (!eventPointer || !eventPointer.id) return null;
-
-  const zapRequest = getZapRequest(receipt);
-  const message = zapRequest?.content || null;
-
-  return new ActivityEntry({
-    photoEventId: eventPointer.id,
-    photo: null,
-    placeIdentifier: null,
-    senderPubkey: sender,
-    amountSats,
-    message,
-    createdAt: receipt.created_at,
-  });
-}
-
-/**
- * Enriches an `ActivityEntry` with photo and place data from the zapped kind
- * 360 event, if it is available in the store.
- *
- * Returns `true` if the entry was enriched (i.e. the zapped event was found
- * and is a kind 360 authored by the user), or `false` if the entry should be
- * discarded (the zapped event is not one of the user's photos).
- *
- * @param {ActivityEntry} entry
- * @param {object} store The applesauce EventStore to look up the zapped event
- * @param {string} userPubkey The logged-in user's pubkey
- * @returns {boolean}
- */
-export function enrichWithPhoto(entry, store, userPubkey) {
-  const event = store.getEvent?.(entry.photoEventId);
-  if (!event || event.kind !== 360 || event.pubkey !== userPubkey) {
-    return false;
-  }
-
-  const photo = parsePhotoFromEvent(event);
-  if (!photo) return false;
-
-  entry.photo = photo;
-  entry.placeIdentifier = photo.placeIdentifier || null;
-
-  // Parse osmType and osmId from placeIdentifier (e.g. "osm:node:123" → "node", "123")
-  if (entry.placeIdentifier) {
-    const [, osmType, osmId] = entry.placeIdentifier.split(':');
-    entry.osmType = osmType;
-    entry.osmId = osmId;
-  }
-
-  return true;
-}

app/utils/contributions.js

@@ -54,7 +54,7 @@ export class ContributionEntry {
  * @param {object} event A NIP-360 (kind 360) Nostr event
  * @returns {object|null} A photo object, or null if no usable `imeta` was found
  */
-export function parsePhotoFromEvent(event) {
+function parsePhotoFromEvent(event) {
   const tags = event.tags || [];
 
   const eventTags = tags

app/utils/format-text.js

@@ -26,10 +26,9 @@ export function formatRelativeDate(timestamp) {
   if (diffMin < 60) return `${diffMin} min ago`;
   if (diffHr < 24) return `${diffHr} hr ago`;
   if (diffDay < 7) return `${diffDay} day${diffDay === 1 ? '' : 's'} ago`;
-  const isCurrentYear = date.getFullYear() === now.getFullYear();
   return date.toLocaleDateString(undefined, {
+    year: 'numeric',
     month: 'short',
     day: 'numeric',
-    ...(isCurrentYear ? {} : { year: 'numeric' }),
   });
 }

app/utils/icons.js

@@ -39,7 +39,6 @@ import target from 'feather-icons/dist/icons/target.svg?raw';
 import trash2 from 'feather-icons/dist/icons/trash-2.svg?raw';
 import uploadCloud from 'feather-icons/dist/icons/upload-cloud.svg?raw';
 import user from 'feather-icons/dist/icons/user.svg?raw';
-import userCheck from 'feather-icons/dist/icons/user-check.svg?raw';
 import x from 'feather-icons/dist/icons/x.svg?raw';
 import check from 'feather-icons/dist/icons/check.svg?raw';
 import alertCircle from 'feather-icons/dist/icons/alert-circle.svg?raw';
@@ -282,7 +281,6 @@ const ICONS = {
   'upload-cloud': uploadCloud,
   'tree-and-bench-with-backrest': treeAndBenchWithBackrest,
   user,
-  'user-check': userCheck,
   'village-buildings': villageBuildings,
   'wall-hanging-with-mountains-and-sun': wallHangingWithMountainsAndSun,
   'womens-and-mens-restroom-symbol': womensAndMensRestroomSymbol,

index.html

@@ -6,9 +6,6 @@
     <meta name="description" content="Unhosted maps app that respects your privacy and choices.">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    <!-- Fediverse account -->
-    <link rel="me" href="https://kosmos.social/@marco">
-
     <!-- Open Graph -->
     <meta property="og:title" content="Marco">
     <meta property="og:description" content="Unhosted maps app that respects your privacy and choices.">

package.json

@@ -1,6 +1,6 @@
 {
   "name": "marco",
-  "version": "1.32.0",
+  "version": "1.30.1",
   "private": true,
   "description": "Unhosted maps app",
   "repository": {

release/assets/main-CEhcTO-R.css

@@ -1 +0,0 @@
-:root{--body-text-color:#333;--primary-background-color:#fff;--hover-bg:#f8f9fa;--divider-color:#eee;--sidebar-width:350px;--link-color:#2a7fff;--link-color-visited:#6a4fbf;--marker-color-primary:#ea4335;--marker-color-dark:#b31412;--danger-color:var(--marker-color-primary);--danger-color-dark:var(--marker-color-dark);--default-list-color:#fc3;--secondary-text-color:#898989;--border-color:#d8d8d8;--success-color:#2e7d32;--secondary-background-color:#f0f0f0}html,body{overscroll-behavior:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;-webkit-text-size-adjust:100%;-webkit-tap-highlight-color:transparent;height:100%}button{-webkit-tap-highlight-color:transparent}body{color:var(--body-text-color);margin:0;font-family:Noto Sans,sans-serif;font-size:16px;font-weight:400}#root,#ember-testing{height:100%}.map-container{-webkit-tap-highlight-color:transparent;background:#f8f9fa;outline:none;position:absolute;inset:0}#rs-widget-container{z-index:4000;display:none;position:absolute;top:60px;right:10px}#rs-widget-container.visible{display:block}.rs-backdrop{z-index:3999;position:fixed;inset:0}.app-header{z-index:3000;pointer-events:none;grid-template-columns:1fr auto 1fr;grid-template-areas:"search chips user";align-items:center;gap:1rem;height:60px;padding:.5rem 1rem;display:grid;position:absolute;top:0;left:0;right:0}@media (width<=768px){.app-header{grid-template-columns:1fr auto;grid-template-areas:"search user""chips chips";row-gap:8px;height:auto;padding:.5rem .5rem 0}}.header-left,.header-right,.header-center{pointer-events:auto}.header-left{grid-area:search;justify-self:start;align-items:center;width:100%;display:flex}@media (width>768px){.header-left{min-width:300px;max-width:350px}}.header-right{grid-area:user;justify-self:end}.header-center{grid-area:chips;justify-content:center;min-width:0;display:flex}@media (width>768px){.header-center .category-chips-scroll{width:auto;max-width:100%}}@media (width<=768px){.header-center{justify-content:start;width:100%;overflow:hidden}.header-center.searching{display:none}}.btn-press{transition:transform .1s}.btn-press:active{transform:scale(.95)}.user-btn{cursor:pointer;background:0 0;border:none;justify-content:center;align-items:center;padding:0;display:flex}.user-avatar-placeholder{background:#2a3743;border-radius:50%;flex-shrink:0;justify-content:center;align-items:center;width:40px;height:40px;display:flex}.user-avatar{object-fit:cover;border-radius:50%;flex-shrink:0;width:40px;height:40px;display:block}.photo-preview-img{max-width:100%;height:auto}.dropzone{text-align:center;cursor:pointer;aspect-ratio:4/3;background-color:#ffffff05;border:2px dashed #ccc;border-radius:8px;margin:1.5rem 0 1rem;transition:all .2s}.dropzone.is-dragging{background-color:#61afef0d;border-color:#61afef}.dropzone-label{cursor:pointer;color:#898989;flex-direction:column;justify-content:center;align-items:center;gap:1rem;width:100%;height:100%;display:flex}.dropzone-label p{margin:0}.file-input-hidden{display:none}.photo-upload-item{aspect-ratio:4/3;background:#1e262e;border-radius:6px;width:100%;margin-bottom:1.25rem;position:relative;overflow:hidden}.photo-upload-item img{object-fit:contain;z-index:1;width:100%;height:100%;display:block;position:absolute;top:0;left:0}.photo-upload-item .overlay,.photo-upload-item .btn-remove-photo{z-index:2}.photo-upload-item .overlay{background:#0009;flex-direction:column;justify-content:center;align-items:center;display:flex;position:absolute;inset:0}.upload-status-text{color:#fff;text-shadow:0 1px 3px #000c;text-align:center;margin-top:1rem;padding:0 1rem;font-size:.9rem}.photo-upload-item .error-overlay{cursor:pointer;background:#e06c75cc;border:none;width:100%;margin:0;padding:0}.photo-upload-item .btn-remove-photo{cursor:pointer;color:#fff;background:#000000b3;border:none;border-radius:50%;justify-content:center;align-items:center;width:24px;height:24px;padding:0;display:flex;position:absolute;top:4px;right:4px}.photo-upload-item .btn-remove-photo:hover{background:var(--danger-color)}.spin-animation{animation:1s linear infinite spin}@keyframes spin{0%{transform:rotate(0)}to{transform:rotate(360deg)}}.btn-publish{width:100%}.user-menu-container{position:relative}.user-menu-popover{z-index:3001;background:#fff;border-radius:8px;width:280px;margin-top:10px;padding:1rem;position:absolute;top:100%;right:0;box-shadow:0 4px 12px #00000026}.menu-backdrop{z-index:3000;position:fixed;inset:0}.account-list{margin:0;padding:0;list-style:none}.account-item{border-bottom:1px solid var(--divider-color);flex-direction:column;padding:1rem 0;display:flex}.account-item:last-child{border-bottom:none;padding-bottom:0}.account-item:first-child{padding-top:0}.account-header{justify-content:space-between;align-items:center;display:flex}.account-status{color:#898989;white-space:nowrap;text-overflow:ellipsis;margin-top:.35rem;margin-left:calc(18px + .75rem);font-size:.85rem;overflow:hidden}.account-status strong{font-weight:600}.account-item.disaLine truncated

release/assets/main-DWxZH-9E.css

@@ -0,0 +1 @@
+:root{--body-text-color:#333;--primary-background-color:#fff;--hover-bg:#f8f9fa;--divider-color:#eee;--sidebar-width:350px;--link-color:#2a7fff;--link-color-visited:#6a4fbf;--marker-color-primary:#ea4335;--marker-color-dark:#b31412;--danger-color:var(--marker-color-primary);--danger-color-dark:var(--marker-color-dark);--default-list-color:#fc3}html,body{overscroll-behavior:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;-webkit-text-size-adjust:100%;-webkit-tap-highlight-color:transparent;height:100%}button{-webkit-tap-highlight-color:transparent}body{color:var(--body-text-color);margin:0;font-family:Noto Sans,sans-serif;font-size:16px;font-weight:400}#root,#ember-testing{height:100%}.map-container{-webkit-tap-highlight-color:transparent;background:#f8f9fa;outline:none;position:absolute;inset:0}#rs-widget-container{z-index:4000;display:none;position:absolute;top:60px;right:10px}#rs-widget-container.visible{display:block}.rs-backdrop{z-index:3999;position:fixed;inset:0}.app-header{z-index:3000;pointer-events:none;grid-template-columns:1fr auto 1fr;grid-template-areas:"search chips user";align-items:center;gap:1rem;height:60px;padding:.5rem 1rem;display:grid;position:absolute;top:0;left:0;right:0}@media (width<=768px){.app-header{grid-template-columns:1fr auto;grid-template-areas:"search user""chips chips";row-gap:8px;height:auto;padding:.5rem .5rem 0}}.header-left,.header-right,.header-center{pointer-events:auto}.header-left{grid-area:search;justify-self:start;align-items:center;width:100%;display:flex}@media (width>768px){.header-left{min-width:300px;max-width:350px}}.header-right{grid-area:user;justify-self:end}.header-center{grid-area:chips;justify-content:center;min-width:0;display:flex}@media (width>768px){.header-center .category-chips-scroll{width:auto;max-width:100%}}@media (width<=768px){.header-center{justify-content:start;width:100%;overflow:hidden}.header-center.searching{display:none}}.btn-press{transition:transform .1s}.btn-press:active{transform:scale(.95)}.user-btn{cursor:pointer;background:0 0;border:none;justify-content:center;align-items:center;padding:0;display:flex}.user-avatar-placeholder{background:#2a3743;border-radius:50%;flex-shrink:0;justify-content:center;align-items:center;width:40px;height:40px;display:flex}.user-avatar{object-fit:cover;border-radius:50%;flex-shrink:0;width:40px;height:40px;display:block}.photo-preview-img{max-width:100%;height:auto}.dropzone{text-align:center;cursor:pointer;aspect-ratio:4/3;background-color:#ffffff05;border:2px dashed #ccc;border-radius:8px;margin:1.5rem 0 1rem;transition:all .2s}.dropzone.is-dragging{background-color:#61afef0d;border-color:#61afef}.dropzone-label{cursor:pointer;color:#898989;flex-direction:column;justify-content:center;align-items:center;gap:1rem;width:100%;height:100%;display:flex}.dropzone-label p{margin:0}.file-input-hidden{display:none}.photo-upload-item{aspect-ratio:4/3;background:#1e262e;border-radius:6px;width:100%;margin-bottom:1.25rem;position:relative;overflow:hidden}.photo-upload-item img{object-fit:contain;z-index:1;width:100%;height:100%;display:block;position:absolute;top:0;left:0}.photo-upload-item .overlay,.photo-upload-item .btn-remove-photo{z-index:2}.photo-upload-item .overlay{background:#0009;flex-direction:column;justify-content:center;align-items:center;display:flex;position:absolute;inset:0}.upload-status-text{color:#fff;text-shadow:0 1px 3px #000c;text-align:center;margin-top:1rem;padding:0 1rem;font-size:.9rem}.photo-upload-item .error-overlay{cursor:pointer;background:#e06c75cc;border:none;width:100%;margin:0;padding:0}.photo-upload-item .btn-remove-photo{cursor:pointer;color:#fff;background:#000000b3;border:none;border-radius:50%;justify-content:center;align-items:center;width:24px;height:24px;padding:0;display:flex;position:absolute;top:4px;right:4px}.photo-upload-item .btn-remove-photo:hover{background:var(--danger-color)}.spin-animation{animation:1s linear infinite spin}@keyframes spin{0%{transform:rotate(0)}to{transform:rotate(360deg)}}.btn-publish{width:100%}.user-menu-container{position:relative}.user-menu-popover{z-index:3001;background:#fff;border-radius:8px;width:280px;margin-top:10px;padding:1rem;position:absolute;top:100%;right:0;box-shadow:0 4px 12px #00000026}.menu-backdrop{z-index:3000;position:fixed;inset:0}.account-list{margin:0;padding:0;list-style:none}.account-item{border-bottom:1px solid var(--divider-color);flex-direction:column;padding:1rem 0;display:flex}.account-item:last-child{border-bottom:none;padding-bottom:0}.account-item:first-child{padding-top:0}.account-header{justify-content:space-between;align-items:center;display:flex}.account-status{color:#898989;white-space:nowrap;text-overflow:ellipsis;margin-top:.35rem;margin-left:calc(18px + .75rem);font-size:.85rem;overflow:hidden}.account-status strong{font-weight:600}.account-item.disabled{opacity:.5;pointer-events:none}.account-info{align-items:center;gap:.75rem;display:flex}.btn-text{cursor:pointLine truncated

release/assets/main-DeiUGvCJ.js

@@ -0,0 +1 @@
+var t=Object.create,e=Object.defineProperty,n=Object.getOwnPropertyDescriptor,r=Object.getOwnPropertyNames,i=Object.getPrototypeOf,s=Object.prototype.hasOwnProperty,o=(t,e)=>()=>(e||(t((e={exports:{}}).exports,e),t=null),e.exports),a=(t,n)=>{let r={};for(var i in t)e(r,i,{get:t[i],enumerable:!0});return n||e(r,Symbol.toStringTag,{value:"Module"}),r},l=(t,i,o,a)=>{if(i&&"object"==typeof i||"function"==typeof i)for(var l,c=r(i),u=0,h=c.length;u<h;u++)l=c[u],s.call(t,l)||l===o||e(t,l,{get:(t=>i[t]).bind(null,l),enumerable:!(a=n(i,l))||a.enumerable});return t},c=(n,r,o)=>(o=null!=n?t(i(n)):{},l(!r&&n&&n.__esModule&&s.call(n,"default")?o:e(o,"default",{value:n,enumerable:!0}),n)),u=(t=>"undefined"!=typeof require?require:"undefined"!=typeof Proxy?new Proxy(t,{get:(t,e)=>("undefined"!=typeof require?require:t)[e]}):t)(function(t){if("undefined"!=typeof require)return require.apply(this,arguments);throw Error('Calling `require` for "'+t+"\" in an environment that doesn't expose the `require` function. See https://rolldown.rs/in-depth/bundling-cjs#require-external-modules for more details.")});!function(){const t=document.createElement("link").relList;if(!(t&&t.supports&&t.supports("modulepreload"))){for(const t of document.querySelectorAll('link[rel="modulepreload"]'))e(t);new MutationObserver(t=>{for(const n of t)if("childList"===n.type)for(const t of n.addedNodes)"LINK"===t.tagName&&"modulepreload"===t.rel&&e(t)}).observe(document,{childList:!0,subtree:!0})}function e(t){if(t.ep)return;t.ep=!0;const e=function(t){const e={};return t.integrity&&(e.integrity=t.integrity),t.referrerPolicy&&(e.referrerPolicy=t.referrerPolicy),"use-credentials"===t.crossOrigin?e.credentials="include":"anonymous"===t.crossOrigin?e.credentials="omit":e.credentials="same-origin",e}(t);fetch(t.href,e)}}();var h,d=Object.prototype,p=Symbol("undefined"),f=function(t){return t[t.ADD=0]="ADD",t[t.ONCE=1]="ONCE",t[t.REMOVE=2]="REMOVE",t}(f||{}),g=1,m=class{_descriptors;_mixins;_isInit;_lazyChains;_values;_revisions;source;proto;_parent;_listeners;_listenersVersion=1;_inheritedEnd=-1;_flattenedVersion=0;constructor(t){this._parent=void 0,this._descriptors=void 0,this._mixins=void 0,this._lazyChains=void 0,this._values=void 0,this._revisions=void 0,this._isInit=!1,this.source=t,this.proto=void 0===t.constructor?void 0:t.constructor.prototype,this._listeners=void 0}get parent(){let t=this._parent;if(void 0===t){let e=y(this.source);this._parent=t=null===e||e===d?null:_(e)}return t}setInitializing(){this._isInit=!0}unsetInitializing(){this._isInit=!1}isInitializing(){return this._isInit}isPrototypeMeta(t){return this.proto===this.source&&this.source===t}_getOrCreateOwnMap(t){return this[t]||(this[t]=Object.create(null))}_getOrCreateOwnSet(t){return this[t]||(this[t]=new Set)}_findInheritedMap(t,e){let n=this;for(;null!==n;){let r=n[t];if(void 0!==r){let t=r.get(e);if(void 0!==t)return t}n=n.parent}}_hasInInheritedSet(t,e){let n=this;for(;null!==n;){let r=n[t];if(void 0!==r&&r.has(e))return!0;n=n.parent}return!1}valueFor(t){let e=this._values;return void 0!==e?e[t]:void 0}setValueFor(t,e){this._getOrCreateOwnMap("_values")[t]=e}revisionFor(t){let e=this._revisions;return void 0!==e?e[t]:void 0}setRevisionFor(t,e){this._getOrCreateOwnMap("_revisions")[t]=e}writableLazyChainsFor(t){let e=this._getOrCreateOwnMap("_lazyChains"),n=e[t];return void 0===n&&(n=e[t]=[]),n}readableLazyChainsFor(t){let e=this._lazyChains;if(void 0!==e)return e[t]}addMixin(t){this._getOrCreateOwnSet("_mixins").add(t)}hasMixin(t){return this._hasInInheritedSet("_mixins",t)}forEachMixins(t){let e,n=this;for(;null!==n;){let r=n._mixins;void 0!==r&&(e=void 0===e?new Set:e,r.forEach(n=>{e.has(n)||(e.add(n),t(n))})),n=n.parent}}writeDescriptors(t,e){(this._descriptors||(this._descriptors=new Map)).set(t,e)}peekDescriptors(t){let e=this._findInheritedMap("_descriptors",t);return e===p?void 0:e}removeDescriptors(t){this.writeDescriptors(t,p)}forEachDescriptors(t){let e,n=this;for(;null!==n;){let r=n._descriptors;void 0!==r&&(e=void 0===e?new Set:e,r.forEach((n,r)=>{e.has(r)||(e.add(r),n!==p&&t(r,n))})),n=n.parent}}addToListeners(t,e,n,r,i){this.pushListener(t,e,n,r?f.ONCE:f.ADD,i)}removeFromListeners(t,e,n){this.pushListener(t,e,n,f.REMOVE)}pushListener(t,e,n,r,i=!1){let s=this.writableListeners(),o=x(s,t,e,n);if(-1!==o&&o<this._inheritedEnd&&(s.splice(o,1),this._inheritedEnd--,o=-1),-1===o)s.push({event:t,target:e,method:n,kind:r,sync:i});else{let t=s[o];r===f.REMOVE&&t.kind!==f.REMOVE?s.splice(o,1):(t.kind=r,t.sync=i)}}writableListeners(){return this._flattenedVersion!==g||this.source!==this.proto&&-1!==this._inheritedEnd||g++,-1===this._inheritedEnd&&(this._inheritedEnd=0,this._listeners=[]),this._listeners}flattenedListeners(){if(this._flattenedVersion<g){let t=this.parent;if(null!==t){let e=t.flattenedListeners();if(void 0!==e)if(void 0===this._listeners)this._listeners=e;else{let t=this._listeners;this._inheritedEnd>0&&(t.splice(0,this._inheritedEnd),this._inheritedEnd=0);for(Line truncated

release/assets/main-Znuwpp9Y.js

@@ -1 +0,0 @@
-var t=Object.create,e=Object.defineProperty,n=Object.getOwnPropertyDescriptor,r=Object.getOwnPropertyNames,i=Object.getPrototypeOf,s=Object.prototype.hasOwnProperty,o=(t,e)=>()=>(e||(t((e={exports:{}}).exports,e),t=null),e.exports),a=(t,n)=>{let r={};for(var i in t)e(r,i,{get:t[i],enumerable:!0});return n||e(r,Symbol.toStringTag,{value:"Module"}),r},l=(t,i,o,a)=>{if(i&&"object"==typeof i||"function"==typeof i)for(var l,c=r(i),u=0,h=c.length;u<h;u++)l=c[u],s.call(t,l)||l===o||e(t,l,{get:(t=>i[t]).bind(null,l),enumerable:!(a=n(i,l))||a.enumerable});return t},c=(n,r,o)=>(o=null!=n?t(i(n)):{},l(!r&&n&&n.__esModule&&s.call(n,"default")?o:e(o,"default",{value:n,enumerable:!0}),n)),u=(t=>"undefined"!=typeof require?require:"undefined"!=typeof Proxy?new Proxy(t,{get:(t,e)=>("undefined"!=typeof require?require:t)[e]}):t)(function(t){if("undefined"!=typeof require)return require.apply(this,arguments);throw Error('Calling `require` for "'+t+"\" in an environment that doesn't expose the `require` function. See https://rolldown.rs/in-depth/bundling-cjs#require-external-modules for more details.")});!function(){const t=document.createElement("link").relList;if(!(t&&t.supports&&t.supports("modulepreload"))){for(const t of document.querySelectorAll('link[rel="modulepreload"]'))e(t);new MutationObserver(t=>{for(const n of t)if("childList"===n.type)for(const t of n.addedNodes)"LINK"===t.tagName&&"modulepreload"===t.rel&&e(t)}).observe(document,{childList:!0,subtree:!0})}function e(t){if(t.ep)return;t.ep=!0;const e=function(t){const e={};return t.integrity&&(e.integrity=t.integrity),t.referrerPolicy&&(e.referrerPolicy=t.referrerPolicy),"use-credentials"===t.crossOrigin?e.credentials="include":"anonymous"===t.crossOrigin?e.credentials="omit":e.credentials="same-origin",e}(t);fetch(t.href,e)}}();var h,d=Object.prototype,p=Symbol("undefined"),f=function(t){return t[t.ADD=0]="ADD",t[t.ONCE=1]="ONCE",t[t.REMOVE=2]="REMOVE",t}(f||{}),g=1,m=class{_descriptors;_mixins;_isInit;_lazyChains;_values;_revisions;source;proto;_parent;_listeners;_listenersVersion=1;_inheritedEnd=-1;_flattenedVersion=0;constructor(t){this._parent=void 0,this._descriptors=void 0,this._mixins=void 0,this._lazyChains=void 0,this._values=void 0,this._revisions=void 0,this._isInit=!1,this.source=t,this.proto=void 0===t.constructor?void 0:t.constructor.prototype,this._listeners=void 0}get parent(){let t=this._parent;if(void 0===t){let e=y(this.source);this._parent=t=null===e||e===d?null:_(e)}return t}setInitializing(){this._isInit=!0}unsetInitializing(){this._isInit=!1}isInitializing(){return this._isInit}isPrototypeMeta(t){return this.proto===this.source&&this.source===t}_getOrCreateOwnMap(t){return this[t]||(this[t]=Object.create(null))}_getOrCreateOwnSet(t){return this[t]||(this[t]=new Set)}_findInheritedMap(t,e){let n=this;for(;null!==n;){let r=n[t];if(void 0!==r){let t=r.get(e);if(void 0!==t)return t}n=n.parent}}_hasInInheritedSet(t,e){let n=this;for(;null!==n;){let r=n[t];if(void 0!==r&&r.has(e))return!0;n=n.parent}return!1}valueFor(t){let e=this._values;return void 0!==e?e[t]:void 0}setValueFor(t,e){this._getOrCreateOwnMap("_values")[t]=e}revisionFor(t){let e=this._revisions;return void 0!==e?e[t]:void 0}setRevisionFor(t,e){this._getOrCreateOwnMap("_revisions")[t]=e}writableLazyChainsFor(t){let e=this._getOrCreateOwnMap("_lazyChains"),n=e[t];return void 0===n&&(n=e[t]=[]),n}readableLazyChainsFor(t){let e=this._lazyChains;if(void 0!==e)return e[t]}addMixin(t){this._getOrCreateOwnSet("_mixins").add(t)}hasMixin(t){return this._hasInInheritedSet("_mixins",t)}forEachMixins(t){let e,n=this;for(;null!==n;){let r=n._mixins;void 0!==r&&(e=void 0===e?new Set:e,r.forEach(n=>{e.has(n)||(e.add(n),t(n))})),n=n.parent}}writeDescriptors(t,e){(this._descriptors||(this._descriptors=new Map)).set(t,e)}peekDescriptors(t){let e=this._findInheritedMap("_descriptors",t);return e===p?void 0:e}removeDescriptors(t){this.writeDescriptors(t,p)}forEachDescriptors(t){let e,n=this;for(;null!==n;){let r=n._descriptors;void 0!==r&&(e=void 0===e?new Set:e,r.forEach((n,r)=>{e.has(r)||(e.add(r),n!==p&&t(r,n))})),n=n.parent}}addToListeners(t,e,n,r,i){this.pushListener(t,e,n,r?f.ONCE:f.ADD,i)}removeFromListeners(t,e,n){this.pushListener(t,e,n,f.REMOVE)}pushListener(t,e,n,r,i=!1){let s=this.writableListeners(),o=x(s,t,e,n);if(-1!==o&&o<this._inheritedEnd&&(s.splice(o,1),this._inheritedEnd--,o=-1),-1===o)s.push({event:t,target:e,method:n,kind:r,sync:i});else{let t=s[o];r===f.REMOVE&&t.kind!==f.REMOVE?s.splice(o,1):(t.kind=r,t.sync=i)}}writableListeners(){return this._flattenedVersion!==g||this.source!==this.proto&&-1!==this._inheritedEnd||g++,-1===this._inheritedEnd&&(this._inheritedEnd=0,this._listeners=[]),this._listeners}flattenedListeners(){if(this._flattenedVersion<g){let t=this.parent;if(null!==t){let e=t.flattenedListeners();if(void 0!==e)if(void 0===this._listeners)this._listeners=e;else{let t=this._listeners;this._inheritedEnd>0&&(t.splice(0,this._inheritedEnd),this._inheritedEnd=0);for(Line truncated

release/assets/modules-4-12-BevGFb8e.js

@@ -1 +1 @@
-import{$ as e,$n as t,$r as a,$t as n,A as s,An as r,Ar as i,At as o,B as l,Bn as g,Br as d,Bt as h,Cn as c,Cr as u,Ct as p,Dn as _,Dr as m,Dt as y,En as C,Er as b,Et as f,F as A,Fn as M,Fr as I,Ft as D,G as T,Gn as v,Gr as O,Gt as E,H as S,Hn as R,Hr as j,Ht as x,I as w,In as P,Ir as N,It as V,J as F,Jn as G,Jr as L,Jt as k,K as U,Kn as Y,Kr as B,Kt as H,L as $,Ln as z,Lr as W,Lt as q,M as Z,Mn as J,Mr as K,Mt as Q,N as X,Nn as ee,Nr as te,Nt as ae,On as ne,Or as se,Ot as re,P as ie,Pn as oe,Pr as le,Pt as ge,Q as de,Qn as he,Qr as ce,Qt as ue,R as pe,Rn as _e,Rr as me,Rt as ye,Sn as Ce,Sr as be,St as fe,Tn as Ae,Tr as Me,Tt as Ie,U as De,Un as Te,Ur as ve,Ut as Oe,V as Ee,Vn as Se,Vr as Re,Vt as je,W as xe,Wn as we,Wr as Pe,Wt as Ne,X as Ve,Xn as Fe,Xr as Ge,Xt as Le,Y as ke,Yn as Ue,Yr as Ye,Yt as Be,Z as He,Zn as $e,Zr as ze,Zt as We,_ as qe,_n as Ze,_r as Je,_t as Ke,a as Qe,ai as Xe,an as et,ar as tt,at,bn as nt,br as st,bt as rt,c as it,cn as ot,cr as lt,ct as gt,d as dt,dn as ht,dr as ct,dt as ut,ei as pt,en as _t,er as mt,et as yt,f as Ct,fn as bt,fr as ft,ft as At,g as Mt,gn as It,gr as Dt,gt as Tt,h as vt,hn as Ot,hr as Et,ht as St,i as Rt,ii as jt,in as xt,ir as wt,it as Pt,j as Nt,jn as Vt,jr as Ft,jt as Gt,k as Lt,kn as kt,kr as Ut,kt as Yt,l as Bt,ln as Ht,lr as $t,lt as zt,m as Wt,mn as qt,mr as Zt,mt as Jt,n as Kt,ni as Qt,nn as Xt,nr as ea,nt as ta,o as aa,oi as na,on as sa,or as ra,ot as ia,p as oa,pn as la,pr as ga,pt as da,q as ha,qn as ca,qr as ua,qt as pa,r as _a,ri as ma,rn as ya,rr as Ca,rt as ba,s as fa,si as Aa,sn as Ma,sr as Ia,st as Da,t as Ta,ti as va,tn as Oa,tr as Ea,tt as Sa,u as Ra,un as ja,ur as xa,ut as wa,v as Pa,vn as Na,vr as Va,vt as Fa,wn as Ga,wr as La,wt as ka,xn as Ua,xr as Ya,xt as Ba,yn as Ha,yr as $a,yt as za,z as Wa,zn as qa,zr as Za,zt as Ja}from"./main-Znuwpp9Y.js";var Ka=Aa({default:()=>Ga}),Qa=Aa({default:()=>tn}),Xa={willChange:"_arrangedContentArrayWillChange",didChange:"_arrangedContentArrayDidChange"};function en(e,t){return"[]"===t?(e._revalidate(),e._arrTag):"length"===t?(e._revalidate(),e._lengthTag):B(e,t)}var tn=class extends Y{_objectsDirtyIndex=0;_objects=null;_lengthDirty=!0;_length=0;_arrangedContent=null;_arrangedContentIsUpdating=!1;_arrangedContentTag=null;_arrangedContentRevision=null;_lengthTag=null;_arrTag=null;init(e){super.init(e),W(this,en)}[b](){this._revalidate()}willDestroy(){this._removeArrangedContentArrayObserver()}objectAtContent(e){let t=be(this,"arrangedContent");return le(t,e)}replace(e,t,a){this.replaceContent(e,t,a)}replaceContent(e,t,a){let n=be(this,"content");$a(n,e,t,a)}objectAt(e){if(this._revalidate(),null===this._objects&&(this._objects=[]),-1!==this._objectsDirtyIndex&&e>=this._objectsDirtyIndex){let e=be(this,"arrangedContent");if(e){let t=this._objects.length=be(e,"length");for(let e=this._objectsDirtyIndex;e<t;e++)this._objects[e]=this.objectAtContent(e)}else this._objects.length=0;this._objectsDirtyIndex=-1}return this._objects[e]}get length(){if(this._revalidate(),this._lengthDirty){let e=be(this,"arrangedContent");this._length=e?be(e,"length"):0,this._lengthDirty=!1}return L(this._lengthTag),this._length}set length(e){let t,a=this.length-e;if(0===a)return;a<0&&(t=new Array(-a),a=0);let n=be(this,"content");n&&($a(n,e,a,t),this._invalidate())}_updateArrangedContentArray(e){let t=null===this._objects?0:this._objects.length,a=e?be(e,"length"):0;this._removeArrangedContentArrayObserver(),Je(this,0,t,a),this._invalidate(),Dt(this,0,t,a,!1),this._addArrangedContentArrayObserver(e)}_addArrangedContentArrayObserver(e){e&&!e.isDestroyed&&(Et(e,this,Xa),this._arrangedContent=e)}_removeArrangedContentArrayObserver(){this._arrangedContent&&Va(this._arrangedContent,this,Xa)}_arrangedContentArrayWillChange(){}_arrangedContentArrayDidChange(e,t,a,n){Je(this,t,a,n);let s=t;s<0&&(s+=be(this._arrangedContent,"length")+a-n),(-1===this._objectsDirtyIndex||this._objectsDirtyIndex>s)&&(this._objectsDirtyIndex=s),this._lengthDirty=!0,Dt(this,t,a,n,!1)}_invalidate(){this._objectsDirtyIndex=0,this._lengthDirty=!0}_revalidate(){if(!0!==this._arrangedContentIsUpdating&&(null===this._arrangedContentTag||!Ye(this._arrangedContentTag,this._arrangedContentRevision))){let e=this.get("arrangedContent");null===this._arrangedContentTag?this._addArrangedContentArrayObserver(e):(this._arrangedContentIsUpdating=!0,this._updateArrangedContentArray(e),this._arrangedContentIsUpdating=!1);let t=this._arrangedContentTag=B(this,"arrangedContent");this._arrangedContentRevision=Ge(this._arrangedContentTag),O(e)?(this._lengthTag=ua([t,I(e,"length")]),this._arrTag=ua([t,I(e,"[]")])):this._lengthTag=this._arrTag=t}}};tn.reopen(Ga,{arrangedContent:st("content")});var an=Aa({Meta:()=>va,UNDEFINED:()=>Qt,counters:()=>ma,meta:()=>jt,peekMeta:()=>Xe,setMeta:()=>na}),nn=Aa({ActionHandler:()=>Fe,Comparable:()=>C,ContainerProxyMixin:()=>Ua,MutableEnumerable:()=>_,RSVP:()=>wt,RegistryProxyMixin:()=>nt,TargetActionSupport:()=>Pa,_ProxyMixin:()=>Sa,_contentFor:()=>taLine truncated
+import{$ as e,$n as t,$r as a,$t as n,A as s,An as r,Ar as i,At as o,B as l,Bn as g,Br as d,Bt as h,Cn as c,Cr as u,Ct as p,Dn as _,Dr as m,Dt as y,En as C,Er as b,Et as f,F as A,Fn as M,Fr as I,Ft as D,G as T,Gn as v,Gr as O,Gt as E,H as S,Hn as R,Hr as j,Ht as x,I as w,In as P,Ir as N,It as V,J as F,Jn as G,Jr as L,Jt as k,K as U,Kn as Y,Kr as B,Kt as H,L as $,Ln as z,Lr as W,Lt as q,M as Z,Mn as J,Mr as K,Mt as Q,N as X,Nn as ee,Nr as te,Nt as ae,On as ne,Or as se,Ot as re,P as ie,Pn as oe,Pr as le,Pt as ge,Q as de,Qn as he,Qr as ce,Qt as ue,R as pe,Rn as _e,Rr as me,Rt as ye,Sn as Ce,Sr as be,St as fe,Tn as Ae,Tr as Me,Tt as Ie,U as De,Un as Te,Ur as ve,Ut as Oe,V as Ee,Vn as Se,Vr as Re,Vt as je,W as xe,Wn as we,Wr as Pe,Wt as Ne,X as Ve,Xn as Fe,Xr as Ge,Xt as Le,Y as ke,Yn as Ue,Yr as Ye,Yt as Be,Z as He,Zn as $e,Zr as ze,Zt as We,_ as qe,_n as Ze,_r as Je,_t as Ke,a as Qe,ai as Xe,an as et,ar as tt,at,bn as nt,br as st,bt as rt,c as it,cn as ot,cr as lt,ct as gt,d as dt,dn as ht,dr as ct,dt as ut,ei as pt,en as _t,er as mt,et as yt,f as Ct,fn as bt,fr as ft,ft as At,g as Mt,gn as It,gr as Dt,gt as Tt,h as vt,hn as Ot,hr as Et,ht as St,i as Rt,ii as jt,in as xt,ir as wt,it as Pt,j as Nt,jn as Vt,jr as Ft,jt as Gt,k as Lt,kn as kt,kr as Ut,kt as Yt,l as Bt,ln as Ht,lr as $t,lt as zt,m as Wt,mn as qt,mr as Zt,mt as Jt,n as Kt,ni as Qt,nn as Xt,nr as ea,nt as ta,o as aa,oi as na,on as sa,or as ra,ot as ia,p as oa,pn as la,pr as ga,pt as da,q as ha,qn as ca,qr as ua,qt as pa,r as _a,ri as ma,rn as ya,rr as Ca,rt as ba,s as fa,si as Aa,sn as Ma,sr as Ia,st as Da,t as Ta,ti as va,tn as Oa,tr as Ea,tt as Sa,u as Ra,un as ja,ur as xa,ut as wa,v as Pa,vn as Na,vr as Va,vt as Fa,wn as Ga,wr as La,wt as ka,xn as Ua,xr as Ya,xt as Ba,yn as Ha,yr as $a,yt as za,z as Wa,zn as qa,zr as Za,zt as Ja}from"./main-DeiUGvCJ.js";var Ka=Aa({default:()=>Ga}),Qa=Aa({default:()=>tn}),Xa={willChange:"_arrangedContentArrayWillChange",didChange:"_arrangedContentArrayDidChange"};function en(e,t){return"[]"===t?(e._revalidate(),e._arrTag):"length"===t?(e._revalidate(),e._lengthTag):B(e,t)}var tn=class extends Y{_objectsDirtyIndex=0;_objects=null;_lengthDirty=!0;_length=0;_arrangedContent=null;_arrangedContentIsUpdating=!1;_arrangedContentTag=null;_arrangedContentRevision=null;_lengthTag=null;_arrTag=null;init(e){super.init(e),W(this,en)}[b](){this._revalidate()}willDestroy(){this._removeArrangedContentArrayObserver()}objectAtContent(e){let t=be(this,"arrangedContent");return le(t,e)}replace(e,t,a){this.replaceContent(e,t,a)}replaceContent(e,t,a){let n=be(this,"content");$a(n,e,t,a)}objectAt(e){if(this._revalidate(),null===this._objects&&(this._objects=[]),-1!==this._objectsDirtyIndex&&e>=this._objectsDirtyIndex){let e=be(this,"arrangedContent");if(e){let t=this._objects.length=be(e,"length");for(let e=this._objectsDirtyIndex;e<t;e++)this._objects[e]=this.objectAtContent(e)}else this._objects.length=0;this._objectsDirtyIndex=-1}return this._objects[e]}get length(){if(this._revalidate(),this._lengthDirty){let e=be(this,"arrangedContent");this._length=e?be(e,"length"):0,this._lengthDirty=!1}return L(this._lengthTag),this._length}set length(e){let t,a=this.length-e;if(0===a)return;a<0&&(t=new Array(-a),a=0);let n=be(this,"content");n&&($a(n,e,a,t),this._invalidate())}_updateArrangedContentArray(e){let t=null===this._objects?0:this._objects.length,a=e?be(e,"length"):0;this._removeArrangedContentArrayObserver(),Je(this,0,t,a),this._invalidate(),Dt(this,0,t,a,!1),this._addArrangedContentArrayObserver(e)}_addArrangedContentArrayObserver(e){e&&!e.isDestroyed&&(Et(e,this,Xa),this._arrangedContent=e)}_removeArrangedContentArrayObserver(){this._arrangedContent&&Va(this._arrangedContent,this,Xa)}_arrangedContentArrayWillChange(){}_arrangedContentArrayDidChange(e,t,a,n){Je(this,t,a,n);let s=t;s<0&&(s+=be(this._arrangedContent,"length")+a-n),(-1===this._objectsDirtyIndex||this._objectsDirtyIndex>s)&&(this._objectsDirtyIndex=s),this._lengthDirty=!0,Dt(this,t,a,n,!1)}_invalidate(){this._objectsDirtyIndex=0,this._lengthDirty=!0}_revalidate(){if(!0!==this._arrangedContentIsUpdating&&(null===this._arrangedContentTag||!Ye(this._arrangedContentTag,this._arrangedContentRevision))){let e=this.get("arrangedContent");null===this._arrangedContentTag?this._addArrangedContentArrayObserver(e):(this._arrangedContentIsUpdating=!0,this._updateArrangedContentArray(e),this._arrangedContentIsUpdating=!1);let t=this._arrangedContentTag=B(this,"arrangedContent");this._arrangedContentRevision=Ge(this._arrangedContentTag),O(e)?(this._lengthTag=ua([t,I(e,"length")]),this._arrTag=ua([t,I(e,"[]")])):this._lengthTag=this._arrTag=t}}};tn.reopen(Ga,{arrangedContent:st("content")});var an=Aa({Meta:()=>va,UNDEFINED:()=>Qt,counters:()=>ma,meta:()=>jt,peekMeta:()=>Xe,setMeta:()=>na}),nn=Aa({ActionHandler:()=>Fe,Comparable:()=>C,ContainerProxyMixin:()=>Ua,MutableEnumerable:()=>_,RSVP:()=>wt,RegistryProxyMixin:()=>nt,TargetActionSupport:()=>Pa,_ProxyMixin:()=>Sa,_contentFor:()=>taLine truncated

release/assets/negentropy-DJj8qdiI.js

@@ -1 +1 @@
-import{C as t,D as e,E as i,O as r,S as n,T as s,b as a,w as o,x as h,y as u}from"./main-Znuwpp9Y.js";function l(){for(var t=[],n=0;n<arguments.length;n++)t[n]=arguments[n];return 1===(t=o(t)).length?e(t[0]):new r(function(t){return function(r){for(var n=[],s=function(s){n.push(e(t[s]).subscribe(i(r,function(t){if(n){for(var e=0;e<n.length;e++)e!==s&&n[e].unsubscribe();n=null}r.next(t)})))},a=0;n&&!r.closed&&a<t.length;a++)s(a)}}(t))}var d=32,c=class t{_raw;length;constructor(t){this._raw=new Uint8Array(t||512),this.length=t?t.length:0}unwrap(){return this._raw.subarray(0,this.length)}get capacity(){return this._raw.byteLength}extend(e){if(e instanceof t&&(e=e.unwrap()),"number"!=typeof e.length)throw Error("bad length");const i=e.length+this.length;if(this.capacity<i){const t=this._raw,e=Math.max(2*this.capacity,i);this._raw=new Uint8Array(e),this._raw.set(t)}this._raw.set(e,this.length),this.length+=e.length}shift(){const t=this._raw[0];return this._raw=this._raw.subarray(1),this.length--,t}shiftN(t=1){const e=this._raw.subarray(0,t);return this._raw=this._raw.subarray(t),this.length-=t,e}};function f(t){let e=0;for(;;){if(0===t.length)throw Error("parse ends prematurely");let i=t.shift();if(e=e<<7|127&i,!(128&i))break}return e}function m(t){if(0===t)return new c([0]);let e=[];for(;0!==t;)e.push(127&t),t>>>=7;e.reverse();for(let i=0;i<e.length-1;i++)e[i]|=128;return new c(e)}function g(t,e){if(t.length<e)throw Error("parse ends prematurely");return t.shiftN(e)}var p=class{buf;sha256;constructor(){this.buf=new Uint8Array(d),this.sha256=async t=>u.create().update(t).digest()}setToZero(){this.buf=new Uint8Array(d)}add(t){let e=0,i=0,r=new DataView(this.buf.buffer),n=new DataView(t.buffer);for(let s=0;s<8;s++){let t=4*s,a=r.getUint32(t,!0);a+=e,a+=n.getUint32(t,!0),a>4294967295&&(i=1),r.setUint32(t,4294967295&a,!0),e=i,i=0}}negate(){let t=new DataView(this.buf.buffer);for(let i=0;i<8;i++){let e=4*i;t.setUint32(e,~t.getUint32(e,!0))}let e=new Uint8Array(d);e[0]=1,this.add(e)}async getFingerprint(t){let e=new c;return e.extend(this.buf),e.extend(m(t)),(await this.sha256(e.unwrap())).subarray(0,16)}},w=class{items;sealed;constructor(){this.items=[],this.sealed=!1}insert(t,e){if(this.sealed)throw Error("already sealed");if((e=y(e)).byteLength!==d)throw Error("bad id size for added item");this.items.push({timestamp:t,id:e})}seal(){if(this.sealed)throw Error("already sealed");this.sealed=!0,this.items.sort(A);for(let t=1;t<this.items.length;t++)if(0===A(this.items[t-1],this.items[t]))throw Error("duplicate item inserted")}unseal(){this.sealed=!1}size(){return this._checkSealed(),this.items.length}getItem(t){if(this._checkSealed(),t>=this.items.length)throw Error("out of range");return this.items[t]}iterate(t,e,i){this._checkSealed(),this._checkBounds(t,e);for(let r=t;r<e&&i(this.items[r],r);++r);}findLowerBound(t,e,i){return this._checkSealed(),this._checkBounds(t,e),this._binarySearch(this.items,t,e,t=>A(t,i)<0)}async fingerprint(t,e){let i=new p;return i.setToZero(),this.iterate(t,e,t=>(i.add(t.id),!0)),await i.getFingerprint(e-t)}_checkSealed(){if(!this.sealed)throw Error("not sealed")}_checkBounds(t,e){if(t>e||e>this.items.length)throw Error("bad range")}_binarySearch(t,e,i,r){let n=i-e;for(;n>0;){let i=e,s=Math.floor(n/2);i+=s,r(t[i])?(e=++i,n-=s+1):n=s}return e}},b=class{storage;frameSizeLimit;lastTimestampIn;lastTimestampOut;isInitiator;wantUint8ArrayOutput;constructor(t,e=0){if(0!==e&&e<4096)throw Error("frameSizeLimit too small");this.storage=t,this.frameSizeLimit=e,this.lastTimestampIn=0,this.lastTimestampOut=0}_bound(t,e){return{timestamp:t,id:e||new Uint8Array(0)}}async initiate(){if(this.isInitiator)throw Error("already initiated");this.isInitiator=!0;let t=new c;return t.extend([97]),await this.splitRange(0,this.storage.size(),this._bound(Number.MAX_VALUE),t),this._renderOutput(t)}setInitiator(){this.isInitiator=!0}async reconcile(t){let e=[],i=[],r=new c(y(t));this.lastTimestampIn=this.lastTimestampOut=0;let n=new c;n.extend([97]);let s=g(r,1)[0];if(s<96||s>111)throw Error("invalid negentropy protocol version byte");if(97!==s){if(this.isInitiator)throw Error("unsupported negentropy protocol version requested: "+(s-96));return[this._renderOutput(n),e,i]}let a=this.storage.size(),o=this._bound(0),h=0,u=!1;for(;0!==r.length;){let t=new c,s=()=>{u&&(u=!1,t.extend(this.encodeBound(o)),t.extend(m(0)))},l=this.decodeBound(r),p=f(r),w=h,b=this.storage.findLowerBound(h,a,l);if(0===p)u=!0;else if(1===p)0!==E(g(r,16),await this.storage.fingerprint(w,b))?(s(),await this.splitRange(w,b,l,t)):u=!0;else{if(2!==p)throw Error("unexpected mode");{let a=f(r),o={};for(let t=0;t<a;t++){let t=g(r,d);this.isInitiator&&(o[t]=t)}if(this.isInitiator){u=!0,this.storage.iterate(w,b,t=>{let i=t.id;return o[i]?delete o[i]:this.isInitiator&&e.push(this.wantUint8ArrayOutput?i:x(i)),!0});for(let t of Object.values(o))i.push(this.wantUint8ArrayOutput?t:x(t))}else{s();let e=new c,i=0,r=l;this.storage.iterate(w,b,(t,s)=>this.exceededFLine truncated
+import{C as t,D as e,E as i,O as r,S as n,T as s,b as a,w as o,x as h,y as u}from"./main-DeiUGvCJ.js";function l(){for(var t=[],r=0;r<arguments.length;r++)t[r]=arguments[r];return 1===(t=n(t)).length?s(t[0]):new e(function(t){return function(e){for(var r=[],n=function(n){r.push(s(t[n]).subscribe(i(e,function(t){if(r){for(var i=0;i<r.length;i++)i!==n&&r[i].unsubscribe();r=null}e.next(t)})))},a=0;r&&!e.closed&&a<t.length;a++)n(a)}}(t))}var d=32,c=class t{_raw;length;constructor(t){this._raw=new Uint8Array(t||512),this.length=t?t.length:0}unwrap(){return this._raw.subarray(0,this.length)}get capacity(){return this._raw.byteLength}extend(e){if(e instanceof t&&(e=e.unwrap()),"number"!=typeof e.length)throw Error("bad length");const i=e.length+this.length;if(this.capacity<i){const t=this._raw,e=Math.max(2*this.capacity,i);this._raw=new Uint8Array(e),this._raw.set(t)}this._raw.set(e,this.length),this.length+=e.length}shift(){const t=this._raw[0];return this._raw=this._raw.subarray(1),this.length--,t}shiftN(t=1){const e=this._raw.subarray(0,t);return this._raw=this._raw.subarray(t),this.length-=t,e}};function f(t){let e=0;for(;;){if(0===t.length)throw Error("parse ends prematurely");let i=t.shift();if(e=e<<7|127&i,!(128&i))break}return e}function m(t){if(0===t)return new c([0]);let e=[];for(;0!==t;)e.push(127&t),t>>>=7;e.reverse();for(let i=0;i<e.length-1;i++)e[i]|=128;return new c(e)}function g(t,e){if(t.length<e)throw Error("parse ends prematurely");return t.shiftN(e)}var p=class{buf;sha256;constructor(){this.buf=new Uint8Array(d),this.sha256=async t=>u.create().update(t).digest()}setToZero(){this.buf=new Uint8Array(d)}add(t){let e=0,i=0,r=new DataView(this.buf.buffer),n=new DataView(t.buffer);for(let s=0;s<8;s++){let t=4*s,a=r.getUint32(t,!0);a+=e,a+=n.getUint32(t,!0),a>4294967295&&(i=1),r.setUint32(t,4294967295&a,!0),e=i,i=0}}negate(){let t=new DataView(this.buf.buffer);for(let i=0;i<8;i++){let e=4*i;t.setUint32(e,~t.getUint32(e,!0))}let e=new Uint8Array(d);e[0]=1,this.add(e)}async getFingerprint(t){let e=new c;return e.extend(this.buf),e.extend(m(t)),(await this.sha256(e.unwrap())).subarray(0,16)}},w=class{items;sealed;constructor(){this.items=[],this.sealed=!1}insert(t,e){if(this.sealed)throw Error("already sealed");if((e=y(e)).byteLength!==d)throw Error("bad id size for added item");this.items.push({timestamp:t,id:e})}seal(){if(this.sealed)throw Error("already sealed");this.sealed=!0,this.items.sort(A);for(let t=1;t<this.items.length;t++)if(0===A(this.items[t-1],this.items[t]))throw Error("duplicate item inserted")}unseal(){this.sealed=!1}size(){return this._checkSealed(),this.items.length}getItem(t){if(this._checkSealed(),t>=this.items.length)throw Error("out of range");return this.items[t]}iterate(t,e,i){this._checkSealed(),this._checkBounds(t,e);for(let r=t;r<e&&i(this.items[r],r);++r);}findLowerBound(t,e,i){return this._checkSealed(),this._checkBounds(t,e),this._binarySearch(this.items,t,e,t=>A(t,i)<0)}async fingerprint(t,e){let i=new p;return i.setToZero(),this.iterate(t,e,t=>(i.add(t.id),!0)),await i.getFingerprint(e-t)}_checkSealed(){if(!this.sealed)throw Error("not sealed")}_checkBounds(t,e){if(t>e||e>this.items.length)throw Error("bad range")}_binarySearch(t,e,i,r){let n=i-e;for(;n>0;){let i=e,s=Math.floor(n/2);i+=s,r(t[i])?(e=++i,n-=s+1):n=s}return e}},b=class{storage;frameSizeLimit;lastTimestampIn;lastTimestampOut;isInitiator;wantUint8ArrayOutput;constructor(t,e=0){if(0!==e&&e<4096)throw Error("frameSizeLimit too small");this.storage=t,this.frameSizeLimit=e,this.lastTimestampIn=0,this.lastTimestampOut=0}_bound(t,e){return{timestamp:t,id:e||new Uint8Array(0)}}async initiate(){if(this.isInitiator)throw Error("already initiated");this.isInitiator=!0;let t=new c;return t.extend([97]),await this.splitRange(0,this.storage.size(),this._bound(Number.MAX_VALUE),t),this._renderOutput(t)}setInitiator(){this.isInitiator=!0}async reconcile(t){let e=[],i=[],r=new c(y(t));this.lastTimestampIn=this.lastTimestampOut=0;let n=new c;n.extend([97]);let s=g(r,1)[0];if(s<96||s>111)throw Error("invalid negentropy protocol version byte");if(97!==s){if(this.isInitiator)throw Error("unsupported negentropy protocol version requested: "+(s-96));return[this._renderOutput(n),e,i]}let a=this.storage.size(),o=this._bound(0),h=0,u=!1;for(;0!==r.length;){let t=new c,s=()=>{u&&(u=!1,t.extend(this.encodeBound(o)),t.extend(m(0)))},l=this.decodeBound(r),p=f(r),w=h,b=this.storage.findLowerBound(h,a,l);if(0===p)u=!0;else if(1===p)0!==E(g(r,16),await this.storage.fingerprint(w,b))?(s(),await this.splitRange(w,b,l,t)):u=!0;else{if(2!==p)throw Error("unexpected mode");{let a=f(r),o={};for(let t=0;t<a;t++){let t=g(r,d);this.isInitiator&&(o[t]=t)}if(this.isInitiator){u=!0,this.storage.iterate(w,b,t=>{let i=t.id;return o[i]?delete o[i]:this.isInitiator&&e.push(this.wantUint8ArrayOutput?i:x(i)),!0});for(let t of Object.values(o))i.push(this.wantUint8ArrayOutput?t:x(t))}else{s();let e=new c,i=0,r=l;this.storage.iterate(w,b,(t,s)=>this.exceededFLine truncated

release/index.html

@@ -6,9 +6,6 @@
     <meta name="description" content="Unhosted maps app that respects your privacy and choices.">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    <!-- Fediverse account -->
-    <link rel="me" href="https://kosmos.social/@marco">
-
     <!-- Open Graph -->
     <meta property="og:title" content="Marco">
     <meta property="og:description" content="Unhosted maps app that respects your privacy and choices.">
@@ -42,8 +39,8 @@
     <meta name="msapplication-TileColor" content="#F6E9A6">
     <meta name="msapplication-TileImage" content="/icons/icon-144.png">
 
-  <script type="module" crossorigin src="/assets/main-Znuwpp9Y.js"></script>
-  <link rel="stylesheet" crossorigin href="/assets/main-CEhcTO-R.css">
+  <script type="module" crossorigin src="/assets/main-DeiUGvCJ.js"></script>
+  <link rel="stylesheet" crossorigin href="/assets/main-DWxZH-9E.css">
 </head>
   <body>
     <div id="modal-portal"></div>

tests/acceptance/activity-test.js

@@ -1,141 +0,0 @@
-import { module, test } from 'qunit';
-import { visit, currentURL, click, waitFor } from '@ember/test-helpers';
-import { setupApplicationTest } from 'marco/tests/helpers';
-import Service from '@ember/service';
-import { tracked } from '@glimmer/tracking';
-
-class MockActivityService extends Service {
-  @tracked items = [
-    {
-      type: 'zap',
-      photoEventId: 'photo-1',
-      photo: {
-        url: 'https://x.com/photo.jpg',
-        thumbUrl: 'https://x.com/thumb.jpg',
-      },
-      placeIdentifier: 'osm:node:123',
-      senderPubkey: 'b'.repeat(64),
-      amountSats: 21,
-      message: 'Great photo!',
-      createdAt: Math.floor(Date.now() / 1000) - 3600,
-      senderName: 'Alice',
-      senderAvatar: 'https://x.com/avatar.jpg',
-      senderProfileLoading: false,
-    },
-  ];
-
-  async load() {}
-
-  stop() {
-    this.items = [];
-  }
-}
-
-class MockNostrAuthService extends Service {
-  @tracked pubkey = 'test-pubkey';
-
-  get isConnected() {
-    return true;
-  }
-}
-
-class MockStorageService extends Service {
-  initialSyncDone = true;
-  savedPlaces = [];
-  findPlaceById() {
-    return null;
-  }
-  isPlaceSaved() {
-    return false;
-  }
-  loadPlacesInBounds() {
-    return [];
-  }
-  get placesInView() {
-    return [];
-  }
-  rs = {
-    on: () => {},
-  };
-}
-
-class MockOsmService extends Service {
-  async fetchOsmObject() {
-    return {
-      osmId: '123',
-      osmType: 'node',
-      lat: 1,
-      lon: 1,
-      osmTags: { name: 'Test Place', amenity: 'cafe' },
-      title: 'Test Place',
-    };
-  }
-
-  getCachedOsmObject() {
-    return Promise.resolve(null);
-  }
-}
-
-module('Acceptance | activity', function (hooks) {
-  setupApplicationTest(hooks);
-
-  hooks.beforeEach(function () {
-    this.owner.register('service:activity', MockActivityService);
-    this.owner.register('service:nostrAuth', MockNostrAuthService);
-    this.owner.register('service:storage', MockStorageService);
-    this.owner.register('service:osm', MockOsmService);
-  });
-
-  test('visiting /activity renders the sidebar with activity items', async function (assert) {
-    await visit('/activity');
-    assert.strictEqual(currentURL(), '/activity');
-
-    assert.dom('.sidebar').exists('Sidebar is rendered');
-    assert.dom('.sidebar-header-text-centered').includesText('Activity');
-  });
-
-  test('activity items are rendered as zap rows', async function (assert) {
-    await visit('/activity');
-
-    await waitFor('.activity-zap-item');
-    assert.dom('.activity-zap-item').exists({ count: 1 });
-    assert.dom('.zap-sender-name').hasText('Alice');
-    assert.dom('.zap-action').includesText('zapped your photo');
-    assert.dom('.zap-amount').includesText('21 ⚡');
-    assert.dom('.zap-message').includesText('Great photo!');
-  });
-
-  test('closing the sidebar returns to index', async function (assert) {
-    await visit('/activity');
-    assert.strictEqual(currentURL(), '/activity');
-
-    await click('.sidebar-header .close-btn');
-    assert.strictEqual(currentURL(), '/', 'Returns to index');
-  });
-
-  test('clicking back button returns to menu', async function (assert) {
-    await visit('/activity');
-
-    await click('.sidebar-header .back-btn');
-    assert.strictEqual(currentURL(), '/menu', 'Returns to menu');
-  });
-
-  test('clicking a zap item navigates to the place', async function (assert) {
-    const mapUi = this.owner.lookup('service:map-ui');
-
-    await visit('/activity');
-    await waitFor('.activity-zap-item');
-
-    await click('.activity-zap-item');
-
-    assert.ok(
-      currentURL().includes('/place/osm:node:123'),
-      'Transitions to place details'
-    );
-    assert.deepEqual(
-      mapUi.returnToRoute,
-      { name: 'activity' },
-      'returnToRoute is set to activity'
-    );
-  });
-});

tests/integration/components/activity-timeline-test.gjs

@@ -1,176 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'marco/tests/helpers';
-import { render, click } from '@ember/test-helpers';
-import ActivityTimeline from 'marco/components/activity-timeline';
-import { setupNostrMocks } from 'marco/tests/helpers/mock-nostr';
-
-function noop() {}
-
-module('Integration | Component | activity-timeline', function (hooks) {
-  setupRenderingTest(hooks);
-  setupNostrMocks(hooks);
-
-  hooks.beforeEach(function () {
-    this.noop = noop;
-    this.emptyItems = [];
-  });
-
-  test('it renders a loading state', async function (assert) {
-    await render(
-      <template>
-        <ActivityTimeline
-          @items={{this.emptyItems}}
-          @isLoading={{true}}
-          @isConnected={{true}}
-          @onSelect={{this.noop}}
-          @onBack={{this.noop}}
-          @onClose={{this.noop}}
-          @onNostrConnected={{this.noop}}
-        />
-      </template>
-    );
-
-    assert.dom('.sidebar-loading').exists();
-    assert.dom('.activity-list').doesNotExist();
-  });
-
-  test('it renders a not-connected state', async function (assert) {
-    await render(
-      <template>
-        <ActivityTimeline
-          @items={{this.emptyItems}}
-          @isLoading={{false}}
-          @isConnected={{false}}
-          @onSelect={{this.noop}}
-          @onBack={{this.noop}}
-          @onClose={{this.noop}}
-          @onNostrConnected={{this.noop}}
-        />
-      </template>
-    );
-
-    assert.dom('.empty-state').includesText('Connect your Nostr account');
-  });
-
-  test('clicking "Connect your Nostr account" opens the Nostr connect modal', async function (assert) {
-    await render(
-      <template>
-        <div id="modal-portal"></div>
-        <ActivityTimeline
-          @items={{this.emptyItems}}
-          @isLoading={{false}}
-          @isConnected={{false}}
-          @onSelect={{this.noop}}
-          @onBack={{this.noop}}
-          @onClose={{this.noop}}
-          @onNostrConnected={{this.noop}}
-        />
-      </template>
-    );
-
-    assert.dom('.nostr-connect-modal').doesNotExist();
-
-    await click('.empty-state a');
-
-    assert.dom('.nostr-connect-modal').exists();
-  });
-
-  test('it renders an empty state when connected but no activity', async function (assert) {
-    await render(
-      <template>
-        <ActivityTimeline
-          @items={{this.emptyItems}}
-          @isLoading={{false}}
-          @isConnected={{true}}
-          @onSelect={{this.noop}}
-          @onBack={{this.noop}}
-          @onClose={{this.noop}}
-          @onNostrConnected={{this.noop}}
-        />
-      </template>
-    );
-
-    assert.dom('.empty-state').includesText('No activity yet');
-  });
-
-  test('it renders activity zap items', async function (assert) {
-    this.items = [
-      {
-        type: 'zap',
-        photoEventId: 'photo-1',
-        photo: {
-          url: 'https://x.com/photo.jpg',
-          thumbUrl: 'https://x.com/thumb.jpg',
-        },
-        placeIdentifier: 'osm:node:111',
-        senderPubkey: 'b'.repeat(64),
-        amountSats: 21,
-        message: 'Nice!',
-        createdAt: 2000,
-        senderName: 'Alice',
-        senderAvatar: 'https://x.com/avatar.jpg',
-        senderProfileLoading: false,
-      },
-      {
-        type: 'zap',
-        photoEventId: 'photo-2',
-        photo: {
-          url: 'https://x.com/photo2.jpg',
-          thumbUrl: 'https://x.com/thumb2.jpg',
-        },
-        placeIdentifier: 'osm:node:222',
-        senderPubkey: 'c'.repeat(64),
-        amountSats: 100,
-        message: null,
-        createdAt: 1000,
-        senderName: 'Bob',
-        senderAvatar: null,
-        senderProfileLoading: false,
-      },
-    ];
-
-    await render(
-      <template>
-        <ActivityTimeline
-          @items={{this.items}}
-          @isLoading={{false}}
-          @isConnected={{true}}
-          @onSelect={{this.noop}}
-          @onBack={{this.noop}}
-          @onClose={{this.noop}}
-          @onNostrConnected={{this.noop}}
-        />
-      </template>
-    );
-
-    assert.dom('.activity-zap-item').exists({ count: 2 });
-    assert.dom(this.element).includesText('Alice');
-    assert.dom(this.element).includesText('21 ⚡');
-    assert.dom(this.element).includesText('Bob');
-    assert.dom(this.element).includesText('100 ⚡');
-  });
-
-  test('clicking the back button fires @onBack', async function (assert) {
-    let backClicked = false;
-    this.handleBack = () => {
-      backClicked = true;
-    };
-
-    await render(
-      <template>
-        <ActivityTimeline
-          @items={{this.emptyItems}}
-          @isLoading={{false}}
-          @isConnected={{true}}
-          @onSelect={{this.noop}}
-          @onBack={{this.handleBack}}
-          @onClose={{this.noop}}
-          @onNostrConnected={{this.noop}}
-        />
-      </template>
-    );
-
-    await click('.sidebar-header .back-btn');
-    assert.true(backClicked);
-  });
-});

tests/integration/components/activity-zap-item-test.gjs

@@ -1,296 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'marco/tests/helpers';
-import { render, click } from '@ember/test-helpers';
-import ActivityZapItem from 'marco/components/activity-zap-item';
-import { ActivityEntry } from 'marco/utils/activity';
-
-function noop() {}
-
-module('Integration | Component | activity-zap-item', function (hooks) {
-  setupRenderingTest(hooks);
-
-  hooks.beforeEach(function () {
-    this.noop = noop;
-  });
-
-  test('it renders sender name, action, amount, and message', async function (assert) {
-    this.item = new ActivityEntry({
-      photoEventId: 'photo-1',
-      photo: {
-        url: 'https://x.com/photo.jpg',
-        thumbUrl: 'https://x.com/thumb.jpg',
-      },
-      placeIdentifier: 'osm:node:12345',
-      senderPubkey: 'b'.repeat(64),
-      amountSats: 21,
-      message: 'Great shot!',
-      createdAt: Math.floor(Date.now() / 1000) - 3600,
-    });
-    this.item.senderName = 'Alice';
-    this.item.senderAvatar = 'https://x.com/avatar.jpg';
-    this.item.senderProfileLoading = false;
-
-    await render(
-      <template>
-        <ActivityZapItem @item={{this.item}} @onSelect={{this.noop}} />
-      </template>
-    );
-
-    assert.dom('.zap-sender-name').hasText('Alice');
-    assert.dom('.zap-action').includesText('zapped your photo');
-    assert.dom('.zap-amount').hasText('21 ⚡');
-    assert.dom('.zap-message').includesText('Great shot!');
-    assert
-      .dom('.zap-sender-avatar')
-      .hasAttribute('src', 'https://x.com/avatar.jpg');
-    assert
-      .dom('.zap-context-thumb img')
-      .hasAttribute('src', 'https://x.com/thumb.jpg');
-  });
-
-  test('it shows avatar placeholder when no avatar', async function (assert) {
-    this.item = new ActivityEntry({
-      photoEventId: 'photo-1',
-      photo: null,
-      placeIdentifier: 'osm:node:12345',
-      senderPubkey: 'b'.repeat(64),
-      amountSats: 100,
-      message: null,
-      createdAt: 1000,
-    });
-    this.item.senderName = 'Bob';
-    this.item.senderAvatar = null;
-    this.item.senderProfileLoading = false;
-
-    await render(
-      <template>
-        <ActivityZapItem @item={{this.item}} @onSelect={{this.noop}} />
-      </template>
-    );
-
-    assert.dom('.zap-sender-avatar-placeholder').exists();
-    assert.dom('.zap-sender-avatar').doesNotExist();
-  });
-
-  test('it omits the message line when there is no message', async function (assert) {
-    this.item = new ActivityEntry({
-      photoEventId: 'photo-1',
-      photo: null,
-      placeIdentifier: 'osm:node:12345',
-      senderPubkey: 'b'.repeat(64),
-      amountSats: 50,
-      message: null,
-      createdAt: 1000,
-    });
-    this.item.senderName = 'Alice';
-    this.item.senderProfileLoading = false;
-
-    await render(
-      <template>
-        <ActivityZapItem @item={{this.item}} @onSelect={{this.noop}} />
-      </template>
-    );
-
-    assert.dom('.zap-message').doesNotExist();
-  });
-
-  test('it omits the context thumbnail when there is no photo', async function (assert) {
-    this.item = new ActivityEntry({
-      photoEventId: 'photo-1',
-      photo: null,
-      placeIdentifier: 'osm:node:12345',
-      senderPubkey: 'b'.repeat(64),
-      amountSats: 50,
-      message: 'Hi',
-      createdAt: 1000,
-    });
-    this.item.senderName = 'Alice';
-    this.item.senderProfileLoading = false;
-
-    await render(
-      <template>
-        <ActivityZapItem @item={{this.item}} @onSelect={{this.noop}} />
-      </template>
-    );
-
-    assert.dom('.zap-context-thumb').doesNotExist();
-    assert.dom('.zap-context-text').exists();
-  });
-
-  test('clicking the item fires @onSelect with the item', async function (assert) {
-    this.item = new ActivityEntry({
-      photoEventId: 'photo-1',
-      photo: null,
-      placeIdentifier: 'osm:node:12345',
-      senderPubkey: 'b'.repeat(64),
-      amountSats: 21,
-      message: 'Test',
-      createdAt: 1000,
-    });
-    this.item.senderName = 'Alice';
-    this.item.senderProfileLoading = false;
-
-    let selected = null;
-    this.handleSelect = (item) => {
-      selected = item;
-    };
-
-    await render(
-      <template>
-        <ActivityZapItem @item={{this.item}} @onSelect={{this.handleSelect}} />
-      </template>
-    );
-
-    await click('.activity-zap-item');
-
-    assert.strictEqual(selected, this.item);
-  });
-
-  test('it shows resolved place name when placeName is set', async function (assert) {
-    this.item = new ActivityEntry({
-      photoEventId: 'photo-1',
-      photo: null,
-      placeIdentifier: 'osm:node:12345',
-      senderPubkey: 'b'.repeat(64),
-      amountSats: 21,
-      message: null,
-      createdAt: 1000,
-    });
-    this.item.senderName = 'Alice';
-    this.item.senderProfileLoading = false;
-    this.item.placeName = 'Café Central';
-    this.item.placeNameLoading = false;
-
-    await render(
-      <template>
-        <ActivityZapItem @item={{this.item}} @onSelect={{this.noop}} />
-      </template>
-    );
-
-    assert
-      .dom('.zap-context-text')
-      .includesText('Café Central', 'Resolved place name is displayed');
-    assert
-      .dom('.contribution-name-loading')
-      .doesNotExist('No loading/fallback text shown');
-  });
-
-  test('it shows "Loading…" when placeNameLoading is true', async function (assert) {
-    this.item = new ActivityEntry({
-      photoEventId: 'photo-1',
-      photo: null,
-      placeIdentifier: 'osm:node:12345',
-      senderPubkey: 'b'.repeat(64),
-      amountSats: 21,
-      message: null,
-      createdAt: 1000,
-    });
-    this.item.senderName = 'Alice';
-    this.item.senderProfileLoading = false;
-    this.item.placeName = null;
-    this.item.placeNameLoading = true;
-
-    await render(
-      <template>
-        <ActivityZapItem @item={{this.item}} @onSelect={{this.noop}} />
-      </template>
-    );
-
-    assert
-      .dom('.zap-context-text .contribution-name-loading')
-      .hasText('Loading…', 'Loading state is displayed');
-  });
-
-  test('it shows "Unnamed place" when not loading and no placeName', async function (assert) {
-    this.item = new ActivityEntry({
-      photoEventId: 'photo-1',
-      photo: null,
-      placeIdentifier: 'osm:node:12345',
-      senderPubkey: 'b'.repeat(64),
-      amountSats: 21,
-      message: null,
-      createdAt: 1000,
-    });
-    this.item.senderName = 'Alice';
-    this.item.senderProfileLoading = false;
-    this.item.placeName = null;
-    this.item.placeNameLoading = false;
-
-    await render(
-      <template>
-        <ActivityZapItem @item={{this.item}} @onSelect={{this.noop}} />
-      </template>
-    );
-
-    assert
-      .dom('.zap-context-text .contribution-name-loading')
-      .hasText('Unnamed place', 'Fallback name is displayed');
-  });
-
-  test('it displays place name in zap-place-name and date in zap-date', async function (assert) {
-    this.item = new ActivityEntry({
-      photoEventId: 'photo-1',
-      photo: null,
-      placeIdentifier: 'osm:node:12345',
-      senderPubkey: 'b'.repeat(64),
-      amountSats: 21,
-      message: null,
-      createdAt: Math.floor(Date.now() / 1000) - 3600, // 1 hour ago
-    });
-    this.item.senderName = 'Alice';
-    this.item.senderProfileLoading = false;
-    this.item.placeName = 'Café Central';
-    this.item.placeNameLoading = false;
-
-    await render(
-      <template>
-        <ActivityZapItem @item={{this.item}} @onSelect={{this.noop}} />
-      </template>
-    );
-
-    const placeNameEl = this.element.querySelector('.zap-place-name');
-    const dateEl = this.element.querySelector('.zap-date');
-
-    assert.ok(placeNameEl, 'zap-place-name element exists');
-    assert.ok(dateEl, 'zap-date element exists');
-    assert.ok(
-      placeNameEl.textContent.includes('Café Central'),
-      'Place name is in zap-place-name'
-    );
-    assert.ok(dateEl.textContent.includes('hr ago'), 'Date contains hr ago');
-    assert.notOk(
-      placeNameEl.textContent.includes('hr ago'),
-      'Place name does not contain date'
-    );
-    assert.notOk(
-      dateEl.textContent.includes('Café Central'),
-      'Date does not contain place name'
-    );
-  });
-
-  test('it truncates long place names with ellipsis while keeping date visible', async function (assert) {
-    this.item = new ActivityEntry({
-      photoEventId: 'photo-1',
-      photo: null,
-      placeIdentifier: 'osm:node:12345',
-      senderPubkey: 'b'.repeat(64),
-      amountSats: 21,
-      message: null,
-      createdAt: Math.floor(Date.now() / 1000) - 3600,
-    });
-    this.item.senderName = 'Alice';
-    this.item.senderProfileLoading = false;
-    this.item.placeName =
-      'A Very Long Place Name That Should Be Truncated With Ellipsis';
-    this.item.placeNameLoading = false;
-
-    await render(
-      <template>
-        <ActivityZapItem @item={{this.item}} @onSelect={{this.noop}} />
-      </template>
-    );
-
-    assert.dom('.zap-place-name').exists('zap-place-name element exists');
-    assert.dom('.zap-date').hasText('1 hr ago', 'Date is still visible');
-  });
-});

tests/integration/components/app-menu/settings/nostr-test.gjs

@@ -293,9 +293,30 @@ module('Integration | Component | app-menu/settings/nostr', function (hooks) {
     removeBtn.dispatchEvent(new MouseEvent('mouseenter', { bubbles: true }));
     await settled();
 
+    const tooltip = document.body.querySelector('.tooltip');
     assert.dom('.tooltip', document.body).exists('tooltip appears on hover');
     assert.dom('.tooltip', document.body).hasText('Remove relay');
 
+    // Verify arrow is rendered
+    assert.ok(tooltip.dataset.placement, 'tooltip has placement attribute');
+    const arrowStyle = getComputedStyle(tooltip, '::after');
+    assert.strictEqual(arrowStyle.content, '""', 'arrow pseudo-element exists');
+
+    // Verify arrow points in correct direction based on placement
+    if (tooltip.dataset.placement === 'top') {
+      assert.notStrictEqual(
+        arrowStyle.borderTopColor,
+        'rgba(0, 0, 0, 0)',
+        'arrow points down when tooltip is above trigger'
+      );
+    } else {
+      assert.notStrictEqual(
+        arrowStyle.borderBottomColor,
+        'rgba(0, 0, 0, 0)',
+        'arrow points up when tooltip is below trigger'
+      );
+    }
+
     removeBtn.dispatchEvent(new MouseEvent('mouseleave', { bubbles: true }));
     await settled();
 

tests/unit/services/activity-test.js

@@ -1,273 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'marco/tests/helpers';
-import Service from '@ember/service';
-import { tracked } from '@glimmer/tracking';
-import { parseZapReceipt } from 'marco/utils/activity';
-import {
-  setVerifyWrappedEventMethod,
-  fakeVerifyEvent,
-} from 'applesauce-core/helpers/event';
-
-setVerifyWrappedEventMethod(fakeVerifyEvent);
-
-const USER_PUBKEY = 'a'.repeat(64);
-const SENDER_PUBKEY = 'b'.repeat(64);
-
-const PHOTO_EVENT_ID_1 = '1'.repeat(64);
-const PHOTO_EVENT_ID_2 = '2'.repeat(64);
-const PHOTO_EVENT_ID_OTHER = '3'.repeat(64);
-const TEXT_EVENT_ID = '4'.repeat(64);
-const RECEIPT_ID_1 = '5'.repeat(64);
-const RECEIPT_ID_2 = '6'.repeat(64);
-const ZAP_REQ_ID = '7'.repeat(64);
-
-const BOLT11_INVOICE =
-  'lnbc20u1p3y0x3hpp5743k2g0fsqqxj7n8qzuhns5gmkk4djeejk3wkp64ppevgekvc0jsdqcve5kzar2v9nr5gpqd4hkuetesp5ez2g297jduwc20t6lmqlsg3man0vf2jfd8ar9fh8fhn2g8yttfkqxqy9gcqcqzys9qrsgqrzjqtx3k77yrrav9hye7zar2rtqlfkytl094dsp0ms5majzth6gt7ca6uhdkxl983uywgqqqqlgqqqvx5qqjqrzjqd98kxkpyw0l9tyy8r8q57k7zpy9zjmh6sez752wj6gcumqnj3yxzhdsmg6qq56utgqqqqqqqqqqqeqqjq7jd56882gtxhrjm03c93aacyfy306m4fq0tskf83c0nmet8zc2lxyyg3saz8x6vwcp26xnrlagf9semau3qm2glysp7sv95693fphvsp54l567';
-
-function makeZapReceiptEvent(opts = {}) {
-  const recipient = opts.recipient || USER_PUBKEY;
-  const sender = opts.sender || SENDER_PUBKEY;
-  const zappedEventId = opts.zappedEventId || PHOTO_EVENT_ID_1;
-
-  const description = JSON.stringify({
-    kind: 9734,
-    pubkey: sender,
-    content: opts.message || '',
-    id: ZAP_REQ_ID,
-    created_at: 10000,
-    sig: 'fake',
-    tags: [
-      ['p', recipient],
-      ['relays', ['wss://relay.example.com']],
-    ],
-  });
-
-  return {
-    id: opts.id || RECEIPT_ID_1,
-    kind: 9735,
-    pubkey: 'zap-service-pubkey',
-    created_at: opts.created_at || 10000,
-    tags: [
-      ['p', recipient],
-      ['P', sender],
-      ['e', zappedEventId],
-      ['bolt11', BOLT11_INVOICE],
-      ['description', description],
-    ],
-    content: '',
-    sig: 'sig',
-  };
-}
-
-function makePhotoEvent(opts = {}) {
-  return {
-    id: opts.id || PHOTO_EVENT_ID_1,
-    pubkey: opts.author || USER_PUBKEY,
-    kind: 360,
-    created_at: 5000,
-    tags: [
-      ['i', opts.placeIdentifier || 'osm:node:123'],
-      ['imeta', `url ${opts.url || 'https://x.com/photo.jpg'}`, 'dim 800x600'],
-    ],
-    content: '',
-    sig: 'sig',
-  };
-}
-
-class MockNostrDataService extends Service {
-  @tracked profiles = {};
-
-  store = {
-    events: new Map(),
-    add(event) {
-      this.events.set(event.id, event);
-    },
-    getEvent(id) {
-      return this.events.get(id);
-    },
-    getReplaceable(kind, pubkey) {
-      // Find a replaceable event (kind 0 profile) by pubkey
-      for (const event of this.events.values()) {
-        if (event.kind === kind && event.pubkey === pubkey) {
-          return event;
-        }
-      }
-      return undefined;
-    },
-    timeline() {
-      return {
-        subscribe(callback) {
-          callback([]);
-          return { unsubscribe() {} };
-        },
-      };
-    },
-    model() {
-      return {
-        subscribe() {
-          return { unsubscribe() {} };
-        },
-      };
-    },
-  };
-
-  loadProfiles() {}
-
-  getProfile(pubkey) {
-    return this.profiles[pubkey];
-  }
-
-  async loadIncomingZaps() {}
-}
-
-module('Unit | Service | activity', function (hooks) {
-  setupTest(hooks);
-
-  hooks.beforeEach(function () {
-    this.owner.register('service:nostrData', MockNostrDataService);
-  });
-
-  test('_updateItems parses receipts and enriches with photos from the store', function (assert) {
-    const service = this.owner.lookup('service:activity');
-    const photoEvent = makePhotoEvent({
-      id: PHOTO_EVENT_ID_1,
-      placeIdentifier: 'osm:node:42',
-    });
-    service.nostrData.store.add(photoEvent);
-
-    const receipt = makeZapReceiptEvent({
-      zappedEventId: PHOTO_EVENT_ID_1,
-      message: 'Love it!',
-    });
-
-    service._updateItems([receipt], USER_PUBKEY);
-
-    assert.strictEqual(service.items.length, 1);
-    assert.strictEqual(service.items[0].type, 'zap');
-    assert.strictEqual(service.items[0].senderPubkey, SENDER_PUBKEY);
-    assert.strictEqual(service.items[0].amountSats, 2000);
-    assert.strictEqual(service.items[0].message, 'Love it!');
-    assert.strictEqual(service.items[0].placeIdentifier, 'osm:node:42');
-    assert.ok(service.items[0].photo, 'photo is populated');
-  });
-
-  test('_updateItems filters out zaps for non-photo events', function (assert) {
-    const service = this.owner.lookup('service:activity');
-    service.nostrData.store.add({
-      id: TEXT_EVENT_ID,
-      pubkey: USER_PUBKEY,
-      kind: 1,
-      created_at: 5000,
-      tags: [],
-    });
-
-    const receipt = makeZapReceiptEvent({ zappedEventId: TEXT_EVENT_ID });
-
-    service._updateItems([receipt], USER_PUBKEY);
-
-    assert.strictEqual(service.items.length, 0, 'non-photo zap filtered out');
-  });
-
-  test('_updateItems filters out zaps for photos not authored by the user', function (assert) {
-    const service = this.owner.lookup('service:activity');
-    const otherUserPhoto = makePhotoEvent({
-      id: PHOTO_EVENT_ID_OTHER,
-      author: 'z'.repeat(64),
-    });
-    service.nostrData.store.add(otherUserPhoto);
-
-    const receipt = makeZapReceiptEvent({
-      zappedEventId: PHOTO_EVENT_ID_OTHER,
-    });
-
-    service._updateItems([receipt], USER_PUBKEY);
-
-    assert.strictEqual(
-      service.items.length,
-      0,
-      "zap for someone else's photo filtered out"
-    );
-  });
-
-  test('_updateItems filters out zaps not directed at the user', function (assert) {
-    const service = this.owner.lookup('service:activity');
-    const photoEvent = makePhotoEvent({ id: PHOTO_EVENT_ID_1 });
-    service.nostrData.store.add(photoEvent);
-
-    const receipt = makeZapReceiptEvent({
-      recipient: 'c'.repeat(64),
-      zappedEventId: PHOTO_EVENT_ID_1,
-    });
-
-    service._updateItems([receipt], USER_PUBKEY);
-
-    assert.strictEqual(
-      service.items.length,
-      0,
-      'zap directed at someone else filtered out'
-    );
-  });
-
-  test('_updateItems sorts entries newest-first', function (assert) {
-    const service = this.owner.lookup('service:activity');
-    service.nostrData.store.add(makePhotoEvent({ id: PHOTO_EVENT_ID_1 }));
-    service.nostrData.store.add(makePhotoEvent({ id: PHOTO_EVENT_ID_2 }));
-
-    const oldReceipt = makeZapReceiptEvent({
-      id: RECEIPT_ID_1,
-      zappedEventId: PHOTO_EVENT_ID_1,
-      created_at: 1000,
-    });
-    const newReceipt = makeZapReceiptEvent({
-      id: RECEIPT_ID_2,
-      zappedEventId: PHOTO_EVENT_ID_2,
-      created_at: 9000,
-    });
-
-    service._updateItems([oldReceipt, newReceipt], USER_PUBKEY);
-
-    assert.strictEqual(service.items.length, 2);
-    assert.strictEqual(service.items[0].createdAt, 9000, 'newest first');
-    assert.strictEqual(service.items[1].createdAt, 1000, 'oldest second');
-  });
-
-  test('stop clears items and resets state', function (assert) {
-    const service = this.owner.lookup('service:activity');
-    service.nostrData.store.add(makePhotoEvent({ id: PHOTO_EVENT_ID_1 }));
-    service._updateItems(
-      [makeZapReceiptEvent({ zappedEventId: PHOTO_EVENT_ID_1 })],
-      USER_PUBKEY
-    );
-
-    assert.strictEqual(service.items.length, 1);
-
-    service.stop();
-
-    assert.strictEqual(service.items.length, 0, 'items cleared');
-    assert.strictEqual(service._userPubkey, null);
-  });
-
-  test('load with no pubkey clears items', async function (assert) {
-    const service = this.owner.lookup('service:activity');
-    service.items = [{ fake: true }];
-
-    await service.load(null);
-
-    assert.strictEqual(service.items.length, 0);
-  });
-
-  test('_resolveSender applies profile when available', function (assert) {
-    const service = this.owner.lookup('service:activity');
-    service.nostrData.profiles[SENDER_PUBKEY] = {
-      name: 'Alice',
-      picture: 'https://x.com/avatar.jpg',
-    };
-
-    const entry = parseZapReceipt(makeZapReceiptEvent(), USER_PUBKEY);
-    service._resolveSender(entry);
-
-    assert.strictEqual(entry.senderName, 'Alice');
-    assert.strictEqual(entry.senderAvatar, 'https://x.com/avatar.jpg');
-    assert.false(entry.senderProfileLoading);
-  });
-});

tests/unit/services/contributions-test.js

@@ -51,6 +51,12 @@ class MockOsmService extends Service {
   }
 }
 
+const NAME_CACHE_STORE = 'contributions-name-cache';
+
+function flushPromises() {
+  return new Promise((resolve) => setTimeout(resolve, 50));
+}
+
 module('Unit | Service | contributions', function (hooks) {
   setupTest(hooks);
 
@@ -60,57 +66,212 @@ module('Unit | Service | contributions', function (hooks) {
     this.owner.register('service:osm', MockOsmService);
   });
 
-  test('_updateItems groups events into entries and resolves bookmark names', function (assert) {
+  test('_updateItems resolves names from bookmarks immediately', function (assert) {
     const events = [makePhotoEvent({ id: 'e1', created_at: 1000 })];
 
     const service = this.owner.lookup('service:contributions');
-    const storage = this.owner.lookup('service:storage');
-    storage.savedPlaces = [{ id: '123', title: 'Bookmarked Café' }];
-    storage.findPlaceById = (id) =>
+    service.storage.savedPlaces = [{ id: '123', title: 'Bookmarked Café' }];
+    service.storage.findPlaceById = (id) =>
       id === '123' ? { id: '123', title: 'Bookmarked Café' } : null;
 
     service._updateItems(events);
 
     assert.strictEqual(service.items.length, 1);
-    assert.false(service.items[0].placeNameLoading);
-    assert.strictEqual(service.items[0].placeName, 'Bookmarked Café');
+    assert.false(service.items[0].placeNameLoading, 'Not loading');
+    assert.strictEqual(
+      service.items[0].placeName,
+      'Bookmarked Café',
+      'Resolved from bookmark'
+    );
   });
 
-  test('stop clears items and resets resolver state', async function (assert) {
+  test('_updateItems resolves names from the persistent name cache', async function (assert) {
+    const events = [
+      makePhotoEvent({
+        id: 'e1',
+        created_at: 1000,
+        placeIdentifier: 'osm:node:999',
+      }),
+    ];
+
     const service = this.owner.lookup('service:contributions');
-    const events = [makePhotoEvent({ id: 'e1', created_at: 1000 })];
+    await service.localForage.set(
+      NAME_CACHE_STORE,
+      'osm:node:999',
+      'Cached Park'
+    );
+
+    service._updateItems(events);
+    await flushPromises();
+
+    assert.strictEqual(service.items[0].placeName, 'Cached Park');
+    assert.false(service.items[0].placeNameLoading);
+  });
+
+  test('resolved names are persisted to the IndexedDB name cache', async function (assert) {
+    const events = [
+      makePhotoEvent({
+        id: 'e1',
+        created_at: 1000,
+        placeIdentifier: 'osm:node:42',
+      }),
+    ];
+
+    const service = this.owner.lookup('service:contributions');
+    service.osm.fetchOsmObjectsBatch = async () => {
+      const map = new Map();
+      map.set('node:42', { title: 'Test Place' });
+      return map;
+    };
+
+    service._updateItems(events);
+    await flushPromises();
+
+    assert.strictEqual(
+      await service.localForage.get(NAME_CACHE_STORE, 'osm:node:42'),
+      'Test Place',
+      'Name is persisted to the IndexedDB name cache'
+    );
+  });
+
+  test('names stored in a previous session are resolved from the IndexedDB cache', async function (assert) {
+    const events = [
+      makePhotoEvent({
+        id: 'e1',
+        created_at: 1000,
+        placeIdentifier: 'osm:node:77',
+      }),
+    ];
+
+    const service = this.owner.lookup('service:contributions');
+    await service.localForage.set(
+      NAME_CACHE_STORE,
+      'osm:node:77',
+      'Persisted Place'
+    );
+
+    service._updateItems(events);
+    await flushPromises();
+
+    assert.strictEqual(service.items[0].placeName, 'Persisted Place');
+    assert.false(service.items[0].placeNameLoading);
+  });
+
+  test('batch fetch failure applies a fallback name so items do not stay loading', async function (assert) {
+    const events = [
+      makePhotoEvent({
+        id: 'e1',
+        created_at: 1000,
+        placeIdentifier: 'osm:node:555',
+      }),
+    ];
+
+    const service = this.owner.lookup('service:contributions');
+    // OSM batch returns empty (simulating all-failed fetch)
+    service.osm.fetchOsmObjectsBatch = async () => new Map();
+
     service._updateItems(events);
 
-    assert.strictEqual(service.items.length, 1);
+    // Wait for the background batch to complete
+    await flushPromises();
 
-    service.stop();
-
-    assert.strictEqual(service.items.length, 0, 'items cleared');
-    const resolver = this.owner.lookup('service:place-name-resolver');
+    assert.false(
+      service.items[0].placeNameLoading,
+      'Item is no longer loading after batch failure'
+    );
     assert.strictEqual(
-      resolver._lastBatchSignature,
-      '',
-      'resolver state reset'
+      service.items[0].placeName,
+      'OSM node 555',
+      'Fallback name is applied'
     );
   });
 
-  test('multiple _updateItems calls re-group events correctly', function (assert) {
+  test('fallback names are NOT persisted to the name cache (so they can be re-fetched next session)', async function (assert) {
+    const events = [
+      makePhotoEvent({
+        id: 'e1',
+        created_at: 1000,
+        placeIdentifier: 'osm:node:666',
+      }),
+    ];
+
     const service = this.owner.lookup('service:contributions');
-    const events1 = [makePhotoEvent({ id: 'e1', created_at: 1000 })];
-    const events2 = [makePhotoEvent({ id: 'e2', created_at: 2000 })];
+    service.osm.fetchOsmObjectsBatch = async () => new Map();
 
-    service._updateItems(events1);
-    assert.strictEqual(
-      service.items.length,
-      1,
-      'first update creates one entry'
+    service._updateItems(events);
+    await flushPromises();
+
+    // Fallback should be shown but NOT cached
+    assert.strictEqual(service.items[0].placeName, 'OSM node 666');
+    assert.notOk(
+      await service.localForage.get(NAME_CACHE_STORE, 'osm:node:666'),
+      'No fallback name persisted in the IndexedDB name cache'
     );
+    assert.true(
+      service._unresolvable.has('osm:node:666'),
+      'Item is marked unresolvable for this session'
+    );
+  });
 
-    service._updateItems(events2);
+  test('unresolvable items are not re-fetched within the same session', async function (assert) {
+    const events = [
+      makePhotoEvent({
+        id: 'e1',
+        created_at: 1000,
+        placeIdentifier: 'osm:node:777',
+      }),
+    ];
+
+    let fetchCount = 0;
+    const service = this.owner.lookup('service:contributions');
+    service.osm.fetchOsmObjectsBatch = async () => {
+      fetchCount++;
+      return new Map();
+    };
+
+    // First update triggers a fetch
+    service._updateItems(events);
+    await flushPromises();
+
+    assert.strictEqual(fetchCount, 1, 'First update triggers a fetch');
+    assert.strictEqual(service.items[0].placeName, 'OSM node 777');
+
+    // Second update should NOT trigger another fetch (already unresolvable)
+    service._updateItems(events);
+    await flushPromises();
+
+    assert.strictEqual(fetchCount, 1, 'Second update does not re-fetch');
     assert.strictEqual(
-      service.items.length,
-      1,
-      'second update replaces with new group'
+      service.items[0].placeName,
+      'OSM node 777',
+      'Fallback is shown immediately'
+    );
+  });
+
+  test('successful batch resolution stores names in the name cache', async function (assert) {
+    const events = [
+      makePhotoEvent({
+        id: 'e1',
+        created_at: 1000,
+        placeIdentifier: 'osm:node:111',
+      }),
+    ];
+
+    const service = this.owner.lookup('service:contributions');
+    service.osm.fetchOsmObjectsBatch = async () => {
+      const map = new Map();
+      map.set('node:111', { title: 'Resolved Café' });
+      return map;
+    };
+
+    service._updateItems(events);
+    await flushPromises();
+
+    assert.strictEqual(service.items[0].placeName, 'Resolved Café');
+    assert.strictEqual(
+      await service.localForage.get(NAME_CACHE_STORE, 'osm:node:111'),
+      'Resolved Café',
+      'Name is stored in the name cache'
     );
   });
 });

tests/unit/services/nostr-data-test.js

@@ -1,912 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'marco/tests/helpers';
-import { Subject, EMPTY } from 'rxjs';
-import Service from '@ember/service';
-import NostrDataService from 'marco/services/nostr-data';
-import { getGeohashPrefixesInBbox } from 'marco/utils/geohash-coverage';
-
-function makePubkey(n) {
-  return n.toString(16).padStart(64, '0');
-}
-
-function makeEventId(n) {
-  return `e${n.toString(16).padStart(63, '0')}`;
-}
-
-function makeContactsEvent(pubkey, contactPubkeys, opts = {}) {
-  const id = opts.id || makeEventId(1);
-  const createdAt = opts.created_at || 1000;
-  return {
-    id,
-    pubkey,
-    kind: 3,
-    created_at: createdAt,
-    tags: contactPubkeys.map((pk) => ['p', pk, 'wss://relay.example']),
-    content: '',
-    sig: 'sig',
-  };
-}
-
-function makePhotoEvent(pubkey, placeId, opts = {}) {
-  const id = opts.id || makeEventId(100);
-  const createdAt = opts.created_at || 2000;
-  return {
-    id,
-    pubkey,
-    kind: 360,
-    created_at: createdAt,
-    tags: [
-      ['i', placeId],
-      ['imeta', 'url https://example.com/photo.jpg', 'dim 800x600'],
-    ],
-    content: '',
-    sig: 'sig',
-  };
-}
-
-function makePhotoEventWithGeohash(pubkey, placeId, geohash, opts = {}) {
-  const event = makePhotoEvent(pubkey, placeId, opts);
-  event.tags.push(['g', geohash]);
-  return event;
-}
-
-function makeDeletionEvent(pubkey, eventIds, opts = {}) {
-  const id = opts.id || makeEventId(50);
-  return {
-    id,
-    pubkey,
-    kind: 5,
-    created_at: opts.created_at || 5000,
-    tags: eventIds.map((eid) => ['e', eid]),
-    content: '',
-    sig: 'sig',
-  };
-}
-
-function makeZapReceiptEvent(pubkey, photoEventIds, opts = {}) {
-  const id = opts.id || makeEventId(600);
-  return {
-    id,
-    pubkey,
-    kind: 9735,
-    created_at: opts.created_at || 6000,
-    tags: photoEventIds.map((eid) => ['e', eid]),
-    content: '',
-    sig: 'sig',
-  };
-}
-
-function wait(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
-
-function setupNostrDataService(hooks) {
-  setupTest(hooks);
-
-  hooks.beforeEach(function () {
-    const requestedFilters = [];
-    const reqCalls = [];
-    const reqMessages = new Subject();
-
-    class StubNostrRelayService extends Service {
-      pool = {
-        relays$: new Subject(),
-        request: (_relays, filters) => {
-          requestedFilters.push(...filters);
-          return EMPTY;
-        },
-        req: (_relays, filters) => {
-          reqCalls.push(true);
-          requestedFilters.push(...filters);
-          return reqMessages;
-        },
-        publish: () => Promise.resolve([{ ok: true }]),
-      };
-    }
-
-    this.owner.register('service:nostrRelay', StubNostrRelayService);
-    this.owner.register('service:nostrData', NostrDataService);
-
-    this.requestedFilters = requestedFilters;
-    this.reqCalls = reqCalls;
-    this.reqMessages = reqMessages;
-
-    const service = this.owner.lookup('service:nostr-data');
-    service.store.verifyEvent = undefined;
-  });
-
-  hooks.afterEach(async function () {
-    const service = this.owner.lookup('service:nostr-data');
-    await service.clearCache();
-    await service.localForage.clear('event-relay-provenance');
-  });
-}
-
-module('Unit | Service | nostr-data | contacts', function (hooks) {
-  setupNostrDataService(hooks);
-
-  test('loadProfile populates contacts from store via ContactsModel', async function (assert) {
-    const service = this.owner.lookup('service:nostr-data');
-
-    const pubkey = makePubkey(1);
-    const contactA = makePubkey(2);
-    const contactB = makePubkey(3);
-
-    service.store.add(makeContactsEvent(pubkey, [contactA, contactB]));
-
-    await service.loadProfile(pubkey);
-
-    assert.ok(service.contacts, 'contacts is populated');
-    assert.strictEqual(service.contacts.length, 2, 'two contacts');
-    const pubkeys = service.contacts.map((c) => c.pubkey).sort();
-    assert.deepEqual(
-      pubkeys,
-      [contactA, contactB].sort(),
-      'contact pubkeys match'
-    );
-  });
-
-  test('loadProfile tears down previous contacts subscription when called with a different pubkey', async function (assert) {
-    const service = this.owner.lookup('service:nostr-data');
-
-    const pubkeyA = makePubkey(1);
-    const pubkeyB = makePubkey(4);
-    const contactA = makePubkey(2);
-
-    service.store.add(makeContactsEvent(pubkeyA, [contactA]));
-    await service.loadProfile(pubkeyA);
-
-    assert.strictEqual(
-      service.contacts.length,
-      1,
-      'contacts populated for pubkeyA'
-    );
-
-    // Switch to a different pubkey — this should tear down pubkeyA's subscription
-    await service.loadProfile(pubkeyB);
-
-    assert.deepEqual(
-      service.contacts,
-      [],
-      'contacts is empty for pubkeyB (no kind 3 event)'
-    );
-
-    // Add a new contacts event for pubkeyA after the switch
-    const newerEvent = makeContactsEvent(pubkeyA, [makePubkey(9)], {
-      created_at: 2000,
-    });
-    service.store.add(newerEvent);
-
-    // Give the subscriptions a tick to propagate
-    await new Promise((r) => setTimeout(r, 50));
-
-    assert.deepEqual(
-      service.contacts,
-      [],
-      'contacts remains empty — old subscription was torn down'
-    );
-  });
-
-  test('loadProfile network request includes kind 3', async function (assert) {
-    const service = this.owner.lookup('service:nostr-data');
-
-    const pubkey = makePubkey(1);
-    await service.loadProfile(pubkey);
-
-    const kindsFilter = this.requestedFilters.find((f) =>
-      f.authors?.includes(pubkey)
-    );
-    assert.ok(kindsFilter, 'filter with authors was requested');
-    assert.ok(kindsFilter.kinds.includes(3), 'kinds includes 3 (contacts)');
-    assert.deepEqual(
-      kindsFilter.kinds.sort(),
-      [0, 3, 10002, 10063].sort(),
-      'kinds match expected set'
-    );
-  });
-
-  test('kind 3 events are persisted to IDB cache', async function (assert) {
-    const service = this.owner.lookup('service:nostr-data');
-
-    // Wait for the IDB cache to be ready before adding events
-    await service._cachePromise;
-
-    const pubkey = makePubkey(1);
-    const contactA = makePubkey(2);
-    const event = makeContactsEvent(pubkey, [contactA], { id: makeEventId(5) });
-
-    service.store.add(event);
-
-    // Wait for the persistEventsToCache batch (1s) plus some margin
-    await new Promise((r) => setTimeout(r, 1500));
-
-    const cached = await service.cache.query([
-      { kinds: [3], authors: [pubkey] },
-    ]);
-    assert.strictEqual(cached.length, 1, 'kind 3 event is in IDB cache');
-    assert.strictEqual(cached[0].id, event.id, 'cached event id matches');
-  });
-});
-
-module('Unit | Service | nostr-data | relay configuration', function (hooks) {
-  setupNostrDataService(hooks);
-
-  test('mailboxReadRelays normalizes mailbox inbox URLs', function (assert) {
-    const service = this.owner.lookup('service:nostr-data');
-
-    assert.deepEqual(service.mailboxReadRelays, [], 'empty when no mailboxes');
-
-    service.mailboxes = {
-      inboxes: ['WSS://Relay.Example.COM/', 'relay.two.example'],
-      outboxes: [],
-    };
-
-    assert.deepEqual(
-      service.mailboxReadRelays,
-      ['wss://relay.example.com', 'wss://relay.two.example'],
-      'normalizes and filters invalid URLs'
-    );
-  });
-
-  test('mailboxWriteRelays returns empty array without mailboxes', function (assert) {
-    const service = this.owner.lookup('service:nostr-data');
-
-    assert.deepEqual(service.mailboxWriteRelays, [], 'empty when no mailboxes');
-
-    service.mailboxes = {
-      inboxes: [],
-      outboxes: ['WSS://Outbox.Example.COM/'],
-    };
-
-    assert.deepEqual(
-      service.mailboxWriteRelays,
-      ['wss://outbox.example.com'],
-      'normalizes outbox URLs'
-    );
-  });
-
-  test('configuredReadRelays merges mailbox and custom relays with dedupe and exclusions', function (assert) {
-    const service = this.owner.lookup('service:nostr-data');
-
-    service.mailboxes = { inboxes: ['wss://a.example'], outboxes: [] };
-    service.settings.nostrReadRelays = ['wss://a.example/', 'wss://b.example'];
-
-    assert.deepEqual(
-      service.configuredReadRelays,
-      ['wss://a.example', 'wss://b.example'],
-      'merges and deduplicates (normalized)'
-    );
-
-    service.settings.nostrReadRelayExclusions = ['wss://a.example'];
-
-    assert.deepEqual(
-      service.configuredReadRelays,
-      ['wss://b.example'],
-      'exclusions remove mailbox relays'
-    );
-  });
-
-  test('configuredWriteRelays merges mailbox outboxes with custom write relays', function (assert) {
-    const service = this.owner.lookup('service:nostr-data');
-
-    service.mailboxes = { inboxes: [], outboxes: ['wss://out.example'] };
-    service.settings.nostrWriteRelays = ['wss://custom.example'];
-
-    assert.deepEqual(
-      service.configuredWriteRelays,
-      ['wss://out.example', 'wss://custom.example'],
-      'merges mailbox and custom write relays'
-    );
-
-    service.settings.nostrWriteRelayExclusions = ['wss://out.example'];
-
-    assert.deepEqual(
-      service.configuredWriteRelays,
-      ['wss://custom.example'],
-      'exclusions apply to write relays'
-    );
-  });
-
-  test('activeReadRelays puts required relays first and appends custom', function (assert) {
-    const service = this.owner.lookup('service:nostr-data');
-
-    assert.deepEqual(
-      service.activeReadRelays,
-      ['wss://nostr.kosmos.org'],
-      'default is required only'
-    );
-
-    service.settings.nostrReadRelays = ['wss://custom.example'];
-
-    assert.deepEqual(
-      service.activeReadRelays,
-      ['wss://nostr.kosmos.org', 'wss://custom.example'],
-      'required first, custom appended'
-    );
-  });
-
-  test('activeWriteRelays returns empty when nothing configured', function (assert) {
-    const service = this.owner.lookup('service:nostr-data');
-
-    assert.deepEqual(
-      service.activeWriteRelays,
-      [],
-      'no required write relays by default'
-    );
-  });
-
-  test('trustedRelays includes required read relays plus user-marked trusted relays', function (assert) {
-    const service = this.owner.lookup('service:nostr-data');
-
-    assert.deepEqual(
-      service.trustedRelays,
-      ['wss://nostr.kosmos.org'],
-      'default is required read relays only'
-    );
-
-    service.settings.nostrTrustedRelays = ['wss://custom.example'];
-
-    assert.deepEqual(
-      service.trustedRelays,
-      ['wss://nostr.kosmos.org', 'wss://custom.example'],
-      'merges custom trusted relays'
-    );
-  });
-});
-
-module('Unit | Service | nostr-data | provenance', function (hooks) {
-  setupNostrDataService(hooks);
-
-  test('_recordProvenance accumulates relays for an event and persists them', async function (assert) {
-    const service = this.owner.lookup('service:nostr-data');
-    const eventId = makeEventId(900);
-
-    service._recordProvenance(eventId, 'wss://one.example');
-    service._recordProvenance(eventId, 'wss://two.example');
-    service._recordProvenance(eventId, 'wss://one.example'); // duplicate
-
-    const relays = service._eventRelays.get(eventId);
-    assert.strictEqual(relays.size, 2, 'accumulates unique relays');
-    assert.true(relays.has('wss://one.example'), 'has first relay');
-    assert.true(relays.has('wss://two.example'), 'has second relay');
-
-    const persisted = await service.localForage.get(
-      'event-relay-provenance',
-      eventId
-    );
-    assert.deepEqual(
-      persisted.sort(),
-      ['wss://one.example', 'wss://two.example'],
-      'persists to localForage'
-    );
-  });
-
-  test('kind 5 deletion events remove provenance for referenced events', async function (assert) {
-    const service = this.owner.lookup('service:nostr-data');
-    const deadId = makeEventId(901);
-    const author = makePubkey(50);
-
-    service._recordProvenance(deadId, 'wss://one.example');
-
-    // The store routes kind-5 events to its DeleteManager, which emits
-    // deleted$ synchronously from add() — provenance is dropped immediately.
-    service.store.add(makeDeletionEvent(author, [deadId]));
-
-    assert.false(
-      service._eventRelays.has(deadId),
-      'provenance removed from memory'
-    );
-    const persisted = await service.localForage.get(
-      'event-relay-provenance',
-      deadId
-    );
-    assert.strictEqual(persisted, null, 'provenance removed from localForage');
-  });
-
-  test('_hydrateProvenance restores persisted provenance', async function (assert) {
-    const service = this.owner.lookup('service:nostr-data');
-    const eventId = makeEventId(902);
-
-    await service.localForage.set('event-relay-provenance', eventId, [
-      'wss://x.example',
-    ]);
-
-    await service._hydrateProvenance();
-
-    const relays = service._eventRelays.get(eventId);
-    assert.ok(relays, 'provenance restored');
-    assert.true(relays.has('wss://x.example'), 'contains the relay');
-  });
-
-  test('_requestContentWithProvenance records provenance and adds events to the store', async function (assert) {
-    const service = this.owner.lookup('service:nostr-data');
-    const eventId = makeEventId(903);
-    const pubkey = makePubkey(60);
-
-    service._requestContentWithProvenance(
-      ['wss://relay.test'],
-      [{ kinds: [360] }],
-      'test'
-    );
-
-    const photoEvent = makePhotoEvent(pubkey, 'osm:node:1', { id: eventId });
-    this.reqMessages.next({
-      type: 'EVENT',
-      event: photoEvent,
-      from: 'wss://relay.test',
-    });
-
-    await wait(50);
-
-    const relays = service._eventRelays.get(eventId);
-    assert.ok(relays, 'provenance recorded');
-    assert.true(
-      relays.has('wss://relay.test'),
-      'contains the relay the event came from'
-    );
-    assert.true(service.store.hasEvent(eventId), 'event added to store');
-  });
-});
-
-module('Unit | Service | nostr-data | trust evaluation', function (hooks) {
-  setupNostrDataService(hooks);
-
-  test('isTrustedEvent trusts content from followed contacts', async function (assert) {
-    const service = this.owner.lookup('service:nostr-data');
-
-    const userPubkey = makePubkey(1);
-    const followedPubkey = makePubkey(2);
-
-    // User follows followedPubkey
-    service.store.add(makeContactsEvent(userPubkey, [followedPubkey]));
-    await service.loadProfile(userPubkey);
-
-    // Photo from followed contact (no trusted relay provenance)
-    const photoEvent = makePhotoEvent(followedPubkey, 'osm:node:123', {
-      id: makeEventId(200),
-    });
-    service.store.add(photoEvent);
-
-    assert.true(
-      service.isTrustedEvent(photoEvent),
-      'photo from followed contact is trusted'
-    );
-  });
-
-  test('isTrustedEvent does not trust content from unfollowed pubkeys', async function (assert) {
-    const service = this.owner.lookup('service:nostr-data');
-
-    const userPubkey = makePubkey(1);
-    const followedPubkey = makePubkey(2);
-    const unfollowedPubkey = makePubkey(3);
-
-    // User follows followedPubkey (but NOT unfollowedPubkey)
-    service.store.add(makeContactsEvent(userPubkey, [followedPubkey]));
-    await service.loadProfile(userPubkey);
-
-    // Photo from unfollowed pubkey (no trusted relay provenance)
-    const photoEvent = makePhotoEvent(unfollowedPubkey, 'osm:node:123', {
-      id: makeEventId(201),
-    });
-    service.store.add(photoEvent);
-
-    assert.false(
-      service.isTrustedEvent(photoEvent),
-      'photo from unfollowed pubkey is not trusted'
-    );
-  });
-
-  test('isTrustedEvent still trusts own content (regression)', async function (assert) {
-    const service = this.owner.lookup('service:nostr-data');
-
-    const userPubkey = makePubkey(1);
-    service.nostrAuth = { pubkey: userPubkey };
-
-    await service.loadProfile(userPubkey);
-
-    // Photo from the user themselves
-    const photoEvent = makePhotoEvent(userPubkey, 'osm:node:123', {
-      id: makeEventId(202),
-    });
-    service.store.add(photoEvent);
-
-    assert.true(service.isTrustedEvent(photoEvent), 'own photo is trusted');
-  });
-
-  test('isTrustedEvent still trusts content from trusted relays (regression)', async function (assert) {
-    const service = this.owner.lookup('service:nostr-data');
-
-    const userPubkey = makePubkey(1);
-    const randomPubkey = makePubkey(99);
-
-    await service.loadProfile(userPubkey);
-
-    // Photo from random pubkey
-    const photoEvent = makePhotoEvent(randomPubkey, 'osm:node:123', {
-      id: makeEventId(203),
-    });
-    service.store.add(photoEvent);
-
-    // Simulate provenance: photo was seen on a trusted relay
-    const trustedRelay = 'wss://nostr.kosmos.org';
-    service._recordProvenance(photoEvent.id, trustedRelay);
-
-    assert.true(
-      service.isTrustedEvent(photoEvent),
-      'photo from trusted relay is trusted'
-    );
-  });
-
-  test('isTrustedEvent re-evaluates when contacts change', async function (assert) {
-    const service = this.owner.lookup('service:nostr-data');
-
-    const userPubkey = makePubkey(1);
-    const followedPubkey = makePubkey(2);
-
-    // Load profile first (no contacts yet)
-    await service.loadProfile(userPubkey);
-
-    // Create a photo from followedPubkey (who is not yet followed)
-    const photoEvent = makePhotoEvent(followedPubkey, 'osm:node:456', {
-      id: makeEventId(204),
-    });
-
-    // Photo should be untrusted initially (no contacts loaded yet)
-    assert.false(
-      service.isTrustedEvent(photoEvent),
-      'photo is untrusted before contacts load'
-    );
-
-    // Now load contacts (user follows followedPubkey)
-    service.store.add(
-      makeContactsEvent(userPubkey, [followedPubkey], {
-        id: makeEventId(300),
-        created_at: 3000,
-      })
-    );
-
-    // Give the contacts subscription a tick to propagate
-    await new Promise((r) => setTimeout(r, 50));
-
-    // Photo should now be trusted (contacts loaded)
-    assert.true(
-      service.isTrustedEvent(photoEvent),
-      'photo is trusted after contacts load'
-    );
-  });
-
-  test('partitionByTrust always passes kind 5 deletions through as trusted', function (assert) {
-    const service = this.owner.lookup('service:nostr-data');
-    const untrustedPk = makePubkey(70);
-    const authorPk = makePubkey(71);
-
-    const untrustedPhoto = makePhotoEvent(untrustedPk, 'osm:node:1', {
-      id: makeEventId(904),
-    });
-    const deletion = makeDeletionEvent(authorPk, [untrustedPhoto.id], {
-      id: makeEventId(905),
-    });
-
-    const { trusted, untrusted } = service.partitionByTrust([
-      untrustedPhoto,
-      deletion,
-    ]);
-
-    assert.strictEqual(trusted.length, 1, 'one trusted event');
-    assert.strictEqual(trusted[0].kind, 5, 'deletion is trusted');
-    assert.strictEqual(untrusted.length, 1, 'one untrusted event');
-    assert.strictEqual(untrusted[0].kind, 360, 'photo is untrusted');
-  });
-});
-
-module('Unit | Service | nostr-data | geohash loading', function (hooks) {
-  setupNostrDataService(hooks);
-
-  const BERLIN_BBOX = {
-    minLat: 52.5,
-    minLon: 13.4,
-    maxLat: 52.55,
-    maxLon: 13.45,
-  };
-
-  test('requests kind 360 events for missing geohash prefixes and marks them loaded', async function (assert) {
-    const service = this.owner.lookup('service:nostr-data');
-    const expected = getGeohashPrefixesInBbox(BERLIN_BBOX);
-    assert.ok(expected.length > 0, 'bbox produces prefixes');
-
-    await service.loadPlacesInBounds(BERLIN_BBOX);
-
-    assert.strictEqual(this.reqCalls.length, 1, 'one network request made');
-    const filter = this.requestedFilters.find((f) => f['#g']);
-    assert.ok(filter, 'geohash filter was requested');
-    assert.deepEqual(filter.kinds, [360], 'requests kind 360');
-    assert.deepEqual(
-      filter['#g'].sort(),
-      expected.sort(),
-      'covers all prefixes'
-    );
-    for (const p of expected) {
-      assert.true(
-        service.loadedGeohashPrefixes.has(p),
-        `prefix ${p} marked loaded`
-      );
-    }
-  });
-
-  test('skips prefixes that were already loaded', async function (assert) {
-    const service = this.owner.lookup('service:nostr-data');
-
-    await service.loadPlacesInBounds(BERLIN_BBOX);
-    const firstReqCalls = this.reqCalls.length;
-
-    await service.loadPlacesInBounds(BERLIN_BBOX);
-
-    assert.strictEqual(
-      this.reqCalls.length,
-      firstReqCalls,
-      'no additional network request'
-    );
-  });
-
-  test('hydrates matching cached photos into the store', async function (assert) {
-    const service = this.owner.lookup('service:nostr-data');
-    await service._cachePromise;
-
-    const pk = makePubkey(80);
-    const geohash = getGeohashPrefixesInBbox(BERLIN_BBOX)[0];
-    const cached = makePhotoEventWithGeohash(pk, 'osm:node:700', geohash, {
-      id: makeEventId(700),
-      created_at: 4000,
-    });
-    await service.cache.add(cached);
-
-    await service.loadPlacesInBounds(BERLIN_BBOX);
-
-    assert.true(
-      service.store.hasEvent(cached.id),
-      'cached photo added to store'
-    );
-  });
-});
-
-module('Unit | Service | nostr-data | place photos', function (hooks) {
-  setupNostrDataService(hooks);
-
-  test('sets entity id and streams photos for the place', async function (assert) {
-    const service = this.owner.lookup('service:nostr-data');
-    const pk = makePubkey(81);
-    const photoId = makeEventId(800);
-
-    await service.loadPhotosForPlace({ osmId: '800', osmType: 'node' });
-    assert.strictEqual(
-      service._currentPlaceEntityId,
-      'osm:node:800',
-      'entity id set'
-    );
-
-    service._recordProvenance(photoId, 'wss://nostr.kosmos.org');
-    service.store.add(makePhotoEvent(pk, 'osm:node:800', { id: photoId }));
-
-    assert.strictEqual(service.placePhotos.length, 1, 'photo visible');
-  });
-
-  test('calling with the same place twice does not tear down subscriptions', async function (assert) {
-    const service = this.owner.lookup('service:nostr-data');
-
-    await service.loadPhotosForPlace({ osmId: '800', osmType: 'node' });
-    const firstSub = service._photosSub;
-
-    await service.loadPhotosForPlace({ osmId: '800', osmType: 'node' });
-
-    assert.strictEqual(
-      service._photosSub,
-      firstSub,
-      'same subscription retained'
-    );
-  });
-
-  test('switching places resets state and re-subscribes', async function (assert) {
-    const service = this.owner.lookup('service:nostr-data');
-    const pk = makePubkey(82);
-    const idA = makeEventId(801);
-    const idB = makeEventId(802);
-
-    await service.loadPhotosForPlace({ osmId: '800', osmType: 'node' });
-    service._recordProvenance(idA, 'wss://nostr.kosmos.org');
-    service.store.add(makePhotoEvent(pk, 'osm:node:800', { id: idA }));
-    assert.strictEqual(service.placePhotos.length, 1, 'place 800 has photo');
-
-    await service.loadPhotosForPlace({ osmId: '801', osmType: 'node' });
-    assert.deepEqual(service.placePhotos, [], 'photos cleared');
-    assert.strictEqual(
-      service._currentPlaceEntityId,
-      'osm:node:801',
-      'entity id updated'
-    );
-
-    service._recordProvenance(idB, 'wss://nostr.kosmos.org');
-    service.store.add(makePhotoEvent(pk, 'osm:node:801', { id: idB }));
-    assert.strictEqual(service.placePhotos.length, 1, 'new place has photo');
-    assert.strictEqual(service.placePhotos[0].id, idB);
-  });
-
-  test('null place clears state and tears down subscription', async function (assert) {
-    const service = this.owner.lookup('service:nostr-data');
-    const pk = makePubkey(83);
-    const idA = makeEventId(803);
-
-    await service.loadPhotosForPlace({ osmId: '800', osmType: 'node' });
-    service._recordProvenance(idA, 'wss://nostr.kosmos.org');
-    service.store.add(makePhotoEvent(pk, 'osm:node:800', { id: idA }));
-    assert.strictEqual(service.placePhotos.length, 1);
-
-    await service.loadPhotosForPlace(null);
-
-    assert.deepEqual(service.placePhotos, [], 'photos cleared');
-    assert.strictEqual(
-      service._currentPlaceEntityId,
-      null,
-      'entity id cleared'
-    );
-    assert.strictEqual(service._photosSub, null, 'subscription torn down');
-  });
-
-  test('placePhotos hides untrusted photos by default and counts them', async function (assert) {
-    const service = this.owner.lookup('service:nostr-data');
-    const pkA = makePubkey(84);
-    const pkB = makePubkey(85);
-    const trustedId = makeEventId(900);
-    const untrustedId = makeEventId(901);
-
-    await service.loadPhotosForPlace({ osmId: '900', osmType: 'node' });
-
-    service._recordProvenance(trustedId, 'wss://nostr.kosmos.org');
-    service.store.add(makePhotoEvent(pkA, 'osm:node:900', { id: trustedId }));
-    service.store.add(makePhotoEvent(pkB, 'osm:node:900', { id: untrustedId }));
-
-    assert.deepEqual(
-      service.placePhotos.map((e) => e.id),
-      [trustedId],
-      'only trusted shown'
-    );
-    assert.strictEqual(service.untrustedContentCount, 1, 'untrusted counted');
-  });
-
-  test('toggleShowUntrustedContent reveals all photos and toggles back', async function (assert) {
-    const service = this.owner.lookup('service:nostr-data');
-    const pkA = makePubkey(86);
-    const pkB = makePubkey(87);
-    const trustedId = makeEventId(902);
-    const untrustedId = makeEventId(903);
-
-    await service.loadPhotosForPlace({ osmId: '901', osmType: 'node' });
-
-    service._recordProvenance(trustedId, 'wss://nostr.kosmos.org');
-    service.store.add(makePhotoEvent(pkA, 'osm:node:901', { id: trustedId }));
-    service.store.add(makePhotoEvent(pkB, 'osm:node:901', { id: untrustedId }));
-
-    service.toggleShowUntrustedContent();
-    assert.strictEqual(service.placePhotos.length, 2, 'all photos shown');
-    assert.strictEqual(service.untrustedContentCount, 1, 'count unchanged');
-
-    service.toggleShowUntrustedContent();
-    assert.strictEqual(service.placePhotos.length, 1, 'back to trusted only');
-  });
-
-  test('own photos are shown without provenance', async function (assert) {
-    const service = this.owner.lookup('service:nostr-data');
-    const myPubkey = makePubkey(95);
-    service.nostrAuth = { pubkey: myPubkey };
-    const ownId = makeEventId(950);
-
-    await service.loadPhotosForPlace({ osmId: '950', osmType: 'node' });
-    service.store.add(makePhotoEvent(myPubkey, 'osm:node:950', { id: ownId }));
-
-    assert.strictEqual(
-      service.placePhotos.length,
-      1,
-      'own photo shown without provenance'
-    );
-    assert.strictEqual(service.untrustedContentCount, 0);
-  });
-});
-
-module('Unit | Service | nostr-data | my contributions', function (hooks) {
-  setupNostrDataService(hooks);
-
-  test('returns early when pubkey is null', async function (assert) {
-    const service = this.owner.lookup('service:nostr-data');
-
-    await service.loadMyContributions(null);
-
-    assert.deepEqual(service.myContributionEvents, [], 'no events loaded');
-    assert.strictEqual(
-      service._contributionsSub,
-      null,
-      'no subscription created'
-    );
-  });
-
-  test('loads own photos from store into myContributionEvents', async function (assert) {
-    const service = this.owner.lookup('service:nostr-data');
-    const myPk = makePubkey(60);
-    const photoId = makeEventId(600);
-
-    service.store.add(makePhotoEvent(myPk, 'osm:node:600', { id: photoId }));
-
-    await service.loadMyContributions(myPk);
-
-    assert.strictEqual(
-      service.myContributionEvents.length,
-      1,
-      'photo in contributions'
-    );
-    assert.strictEqual(service.myContributionEvents[0].id, photoId);
-  });
-
-  test('requests own contributions from network with correct filter', async function (assert) {
-    const service = this.owner.lookup('service:nostr-data');
-    const myPk = makePubkey(61);
-
-    await service.loadMyContributions(myPk);
-
-    const filter = this.requestedFilters.find((f) => f.authors?.includes(myPk));
-    assert.ok(filter, 'filter for own pubkey requested');
-    assert.deepEqual(filter.kinds.sort(), [360, 5].sort(), 'kinds 360 and 5');
-  });
-});
-
-module('Unit | Service | nostr-data | zap receipts', function (hooks) {
-  setupNostrDataService(hooks);
-
-  test('_refreshZapReceiptSubscription batches >100 IDs into multiple filters', async function (assert) {
-    const service = this.owner.lookup('service:nostr-data');
-    const photoIds = Array.from({ length: 250 }, (_, i) =>
-      makeEventId(1000 + i)
-    );
-
-    service._refreshZapReceiptSubscription(photoIds);
-
-    const filters = this.requestedFilters.filter((f) =>
-      f.kinds?.includes(9735)
-    );
-    assert.strictEqual(filters.length, 3, '250 IDs → 3 filters (100+100+50)');
-    assert.strictEqual(filters[0]['#e'].length, 100);
-    assert.strictEqual(filters[1]['#e'].length, 100);
-    assert.strictEqual(filters[2]['#e'].length, 50);
-  });
-
-  test('_updateZapReceipts groups receipts by photo event id', async function (assert) {
-    const service = this.owner.lookup('service:nostr-data');
-    const photoA = makeEventId(2000);
-    const photoB = makeEventId(2001);
-
-    const receipt1 = makeZapReceiptEvent(makePubkey(70), [photoA], {
-      id: makeEventId(2100),
-    });
-    const receipt2 = makeZapReceiptEvent(makePubkey(71), [photoA, photoB], {
-      id: makeEventId(2101),
-    });
-    const receipt3 = makeZapReceiptEvent(makePubkey(72), [photoB], {
-      id: makeEventId(2102),
-    });
-
-    service._updateZapReceipts([receipt1, receipt2, receipt3]);
-
-    assert.strictEqual(
-      service.zapReceipts[photoA].length,
-      2,
-      'photoA has 2 receipts'
-    );
-    assert.strictEqual(
-      service.zapReceipts[photoB].length,
-      2,
-      'photoB has 2 receipts'
-    );
-    assert.deepEqual(
-      service.zapReceipts[photoA].map((r) => r.id).sort(),
-      [makeEventId(2100), makeEventId(2101)],
-      'receipts for photoA match'
-    );
-  });
-});

tests/unit/services/osm-test.js

@@ -329,7 +329,7 @@ module('Unit | Service | osm', function (hooks) {
     );
   });
 
-  test('fetchOsmObjectsBatch writes complete results to the general OSM cache', async function (assert) {
+  test('fetchOsmObjectsBatch does not write to the general OSM cache', async function (assert) {
     let service = this.owner.lookup('service:osm');
 
     service.fetchWithRetry = async () => ({
@@ -343,38 +343,13 @@ module('Unit | Service | osm', function (hooks) {
 
     await service.fetchOsmObjectsBatch([{ osmType: 'node', osmId: '100' }]);
 
-    assert.true(
-      service.cachedPlaces.has('node:100'),
-      'Batch fetch writes complete results (with lat/lon) to the in-memory OSM cache'
-    );
-    assert.ok(
-      await service.localForage.get('osm-cache', 'node:100'),
-      'Batch fetch writes complete results to the persistent OSM cache'
-    );
-  });
-
-  test('fetchOsmObjectsBatch does NOT cache incomplete results without lat/lon', async function (assert) {
-    let service = this.owner.lookup('service:osm');
-
-    // Way without child nodes in the response -> no lat/lon in normalized result
-    service.fetchWithRetry = async () => ({
-      ok: true,
-      json: async () => ({
-        elements: [
-          { id: 200, type: 'way', nodes: [], tags: { name: 'Way 200' } },
-        ],
-      }),
-    });
-
-    await service.fetchOsmObjectsBatch([{ osmType: 'way', osmId: '200' }]);
-
     assert.false(
-      service.cachedPlaces.has('way:200'),
-      'Batch fetch does NOT cache incomplete results (ways without child nodes)'
+      service.cachedPlaces.has('node:100'),
+      'Batch fetch does not write to the in-memory OSM cache'
     );
     assert.notOk(
-      await service.localForage.get('osm-cache', 'way:200'),
-      'Batch fetch does NOT write incomplete results to persistent cache'
+      await service.localForage.get('osm-cache', 'node:100'),
+      'Batch fetch does not write to the persistent OSM cache'
     );
   });
 

tests/unit/services/place-name-resolver-test.js

@@ -1,210 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'marco/tests/helpers';
-import Service from '@ember/service';
-
-function makeEntry(opts = {}) {
-  const placeIdentifier = opts.placeIdentifier || 'osm:node:123';
-  const [, osmType, osmId] = placeIdentifier.split(':');
-  return {
-    placeIdentifier,
-    osmType: opts.osmType || osmType,
-    osmId: opts.osmId || osmId,
-    placeName: opts.placeName || null,
-    placeNameLoading: opts.placeNameLoading ?? true,
-  };
-}
-
-class MockStorageService extends Service {
-  savedPlaces = [];
-  findPlaceById() {
-    return null;
-  }
-}
-
-class MockOsmService extends Service {
-  async getCachedOsmObject() {
-    return null;
-  }
-
-  async fetchOsmObjectsBatch() {
-    return new Map();
-  }
-}
-
-function flushPromises() {
-  return new Promise((resolve) => setTimeout(resolve, 50));
-}
-
-module('Unit | Service | place-name-resolver', function (hooks) {
-  setupTest(hooks);
-
-  hooks.beforeEach(function () {
-    this.owner.register('service:storage', MockStorageService);
-    this.owner.register('service:osm', MockOsmService);
-  });
-
-  test('resolveBookmark returns bookmark title when found', function (assert) {
-    const resolver = this.owner.lookup('service:place-name-resolver');
-    const storage = this.owner.lookup('service:storage');
-    storage.savedPlaces = [{ id: '123', title: 'Bookmarked Café' }];
-    storage.findPlaceById = (id) =>
-      id === '123' ? { id: '123', title: 'Bookmarked Café' } : null;
-
-    const name = resolver.resolveBookmark('123');
-
-    assert.strictEqual(name, 'Bookmarked Café');
-  });
-
-  test('resolveBookmark returns null when no bookmark', function (assert) {
-    const resolver = this.owner.lookup('service:place-name-resolver');
-
-    const name = resolver.resolveBookmark('999');
-
-    assert.notOk(name);
-  });
-
-  test('resolveInBackground resolves names from the persistent name cache', async function (assert) {
-    const resolver = this.owner.lookup('service:place-name-resolver');
-    const localForage = this.owner.lookup('service:localForage');
-    const entry = makeEntry({ placeIdentifier: 'osm:node:999' });
-    await localForage.set('place-name-cache', 'osm:node:999', 'Cached Park');
-
-    await resolver.resolveInBackground([entry]);
-
-    assert.strictEqual(entry.placeName, 'Cached Park');
-    assert.false(entry.placeNameLoading);
-  });
-
-  test('resolved names are persisted to the IndexedDB name cache', async function (assert) {
-    const resolver = this.owner.lookup('service:place-name-resolver');
-    const localForage = this.owner.lookup('service:localForage');
-    const entry = makeEntry({ placeIdentifier: 'osm:node:42' });
-    resolver.osm.fetchOsmObjectsBatch = async () => {
-      const map = new Map();
-      map.set('node:42', { title: 'Test Place' });
-      return map;
-    };
-
-    await resolver.resolveInBackground([entry]);
-    await flushPromises();
-
-    assert.strictEqual(
-      await localForage.get('place-name-cache', 'osm:node:42'),
-      'Test Place',
-      'Name is persisted to the IndexedDB name cache'
-    );
-  });
-
-  test('names stored in a previous session are resolved from the IndexedDB cache', async function (assert) {
-    const resolver = this.owner.lookup('service:place-name-resolver');
-    const localForage = this.owner.lookup('service:localForage');
-    const entry = makeEntry({ placeIdentifier: 'osm:node:77' });
-    await localForage.set('place-name-cache', 'osm:node:77', 'Persisted Place');
-
-    await resolver.resolveInBackground([entry]);
-
-    assert.strictEqual(entry.placeName, 'Persisted Place');
-    assert.false(entry.placeNameLoading);
-  });
-
-  test('batch fetch failure applies a fallback name so items do not stay loading', async function (assert) {
-    const resolver = this.owner.lookup('service:place-name-resolver');
-    const entry = makeEntry({ placeIdentifier: 'osm:node:555' });
-    resolver.osm.fetchOsmObjectsBatch = async () => new Map();
-
-    await resolver.resolveInBackground([entry]);
-    await flushPromises();
-
-    assert.false(
-      entry.placeNameLoading,
-      'Item is no longer loading after batch failure'
-    );
-    assert.strictEqual(
-      entry.placeName,
-      'OSM node 555',
-      'Fallback name is applied'
-    );
-  });
-
-  test('fallback names are NOT persisted to the name cache (so they can be re-fetched next session)', async function (assert) {
-    const resolver = this.owner.lookup('service:place-name-resolver');
-    const localForage = this.owner.lookup('service:localForage');
-    const entry = makeEntry({ placeIdentifier: 'osm:node:666' });
-    resolver.osm.fetchOsmObjectsBatch = async () => new Map();
-
-    await resolver.resolveInBackground([entry]);
-    await flushPromises();
-
-    assert.strictEqual(entry.placeName, 'OSM node 666');
-    assert.notOk(
-      await localForage.get('place-name-cache', 'osm:node:666'),
-      'No fallback name persisted in the IndexedDB name cache'
-    );
-    assert.true(
-      resolver._unresolvable.has('osm:node:666'),
-      'Item is marked unresolvable for this session'
-    );
-  });
-
-  test('unresolvable items are not re-fetched within the same session', async function (assert) {
-    const resolver = this.owner.lookup('service:place-name-resolver');
-    const entry = makeEntry({ placeIdentifier: 'osm:node:777' });
-    let fetchCount = 0;
-    resolver.osm.fetchOsmObjectsBatch = async () => {
-      fetchCount++;
-      return new Map();
-    };
-
-    // First call triggers a fetch
-    await resolver.resolveInBackground([entry]);
-    await flushPromises();
-
-    assert.strictEqual(fetchCount, 1, 'First call triggers a fetch');
-    assert.strictEqual(entry.placeName, 'OSM node 777');
-
-    // Second call should NOT trigger another fetch (already unresolvable)
-    await resolver.resolveInBackground([entry]);
-    await flushPromises();
-
-    assert.strictEqual(fetchCount, 1, 'Second call does not re-fetch');
-    assert.strictEqual(
-      entry.placeName,
-      'OSM node 777',
-      'Fallback is shown immediately'
-    );
-  });
-
-  test('successful batch resolution stores names in the name cache', async function (assert) {
-    const resolver = this.owner.lookup('service:place-name-resolver');
-    const localForage = this.owner.lookup('service:localForage');
-    const entry = makeEntry({ placeIdentifier: 'osm:node:111' });
-    resolver.osm.fetchOsmObjectsBatch = async () => {
-      const map = new Map();
-      map.set('node:111', { title: 'Resolved Café' });
-      return map;
-    };
-
-    await resolver.resolveInBackground([entry]);
-    await flushPromises();
-
-    assert.strictEqual(entry.placeName, 'Resolved Café');
-    assert.strictEqual(
-      await localForage.get('place-name-cache', 'osm:node:111'),
-      'Resolved Café',
-      'Name is stored in the name cache'
-    );
-  });
-
-  test('reset clears per-session state', function (assert) {
-    const resolver = this.owner.lookup('service:place-name-resolver');
-    resolver._unresolvable.add('test-id');
-    resolver._lastBatchSignature = 'sig';
-    resolver._pendingBatchPromise = Promise.resolve();
-
-    resolver.reset();
-
-    assert.strictEqual(resolver._unresolvable.size, 0);
-    assert.strictEqual(resolver._lastBatchSignature, '');
-    assert.strictEqual(resolver._pendingBatchPromise, null);
-  });
-});

tests/unit/utils/activity-test.js

@@ -1,211 +0,0 @@
-import { module, test } from 'qunit';
-import {
-  ActivityEntry,
-  parseZapReceipt,
-  enrichWithPhoto,
-} from 'marco/utils/activity';
-import {
-  setVerifyWrappedEventMethod,
-  fakeVerifyEvent,
-} from 'applesauce-core/helpers/event';
-
-setVerifyWrappedEventMethod(fakeVerifyEvent);
-
-const USER_PUBKEY = 'a'.repeat(64);
-const SENDER_PUBKEY = 'b'.repeat(64);
-
-const PHOTO_EVENT_ID = '1'.repeat(64);
-const RECEIPT_ID = '2'.repeat(64);
-const ZAP_REQ_ID_1 = '3'.repeat(64);
-const ZAP_REQ_ID_2 = '4'.repeat(64);
-const PHOTO_XYZ_ID = '5'.repeat(64);
-const OTHER_EVENT_ID = '6'.repeat(64);
-
-const BOLT11_INVOICE =
-  'lnbc20u1p3y0x3hpp5743k2g0fsqqxj7n8qzuhns5gmkk4djeejk3wkp64ppevgekvc0jsdqcve5kzar2v9nr5gpqd4hkuetesp5ez2g297jduwc20t6lmqlsg3man0vf2jfd8ar9fh8fhn2g8yttfkqxqy9gcqcqzys9qrsgqrzjqtx3k77yrrav9hye7zar2rtqlfkytl094dsp0ms5majzth6gt7ca6uhdkxl983uywgqqqqlgqqqvx5qqjqrzjqd98kxkpyw0l9tyy8r8q57k7zpy9zjmh6sez752wj6gcumqnj3yxzhdsmg6qq56utgqqqqqqqqqqqeqqjq7jd56882gtxhrjm03c93aacyfy306m4fq0tskf83c0nmet8zc2lxyyg3saz8x6vwcp26xnrlagf9semau3qm2glysp7sv95693fphvsp54l567';
-
-function makeZapReceiptEvent(opts = {}) {
-  const recipient = opts.recipient || USER_PUBKEY;
-  const sender = opts.sender || SENDER_PUBKEY;
-  const zappedEventId = opts.zappedEventId || PHOTO_EVENT_ID;
-
-  const description = JSON.stringify({
-    kind: 9734,
-    pubkey: sender,
-    content: opts.message || '',
-    id: ZAP_REQ_ID_1,
-    created_at: 10000,
-    sig: 'fake',
-    tags: [
-      ['p', recipient],
-      ['relays', ['wss://relay.example.com']],
-    ],
-  });
-
-  return {
-    id: opts.id || RECEIPT_ID,
-    kind: 9735,
-    pubkey: opts.receiptAuthor || 'zap-service-pubkey',
-    created_at: opts.created_at || 10000,
-    tags: [
-      ['p', recipient],
-      ['P', sender],
-      ['e', zappedEventId],
-      ['bolt11', BOLT11_INVOICE],
-      ['description', description],
-    ],
-    content: '',
-    sig: 'sig',
-  };
-}
-
-function makePhotoEvent(opts = {}) {
-  return {
-    id: opts.id || PHOTO_EVENT_ID,
-    pubkey: opts.author || USER_PUBKEY,
-    kind: 360,
-    created_at: opts.created_at || 5000,
-    tags: [
-      ['i', opts.placeIdentifier || 'osm:node:123'],
-      ['imeta', `url ${opts.url || 'https://x.com/photo.jpg'}`, 'dim 800x600'],
-    ],
-    content: '',
-    sig: 'sig',
-  };
-}
-
-module('Unit | Utility | activity', function () {
-  test('ActivityEntry has type "zap" and tracked sender fields', function (assert) {
-    const entry = new ActivityEntry({
-      photoEventId: '1'.repeat(64),
-      photo: null,
-      placeIdentifier: 'osm:node:1',
-      senderPubkey: SENDER_PUBKEY,
-      amountSats: 21,
-      message: 'Nice!',
-      createdAt: 10000,
-    });
-
-    assert.strictEqual(entry.type, 'zap');
-    assert.strictEqual(entry.senderPubkey, SENDER_PUBKEY);
-    assert.strictEqual(entry.amountSats, 21);
-    assert.strictEqual(entry.message, 'Nice!');
-    assert.true(entry.senderProfileLoading, 'senderProfileLoading starts true');
-  });
-
-  test('parseZapReceipt extracts sender, amount, and zapped event id', function (assert) {
-    const receipt = makeZapReceiptEvent({ message: 'Great photo!' });
-    const entry = parseZapReceipt(receipt, USER_PUBKEY);
-
-    assert.ok(entry, 'returns an entry');
-    assert.strictEqual(entry.senderPubkey, SENDER_PUBKEY);
-    assert.strictEqual(entry.photoEventId, PHOTO_EVENT_ID);
-    assert.strictEqual(entry.amountSats, 2000, '2000000 msat → 2000 sats');
-    assert.strictEqual(entry.message, 'Great photo!');
-    assert.strictEqual(entry.createdAt, 10000);
-  });
-
-  test('parseZapReceipt returns null when recipient is not the user', function (assert) {
-    const receipt = makeZapReceiptEvent({
-      recipient: 'c'.repeat(64),
-    });
-    const entry = parseZapReceipt(receipt, USER_PUBKEY);
-    assert.notOk(entry, 'not directed at the user');
-  });
-
-  test('parseZapReceipt returns null for wrong kind', function (assert) {
-    const receipt = makeZapReceiptEvent();
-    receipt.kind = 1;
-    const entry = parseZapReceipt(receipt, USER_PUBKEY);
-    assert.notOk(entry);
-  });
-
-  test('parseZapReceipt returns null when no event pointer', function (assert) {
-    const receipt = makeZapReceiptEvent();
-    receipt.tags = receipt.tags.filter((t) => t[0] !== 'e');
-    const entry = parseZapReceipt(receipt, USER_PUBKEY);
-    assert.notOk(entry);
-  });
-
-  test('parseZapReceipt handles null message', function (assert) {
-    const description = JSON.stringify({
-      kind: 9734,
-      pubkey: SENDER_PUBKEY,
-      content: '',
-      id: ZAP_REQ_ID_2,
-      created_at: 10000,
-      sig: 'fake',
-      tags: [
-        ['p', USER_PUBKEY],
-        ['relays', ['wss://relay.example.com']],
-      ],
-    });
-    const receipt = makeZapReceiptEvent({ description });
-    const entry = parseZapReceipt(receipt, USER_PUBKEY);
-
-    assert.ok(entry);
-    assert.strictEqual(entry.message, null, 'empty content → null message');
-  });
-
-  test('enrichWithPhoto populates photo and placeIdentifier from the store', function (assert) {
-    const photoEvent = makePhotoEvent({
-      id: PHOTO_XYZ_ID,
-      placeIdentifier: 'osm:way:456',
-    });
-    const mockStore = {
-      getEvent: (id) => (id === PHOTO_XYZ_ID ? photoEvent : undefined),
-    };
-
-    const entry = parseZapReceipt(
-      makeZapReceiptEvent({ zappedEventId: PHOTO_XYZ_ID }),
-      USER_PUBKEY
-    );
-
-    const result = enrichWithPhoto(entry, mockStore, USER_PUBKEY);
-
-    assert.true(result, 'enrichment succeeded');
-    assert.ok(entry.photo, 'photo is populated');
-    assert.strictEqual(
-      entry.placeIdentifier,
-      'osm:way:456',
-      'placeIdentifier extracted from photo'
-    );
-    assert.strictEqual(entry.photo.url, 'https://x.com/photo.jpg');
-  });
-
-  test('enrichWithPhoto returns false when zapped event is not a kind 360', function (assert) {
-    const nonPhotoEvent = { id: OTHER_EVENT_ID, pubkey: USER_PUBKEY, kind: 1 };
-    const mockStore = { getEvent: () => nonPhotoEvent };
-
-    const entry = parseZapReceipt(
-      makeZapReceiptEvent({ zappedEventId: OTHER_EVENT_ID }),
-      USER_PUBKEY
-    );
-
-    const result = enrichWithPhoto(entry, mockStore, USER_PUBKEY);
-    assert.false(result, 'not a kind 360');
-    assert.notOk(entry.photo);
-  });
-
-  test('enrichWithPhoto returns false when zapped event is not authored by the user', function (assert) {
-    const otherUserPhoto = makePhotoEvent({ author: 'z'.repeat(64) });
-    const mockStore = { getEvent: () => otherUserPhoto };
-
-    const entry = parseZapReceipt(
-      makeZapReceiptEvent({ zappedEventId: PHOTO_EVENT_ID }),
-      USER_PUBKEY
-    );
-
-    const result = enrichWithPhoto(entry, mockStore, USER_PUBKEY);
-    assert.false(result, 'not authored by the user');
-  });
-
-  test('enrichWithPhoto returns false when zapped event not in store', function (assert) {
-    const mockStore = { getEvent: () => undefined };
-
-    const entry = parseZapReceipt(makeZapReceiptEvent(), USER_PUBKEY);
-
-    const result = enrichWithPhoto(entry, mockStore, USER_PUBKEY);
-    assert.false(result, 'event not in store');
-  });
-});

tests/unit/utils/format-text-test.js

@@ -55,34 +55,12 @@ module('Unit | Utility | format-text', function () {
 
   test('formatRelativeDate returns an absolute date for timestamps older than a week', function (assert) {
     const now = Math.floor(Date.now() / 1000);
-    const oldTimestamp = now - 86400 * 400; // 400 days ago (previous year)
+    const oldTimestamp = now - 86400 * 30; // 30 days ago
     const result = formatRelativeDate(oldTimestamp);
     // The exact format depends on the locale, but it should contain a year
     assert.ok(
-      result.includes(String(new Date().getFullYear() - 1)),
-      'Contains the previous year'
-    );
-  });
-
-  test('formatRelativeDate omits year for same-year dates older than a week', function (assert) {
-    const now = Math.floor(Date.now() / 1000);
-    const sameYearTimestamp = now - 86400 * 30; // 30 days ago (same year)
-    const result = formatRelativeDate(sameYearTimestamp);
-    // Should NOT contain the current year
-    assert.notOk(
       result.includes(String(new Date().getFullYear())),
-      'Does not contain the current year'
+      'Contains the year'
     );
-    // Should contain month and day
-    const expectedMonth = new Date(sameYearTimestamp * 1000).toLocaleDateString(
-      undefined,
-      { month: 'short' }
-    );
-    const expectedDay = new Date(sameYearTimestamp * 1000).toLocaleDateString(
-      undefined,
-      { day: 'numeric' }
-    );
-    assert.ok(result.includes(expectedMonth), 'Contains month');
-    assert.ok(result.includes(expectedDay), 'Contains day');
   });
 });