update prod

assets/simplebot.py

@@ -46,7 +46,7 @@ def lambda_handler(event, context):
                 event_hash = generate_event_hash(result)
                 if not result.done and not event_exists(event_hash):
                     counter += 1
-                    send_message(chat_id, str(result), BASE_URL)
+                    send_photo(chat_id, result.image, BASE_URL, str(result))
                     store_event(event_hash)
                     logger.info(f"Stored {result.title}")
 
@@ -55,7 +55,7 @@ def lambda_handler(event, context):
         elif message == "/scrape all":
             response = scrape_webpage()
             for result in response:
-                send_message(chat_id, str(result), BASE_URL)
+                send_photo(chat_id, result.image, BASE_URL, str(result))
             response = f"Sent {len(response)} events!"
             send_message(chat_id, response, BASE_URL)
             logger.info(response)
@@ -76,8 +76,8 @@ def lambda_handler(event, context):
         elif message == "/testPhoto":
             event_image = "https://eventro.ir/images/events/poster/44543.jpg"
             response = "🎵🎶📣🎯\n" \
-                       "📅 23 بهمن 1402\n" \
-                       "<a href='https://eventro.ir/events/44543'>🎟️ منبع و خرید بلیت</a>"
+                       "📅 23 بهمن 1402 \n" \
+                       "<a href='https://eventro.ir/events/44543'>🎟️ منبع و خرید بلیت</a> \n"
             send_photo(chat_id, event_image, BASE_URL, response)
             logger.info(response)
         else:

assets/utils.py

@@ -20,12 +20,14 @@ class Event(BaseModel):
     image: str
     date_iran: str
     date_world: str
+    code: str
+    image_poster_url: str
     done: bool
 
     def __str__(self):
-        return f"<a href='{self.title_link}'>{self.title}</a>\n" \
-               f"{self.date_iran}\n" \
-               f"{self.date_world}"
+        return f"📣 {self.title}\n " \
+               f"📅 {self.date_iran} \n " \
+               f"<a href='https://eventro.ir/events/{self.code}'>🎟️ منبع و خرید بلیت</a> \n"
 
 
 def scrape_webpage():
@@ -47,6 +49,9 @@ def scrape_webpage():
                     .find('span', 'dt1').text
         date_iran = date.strip().split('\n')[0].strip()
         date_world = date.strip().split('\n')[-1].strip()
+        code = title_link.split('/')[-1]
+        image_poster_url = f"https://eventro.ir/images/events/poster/{code}.jpg"
+
         done = False
         for detail in event.find('div', class_='allmode_text') \
                            .find_all('div', class_='event_detail'):
@@ -57,7 +62,8 @@ def scrape_webpage():
                     done = True
 
         result = Event(title=title, title_link=title_link, image=image,
-                       date_iran=date_iran, date_world=date_world, done=done)
+                       date_iran=date_iran, date_world=date_world,
+                       code=code, image_poster_url=image_poster_url, done=done)
         results.append(result)
 
     logger.info(results)