ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/ext/chat.ext
(Generate patch)

Comparing deliantra/server/ext/chat.ext (file contents):
Revision 1.26 by root, Mon Jul 23 21:53:21 2007 UTC vs.
Revision 1.33 by root, Wed Sep 19 21:56:30 2007 UTC

1#! perl # depends=irc 1#! perl # depends=irc mandatory
2#CONVERSION: PARTIAL
3 2
4# implement a replacement for the built-in say/chat/shout/tell/reply commands 3# implement a replacement for the built-in say/chat/shout/tell/reply commands
5# adds ignore/unignore functionality 4# adds ignore/unignore functionality
6 5
7use NPC_Dialogue; 6use NPC_Dialogue;
… …
19 title => "Chat", 18 title => "Chat",
20 reply => "chat ", 19 reply => "chat ",
21 tooltip => "Player chat and shouts, global to the server.", 20 tooltip => "Player chat and shouts, global to the server.",
22}; 21};
23 22
23sub tell_channel($) {
24 my ($target) = @_;
25
26 {
27 id => "tell-$target",
28 title => "$target",
29 reply => "tell $target ",
30 tooltip => "Private messages from/to $target",
31 }
32}
33
24sub clean_timeouts($) { 34sub clean_timeouts($) {
25 my ($player) = @_; 35 my ($player) = @_;
26 my $NOW = time; 36 my $NOW = time;
27 37
28 for my $hash (@$player{qw(ext_ignore_shout ext_ignore_tell)}) { 38 for my $hash (@$player{qw(ext_ignore_shout ext_ignore_tell)}) {
29 while (my ($k, $v) = each %$hash) { 39 while (my ($k, $v) = each %$hash) {
30 if ($v < $NOW) { 40 if ($v < $NOW) {
31 $player->message ("Your ignore on $k has expired.", cf::NDI_GREEN | cf::NDI_UNIQUE); 41 $player->message ("Your ignore on $k has expired.", cf::NDI_GREEN);
32 delete $hash->{$k}; 42 delete $hash->{$k};
33 } elsif (!cf::player::exists $k) { 43 } elsif (!cf::player::exists $k) {
34 $player->message ("Your ignore on $k is no longer valid (no such user).", cf::NDI_GREEN | cf::NDI_UNIQUE); 44 $player->message ("Your ignore on $k is no longer valid (no such user).", cf::NDI_GREEN);
35 delete $hash->{$k}; 45 delete $hash->{$k};
36 } 46 }
37 } 47 }
38 } 48 }
39} 49}
… …
52 prio => -1000, 62 prio => -1000,
53 on_login => sub { 63 on_login => sub {
54 my ($pl) = @_; 64 my ($pl) = @_;
55 65
56 clean_timeouts $pl->ob; 66 clean_timeouts $pl->ob;
67
57 $pl->ns->send_msg ($SAY_CHANNEL); 68 $pl->send_msg ($SAY_CHANNEL);
58 $pl->ns->send_msg ($CHAT_CHANNEL); 69 $pl->send_msg ($CHAT_CHANNEL);
59 }, 70 },
60); 71);
61 72
62cf::register_command listen => sub { 73cf::register_command listen => sub {
63 my ($pl, $msg) = @_; 74 my ($pl, $msg) = @_;
… …
67 $msg = 10 if $msg > 10; 78 $msg = 10 if $msg > 10;
68 79
69 my $prev_listen = $player->listening; 80 my $prev_listen = $player->listening;
70 $player->listening ($msg); 81 $player->listening ($msg);
71 if ($prev_listen == $player->listening) { 82 if ($prev_listen == $player->listening) {
72 $pl->message ("Your verbose level stays at $prev_listen.", cf::NDI_UNIQUE); 83 $pl->message ("Your verbose level stays at $prev_listen.", cf::NDI_REPLY);
73 } else { 84 } else {
74 $pl->message ("Your verbose level is now " . $player->listening . ". (previously: $prev_listen)", cf::NDI_UNIQUE); 85 $pl->message ("Your verbose level is now " . $player->listening . ". (previously: $prev_listen)", cf::NDI_REPLY);
75 } 86 }
76 } else { 87 } else {
77 $pl->message ("Your verbose level is " . $player->listening . ".", cf::NDI_UNIQUE); 88 $pl->message ("Your verbose level is " . $player->listening . ".", cf::NDI_REPLY);
78 } 89 }
79}; 90};
80 91
81cf::register_command cointoss => sub { 92cf::register_command cointoss => sub {
82 my ($pl, $msg) = @_; 93 my ($ob, $msg) = @_;
83 94
95 my $pl = $ob->contr;
84 my $name = $pl->name; 96 my $name = $ob->name;
97
85 my $coin = int rand 2 ? "Heads" : "Tails"; 98 my $coin = int rand 2 ? "Heads" : "Tails";
86 99
100 $_->send_msg ($SAY_CHANNEL => "$name flips a coin.... $coin!", cf::NDI_GREY)
87 for my $other ( grep { $pl->on_same_map_as ($_->ob) } cf::player::list ) { 101 for grep { $ob->on_same_map_as ($_->ob) && $_ != $pl} cf::player::list;
88 next
89 if $other->ob == $pl;
90 $other->ob->message ("$name flips a coin.... $coin!", cf::NDI_GREY | cf::NDI_UNIQUE);
91 }
92 102
93 $pl->message ("You flip a coin.... $coin!", cf::NDI_GREY | cf::NDI_UNIQUE); 103 $pl->send_msg ($SAY_CHANNEL => "You flip a coin.... $coin!", cf::NDI_GREY | cf::NDI_REPLY);
94}; 104};
95 105
96cf::register_command orcknuckle => sub { 106cf::register_command orcknuckle => sub {
97 my ($pl, $msg) = @_; 107 my ($ob, $msg) = @_;
108
109 my $pl = $ob->contr;
110 my $name = $ob->name;
111
98 my @orcknuckle = ("none", "beholder", "ghost", "knight", "princess", "dragon", "orc"); 112 my @orcknuckle = ("beholder", "ghost", "knight", "princess", "dragon", "orc");
99 113 my ($i, $j, $k, $l) = (rand 5, rand 5, rand 5, rand 6);
100 my $name = $pl->name;
101
102 my ($i, $j, $k, $l) = ((int rand 5) + 1, (int rand 5) + 1, (int rand 5) + 1, (int rand 6) + 1);
103 my $result = "$orcknuckle[$i], $orcknuckle[$j], $orcknuckle[$k], $orcknuckle[$l]"; 114 my $result = "$orcknuckle[$i], $orcknuckle[$j], $orcknuckle[$k], $orcknuckle[$l]";
104 115
116 $_->send_msg ($SAY_CHANNEL => "$name throws his orc-knuckles and rolls $result!", cf::NDI_GREY)
105 for my $other ( grep { $pl->on_same_map_as ($_->ob) } cf::player::list ) { 117 for grep { $ob->on_same_map_as ($_->ob) && $_ != $pl} cf::player::list;
106 next
107 if $other->ob == $pl;
108 $other->ob->message ("$name rolls $result!", cf::NDI_GREY | cf::NDI_UNIQUE);
109 } 118
110
111 $pl->message ("You roll $result!", cf::NDI_GREY | cf::NDI_UNIQUE); 119 $pl->send_msg ($SAY_CHANNEL => "You roll $result!", cf::NDI_GREY | cf::NDI_REPLY);
112}; 120};
113 121
114my $emotes = { 122my $emotes = {
115 growl => { 123 growl => {
116 noparams => { 124 noparams => {
… …
693 }, 701 },
694}; 702};
695 703
696for my $emotion (keys %$emotes) { 704for my $emotion (keys %$emotes) {
697 cf::register_command $emotion => sub { 705 cf::register_command $emotion => sub {
698 my ($pl, $tname) = @_; 706 my ($ob, $tname) = @_;
707
708 my $pl = $ob->contr;
699 709
700 cf::async { 710 cf::async {
701 my $name = $pl->name; 711 my $name = $ob->name;
712 $Coro::current->{desc} = "emote handler for $name";
702 713
703 if ($tname eq $name) { 714 if ($tname eq $name) {
704 my $emote = $emotes->{$emotion}->{self}; 715 my %emote = %{ $emotes->{$emotion}->{self} || {} };
705 716
706 $emote->{other} = "You look away from <self>." 717 $emote{other} ||= "You look away from <self>.";
707 if !$emote->{other};
708 $emote->{self} = "My god! Is that LEGAL?" 718 $emote{self} ||= "My god! Is that LEGAL?";
709 if !$emote->{self};
710 719
711 $emote->{other} =~ s/<self>/$name/; 720 $emote{other} =~ s/<self>/$name/;
712 721
722 $_->send_msg ($CHAT_CHANNEL, $emote{other}, cf::NDI_GREY)
713 for my $other ( grep { $pl->on_same_map_as ($_->ob) } cf::player::list ) { 723 for grep { $ob->on_same_map_as ($_->ob) && $_ != $ob} cf::player::list;
714 next
715 if $other->ob == $pl;
716 $other->ob->message ($emote->{other}, cf::NDI_GREY | cf::NDI_UNIQUE);
717 }
718 724
719 $pl->message ($emote->{self}, cf::NDI_GREY | cf::NDI_UNIQUE); 725 $pl->send_msg ($emote{self}, cf::NDI_GREY | cf::NDI_REPLY);
720 } elsif ($tname) { 726 } elsif ($tname) {
721 my $target = cf::player::find $tname 727 my $target = cf::player::find $tname
722 or return $pl->reply (undef, "$tname is not around."); 728 or return $pl->send_msg (tell_channel $tname, "$tname is not around.", cf::NDI_DK_ORANGE | cf::NDI_REPLY);
723 729
724 my $emote = $emotes->{$emotion}->{params}; 730 my %emote = %{ $emotes->{$emotion}->{params} || {} };
725 731
726 $emote->{other} = "<self> is eyeing <other> quizzically." 732 $emote{other} ||= "<self> is eyeing <other> quizzically.";
727 if !$emote->{other};
728 $emote->{self} = "You are still nuts." 733 $emote{self} ||= "You are still nuts.";
729 if !$emote->{self};
730 $emote->{target} = "You get the distinct feeling that <other> is nuts." 734 $emote{target} ||= "You get the distinct feeling that <other> is nuts.";
731 if !$emote->{target};
732 735
733 $emote->{self} =~ s/<other>/$tname/; 736 $emote{self} =~ s/<other>/$tname/;
734 $emote->{target} =~ s/<self>/$name/; 737 $emote{target} =~ s/<self>/$name/;
735 $emote->{other} =~ s/<other>/$tname/; 738 $emote{other} =~ s/<other>/$tname/;
736 $emote->{other} =~ s/<self>/$name/; 739 $emote{other} =~ s/<self>/$name/;
737 740
738 for my $other ( grep { $pl->on_same_map_as ($_->ob) } cf::player::list ) { 741 $_->send_msg ($CHAT_CHANNEL, $emote{other}, cf::NDI_GREY)
739 next 742 for grep { $_ != $pl && $_ != $target && $ob->on_same_map_as ($_->ob) } cf::player::list;
740 if $other->ob == $pl or $other == $target;
741 $other->ob->message ($emote->{other}, cf::NDI_GREY | cf::NDI_UNIQUE);
742 }
743 743
744 $target->ob->message ($emote->{target}, cf::NDI_GREY | cf::NDI_UNIQUE); 744 $target->send_msg (tell_channel $name, $emote{target}, cf::NDI_GREY);
745 $pl->message ($emote->{self}, cf::NDI_GREY | cf::NDI_UNIQUE); 745 $pl->send_msg (tell_channel $tname, $emote{self}, cf::NDI_GREY | cf::NDI_REPLY);
746 } else { 746 } else {
747 my $emote = $emotes->{$emotion}->{noparams}; 747 my %emote = %{ $emotes->{$emotion}->{noparams} || {} };
748 $emote->{other} =~ s/<self>/$name/;
749 748
750 $emote->{other} = "<self> dances with glee." 749 $emote{other} ||= "<self> dances with glee.";
751 if !$emote->{other};
752 $emote->{self} = "You are a nut." 750 $emote{self} ||= "You are a nut.";
753 if !$emote->{self};
754 751
752 $emote{other} =~ s/<self>/$name/;
753
754 $_->send_msg ($CHAT_CHANNEL, $emote{other}, cf::NDI_GREY)
755 for my $other ( grep { $pl->on_same_map_as ($_->ob) } cf::player::list ) { 755 for grep { $ob->on_same_map_as ($_->ob) && $_ != $pl } cf::player::list;
756 next
757 if $other->ob == $pl;
758 $other->ob->message ($emote->{other}, cf::NDI_GREY | cf::NDI_UNIQUE);
759 }
760 756
761 $pl->message ($emote->{self}, cf::NDI_GREY | cf::NDI_UNIQUE); 757 $pl->send_msg ($CHAT_CHANNEL, $emote{self}, cf::NDI_GREY | cf::NDI_REPLY);
762 } 758 }
763 }; 759 };
764 }; 760 };
765} 761}
766 762
767cf::register_command me => sub { 763cf::register_command me => sub {
768 my ($pl, $msg) = @_; 764 my ($pl, $msg) = @_;
769 765
770 my $name = $pl->name; 766 my $name = $pl->name;
771 767
772 $_->ns->send_msg ($SAY_CHANNEL => "* $name $msg", cf::NDI_GREY, $_ == $pl ? (reply => 1) : ()) 768 $_->send_msg ($SAY_CHANNEL => "* $name $msg", cf::NDI_GREY | cf::NDI_DEF | ($_ == $pl ? cf::NDI_REPLY : 0))
773 for grep $pl->on_same_map_as ($_->ob), cf::player::list; 769 for grep $pl->on_same_map_as ($_->ob), cf::player::list;
774}; 770};
775 771
776cf::register_command say => sub { 772cf::register_command say => sub {
777 my ($ob, $msg) = @_; 773 my ($ob, $msg) = @_;
… …
782 778
783 if ($msg) { 779 if ($msg) {
784 my $name = $ob->name; 780 my $name = $ob->name;
785 my @plonmap = grep $ob->on_same_map_as ($_->ob), cf::player::list; 781 my @plonmap = grep $ob->on_same_map_as ($_->ob), cf::player::list;
786 782
787 $_->ns->send_msg ($SAY_CHANNEL => "$name says: $msg", cf::NDI_GREY, $_ == $ob ? (reply => 1) : ()) 783 $_->send_msg ($SAY_CHANNEL => "$name says: $msg", cf::NDI_GREY | ($_ == $ob->contr ? cf::NDI_REPLY : 0))
788 for @plonmap; 784 for @plonmap;
789 785
790 # npcs, magic_ears etc. 786 # npcs, magic_ears etc.
791 # first find all objects and their first-level inventories 787 # first find all objects and their first-level inventories
792 # within a 5x5 square that have something resembling 788 # within a 5x5 square that have something resembling
… …
807 my ($reply, @kw) = $dialog->tell ($msg); 803 my ($reply, @kw) = $dialog->tell ($msg);
808 804
809 if (defined $reply) { 805 if (defined $reply) {
810 if ($npc->type == cf::MAGIC_EAR) { 806 if ($npc->type == cf::MAGIC_EAR) {
811 if (length $reply) { 807 if (length $reply) {
812 $_->ns->send_msg ($SAY_CHANNEL => $reply, cf::NDI_BROWN) 808 $_->send_msg ($SAY_CHANNEL => $reply, cf::NDI_BROWN)
813 for @plonmap; 809 for @plonmap;
814 } 810 }
815 $npc->use_trigger; 811 $npc->use_trigger;
816 } else { 812 } else {
817 if (length $reply) { 813 if (length $reply) {
818 $_->ns->send_msg ($SAY_CHANNEL => $npc->name . " says: $reply", cf::NDI_BROWN) 814 $_->send_msg ($SAY_CHANNEL => $npc->name . " says: $reply", cf::NDI_BROWN)
819 for @plonmap; 815 for @plonmap;
820 } 816 }
821 } 817 }
822 } 818 }
823 819
824 if (@kw) { 820 if (@kw) {
825 $_->ns->send_msg ($SAY_CHANNEL => "[further topics: " . (join ", ", @kw) . "]", cf::NDI_BROWN) 821 $_->send_msg ($SAY_CHANNEL => "[further topics: " . (join ", ", @kw) . "]", cf::NDI_BROWN)
826 for @plonmap; 822 for @plonmap;
827 } 823 }
828 } 824 }
829 825
830 } else { 826 } else {
831 $ob->contr->ns->send_msg ($SAY_CHANNEL => "What do you want to say?", 0, reply => 1); 827 $ob->send_msg ($SAY_CHANNEL => "What do you want to say?", cf::NDI_GREY | cf::NDI_REPLY);
832 } 828 }
833}; 829};
834 830
835cf::register_command chat => sub { 831cf::register_command chat => sub {
836 my ($pl, $msg) = @_; 832 my ($ob, $msg) = @_;
837 833
838 utf8::decode $msg; 834 utf8::decode $msg;
839 835
836 my $pl = $ob->contr;
837
840 return if $pl->contr->invoke (cf::EVENT_PLAYER_CHAT, $msg); 838 return if $pl->invoke (cf::EVENT_PLAYER_CHAT, $msg);
841 839
842 if ($msg) { 840 if ($msg) {
843 my $name = $pl->name; 841 my $name = $ob->name;
844 my $NOW = time; 842 my $NOW = time;
845 843
846 cf::LOG cf::llevDebug, sprintf "QBERT [%s] %s\n", $name, $msg; 844 cf::LOG cf::llevDebug, sprintf "QBERT [%s] %s\n", $name, $msg;
847 send_irc ("[%s] %s", $name, $msg); 845 send_irc ("[%s] %s", $name, $msg);
848 846
849 $_->ns->send_msg ($CHAT_CHANNEL => "$name chats: $msg", cf::NDI_BLUE, $_ == $pl ? (reply => 1) : ()) 847 $_->send_msg ($CHAT_CHANNEL => "$name chats: $msg", cf::NDI_BLUE | cf::NDI_DEF | ($_ == $pl ? cf::NDI_REPLY : 0))
850 for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW && $_->listening >= 10 } cf::player::list; 848 for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW && $_->listening >= 10 } cf::player::list;
851 849
852 } else { 850 } else {
853 $pl->ns->send_msg ($CHAT_CHANNEL => "Chat what?"); 851 $pl->send_msg ($CHAT_CHANNEL => "Chat what?", cf::NDI_BLUE | cf::NDI_DEF | cf::NDI_REPLY);
854 } 852 }
855}; 853};
856 854
857cf::register_command shout => sub { 855cf::register_command shout => sub {
858 my ($pl, $msg) = @_; 856 my ($ob, $msg) = @_;
859 857
860 utf8::decode $msg; 858 utf8::decode $msg;
861 859
860 my $pl = $ob->contr;
861
862 return if $pl->contr->invoke (cf::EVENT_PLAYER_SHOUT, $msg); 862 return if $pl->invoke (cf::EVENT_PLAYER_SHOUT, $msg);
863 863
864 if ($msg) { 864 if ($msg) {
865 my $NOW = time; 865 my $NOW = time;
866 my $name = $pl->name; 866 my $name = $ob->name;
867 867
868 cf::LOG cf::llevDebug, sprintf "QBERT {%s} %s\n", $name, $msg; 868 cf::LOG cf::llevDebug, sprintf "QBERT {%s} %s\n", $name, $msg;
869 send_irc ("\007\0034{%s} %s\n", $name, $msg); 869 send_irc ("\007\0034{%s} %s\n", $name, $msg);
870 870
871 $_->ns->send_msg ($CHAT_CHANNEL => "$name shouts: $msg", cf::NDI_RED, $_ == $pl ? (reply => 1) : ()) 871 $_->send_msg ($CHAT_CHANNEL => "$name shouts: $msg", cf::NDI_RED | cf::NDI_DEF | ($_ == $pl ? cf::NDI_REPLY : 0))
872 for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW && $_->listening >= 2 } cf::player::list; 872 for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW && $_->listening >= 2 } cf::player::list;
873 873
874 } else { 874 } else {
875 $pl->ns->send_msg ($CHAT_CHANNEL => "Shout what?"); 875 $pl->send_msg ($CHAT_CHANNEL => "Shout what?", cf::NDI_RED | cf::NDI_DEF | cf::NDI_REPLY);
876 } 876 }
877}; 877};
878 878
879cf::register_command tell => sub { 879cf::register_command tell => sub {
880 my ($ob, $args) = @_; 880 my ($ob, $args) = @_;
… …
887 or return; 887 or return;
888 my $name = $ob->name; 888 my $name = $ob->name;
889 889
890 return if $pl->invoke (cf::EVENT_PLAYER_TELL, $target, $msg); 890 return if $pl->invoke (cf::EVENT_PLAYER_TELL, $target, $msg);
891 891
892 my $pl_channel = { 892 my $pl_channel = tell_channel $target;
893 id => "tell-$target",
894 title => "$target",
895 reply => "tell $target ",
896 tooltip => "Private messages from/to $target",
897 };
898 893
899 if ($target =~ /irc\//) { 894 if ($target =~ /irc\//) {
900 my (undef, $nick) = split /\//, $target, 2; 895 my (undef, $nick) = split /\//, $target, 2;
901 $ns->send_msg ($pl_channel => "You tell $target: $args", reply => 1); 896 $ns->send_msg ($pl_channel => "You tell $target: $args", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY);
902 send_irc ("(%s) %s: %s\n", $name, $nick, $msg); 897 send_irc ("(%s) %s: %s\n", $name, $nick, $msg);
898
903 } elsif (my $other = cf::player::find_active $target) { 899 } elsif (my $other = cf::player::find_active $target) {
904 my $other_channel = { 900 my $other_channel = tell_channel $name;
905 id => "tell-$name",
906 title => "$name",
907 reply => "tell $name ",
908 tooltip => "Private messages from/to $name",
909 };
910 901
911 if ($msg) { 902 if ($msg) {
912 if ($target eq $name) { 903 if ($target eq $name) {
913 $ns->send_msg ($pl_channel => "You are talking to yourself, you freak!", reply => 1); 904 $ns->send_msg ($pl_channel => "You are talking to yourself, you freak!", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY);
914 } elsif ($other->ob->{ext_ignore_tell}{$name} >= time) { 905 } elsif ($other->ob->{ext_ignore_tell}{$name} >= time) {
915 $ns->send_msg ($pl_channel => "$target ignores what you say. Give up on it.", reply => 1); 906 $ns->send_msg ($pl_channel => "$target ignores what you say. Give up on it.", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY);
916 } else { 907 } else {
917 return if $other->invoke (cf::EVENT_PLAYER_TOLD, $pl, $msg); 908 return if $other->invoke (cf::EVENT_PLAYER_TOLD, $pl, $msg);
918 cf::LOG cf::llevDebug, sprintf "TELL [%s>%s] %s\n", $name, $target, $msg; 909 cf::LOG cf::llevDebug, sprintf "TELL [%s>%s] %s\n", $name, $target, $msg;
919 910
920 $ns->send_msg ($pl_channel => "You tell $target: $msg", reply => 1); 911 $ns->send_msg ($pl_channel => "You tell $target: $msg", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY);
921 $other->ns->send_msg ($other_channel => "$name tells you: $msg"); 912 $other->send_msg ($other_channel => "$name tells you: $msg", cf::NDI_DK_ORANGE | cf::NDI_DEF);
922 } 913 }
923 } else { 914 } else {
924 $ns->send_msg ($pl_channel => "What do you want to tell $target?"); 915 $ns->send_msg ($pl_channel => "What do you want to tell $target?", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY);
925 } 916 }
926 917
927 } else { 918 } else {
928 $ns->send_msg ($pl_channel => "No such player. Your message: $msg"); 919 $ns->send_msg ($pl_channel => "No such player. Your message: $msg", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY);
929 } 920 }
930}; 921};
931 922
932cf::register_command ignore => sub { 923cf::register_command ignore => sub {
933 my ($pl, $args) = @_; 924 my ($pl, $args) = @_;
… …
936 if ($args eq "list") { 927 if ($args eq "list") {
937 clean_timeouts $pl; 928 clean_timeouts $pl;
938 929
939 if ((my @ignored_tell = sort keys %{$pl->{ext_ignore_tell}}) 930 if ((my @ignored_tell = sort keys %{$pl->{ext_ignore_tell}})
940 + (my @ignored_shout = sort keys %{$pl->{ext_ignore_shout}})) { 931 + (my @ignored_shout = sort keys %{$pl->{ext_ignore_shout}})) {
941 $pl->message ("Currently ignoring private messages from: ", cf::NDI_UNIQUE); 932 $pl->message ("Currently ignoring private messages from: ", cf::NDI_REPLY);
942 $pl->message ((join ", ", @ignored_tell), cf::NDI_UNIQUE); 933 $pl->message ((join ", ", @ignored_tell), cf::NDI_REPLY);
943 $pl->message ("Currently ignoring shouts from: ", cf::NDI_UNIQUE); 934 $pl->message ("Currently ignoring shouts from: ", cf::NDI_REPLY);
944 $pl->message ((join ", ", @ignored_shout), cf::NDI_UNIQUE); 935 $pl->message ((join ", ", @ignored_shout), cf::NDI_REPLY);
945 $pl->message ("To stop ignoring one, use unignore.", cf::NDI_UNIQUE); 936 $pl->message ("To stop ignoring one, use unignore.", cf::NDI_REPLY);
946 } else { 937 } else {
947 $pl->message ("Not ignoring anyone", cf::NDI_UNIQUE); 938 $pl->message ("Not ignoring anyone", cf::NDI_REPLY);
948 } 939 }
949 940
950 } elsif ($target && $type) { 941 } elsif ($target && $type) {
951 942
952 $timeout ne "" or $timeout = 24; 943 $timeout ne "" or $timeout = 24;
953 my $absolute_timeout = time + $timeout * 3600; 944 my $absolute_timeout = time + $timeout * 3600;
954 945
955 if (cf::player::exists $target) { 946 if (cf::player::exists $target) {
956 if ($type eq "tell") { 947 if ($type eq "tell") {
957 $pl->message ("Now ignoring private messages from $target for $timeout hours.", cf::NDI_UNIQUE); 948 $pl->message ("Now ignoring private messages from $target for $timeout hours.", cf::NDI_REPLY);
958 $pl->{ext_ignore_tell}{$target} = $absolute_timeout; 949 $pl->{ext_ignore_tell}{$target} = $absolute_timeout;
959 } elsif ($type eq "shout") { 950 } elsif ($type eq "shout") {
960 $pl->message ("Now ignoring shouts from $target for $timeout hours.", cf::NDI_UNIQUE); 951 $pl->message ("Now ignoring shouts from $target for $timeout hours.", cf::NDI_REPLY);
961 $pl->{ext_ignore_shout}{$target} = $absolute_timeout; 952 $pl->{ext_ignore_shout}{$target} = $absolute_timeout;
962 } elsif ($type eq "all") { 953 } elsif ($type eq "all") {
963 $pl->message ("Now ignoring everything from $target for $timeout hours.", cf::NDI_UNIQUE); 954 $pl->message ("Now ignoring everything from $target for $timeout hours.", cf::NDI_REPLY);
964 $pl->{ext_ignore_tell}{$target} = $absolute_timeout; 955 $pl->{ext_ignore_tell}{$target} = $absolute_timeout;
965 $pl->{ext_ignore_shout}{$target} = $absolute_timeout; 956 $pl->{ext_ignore_shout}{$target} = $absolute_timeout;
966 } else { 957 } else {
967 $pl->message ("You need to specify tell, shout or all.", cf::NDI_UNIQUE); 958 $pl->message ("You need to specify tell, shout or all.", cf::NDI_REPLY);
968 } 959 }
969 } else { 960 } else {
970 $pl->message ("No such player: $target", cf::NDI_UNIQUE); 961 $pl->message ("No such player: $target", cf::NDI_REPLY);
971 } 962 }
972 963
973 } else { 964 } else {
974 $pl->message ("Usage: ignore <player> <tell|shout|all> <timeout>\n" 965 $pl->message ("Usage: ignore <player> <tell|shout|all> <timeout>\n"
975 . "will ignore a player for <timeout> hours.\n" 966 . "will ignore a player for <timeout> hours.\n"
976 . "Usage: ignore list\n" 967 . "Usage: ignore list\n"
977 . "will show you a list of players currently ignored.", cf::NDI_UNIQUE); 968 . "will show you a list of players currently ignored.", cf::NDI_REPLY);
978 } 969 }
979}; 970};
980 971
981cf::register_command unignore => sub { 972cf::register_command unignore => sub {
982 my ($pl, $args) = @_; 973 my ($pl, $args) = @_;
983 my ($target, $type) = split /\s+/, $args; 974 my ($target, $type) = split /\s+/, $args;
984 975
985 if ($args eq "") { 976 if ($args eq "") {
986 if ($pl->{ext_ignore_tell}) { 977 if ($pl->{ext_ignore_tell}) {
987 $pl->message ("Currently ignoring private messages from: ", cf::NDI_UNIQUE); 978 $pl->message ("Currently ignoring private messages from: ", cf::NDI_REPLY);
988 $pl->message ((join ", ", sort keys %{ $pl->{ext_ignore_tell} }), cf::NDI_UNIQUE); 979 $pl->message ((join ", ", sort keys %{ $pl->{ext_ignore_tell} }), cf::NDI_REPLY);
989 $pl->message ("Currently ignoring shouts from: ", cf::NDI_UNIQUE); 980 $pl->message ("Currently ignoring shouts from: ", cf::NDI_REPLY);
990 $pl->message ((join ", ", sort keys %{ $pl->{ext_ignore_shout} }), cf::NDI_UNIQUE); 981 $pl->message ((join ", ", sort keys %{ $pl->{ext_ignore_shout} }), cf::NDI_REPLY);
991 } else { 982 } else {
992 $pl->message ("Not ignoring anyone", cf::NDI_UNIQUE); 983 $pl->message ("Not ignoring anyone", cf::NDI_REPLY);
993 } 984 }
994 } else { 985 } else {
995 if (cf::player::exists $target) { 986 if (cf::player::exists $target) {
996 if ($type eq "tell") { 987 if ($type eq "tell") {
997 $pl->message ("Not ignoring private messages from $target anymore.", cf::NDI_UNIQUE); 988 $pl->message ("Not ignoring private messages from $target anymore.", cf::NDI_REPLY);
998 delete $pl->{ext_ignore_tell} {$target}; 989 delete $pl->{ext_ignore_tell} {$target};
999 } elsif ($type eq "shout") { 990 } elsif ($type eq "shout") {
1000 $pl->message ("Not ignoring shouts from $target anymore.", cf::NDI_UNIQUE); 991 $pl->message ("Not ignoring shouts from $target anymore.", cf::NDI_REPLY);
1001 delete $pl->{ext_ignore_shout}{$target}; 992 delete $pl->{ext_ignore_shout}{$target};
1002 } elsif ($type eq "all") { 993 } elsif ($type eq "all") {
1003 $pl->message ("Not ignoring anything from $target anymore.", cf::NDI_UNIQUE); 994 $pl->message ("Not ignoring anything from $target anymore.", cf::NDI_REPLY);
1004 delete $pl->{ext_ignore_tell} {$target}; 995 delete $pl->{ext_ignore_tell} {$target};
1005 delete $pl->{ext_ignore_shout}{$target}; 996 delete $pl->{ext_ignore_shout}{$target};
1006 } else { 997 } else {
1007 $pl->message ("You need to specify tell, shout or all.", cf::NDI_UNIQUE); 998 $pl->message ("You need to specify tell, shout or all.", cf::NDI_REPLY);
1008 } 999 }
1009 } else { 1000 } else {
1010 $pl->message ("No such player or ambiguous name: $target", cf::NDI_UNIQUE); 1001 $pl->message ("No such player or ambiguous name: $target", cf::NDI_REPLY);
1011 } 1002 }
1012 } 1003 }
1013}; 1004};
1014 1005

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines