@yz-social/civildefense.io 4.5.22 → 4.5.28

package/public/javascripts/conversation.js

@@ -19,7 +19,7 @@ export class Tagged { // Maintains cached existence within a (possibly instance-
     for (const key in properties) {
       const existing = this[key];
       const proposed = properties[key];
-      if (JSON.stringify(existing) !== JSON.stringify(proposed)) throw new Error(`Cannot update '${key}' from ${existing} to ${proposed}.`);
+      if (JSON.stringify(existing) !== JSON.stringify(proposed)) throw new Error(`Cannot update '${key}' in ${this.constructor.name} ${this.tag} from ${JSON.stringify(existing)} to ${JSON.stringify(proposed)}.`);
     }
     return this;
   }
@@ -32,13 +32,15 @@ export class Tagged { // Maintains cached existence within a (possibly instance-
 
   static async ensureIn(data, container, kind = container.itemKind) { // update() or initialize() item and remember what those answer. (Falsy is deleted).
     const {tag, payload, ...rest} = data;
-    let item = container.getItem(tag);
+    let item = container.getItem(tag); // existing item
     if (!payload) return item?.destroy();
+
+    // update or create item.
     if (item) item = await item.update(data);
     else item = await (new kind().initialize({...data, container}));
 
     if (!item) return container.removeItem(tag)?.destroy();
-    return container.setItem(tag, item);
+    return container.setItem(item.tag, item); // initialize() may come up with a better tag.
   }
 }
 

package/public/javascripts/hashtags.js

@@ -76,16 +76,18 @@ export const Hashtags = {
     }
     return extended;
   },
-  getAll() { // List of all the user's hashtags.
+  getAll() { // List of all the user's extended hashtags.
     return Object.keys(this.hashtags);
   },
   getSubscribe() { // Return a list of the hashtags to which the user intendeds to subscribe.
     return this.getAll().filter(tag => this.hashtags[tag]);
   },
-  isSubscribed(key) {
-    return this.hashtags[key];
+  isSubscribed(key) { // Is this user subscribed to some form of this key.
+    const canonical = canonicalTag(key);                   // no emoji, lower case.
+    const ourExtended = this.canonical2extended[canonical];  // our current version, if any
+    return this.hashtags[ourExtended];
   },
-  isPublish(key) {
+  isPublish(key) { // Is this extended tag (in the user's preferred presentation) the user's current publishing tag?
     return this.hashtags[key] === 'pub';
   },
   backupPublisher: false,
@@ -123,7 +125,7 @@ export const Hashtags = {
     if (resetSubscriptions) {
       // We destroy unsubscribed markers right away, because we don't want the user to have to wait and wonder why they're still displayed.
       // If there are alerts in flight, they will be rejected by Alert initialize because we will have already turned off the sub.
-      Object.values(Alert.items).forEach(wrapper => this.hashtags[wrapper.hashtag] || wrapper.destroy());
+      Alert.items.forEach(wrapper => this.isSubscribed(wrapper.hashtag) || wrapper.destroy());
       Alert.updateSubscriptions();
     }
   },
@@ -158,6 +160,7 @@ export const Hashtags = {
     newtag.removeAttribute('aria-activedescendant');
     newtag.value = '';
     this.activeIndex = -1;
+    this.selectors = [];
   },
   openSelector() { // Open the autocomplete tag selector
     const { listbox, newtag } = this;
@@ -186,8 +189,9 @@ export const Hashtags = {
   acceptTag() { // Add the new hashtag.
     resetInactivityTimer();
     let tag = this.newtag?.value  // Get into standard form, but do not strip emoji or case into canonical yet.
-	.replace(/^#/, '')       // No leading hash
-	.replace(/\s+/g, ' ')    // Replace multiple spaces with a single space
+	.replace(/^#/, '')        // No leading hash
+	.replace(':', '.')        // Replace colon with some other separator.
+	.replace(/\s+/g, ' ')     // Replace multiple spaces with a single space
 	.normalize('NFD');        // Standardize different ways of making accents into decomposed form - but do not remove them.
     Alert.closePopup();
     if (!tag) return;
@@ -226,16 +230,8 @@ export const Hashtags = {
       item.toLowerCase().includes(matchString)
     );
 
-    if (matchString) {
-      const li = document.createElement('li');
-      li.className = 'combobox-empty combobox-option';
-      li.textContent = `Create tag "${query}"`;
-      li.onpointerdown = event => {
-	event.preventDefault();
-	event.stopPropagation();
-	this.acceptTag();
-      };
-      listbox.appendChild(li);
+    if (matchString && !this.selectors.includes(query)) {
+      this.selectors.unshift(query);
     }
     this.selectors.forEach((item, i) => {
       const li = document.createElement('li');
@@ -321,6 +317,7 @@ export const Hashtags = {
     clickTip(newtag, Int`Add a new topic for which the map should show any alerts.`, event => { // Focusing "add topic".
       event.stopPropagation();
       Alert.closePopup();
+      resetInactivityTimer();
       this.renderSelector('');
       if (navigator.maxTouchPoints <= 1) { // Only when no multi-touch. On-screen keyboard makes it shoot off the top.
 	showMessage(Int`Type a new topic name to see any alerts on the map with this topic.`, 'instructions');
@@ -360,13 +357,14 @@ export const Hashtags = {
 	if (this.activeIndex < 0) this.setActive(0);
 	else this.selectValue(this.selectors[this.activeIndex]); // Otherwise select what is active.
         break;
+      default:
+	this.activeIndex = -1;
       }
     };
     newtag.oninput = () => this.renderSelector(newtag.value);
     // When we click on the listbox, the browser will first blur newtag, and then
     // we would not get the click! So here we delay closing a bit.
     newtag.onblur = () => setTimeout(() => this.closeSelector(), 200);
-    newtag.onchange = () => this.acceptTag();
   },
   remove(chip, redisplaySubscribers = false) { // Remove this topic, persistently.
     delete this.hashtags[chip.label];

package/public/javascripts/main.js

@@ -24,6 +24,8 @@ var inactivityTimer = null, reconnectCountdown, networkPromise = null;
 export { networkPromise };
 export async function resetInactivityTimer(clearMessage = true) { // if !network, initialize(false), else disconnect after INACTIVITY_SECONDSif not restarted
   //console.log('resetInactivityTimer, networkPromise:', networkPromise);
+  document.body.classList.toggle('firstConversation', false);
+  document.body.classList.toggle('firstPublish', false);
   if (clearMessage) showMessage('');
   clearTimeout(inactivityTimer);
   clearInterval(reconnectCountdown);
@@ -46,6 +48,11 @@ export function clickTip(elementOrQuerySelector, text, clickHandler) { // toolti
   tooltip(element, text);
   element.onclick = clickHandler;
 }
+export function getText(querySelector) {
+  const element = document.querySelector(querySelector);
+  if (!element) throw new Error(`No element found for getText('${querySelector}').`);
+  return element.textContent;
+}
 
 function isWebView() { return /CriOS|(WebView|wv|(iPhone|iPod|iPad)(?!.*Safari))/.test(navigator.userAgent); }
 function isApple() { return navigator.platform.startsWith('Mac') || ['iPhone', 'iPad'].includes(navigator.platform); }
@@ -392,6 +399,11 @@ initText('#describePublic');
 initText('#describeSystem');
 initText('#pickLabels');
 initText('#wipe');
+initText('.firstConversation .teach.correspondent');
+initText('.firstPublish .teach.correspondent');
+initText('.teach.share');
+initText('.teach.attach');
+initText('.teach.changeHashtag');
 
 tooltip('#learnMore', Int`Click to see more information in another tab about what you can do with this app and how it is resistant to tracking, censorship, and takedown.`);
 tooltip('#aboutAnyone2', Int`Click to see the source code and documentation for serving copies of this app in another tab.`);

package/public/javascripts/p2pWebNetwork.js

@@ -45,6 +45,8 @@ export class P2PWebNetwork {
       onDisconnect: network.detached,
       author: false
     });
+    infoLogger ||= null;
+    debugLogger ||= null;
     Object.assign(network, {infoLogger, debugLogger, disconnector: disconnect, transport, nodeIdentity, peer});
 
     network.info(`Created network node for kernel ${this.kernelVersion} region 0x${this.regionCode(location.lat, location.lng).toString(16)}.`);
@@ -65,7 +67,7 @@ export class P2PWebNetwork {
   async disconnect(debugLogger = this.debugLogger) { // Politely close network connection.
     const health = this.peer.health();
     await this.disconnector();
-    if (debugLogger) debugLogger(health);
+    if (debugLogger) this.debug('health at disconnect', health);
     else this.shortHealth(health);
     this.resetStatePromises();
   }
@@ -251,7 +253,7 @@ export class P2PWebNetwork {
   }
   shortHealth(health = this.peer.health()) { // Info-report a short form of health.
     const roots = health.axonRoles.filter(r => r.isRoot);
-    this.info(`disconnected with connections ${health.peers.map(P2PWebNetwork.short)}\nand ${roots.length ? `roots ${roots.map(r => P2PWebNetwork.short(r.topic))}.` : 'no roots.'}`);
+    this.info(`disconnected with ${health.peers.length} connections: ${health.peers.map(P2PWebNetwork.short)}\nand ${roots.length ? `roots ${roots.map(r => P2PWebNetwork.short(r.topic))}.` : 'no roots.'}`);
   }
   inRegionConnections(health = this.peer.health()) {
     const region = this.nodeIdentity.id.slice(0, 2);

package/public/javascripts/protocol.js

@@ -6,7 +6,7 @@ let connect, createAuthorIdentity, geoCellId, geoCellCenter, WIRE_VERSION, KERNE
 // dht 1  -> Axona
 // dht 0  -> server
 // dht -1 -> in-memory on client only
-const defaultDHT = 1;
+const defaultDHT = globalThis.process ? 1 : 0; // Browser defaults to no Axona. Server nodes and alert-bot default to Axona.
 export const dht = parseInt((globalThis.process ?
 			     globalThis.process.env.DHT :
 			     new URL(globalThis.location).searchParams.get('dht')) ?? defaultDHT);
@@ -14,7 +14,7 @@ export const dht = parseInt((globalThis.process ?
 if (dht < 1) {
 
   const { v4:uuidv4 } = await import('uuid');
-  const { getContainingCells, getPointInCell } = await import('./s2.js');
+  const { getSmallestCellId, getPointInCell } = await import('./s2.js');
   const { cellHex } = await import('./versions.js');
   const operator = await import('./pubsub.js');
 
@@ -38,8 +38,8 @@ if (dht < 1) {
       return {authorId: tag};
     };
   geoCellId = (lat, lng) => {
-    const cells = getContainingCells(lat, lng);
-    const hex = cellHex(cells[0]);
+    const cellid = getSmallestCellId(lat, lng);
+    const hex = cellHex(cellid);
     const sliced = hex.slice(0, 2);
     return parseInt(sliced, 16); // The worst way to do this.
   };
@@ -97,9 +97,9 @@ if (dht < 1) {
 	  const subHandler = handlers[tag];
 	  const inFlightResolver = inFlight[tag];
 
-	  if ((!subHandler && !inFlightResolver) || // debug
-	      ((typeof(subHandler) !== 'function') && (typeof(inFlightResolver) !== 'function')))
-	    console.log({tag, rest, subHandler, inFlightResolver, handlers, inFlight});
+	  // if ((!subHandler && !inFlightResolver) || // debug
+	  //     ((typeof(subHandler) !== 'function') && (typeof(inFlightResolver) !== 'function')))
+	  //   console.warn('no handler or request', {tag, rest, subHandler, inFlightResolver, handlers, inFlight});
 
 	  if (subHandler) return subHandler(...rest);
 	  delete inFlight[tag];
@@ -107,7 +107,7 @@ if (dht < 1) {
 	};
 	socket.onopen = () => {
 	  if (socket.readyState !== WebSocket.OPEN) return; // You would think that can't happen, but...
-	  resolve((...rest) => { // send()
+	  resolve((...rest) => { // Promise the send() function.
 	    const tag = uuidv4();
 	    const {promise, resolve} = Promise.withResolvers();
 	    inFlight[tag] = resolve;
@@ -154,10 +154,12 @@ if (dht < 1) {
       kill(topic, msgId, options) {
 	return send('unpublish', topic, msgId, options);
       },
+      lookup() { return {}; },
       host() {},
       unhost() {}
     };
     const status = {peers: 0, ms: 0}; // fixme ms
+    await new Promise(resolve => setTimeout(resolve, 1e3)); // Simulate finding peers, and give the app some time to do stuff.
     return { peer, nodeIdentity, transport, status, disconnect };
   };
 

package/public/javascripts/pubsub.js

@@ -1,9 +1,18 @@
 // In memory pubsub, for either client-only testing, or server-websocket testing
 const { v4:uuidv4 } = await import('uuid');
 const { TextEncoder, crypto, Buffer } = globalThis;
+const publicationRolloverLimit = 1000;
 
 function setBucket(collection, type, topicId, subject, value) { // Set value in the collection.
   const bucket = collection[type][topicId] ||= {};
+  if ((collection === data) && (type === 'pub')) {
+    const keys = Object.keys(bucket);
+    const size = keys.length;
+    if (size >= publicationRolloverLimit) {
+      console.warn('Over pub limit on topic', topicId, size); // TODO: rotate out the earliest received.
+      delete bucket[keys[0]];
+    }
+  }
   bucket[subject] = value;
 }
 function removeBucket(collection, type, topicId, subject) { // Return the value and stop storing it.
@@ -20,7 +29,7 @@ const PUBLISH_TIMEOUT = 24 * 60 * 60e3;      // Delete after 24 hours.
 const timeouts = {pub: {}, sub: {}};
 function expire(type, topicId, subject, remover, timeout) { // Cancellably schedule remover() to fire at timeout.
   if (!timeout) return;
-  setBucket(timeouts, type, topicId, subject, setTimeout(remover, timeout));
+  setBucket(timeouts, type, topicId, subject, setTimeout(() => { remover(); cancel(type, topicId, subject); }, timeout));
 }
 function cancel(type, topicId, subject) { // Cancel a sheduled expiration.
   clearTimeout(removeBucket(timeouts, type, topicId, subject));
@@ -46,11 +55,19 @@ function normalizeTopic({name, region, owner, write = 'open'} = {}) {
 function deriveTopicId(topic) {
   return JSON.stringify(normalizeTopic(topic)); // No need to hash in this implementation.
 }
+function delay(ms = 0) {
+  return ms && new Promise(resolve => setTimeout(resolve, ms));
+}
 
 let invoke;
 export function setReceiver(receiver) {
   invoke = receiver;
 }
+const throttleMS = 30; // Just to yield to other stuff.
+async function pauseInvoke(...rest) {
+  invoke(...rest);
+  await new Promise(resolve => setTimeout(resolve, throttleMS));
+}
 
 export function subscribe(topicName, nodeTag, {since = 'all'}) {
   // Axona allows multiple handlers on the same topic, but we don't use that in civildefense, and do not implement it here.
@@ -59,25 +76,27 @@ export function subscribe(topicName, nodeTag, {since = 'all'}) {
   cancel('sub', topicId, id);
   expire('sub', topicId, id, () => deleteSub(topicId, id), SUBSCRIPTION_TIMEOUT);
   setBucket(data, 'sub', topicId, nodeTag, id);
-  if (since) setTimeout(() => { // invoke handler on any sticky data, but only after we have told client the subscription id.
-    let lastEnvelope = null, lastTime = 0;
-    for (const envelope of getDataValues('pub', topicId)) {
-      switch (since) {
-      case 'all':
-	invoke(nodeTag, id, envelope);
-	break;
-      case 'latest':
-	if (envelope.ts > lastTime) {
-	  lastTime = envelope.ts;
-	  lastEnvelope = envelope;
+  if (since) { // invoke handler on any sticky data, but only after we have told client the subscription id.
+    setTimeout(async () => {
+      let lastEnvelope = null, lastTime = 0;
+      for (const envelope of getDataValues('pub', topicId)) {
+	switch (since) {
+	case 'all':
+	  await pauseInvoke(nodeTag, id, envelope);
+	  break;
+	case 'latest':
+	  if (envelope.ts > lastTime) {
+	    lastTime = envelope.ts;
+	    lastEnvelope = envelope;
+	  }
+	  break;
+	default: // Must be a timestamp
+	  if (envelope.ts === since) await pauseInvoke(nodeTag, id, envelope);
 	}
-	break;
-      default: // Must be a timestamp
-	if (envelope.ts === since) invoke(nodeTag, id, envelope);
       }
-    }
-    if (lastEnvelope) invoke(nodeTag, id, lastEnvelope);
-  }, 100);
+      if (lastEnvelope) invoke(nodeTag, id, lastEnvelope);
+    }, 100);
+  }
   return {topicName, topicId, id};
 }
 
@@ -92,7 +111,10 @@ export function deleteSubscriber(nodeTag) {
   for (const topicId in data.sub)  {
     const keySubs = data.sub[topicId];
     for (const [subject, value] of Object.entries(keySubs)) {
-      if (nodeTag === subject) deleteSub(topicId, subject, keySubs);
+      if (nodeTag === subject) {
+	deleteSub(topicId, subject, keySubs);
+	cancel('sub', topicId, subject);
+      }
     }
   }
 }
@@ -106,19 +128,19 @@ export async function publish(topic, message, {signWith}) {
   const hash = await crypto.subtle.digest("SHA-256", new TextEncoder().encode(payload));
   const msgId = toHex(new Uint8Array(hash));
   const envelope = {msgId, topic, ts: Date.now(), message, signerPubkey};
-  for (const [nodeTag, id] of getDataEntries('sub', topicId)) invoke(nodeTag, id, envelope);
+  for (const [nodeTag, id] of getDataEntries('sub', topicId)) await pauseInvoke(nodeTag, id, envelope);
   setBucket(data, 'pub', topicId, msgId, envelope);
   expire('pub', topicId, msgId, () => removeBucket(data, 'pub', topicId, msgId), PUBLISH_TIMEOUT);
   return msgId;
 }
 
-export function unpublish(topic, msgId, {signWith}) {
+export async function unpublish(topic, msgId, {signWith}) {
   const topicId = deriveTopicId(topic);  
   cancel('pub', topicId, msgId);
   const envelope = removeBucket(data, 'pub', topicId, msgId);
   if (!envelope) return {ok: false}; // we didn't have it.
   envelope.deleted = true;
   envelope.message = null;
-  for (const [nodeTag, id] of getDataEntries('sub', topicId)) invoke(nodeTag, id, envelope);
+  for (const [nodeTag, id] of getDataEntries('sub', topicId)) await pauseInvoke(nodeTag, id, envelope);
   return {ok: true};
 }

package/public/javascripts/s2.js

@@ -1,6 +1,7 @@
 import { s2, s1, r1 } from 's2js';
 const { cellid, LatLng, Point, Cell, Cap, RegionCoverer } = s2;
 import { cellHex } from './versions.js';
+import { geoCellCenter/*, geoCellId*/ } from '@axona/protocol';
 const { BigInt } = globalThis;
 
 // s2 defines non-overlapping cells that completely cover the globe, at several different levels of cell-size.
@@ -12,43 +13,59 @@ const { BigInt } = globalThis;
 // Meanwhile as the user changes the area being shown, we subscribe to whatever cells we need in order to cover the display
 // area without overlapping cells.
 
-export const MIN_LEVEL = 3; // Corresponds to the top level Axona regions.
+export const MIN_LEVEL = 3; // The largest cell that is still smaller than an Axona region.
 const MAX_S2_LEVEL = 30; // The leaf level that Cell.fromPoint operates at.
 const MAX_MAP_LEVEL = 17; // The max level that findCoverCellsByCenterAndRadius will use on our maps.
 
 const EARTH_RADIUS_METERS = 6371e3;
 
 export function getPointInCell(cellId) { // answer [lat, lng] in degrees from a BigInt
+  // const {lat, lng} = geoCellCenter(cellid);
+  // return [lat, lng];
   // CAUTION: This is intended for s2 level 3 or finer, and won't always work symmetrically for our top-level regions.
   // e.g. getContainingCells(...getPointInCell( cell for 0x47 )][0] is 0x46!
   let center = s2.cellid.latLng(cellId);
   return [s1.angle.degrees(center.lat), s1.angle.degrees(center.lng)];
 }
 
-function getCellSubdivision(cell) {
+function getCellSubdivision(cell) { // Answer four children off BigInt cell, as BigInt.
   return cellid.children(cell);
 }
-function getCellLevel(cell) {
+export function getSubdivision(hexString) { // Same as getCellSubDivision, but accepting and returning hex strings.
+  return getCellSubdivision(BigInt('0x' + hexString)).map(childCell => cellHex(childCell));
+}
+function getCellLevel(cell) { // Answer level of BigInt cell, as number.
   return cellid.level(cell);
 }
-function getFace(cell) {
+function getCellFace(cell) { // Answer top level face id of BigInt cell, as integer 0 through 5.
   return cellid.face(cell);
 }
-export function getSubdivision(hexString) {
-  return getCellSubdivision(BigInt('0x' + hexString)).map(childCell => cellHex(childCell));
+export function cellContains(putativeOuter, putativeInner) { // Answer true IFF putativeOuter BigInt cell contains putativeInner
+  return cellid.contains(putativeOuter, putativeInner);
+}
+export function pointFromLatLng(lat, lng) { // Answer an s2 Point from lat/lng in degrees.
+  const latLng = LatLng.fromDegrees(lat, lng);
+  return Point.fromLatLng(latLng);
+}
+export function cellFromCellID(bigint) {
+  return Cell.fromCellID(bigint);
+}
+export function getSmallestCellId(lat, lng, level = MAX_MAP_LEVEL) { // Answer smallest BigInt cellid containing latitude/longitude in degrees, at integer level.
+  const userPt = pointFromLatLng(lat, lng);
+  const userLocCellId = Cell.fromPoint(userPt).id; // This is at MAX_S2_LEVEL
+  return cellid.parent(userLocCellId, level);
 }
 
-// Return a list of the cell ids that contain the point.
+// Return a list of the cell ids that contain the point, from region to MAX_S2_LEVEL
+// Note that the first of the cells (the region
 export function getContainingCells(lat, lng) {
-  const userLatLng = LatLng.fromDegrees(lat, lng);
-  const userPt = Point.fromLatLng(userLatLng);
-  // Get leaf-level CellId (level 30)
-  const userLocCellId = Cell.fromPoint(userPt).id; // This is at level 30.
-  let cells = Array(MAX_S2_LEVEL);
-  for (let level = 0; level <= MAX_S2_LEVEL; level++) { // This would be more efficient going backwards using immediateParent, but who cares.
-    cells[level] = cellid.parent(userLocCellId, level);
+  let id = getSmallestCellId(lat, lng);
+  const level = MAX_MAP_LEVEL, cells = Array(MAX_MAP_LEVEL + 1 - MIN_LEVEL);
+  for (let index = level - MIN_LEVEL; index >= 0; index--) {
+    cells[index] = id;
+    id = cellid.immediateParent(id);
   }
-  return cells.slice(MIN_LEVEL, MAX_MAP_LEVEL + 1); // We can only make use between Axona region size and the smallest region our maps subscribe to.
+  return cells;
 }
 
 export function findCoverCellsByMinMaxLatLng({minLat, maxLat, minLng, maxLng, full = false,
@@ -58,8 +75,8 @@ export function findCoverCellsByMinMaxLatLng({minLat, maxLat, minLng, maxLng, fu
 
   // There are a lot of ways that seem like they do this, but it is very easy to find something that works for a few cases,
   // but misses cells in some circumstances, so be wary about rewriting this.
-  const lo = s2.LatLng.fromDegrees(minLat, Math.max(minLng, -180));
-  const hi = s2.LatLng.fromDegrees(maxLat, Math.max(maxLng, 190));
+  const lo = LatLng.fromDegrees(minLat, minLng);
+  const hi = LatLng.fromDegrees(maxLat, maxLng);
 
   const rect = full ? s2.Rect.fullRect() : new s2.Rect(
     new r1.Interval(lo.lat, hi.lat),
@@ -69,4 +86,3 @@ export function findCoverCellsByMinMaxLatLng({minLat, maxLat, minLng, maxLng, fu
   const coverer = new RegionCoverer({minLevel, maxLevel, maxCells});
   return coverer.covering(rect); // a CellUnion — array-like of bigint cell IDs, already normalized/minimal
 }
-

package/public/javascripts/translations.js

@@ -77,6 +77,13 @@ const translations = {
   ['#downloadDefer']: {en: "no, not yet", es: "No, todavía no."},
   ['No update at']: {es: "No hay actualizaciones a las"},
   ['is available']: {es: "está disponible"},
+  ['>Zoom in on multiple alerts in this area.']: {es: "Amplía la vista sobre varias alertas en esta zona."},
+
+  ['.firstConversation .teach.correspondent']: {en: "Change how you label this correspondent.", es: "Cambia la forma en que etiquetas a este corresponsal."},
+  ['.firstPublish .teach.correspondent']: {en: "Change how you label yourself.", es: "Cambia la forma en que te etiquetas."},
+  ['.teach.attach']: {en: "Attach a file to your reply.", es: "Adjunta un archivo a tu respuesta."},
+  ['.teach.share']: {en: "Share this alert through other programs.", es: "Comparte esta alerta a través de otros programas."},
+  ['.teach.changeHashtag']: {en: "Delete your alert or change its topic.", es: "Elimina tu alerta o cambia su tema."},
 
   ['#describePrivate1']: {en: "Here are your private labels for", es: "Aquí están sus etiquetas privadas para"},
   ['#describePrivate2']: {en: "to help you recognize posts from them:", es: "Para ayudarte a reconocer publicaciones de ellas:"},
@@ -114,17 +121,11 @@ const translations = {
   [' share a link to this map and topics, with picture of map.']: {es: " comparte un enlace a este mapa y a los temas, junto con una imagen del mapa."},
   ['Recenter the map to where you are in the world.']: {es: "Vuelve a centrar el mapa en tu ubicación actual."},
   ['Post your reply.']: {es: "Publica tu respuesta."},
-  ['Attach a file to your reply.']: {es: "Adjunta un archivo a tu respuesta."},
   ['Delete your reply.']: {es: "Elimina tu respuesta."},
-  ['Change the topic or delete your alert.']: {es: "Cambia el tema o elimina tu alerta."},
   ['Check to see if a new version of the app is available.']: {es: "Comprueba si hay una nueva versión de la aplicación disponible."},
   ['Update to a new version of this app.']: {es: "Actualiza a una nueva versión de esta aplicación."},
-  ['Share though .']: {es: "Comparte a través de "},
   [' the text and attachments of this reply, with a link to open this alert.']: {es: " el texto y los archivos adjuntos de esta respuesta, junto con un enlace para abrir esta alerta."},
-  ['Share through ']: {es: "Comparte un enlace a través de "},
   [' a link to open this alert.']: {es: " para abrir esta alerta."},
-  ['Control how others see me.']: {es: "Controla cómo me ven los demás."},
-  ['Control how this person is labeled on my device.']: {es: "Controla cómo se etiqueta a esta persona en mi dispositivo."},
   ['Choose the label you want to appear for alerts and replies by this user.']: {es: "Selecciona la etiqueta que quieras que aparezca para las alertas y respuestas de este usuario."},
   ["Capture this unique text so that even if the user changes what they share, you'll still see this text for alerts and replies by this user."]: {es: "Captura este texto único para que, aunque el usuario cambie lo que comparte, sigas viendo este texto en las alertas y respuestas de dicho usuario."},
   ["Capture this name they are currently sharing, so that even if the user changes what they share, you'll still see this text for alerts and replies by this user."]: {es: "Guarda el nombre que están compartiendo actualmente, de modo que, aunque el usuario cambie lo que comparte, sigas viendo este texto en las alertas y respuestas de dicho usuario."},
@@ -132,7 +133,10 @@ const translations = {
   ["Capture this image they are currently sharing, so that even if the user changes what they share, you'll still see this image for alerts and replies by this user."]: {es: "Guarda esta imagen que están compartiendo actualmente, de modo que, aunque el usuario cambie lo que comparte, sigas viendo esta imagen en las alertas y respuestas de dicho usuario."},
   ['Choose the picture you want to appear for alerts and replies by this user.']: {es: "Elige la imagen que quieras que aparezca para las alertas y respuestas de este usuario."},
   ['Enable local ']: {es: "Habilita notificaciones locales de "},
-  [' notifcations for map alerts, without going through any servers. Requires that the app be running.']: {es: " para alertas del mapa, sin pasar por ningún servidor. Requiere que la aplicación esté en ejecución."},  
+  [' notifcations for map alerts, without going through any servers. Requires that the app be running.']: {es: " para alertas del mapa, sin pasar por ningún servidor. Requiere que la aplicación esté en ejecución."},
+  ['There are already at least ']: {es: "Ya hay al menos "},
+  [' alerts of type "']: {es: ' alertas de tipo "'},
+  ['" in the colored region. Zooming in to get a better look.']: {es: '" en la región coloreada. Ampliando la imagen para verla mejor.'},
 
 
   ['Too many posts. (5 allowed every 5 minutes.) Removing oldest from this period.']: {es: "Demasiadas publicaciones. (Se permiten 5 cada 5 minutos). Eliminando las más antiguas de este período."},

package/public/javascripts/versions.js

@@ -25,10 +25,16 @@ export function cellHex(cellid) { // Convert cellid BigInt to properly padded he
 export function alertTopic(cellid, tag) { // Return topic name for public info about specified tag in cellid.
   return `civildefense.io:${dataVersion}:${cellHex(cellid)}:${canonicalTag(tag)}`;
 }
-export function topicCell(topicName) { // Return the cell that is baked in to the topic.
-  // Note that canonicalTag(tag) may contain a colon, but dataVersion must not.
+export function topicTag(topicName) { // Return the hashtag.
+  return topicName.slice(topicName.lastIndexOf(':') + 1); // Currently, colon is not allowed in hashtags.
+}
+export function topicCellHex(topicName) { // Return the hex string cell that is baked in to the topic.
+  // dataVersion cannot contain a colon.
   return topicName.match(/civildefense.io:[^:]+:([a-z0-9]+):/)[1];
 }
+export function topicCell(topicName) { // Return the BigInt cell that is baked in to the topic.
+  return BigInt('0x' + topicCellHex(topicName));
+}
 export function topicRegion(topicName) { // Return the region that is baked in to the topic.
-  return '0x' + topicCell(topicName).slice(0, 2);
+  return '0x' + topicCellHex(topicName).slice(0, 2);
 }

package/public/service-worker.js

@@ -1,6 +1,6 @@
 const { Request, Response, URL, clients} = self;
 // Little point in trying to automatically pull this through package.json, as we need a byte change in THIS file to trigger a new worker.
-const serviceVersion = '4.5.22';
+const serviceVersion = '4.5.28';
 
 const cacheList = [ // The files we need.
   "/",
@@ -124,10 +124,13 @@ async function cacheFirst({request, event}) {
   try {
     const responseFromNetwork = await fetch(request);
     if (request.method !== 'GET' || request.cache === 'no-store') return responseFromNetwork; // Cache shouldn't allow anyway.
+    const mime = responseFromNetwork.headers.get("Content-Type");
+    if (/^(audio|video)\//.test(mime)) return responseFromNetwork; // Do not cache streamable media.
     // Put clone of response in cache (so that original can be returned.
     // Tell event to keep worker open while we put it, even though we return response immediately.
     const cache = await caches.open(serviceVersion);
-    event.waitUntil(cache.put(request, responseFromNetwork.clone()));
+    event.waitUntil(cache.put(request, responseFromNetwork.clone())
+		    .catch(error => console.error(request.url, mime, error)));
     return responseFromNetwork;
   } catch (error) {
     console.error(request.url, error);