Patch from Phil:

patch-pisg-violence is the largest of the three and involves some change
in functionality.  It removes the "slap" statistics, replacing them with
more generic "attack" statistics, with the attack words being
user-definable.  It requires appropriate entries in lang.text (violent1,
violent2, violent3, violenttext, attacked1, attacked2, and attackedtext),
but I have only made the necessary changes to the English template.  The
other languages will have to be changed before this patch will work with
them.  I also addressed Sourceforge bug #456152 and only output one line
if no one attacked anyone.

CONFIG-README

@@ -132,8 +132,8 @@ show_actionline      1 or 0, this will add an example-actionline to the
 show_shoutline       1 or 0, this will add an example-shoutline to the
                      "Most shouting people"-stats
 
-show_slaplines       1 or 0, this will add an exaple-slap to the
-                     "Most slaping" and "Most slapped"-stats
+show_violentlines    1 or 0, this will add an example-attack to the
+                     "Most aggressive" and "Most attacked"-stats
 
 ignorewords          A space seperated list of words to ignore in 'most
                      referenced words'
@@ -197,4 +197,10 @@ So this option configures which words which are considered to be "foul":
 Or in German:
 <set foul="scheisse scheiße kacke">
 
+pisg also recognizes that people may attack others in a variety of ways.
+The words that pisg considers to be attacks may be set with the "violent"
+option:
+
+<set violent="slaps beats kicks">
+
 Have fun configuring pisg! :)

Changelog

@@ -4,6 +4,10 @@ pisg (0.22)
    * When using logdirs, files is now sorted properly, so files is read in the
      right order (thanks, Sascha Lüdecke)
    * A bunch of English grammar corrections (thanks, Phil Gregory)
+   * Words like //www is now being ignored as they should.
+   * Instead of 'slaps' we now have 'violence', so one can define their own
+     action lines to be counted. Like '/me hits nick on the forehead',
+     configured by the 'violent' variable.
 
 pisg (0.21) - Mon, Aug 27th 2001
    * Fix stupid legend bug; 0-6 should be 0-5, and 7-11 should be 6-11.

lang.txt

@@ -48,15 +48,14 @@ shout3 = "Everybody had their shift-key under control.  :)"
 shouttext = "<b>For example, like this:</b><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[:line]"
 
 
-slap1 = "<b>[:nick]</b> is a very aggresive person.  [:He:She:] slapped others around <b>[:slaps]</b> times."
-slap2 = "<b>[:nick]</b> can't control [:his:her:] aggressions.  [:He:She:] slapped people around <b>[:slaps]</b> times."
-slap3 = "Nobody slapped anyone around.  Everybody was friendly."
-slaptext = "<b>For example, like this:</b><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[:line]"
+violent1 = "<b>[:nick]</b> is a very aggresive person.  [:He:She:] attacked others <b>[:attacks]</b> times."
+violent2 = "<b>[:nick]</b> can't control [:his:her:] aggressions, either.  [:He:She:] picked on others <b>[:attacks]</b> times."
+violent3 = "Nobody beat anyone up.  Everybody was friendly."
+violenttext = "<b>For example, like this:</b><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[:line]"
 
-slapped1 = "Poor <b>[:nick]</b>, nobody likes [:him:her:].  [:He:She:] got slapped <b>[:slaps]</b> times."
-slapped2 = "<b>[:nick]</b> seems to be unliked too.  [:He:She:] got slapped <b>[:slaps]</b> times."
-slapped3 = "Nobody got slapped in this channel.  :)"
-slappedtext = "<b>For example, like this:</b><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[:line]"
+attacked1 = "Poor <b>[:nick]</b>, nobody likes [:him:her:].  [:He:She:] was attacked <b>[:attacks]</b> times."
+attacked2 = "<b>[:nick]</b> seems to be unliked too.  [:He:She:] got beaten <b>[:attacks]</b> times."
+attackedtext = "<b>For example, like this:</b><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[:line]"
 
 gotkick1 = "<b>[:nick]</b> wasn't very popular, getting kicked [:kicks] times!"
 gotkick2 = "<b>[:nick]</b> seemed to be hated too:  [:kicks] kicks were received."
@@ -164,15 +163,15 @@ shout2 = "<b>[:nick]</b> hat auch wohl vergessen CAPS-Lock auszuschalten, von [:
 shout3 = "Alle hatten ihre Shift-Taste gut unter kontrolle :)"
 shouttext = "<b>Zum Beispiel so:</b><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[:line]"
 
