diff --git a/src/discord_helper.py b/src/discord_helper.py new file mode 100644 index 0000000..213be35 --- /dev/null +++ b/src/discord_helper.py @@ -0,0 +1,38 @@ +# This example requires the 'message_content' intent. +import asyncio + +import discord + +intents = discord.Intents.default() +intents.messages = True + +discord_client = discord.Client(intents=intents) + + +@discord_client.event +async def on_ready(): + print(f'We have logged in as {discord_client.user}') + # await send_message("我是机器人") + + +@discord_client.event +async def on_message(message): + pass + + +async def send_message(message): + print("will call send") + channel = discord_client.get_channel(1149373754053496866) + await channel.send(message) + + +def run_discord(): + _token = 'MTMxNTI5OTkxODk4MTg5MDExOQ.GKA6lA.wHM4fTFT1luVrptK4YxEtFn_WhUnavtIrla_TE' + discord_client.run(_token) + + +if __name__ == '__main__': + # loop = asyncio.get_event_loop() + # loop.run_until_complete(client.start()) + # client.start() + asyncio.run(run_discord()) diff --git a/src/mail/mail_confirmation.py b/src/mail/mail_confirmation.py index 2764708..2b9ec92 100755 --- a/src/mail/mail_confirmation.py +++ b/src/mail/mail_confirmation.py @@ -217,6 +217,7 @@ def find_confirmation_contacts_mail_list(mail_list): print(mail.subject) print(mail.body) accept_appointment_found(accepted_appointment_list) + return accepted_appointment_list def read_mails_and_find_confirmation_contacts(all_mails=False): @@ -225,7 +226,7 @@ def read_mails_and_find_confirmation_contacts(all_mails=False): mail_list = MONGO_STORE_MANAGER.get_destination_emails() else: mail_list = find_confirmation_contacts_for_today() - find_confirmation_contacts_mail_list(mail_list) + return find_confirmation_contacts_mail_list(mail_list) # mail_list.reverse() # excel_reader = ExcelHelper() # mail_list =excel_reader.read_email_pojo(file_name="/Users/lpan/Desktop/hotmail_list.xlsx") diff --git a/src/pojo/accepted_appointment_pojo.py b/src/pojo/accepted_appointment_pojo.py index f0072e9..f763049 100644 --- a/src/pojo/accepted_appointment_pojo.py +++ b/src/pojo/accepted_appointment_pojo.py @@ -1,3 +1,5 @@ +from typing import Union + import time from src.pojo.ReserveResultPojo import ReserveResultPojo, PublishType @@ -5,7 +7,7 @@ from src.pojo.ReserveResultPojo import ReserveResultPojo, PublishType class AcceptedAppointmentPojo(ReserveResultPojo): accepted_at: float - day: str + day: Union[str,None] def __init__(self, reserve: ReserveResultPojo): self.id = reserve.id @@ -13,15 +15,16 @@ class AcceptedAppointmentPojo(ReserveResultPojo): self.passport = reserve.passport self.url = reserve.url self.store_type = reserve.store_type - self.lastName = reserve.last_name - self.firstName = reserve.first_name + self.last_name = reserve.last_name + self.first_name = reserve.first_name self.ccid = reserve.ccid - self.email = reserve.mail + self.mail = reserve.mail self.phone = reserve.phone self.message = reserve.message self.source_from = reserve.source_from self.created_at = reserve.created_at self.validated_at = reserve.validated_at + self.day = None @staticmethod def from_reserve(reserve: ReserveResultPojo): @@ -33,10 +36,10 @@ class AcceptedAppointmentPojo(ReserveResultPojo): dest = { u'id': self.id, u'phone': self.phone, - u'firstName': self.firstName, - u'lastName': self.lastName, + u'firstName': self.first_name, + u'lastName': self.last_name, u'message': self.message, - u'email': self.email, + u'email': self.mail, u'passport': self.passport, u'url': self.url, u'ccid': self.ccid, @@ -65,8 +68,8 @@ class AcceptedAppointmentPojo(ReserveResultPojo): lastName = source['lastName'] firstName = source['firstName'] result = ReserveResultPojo(type=publish_type, phone=phone, - url=url, email=email, - firstName=firstName, lastName=lastName) + url=url, mail=email, + first_name=firstName, last_name=lastName) if 'accepted' in source: accepted = source['accepted'] result.accepted = accepted @@ -95,5 +98,9 @@ class AcceptedAppointmentPojo(ReserveResultPojo): accepted_pojo = AcceptedAppointmentPojo.from_reserve(result) if 'accepted_at' in source: accepted_at = source['accepted_at'] + # accepted_pojo.accepted_at = int(accepted_at) accepted_pojo.accepted_at = accepted_at + if 'day' in source: + day = source['day'] + accepted_pojo.day = day return accepted_pojo