From 5e2ff7a8593c3329c9b6e0dc76884ac528a52d40 Mon Sep 17 00:00:00 2001
From: tenzi <tenzingkandang1@gmail.com>
Date: Wed, 1 Apr 2026 19:13:42 +0200
Subject: [PATCH] mark task as complete unfinsihed

---
 .gitignore                                    |   2 +-
 .../__pycache__/database.cpython-313.pyc      | Bin 2445 -> 2443 bytes
 bot/__pycache__/task.cpython-313.pyc          | Bin 0 -> 2948 bytes
 .../__pycache__/weather.cpython-313.pyc       | Bin 1878 -> 1876 bytes
 {utils => bot}/database.py                    |   0
 bot/task.py                                   |  40 +++++++++++
 {utils => bot}/weather.py                     |   0
 main.py                                       |  64 ++++++++++--------
 8 files changed, 75 insertions(+), 31 deletions(-)
 rename {utils => bot}/__pycache__/database.cpython-313.pyc (85%)
 create mode 100644 bot/__pycache__/task.cpython-313.pyc
 rename {utils => bot}/__pycache__/weather.cpython-313.pyc (92%)
 rename {utils => bot}/database.py (100%)
 create mode 100644 bot/task.py
 rename {utils => bot}/weather.py (100%)

diff --git a/.gitignore b/.gitignore
index 8992d45..f17da50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,4 @@
 /dvenv
 copy.txt
 user_location.db
-/utils/.env
+/bot/.env
diff --git a/utils/__pycache__/database.cpython-313.pyc b/bot/__pycache__/database.cpython-313.pyc
similarity index 85%
rename from utils/__pycache__/database.cpython-313.pyc
rename to bot/__pycache__/database.cpython-313.pyc
index ad100408e6ef39fea540166602f7b2b16bca76e7..d088d3eaf6073a5dee952ab3961ffbcc0c0f2e52 100644
GIT binary patch
delta 44
zcmeAb?iSwQ!YHq$pOK%Ns$Y_tSCyHUt{)KO@8ud29~|Q7?y8@ZU$QxsQG){jLdOmk

delta 46
zcmeAc?iJqP!l<aDpOK%Ns$Y_tSCyHUt{)KO@8ud29~|Q7?y6r}l9^MyIhj#|0{~+v
B4+H=J

