web commit by joey

[git.ikiwiki.info.git] / IkiWiki / UserInfo.pm

diff --git a/IkiWiki/UserInfo.pm b/IkiWiki/UserInfo.pm
index f4e261563d3ef625be6e776014a93eaf7fd691f5..fabe495bbe532821f507d6bdaf9342c70fb9ed3c 100644 (file)
--- a/IkiWiki/UserInfo.pm
+++ b/IkiWiki/UserInfo.pm
@@ -3,6 +3,7 @@
 use warnings;
 use strict;
 use Storable;
+use IkiWiki;
 
 package IkiWiki;
 
@@ -66,16 +67,24 @@ sub is_admin ($) { #{{{
        return grep { $_ eq $user_name } @{$config{adminuser}};
 } #}}}
 
-sub page_subscribers (@) { #{{{
+sub commit_notify_list ($@) { #{{{
+       my $committer=shift;
+       
+       my @pages;
+       foreach my $file (@_) {
+               push @pages, grep { $pagesources{$_} eq $file } keys %pagesources;
+       }
+       
        my @ret;
        my $userinfo=userinfo_retrieve();
        foreach my $user (keys %{$userinfo}) {
-               if (exists $user->{subscriptions} &&
-                   length $user->{subscriptions} &&
-                   exists $user->{email} &&
-                   length $user->{email} &&
-                   grep { globmatch($_, $user->{subscriptions}) } @_) {
-                       push @ret, $user->{email};
+               next if $user eq $committer;
+               if (exists $userinfo->{$user}->{subscriptions} &&
+                   length $userinfo->{$user}->{subscriptions} &&
+                   exists $userinfo->{$user}->{email} &&
+                   length $userinfo->{$user}->{email} &&
+                   grep { globlist_match($_, $userinfo->{$user}->{subscriptions}) } @pages) {
+                       push @ret, $userinfo->{$user}->{email};
                }
        }
        return @ret;