feat: point to Zulip chat rather than jabber. (ietf-tools#4218)

* feat: point to Zulip chat rather than jabber.

* fix: Address review comments from Jennifer and Nick

Author: rjsparks

client/agenda/AgendaScheduleList.vue

@@ -278,12 +278,12 @@ const meetingEvents = computed(() => {
       }
       if (item.adjustedEnd > current) {
         // -> Pre/live event
-        // -> Jabber logs
+        // -> Chat room
         links.push({
-          id: `lnk-${item.id}-logs`,
-          label: `Chat logs for ${item.acronym}`,
+          id: `lnk-${item.id}-room`,
+          label: `Chat room for ${item.acronym}`,
           icon: 'chat-left-text',
-          href: `xmpp:${item.type === 'plenary' ? 'plenary' : item.acronym}@jabber.ietf.org?join`,
+          href: item.links.chat,
           color: 'green'
         })
         // -> Video stream
@@ -339,12 +339,12 @@ const meetingEvents = computed(() => {
       } else {
         // -> Post event
         if (meetingNumberInt >= 60) {
-          // -> Jabber logs
+          // -> Chat logs
           links.push({
             id: `lnk-${item.id}-logs`,
             label: `Chat logs for ${item.acronym}`,
             icon: 'chat-left-text',
-            href: `https://www.ietf.org/jabber/logs/${item.type === 'plenary' ? 'plenary' : item.acronym}?C=M;O=D`,
+            href: item.links.chatArchive,
             color: 'green'
           })
         }

client/agenda/store.js

@@ -107,12 +107,11 @@ export const useAgendaStore = defineStore('agenda', {
           adjustedStartDateTime: eventStartDate.toISO(),
           adjustedEndDateTime: eventEndDate.toISO(),
           links: {
-            recordings: s.links.recordings,
+            ...s.links,
             videoStream: formatLinkUrl(s.links.videoStream, s, state.meeting.number),
             onsiteTool: formatLinkUrl(s.links.onsiteTool, s, state.meeting.number),
             audioStream: formatLinkUrl(s.links.audioStream, s, state.meeting.number),
-            remoteCallIn: remoteCallInUrl,
-            calendar: s.links.calendar
+            remoteCallIn: remoteCallInUrl
           },
           sessionKeyword: s.sessionToken ? `${s.groupAcronym}-${s.sessionToken}` : s.groupAcronym
         }

ietf/doc/templatetags/ietf_filters.py

@@ -729,7 +729,7 @@ def is_special_agenda_item(assignment):
 
 @register.filter
 def should_show_agenda_session_buttons(assignment):
-    """Should this agenda item show the session buttons (jabber link, etc)?
+    """Should this agenda item show the session buttons (chat link, etc)?
 
     In IETF-112 and earlier, office hours sessions were designated by a name ending
     with ' office hours' and belonged to the IESG or some other group. This led to

ietf/group/admin.py

@@ -200,7 +200,7 @@ class GroupFeaturesAdmin(admin.ModelAdmin):
         'has_nonsession_materials',
         'has_meetings',
         'has_reviews',
-        'has_default_jabber',
+        'has_default_chat',
         'acts_like_wg',
         'create_wiki',
         'custom_group_roles',

ietf/group/migrations/0057_nojabber_onlychat.py

@@ -0,0 +1,19 @@
+# Copyright The IETF Trust 2022, All Rights Reserved
+# Generated by Django 2.2.28 on 2022-07-14 09:09
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('group', '0056_dir_chair_groupman_role'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='groupfeatures',
+            old_name='has_default_jabber',
+            new_name='has_default_chat',
+        ),
+    ]

ietf/group/models.py

@@ -205,6 +205,16 @@ def get_description(self):
                     desc = [ p for p in re.split(r'\r?\n\s*\r?\n\s*', text) if p.strip() ][0]
         return desc
 
+    def chat_room_url(self):
+        return settings.CHAT_URL_PATTERN.format(chat_room_name=self.acronym)
+
+    def chat_archive_url(self):
+        # Zulip has no separate archive
+        if 'CHAT_ARCHIVE_URL_PATTERN' in settings:
+            return settings.CHAT_ARCHIVE_URL_PATTERN.format(chat_room_name=self.acronym)
+        else:
+            return self.chat_room_url()
+
 
 validate_comma_separated_materials = RegexValidator(
     regex=r"[a-z0-9_-]+(,[a-z0-9_-]+)*",
@@ -237,7 +247,7 @@ class GroupFeatures(models.Model):
     has_nonsession_materials= models.BooleanField("Other Matrl.",  default=False)
     has_meetings            = models.BooleanField("Meetings",   default=False)
     has_reviews             = models.BooleanField("Reviews",    default=False)
-    has_default_jabber      = models.BooleanField("Jabber",     default=False)
+    has_default_chat        = models.BooleanField("Chat",     default=False)
     #
     acts_like_wg            = models.BooleanField("WG-Like",    default=False)
     create_wiki             = models.BooleanField("Wiki",       default=False)

ietf/group/resources.py

@@ -302,7 +302,7 @@ class Meta:
             "has_nonsession_materials": ALL,
             "has_meetings": ALL,
             "has_reviews": ALL,
-            "has_default_jabber": ALL,
+            "has_default_chat": ALL,
             "customize_workflow": ALL,
             "about_page": ALL,
             "default_tab": ALL,

ietf/meeting/models.py

@@ -1254,14 +1254,24 @@ def agenda_file(self):
 
         return self._agenda_file
 
-    def jabber_room_name(self):
+    def chat_room_name(self):
         if self.type_id=='plenary':
             return 'plenary'
-        elif self.historic_group:
+        elif hasattr(self, 'historic_group'):
             return self.historic_group.acronym
         else:
             return self.group.acronym
 
+    def chat_room_url(self):
+        return settings.CHAT_URL_PATTERN.format(chat_room_name=self.chat_room_name())
+
+    def chat_archive_url(self):
+        # Zulip has no separate archive
+        if hasattr(settings,'CHAT_ARCHIVE_URL_PATTERN'):
+            return settings.CHAT_ARCHIVE_URL_PATTERN.format(chat_room_name=self.chat_room_name())
+        else:
+            return self.chat_room_url()
+
     def notes_id(self):
         note_id_fragment = 'plenary' if self.type.slug == 'plenary' else self.group.acronym
         return f'notes-ietf-{self.meeting.number}-{note_id_fragment}'

ietf/meeting/views.py

@@ -1639,7 +1639,7 @@ def agenda_neue(request, num=None, name=None, base=None, ext=None, owner=None, u
             "categories": filter_organizer.get_filter_categories(),
             "isCurrentMeeting": is_current_meeting,
             "useHedgeDoc": True if meeting.date>=settings.MEETING_USES_CODIMD_DATE else False,
-            "schedule": list(map(agenda_extract_shedule, filtered_assignments)),
+            "schedule": list(map(agenda_extract_schedule, filtered_assignments)),
             "floors": list(map(agenda_extract_floorplan, floors))
         },
         "schedule": {
@@ -1651,7 +1651,7 @@ def agenda_neue(request, num=None, name=None, base=None, ext=None, owner=None, u
 
     return rendered_page
 
-def agenda_extract_shedule (item):
+def agenda_extract_schedule (item):
     return {
         "id": item.id,
         "room": item.room_name,
@@ -1689,7 +1689,8 @@ def agenda_extract_shedule (item):
         "short": item.session.short if item.session.short else item.session.short_name,
         "sessionToken": item.session.docname_token_only_for_multiple(),
         "links": {
-            # "jabber": item.session.jabber_room_name
+            "chat" : item.session.chat_room_url(),
+            "chatArchive" : item.session.chat_archive_url(),
             "recordings": list(map(agenda_extract_recording, item.session.recordings())),
             "videoStream": item.timeslot.location.video_stream_url() if item.timeslot.location else "",
             "audioStream": item.timeslot.location.audio_stream_url() if item.timeslot.location else "",