From f7853f96edb0aeb43bf8d811e66681f5e4a33d4e Mon Sep 17 00:00:00 2001
From: Kobe <kobeamerijckx@outlook.com>
Date: Fri, 30 May 2025 21:08:58 +0200
Subject: [PATCH] fixing logs on multiple rooms

---
 __pycache__/models.cpython-313.pyc            | Bin 20607 -> 20672 bytes
 models.py                                     |   3 +-
 routes/__pycache__/main.cpython-313.pyc       | Bin 47597 -> 47597 bytes
 routes/__pycache__/room_files.cpython-313.pyc | Bin 45408 -> 45408 bytes
 routes/__pycache__/rooms.cpython-313.pyc      | Bin 16429 -> 19080 bytes
 routes/rooms.py                               |  68 ++++++++++++++++++
 templates/rooms/rooms.html                    |   6 +-
 templates/settings/tabs/events.html           |  12 ----
 8 files changed, 73 insertions(+), 16 deletions(-)

diff --git a/__pycache__/models.cpython-313.pyc b/__pycache__/models.cpython-313.pyc
index 15107a8213b6886f7dfdbddf59edb31ee9859124..434b637a6430d1143515708d130018a3b05813f9 100644
GIT binary patch
delta 1129
zcmZvae@IhN6vsW&Ii32pxi;r?>U6a|3tCdTnObV5rEcV+k`&9b%w@}GKfod~2-K`;
z$3UWAW*ABK>qUWBWKcvPX(5;t{Ud>YL_t9yl-+X;`lko?!@ci(&#!yW{55#i2g3K5
z7<CByYUbVbMb7)eDM1mTz!l5-QCO{)cVrp>tF@Z2s;~+hc1IZE7x{F)SfAb<Dw%u+
zbBGl0GfL*YaiR%Zw09z>BPs%c#`XL5<2Pp<=ILr72m5p)Bw!#{3@>DPBtOpSjwq*<
zdzh%koroQ=0!-r70yExl`!PwsT0a#n1ic;J-i`N;j2Ca8h^{(WBv<M$D_|}DG!%n`
zYm9kt08bdZV6Ci)i&UzldKP)si?+l@mDEgG?06}01pHWO$%0z!w)o&Eww9U92gn#r
zSSW^e9fWp_OS-M5I6RnF9!shQ<vsgER5mV8NrifBwZ+T+lrx~3ts~WG{ADeN1}sf|
z4oxVeZCJ>_3TsN+t?nfWp$<Q#^+B)PYI_k1hp^b;fKzzTu{7)!NL6^*@iL)}sajNG
z${s1um?CAdlNc)b$-f;>h`DeYN5riQ!FT<y{6Q`ybP~=I&Jluy5`v1bfzU-bPe4Kh
zVK<?NaDf4Ly3OkAbRry*<@E1LXp?U`2LUe16&XQ*VeC#fX@*Ecpaz<cqb|lQr>*n@
z49US&OBB$LkFwr{H83M~iAL;q8R0GtyS7E~-aO>ph!(dgnKu=nGcV^L?P3X4geKhV
zwrj>{OXz2-`PJWfc?@IxSq^7^h42YxnSFo_ImrgDo+KAL!AKauD>(!36pL~X8+b-N
z{nZk9+PC;7ce#dwNQ4J$H9z5b?0L6gg6H{?m!JrrVwTxa6!M)>T>X(;?6|^Jh@JW7
ze+@s&PhjPJ$oH|4a26P}yzPZqBacq%J(8z>&(8eXDYQfw#ft^6VG8RCWf+&^*ZmGv
z&ybBUj@FWgFvAP_T9U4SIW(7M!T@e6odOl6mu=z0VoA0G^Wd%WE=wrDze#Z5lQNIm
zN*cl(8p_APil57SSiQ$QHnE=cG{Srk_)GH_;Mc>e<mE_KeC4q~CVuvO(h9J+EhFe^
Pcl`)q+aIYo=^gw7f8IF$

delta 1076
zcmZvbT}V@57{`02^J7yt4VTU4PP*D=kY*p-N|R=kmQG2~sEi8xFkQ>D>LMa2(rQsA
ze~Y|`(n8AYLrw&NqIn?^hLZx*qJq58t1c2k`aI8TP!}CIKc4rz&&U6L-skkU(XX47
z@FhN8H;11}_koXD-3g}?G!uk{+EYs1s!fC{qXA<s18x}aBWIZjX?dBrn&_rA7*2G;
z=E<Uia3mc=yT^>aqy!qkN3R)^NgYbt-0K?3N4{wz)g#wyMTf~sehiu}Q@&C;FIF2j
z9<wD7@NcN8+dJjM{sn&hxOShq2;L=m2i`8|QBz;DxM(-RmU23ZXL%`RzbaIYV-zqB
zGA=Mes7UM5on({YQ{t>uq`l)B(J#j#DV<I#&C+d(mL>LRL~eQs)gY8UK!;J1Q8b%f
zRre^PTGz@hjB2FW+Nc%H(tKsi))hfPG&&q~3J)DiG;#ypI|ftFtA59$ozgxz;Fn~V
zx^hO$$_k;+nMY^v!&y0-e%JrR-{oQ<#zn>@Mib*QqmU8JC}K1-z-VE_Fsd0>7*~;1
zV$rp;$p|XbnP0SYR+-H1Bx+TV(?s+X-!oDSUF^d+%YG-27;jdpSJV=9DdCliHPnu;
zu2+#Y>Lx~<CQP_Z^Z?)7TlJ#fK8~)#PEU$eoahj*g_ZzYNsJwg!?@zH8;00q2vN`f
z%ttNCRu|Kd=<So$pD8M=dQ5fWUamD+M7-uOJHy0iz=zxp>P2JT(PU9|E`K#LMClP2
z*Jc?wiOlF$-(at(m2Hhh{n}d;7PXe<r)r``)!nInl&;Ixi->m|W`|y1fS2pce-BRH
zR8^wITdqz<y*JtT&$w~KMeaeADE~(Ep7Y9#e!TU*piy)bC^W2WTmLgc_lfry!`M^!
zm_7+L*+rQen!)zXt0EiJEi7~%L2U7Eib8F1#q8AB#Go%GHCmio9J!E_{hbRteir+5
z68kV_P*D;l33gwLD!j*MbBg~$%(WN~zIt&bqE|w(kS0rrEw#`}*h@bc<7v^koF?~q
O_w*dqoR(lJ>--IM5izL%

diff --git a/models.py b/models.py
index 02a1fb8..b9d1cbc 100644
--- a/models.py
+++ b/models.py
@@ -55,6 +55,7 @@ class Room(db.Model):
     creator = db.relationship('User', backref='created_rooms', foreign_keys=[created_by])
     members = db.relationship('User', secondary=room_members, backref=db.backref('rooms', lazy='dynamic'))
     member_permissions = relationship('RoomMemberPermission', back_populates='room', cascade='all, delete-orphan')
+    files = db.relationship('RoomFile', back_populates='room', cascade='all, delete-orphan')
 
     def __repr__(self):
         return f'<Room {self.name}>'
@@ -91,7 +92,7 @@ class RoomFile(db.Model):
     deleted_at = db.Column(db.DateTime)  # New field for tracking when the file was deleted
     uploader = db.relationship('User', backref='uploaded_files', foreign_keys=[uploaded_by])
     deleter = db.relationship('User', backref='deleted_room_files', foreign_keys=[deleted_by])
-    room = db.relationship('Room', backref='files')
+    room = db.relationship('Room', back_populates='files')
     starred_by = db.relationship('User', secondary='user_starred_file', backref='starred_files')
 
     def __repr__(self):
diff --git a/routes/__pycache__/main.cpython-313.pyc b/routes/__pycache__/main.cpython-313.pyc
index ed33182ea22dffb5e3278b26f126db85e791037f..cd402882f70065dc7389d5e925e40011579881da 100644
GIT binary patch
delta 21
bcmaF+nd$9kCa%xCyj%=G!1jM5*W;Z4VW<c~

delta 21
bcmaF+nd$9kCa%xCyj%=Gp!#bg*W;Z4Vo3;G

diff --git a/routes/__pycache__/room_files.cpython-313.pyc b/routes/__pycache__/room_files.cpython-313.pyc
index 6f88d646dd840cad360b4ce17b12760870426f05..a06282a15415f6a7fd16bed0c07bfd1886077506 100644
GIT binary patch
delta 21
bcmaFxi0Q#2Ca%xCyj%=G5c+2$SJ*}XUEv44

delta 21
bcmaFxi0Q#2Ca%xCyj%=GAoF`8SJ*}XT!sgO

diff --git a/routes/__pycache__/rooms.cpython-313.pyc b/routes/__pycache__/rooms.cpython-313.pyc
index 2d9fe1d8514027a5c232e41226492113a06cac4b..7e720930829ba268c28a799633fb6c0e823ff725 100644
GIT binary patch
delta 3799
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
b*UUS}g0!?Cf*Q6jp>0EkryGNS_BH$;LGPZO

delta 1929
zcmZuyeQZ-z6o2=<*RFl9U+V{LU)$HWwu5za8(X`LZVc8jVBKJRTuVYaGDg-8i2Hh-
z1V}W)C@}p4#}SPQi4y+NM3QO$BASSbM*jhf8puK-#Q2A3pc9Q4jq%==ZVb7}J@4G}
zJLh-qxnJ+pS#)t4nI0I80z=xlzvBlUMrKVe#LTWbZXG}Y2I~e~SdWD`r@9B+FxhFh
zV6hodZ-yDr4LGo2_MV6HlrSqcViPtuu-Fo3i)bZ9z2!*jvPj$PJs*0+X<vpoXp~%z
zT0t1mBBPUH{xarThPf%GlrS@vmN4v*0I~K`ww2iX_$;wcVwy_@Eq>KNi6n&O$4LB7
zaSWCnm8A-B)l(cpBLQgRe#$HSeGZ9vi>?~6zp~J(PoTd1QT-k^Z!-8<t)I*!r$E&7
z7r%nho1oLYlRd=3d1+hzwpq)fAOx)o$O;Zy24-x#wLR2dhJN=H?6IHZ?To>b|K0u!
zkFxosdm9of2+ooIz{=;(OYgDB2z@?@-Tpcp^!*9@{00<(NztJ(MOkcyJ03s0;;m%E
z7P#a;3$H36<b*k893`QlDj|#zq9ZinF_O>=Z&dw^zK7{RKe`32!I7n0x9Efu`Mbeh
z<To-*x{|~c8`fd2nJwuGv;9<B3&`RFA!LJ>tNTcn_gkC5DI4Kps|<0i4d%2u*y}g&
zSimBkoz0M9a7COgFLsCt8{z9!2jOr{BdR1*?Lbi|)JSYt14`IYmnFG!8X^?h)Cke$
zjcR6e{BUM)G&8zCqpF99?M>=tepJ*X{1LX2!gRG!*j8Ibin~!ev{YOhPm6=QLBoaD
zRwJF0gwh5UZwyty2X!{9xnv=QKL&QdV4Y)`H_X+^%MC*P6Ncd@46{Gz;ZmJwwLdLG
z3|tMeNJ}iXUG;zj8)}3F(Fcbb1&-WI7>umZgf0EYR>QTp3$8S_!Oo^2Txjx=t8uxh
z)jH4bA0K~K)e#0YL4_Ag(PmGWR|9kuq#{N|abbC)!Sm5-ag-=?r02#ET#UX1_hMdn
zG4`Q&i`QQlly}14@e#OF>xPHTwQQCn>lc7)Aw6tw`G_6*C2wkd3*~=YdjJ{ch36)Q
zho&;agZq!dj<y@x37SiVx^`JOOw=!FjxCUC--W(`ciYeLQt6JkU}D`Qy-rKa$KiCx
zgdv5>Cq-evzupfY3#CJ~YJ<^Nv4o|4gt^$TF2$tSGy{nSuhzt1Jy9!Hdg1g2jYg>F
z$Y@6Nda)Si6edkiRw>GmVu`ac%3%}iYiY7nG3ihltYC)vz_UIGSJ#)4-(G9v%$Owy
z+HS&@bhzx8;^31`kCRJq{ll0UBi}5_G98?s$)a#2EOhRMvBamy0c*Nq22~_s>Sihq
z!nv+Sd7jHnspXw2Zc;k|=TRnC+^2;ur!Y+n_esySfOTUpS^;}E`rz}8S@Ld>x2B_e
z%-L1bEi+eSVN;a5Qj<WN>bWoKHJhUO&$?%jcAlRYnmPbGHoqXAAS^cWAIOa`WXGj5
zc0K&FxsU4)S3`2k+wj|#H4=R-inmLp$3vz2r%qFG0@n3N!Wp8{A4$#$`+9;f)3ax5
z2z8<d9K*V)uuu^zXsNNV6)~)EQa&zUw<zDDs+-7s6S)>xH%f5J0|EstH5OW+KG}yQ
z)cph@;nGrTVeKMe$5-0RN2cZLXh)gW{=cxDB#c@M5xAOkIjxTzigVnJ3OqFwYT)0b
k<g7-?V$LE)((%+#=!b@0w_QPz#nRdfJQ)_cVW2ni9}U2@%m4rY

diff --git a/routes/rooms.py b/routes/rooms.py
index b0abf7a..e4793e1 100644
--- a/routes/rooms.py
+++ b/routes/rooms.py
@@ -5,6 +5,8 @@ from forms import RoomForm
 from routes.room_files import user_has_permission
 from routes.auth import require_password_change
 from utils import log_event
+import os
+import shutil
 
 rooms_bp = Blueprint('rooms', __name__, url_prefix='/rooms')
 
@@ -64,6 +66,7 @@ def create_room():
             },
             user_id=current_user.id
         )
+        db.session.commit()
         
         flash('Room created successfully!', 'success')
         return redirect(url_for('rooms.rooms'))
@@ -96,6 +99,7 @@ def room(room_id):
         },
         user_id=current_user.id
     )