-slap1 = "<b>[:nick]</b> ist etwas agressiv. [:Er:Sie:] schlug <b>[:slaps]</b> mal wild um sich herum."
-slap2 = "Auch <b>[:nick]</b> hat einige Probleme seine Agressionen unter Kontrolle zu halten, <b>[:slaps]</b> Schläge von [:ihm:ihr:]."
-slap3 = "Alle waren friedlich im Channel, niemand hat jemanden geschlagen."
+violent1 = "<b>[:nick]</b> ist etwas agressiv. [:Er:Sie:] schlug <b>[:attacks]</b> mal wild um sich herum."
+violent2 = "Auch <b>[:nick]</b> hat einige Probleme seine Agressionen unter Kontrolle zu halten, <b>[:attacks]</b> Schläge von [:ihm:ihr:]."
+violent3 = "Alle waren friedlich im Channel, niemand hat jemanden geschlagen."
 slaptext = "<b>Zum Beispiel so:</b><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[:line]"
 
-slapped1 = "<b>[:nick]</b> ist der Sündenbock im Channel, [:er:sie:] wurde <b>[:slaps]</b> mal geschlagen."
-slapped2 = "<b>[:nick]</b> hat auch [:sein:ihr:] Fett weg bekommen, [:er:sie:] hat <b>[:slaps]</b> mal Schläge bekommen."
-slapped3 = "Niemand wurde geschlagen."
-slappedtext = "<b>Zum Beispiel so:</b><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[:line]"
+attacked1 = "<b>[:nick]</b> ist der Sündenbock im Channel, [:er:sie:] wurde <b>[:attacks]</b> mal geschlagen."
+attacked2 = "<b>[:nick]</b> hat auch [:sein:ihr:] Fett weg bekommen, [:er:sie:] hat <b>[:attacks]</b> mal Schläge bekommen."
+attacked3 = "Niemand wurde geschlagen."
+violenttext = "<b>Zum Beispiel so:</b><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[:line]"
 
 gotkick1 = "<b>[:nick]</b> war wohl der Channelclown, [:er:sie:] wurde [:kicks] mal gekickt!"
 gotkick2 = "<b>[:nick]</b> konnte sich scheinbar auch nicht benehmen, [:kicks] kicks für [:ihn:sie:]."
@@ -313,15 +312,15 @@ shout2 = "<b>[:nick]</b> glemte vidst at Caps-Lock var sl
 shout3 = "Ser ud til at alle har deres shift under kontrol :)"
 shouttext = "<b>For eksempel sådan her: </b><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[:line]"
 
-slap1 = "<b>[:nick]</b> er en meget aggresiv person, han delte <b>[:slaps]</b> slaps ud."
-slap2 = "<b>[:nick]</b> er ude af kontrol. Han/Hun slog andre folk <b>[:slaps]</b> gang(e)."
-slap3 = "Alle er glade ... endnu 8)"
+violent1 = "<b>[:nick]</b> er en meget aggresiv person, han delte <b>[:attacks]</b> slaps ud."
+violent2 = "<b>[:nick]</b> er ude af kontrol. Han/Hun slog andre folk <b>[:attacks]</b> gang(e)."
+violent3 = "Alle er glade ... endnu 8)"
 slaptext = "<b>For eksempel sådan her:</b><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[:line]"
 
-slapped1 = "Ærgeligt. Ingen kan li' <b>[:nick]</b>. Han/Hun blev banket <b>[:slaps]</b> gange."
-slapped2 = "<b>[:nick]</b> er vidst heller ikke for polulær, han/hun fik tæsk <b>[:slaps]</b> gang(e)."
-slapped3 = "Ingen er blevet banket i denne kanal :)"
-slappedtext = "<b>For eksempel sådan her:</b><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[:line]"
+attacked1 = "Ærgeligt. Ingen kan li' <b>[:nick]</b>. Han/Hun blev banket <b>[:attacks]</b> gange."
+attacked2 = "<b>[:nick]</b> er vidst heller ikke for polulær, han/hun fik tæsk <b>[:attacks]</b> gang(e)."
+attacked3 = "Ingen er blevet banket i denne kanal :)"
+violenttext = "<b>For eksempel sådan her:</b><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[:line]"
 
 words1 = "<b>[:nick]</b> er meget aktiv med [:words] skrevne ord!"
 words2 = "[:oldnick] blev tæt forfulgt af <b>[:nick]</b>, med [:words] ord."
