fix unwanted dupe notifications on looped PC12

diff --git a/Changes b/Changes
index 790a2b73902b8baabe2305afbd48416f4051b096..47eee0a10aa71cf0efa26c1858e37b57a6702829 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,5 @@
+03Jul07=======================================================================
+1. fix unwanted dupe notifications if a PC12 comes back in on a loop.
 02Jul07=======================================================================
 1. Add a new command to show the contents of the cmd_cache. This allows those
 people whom develop their own commands to see which version they are using.

diff --git a/perl/AnnTalk.pm b/perl/AnnTalk.pm
index 72abfeb283c6bf35b6dbb839f999e3bf96259289..02bb0a9bedca8393479b4ef40668ff6eb7b6b97b 100644 (file)
--- a/perl/AnnTalk.pm
+++ b/perl/AnnTalk.pm
@@ -18,7 +18,7 @@ use DXVars;
 use vars qw(%dup $duplth $dupage $filterdef);
 
 $duplth = 60;                                  # the length of text to use in the deduping
-$dupage = 5*3600;                      # the length of time to hold spot dups
+$dupage = 5*3600;                      # the length of time to hold ann dups
 $filterdef = bless ([
                          # tag, sort, field, priv, special parser 
                          ['by', 'c', 0],

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index ec6f5b0400a6b309d0da0b398a5235260373b5cf..296553d24c16b0875d4d3f2a870bbb95d9ad9215 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -69,7 +69,7 @@ $eph_pc15_restime = 6*60;
 $eph_pc34_restime = 30;
 $pingint = 5*60;
 $obscount = 2;
-$chatdupeage = 20 * 60 * 60;
+$chatdupeage = 20 * 60;
 $chatimportfn = "$main::root/chat_import";
 $investigation_int = 12*60*60; # time between checks to see if we can see this node
 $pc19_version = 5466;                  # the visible version no for outgoing PC19s generated from pc59
@@ -654,9 +654,9 @@ sub send_announce
                }
        }
 
-       if (AnnTalk::dup($from, $_[1], $_[2])) {
+       if (AnnTalk::dup($from, $target, $_[2])) {
                my $dxchan = DXChannel::get($from);
-               if ($dxchan && $dxchan->is_user) {
+               if ($self == $main::me && $dxchan && $dxchan->is_user) {
                        if ($dxchan->priv < 5) {
                                $dxchan->send($dxchan->msg('dup'));
                                return;
@@ -681,7 +681,7 @@ sub send_announce
        }
 }
 
-my $msgid = 0;
+my $msgid = int rand(1000);
 
 sub nextchatmsgid
 {
@@ -722,9 +722,9 @@ sub send_chat
                }
        }
 
-       if (AnnTalk::dup($from, $target, $_[2], $chatdupeage)) {
+       if (AnnTalk::dup($from, $target, $_[2], $main::systime + $chatdupeage)) {
                my $dxchan = DXChannel::get($from);
-               if ($dxchan && $dxchan->is_user) {
+               if ($self == $main::me && $dxchan && $dxchan->is_user) {
                        if ($dxchan->priv < 5) {
                                $dxchan->send($dxchan->msg('dup'));
                                return;

diff --git a/perl/Version.pm b/perl/Version.pm
index 50a7ce663461f89053aaae4836229b9b822a49d7..5c6d1a29ff785bda9102ce4a44058f33c9858fc5 100644 (file)
--- a/perl/Version.pm
+++ b/perl/Version.pm
@@ -11,6 +11,6 @@ use vars qw($version $subversion $build);
 
 $version = '1.54';
 $subversion = '0';
-$build = '100';
+$build = '101';
 
 1;