v3.66.399

Author: Spl0itable

build.mjs

@@ -41,15 +41,6 @@ async function emit(rel, code) {
   await fs.writeFile(dest, code);
 }
 
-const swRegisterSource = `if ('serviceWorker' in navigator) {
-  window.addEventListener('load', function () {
-    navigator.serviceWorker.register('/sw.js').catch(function (e) {
-      console.error('Service worker registration failed', e);
-    });
-  });
-}
-`;
-
 async function run() {
   await fs.rm(dist, { recursive: true, force: true });
   await fs.mkdir(dist, { recursive: true });
@@ -79,11 +70,6 @@ async function run() {
     assetMap.set(rel, hashed);
   }
 
-  // Service worker registration shim (external, to satisfy strict CSP).
-  const swReg = (await transform(swRegisterSource, { loader: 'js', minify: true })).code;
-  const swRegRel = hashedName('js/sw-register.js', swReg);
-  await emit(swRegRel, swReg);
-
   // Replace original asset paths with hashed ones in HTML. Longest keys first
   // so shorter paths can't partially shadow longer ones.
   const replacements = [...assetMap.entries()].sort((a, b) => b[0].length - a[0].length);
@@ -92,8 +78,7 @@ async function run() {
     return html;
   };
 
-  let indexHtml = rewriteHtml(await fs.readFile(path.join(root, 'index.html'), 'utf8'));
-  indexHtml = indexHtml.replace('</body>', `    <script src="${swRegRel}"></script>\n</body>`);
+  const indexHtml = rewriteHtml(await fs.readFile(path.join(root, 'index.html'), 'utf8'));
   await emit('index.html', await minifyHtml(indexHtml, htmlMinifyOptions));
 
   for (const file of await walk(path.join(root, 'static'))) {
@@ -102,73 +87,25 @@ async function run() {
     else await emit(rel, await fs.readFile(file));
   }
 
-  // Precache the full app shell: index, hashed assets, static pages.
-  const precache = ['/'];
-  for (const hashed of assetMap.values()) precache.push('/' + hashed);
-  precache.push('/' + swRegRel);
-  for (const file of await walk(path.join(dist, 'static'))) {
-    if (file.endsWith('.html')) precache.push('/' + toPosix(path.relative(dist, file)));
-  }
-
-  const version = sha8(Buffer.from([...assetMap.values()].sort().join('|')));
-  const sw = `const CACHE = 'nym-${version}';
-const PRECACHE = ${JSON.stringify(precache)};
-self.addEventListener('install', (e) => {
-  e.waitUntil(caches.open(CACHE).then((c) => c.addAll(PRECACHE)).then(() => self.skipWaiting()));
-});
-self.addEventListener('activate', (e) => {
-  e.waitUntil(caches.keys().then((keys) => Promise.all(keys.filter((k) => k !== CACHE).map((k) => caches.delete(k)))).then(() => self.clients.claim()));
-});
-self.addEventListener('fetch', (e) => {
-  const req = e.request;
-  if (req.method !== 'GET') return;
-  const url = new URL(req.url);
-  if (url.origin !== self.location.origin) return;
-  if (url.pathname.startsWith('/api/')) return;
-  if (req.mode === 'navigate') {
-    e.respondWith(
-      fetch(req).then((res) => {
-        const copy = res.clone();
-        caches.open(CACHE).then((c) => c.put(req, copy));
-        return res;
-      }).catch(() => caches.match(req).then((r) => r || caches.match('/')))
-    );
-    return;
-  }
-  e.respondWith(
-    caches.match(req).then((cached) => cached || fetch(req).then((res) => {
-      if (res.ok && res.type === 'basic') {
-        const copy = res.clone();
-        caches.open(CACHE).then((c) => c.put(req, copy));
-      }
-      return res;
-    }))
-  );
-});
-`;
-  await emit('sw.js', sw);
-
   // robots.txt verbatim.
   await emit('robots.txt', await fs.readFile(path.join(root, 'robots.txt')));
 
-  // _headers + immutable caching for hashed assets, no-cache for entry/sw.
+  // _headers + immutable caching for hashed assets, no-cache for entry.
   const headers = await fs.readFile(path.join(root, '_headers'), 'utf8');
   const cacheRules = `
 
 /js/*
   Cache-Control: public, max-age=31536000, immutable
 /css/*
   Cache-Control: public, max-age=31536000, immutable
-/sw.js
-  Cache-Control: no-cache
 /index.html
   Cache-Control: no-cache
 /
   Cache-Control: no-cache
 `;
   await emit('_headers', headers.replace(/\s*$/, '') + cacheRules);
 
-  console.log(`Built ${assetMap.size + 1} assets to dist/ (cache nym-${version}, ${precache.length} precached).`);
+  console.log(`Built ${assetMap.size} assets to dist/.`);
 }
 
 run().catch((e) => { console.error(e); process.exit(1); });

js/modules/pms.js

@@ -2070,7 +2070,7 @@ Object.assign(NYM.prototype, {
                 ? `<span class="verified-badge" title="${this.verifiedBot.title}">✓</span>`
                 : '';
         const displayNym = `${this.escapeHtml(baseNym)}<span class="nym-suffix">#${suffix}</span>${flairHtml}${verifiedBadge}${friendBadge}`;
-        const pmHeaderHtml = `<img src="${this.escapeHtml(pmAvatarSrc)}" class="avatar-message" data-avatar-pubkey="${safePk}" alt="" loading="lazy">@${displayNym} <span class="nm-pms-1">(PM)</span>`;
+        const pmHeaderHtml = `<img src="${this.escapeHtml(pmAvatarSrc)}" class="avatar-message" data-avatar-pubkey="${safePk}" alt="" loading="lazy">${displayNym} <span class="nm-pms-1">(PM)</span>`;
 
         // Update UI with formatted nym
         const _pmHeaderEl = document.getElementById('currentChannel');

js/modules/users.js

@@ -1787,7 +1787,7 @@ Object.assign(NYM.prototype, {
                 if (channelEl.dataset.pmHeaderSig !== sig) {
                     const pmAvatarSrc = this.getAvatarUrl(pubkey);
                     const displayNym = `${this.escapeHtml(baseNym)}<span class="nym-suffix">#${suffix}</span>${flairHtml}${friendBadge}`;
-                    channelEl.innerHTML = `<img src="${this.escapeHtml(pmAvatarSrc)}" class="avatar-message" data-avatar-pubkey="${safePk}" alt="" loading="lazy">@${displayNym} <span class="nm-usr-2">(PM)</span>`;
+                    channelEl.innerHTML = `<img src="${this.escapeHtml(pmAvatarSrc)}" class="avatar-message" data-avatar-pubkey="${safePk}" alt="" loading="lazy">${displayNym} <span class="nm-usr-2">(PM)</span>`;
                     channelEl.dataset.pmHeaderSig = sig;
                 }
             }