@@ -330,7 +329,7 @@ words3 = "Hmmm ingen har sagt noget endnu... underlig kanal..."
 month = "Januar Februar Marts April Maj Juni Juli August September Oktober November December"
 day = "Søndag Mandag Tirsdag Onsdag Torsdag Fredag Lørdag"
 
-notopic = "Et topic blev aldrig sat på denne kanal.";
+notopic = "Et topic blev aldrig sat på denne kanal."
 
 ## Topics
 
@@ -476,13 +475,13 @@ shout1 = "A <b>[:nick]</b> se le ha atascado el bloqueo de mayusculas, el [:per]
 shout2 = "<b>[:nick]</b> debe tener vicio con la tecla shift, el [:per]% del tiempo hace lo mismo"
 shout3 = "Todo el mundo tiene su tecla shift bajo control :)"
 
-slap1 = "<b>[:nick]</b> es el más agresivo del canal, ha repartido tortas <b>[:slaps]</b> veces."
-slap2 = "<b>[:nick]</b> tiene la mano floja. Ha repartido tortas <b>[:slaps]</b> veces."
-slap3 = "Nadie ha repartido tortas en este canal, todo el mundo parece amigable."
+violent1 = "<b>[:nick]</b> es el más agresivo del canal, ha repartido tortas <b>[:attacks]</b> veces."
+violent2 = "<b>[:nick]</b> tiene la mano floja. Ha repartido tortas <b>[:attacks]</b> veces."
+violent3 = "Nadie ha repartido tortas en este canal, todo el mundo parece amigable."
 
-slapped1 = "Pobre <b>[:nick]</b>, No le gusta a nadie. Ha sido abofeteado <b>[:slaps]</b> veces."
-slapped2 = "<b>[:nick]</b> tiene marcas de dedos en la cara. Ha sido abofeteado <b>[:slaps]</b> veces."
-slapped3 = "Nadie ha sido abofeteado en este canal :)"
+attacked1 = "Pobre <b>[:nick]</b>, No le gusta a nadie. Ha sido abofeteado <b>[:attacks]</b> veces."
+attacked2 = "<b>[:nick]</b> tiene marcas de dedos en la cara. Ha sido abofeteado <b>[:attacks]</b> veces."
+attacked3 = "Nadie ha sido abofeteado en este canal :)"
 
 gotkick1 = "<b>[:nick]</b> ha sido algo capullo y por eso lo echamos [:kicks] veces!"
 gotkick2 = "<b>[:nick]</b> tambien nos toca bastante las narices, por eso lo echamos [:kicks] veces"
@@ -812,13 +811,13 @@ shout1 = "Het lijkt dat  <b>[:nick]</b>'s zijn/haar shift-key kapot is,met een c
 shout2 = "<b>[:nick]</b> is ff vergetuh ze Caps-Lock uit te zettuh, [:per]% CAPS"
 shout3 = "Iedereen had het hoofdletter gebruik onder de knie :)"
 
-slap1 = "<b>[:nick]</b> is een agressief persoon, die veel in het rond slaat wel <b>[:slaps]</b> keer."
-slap2 = "<b>[:nick]</b> ze pilltjes helpen niet. Hij/zij sloeg <b>[:slaps]</b> keer."
-slap3 = "Geen slaps uitgedeeld hiero, wat een vriendelijk ongeregeld zooitje."
+violent1 = "<b>[:nick]</b> is een agressief persoon, die veel in het rond slaat wel <b>[:attacks]</b> keer."
+violent2 = "<b>[:nick]</b> ze pilltjes helpen niet. Hij/zij sloeg <b>[:attacks]</b> keer."
+violent3 = "Geen slaps uitgedeeld hiero, wat een vriendelijk ongeregeld zooitje."
 
-slapped1 = "Zielige <b>[:nick]</b>, niemand mag haar/hem. Hij/zij werdt <b>[:slaps]</b> x geslapped."
-slapped2 = "<b>[:nick]</b> nog zo'n ongewenst zieltjes, hij/zij werd <b>[:slaps]</b> gepijnigt."
-slapped3 = "Niemand irriteerde mensen en er werdt dus ook niemand geslapt :)"
+attacked1 = "Zielige <b>[:nick]</b>, niemand mag haar/hem. Hij/zij werdt <b>[:attacks]</b> x geslapped."
+attacked2 = "<b>[:nick]</b> nog zo'n ongewenst zieltjes, hij/zij werd <b>[:attacks]</b> gepijnigt."
+attacked3 = "Niemand irriteerde mensen en er werdt dus ook niemand geslapt :)"
 
 gotkick1 = "<b>[:nick]</b> was gewoon niet populair genoeg, en werdt [:kicks] x gekickt !"
 gotkick2 = "<b>[:nick]</b> werd ook niet echt gemogen met, [:kicks] ontvangen kicks"
