wiki-plugin-salon 0.0.1 → 0.0.3

package/client/salon.js

@@ -87,8 +87,18 @@ window.plugins.salon = (function() {
         if (data.isOwner) {
           const configDiv = document.createElement('div');
           configDiv.style.cssText = 'border:1px solid rgba(196,181,253,0.2);border-radius:8px;padding:12px;margin-top:8px;background:rgba(124,58,237,0.06);font-family:system-ui;';
+          const pendingBadge = data.pendingCount > 0
+            ? `<span style="background:#f59e0b;color:#000;border-radius:9px;font-size:0.7rem;padding:1px 6px;margin-left:6px;">${data.pendingCount} pending</span>`
+            : '';
           configDiv.innerHTML = `
-            <div style="font-size:0.8rem;color:#c4b5fd;margin-bottom:8px;font-weight:600;">Allyabase connection (owner only)</div>
+            <div style="display:flex;align-items:center;justify-content:space-between;margin-bottom:10px;">
+              <span style="font-size:0.8rem;color:#c4b5fd;font-weight:600;">Owner panel${pendingBadge}</span>
+              <a href="/plugin/salon/admin" target="_blank"
+                style="font-size:0.78rem;color:#7c3aed;text-decoration:none;border:1px solid rgba(124,58,237,0.4);border-radius:4px;padding:3px 8px;">
+                Admin ↗
+              </a>
+            </div>
+            <div style="font-size:0.8rem;color:#a0a0a0;margin-bottom:8px;">Allyabase URL</div>
             <div style="display:flex;gap:6px;align-items:center;">
               <input id="salon-url-input" value="${escapeHtml(data.allyabaseUrl || '')}" placeholder="https://dev.allyabase.com"
                 style="flex:1;background:#0d001a;border:1px solid rgba(196,181,253,0.3);border-radius:4px;padding:6px 8px;color:#e0d0ff;font-size:0.8rem;">

package/package.json

@@ -1,13 +1,11 @@
 {
   "name": "wiki-plugin-salon",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "description": "Federated Wiki plugin — community gathering space with self-registration and plugin event feeds",
   "keywords": ["wiki", "plugin", "salon", "community", "planet-nine"],
   "author": "Planet Nine",
   "license": "MIT",
   "type": "commonjs",
   "main": "index.js",
-  "dependencies": {
-    "nodemailer": "^6.9.0"
-  }
+  "dependencies": {}
 }

package/server/server.js

@@ -93,14 +93,21 @@ function buildEventEmail(config, event, detail) {
 
 // ── Email ─────────────────────────────────────────────────────────────────────
 
-function createTransporter(config) {
-  const nodemailer = require('nodemailer');
-  return nodemailer.createTransport({
-    host: config.minnieHost || 'localhost',
-    port: parseInt(config.minniePort) || 2525,
-    secure: false,
-    tls: { rejectUnauthorized: false }
+function getMinnieUrl(config) {
+  const base = config.allyabaseUrl ||
+    (config.joanUrl ? config.joanUrl.replace(/\/plugin\/allyabase\/joan$/, '') : '');
+  return base ? base.replace(/\/$/, '') + '/plugin/allyabase/minnie' : null;
+}
+
+async function sendViaMinnie(minnieUrl, { from, to, subject, text }) {
+  const resp = await fetch(`${minnieUrl}/send`, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({ from, to, subject, text }),
+    signal: AbortSignal.timeout(10000)
   });
+  if (!resp.ok) throw new Error(`Minnie /send failed: ${resp.status}`);
+  return resp.json();
 }
 
 async function notifyMembers(config, subject, text) {
@@ -108,12 +115,17 @@ async function notifyMembers(config, subject, text) {
   const recipients = Object.values(tenants).filter(t => t.status === 'active' && t.email);
   if (recipients.length === 0) return;
 
-  const transporter = createTransporter(config);
-  const from = `"${config.title}" <${config.fromEmail || 'salon@planetnine.app'}>`;
+  const minnieUrl = getMinnieUrl(config);
+  if (!minnieUrl) {
+    console.warn('salon: no Minnie URL configured — skipping email notifications');
+    return;
+  }
+
+  const from = config.fromEmail || 'salon@planetnine.app';
 
   for (const tenant of recipients) {
     try {
-      await transporter.sendMail({ from, to: tenant.email, subject, text });
+      await sendViaMinnie(minnieUrl, { from, to: tenant.email, subject, text });
     } catch (err) {
       console.error(`salon: email failed for ${tenant.email}:`, err.message);
     }
@@ -632,15 +644,12 @@ function generateAdminPage(config, tenants) {
           <label>From address</label>
           <input name="fromEmail" value="${esc(config.fromEmail || 'salon@planetnine.app')}" placeholder="salon@planetnine.app">
 
-          <label>Minnie host</label>
-          <input name="minnieHost" value="${esc(String(config.minnieHost || 'localhost'))}" placeholder="localhost">
-
-          <label>Minnie port</label>
-          <input name="minniePort" type="number" value="${esc(String(config.minniePort || 2525))}" placeholder="2525">
-
-          <label>Joan URL</label>
-          <input name="joanUrl" value="${esc(config.joanUrl || 'http://localhost:3008')}" placeholder="http://localhost:3008">
-          <div class="form-hint">Used to send OTP codes for member account recovery.</div>
+          <label>Allyabase URL</label>
+          <input name="allyabaseUrl" value="${esc(config.allyabaseUrl || (config.joanUrl ? config.joanUrl.replace(/\/plugin\/allyabase\/joan$/, '') : ''))}" placeholder="https://dev.allyabase.com">
+          <div class="form-hint">
+            Emails sent via <code>${esc((config.allyabaseUrl || (config.joanUrl ? config.joanUrl.replace(/\/plugin\/allyabase\/joan$/, '') : 'https://dev.allyabase.com')) + '/plugin/allyabase/minnie')}</code><br>
+            OTP codes sent via <code>${esc(config.joanUrl || 'https://dev.allyabase.com/plugin/allyabase/joan')}</code>
+          </div>
 
           <div style="margin-top:16px;">
             <button type="submit" class="btn btn-primary btn-sm">Save Settings</button>
@@ -1166,18 +1175,16 @@ function startServer(params) {
 
   app.post('/plugin/salon/config', owner, json, (req, res) => {
     const config = loadConfig();
-    const { registrationMode, title, description, fromEmail, minnieHost, minniePort, joanUrl, allyabaseUrl } = req.body;
+    const { registrationMode, title, description, fromEmail, joanUrl, allyabaseUrl } = req.body;
     const modes = ['open', 'closed', 'grant'];
     if (registrationMode && modes.includes(registrationMode)) config.registrationMode = registrationMode;
     if (title && title.trim()) config.title = title.trim();
     if (description !== undefined) config.description = description.trim();
     if (fromEmail   !== undefined) config.fromEmail   = fromEmail.trim();
-    if (minnieHost  !== undefined) config.minnieHost  = minnieHost.trim();
-    if (minniePort  !== undefined) config.minniePort  = parseInt(minniePort) || 2525;
     if (joanUrl     !== undefined) config.joanUrl     = joanUrl.trim();
-    if (allyabaseUrl !== undefined) {
-      config.allyabaseUrl = allyabaseUrl.trim();
-      config.joanUrl = allyabaseUrl.trim().replace(/\/$/, '') + '/plugin/allyabase/joan';
+    if (allyabaseUrl !== undefined && allyabaseUrl.trim()) {
+      config.allyabaseUrl = allyabaseUrl.trim().replace(/\/$/, '');
+      config.joanUrl = config.allyabaseUrl + '/plugin/allyabase/joan';
     }
     saveConfig(config);
     const derivedAllyabaseUrl = config.allyabaseUrl ||
@@ -1427,16 +1434,21 @@ function startServer(params) {
     const recipients = Object.values(tenants).filter(t => t.status === 'active' && t.email);
 
     if (recipients.length === 0) {
-      return res.json({ success: true, sent: 0 });
+      return res.json({ success: true, sent: 0, warning: 'No active members with email addresses found' });
+    }
+
+    const minnieUrl = getMinnieUrl(config);
+    if (!minnieUrl) {
+      return res.status(503).json({ error: 'Email not configured — save your Allyabase URL in settings first' });
     }
 
-    const transporter = createTransporter(config);
-    const from = `"${config.title}" <${config.fromEmail || 'salon@planetnine.app'}>`;
+    const from = config.fromEmail || 'salon@planetnine.app';
     let sent = 0;
+    const errors = [];
 
     for (const tenant of recipients) {
       try {
-        await transporter.sendMail({
+        await sendViaMinnie(minnieUrl, {
           from,
           to: tenant.email,
           subject: subject.slice(0, 200),
@@ -1445,10 +1457,11 @@ function startServer(params) {
         sent++;
       } catch (err) {
         console.error(`salon: announce email failed for ${tenant.email}:`, err.message);
+        errors.push(tenant.email);
       }
     }
 
-    res.json({ success: true, sent });
+    res.json({ success: true, sent, ...(errors.length && { errors }) });
   });
 
   // ── Freyja federation page ──────────────────────────────────────────────────