Support subsubteams

Author: fmease

src/teams.rs

@@ -106,17 +106,36 @@ impl Data {
         let mut wgs = Vec::new();
         let mut project_groups = Vec::new();
         self.teams
-            .into_iter()
+            .iter()
             .filter(|team| team.website_data.is_some())
             .filter(|team| team.subteam_of.as_ref() == Some(&main_team.name))
-            .for_each(|team| match team.kind {
-                TeamKind::Team => subteams.push(team),
-                TeamKind::WorkingGroup => wgs.push(team),
-                TeamKind::ProjectGroup => project_groups.push(team),
+            .for_each(|subteam| match subteam.kind {
+                TeamKind::Team => {
+                    subteams.push(subteam.clone());
+
+                    subteams.extend(
+                        self.teams
+                            .iter()
+                            .filter(|team| team.subteam_of.as_ref() == Some(&subteam.name))
+                            .filter(|team| matches!(team.kind, TeamKind::Team))
+                            .filter(|team| team.website_data.is_some())
+                            .cloned(),
+                    );
+                }
+                TeamKind::WorkingGroup => wgs.push(subteam.clone()),
+                TeamKind::ProjectGroup => project_groups.push(subteam.clone()),
                 _ => {}
             });
 
-        subteams.sort_by_key(|team| Reverse(team.website_data.as_ref().unwrap().weight));
+        subteams.sort_by_key(|team| {
+            Reverse((
+                self.teams
+                    .iter()
+                    .find(|superteam| team.subteam_of.as_ref() == Some(&superteam.name))
+                    .and_then(|team| team.website_data.as_ref().map(|data| data.weight)),
+                team.website_data.as_ref().unwrap().weight,
+            ))
+        });
         wgs.sort_by_key(|team| Reverse(team.website_data.as_ref().unwrap().weight));
         project_groups.sort_by_key(|team| Reverse(team.website_data.as_ref().unwrap().weight));