+    db.session.commit()
     
     return render_template('rooms/room.html', room=room, can_download=can_download, can_upload=can_upload, can_delete=can_delete, can_rename=can_rename, can_move=can_move, can_share=can_share)
 
@@ -145,6 +149,19 @@ def add_member(room_id):
         if user not in room.members:
             room.members.append(user)
         db.session.commit()
+        
+        log_event(
+            event_type='room_member_add',
+            details={
+                'room_id': room_id,
+                'room_name': room.name,
+                'added_user': f"{user.username} {user.last_name}",
+                'added_by': f"{current_user.username} {current_user.last_name}"
+            },
+            user_id=current_user.id
+        )
+        db.session.commit()
+        
         flash(f'{user.username} has been added to the room.', 'success')
     return redirect(url_for('rooms.room_members', room_id=room_id))
 
@@ -168,8 +185,22 @@ def remove_member(room_id, user_id):
         if not perm:
             flash('User is not a member of this room.', 'error')
         else:
+            user = User.query.get(user_id)
             db.session.delete(perm)
             db.session.commit()
+            
+            log_event(
+                event_type='room_member_remove',
+                details={
+                    'room_id': room_id,
+                    'room_name': room.name,
+                    'removed_user': f"{user.username} {user.last_name}",
+                    'removed_by': f"{current_user.username} {current_user.last_name}"
+                },
+                user_id=current_user.id
+            )
+            db.session.commit()
+            
             flash('User has been removed from the room.', 'success')
     return redirect(url_for('rooms.room_members', room_id=room_id))
 
