add set/buddy.

[spider.git] / perl / DXUser.pm

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index 13c5ba8101f55a66213d17be199e69901800710d..413d56a6446c6678b779498498ef4bfd56146ef9 100644 (file)
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -61,7 +61,8 @@ $v3 = 0;
                  annok => '9,Accept Announces?,yesno', # accept his announces?
                  lang => '0,Language',
                  hmsgno => '0,Highest Msgno',
-                 group => '0,Chat Group,parray',       # used to create a group of users/nodes for some purpose or other
+                 group => '0,Group,parray',    # used to create a group of users/nodes for some purpose or other
+                 buddies => '0,Buddies,parray',
                  isolate => '9,Isolate network,yesno',
                  wantbeep => '0,Req Beep,yesno',
                  wantann => '0,Req Announce,yesno',
@@ -141,7 +142,7 @@ sub init
 
                $ufn = "$fn.v3";
                $v3 = 1;
-               $convert++ unless -e $ufn;
+               $convert++ if -e "$fn.v2" && !-e $ufn;
        }
        
        if ($mode) {
@@ -150,10 +151,12 @@ sub init
                $dbm = tie (%u, 'DB_File', $ufn, O_RDONLY, 0666, $DB_BTREE) or confess "can't open user file: $fn ($!) [rebuild it from user_asc?]";
        }
 
+       die "Cannot open $ufn ($!)\n" unless $dbm;
+
        $lru = LRU->newbase("DXUser", $lrusize);
        
        # do a conversion if required
-       if ($convert) {
+       if ($dbm && $convert) {
                my ($key, $val, $action, $count, $err) = ('','',0,0,0);
                
                my %oldu;
@@ -583,6 +586,13 @@ sub new_group
        $self->{group} = [ 'local' ];
 }
 
+# set up empty buddies (only happens for them's that connect direct)
+sub new_buddies
+{
+       my $self = shift;
+       $self->{buddies} = [  ];
+}
+
 #
 # return a prompt for a field
 #
@@ -723,6 +733,12 @@ sub is_node
        return $self->{sort} =~ /[ACRSX]/;
 }
 
+sub is_local_node
+{
+       my $self = shift;
+       return grep $_ eq 'local_node', @{$self->{group}};
+}
+
 sub is_user
 {
        my $self = shift;