From e1390a8adcd69d15e903963ab1b30ebdeccd6e57 Mon Sep 17 00:00:00 2001
From: Kobe <kobeamerijckx@outlook.com>
Date: Sat, 31 May 2025 23:15:46 +0200
Subject: [PATCH] fix event filtering

---
 .../__pycache__/conversations.cpython-313.pyc | Bin 29378 -> 29378 bytes
 routes/__pycache__/main.cpython-313.pyc       | Bin 59803 -> 60484 bytes
 routes/main.py                                |  18 ++++
 static/js/notifications.js                    |  92 +++++++++++++++++-
 4 files changed, 106 insertions(+), 4 deletions(-)

diff --git a/routes/__pycache__/conversations.cpython-313.pyc b/routes/__pycache__/conversations.cpython-313.pyc
index 4a7805f16e977c7f6fc679731919a8f289bbdc04..c049c162ccb214f4131e7fba42b48f56b1da335f 100644
GIT binary patch
delta 20
acmX@~l=0A0M$XT?yj%=GP_vP9XAuBVAqLU_

delta 20
acmX@~l=0A0M$XT?yj%=Gz`K!iXAuBS_6B1B

diff --git a/routes/__pycache__/main.cpython-313.pyc b/routes/__pycache__/main.cpython-313.pyc
index eeb0d924a9fa403160e0ddccabc5550d942c2e2d..277727a866deedea307c4d3ac6b4e8e2e58a80a3 100644
GIT binary patch
delta 2037
zcmZ{ldrVVj6u|FyOK%^P@@QcS#g^IvrBJX_Cq;0gP9@^h%G7~_h8D#E#oOw9G7*vu
zog3z4i^7zU_$Etqclg*NnfQwO$7KG|OGRZdOI()4BK$F*+jm;rbk6(7ujf18dEIl*
z_qFr7<h&?RkHo|%8TzbTTd=zLyA$g44N$jR!JdzT{v$?Ef20*IH}$fFfh}=5Tta1y
zGRc|XSk5r6;|x=tfzJ4pDIngXg?-I2WGD1Ar;;p)-<}A!nzis*x+co0nL;3SyFIE*
zxx^0j6)CbD>Vxu$8Vx*{powhIMd{Q?z~|}I+Ss>=lW`{6xJ7K~E{2I_42+L$P?pKd
zSZ9(=GKEC!O-y<IGf(Ghk)o0!M)^@D>Jo9QVJzcd*=7%U2xS4IHr~7<$6TLdb{ov|
z9OhDo*=b>+w#5dwHfO{4n~kg`6;xZQW&~xcJubJ0_wm@YptRQSsrT_`sm$*|JVI<o
zJVu;DoJL3}jz+_#Ek)d4xPA)nwCZL2Qz{3IP!*Gy+~D=s*3?$J{I%W&-xc~cJ_E}z
z+n7<M@I&h~0?He@4>if5B*u^v(A$63+eZ?W#>w}!jN$cmPe{Y07`ig|W{Sp)fYIJ>
zw2Nu!hxOh1Kw5r(TK+Xh>GiaQqAsngWN(S6H+5~@yEP<dlJ#A>E?r2<n6nNq=w1*o
z<@cNNMY^cyt_YY5`ppIRr4oHoh-0$zMm5TbWeLNWZWt3|Ay&~~8ctE`)FX^q8yjNO
zF|nftCQg4%KU1_$3s{T#two|`vY2HXmPz9BLX1R__u#&sdi!Mb#V=+RC(KWk3#*z`
z(h2-SY|9f0OA3#>JfS_{J5gc@9B-LDRe}oaJ1<4)EK1iAuk1QU?Vzf45i4bduUoUC
z*oO?<`nV|Ve;kgoL3#KSRMxtAB^0(T=kjU)eP`fi`%Gc5?J_Be$E*nyOL>8&wM6sd
zFncyagL_RVsSr5Aky68{VsROb_z9tfdpnnM3oyK!hJRCN`(z%Gg)JX3AnrOwmJ2PP
zo*}9KWDF-<`eH^{(Vk1R(AK_?R0(2xrb3m8MTEzTA)xBWWeI`8jue*m@7)duD<SYj
z#~rH`t+El=MvI!yLD`ChJs*HBZE&D-tE>*|e8R&19xHSV#0k}3Cd;`<5NJ7YFeU?|
zu>6>2%E24ax#56_Y)Cm&_{{jdLkr2b!dHg|C8QX39NWOnMo%^5iOF#qO#i%}y~jiT
z5cc%kRZ!#R-brLO2)z@zIT-aV80;NKCV}E)nuX6tjRR4Dm`)K?)p=KWE7vu;U4D<7
zpNsnWFyrJYEoKO+s=f7%u7-`3XvNz>c`75G-f&DX%3oXW;rp?aaPat-g45T@fX-9L
zSt1ciPj66QYcHMML|jnZS4g?7Pe(kkug^&;VYu%I)pVS5k!s=bxjbUV92N;*jj2d=
zkaN|0*ERTkcr_Rd+xT3}TLX(PEFr7mz=dMn8nl=49{R(7fM`IxkMII}aV4pNs*3}h
ziz+r{LgOWaP<d&dgsg=lS4=N_gTR&a=zqWZMvz~f!;OV;UM(d{gzl?Cw37c53wS^Q
z>jR73vuIe0{J$fy4Q=ir!ozOEV$hP$Lg4&Z6l0@+idT;o?#=?MXi~j!&dWu|-0(S9
zV~+6sxe=u(wD+OpN6<fjv0DJU7dculjnI&&&y=B`9D&C)sPcRLuDVLkdJk=U<fw#a
z-Ub;11`fqw3f{)Dh{fkZ?SPTvBF7MR-(E&y;J4c~L<5V4)^Iy8>`wS`NJn<T&7lf1
zC^&wRv4wc4^J?5oLX1aDKuko;K$IX#5#@*$M7R)uraNzt4&mgTZ^-zm(!3D~!=)m$
z2y=*|x=^Fg^6T#`Sq9#_HTn+pEy9#`1Wr*<KE2-SURUQS;*Y`T-TjJHu_Qgb{Woo2
B9>V|t

delta 1570
zcmaKsZ%kWN6u^7mqwlr!A2K=tfevV4k0Nx$=wzW|=m?9#W(v-Tq;%4<P736<M79KQ
zYM5k*&hur-D9N%c0~Z#TH?_<Ux;Qpw!ZxxG;;SDNmN`SrSook!*}UiRXY=n(`s=y(
zo<H}Vcka13%^$nLn-@%`L=79&ty}h{#m<`ZIt?P5u4BK26dum@JuP>1e##jfsD#7w
z7#x3hy|GSL$9a;UO|WaEbs%>6VW}$zrn(9_DFw2-8_kqwx{5X!@rS}vB7D{Dw%=nb
zbde#95jU(2TD-cU<Upgz3R`=Uxq2dddfdc*(~@=Fwr$$E`CF%Z%ITh#o|-Nwx-0TY
zu6YfwchM4ND<3>))WT?&J&pdxrqUA>uR#Am978N=;B@cvCHGOr*z^J70^$ZjBn)q(
zq(kXzlwu4LeA#VvPz^2;L?P~QD6L&a(YCflf&p+G+Qlsp`OQNG37kOS#9?>#zqlRY
z6rHN?4K`6daQ&~4e7U~g!U-nyYKHcK^~3^MkZM(}Ef~;%xQ0lAa|5+PDaUfy1daXW
za?J--L{v3J0?`jYCY5s4kuj3F><wMY%&t~4&{VWn&yVhlNfOjR4XKf%uu*TcuU+YP
z4NMId+aBf)D?u?f`y<}4KN1PHHit2twrDALUjy~g*`j>3-H5=fN@gmd?8I=7x@FS>
zwgCh2bm$#wB(KUp4b|&}WoxK9b<&i}wk3|PtlT>lH#pJL%KV4nvQ_2Wks5Irb1+HZ
zmm#NoV&pVW+^}=BQz%CtX83V1JqZs^ANBC-sGr2;hBLSIOt~_)iIhWUELYfuK`P*Q
zEY<oXip2;QViTeS&d0K?im|1wxy{?r-sFq;o9J`6vmFw~K2O02it+WfP`j^nzZbP=
z5nLO~cPwGz5+cEnpHAUX{>ym|+#Jq@#`B+uckoUgUcFPr7gc(WCA$CO0kRXs@v^K2
z7U<^$=1Jldp(Pxl!FEL(>1c29ON9Dh&$x$F!)N2eqyfB_eB>qh!X+2c;VC4ZdSUT$
zhOh_ETCKh@*TiP>G6W|oG6HN-(o!G$qhZ88L^I+IxIEE7YQb^kJJKLOxDw(?2tt$g
zzkHa%$vngIH$syRn4H`$tXQXBttRDi;HqpO2Oz{6gk9Mc+{)A>-QR2DElklJL^lFU
zg`y_SLtr6E`jt|^h5xNF)lkZ1RbVqdEM%5UUA*)KwF#IphWgC+Gf5Hm`h87)8m3`f
zk09PhsBHop+42+oM@99;ZNhSMfHU#O4QfwNYrX)k$2Sl=++}=6PX0beSbg86GrNfv
zKAH)zSH3v2Pk0Y+(+9!X400HHXI~@V$g{H|SB8C(CgNr?!iq>o*brL~m53dP-H0B9
z8vO|5-+G1|mA$vlku<y3wZLnHOhgL8F)y&S`4{EF+jAW8K<Zq89EF~_Ofn47xgmX>
Jh2*Ji^-rg3t9AeY

diff --git a/routes/main.py b/routes/main.py
index fbcc644..e539d9d 100644
--- a/routes/main.py
+++ b/routes/main.py
@@ -491,6 +491,24 @@ def init_routes(main_bp):
         # Get paginated notifications
         notifications = query.order_by(Notif.timestamp.desc()).paginate(page=page, per_page=per_page)
         
+        # Check if this is an AJAX request
+        if request.headers.get('X-Requested-With') == 'XMLHttpRequest':
+            return jsonify({
+                'notifications': [{
+                    'id': notif.id,
+                    'notif_type': notif.notif_type,
+                    'timestamp': notif.timestamp.strftime('%Y-%m-%d %H:%M:%S'),
+                    'read': notif.read,
+                    'details': notif.details,
+                    'sender': {
+                        'username': notif.sender.username,
+                        'last_name': notif.sender.last_name
+                    } if notif.sender else None
+                } for notif in notifications.items],
+                'total_pages': total_pages,
+                'current_page': page
+            })
+        
         return render_template('notifications/notifications.html',
                              notifications=notifications.items,
                              total_pages=total_pages,
diff --git a/static/js/notifications.js b/static/js/notifications.js
index 428f339..bb7ac9a 100644
--- a/static/js/notifications.js
+++ b/static/js/notifications.js
@@ -66,14 +66,68 @@ document.addEventListener('DOMContentLoaded', function() {
             }
             
             const data = await response.json();
-            updateNotificationsTable(data.notifications);
-            updatePagination(data.total_pages, data.current_page);
             
-            // Reinitialize tooltips after updating the table
+            // Update the table with the notifications
+            if (data.notifications && data.notifications.length > 0) {
+                notifsTableBody.innerHTML = data.notifications.map(notif => `
+                    <tr class="${notif.read ? '' : 'table-warning'}" data-notif-id="${notif.id}">
+                        <td>${notif.timestamp}</td>
+                        <td>${getNotifTypeBadge(notif.notif_type)}</td>
+                        <td>${notif.sender ? `${notif.sender.username} ${notif.sender.last_name}` : 'System'}</td>
+                        <td>
+                            ${notif.read ? 
+                                '<span class="badge bg-success">Read</span>' : 
+                                '<span class="badge bg-warning">Unread</span>'}
+                        </td>
+                        <td>
+                            <div class="btn-group">
+                                ${getActionButtons(notif)}
+                                <button class="btn btn-sm btn-secondary" 
+                                        data-bs-toggle="modal" 
+                                        data-bs-target="#notifDetailsModal"
+                                        data-notif-id="${notif.id}"
+                                        data-bs-toggle="tooltip"
+                                        title="View Details">
+                                    <i class="fas fa-info-circle"></i>
+                                </button>
+                                ${!notif.read ? `
+                                    <button class="btn btn-sm btn-success mark-read" 
+                                            data-notif-id="${notif.id}"
+                                            data-bs-toggle="tooltip"
+                                            title="Mark as Read">
+                                        <i class="fas fa-check"></i>
+                                    </button>
+                                ` : ''}
+                                <button class="btn btn-sm btn-danger delete-notif" 
+                                        data-notif-id="${notif.id}"
+                                        data-bs-toggle="tooltip"
+                                        title="Delete">
+                                    <i class="fas fa-trash"></i>
+                                </button>
+                            </div>
+                        </td>
+                    </tr>
+                `).join('');
+            } else {
+                notifsTableBody.innerHTML = '<tr><td colspan="5" class="text-center">No notifications found</td></tr>';
+            }
+            
+            // Update pagination
+            totalPages = data.total_pages;
+            currentPage = data.current_page;
+            currentPageSpan.textContent = currentPage;
+            totalPagesSpan.textContent = totalPages;
+            prevPageBtn.disabled = currentPage <= 1;
+            nextPageBtn.disabled = currentPage >= totalPages;
+            
+            // Reinitialize tooltips
             const tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'));
             tooltipTriggerList.map(function (tooltipTriggerEl) {
                 return new bootstrap.Tooltip(tooltipTriggerEl);
             });
+            
+            // Reattach event listeners
+            attachEventListeners();
         } catch (error) {
             console.error('Error fetching notifications:', error);
             notifsTableBody.innerHTML = '<tr><td colspan="6" class="text-center">Error loading notifications</td></tr>';
@@ -330,4 +384,34 @@ document.addEventListener('DOMContentLoaded', function() {
             updateURL();
         }
     });
-}); 
\ No newline at end of file
+}); 
+
+// Function to get action buttons based on notification type
+function getActionButtons(notif) {
+    if (notif.notif_type === 'room_invite' || notif.notif_type === 'room_invite_removed') {
+        if (notif.details && notif.details.room_id) {
+            return `
+                <a href="/rooms/${notif.details.room_id}" 
+                   class="btn btn-sm btn-primary"
+                   data-bs-toggle="tooltip"
+                   title="View Room">
+                    <i class="fas fa-door-open"></i>
+                </a>
+            `;
+        }
+    } else if (notif.notif_type === 'conversation_invite' || 
+               notif.notif_type === 'conversation_invite_removed' || 
+               notif.notif_type === 'conversation_message') {
+        if (notif.details && notif.details.conversation_id) {
+            return `
+                <a href="/conversations/${notif.details.conversation_id}" 
+                   class="btn btn-sm btn-primary"
+                   data-bs-toggle="tooltip"
+                   title="View Conversation">
+                    <i class="fas fa-comments"></i>
+                </a>
+            `;
+        }
+    }
+    return '';
+} 
\ No newline at end of file