Merge branch 'master' of whale@ruin.nu:git/NDIRC

diff --git a/Members.pm b/Members.pm
index 40d50bc8284fd897d66b0b7f4cc2c377cf156f0c..027ac7c0c611bbd04a86f438cc03974875e26475 100644 (file)
--- a/Members.pm
+++ b/Members.pm
@@ -66,7 +66,7 @@ SQL
                $f->execute();
                my $calls = "";
                while (my ($raid) = $f->fetchrow()){
-                       $calls .= " http://nd.ruin.nu/raids?raid=$raid |"
+                       $calls .= " https://nd.ruin.nu/raids/view/$raid |"
                }
                $calls = "No open future raids" if ($f->rows == 0);
                chop($calls);

diff --git a/Scans.pm b/Scans.pm
index ccdc1f34d96c9189dce1919cfd8aa906b1951a11..76c1e0534f41eaf71d4e87b9c69441ed5ac1cd2d 100644 (file)
--- a/Scans.pm
+++ b/Scans.pm
@@ -28,7 +28,7 @@ our @ISA = qw/Exporter/;
 our @EXPORT = qw/addScan addScanGroup sendScan/;
 
 sub addScan {
-       my ($id,$verbose) = @_;
+       my ($id,$verbose, $quiet) = @_;
        if (1){
                unless ($ND::DBH->selectrow_array(q{SELECT scan_id FROM scans WHERE NOT groupscan AND scan_id = ? AND tick >= tick() - 168},undef,$id)){
                        my @user = $ND::DBH->selectrow_array(q{SELECT uid,username, scan_points, tick() 
@@ -38,7 +38,12 @@ sub addScan {
                                if (@user){
                                        $ND::DBH->do('UPDATE users SET scan_points = scan_points + 1 WHERE uid = ? ',undef,$user[0]);
                                        $user[2] += 1;
-                                       $ND::server->command("msg $ND::target Added scan, at tick $user[3]. $user[1] points now $user[2]");
+                                       if ($quiet){
+                                               $ND::server->command("msg $ND::target Added scan, points now $user[2]");
+                                       }
+                                       else{
+                                               $ND::server->command("msg $ND::target Added scan, at tick $user[3]. $user[1] points now $user[2]");
+                                       }
                                }elsif ($verbose){
                                        $ND::server->command("msg $ND::target Added scan, but unknown user, no points");
                                }

diff --git a/Usermgm.pm b/Usermgm.pm
index 63e3187e1531dad9b7b82d5faba1029d07a3181a..445a33a9eae1923895ff874507f3ab031a1acc96 100644 (file)
--- a/Usermgm.pm
+++ b/Usermgm.pm
@@ -141,12 +141,21 @@ sub laston {
                        $min = $2;
                        $min = 0 unless defined $min;
                        $f = $ND::DBH->prepare(qq{SELECT username,last,lastforum
-                               FROM (SELECT uid,username, date_part('day',now() - laston)::int AS last,date_part('day',now() - last_forum_visit)::int AS lastforum, laston FROM users) u NATURAL JOIN groupmembers NATURAL JOIN groups WHERE flag = ? AND (last >= ? OR last IS NULL) ORDER BY laston
+                               FROM (SELECT uid,username, date_part('day',now() - laston)::int AS last
+                                       ,date_part('day',now() - (SELECT max(time) FROM forum_thread_visits WHERE uid = u.uid))::int AS lastforum
+                                       ,laston FROM users u) u
+                                       NATURAL JOIN groupmembers
+                                       NATURAL JOIN groups
+                               WHERE flag = ? AND (last >= ? OR last IS NULL)
+                               ORDER BY laston
                                });
                        $f->execute($flag,$min);
                }elsif(defined $msg && $msg =~ /^(\S+)$/){
                        $f = $ND::DBH->prepare(qq{SELECT username,last,lastforum
-                               FROM (SELECT uid,username, date_part('day',now() - laston)::int AS last,date_part('day',now() - last_forum_visit)::int AS lastforum, laston FROM users) u WHERE username ILIKE ? ORDER BY lower(username)
+                               FROM (SELECT uid,username, date_part('day',now() - laston)::int AS last
+                                       ,date_part('day',now() - (SELECT max(time) FROM forum_thread_visits WHERE uid = u.uid))::int AS lastforum
+                                       , laston FROM users u) u
+                               WHERE username ILIKE ? ORDER BY lower(username)
                                });
                        $f->execute($1);
                }else{