From d9bb0a0860798b4e8d6e722b63c20c94777964c2 Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Tue, 23 Apr 2024 00:22:18 +0200 Subject: [PATCH 01/35] Prepare models for new chat feature Signed-off-by: Emmy D'Anello --- chat/__init__.py | 2 + chat/admin.py | 22 ++ chat/apps.py | 9 + chat/migrations/0001_initial.py | 198 ++++++++++++++++ chat/migrations/__init__.py | 2 + chat/models.py | 116 ++++++++++ chat/tests.py | 2 + chat/urls.py | 2 + chat/views.py | 2 + .../migrations/0003_alter_teamdraw_options.py | 28 +++ locale/fr/LC_MESSAGES/django.po | 212 ++++++++++++++---- tfjm/permissions.py | 19 ++ tfjm/settings.py | 1 + tfjm/urls.py | 1 + 14 files changed, 571 insertions(+), 45 deletions(-) create mode 100644 chat/__init__.py create mode 100644 chat/admin.py create mode 100644 chat/apps.py create mode 100644 chat/migrations/0001_initial.py create mode 100644 chat/migrations/__init__.py create mode 100644 chat/models.py create mode 100644 chat/tests.py create mode 100644 chat/urls.py create mode 100644 chat/views.py create mode 100644 draw/migrations/0003_alter_teamdraw_options.py create mode 100644 tfjm/permissions.py diff --git a/chat/__init__.py b/chat/__init__.py new file mode 100644 index 0000000..80ea069 --- /dev/null +++ b/chat/__init__.py @@ -0,0 +1,2 @@ +# Copyright (C) 2024 by Animath +# SPDX-License-Identifier: GPL-3.0-or-later diff --git a/chat/admin.py b/chat/admin.py new file mode 100644 index 0000000..2c467d4 --- /dev/null +++ b/chat/admin.py @@ -0,0 +1,22 @@ +# Copyright (C) 2024 by Animath +# SPDX-License-Identifier: GPL-3.0-or-later + +from django.contrib import admin + +from .models import Channel, Message + + +@admin.register(Channel) +class ChannelAdmin(admin.ModelAdmin): + list_display = ('name', 'read_access', 'write_access', 'tournament', 'pool', 'team', 'private',) + list_filter = ('read_access', 'write_access', 'tournament', 'private',) + search_fields = ('name', 'tournament__name', 'team__name', 'team__trigram',) + autocomplete_fields = ('tournament', 'pool', 'team', 'invited', ) + + +@admin.register(Message) +class MessageAdmin(admin.ModelAdmin): + list_display = ('channel', 'author', 'created_at', 'updated_at', 'content',) + list_filter = ('channel', 'created_at', 'updated_at',) + search_fields = ('author__username', 'author__first_name', 'author__last_name', 'content',) + autocomplete_fields = ('channel', 'author',) diff --git a/chat/apps.py b/chat/apps.py new file mode 100644 index 0000000..a17b8f5 --- /dev/null +++ b/chat/apps.py @@ -0,0 +1,9 @@ +# Copyright (C) 2024 by Animath +# SPDX-License-Identifier: GPL-3.0-or-later + +from django.apps import AppConfig + + +class ChatConfig(AppConfig): + default_auto_field = "django.db.models.BigAutoField" + name = "chat" diff --git a/chat/migrations/0001_initial.py b/chat/migrations/0001_initial.py new file mode 100644 index 0000000..75f8f15 --- /dev/null +++ b/chat/migrations/0001_initial.py @@ -0,0 +1,198 @@ +# Generated by Django 5.0.3 on 2024-04-27 06:48 + +import django.db.models.deletion +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ("participation", "0013_alter_pool_options_pool_room"), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name="Channel", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("name", models.CharField(max_length=255, verbose_name="name")), + ( + "read_access", + models.PositiveSmallIntegerField( + choices=[ + ("anonymous", "Everyone, including anonymous users"), + ("authenticated", "Authenticated users"), + ("volunteer", "All volunteers"), + ("tournament", "All members of a given tournament"), + ("organizer", "Tournament organizers only"), + ( + "jury_president", + "Tournament organizers and jury presidents of the tournament", + ), + ("jury", "Jury members of the pool"), + ("pool", "Jury members and participants of the pool"), + ( + "team", + "Members of the team and organizers of concerned tournaments", + ), + ( + "private", + "Private, reserved to explicit authorized users", + ), + ("admin", "Admin users"), + ], + verbose_name="read permission", + ), + ), + ( + "write_access", + models.PositiveSmallIntegerField( + choices=[ + ("anonymous", "Everyone, including anonymous users"), + ("authenticated", "Authenticated users"), + ("volunteer", "All volunteers"), + ("tournament", "All members of a given tournament"), + ("organizer", "Tournament organizers only"), + ( + "jury_president", + "Tournament organizers and jury presidents of the tournament", + ), + ("jury", "Jury members of the pool"), + ("pool", "Jury members and participants of the pool"), + ( + "team", + "Members of the team and organizers of concerned tournaments", + ), + ( + "private", + "Private, reserved to explicit authorized users", + ), + ("admin", "Admin users"), + ], + verbose_name="write permission", + ), + ), + ( + "private", + models.BooleanField( + default=False, + help_text="If checked, only users who have been explicitly added to the channel will be able to access it.", + verbose_name="private", + ), + ), + ( + "invited", + models.ManyToManyField( + blank=True, + help_text="Extra users who have been invited to the channel, in addition to the permitted group of the channel.", + related_name="+", + to=settings.AUTH_USER_MODEL, + verbose_name="invited users", + ), + ), + ( + "pool", + models.ForeignKey( + blank=True, + default=None, + help_text="For a permission that concerns a pool, indicates what is the concerned pool.", + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name="chat_channels", + to="participation.pool", + verbose_name="pool", + ), + ), + ( + "team", + models.ForeignKey( + blank=True, + default=None, + help_text="For a permission that concerns a team, indicates what is the concerned team.", + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name="chat_channels", + to="participation.team", + verbose_name="team", + ), + ), + ( + "tournament", + models.ForeignKey( + blank=True, + default=None, + help_text="For a permission that concerns a tournament, indicates what is the concerned tournament.", + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name="chat_channels", + to="participation.tournament", + verbose_name="tournament", + ), + ), + ], + options={ + "verbose_name": "channel", + "verbose_name_plural": "channels", + "ordering": ("name",), + }, + ), + migrations.CreateModel( + name="Message", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "created_at", + models.DateTimeField(auto_now_add=True, verbose_name="created at"), + ), + ( + "updated_at", + models.DateTimeField(auto_now=True, verbose_name="updated at"), + ), + ("content", models.TextField(verbose_name="content")), + ( + "author", + models.ForeignKey( + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name="chat_messages", + to=settings.AUTH_USER_MODEL, + verbose_name="author", + ), + ), + ( + "channel", + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name="messages", + to="chat.channel", + verbose_name="channel", + ), + ), + ], + options={ + "verbose_name": "message", + "verbose_name_plural": "messages", + "ordering": ("created_at",), + }, + ), + ] diff --git a/chat/migrations/__init__.py b/chat/migrations/__init__.py new file mode 100644 index 0000000..80ea069 --- /dev/null +++ b/chat/migrations/__init__.py @@ -0,0 +1,2 @@ +# Copyright (C) 2024 by Animath +# SPDX-License-Identifier: GPL-3.0-or-later diff --git a/chat/models.py b/chat/models.py new file mode 100644 index 0000000..b5a35e7 --- /dev/null +++ b/chat/models.py @@ -0,0 +1,116 @@ +# Copyright (C) 2024 by Animath +# SPDX-License-Identifier: GPL-3.0-or-later + +from django.db import models +from django.utils.text import format_lazy +from django.utils.translation import gettext_lazy as _ +from tfjm.permissions import PermissionType + + +class Channel(models.Model): + name = models.CharField( + max_length=255, + verbose_name=_("name"), + ) + + read_access = models.PositiveSmallIntegerField( + verbose_name=_("read permission"), + choices=PermissionType, + ) + + write_access = models.PositiveSmallIntegerField( + verbose_name=_("write permission"), + choices=PermissionType, + ) + + tournament = models.ForeignKey( + 'participation.Tournament', + on_delete=models.CASCADE, + blank=True, + null=True, + default=None, + verbose_name=_("tournament"), + related_name='chat_channels', + help_text=_("For a permission that concerns a tournament, indicates what is the concerned tournament."), + ) + + pool = models.ForeignKey( + 'participation.Pool', + on_delete=models.CASCADE, + blank=True, + null=True, + default=None, + verbose_name=_("pool"), + related_name='chat_channels', + help_text=_("For a permission that concerns a pool, indicates what is the concerned pool."), + ) + + team = models.ForeignKey( + 'participation.Team', + on_delete=models.CASCADE, + blank=True, + null=True, + default=None, + verbose_name=_("team"), + related_name='chat_channels', + help_text=_("For a permission that concerns a team, indicates what is the concerned team."), + ) + + private = models.BooleanField( + verbose_name=_("private"), + default=False, + help_text=_("If checked, only users who have been explicitly added to the channel will be able to access it."), + ) + + invited = models.ManyToManyField( + 'auth.User', + verbose_name=_("invited users"), + related_name='+', + blank=True, + help_text=_("Extra users who have been invited to the channel, " + "in addition to the permitted group of the channel."), + ) + + def __str__(self): + return format_lazy(_("Channel {name}"), name=self.name) + + class Meta: + verbose_name = _("channel") + verbose_name_plural = _("channels") + ordering = ('name',) + + +class Message(models.Model): + channel = models.ForeignKey( + Channel, + on_delete=models.CASCADE, + verbose_name=_("channel"), + related_name='messages', + ) + + author = models.ForeignKey( + 'auth.User', + verbose_name=_("author"), + on_delete=models.SET_NULL, + null=True, + related_name='chat_messages', + ) + + created_at = models.DateTimeField( + verbose_name=_("created at"), + auto_now_add=True, + ) + + updated_at = models.DateTimeField( + verbose_name=_("updated at"), + auto_now=True, + ) + + content = models.TextField( + verbose_name=_("content"), + ) + + class Meta: + verbose_name = _("message") + verbose_name_plural = _("messages") + ordering = ('created_at',) diff --git a/chat/tests.py b/chat/tests.py new file mode 100644 index 0000000..80ea069 --- /dev/null +++ b/chat/tests.py @@ -0,0 +1,2 @@ +# Copyright (C) 2024 by Animath +# SPDX-License-Identifier: GPL-3.0-or-later diff --git a/chat/urls.py b/chat/urls.py new file mode 100644 index 0000000..80ea069 --- /dev/null +++ b/chat/urls.py @@ -0,0 +1,2 @@ +# Copyright (C) 2024 by Animath +# SPDX-License-Identifier: GPL-3.0-or-later diff --git a/chat/views.py b/chat/views.py new file mode 100644 index 0000000..80ea069 --- /dev/null +++ b/chat/views.py @@ -0,0 +1,2 @@ +# Copyright (C) 2024 by Animath +# SPDX-License-Identifier: GPL-3.0-or-later diff --git a/draw/migrations/0003_alter_teamdraw_options.py b/draw/migrations/0003_alter_teamdraw_options.py new file mode 100644 index 0000000..8725ba9 --- /dev/null +++ b/draw/migrations/0003_alter_teamdraw_options.py @@ -0,0 +1,28 @@ +# Generated by Django 5.0.3 on 2024-04-22 22:11 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("draw", "0002_alter_teamdraw_purposed"), + ] + + operations = [ + migrations.AlterModelOptions( + name="teamdraw", + options={ + "ordering": ( + "round__draw__tournament__name", + "round__number", + "pool__letter", + "passage_index", + "choice_dice", + "passage_dice", + ), + "verbose_name": "team draw", + "verbose_name_plural": "team draws", + }, + ), + ] diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 5043b78..13cd29e 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: TFJM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-22 23:36+0200\n" +"POT-Creation-Date: 2024-04-27 08:46+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Emmy D'Anello \n" "Language-Team: LANGUAGE \n" @@ -21,14 +21,21 @@ msgstr "" msgid "API" msgstr "API" -#: draw/admin.py:39 draw/admin.py:57 draw/admin.py:75 -#: participation/admin.py:109 participation/models.py:253 -#: participation/tables.py:88 -msgid "teams" -msgstr "équipes" +#: chat/models.py:13 participation/models.py:35 participation/models.py:263 +#: participation/tables.py:18 participation/tables.py:34 +msgid "name" +msgstr "nom" -#: draw/admin.py:53 draw/admin.py:71 draw/admin.py:88 draw/models.py:26 -#: participation/admin.py:79 participation/admin.py:140 +#: chat/models.py:17 +msgid "read permission" +msgstr "permission de lecture" + +#: chat/models.py:22 +msgid "write permission" +msgstr "permission d'écriture" + +#: chat/models.py:32 draw/admin.py:53 draw/admin.py:71 draw/admin.py:88 +#: draw/models.py:26 participation/admin.py:79 participation/admin.py:140 #: participation/admin.py:171 participation/models.py:693 #: participation/models.py:717 participation/models.py:935 #: registration/models.py:756 @@ -36,6 +43,112 @@ msgstr "équipes" msgid "tournament" msgstr "tournoi" +#: chat/models.py:34 +msgid "" +"For a permission that concerns a tournament, indicates what is the concerned " +"tournament." +msgstr "" +"Pour une permission qui concerne un tournoi, indique quel est le tournoi " +"concerné." + +#: chat/models.py:43 draw/models.py:429 draw/models.py:456 +#: participation/admin.py:136 participation/admin.py:155 +#: participation/models.py:1434 participation/models.py:1443 +#: participation/tables.py:84 +msgid "pool" +msgstr "poule" + +#: chat/models.py:45 +msgid "" +"For a permission that concerns a pool, indicates what is the concerned pool." +msgstr "" +"Pour une permission qui concerne une poule, indique quelle est la poule " +"concernée." + +#: chat/models.py:54 draw/templates/draw/tournament_content.html:277 +#: participation/admin.py:167 participation/models.py:252 +#: participation/models.py:708 +#: participation/templates/participation/tournament_harmonize.html:15 +#: registration/models.py:157 registration/models.py:747 +#: registration/tables.py:39 +#: registration/templates/registration/payment_form.html:52 +msgid "team" +msgstr "équipe" + +#: chat/models.py:56 +msgid "" +"For a permission that concerns a team, indicates what is the concerned team." +msgstr "" +"Pour une permission qui concerne une équipe, indique quelle est l'équipe " +"concernée." + +#: chat/models.py:60 +msgid "private" +msgstr "privé" + +#: chat/models.py:62 +msgid "" +"If checked, only users who have been explicitly added to the channel will be " +"able to access it." +msgstr "" +"Si sélectionné, seul⋅es les utilisateur⋅rices qui ont été explicitement " +"ajouté⋅es au canal pourront y accéder." + +#: chat/models.py:67 +msgid "invited users" +msgstr "Utilisateur⋅rices invité" + +#: chat/models.py:70 +msgid "" +"Extra users who have been invited to the channel, in addition to the " +"permitted group of the channel." +msgstr "" +"Utilisateur⋅rices supplémentaires qui ont été invité⋅es au canal, en plus du " +"groupe autorisé du canal." + +#: chat/models.py:75 +#, python-brace-format +msgid "Channel {name}" +msgstr "Canal {name}" + +#: chat/models.py:78 chat/models.py:87 +msgid "channel" +msgstr "canal" + +#: chat/models.py:79 +msgid "channels" +msgstr "canaux" + +#: chat/models.py:93 +msgid "author" +msgstr "auteur⋅rice" + +#: chat/models.py:100 +msgid "created at" +msgstr "créé le" + +#: chat/models.py:105 +msgid "updated at" +msgstr "modifié le" + +#: chat/models.py:110 +msgid "content" +msgstr "contenu" + +#: chat/models.py:114 +msgid "message" +msgstr "message" + +#: chat/models.py:115 +msgid "messages" +msgstr "messages" + +#: draw/admin.py:39 draw/admin.py:57 draw/admin.py:75 +#: participation/admin.py:109 participation/models.py:253 +#: participation/tables.py:88 +msgid "teams" +msgstr "équipes" + #: draw/admin.py:92 draw/models.py:234 draw/models.py:448 #: participation/models.py:939 msgid "round" @@ -213,12 +326,6 @@ msgstr "L'instance complète de la poule." msgid "Pool {letter}{number}" msgstr "Poule {letter}{number}" -#: draw/models.py:429 draw/models.py:456 participation/admin.py:136 -#: participation/admin.py:155 participation/models.py:1434 -#: participation/models.py:1443 participation/tables.py:84 -msgid "pool" -msgstr "poule" - #: draw/models.py:430 participation/models.py:1435 msgid "pools" msgstr "poules" @@ -352,15 +459,6 @@ msgstr "Tirer un problème pour" msgid "Pb." msgstr "Pb." -#: draw/templates/draw/tournament_content.html:277 participation/admin.py:167 -#: participation/models.py:252 participation/models.py:708 -#: participation/templates/participation/tournament_harmonize.html:15 -#: registration/models.py:157 registration/models.py:747 -#: registration/tables.py:39 -#: registration/templates/registration/payment_form.html:52 -msgid "team" -msgstr "équipe" - #: draw/templates/draw/tournament_content.html:287 #: draw/templates/draw/tournament_content.html:288 #: draw/templates/draw/tournament_content.html:289 @@ -589,11 +687,6 @@ msgstr "Ce⋅tte défenseur⋅se ne travaille pas sur ce problème." msgid "The PDF file must not have more than 2 pages." msgstr "Le fichier PDF ne doit pas avoir plus de 2 pages." -#: participation/models.py:35 participation/models.py:263 -#: participation/tables.py:18 participation/tables.py:34 -msgid "name" -msgstr "nom" - #: participation/models.py:41 participation/tables.py:39 msgid "trigram" msgstr "trigramme" @@ -1219,16 +1312,6 @@ msgstr "Pas d'équipe définie" msgid "Update" msgstr "Modifier" -#: participation/templates/participation/chat.html:7 -msgid "" -"The chat feature is now out of usage. If you feel that having a chat feature " -"between participants is important, for example to build a team, please " -"contact us." -msgstr "" -"La fonctionnalité de chat est désormais hors-service. Si vous pensez " -"qu'avoir un chat entre les participant⋅es est important, par exemple pour " -"former une équipe, merci de nous contacter." - #: participation/templates/participation/create_team.html:11 #: participation/templates/participation/tournament_form.html:14 #: tfjm/templates/base.html:80 @@ -3484,11 +3567,55 @@ msgstr "Autorisation parentale de {student}.{ext}" msgid "Payment receipt of {registrations}.{ext}" msgstr "Justificatif de paiement de {registrations}.{ext}" -#: tfjm/settings.py:167 +#: tfjm/permissions.py:9 +msgid "Everyone, including anonymous users" +msgstr "Tout le monde, incluant les utilisateur⋅rices anonymes" + +#: tfjm/permissions.py:10 +msgid "Authenticated users" +msgstr "Utilisateur⋅rices connecté⋅es" + +#: tfjm/permissions.py:11 +msgid "All volunteers" +msgstr "Toustes les bénévoles" + +#: tfjm/permissions.py:12 +msgid "All members of a given tournament" +msgstr "Toustes les membres d'un tournoi donné" + +#: tfjm/permissions.py:13 +msgid "Tournament organizers only" +msgstr "Organisateur⋅rices du tournoi seulement" + +#: tfjm/permissions.py:14 +msgid "Tournament organizers and jury presidents of the tournament" +msgstr "Organisateur⋅rices du tournoi et président⋅es de jury du tournoi" + +#: tfjm/permissions.py:15 +msgid "Jury members of the pool" +msgstr "Membres du jury de la poule" + +#: tfjm/permissions.py:16 +msgid "Jury members and participants of the pool" +msgstr "Membre du jury et participant⋅es de la poule" + +#: tfjm/permissions.py:17 +msgid "Members of the team and organizers of concerned tournaments" +msgstr "Membres de l'équipe et organisateur⋅rices des tournois concernés" + +#: tfjm/permissions.py:18 +msgid "Private, reserved to explicit authorized users" +msgstr "Privé, réservé aux utilisateur⋅rices explicitement autorisé⋅es" + +#: tfjm/permissions.py:19 +msgid "Admin users" +msgstr "Administrateur⋅rices" + +#: tfjm/settings.py:168 msgid "English" msgstr "Anglais" -#: tfjm/settings.py:168 +#: tfjm/settings.py:169 msgid "French" msgstr "Français" @@ -3645,8 +3772,3 @@ msgstr "Aucun résultat." #: tfjm/templates/sidebar.html:10 tfjm/templates/sidebar.html:21 msgid "Informations" msgstr "Informations" - -#~ msgid "Can't determine the pool size. Are you sure your file is correct?" -#~ msgstr "" -#~ "Impossible de déterminer la taille de la poule. Êtes-vous sûr⋅e que le " -#~ "fichier est correct ?" diff --git a/tfjm/permissions.py b/tfjm/permissions.py new file mode 100644 index 0000000..f29d5c6 --- /dev/null +++ b/tfjm/permissions.py @@ -0,0 +1,19 @@ +# Copyright (C) 2024 by Animath +# SPDX-License-Identifier: GPL-3.0-or-later + +from django.db import models +from django.utils.translation import gettext_lazy as _ + + +class PermissionType(models.TextChoices): + ANONYMOUS = 'anonymous', _("Everyone, including anonymous users") + AUTHENTICATED = 'authenticated', _("Authenticated users") + VOLUNTEER = 'volunteer', _("All volunteers") + TOURNAMENT_MEMBER = 'tournament', _("All members of a given tournament") + TOURNAMENT_ORGANIZER = 'organizer', _("Tournament organizers only") + TOURNAMENT_JURY_PRESIDENT = 'jury_president', _("Tournament organizers and jury presidents of the tournament") + JURY_MEMBER = 'jury', _("Jury members of the pool") + POOL_MEMBER = 'pool', _("Jury members and participants of the pool") + TEAM_MEMBER = 'team', _("Members of the team and organizers of concerned tournaments") + PRIVATE = 'private', _("Private, reserved to explicit authorized users") + ADMIN = 'admin', _("Admin users") diff --git a/tfjm/settings.py b/tfjm/settings.py index c1b98bb..eb1c53f 100644 --- a/tfjm/settings.py +++ b/tfjm/settings.py @@ -68,6 +68,7 @@ INSTALLED_APPS = [ 'rest_framework.authtoken', 'api', + 'chat', 'draw', 'registration', 'participation', diff --git a/tfjm/urls.py b/tfjm/urls.py index 1185dbc..a397f07 100644 --- a/tfjm/urls.py +++ b/tfjm/urls.py @@ -37,6 +37,7 @@ urlpatterns = [ path('search/', AdminSearchView.as_view(), name="haystack_search"), path('api/', include('api.urls')), + # path('chat/', include('chat.urls')), path('draw/', include('draw.urls')), path('participation/', include('participation.urls')), path('registration/', include('registration.urls')), From ea8007aa07ece08d7dc0e5a80e9309fbd4e06556 Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Sat, 27 Apr 2024 08:57:01 +0200 Subject: [PATCH 02/35] Initialize chat interface Signed-off-by: Emmy D'Anello --- chat/consumers.py | 46 ++++++++++++++++ chat/static/chat.js | 52 +++++++++++++++++++ chat/templates/chat/chat.html | 12 +++++ chat/urls.py | 11 ++++ chat/views.py | 11 ++++ draw/routing.py | 10 ---- draw/tests.py | 4 +- .../templates/participation/chat.html | 13 ----- participation/urls.py | 2 - tfjm/asgi.py | 4 +- tfjm/routing.py | 11 ++++ tfjm/templates/navbar.html | 4 +- tfjm/urls.py | 2 +- 13 files changed, 150 insertions(+), 32 deletions(-) create mode 100644 chat/consumers.py create mode 100644 chat/static/chat.js create mode 100644 chat/templates/chat/chat.html delete mode 100644 draw/routing.py delete mode 100644 participation/templates/participation/chat.html create mode 100644 tfjm/routing.py diff --git a/chat/consumers.py b/chat/consumers.py new file mode 100644 index 0000000..7af3987 --- /dev/null +++ b/chat/consumers.py @@ -0,0 +1,46 @@ +# Copyright (C) 2024 by Animath +# SPDX-License-Identifier: GPL-3.0-or-later + +from channels.generic.websocket import AsyncJsonWebsocketConsumer +from registration.models import Registration + + +class ChatConsumer(AsyncJsonWebsocketConsumer): + """ + This consumer manages the websocket of the chat interface. + """ + async def connect(self) -> None: + """ + This function is called when a new websocket is trying to connect to the server. + We accept only if this is a user of a team of the associated tournament, or a volunteer + of the tournament. + """ + + # Fetch the registration of the current user + user = self.scope['user'] + if user.is_anonymous: + # User is not authenticated + await self.close() + return + + reg = await Registration.objects.aget(user_id=user.id) + self.registration = reg + + # Accept the connection + await self.accept() + + async def disconnect(self, close_code) -> None: + """ + Called when the websocket got disconnected, for any reason. + :param close_code: The error code. + """ + if self.scope['user'].is_anonymous: + # User is not authenticated + return + + async def receive_json(self, content, **kwargs): + """ + Called when the client sends us some data, parsed as JSON. + :param content: The sent data, decoded from JSON text. Must content a `type` field. + """ + # TODO Process chat protocol diff --git a/chat/static/chat.js b/chat/static/chat.js new file mode 100644 index 0000000..5a45a83 --- /dev/null +++ b/chat/static/chat.js @@ -0,0 +1,52 @@ +(async () => { + // check notification permission + // This is useful to alert people that they should do something + await Notification.requestPermission() +})() + +/** + * Display a new notification with the given title and the given body. + * @param title The title of the notification + * @param body The body of the notification + * @param timeout The time (in milliseconds) after that the notification automatically closes. 0 to make indefinite. Default to 5000 ms. + * @return Notification + */ +function showNotification(title, body, timeout = 5000) { + let notif = new Notification(title, {'body': body, 'icon': "/static/tfjm.svg"}) + if (timeout) + setTimeout(() => notif.close(), timeout) + return notif +} + +document.addEventListener('DOMContentLoaded', () => { + /** + * Process the received data from the server. + * @param data The received message + */ + function processMessage(data) { + // TODO Implement chat protocol + } + + function setupSocket(nextDelay = 1000) { + // Open a global websocket + socket = new WebSocket( + (document.location.protocol === 'https:' ? 'wss' : 'ws') + '://' + window.location.host + '/ws/chat/' + ) + + // Listen on websockets and process messages from the server + socket.addEventListener('message', e => { + // Parse received data as JSON + const data = JSON.parse(e.data) + + processMessage(data) + }) + + // Manage errors + socket.addEventListener('close', e => { + console.error('Chat socket closed unexpectedly, restarting…') + setTimeout(() => setupSocket(2 * nextDelay), nextDelay) + }) + } + + setupSocket() +}) diff --git a/chat/templates/chat/chat.html b/chat/templates/chat/chat.html new file mode 100644 index 0000000..cf7de49 --- /dev/null +++ b/chat/templates/chat/chat.html @@ -0,0 +1,12 @@ +{% extends "base.html" %} + +{% load static %} +{% load i18n %} + +{% block content %} +{% endblock %} + +{% block extrajavascript %} + {# This script contains all data for the chat management #} + +{% endblock %} diff --git a/chat/urls.py b/chat/urls.py index 80ea069..77d52c2 100644 --- a/chat/urls.py +++ b/chat/urls.py @@ -1,2 +1,13 @@ # Copyright (C) 2024 by Animath # SPDX-License-Identifier: GPL-3.0-or-later + +from django.urls import path + +from .views import ChatView + + +app_name = 'chat' + +urlpatterns = [ + path('', ChatView.as_view(), name='chat'), +] diff --git a/chat/views.py b/chat/views.py index 80ea069..8c4ef96 100644 --- a/chat/views.py +++ b/chat/views.py @@ -1,2 +1,13 @@ # Copyright (C) 2024 by Animath # SPDX-License-Identifier: GPL-3.0-or-later + +from django.contrib.auth.mixins import LoginRequiredMixin +from django.views.generic import TemplateView + + +class ChatView(LoginRequiredMixin, TemplateView): + """ + This view is the main interface of the chat system, which is working + with Javascript and websockets. + """ + template_name = "chat/chat.html" diff --git a/draw/routing.py b/draw/routing.py deleted file mode 100644 index 8ce6085..0000000 --- a/draw/routing.py +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (C) 2023 by Animath -# SPDX-License-Identifier: GPL-3.0-or-later - -from django.urls import path - -from . import consumers - -websocket_urlpatterns = [ - path("ws/draw/", consumers.DrawConsumer.as_asgi()), -] diff --git a/draw/tests.py b/draw/tests.py index 9f3ec6a..bbb209a 100644 --- a/draw/tests.py +++ b/draw/tests.py @@ -14,8 +14,8 @@ from django.contrib.sites.models import Site from django.test import TestCase from django.urls import reverse from participation.models import Team, Tournament +from tfjm import routing as websocket_routing -from . import routing from .models import Draw, Pool, Round, TeamDraw @@ -55,7 +55,7 @@ class TestDraw(TestCase): # Connect to Websocket headers = [(b'cookie', self.async_client.cookies.output(header='', sep='; ').encode())] - communicator = WebsocketCommunicator(AuthMiddlewareStack(URLRouter(routing.websocket_urlpatterns)), + communicator = WebsocketCommunicator(AuthMiddlewareStack(URLRouter(websocket_routing.websocket_urlpatterns)), "/ws/draw/", headers) connected, subprotocol = await communicator.connect() self.assertTrue(connected) diff --git a/participation/templates/participation/chat.html b/participation/templates/participation/chat.html deleted file mode 100644 index bf47704..0000000 --- a/participation/templates/participation/chat.html +++ /dev/null @@ -1,13 +0,0 @@ -{% extends "base.html" %} - -{% load i18n %} - -{% block content %} -
- {% blocktrans trimmed %} - The chat feature is now out of usage. If you feel that having a chat - feature between participants is important, for example to build a - team, please contact us. - {% endblocktrans %} -
-{% endblock %} diff --git a/participation/urls.py b/participation/urls.py index 4125a4c..2c97587 100644 --- a/participation/urls.py +++ b/participation/urls.py @@ -2,7 +2,6 @@ # SPDX-License-Identifier: GPL-3.0-or-later from django.urls import path -from django.views.generic import TemplateView from .views import CreateTeamView, FinalNotationSheetTemplateView, GSheetNotificationsView, JoinTeamView, \ MyParticipationDetailView, MyTeamDetailView, NotationSheetsArchiveView, NoteUpdateView, ParticipationDetailView, \ @@ -74,5 +73,4 @@ urlpatterns = [ path("pools/passages//update/", PassageUpdateView.as_view(), name="passage_update"), path("pools/passages//solution/", SynthesisUploadView.as_view(), name="upload_synthesis"), path("pools/passages/notes//", NoteUpdateView.as_view(), name="update_notes"), - path("chat/", TemplateView.as_view(template_name="participation/chat.html"), name="chat") ] diff --git a/tfjm/asgi.py b/tfjm/asgi.py index 3bec7e0..417d54e 100644 --- a/tfjm/asgi.py +++ b/tfjm/asgi.py @@ -22,13 +22,13 @@ os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'tfjm.settings') django_asgi_app = get_asgi_application() # useful since the import must be done after the application initialization -import draw.routing # noqa: E402, I202 +import tfjm.routing # noqa: E402, I202 application = ProtocolTypeRouter( { "http": django_asgi_app, "websocket": AllowedHostsOriginValidator( - AuthMiddlewareStack(URLRouter(draw.routing.websocket_urlpatterns)) + AuthMiddlewareStack(URLRouter(tfjm.routing.websocket_urlpatterns)) ), } ) diff --git a/tfjm/routing.py b/tfjm/routing.py new file mode 100644 index 0000000..08c54d8 --- /dev/null +++ b/tfjm/routing.py @@ -0,0 +1,11 @@ +# Copyright (C) 2024 by Animath +# SPDX-License-Identifier: GPL-3.0-or-later + +import chat.consumers +from django.urls import path +import draw.consumers + +websocket_urlpatterns = [ + path("ws/chat/", chat.consumers.ChatConsumer.as_asgi()), + path("ws/draw/", draw.consumers.DrawConsumer.as_asgi()), +] diff --git a/tfjm/templates/navbar.html b/tfjm/templates/navbar.html index 8e0115d..ecdb4dc 100644 --- a/tfjm/templates/navbar.html +++ b/tfjm/templates/navbar.html @@ -62,8 +62,8 @@ {% endif %} {% endif %} -
  • - +
  • + {% trans "Chat" %}
    • diff --git a/tfjm/urls.py b/tfjm/urls.py index a397f07..c506456 100644 --- a/tfjm/urls.py +++ b/tfjm/urls.py @@ -37,7 +37,7 @@ urlpatterns = [ path('search/', AdminSearchView.as_view(), name="haystack_search"), path('api/', include('api.urls')), - # path('chat/', include('chat.urls')), + path('chat/', include('chat.urls')), path('draw/', include('draw.urls')), path('participation/', include('participation.urls')), path('registration/', include('registration.urls')), From 7498677bbd6590dd9131be20c9dfb87681e150bc Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Sat, 27 Apr 2024 09:00:23 +0200 Subject: [PATCH 03/35] Permissions are strings, not integers Signed-off-by: Emmy D'Anello --- chat/migrations/0001_initial.py | 8 +++++--- chat/models.py | 6 ++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/chat/migrations/0001_initial.py b/chat/migrations/0001_initial.py index 75f8f15..294bd7e 100644 --- a/chat/migrations/0001_initial.py +++ b/chat/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 5.0.3 on 2024-04-27 06:48 +# Generated by Django 5.0.3 on 2024-04-27 07:00 import django.db.models.deletion from django.conf import settings @@ -30,7 +30,7 @@ class Migration(migrations.Migration): ("name", models.CharField(max_length=255, verbose_name="name")), ( "read_access", - models.PositiveSmallIntegerField( + models.CharField( choices=[ ("anonymous", "Everyone, including anonymous users"), ("authenticated", "Authenticated users"), @@ -53,12 +53,13 @@ class Migration(migrations.Migration): ), ("admin", "Admin users"), ], + max_length=16, verbose_name="read permission", ), ), ( "write_access", - models.PositiveSmallIntegerField( + models.CharField( choices=[ ("anonymous", "Everyone, including anonymous users"), ("authenticated", "Authenticated users"), @@ -81,6 +82,7 @@ class Migration(migrations.Migration): ), ("admin", "Admin users"), ], + max_length=16, verbose_name="write permission", ), ), diff --git a/chat/models.py b/chat/models.py index b5a35e7..66e0f93 100644 --- a/chat/models.py +++ b/chat/models.py @@ -13,12 +13,14 @@ class Channel(models.Model): verbose_name=_("name"), ) - read_access = models.PositiveSmallIntegerField( + read_access = models.CharField( + max_length=16, verbose_name=_("read permission"), choices=PermissionType, ) - write_access = models.PositiveSmallIntegerField( + write_access = models.CharField( + max_length=16, verbose_name=_("write permission"), choices=PermissionType, ) From b464e7df1d3fc1d3c3a236539d54c26c48eb1c18 Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Sat, 27 Apr 2024 09:53:55 +0200 Subject: [PATCH 04/35] Manage channels permissions Signed-off-by: Emmy D'Anello --- chat/consumers.py | 31 ++++++++++++++++++- chat/models.py | 72 ++++++++++++++++++++++++++++++++++++++++++++- chat/static/chat.js | 7 +++++ 3 files changed, 108 insertions(+), 2 deletions(-) diff --git a/chat/consumers.py b/chat/consumers.py index 7af3987..75afd75 100644 --- a/chat/consumers.py +++ b/chat/consumers.py @@ -2,8 +2,11 @@ # SPDX-License-Identifier: GPL-3.0-or-later from channels.generic.websocket import AsyncJsonWebsocketConsumer +from django.contrib.auth.models import User from registration.models import Registration +from .models import Channel + class ChatConsumer(AsyncJsonWebsocketConsumer): """ @@ -15,6 +18,8 @@ class ChatConsumer(AsyncJsonWebsocketConsumer): We accept only if this is a user of a team of the associated tournament, or a volunteer of the tournament. """ + if '_fake_user_id' in self.scope['session']: + self.scope['user'] = await User.objects.aget(pk=self.scope['session']['_fake_user_id']) # Fetch the registration of the current user user = self.scope['user'] @@ -43,4 +48,28 @@ class ChatConsumer(AsyncJsonWebsocketConsumer): Called when the client sends us some data, parsed as JSON. :param content: The sent data, decoded from JSON text. Must content a `type` field. """ - # TODO Process chat protocol + match content['type']: + case 'fetch_channels': + await self.fetch_channels() + case unknown: + print("Unknown message type:", unknown) + + async def fetch_channels(self) -> None: + user = self.scope['user'] + + read_channels = await Channel.get_accessible_channels(user, 'read') + write_channels = await Channel.get_accessible_channels(user, 'write') + print([channel async for channel in write_channels.all()]) + message = { + 'type': 'fetch_channels', + 'channels': [ + { + 'id': channel.id, + 'name': channel.name, + 'read_access': True, + 'write_access': await write_channels.acontains(channel), + } + async for channel in read_channels.all() + ] + } + await self.send_json(message) diff --git a/chat/models.py b/chat/models.py index 66e0f93..0e4b078 100644 --- a/chat/models.py +++ b/chat/models.py @@ -1,9 +1,13 @@ # Copyright (C) 2024 by Animath # SPDX-License-Identifier: GPL-3.0-or-later +from django.contrib.auth.models import User from django.db import models +from django.db.models import Q, QuerySet from django.utils.text import format_lazy from django.utils.translation import gettext_lazy as _ +from participation.models import Tournament +from registration.models import ParticipantRegistration, Registration, VolunteerRegistration from tfjm.permissions import PermissionType @@ -74,7 +78,73 @@ class Channel(models.Model): ) def __str__(self): - return format_lazy(_("Channel {name}"), name=self.name) + return str(format_lazy(_("Channel {name}"), name=self.name)) + + @staticmethod + async def get_accessible_channels(user: User, permission_type: str = 'read') -> QuerySet["Channel"]: + permission_type = 'write_access' if 'write' in permission_type.lower() else 'read_access' + + qs = Channel.objects.none() + if user.is_anonymous: + return Channel.objects.filter(**{permission_type: PermissionType.ANONYMOUS}) + + qs |= Channel.objects.filter(**{permission_type: PermissionType.AUTHENTICATED}) + registration = await Registration.objects.aget(user_id=user.id) + + if registration.is_admin: + return Channel.objects.all() + + if registration.is_volunteer: + registration = await VolunteerRegistration.objects \ + .prefetch_related('jury_in__tournament', 'organized_tournaments').aget(user_id=user.id) + + qs |= Channel.objects.filter(**{permission_type: PermissionType.VOLUNTEER}) + + qs |= Channel.objects.filter(Q(tournament__in=registration.interesting_tournaments), + **{permission_type: PermissionType.TOURNAMENT_MEMBER}) + + qs |= Channel.objects.filter(Q(tournament__in=registration.organized_tournaments.all()), + **{permission_type: PermissionType.TOURNAMENT_ORGANIZER}) + + qs |= Channel.objects.filter(Q(tournament__pools__in=registration.pools_presided.all()) + | Q(tournament__in=registration.organized_tournaments.all()), + **{permission_type: PermissionType.TOURNAMENT_JURY_PRESIDENT}) + + qs |= Channel.objects.filter(Q(pool__in=registration.jury_in.all()) + | Q(pool__tournament__in=registration.organized_tournaments.all()) + | Q(pool__tournament__pools__in=registration.pools_presided.all()), + **{permission_type: PermissionType.JURY_MEMBER}) + + qs |= Channel.objects.filter(Q(pool__in=registration.jury_in.all()) + | Q(pool__tournament__in=registration.organized_tournaments.all()) + | Q(pool__tournament__pools__in=registration.pools_presided.all()), + **{permission_type: PermissionType.POOL_MEMBER}) + else: + registration = await ParticipantRegistration.objects \ + .prefetch_related('team__participation__pools', 'team__participation__tournament').aget(user_id=user.id) + + team = registration.team + tournaments = [] + if team.participation.valid: + tournaments.append(team.participation.tournament) + if team.participation.final: + tournaments.append(await Tournament.objects.aget(final=True)) + + qs |= Channel.objects.filter(Q(tournament__in=tournaments), + **{permission_type: PermissionType.TOURNAMENT_MEMBER}) + + qs |= Channel.objects.filter(Q(pool__in=team.participation.pools.all()), + **{permission_type: PermissionType.POOL_MEMBER}) + + qs |= Channel.objects.filter(Q(team=team), + **{permission_type: PermissionType.TEAM_MEMBER}) + + qs |= Channel.objects.filter(invited=user) + + print(user) + print(qs.query) + + return qs class Meta: verbose_name = _("channel") diff --git a/chat/static/chat.js b/chat/static/chat.js index 5a45a83..8d5063a 100644 --- a/chat/static/chat.js +++ b/chat/static/chat.js @@ -25,6 +25,7 @@ document.addEventListener('DOMContentLoaded', () => { */ function processMessage(data) { // TODO Implement chat protocol + console.log(data) } function setupSocket(nextDelay = 1000) { @@ -46,6 +47,12 @@ document.addEventListener('DOMContentLoaded', () => { console.error('Chat socket closed unexpectedly, restarting…') setTimeout(() => setupSocket(2 * nextDelay), nextDelay) }) + + socket.addEventListener('open', e => { + socket.send(JSON.stringify({ + 'type': 'fetch_channels', + })) + }) } setupSocket() From 46fc5f39c82d67df10940572f804ad543dd1b522 Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Sat, 27 Apr 2024 09:55:33 +0200 Subject: [PATCH 05/35] Allow to impersonate user on draw interface Signed-off-by: Emmy D'Anello --- draw/consumers.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/draw/consumers.py b/draw/consumers.py index d64c888..7719b8d 100644 --- a/draw/consumers.py +++ b/draw/consumers.py @@ -9,6 +9,7 @@ from random import randint, shuffle from asgiref.sync import sync_to_async from channels.generic.websocket import AsyncJsonWebsocketConsumer from django.conf import settings +from django.contrib.auth.models import User from django.contrib.contenttypes.models import ContentType from django.utils import translation from django.utils.translation import gettext_lazy as _ @@ -44,6 +45,8 @@ class DrawConsumer(AsyncJsonWebsocketConsumer): We accept only if this is a user of a team of the associated tournament, or a volunteer of the tournament. """ + if '_fake_user_id' in self.scope['session']: + self.scope['user'] = await User.objects.aget(pk=self.scope['session']['_fake_user_id']) # Fetch the registration of the current user user = self.scope['user'] From f3a4a99b78bc55b5dc8307523d092e09c5da6189 Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Sat, 27 Apr 2024 12:08:10 +0200 Subject: [PATCH 06/35] Setup chat UI Signed-off-by: Emmy D'Anello --- chat/static/chat.js | 40 +++++++++++++- chat/templates/chat/chat.html | 58 +++++++++++++++++++++ chat/views.py | 8 +++ locale/fr/LC_MESSAGES/django.po | 92 +++++++++++++++++++-------------- tfjm/templates/base.html | 8 +-- 5 files changed, 161 insertions(+), 45 deletions(-) diff --git a/chat/static/chat.js b/chat/static/chat.js index 8d5063a..8e51aec 100644 --- a/chat/static/chat.js +++ b/chat/static/chat.js @@ -4,6 +4,9 @@ await Notification.requestPermission() })() +let channels = {} +let selected_channel_id = null + /** * Display a new notification with the given title and the given body. * @param title The title of the notification @@ -18,6 +21,33 @@ function showNotification(title, body, timeout = 5000) { return notif } +function selectChannel(channel_id) { + let channel = channels[channel_id] + if (!channel) { + console.error('Channel not found:', channel_id) + return + } + + selected_channel_id = channel_id + + let channelTitle = document.getElementById('channel-title') + channelTitle.innerText = channel['name'] + + let messageInput = document.getElementById('input-message') + messageInput.disabled = !channel['write_access'] +} + +function setChannels(new_channels) { + channels = {} + for (let channel of new_channels) { + channels[channel['id']] = channel + } + + if (new_channels && (!selected_channel_id || !channels[selected_channel_id])) { + selectChannel(Object.keys(channels)[0]) + } +} + document.addEventListener('DOMContentLoaded', () => { /** * Process the received data from the server. @@ -25,7 +55,15 @@ document.addEventListener('DOMContentLoaded', () => { */ function processMessage(data) { // TODO Implement chat protocol - console.log(data) + switch (data['type']) { + case 'fetch_channels': + setChannels(data['channels']) + break + default: + console.log(data) + console.error('Unknown message type:', data['type']) + break + } } function setupSocket(nextDelay = 1000) { diff --git a/chat/templates/chat/chat.html b/chat/templates/chat/chat.html index cf7de49..860147b 100644 --- a/chat/templates/chat/chat.html +++ b/chat/templates/chat/chat.html @@ -4,6 +4,64 @@ {% load i18n %} {% block content %} + +
    +
    +

    {% trans "Chat channels" %}

    + +
    +
    + +
    +
    + +
    +
    +

    + + +

    +
    +
    +
      +
    • +
      Emmy D'Anello (CNO)
      + Message 1 +
      • +
    • +
      Emmy D'Anello (CNO)
      + Message 2 +
      • +
    • +
      Emmy D'Anello (CNO)
      + Message 3 +
      • +
    +
    +
    +
    + + + +
    +
    +
    {% endblock %} {% block extrajavascript %} diff --git a/chat/views.py b/chat/views.py index 8c4ef96..30c40e9 100644 --- a/chat/views.py +++ b/chat/views.py @@ -4,6 +4,8 @@ from django.contrib.auth.mixins import LoginRequiredMixin from django.views.generic import TemplateView +from chat.models import Channel + class ChatView(LoginRequiredMixin, TemplateView): """ @@ -11,3 +13,9 @@ class ChatView(LoginRequiredMixin, TemplateView): with Javascript and websockets. """ template_name = "chat/chat.html" + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + from asgiref.sync import async_to_sync + context['channels'] = async_to_sync(Channel.get_accessible_channels)(self.request.user, 'read') + return context diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 13cd29e..c70abdc 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: TFJM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-27 08:46+0200\n" +"POT-Creation-Date: 2024-04-27 11:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Emmy D'Anello \n" "Language-Team: LANGUAGE \n" @@ -21,20 +21,20 @@ msgstr "" msgid "API" msgstr "API" -#: chat/models.py:13 participation/models.py:35 participation/models.py:263 +#: chat/models.py:17 participation/models.py:35 participation/models.py:263 #: participation/tables.py:18 participation/tables.py:34 msgid "name" msgstr "nom" -#: chat/models.py:17 +#: chat/models.py:22 msgid "read permission" msgstr "permission de lecture" -#: chat/models.py:22 +#: chat/models.py:28 msgid "write permission" msgstr "permission d'écriture" -#: chat/models.py:32 draw/admin.py:53 draw/admin.py:71 draw/admin.py:88 +#: chat/models.py:38 draw/admin.py:53 draw/admin.py:71 draw/admin.py:88 #: draw/models.py:26 participation/admin.py:79 participation/admin.py:140 #: participation/admin.py:171 participation/models.py:693 #: participation/models.py:717 participation/models.py:935 @@ -43,7 +43,7 @@ msgstr "permission d'écriture" msgid "tournament" msgstr "tournoi" -#: chat/models.py:34 +#: chat/models.py:40 msgid "" "For a permission that concerns a tournament, indicates what is the concerned " "tournament." @@ -51,21 +51,21 @@ msgstr "" "Pour une permission qui concerne un tournoi, indique quel est le tournoi " "concerné." -#: chat/models.py:43 draw/models.py:429 draw/models.py:456 +#: chat/models.py:49 draw/models.py:429 draw/models.py:456 #: participation/admin.py:136 participation/admin.py:155 #: participation/models.py:1434 participation/models.py:1443 #: participation/tables.py:84 msgid "pool" msgstr "poule" -#: chat/models.py:45 +#: chat/models.py:51 msgid "" "For a permission that concerns a pool, indicates what is the concerned pool." msgstr "" "Pour une permission qui concerne une poule, indique quelle est la poule " "concernée." -#: chat/models.py:54 draw/templates/draw/tournament_content.html:277 +#: chat/models.py:60 draw/templates/draw/tournament_content.html:277 #: participation/admin.py:167 participation/models.py:252 #: participation/models.py:708 #: participation/templates/participation/tournament_harmonize.html:15 @@ -75,18 +75,18 @@ msgstr "" msgid "team" msgstr "équipe" -#: chat/models.py:56 +#: chat/models.py:62 msgid "" "For a permission that concerns a team, indicates what is the concerned team." msgstr "" "Pour une permission qui concerne une équipe, indique quelle est l'équipe " "concernée." -#: chat/models.py:60 +#: chat/models.py:66 msgid "private" msgstr "privé" -#: chat/models.py:62 +#: chat/models.py:68 msgid "" "If checked, only users who have been explicitly added to the channel will be " "able to access it." @@ -94,11 +94,11 @@ msgstr "" "Si sélectionné, seul⋅es les utilisateur⋅rices qui ont été explicitement " "ajouté⋅es au canal pourront y accéder." -#: chat/models.py:67 +#: chat/models.py:73 msgid "invited users" msgstr "Utilisateur⋅rices invité" -#: chat/models.py:70 +#: chat/models.py:76 msgid "" "Extra users who have been invited to the channel, in addition to the " "permitted group of the channel." @@ -106,43 +106,55 @@ msgstr "" "Utilisateur⋅rices supplémentaires qui ont été invité⋅es au canal, en plus du " "groupe autorisé du canal." -#: chat/models.py:75 +#: chat/models.py:81 #, python-brace-format msgid "Channel {name}" msgstr "Canal {name}" -#: chat/models.py:78 chat/models.py:87 +#: chat/models.py:150 chat/models.py:159 msgid "channel" msgstr "canal" -#: chat/models.py:79 +#: chat/models.py:151 msgid "channels" msgstr "canaux" -#: chat/models.py:93 +#: chat/models.py:165 msgid "author" msgstr "auteur⋅rice" -#: chat/models.py:100 +#: chat/models.py:172 msgid "created at" msgstr "créé le" -#: chat/models.py:105 +#: chat/models.py:177 msgid "updated at" msgstr "modifié le" -#: chat/models.py:110 +#: chat/models.py:182 msgid "content" msgstr "contenu" -#: chat/models.py:114 +#: chat/models.py:186 msgid "message" msgstr "message" -#: chat/models.py:115 +#: chat/models.py:187 msgid "messages" msgstr "messages" +#: chat/templates/chat/chat.html:8 +msgid "JavaScript must be enabled on your browser to access chat." +msgstr "" + +#: chat/templates/chat/chat.html:12 +msgid "Chat channels" +msgstr "Canaux de chat" + +#: chat/templates/chat/chat.html:43 +msgid "Send message…" +msgstr "Envoyer un message…" + #: draw/admin.py:39 draw/admin.py:57 draw/admin.py:75 #: participation/admin.py:109 participation/models.py:253 #: participation/tables.py:88 @@ -158,68 +170,68 @@ msgstr "tour" msgid "Draw" msgstr "Tirage au sort" -#: draw/consumers.py:30 +#: draw/consumers.py:31 msgid "You are not an organizer." msgstr "Vous n'êtes pas un⋅e organisateur⋅rice." -#: draw/consumers.py:162 +#: draw/consumers.py:165 msgid "The draw is already started." msgstr "Le tirage a déjà commencé." -#: draw/consumers.py:168 +#: draw/consumers.py:171 msgid "Invalid format" msgstr "Format invalide" -#: draw/consumers.py:173 +#: draw/consumers.py:176 #, python-brace-format msgid "The sum must be equal to the number of teams: expected {len}, got {sum}" msgstr "" "La somme doit être égale au nombre d'équipes : attendu {len}, obtenu {sum}" -#: draw/consumers.py:178 +#: draw/consumers.py:181 msgid "There can be at most one pool with 5 teams." msgstr "Il ne peut y avoir au plus qu'une seule poule de 5 équipes." -#: draw/consumers.py:218 +#: draw/consumers.py:221 msgid "Draw started!" msgstr "Le tirage a commencé !" -#: draw/consumers.py:240 +#: draw/consumers.py:243 #, python-brace-format msgid "The draw for the tournament {tournament} will start." msgstr "Le tirage au sort du tournoi {tournament} va commencer." -#: draw/consumers.py:251 draw/consumers.py:277 draw/consumers.py:687 -#: draw/consumers.py:904 draw/consumers.py:993 draw/consumers.py:1015 -#: draw/consumers.py:1106 draw/templates/draw/tournament_content.html:5 +#: draw/consumers.py:254 draw/consumers.py:280 draw/consumers.py:690 +#: draw/consumers.py:907 draw/consumers.py:996 draw/consumers.py:1018 +#: draw/consumers.py:1109 draw/templates/draw/tournament_content.html:5 msgid "The draw has not started yet." msgstr "Le tirage au sort n'a pas encore commencé." -#: draw/consumers.py:264 +#: draw/consumers.py:267 #, python-brace-format msgid "The draw for the tournament {tournament} is aborted." msgstr "Le tirage au sort du tournoi {tournament} est annulé." -#: draw/consumers.py:304 draw/consumers.py:325 draw/consumers.py:621 -#: draw/consumers.py:692 draw/consumers.py:909 +#: draw/consumers.py:307 draw/consumers.py:328 draw/consumers.py:624 +#: draw/consumers.py:695 draw/consumers.py:912 msgid "This is not the time for this." msgstr "Ce n'est pas le moment pour cela." -#: draw/consumers.py:317 draw/consumers.py:320 +#: draw/consumers.py:320 draw/consumers.py:323 msgid "You've already launched the dice." msgstr "Vous avez déjà lancé le dé." -#: draw/consumers.py:323 +#: draw/consumers.py:326 msgid "It is not your turn." msgstr "Ce n'est pas votre tour." -#: draw/consumers.py:410 +#: draw/consumers.py:413 #, python-brace-format msgid "Dices from teams {teams} are identical. Please relaunch your dices." msgstr "" "Les dés des équipes {teams} sont identiques. Merci de relancer vos dés." -#: draw/consumers.py:1018 +#: draw/consumers.py:1021 msgid "This is only available for the final tournament." msgstr "Cela n'est possible que pour la finale." diff --git a/tfjm/templates/base.html b/tfjm/templates/base.html index f272bd7..da1cff5 100644 --- a/tfjm/templates/base.html +++ b/tfjm/templates/base.html @@ -40,18 +40,18 @@ {% include "navbar.html" %} -
    +
    -
    -
    +
    +
    {% block content-title %}

    {{ title }}

    {% endblock %} {% include "messages.html" %} -
    +
    {% block content %}

    Default content...

    {% endblock content %} From 4a78e8039914b6888419d05924175189ccea8bb8 Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Sat, 27 Apr 2024 12:59:50 +0200 Subject: [PATCH 07/35] Send messages Signed-off-by: Emmy D'Anello --- chat/consumers.py | 40 +++++++++++++++++++-- chat/models.py | 65 ++++++++++++++++++++++++++++++++--- chat/static/chat.js | 36 +++++++++++++++++++ chat/templates/chat/chat.html | 35 +++++++------------ 4 files changed, 147 insertions(+), 29 deletions(-) diff --git a/chat/consumers.py b/chat/consumers.py index 75afd75..c356089 100644 --- a/chat/consumers.py +++ b/chat/consumers.py @@ -3,9 +3,10 @@ from channels.generic.websocket import AsyncJsonWebsocketConsumer from django.contrib.auth.models import User +from participation.models import Team, Pool, Tournament from registration.models import Registration -from .models import Channel +from .models import Channel, Message class ChatConsumer(AsyncJsonWebsocketConsumer): @@ -34,6 +35,10 @@ class ChatConsumer(AsyncJsonWebsocketConsumer): # Accept the connection await self.accept() + channels = await Channel.get_accessible_channels(user, 'read') + async for channel in channels.all(): + await self.channel_layer.group_add(f"chat-{channel.id}", self.channel_name) + async def disconnect(self, close_code) -> None: """ Called when the websocket got disconnected, for any reason. @@ -43,6 +48,10 @@ class ChatConsumer(AsyncJsonWebsocketConsumer): # User is not authenticated return + channels = await Channel.get_accessible_channels(self.scope['user'], 'read') + async for channel in channels.all(): + await self.channel_layer.group_discard(f"chat-{channel.id}", self.channel_name) + async def receive_json(self, content, **kwargs): """ Called when the client sends us some data, parsed as JSON. @@ -51,6 +60,8 @@ class ChatConsumer(AsyncJsonWebsocketConsumer): match content['type']: case 'fetch_channels': await self.fetch_channels() + case 'send_message': + await self.receive_message(content) case unknown: print("Unknown message type:", unknown) @@ -59,7 +70,6 @@ class ChatConsumer(AsyncJsonWebsocketConsumer): read_channels = await Channel.get_accessible_channels(user, 'read') write_channels = await Channel.get_accessible_channels(user, 'write') - print([channel async for channel in write_channels.all()]) message = { 'type': 'fetch_channels', 'channels': [ @@ -73,3 +83,29 @@ class ChatConsumer(AsyncJsonWebsocketConsumer): ] } await self.send_json(message) + + async def receive_message(self, message: dict) -> None: + user = self.scope['user'] + channel = await Channel.objects.prefetch_related('tournament__pools__juries', 'pool', 'team', 'invited') \ + .aget(id=message['channel_id']) + write_channels = await Channel.get_accessible_channels(user, 'write') + if not await write_channels.acontains(channel): + return + + message = await Message.objects.acreate( + author=user, + channel=channel, + content=message['content'], + ) + + await self.channel_layer.group_send(f'chat-{channel.id}', { + 'type': 'chat.send_message', + 'id': message.id, + 'timestamp': message.created_at.isoformat(), + 'author': await message.aget_author_name(), + 'content': message.content, + }) + + async def chat_send_message(self, message) -> None: + await self.send_json({'type': 'send_message', 'id': message['id'], 'timestamp': message['timestamp'], + 'author': message['author'], 'content': message['content']}) diff --git a/chat/models.py b/chat/models.py index 0e4b078..913d8b8 100644 --- a/chat/models.py +++ b/chat/models.py @@ -1,12 +1,13 @@ # Copyright (C) 2024 by Animath # SPDX-License-Identifier: GPL-3.0-or-later +from asgiref.sync import sync_to_async from django.contrib.auth.models import User from django.db import models from django.db.models import Q, QuerySet from django.utils.text import format_lazy from django.utils.translation import gettext_lazy as _ -from participation.models import Tournament +from participation.models import Pool, Team, Tournament from registration.models import ParticipantRegistration, Registration, VolunteerRegistration from tfjm.permissions import PermissionType @@ -141,9 +142,6 @@ class Channel(models.Model): qs |= Channel.objects.filter(invited=user) - print(user) - print(qs.query) - return qs class Meta: @@ -182,6 +180,65 @@ class Message(models.Model): verbose_name=_("content"), ) + def get_author_name(self): + registration = self.author.registration + + author_name = f"{self.author.first_name} {self.author.last_name}" + if registration.is_volunteer: + if registration.is_admin: + author_name += " (CNO)" + + if self.channel.pool: + if registration == self.channel.pool.jury_president: + author_name += " (P. jury)" + elif registration in self.channel.pool.juries.all(): + author_name += " (Juré⋅e)" + elif registration in self.channel.pool.tournament.organizers.all(): + author_name += " (CRO)" + else: + author_name += " (Bénévole)" + elif self.channel.tournament: + if registration in self.channel.tournament.organizers.all(): + author_name += " (CRO)" + elif any([registration.id == pool.jury_president + for pool in self.channel.tournament.pools.all()]): + pools = ", ".join([pool.short_name + for pool in self.channel.tournament.pools.all() + if pool.jury_president == registration]) + author_name += f" (P. jury {pools})" + elif any([pool.juries.contains(registration) + for pool in self.channel.tournament.pools.all()]): + pools = ", ".join([pool.short_name + for pool in self.channel.tournament.pools.all() + if pool.juries.acontains(registration)]) + author_name += f" (Juré⋅e {pools})" + else: + author_name += " (Bénévole)" + else: + if registration.organized_tournaments.exists(): + tournaments = ", ".join([tournament.name + for tournament in registration.organized_tournaments.all()]) + author_name += f" (CRO {tournaments})" + if Pool.objects.filter(jury_president=registration).exists(): + tournaments = Tournament.objects.filter(pools__jury_president=registration).distinct() + tournaments = ", ".join([tournament.name for tournament in tournaments]) + author_name += f" (P. jury {tournaments})" + elif registration.jury_in.exists(): + tournaments = Tournament.objects.filter(pools__juries=registration).distinct() + tournaments = ", ".join([tournament.name for tournament in tournaments]) + author_name += f" (Juré⋅e {tournaments})" + else: + if registration.team_id: + team = Team.objects.get(id=registration.team_id) + author_name += f" ({team.trigram})" + else: + author_name += " (sans équipe)" + + return author_name + + async def aget_author_name(self): + return await sync_to_async(self.get_author_name)() + class Meta: verbose_name = _("message") verbose_name_plural = _("messages") diff --git a/chat/static/chat.js b/chat/static/chat.js index 8e51aec..2265508 100644 --- a/chat/static/chat.js +++ b/chat/static/chat.js @@ -37,6 +37,22 @@ function selectChannel(channel_id) { messageInput.disabled = !channel['write_access'] } +function sendMessage() { + let messageInput = document.getElementById('input-message') + let message = messageInput.value + messageInput.value = '' + + if (!message) { + return + } + + socket.send(JSON.stringify({ + 'type': 'send_message', + 'channel_id': selected_channel_id, + 'content': message, + })) +} + function setChannels(new_channels) { channels = {} for (let channel of new_channels) { @@ -48,6 +64,23 @@ function setChannels(new_channels) { } } +function receiveMessage(message) { + let messageList = document.getElementById('message-list') + + let messageElement = document.createElement('li') + messageElement.classList.add('list-group-item') + messageList.appendChild(messageElement) + + let authorDiv = document.createElement('div') + authorDiv.classList.add('text-muted', 'fw-bold') + authorDiv.innerText = message['author'] + messageElement.appendChild(authorDiv) + + let contentDiv = document.createElement('div') + contentDiv.innerText = message['content'] + messageElement.appendChild(contentDiv) +} + document.addEventListener('DOMContentLoaded', () => { /** * Process the received data from the server. @@ -59,6 +92,9 @@ document.addEventListener('DOMContentLoaded', () => { case 'fetch_channels': setChannels(data['channels']) break + case 'send_message': + receiveMessage(data) + break default: console.log(data) console.error('Unknown message type:', data['type']) diff --git a/chat/templates/chat/chat.html b/chat/templates/chat/chat.html index 860147b..b3d293a 100644 --- a/chat/templates/chat/chat.html +++ b/chat/templates/chat/chat.html @@ -35,31 +35,20 @@
    -
      -
    • -
      Emmy D'Anello (CNO)
      - Message 1 -
      • -
    • -
      Emmy D'Anello (CNO)
      - Message 2 -
      • -
    • -
      Emmy D'Anello (CNO)
      - Message 3 -
      • -
    +
      -
      - - - -
      +
      +
      + + + +
      +
      {% endblock %} From d59bb75dcec9bbe493342477080fe2b87209b5ca Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Sat, 27 Apr 2024 13:27:27 +0200 Subject: [PATCH 08/35] Fetching last messages is working Signed-off-by: Emmy D'Anello --- chat/consumers.py | 29 +++++++++++++-- chat/static/chat.js | 87 ++++++++++++++++++++++++++++++++++++++------- 2 files changed, 101 insertions(+), 15 deletions(-) diff --git a/chat/consumers.py b/chat/consumers.py index c356089..c4e7bb6 100644 --- a/chat/consumers.py +++ b/chat/consumers.py @@ -62,6 +62,8 @@ class ChatConsumer(AsyncJsonWebsocketConsumer): await self.fetch_channels() case 'send_message': await self.receive_message(content) + case 'fetch_messages': + await self.fetch_messages(content['channel_id']) case unknown: print("Unknown message type:", unknown) @@ -101,11 +103,34 @@ class ChatConsumer(AsyncJsonWebsocketConsumer): await self.channel_layer.group_send(f'chat-{channel.id}', { 'type': 'chat.send_message', 'id': message.id, + 'channel_id': channel.id, 'timestamp': message.created_at.isoformat(), 'author': await message.aget_author_name(), 'content': message.content, }) + async def fetch_messages(self, channel_id: int, offset: int = 0, limit: int = 50) -> None: + channel = await Channel.objects.aget(id=channel_id) + read_channels = await Channel.get_accessible_channels(self.scope['user'], 'read') + if not await read_channels.acontains(channel): + return + + messages = Message.objects.filter(channel=channel).order_by('created_at')[offset:offset + limit].all() + await self.send_json({ + 'type': 'fetch_messages', + 'channel_id': channel_id, + 'messages': [ + { + 'id': message.id, + 'timestamp': message.created_at.isoformat(), + 'author': await message.aget_author_name(), + 'content': message.content, + } + async for message in messages + ] + }) + async def chat_send_message(self, message) -> None: - await self.send_json({'type': 'send_message', 'id': message['id'], 'timestamp': message['timestamp'], - 'author': message['author'], 'content': message['content']}) + await self.send_json({'type': 'send_message', 'id': message['id'], 'channel_id': message['channel_id'], + 'timestamp': message['timestamp'], 'author': message['author'], + 'content': message['content']}) diff --git a/chat/static/chat.js b/chat/static/chat.js index 2265508..8557008 100644 --- a/chat/static/chat.js +++ b/chat/static/chat.js @@ -5,6 +5,7 @@ })() let channels = {} +let messages = {} let selected_channel_id = null /** @@ -35,6 +36,8 @@ function selectChannel(channel_id) { let messageInput = document.getElementById('input-message') messageInput.disabled = !channel['write_access'] + + redrawMessages() } function sendMessage() { @@ -57,28 +60,84 @@ function setChannels(new_channels) { channels = {} for (let channel of new_channels) { channels[channel['id']] = channel + if (!messages[channel['id']]) + messages[channel['id']] = [] + + socket.send(JSON.stringify({ + 'type': 'fetch_messages', + 'channel_id': channel['id'], + })) } - if (new_channels && (!selected_channel_id || !channels[selected_channel_id])) { + if (new_channels && (!selected_channel_id || !channels[selected_channel_id])) selectChannel(Object.keys(channels)[0]) - } } function receiveMessage(message) { + messages[message['channel_id']].push(message) + redrawMessages() +} + +function fetchMessages(data) { + let channel_id = data['channel_id'] + let new_messages = data['messages'] + + if (!messages[channel_id]) + messages[channel_id] = [] + + for (let message of new_messages) { + messages[channel_id].push(message) + } + + redrawMessages() +} + +function redrawMessages() { let messageList = document.getElementById('message-list') + messageList.innerHTML = '' - let messageElement = document.createElement('li') - messageElement.classList.add('list-group-item') - messageList.appendChild(messageElement) + let lastMessage = null + let lastContentDiv = null - let authorDiv = document.createElement('div') - authorDiv.classList.add('text-muted', 'fw-bold') - authorDiv.innerText = message['author'] - messageElement.appendChild(authorDiv) + for (let message of messages[selected_channel_id]) { + if (lastMessage && lastMessage['author'] === message['author']) { + let lastTimestamp = new Date(lastMessage['timestamp']) + let newTimestamp = new Date(message['timestamp']) + if ((newTimestamp - lastTimestamp) / 1000 < 60 * 10) { + let messageContentDiv = document.createElement('div') + messageContentDiv.innerText = message['content'] + lastContentDiv.appendChild(messageContentDiv) + continue + } + } - let contentDiv = document.createElement('div') - contentDiv.innerText = message['content'] - messageElement.appendChild(contentDiv) + let messageElement = document.createElement('li') + messageElement.classList.add('list-group-item') + messageList.appendChild(messageElement) + + let authorDiv = document.createElement('div') + messageElement.appendChild(authorDiv) + + let authorSpan = document.createElement('span') + authorSpan.classList.add('text-muted', 'fw-bold') + authorSpan.innerText = message['author'] + authorDiv.appendChild(authorSpan) + + let dateSpan = document.createElement('span') + dateSpan.classList.add('text-muted', 'float-end') + dateSpan.innerText = new Date(message['timestamp']).toLocaleString() + authorDiv.appendChild(dateSpan) + + let contentDiv = document.createElement('div') + messageElement.appendChild(contentDiv) + + let messageContentDiv = document.createElement('div') + messageContentDiv.innerText = message['content'] + contentDiv.appendChild(messageContentDiv) + + lastMessage = message + lastContentDiv = contentDiv + } } document.addEventListener('DOMContentLoaded', () => { @@ -87,7 +146,6 @@ document.addEventListener('DOMContentLoaded', () => { * @param data The received message */ function processMessage(data) { - // TODO Implement chat protocol switch (data['type']) { case 'fetch_channels': setChannels(data['channels']) @@ -95,6 +153,9 @@ document.addEventListener('DOMContentLoaded', () => { case 'send_message': receiveMessage(data) break + case 'fetch_messages': + fetchMessages(data) + break default: console.log(data) console.error('Unknown message type:', data['type']) From d617dd77c1efed93b713092f3d5cd7527234ccaf Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Sat, 27 Apr 2024 14:12:08 +0200 Subject: [PATCH 09/35] Properly sort messages and add fetch previous messages ability Signed-off-by: Emmy D'Anello --- chat/consumers.py | 12 +++++--- chat/static/chat.js | 48 +++++++++++++++++++++-------- chat/templates/chat/chat.html | 6 ++++ locale/fr/LC_MESSAGES/django.po | 54 ++++++++++++++++++--------------- 4 files changed, 78 insertions(+), 42 deletions(-) diff --git a/chat/consumers.py b/chat/consumers.py index c4e7bb6..1f7441c 100644 --- a/chat/consumers.py +++ b/chat/consumers.py @@ -63,7 +63,7 @@ class ChatConsumer(AsyncJsonWebsocketConsumer): case 'send_message': await self.receive_message(content) case 'fetch_messages': - await self.fetch_messages(content['channel_id']) + await self.fetch_messages(**content) case unknown: print("Unknown message type:", unknown) @@ -109,17 +109,19 @@ class ChatConsumer(AsyncJsonWebsocketConsumer): 'content': message.content, }) - async def fetch_messages(self, channel_id: int, offset: int = 0, limit: int = 50) -> None: + async def fetch_messages(self, channel_id: int, offset: int = 0, limit: int = 50, **_kwargs) -> None: channel = await Channel.objects.aget(id=channel_id) read_channels = await Channel.get_accessible_channels(self.scope['user'], 'read') if not await read_channels.acontains(channel): return - messages = Message.objects.filter(channel=channel).order_by('created_at')[offset:offset + limit].all() + limit = min(limit, 200) # Fetch only maximum 200 messages at the time + + messages = Message.objects.filter(channel=channel).order_by('-created_at')[offset:offset + limit].all() await self.send_json({ 'type': 'fetch_messages', 'channel_id': channel_id, - 'messages': [ + 'messages': list(reversed([ { 'id': message.id, 'timestamp': message.created_at.isoformat(), @@ -127,7 +129,7 @@ class ChatConsumer(AsyncJsonWebsocketConsumer): 'content': message.content, } async for message in messages - ] + ])) }) async def chat_send_message(self, message) -> None: diff --git a/chat/static/chat.js b/chat/static/chat.js index 8557008..68d0c04 100644 --- a/chat/static/chat.js +++ b/chat/static/chat.js @@ -4,6 +4,8 @@ await Notification.requestPermission() })() +const MAX_MESSAGES = 50 + let channels = {} let messages = {} let selected_channel_id = null @@ -61,12 +63,9 @@ function setChannels(new_channels) { for (let channel of new_channels) { channels[channel['id']] = channel if (!messages[channel['id']]) - messages[channel['id']] = [] + messages[channel['id']] = new Map() - socket.send(JSON.stringify({ - 'type': 'fetch_messages', - 'channel_id': channel['id'], - })) + fetchMessages(channel['id']) } if (new_channels && (!selected_channel_id || !channels[selected_channel_id])) @@ -78,16 +77,35 @@ function receiveMessage(message) { redrawMessages() } -function fetchMessages(data) { +function fetchMessages(channel_id, offset = 0, limit = MAX_MESSAGES) { + socket.send(JSON.stringify({ + 'type': 'fetch_messages', + 'channel_id': channel_id, + 'offset': offset, + 'limit': limit, + })) +} + +function fetchPreviousMessages() { + let channel_id = selected_channel_id + let offset = messages[channel_id].size + fetchMessages(channel_id, offset, MAX_MESSAGES) +} + +function receiveFetchedMessages(data) { let channel_id = data['channel_id'] let new_messages = data['messages'] if (!messages[channel_id]) - messages[channel_id] = [] + messages[channel_id] = new Map() - for (let message of new_messages) { - messages[channel_id].push(message) - } + for (let message of new_messages) + messages[channel_id].set(message['id'], message) + + // Sort messages by timestamp + messages[channel_id] = new Map([...messages[channel_id].values()] + .sort((a, b) => new Date(a['timestamp']) - new Date(b['timestamp'])) + .map(message => [message['id'], message])) redrawMessages() } @@ -99,7 +117,7 @@ function redrawMessages() { let lastMessage = null let lastContentDiv = null - for (let message of messages[selected_channel_id]) { + for (let message of messages[selected_channel_id].values()) { if (lastMessage && lastMessage['author'] === message['author']) { let lastTimestamp = new Date(lastMessage['timestamp']) let newTimestamp = new Date(message['timestamp']) @@ -138,6 +156,12 @@ function redrawMessages() { lastMessage = message lastContentDiv = contentDiv } + + let fetchMoreButton = document.getElementById('fetch-previous-messages') + if (!messages[selected_channel_id] || messages[selected_channel_id].size % MAX_MESSAGES !== 0) + fetchMoreButton.classList.add('d-none') + else + fetchMoreButton.classList.remove('d-none') } document.addEventListener('DOMContentLoaded', () => { @@ -154,7 +178,7 @@ document.addEventListener('DOMContentLoaded', () => { receiveMessage(data) break case 'fetch_messages': - fetchMessages(data) + receiveFetchedMessages(data) break default: console.log(data) diff --git a/chat/templates/chat/chat.html b/chat/templates/chat/chat.html index b3d293a..4318f36 100644 --- a/chat/templates/chat/chat.html +++ b/chat/templates/chat/chat.html @@ -35,6 +35,12 @@
      +
      + + {% trans "Fetch previous messages…" %} + +
      +
        diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index c70abdc..a854685 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: TFJM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-27 11:02+0200\n" +"POT-Creation-Date: 2024-04-27 14:10+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Emmy D'Anello \n" "Language-Team: LANGUAGE \n" @@ -21,20 +21,20 @@ msgstr "" msgid "API" msgstr "API" -#: chat/models.py:17 participation/models.py:35 participation/models.py:263 +#: chat/models.py:18 participation/models.py:35 participation/models.py:263 #: participation/tables.py:18 participation/tables.py:34 msgid "name" msgstr "nom" -#: chat/models.py:22 +#: chat/models.py:23 msgid "read permission" msgstr "permission de lecture" -#: chat/models.py:28 +#: chat/models.py:29 msgid "write permission" msgstr "permission d'écriture" -#: chat/models.py:38 draw/admin.py:53 draw/admin.py:71 draw/admin.py:88 +#: chat/models.py:39 draw/admin.py:53 draw/admin.py:71 draw/admin.py:88 #: draw/models.py:26 participation/admin.py:79 participation/admin.py:140 #: participation/admin.py:171 participation/models.py:693 #: participation/models.py:717 participation/models.py:935 @@ -43,7 +43,7 @@ msgstr "permission d'écriture" msgid "tournament" msgstr "tournoi" -#: chat/models.py:40 +#: chat/models.py:41 msgid "" "For a permission that concerns a tournament, indicates what is the concerned " "tournament." @@ -51,21 +51,21 @@ msgstr "" "Pour une permission qui concerne un tournoi, indique quel est le tournoi " "concerné." -#: chat/models.py:49 draw/models.py:429 draw/models.py:456 +#: chat/models.py:50 draw/models.py:429 draw/models.py:456 #: participation/admin.py:136 participation/admin.py:155 #: participation/models.py:1434 participation/models.py:1443 #: participation/tables.py:84 msgid "pool" msgstr "poule" -#: chat/models.py:51 +#: chat/models.py:52 msgid "" "For a permission that concerns a pool, indicates what is the concerned pool." msgstr "" "Pour une permission qui concerne une poule, indique quelle est la poule " "concernée." -#: chat/models.py:60 draw/templates/draw/tournament_content.html:277 +#: chat/models.py:61 draw/templates/draw/tournament_content.html:277 #: participation/admin.py:167 participation/models.py:252 #: participation/models.py:708 #: participation/templates/participation/tournament_harmonize.html:15 @@ -75,18 +75,18 @@ msgstr "" msgid "team" msgstr "équipe" -#: chat/models.py:62 +#: chat/models.py:63 msgid "" "For a permission that concerns a team, indicates what is the concerned team." msgstr "" "Pour une permission qui concerne une équipe, indique quelle est l'équipe " "concernée." -#: chat/models.py:66 +#: chat/models.py:67 msgid "private" msgstr "privé" -#: chat/models.py:68 +#: chat/models.py:69 msgid "" "If checked, only users who have been explicitly added to the channel will be " "able to access it." @@ -94,11 +94,11 @@ msgstr "" "Si sélectionné, seul⋅es les utilisateur⋅rices qui ont été explicitement " "ajouté⋅es au canal pourront y accéder." -#: chat/models.py:73 +#: chat/models.py:74 msgid "invited users" msgstr "Utilisateur⋅rices invité" -#: chat/models.py:76 +#: chat/models.py:77 msgid "" "Extra users who have been invited to the channel, in addition to the " "permitted group of the channel." @@ -106,52 +106,56 @@ msgstr "" "Utilisateur⋅rices supplémentaires qui ont été invité⋅es au canal, en plus du " "groupe autorisé du canal." -#: chat/models.py:81 +#: chat/models.py:82 #, python-brace-format msgid "Channel {name}" msgstr "Canal {name}" -#: chat/models.py:150 chat/models.py:159 +#: chat/models.py:148 chat/models.py:157 msgid "channel" msgstr "canal" -#: chat/models.py:151 +#: chat/models.py:149 msgid "channels" msgstr "canaux" -#: chat/models.py:165 +#: chat/models.py:163 msgid "author" msgstr "auteur⋅rice" -#: chat/models.py:172 +#: chat/models.py:170 msgid "created at" msgstr "créé le" -#: chat/models.py:177 +#: chat/models.py:175 msgid "updated at" msgstr "modifié le" -#: chat/models.py:182 +#: chat/models.py:180 msgid "content" msgstr "contenu" -#: chat/models.py:186 +#: chat/models.py:243 msgid "message" msgstr "message" -#: chat/models.py:187 +#: chat/models.py:244 msgid "messages" msgstr "messages" #: chat/templates/chat/chat.html:8 msgid "JavaScript must be enabled on your browser to access chat." -msgstr "" +msgstr "JavaScript doit être activé sur votre navigateur pour accéder au chat." #: chat/templates/chat/chat.html:12 msgid "Chat channels" msgstr "Canaux de chat" -#: chat/templates/chat/chat.html:43 +#: chat/templates/chat/chat.html:40 +msgid "Fetch previous messages…" +msgstr "Récupérer les messages précédents…" + +#: chat/templates/chat/chat.html:52 msgid "Send message…" msgstr "Envoyer un message…" From ca91842c2d401afc4383c2823acf473e155cb0e2 Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Sat, 27 Apr 2024 14:50:25 +0200 Subject: [PATCH 10/35] Fill channel selector using JavaScript Signed-off-by: Emmy D'Anello --- chat/static/chat.js | 18 +++++++++++++++++- chat/templates/chat/chat.html | 9 +-------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/chat/static/chat.js b/chat/static/chat.js index 68d0c04..9172c97 100644 --- a/chat/static/chat.js +++ b/chat/static/chat.js @@ -60,11 +60,27 @@ function sendMessage() { function setChannels(new_channels) { channels = {} + let navTab = document.getElementById('nav-channels-tab') + navTab.innerHTML = '' + for (let channel of new_channels) { channels[channel['id']] = channel if (!messages[channel['id']]) messages[channel['id']] = new Map() + let navItem = document.createElement('li') + navItem.classList.add('list-group-item') + navItem.id = `tab-channel-${channel['id']}` + navItem.setAttribute('data-bs-dismiss', 'offcanvas') + navItem.onclick = () => selectChannel(channel['id']) + navTab.appendChild(navItem) + + let channelButton = document.createElement('button') + channelButton.classList.add('nav-link') + channelButton.type = 'button' + channelButton.innerText = channel['name'] + navItem.appendChild(channelButton) + fetchMessages(channel['id']) } @@ -73,7 +89,7 @@ function setChannels(new_channels) { } function receiveMessage(message) { - messages[message['channel_id']].push(message) + messages[message['channel_id']].set(message['id'], message) redrawMessages() } diff --git a/chat/templates/chat/chat.html b/chat/templates/chat/chat.html index 4318f36..81e5c21 100644 --- a/chat/templates/chat/chat.html +++ b/chat/templates/chat/chat.html @@ -13,14 +13,7 @@
        - +
        From 2d706b2b81dc64957f32518a8986a0428505eec0 Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Sat, 27 Apr 2024 16:16:57 +0200 Subject: [PATCH 11/35] Add fullscreen mode for chat Signed-off-by: Emmy D'Anello --- chat/static/chat.js | 24 ++++++++++++++++++++++-- chat/templates/chat/chat.html | 8 +++++++- chat/views.py | 10 ++-------- locale/fr/LC_MESSAGES/django.po | 22 +++++++++++++--------- 4 files changed, 44 insertions(+), 20 deletions(-) diff --git a/chat/static/chat.js b/chat/static/chat.js index 9172c97..af028d2 100644 --- a/chat/static/chat.js +++ b/chat/static/chat.js @@ -33,6 +33,8 @@ function selectChannel(channel_id) { selected_channel_id = channel_id + window.history.replaceState({}, null, `#channel-${channel['id']}`) + let channelTitle = document.getElementById('channel-title') channelTitle.innerText = channel['name'] @@ -84,8 +86,12 @@ function setChannels(new_channels) { fetchMessages(channel['id']) } - if (new_channels && (!selected_channel_id || !channels[selected_channel_id])) - selectChannel(Object.keys(channels)[0]) + if (new_channels && (!selected_channel_id || !channels[selected_channel_id])) { + if (window.location.hash) + selectChannel(window.location.hash.substring(9)) + else + selectChannel(Object.keys(channels)[0]) + } } function receiveMessage(message) { @@ -180,6 +186,20 @@ function redrawMessages() { fetchMoreButton.classList.remove('d-none') } +function toggleFullscreen() { + let chatContainer = document.getElementById('chat-container') + if (!chatContainer.getAttribute('data-fullscreen')) { + chatContainer.setAttribute('data-fullscreen', 'true') + chatContainer.classList.add('position-absolute', 'top-0', 'start-0', 'vh-100', 'z-3') + window.history.replaceState({}, null, `?fullscreen=1#channel-${selected_channel_id}`) + } + else { + chatContainer.removeAttribute('data-fullscreen') + chatContainer.classList.remove('position-absolute', 'top-0', 'start-0', 'vh-100', 'z-3') + window.history.replaceState({}, null, `?fullscreen=0#channel-${selected_channel_id}`) + } +} + document.addEventListener('DOMContentLoaded', () => { /** * Process the received data from the server. diff --git a/chat/templates/chat/chat.html b/chat/templates/chat/chat.html index 81e5c21..a57bb63 100644 --- a/chat/templates/chat/chat.html +++ b/chat/templates/chat/chat.html @@ -3,6 +3,8 @@ {% load static %} {% load i18n %} +{% block content-title %}{% endblock %} + {% block content %}
        -
        +

        +

        diff --git a/chat/views.py b/chat/views.py index 30c40e9..8706d3b 100644 --- a/chat/views.py +++ b/chat/views.py @@ -2,10 +2,9 @@ # SPDX-License-Identifier: GPL-3.0-or-later from django.contrib.auth.mixins import LoginRequiredMixin +from django.utils.translation import gettext_lazy as _ from django.views.generic import TemplateView -from chat.models import Channel - class ChatView(LoginRequiredMixin, TemplateView): """ @@ -13,9 +12,4 @@ class ChatView(LoginRequiredMixin, TemplateView): with Javascript and websockets. """ template_name = "chat/chat.html" - - def get_context_data(self, **kwargs): - context = super().get_context_data(**kwargs) - from asgiref.sync import async_to_sync - context['channels'] = async_to_sync(Channel.get_accessible_channels)(self.request.user, 'read') - return context + extra_context = {'title': _("Chat")} diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index a854685..8423487 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: TFJM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-27 14:10+0200\n" +"POT-Creation-Date: 2024-04-27 16:15+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Emmy D'Anello \n" "Language-Team: LANGUAGE \n" @@ -143,22 +143,30 @@ msgstr "message" msgid "messages" msgstr "messages" -#: chat/templates/chat/chat.html:8 +#: chat/templates/chat/chat.html:10 msgid "JavaScript must be enabled on your browser to access chat." msgstr "JavaScript doit être activé sur votre navigateur pour accéder au chat." -#: chat/templates/chat/chat.html:12 +#: chat/templates/chat/chat.html:14 msgid "Chat channels" msgstr "Canaux de chat" -#: chat/templates/chat/chat.html:40 +#: chat/templates/chat/chat.html:31 +msgid "Toggle fullscreen mode" +msgstr "Inverse le mode plein écran" + +#: chat/templates/chat/chat.html:39 msgid "Fetch previous messages…" msgstr "Récupérer les messages précédents…" -#: chat/templates/chat/chat.html:52 +#: chat/templates/chat/chat.html:51 msgid "Send message…" msgstr "Envoyer un message…" +#: chat/views.py:15 tfjm/templates/navbar.html:67 +msgid "Chat" +msgstr "Chat" + #: draw/admin.py:39 draw/admin.py:57 draw/admin.py:75 #: participation/admin.py:109 participation/models.py:253 #: participation/tables.py:88 @@ -3720,10 +3728,6 @@ msgstr "Mon équipe" msgid "My participation" msgstr "Ma participation" -#: tfjm/templates/navbar.html:67 -msgid "Chat" -msgstr "Chat" - #: tfjm/templates/navbar.html:72 msgid "Administration" msgstr "Administration" From a121d1042b5fef9034fb726af09d5ac0b3b8b19e Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Sat, 27 Apr 2024 19:11:03 +0200 Subject: [PATCH 12/35] Add feature to install chat on the home screen Signed-off-by: Emmy D'Anello --- chat/static/chat.js | 21 ++++++++++ chat/static/chat.webmanifest | 21 ++++++++++ chat/templates/chat/chat.html | 55 +++---------------------- chat/templates/chat/content.html | 61 ++++++++++++++++++++++++++++ chat/templates/chat/fullscreen.html | 34 ++++++++++++++++ chat/urls.py | 2 + locale/fr/LC_MESSAGES/django.po | 26 ++++++++---- tfjm/static/tfjm-192.png | Bin 0 -> 3942 bytes tfjm/static/tfjm-512.png | Bin 0 -> 10702 bytes tfjm/templates/navbar.html | 9 ++-- 10 files changed, 169 insertions(+), 60 deletions(-) create mode 100644 chat/static/chat.webmanifest create mode 100644 chat/templates/chat/content.html create mode 100644 chat/templates/chat/fullscreen.html create mode 100644 tfjm/static/tfjm-192.png create mode 100644 tfjm/static/tfjm-512.png diff --git a/chat/static/chat.js b/chat/static/chat.js index af028d2..9252ea0 100644 --- a/chat/static/chat.js +++ b/chat/static/chat.js @@ -251,4 +251,25 @@ document.addEventListener('DOMContentLoaded', () => { } setupSocket() + + let deferredPrompt = null + + window.addEventListener("beforeinstallprompt", (e) => { + e.preventDefault() + deferredPrompt = e + let btn = document.getElementById('install-app-home-screen') + let alert = document.getElementById('alert-download-chat-app') + btn.classList.remove('d-none') + alert.classList.remove('d-none') + btn.onclick = function () { + deferredPrompt.prompt() + deferredPrompt.userChoice.then((choiceResult) => { + if (choiceResult.outcome === 'accepted') { + deferredPrompt = null + btn.classList.add('d-none') + alert.classList.add('d-none') + } + }) + } + }) }) diff --git a/chat/static/chat.webmanifest b/chat/static/chat.webmanifest new file mode 100644 index 0000000..afddf74 --- /dev/null +++ b/chat/static/chat.webmanifest @@ -0,0 +1,21 @@ +{ + "background_color": "white", + "description": "Chat pour le TFJM²", + "display": "standalone", + "icons": [ + { + "src": "tfjm-512.png", + "sizes": "512x512", + "type": "image/png" + }, + { + "src": "tfjm-192.png", + "sizes": "192x192", + "type": "image/png" + } + ], + "name": "Chat TFJM²", + "short_name": "Chat TFJM²", + "start_url": "/chat/fullscreen/", + "theme_color": "black" +} diff --git a/chat/templates/chat/chat.html b/chat/templates/chat/chat.html index a57bb63..a7c5c45 100644 --- a/chat/templates/chat/chat.html +++ b/chat/templates/chat/chat.html @@ -3,59 +3,14 @@ {% load static %} {% load i18n %} +{% block extracss %} + +{% endblock %} + {% block content-title %}{% endblock %} {% block content %} - -
        -
        -

        {% trans "Chat channels" %}

        - -
        -
        - -
        -
        - -
        -
        -

        - - - -

        -
        -
        -
        - - {% trans "Fetch previous messages…" %} - -
        -
        -
          -
          -
          -
          -
          - - - -
          -
          -
          -
          + {% include "chat/content.html" %} {% endblock %} {% block extrajavascript %} diff --git a/chat/templates/chat/content.html b/chat/templates/chat/content.html new file mode 100644 index 0000000..4588ef2 --- /dev/null +++ b/chat/templates/chat/content.html @@ -0,0 +1,61 @@ +{% load i18n %} + + +
          +
          +

          {% trans "Chat channels" %}

          + +
          +
          + +
          +
          + +
          + {% trans "You can install a shortcut to the chat on your home screen using the download button on the header." %} +
          + +
          +
          +

          + + + {% if not fullscreen %} + + {% endif %} + +

          +
          +
          +
          + + {% trans "Fetch previous messages…" %} + +
          +
          +
            +
            +
            +
            +
            + + + +
            +
            +
            +
            \ No newline at end of file diff --git a/chat/templates/chat/fullscreen.html b/chat/templates/chat/fullscreen.html new file mode 100644 index 0000000..8d5053a --- /dev/null +++ b/chat/templates/chat/fullscreen.html @@ -0,0 +1,34 @@ +{% load i18n static %} + + +{% get_current_language as LANGUAGE_CODE %}{% get_current_language_bidi as LANGUAGE_BIDI %} + + + + + + Chat du TFJM² + + + + {# Favicon #} + + + + {# Bootstrap CSS #} + + + + + {# Bootstrap JavaScript #} + + + + + +{% include "chat/content.html" with fullscreen=True %} + + + + + diff --git a/chat/urls.py b/chat/urls.py index 77d52c2..c47f175 100644 --- a/chat/urls.py +++ b/chat/urls.py @@ -2,6 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later from django.urls import path +from django.views.generic import TemplateView from .views import ChatView @@ -10,4 +11,5 @@ app_name = 'chat' urlpatterns = [ path('', ChatView.as_view(), name='chat'), + path('fullscreen/', TemplateView.as_view(template_name="chat/fullscreen.html"), name='fullscreen'), ] diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 8423487..8e8d78e 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: TFJM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-27 16:15+0200\n" +"POT-Creation-Date: 2024-04-27 18:49+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Emmy D'Anello \n" "Language-Team: LANGUAGE \n" @@ -143,23 +143,35 @@ msgstr "message" msgid "messages" msgstr "messages" -#: chat/templates/chat/chat.html:10 +#: chat/templates/chat/chat.html:14 msgid "JavaScript must be enabled on your browser to access chat." msgstr "JavaScript doit être activé sur votre navigateur pour accéder au chat." -#: chat/templates/chat/chat.html:14 +#: chat/templates/chat/chat.html:18 msgid "Chat channels" msgstr "Canaux de chat" -#: chat/templates/chat/chat.html:31 +#: chat/templates/chat/chat.html:27 +msgid "" +"You can install a shortcut to the chat on your home screen using the " +"download button on the header." +msgstr "" +"Vous pouvez installer un raccourci vers le chat sur votre écran d'accueil en " +"utilisant le bouton de téléchargement dans l'en-tête." + +#: chat/templates/chat/chat.html:40 msgid "Toggle fullscreen mode" msgstr "Inverse le mode plein écran" -#: chat/templates/chat/chat.html:39 +#: chat/templates/chat/chat.html:44 +msgid "Install app on home screen" +msgstr "Installer l'application sur l'écran d'accueil" + +#: chat/templates/chat/chat.html:52 msgid "Fetch previous messages…" msgstr "Récupérer les messages précédents…" -#: chat/templates/chat/chat.html:51 +#: chat/templates/chat/chat.html:64 msgid "Send message…" msgstr "Envoyer un message…" @@ -3748,7 +3760,7 @@ msgstr "S'inscrire" msgid "My account" msgstr "Mon compte" -#: tfjm/templates/navbar.html:115 +#: tfjm/templates/navbar.html:117 msgid "Log out" msgstr "Déconnexion" diff --git a/tfjm/static/tfjm-192.png b/tfjm/static/tfjm-192.png new file mode 100644 index 0000000000000000000000000000000000000000..09e57f420582db8f8da155cdd1712c1af2400d12 GIT binary patch literal 3942 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 literal 0 HcmV?d00001 diff --git a/tfjm/static/tfjm-512.png b/tfjm/static/tfjm-512.png new file mode 100644 index 0000000000000000000000000000000000000000..5837e3b9481355f9ca7206f080116365f9cd62df GIT binary patch literal 10702 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 ZfyCksHTC_yr2lY0ENuTN{oDKD{{XYaC~yD( literal 0 HcmV?d00001 diff --git a/tfjm/templates/navbar.html b/tfjm/templates/navbar.html index ecdb4dc..1bc75f8 100644 --- a/tfjm/templates/navbar.html +++ b/tfjm/templates/navbar.html @@ -111,9 +111,12 @@
          • - - {% trans "Log out" %} - +
            + {% csrf_token %} + +
            • From 181bb86e49f63e7f5158d183f2fc81a8532d780d Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Sat, 27 Apr 2024 19:12:11 +0200 Subject: [PATCH 13/35] Simplify chat views Signed-off-by: Emmy D'Anello --- chat/urls.py | 5 ++--- chat/views.py | 15 --------------- 2 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 chat/views.py diff --git a/chat/urls.py b/chat/urls.py index c47f175..72465fc 100644 --- a/chat/urls.py +++ b/chat/urls.py @@ -2,14 +2,13 @@ # SPDX-License-Identifier: GPL-3.0-or-later from django.urls import path +from django.utils.translation import gettext_lazy as _ from django.views.generic import TemplateView -from .views import ChatView - app_name = 'chat' urlpatterns = [ - path('', ChatView.as_view(), name='chat'), + path('', TemplateView.as_view(template_name="chat/chat.html", extra_context={'title': _("Chat")}), name='chat'), path('fullscreen/', TemplateView.as_view(template_name="chat/fullscreen.html"), name='fullscreen'), ] diff --git a/chat/views.py b/chat/views.py deleted file mode 100644 index 8706d3b..0000000 --- a/chat/views.py +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (C) 2024 by Animath -# SPDX-License-Identifier: GPL-3.0-or-later - -from django.contrib.auth.mixins import LoginRequiredMixin -from django.utils.translation import gettext_lazy as _ -from django.views.generic import TemplateView - - -class ChatView(LoginRequiredMixin, TemplateView): - """ - This view is the main interface of the chat system, which is working - with Javascript and websockets. - """ - template_name = "chat/chat.html" - extra_context = {'title': _("Chat")} From d36e97fa2ea72b12a90d3cbf3e02c80baf65732f Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Sat, 27 Apr 2024 19:24:01 +0200 Subject: [PATCH 14/35] Chat is restricted to authenticated users Signed-off-by: Emmy D'Anello --- tfjm/templates/navbar.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tfjm/templates/navbar.html b/tfjm/templates/navbar.html index 1bc75f8..e012871 100644 --- a/tfjm/templates/navbar.html +++ b/tfjm/templates/navbar.html @@ -61,12 +61,12 @@ {% endif %} +
          • + + {% trans "Chat" %} + +
            • {% endif %} -
          • - - {% trans "Chat" %} - -
            • {% if user.registration.is_admin %}
          • {% trans "Administration" %} From b86dfe7351276ed2c06f575bef788dfa752eaaa5 Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Sat, 27 Apr 2024 20:23:55 +0200 Subject: [PATCH 15/35] Automatically scroll to bottom Signed-off-by: Emmy D'Anello --- chat/static/chat.js | 10 ++++++++++ chat/templates/chat/content.html | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/chat/static/chat.js b/chat/static/chat.js index 9252ea0..482d8b1 100644 --- a/chat/static/chat.js +++ b/chat/static/chat.js @@ -95,8 +95,18 @@ function setChannels(new_channels) { } function receiveMessage(message) { + let scrollableContent = document.getElementById('chat-messages') + let isScrolledToBottom = scrollableContent.scrollHeight - scrollableContent.clientHeight <= scrollableContent.scrollTop + 1 + messages[message['channel_id']].set(message['id'], message) redrawMessages() + + // Scroll to bottom if the user was already at the bottom + if (isScrolledToBottom) + scrollableContent.scrollTop = scrollableContent.scrollHeight - scrollableContent.clientHeight + + if (message['content'].includes("@everyone")) + showNotification(channels[message['channel_id']]['name'], `${message['author']} : ${message['content']}`) } function fetchMessages(channel_id, offset = 0, limit = MAX_MESSAGES) { diff --git a/chat/templates/chat/content.html b/chat/templates/chat/content.html index 4588ef2..bb7e62d 100644 --- a/chat/templates/chat/content.html +++ b/chat/templates/chat/content.html @@ -36,7 +36,7 @@
            • -
            +
            {% trans "Fetch previous messages…" %} From bfd1a76a2d8d8c05fc8253237b48242514e31c43 Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Sat, 27 Apr 2024 20:37:23 +0200 Subject: [PATCH 16/35] Notifications use the PNG logo Signed-off-by: Emmy D'Anello --- chat/static/chat.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/chat/static/chat.js b/chat/static/chat.js index 482d8b1..c00c369 100644 --- a/chat/static/chat.js +++ b/chat/static/chat.js @@ -18,10 +18,10 @@ let selected_channel_id = null * @return Notification */ function showNotification(title, body, timeout = 5000) { - let notif = new Notification(title, {'body': body, 'icon': "/static/tfjm.svg"}) - if (timeout) - setTimeout(() => notif.close(), timeout) - return notif + Notification.requestPermission().then((status) => { + if (status === 'granted') + new Notification(title, {'body': body, 'icon': "/static/tfjm-192.png"}) + }) } function selectChannel(channel_id) { From 7bb0f78f349981d59d3cd883e0040b247e843eea Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Sat, 27 Apr 2024 23:20:15 +0200 Subject: [PATCH 17/35] Improve mobile chat Signed-off-by: Emmy D'Anello --- chat/static/chat.webmanifest | 14 ++++- chat/templates/chat/content.html | 2 +- chat/urls.py | 8 +-- tfjm/static/tfjm-192.png | Bin 3942 -> 7319 bytes tfjm/static/tfjm-512.png | Bin 10702 -> 21025 bytes tfjm/static/tfjm-square.svg | 91 +++++++++++++++++++++++++++++++ tfjm/views.py | 5 ++ 7 files changed, 112 insertions(+), 8 deletions(-) create mode 100644 tfjm/static/tfjm-square.svg diff --git a/chat/static/chat.webmanifest b/chat/static/chat.webmanifest index afddf74..156d0a1 100644 --- a/chat/static/chat.webmanifest +++ b/chat/static/chat.webmanifest @@ -3,19 +3,27 @@ "description": "Chat pour le TFJM²", "display": "standalone", "icons": [ + { + "src": "tfjm-square.svg", + "sizes": "any", + "type": "image/svg+xml", + "purpose": "maskable" + }, { "src": "tfjm-512.png", "sizes": "512x512", - "type": "image/png" + "type": "image/png", + "purpose": "maskable" }, { "src": "tfjm-192.png", "sizes": "192x192", - "type": "image/png" + "type": "image/png", + "purpose": "maskable" } ], "name": "Chat TFJM²", "short_name": "Chat TFJM²", - "start_url": "/chat/fullscreen/", + "start_url": "/chat/fullscreen", "theme_color": "black" } diff --git a/chat/templates/chat/content.html b/chat/templates/chat/content.html index bb7e62d..34c0396 100644 --- a/chat/templates/chat/content.html +++ b/chat/templates/chat/content.html @@ -51,7 +51,7 @@ - + diff --git a/chat/urls.py b/chat/urls.py index 72465fc..09a7fbe 100644 --- a/chat/urls.py +++ b/chat/urls.py @@ -3,12 +3,12 @@ from django.urls import path from django.utils.translation import gettext_lazy as _ -from django.views.generic import TemplateView - +from tfjm.views import LoginRequiredTemplateView app_name = 'chat' urlpatterns = [ - path('', TemplateView.as_view(template_name="chat/chat.html", extra_context={'title': _("Chat")}), name='chat'), - path('fullscreen/', TemplateView.as_view(template_name="chat/fullscreen.html"), name='fullscreen'), + path('', LoginRequiredTemplateView.as_view(template_name="chat/chat.html", + extra_context={'title': _("Chat")}), name='chat'), + path('fullscreen/', LoginRequiredTemplateView.as_view(template_name="chat/fullscreen.html"), name='fullscreen'), ] diff --git a/tfjm/static/tfjm-192.png b/tfjm/static/tfjm-192.png index 09e57f420582db8f8da155cdd1712c1af2400d12..a212e448a89ad7da70f3c6c82924a94f8bcab33a 100644 GIT binary patch literal 7319 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 literal 3942 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 diff --git a/tfjm/static/tfjm-512.png b/tfjm/static/tfjm-512.png index 5837e3b9481355f9ca7206f080116365f9cd62df..5be044ac940451753c09db1df2eadb74e2b2b4ec 100644 GIT binary patch literal 21025 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 ZfyCksHTC_yr2lY0ENuTN{oDKD{{XYaC~yD( diff --git a/tfjm/static/tfjm-square.svg b/tfjm/static/tfjm-square.svg new file mode 100644 index 0000000..7e76588 --- /dev/null +++ b/tfjm/static/tfjm-square.svg @@ -0,0 +1,91 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/tfjm/views.py b/tfjm/views.py index 6ccea34..64ae580 100644 --- a/tfjm/views.py +++ b/tfjm/views.py @@ -3,6 +3,7 @@ from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib.auth.models import User +from django.views.generic import TemplateView from haystack.generic_views import SearchView @@ -40,5 +41,9 @@ class UserRegistrationMixin(LoginRequiredMixin): return super().dispatch(request, *args, **kwargs) +class LoginRequiredTemplateView(LoginRequiredMixin, TemplateView): + pass + + class AdminSearchView(AdminMixin, SearchView): pass From e77cc558de64408c02deac1d07dc0acb18f8c4e7 Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Sun, 28 Apr 2024 11:57:25 +0200 Subject: [PATCH 18/35] Add specific login and logout pages for chat Signed-off-by: Emmy D'Anello --- chat/static/chat.js | 2 +- chat/templates/chat/content.html | 12 ++++ chat/templates/chat/login.html | 36 ++++++++++ chat/urls.py | 6 +- locale/fr/LC_MESSAGES/django.po | 70 ++++++++++--------- tfjm/settings.py | 1 + .../registration/includes/login.html | 23 ++++++ tfjm/templates/registration/login.html | 24 +------ 8 files changed, 116 insertions(+), 58 deletions(-) create mode 100644 chat/templates/chat/login.html create mode 100644 tfjm/templates/registration/includes/login.html diff --git a/chat/static/chat.js b/chat/static/chat.js index c00c369..43dd347 100644 --- a/chat/static/chat.js +++ b/chat/static/chat.js @@ -190,7 +190,7 @@ function redrawMessages() { } let fetchMoreButton = document.getElementById('fetch-previous-messages') - if (!messages[selected_channel_id] || messages[selected_channel_id].size % MAX_MESSAGES !== 0) + if (!messages[selected_channel_id].size || messages[selected_channel_id].size % MAX_MESSAGES !== 0) fetchMoreButton.classList.add('d-none') else fetchMoreButton.classList.remove('d-none') diff --git a/chat/templates/chat/content.html b/chat/templates/chat/content.html index 34c0396..12bf52c 100644 --- a/chat/templates/chat/content.html +++ b/chat/templates/chat/content.html @@ -21,6 +21,11 @@ style="height: 95vh" id="chat-container">

            + {% if fullscreen %} + {# Logout button must be present in a form. The form must includes the whole line. #} +
            + {% csrf_token %} + {% endif %} + {% else %} + {% endif %} + {% if fullscreen %} +
            + {% endif %}

            diff --git a/chat/templates/chat/login.html b/chat/templates/chat/login.html new file mode 100644 index 0000000..ee3e45e --- /dev/null +++ b/chat/templates/chat/login.html @@ -0,0 +1,36 @@ +{% load i18n static %} + + +{% get_current_language as LANGUAGE_CODE %}{% get_current_language_bidi as LANGUAGE_BIDI %} + + + + + + Chat du TFJM² - {% trans "Log in" %} + + + + {# Favicon #} + + + + {# Bootstrap CSS #} + + + + + {# Bootstrap JavaScript #} + + + + + +
            +

            {% trans "Log in" %}

            + {% include "registration/includes/login.html" %} +
            + + + + diff --git a/chat/urls.py b/chat/urls.py index 09a7fbe..9adf06e 100644 --- a/chat/urls.py +++ b/chat/urls.py @@ -1,6 +1,7 @@ # Copyright (C) 2024 by Animath # SPDX-License-Identifier: GPL-3.0-or-later +from django.contrib.auth.views import LoginView, LogoutView from django.urls import path from django.utils.translation import gettext_lazy as _ from tfjm.views import LoginRequiredTemplateView @@ -10,5 +11,8 @@ app_name = 'chat' urlpatterns = [ path('', LoginRequiredTemplateView.as_view(template_name="chat/chat.html", extra_context={'title': _("Chat")}), name='chat'), - path('fullscreen/', LoginRequiredTemplateView.as_view(template_name="chat/fullscreen.html"), name='fullscreen'), + path('fullscreen/', LoginRequiredTemplateView.as_view(template_name="chat/fullscreen.html", login_url='chat:login'), + name='fullscreen'), + path('login/', LoginView.as_view(template_name="chat/login.html"), name='login'), + path('logout/', LogoutView.as_view(next_page='chat:fullscreen'), name='logout'), ] diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 8e8d78e..187ca3f 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: TFJM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-27 18:49+0200\n" +"POT-Creation-Date: 2024-04-28 11:56+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Emmy D'Anello \n" "Language-Team: LANGUAGE \n" @@ -143,15 +143,15 @@ msgstr "message" msgid "messages" msgstr "messages" -#: chat/templates/chat/chat.html:14 +#: chat/templates/chat/content.html:4 msgid "JavaScript must be enabled on your browser to access chat." msgstr "JavaScript doit être activé sur votre navigateur pour accéder au chat." -#: chat/templates/chat/chat.html:18 +#: chat/templates/chat/content.html:8 msgid "Chat channels" msgstr "Canaux de chat" -#: chat/templates/chat/chat.html:27 +#: chat/templates/chat/content.html:17 msgid "" "You can install a shortcut to the chat on your home screen using the " "download button on the header." @@ -159,23 +159,37 @@ msgstr "" "Vous pouvez installer un raccourci vers le chat sur votre écran d'accueil en " "utilisant le bouton de téléchargement dans l'en-tête." -#: chat/templates/chat/chat.html:40 +#: chat/templates/chat/content.html:35 msgid "Toggle fullscreen mode" msgstr "Inverse le mode plein écran" -#: chat/templates/chat/chat.html:44 +#: chat/templates/chat/content.html:39 tfjm/templates/navbar.html:117 +msgid "Log out" +msgstr "Déconnexion" + +#: chat/templates/chat/content.html:43 msgid "Install app on home screen" msgstr "Installer l'application sur l'écran d'accueil" -#: chat/templates/chat/chat.html:52 +#: chat/templates/chat/content.html:54 msgid "Fetch previous messages…" msgstr "Récupérer les messages précédents…" -#: chat/templates/chat/chat.html:64 +#: chat/templates/chat/content.html:66 msgid "Send message…" msgstr "Envoyer un message…" -#: chat/views.py:15 tfjm/templates/navbar.html:67 +#: chat/templates/chat/login.html:10 chat/templates/chat/login.html:30 +#: registration/templates/registration/password_reset_complete.html:10 +#: tfjm/templates/base.html:84 tfjm/templates/base.html:85 +#: tfjm/templates/navbar.html:98 +#: tfjm/templates/registration/includes/login.html:22 +#: tfjm/templates/registration/login.html:7 +#: tfjm/templates/registration/login.html:8 +msgid "Log in" +msgstr "Connexion" + +#: chat/urls.py:13 tfjm/templates/navbar.html:66 msgid "Chat" msgstr "Chat" @@ -3018,14 +3032,6 @@ msgstr "Changer mon mot de passe" msgid "Your password has been set. You may go ahead and log in now." msgstr "Votre mot de passe a été changé. Vous pouvez désormais vous connecter." -#: registration/templates/registration/password_reset_complete.html:10 -#: tfjm/templates/base.html:84 tfjm/templates/base.html:85 -#: tfjm/templates/navbar.html:98 tfjm/templates/registration/login.html:7 -#: tfjm/templates/registration/login.html:8 -#: tfjm/templates/registration/login.html:30 -msgid "Log in" -msgstr "Connexion" - #: registration/templates/registration/password_reset_confirm.html:9 msgid "" "Please enter your new password twice so we can verify you typed it in " @@ -3647,11 +3653,11 @@ msgstr "Privé, réservé aux utilisateur⋅rices explicitement autorisé⋅es" msgid "Admin users" msgstr "Administrateur⋅rices" -#: tfjm/settings.py:168 +#: tfjm/settings.py:169 msgid "English" msgstr "Anglais" -#: tfjm/settings.py:169 +#: tfjm/settings.py:170 msgid "French" msgstr "Français" @@ -3760,19 +3766,7 @@ msgstr "S'inscrire" msgid "My account" msgstr "Mon compte" -#: tfjm/templates/navbar.html:117 -msgid "Log out" -msgstr "Déconnexion" - -#: tfjm/templates/registration/logged_out.html:8 -msgid "Thanks for spending some quality time with the Web site today." -msgstr "Merci d'avoir utilisé la plateforme du TFJM²." - -#: tfjm/templates/registration/logged_out.html:9 -msgid "Log in again" -msgstr "Se reconnecter" - -#: tfjm/templates/registration/login.html:13 +#: tfjm/templates/registration/includes/login.html:5 #, python-format msgid "" "You are authenticated as %(user)s, but are not authorized to access this " @@ -3781,14 +3775,22 @@ msgstr "" "Vous êtes connecté⋅e en tant que %(user)s, mais n'êtes pas autorisé⋅e à " "accéder à cette page. Voulez-vous vous reconnecter avec un autre compte ?" -#: tfjm/templates/registration/login.html:25 +#: tfjm/templates/registration/includes/login.html:17 msgid "Your username is your e-mail address." msgstr "Votre identifiant est votre adresse e-mail." -#: tfjm/templates/registration/login.html:28 +#: tfjm/templates/registration/includes/login.html:20 msgid "Forgotten your password?" msgstr "Mot de passe oublié ?" +#: tfjm/templates/registration/logged_out.html:8 +msgid "Thanks for spending some quality time with the Web site today." +msgstr "Merci d'avoir utilisé la plateforme du TFJM²." + +#: tfjm/templates/registration/logged_out.html:9 +msgid "Log in again" +msgstr "Se reconnecter" + #: tfjm/templates/search/search.html:6 tfjm/templates/search/search.html:10 msgid "Search" msgstr "Chercher" diff --git a/tfjm/settings.py b/tfjm/settings.py index eb1c53f..4c6a0e0 100644 --- a/tfjm/settings.py +++ b/tfjm/settings.py @@ -102,6 +102,7 @@ MIDDLEWARE = [ ROOT_URLCONF = 'tfjm.urls' LOGIN_REDIRECT_URL = "index" +LOGOUT_REDIRECT_URL = "login" TEMPLATES = [ { diff --git a/tfjm/templates/registration/includes/login.html b/tfjm/templates/registration/includes/login.html new file mode 100644 index 0000000..1ae3348 --- /dev/null +++ b/tfjm/templates/registration/includes/login.html @@ -0,0 +1,23 @@ +{% load i18n crispy_forms_filters %} + +{% if user.is_authenticated %} +

            + {% blocktrans trimmed %} + You are authenticated as {{ user }}, but are not authorized to + access this page. Would you like to login to a different account? + {% endblocktrans %} +

            +{% endif %} +
            +
            + {{ form|as_crispy_errors }} + {% csrf_token %} + {{ form.username|as_crispy_field }} +
            + {% trans "Your username is your e-mail address." %} +
            + {{ form.password|as_crispy_field }} +             {% trans 'Forgotten your password?' %} +
            + +
            \ No newline at end of file diff --git a/tfjm/templates/registration/login.html b/tfjm/templates/registration/login.html index f033a0b..2695aa0 100644 --- a/tfjm/templates/registration/login.html +++ b/tfjm/templates/registration/login.html @@ -2,31 +2,11 @@ {% comment %} SPDX-License-Identifier: GPL-2.0-or-later {% endcomment %} -{% load i18n crispy_forms_filters %} +{% load i18n %} {% block title %}{% trans "Log in" %}{% endblock %} {% block content-title %}

            {% trans "Log in" %}

            {% endblock %} {% block content %} - {% if user.is_authenticated %} -

            - {% blocktrans trimmed %} - You are authenticated as {{ user }}, but are not authorized to - access this page. Would you like to login to a different account? - {% endblocktrans %} -

            - {% endif %} -
            -
            - {{ form|as_crispy_errors }} - {% csrf_token %} - {{ form.username|as_crispy_field }} -
            - {% trans "Your username is your e-mail address." %} -
            - {{ form.password|as_crispy_field }} - {% trans 'Forgotten your password?' %} -
            - -
            + {% include "registration/includes/login.html" %} {% endblock %} From 784002c085144ef58e7f632523272e8e29b98ba1 Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Sun, 28 Apr 2024 12:55:25 +0200 Subject: [PATCH 19/35] Open channels list by swiping Signed-off-by: Emmy D'Anello --- chat/static/chat.js | 70 +++++++++++++++++++++++--------- chat/templates/chat/content.html | 2 +- 2 files changed, 51 insertions(+), 21 deletions(-) diff --git a/chat/static/chat.js b/chat/static/chat.js index 43dd347..bc74972 100644 --- a/chat/static/chat.js +++ b/chat/static/chat.js @@ -260,26 +260,56 @@ document.addEventListener('DOMContentLoaded', () => { }) } - setupSocket() + function setupSwipeOffscreen() { + const offcanvas = new bootstrap.Offcanvas(document.getElementById('channelSelector')) - let deferredPrompt = null - - window.addEventListener("beforeinstallprompt", (e) => { - e.preventDefault() - deferredPrompt = e - let btn = document.getElementById('install-app-home-screen') - let alert = document.getElementById('alert-download-chat-app') - btn.classList.remove('d-none') - alert.classList.remove('d-none') - btn.onclick = function () { - deferredPrompt.prompt() - deferredPrompt.userChoice.then((choiceResult) => { - if (choiceResult.outcome === 'accepted') { - deferredPrompt = null - btn.classList.add('d-none') - alert.classList.add('d-none') + let lastX = null + document.addEventListener('touchstart', (event) => { + if (event.touches.length === 1) + lastX = event.touches[0].clientX + }) + document.addEventListener('touchmove', (event) => { + if (event.touches.length === 1 && lastX !== null) { + const diff = event.touches[0].clientX - lastX + if (diff > window.innerWidth / 10 && lastX < window.innerWidth / 4) { + offcanvas.show() + lastX = null } - }) - } - }) + else if (diff < -window.innerWidth / 10) { + offcanvas.hide() + lastX = null + } + } + }) + document.addEventListener('touchend', () => { + lastX = null + }) + } + + function setupPWAPrompt() { + let deferredPrompt = null + + window.addEventListener("beforeinstallprompt", (e) => { + e.preventDefault() + deferredPrompt = e + let btn = document.getElementById('install-app-home-screen') + let alert = document.getElementById('alert-download-chat-app') + btn.classList.remove('d-none') + alert.classList.remove('d-none') + btn.onclick = function () { + deferredPrompt.prompt() + deferredPrompt.userChoice.then((choiceResult) => { + if (choiceResult.outcome === 'accepted') { + deferredPrompt = null + btn.classList.add('d-none') + alert.classList.add('d-none') + } + }) + } + }) + } + + setupSocket() + setupSwipeOffscreen() + setupPWAPrompt() }) diff --git a/chat/templates/chat/content.html b/chat/templates/chat/content.html index 12bf52c..e712e14 100644 --- a/chat/templates/chat/content.html +++ b/chat/templates/chat/content.html @@ -49,13 +49,13 @@
            +
              {% trans "Fetch previous messages…" %}
              -
                From a5c210e9b66836c2a1c9e623c2b26ebbc7494162 Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Sun, 28 Apr 2024 13:50:04 +0200 Subject: [PATCH 20/35] Add script to create channels per tournament, pools and teams. Put channels in categories Signed-off-by: Emmy D'Anello --- chat/admin.py | 4 +- chat/consumers.py | 2 +- chat/management/__init__.py | 0 chat/management/commands/__init__.py | 0 .../commands/create_chat_channels.py | 144 ++++++++++++++++++ ..._alter_channel_options_channel_category.py | 36 +++++ chat/models.py | 17 ++- chat/static/chat.js | 14 +- chat/templates/chat/content.html | 23 ++- locale/fr/LC_MESSAGES/django.po | 68 ++++++--- 10 files changed, 273 insertions(+), 35 deletions(-) create mode 100644 chat/management/__init__.py create mode 100644 chat/management/commands/__init__.py create mode 100644 chat/management/commands/create_chat_channels.py create mode 100644 chat/migrations/0002_alter_channel_options_channel_category.py diff --git a/chat/admin.py b/chat/admin.py index 2c467d4..a94de30 100644 --- a/chat/admin.py +++ b/chat/admin.py @@ -8,8 +8,8 @@ from .models import Channel, Message @admin.register(Channel) class ChannelAdmin(admin.ModelAdmin): - list_display = ('name', 'read_access', 'write_access', 'tournament', 'pool', 'team', 'private',) - list_filter = ('read_access', 'write_access', 'tournament', 'private',) + list_display = ('name', 'category', 'read_access', 'write_access', 'tournament', 'private',) + list_filter = ('category', 'read_access', 'write_access', 'tournament', 'private',) search_fields = ('name', 'tournament__name', 'team__name', 'team__trigram',) autocomplete_fields = ('tournament', 'pool', 'team', 'invited', ) diff --git a/chat/consumers.py b/chat/consumers.py index 1f7441c..47b66ce 100644 --- a/chat/consumers.py +++ b/chat/consumers.py @@ -3,7 +3,6 @@ from channels.generic.websocket import AsyncJsonWebsocketConsumer from django.contrib.auth.models import User -from participation.models import Team, Pool, Tournament from registration.models import Registration from .models import Channel, Message @@ -78,6 +77,7 @@ class ChatConsumer(AsyncJsonWebsocketConsumer): { 'id': channel.id, 'name': channel.name, + 'category': channel.category, 'read_access': True, 'write_access': await write_channels.acontains(channel), } diff --git a/chat/management/__init__.py b/chat/management/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/chat/management/commands/__init__.py b/chat/management/commands/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/chat/management/commands/create_chat_channels.py b/chat/management/commands/create_chat_channels.py new file mode 100644 index 0000000..0baf61c --- /dev/null +++ b/chat/management/commands/create_chat_channels.py @@ -0,0 +1,144 @@ +# Copyright (C) 2024 by Animath +# SPDX-License-Identifier: GPL-3.0-or-later + +from django.core.management import BaseCommand +from django.utils.translation import activate + +from participation.models import Team, Tournament +from tfjm.permissions import PermissionType + +from ...models import Channel + + +class Command(BaseCommand): + def handle(self, *args, **kwargs): + activate('fr') + + Channel.objects.update_or_create( + name="Annonces", + defaults=dict( + category=Channel.ChannelCategory.GENERAL, + read_access=PermissionType.AUTHENTICATED, + write_access=PermissionType.ADMIN, + ), + ) + + Channel.objects.update_or_create( + name="Aide jurys et orgas", + defaults=dict( + category=Channel.ChannelCategory.GENERAL, + read_access=PermissionType.VOLUNTEER, + write_access=PermissionType.VOLUNTEER, + ), + ) + + Channel.objects.update_or_create( + name="Général", + defaults=dict( + category=Channel.ChannelCategory.GENERAL, + read_access=PermissionType.AUTHENTICATED, + write_access=PermissionType.AUTHENTICATED, + ), + ) + + Channel.objects.update_or_create( + name="Je cherche une équipe", + defaults=dict( + category=Channel.ChannelCategory.GENERAL, + read_access=PermissionType.AUTHENTICATED, + write_access=PermissionType.AUTHENTICATED, + ), + ) + + Channel.objects.update_or_create( + name="Détente", + defaults=dict( + category=Channel.ChannelCategory.GENERAL, + read_access=PermissionType.AUTHENTICATED, + write_access=PermissionType.AUTHENTICATED, + ), + ) + + for tournament in Tournament.objects.all(): + Channel.objects.update_or_create( + name=f"{tournament.name} - Annonces", + defaults=dict( + category=Channel.ChannelCategory.TOURNAMENT, + read_access=PermissionType.TOURNAMENT_MEMBER, + write_access=PermissionType.TOURNAMENT_ORGANIZER, + tournament=tournament, + ), + ) + + Channel.objects.update_or_create( + name=f"{tournament.name} - Général", + defaults=dict( + category=Channel.ChannelCategory.TOURNAMENT, + read_access=PermissionType.TOURNAMENT_MEMBER, + write_access=PermissionType.TOURNAMENT_MEMBER, + tournament=tournament, + ), + ) + + Channel.objects.update_or_create( + name=f"{tournament.name} - Détente", + defaults=dict( + category=Channel.ChannelCategory.TOURNAMENT, + read_access=PermissionType.TOURNAMENT_MEMBER, + write_access=PermissionType.TOURNAMENT_MEMBER, + tournament=tournament, + ), + ) + + Channel.objects.update_or_create( + name=f"{tournament.name} - Juré⋅es", + defaults=dict( + category=Channel.ChannelCategory.TOURNAMENT, + read_access=PermissionType.JURY_MEMBER, + write_access=PermissionType.JURY_MEMBER, + tournament=tournament, + ), + ) + + if tournament.remote: + Channel.objects.update_or_create( + name=f"{tournament.name} - Président⋅es de jury", + defaults=dict( + category=Channel.ChannelCategory.TOURNAMENT, + read_access=PermissionType.TOURNAMENT_JURY_PRESIDENT, + write_access=PermissionType.TOURNAMENT_JURY_PRESIDENT, + tournament=tournament, + ), + ) + + for pool in tournament.pools.all(): + Channel.objects.update_or_create( + name=f"{tournament.name} - Poule {pool.short_name}", + defaults=dict( + category=Channel.ChannelCategory.TOURNAMENT, + read_access=PermissionType.POOL_MEMBER, + write_access=PermissionType.POOL_MEMBER, + pool=pool, + ), + ) + + Channel.objects.update_or_create( + name=f"{tournament.name} - Poule {pool.short_name} - Jury", + defaults=dict( + category=Channel.ChannelCategory.TOURNAMENT, + read_access=PermissionType.JURY_MEMBER, + write_access=PermissionType.JURY_MEMBER, + pool=pool, + ), + ) + + for team in Team.objects.filter(participation__valid=True).all(): + Channel.objects.update_or_create( + name=f"Équipe {team.trigram}", + defaults=dict( + category=Channel.ChannelCategory.TEAM, + read_access=PermissionType.TEAM_MEMBER, + write_access=PermissionType.TEAM_MEMBER, + team=team, + ), + ) diff --git a/chat/migrations/0002_alter_channel_options_channel_category.py b/chat/migrations/0002_alter_channel_options_channel_category.py new file mode 100644 index 0000000..82898dd --- /dev/null +++ b/chat/migrations/0002_alter_channel_options_channel_category.py @@ -0,0 +1,36 @@ +# Generated by Django 5.0.3 on 2024-04-28 11:08 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("chat", "0001_initial"), + ] + + operations = [ + migrations.AlterModelOptions( + name="channel", + options={ + "ordering": ("category", "name"), + "verbose_name": "channel", + "verbose_name_plural": "channels", + }, + ), + migrations.AddField( + model_name="channel", + name="category", + field=models.CharField( + choices=[ + ("general", "General channels"), + ("tournament", "Tournament channels"), + ("team", "Team channels"), + ("private", "Private channels"), + ], + default="general", + max_length=255, + verbose_name="category", + ), + ), + ] diff --git a/chat/models.py b/chat/models.py index 913d8b8..9b91ec0 100644 --- a/chat/models.py +++ b/chat/models.py @@ -13,11 +13,24 @@ from tfjm.permissions import PermissionType class Channel(models.Model): + class ChannelCategory(models.TextChoices): + GENERAL = 'general', _("General channels") + TOURNAMENT = 'tournament', _("Tournament channels") + TEAM = 'team', _("Team channels") + PRIVATE = 'private', _("Private channels") + name = models.CharField( max_length=255, verbose_name=_("name"), ) + category = models.CharField( + max_length=255, + verbose_name=_("category"), + choices=ChannelCategory, + default=ChannelCategory.GENERAL, + ) + read_access = models.CharField( max_length=16, verbose_name=_("read permission"), @@ -90,7 +103,7 @@ class Channel(models.Model): return Channel.objects.filter(**{permission_type: PermissionType.ANONYMOUS}) qs |= Channel.objects.filter(**{permission_type: PermissionType.AUTHENTICATED}) - registration = await Registration.objects.aget(user_id=user.id) + registration = await Registration.objects.prefetch_related('user').aget(user_id=user.id) if registration.is_admin: return Channel.objects.all() @@ -147,7 +160,7 @@ class Channel(models.Model): class Meta: verbose_name = _("channel") verbose_name_plural = _("channels") - ordering = ('name',) + ordering = ('category', 'name',) class Message(models.Model): diff --git a/chat/static/chat.js b/chat/static/chat.js index bc74972..7a0ee09 100644 --- a/chat/static/chat.js +++ b/chat/static/chat.js @@ -6,6 +6,7 @@ const MAX_MESSAGES = 50 +const channel_categories = ['general', 'tournament', 'team', 'private'] let channels = {} let messages = {} let selected_channel_id = null @@ -62,20 +63,27 @@ function sendMessage() { function setChannels(new_channels) { channels = {} - let navTab = document.getElementById('nav-channels-tab') - navTab.innerHTML = '' + let categoryLists = {} + for (let category of channel_categories) { + categoryLists[category] = document.getElementById(`nav-${category}-channels-tab`) + categoryLists[category].innerHTML = '' + categoryLists[category].parentElement.classList.add('d-none') + } for (let channel of new_channels) { channels[channel['id']] = channel if (!messages[channel['id']]) messages[channel['id']] = new Map() + let categoryList = categoryLists[channel['category']] + categoryList.parentElement.classList.remove('d-none') + let navItem = document.createElement('li') navItem.classList.add('list-group-item') navItem.id = `tab-channel-${channel['id']}` navItem.setAttribute('data-bs-dismiss', 'offcanvas') navItem.onclick = () => selectChannel(channel['id']) - navTab.appendChild(navItem) + categoryList.appendChild(navItem) let channelButton = document.createElement('button') channelButton.classList.add('nav-link') diff --git a/chat/templates/chat/content.html b/chat/templates/chat/content.html index e712e14..b58e35a 100644 --- a/chat/templates/chat/content.html +++ b/chat/templates/chat/content.html @@ -3,13 +3,30 @@ -
                +
                -

                {% trans "Chat channels" %}

                +

                {% trans "Chat channels" %}

                - +
                diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 187ca3f..dd23b19 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: TFJM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-28 11:56+0200\n" +"POT-Creation-Date: 2024-04-28 13:08+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Emmy D'Anello \n" "Language-Team: LANGUAGE \n" @@ -21,20 +21,40 @@ msgstr "" msgid "API" msgstr "API" -#: chat/models.py:18 participation/models.py:35 participation/models.py:263 +#: chat/models.py:17 +msgid "General channels" +msgstr "Canaux généraux" + +#: chat/models.py:18 +msgid "Tournament channels" +msgstr "Canaux de tournois" + +#: chat/models.py:19 +msgid "Team channels" +msgstr "Canaux d'équipes" + +#: chat/models.py:20 +msgid "Private channels" +msgstr "Messages privés" + +#: chat/models.py:24 participation/models.py:35 participation/models.py:263 #: participation/tables.py:18 participation/tables.py:34 msgid "name" msgstr "nom" -#: chat/models.py:23 +#: chat/models.py:29 +msgid "category" +msgstr "catégorie" + +#: chat/models.py:36 msgid "read permission" msgstr "permission de lecture" -#: chat/models.py:29 +#: chat/models.py:42 msgid "write permission" msgstr "permission d'écriture" -#: chat/models.py:39 draw/admin.py:53 draw/admin.py:71 draw/admin.py:88 +#: chat/models.py:52 draw/admin.py:53 draw/admin.py:71 draw/admin.py:88 #: draw/models.py:26 participation/admin.py:79 participation/admin.py:140 #: participation/admin.py:171 participation/models.py:693 #: participation/models.py:717 participation/models.py:935 @@ -43,7 +63,7 @@ msgstr "permission d'écriture" msgid "tournament" msgstr "tournoi" -#: chat/models.py:41 +#: chat/models.py:54 msgid "" "For a permission that concerns a tournament, indicates what is the concerned " "tournament." @@ -51,21 +71,21 @@ msgstr "" "Pour une permission qui concerne un tournoi, indique quel est le tournoi " "concerné." -#: chat/models.py:50 draw/models.py:429 draw/models.py:456 +#: chat/models.py:63 draw/models.py:429 draw/models.py:456 #: participation/admin.py:136 participation/admin.py:155 #: participation/models.py:1434 participation/models.py:1443 #: participation/tables.py:84 msgid "pool" msgstr "poule" -#: chat/models.py:52 +#: chat/models.py:65 msgid "" "For a permission that concerns a pool, indicates what is the concerned pool." msgstr "" "Pour une permission qui concerne une poule, indique quelle est la poule " "concernée." -#: chat/models.py:61 draw/templates/draw/tournament_content.html:277 +#: chat/models.py:74 draw/templates/draw/tournament_content.html:277 #: participation/admin.py:167 participation/models.py:252 #: participation/models.py:708 #: participation/templates/participation/tournament_harmonize.html:15 @@ -75,18 +95,18 @@ msgstr "" msgid "team" msgstr "équipe" -#: chat/models.py:63 +#: chat/models.py:76 msgid "" "For a permission that concerns a team, indicates what is the concerned team." msgstr "" "Pour une permission qui concerne une équipe, indique quelle est l'équipe " "concernée." -#: chat/models.py:67 +#: chat/models.py:80 msgid "private" msgstr "privé" -#: chat/models.py:69 +#: chat/models.py:82 msgid "" "If checked, only users who have been explicitly added to the channel will be " "able to access it." @@ -94,11 +114,11 @@ msgstr "" "Si sélectionné, seul⋅es les utilisateur⋅rices qui ont été explicitement " "ajouté⋅es au canal pourront y accéder." -#: chat/models.py:74 +#: chat/models.py:87 msgid "invited users" msgstr "Utilisateur⋅rices invité" -#: chat/models.py:77 +#: chat/models.py:90 msgid "" "Extra users who have been invited to the channel, in addition to the " "permitted group of the channel." @@ -106,40 +126,40 @@ msgstr "" "Utilisateur⋅rices supplémentaires qui ont été invité⋅es au canal, en plus du " "groupe autorisé du canal." -#: chat/models.py:82 +#: chat/models.py:95 #, python-brace-format msgid "Channel {name}" msgstr "Canal {name}" -#: chat/models.py:148 chat/models.py:157 +#: chat/models.py:161 chat/models.py:170 msgid "channel" msgstr "canal" -#: chat/models.py:149 +#: chat/models.py:162 msgid "channels" msgstr "canaux" -#: chat/models.py:163 +#: chat/models.py:176 msgid "author" msgstr "auteur⋅rice" -#: chat/models.py:170 +#: chat/models.py:183 msgid "created at" msgstr "créé le" -#: chat/models.py:175 +#: chat/models.py:188 msgid "updated at" msgstr "modifié le" -#: chat/models.py:180 +#: chat/models.py:193 msgid "content" msgstr "contenu" -#: chat/models.py:243 +#: chat/models.py:256 msgid "message" msgstr "message" -#: chat/models.py:244 +#: chat/models.py:257 msgid "messages" msgstr "messages" @@ -171,7 +191,7 @@ msgstr "Déconnexion" msgid "Install app on home screen" msgstr "Installer l'application sur l'écran d'accueil" -#: chat/templates/chat/content.html:54 +#: chat/templates/chat/content.html:55 msgid "Fetch previous messages…" msgstr "Récupérer les messages précédents…" From 675f19492cd0609927033fc9d3a027ec4e19fba1 Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Sun, 28 Apr 2024 15:04:15 +0200 Subject: [PATCH 21/35] Extend session cookie age from 3 hours to 2 weeks Signed-off-by: Emmy D'Anello --- tfjm/settings_prod.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tfjm/settings_prod.py b/tfjm/settings_prod.py index d7f48b8..2024aeb 100644 --- a/tfjm/settings_prod.py +++ b/tfjm/settings_prod.py @@ -27,7 +27,7 @@ SESSION_COOKIE_SECURE = False CSRF_COOKIE_SECURE = False CSRF_COOKIE_HTTPONLY = False X_FRAME_OPTIONS = 'DENY' -SESSION_COOKIE_AGE = 60 * 60 * 3 +SESSION_COOKIE_AGE = 60 * 60 * 24 * 7 * 2 # 2 weeks CHANNEL_LAYERS = { "default": { From c6b9a84def02c4b9b6059ff7aba8eb785311e679 Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Sun, 28 Apr 2024 15:09:52 +0200 Subject: [PATCH 22/35] Reset retry delay to 1 second when a connection has succeeded Signed-off-by: Emmy D'Anello --- chat/static/chat.js | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/chat/static/chat.js b/chat/static/chat.js index 7a0ee09..b1b7997 100644 --- a/chat/static/chat.js +++ b/chat/static/chat.js @@ -150,6 +150,22 @@ function receiveFetchedMessages(data) { redrawMessages() } +function startPrivateChat(data) { + let channel = data['channel'] + if (!channel) { + console.error('Private chat not found:', data) + return + } + + if (!channels[channel['id']]) { + channels[channel['id']] = channel + messages[channel['id']] = new Map() + setChannels(Object.values(channels)) + } + + selectChannel(channel['id']) +} + function redrawMessages() { let messageList = document.getElementById('message-list') messageList.innerHTML = '' @@ -181,6 +197,26 @@ function redrawMessages() { authorSpan.innerText = message['author'] authorDiv.appendChild(authorSpan) + authorSpan.addEventListener('contextmenu', (menu_event) => { + menu_event.preventDefault() + const popover = bootstrap.Popover.getOrCreateInstance(authorSpan, { + 'title': message['author'], + 'content': `Envoyer un message privé`, + 'html': true, + 'placement': "bottom", + }) + popover.show() + + document.getElementById('send-private-message-link-' + message['id']).addEventListener('click', event => { + event.preventDefault() + popover.hide() + socket.send(JSON.stringify({ + 'type': 'start_private_chat', + 'user_id': message['author_id'], + })) + }) + }) + let dateSpan = document.createElement('span') dateSpan.classList.add('text-muted', 'float-end') dateSpan.innerText = new Date(message['timestamp']).toLocaleString() @@ -234,6 +270,9 @@ document.addEventListener('DOMContentLoaded', () => { case 'fetch_messages': receiveFetchedMessages(data) break + case 'start_private_chat': + startPrivateChat(data) + break default: console.log(data) console.error('Unknown message type:', data['type']) @@ -246,6 +285,7 @@ document.addEventListener('DOMContentLoaded', () => { socket = new WebSocket( (document.location.protocol === 'https:' ? 'wss' : 'ws') + '://' + window.location.host + '/ws/chat/' ) + let socketOpen = false // Listen on websockets and process messages from the server socket.addEventListener('message', e => { @@ -258,10 +298,11 @@ document.addEventListener('DOMContentLoaded', () => { // Manage errors socket.addEventListener('close', e => { console.error('Chat socket closed unexpectedly, restarting…') - setTimeout(() => setupSocket(2 * nextDelay), nextDelay) + setTimeout(() => setupSocket(socketOpen ? 1000 : 2 * nextDelay), nextDelay) }) socket.addEventListener('open', e => { + socketOpen = true socket.send(JSON.stringify({ 'type': 'fetch_channels', })) From d6aa5eb0cc83a3e6214dd4d426971c8a926dd75b Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Sun, 28 Apr 2024 15:35:32 +0200 Subject: [PATCH 23/35] Manage private chats Signed-off-by: Emmy D'Anello --- chat/consumers.py | 53 +++++++++++++++++++++++++++++++++++++++++++-- chat/models.py | 11 ++++++++-- chat/static/chat.js | 9 ++++++-- 3 files changed, 67 insertions(+), 6 deletions(-) diff --git a/chat/consumers.py b/chat/consumers.py index 47b66ce..f120ee0 100644 --- a/chat/consumers.py +++ b/chat/consumers.py @@ -37,6 +37,7 @@ class ChatConsumer(AsyncJsonWebsocketConsumer): channels = await Channel.get_accessible_channels(user, 'read') async for channel in channels.all(): await self.channel_layer.group_add(f"chat-{channel.id}", self.channel_name) + await self.channel_layer.group_add(f"user-{user.id}", self.channel_name) async def disconnect(self, close_code) -> None: """ @@ -50,6 +51,7 @@ class ChatConsumer(AsyncJsonWebsocketConsumer): channels = await Channel.get_accessible_channels(self.scope['user'], 'read') async for channel in channels.all(): await self.channel_layer.group_discard(f"chat-{channel.id}", self.channel_name) + await self.channel_layer.group_discard(f"user-{self.scope['user'].id}", self.channel_name) async def receive_json(self, content, **kwargs): """ @@ -63,6 +65,8 @@ class ChatConsumer(AsyncJsonWebsocketConsumer): await self.receive_message(content) case 'fetch_messages': await self.fetch_messages(**content) + case 'start_private_chat': + await self.start_private_chat(content['user_id']) case unknown: print("Unknown message type:", unknown) @@ -76,12 +80,12 @@ class ChatConsumer(AsyncJsonWebsocketConsumer): 'channels': [ { 'id': channel.id, - 'name': channel.name, + 'name': channel.get_visible_name(user), 'category': channel.category, 'read_access': True, 'write_access': await write_channels.acontains(channel), } - async for channel in read_channels.all() + async for channel in read_channels.prefetch_related('invited').all() ] } await self.send_json(message) @@ -105,6 +109,7 @@ class ChatConsumer(AsyncJsonWebsocketConsumer): 'id': message.id, 'channel_id': channel.id, 'timestamp': message.created_at.isoformat(), + 'author_id': message.author_id, 'author': await message.aget_author_name(), 'content': message.content, }) @@ -125,6 +130,7 @@ class ChatConsumer(AsyncJsonWebsocketConsumer): { 'id': message.id, 'timestamp': message.created_at.isoformat(), + 'author_id': message.author_id, 'author': await message.aget_author_name(), 'content': message.content, } @@ -132,7 +138,50 @@ class ChatConsumer(AsyncJsonWebsocketConsumer): ])) }) + async def start_private_chat(self, user_id: int) -> None: + user = self.scope['user'] + other_user = await User.objects.aget(id=user_id) + channel_qs = Channel.objects.filter(private=True).filter(invited=user).filter(invited=other_user) + if not await channel_qs.aexists(): + channel = await Channel.objects.acreate( + name=f"{user.first_name} {user.last_name}, {other_user.first_name} {other_user.last_name}", + category=Channel.ChannelCategory.PRIVATE, + private=True, + ) + await channel.invited.aset([user, other_user]) + await channel.asave() + + await self.channel_layer.group_add(f"chat-{channel.id}", self.channel_name) + else: + channel = await channel_qs.afirst() + + await self.channel_layer.group_send(f"user-{user.id}", { + 'type': 'chat.start_private_chat', + 'channel': { + 'id': channel.id, + 'name': f"{other_user.first_name} {other_user.last_name}", + 'category': channel.category, + 'read_access': True, + 'write_access': True, + } + }) + if user != other_user: + await self.channel_layer.group_send(f"user-{other_user.id}", { + 'type': 'chat.start_private_chat', + 'channel': { + 'id': channel.id, + 'name': f"{user.first_name} {user.last_name}", + 'category': channel.category, + 'read_access': True, + 'write_access': True, + } + }) + async def chat_send_message(self, message) -> None: await self.send_json({'type': 'send_message', 'id': message['id'], 'channel_id': message['channel_id'], 'timestamp': message['timestamp'], 'author': message['author'], 'content': message['content']}) + + async def chat_start_private_chat(self, message) -> None: + await self.channel_layer.group_add(f"chat-{message['channel']['id']}", self.channel_name) + await self.send_json({'type': 'start_private_chat', 'channel': message['channel']}) diff --git a/chat/models.py b/chat/models.py index 9b91ec0..706060d 100644 --- a/chat/models.py +++ b/chat/models.py @@ -91,6 +91,13 @@ class Channel(models.Model): "in addition to the permitted group of the channel."), ) + def get_visible_name(self, user: User) -> str: + if self.private: + users = [f"{u.first_name} {u.last_name}" for u in self.invited.all() if u != user] \ + or [f"{user.first_name} {user.last_name}"] + return ", ".join(users) + return self.name + def __str__(self): return str(format_lazy(_("Channel {name}"), name=self.name)) @@ -106,7 +113,7 @@ class Channel(models.Model): registration = await Registration.objects.prefetch_related('user').aget(user_id=user.id) if registration.is_admin: - return Channel.objects.all() + return Channel.objects.prefetch_related('invited').exclude(~Q(invited=user) & Q(private=True)).all() if registration.is_volunteer: registration = await VolunteerRegistration.objects \ @@ -153,7 +160,7 @@ class Channel(models.Model): qs |= Channel.objects.filter(Q(team=team), **{permission_type: PermissionType.TEAM_MEMBER}) - qs |= Channel.objects.filter(invited=user) + qs |= Channel.objects.filter(invited=user).prefetch_related('invited') return qs diff --git a/chat/static/chat.js b/chat/static/chat.js index b1b7997..9295de2 100644 --- a/chat/static/chat.js +++ b/chat/static/chat.js @@ -95,8 +95,13 @@ function setChannels(new_channels) { } if (new_channels && (!selected_channel_id || !channels[selected_channel_id])) { - if (window.location.hash) - selectChannel(window.location.hash.substring(9)) + if (window.location.hash) { + let channel_id = parseInt(window.location.hash.substring(9)) + if (channels[channel_id]) + selectChannel(channel_id) + else + selectChannel(Object.keys(channels)[0]) + } else selectChannel(Object.keys(channels)[0]) } From 3b3dcff28ba115aa89ea2087ab18cfb9cc2d149b Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Sun, 28 Apr 2024 15:37:45 +0200 Subject: [PATCH 24/35] Only give the focus to a private channel if it wasn't previously created Signed-off-by: Emmy D'Anello --- chat/consumers.py | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/chat/consumers.py b/chat/consumers.py index f120ee0..6e65614 100644 --- a/chat/consumers.py +++ b/chat/consumers.py @@ -152,6 +152,18 @@ class ChatConsumer(AsyncJsonWebsocketConsumer): await channel.asave() await self.channel_layer.group_add(f"chat-{channel.id}", self.channel_name) + + if user != other_user: + await self.channel_layer.group_send(f"user-{other_user.id}", { + 'type': 'chat.start_private_chat', + 'channel': { + 'id': channel.id, + 'name': f"{user.first_name} {user.last_name}", + 'category': channel.category, + 'read_access': True, + 'write_access': True, + } + }) else: channel = await channel_qs.afirst() @@ -165,17 +177,6 @@ class ChatConsumer(AsyncJsonWebsocketConsumer): 'write_access': True, } }) - if user != other_user: - await self.channel_layer.group_send(f"user-{other_user.id}", { - 'type': 'chat.start_private_chat', - 'channel': { - 'id': channel.id, - 'name': f"{user.first_name} {user.last_name}", - 'category': channel.category, - 'read_access': True, - 'write_access': True, - } - }) async def chat_send_message(self, message) -> None: await self.send_json({'type': 'send_message', 'id': message['id'], 'channel_id': message['channel_id'], From a771710094a3f086517ab8b442c8611e6d36e729 Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Sun, 28 Apr 2024 16:28:39 +0200 Subject: [PATCH 25/35] Add popovers to edit and delete messages Signed-off-by: Emmy D'Anello --- chat/static/chat.js | 86 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 65 insertions(+), 21 deletions(-) diff --git a/chat/static/chat.js b/chat/static/chat.js index 9295de2..dcef533 100644 --- a/chat/static/chat.js +++ b/chat/static/chat.js @@ -184,8 +184,12 @@ function redrawMessages() { let newTimestamp = new Date(message['timestamp']) if ((newTimestamp - lastTimestamp) / 1000 < 60 * 10) { let messageContentDiv = document.createElement('div') - messageContentDiv.innerText = message['content'] lastContentDiv.appendChild(messageContentDiv) + let messageContentSpan = document.createElement('span') + messageContentSpan.innerText = message['content'] + messageContentDiv.appendChild(messageContentSpan) + + registerMessageContextMenu(message, messageContentSpan) continue } } @@ -202,25 +206,7 @@ function redrawMessages() { authorSpan.innerText = message['author'] authorDiv.appendChild(authorSpan) - authorSpan.addEventListener('contextmenu', (menu_event) => { - menu_event.preventDefault() - const popover = bootstrap.Popover.getOrCreateInstance(authorSpan, { - 'title': message['author'], - 'content': `Envoyer un message privé`, - 'html': true, - 'placement': "bottom", - }) - popover.show() - - document.getElementById('send-private-message-link-' + message['id']).addEventListener('click', event => { - event.preventDefault() - popover.hide() - socket.send(JSON.stringify({ - 'type': 'start_private_chat', - 'user_id': message['author_id'], - })) - }) - }) + registerSendPrivateMessageContextMenu(message, authorSpan) let dateSpan = document.createElement('span') dateSpan.classList.add('text-muted', 'float-end') @@ -231,8 +217,12 @@ function redrawMessages() { messageElement.appendChild(contentDiv) let messageContentDiv = document.createElement('div') - messageContentDiv.innerText = message['content'] contentDiv.appendChild(messageContentDiv) + let messageContentSpan = document.createElement('span') + messageContentSpan.innerText = message['content'] + messageContentDiv.appendChild(messageContentSpan) + + registerMessageContextMenu(message, messageContentSpan) lastMessage = message lastContentDiv = contentDiv @@ -245,6 +235,52 @@ function redrawMessages() { fetchMoreButton.classList.remove('d-none') } +function registerSendPrivateMessageContextMenu(message, element) { + element.addEventListener('contextmenu', (menu_event) => { + menu_event.preventDefault() + const popover = bootstrap.Popover.getOrCreateInstance(element, { + 'title': message['author'], + 'content': `Envoyer un message privé`, + 'html': true, + }) + popover.show() + + document.getElementById('send-private-message-link-' + message['id']).addEventListener('click', event => { + event.preventDefault() + popover.hide() + socket.send(JSON.stringify({ + 'type': 'start_private_chat', + 'user_id': message['author_id'], + })) + }) + }) +} + +function registerMessageContextMenu(message, element) { + element.addEventListener('contextmenu', (menu_event) => { + menu_event.preventDefault() + let content = `Envoyer un message privé` + content += `
                ` + content += `Modifier` + content += `Supprimer` + const popover = bootstrap.Popover.getOrCreateInstance(element, { + 'content': content, + 'html': true, + 'placement': 'bottom', + }) + popover.show() + + document.getElementById('send-private-message-link-msg-' + message['id']).addEventListener('click', event => { + event.preventDefault() + popover.hide() + socket.send(JSON.stringify({ + 'type': 'start_private_chat', + 'user_id': message['author_id'], + })) + }) + }) +} + function toggleFullscreen() { let chatContainer = document.getElementById('chat-container') if (!chatContainer.getAttribute('data-fullscreen')) { @@ -260,6 +296,14 @@ function toggleFullscreen() { } document.addEventListener('DOMContentLoaded', () => { + document.addEventListener('click', () => { + for (let popover of document.querySelectorAll('span[aria-describedby*="popover"]')) { + let instance = bootstrap.Popover.getInstance(popover) + if (instance) + instance.hide() + } + }) + /** * Process the received data from the server. * @param data The received message From 0cab21f34450068b1728d097d2e90725943d3d30 Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Sun, 28 Apr 2024 16:36:54 +0200 Subject: [PATCH 26/35] Users can only edit & delete their own messages (except for admin users) Signed-off-by: Emmy D'Anello --- chat/static/chat.js | 30 ++++++++++++++++++------------ chat/templates/chat/content.html | 7 ++++++- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/chat/static/chat.js b/chat/static/chat.js index dcef533..30ce636 100644 --- a/chat/static/chat.js +++ b/chat/static/chat.js @@ -235,9 +235,18 @@ function redrawMessages() { fetchMoreButton.classList.remove('d-none') } +function removeAllPopovers() { + for (let popover of document.querySelectorAll('*[aria-describedby*="popover"]')) { + let instance = bootstrap.Popover.getInstance(popover) + if (instance) + instance.dispose() + } +} + function registerSendPrivateMessageContextMenu(message, element) { element.addEventListener('contextmenu', (menu_event) => { menu_event.preventDefault() + removeAllPopovers() const popover = bootstrap.Popover.getOrCreateInstance(element, { 'title': message['author'], 'content': `Envoyer un message privé`, @@ -247,7 +256,7 @@ function registerSendPrivateMessageContextMenu(message, element) { document.getElementById('send-private-message-link-' + message['id']).addEventListener('click', event => { event.preventDefault() - popover.hide() + popover.dispose() socket.send(JSON.stringify({ 'type': 'start_private_chat', 'user_id': message['author_id'], @@ -259,10 +268,13 @@ function registerSendPrivateMessageContextMenu(message, element) { function registerMessageContextMenu(message, element) { element.addEventListener('contextmenu', (menu_event) => { menu_event.preventDefault() + removeAllPopovers() let content = `Envoyer un message privé` - content += `
                ` - content += `Modifier` - content += `Supprimer` + if (message['author_id'] === USER_ID || IS_ADMIN) { + content += `
                ` + content += `Modifier` + content += `Supprimer` + } const popover = bootstrap.Popover.getOrCreateInstance(element, { 'content': content, 'html': true, @@ -272,7 +284,7 @@ function registerMessageContextMenu(message, element) { document.getElementById('send-private-message-link-msg-' + message['id']).addEventListener('click', event => { event.preventDefault() - popover.hide() + popover.dispose() socket.send(JSON.stringify({ 'type': 'start_private_chat', 'user_id': message['author_id'], @@ -296,13 +308,7 @@ function toggleFullscreen() { } document.addEventListener('DOMContentLoaded', () => { - document.addEventListener('click', () => { - for (let popover of document.querySelectorAll('span[aria-describedby*="popover"]')) { - let instance = bootstrap.Popover.getInstance(popover) - if (instance) - instance.hide() - } - }) + document.addEventListener('click', removeAllPopovers) /** * Process the received data from the server. diff --git a/chat/templates/chat/content.html b/chat/templates/chat/content.html index b58e35a..2e1d8e1 100644 --- a/chat/templates/chat/content.html +++ b/chat/templates/chat/content.html @@ -87,4 +87,9 @@
                -
                \ No newline at end of file +
                + + \ No newline at end of file From 1e5d0ebcfce91d1fe956f1fb6d0d687f7a663af4 Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Sun, 28 Apr 2024 16:56:30 +0200 Subject: [PATCH 27/35] Editing and deleting is working Signed-off-by: Emmy D'Anello --- chat/consumers.py | 54 ++++++++++++++++++++++++++++++++++++++++----- chat/static/chat.js | 51 +++++++++++++++++++++++++++++++++++++++--- 2 files changed, 96 insertions(+), 9 deletions(-) diff --git a/chat/consumers.py b/chat/consumers.py index 6e65614..c8d2ce5 100644 --- a/chat/consumers.py +++ b/chat/consumers.py @@ -62,11 +62,15 @@ class ChatConsumer(AsyncJsonWebsocketConsumer): case 'fetch_channels': await self.fetch_channels() case 'send_message': - await self.receive_message(content) + await self.receive_message(**content) + case 'edit_message': + await self.edit_message(**content) + case 'delete_message': + await self.delete_message(**content) case 'fetch_messages': await self.fetch_messages(**content) case 'start_private_chat': - await self.start_private_chat(content['user_id']) + await self.start_private_chat(**content) case unknown: print("Unknown message type:", unknown) @@ -90,10 +94,10 @@ class ChatConsumer(AsyncJsonWebsocketConsumer): } await self.send_json(message) - async def receive_message(self, message: dict) -> None: + async def receive_message(self, channel_id: int, content: str, **kwargs) -> None: user = self.scope['user'] channel = await Channel.objects.prefetch_related('tournament__pools__juries', 'pool', 'team', 'invited') \ - .aget(id=message['channel_id']) + .aget(id=channel_id) write_channels = await Channel.get_accessible_channels(user, 'write') if not await write_channels.acontains(channel): return @@ -101,7 +105,7 @@ class ChatConsumer(AsyncJsonWebsocketConsumer): message = await Message.objects.acreate( author=user, channel=channel, - content=message['content'], + content=content, ) await self.channel_layer.group_send(f'chat-{channel.id}', { @@ -114,6 +118,36 @@ class ChatConsumer(AsyncJsonWebsocketConsumer): 'content': message.content, }) + async def edit_message(self, message_id: int, content: str, **kwargs) -> None: + message = await Message.objects.aget(id=message_id) + user = self.scope['user'] + if user.id != message.author_id and not user.is_superuser: + return + + message.content = content + await message.asave() + + await self.channel_layer.group_send(f'chat-{message.channel_id}', { + 'type': 'chat.edit_message', + 'id': message_id, + 'channel_id': message.channel_id, + 'content': content, + }) + + async def delete_message(self, message_id: int, **kwargs) -> None: + message = await Message.objects.aget(id=message_id) + user = self.scope['user'] + if user.id != message.author_id and not user.is_superuser: + return + + await message.adelete() + + await self.channel_layer.group_send(f'chat-{message.channel_id}', { + 'type': 'chat.delete_message', + 'id': message_id, + 'channel_id': message.channel_id, + }) + async def fetch_messages(self, channel_id: int, offset: int = 0, limit: int = 50, **_kwargs) -> None: channel = await Channel.objects.aget(id=channel_id) read_channels = await Channel.get_accessible_channels(self.scope['user'], 'read') @@ -138,7 +172,7 @@ class ChatConsumer(AsyncJsonWebsocketConsumer): ])) }) - async def start_private_chat(self, user_id: int) -> None: + async def start_private_chat(self, user_id: int, **kwargs) -> None: user = self.scope['user'] other_user = await User.objects.aget(id=user_id) channel_qs = Channel.objects.filter(private=True).filter(invited=user).filter(invited=other_user) @@ -183,6 +217,14 @@ class ChatConsumer(AsyncJsonWebsocketConsumer): 'timestamp': message['timestamp'], 'author': message['author'], 'content': message['content']}) + async def chat_edit_message(self, message) -> None: + print(message) + await self.send_json({'type': 'edit_message', 'id': message['id'], 'channel_id': message['channel_id'], + 'content': message['content']}) + + async def chat_delete_message(self, message) -> None: + await self.send_json({'type': 'delete_message', 'id': message['id'], 'channel_id': message['channel_id']}) + async def chat_start_private_chat(self, message) -> None: await self.channel_layer.group_add(f"chat-{message['channel']['id']}", self.channel_name) await self.send_json({'type': 'start_private_chat', 'channel': message['channel']}) diff --git a/chat/static/chat.js b/chat/static/chat.js index 30ce636..74567f1 100644 --- a/chat/static/chat.js +++ b/chat/static/chat.js @@ -122,6 +122,16 @@ function receiveMessage(message) { showNotification(channels[message['channel_id']]['name'], `${message['author']} : ${message['content']}`) } +function editMessage(data) { + messages[data['channel_id']].get(data['id'])['content'] = data['content'] + redrawMessages() +} + +function deleteMessage(data) { + messages[data['channel_id']].delete(data['id']) + redrawMessages() +} + function fetchMessages(channel_id, offset = 0, limit = MAX_MESSAGES) { socket.send(JSON.stringify({ 'type': 'fetch_messages', @@ -270,11 +280,14 @@ function registerMessageContextMenu(message, element) { menu_event.preventDefault() removeAllPopovers() let content = `Envoyer un message privé` - if (message['author_id'] === USER_ID || IS_ADMIN) { + + let has_right_to_edit = message['author_id'] === USER_ID || IS_ADMIN + if (has_right_to_edit) { content += `
                ` - content += `Modifier` - content += `Supprimer` + content += `Modifier` + content += `Supprimer` } + const popover = bootstrap.Popover.getOrCreateInstance(element, { 'content': content, 'html': true, @@ -290,6 +303,32 @@ function registerMessageContextMenu(message, element) { 'user_id': message['author_id'], })) }) + + if (has_right_to_edit) { + document.getElementById('edit-message-' + message['id']).addEventListener('click', event => { + event.preventDefault() + popover.dispose() + let new_message = prompt("Modifier le message", message['content']) + if (new_message) { + socket.send(JSON.stringify({ + 'type': 'edit_message', + 'message_id': message['id'], + 'content': new_message, + })) + } + }) + + document.getElementById('delete-message-' + message['id']).addEventListener('click', event => { + event.preventDefault() + popover.dispose() + if (confirm("Supprimer le message ?")) { + socket.send(JSON.stringify({ + 'type': 'delete_message', + 'message_id': message['id'], + })) + } + }) + } }) } @@ -322,6 +361,12 @@ document.addEventListener('DOMContentLoaded', () => { case 'send_message': receiveMessage(data) break + case 'edit_message': + editMessage(data) + break + case 'delete_message': + deleteMessage(data) + break case 'fetch_messages': receiveFetchedMessages(data) break From f26f102650b737c75be066ca9dc442233f5c719c Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Sun, 28 Apr 2024 17:04:34 +0200 Subject: [PATCH 28/35] Automatically create appropriated channels when tournaments/pools/participations are updated Signed-off-by: Emmy D'Anello --- chat/apps.py | 7 ++ .../commands/create_chat_channels.py | 1 - chat/signals.py | 100 ++++++++++++++++++ tox.ini | 4 +- 4 files changed, 109 insertions(+), 3 deletions(-) create mode 100644 chat/signals.py diff --git a/chat/apps.py b/chat/apps.py index a17b8f5..ce683bf 100644 --- a/chat/apps.py +++ b/chat/apps.py @@ -2,8 +2,15 @@ # SPDX-License-Identifier: GPL-3.0-or-later from django.apps import AppConfig +from django.db.models.signals import post_save class ChatConfig(AppConfig): default_auto_field = "django.db.models.BigAutoField" name = "chat" + + def ready(self): + from chat import signals + post_save.connect(signals.create_tournament_channels, "participation.Tournament") + post_save.connect(signals.create_pool_channels, "participation.Pool") + post_save.connect(signals.create_team_channel, "participation.Participation") diff --git a/chat/management/commands/create_chat_channels.py b/chat/management/commands/create_chat_channels.py index 0baf61c..666ee3f 100644 --- a/chat/management/commands/create_chat_channels.py +++ b/chat/management/commands/create_chat_channels.py @@ -3,7 +3,6 @@ from django.core.management import BaseCommand from django.utils.translation import activate - from participation.models import Team, Tournament from tfjm.permissions import PermissionType diff --git a/chat/signals.py b/chat/signals.py new file mode 100644 index 0000000..72056e3 --- /dev/null +++ b/chat/signals.py @@ -0,0 +1,100 @@ +# Copyright (C) 2024 by Animath +# SPDX-License-Identifier: GPL-3.0-or-later + +from chat.models import Channel +from participation.models import Participation, Pool, Tournament +from tfjm.permissions import PermissionType + + +def create_tournament_channels(instance: Tournament, **_kwargs): + tournament = instance + + Channel.objects.update_or_create( + name=f"{tournament.name} - Annonces", + defaults=dict( + category=Channel.ChannelCategory.TOURNAMENT, + read_access=PermissionType.TOURNAMENT_MEMBER, + write_access=PermissionType.TOURNAMENT_ORGANIZER, + tournament=tournament, + ), + ) + + Channel.objects.update_or_create( + name=f"{tournament.name} - Général", + defaults=dict( + category=Channel.ChannelCategory.TOURNAMENT, + read_access=PermissionType.TOURNAMENT_MEMBER, + write_access=PermissionType.TOURNAMENT_MEMBER, + tournament=tournament, + ), + ) + + Channel.objects.update_or_create( + name=f"{tournament.name} - Détente", + defaults=dict( + category=Channel.ChannelCategory.TOURNAMENT, + read_access=PermissionType.TOURNAMENT_MEMBER, + write_access=PermissionType.TOURNAMENT_MEMBER, + tournament=tournament, + ), + ) + + Channel.objects.update_or_create( + name=f"{tournament.name} - Juré⋅es", + defaults=dict( + category=Channel.ChannelCategory.TOURNAMENT, + read_access=PermissionType.JURY_MEMBER, + write_access=PermissionType.JURY_MEMBER, + tournament=tournament, + ), + ) + + if tournament.remote: + Channel.objects.update_or_create( + name=f"{tournament.name} - Président⋅es de jury", + defaults=dict( + category=Channel.ChannelCategory.TOURNAMENT, + read_access=PermissionType.TOURNAMENT_JURY_PRESIDENT, + write_access=PermissionType.TOURNAMENT_JURY_PRESIDENT, + tournament=tournament, + ), + ) + + +def create_pool_channels(instance: Pool, **_kwargs): + pool = instance + tournament = pool.tournament + + if tournament.remote: + Channel.objects.update_or_create( + name=f"{tournament.name} - Poule {pool.short_name}", + defaults=dict( + category=Channel.ChannelCategory.TOURNAMENT, + read_access=PermissionType.POOL_MEMBER, + write_access=PermissionType.POOL_MEMBER, + pool=pool, + ), + ) + + Channel.objects.update_or_create( + name=f"{tournament.name} - Poule {pool.short_name} - Jury", + defaults=dict( + category=Channel.ChannelCategory.TOURNAMENT, + read_access=PermissionType.JURY_MEMBER, + write_access=PermissionType.JURY_MEMBER, + pool=pool, + ), + ) + + +def create_team_channel(instance: Participation, **_kwargs): + if instance.valid: + Channel.objects.update_or_create( + name=f"Équipe {instance.team.trigram}", + defaults=dict( + category=Channel.ChannelCategory.TEAM, + read_access=PermissionType.TEAM_MEMBER, + write_access=PermissionType.TEAM_MEMBER, + team=instance.team, + ), + ) diff --git a/tox.ini b/tox.ini index aa524c4..521eccb 100644 --- a/tox.ini +++ b/tox.ini @@ -13,7 +13,7 @@ deps = coverage commands = python manage.py compilemessages -i .tox -i venv - coverage run --source=api,draw,logs,participation,registration,tfjm ./manage.py test api/ draw/ logs/ participation/ registration/ tfjm/ + coverage run --source=api,draw,logs,participation,registration,tfjm ./manage.py test api/ chat/ draw/ logs/ participation/ registration/ tfjm/ coverage report -m [testenv:linters] @@ -26,7 +26,7 @@ deps = pep8-naming pyflakes commands = - flake8 api/ draw/ logs/ participation/ registration/ tfjm/ + flake8 api/ chat/ draw/ logs/ participation/ registration/ tfjm/ [flake8] exclude = From 8f3929875f548da32ec0f349a0905556e1b7526e Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Sun, 28 Apr 2024 20:25:00 +0200 Subject: [PATCH 29/35] Improve context menus Signed-off-by: Emmy D'Anello --- chat/static/chat.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/chat/static/chat.js b/chat/static/chat.js index 74567f1..95a63a4 100644 --- a/chat/static/chat.js +++ b/chat/static/chat.js @@ -199,7 +199,7 @@ function redrawMessages() { messageContentSpan.innerText = message['content'] messageContentDiv.appendChild(messageContentSpan) - registerMessageContextMenu(message, messageContentSpan) + registerMessageContextMenu(message, messageContentDiv, messageContentSpan) continue } } @@ -216,7 +216,7 @@ function redrawMessages() { authorSpan.innerText = message['author'] authorDiv.appendChild(authorSpan) - registerSendPrivateMessageContextMenu(message, authorSpan) + registerSendPrivateMessageContextMenu(message, authorDiv, authorSpan) let dateSpan = document.createElement('span') dateSpan.classList.add('text-muted', 'float-end') @@ -232,7 +232,7 @@ function redrawMessages() { messageContentSpan.innerText = message['content'] messageContentDiv.appendChild(messageContentSpan) - registerMessageContextMenu(message, messageContentSpan) + registerMessageContextMenu(message, messageContentDiv, messageContentSpan) lastMessage = message lastContentDiv = contentDiv @@ -253,11 +253,11 @@ function removeAllPopovers() { } } -function registerSendPrivateMessageContextMenu(message, element) { - element.addEventListener('contextmenu', (menu_event) => { +function registerSendPrivateMessageContextMenu(message, div, span) { + div.addEventListener('contextmenu', (menu_event) => { menu_event.preventDefault() removeAllPopovers() - const popover = bootstrap.Popover.getOrCreateInstance(element, { + const popover = bootstrap.Popover.getOrCreateInstance(span, { 'title': message['author'], 'content': `Envoyer un message privé`, 'html': true, @@ -275,8 +275,8 @@ function registerSendPrivateMessageContextMenu(message, element) { }) } -function registerMessageContextMenu(message, element) { - element.addEventListener('contextmenu', (menu_event) => { +function registerMessageContextMenu(message, div, span) { + div.addEventListener('contextmenu', (menu_event) => { menu_event.preventDefault() removeAllPopovers() let content = `Envoyer un message privé` @@ -288,7 +288,7 @@ function registerMessageContextMenu(message, element) { content += `Supprimer` } - const popover = bootstrap.Popover.getOrCreateInstance(element, { + const popover = bootstrap.Popover.getOrCreateInstance(span, { 'content': content, 'html': true, 'placement': 'bottom', @@ -321,7 +321,7 @@ function registerMessageContextMenu(message, element) { document.getElementById('delete-message-' + message['id']).addEventListener('click', event => { event.preventDefault() popover.dispose() - if (confirm("Supprimer le message ?")) { + if (confirm(`Supprimer le message ?\n${message['content']}`)) { socket.send(JSON.stringify({ 'type': 'delete_message', 'message_id': message['id'], From 1a641cb2d7452ef6cfcf47631526c0fcd9f525fa Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Sun, 28 Apr 2024 23:25:15 +0200 Subject: [PATCH 30/35] Store what messages are read Signed-off-by: Emmy D'Anello --- chat/admin.py | 2 +- chat/consumers.py | 49 +++++--- chat/migrations/0003_message_users_read.py | 26 ++++ chat/models.py | 8 ++ chat/static/chat.js | 138 +++++++++++++++++---- locale/fr/LC_MESSAGES/django.po | 48 ++++--- 6 files changed, 213 insertions(+), 58 deletions(-) create mode 100644 chat/migrations/0003_message_users_read.py diff --git a/chat/admin.py b/chat/admin.py index a94de30..757dcac 100644 --- a/chat/admin.py +++ b/chat/admin.py @@ -19,4 +19,4 @@ class MessageAdmin(admin.ModelAdmin): list_display = ('channel', 'author', 'created_at', 'updated_at', 'content',) list_filter = ('channel', 'created_at', 'updated_at',) search_fields = ('author__username', 'author__first_name', 'author__last_name', 'content',) - autocomplete_fields = ('channel', 'author',) + autocomplete_fields = ('channel', 'author', 'users_read',) diff --git a/chat/consumers.py b/chat/consumers.py index c8d2ce5..4812af7 100644 --- a/chat/consumers.py +++ b/chat/consumers.py @@ -3,6 +3,7 @@ from channels.generic.websocket import AsyncJsonWebsocketConsumer from django.contrib.auth.models import User +from django.db.models import Exists, OuterRef, Count, Q from registration.models import Registration from .models import Channel, Message @@ -34,8 +35,10 @@ class ChatConsumer(AsyncJsonWebsocketConsumer): # Accept the connection await self.accept() - channels = await Channel.get_accessible_channels(user, 'read') - async for channel in channels.all(): + self.read_channels = await Channel.get_accessible_channels(user, 'read') + self.write_channels = await Channel.get_accessible_channels(user, 'write') + + async for channel in self.read_channels.all(): await self.channel_layer.group_add(f"chat-{channel.id}", self.channel_name) await self.channel_layer.group_add(f"user-{user.id}", self.channel_name) @@ -48,8 +51,7 @@ class ChatConsumer(AsyncJsonWebsocketConsumer): # User is not authenticated return - channels = await Channel.get_accessible_channels(self.scope['user'], 'read') - async for channel in channels.all(): + async for channel in self.read_channels.all(): await self.channel_layer.group_discard(f"chat-{channel.id}", self.channel_name) await self.channel_layer.group_discard(f"user-{self.scope['user'].id}", self.channel_name) @@ -69,6 +71,8 @@ class ChatConsumer(AsyncJsonWebsocketConsumer): await self.delete_message(**content) case 'fetch_messages': await self.fetch_messages(**content) + case 'mark_read': + await self.mark_read(**content) case 'start_private_chat': await self.start_private_chat(**content) case unknown: @@ -77,8 +81,6 @@ class ChatConsumer(AsyncJsonWebsocketConsumer): async def fetch_channels(self) -> None: user = self.scope['user'] - read_channels = await Channel.get_accessible_channels(user, 'read') - write_channels = await Channel.get_accessible_channels(user, 'write') message = { 'type': 'fetch_channels', 'channels': [ @@ -87,9 +89,11 @@ class ChatConsumer(AsyncJsonWebsocketConsumer): 'name': channel.get_visible_name(user), 'category': channel.category, 'read_access': True, - 'write_access': await write_channels.acontains(channel), + 'write_access': await self.write_channels.acontains(channel), + 'unread_messages': channel.unread_messages, } - async for channel in read_channels.prefetch_related('invited').all() + async for channel in self.read_channels.prefetch_related('invited') \ + .annotate(unread_messages=Count('messages', filter=~Q(messages__users_read=user))).all() ] } await self.send_json(message) @@ -98,8 +102,7 @@ class ChatConsumer(AsyncJsonWebsocketConsumer): user = self.scope['user'] channel = await Channel.objects.prefetch_related('tournament__pools__juries', 'pool', 'team', 'invited') \ .aget(id=channel_id) - write_channels = await Channel.get_accessible_channels(user, 'write') - if not await write_channels.acontains(channel): + if not await self.write_channels.acontains(channel): return message = await Message.objects.acreate( @@ -150,13 +153,16 @@ class ChatConsumer(AsyncJsonWebsocketConsumer): async def fetch_messages(self, channel_id: int, offset: int = 0, limit: int = 50, **_kwargs) -> None: channel = await Channel.objects.aget(id=channel_id) - read_channels = await Channel.get_accessible_channels(self.scope['user'], 'read') - if not await read_channels.acontains(channel): + if not await self.read_channels.acontains(channel): return limit = min(limit, 200) # Fetch only maximum 200 messages at the time - messages = Message.objects.filter(channel=channel).order_by('-created_at')[offset:offset + limit].all() + messages = Message.objects \ + .filter(channel=channel) \ + .annotate(read=Exists(User.objects.filter(pk=self.scope['user'].pk) \ + .filter(pk=OuterRef('users_read')))) \ + .order_by('-created_at')[offset:offset + limit].all() await self.send_json({ 'type': 'fetch_messages', 'channel_id': channel_id, @@ -167,11 +173,27 @@ class ChatConsumer(AsyncJsonWebsocketConsumer): 'author_id': message.author_id, 'author': await message.aget_author_name(), 'content': message.content, + 'read': message.read, } async for message in messages ])) }) + async def mark_read(self, message_ids: list[int], **_kwargs) -> None: + messages = Message.objects.filter(id__in=message_ids) + async for message in messages.all(): + await message.users_read.aadd(self.scope['user']) + + unread_messages_by_channel = Message.objects.exclude(users_read=self.scope['user']).values('channel_id') \ + .annotate(unread_messages=Count('channel_id')) + + await self.send_json({ + 'type': 'mark_read', + 'messages': [{'id': message.id, 'channel_id': message.channel_id} async for message in messages.all()], + 'unread_messages': {group['channel_id']: group['unread_messages'] + async for group in unread_messages_by_channel.all()}, + }) + async def start_private_chat(self, user_id: int, **kwargs) -> None: user = self.scope['user'] other_user = await User.objects.aget(id=user_id) @@ -183,7 +205,6 @@ class ChatConsumer(AsyncJsonWebsocketConsumer): private=True, ) await channel.invited.aset([user, other_user]) - await channel.asave() await self.channel_layer.group_add(f"chat-{channel.id}", self.channel_name) diff --git a/chat/migrations/0003_message_users_read.py b/chat/migrations/0003_message_users_read.py new file mode 100644 index 0000000..16f9434 --- /dev/null +++ b/chat/migrations/0003_message_users_read.py @@ -0,0 +1,26 @@ +# Generated by Django 5.0.3 on 2024-04-28 18:52 + +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("chat", "0002_alter_channel_options_channel_category"), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.AddField( + model_name="message", + name="users_read", + field=models.ManyToManyField( + blank=True, + help_text="Users who have read the message.", + related_name="+", + to=settings.AUTH_USER_MODEL, + verbose_name="users read", + ), + ), + ] diff --git a/chat/models.py b/chat/models.py index 706060d..833890f 100644 --- a/chat/models.py +++ b/chat/models.py @@ -200,6 +200,14 @@ class Message(models.Model): verbose_name=_("content"), ) + users_read = models.ManyToManyField( + 'auth.User', + verbose_name=_("users read"), + related_name='+', + blank=True, + help_text=_("Users who have read the message."), + ) + def get_author_name(self): registration = self.author.registration diff --git a/chat/static/chat.js b/chat/static/chat.js index 95a63a4..0962f34 100644 --- a/chat/static/chat.js +++ b/chat/static/chat.js @@ -70,29 +70,8 @@ function setChannels(new_channels) { categoryLists[category].parentElement.classList.add('d-none') } - for (let channel of new_channels) { - channels[channel['id']] = channel - if (!messages[channel['id']]) - messages[channel['id']] = new Map() - - let categoryList = categoryLists[channel['category']] - categoryList.parentElement.classList.remove('d-none') - - let navItem = document.createElement('li') - navItem.classList.add('list-group-item') - navItem.id = `tab-channel-${channel['id']}` - navItem.setAttribute('data-bs-dismiss', 'offcanvas') - navItem.onclick = () => selectChannel(channel['id']) - categoryList.appendChild(navItem) - - let channelButton = document.createElement('button') - channelButton.classList.add('nav-link') - channelButton.type = 'button' - channelButton.innerText = channel['name'] - navItem.appendChild(channelButton) - - fetchMessages(channel['id']) - } + for (let channel of new_channels) + addChannel(channel, categoryLists) if (new_channels && (!selected_channel_id || !channels[selected_channel_id])) { if (window.location.hash) { @@ -107,6 +86,38 @@ function setChannels(new_channels) { } } +async function addChannel(channel, categoryLists) { + channels[channel['id']] = channel + if (!messages[channel['id']]) + messages[channel['id']] = new Map() + + let categoryList = categoryLists[channel['category']] + categoryList.parentElement.classList.remove('d-none') + + let navItem = document.createElement('li') + navItem.classList.add('list-group-item') + navItem.id = `tab-channel-${channel['id']}` + navItem.setAttribute('data-bs-dismiss', 'offcanvas') + navItem.onclick = () => selectChannel(channel['id']) + categoryList.appendChild(navItem) + + let channelButton = document.createElement('button') + channelButton.classList.add('nav-link') + channelButton.type = 'button' + channelButton.innerText = channel['name'] + navItem.appendChild(channelButton) + + let unreadBadge = document.createElement('span') + unreadBadge.classList.add('badge', 'rounded-pill', 'text-bg-light', 'ms-2') + unreadBadge.id = `unread-messages-${channel['id']}` + unreadBadge.innerText = channel.unread_messages || 0 + if (!channel.unread_messages) + unreadBadge.classList.add('d-none') + channelButton.appendChild(unreadBadge) + + fetchMessages(channel['id']) +} + function receiveMessage(message) { let scrollableContent = document.getElementById('chat-messages') let isScrolledToBottom = scrollableContent.scrollHeight - scrollableContent.clientHeight <= scrollableContent.scrollTop + 1 @@ -165,6 +176,32 @@ function receiveFetchedMessages(data) { redrawMessages() } +function markMessageAsRead(data) { + for (let message of data['messages']) { + let stored_message = messages[message['channel_id']].get(message['id']) + if (stored_message) + stored_message['read'] = true + } + redrawMessages() + updateUnreadBadges(data['unread_messages']) +} + +function updateUnreadBadges(unreadMessages) { + console.log(unreadMessages) + for (let channel of Object.values(channels)) { + let unreadMessagesChannel = unreadMessages[channel['id']] || 0 + console.log(channel, unreadMessagesChannel) + channel.unread_messages = unreadMessagesChannel + + let unreadBadge = document.getElementById(`unread-messages-${channel['id']}`) + unreadBadge.innerText = unreadMessagesChannel + if (unreadMessagesChannel) + unreadBadge.classList.remove('d-none') + else + unreadBadge.classList.add('d-none') + } +} + function startPrivateChat(data) { let channel = data['channel'] if (!channel) { @@ -194,6 +231,8 @@ function redrawMessages() { let newTimestamp = new Date(message['timestamp']) if ((newTimestamp - lastTimestamp) / 1000 < 60 * 10) { let messageContentDiv = document.createElement('div') + messageContentDiv.classList.add('message') + messageContentDiv.setAttribute('data-message-id', message['id']) lastContentDiv.appendChild(messageContentDiv) let messageContentSpan = document.createElement('span') messageContentSpan.innerText = message['content'] @@ -227,6 +266,8 @@ function redrawMessages() { messageElement.appendChild(contentDiv) let messageContentDiv = document.createElement('div') + messageContentDiv.classList.add('message') + messageContentDiv.setAttribute('data-message-id', message['id']) contentDiv.appendChild(messageContentDiv) let messageContentSpan = document.createElement('span') messageContentSpan.innerText = message['content'] @@ -243,6 +284,8 @@ function redrawMessages() { fetchMoreButton.classList.add('d-none') else fetchMoreButton.classList.remove('d-none') + + messageList.dispatchEvent(new CustomEvent('updatemessages')) } function removeAllPopovers() { @@ -370,6 +413,9 @@ document.addEventListener('DOMContentLoaded', () => { case 'fetch_messages': receiveFetchedMessages(data) break + case 'mark_read': + markMessageAsRead(data) + break case 'start_private_chat': startPrivateChat(data) break @@ -435,6 +481,51 @@ document.addEventListener('DOMContentLoaded', () => { }) } + function setupReadTracker() { + const scrollableContent = document.getElementById('chat-messages') + const messagesList = document.getElementById('message-list') + let markReadBuffer = [] + let markReadTimeout = null + + scrollableContent.addEventListener('scroll', () => { + if (scrollableContent.clientHeight - scrollableContent.scrollTop === scrollableContent.scrollHeight + && !document.getElementById('fetch-previous-messages').classList.contains('d-none')) { + // If the user is at the top of the chat, fetch previous messages + fetchPreviousMessages()} + + markVisibleMessagesAsRead() + }) + + messagesList.addEventListener('updatemessages', () => markVisibleMessagesAsRead()) + + function markVisibleMessagesAsRead() { + let viewport = scrollableContent.getBoundingClientRect() + + for (let item of messagesList.querySelectorAll('.message')) { + let message = messages[selected_channel_id].get(parseInt(item.getAttribute('data-message-id'))) + if (!message.read) { + let rect = item.getBoundingClientRect() + if (rect.top >= viewport.top && rect.bottom <= viewport.bottom) { + message.read = true + markReadBuffer.push(message['id']) + if (markReadTimeout) + clearTimeout(markReadTimeout) + markReadTimeout = setTimeout(() => { + socket.send(JSON.stringify({ + 'type': 'mark_read', + 'message_ids': markReadBuffer, + })) + markReadBuffer = [] + markReadTimeout = null + }, 3000) + } + } + } + } + + markVisibleMessagesAsRead() + } + function setupPWAPrompt() { let deferredPrompt = null @@ -460,5 +551,6 @@ document.addEventListener('DOMContentLoaded', () => { setupSocket() setupSwipeOffscreen() + setupReadTracker() setupPWAPrompt() }) diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index dd23b19..69bd864 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: TFJM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-28 13:08+0200\n" +"POT-Creation-Date: 2024-04-28 23:24+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Emmy D'Anello \n" "Language-Team: LANGUAGE \n" @@ -21,19 +21,19 @@ msgstr "" msgid "API" msgstr "API" -#: chat/models.py:17 +#: chat/models.py:17 chat/templates/chat/content.html:14 msgid "General channels" msgstr "Canaux généraux" -#: chat/models.py:18 +#: chat/models.py:18 chat/templates/chat/content.html:18 msgid "Tournament channels" msgstr "Canaux de tournois" -#: chat/models.py:19 +#: chat/models.py:19 chat/templates/chat/content.html:22 msgid "Team channels" msgstr "Canaux d'équipes" -#: chat/models.py:20 +#: chat/models.py:20 chat/templates/chat/content.html:26 msgid "Private channels" msgstr "Messages privés" @@ -126,40 +126,48 @@ msgstr "" "Utilisateur⋅rices supplémentaires qui ont été invité⋅es au canal, en plus du " "groupe autorisé du canal." -#: chat/models.py:95 +#: chat/models.py:102 #, python-brace-format msgid "Channel {name}" msgstr "Canal {name}" -#: chat/models.py:161 chat/models.py:170 +#: chat/models.py:168 chat/models.py:177 msgid "channel" msgstr "canal" -#: chat/models.py:162 +#: chat/models.py:169 msgid "channels" msgstr "canaux" -#: chat/models.py:176 +#: chat/models.py:183 msgid "author" msgstr "auteur⋅rice" -#: chat/models.py:183 +#: chat/models.py:190 msgid "created at" msgstr "créé le" -#: chat/models.py:188 +#: chat/models.py:195 msgid "updated at" msgstr "modifié le" -#: chat/models.py:193 +#: chat/models.py:200 msgid "content" msgstr "contenu" -#: chat/models.py:256 +#: chat/models.py:205 +msgid "users read" +msgstr "utilisateur⋅rices ayant lu" + +#: chat/models.py:208 +msgid "Users who have read the message." +msgstr "Utilisateur⋅rices qui ont lu le message." + +#: chat/models.py:271 msgid "message" msgstr "message" -#: chat/models.py:257 +#: chat/models.py:272 msgid "messages" msgstr "messages" @@ -171,7 +179,7 @@ msgstr "JavaScript doit être activé sur votre navigateur pour accéder au chat msgid "Chat channels" msgstr "Canaux de chat" -#: chat/templates/chat/content.html:17 +#: chat/templates/chat/content.html:34 msgid "" "You can install a shortcut to the chat on your home screen using the " "download button on the header." @@ -179,23 +187,23 @@ msgstr "" "Vous pouvez installer un raccourci vers le chat sur votre écran d'accueil en " "utilisant le bouton de téléchargement dans l'en-tête." -#: chat/templates/chat/content.html:35 +#: chat/templates/chat/content.html:52 msgid "Toggle fullscreen mode" msgstr "Inverse le mode plein écran" -#: chat/templates/chat/content.html:39 tfjm/templates/navbar.html:117 +#: chat/templates/chat/content.html:56 tfjm/templates/navbar.html:117 msgid "Log out" msgstr "Déconnexion" -#: chat/templates/chat/content.html:43 +#: chat/templates/chat/content.html:60 msgid "Install app on home screen" msgstr "Installer l'application sur l'écran d'accueil" -#: chat/templates/chat/content.html:55 +#: chat/templates/chat/content.html:72 msgid "Fetch previous messages…" msgstr "Récupérer les messages précédents…" -#: chat/templates/chat/content.html:66 +#: chat/templates/chat/content.html:83 msgid "Send message…" msgstr "Envoyer un message…" From 80456f4da8b8ac776509d0b4e06a37d437d4f675 Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Sun, 28 Apr 2024 23:54:00 +0200 Subject: [PATCH 31/35] Add sort by unread messages option Signed-off-by: Emmy D'Anello --- chat/static/chat.js | 29 +++++++++++++++++++++++++++-- chat/templates/chat/content.html | 4 ++++ locale/fr/LC_MESSAGES/django.po | 26 +++++++++++++++----------- 3 files changed, 46 insertions(+), 13 deletions(-) diff --git a/chat/static/chat.js b/chat/static/chat.js index 0962f34..c4b8ab9 100644 --- a/chat/static/chat.js +++ b/chat/static/chat.js @@ -95,7 +95,7 @@ async function addChannel(channel, categoryLists) { categoryList.parentElement.classList.remove('d-none') let navItem = document.createElement('li') - navItem.classList.add('list-group-item') + navItem.classList.add('list-group-item', 'tab-channel') navItem.id = `tab-channel-${channel['id']}` navItem.setAttribute('data-bs-dismiss', 'offcanvas') navItem.onclick = () => selectChannel(channel['id']) @@ -115,6 +115,9 @@ async function addChannel(channel, categoryLists) { unreadBadge.classList.add('d-none') channelButton.appendChild(unreadBadge) + if (document.getElementById('sort-by-unread-switch').checked) + navItem.style.order = `${-channel.unread_messages}` + fetchMessages(channel['id']) } @@ -187,7 +190,8 @@ function markMessageAsRead(data) { } function updateUnreadBadges(unreadMessages) { - console.log(unreadMessages) + const sortByUnread = document.getElementById('sort-by-unread-switch').checked + for (let channel of Object.values(channels)) { let unreadMessagesChannel = unreadMessages[channel['id']] || 0 console.log(channel, unreadMessagesChannel) @@ -199,6 +203,9 @@ function updateUnreadBadges(unreadMessages) { unreadBadge.classList.remove('d-none') else unreadBadge.classList.add('d-none') + + if (sortByUnread) + document.getElementById(`tab-channel-${channel['id']}`).style.order = `${-unreadMessagesChannel}` } } @@ -392,6 +399,24 @@ function toggleFullscreen() { document.addEventListener('DOMContentLoaded', () => { document.addEventListener('click', removeAllPopovers) + document.getElementById('sort-by-unread-switch').addEventListener('change', event => { + const sortByUnread = event.target.checked + for (let channel of Object.values(channels)) { + let item = document.getElementById(`tab-channel-${channel['id']}`) + if (sortByUnread) + item.style.order = `${-channel.unread_messages}` + else + item.style.removeProperty('order') + } + + localStorage.setItem('chat.sort-by-unread', sortByUnread) + }) + + if (localStorage.getItem('chat.sort-by-unread') === 'true') { + document.getElementById('sort-by-unread-switch').checked = true + document.getElementById('sort-by-unread-switch').dispatchEvent(new Event('change')) + } + /** * Process the received data from the server. * @param data The received message diff --git a/chat/templates/chat/content.html b/chat/templates/chat/content.html index 2e1d8e1..0bf517f 100644 --- a/chat/templates/chat/content.html +++ b/chat/templates/chat/content.html @@ -9,6 +9,10 @@
                +
                + + +