Merge branch 'dev'

Author: nfacha

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+# Release V2.2.1 (2022-12-18)
+
+- Fix Mastodon not posting screenshots
+- Fix Take-Off messages not being sent
+
 # Release V2.2.0 (2022-12-17)
 
 - Add Mastodon Support

README.md

@@ -46,8 +46,9 @@ The following TrackSources are supported:
 - VRS - This connects to your own Virtual Radar Server | (Self-Hosted)
 - OPSN - OpenSkyNetwork | (https://openskynetwork.github.io/opensky-api/rest.html)
 - dump1090 - Dump1090 Aircraft.Json | Get data from your local Dump1090 Feeder
-  At this time airlines, squawk and type queries are only supported by the FachaDev TrackSource, and will not work if
-  another source is selected
+
+At this time airlines, squawk and type queries are only supported by the FachaDev TrackSource, and will not work if
+another source is selected
 
 ## Usage
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "planealert",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "",
   "main": "index.js",
   "engines": {

package.json

@@ -159,8 +159,7 @@ export class Aircraft {
                 if (nearestAirport !== null) {
                     PlaneAlert.log.info(`Plane ${this.name} (${this.icao}) took off at ${nearestAirport.airport.name} (${nearestAirport.airport.gps_code})`);
                     // Check altitude
-                    // @ts-ignore
-                    if (this.aircraft[i].meta.alt != null && this.aircraft[i].meta.alt <= PlaneAlert.config.thresholds.takeoff) {
+                    if (this.meta.alt != null && this.meta.alt <= PlaneAlert.config.thresholds.takeoff) {
                         EventUtils.triggerEvent(PlaneEvents.PLANE_TAKEOFF, this, null, {nearestAirport: nearestAirport?.airport});
                     }
                 } else {

src/models/Aircraft.ts

@@ -199,7 +199,6 @@ export class Airline {
                         if (nearestAirport !== null) {
                             PlaneAlert.log.debug(`Plane ${this.name} (${element.icao}) is near ${nearestAirport.airport!.name!} (${nearestAirport.airport!.ident!}) and has lost signal`);
                             // Check altitude
-                            // @ts-ignore
                             if (element.meta.alt != null && element.meta.alt <= PlaneAlert.config.thresholds.landing) {
 
                                 PlaneAlert.log.info(`Plane ${this.name} (${element.icao}) is at ${element.meta.alt} ft and has lost signal. Suspected landing`);
@@ -228,7 +227,6 @@ export class Airline {
                     if (nearestAirport !== null) {
                         PlaneAlert.log.info(`Plane ${this.name} (${element.icao}) took off at ${nearestAirport.airport.name} (${nearestAirport.airport.gps_code})`);
                         // Check altitude
-                        // @ts-ignore
                         if (element.meta.alt != null && element.meta.alt <= PlaneAlert.config.thresholds.takeoff) {
                             EventUtils.triggerEvent(PlaneEvents.PLANE_TAKEOFF, element, this, {nearestAirport: nearestAirport?.airport});
                         }

src/models/Airline.ts

@@ -86,7 +86,7 @@ export class EventUtils {
                                 url: account.url,
                                 accessToken: account.accessToken,
                             });
-                            let media: Attachment;
+                            let media: Attachment | undefined = undefined;
                             if (hasTakeoffScreenshot) {
                                 try {
                                     media = await masto.mediaAttachments.create({
@@ -101,8 +101,7 @@ export class EventUtils {
                                 await masto.statuses.create({
                                     status: `${notificationName}${aircraft.callsign ? " flight #" + aircraft.callsign : ""} (#${aircraft.registration}) took off from ${data.nearestAirport.name} at ${new Date().toLocaleString()}\n${adsbExchangeLink}`,
                                     visibility: 'public',
-                                    // @ts-ignore
-                                    mediaIds: hasTakeoffScreenshot ? [media.id] : undefined,
+                                    mediaIds: media ? [media.id] : undefined,
                                 });
                             } catch (e) {
                                 PlaneAlert.log.error(`Plane ${notificationName} (${aircraft.icao}) could not send post to Mastodon: ${e}`);
@@ -178,7 +177,7 @@ export class EventUtils {
                                 url: account.url,
                                 accessToken: account.accessToken,
                             });
-                            let media: Attachment;
+                            let media: Attachment | undefined = undefined;
                             if (hasLandingScreenshot) {
                                 try {
                                     media = await masto.mediaAttachments.create({
@@ -193,8 +192,7 @@ export class EventUtils {
                                 await masto.statuses.create({
                                     status: `${notificationName}${aircraft.callsign ? " flight #" + aircraft.callsign : ""} (#${aircraft.registration}) landed at ${data.nearestAirport.name} at ${new Date().toLocaleString()}\n${adsbExchangeLink}`,
                                     visibility: 'public',
-                                    // @ts-ignore
-                                    mediaIds: hasTakeoffScreenshot ? [media.id] : undefined,
+                                    mediaIds: media ? [media.id] : undefined,
                                 });
                             } catch (e) {
                                 PlaneAlert.log.error(`Plane ${notificationName} (${aircraft.icao}) could not send post to Mastodon: ${e}`);
@@ -264,7 +262,7 @@ export class EventUtils {
                                 url: account.url,
                                 accessToken: account.accessToken,
                             });
-                            let media: Attachment;
+                            let media: Attachment | undefined = undefined;
                             if (hasEmergencyScreenshot) {
                                 try {
                                     media = await masto.mediaAttachments.create({
@@ -279,8 +277,7 @@ export class EventUtils {
                                 await masto.statuses.create({
                                     status: `${notificationName}${aircraft.callsign ? " flight #" + aircraft.callsign : ""} is squawking #${data.squawk} (${PlaneUtils.getEmergencyType(data.squawk)}) at ${new Date().toLocaleString()}\n${adsbExchangeLink}`,
                                     visibility: 'public',
-                                    // @ts-ignore
-                                    mediaIds: hasTakeoffScreenshot ? [media.id] : undefined,
+                                    mediaIds: media ? [media.id] : undefined,
                                 });
                             } catch (e) {
                                 PlaneAlert.log.error(`Plane ${notificationName} (${aircraft.icao}) could not send post to Mastodon: ${e}`);

src/utils/EventUtils.ts

@@ -24,6 +24,9 @@ export class GeoUtils {
         if (aircraft.meta.lon === null || aircraft.meta.lat === null || PlaneAlert.airports === null) {
             return null;
         }
+        if (aircraft.meta.lon === undefined || aircraft.meta.lat === undefined) {
+            return null;
+        }
         PlaneAlert.log.debug(`Plane ${this.name} (${aircraft.icao}) searching for nearest airport of ${aircraft.meta.lat}/${aircraft.meta.lon}`);
         let min_distance: number = PlaneAlert.config.thresholds.landingNearestSuitableAirportDistance;
         let nearest_airport = null;