@@ -698,12 +698,8 @@ userNotifyFeature ServerEnv{serverBaseURI, serverCron}
698
698
699
699
idx <- queryGetPackageIndex
700
700
revIdx <- liftIO queryReverseIndex
701
- let
702
- genEmails :: PackageIdentifier -> IO (Map. Map (UserId , PackageId ) [PackageId ])
703
- genEmails =
704
- dependencyReleaseEmails (queryUserGroup . maintainersGroup) idx revIdx queryGetUserNotifyPref
705
- dependencyEmailMap <- Map. unionsWith (++) <$> traverse (genEmails . pkgInfoToPkgId) revisionsAndUploads
706
- dependencyEmails <- Map. mapKeys fst <$> Map. traverseWithKey describeDependencyUpdate dependencyEmailMap
701
+ dependencyUpdateNotifications <- Map. unionsWith (++) <$> traverse (genDependencyUpdateList idx revIdx . pkgInfoToPkgId) revisionsAndUploads
702
+ dependencyEmails <- Map. mapKeys fst <$> Map. traverseWithKey describeDependencyUpdate dependencyUpdateNotifications
707
703
708
704
-- Concat the constituent email parts such that only one email is sent per user
709
705
mapM_ (sendNotifyEmailAndDelay users) . Map. toList $ foldr1 (Map. unionWith (++) ) $ [revisionUploadEmails, groupActionEmails, docReportEmails, tagProposalEmails]
@@ -799,6 +795,9 @@ userNotifyFeature ServerEnv{serverBaseURI, serverCron}
799
795
maintainers <- queryUserGroup $ maintainersGroup (fst pkgTags)
800
796
return $ foldr addNotification mp (toList maintainers)
801
797
798
+ genDependencyUpdateList idx revIdx =
799
+ dependencyReleaseEmails (queryUserGroup . maintainersGroup) idx revIdx queryGetUserNotifyPref
800
+
802
801
describeRevision users earlier now pkg =
803
802
if pkgNumRevisions pkg <= 1
804
803
then " Package upload, " ++ display (packageName pkg) ++ " , by " ++
0 commit comments