@@ -184,6 +215,13 @@ def update_member_permissions(room_id, user_id):
     if not perm:
         flash('Member not found.', 'error')
         return redirect(url_for('rooms.room_members', room_id=room_id))
+    
+    # Get the user object
+    user = User.query.get(user_id)
+    if not user:
+        flash('User not found.', 'error')
+        return redirect(url_for('rooms.room_members', room_id=room_id))
+    
     perm.can_view = bool(request.form.get('can_view'))
     perm.can_download = bool(request.form.get('can_download'))
     perm.can_upload = bool(request.form.get('can_upload'))
@@ -192,6 +230,28 @@ def update_member_permissions(room_id, user_id):
     perm.can_move = bool(request.form.get('can_move'))
     perm.can_share = bool(request.form.get('can_share'))
     db.session.commit()
+    
+    log_event(
+        event_type='room_permission_update',
+        details={
+            'room_id': room_id,
+            'room_name': room.name,
+            'user': f"{user.username} {user.last_name}",
+            'updated_by': f"{current_user.username} {current_user.last_name}",
+            'permissions': {
+                'can_view': perm.can_view,
+                'can_download': perm.can_download,
+                'can_upload': perm.can_upload,
+                'can_delete': perm.can_delete,
+                'can_rename': perm.can_rename,
+                'can_move': perm.can_move,
+                'can_share': perm.can_share
+            }
+        },
+        user_id=current_user.id
+    )
+    db.session.commit()
+    
     flash('Permissions updated.', 'success')
     return redirect(url_for('rooms.room_members', room_id=room_id))
 
