diff --git a/slack-bot/__pycache__/pullTrafficInfo.cpython-37.pyc b/slack-bot/__pycache__/pullTrafficInfo.cpython-37.pyc index 5ebf974..3a1df30 100644 Binary files a/slack-bot/__pycache__/pullTrafficInfo.cpython-37.pyc and b/slack-bot/__pycache__/pullTrafficInfo.cpython-37.pyc differ diff --git a/slack-bot/pullTrafficInfo.py b/slack-bot/pullTrafficInfo.py index 8c29791..c3a5107 100644 --- a/slack-bot/pullTrafficInfo.py +++ b/slack-bot/pullTrafficInfo.py @@ -124,7 +124,7 @@ class getTrafficInfo(object): currentTime = datetime.now().strftime('%H:%M') self.output.append(emoji.emojize(f'Did someone say {self.motorway}!?' ' :anguished:' - ' Let \'s check the latest updates' + ' Let\'s check the latest updates' ' from Highways England as of' f' {currentTime}!' ' :police_car::rotating_light:', diff --git a/slack-bot/sendToSQS.py b/slack-bot/sendToSQS.py index 31da460..0827c14 100644 --- a/slack-bot/sendToSQS.py +++ b/slack-bot/sendToSQS.py @@ -6,15 +6,48 @@ from pullTrafficInfo import getTrafficInfo import base64 import emoji +motorway = 'M62' + session = boto3.Session(profile_name='plex-aws') -sqs = session.resource('sqs') +sqs = session.client('sqs') # queue = sqs.create_queue(QueueName='test', Attributes={'DelaySeconds': '5'}) -inst = getTrafficInfo.getTrafficURL('A50').findIncidents() \ +inst = getTrafficInfo.getTrafficURL(motorway).findIncidents() \ .getIncidentInformation().generateOutput() -inst.output +# encoded = base64.b64encode(inst.output[0].encode()) +# decoded = base64.b64decode(encoded).decode() -encoded = base64.b64encode(inst.output[0].encode()) -decoded = base64.b64decode(encoded).decode() +queueURL = 'https://sqs.eu-west-1.amazonaws.com/745437999005/slack-bot.fifo' + +# message = sqs.send_message(QueueUrl=queueURL, +# MessageBody='string', +# MessageGroupId='slack-bot-motorway') + +# response = sqs.receive_message(QueueUrl=queueURL, +# MaxNumberOfMessages=5) +# if 'Messages' in response: +# for message in response['Messages']: +# print(message['Body']) +# else: +# print('Queue is empty') + +for item in inst.output: + encoded = (base64.b64encode(item.encode())).decode() + message = sqs.send_message(QueueUrl=queueURL, + MessageBody=encoded, + MessageGroupId=f'slack-bot-{motorway}') + response = sqs.receive_message(QueueUrl=queueURL, + MaxNumberOfMessages=5) + if 'Messages' in response: + for message in response['Messages']: + # print(message['Body']) + # break + decoded = base64.b64decode(message['Body'].encode()) + print(decoded.decode()) + else: + print('Queue is empty') + # print(encoded) + # print(encoded.encode()) + # print(base64.b64decode(encoded.encode()).decode())