From 4f1f4b0783c3dd9408eb60b31312a8614915c012 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sat, 31 Oct 2020 22:23:02 +0100 Subject: [PATCH] Use french names for Matrix room aliases --- apps/participation/models.py | 2 +- apps/participation/views.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/participation/models.py b/apps/participation/models.py index 0058e3b..0d5e5fb 100644 --- a/apps/participation/models.py +++ b/apps/participation/models.py @@ -83,7 +83,7 @@ class Team(models.Model): Matrix.create_room( visibility=RoomVisibility.private, name=f"#équipe-{self.trigram.lower()}", - alias=f"team-{self.trigram.lower()}", + alias=f"equipe-{self.trigram.lower()}", topic=f"Discussion de l'équipe {self.name}", preset=RoomPreset.private_chat, ) diff --git a/apps/participation/views.py b/apps/participation/views.py index 0d72b5a..6e6970b 100644 --- a/apps/participation/views.py +++ b/apps/participation/views.py @@ -65,7 +65,7 @@ class CreateTeamView(LoginRequiredMixin, CreateView): f"{user.first_name} {user.last_name}") # Invite the user in the team Matrix room - Matrix.invite(f"#team-{form.instance.trigram.lower()}:correspondances-maths.fr", + Matrix.invite(f"#equipe-{form.instance.trigram.lower()}:correspondances-maths.fr", f"@{user.registration.matrix_username}:correspondances-maths.fr") return ret @@ -111,7 +111,7 @@ class JoinTeamView(LoginRequiredMixin, FormView): f"{user.first_name} {user.last_name}") # Invite the user in the team Matrix room - Matrix.invite(f"#team-{form.instance.trigram.lower()}:correspondances-maths.fr", + Matrix.invite(f"#equipe-{form.instance.trigram.lower()}:correspondances-maths.fr", f"@{user.registration.matrix_username}:correspondances-maths.fr") return ret @@ -312,7 +312,7 @@ class TeamLeaveView(LoginRequiredMixin, TemplateView): request.user.registration.team = None request.user.registration.save() get_sympa_client().unsubscribe(request.user.email, f"equipe-{team.trigram.lower()}", False) - Matrix.kick(f"#team-{team.trigram.lower()}:correspondances-maths.fr", + Matrix.kick(f"#equipe-{team.trigram.lower()}:correspondances-maths.fr", f"@{request.user.registration.matrix_username}:correspondances-maths.fr", "Équipe quittée") if team.students.count() + team.coachs.count() == 0: