@yz-social/civildefense.io 4.4.4 → 4.5.4

package/public/javascripts/hashtags.js

@@ -1,7 +1,8 @@
 const { localStorage } = globalThis; // For linters.
 import { stripLeadingEmoji, canonicalTag } from './versions.js';
 import { Int } from './translations.js';
-import { updateSubscriptions, Marker, showMessage } from './map.js';
+import { showMessage } from './map.js';
+import { Alert } from './alert.js';
 import { resetInactivityTimer, clickTip } from './main.js';
 
 // We subscribe to the cartesian product of the list of non-overlapping cells and all hashes.
@@ -26,7 +27,7 @@ export const Hashtags = {
   //    were using the same emoji as each other.
   hashtags: {},
   canonical2extended: {},
-  add(label, active = true, updateMarkers = true) { // Ensure label is a hashtag, initialized to active, and if existing, forcing it active.
+  add(label, active = true, updateAlerts = true) { // Ensure label is a hashtag, initialized to active, and if existing, forcing it active.
     // Return our (possibly new) understanding of the extended hashtag.
     // Note that only startup-population of tags from persistence would ever specify active=false.
     // Here we accept a canonical or extended label, updating our records keyed by the canonical part,
@@ -44,7 +45,7 @@ export const Hashtags = {
     this.canonical2extended[canonical] = extended;
     if (!oursHasEmoji) {
       this.onchange({resetSubscriptions: false});
-      if (updateMarkers) Marker.updateMarkers(canonical, extended);
+      if (updateAlerts) Alert.updateAlerts(canonical, extended);
     }
     return extended;
   },
@@ -70,7 +71,7 @@ export const Hashtags = {
     // Unneeded and not necessarilly meaningful if tag has emoji.
     return `<minidenticon-svg ${slot ? `slot="${slot}"` : ''} username="${tag}"></minidenticon-svg>`;
   },
-  formatMarker(tag) { // HTML (possibly text) to represent tag as a marker on map.
+  formatAlert(tag) { // HTML (possibly text) to represent tag as a marker on map.
     return this.firstEmoji(tag) || this.identicon(tag);
   },
   formatPubtag(tag) { // HTML (possibly text) to represent tag with defaulted icon.
@@ -82,8 +83,8 @@ export const Hashtags = {
     if (redisplaySubscribers) this.resetSubscriberDisplay();
     localStorage.setItem('hashtags', JSON.stringify(this.hashtags));
     if (resetSubscriptions) {
-      updateSubscriptions();
-      Object.values(Marker.markers).forEach(wrapper => this.hashtags[wrapper.hashtag] || wrapper.destroy());
+      Alert.updateSubscriptions();
+      Alert.items.forEach(wrapper => this.hashtags[wrapper.hashtag] || wrapper.destroy());
     }
   },
   chipset: document.body.querySelector('.watching-hashtags'), // Element containing the user's chips.
@@ -132,7 +133,7 @@ export const Hashtags = {
 	if (chip.selected) showMessage(Int`Turning "${chip.label}" alerts back on in the map.`, 'instructions');
 	else showMessage(Int`Turning off "${chip.label}" alerts in the map. You can delete the topic altogether with the X.`, 'instructions');
 	this.toggleChip(chip);
-	Marker.closePopup();
+	Alert.closePopup();
 	if (chip.selected) this.setPublish(chip.label);
 	this.onchange({redisplaySubscribers: false});
       });
@@ -141,7 +142,7 @@ export const Hashtags = {
 				    `<md-filled-text-field class="newtag" placeholder="➕${Int`add topic`}"></md-filled-text-field>`);
     clickTip(this.chipset.firstChild, Int`Add a new topic for which the map should show any alerts.`, event => { // Focusing "add topic".
       event.stopPropagation();
-      Marker.closePopup();
+      Alert.closePopup();
       showMessage(Int`Type a new topic name to see any alerts on the map with this topic.`, 'instructions');
     });
     this.chipset.firstChild.onchange = event => { // Add the new hashtag.
@@ -151,7 +152,7 @@ export const Hashtags = {
 	  .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.
       if (!tag) return;
-      Marker.closePopup();
+      Alert.closePopup();
       tag = this.add(tag); // Might exist, in which case tag might now be extended.
       this.setPublish(tag);
       this.onchange({highlightPublish: true});

package/public/javascripts/main.js

@@ -5,7 +5,8 @@ import { openDisplay } from './display.js';
 import { Agent} from './agent.js';
 import { P2PWebNetwork } from './p2pWebNetwork.js';
 import { getPointInCell } from './s2.js';
-import { Marker, map, getShareableURL, showMessage, updateLocation, updateSubscriptions, recenterMap, share } from './map.js';
+import { Alert, getShareableURL, share } from './alert.js';
+import { map, showMessage, updateLocation, recenterMap } from './map.js';
 import './service-manager.js'; // Comment this out and kill service-workers for reload-to-get-latest behavior during development.
 
 document.getElementById('appVersion').textContent = appVersion;
@@ -41,7 +42,6 @@ export function tooltip(elementOrQuerySelector, text) { // Add plain tooltip tex
 }
 export function clickTip(elementOrQuerySelector, text, clickHandler) { // tooltip and onclick in one step.
   const element = asElement(elementOrQuerySelector);
-  if (element.id === 'downloadUpdates2') console.log('assigning title', text, 'and', clickHandler, 'to', element);
   tooltip(element, text);
   element.onclick = clickHandler;
 }
@@ -124,7 +124,7 @@ export function openAbout(event) {
   noteNotificationPermission(window.Notification?.permission);
 }
 clickTip('#aboutButton', Int`Information about this app, and options to change how you appear to others.`, event => { // open about
-  Marker.closePopup();
+  Alert.closePopup();
   openAbout(event);
 });
 clickTip('#wipe', Int`Wipe from ${osName()} all personal data and source files for this app.`, async event => {
@@ -243,7 +243,7 @@ function initializeGeolocation(subscribe = false) { // Arrange to constantly upd
     if (!subscribeOneShot) return;
     subscribeOneShot = false;
     resetInactivityTimer(false);
-    updateSubscriptions([]); // This was for a new node, so supply an empty oldSubscriptions.
+    Alert.updateSubscriptions([]); // This was for a new node, so supply an empty oldSubscriptions.
   };
   if (!geolocation) {
     showMessage(Int`Geolocation not supported. Using default location.`, 'error', 'fail');
@@ -364,7 +364,6 @@ document.querySelector('head > title').innerHTML = titleElement.textContent;
 function initText(selector, content = selector) {
   const element = document.querySelector(selector);
   const text = Int([content]);
-  if (element.id === 'downloadUpdates2') console.log('assigning', text, 'to', element);
   element.textContent = text;
 }
 initText('#aboutReport');