From 4ce6226fcfea6fd02509c8ef1713ebc47589e482 Mon Sep 17 00:00:00 2001
From: tenzi <tenzingkandang1@gmail.com>
Date: Thu, 19 Mar 2026 19:11:17 +0100
Subject: [PATCH] de

---
 .env                                |   1 +
 .gitignore                          |   2 +
 __pycache__/weather.cpython-313.pyc | Bin 0 -> 1738 bytes
 calendar/credentials.json           |   1 +
 discord.py                          |   1 -
 task_bot.py                         |  83 ++++++++++-------
 testfile.py                         | 139 ++++++++++++++++++++++++++++
 7 files changed, 193 insertions(+), 34 deletions(-)
 create mode 100644 .env
 create mode 100644 .gitignore
 create mode 100644 __pycache__/weather.cpython-313.pyc
 create mode 100644 calendar/credentials.json
 delete mode 160000 discord.py
 create mode 100644 testfile.py

diff --git a/.env b/.env
new file mode 100644
index 0000000..9c40ade
--- /dev/null
+++ b/.env
@@ -0,0 +1 @@
+DISCORD_TOKEN=MTQ4MDkxODI5Mzk5MTc4ODYzNQ.GQ4P7l.uqYM-awr8zAp6eun9iJr0ziDhscv3XiByqSMpw
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..8833475
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+copies.txt
+
diff --git a/__pycache__/weather.cpython-313.pyc b/__pycache__/weather.cpython-313.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..7acdcafc5755b0cdfab75e6e53df2bd7f84a2fb4
GIT binary patch
literal 1738
zcmaJ>-ESL35a0W<&(4R59p}SJTa%;`2gFYEMT4S>ibg;y(#qEpky>eWId7aR_T6>w
zj;N9P@q`=!qD6`VZ+WCo6%r5p8IE{}wSW|fr@ldg)K_NDA1#*3$eP{p%+AjJelvSI
zFpxwbV-J6_zmO36lN%k8+ndvOVY7#Hqzl&&<*Rs2xGGXHkH*j>(xn{I<wda-O{I#U
zDbKmFrU@*u=GJV-4D6cK^0#z57@fWi_8z*8sGuV%>H?K?F^8zklTt;G>v9g=5ok<T
zXuJ~BR5p6uBhF{U47LdU)buXj_~gT?O`PC4uhxQ3=nB7s+nw?S168|DT?9+$nCtm!
zry^8AnzXiab}I-x|NUao^z4EQS8lhiteIZHr4^R9mI#@(-m_*e%x^B07dEWrvNbom
zd~wbs*2WUCG>NGjrcZE4t1O8j4G!GTiNj>atP$|aKB;c9MAt$4pc<bSoX_Xk`Qnya
zBgKF?JGN6P-Y8wax_T4qH!pv*T5Ok6@a{1cW81L<j9LCQxD+}O3QwN}^$0b`F4pC*
z2b#GRSW?a5v2PNm;6PRv1Tc7f1fK_+J#?!JmVrvI#(|fME-VX<Xow|#u15?(7j<b_
zEX8^pU^<c^=`ueAtHRd>aT;kc-aN_BCls3%pm#?h&P?dTpK8@~Dk1#Iq^cQ!ave>k
zywV6k7OxQ3a?9YR<~Dfx!2^d}3!2b%SQ6Zk;nFCyYzC&!dk0X@(?K5GS0Mq0Fz#Yg
zufz3~AU;C=B~Xvh@7c3IPCwJ0YKPf{da{|GI7&|+rl$|qe~CBJ(~a~8N9ikv=_~d4
zacbmoxclJy?St@#2aVKBL!F^Rkm5fr+~weB@a!Q#9@btN1nlQUz!8-=3O!;7i*4pY
zV9i@KWJ58a`AhtpdqfutvJ<=2WvQh01b{h-)|WV!PTYu>c+2+4V%v69Lj@k?wVk0N
z2eLR<SnPBzu)-UWj(}oH2o3Br#q>P84E)AClbSVOi_rv+nc#{8%v4J5hQx<h39x7K
z9UquaMEufm9(9gKNic6Ov(q=*Cw<R#e8S|2Zl0La9Z8Gx45!lyDTQ9c?Ez!&{2%u{
z!EZoL|28NXuc7SznI~r+ryA#G8-o|>QZqApl$korOdWjuYi4FwtxLz5ktY1Ixn_2J
zA3wo=CzN!u9{Xny4NvT^e7ABS9cJe1YBM$Z?fu>RUp=hL$Ei%cFX|9YituQ`!x`YC
z604Db+7>*J@FegT2A+f@#x=JbR{6dk<GZ0*ZF^D}Z`#xks<uNM7h{@&G%cv#f*s3Z
z><2I}7B&M&yAcM&$M`9V?vDVYyfq`m`^e{=`z1ONC1w01DJz8+{R7HyE1Cxa;ghhi
z6ik(Ouh5=Q>bJ%=N;M1qm+6_h(klHDodXB&;OOo8OA-X(H<bDVoqr*Z3&SS}RCMfL
D4_lH~

literal 0
HcmV?d00001

diff --git a/calendar/credentials.json b/calendar/credentials.json
new file mode 100644
index 0000000..620c140
--- /dev/null
+++ b/calendar/credentials.json
@@ -0,0 +1 @@
+{"installed":{"client_id":"880804761661-24ss22kt313h0p8godha5po7cmogsdah.apps.googleusercontent.com","project_id":"dask-bot","auth_uri":"https://accounts.google.com/o/oauth2/auth","token_uri":"https://oauth2.googleapis.com/token","auth_provider_x509_cert_url":"https://www.googleapis.com/oauth2/v1/certs","client_secret":"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","redirect_uris":["http://localhost"]}}
\ No newline at end of file
diff --git a/discord.py b/discord.py
deleted file mode 160000
index e55b308..0000000
--- a/discord.py
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e55b308c1adb705a99bb0b30aa1d6dcc8ce05790
diff --git a/task_bot.py b/task_bot.py
index 8a138bd..3a8f72c 100644
--- a/task_bot.py
+++ b/task_bot.py
@@ -11,7 +11,6 @@ global service
 service = None
 
 SCOPES = ['https://www.googleapis.com/auth/calendar.readonly']
-service = None
 
 load_dotenv()
 DISCORD_TOKEN = os.getenv("DISCORD_TOKEN")
@@ -25,45 +24,62 @@ bot = commands.Bot(command_prefix='!', intents=intents)
 
 
 #Calendar authentification
-@bot.tree.command()
-async def authenticate(interaction: discord.Interaction):
-    await interaction.response.defer(thinking=True)
+async def authenticate():
+
+    print("Authenticating..")
     global service
-    try:
-        flow = google_auth_oauthlib.flow.InstalledAppFlow.from_client_secrets_file('./calendar/credentials.json', SCOPES)
-        credentials = flow.run_local_server(port=0)
-        service = build('calendar', 'v3', credentials=credentials)
-        await interaction.followup.send('Successfully authenticated with Google Calendar !')
-    except Exception as e:
-            await interaction.followup.send(f'An error occurred: {e}')
+    flow = google_auth_oauthlib.flow.InstalledAppFlow.from_client_secrets_file('./calendar/credentials.json', SCOPES)
+    credentials = flow.run_local_server(port=0)
+    service = build('calendar', 'v3', credentials=credentials)
+    
 
-@bot.tree.command(name='tasks_otd')
+@bot.tree.command(name='weekly_events')
 async def events(interaction: discord.Interaction):
-    if service is None:
-        await interaction.response.send_message('Please authenticate first using /authenticate.')
-        return
+    await interaction.response.defer(thinking=True)
+    
+    now = datetime.datetime.utcnow()
+    current_weekday = now.weekday()
 
-    now = datetime.datetime.utcnow().isoformat() + 'Z'
-    start_of_day = datetime.datetime.utcnow().replace(hour=0, minute=0, second=0, microsecond=0).isoformat() + 'Z'
-    end_of_day = datetime.datetime.utcnow().replace(hour=23, minute=59, second=59, microsecond=999999).isoformat() + 'Z'
+    start_of_week = now - datetime.timedelta(days=current_weekday)
+    start_of_week = start_of_week.replace(hour=0, minute=0, second=0, microsecond=0)
 
-    events_result = service.events().list(
-        calendarId='primary', 
-        timeMin=start_of_day,
-        timeMax=end_of_day,
-        singleEvents=True,
-        orderBy='startTime'
-    ).execute()
+    end_of_week = start_of_week + datetime.timedelta(days=6)
+    end_of_week= end_of_week.replace(hour=23, minute=59, second=59, microsecond=999999)
 
-    events = events_result.get('items',[])    
+    try:
+        events_result = service.events().list(
+            calendarId='primary', 
+            timeMin=start_of_week.isoformat() + 'Z',
+            timeMax=end_of_week.isoformat() + 'Z',
+            singleEvents=True,
+            orderBy='startTime'
+        ).execute()
 
-    if not events:
-        await interaction.response.send_message('No tasks for today !')
-    else:
-        tasks = []
-        for event in events:
-            task= f"{event['summary']} at {event['start'].get('dateTime', event['start'].get('date'))}"
-            await interaction.response.send_message('\n'.join(tasks))
+        events = events_result.get('items',[])    
+
+        if not events:
+            await interaction.response.send_message('No events this week !')
+        else:
+            embed = discord.Embed(
+                 title="📅 Weekly Events Summary",
+                 color=discord.Color.blue()
+            )
+            
+            for event in events:
+                event_time_str = event['start'].get('dateTime', event['start'].get('date'))
+                if 'Z' in event_time_str:
+                    event_time = datetime.datetime.fromisoformat(event_time_str.replace('Z', '+00:00'))
+                else:
+                    event_time = datetime.datetime.fromisoformat(event_time_str)
+
+                event_time_local = event_time.strftime("%A, %B %d, %Y, %H:%M")
+                task = f"**{event['summary']}**\n⏰ **At: {event_time_local}**"
+                embed.add_field(name="\u200b", value=task, inline=False)
+
+            await interaction.followup.send(embed=embed)
+
+    except Exception as e:
+        await interaction.followup.send(f'An error occurred: {e}')
 
 
 #Weather commad tree
@@ -111,6 +127,7 @@ async def hello_command(interaction: discord.Interaction):
 @bot.event
 async def on_ready():
     print(f'Logged in as {bot.user}')
+    await authenticate()
     await bot.tree.sync()
 
 #Liste commandes enregistré
diff --git a/testfile.py b/testfile.py
new file mode 100644
index 0000000..5a1dd41
--- /dev/null
+++ b/testfile.py
@@ -0,0 +1,139 @@
+import os
+import discord
+import datetime
+import google_auth_oauthlib.flow
+from weather import OpenWeatherMapAPIClient
+from googleapiclient.discovery import build
+from discord.ext import commands
+from dotenv import load_dotenv
+
+global service
+service = None
+
+SCOPES = ['https://www.googleapis.com/auth/calendar.readonly']
+service = None
+
+load_dotenv()
+DISCORD_TOKEN = os.getenv("DISCORD_TOKEN")
+WEATHER_TOKEN = os.getenv("WEATHER_TOKEN")
+
+weather_client = OpenWeatherMapAPIClient(WEATHER_TOKEN, "MyDiscordWeatherBot")
+intents = discord.Intents(messages=True, guilds=True)
+intents.message_content = True
+bot = commands.Bot(command_prefix='!', intents=intents)
+
+
+
+#Calendar authentification
+@bot.tree.command()
+async def authenticate(interaction: discord.Interaction):
+    await interaction.response.defer(thinking=True)
+    global service
+    try:
+        if service:
+            await interaction.response.send_message('Already authenticated with Google Calendar.')
+            return
+
+        flow = google_auth_oauthlib.flow.InstalledAppFlow.from_client_secrets_file('./calendar/credentials.json', SCOPES)
+        credentials = flow.run_local_server(port=0)
+        service = build('calendar', 'v3', credentials=credentials)
+        await interaction.followup.send('Successfully authenticated with Google Calendar !')
+    except Exception as e:
+            await interaction.followup.send(f'An error occurred: {e}')
+    
+
+@bot.tree.command(name='weekly_events')
+async def events(interaction: discord.Interaction):
+    await interaction.response.defer(thinking=True)
+
+    if service is None:
+        await interaction.followup.send('Please authenticate first using /authenticate.')
+        return
+
+    now = datetime.datetime.utcnow()
+    current_weekday = now.weekday()
+
+    start_of_week = now - datetime.timedelta(days=current_weekday)
+    start_of_week = start_of_week.replace(hour=0, minute=0, second=0, microsecond=0).isoformat() + 'Z'
+
+    end_of_week = start_of_week + datetime.timedelta(days=6)
+    end_of_week= end_of_week.replace(hour=23, minute=59, second=59, microsecond=999999).isoformat() + 'Z'
+    try:
+        events_result = service.events().list(
+            calendarId='primary', 
+            timeMin=start_of_week,
+            timeMax=end_of_week,
+            singleEvents=True,
+            orderBy='startTime'
+        ).execute()
+
+        events = events_result.get('items',[])    
+
+        if not events:
+            await interaction.response.send_message('No tasks for today !')
+        else:
+            tasks = []
+            for event in events:
+                task= f"{event['summary']} at {event['start'].get('dateTime', event['start'].get('date'))}"
+                tasks.append(task)
+            
+            await interaction.followup.send('\n'.join(tasks))
+
+    except Exception as e:
+        await interaction.followup.send(f'An error occurred: {e}')
+
+
+#Weather commad tree
+@bot.tree.command(name="weather")
+async def current_weather(interaction: discord.Interaction, location: str):
+
+    print(f"Received weather command from {interaction.user.display_name}")  # Log intéraction
+
+    current_weather = weather_client.get_current_weather(location)
+
+    print(f"JSON API {current_weather}")
+
+    # Check that current_weather is a dictionary and contains necessary keys
+    if not isinstance(current_weather, dict) or 'main' not in current_weather or 'weather' not in current_weather:
+        await interaction.response.send_message("Could not retrieve weather data. Please check the location.")
+        return
+        
+    weather_list = current_weather['weather']
+    if len(weather_list) == 0:
+        await interaction.response.send_message("Weather information is not available.")
+        return
+
+    weather_condition = weather_list[0]['main'] 
+
+    temp = current_weather['main']['temp']
+   
+    icon = current_weather['weather']['icon']
+    embed = discord.Embed(
+        title=f"Current weather in {location}",
+        description=f"Temperature: {temp}°C\nSky: {weather_condition}",
+    )
+    embed.set_thumbnail(url=f"https://openweathermap.org/img/wn/{icon}.png")
+    
+    await interaction.response.send_message(embed=embed)
+   
+
+@bot.tree.command(name='hello')
+async def hello_command(interaction: discord.Interaction):
+    
+    print(f"Received hello command from {interaction.user.display_name}")  # Log intéraction
+
+    user_nick = interaction.user.display_name
+    await interaction.response.send_message(f'Hello {user_nick}!')
+
+@bot.event
+async def on_ready():
+    print(f'Logged in as {bot.user}')
+    await bot.tree.sync()
+
+#Liste commandes enregistré
+    commands = await bot.tree.fetch_commands()
+    print("Registered Commands:")
+    for command in commands:
+        print(f"- {command.name}")
+
+bot.run(DISCORD_TOKEN)