aboutsummaryrefslogtreecommitdiff
path: root/roomserver
diff options
context:
space:
mode:
authorTill Faelligen <2353100+S7evinK@users.noreply.github.com>2023-07-26 09:09:04 +0200
committerTill Faelligen <2353100+S7evinK@users.noreply.github.com>2023-07-26 09:09:04 +0200
commit79d4a0e399bb68920b81bc877744108095c06f1a (patch)
tree8463cbfae253c02b0217b3a2318f43e8e4aac096 /roomserver
parent7899f47e71631170bf2578bf04060c9f5abee461 (diff)
Restore old behaviour of PurgeRoom
Diffstat (limited to 'roomserver')
-rw-r--r--roomserver/internal/perform/perform_admin.go12
1 files changed, 0 insertions, 12 deletions
diff --git a/roomserver/internal/perform/perform_admin.go b/roomserver/internal/perform/perform_admin.go
index 12b557f5..dd713262 100644
--- a/roomserver/internal/perform/perform_admin.go
+++ b/roomserver/internal/perform/perform_admin.go
@@ -204,18 +204,6 @@ func (r *Admin) PerformAdminPurgeRoom(
return err
}
- // Evacuate the room before purging it from the database
- evacAffected, err := r.PerformAdminEvacuateRoom(ctx, roomID)
- if err != nil {
- logrus.WithField("room_id", roomID).WithError(err).Warn("Failed to evacuate room before purging")
- return err
- }
-
- logrus.WithFields(logrus.Fields{
- "room_id": roomID,
- "evacuated_users": len(evacAffected),
- }).Warn("Evacuated room, purging room from roomserver now")
-
logrus.WithField("room_id", roomID).Warn("Purging room from roomserver")
if err := r.DB.PurgeRoom(ctx, roomID); err != nil {
logrus.WithField("room_id", roomID).WithError(err).Warn("Failed to purge room from roomserver")