@@ -225,6 +285,7 @@ def edit_room(room_id):
             },
             user_id=current_user.id
         )
+        db.session.commit()
         
         flash('Room updated successfully!', 'success')
         return redirect(url_for('rooms.rooms'))
@@ -249,6 +310,12 @@ def delete_room(room_id):
     try:
         print(f"Attempting to delete room {room_id} ({room_name})")
         
+        # Delete physical files
+        room_dir = os.path.join('/data/rooms', str(room_id))
+        if os.path.exists(room_dir):
+            shutil.rmtree(room_dir)
+            print(f"Deleted room directory: {room_dir}")
+        
         # Delete the room (cascade will handle the rest)
         db.session.delete(room)
         db.session.commit()
@@ -263,6 +330,7 @@ def delete_room(room_id):
             },
             user_id=current_user.id
         )
+        db.session.commit()
         
         flash(f'Room "{room_name}" has been deleted.', 'success')
     except Exception as e:
diff --git a/templates/rooms/rooms.html b/templates/rooms/rooms.html
index a45472f..5273ff4 100644
--- a/templates/rooms/rooms.html
+++ b/templates/rooms/rooms.html
@@ -110,9 +110,9 @@
                                 <p class="text-muted mb-0" id="deleteFileName{{ room.id }}">{{ room.name }}</p>
                             </div>
                         </div>
-                        <div class="alert alert-info">
-                            <i class="fas fa-info-circle me-2"></i>
-                            This item will be moved to trash. You can restore it from the trash page within 30 days.
+                        <div class="alert alert-warning">
+                            <i class="fas fa-exclamation-triangle text-warning"></i>
+                            This Room will be permanently deleted. This action cannot be undone. Are you sure you want to proceed?
                         </div>
                     </div>
                     <div class="modal-footer">
diff --git a/templates/settings/tabs/events.html b/templates/settings/tabs/events.html
index 5d93c7c..f9033c8 100644
--- a/templates/settings/tabs/events.html
+++ b/templates/settings/tabs/events.html
@@ -23,10 +23,6 @@
                     <option value="room_delete">Room Delete</option>
                     <option value="room_update">Room Update</option>
                     <option value="room_open">Room Open</option>
-                    <option value="room_list_view">Room List View</option>
-                    <option value="room_search">Room Search</option>
-                    <option value="room_join">Room Join</option>
-                    <option value="room_leave">Room Leave</option>
                     <option value="room_member_permissions_update">Room Member Permissions Update</option>
                     <option value="conversation_create">Conversation Create</option>
                     <option value="conversation_delete">Conversation Delete</option>
@@ -100,14 +96,6 @@
                                     <span class="badge bg-primary">Room Update</span>
                                 {% elif event.event_type == 'room_open' %}
                                     <span class="badge bg-info">Room Open</span>
-                                {% elif event.event_type == 'room_list_view' %}
-                                    <span class="badge bg-secondary">Room List View</span>
-                                {% elif event.event_type == 'room_search' %}
-                                    <span class="badge bg-info">Room Search</span>
-                                {% elif event.event_type == 'room_join' %}
-                                    <span class="badge bg-info">Room Join</span>
-                                {% elif event.event_type == 'room_leave' %}
-                                    <span class="badge bg-secondary">Room Leave</span>
                                 {% elif event.event_type == 'room_member_permissions_update' %}
                                     <span class="badge bg-primary">Room Member Permissions Update</span>
                                 {% elif event.event_type == 'conversation_create' %}