diff --git a/bot/__pycache__/task.cpython-313.pyc b/bot/__pycache__/task.cpython-313.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..7bd93ad600b92420b6f8428d84a387e84e3f040f
GIT binary patch
literal 2948
zcmb6bOKjWN@ja0gDOq-GIjh+2?po_Oi7BVjritOYT{~-g({ydb2}G$EyJl&MvYAk#
z`$*;ElYs&Y2R-bfXt2qtIeKq7_SiU=UJ6J}TNy-vEzqK<fgYSy(gfHZIzx(fV)W7n
zaAw})ym|BH_omg^87D9vT>FDL9VO&%I0=W)CR#rO;vP|mLgxt!FlE%AM_9zi9OD2-
z=J`2+33E{vO_M${L=<j-DEv}%j0<Ej(O(r{HM%4mtV*j?7Wa^4L5_I*PfX*M7gY?)
z&|N*)7{Ew-(wYNe8FX4As0Zjk8CN71s1g|<*Coa)+>($_yty@?FGLg`ICv&10+Whl
zlCsz^k)vL`pgA{!6Zd%F)x)E3p9mjbpmiF+6un0l0SBWHDUzRpp%ge;i4>{AP4H>5
zN@RXv<K5Xc+jfk!mUcmS+O^ZVU0Jsb*T`nGdlUr7yw|aAX}YmyTP1^e@rqehZ)#S}
zaDdishqP#~yQW=rz&L_aTL(@_Rn4mDs;bO+ykl5p)(P^wn5ycQ<~XYApu*|&rgu8G
zW><`yYg9MP>T2#<{_5PNf~pjzFJH>7*lrGW%dX#H$8dk|p&7E_2^a>>Ab{7K<eAiY
zS8Paq^;5IEy~iK+Y+v5zNUZ-GLSthsU?E<IS#=Gj>8S5pMug}hzksjxPq_KAxGXKl
zmg6T$8oYRD&itEZM|m)YNRi~xCr5@tQL{0$BaCXK2oAuNN*pN8r(#8#$8(R2eC)^q
zOch=cCg`US-D_aEoAe&HAS6J$_sL>M$UW93D$?RXY~{PczlRt!mWr`r`~s&$F&;x5
zk4mp{MQ)_Mt#pzQ(6;+fN=W5<L+TJKBIqkkM2<?t&|4)ESy+be9DMN)$l`FgPbAuh
zV5#W;aZaol?IPzPYYt8WPXyMH2-;^5ELM$9M_1dpOv_}F8zf~q&XuVgUts7`uLHx(
zG96bnOP+`mAPO?|BzMiM-hjx|LoE@b_wd@SB>+?0JyIa~wxeO;V1y3IgUgPNLZm<y
zIuXgEtRo}b2dN*yiX(;Ec|1~(Qvzbg<5msV6OG%3UULmt79E4#G<AdZfkbu!fS+fZ
zo0}{N6Hofc(kd$@ZOS`U00BWk$?BSAt!Vm<>_?Ujv@-=nz=oTgQve{hb`!myU%7kb
zmsgvK!A4?m`#ZlKuO|lUiP>gizLA*!Q{oCc4xAguP;$CzyXmrBtCq50#F(+ZW>g^U
ztPSxJV>bIiTJH7u>yBOZ1k2V+ju&m06^R+nI+PN_6G}!IDoO83&9q9Ye_yqIJx|n}
zJ5}AZy_jpO?iw?+k|&jI%d&6P*0JDJVP4W)!!;|07p=K^)xPD4%<!uj*b|mF?5g2$
z@XL#tj$O7{MRPsAWa=(^A8i%8bXzz4x+ZrpjC=MDE{p5h9aNdUi!;ubTU*DoN**;l
ze#I``VQFMP^Z{mQIv5|rX!{~G`&(5lT*MOK{0qRhdt{URJ(>D4^Q+AL!fzHIEN=Ha
zSbmy3yCv?X-n(CEq|R=2>?Zr~%Z=plmiX7M{$|%uqid+yHPYxBc{E(_8mV`UH>L5q
zG`=6{jm^_%Dfww?bnEi7{&cfH^T+<ozX?6NKwE?kT&1rFJ${vLee#dq6T7JonyE}9
zm1(AOja07w;q>ndb-<~7vpZk!&hK`o_62gh?|BD_egAnB_dSo29)-SsF+jTeK^`2o
zn|!aCJl#m1ZYD<?$<giAN7^H0`^xVM_2g(hIoC|g{UtH??LLRR|8Xq1@MqKU+3(TE
z-E=0$Kkng?PRTQ4<ncv1bB^C3BS7zr(3$i6j?5$dT@HA5&QYY#`*18io8xvare`zU
zlR-K=6n&BwkUk{<=aY;8f1l)V*H=W2<6BkLDu$|haaFC@rJ99wLREiW)2#NNW2#y<
znd4e!)u`I48azj0$#is^mAsBm4__7bL%4+Z4m@$L=9;>yxh^wTAV1;N^E%rPpl(=}
zs(wXT5BeEPM-UYZp93G@i{cCcc>Ni98HosE`_h0gPq)uBGn0+X<ST-+Z+z(Ioxka=
zA{7>$)>)8pv>Q?Q!+zvC#g2pte!mfgq9b@QOkxKcojpu{J(LBsU;J?1DgZdrZa|lV
z?FPJXbb_YwW&9uIZ4nz5e-vr>_Jr7PPN3*fsKSt>cFmP}hHqG4aY-wcRMRyo{&nG(
zpP1NNuz3W&Ini{GZ9&Zo_9YMQbI><nv*Zi|c%yH4c%m-#H6(dgN_^gVxAWK6AD(!c
zlK(7a0uxUHw@mkLBNEvZAa)VK#|WkoV3)!^L2wDdj{v;s-5=v30yL_FYJ+!Qfp<q=
z5&*#|_+O5(3?PR3u`Gfa0A9QuaM_y4&;<;y8pMn*8WjwLw99=E&Qt6f{J<!4WB`zD
llzvUlG|8E-$;lV|Af2aQq+SrjFJ>r5N59}-5<tGF{{jcAi}?Tm

literal 0
HcmV?d00001

diff --git a/utils/__pycache__/weather.cpython-313.pyc b/bot/__pycache__/weather.cpython-313.pyc
similarity index 92%
rename from utils/__pycache__/weather.cpython-313.pyc
rename to bot/__pycache__/weather.cpython-313.pyc
index f46dd28ce3d0f239b7b61f8134550aa6be50e402..b74f21d985fcab893392fa90f2c0943599ec916f 100644
GIT binary patch
delta 22
ecmcb{cZF}m3r0rG$uAkDnUnHMHghuhvH}2P4+nYx

delta 24
gcmcb@ca3ku3r0rm$uAkDSxZYYbBZ^!Gx@Rt0Cz?RXaE2J

diff --git a/utils/database.py b/bot/database.py
similarity index 100%
rename from utils/database.py
rename to bot/database.py
diff --git a/bot/task.py b/bot/task.py
new file mode 100644
index 0000000..e63ce8d
--- /dev/null
+++ b/bot/task.py
@@ -0,0 +1,40 @@
+import asyncio, json, datetime, discord
+from discord.ui import View, Select
+
+class TaskSelect(Select):
+    def __init__(self, options):
+        super().__init__(placeholder="Choose a task to complete...",
+        min_values=1, max_values=1, options=options)
+
+    async def callback(self, interaction: discord.Interaction):
+
+        payload = json.loads(self.values[0])
+        tasklist_id = payload["tasklist_id"]
+        task_id = payload["task_id"]
+
+        await interaction.response.defer(thinking=True)
+        try:
+            service = build_tasks_service()
+            task = await asyncio.to_thread(lambda:
+            service.tasks().get(tasklist=tasklist_id, task=task_id).execute())
+            if not task:
+                await interaction.followup.send("Task not found.", ephemeral=True)
+                return
+
+                now = datetime.datetime.utcnow().replace(tzinfo=datetime.timezone.utc).isoformat()
+                body = dict(task)
+                body["status"] = "completed"
+                body["completed"] = now
+
+                updated = await asyncio.to_thread(lambda: service.tasks().update(tasklist=tasklist_id, task=task_id, body=body).execute())
+
+                if updated.get("status") == "completed":
+                    await interaction.followup.send("Failed to mark completed.", ephemeral=True)
+
+        except Exception as e:
+            await interaction.followup.send(f"Error: {e}", ephemeral=True)
+
+class TasksView(View):
+    def __init__(self, options, timeout=120):
+        super().__init__(timeout=timeout)
+        self.add_item(TaskSelect(options))
\ No newline at end of file
diff --git a/utils/weather.py b/bot/weather.py
similarity index 100%
rename from utils/weather.py
rename to bot/weather.py
diff --git a/main.py b/main.py
index f515483..53a4ebb 100644
--- a/main.py
+++ b/main.py
@@ -1,14 +1,15 @@
-import os
-import discord
-import datetime
+import discord, asyncio, json, datetime, os
 from google_auth_oauthlib.flow import InstalledAppFlow
-from utils.weather import OpenWeatherMapAPIClient
+from bot.weather import OpenWeatherMapAPIClient
 from googleapiclient.discovery import build
 from google.oauth2.credentials import Credentials
 from discord.ext import commands
 from dotenv import load_dotenv
-from utils.database import UserLocation
+from bot.database import UserLocation
 from asyncio import to_thread
+from discord import app_commands
+from discord.ui import View, Select
+from bot.task import TaskSelect, TasksView
 
 load_dotenv()
 DISCORD_TOKEN = os.getenv("DISCORD_TOKEN")
@@ -61,14 +62,16 @@ async def authenticate():
     with open(TOKEN_FILE, 'w') as f:
         f.write(credentials.to_json())
     print(f"Saved credentials to {TOKEN_FILE} for instant access")
-    
-    
-@bot.tree.command(name="daily_tasks", description="Check today's saved tasks")
+
+
+@bot.tree.command(name="daily_tasks", description="Check today's saved tasks and complete them")
 async def today(interaction: discord.Interaction):
     await interaction.response.defer(thinking=True)
+
+    print(f'Recieved daily_tasks command by {interaction.user.display_name}')
     try:
         service = build_tasks_service()
-        tl_res = service.tasklists().list(maxResults=100).execute()
+        tl_res = await asyncio.to_thread(lambda: service.tasklists().list(maxResults=100).execute())
         lists = tl_res.get("items", []) or []
 
         today = datetime.datetime.now(tz=TZ).date()
@@ -79,15 +82,16 @@ async def today(interaction: discord.Interaction):
             timestamp=datetime.datetime.now(tz=TZ)
         )
 
+        options = []
         added = 0
+
         for tl in lists:
             tl_id = tl.get("id")
             tl_title = tl.get("title") or "<untitled>"
 
-            tasks_res = service.tasks().list(
-                tasklist=tl_id, showCompleted=True, showHidden=True, maxResults=250).execute() or {}
+            tasks_res = await asyncio.to_thread(lambda: service.tasks().list(
+                tasklist=tl_id, showCompleted=True, showHidden=True, maxResults=250).execute() or {})
             items = tasks_res.get("items", []) or []
-            lines = []
 
             for t in items:    
                 if not isinstance(t, dict):        
@@ -96,35 +100,26 @@ async def today(interaction: discord.Interaction):
                 due_date = parse_rfc3339_to_local_date(t.get("due"))
                 completed_date = parse_rfc3339_to_local_date(t.get("completed"))
 
-                print("title:", t.get("title"), "due:", t.get("due"), "completed:", t.get("completed"), "status:", t.get("status"))
-
                 if due_date != today and completed_date != today:
                    continue
 
 
                 status = "✅" if t.get("status") == "completed" else "🔲"
+                t_id = t.get("id")
                 title = t.get("title") or "(no title)"                
-    
-                if completed_date == today and t.get("completed"):
-                    completed_short = t["completed"].replace("T", " ").split(".")[0]
-                    lines.append(f"{status} {title} - completed {completed_short}")
-                else:
-                    if due_date:
-                        lines.append(f"{status} {title} (due {due_date.isoformat()})")
-                    else:
-                        lines.append(f"{status}{title}")
 
-            if not lines:
-                continue
+                embed.add_field(name=f"{tl_title} - {status} {title}", value=f"ID: {t.get('id')}", inline=False)
 
-            value = "\n".join(lines)[:1024]
-            embed.add_field(name=tl_title, value=value, inline=False)
+            value = json.dumps({"tasklist_id": tl_id, "task_id": t.get("id")})
+            options.append(discord.SelectOption(label=(title[:90] or "(no title)"), description=tl_title[:50], value=value))
             added += 1
 
         if added == 0:
             embed.description = "No tasks due today."
-
-        await interaction.followup.send(embed=embed)
+            return
+        options = options[:25]
+        view = TasksView(options, interaction.user.id)
+        await interaction.followup.send(embed=embed, view=view)
 
     except Exception as e:
         await interaction.followup.send(f"An error occured:{e}")
@@ -134,6 +129,7 @@ async def today(interaction: discord.Interaction):
 async def events(interaction: discord.Interaction):
     await interaction.response.defer(thinking=True)
     
+    print(f'Recieved weekly_events command by {interaction.user.display_name}')
     try:
         service = build_calendar_service()
     except FileNotFoundError:
@@ -246,13 +242,21 @@ async def on_ready():
     print(f'Logged in as {bot.user}')
     await authenticate()
     await bot.tree.sync()
-
 #Liste commandes enregistré
     commands = await bot.tree.fetch_commands()
     print("Registered Commands:")
     for command in commands:
         print(f"- {command.name}")
     print("- !set_location")
+
+    channel = bot.get_channel(1480922508566990879)
+    if channel:
+        embed = discord.Embed(
+            description="Bot is now online and ready to serve! Type / to check available commands"
+        )
+        await channel.send(embed=embed)
+
     print("your bot is online and ready to serve !")
 
+
 bot.run(DISCORD_TOKEN)