@@ -909,13 +908,13 @@ shout1 = "Det verkar som <b>[:nick]</b> har en h
 shout2 = "<b>[:nick]</b> glömde att deaktivera sin CapsLock-tangent, [:per]% av det han/hon skrev var VERSALER"
 shout3 = "Alla hade sin shift-tangent under kontroll :)"
 
-slap1 = "<b>[:nick]</b> är en väldigt aggressiv person, som använde handflatan <b>[:slaps]</b> gånger."
-slap2 = "<b>[:nick]</b> kunde inte kontrollera sina aggressioner. Han/Hon slogs <b>[:slaps]</b> gånger med sin handflata."
-slap3 = "Ingen slog ingen, alla var vänner."
+violent1 = "<b>[:nick]</b> är en väldigt aggressiv person, som använde handflatan <b>[:attacks]</b> gånger."
+violent2 = "<b>[:nick]</b> kunde inte kontrollera sina aggressioner. Han/Hon slogs <b>[:attacks]</b> gånger med sin handflata."
+violent3 = "Ingen slog ingen, alla var vänner."
 
-slapped1 = "Stackars <b>[:nick]</b>, ingen gillade honom/henne. Han/Hon blev slagen <b>[:slaps]</b> gånger med handflatan."
-slapped2 = "<b>[:nick]</b> var inte heller speciellt omtyckt, han/hon blev slagen <b>[:slaps]</b> gånger."
-slapped3 = "Ingen i kanalen fick en svidande handflata över nosen :)"
+attacked1 = "Stackars <b>[:nick]</b>, ingen gillade honom/henne. Han/Hon blev slagen <b>[:attacks]</b> gånger med handflatan."
+attacked2 = "<b>[:nick]</b> var inte heller speciellt omtyckt, han/hon blev slagen <b>[:attacks]</b> gånger."
+attacked3 = "Ingen i kanalen fick en svidande handflata över nosen :)"
 
 gotkick1 = "<b>[:nick]</b> var inte speciellt populär, och blev utsparkad [:kicks] gånger!"
 gotkick2 = "<b>[:nick]</b> verkar också vara hatad, [:kicks] utsparkningar"

pisg.pl

@@ -120,7 +120,7 @@ my $conf = {
     show_kickline => 1,
     show_actionline => 1,
     show_shoutline => 1,
-    show_slaplines => 1,
+    show_violentlines => 1,
 
     # Less important things
 
@@ -136,6 +136,7 @@ my $conf = {
     # Misc settings
 
     foul => 'ass fuck bitch shit scheisse scheiße kacke arsch ficker ficken schlampe',
+    violent => 'slaps beats smacks',
     ignorewords => '',
     tablewidth => 614,
     regexp_aliases => 0,
@@ -154,9 +155,9 @@ $thirdline, $processtime, @topics, %monologue, %kicked, %gotkick,
 %line, %length, %sadface, %smile, $nicks, %longlines, %mono, %times, %question,
 %loud, $totallength, %gaveop, %tookop, %joins, %actions, %sayings, %wordcount,
 %lastused, %gotban, %setban, %foul, $days, $oldtime, $lastline, $actions,
-$normals, %T, $repeated, $lastnormal, %shout, %slap, %slapped, %words,
-%line_time, @urls, %urlnick, %kickline, %actionline, %shoutline, %slapline,
-%slappedline);
+$normals, %T, $repeated, $lastnormal, %shout, %violence, %attacked, %words,
+%line_time, @urls, %urlnick, %kickline, %actionline, %shoutline, %violenceline,
+%attackedline);
 
 
 sub main
@@ -258,8 +259,8 @@ sub init_pisg
     undef $lastnormal;
     undef %shout;
 
-    undef %slap;
-    undef %slapped;
+    undef %violence;
+    undef %attacked;
     undef %words;
     undef %line_time;
 
@@ -391,6 +392,7 @@ sub init_words {
     foreach (split /\s+/, $conf->{ignorewords}) {
         $conf->{ignoreword}{$_} = 1;
     }
+    $conf->{violent} =~ s/\s+/|/g;
 }
 
 sub init_debug
@@ -561,13 +563,14 @@ sub parse_file
                 $line{$nick}++;
                 $line_time{$nick}[int($hour/6)]++;
 
