RomanNum3ral
/
plane-notify
mirror of https://github.com/RomanNum3ral/plane-notify.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Global Twitter Flag checking

This commit is contained in:
Jack Sweeney 2022-12-22 22:19:12 -05:00
parent cea7e5b32e
commit 7b51e4255d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
planeClass.py
View File

@ -407,7 +407,7 @@ class Plane:
else: else:
self.dis_title = self.config.get('DISCORD', 'TITLE') self.dis_title = self.config.get('DISCORD', 'TITLE')
#Set Twitter Title #Set Twitter Title
if self.config.getboolean('TWITTER', 'ENABLE'): if self.config.getboolean('TWITTER', 'ENABLE') and Plane.main_config.getboolean('TWITTER', 'ENABLE'):
if self.config.get('TWITTER', 'TITLE') in ["DYNAMIC", "callsign"]: if self.config.get('TWITTER', 'TITLE') in ["DYNAMIC", "callsign"]:
self.twitter_title = dynamic_title self.twitter_title = dynamic_title
else: else:
@ -473,7 +473,7 @@ class Plane:
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)
#Twitter #Twitter
if self.config.getboolean('TWITTER', 'ENABLE'): if self.config.getboolean('TWITTER', 'ENABLE') and Plane.main_config.getboolean('TWITTER', 'ENABLE'):
import tweepy import tweepy
try: try:
twitter_media_map_obj = self.tweet_api.media_upload(self.map_file_name) twitter_media_map_obj = self.tweet_api.media_upload(self.map_file_name)
@ -511,7 +511,7 @@ class Plane:
dis_message = f"{self.dis_title} {distance_message} \nFlight Fuel Info ```{fuel_message}```".strip() dis_message = f"{self.dis_title} {distance_message} \nFlight Fuel Info ```{fuel_message}```".strip()
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(dis_message, self.config, role_id) sendDis(dis_message, self.config, role_id)
if self.config.getboolean('TWITTER', 'ENABLE'): if self.config.getboolean('TWITTER', 'ENABLE') and Plane.main_config.getboolean('TWITTER', 'ENABLE'):
try: try:
self.latest_tweet_id = self.tweet_api.update_status(status = ((self.twitter_title + " " + distance_message + " " + fuel_message).strip()), in_reply_to_status_id = self.latest_tweet_id).id self.latest_tweet_id = self.tweet_api.update_status(status = ((self.twitter_title + " " + distance_message + " " + fuel_message).strip()), in_reply_to_status_id = self.latest_tweet_id).id
except tweepy.errors.TweepyException as e: except tweepy.errors.TweepyException as e:
@ -538,7 +538,7 @@ class Plane:
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(dis_message, self.config, role_id) sendDis(dis_message, self.config, role_id)
#Twitter #Twitter
if self.config.getboolean('TWITTER', 'ENABLE'): if self.config.getboolean('TWITTER', 'ENABLE') and Plane.main_config.getboolean('TWITTER', 'ENABLE'):
self.latest_tweet_id = self.tweet_api.update_status(status = f"{self.twitter_title} {route_to}".strip(), in_reply_to_status_id = self.latest_tweet_id).id self.latest_tweet_id = self.tweet_api.update_status(status = f"{self.twitter_title} {route_to}".strip(), in_reply_to_status_id = self.latest_tweet_id).id
if self.circle_history is not None: if self.circle_history is not None:
@ -807,7 +807,7 @@ class Plane:
sendDis(message, self.config, role_id, self.map_file_name, tfr_map_filename) sendDis(message, self.config, role_id, self.map_file_name, tfr_map_filename)
elif tfr_map_filename is None: elif tfr_map_filename is None:
sendDis(message, self.config, role_id, self.map_file_name) sendDis(message, self.config, role_id, self.map_file_name)
if self.config.getboolean('TWITTER', 'ENABLE'): if self.config.getboolean('TWITTER', 'ENABLE') and Plane.main_config.getboolean('TWITTER', 'ENABLE'):
twitter_media_map_obj = self.tweet_api.media_upload(self.map_file_name) twitter_media_map_obj = self.tweet_api.media_upload(self.map_file_name)
media_ids = [twitter_media_map_obj.media_id] media_ids = [twitter_media_map_obj.media_id]
if tfr_map_filename is not None: if tfr_map_filename is not None: