eric/WeatherStar4000
1
0
Fork 0
mirror of https://github.com/netbymatt/ws4kp.git synced 2026-04-23 03:59:30 -07:00
Code Issues Packages Projects Releases Wiki Activity

simplify check to cover other ios browsers too

Browse Source
This commit is contained in:
Andrew Petersen
2025-06-01 17:14:45 -04:00
parent 2365a4c0f7
commit 28917489bb
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/scripts/modules/radar.mjs
View File

@@ -6,9 +6,10 @@ import WeatherDisplay from './weatherdisplay.mjs';
import { registerDisplay, timeZone } from './navigation.mjs'; import { registerDisplay, timeZone } from './navigation.mjs';
import * as utils from './radar-utils.mjs'; import * as utils from './radar-utils.mjs';
// TEMPORARY fix to disable radar on ios safari // TEMPORARY fix to disable radar on ios safari. The same engine (webkit) is
// used for all ios browers (chrome, brave, firefox, etc) so it's safe to skip
// any subsequent narrowing of the user-agent.
const isIos = /iP(ad|od|hone)/i.test(window.navigator.userAgent); const isIos = /iP(ad|od|hone)/i.test(window.navigator.userAgent);
const isSafari = !!navigator.userAgent.match(/Version\/[\d.]+.*Safari/);
// NOTE: iMessages/Messages preview is provided by an Apple scraper that uses a // NOTE: iMessages/Messages preview is provided by an Apple scraper that uses a
// user-agent similar to: `Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_1) // user-agent similar to: `Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_1)
// AppleWebKit/601.2.4 (KHTML, like Gecko) Version/9.0.1 Safari/601.2.4 // AppleWebKit/601.2.4 (KHTML, like Gecko) Version/9.0.1 Safari/601.2.4
@@ -21,12 +22,11 @@ const isSafari = !!navigator.userAgent.match(/Version\/[\d.]+.*Safari/);
// https://github.com/netbymatt/ws4kp/issues/74#issuecomment-2921154962 for more // https://github.com/netbymatt/ws4kp/issues/74#issuecomment-2921154962 for more
// context. // context.
const isBot = /twitterbot|Facebot/i.test(window.navigator.userAgent); const isBot = /twitterbot|Facebot/i.test(window.navigator.userAgent);
const safariIos = isIos && isSafari;
const RADAR_HOST = 'mesonet.agron.iastate.edu'; const RADAR_HOST = 'mesonet.agron.iastate.edu';
class Radar extends WeatherDisplay { class Radar extends WeatherDisplay {
constructor(navId, elemId) { constructor(navId, elemId) {
super(navId, elemId, 'Local Radar', !safariIos && !isBot); super(navId, elemId, 'Local Radar', !isIos && !isBot);
this.okToDrawCurrentConditions = false; this.okToDrawCurrentConditions = false;
this.okToDrawCurrentDateTime = false; this.okToDrawCurrentDateTime = false;
@@ -219,7 +219,7 @@ const radarWorker = () => {
}; };
// register display // register display
// TEMPORARY: except on safari on IOS and bots // TEMPORARY: except on IOS and bots
if (!safariIos && !isBot) { if (!isIos && !isBot) {
registerDisplay(new Radar(11, 'radar')); registerDisplay(new Radar(11, 'radar'));
} }