Removing PushBullet support
I can longer recommend PushBullet, poorly maintained, switch to the Telegram integration. No longer needed
This commit is contained in:
parent
4f4ae83800
commit
82b1c2f272
|
|
@ -1,214 +1,412 @@
|
||||||
{
|
{
|
||||||
"EA50": {
|
"EA50": {
|
||||||
"name": "Eclipse 550",
|
"name": "Eclipse 550",
|
||||||
"galph": 76,
|
"galph": 76,
|
||||||
"category": "VLJ"
|
"category": "VLJ"
|
||||||
},
|
},
|
||||||
"LJ31": {
|
"LJ31": {
|
||||||
"name": "Learjet 31",
|
"name": "Learjet 31",
|
||||||
"galph": 202,
|
"galph": 202,
|
||||||
"category": "Light"
|
"category": "Light"
|
||||||
},
|
},
|
||||||
"LJ40": {
|
"LJ40": {
|
||||||
"name": "Learjet 40",
|
"name": "Learjet 40",
|
||||||
"galph": 207,
|
"galph": 207,
|
||||||
"category": "Light"
|
"category": "Light"
|
||||||
},
|
},
|
||||||
"PC24": {
|
"PC24": {
|
||||||
"name": "Pilatus PC-24",
|
"name": "Pilatus PC-24",
|
||||||
"galph": 154,
|
"galph": 154,
|
||||||
"category": "Light"
|
"category": "Light"
|
||||||
},
|
},
|
||||||
"LJ45": {
|
"LJ45": {
|
||||||
"name": "Learjet 45",
|
"name": "Learjet 45",
|
||||||
"galph": 205,
|
"galph": 205,
|
||||||
"category": "Super Light"
|
"category": "Super Light"
|
||||||
},
|
},
|
||||||
"LJ70": {
|
"LJ70": {
|
||||||
"name": "Learjet 70",
|
"name": "Learjet 70",
|
||||||
"galph": 198,
|
"galph": 198,
|
||||||
"category": "Super Light"
|
"category": "Super Light"
|
||||||
},
|
},
|
||||||
"LJ75": {
|
"LJ75": {
|
||||||
"name": "Learjet 75",
|
"name": "Learjet 75",
|
||||||
"galph": 199,
|
"galph": 199,
|
||||||
"category": "Super Light"
|
"category": "Super Light"
|
||||||
},
|
},
|
||||||
"G150": {
|
"G150": {
|
||||||
"name": "Gulfstream G150",
|
"name": "Gulfstream G150",
|
||||||
"galph": 228,
|
"galph": 228,
|
||||||
"category": "Midsize"
|
"category": "Midsize"
|
||||||
},
|
},
|
||||||
"LJ60": {
|
"LJ60": {
|
||||||
"name": "Learjet 60",
|
"name": "Learjet 60",
|
||||||
"galph": 239,
|
"galph": 239,
|
||||||
"category": "Midsize"
|
"category": "Midsize"
|
||||||
},
|
},
|
||||||
"GALX": {
|
"GALX": {
|
||||||
"name": "Gulfstream G200",
|
"name": "Gulfstream G200",
|
||||||
"galph": 278,
|
"galph": 278,
|
||||||
"category": "Super Midsize"
|
"category": "Super Midsize"
|
||||||
},
|
},
|
||||||
"G280": {
|
"G280": {
|
||||||
"name": "Gulfstream G280",
|
"name": "Gulfstream G280",
|
||||||
"galph": 297,
|
"galph": 297,
|
||||||
"category": "Super Midsize"
|
"category": "Super Midsize"
|
||||||
},
|
},
|
||||||
"GLF5": {
|
"GLF5": {
|
||||||
"name": "Gulfstream G500",
|
"name": "Gulfstream G500",
|
||||||
"galph": 447,
|
"galph": 447,
|
||||||
"category": "Large"
|
"category": "Large"
|
||||||
},
|
},
|
||||||
"GLF6": {
|
"GLF6": {
|
||||||
"name": "Gulfstream G650",
|
"name": "Gulfstream G650",
|
||||||
"galph": 503,
|
"galph": 503,
|
||||||
"category": "Ultra Long Range"
|
"category": "Ultra Long Range"
|
||||||
},
|
},
|
||||||
"PC12": {
|
"PC12": {
|
||||||
"name": "Pilatus PC-12",
|
"name": "Pilatus PC-12",
|
||||||
"galph": 66,
|
"galph": 66,
|
||||||
"category": "Turboprop Aircraft"
|
"category": "Turboprop Aircraft"
|
||||||
},
|
},
|
||||||
"GLEX": {
|
"GLEX": {
|
||||||
"name": "Global",
|
"name": "Global",
|
||||||
"galph": 500,
|
"galph": 500,
|
||||||
"category": "Ultra Long Range"
|
"category": "Ultra Long Range"
|
||||||
}
|
},
|
||||||
,
|
|
||||||
"CL30": {
|
"CL30": {
|
||||||
"name": "Challenger 300",
|
"name": "Challenger 300",
|
||||||
"galph": 295,
|
"galph": 295,
|
||||||
"category": "Super Midsize"
|
"category": "Super Midsize"
|
||||||
}, "B742": {
|
},
|
||||||
"name": "Boeing 747-200",
|
"B742": {
|
||||||
"galph": 3830,
|
"name": "Boeing 747-200",
|
||||||
"category": "Large"
|
"galph": 3830,
|
||||||
}, "T38": {
|
"category": "Large"
|
||||||
"name": "T-38 Talon",
|
},
|
||||||
"galph": 375,
|
"T38": {
|
||||||
"category": "Fighter"
|
"name": "T-38 Talon",
|
||||||
}, "WB57": {
|
"galph": 375,
|
||||||
"name": "Martin B-57 Canberra",
|
"category": "Fighter"
|
||||||
"galph": 531,
|
},
|
||||||
"category": "Twinjet Tactical Bomber and Reconnaissance"
|
"WB57": {
|
||||||
}, "B74S": {
|
"name": "Martin B-57 Canberra",
|
||||||
"name": "747 SP",
|
"galph": 531,
|
||||||
"galph": 2289,
|
"category": "Twinjet Tactical Bomber and Reconnaissance"
|
||||||
"category": "Large"
|
},
|
||||||
}, "B752": {
|
"B74S": {
|
||||||
"name": "757 200",
|
"name": "747 SP",
|
||||||
"galph": 877,
|
"galph": 2289,
|
||||||
"category": "Large"
|
"category": "Large"
|
||||||
},
|
},
|
||||||
"B738": {
|
"B752": {
|
||||||
"name": "737 800",
|
"name": "757 200",
|
||||||
"galph": 832,
|
"galph": 877,
|
||||||
"category": "Medium"
|
"category": "Large"
|
||||||
|
},
|
||||||
|
"B738": {
|
||||||
|
"name": "737 800",
|
||||||
|
"galph": 832,
|
||||||
|
"category": "Medium"
|
||||||
},
|
},
|
||||||
"B737": {
|
"B737": {
|
||||||
"name": "737 700",
|
"name": "737 700",
|
||||||
"galph": 796,
|
"galph": 796,
|
||||||
"category": "Medium"
|
"category": "Medium"
|
||||||
},
|
},
|
||||||
"A320": {
|
"A320": {
|
||||||
"name": "A320",
|
"name": "A320",
|
||||||
"galph": 800,
|
"galph": 800,
|
||||||
"category": "Medium"
|
"category": "Medium"
|
||||||
},
|
},
|
||||||
"P3": {
|
"P3": {
|
||||||
"name": "Lockheed Orion P3",
|
"name": "Lockheed Orion P3",
|
||||||
"galph": 671,
|
"galph": 671,
|
||||||
"category": "Turboprop"
|
"category": "Turboprop"
|
||||||
},
|
},
|
||||||
"C750": {
|
"C750": {
|
||||||
"name": "Cessna 750 Citation X",
|
"name": "Cessna 750 Citation X",
|
||||||
"galph": 347,
|
"galph": 347,
|
||||||
"category": "Small Private Jet"
|
"category": "Small Private Jet"
|
||||||
},
|
},
|
||||||
"FA7X": {
|
"FA7X": {
|
||||||
"name": "Dassult Falcon 7X",
|
"name": "Dassult Falcon 7X",
|
||||||
"galph": 380,
|
"galph": 380,
|
||||||
"category": "Small Private Jet"
|
"category": "Small Private Jet"
|
||||||
},
|
},
|
||||||
"F900": {
|
"F900": {
|
||||||
"name": "Dassult Falcon 900",
|
"name": "Dassult Falcon 900",
|
||||||
"galph": 347,
|
"galph": 347,
|
||||||
"category": "Small Private Jet"
|
"category": "Small Private Jet"
|
||||||
},
|
},
|
||||||
"H25B": {
|
"H25B": {
|
||||||
"name": "Hawker 750/850",
|
"name": "Hawker 750/850",
|
||||||
"galph": 270,
|
"galph": 270,
|
||||||
"category": "Small Private Jet"
|
"category": "Small Private Jet"
|
||||||
},
|
},
|
||||||
"C680": {
|
"C680": {
|
||||||
"name": "Cessna 680 Citation",
|
"name": "Cessna 680 Citation",
|
||||||
"galph": 247,
|
"galph": 247,
|
||||||
"category": "Small Private Jet"
|
"category": "Small Private Jet"
|
||||||
},
|
},
|
||||||
"GLF3": {
|
"GLF3": {
|
||||||
"name": "Gulfstream 3",
|
"name": "Gulfstream 3",
|
||||||
"galph": 568,
|
"galph": 568,
|
||||||
"category": "Heavy Private Jet"
|
"category": "Heavy Private Jet"
|
||||||
},
|
},
|
||||||
"GLF4": {
|
"GLF4": {
|
||||||
"name": "Gulfstream 4",
|
"name": "Gulfstream 4",
|
||||||
"galph": 479,
|
"galph": 479,
|
||||||
"category": "Heavy Private Jet"
|
"category": "Heavy Private Jet"
|
||||||
},
|
},
|
||||||
"CL60": {
|
"CL60": {
|
||||||
"name": "Bombardier CL-600 Challenge",
|
"name": "Bombardier CL-600 Challenge",
|
||||||
"galph": 262,
|
"galph": 262,
|
||||||
"category": "Mid-size Private Jet"
|
"category": "Mid-size Private Jet"
|
||||||
},
|
},
|
||||||
"A139": {
|
"A139": {
|
||||||
"name": "Agusta-Bell AW139",
|
"name": "Agusta-Bell AW139",
|
||||||
"galph": 150,
|
"galph": 150,
|
||||||
"category": "Medium Utility Helicopter"
|
"category": "Medium Utility Helicopter"
|
||||||
},
|
},
|
||||||
"GL5T": {
|
"GL5T": {
|
||||||
"name": "Global 5000",
|
"name": "Global 5000",
|
||||||
"galph": 455,
|
"galph": 455,
|
||||||
"category": "Heavy Private Jet"
|
"category": "Heavy Private Jet"
|
||||||
},
|
},
|
||||||
"GA6C": {
|
"GA6C": {
|
||||||
"name": "Gulfstream G600",
|
"name": "Gulfstream G600",
|
||||||
"galph": 458,
|
"galph": 458,
|
||||||
"category": "Heavy Private Jet"
|
"category": "Heavy Private Jet"
|
||||||
},
|
},
|
||||||
"A337": {
|
"A337": {
|
||||||
"name": "Airbus Beluga XL",
|
"name": "Airbus Beluga XL",
|
||||||
"galph": 1800,
|
"galph": 1800,
|
||||||
"category": "Large Transport Aircraft"
|
"category": "Large Transport Aircraft"
|
||||||
},
|
},
|
||||||
"A3ST": {
|
"A3ST": {
|
||||||
"name": "Airbus Beluga",
|
"name": "Airbus Beluga",
|
||||||
"galph": 1260,
|
"galph": 1260,
|
||||||
"category": "Large Transport Aircraft"
|
"category": "Large Transport Aircraft"
|
||||||
},
|
},
|
||||||
"F2TH": {
|
"F2TH": {
|
||||||
"name": "Dassault Falcon 2000",
|
"name": "Dassault Falcon 2000",
|
||||||
"galph": 245,
|
"galph": 245,
|
||||||
"category": "Medium Private Jet"
|
"category": "Medium Private Jet"
|
||||||
},
|
},
|
||||||
"GA5C": {
|
"GA5C": {
|
||||||
"name": "Gulfstream G500",
|
"name": "Gulfstream G500",
|
||||||
"galph": 402,
|
"galph": 402,
|
||||||
"category": "Large Private Jet"
|
"category": "Large Private Jet"
|
||||||
},
|
},
|
||||||
"C130": {
|
"C130": {
|
||||||
"name": "Lockheed C130",
|
"name": "Lockheed C130",
|
||||||
"galph": 740,
|
"galph": 740,
|
||||||
"category": "Medium Cargo"
|
"category": "Medium Cargo"
|
||||||
},
|
},
|
||||||
"B762": {
|
"B762": {
|
||||||
"name": "Boeing 767 200",
|
"name": "Boeing 767 200",
|
||||||
"galph": 1722,
|
"galph": 1722,
|
||||||
"category": "Wide-body"
|
"category": "Wide-body"
|
||||||
},
|
},
|
||||||
"B772": {
|
"B772": {
|
||||||
"name": "Boeing 777 200",
|
"name": "Boeing 777 200",
|
||||||
"galph": 2300,
|
"galph": 2300,
|
||||||
"category": "Wide-body"
|
"category": "Wide-body"
|
||||||
|
},
|
||||||
|
"SLCH": {
|
||||||
|
"name": "Stratolaunch",
|
||||||
|
"galph": 2396,
|
||||||
|
"category": "Special"
|
||||||
|
},
|
||||||
|
"P51": {
|
||||||
|
"name": "P51 Mustang",
|
||||||
|
"galph": 65,
|
||||||
|
"category": "Fighter"
|
||||||
|
},
|
||||||
|
"HDJT": {
|
||||||
|
"name": "Honda Jet",
|
||||||
|
"galph": 90,
|
||||||
|
"category": "Light Jet"
|
||||||
|
},
|
||||||
|
"B744": {
|
||||||
|
"name": "Boeing 747-400",
|
||||||
|
"galph": 3700,
|
||||||
|
"category": "Heavy Airliner"
|
||||||
|
},
|
||||||
|
"E190": {
|
||||||
|
"name": "Embrar E190",
|
||||||
|
"galph": 469,
|
||||||
|
"category": "Heavy Jet"
|
||||||
|
},
|
||||||
|
"FA50": {
|
||||||
|
"name": "Falcon 50",
|
||||||
|
"galph": 229,
|
||||||
|
"category": "Heavy Jet"
|
||||||
|
},
|
||||||
|
"GL7T": {
|
||||||
|
"name": "Global 7000",
|
||||||
|
"galph": 460,
|
||||||
|
"category": "Heavy Jet"
|
||||||
|
},
|
||||||
|
"GL6T": {
|
||||||
|
"name": "",
|
||||||
|
"galph": 455.0,
|
||||||
|
"category": ""
|
||||||
|
},
|
||||||
|
"C68A": {
|
||||||
|
"name": "",
|
||||||
|
"galph": 212.0,
|
||||||
|
"category": ""
|
||||||
|
},
|
||||||
|
"C56X": {
|
||||||
|
"name": "",
|
||||||
|
"galph": 217.0,
|
||||||
|
"category": ""
|
||||||
|
},
|
||||||
|
"B763": {
|
||||||
|
"name": "",
|
||||||
|
"galph": 1320.0,
|
||||||
|
"category": ""
|
||||||
|
},
|
||||||
|
"A310": {
|
||||||
|
"name": "",
|
||||||
|
"galph": 1189.0,
|
||||||
|
"category": ""
|
||||||
|
},
|
||||||
|
"A330": {
|
||||||
|
"name": "",
|
||||||
|
"galph": 1505.0,
|
||||||
|
"category": ""
|
||||||
|
},
|
||||||
|
"A380": {
|
||||||
|
"name": "",
|
||||||
|
"galph": 4062.0,
|
||||||
|
"category": ""
|
||||||
|
},
|
||||||
|
"E170": {
|
||||||
|
"name": "",
|
||||||
|
"galph": 469.0,
|
||||||
|
"category": ""
|
||||||
|
},
|
||||||
|
"DC87": {
|
||||||
|
"name": "",
|
||||||
|
"galph": 1250.0,
|
||||||
|
"category": ""
|
||||||
|
},
|
||||||
|
"SGUP": {
|
||||||
|
"name": "",
|
||||||
|
"galph": 1156.0,
|
||||||
|
"category": ""
|
||||||
|
},
|
||||||
|
"WHK2": {
|
||||||
|
"name": "",
|
||||||
|
"galph": 500.0,
|
||||||
|
"category": ""
|
||||||
|
},
|
||||||
|
"B350": {
|
||||||
|
"name": "",
|
||||||
|
"galph": 122.0,
|
||||||
|
"category": ""
|
||||||
|
},
|
||||||
|
"BE30": {
|
||||||
|
"name": "",
|
||||||
|
"galph": 121.0,
|
||||||
|
"category": ""
|
||||||
|
},
|
||||||
|
"FA8X": {
|
||||||
|
"name": "",
|
||||||
|
"galph": 380.0,
|
||||||
|
"category": ""
|
||||||
|
},
|
||||||
|
"E550": {
|
||||||
|
"name": "",
|
||||||
|
"galph": 280.0,
|
||||||
|
"category": ""
|
||||||
|
},
|
||||||
|
"E55P": {
|
||||||
|
"name": "",
|
||||||
|
"galph": 166.0,
|
||||||
|
"category": ""
|
||||||
|
},
|
||||||
|
"A332": {
|
||||||
|
"name": "",
|
||||||
|
"galph": 1480,
|
||||||
|
"category": ""
|
||||||
|
},
|
||||||
|
"GA7C": {
|
||||||
|
"name": "",
|
||||||
|
"galph": 382.0,
|
||||||
|
"category": ""
|
||||||
|
},
|
||||||
|
"FA6X": {
|
||||||
|
"name": "",
|
||||||
|
"galph": 419.0,
|
||||||
|
"category": ""
|
||||||
|
},
|
||||||
|
"B3XM": {
|
||||||
|
"name": "",
|
||||||
|
"galph": 716.0,
|
||||||
|
"category": ""
|
||||||
|
},
|
||||||
|
"B779": {
|
||||||
|
"name": "",
|
||||||
|
"galph": 2250.0,
|
||||||
|
"category": ""
|
||||||
|
},
|
||||||
|
"BE22": {
|
||||||
|
"name": "",
|
||||||
|
"galph": 60.0,
|
||||||
|
"category": ""
|
||||||
|
},
|
||||||
|
"C560": {
|
||||||
|
"name": "",
|
||||||
|
"galph": 182.0,
|
||||||
|
"category": ""
|
||||||
|
},
|
||||||
|
"E145": {
|
||||||
|
"name": "",
|
||||||
|
"galph": 284.0,
|
||||||
|
"category": ""
|
||||||
|
},
|
||||||
|
"C25C": {
|
||||||
|
"name": "",
|
||||||
|
"galph": 110.0,
|
||||||
|
"category": ""
|
||||||
|
},
|
||||||
|
"C25B": {
|
||||||
|
"name": "",
|
||||||
|
"galph": 110.0,
|
||||||
|
"category": ""
|
||||||
|
},
|
||||||
|
"C441": {
|
||||||
|
"name": "",
|
||||||
|
"galph": 57.0,
|
||||||
|
"category": ""
|
||||||
|
},
|
||||||
|
"E50P": {
|
||||||
|
"name": "",
|
||||||
|
"galph": 109.0,
|
||||||
|
"category": ""
|
||||||
|
},
|
||||||
|
"CRJ2": {
|
||||||
|
"name": "",
|
||||||
|
"galph": 325.0,
|
||||||
|
"category": ""
|
||||||
|
},
|
||||||
|
"CRJ7": {
|
||||||
|
"name": "",
|
||||||
|
"galph": 444.0,
|
||||||
|
"category": ""
|
||||||
|
},
|
||||||
|
"BE40": {
|
||||||
|
"name": "",
|
||||||
|
"galph": 220.0,
|
||||||
|
"category": ""
|
||||||
|
},
|
||||||
|
"C700": {
|
||||||
|
"name": "",
|
||||||
|
"galph": 288.0,
|
||||||
|
"category": ""
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -31,12 +31,6 @@ TITLE =
|
||||||
ACCESS_TOKEN = athere
|
ACCESS_TOKEN = athere
|
||||||
ACCESS_TOKEN_SECRET = atshere
|
ACCESS_TOKEN_SECRET = atshere
|
||||||
|
|
||||||
[PUSHBULLET]
|
|
||||||
ENABLE = FALSE
|
|
||||||
TITLE = Title Of Pushbullet message
|
|
||||||
API_KEY = apikey
|
|
||||||
CHANNEL_TAG = channeltag
|
|
||||||
|
|
||||||
[DISCORD]
|
[DISCORD]
|
||||||
ENABLE = FALSE
|
ENABLE = FALSE
|
||||||
#WEBHOOK URL https://support.discord.com/hc/en-us/articles/228383668-Intro-to-Webhooks
|
#WEBHOOK URL https://support.discord.com/hc/en-us/articles/228383668-Intro-to-Webhooks
|
||||||
|
|
|
||||||
|
|
@ -79,11 +79,6 @@ class Plane:
|
||||||
self.latest_tweet_id = self.tweet_api.user_timeline(count = 1)[0]
|
self.latest_tweet_id = self.tweet_api.user_timeline(count = 1)[0]
|
||||||
except IndexError:
|
except IndexError:
|
||||||
self.latest_tweet_id = None
|
self.latest_tweet_id = None
|
||||||
#Setup PushBullet
|
|
||||||
if self.config.getboolean('PUSHBULLET', 'ENABLE'):
|
|
||||||
from pushbullet import Pushbullet
|
|
||||||
self.pb = Pushbullet(self.config['PUSHBULLET']['API_KEY'])
|
|
||||||
self.pb_channel = self.pb.get_channel(self.config.get('PUSHBULLET', 'CHANNEL_TAG'))
|
|
||||||
def run_opens(self, ac_dict):
|
def run_opens(self, ac_dict):
|
||||||
#Parse OpenSky Vector
|
#Parse OpenSky Vector
|
||||||
from colorama import Fore, Back, Style
|
from colorama import Fore, Back, Style
|
||||||
|
|
@ -472,12 +467,6 @@ class Plane:
|
||||||
if self.config.getboolean('DISCORD', 'ENABLE'):
|
if self.config.getboolean('DISCORD', 'ENABLE'):
|
||||||
role_id = self.config.get('DISCORD', 'ROLE_ID') if self.config.has_option('DISCORD', 'ROLE_ID') and self.config.get('DISCORD', 'ROLE_ID').strip() != "" else None
|
role_id = self.config.get('DISCORD', 'ROLE_ID') if self.config.has_option('DISCORD', 'ROLE_ID') and self.config.get('DISCORD', 'ROLE_ID').strip() != "" else None
|
||||||
sendDis(message, self.config, role_id, self.map_file_name)
|
sendDis(message, self.config, role_id, self.map_file_name)
|
||||||
#PushBullet
|
|
||||||
if self.config.getboolean('PUSHBULLET', 'ENABLE'):
|
|
||||||
with open(self.map_file_name, "rb") as pic:
|
|
||||||
map_data = self.pb.upload_file(pic, "Tookoff IMG" if self.tookoff else "Landed IMG")
|
|
||||||
self.pb_channel.push_note(self.config.get('PUSHBULLET', 'TITLE'), message)
|
|
||||||
self.pb_channel.push_file(**map_data)
|
|
||||||
#Twitter
|
#Twitter
|
||||||
if self.config.getboolean('TWITTER', 'ENABLE'):
|
if self.config.getboolean('TWITTER', 'ENABLE'):
|
||||||
import tweepy
|
import tweepy
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue