1.27.1

Merge pull request 'Fix WhatsApp links/numbers' (#79 ) from bugfix/whatsapp_links into master
Reviewed-on: #79
2026-08-19 12:44:47 -06:00 · 2026-08-19 18:42:26 +00:00 · 2026-08-19 12:39:50 -06:00 · 2026-08-19 18:36:11 +00:00 · 2026-08-19 12:32:21 -06:00 · 2026-08-19 12:24:50 -06:00
14 changed files with 152 additions and 50 deletions
@@ -1,48 +1,86 @@
+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 ContributionPhoto from './contribution-photo';
+import Modal from './modal';
+import NostrConnect from './nostr-connect';
 import eq from 'ember-truth-helpers/helpers/eq';
 import not from 'ember-truth-helpers/helpers/not';
 import restoreScroll from '../modifiers/restore-scroll';

-<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>
-        My Contributions
-      </h2>
-      <button type="button" class="close-btn" {{on "click" @onClose}}>
-        <Icon @name="x" @size={{20}} @color="#333" />
-      </button>
+export default class ContributionsTimelineComponent 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>
+          My Contributions
+        </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 contributions.
+          </p>
+        {{else if (not @items.length)}}
+          <p class="empty-state">No contributions yet. Start by adding photos to
+            places.</p>
+        {{else}}
+          <ul class="contributions-list">
+            {{#each @items as |item|}}
+              {{#if (eq item.type "photo")}}
+                <ContributionPhoto @item={{item}} @onSelect={{@onSelect}} />
+              {{/if}}
+            {{/each}}
+          </ul>
+        {{/if}}
+      </div>
    </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">
-          Connect your Nostr account to see your contributions.
-        </p>
-      {{else if (not @items.length)}}
-        <p class="empty-state">No contributions yet. Start by adding photos to
-          places.</p>
-      {{else}}
-        <ul class="contributions-list">
-          {{#each @items as |item|}}
-            {{#if (eq item.type "photo")}}
-              <ContributionPhoto @item={{item}} @onSelect={{@onSelect}} />
-            {{/if}}
-          {{/each}}
-        </ul>
-      {{/if}}
-    </div>
-  </div>
-</template>
+    {{#if this.isNostrConnectModalOpen}}
+      <Modal @onClose={{this.closeNostrConnectModal}}>
+        <NostrConnect @onConnect={{this.onNostrConnected}} />
+      </Modal>
+    {{/if}}
+  </template>
+}
@@ -232,7 +232,7 @@ export default class PlaceDetails extends Component {
      return htmlSafe(
        parts
          .map((p) => {
-            const safeTel = p.replace(/[\s-]+/g, '');
+            const safeTel = p.replace(/[\s()+.-]/g, '');
            return `<a href="https://wa.me/${safeTel}" target="_blank" rel="noopener noreferrer">${p}</a>`;
          })
          .join('<br>')
@@ -43,6 +43,11 @@ export default class ContributionsController extends Controller {
    this.router.transitionTo(`/place/${item.placeIdentifier}`);
  }

+  @action
+  onNostrConnected() {
+    this.loadContributionsTask.perform(this.nostrAuth.pubkey);
+  }
+
  @action
  backToMenu() {
    this.router.transitionTo('menu');
@@ -10,6 +10,7 @@ import ContributionsTimeline from '#components/contributions-timeline';
      @onSelect={{@controller.selectContribution}}
      @onBack={{@controller.backToMenu}}
      @onClose={{@controller.close}}
+      @onNostrConnected={{@controller.onNostrConnected}}
    />
  {{/if}}
 </template>
@@ -1,6 +1,6 @@
 {
  "name": "marco",
-  "version": "1.27.0",
+  "version": "1.27.1",
  "private": true,
  "description": "Unhosted maps app",
  "repository": {
@@ -39,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-MT6QR2E9.js"></script>
-  <link rel="stylesheet" crossorigin href="/assets/main-sIiovt6q.css">
+  <script type="module" crossorigin src="/assets/main-D3dQ-CGf.js"></script>
+  <link rel="stylesheet" crossorigin href="/assets/main-P9lvOtv_.css">
 </head>
  <body>
    <div id="modal-portal"></div>
@@ -1,14 +1,23 @@
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'marco/tests/helpers';
 import { render, click } from '@ember/test-helpers';
+import Service from '@ember/service';
 import ContributionsTimeline from 'marco/components/contributions-timeline';
+import { setupNostrMocks } from 'marco/tests/helpers/mock-nostr';

 function noop() {}

+class MockToastService extends Service {
+  show() {}
+}
+
 module('Integration | Component | contributions-timeline', function (hooks) {
  setupRenderingTest(hooks);
+  setupNostrMocks(hooks);

  hooks.beforeEach(function () {
+    this.owner.register('service:toast', MockToastService);
+
    this.noop = noop;
    this.emptyItems = [];
  });
@@ -48,6 +57,28 @@ module('Integration | Component | contributions-timeline', function (hooks) {
    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>
+        <ContributionsTimeline
+          @items={{this.emptyItems}}
+          @isLoading={{false}}
+          @isConnected={{false}}
+          @onBack={{this.noop}}
+          @onClose={{this.noop}}
+          @onSelect={{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 contributions', async function (assert) {
    await render(
      <template>
@@ -320,14 +320,14 @@ module('Integration | Component | place-details', function (hooks) {
    const links = whatsappBlock.querySelectorAll('a[href^="https://wa.me/"]');
    assert.strictEqual(links.length, 2, 'Rendered exactly 2 WhatsApp links');

-    // Verify it stripped the dashes and spaces for the wa.me URL
+    // Verify it stripped the dashes, spaces and leading plus for the wa.me URL
    assert.strictEqual(
      links[0].getAttribute('href'),
-      'https://wa.me/+44987654321'
+      'https://wa.me/44987654321'
    );
    assert.strictEqual(
      links[1].getAttribute('href'),
-      'https://wa.me/+12345678900'
+      'https://wa.me/12345678900'
    );

    // Verify it kept the dashes and spaces for the visible text
@@ -335,6 +335,33 @@ module('Integration | Component | place-details', function (hooks) {
    assert.dom(links[1]).hasText('+1 234-567 8900');
  });

+  test('it strips parentheses, dots and the leading plus from whatsapp hrefs', async function (assert) {
+    const place = {
+      title: 'Chat Shop',
+      osmTags: {
+        whatsapp: '+504-9850-3802;(504) 9850.3802;+1.234.567.8900',
+      },
+    };
+
+    await render(<template><PlaceDetails @place={{place}} /></template>);
+
+    const links = this.element.querySelectorAll('a[href^="https://wa.me/"]');
+    assert.strictEqual(links.length, 3, 'Rendered exactly 3 WhatsApp links');
+
+    assert.strictEqual(
+      links[0].getAttribute('href'),
+      'https://wa.me/50498503802'
+    );
+    assert.strictEqual(
+      links[1].getAttribute('href'),
+      'https://wa.me/50498503802'
+    );
+    assert.strictEqual(
+      links[2].getAttribute('href'),
+      'https://wa.me/12345678900'
+    );
+  });
+
  test('it renders correct OpenStreetMap link for an OSM place', async function (assert) {
    const place = {
      title: 'OSM Place',
Author	SHA1	Message	Date
raucao	c9a6304926	1.27.1 CI / Lint (push) Successful in 1m0s Details CI / Test (push) Successful in 1m13s Details	2026-08-19 12:44:47 -06:00
raucao	6fb4ecede3	Merge pull request 'Fix WhatsApp links/numbers' (#79 ) from bugfix/whatsapp_links into master CI / Lint (push) Successful in 59s Details CI / Test (push) Successful in 1m13s Details Reviewed-on: #79	2026-08-19 18:42:26 +00:00
raucao	77db625b11	Fix WhatsApp links/numbers CI / Lint (pull_request) Successful in 1m3s Details CI / Test (pull_request) Successful in 1m14s Details Release Drafter / Update release notes draft (pull_request) Successful in 5s Details Our links would work after opening WhatsApp, but not render e.g. known business names associated with the number on the intermediate page that you open the app or web app from	2026-08-19 12:39:50 -06:00
raucao	6351cfbd07	Merge pull request 'Connect Nostr account from My Contributions' (#78 ) from feature/connect_nostr_from_contributions_timeline into master CI / Lint (push) Successful in 1m2s Details CI / Test (push) Successful in 1m12s Details Reviewed-on: #78	2026-08-19 18:36:11 +00:00
raucao	b7e46da3e9	Add test for new Nostr connect location CI / Lint (pull_request) Successful in 1m2s Details CI / Test (pull_request) Successful in 1m14s Details Release Drafter / Update release notes draft (pull_request) Successful in 7s Details	2026-08-19 12:32:21 -06:00
raucao	3233150cc4	Connect Nostr account from My Contributions And upon connection, immediately fetch contributions and render them	2026-08-19 12:24:50 -06:00
raucao	822472a0e6	Merge pull request 'App content/copy/links' (#77 ) from ui/copy into master CI / Lint (push) Successful in 1m1s Details CI / Test (push) Successful in 1m13s Details Reviewed-on: #77	2026-08-19 18:03:58 +00:00