-                if ($saying =~ /^slaps (\S+)/o) {
-                    $slap{$nick}++;
-                    $slapped{$1}++;
-                    $slapline{$nick} = $line;
-                    $slappedline{$1} = $line;
+                if ($saying =~ /^($conf->{violent}) (\S+)/) {
+                    $violence{$nick}++;
+                    $attacked{$2}++;
+                    $violenceline{$nick} = $line;
+                    $attackedline{$2} = $line;
                 }
 
+
                 my $len = length($saying);
                 $length{$nick} += $len;
                 $totallength += $len;
@@ -874,7 +877,7 @@ sub create_html
     questions();
     loudpeople();
     shoutpeople();
-    slap();
+    violent();
     mostsmiles();
     mostsad();
     longlines();
@@ -1436,76 +1439,74 @@ sub shoutpeople
 
 }
 
-sub slap
+sub violent
 {
-    # They slapped around
+    # They attacked others
 
-    my @slaps;
+    my @agressors;
 
-    foreach my $nick (sort keys %slap) {
-        @slaps = sort { $slap{$b} <=> $slap{$a} } keys %slap;
+    foreach my $nick (sort keys %violence) {
+        @agressors = sort { $violence{$b} <=> $violence{$a} } keys %violence;
     }
 
-    if(@slaps) {
+    if(@agressors) {
         my %hash = (
-            nick => $slaps[0],
-            slaps => $slap{$slaps[0]},
-            line => $slapline{$slaps[0]}
+            nick    => $agressors[0],
+            attacks => $violence{$agressors[0]},
+            line    => $violenceline{$agressors[0]}
         );
-        my $text = template_text('slap1', %hash);
-        if($conf->{show_slaplines}) {
-            my $exttext = template_text('slaptext', %hash);
+        my $text = template_text('violent1', %hash);
+        if($conf->{show_violentlines}) {
+            my $exttext = template_text('violenttext', %hash);
             html("<tr><td bgcolor=\"$conf->{hicell}\">$text<br><span class=\"small\">$exttext</span><br>");
         } else {
             html("<tr><td bgcolor=\"$conf->{hicell}\">$text");
         }
-        if (@slaps >= 2) {
+        if (@agressors >= 2) {
             my %hash = (
-                nick => $slaps[1],
-                slaps => $slap{$slaps[1]}
+                nick    => $agressors[1],
+                attacks => $violence{$agressors[1]}
             );
 
-            my $text = template_text('slap2', %hash);
+            my $text = template_text('violent2', %hash);
             html("<br><span class=\"small\">$text</span>");
         }
         html("</td></tr>");
     } else {
-        my $text = template_text('slap3');
+        my $text = template_text('violent3');
         html("<tr><td bgcolor=\"$conf->{hicell}\">$text</td></tr>");
     }
 
 
-    # They got slapped
-    foreach my $nick (sort keys %slapped) {
-        @slaps = sort { $slapped{$b} <=> $slapped{$a} } keys %slapped;
+    # They got attacked
+    my @victims;
+    foreach my $nick (sort keys %attacked) {
+        @victims = sort { $attacked{$b} <=> $attacked{$a} } keys %attacked;
     }
 
-    if(@slaps) {
+    if(@victims) {
         my %hash = (
-            nick => $slaps[0],
-            slaps => $slapped{$slaps[0]},
-            line => $slappedline{$slaps[0]}
+            nick    => $victims[0],
+            attacks => $attacked{$victims[0]},
+            line    => $attackedline{$victims[0]}
         );
-        my $text = template_text('slapped1', %hash);
-        if($conf->{show_slaplines}) {
-            my $exttext = template_text('slappedtext', %hash);
+        my $text = template_text('attacked1', %hash);
+        if($conf->{show_violentlines}) {
+            my $exttext = template_text('attackedtext', %hash);
             html("<tr><td bgcolor=\"$conf->{hicell}\">$text<br><span class=\"small\">$exttext</span><br>");
         } else {
             html("<tr><td bgcolor=\"$conf->{hicell}\">$text");
         }
-        if (@slaps >= 2) {
+        if (@victims >= 2) {
             my %hash = (
-                nick => $slaps[1],
-                slaps => $slapped{$slaps[1]}
+                nick    => $victims[1],
+                attacks => $attacked{$victims[1]}
             );
 
-            my $text = template_text('slapped2', %hash);
+            my $text = template_text('attacked2', %hash);
             html("<br><span class=\"small\">$text</span>");
         }
         html("</td></tr>");
-    } else {
-        my $text = template_text('slapped3');
-        html("<tr><td bgcolor=\"$conf->{hicell}\">$text</td></tr>");
     }
 }