From b66ae49f67dae87a63326a0ab15e57e004cb8fa4 Mon Sep 17 00:00:00 2001 From: Stefano Assenzo Date: Sat, 21 Jan 2023 20:12:15 +0100 Subject: [PATCH] Change URL --- src/commands/command_freegame.py | 34 ++++++++++++------------------- src/events/check_game.py | 8 ++++---- src/events/notification_game.py | 35 ++++++++++++-------------------- 3 files changed, 30 insertions(+), 47 deletions(-) diff --git a/src/commands/command_freegame.py b/src/commands/command_freegame.py index 0060c47..f16588b 100644 --- a/src/commands/command_freegame.py +++ b/src/commands/command_freegame.py @@ -7,27 +7,21 @@ def freegame_command(message, bot): url = "https://api.plenusbot.xyz/epic_games?country=IT" #URL API response = requests.get(url).json() #API in JSON #Take data from API (Current Game 1) - image_currentgames1 = response['currentGames'][0]['keyImages'][0]['url'] # First image current games - current_games1 = response['currentGames'][0]['title'] # First title current games - current_games_description1 = response['currentGames'][0]['description'] # First description current games - current_games_startdate1 = response['currentGames'][0]['promotions']['promotionalOffers'][0]['promotionalOffers'][0]['startDate'] - current_games_endate1 = response['currentGames'][0]['promotions']['promotionalOffers'][0]['promotionalOffers'][0]['endDate'] - current_games_price1 = response['currentGames'][0]['price']['totalPrice']['fmtPrice']['originalPrice'] + image_currentgames1 = response['games'][0]['mainImage'] # First image current games + current_games1 = response['games'][0]['title'] # First title current games + current_games_description1 = response['games'][0]['description'] # First description current games #Send notification to user (Current Game 1) - title_description_1 = current_games1 + "\n\nAbout:\n" + current_games_description1 + "\n" + "\nStart Date:\n" + current_games_startdate1 + "\n" + "\nEnd Date:\n" + current_games_endate1 + "\n" + "\nPrice:\n" + current_games_price1 + " → " + "Free" # Send title, description, start date and price first current game + title_description_1 = current_games1 + "\n\nAbout:\n" + current_games_description1 # Send title, description, start date and price first current game img_1 = bot.send_photo(message.chat.id, image_currentgames1) # Send image first current games send_message = bot.send_message(chat_id, title_description_1, parse_mode="HTML") # Send all try: #Take data from API (Current Game 2) - image_currentgames2 = response['currentGames'][1]['keyImages'][0]['url'] # First image current games - current_games2 = response['currentGames'][1]['title'] # First title current games - current_games_description2 = response['currentGames'][1]['description'] # First description current games - current_games_startdate2 = response['currentGames'][1]['promotions']['promotionalOffers'][0]['promotionalOffers'][0]['startDate'] - current_games_endate2 = response['currentGames'][1]['promotions']['promotionalOffers'][0]['promotionalOffers'][0]['endDate'] - current_games_price2 = response['currentGames'][1]['price']['totalPrice']['fmtPrice']['originalPrice'] + image_currentgames2 = response['games'][1]['mainImage'] # First image current games + current_games2 = response['games'][1]['title'] # First title current games + current_games_description2 = response['games'][1]['description'] # First description current games - title_description_2 = current_games2 + "\n\nAbout:\n" + current_games_description2 + "\n" + "\nStart Date:\n" + current_games_startdate2 + "\n" + "\nEnd Date:\n" + current_games_endate2 + "\n" + "\nPrice:\n" + current_games_price2 + " → " + "Free" # Send title, description, start date and price second current game + title_description_2 = current_games2 + "\n\nAbout:\n" + current_games_description2 # Send title, description, start date and price second current game img_2 = bot.send_photo(message.chat.id, image_currentgames2) # Send image second current games send_message = bot.send_message(chat_id, title_description_2, parse_mode="HTML") # Send all except: @@ -36,14 +30,12 @@ def freegame_command(message, bot): #Try search third game try: #Take data from API (Current Game 3) - image_currentgames3 = response['currentGames'][2]['keyImages'][0]['url'] # First image current games - current_games3 = response['currentGames'][2]['title'] # First title current games - current_games_description3 = response['currentGames'][2]['description'] # First description current games - current_games_startdate3 = response['currentGames'][2]['promotions']['promotionalOffers'][0]['promotionalOffers'][0]['startDate'] - current_games_endate3 = response['currentGames'][2]['promotions']['promotionalOffers'][0]['promotionalOffers'][0]['endDate'] - current_games_price3 = response['currentGames'][2]['price']['totalPrice']['fmtPrice']['originalPrice'] + image_currentgames3 = response['games'][2]['mainImage'] # First image current games + current_games3 = response['games'][2]['title'] # First title current games + current_games_description3 = response['games'][2]['description'] # First description current games + #Send notification to user (Current Game 3) - title_description_3 = current_games3 + "\n\nAbout:\n" + current_games_description3 + "\n" + "\nStart Date:\n" + current_games_startdate3 + "\n" + "\nEnd Date:\n" + current_games_endate3 + "\n" + "\nPrice:\n" + current_games_price3 + " → " + "Free" # Send title, description, start date and price second current game + title_description_3 = current_games3 + "\n\nAbout:\n" + current_games_description3 # Send title, description, start date and price second current game img_3 = bot.send_photo(message.chat.id, image_currentgames3) # Send image second current games send_message = bot.send_message(chat_id, title_description_3, parse_mode="HTML") # Send all except IndexError: diff --git a/src/events/check_game.py b/src/events/check_game.py index 291d925..aacf243 100644 --- a/src/events/check_game.py +++ b/src/events/check_game.py @@ -11,12 +11,12 @@ def recheck_game(collection_game, collection_id, bot): def a(collection_game, collection_id, bot): try: #Connect to API - url = "https://api.plenusbot.xyz/epic_games?country=IT" #URL API + url = "https://minty.apexie.eu/v1/epicfreegames" #URL API response = requests.get(url).json() #API in JSON # Title of current games try: - current_games_title1 = response['currentGames'][0]['title'] #Title of first game + current_games_title1 = response['games'][0]['title'] #Title of first game search_game1 = collection_game.find_one({"Game 1": current_games_title1}) #Search game1 in MongoDB if search_game1 is None: #If game1 is not in MongoDB send notification @@ -31,7 +31,7 @@ def a(collection_game, collection_id, bot): #recheck_game(collection_game, collection_id, bot) try: - current_games_title2 = response['currentGames'][1]['title'] #Title of second game + current_games_title2 = response['games'][1]['title'] #Title of second game search_game2 = collection_game.find_one({"Game 2" : current_games_title2}) #Search game2 in MongoDB if search_game2 is None: #If game2 is not in MongoDB send notification #Send notification if title game is changed @@ -43,7 +43,7 @@ def a(collection_game, collection_id, bot): #recheck_game(collection_game, collection_id, bot) try: - current_games_title3 = response['currentGames'][2]['title'] + current_games_title3 = response['games'][2]['title'] search_game3 = collection_game.find_one({"Game 3" : current_games_title3}) if search_game3 is None: #If game2 is not in MongoDB send notification #Send notification if title game is changed diff --git a/src/events/notification_game.py b/src/events/notification_game.py index 7c6ec59..8c87f4c 100644 --- a/src/events/notification_game.py +++ b/src/events/notification_game.py @@ -6,23 +6,20 @@ def notification_game1(collection_game, collection_id, bot): try: print("Try to send first game") - url = "https://api.plenusbot.xyz/epic_games?country=IT" + url = "https://minty.apexie.eu/v1/epicfreegames" response = requests.get(url).json() #All information for first game - current_games_title1 = response['currentGames'][0]['title'] # First title current games - current_games_description1 = response['currentGames'][0]['description'] # First description current games - current_games_startdate1 = response['currentGames'][0]['promotions']['promotionalOffers'][0]['promotionalOffers'][0]['startDate'] # Public release first game - current_games_endate1 = response['currentGames'][0]['promotions']['promotionalOffers'][0]['promotionalOffers'][0]['endDate'] # End public release first game - current_games_price1 = response['currentGames'][0]['price']['totalPrice']['fmtPrice']['originalPrice'] - current_games_images1 = response['currentGames'][0]['keyImages'][0]['url'] # First image current games + current_games_title1 = response['games'][0]['title'] # First title current games + current_games_description1 = response['games'][0]['description'] # First description current games + current_games_images1 = response['games'][0]['mainImage'] # First image current games collection_find_username = list(collection_id.find({}, {"username": 1,})) #Find all username in collection array_username = list(collection_find_username[0]['username']) #Get just the array for i in array_username: #Send first and second message when the free game title change - title_description_1 = current_games_title1 + "\n\nAbout:\n" + current_games_description1 + "\n" + "\nStart Date:\n" + current_games_startdate1 + "\n" + "\nEnd Date:\n" + current_games_endate1 + "\n" + "\nPrice:\n" + current_games_price1 + " → " + "Free" # Send title, description, start date and price first current game + title_description_1 = current_games_title1 + "\n\nAbout:\n" + current_games_description1 # Send title, description, start date and price first current game img_1 = bot.send_photo(i, current_games_images1) # Send image first current games send_message = bot.send_message(i, title_description_1, parse_mode="HTML") # Send all @@ -39,17 +36,14 @@ def notification_game2(collection_game, collection_id, bot,): try: print("Try to send second game") #All information for second game - current_games_title2 = response['currentGames'][1]['title'] # Second title current game - current_games_images2 = response['currentGames'][1]['keyImages'][0]['url'] # Second image current game - current_games_description2 = response['currentGames'][1]['description'] # Second description current game - current_games_startdate2 = response['currentGames'][1]['promotions']['promotionalOffers'][0]['promotionalOffers'][0]['startDate'] #Public release second game - current_games_endate2 = response['currentGames'][1]['promotions']['promotionalOffers'][0]['promotionalOffers'][0]['endDate'] # End public release second game - current_games_price2 = response['currentGames'][1]['price']['totalPrice']['fmtPrice']['originalPrice'] # Original price second game + current_games_title2 = response['games'][1]['title'] # Second title current game + current_games_images2 = response['games'][1]['mainImage'] # Second image current game + current_games_description2 = response['games'][1]['description'] # Second description current game collection_find_username = list(collection_id.find({}, {"username": 1,})) #Find all username in collection array_username = list(collection_find_username[1]['username']) #Get the array for i in array_username: - title_description_2 = current_games_title2 + "\n\nAbout:\n" + current_games_description2 + "\n" + "\nStart Date:\n" + current_games_startdate2 + "\n" + "\nEnd Date:\n" + current_games_endate2 + "\n" + "\nPrice:\n" + current_games_price2 + " → " + "Free" # Send title, description, start date and price second current game + title_description_2 = current_games_title2 + "\n\nAbout:\n" + current_games_description2 # Send title, description, start date and price second current game img_2 = bot.send_photo(i, current_games_images2) # Send image second current games send_message = bot.send_message(i, title_description_2, parse_mode="HTML") # Send all @@ -66,17 +60,14 @@ def notification_game3(collection_game, collection_id, bot,): try: print("Try to send third game") #All information for second game - current_games_title3 = response['currentGames'][1]['title'] # Third title current game - current_games_images3 = response['currentGames'][1]['keyImages'][0]['url'] # Third image current game - current_games_description3 = response['currentGames'][1]['description'] # Third description current game - current_games_startdate3 = response['currentGames'][1]['promotions']['promotionalOffers'][0]['promotionalOffers'][0]['startDate'] #Public release Third game - current_games_endate3 = response['currentGames'][1]['promotions']['promotionalOffers'][0]['promotionalOffers'][0]['endDate'] # End public release Third game - current_games_price3 = response['currentGames'][1]['price']['totalPrice']['fmtPrice']['originalPrice'] # Original price Third game + current_games_title3 = response['games'][1]['title'] # Third title current game + current_games_images3 = response['games'][1]['mainImage'] # Third image current game + current_games_description3 = response['games'][1]['description'] # Third description current game collection_find_username = list(collection_id.find({}, {"username": 1,})) #Find all username in collection array_username = list(collection_find_username[1]['username']) #Get the array for i in array_username: - title_description_3 = current_games_title3 + "\n\nAbout:\n" + current_games_description3 + "\n" + "\nStart Date:\n" + current_games_startdate3 + "\n" + "\nEnd Date:\n" + current_games_endate3 + "\n" + "\nPrice:\n" + current_games_price3 + " → " + "Free" # Send title, description, start date and price Third current game + title_description_3 = current_games_title3 + "\n\nAbout:\n" + current_games_description3 # Send title, description, start date and price Third current game img_3 = bot.send_photo(i, current_games_images3) # Send image Third current games send_message = bot.send_message(i, title_description_3, parse_mode="HTML") # Send all