Date: Mon, 3 Oct 2005 00:16:30 -0400 (EDT) From: zak@ircii.org (Zak) -license update/info -credits info/updates. -move some files around. remove uptime.m merged into hooks.m -some other changes. read diff/changelog. //zak diff -aruN amn.orig/CHANGES amn/CHANGES --- amn.orig/CHANGES Sun Oct 2 14:20:18 2005 +++ amn/CHANGES Mon Oct 3 00:12:51 2005 @@ -164,3 +164,13 @@ -sync E5-KNOWNBUGS from -HEAD //zak -update EPIC-BUGS info after having some time to debug the $finditem() problems this morning a bit. //zak + +10.3.05 +-add a BSD like license with a clause.. see COPYRIGHT for info. //zak +-add credits in README if i happen to be missing someone or if someone + thinks they should be in the credits drop me an e-mail or msg online. //zak +-remove uptime.m merge it into hooks.m //zak +-sync most files with the COPYRIGHT info. //zak +-some other minor changes. //zak +-move UPGRADE into doc/ //zak +-move NOTES into doc/ //zak diff -aruN amn.orig/COPYRIGHT amn/COPYRIGHT --- amn.orig/COPYRIGHT Wed Dec 31 19:00:00 1969 +++ amn/COPYRIGHT Mon Oct 3 00:06:40 2005 @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2003-2005 Amnesiac Project + * Copyright (c) 2003-2005 EPIC Software Labs + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + + * 3. Products derived from this software may not be called "Amnesiac" + * nor may "Amnesiac" appear in their names without prior written + * permission of the Amnesiac Project. + + * 4. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by the Amnesiac Project + * for use with EPIC software Labs (http://amnesiac.ircii.org/)" + * + * THIS SOFTWARE IS PROVIDED BY THE Amnesiac PROJECT `AS IS'' AND ANY + * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE Amnesiac PROJECT OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The licence and distribution terms for any publically available version + * or derivative of this code cannot be changed. i.e. this code cannot + * simply be copied and put under another distribution licence + * [including the GNU Public Licence.] + * + */ diff -aruN amn.orig/INSTALL amn/INSTALL --- amn.orig/INSTALL Thu Sep 1 08:20:11 2005 +++ amn/INSTALL Sun Oct 2 22:53:49 2005 @@ -1,4 +1,6 @@ -(amnesiac) +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. + before installing amnesiac remember this script is for epic it's not a bitchx and or scrollz script or any other ircii based client but epic first you should get epic from www.epicsol.org download it and compile it. diff -aruN amn.orig/NOTES amn/NOTES --- amn.orig/NOTES Fri Sep 16 19:20:35 2005 +++ amn/NOTES Wed Dec 31 19:00:00 1969 @@ -1,53 +0,0 @@ -## various notes/documents about some common problems known in -## amnesiac/epic. - - -## ansi/ibm437 hardcoding fonts/ugly looking etc.. --this is not a bug per se, it's just how the font handles ansi codes. - i do not know what fonts really support them, these are some of the - things you can try if your theme/colors/ansi etc.. in the client looks - screwed up, also for european/non western languages users. there is a - /latin1 alias which should fix your terminal to fix your native language - characters however you cannot use an ansi theme (in most cases) - best to use the vanilla or epic theme. for non-western language encodings. - /ibm437 will try and enable ansi-like encodings on your terminal/putty/ - xterm/whatever. it is best to have a font that supports this, one such - font i do know that supports it for rxvt/aterm/etc.. is the vga11x19 - font, most people do not like this font as this is huge on small screens - ie; 1024x768 or 15" or less monitors, it can be grabbed from - http://amnesiac.ircii.org/misc/ - there are also some other fonts in there as well which may or may not work. - -## terminfo/termcap info. --terminfo/termcap issues on FreeBSD not sure about DragonFly... possible fix - ln -s /usr/compat/linux/usr/share/terminfo /usr/share/misc - and cross your fingers? - help from |Rain| (naturally i presume this - requires the linux-compat libs installed.) - -## multiserver in amnesiac. --there has been some improvements since 1.1 release - it's been tested and known to work, major complaints are no mjoin for - multiple servers, and no auto-reconnect(there is but highly not recommended) - and no auto_rejoin_on_connect. - -## output_rewrite formatting changes. --There are times i have came across people requesting indenting on long txt - from someone and others who want's it at beginning of next line, to adjust - the value for your choice of poison. - -/set output_rewrite output_rewrite $_paste($1-)$1- -[sample long txt output] <-- this sample is non-default -17:24:16|<@crapple> i wonder if i should test out the aggressive states on - nocturnal - -/set output_rewrite output_rewrite $_paste($1-) $1- -[sample long txt output with wrapping to beginning of line] <-- default. -17:24:16|<@crapple> i wonder if i should test out the aggressive states on -nocturnal -note: this will also wrap other formats as well ie: private msg. -/orw - indenting, non-default as of 9.8.05 -/orww - extended with wrappings. -default behavior. -## end output_rewrite formatting note. - -//crapple -//zak@ircii.org diff -aruN amn.orig/README amn/README --- amn.orig/README Fri Sep 16 19:06:44 2005 +++ amn/README Mon Oct 3 00:06:26 2005 @@ -1,3 +1,6 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. + * THE AMNESIAC HOME PAGE IS: http://amnesiac.ircii.org THE AMNESIAC IRC CHANNEL IS: #amnesiac on EFNet * Amnesiac is still extremely ALPHA, some things may break/not work/or even @@ -26,3 +29,28 @@ (crapple) (kreca) (skullY) + +I would like to thank the following people for contributing +in some way to this project. + + Jeremy Nelson + Brian Weiss + Xavier + Jonas Trollvik + Zach White + Eli Sand + Void + ryan + krimson + violence + adam + eater + twez + azel + Mike Garrison + David B. Kratter + Trenton Petrasek + Whitney Green + Kristian Paulsen + +if you beleive your name should be on this list drop me an e-mail. diff -aruN amn.orig/UPGRADE amn/UPGRADE --- amn.orig/UPGRADE Sun Oct 2 13:38:22 2005 +++ amn/UPGRADE Wed Dec 31 19:00:00 1969 @@ -1,23 +0,0 @@ -here i will note from time to time on the 'upgrade' howto, for the changes -you need to make or remove to update without restarting your client using -/adump. first off in order to use adump you must have an ~/.epicrc which -loads your amn.epic from somewhere(since amnesiac does not have to be -placed in ~/amn it could be in ~/irc/amnesiac/ or whatever. and savefiles -will always go in ~/.amn now we got that covered. let's move on. -(this is not for the faint of heart this is for people who have a big ego -about their irc client uptimes *ahem*) - -## upgrade info -## any to 1.1d r/* (in theory) -rm -rf /path/to/amn -rm -rf ~/.amn/.mod.save -rm -rf ~/.amn/.a.fsetsave - -## 1.1d r/5 > r/7 -rm -rf /path/to/amn -rm -rf ~/.amn/.mod.save -tar zxvf newver.tgz (in your home dir or dir you want it) -or -tar zxvf newver.tgz -C /path/to/where/you/want/it -lastly -/adump (in the client) diff -aruN amn.orig/amn.epic amn/amn.epic --- amn.orig/amn.epic Sun Oct 2 13:39:28 2005 +++ amn/amn.epic Sun Oct 2 22:56:48 2005 @@ -1,3 +1,6 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. + /* amnesiac by crapple mods/bugfixes by kreca pr0pz and thanks go to void!, xavier!, fudd, BlackJac, hop, criminal, krimson, twez, azel, violence, whitney, skullY, Alien88, kreca, eater, grimzy, adam, diff -aruN amn.orig/core/action.m amn/core/action.m --- amn.orig/core/action.m Tue Aug 30 10:42:46 2005 +++ amn/core/action.m Sun Oct 2 22:57:49 2005 @@ -1,4 +1,7 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage action + ## action hooks ## helper function that'll make /me output to the correct window during a diff -aruN amn.orig/core/alias.m amn/core/alias.m --- amn.orig/core/alias.m Sat Oct 1 20:55:46 2005 +++ amn/core/alias.m Sun Oct 2 22:57:58 2005 @@ -1,3 +1,6 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. + subpackage alias ## last modified by crapple 10.1.05 diff -aruN amn.orig/core/arrays.m amn/core/arrays.m --- amn.orig/core/arrays.m Wed Sep 14 17:01:15 2005 +++ amn/core/arrays.m Sun Oct 2 22:58:36 2005 @@ -1,5 +1,7 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. +# last modified: 9.07.05 - crapple subpackage arrays -## last modified: 9.07.05 - crapple ## msg formats @ delarray(mform) diff -aruN amn.orig/core/banner.m amn/core/banner.m --- amn.orig/core/banner.m Fri Jun 10 11:12:05 2005 +++ amn/core/banner.m Sun Oct 2 22:59:08 2005 @@ -1,4 +1,6 @@ -/* modified to throw away crappy ansi */ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. + /* 2005 crapple */ alias banner.head {awecho ------------------------------------------------------------------} diff -aruN amn.orig/core/bans.m amn/core/bans.m --- amn.orig/core/bans.m Tue Aug 30 00:22:19 2005 +++ amn/core/bans.m Sun Oct 2 22:59:36 2005 @@ -1,3 +1,6 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. + subpackage bans ## Robohak's tban and takeall alias diff -aruN amn.orig/core/bind.m amn/core/bind.m --- amn.orig/core/bind.m Sun Sep 18 00:09:23 2005 +++ amn/core/bind.m Sun Oct 2 22:59:55 2005 @@ -1,4 +1,7 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage binds + ## binds alias breset {bind -defaults} diff -aruN amn.orig/core/channel.m amn/core/channel.m --- amn.orig/core/channel.m Fri Sep 30 02:58:51 2005 +++ amn/core/channel.m Sun Oct 2 23:00:19 2005 @@ -1,3 +1,5 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage channel ## op/oper commands. diff -aruN amn.orig/core/color.m amn/core/color.m --- amn.orig/core/color.m Tue Aug 30 02:12:21 2005 +++ amn/core/color.m Sun Oct 2 23:00:43 2005 @@ -1,4 +1,7 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage color + alias colour color $* alias color { diff -aruN amn.orig/core/compat.m amn/core/compat.m --- amn.orig/core/compat.m Fri Sep 30 03:11:15 2005 +++ amn/core/compat.m Sun Oct 2 23:01:17 2005 @@ -1,4 +1,7 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage compat + ## compat/missing functions/things to make the script work well with epic5. if (word(2 $loadinfo()) != [pf]) { load -pf $word(1 $loadinfo()); diff -aruN amn.orig/core/config amn/core/config --- amn.orig/core/config Sat Oct 1 20:51:33 2005 +++ amn/core/config Sun Oct 2 23:01:33 2005 @@ -1,3 +1,6 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. + cleararray oper cleararray away cleararray protect diff -aruN amn.orig/core/config.m amn/core/config.m --- amn.orig/core/config.m Sat Oct 1 20:49:18 2005 +++ amn/core/config.m Sun Oct 2 23:01:47 2005 @@ -1,4 +1,7 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage config + alias setumode if (![$0]) {xecho -v [a+c] current usermode set to: $getumode}{@ getumode = [$0];xecho -v [a+c] usermodes set to: $getumode} alias config { @ :choice = [$1-] diff -aruN amn.orig/core/country.m amn/core/country.m --- amn.orig/core/country.m Tue Aug 30 01:23:23 2005 +++ amn/core/country.m Sun Oct 2 23:02:07 2005 @@ -1,3 +1,5 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage country alias addcountry { diff -aruN amn.orig/core/dcc.m amn/core/dcc.m --- amn.orig/core/dcc.m Tue Sep 20 20:00:09 2005 +++ amn/core/dcc.m Sun Oct 2 23:02:22 2005 @@ -1,3 +1,5 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage dcc ## binds. diff -aruN amn.orig/core/ehelp.m amn/core/ehelp.m --- amn.orig/core/ehelp.m Fri Sep 30 02:51:32 2005 +++ amn/core/ehelp.m Sun Oct 2 23:02:42 2005 @@ -1,4 +1,7 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage ehelp + alias ehelp { if (!$[0]) { diff -aruN amn.orig/core/eimodes.m amn/core/eimodes.m --- amn.orig/core/eimodes.m Tue Aug 30 01:31:29 2005 +++ amn/core/eimodes.m Sun Oct 2 23:02:57 2005 @@ -1,3 +1,5 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage eimodes ## simple aliases. diff -aruN amn.orig/core/exec.m amn/core/exec.m --- amn.orig/core/exec.m Sat Oct 1 09:15:22 2005 +++ amn/core/exec.m Sun Oct 2 23:03:18 2005 @@ -1,4 +1,7 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage exec + ## dns stuff. alias dns { if (match(*.* $0)) { diff -aruN amn.orig/core/fkey.m amn/core/fkey.m --- amn.orig/core/fkey.m Fri Sep 2 18:08:03 2005 +++ amn/core/fkey.m Sun Oct 2 23:03:33 2005 @@ -1,4 +1,7 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage fkey + alias fkeys { load $(loadpath)ans/fkeys.ans } diff -aruN amn.orig/core/format.m amn/core/format.m --- amn.orig/core/format.m Wed Sep 7 12:53:30 2005 +++ amn/core/format.m Sun Oct 2 23:03:49 2005 @@ -1,4 +1,7 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage format + alias format { if ([$#]) { switch ($0) { diff -aruN amn.orig/core/fsets.m amn/core/fsets.m --- amn.orig/core/fsets.m Fri Sep 30 00:27:03 2005 +++ amn/core/fsets.m Sun Oct 2 23:04:05 2005 @@ -1,4 +1,7 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage fsets + @fwords=[format_scan_onjoin_nicks_border format_scan_nicks_border format_scan_onjoin_nicks format_scan_users_op format_scan_users_non format_scan_users_voc format_scan_users format_scan_header format_scan_nicks format_scan_footer format_timestamp_some format_who format_who_footer format_whois_signon format_whois_actual format_who format_whois_header format_whois_admin format_whois_nick format_whois_name format_whois_channels format_whois_server format_whois_away format_whois_operator format_whois_idle format_whois_unknown format_whois_footer format_whowas_header format_whowas_nick format_whowas_name format_whowas_unknown format_whowas_footer format_sort format_user_non format_chops format_bwall format_msg format_send_msg format_public format_send_public format_public_other format_signoff format_join format_leave format_mode format_notice format_public_notice format_send_notice format_send_dcc_chat format_dcc_chat format_topic format_ctcp format_send_ctcp format_nick_comp format_sv format_wall format_away format_back format_action format_action_other format_desc format_send_desc format_wallop format_nickname format_invite format_dcc_connect format_dcc_request format_kick format_ctcp_reply format_server_notice format_dcc_lost_chat format_dcc_lost_file format_dcc_done_file] ^on ^set "format_*" { if ([$0]) { diff -aruN amn.orig/core/getusers.m amn/core/getusers.m --- amn.orig/core/getusers.m Fri Sep 2 22:25:07 2005 +++ amn/core/getusers.m Sun Oct 2 23:04:18 2005 @@ -1,3 +1,5 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage getusers ## some parts are questionable. will need more pruning in the future. //zak diff -aruN amn.orig/core/help.m amn/core/help.m --- amn.orig/core/help.m Sun Sep 18 00:18:07 2005 +++ amn/core/help.m Sun Oct 2 23:04:47 2005 @@ -1,4 +1,7 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage help + @hwords=[rn rk vocs bantype fset ban mko mkn massk orignick ub sping bkt dldir ps ls cd dns nslookup fkeys format q bans banstat wii mdop mdeop dop dv v scano scanv scann t k umode m j l wi ver c nochat chat bk op voice deop mop cycle mreop readlog wall user chops sv frelm tsave freln away back format config color sbcolor dict fsave sbar scan wk wlk wn wp wj wc csave banstat bankick cig cops devoice fctcp iban inv kickban kb links lk lsay mdv more mv mw nops not partall qk staynick supt theme tig unban untheme winhelp] alias ahelp if (![$0]) { banner.head diff -aruN amn.orig/core/hooks.m amn/core/hooks.m --- amn.orig/core/hooks.m Sun Sep 18 00:05:56 2005 +++ amn/core/hooks.m Sun Oct 2 23:15:13 2005 @@ -1,4 +1,8 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage hooks + +## exit hook on #-exit 000 "*" { @ex.signon=stime($time()) xecho -v -b Signon time : $ex.signon @@ -7,13 +11,24 @@ xecho -v -b signoff: $N \($*\) } +## chanalone hook ^on #-leave 123 "% % *" { if ([$0] != servernick() && remw($0 $chanusers($1)) == servernick()) { timer 1 xecho -b You are the only user left on $1 } } +## uptime hooks. +on #-msg 22 * {@lrm=[$1-];@lrmn=[$0]} +on #-send_msg 22 * {@lsm=[$1-];@lsmn=[$0]} + +on #-notice 22 * {@lrn=[$1-];@lrnn=[$0]} + +on #-send_notice 22 * {@lsn=[$1-];@lsnn=[$0]} + +alias uptime {/load $(loadpath)ans/uptime.ans} + ## umode hook on #-connect 50 * { if (!_pubnick) { @@ -69,8 +84,8 @@ abecho $2- } -#disable certain servnumerics here. -##/End of MOTD +## disable certain servnumerics here. +#/End of MOTD ^on ^376 * # ## disable you've got mail!. diff -aruN amn.orig/core/ignore.m amn/core/ignore.m --- amn.orig/core/ignore.m Thu Sep 8 19:18:35 2005 +++ amn/core/ignore.m Sun Oct 2 23:05:20 2005 @@ -1,3 +1,5 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage ignore ## some short aliases. diff -aruN amn.orig/core/lag.m amn/core/lag.m --- amn.orig/core/lag.m Tue Aug 30 00:17:58 2005 +++ amn/core/lag.m Sun Oct 2 23:05:56 2005 @@ -1,6 +1,8 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage lag + ## from psykotyk's orb -## lagbitz alias _orb.relag { @ _ass.rlt = time() quote ping $S diff -aruN amn.orig/core/lusers.m amn/core/lusers.m --- amn.orig/core/lusers.m Sun Oct 2 13:09:28 2005 +++ amn/core/lusers.m Sun Oct 2 23:07:33 2005 @@ -1,10 +1,13 @@ -subpackage lusers +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. +# ## last modified by skullY on 2005 Aug 11. ## modded a bit to remove cruft by crapple on 2005 Oct 2 -## stolen from argon cause of sheer leetness. +## idea originally taken from argon. ## fixed by skullY because it was broked with the new math parser. ## It's still all ugly and there's at least one new hack, but really, who ## cares that much about lusers? <-- Alien88 does apparently ;( -crapple. +subpackage lusers on ^001 * # on ^002 * # diff -aruN amn.orig/core/mod.m amn/core/mod.m --- amn.orig/core/mod.m Fri Sep 16 20:08:08 2005 +++ amn/core/mod.m Sun Oct 2 23:07:49 2005 @@ -1,3 +1,5 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage mod alias emod {/load $(loadpath)ans/modules.ans} diff -aruN amn.orig/core/modeshow.m amn/core/modeshow.m --- amn.orig/core/modeshow.m Wed Aug 31 09:43:29 2005 +++ amn/core/modeshow.m Sun Oct 2 23:08:03 2005 @@ -1,4 +1,7 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage modeshow + alias modeshow vocop $* alias showmodes vocop $* alias vocop { diff -aruN amn.orig/core/more.m amn/core/more.m --- amn.orig/core/more.m Tue Aug 30 04:08:25 2005 +++ amn/core/more.m Sun Oct 2 23:08:51 2005 @@ -1,5 +1,8 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. +# this taken from EPIC4 dist written by archon subpackage more -## this taken from EPIC4 dist written by archon + alias more { if ([$0]) diff -aruN amn.orig/core/notify.m amn/core/notify.m --- amn.orig/core/notify.m Fri Sep 2 17:54:05 2005 +++ amn/core/notify.m Sun Oct 2 23:09:30 2005 @@ -1,4 +1,7 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage notify + ^on ^notify_signon * { awecho $G $(c1)signon $(cl)by $(c1)$0$(hblk)!$(cl)$sar(g/@/$(hblk)@$(cl)/$1-) at $Z } diff -aruN amn.orig/core/paste.m amn/core/paste.m --- amn.orig/core/paste.m Tue Aug 30 01:43:13 2005 +++ amn/core/paste.m Sun Oct 2 23:10:33 2005 @@ -1,6 +1,9 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. +# hops little paste script so you can paste shit without worrying about +# commands....ctrl-p to toggle.. /set paste for some other shit. subpackage paste -##hops little paste script so you can paste shit without worrying about -##commands....ctrl-p to toggle.. /set paste for some other shit. + @ paste.on = 0 @ paste.strip = 0 @ paste.delay = 30 diff -aruN amn.orig/core/save.m amn/core/save.m --- amn.orig/core/save.m Sat Oct 1 20:47:49 2005 +++ amn/core/save.m Sun Oct 2 23:10:44 2005 @@ -1,4 +1,7 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage save + alias asave { @savefile=[$(savepath).a.save] @rename($savefile $savefile~) diff -aruN amn.orig/core/sbar.m amn/core/sbar.m --- amn.orig/core/sbar.m Fri Sep 2 20:01:16 2005 +++ amn/core/sbar.m Sun Oct 2 23:10:55 2005 @@ -1,4 +1,7 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage sbar + @ sbar.max = 14 alias sbar if ([$0] && ([$0] <= sbar.max)) { @statbar=[stat.$0] diff -aruN amn.orig/core/sbcolor.m amn/core/sbcolor.m --- amn.orig/core/sbcolor.m Tue Aug 30 01:41:18 2005 +++ amn/core/sbcolor.m Sun Oct 2 23:11:05 2005 @@ -1,4 +1,7 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage sbcolor + alias sbcolour sbcolor $* alias sbcolor { @:clear = [$(cl)] diff -aruN amn.orig/core/scan.m amn/core/scan.m --- amn.orig/core/scan.m Tue Aug 30 23:52:33 2005 +++ amn/core/scan.m Sun Oct 2 23:11:18 2005 @@ -1,4 +1,7 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage scan + ^on ^names * #- alias fix.scan if ([$0]) { @_t=[$[10]0] diff -aruN amn.orig/core/sets.m amn/core/sets.m --- amn.orig/core/sets.m Sat Oct 1 21:33:13 2005 +++ amn/core/sets.m Sun Oct 2 23:11:29 2005 @@ -1,3 +1,5 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage sets ## colour vars. diff -aruN amn.orig/core/sync.m amn/core/sync.m --- amn.orig/core/sync.m Tue Aug 30 00:16:33 2005 +++ amn/core/sync.m Sun Oct 2 23:11:47 2005 @@ -1,4 +1,7 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage sync + ## rain's utime_sub alias alias utime_sub { @:first=[$0.$pad(-6 0 $1)] diff -aruN amn.orig/core/theme.m amn/core/theme.m --- amn.orig/core/theme.m Wed Sep 7 13:05:57 2005 +++ amn/core/theme.m Sun Oct 2 23:12:18 2005 @@ -1,6 +1,9 @@ -subpackage theme +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. ## codelogic's theme module, thanx to robohak for help w/ padding ## modified crapple/kreca 05 +subpackage theme + alias tsave if ([$1]) { @ blahfile = $0 if (fexist($(loadpath)themes/$0.th)) { diff -aruN amn.orig/core/trickle.m amn/core/trickle.m --- amn.orig/core/trickle.m Fri Sep 2 14:51:54 2005 +++ amn/core/trickle.m Sun Oct 2 23:12:33 2005 @@ -1,4 +1,7 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage trickle + alias trickle { diff -aruN amn.orig/core/update.m amn/core/update.m --- amn.orig/core/update.m Fri Sep 2 19:43:06 2005 +++ amn/core/update.m Sun Oct 2 23:12:44 2005 @@ -1,4 +1,7 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage update + alias update.f { ^eval load $(loadpath)stats/$statbar ^eval load $(loadpath)sc/scan.$snf diff -aruN amn.orig/core/uptime.m amn/core/uptime.m --- amn.orig/core/uptime.m Tue Aug 30 01:32:28 2005 +++ amn/core/uptime.m Wed Dec 31 19:00:00 1969 @@ -1,10 +0,0 @@ -subpackage uptime -on #-msg 22 * {@lrm=[$1-];@lrmn=[$0]} - -on #-send_msg 22 * {@lsm=[$1-];@lsmn=[$0]} - -on #-notice 22 * {@lrn=[$1-];@lrnn=[$0]} - -on #-send_notice 22 * {@lsn=[$1-];@lsnn=[$0]} - -alias uptime {/load $(loadpath)ans/uptime.ans} diff -aruN amn.orig/core/users.m amn/core/users.m --- amn.orig/core/users.m Fri Sep 2 06:45:42 2005 +++ amn/core/users.m Sun Oct 2 23:15:55 2005 @@ -1,5 +1,8 @@ -subpackage users +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. ## last modified by crapple on 9.1.05 +subpackage users + alias chops { if (![$0]) { @:chan = [$1] ? [$1] : [$C] diff -aruN amn.orig/core/version.m amn/core/version.m --- amn.orig/core/version.m Wed Aug 31 08:18:13 2005 +++ amn/core/version.m Sun Oct 2 23:16:33 2005 @@ -1,4 +1,7 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage version + alias svf { msg $T $fparse(format_sv); diff -aruN amn.orig/core/wall.m amn/core/wall.m --- amn.orig/core/wall.m Tue Aug 30 00:18:26 2005 +++ amn/core/wall.m Sun Oct 2 23:17:05 2005 @@ -1,3 +1,5 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage wall ## old wall diff -aruN amn.orig/core/whois.m amn/core/whois.m --- amn.orig/core/whois.m Tue Aug 30 01:15:58 2005 +++ amn/core/whois.m Sun Oct 2 23:17:22 2005 @@ -1,4 +1,7 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage whois + alias 1format { switch ($0) { (1) {@_whois=1;^eval load ${loadpath}wis/whois.1} diff -aruN amn.orig/core/window.m amn/core/window.m --- amn.orig/core/window.m Sat Oct 1 21:27:04 2005 +++ amn/core/window.m Sun Oct 2 23:18:23 2005 @@ -1,6 +1,8 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. +# last modified by crapple 9.2.05 +# windowing stuff subpackage window -## last modified by crapple 9.2.05 -## windowing stuff ## more complex windowing stuff here. alias channame if (left(1 $0)==[#] || left(1 $0)==[&]) { return $0 }{ return #$0 } diff -aruN amn.orig/core/winhelp.m amn/core/winhelp.m --- amn.orig/core/winhelp.m Fri Sep 2 14:50:13 2005 +++ amn/core/winhelp.m Sun Oct 2 23:18:34 2005 @@ -1,4 +1,7 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage winhelp + alias winhelp { if (!$[0]) { diff -aruN amn.orig/docs/NOTES amn/docs/NOTES --- amn.orig/docs/NOTES Wed Dec 31 19:00:00 1969 +++ amn/docs/NOTES Fri Sep 16 19:20:35 2005 @@ -0,0 +1,53 @@ +## various notes/documents about some common problems known in +## amnesiac/epic. + + +## ansi/ibm437 hardcoding fonts/ugly looking etc.. +-this is not a bug per se, it's just how the font handles ansi codes. + i do not know what fonts really support them, these are some of the + things you can try if your theme/colors/ansi etc.. in the client looks + screwed up, also for european/non western languages users. there is a + /latin1 alias which should fix your terminal to fix your native language + characters however you cannot use an ansi theme (in most cases) + best to use the vanilla or epic theme. for non-western language encodings. + /ibm437 will try and enable ansi-like encodings on your terminal/putty/ + xterm/whatever. it is best to have a font that supports this, one such + font i do know that supports it for rxvt/aterm/etc.. is the vga11x19 + font, most people do not like this font as this is huge on small screens + ie; 1024x768 or 15" or less monitors, it can be grabbed from + http://amnesiac.ircii.org/misc/ + there are also some other fonts in there as well which may or may not work. + +## terminfo/termcap info. +-terminfo/termcap issues on FreeBSD not sure about DragonFly... possible fix + ln -s /usr/compat/linux/usr/share/terminfo /usr/share/misc + and cross your fingers? - help from |Rain| (naturally i presume this + requires the linux-compat libs installed.) + +## multiserver in amnesiac. +-there has been some improvements since 1.1 release + it's been tested and known to work, major complaints are no mjoin for + multiple servers, and no auto-reconnect(there is but highly not recommended) + and no auto_rejoin_on_connect. + +## output_rewrite formatting changes. +-There are times i have came across people requesting indenting on long txt + from someone and others who want's it at beginning of next line, to adjust + the value for your choice of poison. + +/set output_rewrite output_rewrite $_paste($1-)$1- +[sample long txt output] <-- this sample is non-default +17:24:16|<@crapple> i wonder if i should test out the aggressive states on + nocturnal + +/set output_rewrite output_rewrite $_paste($1-) $1- +[sample long txt output with wrapping to beginning of line] <-- default. +17:24:16|<@crapple> i wonder if i should test out the aggressive states on +nocturnal +note: this will also wrap other formats as well ie: private msg. +/orw - indenting, non-default as of 9.8.05 +/orww - extended with wrappings. -default behavior. +## end output_rewrite formatting note. + +//crapple +//zak@ircii.org diff -aruN amn.orig/docs/UPGRADE amn/docs/UPGRADE --- amn.orig/docs/UPGRADE Wed Dec 31 19:00:00 1969 +++ amn/docs/UPGRADE Sun Oct 2 13:38:22 2005 @@ -0,0 +1,23 @@ +here i will note from time to time on the 'upgrade' howto, for the changes +you need to make or remove to update without restarting your client using +/adump. first off in order to use adump you must have an ~/.epicrc which +loads your amn.epic from somewhere(since amnesiac does not have to be +placed in ~/amn it could be in ~/irc/amnesiac/ or whatever. and savefiles +will always go in ~/.amn now we got that covered. let's move on. +(this is not for the faint of heart this is for people who have a big ego +about their irc client uptimes *ahem*) + +## upgrade info +## any to 1.1d r/* (in theory) +rm -rf /path/to/amn +rm -rf ~/.amn/.mod.save +rm -rf ~/.amn/.a.fsetsave + +## 1.1d r/5 > r/7 +rm -rf /path/to/amn +rm -rf ~/.amn/.mod.save +tar zxvf newver.tgz (in your home dir or dir you want it) +or +tar zxvf newver.tgz -C /path/to/where/you/want/it +lastly +/adump (in the client) diff -aruN amn.orig/modules/abot/abot.m amn/modules/abot/abot.m --- amn.orig/modules/abot/abot.m Sat Jul 9 18:45:27 2005 +++ amn/modules/abot/abot.m Sun Oct 2 23:18:57 2005 @@ -1,4 +1,7 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage autobot + @ bsavefile = [$(savepath).bot.save] @ botprompt = [$cparse($(c1)auto)$cparse($(c2)bot)$(hblk):$(cl)] alias ismask {return ${pass(!@ $0) ? 1 : 0}} diff -aruN amn.orig/modules/adcc/adcc.m amn/modules/adcc/adcc.m --- amn.orig/modules/adcc/adcc.m Fri Sep 2 21:45:50 2005 +++ amn/modules/adcc/adcc.m Sun Oct 2 23:19:17 2005 @@ -1,4 +1,7 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage adcc + alias cdcc adcc alias xdcc adcc alias adcc { diff -aruN amn.orig/modules/aol/aol.m amn/modules/aol/aol.m --- amn.orig/modules/aol/aol.m Sun Oct 2 13:33:24 2005 +++ amn/modules/aol/aol.m Sun Oct 2 23:20:12 2005 @@ -1,7 +1,9 @@ -subpackage aol -# nutbar -# elite aol text stuff +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. +# taken from enigma. nutbar. # moved lsay here on 10.2.05 - crapple +subpackage aol + @ setitem(aol 0 ALL OREAND THE GIFCHERRY BUSH DA BOON CHASED DA WHEASELGIFPASTECLITNUGGET SHIT) @ setitem(aol 1 WH0A WHUT W00D PEEPUHL THEEENK IF DAY GN00 EYE WUZ A JEEEZUS FREEEK?!) @ setitem(aol 2 EYE WENT TO THE TRAK TO WAATCH THE PONYNUGGETS RHUN AROUND THE GIFPASTE) diff -aruN amn.orig/modules/away/away.m amn/modules/away/away.m --- amn.orig/modules/away/away.m Tue Aug 30 03:44:29 2005 +++ amn/modules/away/away.m Sun Oct 2 23:20:37 2005 @@ -1,4 +1,7 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage away + alias mlog {config b $*} alias clog {config c $*} alias nlog {config d $*} diff -aruN amn.orig/modules/bwk/bwk.m amn/modules/bwk/bwk.m --- amn.orig/modules/bwk/bwk.m Fri Sep 2 22:39:27 2005 +++ amn/modules/bwk/bwk.m Sun Oct 2 23:20:55 2005 @@ -1,3 +1,5 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage bwk @wordsfile=[$(savepath).a.words.save] diff -aruN amn.orig/modules/clones/clones.m amn/modules/clones/clones.m --- amn.orig/modules/clones/clones.m Tue Aug 30 04:12:11 2005 +++ amn/modules/clones/clones.m Sun Oct 2 23:21:44 2005 @@ -1,5 +1,8 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. +# taken from cypress //zak subpackage clones -## ripped from cypress; it appears to be ok. //zak + alias getclones { @ delarray(clones) @ setitem(clones 0) diff -aruN amn.orig/modules/dict/dict.m amn/modules/dict/dict.m --- amn.orig/modules/dict/dict.m Tue Aug 30 04:12:37 2005 +++ amn/modules/dict/dict.m Sun Oct 2 23:22:31 2005 @@ -1,6 +1,9 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. +# most of this taken from crackrock and made a lot better. server var +# taken from pv. subpackage dict -## most of this taken from crackrock and made a lot better. server var -## taken from pv. + @ dict.serv = [dict.org] @ dict.port = 2628 alias processdict { diff -aruN amn.orig/modules/flood/flood.m amn/modules/flood/flood.m --- amn.orig/modules/flood/flood.m Tue Aug 30 04:13:11 2005 +++ amn/modules/flood/flood.m Sun Oct 2 23:22:46 2005 @@ -1,4 +1,7 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage flood + ^on #-msg 1 * if (msgflood != 1) { @msgs++ //timer -refnum 5001 3 {@msgs = 0} diff -aruN amn.orig/modules/mjoin/mjoin.m amn/modules/mjoin/mjoin.m --- amn.orig/modules/mjoin/mjoin.m Thu Sep 8 18:52:39 2005 +++ amn/modules/mjoin/mjoin.m Sun Oct 2 23:22:59 2005 @@ -1,4 +1,7 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage mjoin + ## some aliases for mjoin alias listc listchan alias addjoin ajoin $* diff -aruN amn.orig/modules/ncomp/ncomp.m amn/modules/ncomp/ncomp.m --- amn.orig/modules/ncomp/ncomp.m Tue Aug 30 04:13:59 2005 +++ amn/modules/ncomp/ncomp.m Sun Oct 2 23:23:15 2005 @@ -1,4 +1,7 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage ncomp + ^on ^input "*" { if (strlen($before(: $0)) > 1&&right(1 $0)==[:]) { @ txt = before(: $0) diff -aruN amn.orig/modules/netsplit/netsplit.m amn/modules/netsplit/netsplit.m --- amn.orig/modules/netsplit/netsplit.m Tue Aug 30 04:14:11 2005 +++ amn/modules/netsplit/netsplit.m Sun Oct 2 23:25:30 2005 @@ -1,4 +1,5 @@ -subpackage netsplit +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. # Taken from the base epic5/scripts. # # NETSPLIT 7 - This script does it's best to suppress the excessive @@ -17,6 +18,10 @@ # CONVERTED for ircII2.2pre8 # Version V by poxaV (cgw@unt.edu), from Daemon's code # modified last 7-03-93 +# +# integration into amnesiac by crapple/kreca some simplifications. +# crapple/kreca 05 +subpackage netsplit #shows the current time in HH:MM:SS format ^alias currtime @ function_return = strftime(%T) diff -aruN amn.orig/modules/nlog/nlog.m amn/modules/nlog/nlog.m --- amn.orig/modules/nlog/nlog.m Fri Sep 16 17:49:59 2005 +++ amn/modules/nlog/nlog.m Sun Oct 2 23:25:44 2005 @@ -1,4 +1,7 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage nlog + @nsolog=[off] @nfile=[$(savepath).a.notify.save] @nlogfile=[$(savepath)notify.log] diff -aruN amn.orig/modules/oper/oper.m amn/modules/oper/oper.m --- amn.orig/modules/oper/oper.m Thu Sep 8 18:47:37 2005 +++ amn/modules/oper/oper.m Sun Oct 2 23:25:55 2005 @@ -1,4 +1,7 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage oper + @ bindctl(sequence ^E set parse_command _spageu) @ bindctl(sequence ^D set parse_command _spaged) diff -aruN amn.orig/modules/orignick/orignick.m amn/modules/orignick/orignick.m --- amn.orig/modules/orignick/orignick.m Thu Sep 1 20:26:58 2005 +++ amn/modules/orignick/orignick.m Sun Oct 2 23:26:06 2005 @@ -1,4 +1,7 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage orignick + ^timer -del 45 alias orignick { if (![$0]) { diff -aruN amn.orig/modules/query/query.m amn/modules/query/query.m --- amn.orig/modules/query/query.m Sat Oct 1 21:30:04 2005 +++ amn/modules/query/query.m Sun Oct 2 23:27:04 2005 @@ -1,10 +1,11 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage query /* * Copyright (c) 2003 Brian Weiss * All rights reserved. * - * This script uses serial number 835 for all /ON hooks. */ /****** CONFIG SECTION ******/ diff -aruN amn.orig/modules/relay/relay.m amn/modules/relay/relay.m --- amn.orig/modules/relay/relay.m Sun Oct 2 00:49:17 2005 +++ amn/modules/relay/relay.m Sun Oct 2 23:27:33 2005 @@ -1,6 +1,7 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. +# last modified by crapple 10.2.05 - added /rel(smn) -l hacks for xavier. subpackage relay - -## last modified by crapple 10.2.05 - added /rel(smn) -l hacks for xavier. alias lpaste msg $T $line(${[$0]?[$0]:1}) alias lp lpaste diff -aruN amn.orig/modules/services/services.m amn/modules/services/services.m --- amn.orig/modules/services/services.m Sat Sep 3 15:48:17 2005 +++ amn/modules/services/services.m Sun Oct 2 23:28:01 2005 @@ -1,5 +1,7 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. +# nickserv/chanserv/operserv etc.. module. subpackage services -## nickserv/chanserv/operserv etc.. module. #both way aliases chanserv/nickserv. diff -aruN amn.orig/modules/shitlist/shitlist.m amn/modules/shitlist/shitlist.m --- amn.orig/modules/shitlist/shitlist.m Thu Sep 1 20:52:21 2005 +++ amn/modules/shitlist/shitlist.m Sun Oct 2 23:28:50 2005 @@ -1,3 +1,5 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage shitlist alias listshit shitlist diff -aruN amn.orig/modules/sprot/sprot.m amn/modules/sprot/sprot.m --- amn.orig/modules/sprot/sprot.m Tue Aug 30 04:15:27 2005 +++ amn/modules/sprot/sprot.m Sun Oct 2 23:29:05 2005 @@ -1,3 +1,5 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage sprot @kicklogo=[off] diff -aruN amn.orig/modules/tab/tab.m amn/modules/tab/tab.m --- amn.orig/modules/tab/tab.m Tue Jun 21 04:44:09 2005 +++ amn/modules/tab/tab.m Sun Oct 2 23:29:27 2005 @@ -1,3 +1,5 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage tab @ bindctl(sequence ^I set parse_command get.msg) diff -aruN amn.orig/modules/userlist/userlist.m amn/modules/userlist/userlist.m --- amn.orig/modules/userlist/userlist.m Thu Sep 1 20:37:14 2005 +++ amn/modules/userlist/userlist.m Sun Oct 2 23:29:58 2005 @@ -1,8 +1,10 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. +# based on void/codelogic's autobot 98 +# modded by crapple 05 +# taken from epic dist scripts dir subpackage userlist -## based on void/codelogic's autobot 98 -## modded by crapple 05 -## taken from epic dist scripts dir ^alias clean foreach $0 ii { ^assign -$0[$ii] } # /purge diff -aruN amn.orig/modules/vanilla/vanilla.m amn/modules/vanilla/vanilla.m --- amn.orig/modules/vanilla/vanilla.m Fri Sep 9 03:52:14 2005 +++ amn/modules/vanilla/vanilla.m Sun Oct 2 23:30:37 2005 @@ -1,5 +1,7 @@ -subpackage vanilla +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. # Make amnesiac behave a bit more like default epic with tc and netsplit # loaded, just the way skullY likes it +subpackage vanilla @ bindctl(sequence ^D set parse_command listsplit) diff -aruN amn.orig/modules/xy/xy.m amn/modules/xy/xy.m --- amn.orig/modules/xy/xy.m Sat Jun 4 00:57:53 2005 +++ amn/modules/xy/xy.m Sun Oct 2 23:31:02 2005 @@ -1,4 +1,7 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage xy + alias xy msg x@channels.undernet.org $* alias x xy $* alias xlogin xy login $* diff -aruN amn.orig/pasture/topwin/topwin.m amn/pasture/topwin/topwin.m --- amn.orig/pasture/topwin/topwin.m Fri Apr 29 04:18:38 2005 +++ amn/pasture/topwin/topwin.m Sun Oct 2 23:31:26 2005 @@ -1,4 +1,7 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage topwin + alias fixtopic { @cwin=winchan($0) if ( cwin != -1) { diff -aruN amn.orig/sc/scan.1 amn/sc/scan.1 --- amn.orig/sc/scan.1 Tue Aug 30 04:17:06 2005 +++ amn/sc/scan.1 Sun Oct 2 23:32:24 2005 @@ -1,3 +1,5 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage scan1 @format_scan_users=[$$(hblk)[$$(cl)ops\\\($$(hwht)$$1$$(cl\\\))$$(hblk)] $$(hblk)[$$(cl)non\\\($$(hwht)$$2$$(cl)\\\)$$(hblk)] $$(hblk)[$$(cl)voc\\\($$(hwht)$$3$$(cl)\\\)$$(hblk)]] diff -aruN amn.orig/sc/scan.2 amn/sc/scan.2 --- amn.orig/sc/scan.2 Tue Aug 30 04:17:15 2005 +++ amn/sc/scan.2 Sun Oct 2 23:32:35 2005 @@ -1,3 +1,5 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage scan2 @format_scan_users=[ $$(hblk)[$$(c1)o$$(hblk)!$$(wht)$$1$(cl)$$(hblk)] $$(hblk)[$$(c1)n$$(hblk)!$$(wht)$$2$$(hblk)] $$(hblk)[$$(c1)v$$(hblk)!$$(wht)$$3$$(hblk)]] diff -aruN amn.orig/sc/scan.3 amn/sc/scan.3 --- amn.orig/sc/scan.3 Tue Aug 30 04:17:22 2005 +++ amn/sc/scan.3 Sun Oct 2 23:32:42 2005 @@ -1,4 +1,7 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage scan3 + @format_scan_users=[ Users on $$4 \\\(o:$$1) \\\(n:$$2) \\\(v:$$3) @format_scan_width=15 ^assign -format_scan_header diff -aruN amn.orig/sc/scan.4 amn/sc/scan.4 --- amn.orig/sc/scan.4 Tue Aug 30 04:17:28 2005 +++ amn/sc/scan.4 Sun Oct 2 23:32:50 2005 @@ -1,3 +1,5 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage scan4 @format_scan_users=[ $$(hblk)[$$(c1)o$$(hblk)!$$(wht)$$1$$(cl)$$(hblk)] $$(hblk)[$$(c1)n$$(hblk)!$$(wht)$$2$$(hblk)] $$(hblk)[$$(c1)v$$(hblk)!$$(wht)$$3$$(hblk)]] diff -aruN amn.orig/sc/scan.5 amn/sc/scan.5 --- amn.orig/sc/scan.5 Tue Aug 30 04:17:34 2005 +++ amn/sc/scan.5 Sun Oct 2 23:32:59 2005 @@ -1,4 +1,7 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage scan5 + @format_scan_users=[*** Users on $$4] @format_scan_width=1 ^assign -format_scan_header diff -aruN amn.orig/sc/scan.6 amn/sc/scan.6 --- amn.orig/sc/scan.6 Tue Aug 30 04:17:40 2005 +++ amn/sc/scan.6 Sun Oct 2 23:33:14 2005 @@ -1,3 +1,5 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. subpackage scan6 @format_scan_users=[ $$4 [o!$$1] [n!$$2] [v!$$3]] Date: Mon, 3 Oct 2005 22:14:50 -0400 (EDT) From: zak@ircii.org (Zak) -sync EPIC-BUGS to reality. -sync E5-KNOWNBUGS to reality. //zak diff -aruN amn.orig/CHANGES amn/CHANGES --- amn.orig/CHANGES Mon Oct 3 00:12:51 2005 +++ amn/CHANGES Mon Oct 3 22:13:56 2005 @@ -174,3 +174,4 @@ -some other minor changes. //zak -move UPGRADE into doc/ //zak -move NOTES into doc/ //zak +-sync EPIC-BUGS E5-KNOWNBUGS to reality //zak diff -aruN amn.orig/EPIC-BUGS amn/EPIC-BUGS --- amn.orig/EPIC-BUGS Sun Oct 2 14:19:20 2005 +++ amn/EPIC-BUGS Mon Oct 3 22:11:06 2005 @@ -1,3 +1,6 @@ +All bugs reported here has been fixed in cvs id 1302. the file will just +stay here as a reference until the next epic5 release comes out. + ircII EPIC5-0.0.6 (Commit id: 1288) (Date of release: 20050809) -FIXED - ircII EPIC5-0.0.6 (Commit id: 1300) (Date of release: 20050809) nonblocking dns problems are gone now many thanks to hop for fixing this. @@ -42,183 +45,33 @@ that. 00:04|(hop!jnelson@epic.user) therefore, i shall make it a high priority to finish that part of the code right away, so you can continue testing. =) -^^ so hopefully a fix regarding this will come soon ;) +^^ FIXED. -discussed the below with hop somewhat on 10.2.05 -it's kinda hard to reproduce.. i will update more on this when i get time. - ircII EPIC5-0.0.6 (Commit id: 1292) (Date of release: 20050809) +FIXED: 10.3.05 ircII EPIC5-0.0.6 (Commit id: 1302) (Date of release: 20050809) + 21:22|(hop!jnelson@epic.user) the karll array stuff rqeuires a call to + qsort() occasionally, and qsort()'s 3rd argument asks how big each item in + the array is. + 21:22|(hop!jnelson@epic.user) so we passed sizeof(long *) to qsort + 21:22|(hop!jnelson@epic.user) but in the qsort callback function, we were + casting the argument to (int *) and not (long *) + 21:23|(hop!jnelson@epic.user) this caused the qsort callback to do +incorrect comparisons + 21:23|(hop!jnelson@epic.user) the reason this doesn't come up in amd64 is + because sparc is big endian and amd64, like all pc's, is little endian + 21:23|(hop!jnelson@epic.user) for example, if i have 4 and 8 byte integers, + and i assign 10 to each of them + 21:23|(hop!jnelson@epic.user) on amd64, it is 10 00 00 00 [00 00 00 00] + 21:23|(hop!jnelson@epic.user) so whether i cast it to (long *) or (int *) i + still get 10 + 21:24|(hop!jnelson@epic.user) but on sparc, it's [00 00 00 00] 00 00 00 10 + 21:24|(hop!jnelson@epic.user) so if i cast to (int *), i get 0! and if i + -finditem() seems to be broken, however the behavior seems hard to reproduce among the different commit id and release versions of epic5, sample code that usually guarantees a reproduce. -alias addcountry { - @:i = numitems(countryIndex) - @setitem(countryIndex $i $toupper($0)) - @setitem(countryName $i $1-) -} - -alias country { - @:i= finditem(countryIndex $toupper($0)) - if ( i > -1) { - @function_return=getitem(countryName $i) - } { - @function_return =[Unknown] - } -} - -@addcountry(ZR Zaire) -@addcountry(ZW Zimbabwe) -@addcountry(COM Internic Commercial) -@addcountry(EDU Educational Institution) -@addcountry(ARPA Reverse DNS) - -/eval echo $country(ZR) <-- works -/eval echo $country(COM) <-- 3/4 letter finds don't seem to work. -^^ fix i did for the above in amnesiac is to use matchitem() instead of - finditem() - --> debug 7 output for broken $finditem() --> even more confusing/unpredictable as of 10.2.05 //zak -## test .com //works oddly. - -Executing [0] /eval echo $country(com) -Expanded [com] to [com] -Expanded [@:i= finditem(countryIndex $toupper($0));if ( i > -1) -+{@function_return=getitem(countryName $i)} {@function_return =[Unknown]}] -to -+[@:i= finditem(countryIndex $toupper($0))] -Executing [1] @:i= finditem(countryIndex $toupper($0)) -Expanded [:i] to [:i] -Expanded [finditem(countryIndex $toupper($0))] to [finditem(countryIndex -+$toupper($0))] -Expanded [$0] to [com] -Function TOUPPER(com) returned COM -Expanded [countryIndex $toupper($0)] to [countryIndex COM] -Function FINDITEM(countryIndex COM) returned 2 -Expanded [if ( i > -1) {@function_return=getitem(countryName $i)} -+{@function_return =[Unknown]}] to [if ( i > -1) -+{@function_return=getitem(countryName $i)} {@function_return =[Unknown]}] -Executing [1] if ( i > -1) {@function_return=getitem(countryName $i)} -+{@function_return =[Unknown]} -Expanded [-1] to [-1] -Expanded [i] to [i] -Expanded [1] to [1] -IF expression expands to: (1) -IF expression expands to: (1) -Expanded [@function_return=getitem(countryName $i)] to -+[@function_return=getitem(countryName $i)] -Executing [2] @function_return=getitem(countryName $i) -Expanded [function_return] to [function_return] -Expanded [getitem(countryName $i)] to [getitem(countryName $i)] -Expanded [countryName $i] to [countryName 2] -Function GETITEM(countryName 2) returned Internic Commercial -Function COUNTRY(com) returned Internic Commercial -Expanded [echo $country(com)] to [echo Internic Commercial] -Executing [1] echo Internic Commercial -Internic Commercial - -## testing arpa. //broken. -Executing [0] /eval echo $country(arpa) -Expanded [arpa] to [arpa] -Expanded [@:i= finditem(countryIndex $toupper($0));if ( i > -1) -+{@function_return=getitem(countryName $i)} {@function_return =[Unknown]}] -to -+[@:i= finditem(countryIndex $toupper($0))] -Executing [1] @:i= finditem(countryIndex $toupper($0)) -Expanded [:i] to [:i] -Expanded [finditem(countryIndex $toupper($0))] to [finditem(countryIndex -+$toupper($0))] -Expanded [$0] to [arpa] -Function TOUPPER(arpa) returned ARPA -Expanded [countryIndex $toupper($0)] to [countryIndex ARPA] -Function FINDITEM(countryIndex ARPA) returned -2 -Expanded [if ( i > -1) {@function_return=getitem(countryName $i)} -+{@function_return =[Unknown]}] to [if ( i > -1) -+{@function_return=getitem(countryName $i)} {@function_return =[Unknown]}] -Executing [1] if ( i > -1) {@function_return=getitem(countryName $i)} -+{@function_return =[Unknown]} -Expanded [-1] to [-1] -Expanded [i] to [i] -Expanded [0] to [0] -IF expression expands to: (0) -Expanded [@function_return =[Unknown]] to [@function_return =[Unknown]] -Executing [2] @function_return =[Unknown] -Expanded [function_return] to [function_return] -Expanded [Unknown] to [Unknown] -Function COUNTRY(arpa) returned Unknown -Expanded [echo $country(arpa)] to [echo Unknown] -Executing [1] echo Unknown -Unknown - -## test .edu //works. -Executing [0] /eval echo $country(edu) -Expanded [edu] to [edu] -Expanded [@:i= finditem(countryIndex $toupper($0));if ( i > -1) -+{@function_return=getitem(countryName $i)} {@function_return =[Unknown]}] -to -+[@:i= finditem(countryIndex $toupper($0))] -Executing [1] @:i= finditem(countryIndex $toupper($0)) -Expanded [:i] to [:i] -Expanded [finditem(countryIndex $toupper($0))] to [finditem(countryIndex -+$toupper($0))] -Expanded [$0] to [edu] -Function TOUPPER(edu) returned EDU -Expanded [countryIndex $toupper($0)] to [countryIndex EDU] -Function FINDITEM(countryIndex EDU) returned 3 -Expanded [if ( i > -1) {@function_return=getitem(countryName $i)} -+{@function_return =[Unknown]}] to [if ( i > -1) -+{@function_return=getitem(countryName $i)} {@function_return =[Unknown]}] -Executing [1] if ( i > -1) {@function_return=getitem(countryName $i)} -+{@function_return =[Unknown]} -Expanded [-1] to [-1] -Expanded [i] to [i] -Expanded [1] to [1] -IF expression expands to: (1) -Expanded [@function_return=getitem(countryName $i)] to -+[@function_return=getitem(countryName $i)] -Executing [2] @function_return=getitem(countryName $i) -Expanded [function_return] to [function_return] -Expanded [getitem(countryName $i)] to [getitem(countryName $i)] -Expanded [countryName $i] to [countryName 3] -Function GETITEM(countryName 3) returned Educational Institution -Function COUNTRY(edu) returned Educational Institution -Expanded [echo $country(edu)] to [echo Educational Institution] -Executing [1] echo Educational Institution -Educational Institution - -## test .zw //broken this is confusing. -Executing [0] /eval echo $country(zw) -Expanded [zw] to [zw] -Expanded [@:i= finditem(countryIndex $toupper($0));if ( i > -1) -+{@function_return=getitem(countryName $i)} {@function_return =[Unknown]}] -to -+[@:i= finditem(countryIndex $toupper($0))] -Executing [1] @:i= finditem(countryIndex $toupper($0)) -Expanded [:i] to [:i] -Expanded [finditem(countryIndex $toupper($0))] to [finditem(countryIndex -+$toupper($0))] -Expanded [$0] to [zw] -Function TOUPPER(zw) returned ZW -Expanded [countryIndex $toupper($0)] to [countryIndex ZW] -Function FINDITEM(countryIndex ZW) returned -2 -Expanded [if ( i > -1) {@function_return=getitem(countryName $i)} -+{@function_return =[Unknown]}] to [if ( i > -1) -+{@function_return=getitem(countryName $i)} {@function_return =[Unknown]}] -Executing [1] if ( i > -1) {@function_return=getitem(countryName $i)} -+{@function_return =[Unknown]} -Expanded [-1] to [-1] -Expanded [i] to [i] -Expanded [0] to [0] -IF expression expands to: (0) -Expanded [@function_return =[Unknown]] to [@function_return =[Unknown]] -Executing [2] @function_return =[Unknown] -Expanded [function_return] to [function_return] -Expanded [Unknown] to [Unknown] -Function COUNTRY(zw) returned Unknown -Expanded [echo $country(zw)] to [echo Unknown] -Executing [1] echo Unknown -Unknown +^^ fixed in cvs id 1302 10.3.05 ## proposals on the ugly getaddrinfo(3) and other things for epic itself. ## this is just here for reference material at this time, no it doesn't mean diff -aruN amn.orig/docs/E5-KNOWNBUGS amn/docs/E5-KNOWNBUGS --- amn.orig/docs/E5-KNOWNBUGS Sun Oct 2 13:43:25 2005 +++ amn/docs/E5-KNOWNBUGS Mon Oct 3 22:13:01 2005 @@ -788,3 +788,4 @@ * Use buffer type -2 for reading nonblocking dns addrs, fixes probs on solaris. * Fix alignment issues on sparc. Thanks to crapple for his assistance! * Convert the other users of mangle_line() to new_normalize_string (*gulp!*) +* Fix another 32-bit/64-bit cast problem with karll arrays (rb crapple) Date: Wed, 5 Oct 2005 22:02:00 -0400 (EDT) From: zak@ircii.org (Zak) -update TODO-BUGS. //zak diff -aruN amn.orig/TODO-BUGS amn/TODO-BUGS --- amn.orig/TODO-BUGS Sun Oct 2 13:19:59 2005 +++ amn/TODO-BUGS Wed Oct 5 22:01:15 2005 @@ -15,6 +15,14 @@ $ /dict word, doesn't explictly close telnet in the background on some OS's. resulting in a nice spiked race condition. mebe need to add a kill -9? +## highest priority TODO. +-remove usages of $stripansi() $stripcrap() since -cvs uses mangle_display + thus removing those functions. +-adjust our 'poor mans' thuttup to be more reasonable. +-fixdouble/fixwin or equiv for doublestats +-check into the new windowing stuff in -cvs. and correct aliases/add + aliases if needs to be. + ## Higher priority requests. @ add a topiclock alias (like bitchx) for xavier. @ add a module to bwk involving. Date: Thu, 6 Oct 2005 02:13:49 -0400 (EDT) From: zak@ircii.org (Zak) -update TODO-BUGS. //zak diff -aruN amn.orig/TODO-BUGS amn/TODO-BUGS --- amn.orig/TODO-BUGS Wed Oct 5 22:01:15 2005 +++ amn/TODO-BUGS Thu Oct 6 02:13:12 2005 @@ -22,6 +22,16 @@ -fixdouble/fixwin or equiv for doublestats -check into the new windowing stuff in -cvs. and correct aliases/add aliases if needs to be. +-cleanup statbars to be compatable with the new mangle_display esp with + last commit id 1307 passing \r charcode 5 +note -> 01:37|(hop!jnelson@epic.user) the problem was the \r character, +which was being sent, was incorrectly being permitted to pass through to the +display. + 01:37|(hop!jnelson@epic.user) since epic does a "clear-to-end-of-line" when + it's done writing a line, "foobar\r\n" yields a blank line because \r +moves the cursor back and then clear_to_eol() -> zap + 01:37|(hop!jnelson@epic.user) i have changed \r to be a "never printable +ever under any circumstances" characters (type 5) ## Higher priority requests. @ add a topiclock alias (like bitchx) for xavier. Date: Thu, 6 Oct 2005 22:49:45 -0400 (EDT) From: zak@ircii.org (Zak) -sync documents to reality. //zak diff -aruN amn.orig/CHANGES amn/CHANGES --- amn.orig/CHANGES Mon Oct 3 22:13:56 2005 +++ amn/CHANGES Thu Oct 6 22:48:41 2005 @@ -175,3 +175,7 @@ -move UPGRADE into doc/ //zak -move NOTES into doc/ //zak -sync EPIC-BUGS E5-KNOWNBUGS to reality //zak + +10.6.05 +-sync TODO-BUGS to reality. //zak +-sync E5-KNOWNBUGS from -HEAD //zak diff -aruN amn.orig/TODO-BUGS amn/TODO-BUGS --- amn.orig/TODO-BUGS Thu Oct 6 02:13:12 2005 +++ amn/TODO-BUGS Thu Oct 6 22:42:56 2005 @@ -22,16 +22,6 @@ -fixdouble/fixwin or equiv for doublestats -check into the new windowing stuff in -cvs. and correct aliases/add aliases if needs to be. --cleanup statbars to be compatable with the new mangle_display esp with - last commit id 1307 passing \r charcode 5 -note -> 01:37|(hop!jnelson@epic.user) the problem was the \r character, -which was being sent, was incorrectly being permitted to pass through to the -display. - 01:37|(hop!jnelson@epic.user) since epic does a "clear-to-end-of-line" when - it's done writing a line, "foobar\r\n" yields a blank line because \r -moves the cursor back and then clear_to_eol() -> zap - 01:37|(hop!jnelson@epic.user) i have changed \r to be a "never printable -ever under any circumstances" characters (type 5) ## Higher priority requests. @ add a topiclock alias (like bitchx) for xavier. diff -aruN amn.orig/docs/E5-KNOWNBUGS amn/docs/E5-KNOWNBUGS --- amn.orig/docs/E5-KNOWNBUGS Mon Oct 3 22:13:01 2005 +++ amn/docs/E5-KNOWNBUGS Thu Oct 6 22:44:33 2005 @@ -6,7 +6,8 @@ * /CTCPs over /DCCs don't match up with their queries very well. * Revamp of /who -realname * alias foo {package x;load script} carries 'x' into 'script' ??? -* Unify mangle_line() and normalize_string(). +* Remove support for "highlighted ignores" because they annoy me. +* Change direct manipulations of to_window with calls to message_to(). LOOK FOR IN THE FUTURE ----------------------- @@ -17,6 +18,7 @@ * Turn unified symbol table into an inode table (name, entry), entry in array * /window noserv causes bad fd loop. (can't reproduce?) * DBM support. +* Is there some way to set what ^O resets to, a la mirc? [See http://www.epicsol.org/PROJECTS for things to come in the future] [See http://www.epicsol.org/CHANGELOG5 for things that changed in the past] @@ -789,3 +791,40 @@ * Fix alignment issues on sparc. Thanks to crapple for his assistance! * Convert the other users of mangle_line() to new_normalize_string (*gulp!*) * Fix another 32-bit/64-bit cast problem with karll arrays (rb crapple) +* Include if we can, for no particular reason... +* Nix now unused mangle_line(). yay! +* Use (intptr_t) instead of (intmax_t) to treat pointers as integers... +* Try to handle failures from the dns helpers with more grace. +* Add the idea of a "visible" and "invisible" lastlog entry +* Always skip "invisible" lastlog entries, handle them when trimming, etc. +* Rename remove_from_lastlog() to trim_lastlog() and have it do looping +* Unconditionally keep every item in the lastlog, even if it's "hidden". +* When screen changes width, purge+recreate all window's scrollback +* Add /window rebuild_scrollback to manually invoke this process. +* For now, auto-recreate unholds all, and cancels scrollback +* Add /window auto_scrollback to opt-out of auto-recreate feature +* Store each window's width individually, don't refer to server +* Use each window's personal width to re-break lines (more on this later) +* Fix so "/window lastlog foo" doesn't delete your lastlog! +* Change all the builtin functions to use new_normalize_string(). +* Change the input prompt to use new_normalize_string(). +* Add /set mangle_display. HUZZAH! +* Change the display stuff to new_normalize_string() and /set mangle_display +* Whack the now unused normalize_string(). HUZZAH! HUZZAH! HUZZAH! +* Change the seperator of the mangler-type-parser to be spaces and not commas. +* Start keeping a monotonically increasing refnum for all lastlog items +* Change add_to_lastlog() to return the lastlog refnum +* Change add_to[_window]_scrollback]() to take the lastlog refnum +* Cross-link scrollback items with the corresponding lastlog refnum. +* Save scrollback/hold position across scrollback rebuilds +* This means rebuilding doesn't affect scrollback/hold users! HUZZAH! +* Whack the now unnecessary /window auto_scrollback (mis)feature. +* Don't unconditionally unclear after rebuild, if everything still fits. +* Fix /xecho -x +* Remove /set alt_charset, blink_video, bold_video, color, display_ansi +* Remove /set display_pc_characters, inverse_video, underline_video. HUZZAH! +* Force \r (carriage return) to be type 5 char (never printable ever) +* Handle \f as a special case in new_normalize_string for the status bar. +* Do some re-org in screen.c, screen.h +* Roll window_disp() into its only caller, add_to_window(). +* Change create_new_screen() into a void function Date: Fri, 7 Oct 2005 11:36:23 -0400 (EDT) From: zak@ircii.org (Zak) -mostly changes on how the script adds sets, and new file for it also allow for ~/.amnrc which loads at proper time for /sets. requested by adam. //zak diff -aruN amn.orig/CHANGES amn/CHANGES --- amn.orig/CHANGES Thu Oct 6 22:48:41 2005 +++ amn/CHANGES Fri Oct 7 11:06:03 2005 @@ -175,7 +175,20 @@ -move UPGRADE into doc/ //zak -move NOTES into doc/ //zak -sync EPIC-BUGS E5-KNOWNBUGS to reality //zak - 10.6.05 -sync TODO-BUGS to reality. //zak -sync E5-KNOWNBUGS from -HEAD //zak + +10.7.05 +-move client adjustable on both epic4/5 sets to amn/settings for ppl who + wish to edit the file, however will be overriden on new client versions. + //zak +-allow usage for ~/.amnrc to prevent amnesiac from overriding users sets. + added a sample.amnrc in docs/ +-some cleanups of sets and merged some sets from compat.m to amn.epic which + are epic5 only so users can see what's available (for those who actually + looks at the script) //zak +^^ all of the above was requested by adam@efnet to make the annoying static + that seemingly comes out in txt from his nick stop hopefully ;) +-increment development version to .8 probably a release sometime by the + weekend. if all goes ok. seems stable thus far. //zak diff -aruN amn.orig/amn.epic amn/amn.epic --- amn.orig/amn.epic Sun Oct 2 22:56:48 2005 +++ amn/amn.epic Fri Oct 7 10:55:26 2005 @@ -24,40 +24,31 @@ ^eval ^load $(loadpath)core/compat.m ## compiling sets... addset auto_rejoin bool; + addset history_circleq bool; + addset history_save_file str; + addset history_remove_dupes bool; + addset history_save_position bool; + addset history_timestamp bool; xaddset auto_rejoin_delay int; xaddset num_of_whowas int; xaddset show_end_of_msgs bool; xaddset show_who_hopcount bool; - + ## epic5 must sets here. + set auto_reconnect off; + set history_save_file ~/.epic_history; + set history_remove_dupes on; + set history_save_position on; + set history_timestamp on; } +## allow for user customizable settings. +^eval ^load $(loadpath)settings -## various sets -set floating_point_math on -set high_bit_esc 0 -set insert_mode on -set -continued_line -set dcc_sliding_window 1024 -set dcc_timeout 600 -set auto_rejoin on -set auto_rejoin_delay 5 -set auto_reconnect off -set num_of_whowas 2 -set auto_whowas on -set indent on -set show_who_hopcount on -set show_channel_names off -set mode_stripper on -set client_information I get my kicks on channel six -set user_information Are you from the FBI? -set notify_on_termination off -set new_server_lastlog_level none -set switch_channels_between_windows off +## remove certain sets for cosmetics. other cosmetic adjustments here. set -status_user set -status_format1 set -status_format2 set quit_message $tolower($J) - $randread($(loadpath)quit.reasons) - -window 1 level none +window 1 level none window 1 name - ## hack to not break URLS. eval set word_break $strip(. $word_break) @@ -76,6 +67,8 @@ ^on ^yell * # ##end poor mans THUTTUP. +## allow for permanent settings via ~/.amnrc +^eval ^load ~/.amnrc ^eval ^load $(loadpath)core/sets.m #progress bar diff -aruN amn.orig/core/compat.m amn/core/compat.m --- amn.orig/core/compat.m Sun Oct 2 23:01:17 2005 +++ amn/core/compat.m Fri Oct 7 10:35:57 2005 @@ -469,10 +469,6 @@ set history 150; -addset history_circleq bool; - -set history_circleq on; - addset history_persistent bool { if (*0 == [on]) { ^on #-exit 2 "*" { @@ -484,22 +480,6 @@ }; set history_persistent off; - -addset history_save_file str; - -set history_save_file ~/.epic_history; - -addset history_remove_dupes bool; - -set history_remove_dupes on; - -addset history_save_position bool; - -set history_save_position on; - -addset history_timestamp bool; - -set history_timestamp on; if (history_persistent == [on] && fexist($history_save_file) == 1) { @ historyctl(read $history_save_file); diff -aruN amn.orig/core/sets.m amn/core/sets.m --- amn.orig/core/sets.m Sun Oct 2 23:11:29 2005 +++ amn/core/sets.m Fri Oct 7 11:06:31 2005 @@ -39,7 +39,7 @@ @awayl=[on] @awayr=[Not Here] @a.ver=[amnesiac] -@rel_id=[7] +@rel_id=[8] @a.rel=[1.1d r/$rel_id] @a.date=[20050903] @_ss=[15] diff -aruN amn.orig/docs/sample.amnrc amn/docs/sample.amnrc --- amn.orig/docs/sample.amnrc Wed Dec 31 19:00:00 1969 +++ amn/docs/sample.amnrc Fri Oct 7 11:00:58 2005 @@ -0,0 +1,7 @@ +## sample ~/.amnrc file to prevent amnesiac from overriding your +## customized settings. +set history_circleq off +set dcc_sliding_window 512 +set auto_rejoin off +set auto_rejoin_delay 10 +set num_of_whowas 1 diff -aruN amn.orig/settings amn/settings --- amn.orig/settings Wed Dec 31 19:00:00 1969 +++ amn/settings Fri Oct 7 10:53:46 2005 @@ -0,0 +1,22 @@ +## you may edit this file to tune your desired settings. +## or create a ~/.amnrc with your default settings which will not be +## overriden with new script versions. or via script. +set history_circleq on +set high_bit_esc 0 +set insert_mode on +set -continued_line +set dcc_sliding_window 1024 +set dcc_timeout 600 +set auto_rejoin on +set auto_rejoin_delay 5 +set num_of_whowas 2 +set auto_whowas on +set indent on +set show_who_hopcount on +set show_channel_names off +set mode_stripper on +set client_information I get my kicks on channel six +set user_information Are you from the FBI? +set notify_on_termination off +set new_server_lastlog_level none +set switch_channels_between_windows off Date: Fri, 7 Oct 2005 12:43:09 -0400 (EDT) From: zak@ircii.org (Zak) -sync TODO-BUGS to reality. //zak diff -aruN amn.orig/CHANGES amn/CHANGES --- amn.orig/CHANGES Fri Oct 7 11:06:03 2005 +++ amn/CHANGES Fri Oct 7 12:41:35 2005 @@ -192,3 +192,4 @@ that seemingly comes out in txt from his nick stop hopefully ;) -increment development version to .8 probably a release sometime by the weekend. if all goes ok. seems stable thus far. //zak +-sync todo-bugs to reality. //zak diff -aruN amn.orig/TODO-BUGS amn/TODO-BUGS --- amn.orig/TODO-BUGS Thu Oct 6 22:42:56 2005 +++ amn/TODO-BUGS Fri Oct 7 12:41:00 2005 @@ -16,8 +16,6 @@ resulting in a nice spiked race condition. mebe need to add a kill -9? ## highest priority TODO. --remove usages of $stripansi() $stripcrap() since -cvs uses mangle_display - thus removing those functions. -adjust our 'poor mans' thuttup to be more reasonable. -fixdouble/fixwin or equiv for doublestats -check into the new windowing stuff in -cvs. and correct aliases/add From: Kreca Date: Mon, 10 Oct 2005 11:47:10 +0200 (CEST) -big cleanup to tab.m. Remove old useless crap and insert the msg tab completion into our new switch. the old command_completion is now ripped out since it's marked obsolete and hasnt worked at all in epic5. //kreca diff -aruN /home/kreca/cvs/amn.orig/CHANGES /home/kreca/cvs/amn/CHANGES --- /home/kreca/cvs/amn.orig/CHANGES Fri Oct 7 18:41:35 2005 +++ /home/kreca/cvs/amn/CHANGES Mon Oct 10 11:44:39 2005 @@ -193,3 +193,6 @@ -increment development version to .8 probably a release sometime by the weekend. if all goes ok. seems stable thus far. //zak -sync todo-bugs to reality. //zak + +10.10.05 +-big cleanup to tab.m. Remove old useless crap and insert the msg tab completion into our new switch. the old command_completion is now ripped out since it's marked obsolete and hasnt worked at all in epic5. //kreca diff -aruN /home/kreca/cvs/amn.orig/modules/tab/tab.m /home/kreca/cvs/amn/modules/tab/tab.m --- /home/kreca/cvs/amn.orig/modules/tab/tab.m Mon Oct 3 05:29:27 2005 +++ /home/kreca/cvs/amn/modules/tab/tab.m Mon Oct 10 11:42:48 2005 @@ -34,21 +34,6 @@ ^assign -_nlist;^assign -_nlist2;^assign -uulist; } -alias add.msg { - - - @keywords=[/msg /m] - if (match($0 $keywords) >= 1) { - if (rmatchitem(tabs $1) < 0) { - @setitem(tabs $numitems(tabs) $^\^^1) - } - if (numitems(tabs) == 20) { - @delitem(tabs 0) - } - } -} - -@equ=[\=] alias get.msg { if ( #L > 0 && left(1 $L) != [$(K)] && right(1 $L) != [ ] ) { @@ -114,163 +99,106 @@ } - return; } -} -/* After this point all is old */ - switch ($L) { - () ($(K)m${[ ]}) ($(K)m %${[ ]}) ($(K)msg${[ ]}) ($(K)msg %${[ ]}) { - if (getitem(tabs $_tabnum)==[]) { - type ^U/msg$chr(32) - }{ - type ^U/msg $getitem(tabs $_tabnum)$chr(32) - if (_tabnum != -1) { - @_tabnum-- - } + () + ($(K)m${[ ]}) + ($(K)m %${[ ]}) + ($(K)msg${[ ]}) + ($(K)msg %${[ ]}) + { + /* msg completion */ + if (getitem(tabs $_tabnum)==[]) { + parsekey erase_line + xtype -l /msg$chr(32) + }{ + parsekey erase_line + xtype -l /msg $getitem(tabs $_tabnum)$chr(32) if (_tabnum == -1) { - @_tabnum = [${numitems(tabs)-1}] - } + @_tabnum = [${numitems(tabs)-1}] + } { + @_tabnum-- + } + } } } - ($(K)$sar(g$chr(1)$K$chr(1 1)$(K)$word(0 $L))${[ ]}$word(1 $L)) { +} - @txt = word(1 $L) - if (pattern($txt* $chanusers($C))) { - - @ per = word(0 $pattern($txt* $chanusers($C))) - type ^U$word(0 $L) $^\^^per - } - if (!pattern($txt* $chanusers($C)) && pattern(*$txt* $chanusers($C))) { - @ per = word(0 $pattern(*$txt* $chanusers($C))) - type ^U$word(0 $L) $^\^^per - } - if (match(*#* $txt)) { - @chanper = word(0 $pattern(*$txt* $mychannels())) - type ^U$word(0 $L) $^\^^chanper - } - } - -($(K)%) ($K$(K)%) { - ^push comwords $hwords - ^push comwords $tolower($getcommands()) - @comwords2=remws(m msg odcc / $comwords) - fe ($pattern($after(/ $L)* $comwords2)) n1 n2 n3 n4 { - xecho -b $[10]n1 $[10]n2 $[10]n3 $[10]n4 - } - if ([$#pattern($after(/ $L)* $comwords2)]==1) { - type ^U$(K)$^\^^pattern($after(/ $L)* $comwords2) - } - ^assign -comwords2;^assign -comwords -} -($(K)cdcc${[ ]}send${[ ]}$word(2 $L)${[ ]}$word(3 $L)) ($(K)odcc${[ ]}send${[ ]}$word(2 $L)${[ ]}$word(3 $L)) ($(K)xdcc${[ ]}send${[ ]}$word(2 $L)${[ ]}$word(3 $L)) { - @ctxt = twiddle($word(3 $L)) - if (pattern(*$ctxt* $glob($ctxt*)) && ctxt) { - @ cper = glob($ctxt*) - type ^U$(K)odcc send $^\^^word(2 $L) $^\^^cper +alias add.msg { + @keywords=[/msg /m] + if (match($0 $keywords) >= 1) { + if (rmatchitem(tabs $1) < 0) { + @setitem(tabs $numitems(tabs) $^\^^1) + } + if (numitems(tabs) == 20) { + @delitem(tabs 0) } + } } -($(K)cdcc${[ ]}send${[ ]}$word(2 $L)) ($(K)odcc${[ ]}send${[ ]}$word(2 $L)) ($(K)xdcc${[ ]}send${[ ]}$word(2 $L)${[ ]}) { - @ctxt2 = word(2 $L) - if (pattern(*$ctxt2* $chanusers($C))) { - @ per = word(0 $pattern(*$ctxt2* $chanusers($C))) - type ^U$(K)odcc send $^\^^per - } - if (match(*#* $ctxt2)) { - @chanper = word(0 $pattern(*$ctxt2* $mychannels())) - type ^U$word(0 $L) $^\^^chanper - } -} - - - ($word(0 $L)) ($word(0 $L) $afterw($word(0 $L) $L)${[ ]}) ($word(0 $L) $afterw($word(0 $L) $L)) { - @ntxt = sar(g/://$word(0 $L)) - @ntxt2 = word(0 $L) - if ([$[1]ntxt] == K) { - parsekey command_completion - - } - if (pattern($ntxt* $chanusers($C)) && match(*:* $ntxt2)) { - @ per = pattern($ntxt* $chanusers($C)) - if (numwords($per) > 1) { - xecho -b Ambiguous matches: $per - sendline $* - }{ - type ^U$^\^^per$format_nick_comp $afterw($word(0 $L) $L) - }} - if (pattern(*$ntxt* $chanusers($C)) && !pattern($ntxt* $chanusers($C)) && match(*:* $ntxt2)) { - @ per = pattern(*$ntxt* $chanusers($C)) - if (numwords($per) > 1) { - xecho -b Ambiguous matches: $per - sendline $* - }{ - type ^U$^\^^per$format_nick_comp $afterw($word(0 $L) $L) - - } } - - } +@equ=[\=] - } -} on #-msg 2 * { if (rmatchitem(tabs $0) >= 0) { - @delitem(tabs $rmatchitem(tabs $0)) + @delitem(tabs $rmatchitem(tabs $0)) } - ^add.msg /msg $0;@_tabnum = rmatchitem(tabs $0) + ^add.msg /msg $0; + @_tabnum = rmatchitem(tabs $0) } on #-send_msg 2 * { if (rmatchitem(tabs $0) >= 0) { - @delitem(tabs $rmatchitem(tabs $0)) + @delitem(tabs $rmatchitem(tabs $0)) } - ^add.msg /msg $0;@_tabnum = rmatchitem(tabs $0) + ^add.msg /msg $0; + @_tabnum = rmatchitem(tabs $0) } on #-send_dcc_chat 2 * { if (rmatchitem(tabs \=$0) >= 0) { - @delitem(tabs $rmatchitem(tabs $(equ)$0)) + @delitem(tabs $rmatchitem(tabs $(equ)$0)) } - ^add.msg /msg \=$0;@_tabnum=[${numitems(tabs)-1}] - + ^add.msg /msg \=$0; + @_tabnum=[${numitems(tabs)-1}] } on #-dcc_chat 2 * { if (rmatchitem(tabs $(equ)$0) >= 0) { - @delitem(tabs $rmatchitem(tabs $(equ)$0)) + @delitem(tabs $rmatchitem(tabs $(equ)$0)) } - ^add.msg /msg \=$0;@_tabnum=[${numitems(tabs)-1}] + ^add.msg /msg \=$0; + @_tabnum=[${numitems(tabs)-1}] } on #-dcc_connect 2 "% CHAT *" { if (rmatchitem(tabs $(equ)$0) >= 0) { - @delitem(tabs $rmatchitem(tabs $(equ)$0)) + @delitem(tabs $rmatchitem(tabs $(equ)$0)) } - ^add.msg /msg \=$0;@_tabnum=[${numitems(tabs)-1}] - + ^add.msg /msg \=$0; + @_tabnum=[${numitems(tabs)-1}] } on #-dcc_request 2 "% CHAT*" { if (rmatchitem(tabs $(equ)$0) >= 0) { - @delitem(tabs $rmatchitem(tabs $(equ)$0)) + @delitem(tabs $rmatchitem(tabs $(equ)$0)) } - ^add.msg /msg \=$0;@_tabnum=[${numitems(tabs)-1}] - + ^add.msg /msg \=$0; + @_tabnum=[${numitems(tabs)-1}] } on #-dcc_offer 2 "% % CHAT *" { if (rmatchitem(tabs $(equ)$0) >= 0) { - @delitem(tabs $rmatchitem(tabs $(equ)$0)) + @delitem(tabs $rmatchitem(tabs $(equ)$0)) } - ^add.msg /msg \=$0;@_tabnum=[${numitems(tabs)-1}] - -} + ^add.msg /msg \=$0; + @_tabnum=[${numitems(tabs)-1}] +} From zwhite@ircii.org Mon Oct 10 15:40:38 2005 -Fix output_rewrite rules to not add an extra space at the beginning of every line. //skullY -vanilla.m: Remove ^W map so switching windows with ^W alone is done quickly. //skully -Fix some code formatting. //skullY -Change all instances of echo to //echo, to allow echo to be aliased. //skullY -vanilla.m: alias echo to output ot the current window. diff /home/zwhite/amn.orig/CHANGES /home/zwhite/amn/CHANGES --- /home/zwhite/amn.orig/CHANGES Mon Oct 10 18:52:11 2005 +++ /home/zwhite/amn/CHANGES Mon Oct 10 19:38:43 2005 @@ -194,5 +194,16 @@ weekend. if all goes ok. seems stable thus far. //zak -sync todo-bugs to reality. //zak +2005 Oct 9 +-Fix output_rewrite rules to not add an extra space at the beginning of + every line. //skullY +-vanilla.m: Remove ^W map so switching windows with ^W alone is done quickly. + //skully +-Fix some code formatting. //skullY + 10.10.05 --big cleanup to tab.m. Remove old useless crap and insert the msg tab completion into our new switch. the old command_completion is now ripped out since it's marked obsolete and hasnt worked at all in epic5. //kreca \ No newline at end of file +-big cleanup to tab.m. Remove old useless crap and insert the msg tab completion into our new switch. the old command_completion is now ripped out since it's marked obsolete and hasnt worked at all in epic5. //kreca + +2005 Oct 10 +-Change all instances of echo to //echo, to allow echo to be aliased. //skullY +-vanilla.m: alias echo to output ot the current window. diff /home/zwhite/amn.orig/ans/fkeys.ans /home/zwhite/amn/ans/fkeys.ans --- /home/zwhite/amn.orig/ans/fkeys.ans Mon Oct 10 18:52:11 2005 +++ /home/zwhite/amn/ans/fkeys.ans Mon Oct 10 18:53:43 2005 @@ -1,10 +1,10 @@ -eval echo ----------------------------= function keys =----------------------- -eval echo f1 $[25]fke1 | f2 $[25]fke2 -eval echo f3 $[25]fke3 | f4 $[25]fke4 -eval echo f5 $[25]fke5 | f6 $[25]fke6 -eval echo f7 $[25]fke7 | f8 $[25]fke8 -eval echo f9 $[25]fke9 | f10 $[25]fke10 -eval echo f11 $[25]fke11 | f12 $[25]fke12 -eval echo -eval echo fkey <1-12> -eval echo --------------------------------------------------------------------- +eval //echo ----------------------------= function keys =----------------------- +eval //echo f1 $[25]fke1 | f2 $[25]fke2 +eval //echo f3 $[25]fke3 | f4 $[25]fke4 +eval //echo f5 $[25]fke5 | f6 $[25]fke6 +eval //echo f7 $[25]fke7 | f8 $[25]fke8 +eval //echo f9 $[25]fke9 | f10 $[25]fke10 +eval //echo f11 $[25]fke11 | f12 $[25]fke12 +eval //echo +eval //echo fkey <1-12> +eval //echo --------------------------------------------------------------------- diff /home/zwhite/amn.orig/ans/modlist.ans /home/zwhite/amn/ans/modlist.ans --- /home/zwhite/amn.orig/ans/modlist.ans Mon Oct 10 18:52:11 2005 +++ /home/zwhite/amn/ans/modlist.ans Mon Oct 10 18:53:43 2005 @@ -1,12 +1,12 @@ -eval echo --------------------= Available Modules =------------------------ -eval echo [abot] [*] [away] [*] [dict] [*] -eval echo [mjoin] [*] [oper] [*] [relay] [*] -eval echo [tab] [*] [netsplit] [*] [orignick] [*] -eval echo [clones] [M] [ncomp] [M] [adcc] [M] -eval echo [flood] [M] [nlog] [M] [query] [M] -eval echo [sprot] [M] [aol] [M] [bwk] [M] -eval echo [xy] [M] [shitlist] [M] [userlist] [M] -eval echo [services] [M] -eval echo -eval echo [*] Default [M] Non-default /mhelp for more info. -eval echo ------------------------------------------------------------------- +eval //echo --------------------= Available Modules =------------------------ +eval //echo [abot] [*] [away] [*] [dict] [*] +eval //echo [mjoin] [*] [oper] [*] [relay] [*] +eval //echo [tab] [*] [netsplit] [*] [orignick] [*] +eval //echo [clones] [M] [ncomp] [M] [adcc] [M] +eval //echo [flood] [M] [nlog] [M] [query] [M] +eval //echo [sprot] [M] [aol] [M] [bwk] [M] +eval //echo [xy] [M] [shitlist] [M] [userlist] [M] +eval //echo [services] [M] +eval //echo +eval //echo [*] Default [M] Non-default /mhelp for more info. +eval //echo ------------------------------------------------------------------- diff /home/zwhite/amn.orig/ans/modules.ans /home/zwhite/amn/ans/modules.ans --- /home/zwhite/amn.orig/ans/modules.ans Mon Oct 10 18:52:11 2005 +++ /home/zwhite/amn/ans/modules.ans Mon Oct 10 18:53:43 2005 @@ -1,27 +1,27 @@ -eval echo -----------------= Module Description =------------------- -eval echo [*] Default [M] Non-default /mhelp for more info. -eval echo [abot] - auto-bot [*] -eval echo [away] - away/away-log [*] -eval echo [dict] - dictionary [*] -eval echo [mjoin] - mass join/auto-join [*] -eval echo [oper] - IRC oper/opervision/commands [*] -eval echo [relay] - paste/relm/reln etc.. buffer [*] -eval echo [tab] - extended tab completion [*] -eval echo [netsplit] - netsplit detector [*] -eval echo [orignick] - orignick/jupenick [*] -eval echo [clones] - scan for clones in current chan [M] -eval echo [ncomp] - nick completion [M] -eval echo [adcc] - xdcc/dcc pack/offers [M] -eval echo [flood] - msg flood protection [M] +eval //echo -----------------= Module Description =------------------- +eval //echo [*] Default [M] Non-default /mhelp for more info. +eval //echo [abot] - auto-bot [*] +eval //echo [away] - away/away-log [*] +eval //echo [dict] - dictionary [*] +eval //echo [mjoin] - mass join/auto-join [*] +eval //echo [oper] - IRC oper/opervision/commands [*] +eval //echo [relay] - paste/relm/reln etc.. buffer [*] +eval //echo [tab] - extended tab completion [*] +eval //echo [netsplit] - netsplit detector [*] +eval //echo [orignick] - orignick/jupenick [*] +eval //echo [clones] - scan for clones in current chan [M] +eval //echo [ncomp] - nick completion [M] +eval //echo [adcc] - xdcc/dcc pack/offers [M] +eval //echo [flood] - msg flood protection [M] input_char "menu paused hit the ANY key to continue " pause -eval echo [nlog] - notify logging [M] -eval echo [query] - auto-query window [M] -eval echo [sprot] - self-protection aka unbanself [M] -eval echo [aol] - aol say [M] -eval echo [bwk] - banwordkick k/bk user on said word [M] -eval echo [xy] - undernet xy services helper [M] -eval echo [shitlist] - shitlist user [M] -eval echo [userlist] - friends/userlist protection [M] -eval echo [services] - nickserv/memoserv/chanserv helper [M] -eval echo ------------------------------------------------------------- +eval //echo [nlog] - notify logging [M] +eval //echo [query] - auto-query window [M] +eval //echo [sprot] - self-protection aka unbanself [M] +eval //echo [aol] - aol say [M] +eval //echo [bwk] - banwordkick k/bk user on said word [M] +eval //echo [xy] - undernet xy services helper [M] +eval //echo [shitlist] - shitlist user [M] +eval //echo [userlist] - friends/userlist protection [M] +eval //echo [services] - nickserv/memoserv/chanserv helper [M] +eval //echo ------------------------------------------------------------- diff /home/zwhite/amn.orig/ans/uptime.ans /home/zwhite/amn/ans/uptime.ans --- /home/zwhite/amn.orig/ans/uptime.ans Mon Oct 10 18:52:11 2005 +++ /home/zwhite/amn/ans/uptime.ans Mon Oct 10 18:53:43 2005 @@ -1,17 +1,17 @@ -eval echo --------------------------= Amnesiac Uptime =------------------- -eval echo $uname(%s %r) \($uname(%m)\) -eval echo Client Version: ircII $J \($V\) [$info(i)] "$info(r)" -eval echo Client Running Since $stime($F) -eval echo Client Uptime: $tdiff2(${time() - F}) - PID: $pid(), PPID: $ppid() -eval echo $info(c) -eval echo Compile-time options: $info(o); -eval echo Amnesiac release id: $rel_id -eval echo Last Recv Message: \($lrmn\) $lrm -eval echo Last Recv Notice: \($lrnn\) $lrn -eval echo Last Sent Msg: $lsm -eval echo Last Sent Notice: $lsn -eval echo Last Channel invited to: $I -eval echo Last person seen via notify ${D} -eval echo Current server version: ${R} -eval echo Current Servername: ${S} -eval echo ----------------------------------------------------------------- +eval //echo --------------------------= Amnesiac Uptime =------------------- +eval //echo $uname(%s %r) \($uname(%m)\) +eval //echo Client Version: ircII $J \($V\) [$info(i)] "$info(r)" +eval //echo Client Running Since $stime($F) +eval //echo Client Uptime: $tdiff2(${time() - F}) - PID: $pid(), PPID: $ppid() +eval //echo $info(c) +eval //echo Compile-time options: $info(o); +eval //echo Amnesiac release id: $rel_id +eval //echo Last Recv Message: \($lrmn\) $lrm +eval //echo Last Recv Notice: \($lrnn\) $lrn +eval //echo Last Sent Msg: $lsm +eval //echo Last Sent Notice: $lsn +eval //echo Last Channel invited to: $I +eval //echo Last person seen via notify ${D} +eval //echo Current server version: ${R} +eval //echo Current Servername: ${S} +eval //echo ----------------------------------------------------------------- diff /home/zwhite/amn.orig/core/action.m /home/zwhite/amn/core/action.m --- /home/zwhite/amn.orig/core/action.m Mon Oct 10 18:52:11 2005 +++ /home/zwhite/amn/core/action.m Mon Oct 10 18:53:43 2005 @@ -37,9 +37,9 @@ } on ^send_action "*" { switch ( $0 ) { - ( $C ) { echo $fparse(format_action $N $0 $1-) } - ( #* ) { echo $fparse(format_action_other $N $0 $1-) } - ( * ) { echo $fparse(format_send_desc $0 $N $1-)} + ( $C ) { //echo $fparse(format_action $N $0 $1-) } + ( #* ) { //echo $fparse(format_action_other $N $0 $1-) } + ( * ) { //echo $fparse(format_send_desc $0 $N $1-)} } } diff /home/zwhite/amn.orig/core/alias.m /home/zwhite/amn/core/alias.m --- /home/zwhite/amn.orig/core/alias.m Mon Oct 10 18:52:11 2005 +++ /home/zwhite/amn/core/alias.m Mon Oct 10 18:53:43 2005 @@ -9,7 +9,7 @@ alias sc scan $* alias quit bye $* alias ismask {return ${pass(!@ $0) ? 1 : 0}} -alias recho eval echo $* +alias recho eval //echo $* alias save saveall alias settings config $* @@ -57,9 +57,9 @@ ## script echo ##still need to clean some of this up. alias abwecho xecho -b -v $cparse($*) alias awecho xecho -v $cparse($*) -alias aecho echo $cparse($*) +alias aecho //echo $cparse($*) alias abecho xecho -b -- $cparse($*) -alias ce echo $cparse("$*") +alias ce //echo $cparse("$*") ## to be annoying like xavier. alias blinky msg $T $cparse("%F%G$*") @@ -135,16 +135,16 @@ ## static timestamping format. alias indent orw alias orw { -^set -output_rewrite -^set output_rewrite $_paste($1-)$1- -xecho -v [a+c] output indent set to "on" + ^set -output_rewrite + ^set output_rewrite $_paste($1-)$1- + xecho -v [a+c] output indent set to "on" } alias wrap orww alias orww { -^set -output_rewrite -^set output_rewrite $_paste($1-) $$1- -xecho -v [a+c] output linewrap set to "on" + ^set -output_rewrite + ^set output_rewrite $_paste($1-)$1- + xecho -v [a+c] output linewrap set to "on" } ## end output_rewrite sillyness. @@ -160,14 +160,14 @@ ## long complex aliases below here. alias fixterm { - exec echo '$chr(27)\(U' + exec //echo '$chr(27)\(U' xecho -r $chr(27)\(U } alias ibm437 fixterm alias latin1 { - exec echo '$chr(27)\(B' + exec //echo '$chr(27)\(B' xecho -r $chr(27)\(B } @@ -175,7 +175,7 @@ if ([$#]) { @:ansifile = open($0 R T) while (!eof($ansifile)) { - echo $read($ansifile) + //echo $read($ansifile) } @close($ansifile) } @@ -185,7 +185,7 @@ if ([$#]) { @:ansifile = open($0 R T) while (!eof($ansifile)) { - eval echo $read($ansifile) + eval //echo $read($ansifile) } @close($ansifile) } diff /home/zwhite/amn.orig/core/arrays.m /home/zwhite/amn/core/arrays.m --- /home/zwhite/amn.orig/core/arrays.m Mon Oct 10 18:52:11 2005 +++ /home/zwhite/amn/core/arrays.m Mon Oct 10 18:53:43 2005 @@ -717,6 +717,7 @@ @ setitem(nickform 13 $$fparse(format_timestamp_some $($_timess))$$G %nnick change %K\\\(%c$$1 %K-> %m$$2%K\\\)) @ setitem(nickform 14 $$fparse(format_timestamp_some $($_timess))$$G %nnick change %K\\\(%W$$1 %K-> %m$$2%K\\\)) @ setitem(nickform 15 $$fparse(format_timestamp_some $($_timess))$$G %nnick change %K\\\(%W$$1 %K-> %W$$2%K\\\)) +@ setitem(nickform 16 $$G $$1 is now known as $$2) ## timestamp formats -crapple @ delarray(timeform) diff /home/zwhite/amn.orig/core/bans.m /home/zwhite/amn/core/bans.m --- /home/zwhite/amn.orig/core/bans.m Mon Oct 10 18:52:11 2005 +++ /home/zwhite/amn/core/bans.m Mon Oct 10 18:53:43 2005 @@ -15,7 +15,7 @@ @chan=[$2] for (@:xx=0,xx config setting>} + (*) {load $(loadpath)core/config;^//echo $G usage -> config setting>} }} ## auto-bot password show toggle. undocumented unless ppl read this. alias bot_tog { if (showtype==1) { @ showtype = 2 - xecho -v (abot).. now showing passwords. + xecho -b (abot).. now showing passwords. }{ @ showtype = 1 - xecho -v (abot).. not showing passwords + xecho -b (abot).. not showing passwords } } ## end auto-bot pass toggle. @@ -52,14 +52,14 @@ ## window double toggle. alias _double { if (![$0]) { - xecho -v [a+c] double fixed window set to $toupper($windowdoubles) + xecho -b double fixed window set to $toupper($windowdoubles) } if (match($0 on off)) { @windowdoubles = [$0] - xecho -v [a+c] double fixed window set to $toupper($windowdoubles) + xecho -b double fixed window set to $toupper($windowdoubles) }{ if ([$0]&&!match($0 on off)) { - xecho -v [a+c] invalid choice + xecho -b invalid choice } } } @@ -107,15 +107,15 @@ ## timestamp some. timestamp all has been removed. alias _tsmps { if (![$0]) { - xecho -v [a+c] timestamp is set to "$_tss" + xecho -b timestamp is set to "$_tss" } if (match($0 on off)) { @_tss = [$0] _timestampsome $_tss - xecho -v [a+c] timestamp msgs,not,walls,pubs,dcc,signoff,oper set to "$_tss" + xecho -b timestamp msgs,not,walls,pubs,dcc,signoff,oper set to "$_tss" }{ if ([$0]&&!match($0 on off)) { - xecho -v [a+c] invalid choice + xecho -b invalid choice } } } @@ -138,15 +138,15 @@ ## bantype config. [Norm/Better/Host/Domain] alias bantype if (![$0]) { - xecho -v [a+c] bantype set to $bt_ - xecho -v [a+c] /bantype + xecho -b bantype set to $bt_ + xecho -b /bantype }{ switch ($0) { - (normal) {@bt_=[normal];@_bt=6;xecho -v [a+c] bantype set to normal (n!*u@h.d n!*u@d.h)} - (better) {@bt_=[better];@_bt=3;xecho -v [a+c] bantype set to better (*!*u@*.d *!*u@d.*)} - (host) {@bt_=[host];@_bt=2;xecho -v [a+c] bantype set to host (*!*@h.d *!*@d.h)} - (domain) {@bt_=[domain];@_bt=4;xecho -v [a+c] bantype set to domain (*!*@*.d *!*@d.*)} + (normal) {@bt_=[normal];@_bt=6;xecho -b bantype set to normal (n!*u@h.d n!*u@d.h)} + (better) {@bt_=[better];@_bt=3;xecho -b bantype set to better (*!*u@*.d *!*u@d.*)} + (host) {@bt_=[host];@_bt=2;xecho -b bantype set to host (*!*@h.d *!*@d.h)} + (domain) {@bt_=[domain];@_bt=4;xecho -b bantype set to domain (*!*@*.d *!*@d.*)} } } @@ -155,37 +155,36 @@ ## auto-responses /resp1 /resp2 /resp3 /resp4 alias _pubn { if (![$0]) { - xecho -v [a+c] primary auto-response set to "$_pubnick" - }{ - xecho -v [a+c] primary auto-response set to "$*" + abecho primary auto-response set to "$_pubnick" + }{ + abecho primary auto-response set to "$*" @_pubnick=[$*] } - } alias _r2 { if (![$0]) { - xecho -v [a+c] 2nd auto-response set to "$_r2" + xecho -b 2nd auto-response set to "$_r2" }{ - xecho -v [a+c] 2nd auto-response set to "$*" + xecho -b 2nd auto-response set to "$*" @_r2=[$*] } } alias _r3 { if (![$0]) { - xecho -v [a+c] 3rd auto-response set to "$_r3" + xecho -b 3rd auto-response set to "$_r3" }{ - xecho -v [a+c] 3rd auto-response set to "$*" + xecho -b 3rd auto-response set to "$*" @_r3=[$*] } } alias _r4 { if (![$0]) { - xecho -v [a+c] 4th auto-response set to "$_r4" + xecho -b 4th auto-response set to "$_r4" }{ - xecho -v [a+c] 4th auto-response set to "$*" + xecho -b 4th auto-response set to "$*" @_r4=[$*] } } diff /home/zwhite/amn.orig/core/ehelp.m /home/zwhite/amn/core/ehelp.m --- /home/zwhite/amn.orig/core/ehelp.m Mon Oct 10 18:52:11 2005 +++ /home/zwhite/amn/core/ehelp.m Mon Oct 10 18:53:43 2005 @@ -7,22 +7,22 @@ echo -------------------------= Extended Help =---------------------------- - echo uhelp <userlist help> userlist help menu. [module] - echo shelp <shitlist help> shitlist help menu. [module] - echo bwhelp <bwk help> banwordkick help menu. [module] - echo mjhelp <mjoin help> mjoin/ajoin help menu. [module] - echo abhelp <abot help> autobot help menu. [module] - echo ohelp <oper help> operview/oper help menu [module] - echo rhelp <relay help> relay/paste help menu. [module] - echo svhelp <services help> nserv/cserv/etc.. help menu. [module] - echo chelp <config help> config shortcut help menu. [core] - echo fhelp <look/feel help> amnesiac look/feel help menu. [core] - echo ghelp <general help> general client/user cmds help. [core] - echo mhelp <module help> module help menu. [core] - echo winhelp <window help> window shortcuts help menu. [core] - echo dcchelp <dcc help> dcc usage/binds help menu. [core] - echo smhelp <special modes> exempt modes cmds help menu. [core] - echo thelp <trickle help> the irc swiss army knife menu. [core] + //echo uhelp <userlist help> userlist help menu. [module] + //echo shelp <shitlist help> shitlist help menu. [module] + //echo bwhelp <bwk help> banwordkick help menu. [module] + //echo mjhelp <mjoin help> mjoin/ajoin help menu. [module] + //echo abhelp <abot help> autobot help menu. [module] + //echo ohelp <oper help> operview/oper help menu [module] + //echo rhelp <relay help> relay/paste help menu. [module] + //echo svhelp <services help> nserv/cserv/etc.. help menu. [module] + //echo chelp <config help> config shortcut help menu. [core] + //echo fhelp <look/feel help> amnesiac look/feel help menu. [core] + //echo ghelp <general help> general client/user cmds help. [core] + //echo mhelp <module help> module help menu. [core] + //echo winhelp <window help> window shortcuts help menu. [core] + //echo dcchelp <dcc help> dcc usage/binds help menu. [core] + //echo smhelp <special modes> exempt modes cmds help menu. [core] + //echo thelp <trickle help> the irc swiss army knife menu. [core] echo ---------------------------------------------------------------------- } diff /home/zwhite/amn.orig/core/eimodes.m /home/zwhite/amn/core/eimodes.m --- /home/zwhite/amn.orig/core/eimodes.m Mon Oct 10 18:52:11 2005 +++ /home/zwhite/amn/core/eimodes.m Mon Oct 10 18:53:43 2005 @@ -24,7 +24,7 @@ @chan=[$2] for (@:xx=0,xx%n") kreca$format_nick_comp hi! + //echo $G $cparse("%K<%ncrapple%K>%n") kreca$format_nick_comp hi! xecho -v -b this is your new nick completion, /fsave to save. @ncomp = [$0] }{ @@ -605,7 +605,7 @@ alias svform if ([$0]) { if (isnumber($0)&&[$0] 0) { @thenick=[$(hwht)$0$(cl)] } - echo $fparse(format_public_other $(extravar)$(thenick) $1 $2-) + //echo $fparse(format_public_other $(extravar)$(thenick) $1 $2-) } @@ -72,8 +72,8 @@ } } if (winchan($0)==-1 || winchan($winchan($0)) != [$0] ) { - echo $fparse(format_send_public ${extravar}$N:$0 $1-) + //echo $fparse(format_send_public ${extravar}$N:$0 $1-) } else { - echo $fparse(format_send_public ${extravar}$N $1-) + //echo $fparse(format_send_public ${extravar}$N $1-) } } diff /home/zwhite/amn.orig/core/theme.m /home/zwhite/amn/core/theme.m --- /home/zwhite/amn.orig/core/theme.m Mon Oct 10 18:52:11 2005 +++ /home/zwhite/amn/core/theme.m Mon Oct 10 18:53:43 2005 @@ -77,15 +77,15 @@ # thanks to ttb for some original help w/ read(), but it still didn't work :P alias theme if (![$0]) { - echo file name author description - echo + //echo file name author description + //echo fe ($glob($(loadpath)themes\/*.th)) th { @ :thfile = open($th R T) @ :auth = after(: $read($thfile)) @ :desc = after(: $read($thfile)) @ :name = after(: $read($thfile)) @ close($thfile) - echo $[10]name $[12]auth $desc$repeat(${20-strlen($strip( $stripansicodes($desc)))} ) + //echo $[10]name $[12]auth $desc$repeat(${20-strlen($strip( $stripansicodes($desc)))} ) } xecho -v [a+c] current theme is $scdesc }{ diff /home/zwhite/amn.orig/core/wall.m /home/zwhite/amn/core/wall.m --- /home/zwhite/amn.orig/core/wall.m Mon Oct 10 18:52:11 2005 +++ /home/zwhite/amn/core/wall.m Mon Oct 10 18:53:43 2005 @@ -12,14 +12,14 @@ fe ($lusers) o1 o2 o3 o4 o5 o6 o7 o8 { ^quote NOTICE $o1,$o2,$o3,$o4,$o5,$o6,$o7,$o8 :\[Wall/$C\] $* } - echo $fparse(format_bwall $0-) + //echo $fparse(format_bwall $0-) ^assign -lusers } ## new wall alias wall { quote notice @$C :\[Wall/$C\] $* - echo $fparse(format_bwall $0-) + //echo $fparse(format_bwall $0-) } ## robohaks wall.bx pr0pz diff /home/zwhite/amn.orig/core/winhelp.m /home/zwhite/amn/core/winhelp.m --- /home/zwhite/amn.orig/core/winhelp.m Mon Oct 10 18:52:11 2005 +++ /home/zwhite/amn/core/winhelp.m Mon Oct 10 18:53:43 2005 @@ -7,30 +7,30 @@ echo --------------------= Windowing Help =----------------------------- - echo wc <window create> creates new hidden window - echo wj <window join> creates new hidden window and joins specified channel - echo wk <window kill> kills current window - echo wlk <window leave kill> kills current window and parts channel - echo cls <clear screen> clears notices/dcc/publics/etc in current window. - echo wn <window next> window next switches to next hidden window - echo wp <window prev> switches to previous hidden window - echo mv <msg window> -hidden|split|kill - echo wq <window query> /wq nick creates a query window with the nick - echo wka <window kill all_hidden> attempts to kill all hidden windows. - echo wko <window kill others> attempts to kill other windows on the screen if visible. - echo wsl <window swap last> swaps to your last window. + //echo wc <window create> creates new hidden window + //echo wj <window join> creates new hidden window and joins specified channel + //echo wk <window kill> kills current window + //echo wlk <window leave kill> kills current window and parts channel + //echo cls <clear screen> clears notices/dcc/publics/etc in current window. + //echo wn <window next> window next switches to next hidden window + //echo wp <window prev> switches to previous hidden window + //echo mv <msg window> -hidden|split|kill + //echo wq <window query> /wq nick creates a query window with the nick + //echo wka <window kill all_hidden> attempts to kill all hidden windows. + //echo wko <window kill others> attempts to kill other windows on the screen if visible. + //echo wsl <window swap last> swaps to your last window. input_char "menu paused hit the ANY key to continue " pause - echo wsa <window swap act> swaps to your activity window(s) from statbar. ie: act(3,4) - echo wl <window list> lists windows in use - echo wsg <window grow> grows current window ie: /wsg 7 - echo wss <window shrink> shrinks current window ie: /wss 7 - echo 1-25 <swap windows> swap windows ie: /1 for window 1 /2 for window 2 etc.. - echo wlog <window log> toggles window logging - echo wflush <window flush> window flush the scroll back epic5-0.0.6 and higher. - echo wlevel <window levels> changes level of current window - echo msgwin <msg window> wsl's then it wc's a window bound to msgs,notices + //echo wsa <window swap act> swaps to your activity window(s) from statbar. ie: act(3,4) + //echo wl <window list> lists windows in use + //echo wsg <window grow> grows current window ie: /wsg 7 + //echo wss <window shrink> shrinks current window ie: /wss 7 + //echo 1-25 <swap windows> swap windows ie: /1 for window 1 /2 for window 2 etc.. + //echo wlog <window log> toggles window logging + //echo wflush <window flush> window flush the scroll back epic5-0.0.6 and higher. + //echo wlevel <window levels> changes level of current window + //echo msgwin <msg window> wsl's then it wc's a window bound to msgs,notices echo --------------------------------------------------------------------------- } -} \ No newline at end of file +} diff /home/zwhite/amn.orig/modules/bwk/bwk.m /home/zwhite/amn/modules/bwk/bwk.m --- /home/zwhite/amn.orig/modules/bwk/bwk.m Mon Oct 10 18:52:11 2005 +++ /home/zwhite/amn/modules/bwk/bwk.m Mon Oct 10 18:53:43 2005 @@ -123,16 +123,16 @@ ^wordsload alias bwkhelp bwhelp alias bwhelp { - echo -----------------------= Wordkick Help =-------------------------- - echo addword /addword /addword word #chan [type] to bk a word in - echo specified channel... type is either bk or kick. Default is bk. - echo delword /delword will delete specified word from list. - echo listword /listword will list words in bankick word list. - echo wordssave /wordssave will save the word list in bankick word list. - echo -= Wordkick Quick Aliases =- - echo unword/delword delbwk/delword - echo addw/addword addbwk/addword - echo bwk/listword - echo ------------------------------------------------------------------- + //echo -----------------------= Wordkick Help =-------------------------- + //echo addword /addword /addword word #chan [type] to bk a word in + //echo specified channel... type is either bk or kick. Default is bk. + //echo delword /delword will delete specified word from list. + //echo listword /listword will list words in bankick word list. + //echo wordssave /wordssave will save the word list in bankick word list. + //echo -= Wordkick Quick Aliases =- + //echo unword/delword delbwk/delword + //echo addw/addword addbwk/addword + //echo bwk/listword + //echo ------------------------------------------------------------------- } diff /home/zwhite/amn.orig/modules/netsplit/netsplit.m /home/zwhite/amn/modules/netsplit/netsplit.m --- /home/zwhite/amn.orig/modules/netsplit/netsplit.m Mon Oct 10 18:52:11 2005 +++ /home/zwhite/amn/modules/netsplit/netsplit.m Mon Oct 10 18:53:43 2005 @@ -44,17 +44,17 @@ # Add patterns.. like /boguspat *bonk* *thud* *haha* # that will NOT be treated as server names.. -^alias boguspat ^assign isbogus.pats $isbogus.pats $*;echo $* added +^alias boguspat ^assign isbogus.pats $isbogus.pats $*;//echo $* added # Next two are pretty obvious -^alias boguslist echo Pats: $isbogus.pats -^alias bogusclear ^assign -isbogus.pats;echo Bogus list clean +^alias boguslist //echo Pats: $isbogus.pats +^alias bogusclear ^assign -isbogus.pats;//echo Bogus list clean # If first word in Signoff contains a period then assume servername # and thus a a split. Stash in assoc array. ^ON ^CHANNEL_SIGNOFF "% % %.% %.%" { if (isbogus($1-)) - { echo *** Signoff: $1 \($2-\) } + { //echo *** Signoff: $1 \($2-\) } { ^netbroke $encode($tolower($0)) $encode($1) $encode($2).$encode($3) $2 $3 } } @@ -140,7 +140,7 @@ ^alias showsplit { if ( [$($0)] ) { - echo $0 $($0) + //echo $0 $($0) } foreach $0 ii { @@ -163,7 +163,7 @@ { foreach signoffs.$ii jj { - echo $lformat(15 $decode($ii)) $lformat(10 $decode($jj)) $splitname[$signoffs[$ii][$jj]] + //echo $lformat(15 $decode($ii)) $lformat(10 $decode($jj)) $splitname[$signoffs[$ii][$jj]] } } ^assign -ii diff /home/zwhite/amn.orig/modules/relay/relay.m /home/zwhite/amn/modules/relay/relay.m --- /home/zwhite/amn.orig/modules/relay/relay.m Mon Oct 10 18:52:11 2005 +++ /home/zwhite/amn/modules/relay/relay.m Mon Oct 10 18:53:43 2005 @@ -7,7 +7,7 @@ alias lp lpaste alias paste relw -^set output_rewrite $_paste($1-) $1- +^set output_rewrite $_paste($1-)$1- alias rel { while (:option = getopt(optopt optarg lns $*)) { @@ -33,7 +33,7 @@ ^local xx @relayw=[OFF] for (@xx=0, xx]) { msg $T $fparse(format_msg $0 $3@$4)$fmsg }{ - echo $0 isn't on IRC right now. + //echo $0 isn't on IRC right now. } }{ echo usage : /frelm [fake nick] [nick/channel to send to] [fake msg]} @@ -273,7 +273,7 @@ userhost $0 -direct -cmd if ([$4]!=[]) { msg $T $fparse(format_notice $0 $3@$4 )$fnot }{ - echo $0 isn't on IRC right now. + //echo $0 isn't on IRC right now. } }{ echo usage: /freln [fake nick] [nick/channel to send to] [fake notice]} diff /home/zwhite/amn.orig/modules/shitlist/shitlist.m /home/zwhite/amn/modules/shitlist/shitlist.m --- /home/zwhite/amn.orig/modules/shitlist/shitlist.m Mon Oct 10 18:52:11 2005 +++ /home/zwhite/amn/modules/shitlist/shitlist.m Mon Oct 10 18:53:43 2005 @@ -34,7 +34,7 @@ @ shithost = input1 }{ if (!getuhost($input1)) { - echo $banner $input1 is not on irc! + //echo $banner $input1 is not on irc! }{ @ shithost1 = sar(g/~/\*/$getuhost($input1)) @ shitnick = [$input1] @@ -48,7 +48,7 @@ @ setitem(shitlist 0 !) @ setitem(shitlist $numitems(shitlist) $shithost $schan $slevel) @ setitem(shitreas $numitems(shitreas) $sreason) - echo $banner added $shithost $schan $slevel $sreason + //echo $banner added $shithost $schan $slevel $sreason if (slevel == 3) { fe ($chanusers($schan)) n1 { if (rmatch($n1!$userhost($n1) $shithost) > 0) { @@ -63,7 +63,7 @@ alias shitlist { if (numitems(shitlist)<2) { - echo $banner the shitlist is empty! + //echo $banner the shitlist is empty! }{ xecho [num] [shithost ] [shitchan [lev] [reason ] for (@xx=1, xx + //echo $banner usage: /shitdel } alias shitload { diff /home/zwhite/amn.orig/modules/userlist/userlist.m /home/zwhite/amn/modules/userlist/userlist.m --- /home/zwhite/amn.orig/modules/userlist/userlist.m Mon Oct 10 18:52:11 2005 +++ /home/zwhite/amn/modules/userlist/userlist.m Mon Oct 10 18:53:43 2005 @@ -32,18 +32,18 @@ alias adduser { if (![$1]) { - echo ------------------------------------------------------------------ - echo syntax: /adduser [nick|ident@host] #channel userlevel1,userlevel2, - echo userlevel3 ... password - echo valid userlevels are ops iops invite voice deop - echo ------------------------------------------------------------------ + //echo ------------------------------------------------------------------ + //echo syntax: /adduser [nick|ident@host] #channel userlevel1,userlevel2, + //echo userlevel3 ... password + //echo valid userlevels are ops iops invite voice deop + //echo ------------------------------------------------------------------ }{ @ :input1 = [$0] if (ismask($input1)) { @ friendhost = input1 } else { - if (!getuhost($input1)) { echo $banner $input1 is not on irc! }{ + if (!getuhost($input1)) { //echo $banner $input1 is not on irc! }{ @ friendhost = sar(g/~/\*/$getuhost($input1)) @ friendnick = [$input1] }} @@ -99,13 +99,13 @@ alias userdel if ([$0]) { if (numitems(friends)<=[$0]) { - echo $banner no such user! + //echo $banner no such user! }{ xecho -b deleted userlist entry $getitem(friends $0) @ delitem(friends $0) } }{ - echo $banner usage: /deluser + //echo $banner usage: /deluser } alias userload { diff /home/zwhite/amn.orig/modules/vanilla/vanilla.m /home/zwhite/amn/modules/vanilla/vanilla.m --- /home/zwhite/amn.orig/modules/vanilla/vanilla.m Mon Oct 10 18:52:11 2005 +++ /home/zwhite/amn/modules/vanilla/vanilla.m Mon Oct 10 18:53:43 2005 @@ -1,7 +1,14 @@ # Copyright (c) 2003-2005 Amnesiac Software Project. # See the 'COPYRIGHT' file for more information. # Make amnesiac behave a bit more like default epic with tc and netsplit -# loaded, just the way skullY likes it +# loaded, just the way skullY likes it. subpackage vanilla @ bindctl(sequence ^D set parse_command listsplit) +@ bindctl(sequence ^E set end_of_line) +@ bindctl(sequence ^P set parse_command window prev) +@ bindctl(map ^W clear) + +window -1 level ALL + +alias echo xecho -v $* diff /home/zwhite/amn.orig/themes/vanilla.th /home/zwhite/amn/themes/vanilla.th --- /home/zwhite/amn.orig/themes/vanilla.th Mon Oct 10 18:52:11 2005 +++ /home/zwhite/amn/themes/vanilla.th Mon Oct 10 18:53:43 2005 @@ -23,6 +23,7 @@ @sctcpform=12 @echostr=54 @ncomp=15 +@nickform=16 @svform=19 @snf=5 @wallform=12 Date: Mon, 10 Oct 2005 21:40:48 +0000 From: Zach White Audit uses of xecho -v, should only be used when the output really does need to goto current window. Fix some echo's I missed. diff /home/zwhite/amn.orig/CHANGES /home/zwhite/amn/CHANGES --- /home/zwhite/amn.orig/CHANGES Mon Oct 10 19:40:01 2005 +++ /home/zwhite/amn/CHANGES Mon Oct 10 21:40:03 2005 @@ -203,7 +203,8 @@ 10.10.05 -big cleanup to tab.m. Remove old useless crap and insert the msg tab completion into our new switch. the old command_completion is now ripped out since it's marked obsolete and hasnt worked at all in epic5. //kreca - -2005 Oct 10 -Change all instances of echo to //echo, to allow echo to be aliased. //skullY --vanilla.m: alias echo to output ot the current window. +-vanilla.m: alias echo to output to the current window. //skullY +-audit all uses of xecho -v. Should only be used on things that really need + to goto the current window. Users that use window level none everywhere won't + notice any difference. //skullY diff /home/zwhite/amn.orig/core/alias.m /home/zwhite/amn/core/alias.m --- /home/zwhite/amn.orig/core/alias.m Mon Oct 10 19:40:01 2005 +++ /home/zwhite/amn/core/alias.m Mon Oct 10 20:25:31 2005 @@ -136,15 +136,15 @@ alias indent orw alias orw { ^set -output_rewrite - ^set output_rewrite $_paste($1-)$1- - xecho -v [a+c] output indent set to "on" + ^set output_rewrite $_paste($1-) $1- + xecho -b output indent set to "on" } alias wrap orww alias orww { ^set -output_rewrite ^set output_rewrite $_paste($1-)$1- - xecho -v [a+c] output linewrap set to "on" + xecho -b output linewrap set to "on" } ## end output_rewrite sillyness. diff /home/zwhite/amn.orig/core/bans.m /home/zwhite/amn/core/bans.m --- /home/zwhite/amn.orig/core/bans.m Mon Oct 10 19:40:01 2005 +++ /home/zwhite/amn/core/bans.m Mon Oct 10 20:55:43 2005 @@ -110,24 +110,24 @@ } alias kob { if (![$0]) { - xecho -v [a+c] kick on ban set to "$kickonban"} + xecho -v -b kick on ban set to "$kickonban"} if (match($0 on off)) {@kickonban = [$0] - xecho -v [a+c] kick on ban set to "$kickonban" + xecho -v -b kick on ban set to "$kickonban" }{ if ([$0]&&!match($0 on off)) { - xecho -v [a+c] invalid choice + xecho -v -b invalid choice } } } alias kops { if (![$0]) { - xecho -v [a+c] kick ops on ban set to "$kickops"} + xecho -v -b kick ops on ban set to "$kickops"} if (match($0 on off)) {@kickops = [$0] - xecho -v [a+c] kick ops on ban set to "$kickops" + xecho -v -b kick ops on ban set to "$kickops" }{ if ([$0]&&!match($0 on off)) { - xecho -v [a+c] invalid choice + xecho -v -b invalid choice } } diff /home/zwhite/amn.orig/core/dcc.m /home/zwhite/amn/core/dcc.m --- /home/zwhite/amn.orig/core/dcc.m Mon Oct 10 19:40:01 2005 +++ /home/zwhite/amn/core/dcc.m Mon Oct 10 21:35:17 2005 @@ -31,7 +31,7 @@ ## hooks. on ^211 * { - xecho -v -b $1: Sent: ${[$4]/1024}MB Received: ${[$6]/1024}MB SendQ: $2 Connected for: $tdiff2($7) Idle: $8 [$9-] + xecho -b $1: Sent: ${[$4]/1024}MB Received: ${[$6]/1024}MB SendQ: $2 Connected for: $tdiff2($7) Idle: $8 [$9-] } ^on #-leave 123 "% % *" { @@ -42,8 +42,8 @@ on -dcc_request "% CHAT *" { push dccchats $0 - xecho -v [a+c] DCC $0 has sent a dcc chat request. - xecho -v [a+c] DCC Press alt-T to respond or alt-R to reject from $0. + xecho -b DCC $0 has sent a dcc chat request. + xecho -b DCC Press alt-T to respond or alt-R to reject from $0. } alias dcc.get { @@ -57,7 +57,7 @@ on #-dcc_request 22 "% SEND*" { @dccnick = [$0] @dccfile = [$5] - xecho -v [a+c] press ctrl-T to accept file or ctrl-R to reject + xecho -b press ctrl-T to accept file or ctrl-R to reject } on #-dcc_request 23 "% SEND*" { @@ -65,7 +65,7 @@ @dccfile = [$5] if (autoget == [on]) { ^dcc get $dccnick - xecho -v [a+c] autogetting dcc $dccfile from $dccnick + xecho -b autogetting dcc $dccfile from $dccnick } } @@ -77,14 +77,14 @@ alias dccag { if (![$0]) { - xecho -v [a+c] dcc autoget set to $toupper($autoget) + xecho -b dcc autoget set to $toupper($autoget) } if (match($0 on off)) { @autoget = [$0] - xecho -v [a+c] dcc autoget set to $toupper($autoget) + xecho -b dcc autoget set to $toupper($autoget) }{ if ([$0]&&!match($0 on off)) { - xecho -v [a+c] invalid choice + xecho -b invalid choice } } } @@ -93,25 +93,25 @@ alias dcchelp { if (!$[0]) { -echo ---------------------= Dcc Help =------------------------------ -echo chat /chat [-p portnum] will send or accept a dcc chat -echo to specified nick -p port is optional. -echo nochat /nochat will close/deny a dcc chat session to -echo specified nick. -echo send /send will send specified nick specified -echo filename. -echo get /get will grab file from specified nick. -echo dcc /dcc will list current dcc sessions if any. -echo dca /dca will kill all dcc sessions. -echo dcs /dcs will close file transfer from specified nick. -echo dcx /dcx will close chat session to specified nick. -echo dcn /dcn will close any dcc sessions to specified nick. -echo ---------------------= dcc keybinds =---------------------------- -echo alt-r : will reject dcc chat request. -echo alt-t : will accept dcc chat request. -echo ctrl-t : will accept dcc file/send request. -echo ctrl-r : will reject dcc file/send request. -echo ------------------------------------------------------------------ +//echo ---------------------= Dcc Help =------------------------------ +//echo chat /chat [-p portnum] will send or accept a dcc chat +//echo to specified nick -p port is optional. +//echo nochat /nochat will close/deny a dcc chat session to +//echo specified nick. +//echo send /send will send specified nick specified +//echo filename. +//echo get /get will grab file from specified nick. +//echo dcc /dcc will list current dcc sessions if any. +//echo dca /dca will kill all dcc sessions. +//echo dcs /dcs will close file transfer from specified nick. +//echo dcx /dcx will close chat session to specified nick. +//echo dcn /dcn will close any dcc sessions to specified nick. +//echo ---------------------= dcc keybinds =---------------------------- +//echo alt-r : will reject dcc chat request. +//echo alt-t : will accept dcc chat request. +//echo ctrl-t : will accept dcc file/send request. +//echo ctrl-r : will reject dcc file/send request. +//echo ------------------------------------------------------------------ } } diff /home/zwhite/amn.orig/core/ehelp.m /home/zwhite/amn/core/ehelp.m --- /home/zwhite/amn.orig/core/ehelp.m Mon Oct 10 19:40:01 2005 +++ /home/zwhite/amn/core/ehelp.m Mon Oct 10 21:34:39 2005 @@ -5,7 +5,7 @@ alias ehelp { if (!$[0]) { -echo -------------------------= Extended Help =---------------------------- +//echo -------------------------= Extended Help =---------------------------- //echo uhelp <userlist help> userlist help menu. [module] //echo shelp <shitlist help> shitlist help menu. [module] @@ -23,7 +23,7 @@ //echo dcchelp <dcc help> dcc usage/binds help menu. [core] //echo smhelp <special modes> exempt modes cmds help menu. [core] //echo thelp <trickle help> the irc swiss army knife menu. [core] -echo ---------------------------------------------------------------------- +//echo ---------------------------------------------------------------------- } } @@ -32,24 +32,24 @@ alias genhelp { if (!$[0]) { -echo ---------------------= General Usage Help =------------------------- -echo ign /ign [nick|nick!ident@host] [type] will ignore someone -echo type: can be 1 or more options of notice,msg,dcc,crap,public,all -echo tig /tig # removes specified ignore. -echo cig /cig to ignore public from current or specified channel. -echo umode /umode changes user mode. -echo ircname /ircname will change your realname on next connect. -echo arejoin /arejoin will toggle auto_rejoin on/off -echo aww /aww will toggle auto_whowas on/off -echo topic /topic will insert current topic for editing. -echo away /away set yourself away. -echo back /back set yourself back. -echo readlog /readlog reads away msgs. [requires away module] -echo remlog /remlog erase away msgs. [requires away module] -echo orignick /orignick will attempt to regain(jupe) specified nick -echo every 3 seconds(default) unless you specify time in /config. [orignick module] -echo staynick /staynick will cancel /orignick [orignick module] -echo --------------------------------------------------------------------- +//echo ---------------------= General Usage Help =------------------------- +//echo ign /ign [nick|nick!ident@host] [type] will ignore someone +//echo type: can be 1 or more options of notice,msg,dcc,crap,public,all +//echo tig /tig # removes specified ignore. +//echo cig /cig to ignore public from current or specified channel. +//echo umode /umode changes user mode. +//echo ircname /ircname will change your realname on next connect. +//echo arejoin /arejoin will toggle auto_rejoin on/off +//echo aww /aww will toggle auto_whowas on/off +//echo topic /topic will insert current topic for editing. +//echo away /away set yourself away. +//echo back /back set yourself back. +//echo readlog /readlog reads away msgs. [requires away module] +//echo remlog /remlog erase away msgs. [requires away module] +//echo orignick /orignick will attempt to regain(jupe) specified nick +//echo every 3 seconds(default) unless you specify time in /config. [orignick module] +//echo staynick /staynick will cancel /orignick [orignick module] +//echo --------------------------------------------------------------------- } } @@ -58,31 +58,31 @@ alias lfhelp { if (!$[0]) { -echo --------------------= Amnesiac Look/Feel Help =--------------------------- -echo config /config will list currently available configuration options -echo /config will change the specified option. -echo theme /theme will display available themes and you can choose which -echo one you want syn: /theme -echo format /format will display available format -echo /format will choose the specified format -echo sbcolor /sbcolor changes sbar colors -echo to desired colors. -echo color /color changes color to -echo desired colors. -echo tsave /tsave will create a theme. -echo untheme /untheme will make amnesiac revert back to the default theme. +//echo --------------------= Amnesiac Look/Feel Help =--------------------------- +//echo config /config will list currently available configuration options +//echo /config will change the specified option. +//echo theme /theme will display available themes and you can choose which +//echo one you want syn: /theme +//echo format /format will display available format +//echo /format will choose the specified format +//echo sbcolor /sbcolor changes sbar colors +//echo to desired colors. +//echo color /color changes color to +//echo desired colors. +//echo tsave /tsave will create a theme. +//echo untheme /untheme will make amnesiac revert back to the default theme. input_char "menu paused hit the ANY key to continue " pause -echo fset /fset format_choice will change specified format. -echo fkeys /fkeys shows which fkeys are bound to which and can be changed by -echo by /fkey 1 /fkey 2 -echo sbar /sbar changes sbar to desired number. -echo mw /mw -hidden|split|kill -echo extpub /extpub and <+nick> in public. -echo indent /indent will indent on newline as opposed to linewrap. -echo wrap /wrap will linewrap msgs/publics etc.. on newline <-- this is -echo the default behavior. -echo ---------------------------------------------------------------------------- +//echo fset /fset format_choice will change specified format. +//echo fkeys /fkeys shows which fkeys are bound to which and can be changed by +//echo by /fkey 1 /fkey 2 +//echo sbar /sbar changes sbar to desired number. +//echo mw /mw -hidden|split|kill +//echo extpub /extpub and <+nick> in public. +//echo indent /indent will indent on newline as opposed to linewrap. +//echo wrap /wrap will linewrap msgs/publics etc.. on newline <-- this is +//echo the default behavior. +//echo ---------------------------------------------------------------------------- } } @@ -90,23 +90,23 @@ alias chelp { if (!$[0]) { -echo ---------------------= Amnesiac Config Shortcuts =----------------------- -echo cumode /cumode will set default usermode on connect. -echo stamp /stamp -echo modeshow /modeshow and <+nick> in public. -echo extpub /extpub same as /modeshow -echo resp /resp will highlight nick when specified word is said in -echo public. /resp /resp2 /resp3 /resp4 -echo kops /kops -echo kob /kob -echo otime /otime -echo awayt /awayt -echo tform /tform will display available timestamp formats and you can -echo choose which one you want syn: /tform -echo autoget /autoget will attempt to grab files sent to you automatically. -echo bantype /bantype when a ban is done on a nick -echo it uses -echo ------------------------------------------------------------------------- +//echo ---------------------= Amnesiac Config Shortcuts =----------------------- +//echo cumode /cumode will set default usermode on connect. +//echo stamp /stamp +//echo modeshow /modeshow and <+nick> in public. +//echo extpub /extpub same as /modeshow +//echo resp /resp will highlight nick when specified word is said in +//echo public. /resp /resp2 /resp3 /resp4 +//echo kops /kops +//echo kob /kob +//echo otime /otime +//echo awayt /awayt +//echo tform /tform will display available timestamp formats and you can +//echo choose which one you want syn: /tform +//echo autoget /autoget will attempt to grab files sent to you automatically. +//echo bantype /bantype when a ban is done on a nick +//echo it uses +//echo ------------------------------------------------------------------------- } } diff /home/zwhite/amn.orig/core/eimodes.m /home/zwhite/amn/core/eimodes.m --- /home/zwhite/amn.orig/core/eimodes.m Mon Oct 10 19:40:01 2005 +++ /home/zwhite/amn/core/eimodes.m Mon Oct 10 21:35:25 2005 @@ -225,22 +225,22 @@ alias rathelp { if (!$[0]) { -echo -----------------= Special Modes Help =---------------------------- -echo tpi /tpi invite exempt menu -I ie: /tpi 3-6 removes -echo invite exempts 3 4 5 and 6 shown in the menu. -echo tpe /tpe ban exempt menu +e ie: /tpe 4 to remove one exempt. -echo ui /ui clears the invite exempts in current chan -IIII. -echo ue /ue clears the ban exempts in current chan -eeee. -echo i /i shows the invite exempts in current chan if any. -echo e /e shows the ban exempts in current chan if any. -echo +i /+i add a invite exempt in current chan ie: /+i *!test@test.com -echo +e /+e add a ban exempt in current chan ie: /+e *!ident@host.com -echo -----= Other Aliases =---- -echo pinv /pinv - same as /ui cleans invite exempt list. -echo pexp /pexp - same as /ue cleans ban exempt list. -echo tinv /tinv - same as /tpi invite exempt menu. -echo texp /texp - same as /tpe ban exempt menu. -echo --------------------------------------------------------------------- +//echo -----------------= Special Modes Help =---------------------------- +//echo tpi /tpi invite exempt menu -I ie: /tpi 3-6 removes +//echo invite exempts 3 4 5 and 6 shown in the menu. +//echo tpe /tpe ban exempt menu +e ie: /tpe 4 to remove one exempt. +//echo ui /ui clears the invite exempts in current chan -IIII. +//echo ue /ue clears the ban exempts in current chan -eeee. +//echo i /i shows the invite exempts in current chan if any. +//echo e /e shows the ban exempts in current chan if any. +//echo +i /+i add a invite exempt in current chan ie: /+i *!test@test.com +//echo +e /+e add a ban exempt in current chan ie: /+e *!ident@host.com +//echo -----= Other Aliases =---- +//echo pinv /pinv - same as /ui cleans invite exempt list. +//echo pexp /pexp - same as /ue cleans ban exempt list. +//echo tinv /tinv - same as /tpi invite exempt menu. +//echo texp /texp - same as /tpe ban exempt menu. +//echo --------------------------------------------------------------------- } } diff /home/zwhite/amn.orig/core/fkey.m /home/zwhite/amn/core/fkey.m --- /home/zwhite/amn.orig/core/fkey.m Mon Oct 10 19:40:01 2005 +++ /home/zwhite/amn/core/fkey.m Mon Oct 10 20:27:29 2005 @@ -13,117 +13,117 @@ switch ($0) { (1) { if (![$1]) { - xecho -v [a+c] function key 1 set to $fke1 + xecho -b function key 1 set to $fke1 }{ @fke1 = [$1-] ^bind ^[[11~ parse_command $fke1 ^bind ^[[[A parse_command $fke1 ^bind ^[OP parse_command $fke1 - xecho -v [a+c] function key 1 set to $fke1 + xecho -b function key 1 set to $fke1 } } (2) { if (![$1]) { - xecho -v [a+c] function key 2 set to $fke2 + xecho -b function key 2 set to $fke2 }{ @fke2 = [$1-] ^bind ^[[12~ parse_command $fke2 ^bind ^[[[B parse_command $fke2 ^bind ^[OQ parse_command $fke2 - xecho -v [a+c] function key 2 set to $fke2 + xecho -b function key 2 set to $fke2 } } (3) { if (![$1]) { - xecho -v [a+c] function key 3 set to $fke3 + xecho -b function key 3 set to $fke3 }{ @fke3 = [$1-] ^bind ^[[13~ parse_command $fke3 ^bind ^[[[C parse_command $fke3 ^bind ^[OR parse_command $fke3 - xecho -v [a+c] function key 3 set to $fke3 + xecho -b function key 3 set to $fke3 } } (4) { if (![$1]) { - xecho -v [a+c] function key 4 set to $fke4 + xecho -b function key 4 set to $fke4 }{ @fke4 = [$1-] ^bind ^[[14~ parse_command $fke4 ^bind ^[[[D parse_command $fke4 ^bind ^[OS parse_command $fke4 - xecho -v [a+c] function key 4 set to $fke4 + xecho -b function key 4 set to $fke4 }} (5) { if (![$1]) { - xecho -v [a+c] function key 5 set to $fke5 + xecho -b function key 5 set to $fke5 }{ @fke5 = [$1-] ^bind ^[[15~ parse_command $fke5 ^bind ^[[[E parse_command $fke5 - xecho -v [a+c] function key 5 set to $fke5 + xecho -b function key 5 set to $fke5 }} (6) { if (![$1]) { - xecho -v [a+c] function key 6 set to $fke6 + xecho -b function key 6 set to $fke6 }{ @fke6 = [$1-] ^bind ^[[17~ parse_command $fke6 - xecho -v [a+c] function key 6 set to $fke6 + xecho -b function key 6 set to $fke6 }} (7) { if (![$1]) { - xecho -v [a+c] function key 7 set to $fke7 + xecho -b function key 7 set to $fke7 }{ @fke7 = [$1-] ^bind ^[[18~ parse_command $fke7 - xecho -v [a+c] function key 7 set to $fke7 + xecho -b function key 7 set to $fke7 }} (8) { if (![$1]) { - xecho -v [a+c] function key 8 set to $fke8 + xecho -b function key 8 set to $fke8 }{ @fke8 = [$1-] ^bind ^[[19~ parse_command $fke8 - xecho -v [a+c] function key 8 set to $fke8 + xecho -b function key 8 set to $fke8 }} (9) { if (![$1]) { - xecho -v [a+c] function key 9 set to $fke9 + xecho -b function key 9 set to $fke9 }{ @fke9 = [$1-] ^bind ^[[20~ parse_command $fke9 - xecho -v [a+c] function key 9 set to $fke9 + xecho -b function key 9 set to $fke9 }} (10) { if (![$1]) { - xecho -v [a+c] function key 10 set to $fke10 + xecho -b function key 10 set to $fke10 }{ @fke10 = [$1-] ^bind ^[[21~ parse_command $fke10 - xecho -v [a+c] function key 10 set to $fke10 + xecho -b function key 10 set to $fke10 }} (11) { if (![$1]) { - xecho -v [a+c] function key 11 set to $fke11 + xecho -b function key 11 set to $fke11 }{ @fke11 = [$1-] ^bind ^[[23~ parse_command $fke11 - xecho -v [a+c] function key 11 set to $fke11 + xecho -b function key 11 set to $fke11 }} (12) { if (![$1]) { - xecho -v [a+c] function key 12 set to $fke12 + xecho -b function key 12 set to $fke12 }{ @fke12 = [$1-] ^bind ^[[24~ parse_command $fke12 - xecho -v [a+c] function key 12 set to $fke12 + xecho -b function key 12 set to $fke12 }} } } diff /home/zwhite/amn.orig/core/format.m /home/zwhite/amn/core/format.m --- /home/zwhite/amn.orig/core/format.m Mon Oct 10 19:40:01 2005 +++ /home/zwhite/amn/core/format.m Mon Oct 10 20:32:25 2005 @@ -46,10 +46,10 @@ if (isnumber($0)&&[$0] to set msg format - xecho -v -b current format set to $mform + xecho -b /format a to set msg format + xecho -b current format set to $mform @format_msg = getitem(mform $mform) } @@ -73,10 +73,10 @@ if (isnumber($0)&&[$0] to set send msg format - xecho -v -b current format set to $smform + xecho -b /format b to set send msg format + xecho -b current format set to $smform @format_send_msg=getitem(smform $smform) } @@ -102,10 +102,10 @@ if (isnumber($0)&&[$0] to set public format - xecho -v -b current format set to $pubform + xecho -b /format c to set public format + xecho -b current format set to $pubform @format_public=getitem(pubform $pubform) } @@ -131,10 +131,10 @@ if (isnumber($0)&&[$0] to set send public format - xecho -v -b current format set to $spubform + xecho -b /format d to set send public format + xecho -b current format set to $spubform @format_send_public=getitem(spubform $spubform) } @@ -160,10 +160,10 @@ if (isnumber($0)&&[$0] to set public other format - xecho -v -b current format set to $spuboform + xecho -b /format e to set public other format + xecho -b current format set to $spuboform @format_public_other=getitem(spuboform $spuboform) } @@ -190,10 +190,10 @@ if (isnumber($0)&&[$0] to set signoff format - xecho -v -b current format set to $signform + xecho -b /format f to set signoff format + xecho -b current format set to $signform @format_signoff=getitem(signform $signform) } @@ -220,10 +220,10 @@ if (isnumber($0)&&[$0] to set join format - xecho -v -b current format set to $joinform + xecho -b /format g to set join format + xecho -b current format set to $joinform @format_join=getitem(joinform $joinform) } @@ -250,10 +250,10 @@ if (isnumber($0)&&[$0] to set leaveoff format - xecho -v -b current format set to $leaveform + xecho -b /format h to set leaveoff format + xecho -b current format set to $leaveform @format_leave=getitem(leaveform $leaveform) } @@ -279,10 +279,10 @@ if (isnumber($0)&&[$0] to set modeoff format - xecho -v -b current format set to $modeform + xecho -b /format i to set modeoff format + xecho -b current format set to $modeform @format_mode=getitem(modeform $modeform) } @@ -308,10 +308,10 @@ if (isnumber($0)&&[$0] to set notice format - xecho -v -b current format set to $notform + xecho -b /format j to set notice format + xecho -b current format set to $notform @format_notice = getitem(notform $notform) } alias pubnotform if ([$0]) { if (isnumber($0)&&[$0] to set public notice format - xecho -v -b current format set to $pubnotform + xecho -b /format z to set public notice format + xecho -b current format set to $pubnotform @format_public_notice=getitem(pubnotform $pubnotform) } @@ -364,10 +364,10 @@ if (isnumber($0)&&[$0] to set send notice format - xecho -v -b current format set to $snotform + xecho -b /format k to set send notice format + xecho -b current format set to $snotform @format_send_notice=getitem(snotform $snotform) } @@ -395,10 +395,10 @@ if (isnumber($0)&&[$0] to set send dcc chat format - xecho -v -b current format set to $sdcform + xecho -b /format l to set send dcc chat format + xecho -b current format set to $sdcform @ format_send_dcc_chat = getitem(sdcform $sdcform) } @@ -425,10 +425,10 @@ if (isnumber($0)&&[$0] to set dcc chat format - xecho -v -b current format set to $dcform + xecho -b /format m to set dcc chat format + xecho -b current format set to $dcform @format_dcc_chat=getitem(dcform $dcform) } @@ -455,10 +455,10 @@ if (isnumber($0)&&[$0] to set topic format - xecho -v -b current format set to $topform + xecho -b /format n to set topic format + xecho -b current format set to $topform @format_topic=getitem(topform $topform) } @@ -485,10 +485,10 @@ if (isnumber($0)&&[$0] to set ctcp format - xecho -v -b current format set to $ctcpform + xecho -b /format o to set ctcp format + xecho -b current format set to $ctcpform @format_ctcp=getitem(ctcpform $ctcpform) } @@ -516,10 +516,10 @@ if (isnumber($0)&&[$0] to set send ctcp format - xecho -v -b current format set to $sctcpform + xecho -b /format p to set send ctcp format + xecho -b current format set to $sctcpform @format_send_ctcp=getitem(sctcpform $sctcpform) } @@ -547,11 +547,11 @@ if (isnumber($0)&&[$0] to set echostr - xecho -v -b current format set to $echostr + xecho -b /format q to set echostr + xecho -b current format set to $echostr } alias ncomp if ([$0]) { if (isnumber($0)&&[$0]%n") kreca$format_nick_comp hi! - xecho -v -b this is your new nick completion, /fsave to save. + xecho -b this is your new nick completion, /fsave to save. @ncomp = [$0] }{ - xecho -v -b please make a valid selection. + xecho -b please make a valid selection. } }{ ncomp.show @@ -594,10 +594,10 @@ alias ncomp.show { for (@nc=1, nc < numitems(ncomp), @nc++) { @format_nick_comp=getitem(ncomp $nc) - xecho -v -b $Cparse("%K[%n$([2]nc)%K]%n %K<%ncrapple%K>%n") kreca$format_nick_comp hi! + xecho -b $Cparse("%K[%n$([2]nc)%K]%n %K<%ncrapple%K>%n") kreca$format_nick_comp hi! } - xecho -v -b /format r to set nick completion - xecho -v -b current format set to $ncomp + xecho -b /format r to set nick completion + xecho -b current format set to $ncomp @format_nick_comp=getitem(ncomp $ncomp) } @@ -606,10 +606,10 @@ if (isnumber($0)&&[$0] to set version format - xecho -v -b current format set to $svform + xecho -b /format s to set version format + xecho -b current format set to $svform @format_sv=getitem(svform $svform) } @@ -638,11 +638,11 @@ @format_wall=getitem(wallform $0) @format_bwall=getitem(bwallform $0) //echo $fparse(format_wall crapple #amnesiac hi) - xecho -v -b this is your new wall format, /fsave to save. + xecho -b this is your new wall format, /fsave to save. @wallform = [$0] @bwallform = [$0] }{ - xecho -v -b please make a valid selection. + xecho -b please make a valid selection. } }{ wallform.show @@ -660,10 +660,10 @@ for (@mm=1, mm < numitems(wallform), @mm++) { @format_wall = getitem(wallform $mm) @format_bwall = getitem(bwallform $mm) - xecho -v -b $Cparse(%K[%n$mm%K]%n) $fparse(format_wall crapple #amnesiac hi) + xecho -b $Cparse(%K[%n$mm%K]%n) $fparse(format_wall crapple #amnesiac hi) } - xecho -v -b /format v to set wall format - xecho -v -b current format set to $wallform + xecho -b /format v to set wall format + xecho -b current format set to $wallform @format_wall=getitem(wallform $wallform) @format_bwall=getitem(bwallform $bwallform) } @@ -672,10 +672,10 @@ if (isnumber($0)&&[$0] to set away format - xecho -v -b current format set to $awayform + xecho -b /format w to set away format + xecho -b current format set to $awayform @format_away = getitem(awayform $awayform) } alias actform if ([$0]) { @@ -703,11 +703,11 @@ @format_action_other=getitem(actoform $0) //echo $fparse(format_action crapple #amnesiac hi) //echo $fparse(format_action_other crapple #amnesiac hi) - xecho -v -b this is your new action format, /fsave to save. + xecho -b this is your new action format, /fsave to save. @actform = [$0] @actoform = [$0] }{ - xecho -v -b please make a valid selection. + xecho -b please make a valid selection. } }{ actform.show @@ -725,12 +725,12 @@ for (@mm=1, mm < numitems(actform), @mm++) { @format_action=getitem(actform $mm) @format_action_other=getitem(actoform $mm) - xecho -v -b $Cparse(%K[%n$mm%K]%n) $fparse(format_action crapple #amnesiac hi) - xecho -v -b $fparse(format_action_other crapple #amnesiac hi) + xecho -b $Cparse(%K[%n$mm%K]%n) $fparse(format_action crapple #amnesiac hi) + xecho -b $fparse(format_action_other crapple #amnesiac hi) } - xecho -v -b /format x to set action format - xecho -v -b current format set to $actform + xecho -b /format x to set action format + xecho -b current format set to $actform @format_action=getitem(actform $actform) @format_action_other=getitem(actoform $actoform) } @@ -740,11 +740,11 @@ @format_send_desc=getitem(sdescform $0) //echo $fparse(format_desc crapple blah hi) //echo $fparse(format_send_desc crapple #amnesiac hi) - xecho -v -b this is your new describe format, /fsave to save. + xecho -b this is your new describe format, /fsave to save. @descform = [$0] @sdescform = [$0] }{ - xecho -v -b please make a valid selection. + xecho -b please make a valid selection. } }{ xdescform.show @@ -762,12 +762,12 @@ for (@mm=1, mm < numitems(descform), @mm++) { @format_desc = getitem(descform $mm) @format_send_desc = getitem(sdescform $mm) - xecho -v -b $Cparse(%K[%n$mm%K]%n) $fparse(format_desc crapple blah hi) - xecho -v -b $fparse(format_send_desc crapple #amnesiac hi) + xecho -b $Cparse(%K[%n$mm%K]%n) $fparse(format_desc crapple blah hi) + xecho -b $fparse(format_send_desc crapple #amnesiac hi) } - xecho -v -b /format y to set describe format - xecho -v -b current format set to $descform + xecho -b /format y to set describe format + xecho -b current format set to $descform @format_desc=getitem(descform $descform) @format_send_desc=getitem(sdescform $sdescform) @@ -778,11 +778,11 @@ @format_who_footer=getitem(whofootform $0) //echo $fparse(format_who #amnesiac skullY H@ zwhite front.arpa.org irc.servercentral.net 0 The Work is Done and Then Forgotten) //echo $fparse(format_who_footer irc.servercentral.net skully :End of /WHO list. - xecho -v -b this is your new who format, /fsave to save. + xecho -b this is your new who format, /fsave to save. @whoform = [$0] @whofootform = [$0] }{ - xecho -v -b please make a valid selection. + xecho -b please make a valid selection. } }{ whoform.show @@ -799,11 +799,11 @@ alias whoform.show { for (@mm=1, mm < numitems(whoform), @mm++) { @format_who=getitem(whoform $mm) - xecho -v $Cparse(%K[%n$mm%K]%n) $fparse(format_who #amnesiac skullY H@ zwhite front.arpa.org irc.servercentral.net 0 The Work is Done and Then Forgotten) + xecho -b $fparse(format_who #amnesiac skullY H@ zwhite front.arpa.org irc.servercentral.net 0 The Work is Done and Then Forgotten) } - xecho -v -- /format 2 to set who format - xecho -v current format set to $whoform + xecho -b /format 2 to set who format + xecho -b format set to $whoform @format_who=getitem(whoform $whoform) } @@ -812,10 +812,10 @@ if (isnumber($0)&&[$0] to set nick change format - xecho -v -b current format set to $nickform + xecho -b /format u to set nick change format + xecho -b current format set to $nickform @format_nickname=getitem(nickform $nickform) } @@ -841,10 +841,10 @@ if (isnumber($0)&&[$0]%n timestamp in public format example.) + xecho -b $Cparse(%K[%n$mm%K]%n) $fparse(format_timestamp_some)$cparse(%m<%ncrapple%m>%n timestamp in public format example.) } - xecho -v -b /format 3 to set time stamp format - xecho -v -b current format set to $timeform + xecho -b /format 3 to set time stamp format + xecho -b current format set to $timeform @format_timestamp_some=getitem(timeform $timeform) } @@ -869,10 +869,10 @@ if (isnumber($0)&&[$0] to set kick format - xecho -v -b current format set to $kickform + xecho -b /format 4 to set kick format + xecho -b current format set to $kickform @format_kick=getitem(kickform $kickform) } diff /home/zwhite/amn.orig/core/fsets.m /home/zwhite/amn/core/fsets.m --- /home/zwhite/amn.orig/core/fsets.m Mon Oct 10 19:40:01 2005 +++ /home/zwhite/amn/core/fsets.m Mon Oct 10 20:56:39 2005 @@ -7,16 +7,16 @@ if ([$0]) { if (!pattern(*$0* $fwords)) { banner.lchead - banner.mid [a+c] $0 format not found + banner.mid $banner $0 format not found banner.lcfoot }{ if (pattern(*$0* $fwords) && [$1]) { @format_choice=[$after(_ $0)] @format_$after(_ $0)=[$1-] - xecho -v [a+c] fset $0 changed to $1- + xecho -b fset $0 changed to $1- }{ fe ($pattern(*$0* $fwords)) a1 { - xecho -v [a+c] $[31]a1 ...... $($a1) + xecho -b $[31]a1 ...... $($a1) } } } @@ -170,39 +170,39 @@ on ^311 * { if (format_whois_header) { - xecho -v $fparse(format_whois_header) + xecho $fparse(format_whois_header) } - xecho -v $fparse(format_whois_nick $1 $2 $3 $5-) + xecho $fparse(format_whois_nick $1 $2 $3 $5-) if (format_whois_name) { - xecho -v $fparse(format_whois_name $5-) + xecho $fparse(format_whois_name $5-) } } -on ^319 * xecho -v $fparse(format_whois_channels $2-) -on ^312 * xecho -v $fparse(format_whois_server $2 $3-) -on ^301 * xecho -v $fparse(format_whois_away $1-) +on ^319 * xecho $fparse(format_whois_channels $2-) +on ^312 * xecho $fparse(format_whois_server $2 $3-) +on ^301 * xecho $fparse(format_whois_away $1-) on ^317 * { - xecho -v $fparse(format_whois_idle $2) - xecho -v $fparse(format_whois_signon $1 $stime($3)) + xecho $fparse(format_whois_idle $2) + xecho $fparse(format_whois_signon $1 $stime($3)) } on ^318 * { if (format_whois_footer) { - xecho -v $fparse(format_whois_footer) + xecho $fparse(format_whois_footer) } } on ^314 * { - xecho -v $fparse(format_whowas_header) - xecho -v $fparse(format_whowas_nick $1 $2 $3) - xecho -v $fparse(format_whowas_name $5-) + xecho $fparse(format_whowas_header) + xecho $fparse(format_whowas_nick $1 $2 $3) + xecho $fparse(format_whowas_name $5-) } on ^338 * { - xecho -v $fparse(format_whois_actual $*) + xecho $fparse(format_whois_actual $*) } on ^330 * { - xecho -v $fparse(format_whois_login $*) + xecho $fparse(format_whois_login $*) } on ^308 * { - xecho -v $fparse(format_whois_admin $1-) + xecho $fparse(format_whois_admin $1-) } on ^313 * { @@ -235,16 +235,16 @@ @ rcl.25 = ['s face is more plastic than flesh] $rcl[$rand(26)] ^randcl -xecho -v $fparse(format_whois_operator $1 $rcl[$rand(26)]) +xecho $fparse(format_whois_operator $1 $rcl[$rand(26)]) } ^on ^401 * { - xecho -v $fparse(format_whois_header) - xecho -v $fparse(format_whois_unknown $1) + xecho $fparse(format_whois_header) + xecho $fparse(format_whois_unknown $1) } ^on ^369 * { - xecho -v $fparse(format_whowas_footer) + xecho $fparse(format_whowas_footer) } ^on ^406 * { - xecho -v $fparse(format_whowas_header) - xecho -v $fparse(format_whowas_unknown $1) + xecho $fparse(format_whowas_header) + xecho $fparse(format_whowas_unknown $1) } diff /home/zwhite/amn.orig/core/help.m /home/zwhite/amn/core/help.m --- /home/zwhite/amn.orig/core/help.m Mon Oct 10 19:40:01 2005 +++ /home/zwhite/amn/core/help.m Mon Oct 10 20:57:40 2005 @@ -133,11 +133,11 @@ if ([$0]) { if (!match($0 $hwords)) { banner.head - //echo [a+c] command: $0 not found + xecho -b command: $0 not found banner.foot }{ banner.head - //echo $cparse("$($*)") + //echo $cparse("$($*)") banner.foot } } diff /home/zwhite/amn.orig/core/lag.m /home/zwhite/amn/core/lag.m --- /home/zwhite/amn.orig/core/lag.m Mon Oct 10 19:40:01 2005 +++ /home/zwhite/amn/core/lag.m Mon Oct 10 20:37:52 2005 @@ -37,7 +37,7 @@ alias do.pong { ^on #^pong 10 "*" { if ([$0] == svar ^^ [$0] == [$svar1]) { - xecho -v -b your lag to $0 is: ${time() - pblah} second(s) + xecho -b your lag to $0 is: ${time() - pblah} second(s) ^on #^pong 10 -"*" } } diff /home/zwhite/amn.orig/core/lusers.m /home/zwhite/amn/core/lusers.m --- /home/zwhite/amn.orig/core/lusers.m Mon Oct 10 19:40:01 2005 +++ /home/zwhite/amn/core/lusers.m Mon Oct 10 20:38:15 2005 @@ -53,17 +53,17 @@ ^assign _lu.umd $2, ^set floating_point_math on # next two lines don't make the new math parser bitch. -skullY - xecho -v $(hblk)[$cparse($(c2)³)$(hblk)] $cparse($(c2)g)$cparse($(c1)lobal users)$(hblk).. $(cl)$[6]_lu.u max$(c.hk) $(cl)$[7]_lu.umd $cparse($(c1)\()$(cl)$_lu.i invisible, $_lu.o operators$cparse($(c1)\)) - xecho -v $(hblk)[$cparse($(c1)³)$(hblk)] $cparse($(c2)l)$cparse($(c1)ocal users)$(hblk)... $(cl)$[6]_lu.lu max$(c.hk) $(cl)$[7]_lu.lumd $cparse($(c1)\()$(cl)$trunc(5 ${100 * (_lu.lu / _lu.u)})\%$cparse($(c1)\)) - xecho -v $(hblk)[$cparse($(c1)³)$(hblk)] $cparse($(c2)s)$cparse($(c1)ervers)$(hblk)....... $(cl)$[6]_lu.s $cparse($(c1)\()$(cl)$trunc(2 ${_lu.u / _lu.s}) avg users per server$cparse($(c1)\)) - xecho -v $(hblk)[$cparse($(c1)³)$(hblk)] $cparse($(c2)c)$cparse($(c1)hannels)$(hblk)...... $(cl)$[6]_lu.c $cparse($(c1)\()$(cl)$trunc(2 ${_lu.u / _lu.c}) avg users per channel$cparse($(c1)\)) + xecho $(hblk)[$cparse($(c2)³)$(hblk)] $cparse($(c2)g)$cparse($(c1)lobal users)$(hblk).. $(cl)$[6]_lu.u max$(c.hk) $(cl)$[7]_lu.umd $cparse($(c1)\()$(cl)$_lu.i invisible, $_lu.o operators$cparse($(c1)\)) + xecho $(hblk)[$cparse($(c1)³)$(hblk)] $cparse($(c2)l)$cparse($(c1)ocal users)$(hblk)... $(cl)$[6]_lu.lu max$(c.hk) $(cl)$[7]_lu.lumd $cparse($(c1)\()$(cl)$trunc(5 ${100 * (_lu.lu / _lu.u)})\%$cparse($(c1)\)) + xecho $(hblk)[$cparse($(c1)³)$(hblk)] $cparse($(c2)s)$cparse($(c1)ervers)$(hblk)....... $(cl)$[6]_lu.s $cparse($(c1)\()$(cl)$trunc(2 ${_lu.u / _lu.s}) avg users per server$cparse($(c1)\)) + xecho $(hblk)[$cparse($(c1)³)$(hblk)] $cparse($(c2)c)$cparse($(c1)hannels)$(hblk)...... $(cl)$[6]_lu.c $cparse($(c1)\()$(cl)$trunc(2 ${_lu.u / _lu.c}) avg users per channel$cparse($(c1)\)) } on ^250 * { - xecho -v $(hblk)[$cparse($(c1)³)$(hblk)] $cparse($(c2)c)$cparse($(c1)onnect count)$(hblk)..$(cl)$4 $5 $6 $7 $9 + xecho $(hblk)[$cparse($(c1)³)$(hblk)] $cparse($(c2)c)$cparse($(c1)onnect count)$(hblk)..$(cl)$4 $5 $6 $7 $9 } on ^253 * { - xecho -v $(hblk)[$cparse($(c1)³)$(hblk)] $cparse($(c2)u)$cparse($(c1)nknown)$(hblk)........$(cl)$1 $2 $3 + xecho $(hblk)[$cparse($(c1)³)$(hblk)] $cparse($(c2)u)$cparse($(c1)nknown)$(hblk)........$(cl)$1 $2 $3 } diff /home/zwhite/amn.orig/core/mod.m /home/zwhite/amn/core/mod.m --- /home/zwhite/amn.orig/core/mod.m Mon Oct 10 19:40:01 2005 +++ /home/zwhite/amn/core/mod.m Mon Oct 10 21:35:35 2005 @@ -8,8 +8,8 @@ alias addmod { if (![$0]) { - xecho -v [a+c] syn: /addmod module1,module2,etc.. - xecho -v [a+c] valid modules are [$_modules] + xecho -b syn: /addmod module1,module2,etc.. + xecho -b valid modules are [$_modules] }{ @_ach=sar(g/,/ /$0) if ([$0]==[*]) { @@ -19,7 +19,7 @@ @setitem(_mods $numitems(_mods) $a1) ^load $(loadpath)modules/$(a1)/$(a1).m } - xecho -v [a+c] loaded modules $_modules + xecho -b loaded modules $_modules }{ fe ($_ach) n1 { if (match($n1 $_modules) > 0 && finditem(_mods $n1) < 0) { @@ -28,11 +28,11 @@ ^load $(loadpath)modules/$(n1)/$(n1).m ^push _mlist $n1 }{ - xecho -v [a+c] $n1 module not found or already loaded. + xecho -b $n1 module not found or already loaded. } } if (_mlist) { - xecho -v [a+c] $_mlist module(s) loaded. + xecho -b $_mlist module(s) loaded. } ^assign -_mlist } @@ -41,7 +41,7 @@ alias listmod { if (numitems(_mods) == 1) { - xecho -v [a+c] no modules current on list + xecho -b no modules current on list }{ eval aecho ----------------------= Modules Loaded =------------------ for (@xx=1, xx and <+nick> in public set to $0 + xecho -b showing <@nick> and <+nick> in public set to $0 }{ - xecho -v [a+c] extpub/modeshow set to $showop + xecho -b extpub/modeshow set to $showop } } diff /home/zwhite/amn.orig/core/more.m /home/zwhite/amn/core/more.m --- /home/zwhite/amn.orig/core/more.m Mon Oct 10 19:40:01 2005 +++ /home/zwhite/amn/core/more.m Mon Oct 10 20:38:45 2005 @@ -24,7 +24,7 @@ @ done = 1 } { - xecho -v $ugh + xecho $ugh } } if (!done) @@ -37,13 +37,13 @@ @ fd = line = done = rows = pause = ugh = [] } { - xecho -b -v $0\: no such file. + xecho -b $0\: no such file. } } { - xecho -b -v syn: /more + xecho -b syn: /more } } #archon'96 -oof \ No newline at end of file +oof diff /home/zwhite/amn.orig/core/save.m /home/zwhite/amn/core/save.m --- /home/zwhite/amn.orig/core/save.m Mon Oct 10 19:40:01 2005 +++ /home/zwhite/amn/core/save.m Mon Oct 10 20:39:21 2005 @@ -54,7 +54,7 @@ @write($savemt @_r3 = [$_r3]) @write($savemt @_r4 = [$_r4]) @close($savemt) - xecho -v [a+c] (core).. settings saved to $savefile + xecho -b (core).. settings saved to $savefile } @@ -112,7 +112,7 @@ @write($fsetsavemt ^sfset format_who_footer $format_who_footer) */ @close($fsetsavemt) - xecho -v [a+c] (core).. fset settings saved to $(savepath)$fsetsavefile + xecho -b (core).. fset settings saved to $(savepath)$fsetsavefile } alias fsave { @fsavefile=[$(savepath).a.fsave] @@ -156,7 +156,7 @@ @write($savemt @_whois = [$_whois]) @close($savemt) - xecho -v [a+c] (core).. format settings saved to $fsavefile + xecho -b (core).. format settings saved to $fsavefile } alias csave { @@ -174,7 +174,7 @@ @write($savemt @sc3 = [$sc3) @write($savemt @sc4 = [$sc4) @close($savemt) - xecho -v [a+c] (core).. color settings saved to $csavefile + xecho -b (core).. color settings saved to $csavefile } alias igsave { @@ -185,7 +185,7 @@ @ write($saveig ^ignore $_igmasks $igtype($_igmasks)) } @close($saveig) - xecho -v [a+c] (core).. ignores saved to $igsfile + xecho -b (core).. ignores saved to $igsfile } alias saveall { diff /home/zwhite/amn.orig/core/sbar.m /home/zwhite/amn/core/sbar.m --- /home/zwhite/amn.orig/core/sbar.m Mon Oct 10 19:40:01 2005 +++ /home/zwhite/amn/core/sbar.m Mon Oct 10 20:39:38 2005 @@ -13,10 +13,10 @@ if (statbar == [stat.3]) { ^sip2 } - xecho -v -b $scriptname sbar set to $0 - xecho -v [a+c] type /asave to save status bar + xecho -b $scriptname sbar set to $0 + xecho -b type /asave to save status bar }{ - xecho -v [a+c] syn: /sbar <1-$(sbar.max)> current sbar is ${hwht}$after(. $statbar) + xecho -b syn: /sbar <1-$(sbar.max)> current sbar is ${hwht}$after(. $statbar) } oof diff /home/zwhite/amn.orig/core/scan.m /home/zwhite/amn/core/scan.m --- /home/zwhite/amn.orig/core/scan.m Mon Oct 10 19:40:01 2005 +++ /home/zwhite/amn/core/scan.m Mon Oct 10 20:39:43 2005 @@ -206,6 +206,6 @@ (5) {@snf=5;^eval load ${loadpath}sc/scan.5} (6) {@snf=6;^eval load ${loadpath}sc/scan.6} } - xecho -v [a+c] scan format set to $(snf) + xecho -b scan format set to $(snf) } oof diff /home/zwhite/amn.orig/core/theme.m /home/zwhite/amn/core/theme.m --- /home/zwhite/amn.orig/core/theme.m Mon Oct 10 19:40:01 2005 +++ /home/zwhite/amn/core/theme.m Mon Oct 10 20:40:00 2005 @@ -64,7 +64,7 @@ @ write($saveth @sc3=[$sc3) @ write($saveth @sc4=[$sc4) @ close($saveth) - xecho -v [a+c]: saved theme file [$(loadpath)themes/$(name).th] $desc + xecho -b saved theme file [$(loadpath)themes/$(name).th] $desc ^load $(loadpath)themes/$(name).th ^eval load $(loadpath)core/fsets.m ^eval load $(loadpath)core/arrays.m @@ -72,7 +72,7 @@ ^getusers }{ -xecho -v -b $scriptname usage: /tsave +xecho -b $scriptname usage: /tsave } # thanks to ttb for some original help w/ read(), but it still didn't work :P @@ -87,27 +87,27 @@ @ close($thfile) //echo $[10]name $[12]auth $desc$repeat(${20-strlen($strip( $stripansicodes($desc)))} ) } - xecho -v [a+c] current theme is $scdesc + xecho -b current theme is $scdesc }{ -if (fexist($(loadpath)themes/$0.th)==-1) { xecho -v [a+c] theme $0 does not exist }{ +if (fexist($(loadpath)themes/$0.th)==-1) { xecho -b theme $0 does not exist }{ @ name = [$0] ^load $(loadpath)themes/$(0).th ^eval load $(loadpath)core/fsets.m ^eval load $(loadpath)core/arrays.m ^update.f ^getusers - xecho -v [a+c] loaded theme file [$(0).th] by $auth $desc + xecho -b loaded theme file [$(0).th] by $auth $desc } } -alias untheme { @name=[];@scdesc=[];xecho -v -b $scriptname: no longer using a theme;fsave +alias untheme { @name=[];@scdesc=[];xecho -b $scriptname: no longer using a theme;fsave }[C alias rtheme if ([$0]) { -if (fexist($(loadpath)themes/$0.th)==-1) { xecho -v [a+c] theme $(0) does not exist! +if (fexist($(loadpath)themes/$0.th)==-1) { xecho -b theme $(0) does not exist! }{ ^exec rm -rf $(loadpath)themes/$(0).th 1> /dev/null 2> /dev/null -xecho -v [a+c] theme $(0) has been removed! -}}{xecho -v [a+c] usage: /rtheme } +xecho -b theme $(0) has been removed! +}}{xecho -b usage: /rtheme } ## kreca/crapple 05 ## clogic '98 diff /home/zwhite/amn.orig/core/trickle.m /home/zwhite/amn/core/trickle.m --- /home/zwhite/amn.orig/core/trickle.m Mon Oct 10 19:40:01 2005 +++ /home/zwhite/amn/core/trickle.m Mon Oct 10 21:35:48 2005 @@ -46,31 +46,31 @@ alias thelp { if (!$[0]) { -echo -------------= Trickle IRC Swiss Army Knife Help =------------- +//echo -------------= Trickle IRC Swiss Army Knife Help =------------- -echo tscan /tscan [ident@host] specified match will show user(s) in -echo current chan. -echo tdeop /tdeop [ident@host] specified match will deop user(s) in -echo current chan. -echo tkick /tkick [ident@host] specified match will kick user(s) in -echo current chan. -echo tbk /tbk [ident@host] specified match will bankick user(s) -echo in current chan. -echo top /top [ident@host] specified match will op user(s) in -echo current chan. -echo common /common #somechan will compare nicks between current and -echo specified chan. +//echo tscan /tscan [ident@host] specified match will show user(s) in +//echo current chan. +//echo tdeop /tdeop [ident@host] specified match will deop user(s) in +//echo current chan. +//echo tkick /tkick [ident@host] specified match will kick user(s) in +//echo current chan. +//echo tbk /tbk [ident@host] specified match will bankick user(s) +//echo in current chan. +//echo top /top [ident@host] specified match will op user(s) in +//echo current chan. +//echo common /common #somechan will compare nicks between current and +//echo specified chan. input_char "menu paused, hit the ANY key to continue. " pause -echo -echo /trickle can do a wide variety of commands/matches these are just -echo some of the quick aliases which makes usage of /trickle. -echo some /trickle usage examples. -echo /trickle #somechan *!*@*aol.com kill -echo /trickle #somechan *!ident@* voice -echo /trickle * wildcard is not working at this time. -echo /filter is also aliased to trickle for those who can't remember the cmd. -echo --------------------------------------------------------------------- +//echo +//echo /trickle can do a wide variety of commands/matches these are just +//echo some of the quick aliases which makes usage of /trickle. +//echo some /trickle usage examples. +//echo /trickle #somechan *!*@*aol.com kill +//echo /trickle #somechan *!ident@* voice +//echo /trickle * wildcard is not working at this time. +//echo /filter is also aliased to trickle for those who can't remember the cmd. +//echo --------------------------------------------------------------------- } } diff /home/zwhite/amn.orig/core/whois.m /home/zwhite/amn/core/whois.m --- /home/zwhite/amn.orig/core/whois.m Mon Oct 10 19:40:01 2005 +++ /home/zwhite/amn/core/whois.m Mon Oct 10 20:41:13 2005 @@ -11,6 +11,6 @@ (5) {@_whois=5;^eval load ${loadpath}wis/whois.5} (6) {@_whois=6;^eval load ${loadpath}wis/whois.6} } - xecho -v [a+c] whois format set to $(_whois) + xecho -b whois format set to $(_whois) } oof diff /home/zwhite/amn.orig/core/winhelp.m /home/zwhite/amn/core/winhelp.m --- /home/zwhite/amn.orig/core/winhelp.m Mon Oct 10 19:40:01 2005 +++ /home/zwhite/amn/core/winhelp.m Mon Oct 10 21:35:52 2005 @@ -5,7 +5,7 @@ alias winhelp { if (!$[0]) { -echo --------------------= Windowing Help =----------------------------- +//echo --------------------= Windowing Help =----------------------------- //echo wc <window create> creates new hidden window //echo wj <window join> creates new hidden window and joins specified channel @@ -30,7 +30,7 @@ //echo wflush <window flush> window flush the scroll back epic5-0.0.6 and higher. //echo wlevel <window levels> changes level of current window //echo msgwin <msg window> wsl's then it wc's a window bound to msgs,notices -echo --------------------------------------------------------------------------- +//echo --------------------------------------------------------------------------- } } diff /home/zwhite/amn.orig/modules/abot/abot.m /home/zwhite/amn/modules/abot/abot.m --- /home/zwhite/amn.orig/modules/abot/abot.m Mon Oct 10 19:40:01 2005 +++ /home/zwhite/amn/modules/abot/abot.m Mon Oct 10 21:36:00 2005 @@ -26,7 +26,7 @@ @ bothost = after(! $input1) @ botnick = before(! $input1) } else { - if (!getuhost($input1)) { xecho -v -b $botprompt $input1 is not on irc! }{ + if (!getuhost($input1)) { xecho -b $botprompt $input1 is not on irc! }{ @ bothost = sar(g/~/\*/$getuhost($input1)) @ botnick = [$input1] }} @@ -36,7 +36,7 @@ @ :botcmd = [$3-] @ setitem(bots 0 !) @ setitem(bots $numitems(bots) $botnick!$bothost $pass $chan $botcmd) - xecho -v -b $botprompt $Cparse(%nbot added %c$botnick%K!%c$bothost%n pass%K:%c $decode($pass) %nchannel%K:%c $chan%n command%K:%n $botcmd) + xecho -b $botprompt $Cparse(%nbot added %c$botnick%K!%c$bothost%n pass%K:%c $decode($pass) %nchannel%K:%c $chan%n command%K:%n $botcmd) } } } @@ -69,7 +69,7 @@ for (@xx=0, xx -echo adds bots to the botlist. -echo botdel /botdel delete bot from botlist -echo botsave /botsave saves bots to file -echo listbot /listbot lists all bots -echo delbot /delbot - same as /botdel -echo botlist /botlist - same as /listbot -echo abot /abot - same as /listbot -echo rmbot /rmbot - same as /botdel +//echo addbot /addbot +//echo adds bots to the botlist. +//echo botdel /botdel delete bot from botlist +//echo botsave /botsave saves bots to file +//echo listbot /listbot lists all bots +//echo delbot /delbot - same as /botdel +//echo botlist /botlist - same as /listbot +//echo abot /abot - same as /listbot +//echo rmbot /rmbot - same as /botdel -echo ------------------------------------------------------------------- +//echo ------------------------------------------------------------------- } } diff /home/zwhite/amn.orig/modules/adcc/adcc.m /home/zwhite/amn/modules/adcc/adcc.m --- /home/zwhite/amn.orig/modules/adcc/adcc.m Mon Oct 10 19:40:01 2005 +++ /home/zwhite/amn/modules/adcc/adcc.m Mon Oct 10 20:42:54 2005 @@ -39,7 +39,7 @@ alias adcc.timer { if (numitems(offers.files) == 0) { - xecho -v (adcc).. no packs offered + xecho (adcc).. no packs offered }{ input "which channel do you want the timer to plist in? <#chan1,#chan2...> " { @dcchans=[$0] @@ -51,7 +51,7 @@ ^timer -del 41 input "time in minutes to plist on channel " { if ([$0] == 0 || ![$0]) { - xecho -v (adcc).. timer canceled + xecho (adcc).. timer canceled }{ @pts=[$0] ^timer -refnum 41 -rep -1 ${pts * 60} ^plist $dcchans @@ -60,7 +60,7 @@ } alias adcc.list { if (numitems(offers.files)== 0) { - xecho -v (adcc).. no packs current on list + xecho (adcc).. no packs current on list }{ banner.lchead banner.mid file desc gets @@ -92,7 +92,7 @@ if (fexist($glob($*)) == [-1]) { @fuk=1 - xecho -v (adcc).. file not found + xecho (adcc).. file not found }{ if (match(*/* $*)) { @setitem(gets $numitems(gets) 0) @@ -137,7 +137,7 @@ alias plist { if (numitems(offers.files) == 0) { - xecho -v (adcc).. no packs being offered + xecho (adcc).. no packs being offered }{ if (![$0]) { @pl=[$C] @@ -190,7 +190,7 @@ @ write($savec @speed=[$getitem(speed 0)]) @ write($savec @total=[$getitem(total 0)]) @ close($savec) - xecho -v [mod] (odcc).. adcc settings saved to $dccsavefile + xecho [mod] (odcc).. adcc settings saved to $dccsavefile } ^eval ^load $dccsavefile @@ -229,7 +229,7 @@ } - xecho -v (adcc).. odcc file loaded + xecho (adcc).. odcc file loaded } alias adcc.doffer { @@ -241,14 +241,14 @@ @delarray(gets) @delarray(speed) @delarray(total) - xecho -v (adcc).. all packs deleted + xecho (adcc).. all packs deleted }{ @numer=[$0] @delitem(offers.files ${numer-1}) @delitem(offers.desc ${numer-1}) @delitem(offers.note ${numer-1}) @delitem(gets ${numer-1}) - xecho -v (adcc).. pack $numer deleted + xecho (adcc).. pack $numer deleted } } } diff /home/zwhite/amn.orig/modules/away/away.m /home/zwhite/amn/modules/away/away.m --- /home/zwhite/amn.orig/modules/away/away.m Mon Oct 10 19:40:01 2005 +++ /home/zwhite/amn/modules/away/away.m Mon Oct 10 20:43:52 2005 @@ -10,14 +10,14 @@ alias remlog { if (fexist(~/.amn/away.log) == -1) { - xecho -v -b log file does not exist. + xecho -b log file does not exist. }{ input "remove log? [y|n]: " { if ([$0]==[y]) { exec rm ~/.amn/away.log - xecho -v -b ~/.amn/away.log deleted + xecho -b ~/.amn/away.log deleted }{ - xecho -v -b remlog canceled + xecho -b remlog canceled } } } @@ -65,34 +65,34 @@ if (awaytime > [0]) { @timediff=tdiff2(${backtime - awaytime}) //away - xecho -v -b type /readlog to view log. + xecho -b type /readlog to view log. } }{ - xecho -v -b you are not away.. + xecho -b you are not away.. } alias awaytime if ([$0]) { @ awayt = [$0] - xecho -v [a+c] awaytime set to "$awayt" + xecho -b awaytime set to "$awayt" } else { - xecho -v [a+c] awaytime set to "$awayt"} + xecho -b awaytime set to "$awayt"} alias awaymsg if ([$0]) { @ awayr = [$*] - xecho -v [a+c] away reason set to "$awayr" + xecho -b away reason set to "$awayr" } else { - xecho -v [a+c] away reason set to "$awayr"} + xecho -b away reason set to "$awayr"} alias awaytog { if (![$0]) { - xecho -v [a+c] away toggle is set to "$togaway" + xecho -b away toggle is set to "$togaway" } if (match($0 on off)) {@togaway = [$0] - xecho -v [a+c] away toggle is set to "$togaway" + xecho -b away toggle is set to "$togaway" }{ if ([$0]&&!match($0 on off)) { - xecho -v [a+c] invalid choice + xecho -b invalid choice } } @@ -101,14 +101,14 @@ ## pager crap here. alias pager { if (![$0]) { - xecho -v [a+c] pager set to "$togpager" + xecho -b pager set to "$togpager" } if (match($0 on off)) { @togpager = [$0] - xecho -v [a+c] pager set to "$togpager" + xecho -b pager set to "$togpager" }{ if ([$0]&&!match($0 on off)) { - xecho -v [a+c] invalid choice + xecho -b invalid choice } } } @@ -171,70 +171,70 @@ alias logcrap { if (![$0]) { - xecho -v [a+c] misc crap logging set to "$crapl" + xecho -b misc crap logging set to "$crapl" } if (match($0 on off)) { @crapl = [$0] - xecho -v [a+c] misc crap logging set to "$crapl" + xecho -b misc crap logging set to "$crapl" }{ if ([$0]&&!match($0 on off)) { - xecho -v [a+c] invalid choice + xecho -b invalid choice } } } alias logm { if (![$0]) { - xecho -v [a+c] msg logging set to "$msgl" + xecho -b msg logging set to "$msgl" } if (match($0 on off)) { @msgl = [$0] - xecho -v [a+c] msg logging set to "$msgl" + xecho -b msg logging set to "$msgl" }{ if ([$0]&&!match($0 on off)) { - xecho -v [a+c] invalid choice + xecho -b invalid choice } } } alias logd { if (![$0]) { - xecho -v [a+c] dcc logging set to "$dccl" + xecho -b dcc logging set to "$dccl" } if (match($0 on off)) { @dccl = [$0] - xecho -v [a+c] dcc logging set to "$dccl" + xecho -b dcc logging set to "$dccl" }{ if ([$0]&&!match($0 on off)) { - xecho -v [a+c] invalid choice + xecho -b invalid choice } } } alias logn { if (![$0]) { - xecho -v [a+c] notice logging set to "$notl" + xecho -b notice logging set to "$notl" } if (match($0 on off)) { @notl = [$0] - xecho -v [a+c] notice logging set to "$notl" + xecho -b notice logging set to "$notl" }{ if ([$0]&&!match($0 on off)) { - xecho -v [a+c] invalid choice + xecho -b invalid choice } } } alias logpub { if (![$0]) { - xecho -v [a+c] public logging set to "$plog" + xecho -b public logging set to "$plog" } if (match($0 on off)) { @plog = [$0] - xecho -v [a+c] public logging set to "$plog" + xecho -b public logging set to "$plog" }{ if ([$0]&&!match($0 on off)) { - xecho -v [a+c] invalid choice + xecho -b invalid choice } } } diff /home/zwhite/amn.orig/modules/bwk/bwk.m /home/zwhite/amn/modules/bwk/bwk.m --- /home/zwhite/amn.orig/modules/bwk/bwk.m Mon Oct 10 19:40:01 2005 +++ /home/zwhite/amn/modules/bwk/bwk.m Mon Oct 10 20:44:09 2005 @@ -14,8 +14,8 @@ alias addword { if ( # < 2) { - xecho -v -b syn: /addword word #chan [type] to bk a word in specified chan. - xecho -v -b type is either bk or kick. Default is bk. + xecho -b syn: /addword word #chan [type] to bk a word in specified chan. + xecho -b type is either bk or kick. Default is bk. }{ @:bktype=[bk] if ( # >= 3 && findw($2 bk kick)) { @@ -27,13 +27,13 @@ @setitem(_words $numitems(_words) $0) @setitem(_wordschan $numitems(_wordschan) $1) @setitem(_wordstype $numitems(_wordstype) $bktype) - xecho -v -b added word $0 with channel $1 to word list. + xecho -b added word $0 with channel $1 to word list. } } alias listword { if (numitems(_words) == 1) { - xecho -v -b no words current on list + xecho -b no words current on list }{ banner.head for (@xx=1, xx 0 && [$0] < numitems(_words)) { - xecho -v -b deleted $getitem(_words $0) $getitem(_wordschan $0) from list + xecho -b deleted $getitem(_words $0) $getitem(_wordschan $0) from list @delitem(_words $0) @delitem(_wordschan $0) @delitem(_wordstype $0) }{ - xecho -v -b number out of range. + xecho -b number out of range. } }{ - xecho -v -b syn: /delword + xecho -b syn: /delword } } @@ -94,7 +94,7 @@ @write($savemt @_wordstype.$xx=[$getitem(_wordtype $xx)]) } @close($savemt) - xecho -v [mod] (bwk).. wordlist saved to $wordsfile + xecho [mod] (bwk).. wordlist saved to $wordsfile } alias wordsload { diff /home/zwhite/amn.orig/modules/flood/flood.m /home/zwhite/amn/modules/flood/flood.m --- /home/zwhite/amn.orig/modules/flood/flood.m Mon Oct 10 19:40:01 2005 +++ /home/zwhite/amn/modules/flood/flood.m Mon Oct 10 20:50:35 2005 @@ -4,27 +4,27 @@ ^on #-msg 1 * if (msgflood != 1) { @msgs++ - //timer -refnum 5001 3 {@msgs = 0} - if (msgs > msgfloodsensor) { - /umode +g - xecho -b msg flood detected setting flood protect umode +g for $mfloodtimer seconds - @msgflood=1 - //timer -refnum 5002 $mfloodtimer {^xecho -b server protect umode +g lifted after $mfloodtimer seconds;@msgflood=0;^umode -g} - - } + //timer -refnum 5001 3 {@msgs = 0} + if (msgs > msgfloodsensor) { + /umode +g + xecho -b msg flood detected setting flood protect umode +g for $mfloodtimer seconds + @msgflood=1 + //timer -refnum 5002 $mfloodtimer {^xecho -b server protect umode +g lifted after $mfloodtimer seconds;@msgflood=0;^umode -g} + } } + alias msgflood if ([$0]) { @msgfloodsensor=[$0] - xecho -v [a+c] server msg flood sensor set to "$msgfloodsensor" + xecho -b server msg flood sensor set to "$msgfloodsensor" }{ - xecho -v [a+c] server msg flood sensor set to "$msgfloodsensor" + xecho -b server msg flood sensor set to "$msgfloodsensor" } alias msgftimer if ([$0]) { @mfloodtimer=[$0] - xecho -v [a+c] server protect msg flood time set to "$mfloodtimer" + xecho -b server protect msg flood time set to "$mfloodtimer" }{ - xecho -v [a+c] server protect msg flood time set to "$mfloodtimer" + xecho -b server protect msg flood time set to "$mfloodtimer" } alias mtime msgftimer $* diff /home/zwhite/amn.orig/modules/mjoin/mjoin.m /home/zwhite/amn/modules/mjoin/mjoin.m --- /home/zwhite/amn.orig/modules/mjoin/mjoin.m Mon Oct 10 19:40:01 2005 +++ /home/zwhite/amn/modules/mjoin/mjoin.m Mon Oct 10 21:36:07 2005 @@ -16,7 +16,7 @@ alias addchan { if (![$0]) { - xecho -v (mjoin).. syn: /addchan chan1,chan2,chan3... (note. if the channel has a key then /addchan chan1 key, one by one.) + xecho (mjoin).. syn: /addchan chan1,chan2,chan3... (note. if the channel has a key then /addchan chan1 key, one by one.) }{ @_ach=sar(g/,/ /$0) if ([$1]) { @@ -25,20 +25,20 @@ @setitem(chans 0 !) @setitem(chans $numitems(chans) $a1 $_key) } - xecho -v -b added $* to channel list + xecho -b added $* to channel list }{ fe ($_ach) a1 { @setitem(chans 0 !) @setitem(chans $numitems(chans) $a1) } - xecho -v -b added $* to channel list + xecho -b added $* to channel list } } } alias listchan { if (numitems(chans) == 1) { - xecho -v -b no channels current on list + xecho -b no channels current on list }{ banner.lchead for (@xx=1, xx will add specified channel to mjoinlist -echo addjoin /addjoin will add specified channel to mjoinlist -echo delchan /delchan will delete channel from mjoin list -echo listchan /listchan will show a list of channels on the mjoin list -echo mjoin /mjoin will join all channels on mjoin list -echo chansave /chansave will save mjoin list -echo chanload /chanload will load mjoin list from ~/.chan.save -echo -= Mjoin Quick Aliases =- -echo listc/listchan ajlist/listchan chanlist/listchan -echo addjoin/addchan ajoin/addchan -echo unajoin/delchan deljoin/delchan rmjoin/delchan unjoin/delchan +//echo addchan /addchan will add specified channel to mjoinlist +//echo addjoin /addjoin will add specified channel to mjoinlist +//echo delchan /delchan will delete channel from mjoin list +//echo listchan /listchan will show a list of channels on the mjoin list +//echo mjoin /mjoin will join all channels on mjoin list +//echo chansave /chansave will save mjoin list +//echo chanload /chanload will load mjoin list from ~/.chan.save +//echo -= Mjoin Quick Aliases =- +//echo listc/listchan ajlist/listchan chanlist/listchan +//echo addjoin/addchan ajoin/addchan +//echo unajoin/delchan deljoin/delchan rmjoin/delchan unjoin/delchan -echo ------------------------------------------------------------------- +//echo ------------------------------------------------------------------- } } diff /home/zwhite/amn.orig/modules/ncomp/ncomp.m /home/zwhite/amn/modules/ncomp/ncomp.m --- /home/zwhite/amn.orig/modules/ncomp/ncomp.m Mon Oct 10 19:40:01 2005 +++ /home/zwhite/amn/modules/ncomp/ncomp.m Mon Oct 10 20:51:21 2005 @@ -8,7 +8,7 @@ if (pattern($txt* $chanusers($C))) { @ per = pattern($txt* $chanusers($C)) if (numwords($per) > 1) { - xecho -v -b Ambiguous matches: $per + xecho -b Ambiguous matches: $per sendline $* }{ sendline $stripansicodes($per$format_nick_comp $1-) @@ -17,7 +17,7 @@ if (!pattern($txt* $chanusers($C)) && pattern(*$txt* $chanusers($C))) { @ per = pattern(*$txt* $chanusers($C)) if (numwords($per) > 1) { - xecho -v -b Ambiguous matches: $per + xecho -b Ambiguous matches: $per sendline $* }{ sendline $stripansicodes($per$format_nick_comp $1-) diff /home/zwhite/amn.orig/modules/nlog/nlog.m /home/zwhite/amn/modules/nlog/nlog.m --- /home/zwhite/amn.orig/modules/nlog/nlog.m Mon Oct 10 19:40:01 2005 +++ /home/zwhite/amn/modules/nlog/nlog.m Mon Oct 10 20:52:09 2005 @@ -25,14 +25,14 @@ alias nsotog { if ( [$#] ==0) { - xecho -v [a+c] notify signoff log toggle is set to "$nsolog" + xecho -b notify signoff log toggle is set to "$nsolog" } if (match($0 on off)) { @nsolog = [$0] - xecho -v [a+c] notify signoff log toggle is set to "$nsolog" + xecho -b notify signoff log toggle is set to "$nsolog" }{ if ( [$#] &&!match($0 on off)) { - xecho -v [a+c] invalid choice, on or off. + xecho -b invalid choice, on or off. } } } @@ -41,14 +41,14 @@ #notify aliases. alias rnlog { if (fexist($nlogfile) == -1) { - xecho -v -b notify log file does not exist. + xecho -b notify log file does not exist. }{ input "remove log? [y|n]: " { if ([$0]==[y]) { exec rm $nlogfile - xecho -v -b $nlogfile deleted + xecho -b $nlogfile deleted }{ - xecho -v -b rnlog canceled + xecho -b rnlog canceled } } } @@ -68,7 +68,7 @@ @savemt = open($nfile W T) @write($savemt @nsolog=[$nsolog]) @close($savemt) - xecho -v [mod] (nlog).. notify settings saved to $nfile + xecho [mod] (nlog).. notify settings saved to $nfile } ^eval load $nfile diff /home/zwhite/amn.orig/modules/oper/oper.m /home/zwhite/amn/modules/oper/oper.m --- /home/zwhite/amn.orig/modules/oper/oper.m Mon Oct 10 19:40:01 2005 +++ /home/zwhite/amn/modules/oper/oper.m Mon Oct 10 21:36:17 2005 @@ -21,7 +21,7 @@ alias _winnames { fe ($winrefs()) n1 { - if (match($0 $winnam($n1)) > 0) { + if (match($0 $winnam($n1))) { return $n1 }{ @@ -32,19 +32,19 @@ alias ovsize { if (![$0]) { - xecho -v -b operview window size set to "$_ovsize" + xecho -b operview window size set to "$_ovsize" }{ @_ovsize=[$0] - xecho -v -b operview window size set to "$_ovsize" + xecho -b operview window size set to "$_ovsize" } } alias ovmode { if (![$0]) { - xecho -v -b oper modes set to "$_ovmode" + xecho -b oper modes set to "$_ovmode" }{ @_ovmode=[$0] - xecho -v -b oper modes set to "$_ovmode" + xecho -b oper modes set to "$_ovmode" } } @@ -61,13 +61,13 @@ alias operview { if (winnum(operview) != -1) { - abecho [a+c] toggled operview off. + abecho $banner toggled operview off. ^window OperView kill ^umode -$_ovmode }{ - abecho [a+c] toggled operview on. + abecho $banner toggled operview on. ^window new fixed on size $_ovsize name OperView level snotes,opnotes,wallops;umode +$_ovmode # ^set status_server [%S] ^set status_format [operview] %> [$servername($winserv(OperView))] @@ -90,7 +90,7 @@ alias tkline { if (![$0]) { - xecho -v [a+c] usage: /tkline [nick|hostmask] + xecho -b usage: /tkline [nick|hostmask] }{ quote kline $0 $1 :$2- } @@ -340,38 +340,27 @@ alias ohelp { if (!$[0]) { -echo -----------------------= Oper Help =-------------------------- +//echo -----------------------= Oper Help =-------------------------- -echo /tkline [nick|ident@host] will temp kline for -echo specified minutes. -echo /unkline will remove kline from server list. -echo /operwall will send a operwall with specified text to the server. -echo /ov will open up a split window will the level WALLOPS OPNOTES SNOTES -echo so all server msgs will go to that window. -echo /mkline will mass kline current channel for specified reason -echo /mkill will mass kill current channel -echo /locops will send a msg to all operators on current server -echo /kline will set a kline for nick or specified ident@host -echo /modlist view ircd modules. -echo /modload loads specified ircd module. -echo /modunload unloads specified ircd module. -echo /dline reason. will set a dline with reason. (ratbox) -echo /undline will remove a dline. (ratbox) -echo binds ^E scroll_backward in ovwin ^D scroll_forward in ovwin +//echo /tkline [nick|ident@host] will temp kline for +//echo specified minutes. +//echo /unkline will remove kline from server list. +//echo /operwall will send a operwall with specified text to the server. +//echo /ov will open up a split window will the level WALLOPS OPNOTES SNOTES +//echo so all server msgs will go to that window. +//echo /mkline will mass kline current channel for specified reason +//echo /mkill will mass kill current channel +//echo /locops will send a msg to all operators on current server +//echo /kline will set a kline for nick or specified ident@host +//echo /modlist view ircd modules. +//echo /modload loads specified ircd module. +//echo /modunload unloads specified ircd module. +//echo /dline reason. will set a dline with reason. (ratbox) +//echo /undline will remove a dline. (ratbox) +//echo binds ^E scroll_backward in ovwin ^D scroll_forward in ovwin -echo ------------------------------------------------------------------- +//echo ------------------------------------------------------------------- } } -if (_winnames(Operview) > 0) { - ^set status_format $(hblk)[$(sc1)operview$(hblk)] $(cl)%>$(hblk)\([$(cl)$servername($winserv(OperView))$(hblk)]\) -} - - -^on #-connect 53 * { - ^set status_format $(hblk)[$(sc1)operview$(hblk)] $(cl)%>$(hblk)\([$(cl)$servername($winserv(OperView))$(hblk)]\) - if (!_pubnick) { - @_pubnick=N - } -} diff /home/zwhite/amn.orig/modules/orignick/orignick.m /home/zwhite/amn/modules/orignick/orignick.m --- /home/zwhite/amn.orig/modules/orignick/orignick.m Mon Oct 10 19:40:01 2005 +++ /home/zwhite/amn/modules/orignick/orignick.m Mon Oct 10 20:53:20 2005 @@ -5,14 +5,14 @@ ^timer -del 45 alias orignick { if (![$0]) { - xecho -v [a+c] /orignick /staynick to cancel + xecho -b /orignick /staynick to cancel }{ ^timer -delete 45 @nic=[$0] ^timer -window -1 -refnum 45 -rep -1 $_ort { ^getnick $nic } - xecho -v [a+c] attempting to jupe $nic + xecho -b attempting to jupe $nic } } @@ -20,39 +20,39 @@ ^userhost $nic -cmd { if ([$3@$4] == [@]) { ^nick $nic - xecho -v [a+c] congrads nick juped. /staynick to cancel + xecho -b congrads nick juped. /staynick to cancel } } } alias staynick { ^assign -nic ^timer -delete 45 - xecho -v [a+c] /orignick request canceled. + xecho -b /orignick request canceled. } alias setorig { if (# == 0) { - xecho -v [a+c] orignick delay set to "$_ort" + xecho -b orignick delay set to "$_ort" return; } if ([$0] > 0 && [$0] <=20) { @_ort = [$0] - xecho -v [a+c] orignick delay set to "$_ort" + xecho -b orignick delay set to "$_ort" }{ - xecho -v [a+c] time out of range. Valid numbers are 1-20 + xecho -b time out of range. Valid numbers are 1-20 } } on #-channel_signoff 42 "*" { if ([$1] == nic) { ^nick $nic - xecho -v [a+c] congrads nick juped. /staynick to cancel + xecho -b congrads nick juped. /staynick to cancel } } ^on #-nickname 33 * { if ([$0]== nic) { ^nick $nic - xecho -v [a+c] congrads nick juped. /staynick to cancel + xecho -b congrads nick juped. /staynick to cancel } } diff /home/zwhite/amn.orig/modules/relay/relay.m /home/zwhite/amn/modules/relay/relay.m --- /home/zwhite/amn.orig/modules/relay/relay.m Mon Oct 10 19:40:01 2005 +++ /home/zwhite/amn/modules/relay/relay.m Mon Oct 10 21:36:27 2005 @@ -262,7 +262,7 @@ //echo $0 isn't on IRC right now. } }{ -echo usage : /frelm [fake nick] [nick/channel to send to] [fake msg]} +//echo usage : /frelm [fake nick] [nick/channel to send to] [fake msg]} } alias freln { @@ -276,7 +276,7 @@ //echo $0 isn't on IRC right now. } }{ -echo usage: /freln [fake nick] [nick/channel to send to] [fake notice]} +//echo usage: /freln [fake nick] [nick/channel to send to] [fake notice]} } ## end fake stuff. @@ -284,21 +284,21 @@ alias rhelp { if (!$[0]) { -echo -----------------------= Relay Help =-------------------------- +//echo -----------------------= Relay Help =-------------------------- -echo lpaste /lpaste will paste to current window last line recieved. -echo relm /relm then to paste msg lines in buffer. -echo relsm /relsm then to paste sent msg lines in buffer. -echo reln /reln then to paste notice lines in buffer. -echo relsn /relsn then to paste sent notice lines in buffer. -echo paste /paste then to paste line in buffer. -echo relw /relw then to paste line in buffer. -echo rel /rel -l (msg) /rel -n (notice) /rel -s (sendmsg) -echo -echo Note: you do not have to specify numbers or actually paste anything -echo to anyone when seeing what's in the buffer ie: /relm to view the last -echo 15 msgs to you then enter to avoid pasting anything. +//echo lpaste /lpaste will paste to current window last line recieved. +//echo relm /relm then to paste msg lines in buffer. +//echo relsm /relsm then to paste sent msg lines in buffer. +//echo reln /reln then to paste notice lines in buffer. +//echo relsn /relsn then to paste sent notice lines in buffer. +//echo paste /paste then to paste line in buffer. +//echo relw /relw then to paste line in buffer. +//echo rel /rel -l (msg) /rel -n (notice) /rel -s (sendmsg) +//echo +//echo Note: you do not have to specify numbers or actually paste anything +//echo to anyone when seeing what's in the buffer ie: /relm to view the last +//echo 15 msgs to you then enter to avoid pasting anything. -echo ------------------------------------------------------------------- +//echo ------------------------------------------------------------------- } } diff /home/zwhite/amn.orig/modules/shitlist/shitlist.m /home/zwhite/amn/modules/shitlist/shitlist.m --- /home/zwhite/amn.orig/modules/shitlist/shitlist.m Mon Oct 10 19:40:01 2005 +++ /home/zwhite/amn/modules/shitlist/shitlist.m Mon Oct 10 21:36:34 2005 @@ -88,14 +88,14 @@ @write($savec @shitreas.$xx=[$getitem(shitreas $xx)]) } @ close($savec) - xecho -v [mod] (shitlist).. saved to $shitsavefile + xecho [mod] (shitlist).. saved to $shitsavefile } alias unshit shitdel alias shitdel if ([$0]) { if (numitems(shitlist)<=[$0]) { //echo $banner no such user! }{ - xecho -v -b deleted shitlist entry $getitem(shitlist $0) + xecho -b deleted shitlist entry $getitem(shitlist $0) @ delitem(shitlist $0) @ delitem(shitreas $0) } @@ -215,19 +215,19 @@ alias shelp { if (!$[0]) { -echo -----------------------= Shitlist Help =-------------------------- +//echo -----------------------= Shitlist Help =-------------------------- -echo addshit /addshit [nick|ident@host] #chan1,#chan2,#chan3... level reason -echo shitlevels 1 - deop users at all time, 2 - kick user when they -echo join the channel, 3 - Ban/Kick user when they join the channel -echo fuck /fuck nick will kickban nick and add nick to your shitlist level 3 -echo listshit /listshit view current users on the shitlist. -echo delshit /delshit # removes user from the shitlist. -echo -= Shitlist Quick Alias =- -echo listbk/listshit -echo addbk/addshit -echo rembk/delshit +//echo addshit /addshit [nick|ident@host] #chan1,#chan2,#chan3... level reason +//echo shitlevels 1 - deop users at all time, 2 - kick user when they +//echo join the channel, 3 - Ban/Kick user when they join the channel +//echo fuck /fuck nick will kickban nick and add nick to your shitlist level 3 +//echo listshit /listshit view current users on the shitlist. +//echo delshit /delshit # removes user from the shitlist. +//echo -= Shitlist Quick Alias =- +//echo listbk/listshit +//echo addbk/addshit +//echo rembk/delshit -echo ------------------------------------------------------------------- +//echo ------------------------------------------------------------------- } } diff /home/zwhite/amn.orig/modules/userlist/userlist.m /home/zwhite/amn/modules/userlist/userlist.m --- /home/zwhite/amn.orig/modules/userlist/userlist.m Mon Oct 10 19:40:01 2005 +++ /home/zwhite/amn/modules/userlist/userlist.m Mon Oct 10 21:36:47 2005 @@ -94,7 +94,7 @@ @ write($savec @friends.$xx=[$getitem(friends $xx)]) } @ close($savec) - xecho -v [mod] (userlist).. saved to $frsavefile + xecho [mod] (userlist).. saved to $frsavefile } alias userdel if ([$0]) { @@ -121,14 +121,14 @@ alias setsec { if (# == 0) { - xecho -v [a+c] autop delay set to "$_ss" + xecho -b autop delay set to "$_ss" return; } if ([$0] > 0 && [$0] <=40) { @_ss = [$0] - xecho -v [a+c] autop delay set to "$_ss" + xecho -b autop delay set to "$_ss" }{ - xecho -v [a+c] time out of range. Valid numbers are 1 - 40 + xecho -b time out of range. Valid numbers are 1 - 40 } } @@ -343,22 +343,22 @@ alias uhelp { if (!$[0]) { -echo -----------------------= Userlist Help =-------------------------- +//echo -----------------------= Userlist Help =-------------------------- -echo userlist /userlist will display users from the userlist. -echo adduser /adduser [nick|ident@host] #channel userlevel1,userlevel2, -echo userlevel3 .. password. -echo userlevels ops - will op person requesting for ops ,iops - will -echo instantly op someone when they enter the channel, invite - upon ctcp -echo request, will invite user to channel, voice - will voice person when -echo enters the channel -echo listuser /listuser will display users from the userlist. -echo deluser /deluser # will delete the user from the userlist. -echo addf /addf same as /adduser -echo listf /listf same as /userlist -echo delf /delf same as /deluser -echo remf /remf same as /deluser +//echo userlist /userlist will display users from the userlist. +//echo adduser /adduser [nick|ident@host] #channel userlevel1,userlevel2, +//echo userlevel3 .. password. +//echo userlevels ops - will op person requesting for ops ,iops - will +//echo instantly op someone when they enter the channel, invite - upon ctcp +//echo request, will invite user to channel, voice - will voice person when +//echo enters the channel +//echo listuser /listuser will display users from the userlist. +//echo deluser /deluser # will delete the user from the userlist. +//echo addf /addf same as /adduser +//echo listf /listf same as /userlist +//echo delf /delf same as /deluser +//echo remf /remf same as /deluser -echo ------------------------------------------------------------------- +//echo ------------------------------------------------------------------- } } Date: Mon, 10 Oct 2005 18:08:40 -0400 (EDT) From: zak@ircii.org (Zak) -REFIX AMN TREE AND SOME CHANGELOG CHANGES ENJOY THE MASSIVE INBOXES GUYS. BLAME SKULLY. ;((( //zak diff -aruN amn.orig/CHANGES amn/CHANGES --- amn.orig/CHANGES Mon Oct 10 15:38:43 2005 +++ amn/CHANGES Mon Oct 10 18:02:59 2005 @@ -194,7 +194,7 @@ weekend. if all goes ok. seems stable thus far. //zak -sync todo-bugs to reality. //zak -2005 Oct 9 +10.9.05 -Fix output_rewrite rules to not add an extra space at the beginning of every line. //skullY -vanilla.m: Remove ^W map so switching windows with ^W alone is done quickly. @@ -203,7 +203,11 @@ 10.10.05 -big cleanup to tab.m. Remove old useless crap and insert the msg tab completion into our new switch. the old command_completion is now ripped out since it's marked obsolete and hasnt worked at all in epic5. //kreca - -2005 Oct 10 -Change all instances of echo to //echo, to allow echo to be aliased. //skullY --vanilla.m: alias echo to output ot the current window. +-vanilla.m: alias echo to output to the current window. //skullY +-audit all uses of xecho -v. Should only be used on things that really need + to goto the current window. Users that use window level none everywhere won't + notice any difference. //skullY +-resync to tree, i presume this is skullY's latest or 'tried to commit' //zak +-fix dating format. //zak + diff -aruN amn.orig/core/alias.m amn/core/alias.m --- amn.orig/core/alias.m Mon Oct 10 14:53:43 2005 +++ amn/core/alias.m Mon Oct 10 16:25:31 2005 @@ -136,15 +136,15 @@ alias indent orw alias orw { ^set -output_rewrite - ^set output_rewrite $_paste($1-)$1- - xecho -v [a+c] output indent set to "on" + ^set output_rewrite $_paste($1-) $1- + xecho -b output indent set to "on" } alias wrap orww alias orww { ^set -output_rewrite ^set output_rewrite $_paste($1-)$1- - xecho -v [a+c] output linewrap set to "on" + xecho -b output linewrap set to "on" } ## end output_rewrite sillyness. diff -aruN amn.orig/core/bans.m amn/core/bans.m --- amn.orig/core/bans.m Mon Oct 10 14:53:43 2005 +++ amn/core/bans.m Mon Oct 10 16:55:43 2005 @@ -110,24 +110,24 @@ } alias kob { if (![$0]) { - xecho -v [a+c] kick on ban set to "$kickonban"} + xecho -v -b kick on ban set to "$kickonban"} if (match($0 on off)) {@kickonban = [$0] - xecho -v [a+c] kick on ban set to "$kickonban" + xecho -v -b kick on ban set to "$kickonban" }{ if ([$0]&&!match($0 on off)) { - xecho -v [a+c] invalid choice + xecho -v -b invalid choice } } } alias kops { if (![$0]) { - xecho -v [a+c] kick ops on ban set to "$kickops"} + xecho -v -b kick ops on ban set to "$kickops"} if (match($0 on off)) {@kickops = [$0] - xecho -v [a+c] kick ops on ban set to "$kickops" + xecho -v -b kick ops on ban set to "$kickops" }{ if ([$0]&&!match($0 on off)) { - xecho -v [a+c] invalid choice + xecho -v -b invalid choice } } diff -aruN amn.orig/core/dcc.m amn/core/dcc.m --- amn.orig/core/dcc.m Sun Oct 2 23:02:22 2005 +++ amn/core/dcc.m Mon Oct 10 17:35:17 2005 @@ -31,7 +31,7 @@ ## hooks. on ^211 * { - xecho -v -b $1: Sent: ${[$4]/1024}MB Received: ${[$6]/1024}MB SendQ: $2 Connected for: $tdiff2($7) Idle: $8 [$9-] + xecho -b $1: Sent: ${[$4]/1024}MB Received: ${[$6]/1024}MB SendQ: $2 Connected for: $tdiff2($7) Idle: $8 [$9-] } ^on #-leave 123 "% % *" { @@ -42,8 +42,8 @@ on -dcc_request "% CHAT *" { push dccchats $0 - xecho -v [a+c] DCC $0 has sent a dcc chat request. - xecho -v [a+c] DCC Press alt-T to respond or alt-R to reject from $0. + xecho -b DCC $0 has sent a dcc chat request. + xecho -b DCC Press alt-T to respond or alt-R to reject from $0. } alias dcc.get { @@ -57,7 +57,7 @@ on #-dcc_request 22 "% SEND*" { @dccnick = [$0] @dccfile = [$5] - xecho -v [a+c] press ctrl-T to accept file or ctrl-R to reject + xecho -b press ctrl-T to accept file or ctrl-R to reject } on #-dcc_request 23 "% SEND*" { @@ -65,7 +65,7 @@ @dccfile = [$5] if (autoget == [on]) { ^dcc get $dccnick - xecho -v [a+c] autogetting dcc $dccfile from $dccnick + xecho -b autogetting dcc $dccfile from $dccnick } } @@ -77,14 +77,14 @@ alias dccag { if (![$0]) { - xecho -v [a+c] dcc autoget set to $toupper($autoget) + xecho -b dcc autoget set to $toupper($autoget) } if (match($0 on off)) { @autoget = [$0] - xecho -v [a+c] dcc autoget set to $toupper($autoget) + xecho -b dcc autoget set to $toupper($autoget) }{ if ([$0]&&!match($0 on off)) { - xecho -v [a+c] invalid choice + xecho -b invalid choice } } } @@ -93,25 +93,25 @@ alias dcchelp { if (!$[0]) { -echo ---------------------= Dcc Help =------------------------------ -echo chat /chat [-p portnum] will send or accept a dcc chat -echo to specified nick -p port is optional. -echo nochat /nochat will close/deny a dcc chat session to -echo specified nick. -echo send /send will send specified nick specified -echo filename. -echo get /get will grab file from specified nick. -echo dcc /dcc will list current dcc sessions if any. -echo dca /dca will kill all dcc sessions. -echo dcs /dcs will close file transfer from specified nick. -echo dcx /dcx will close chat session to specified nick. -echo dcn /dcn will close any dcc sessions to specified nick. -echo ---------------------= dcc keybinds =---------------------------- -echo alt-r : will reject dcc chat request. -echo alt-t : will accept dcc chat request. -echo ctrl-t : will accept dcc file/send request. -echo ctrl-r : will reject dcc file/send request. -echo ------------------------------------------------------------------ +//echo ---------------------= Dcc Help =------------------------------ +//echo chat /chat [-p portnum] will send or accept a dcc chat +//echo to specified nick -p port is optional. +//echo nochat /nochat will close/deny a dcc chat session to +//echo specified nick. +//echo send /send will send specified nick specified +//echo filename. +//echo get /get will grab file from specified nick. +//echo dcc /dcc will list current dcc sessions if any. +//echo dca /dca will kill all dcc sessions. +//echo dcs /dcs will close file transfer from specified nick. +//echo dcx /dcx will close chat session to specified nick. +//echo dcn /dcn will close any dcc sessions to specified nick. +//echo ---------------------= dcc keybinds =---------------------------- +//echo alt-r : will reject dcc chat request. +//echo alt-t : will accept dcc chat request. +//echo ctrl-t : will accept dcc file/send request. +//echo ctrl-r : will reject dcc file/send request. +//echo ------------------------------------------------------------------ } } diff -aruN amn.orig/core/ehelp.m amn/core/ehelp.m --- amn.orig/core/ehelp.m Mon Oct 10 14:53:43 2005 +++ amn/core/ehelp.m Mon Oct 10 17:34:39 2005 @@ -5,7 +5,7 @@ alias ehelp { if (!$[0]) { -echo -------------------------= Extended Help =---------------------------- +//echo -------------------------= Extended Help =---------------------------- //echo uhelp <userlist help> userlist help menu. [module] //echo shelp <shitlist help> shitlist help menu. [module] @@ -23,7 +23,7 @@ //echo dcchelp <dcc help> dcc usage/binds help menu. [core] //echo smhelp <special modes> exempt modes cmds help menu. [core] //echo thelp <trickle help> the irc swiss army knife menu. [core] -echo ---------------------------------------------------------------------- +//echo ---------------------------------------------------------------------- } } @@ -32,24 +32,24 @@ alias genhelp { if (!$[0]) { -echo ---------------------= General Usage Help =------------------------- -echo ign /ign [nick|nick!ident@host] [type] will ignore someone -echo type: can be 1 or more options of notice,msg,dcc,crap,public,all -echo tig /tig # removes specified ignore. -echo cig /cig to ignore public from current or specified channel. -echo umode /umode changes user mode. -echo ircname /ircname will change your realname on next connect. -echo arejoin /arejoin will toggle auto_rejoin on/off -echo aww /aww will toggle auto_whowas on/off -echo topic /topic will insert current topic for editing. -echo away /away set yourself away. -echo back /back set yourself back. -echo readlog /readlog reads away msgs. [requires away module] -echo remlog /remlog erase away msgs. [requires away module] -echo orignick /orignick will attempt to regain(jupe) specified nick -echo every 3 seconds(default) unless you specify time in /config. [orignick module] -echo staynick /staynick will cancel /orignick [orignick module] -echo --------------------------------------------------------------------- +//echo ---------------------= General Usage Help =------------------------- +//echo ign /ign [nick|nick!ident@host] [type] will ignore someone +//echo type: can be 1 or more options of notice,msg,dcc,crap,public,all +//echo tig /tig # removes specified ignore. +//echo cig /cig to ignore public from current or specified channel. +//echo umode /umode changes user mode. +//echo ircname /ircname will change your realname on next connect. +//echo arejoin /arejoin will toggle auto_rejoin on/off +//echo aww /aww will toggle auto_whowas on/off +//echo topic /topic will insert current topic for editing. +//echo away /away set yourself away. +//echo back /back set yourself back. +//echo readlog /readlog reads away msgs. [requires away module] +//echo remlog /remlog erase away msgs. [requires away module] +//echo orignick /orignick will attempt to regain(jupe) specified nick +//echo every 3 seconds(default) unless you specify time in /config. [orignick module] +//echo staynick /staynick will cancel /orignick [orignick module] +//echo --------------------------------------------------------------------- } } @@ -58,31 +58,31 @@ alias lfhelp { if (!$[0]) { -echo --------------------= Amnesiac Look/Feel Help =--------------------------- -echo config /config will list currently available configuration options -echo /config will change the specified option. -echo theme /theme will display available themes and you can choose which -echo one you want syn: /theme -echo format /format will display available format -echo /format will choose the specified format -echo sbcolor /sbcolor changes sbar colors -echo to desired colors. -echo color /color changes color to -echo desired colors. -echo tsave /tsave will create a theme. -echo untheme /untheme will make amnesiac revert back to the default theme. +//echo --------------------= Amnesiac Look/Feel Help =--------------------------- +//echo config /config will list currently available configuration options +//echo /config will change the specified option. +//echo theme /theme will display available themes and you can choose which +//echo one you want syn: /theme +//echo format /format will display available format +//echo /format will choose the specified format +//echo sbcolor /sbcolor changes sbar colors +//echo to desired colors. +//echo color /color changes color to +//echo desired colors. +//echo tsave /tsave will create a theme. +//echo untheme /untheme will make amnesiac revert back to the default theme. input_char "menu paused hit the ANY key to continue " pause -echo fset /fset format_choice will change specified format. -echo fkeys /fkeys shows which fkeys are bound to which and can be changed by -echo by /fkey 1 /fkey 2 -echo sbar /sbar changes sbar to desired number. -echo mw /mw -hidden|split|kill -echo extpub /extpub and <+nick> in public. -echo indent /indent will indent on newline as opposed to linewrap. -echo wrap /wrap will linewrap msgs/publics etc.. on newline <-- this is -echo the default behavior. -echo ---------------------------------------------------------------------------- +//echo fset /fset format_choice will change specified format. +//echo fkeys /fkeys shows which fkeys are bound to which and can be changed by +//echo by /fkey 1 /fkey 2 +//echo sbar /sbar changes sbar to desired number. +//echo mw /mw -hidden|split|kill +//echo extpub /extpub and <+nick> in public. +//echo indent /indent will indent on newline as opposed to linewrap. +//echo wrap /wrap will linewrap msgs/publics etc.. on newline <-- this is +//echo the default behavior. +//echo ---------------------------------------------------------------------------- } } @@ -90,23 +90,23 @@ alias chelp { if (!$[0]) { -echo ---------------------= Amnesiac Config Shortcuts =----------------------- -echo cumode /cumode will set default usermode on connect. -echo stamp /stamp -echo modeshow /modeshow and <+nick> in public. -echo extpub /extpub same as /modeshow -echo resp /resp will highlight nick when specified word is said in -echo public. /resp /resp2 /resp3 /resp4 -echo kops /kops -echo kob /kob -echo otime /otime -echo awayt /awayt -echo tform /tform will display available timestamp formats and you can -echo choose which one you want syn: /tform -echo autoget /autoget will attempt to grab files sent to you automatically. -echo bantype /bantype when a ban is done on a nick -echo it uses -echo ------------------------------------------------------------------------- +//echo ---------------------= Amnesiac Config Shortcuts =----------------------- +//echo cumode /cumode will set default usermode on connect. +//echo stamp /stamp +//echo modeshow /modeshow and <+nick> in public. +//echo extpub /extpub same as /modeshow +//echo resp /resp will highlight nick when specified word is said in +//echo public. /resp /resp2 /resp3 /resp4 +//echo kops /kops +//echo kob /kob +//echo otime /otime +//echo awayt /awayt +//echo tform /tform will display available timestamp formats and you can +//echo choose which one you want syn: /tform +//echo autoget /autoget will attempt to grab files sent to you automatically. +//echo bantype /bantype when a ban is done on a nick +//echo it uses +//echo ------------------------------------------------------------------------- } } diff -aruN amn.orig/core/eimodes.m amn/core/eimodes.m --- amn.orig/core/eimodes.m Mon Oct 10 14:53:43 2005 +++ amn/core/eimodes.m Mon Oct 10 17:35:25 2005 @@ -225,22 +225,22 @@ alias rathelp { if (!$[0]) { -echo -----------------= Special Modes Help =---------------------------- -echo tpi /tpi invite exempt menu -I ie: /tpi 3-6 removes -echo invite exempts 3 4 5 and 6 shown in the menu. -echo tpe /tpe ban exempt menu +e ie: /tpe 4 to remove one exempt. -echo ui /ui clears the invite exempts in current chan -IIII. -echo ue /ue clears the ban exempts in current chan -eeee. -echo i /i shows the invite exempts in current chan if any. -echo e /e shows the ban exempts in current chan if any. -echo +i /+i add a invite exempt in current chan ie: /+i *!test@test.com -echo +e /+e add a ban exempt in current chan ie: /+e *!ident@host.com -echo -----= Other Aliases =---- -echo pinv /pinv - same as /ui cleans invite exempt list. -echo pexp /pexp - same as /ue cleans ban exempt list. -echo tinv /tinv - same as /tpi invite exempt menu. -echo texp /texp - same as /tpe ban exempt menu. -echo --------------------------------------------------------------------- +//echo -----------------= Special Modes Help =---------------------------- +//echo tpi /tpi invite exempt menu -I ie: /tpi 3-6 removes +//echo invite exempts 3 4 5 and 6 shown in the menu. +//echo tpe /tpe ban exempt menu +e ie: /tpe 4 to remove one exempt. +//echo ui /ui clears the invite exempts in current chan -IIII. +//echo ue /ue clears the ban exempts in current chan -eeee. +//echo i /i shows the invite exempts in current chan if any. +//echo e /e shows the ban exempts in current chan if any. +//echo +i /+i add a invite exempt in current chan ie: /+i *!test@test.com +//echo +e /+e add a ban exempt in current chan ie: /+e *!ident@host.com +//echo -----= Other Aliases =---- +//echo pinv /pinv - same as /ui cleans invite exempt list. +//echo pexp /pexp - same as /ue cleans ban exempt list. +//echo tinv /tinv - same as /tpi invite exempt menu. +//echo texp /texp - same as /tpe ban exempt menu. +//echo --------------------------------------------------------------------- } } diff -aruN amn.orig/core/fkey.m amn/core/fkey.m --- amn.orig/core/fkey.m Sun Oct 2 23:03:33 2005 +++ amn/core/fkey.m Mon Oct 10 16:27:29 2005 @@ -13,117 +13,117 @@ switch ($0) { (1) { if (![$1]) { - xecho -v [a+c] function key 1 set to $fke1 + xecho -b function key 1 set to $fke1 }{ @fke1 = [$1-] ^bind ^[[11~ parse_command $fke1 ^bind ^[[[A parse_command $fke1 ^bind ^[OP parse_command $fke1 - xecho -v [a+c] function key 1 set to $fke1 + xecho -b function key 1 set to $fke1 } } (2) { if (![$1]) { - xecho -v [a+c] function key 2 set to $fke2 + xecho -b function key 2 set to $fke2 }{ @fke2 = [$1-] ^bind ^[[12~ parse_command $fke2 ^bind ^[[[B parse_command $fke2 ^bind ^[OQ parse_command $fke2 - xecho -v [a+c] function key 2 set to $fke2 + xecho -b function key 2 set to $fke2 } } (3) { if (![$1]) { - xecho -v [a+c] function key 3 set to $fke3 + xecho -b function key 3 set to $fke3 }{ @fke3 = [$1-] ^bind ^[[13~ parse_command $fke3 ^bind ^[[[C parse_command $fke3 ^bind ^[OR parse_command $fke3 - xecho -v [a+c] function key 3 set to $fke3 + xecho -b function key 3 set to $fke3 } } (4) { if (![$1]) { - xecho -v [a+c] function key 4 set to $fke4 + xecho -b function key 4 set to $fke4 }{ @fke4 = [$1-] ^bind ^[[14~ parse_command $fke4 ^bind ^[[[D parse_command $fke4 ^bind ^[OS parse_command $fke4 - xecho -v [a+c] function key 4 set to $fke4 + xecho -b function key 4 set to $fke4 }} (5) { if (![$1]) { - xecho -v [a+c] function key 5 set to $fke5 + xecho -b function key 5 set to $fke5 }{ @fke5 = [$1-] ^bind ^[[15~ parse_command $fke5 ^bind ^[[[E parse_command $fke5 - xecho -v [a+c] function key 5 set to $fke5 + xecho -b function key 5 set to $fke5 }} (6) { if (![$1]) { - xecho -v [a+c] function key 6 set to $fke6 + xecho -b function key 6 set to $fke6 }{ @fke6 = [$1-] ^bind ^[[17~ parse_command $fke6 - xecho -v [a+c] function key 6 set to $fke6 + xecho -b function key 6 set to $fke6 }} (7) { if (![$1]) { - xecho -v [a+c] function key 7 set to $fke7 + xecho -b function key 7 set to $fke7 }{ @fke7 = [$1-] ^bind ^[[18~ parse_command $fke7 - xecho -v [a+c] function key 7 set to $fke7 + xecho -b function key 7 set to $fke7 }} (8) { if (![$1]) { - xecho -v [a+c] function key 8 set to $fke8 + xecho -b function key 8 set to $fke8 }{ @fke8 = [$1-] ^bind ^[[19~ parse_command $fke8 - xecho -v [a+c] function key 8 set to $fke8 + xecho -b function key 8 set to $fke8 }} (9) { if (![$1]) { - xecho -v [a+c] function key 9 set to $fke9 + xecho -b function key 9 set to $fke9 }{ @fke9 = [$1-] ^bind ^[[20~ parse_command $fke9 - xecho -v [a+c] function key 9 set to $fke9 + xecho -b function key 9 set to $fke9 }} (10) { if (![$1]) { - xecho -v [a+c] function key 10 set to $fke10 + xecho -b function key 10 set to $fke10 }{ @fke10 = [$1-] ^bind ^[[21~ parse_command $fke10 - xecho -v [a+c] function key 10 set to $fke10 + xecho -b function key 10 set to $fke10 }} (11) { if (![$1]) { - xecho -v [a+c] function key 11 set to $fke11 + xecho -b function key 11 set to $fke11 }{ @fke11 = [$1-] ^bind ^[[23~ parse_command $fke11 - xecho -v [a+c] function key 11 set to $fke11 + xecho -b function key 11 set to $fke11 }} (12) { if (![$1]) { - xecho -v [a+c] function key 12 set to $fke12 + xecho -b function key 12 set to $fke12 }{ @fke12 = [$1-] ^bind ^[[24~ parse_command $fke12 - xecho -v [a+c] function key 12 set to $fke12 + xecho -b function key 12 set to $fke12 }} } } diff -aruN amn.orig/core/format.m amn/core/format.m --- amn.orig/core/format.m Mon Oct 10 14:53:43 2005 +++ amn/core/format.m Mon Oct 10 16:32:25 2005 @@ -46,10 +46,10 @@ if (isnumber($0)&&[$0] to set msg format - xecho -v -b current format set to $mform + xecho -b /format a to set msg format + xecho -b current format set to $mform @format_msg = getitem(mform $mform) } @@ -73,10 +73,10 @@ if (isnumber($0)&&[$0] to set send msg format - xecho -v -b current format set to $smform + xecho -b /format b to set send msg format + xecho -b current format set to $smform @format_send_msg=getitem(smform $smform) } @@ -102,10 +102,10 @@ if (isnumber($0)&&[$0] to set public format - xecho -v -b current format set to $pubform + xecho -b /format c to set public format + xecho -b current format set to $pubform @format_public=getitem(pubform $pubform) } @@ -131,10 +131,10 @@ if (isnumber($0)&&[$0] to set send public format - xecho -v -b current format set to $spubform + xecho -b /format d to set send public format + xecho -b current format set to $spubform @format_send_public=getitem(spubform $spubform) } @@ -160,10 +160,10 @@ if (isnumber($0)&&[$0] to set public other format - xecho -v -b current format set to $spuboform + xecho -b /format e to set public other format + xecho -b current format set to $spuboform @format_public_other=getitem(spuboform $spuboform) } @@ -190,10 +190,10 @@ if (isnumber($0)&&[$0] to set signoff format - xecho -v -b current format set to $signform + xecho -b /format f to set signoff format + xecho -b current format set to $signform @format_signoff=getitem(signform $signform) } @@ -220,10 +220,10 @@ if (isnumber($0)&&[$0] to set join format - xecho -v -b current format set to $joinform + xecho -b /format g to set join format + xecho -b current format set to $joinform @format_join=getitem(joinform $joinform) } @@ -250,10 +250,10 @@ if (isnumber($0)&&[$0] to set leaveoff format - xecho -v -b current format set to $leaveform + xecho -b /format h to set leaveoff format + xecho -b current format set to $leaveform @format_leave=getitem(leaveform $leaveform) } @@ -279,10 +279,10 @@ if (isnumber($0)&&[$0] to set modeoff format - xecho -v -b current format set to $modeform + xecho -b /format i to set modeoff format + xecho -b current format set to $modeform @format_mode=getitem(modeform $modeform) } @@ -308,10 +308,10 @@ if (isnumber($0)&&[$0] to set notice format - xecho -v -b current format set to $notform + xecho -b /format j to set notice format + xecho -b current format set to $notform @format_notice = getitem(notform $notform) } alias pubnotform if ([$0]) { if (isnumber($0)&&[$0] to set public notice format - xecho -v -b current format set to $pubnotform + xecho -b /format z to set public notice format + xecho -b current format set to $pubnotform @format_public_notice=getitem(pubnotform $pubnotform) } @@ -364,10 +364,10 @@ if (isnumber($0)&&[$0] to set send notice format - xecho -v -b current format set to $snotform + xecho -b /format k to set send notice format + xecho -b current format set to $snotform @format_send_notice=getitem(snotform $snotform) } @@ -395,10 +395,10 @@ if (isnumber($0)&&[$0] to set send dcc chat format - xecho -v -b current format set to $sdcform + xecho -b /format l to set send dcc chat format + xecho -b current format set to $sdcform @ format_send_dcc_chat = getitem(sdcform $sdcform) } @@ -425,10 +425,10 @@ if (isnumber($0)&&[$0] to set dcc chat format - xecho -v -b current format set to $dcform + xecho -b /format m to set dcc chat format + xecho -b current format set to $dcform @format_dcc_chat=getitem(dcform $dcform) } @@ -455,10 +455,10 @@ if (isnumber($0)&&[$0] to set topic format - xecho -v -b current format set to $topform + xecho -b /format n to set topic format + xecho -b current format set to $topform @format_topic=getitem(topform $topform) } @@ -485,10 +485,10 @@ if (isnumber($0)&&[$0] to set ctcp format - xecho -v -b current format set to $ctcpform + xecho -b /format o to set ctcp format + xecho -b current format set to $ctcpform @format_ctcp=getitem(ctcpform $ctcpform) } @@ -516,10 +516,10 @@ if (isnumber($0)&&[$0] to set send ctcp format - xecho -v -b current format set to $sctcpform + xecho -b /format p to set send ctcp format + xecho -b current format set to $sctcpform @format_send_ctcp=getitem(sctcpform $sctcpform) } @@ -547,11 +547,11 @@ if (isnumber($0)&&[$0] to set echostr - xecho -v -b current format set to $echostr + xecho -b /format q to set echostr + xecho -b current format set to $echostr } alias ncomp if ([$0]) { if (isnumber($0)&&[$0]%n") kreca$format_nick_comp hi! - xecho -v -b this is your new nick completion, /fsave to save. + xecho -b this is your new nick completion, /fsave to save. @ncomp = [$0] }{ - xecho -v -b please make a valid selection. + xecho -b please make a valid selection. } }{ ncomp.show @@ -594,10 +594,10 @@ alias ncomp.show { for (@nc=1, nc < numitems(ncomp), @nc++) { @format_nick_comp=getitem(ncomp $nc) - xecho -v -b $Cparse("%K[%n$([2]nc)%K]%n %K<%ncrapple%K>%n") kreca$format_nick_comp hi! + xecho -b $Cparse("%K[%n$([2]nc)%K]%n %K<%ncrapple%K>%n") kreca$format_nick_comp hi! } - xecho -v -b /format r to set nick completion - xecho -v -b current format set to $ncomp + xecho -b /format r to set nick completion + xecho -b current format set to $ncomp @format_nick_comp=getitem(ncomp $ncomp) } @@ -606,10 +606,10 @@ if (isnumber($0)&&[$0] to set version format - xecho -v -b current format set to $svform + xecho -b /format s to set version format + xecho -b current format set to $svform @format_sv=getitem(svform $svform) } @@ -638,11 +638,11 @@ @format_wall=getitem(wallform $0) @format_bwall=getitem(bwallform $0) //echo $fparse(format_wall crapple #amnesiac hi) - xecho -v -b this is your new wall format, /fsave to save. + xecho -b this is your new wall format, /fsave to save. @wallform = [$0] @bwallform = [$0] }{ - xecho -v -b please make a valid selection. + xecho -b please make a valid selection. } }{ wallform.show @@ -660,10 +660,10 @@ for (@mm=1, mm < numitems(wallform), @mm++) { @format_wall = getitem(wallform $mm) @format_bwall = getitem(bwallform $mm) - xecho -v -b $Cparse(%K[%n$mm%K]%n) $fparse(format_wall crapple #amnesiac hi) + xecho -b $Cparse(%K[%n$mm%K]%n) $fparse(format_wall crapple #amnesiac hi) } - xecho -v -b /format v to set wall format - xecho -v -b current format set to $wallform + xecho -b /format v to set wall format + xecho -b current format set to $wallform @format_wall=getitem(wallform $wallform) @format_bwall=getitem(bwallform $bwallform) } @@ -672,10 +672,10 @@ if (isnumber($0)&&[$0] to set away format - xecho -v -b current format set to $awayform + xecho -b /format w to set away format + xecho -b current format set to $awayform @format_away = getitem(awayform $awayform) } alias actform if ([$0]) { @@ -703,11 +703,11 @@ @format_action_other=getitem(actoform $0) //echo $fparse(format_action crapple #amnesiac hi) //echo $fparse(format_action_other crapple #amnesiac hi) - xecho -v -b this is your new action format, /fsave to save. + xecho -b this is your new action format, /fsave to save. @actform = [$0] @actoform = [$0] }{ - xecho -v -b please make a valid selection. + xecho -b please make a valid selection. } }{ actform.show @@ -725,12 +725,12 @@ for (@mm=1, mm < numitems(actform), @mm++) { @format_action=getitem(actform $mm) @format_action_other=getitem(actoform $mm) - xecho -v -b $Cparse(%K[%n$mm%K]%n) $fparse(format_action crapple #amnesiac hi) - xecho -v -b $fparse(format_action_other crapple #amnesiac hi) + xecho -b $Cparse(%K[%n$mm%K]%n) $fparse(format_action crapple #amnesiac hi) + xecho -b $fparse(format_action_other crapple #amnesiac hi) } - xecho -v -b /format x to set action format - xecho -v -b current format set to $actform + xecho -b /format x to set action format + xecho -b current format set to $actform @format_action=getitem(actform $actform) @format_action_other=getitem(actoform $actoform) } @@ -740,11 +740,11 @@ @format_send_desc=getitem(sdescform $0) //echo $fparse(format_desc crapple blah hi) //echo $fparse(format_send_desc crapple #amnesiac hi) - xecho -v -b this is your new describe format, /fsave to save. + xecho -b this is your new describe format, /fsave to save. @descform = [$0] @sdescform = [$0] }{ - xecho -v -b please make a valid selection. + xecho -b please make a valid selection. } }{ xdescform.show @@ -762,12 +762,12 @@ for (@mm=1, mm < numitems(descform), @mm++) { @format_desc = getitem(descform $mm) @format_send_desc = getitem(sdescform $mm) - xecho -v -b $Cparse(%K[%n$mm%K]%n) $fparse(format_desc crapple blah hi) - xecho -v -b $fparse(format_send_desc crapple #amnesiac hi) + xecho -b $Cparse(%K[%n$mm%K]%n) $fparse(format_desc crapple blah hi) + xecho -b $fparse(format_send_desc crapple #amnesiac hi) } - xecho -v -b /format y to set describe format - xecho -v -b current format set to $descform + xecho -b /format y to set describe format + xecho -b current format set to $descform @format_desc=getitem(descform $descform) @format_send_desc=getitem(sdescform $sdescform) @@ -778,11 +778,11 @@ @format_who_footer=getitem(whofootform $0) //echo $fparse(format_who #amnesiac skullY H@ zwhite front.arpa.org irc.servercentral.net 0 The Work is Done and Then Forgotten) //echo $fparse(format_who_footer irc.servercentral.net skully :End of /WHO list. - xecho -v -b this is your new who format, /fsave to save. + xecho -b this is your new who format, /fsave to save. @whoform = [$0] @whofootform = [$0] }{ - xecho -v -b please make a valid selection. + xecho -b please make a valid selection. } }{ whoform.show @@ -799,11 +799,11 @@ alias whoform.show { for (@mm=1, mm < numitems(whoform), @mm++) { @format_who=getitem(whoform $mm) - xecho -v $Cparse(%K[%n$mm%K]%n) $fparse(format_who #amnesiac skullY H@ zwhite front.arpa.org irc.servercentral.net 0 The Work is Done and Then Forgotten) + xecho -b $fparse(format_who #amnesiac skullY H@ zwhite front.arpa.org irc.servercentral.net 0 The Work is Done and Then Forgotten) } - xecho -v -- /format 2 to set who format - xecho -v current format set to $whoform + xecho -b /format 2 to set who format + xecho -b format set to $whoform @format_who=getitem(whoform $whoform) } @@ -812,10 +812,10 @@ if (isnumber($0)&&[$0] to set nick change format - xecho -v -b current format set to $nickform + xecho -b /format u to set nick change format + xecho -b current format set to $nickform @format_nickname=getitem(nickform $nickform) } @@ -841,10 +841,10 @@ if (isnumber($0)&&[$0]%n timestamp in public format example.) + xecho -b $Cparse(%K[%n$mm%K]%n) $fparse(format_timestamp_some)$cparse(%m<%ncrapple%m>%n timestamp in public format example.) } - xecho -v -b /format 3 to set time stamp format - xecho -v -b current format set to $timeform + xecho -b /format 3 to set time stamp format + xecho -b current format set to $timeform @format_timestamp_some=getitem(timeform $timeform) } @@ -869,10 +869,10 @@ if (isnumber($0)&&[$0] to set kick format - xecho -v -b current format set to $kickform + xecho -b /format 4 to set kick format + xecho -b current format set to $kickform @format_kick=getitem(kickform $kickform) } diff -aruN amn.orig/core/fsets.m amn/core/fsets.m --- amn.orig/core/fsets.m Mon Oct 10 14:53:43 2005 +++ amn/core/fsets.m Mon Oct 10 16:56:39 2005 @@ -7,16 +7,16 @@ if ([$0]) { if (!pattern(*$0* $fwords)) { banner.lchead - banner.mid [a+c] $0 format not found + banner.mid $banner $0 format not found banner.lcfoot }{ if (pattern(*$0* $fwords) && [$1]) { @format_choice=[$after(_ $0)] @format_$after(_ $0)=[$1-] - xecho -v [a+c] fset $0 changed to $1- + xecho -b fset $0 changed to $1- }{ fe ($pattern(*$0* $fwords)) a1 { - xecho -v [a+c] $[31]a1 ...... $($a1) + xecho -b $[31]a1 ...... $($a1) } } } @@ -170,39 +170,39 @@ on ^311 * { if (format_whois_header) { - xecho -v $fparse(format_whois_header) + xecho $fparse(format_whois_header) } - xecho -v $fparse(format_whois_nick $1 $2 $3 $5-) + xecho $fparse(format_whois_nick $1 $2 $3 $5-) if (format_whois_name) { - xecho -v $fparse(format_whois_name $5-) + xecho $fparse(format_whois_name $5-) } } -on ^319 * xecho -v $fparse(format_whois_channels $2-) -on ^312 * xecho -v $fparse(format_whois_server $2 $3-) -on ^301 * xecho -v $fparse(format_whois_away $1-) +on ^319 * xecho $fparse(format_whois_channels $2-) +on ^312 * xecho $fparse(format_whois_server $2 $3-) +on ^301 * xecho $fparse(format_whois_away $1-) on ^317 * { - xecho -v $fparse(format_whois_idle $2) - xecho -v $fparse(format_whois_signon $1 $stime($3)) + xecho $fparse(format_whois_idle $2) + xecho $fparse(format_whois_signon $1 $stime($3)) } on ^318 * { if (format_whois_footer) { - xecho -v $fparse(format_whois_footer) + xecho $fparse(format_whois_footer) } } on ^314 * { - xecho -v $fparse(format_whowas_header) - xecho -v $fparse(format_whowas_nick $1 $2 $3) - xecho -v $fparse(format_whowas_name $5-) + xecho $fparse(format_whowas_header) + xecho $fparse(format_whowas_nick $1 $2 $3) + xecho $fparse(format_whowas_name $5-) } on ^338 * { - xecho -v $fparse(format_whois_actual $*) + xecho $fparse(format_whois_actual $*) } on ^330 * { - xecho -v $fparse(format_whois_login $*) + xecho $fparse(format_whois_login $*) } on ^308 * { - xecho -v $fparse(format_whois_admin $1-) + xecho $fparse(format_whois_admin $1-) } on ^313 * { @@ -235,16 +235,16 @@ @ rcl.25 = ['s face is more plastic than flesh] $rcl[$rand(26)] ^randcl -xecho -v $fparse(format_whois_operator $1 $rcl[$rand(26)]) +xecho $fparse(format_whois_operator $1 $rcl[$rand(26)]) } ^on ^401 * { - xecho -v $fparse(format_whois_header) - xecho -v $fparse(format_whois_unknown $1) + xecho $fparse(format_whois_header) + xecho $fparse(format_whois_unknown $1) } ^on ^369 * { - xecho -v $fparse(format_whowas_footer) + xecho $fparse(format_whowas_footer) } ^on ^406 * { - xecho -v $fparse(format_whowas_header) - xecho -v $fparse(format_whowas_unknown $1) + xecho $fparse(format_whowas_header) + xecho $fparse(format_whowas_unknown $1) } diff -aruN amn.orig/core/help.m amn/core/help.m --- amn.orig/core/help.m Mon Oct 10 14:53:43 2005 +++ amn/core/help.m Mon Oct 10 16:57:40 2005 @@ -133,11 +133,11 @@ if ([$0]) { if (!match($0 $hwords)) { banner.head - //echo [a+c] command: $0 not found + xecho -b command: $0 not found banner.foot }{ banner.head - //echo $cparse("$($*)") + //echo $cparse("$($*)") banner.foot } } diff -aruN amn.orig/core/lag.m amn/core/lag.m --- amn.orig/core/lag.m Sun Oct 2 23:05:56 2005 +++ amn/core/lag.m Mon Oct 10 16:37:52 2005 @@ -37,7 +37,7 @@ alias do.pong { ^on #^pong 10 "*" { if ([$0] == svar ^^ [$0] == [$svar1]) { - xecho -v -b your lag to $0 is: ${time() - pblah} second(s) + xecho -b your lag to $0 is: ${time() - pblah} second(s) ^on #^pong 10 -"*" } } diff -aruN amn.orig/core/lusers.m amn/core/lusers.m --- amn.orig/core/lusers.m Mon Oct 10 14:53:43 2005 +++ amn/core/lusers.m Mon Oct 10 16:38:15 2005 @@ -53,17 +53,17 @@ ^assign _lu.umd $2, ^set floating_point_math on # next two lines don't make the new math parser bitch. -skullY - xecho -v $(hblk)[$cparse($(c2)³)$(hblk)] $cparse($(c2)g)$cparse($(c1)lobal users)$(hblk).. $(cl)$[6]_lu.u max$(c.hk) $(cl)$[7]_lu.umd $cparse($(c1)\()$(cl)$_lu.i invisible, $_lu.o operators$cparse($(c1)\)) - xecho -v $(hblk)[$cparse($(c1)³)$(hblk)] $cparse($(c2)l)$cparse($(c1)ocal users)$(hblk)... $(cl)$[6]_lu.lu max$(c.hk) $(cl)$[7]_lu.lumd $cparse($(c1)\()$(cl)$trunc(5 ${100 * (_lu.lu / _lu.u)})\%$cparse($(c1)\)) - xecho -v $(hblk)[$cparse($(c1)³)$(hblk)] $cparse($(c2)s)$cparse($(c1)ervers)$(hblk)....... $(cl)$[6]_lu.s $cparse($(c1)\()$(cl)$trunc(2 ${_lu.u / _lu.s}) avg users per server$cparse($(c1)\)) - xecho -v $(hblk)[$cparse($(c1)³)$(hblk)] $cparse($(c2)c)$cparse($(c1)hannels)$(hblk)...... $(cl)$[6]_lu.c $cparse($(c1)\()$(cl)$trunc(2 ${_lu.u / _lu.c}) avg users per channel$cparse($(c1)\)) + xecho $(hblk)[$cparse($(c2)³)$(hblk)] $cparse($(c2)g)$cparse($(c1)lobal users)$(hblk).. $(cl)$[6]_lu.u max$(c.hk) $(cl)$[7]_lu.umd $cparse($(c1)\()$(cl)$_lu.i invisible, $_lu.o operators$cparse($(c1)\)) + xecho $(hblk)[$cparse($(c1)³)$(hblk)] $cparse($(c2)l)$cparse($(c1)ocal users)$(hblk)... $(cl)$[6]_lu.lu max$(c.hk) $(cl)$[7]_lu.lumd $cparse($(c1)\()$(cl)$trunc(5 ${100 * (_lu.lu / _lu.u)})\%$cparse($(c1)\)) + xecho $(hblk)[$cparse($(c1)³)$(hblk)] $cparse($(c2)s)$cparse($(c1)ervers)$(hblk)....... $(cl)$[6]_lu.s $cparse($(c1)\()$(cl)$trunc(2 ${_lu.u / _lu.s}) avg users per server$cparse($(c1)\)) + xecho $(hblk)[$cparse($(c1)³)$(hblk)] $cparse($(c2)c)$cparse($(c1)hannels)$(hblk)...... $(cl)$[6]_lu.c $cparse($(c1)\()$(cl)$trunc(2 ${_lu.u / _lu.c}) avg users per channel$cparse($(c1)\)) } on ^250 * { - xecho -v $(hblk)[$cparse($(c1)³)$(hblk)] $cparse($(c2)c)$cparse($(c1)onnect count)$(hblk)..$(cl)$4 $5 $6 $7 $9 + xecho $(hblk)[$cparse($(c1)³)$(hblk)] $cparse($(c2)c)$cparse($(c1)onnect count)$(hblk)..$(cl)$4 $5 $6 $7 $9 } on ^253 * { - xecho -v $(hblk)[$cparse($(c1)³)$(hblk)] $cparse($(c2)u)$cparse($(c1)nknown)$(hblk)........$(cl)$1 $2 $3 + xecho $(hblk)[$cparse($(c1)³)$(hblk)] $cparse($(c2)u)$cparse($(c1)nknown)$(hblk)........$(cl)$1 $2 $3 } diff -aruN amn.orig/core/mod.m amn/core/mod.m --- amn.orig/core/mod.m Mon Oct 10 14:53:43 2005 +++ amn/core/mod.m Mon Oct 10 17:35:35 2005 @@ -8,8 +8,8 @@ alias addmod { if (![$0]) { - xecho -v [a+c] syn: /addmod module1,module2,etc.. - xecho -v [a+c] valid modules are [$_modules] + xecho -b syn: /addmod module1,module2,etc.. + xecho -b valid modules are [$_modules] }{ @_ach=sar(g/,/ /$0) if ([$0]==[*]) { @@ -19,7 +19,7 @@ @setitem(_mods $numitems(_mods) $a1) ^load $(loadpath)modules/$(a1)/$(a1).m } - xecho -v [a+c] loaded modules $_modules + xecho -b loaded modules $_modules }{ fe ($_ach) n1 { if (match($n1 $_modules) > 0 && finditem(_mods $n1) < 0) { @@ -28,11 +28,11 @@ ^load $(loadpath)modules/$(n1)/$(n1).m ^push _mlist $n1 }{ - xecho -v [a+c] $n1 module not found or already loaded. + xecho -b $n1 module not found or already loaded. } } if (_mlist) { - xecho -v [a+c] $_mlist module(s) loaded. + xecho -b $_mlist module(s) loaded. } ^assign -_mlist } @@ -41,7 +41,7 @@ alias listmod { if (numitems(_mods) == 1) { - xecho -v [a+c] no modules current on list + xecho -b no modules current on list }{ eval aecho ----------------------= Modules Loaded =------------------ for (@xx=1, xx and <+nick> in public set to $0 + xecho -b showing <@nick> and <+nick> in public set to $0 }{ - xecho -v [a+c] extpub/modeshow set to $showop + xecho -b extpub/modeshow set to $showop } } diff -aruN amn.orig/core/more.m amn/core/more.m --- amn.orig/core/more.m Sun Oct 2 23:08:51 2005 +++ amn/core/more.m Mon Oct 10 16:38:45 2005 @@ -24,7 +24,7 @@ @ done = 1 } { - xecho -v $ugh + xecho $ugh } } if (!done) @@ -37,13 +37,13 @@ @ fd = line = done = rows = pause = ugh = [] } { - xecho -b -v $0\: no such file. + xecho -b $0\: no such file. } } { - xecho -b -v syn: /more + xecho -b syn: /more } } #archon'96 -oof \ No newline at end of file +oof diff -aruN amn.orig/core/save.m amn/core/save.m --- amn.orig/core/save.m Sun Oct 2 23:10:44 2005 +++ amn/core/save.m Mon Oct 10 16:39:21 2005 @@ -54,7 +54,7 @@ @write($savemt @_r3 = [$_r3]) @write($savemt @_r4 = [$_r4]) @close($savemt) - xecho -v [a+c] (core).. settings saved to $savefile + xecho -b (core).. settings saved to $savefile } @@ -112,7 +112,7 @@ @write($fsetsavemt ^sfset format_who_footer $format_who_footer) */ @close($fsetsavemt) - xecho -v [a+c] (core).. fset settings saved to $(savepath)$fsetsavefile + xecho -b (core).. fset settings saved to $(savepath)$fsetsavefile } alias fsave { @fsavefile=[$(savepath).a.fsave] @@ -156,7 +156,7 @@ @write($savemt @_whois = [$_whois]) @close($savemt) - xecho -v [a+c] (core).. format settings saved to $fsavefile + xecho -b (core).. format settings saved to $fsavefile } alias csave { @@ -174,7 +174,7 @@ @write($savemt @sc3 = [$sc3) @write($savemt @sc4 = [$sc4) @close($savemt) - xecho -v [a+c] (core).. color settings saved to $csavefile + xecho -b (core).. color settings saved to $csavefile } alias igsave { @@ -185,7 +185,7 @@ @ write($saveig ^ignore $_igmasks $igtype($_igmasks)) } @close($saveig) - xecho -v [a+c] (core).. ignores saved to $igsfile + xecho -b (core).. ignores saved to $igsfile } alias saveall { diff -aruN amn.orig/core/sbar.m amn/core/sbar.m --- amn.orig/core/sbar.m Sun Oct 2 23:10:55 2005 +++ amn/core/sbar.m Mon Oct 10 16:39:38 2005 @@ -13,10 +13,10 @@ if (statbar == [stat.3]) { ^sip2 } - xecho -v -b $scriptname sbar set to $0 - xecho -v [a+c] type /asave to save status bar + xecho -b $scriptname sbar set to $0 + xecho -b type /asave to save status bar }{ - xecho -v [a+c] syn: /sbar <1-$(sbar.max)> current sbar is ${hwht}$after(. $statbar) + xecho -b syn: /sbar <1-$(sbar.max)> current sbar is ${hwht}$after(. $statbar) } oof diff -aruN amn.orig/core/scan.m amn/core/scan.m --- amn.orig/core/scan.m Sun Oct 2 23:11:18 2005 +++ amn/core/scan.m Mon Oct 10 16:39:43 2005 @@ -206,6 +206,6 @@ (5) {@snf=5;^eval load ${loadpath}sc/scan.5} (6) {@snf=6;^eval load ${loadpath}sc/scan.6} } - xecho -v [a+c] scan format set to $(snf) + xecho -b scan format set to $(snf) } oof diff -aruN amn.orig/core/theme.m amn/core/theme.m --- amn.orig/core/theme.m Mon Oct 10 14:53:43 2005 +++ amn/core/theme.m Mon Oct 10 16:40:00 2005 @@ -64,7 +64,7 @@ @ write($saveth @sc3=[$sc3) @ write($saveth @sc4=[$sc4) @ close($saveth) - xecho -v [a+c]: saved theme file [$(loadpath)themes/$(name).th] $desc + xecho -b saved theme file [$(loadpath)themes/$(name).th] $desc ^load $(loadpath)themes/$(name).th ^eval load $(loadpath)core/fsets.m ^eval load $(loadpath)core/arrays.m @@ -72,7 +72,7 @@ ^getusers }{ -xecho -v -b $scriptname usage: /tsave +xecho -b $scriptname usage: /tsave } # thanks to ttb for some original help w/ read(), but it still didn't work :P @@ -87,27 +87,27 @@ @ close($thfile) //echo $[10]name $[12]auth $desc$repeat(${20-strlen($strip( $stripansicodes($desc)))} ) } - xecho -v [a+c] current theme is $scdesc + xecho -b current theme is $scdesc }{ -if (fexist($(loadpath)themes/$0.th)==-1) { xecho -v [a+c] theme $0 does not exist }{ +if (fexist($(loadpath)themes/$0.th)==-1) { xecho -b theme $0 does not exist }{ @ name = [$0] ^load $(loadpath)themes/$(0).th ^eval load $(loadpath)core/fsets.m ^eval load $(loadpath)core/arrays.m ^update.f ^getusers - xecho -v [a+c] loaded theme file [$(0).th] by $auth $desc + xecho -b loaded theme file [$(0).th] by $auth $desc } } -alias untheme { @name=[];@scdesc=[];xecho -v -b $scriptname: no longer using a theme;fsave +alias untheme { @name=[];@scdesc=[];xecho -b $scriptname: no longer using a theme;fsave }[C alias rtheme if ([$0]) { -if (fexist($(loadpath)themes/$0.th)==-1) { xecho -v [a+c] theme $(0) does not exist! +if (fexist($(loadpath)themes/$0.th)==-1) { xecho -b theme $(0) does not exist! }{ ^exec rm -rf $(loadpath)themes/$(0).th 1> /dev/null 2> /dev/null -xecho -v [a+c] theme $(0) has been removed! -}}{xecho -v [a+c] usage: /rtheme } +xecho -b theme $(0) has been removed! +}}{xecho -b usage: /rtheme } ## kreca/crapple 05 ## clogic '98 diff -aruN amn.orig/core/trickle.m amn/core/trickle.m --- amn.orig/core/trickle.m Sun Oct 2 23:12:33 2005 +++ amn/core/trickle.m Mon Oct 10 17:35:48 2005 @@ -46,31 +46,31 @@ alias thelp { if (!$[0]) { -echo -------------= Trickle IRC Swiss Army Knife Help =------------- +//echo -------------= Trickle IRC Swiss Army Knife Help =------------- -echo tscan /tscan [ident@host] specified match will show user(s) in -echo current chan. -echo tdeop /tdeop [ident@host] specified match will deop user(s) in -echo current chan. -echo tkick /tkick [ident@host] specified match will kick user(s) in -echo current chan. -echo tbk /tbk [ident@host] specified match will bankick user(s) -echo in current chan. -echo top /top [ident@host] specified match will op user(s) in -echo current chan. -echo common /common #somechan will compare nicks between current and -echo specified chan. +//echo tscan /tscan [ident@host] specified match will show user(s) in +//echo current chan. +//echo tdeop /tdeop [ident@host] specified match will deop user(s) in +//echo current chan. +//echo tkick /tkick [ident@host] specified match will kick user(s) in +//echo current chan. +//echo tbk /tbk [ident@host] specified match will bankick user(s) +//echo in current chan. +//echo top /top [ident@host] specified match will op user(s) in +//echo current chan. +//echo common /common #somechan will compare nicks between current and +//echo specified chan. input_char "menu paused, hit the ANY key to continue. " pause -echo -echo /trickle can do a wide variety of commands/matches these are just -echo some of the quick aliases which makes usage of /trickle. -echo some /trickle usage examples. -echo /trickle #somechan *!*@*aol.com kill -echo /trickle #somechan *!ident@* voice -echo /trickle * wildcard is not working at this time. -echo /filter is also aliased to trickle for those who can't remember the cmd. -echo --------------------------------------------------------------------- +//echo +//echo /trickle can do a wide variety of commands/matches these are just +//echo some of the quick aliases which makes usage of /trickle. +//echo some /trickle usage examples. +//echo /trickle #somechan *!*@*aol.com kill +//echo /trickle #somechan *!ident@* voice +//echo /trickle * wildcard is not working at this time. +//echo /filter is also aliased to trickle for those who can't remember the cmd. +//echo --------------------------------------------------------------------- } } diff -aruN amn.orig/core/whois.m amn/core/whois.m --- amn.orig/core/whois.m Sun Oct 2 23:17:22 2005 +++ amn/core/whois.m Mon Oct 10 16:41:13 2005 @@ -11,6 +11,6 @@ (5) {@_whois=5;^eval load ${loadpath}wis/whois.5} (6) {@_whois=6;^eval load ${loadpath}wis/whois.6} } - xecho -v [a+c] whois format set to $(_whois) + xecho -b whois format set to $(_whois) } oof diff -aruN amn.orig/core/winhelp.m amn/core/winhelp.m --- amn.orig/core/winhelp.m Mon Oct 10 14:53:43 2005 +++ amn/core/winhelp.m Mon Oct 10 17:35:52 2005 @@ -5,7 +5,7 @@ alias winhelp { if (!$[0]) { -echo --------------------= Windowing Help =----------------------------- +//echo --------------------= Windowing Help =----------------------------- //echo wc <window create> creates new hidden window //echo wj <window join> creates new hidden window and joins specified channel @@ -30,7 +30,7 @@ //echo wflush <window flush> window flush the scroll back epic5-0.0.6 and higher. //echo wlevel <window levels> changes level of current window //echo msgwin <msg window> wsl's then it wc's a window bound to msgs,notices -echo --------------------------------------------------------------------------- +//echo --------------------------------------------------------------------------- } } diff -aruN amn.orig/modules/abot/abot.m amn/modules/abot/abot.m --- amn.orig/modules/abot/abot.m Sun Oct 2 23:18:57 2005 +++ amn/modules/abot/abot.m Mon Oct 10 17:36:00 2005 @@ -26,7 +26,7 @@ @ bothost = after(! $input1) @ botnick = before(! $input1) } else { - if (!getuhost($input1)) { xecho -v -b $botprompt $input1 is not on irc! }{ + if (!getuhost($input1)) { xecho -b $botprompt $input1 is not on irc! }{ @ bothost = sar(g/~/\*/$getuhost($input1)) @ botnick = [$input1] }} @@ -36,7 +36,7 @@ @ :botcmd = [$3-] @ setitem(bots 0 !) @ setitem(bots $numitems(bots) $botnick!$bothost $pass $chan $botcmd) - xecho -v -b $botprompt $Cparse(%nbot added %c$botnick%K!%c$bothost%n pass%K:%c $decode($pass) %nchannel%K:%c $chan%n command%K:%n $botcmd) + xecho -b $botprompt $Cparse(%nbot added %c$botnick%K!%c$bothost%n pass%K:%c $decode($pass) %nchannel%K:%c $chan%n command%K:%n $botcmd) } } } @@ -69,7 +69,7 @@ for (@xx=0, xx -echo adds bots to the botlist. -echo botdel /botdel delete bot from botlist -echo botsave /botsave saves bots to file -echo listbot /listbot lists all bots -echo delbot /delbot - same as /botdel -echo botlist /botlist - same as /listbot -echo abot /abot - same as /listbot -echo rmbot /rmbot - same as /botdel +//echo addbot /addbot +//echo adds bots to the botlist. +//echo botdel /botdel delete bot from botlist +//echo botsave /botsave saves bots to file +//echo listbot /listbot lists all bots +//echo delbot /delbot - same as /botdel +//echo botlist /botlist - same as /listbot +//echo abot /abot - same as /listbot +//echo rmbot /rmbot - same as /botdel -echo ------------------------------------------------------------------- +//echo ------------------------------------------------------------------- } } diff -aruN amn.orig/modules/adcc/adcc.m amn/modules/adcc/adcc.m --- amn.orig/modules/adcc/adcc.m Sun Oct 2 23:19:17 2005 +++ amn/modules/adcc/adcc.m Mon Oct 10 16:42:54 2005 @@ -39,7 +39,7 @@ alias adcc.timer { if (numitems(offers.files) == 0) { - xecho -v (adcc).. no packs offered + xecho (adcc).. no packs offered }{ input "which channel do you want the timer to plist in? <#chan1,#chan2...> " { @dcchans=[$0] @@ -51,7 +51,7 @@ ^timer -del 41 input "time in minutes to plist on channel " { if ([$0] == 0 || ![$0]) { - xecho -v (adcc).. timer canceled + xecho (adcc).. timer canceled }{ @pts=[$0] ^timer -refnum 41 -rep -1 ${pts * 60} ^plist $dcchans @@ -60,7 +60,7 @@ } alias adcc.list { if (numitems(offers.files)== 0) { - xecho -v (adcc).. no packs current on list + xecho (adcc).. no packs current on list }{ banner.lchead banner.mid file desc gets @@ -92,7 +92,7 @@ if (fexist($glob($*)) == [-1]) { @fuk=1 - xecho -v (adcc).. file not found + xecho (adcc).. file not found }{ if (match(*/* $*)) { @setitem(gets $numitems(gets) 0) @@ -137,7 +137,7 @@ alias plist { if (numitems(offers.files) == 0) { - xecho -v (adcc).. no packs being offered + xecho (adcc).. no packs being offered }{ if (![$0]) { @pl=[$C] @@ -190,7 +190,7 @@ @ write($savec @speed=[$getitem(speed 0)]) @ write($savec @total=[$getitem(total 0)]) @ close($savec) - xecho -v [mod] (odcc).. adcc settings saved to $dccsavefile + xecho [mod] (odcc).. adcc settings saved to $dccsavefile } ^eval ^load $dccsavefile @@ -229,7 +229,7 @@ } - xecho -v (adcc).. odcc file loaded + xecho (adcc).. odcc file loaded } alias adcc.doffer { @@ -241,14 +241,14 @@ @delarray(gets) @delarray(speed) @delarray(total) - xecho -v (adcc).. all packs deleted + xecho (adcc).. all packs deleted }{ @numer=[$0] @delitem(offers.files ${numer-1}) @delitem(offers.desc ${numer-1}) @delitem(offers.note ${numer-1}) @delitem(gets ${numer-1}) - xecho -v (adcc).. pack $numer deleted + xecho (adcc).. pack $numer deleted } } } diff -aruN amn.orig/modules/away/away.m amn/modules/away/away.m --- amn.orig/modules/away/away.m Sun Oct 2 23:20:37 2005 +++ amn/modules/away/away.m Mon Oct 10 16:43:52 2005 @@ -10,14 +10,14 @@ alias remlog { if (fexist(~/.amn/away.log) == -1) { - xecho -v -b log file does not exist. + xecho -b log file does not exist. }{ input "remove log? [y|n]: " { if ([$0]==[y]) { exec rm ~/.amn/away.log - xecho -v -b ~/.amn/away.log deleted + xecho -b ~/.amn/away.log deleted }{ - xecho -v -b remlog canceled + xecho -b remlog canceled } } } @@ -65,34 +65,34 @@ if (awaytime > [0]) { @timediff=tdiff2(${backtime - awaytime}) //away - xecho -v -b type /readlog to view log. + xecho -b type /readlog to view log. } }{ - xecho -v -b you are not away.. + xecho -b you are not away.. } alias awaytime if ([$0]) { @ awayt = [$0] - xecho -v [a+c] awaytime set to "$awayt" + xecho -b awaytime set to "$awayt" } else { - xecho -v [a+c] awaytime set to "$awayt"} + xecho -b awaytime set to "$awayt"} alias awaymsg if ([$0]) { @ awayr = [$*] - xecho -v [a+c] away reason set to "$awayr" + xecho -b away reason set to "$awayr" } else { - xecho -v [a+c] away reason set to "$awayr"} + xecho -b away reason set to "$awayr"} alias awaytog { if (![$0]) { - xecho -v [a+c] away toggle is set to "$togaway" + xecho -b away toggle is set to "$togaway" } if (match($0 on off)) {@togaway = [$0] - xecho -v [a+c] away toggle is set to "$togaway" + xecho -b away toggle is set to "$togaway" }{ if ([$0]&&!match($0 on off)) { - xecho -v [a+c] invalid choice + xecho -b invalid choice } } @@ -101,14 +101,14 @@ ## pager crap here. alias pager { if (![$0]) { - xecho -v [a+c] pager set to "$togpager" + xecho -b pager set to "$togpager" } if (match($0 on off)) { @togpager = [$0] - xecho -v [a+c] pager set to "$togpager" + xecho -b pager set to "$togpager" }{ if ([$0]&&!match($0 on off)) { - xecho -v [a+c] invalid choice + xecho -b invalid choice } } } @@ -171,70 +171,70 @@ alias logcrap { if (![$0]) { - xecho -v [a+c] misc crap logging set to "$crapl" + xecho -b misc crap logging set to "$crapl" } if (match($0 on off)) { @crapl = [$0] - xecho -v [a+c] misc crap logging set to "$crapl" + xecho -b misc crap logging set to "$crapl" }{ if ([$0]&&!match($0 on off)) { - xecho -v [a+c] invalid choice + xecho -b invalid choice } } } alias logm { if (![$0]) { - xecho -v [a+c] msg logging set to "$msgl" + xecho -b msg logging set to "$msgl" } if (match($0 on off)) { @msgl = [$0] - xecho -v [a+c] msg logging set to "$msgl" + xecho -b msg logging set to "$msgl" }{ if ([$0]&&!match($0 on off)) { - xecho -v [a+c] invalid choice + xecho -b invalid choice } } } alias logd { if (![$0]) { - xecho -v [a+c] dcc logging set to "$dccl" + xecho -b dcc logging set to "$dccl" } if (match($0 on off)) { @dccl = [$0] - xecho -v [a+c] dcc logging set to "$dccl" + xecho -b dcc logging set to "$dccl" }{ if ([$0]&&!match($0 on off)) { - xecho -v [a+c] invalid choice + xecho -b invalid choice } } } alias logn { if (![$0]) { - xecho -v [a+c] notice logging set to "$notl" + xecho -b notice logging set to "$notl" } if (match($0 on off)) { @notl = [$0] - xecho -v [a+c] notice logging set to "$notl" + xecho -b notice logging set to "$notl" }{ if ([$0]&&!match($0 on off)) { - xecho -v [a+c] invalid choice + xecho -b invalid choice } } } alias logpub { if (![$0]) { - xecho -v [a+c] public logging set to "$plog" + xecho -b public logging set to "$plog" } if (match($0 on off)) { @plog = [$0] - xecho -v [a+c] public logging set to "$plog" + xecho -b public logging set to "$plog" }{ if ([$0]&&!match($0 on off)) { - xecho -v [a+c] invalid choice + xecho -b invalid choice } } } diff -aruN amn.orig/modules/bwk/bwk.m amn/modules/bwk/bwk.m --- amn.orig/modules/bwk/bwk.m Mon Oct 10 14:53:43 2005 +++ amn/modules/bwk/bwk.m Mon Oct 10 16:44:09 2005 @@ -14,8 +14,8 @@ alias addword { if ( # < 2) { - xecho -v -b syn: /addword word #chan [type] to bk a word in specified chan. - xecho -v -b type is either bk or kick. Default is bk. + xecho -b syn: /addword word #chan [type] to bk a word in specified chan. + xecho -b type is either bk or kick. Default is bk. }{ @:bktype=[bk] if ( # >= 3 && findw($2 bk kick)) { @@ -27,13 +27,13 @@ @setitem(_words $numitems(_words) $0) @setitem(_wordschan $numitems(_wordschan) $1) @setitem(_wordstype $numitems(_wordstype) $bktype) - xecho -v -b added word $0 with channel $1 to word list. + xecho -b added word $0 with channel $1 to word list. } } alias listword { if (numitems(_words) == 1) { - xecho -v -b no words current on list + xecho -b no words current on list }{ banner.head for (@xx=1, xx 0 && [$0] < numitems(_words)) { - xecho -v -b deleted $getitem(_words $0) $getitem(_wordschan $0) from list + xecho -b deleted $getitem(_words $0) $getitem(_wordschan $0) from list @delitem(_words $0) @delitem(_wordschan $0) @delitem(_wordstype $0) }{ - xecho -v -b number out of range. + xecho -b number out of range. } }{ - xecho -v -b syn: /delword + xecho -b syn: /delword } } @@ -94,7 +94,7 @@ @write($savemt @_wordstype.$xx=[$getitem(_wordtype $xx)]) } @close($savemt) - xecho -v [mod] (bwk).. wordlist saved to $wordsfile + xecho [mod] (bwk).. wordlist saved to $wordsfile } alias wordsload { diff -aruN amn.orig/modules/flood/flood.m amn/modules/flood/flood.m --- amn.orig/modules/flood/flood.m Sun Oct 2 23:22:46 2005 +++ amn/modules/flood/flood.m Mon Oct 10 16:50:35 2005 @@ -4,27 +4,27 @@ ^on #-msg 1 * if (msgflood != 1) { @msgs++ - //timer -refnum 5001 3 {@msgs = 0} - if (msgs > msgfloodsensor) { - /umode +g - xecho -b msg flood detected setting flood protect umode +g for $mfloodtimer seconds - @msgflood=1 - //timer -refnum 5002 $mfloodtimer {^xecho -b server protect umode +g lifted after $mfloodtimer seconds;@msgflood=0;^umode -g} - - } + //timer -refnum 5001 3 {@msgs = 0} + if (msgs > msgfloodsensor) { + /umode +g + xecho -b msg flood detected setting flood protect umode +g for $mfloodtimer seconds + @msgflood=1 + //timer -refnum 5002 $mfloodtimer {^xecho -b server protect umode +g lifted after $mfloodtimer seconds;@msgflood=0;^umode -g} + } } + alias msgflood if ([$0]) { @msgfloodsensor=[$0] - xecho -v [a+c] server msg flood sensor set to "$msgfloodsensor" + xecho -b server msg flood sensor set to "$msgfloodsensor" }{ - xecho -v [a+c] server msg flood sensor set to "$msgfloodsensor" + xecho -b server msg flood sensor set to "$msgfloodsensor" } alias msgftimer if ([$0]) { @mfloodtimer=[$0] - xecho -v [a+c] server protect msg flood time set to "$mfloodtimer" + xecho -b server protect msg flood time set to "$mfloodtimer" }{ - xecho -v [a+c] server protect msg flood time set to "$mfloodtimer" + xecho -b server protect msg flood time set to "$mfloodtimer" } alias mtime msgftimer $* diff -aruN amn.orig/modules/mjoin/mjoin.m amn/modules/mjoin/mjoin.m --- amn.orig/modules/mjoin/mjoin.m Sun Oct 2 23:22:59 2005 +++ amn/modules/mjoin/mjoin.m Mon Oct 10 17:36:07 2005 @@ -16,7 +16,7 @@ alias addchan { if (![$0]) { - xecho -v (mjoin).. syn: /addchan chan1,chan2,chan3... (note. if the channel has a key then /addchan chan1 key, one by one.) + xecho (mjoin).. syn: /addchan chan1,chan2,chan3... (note. if the channel has a key then /addchan chan1 key, one by one.) }{ @_ach=sar(g/,/ /$0) if ([$1]) { @@ -25,20 +25,20 @@ @setitem(chans 0 !) @setitem(chans $numitems(chans) $a1 $_key) } - xecho -v -b added $* to channel list + xecho -b added $* to channel list }{ fe ($_ach) a1 { @setitem(chans 0 !) @setitem(chans $numitems(chans) $a1) } - xecho -v -b added $* to channel list + xecho -b added $* to channel list } } } alias listchan { if (numitems(chans) == 1) { - xecho -v -b no channels current on list + xecho -b no channels current on list }{ banner.lchead for (@xx=1, xx will add specified channel to mjoinlist -echo addjoin /addjoin will add specified channel to mjoinlist -echo delchan /delchan will delete channel from mjoin list -echo listchan /listchan will show a list of channels on the mjoin list -echo mjoin /mjoin will join all channels on mjoin list -echo chansave /chansave will save mjoin list -echo chanload /chanload will load mjoin list from ~/.chan.save -echo -= Mjoin Quick Aliases =- -echo listc/listchan ajlist/listchan chanlist/listchan -echo addjoin/addchan ajoin/addchan -echo unajoin/delchan deljoin/delchan rmjoin/delchan unjoin/delchan +//echo addchan /addchan will add specified channel to mjoinlist +//echo addjoin /addjoin will add specified channel to mjoinlist +//echo delchan /delchan will delete channel from mjoin list +//echo listchan /listchan will show a list of channels on the mjoin list +//echo mjoin /mjoin will join all channels on mjoin list +//echo chansave /chansave will save mjoin list +//echo chanload /chanload will load mjoin list from ~/.chan.save +//echo -= Mjoin Quick Aliases =- +//echo listc/listchan ajlist/listchan chanlist/listchan +//echo addjoin/addchan ajoin/addchan +//echo unajoin/delchan deljoin/delchan rmjoin/delchan unjoin/delchan -echo ------------------------------------------------------------------- +//echo ------------------------------------------------------------------- } } diff -aruN amn.orig/modules/ncomp/ncomp.m amn/modules/ncomp/ncomp.m --- amn.orig/modules/ncomp/ncomp.m Sun Oct 2 23:23:15 2005 +++ amn/modules/ncomp/ncomp.m Mon Oct 10 16:51:21 2005 @@ -8,7 +8,7 @@ if (pattern($txt* $chanusers($C))) { @ per = pattern($txt* $chanusers($C)) if (numwords($per) > 1) { - xecho -v -b Ambiguous matches: $per + xecho -b Ambiguous matches: $per sendline $* }{ sendline $stripansicodes($per$format_nick_comp $1-) @@ -17,7 +17,7 @@ if (!pattern($txt* $chanusers($C)) && pattern(*$txt* $chanusers($C))) { @ per = pattern(*$txt* $chanusers($C)) if (numwords($per) > 1) { - xecho -v -b Ambiguous matches: $per + xecho -b Ambiguous matches: $per sendline $* }{ sendline $stripansicodes($per$format_nick_comp $1-) diff -aruN amn.orig/modules/nlog/nlog.m amn/modules/nlog/nlog.m --- amn.orig/modules/nlog/nlog.m Sun Oct 2 23:25:44 2005 +++ amn/modules/nlog/nlog.m Mon Oct 10 16:52:09 2005 @@ -25,14 +25,14 @@ alias nsotog { if ( [$#] ==0) { - xecho -v [a+c] notify signoff log toggle is set to "$nsolog" + xecho -b notify signoff log toggle is set to "$nsolog" } if (match($0 on off)) { @nsolog = [$0] - xecho -v [a+c] notify signoff log toggle is set to "$nsolog" + xecho -b notify signoff log toggle is set to "$nsolog" }{ if ( [$#] &&!match($0 on off)) { - xecho -v [a+c] invalid choice, on or off. + xecho -b invalid choice, on or off. } } } @@ -41,14 +41,14 @@ #notify aliases. alias rnlog { if (fexist($nlogfile) == -1) { - xecho -v -b notify log file does not exist. + xecho -b notify log file does not exist. }{ input "remove log? [y|n]: " { if ([$0]==[y]) { exec rm $nlogfile - xecho -v -b $nlogfile deleted + xecho -b $nlogfile deleted }{ - xecho -v -b rnlog canceled + xecho -b rnlog canceled } } } @@ -68,7 +68,7 @@ @savemt = open($nfile W T) @write($savemt @nsolog=[$nsolog]) @close($savemt) - xecho -v [mod] (nlog).. notify settings saved to $nfile + xecho [mod] (nlog).. notify settings saved to $nfile } ^eval load $nfile diff -aruN amn.orig/modules/oper/oper.m amn/modules/oper/oper.m --- amn.orig/modules/oper/oper.m Sun Oct 2 23:25:55 2005 +++ amn/modules/oper/oper.m Mon Oct 10 17:36:17 2005 @@ -21,7 +21,7 @@ alias _winnames { fe ($winrefs()) n1 { - if (match($0 $winnam($n1)) > 0) { + if (match($0 $winnam($n1))) { return $n1 }{ @@ -32,19 +32,19 @@ alias ovsize { if (![$0]) { - xecho -v -b operview window size set to "$_ovsize" + xecho -b operview window size set to "$_ovsize" }{ @_ovsize=[$0] - xecho -v -b operview window size set to "$_ovsize" + xecho -b operview window size set to "$_ovsize" } } alias ovmode { if (![$0]) { - xecho -v -b oper modes set to "$_ovmode" + xecho -b oper modes set to "$_ovmode" }{ @_ovmode=[$0] - xecho -v -b oper modes set to "$_ovmode" + xecho -b oper modes set to "$_ovmode" } } @@ -61,13 +61,13 @@ alias operview { if (winnum(operview) != -1) { - abecho [a+c] toggled operview off. + abecho $banner toggled operview off. ^window OperView kill ^umode -$_ovmode }{ - abecho [a+c] toggled operview on. + abecho $banner toggled operview on. ^window new fixed on size $_ovsize name OperView level snotes,opnotes,wallops;umode +$_ovmode # ^set status_server [%S] ^set status_format [operview] %> [$servername($winserv(OperView))] @@ -90,7 +90,7 @@ alias tkline { if (![$0]) { - xecho -v [a+c] usage: /tkline [nick|hostmask] + xecho -b usage: /tkline [nick|hostmask] }{ quote kline $0 $1 :$2- } @@ -340,38 +340,27 @@ alias ohelp { if (!$[0]) { -echo -----------------------= Oper Help =-------------------------- +//echo -----------------------= Oper Help =-------------------------- -echo /tkline [nick|ident@host] will temp kline for -echo specified minutes. -echo /unkline will remove kline from server list. -echo /operwall will send a operwall with specified text to the server. -echo /ov will open up a split window will the level WALLOPS OPNOTES SNOTES -echo so all server msgs will go to that window. -echo /mkline will mass kline current channel for specified reason -echo /mkill will mass kill current channel -echo /locops will send a msg to all operators on current server -echo /kline will set a kline for nick or specified ident@host -echo /modlist view ircd modules. -echo /modload loads specified ircd module. -echo /modunload unloads specified ircd module. -echo /dline reason. will set a dline with reason. (ratbox) -echo /undline will remove a dline. (ratbox) -echo binds ^E scroll_backward in ovwin ^D scroll_forward in ovwin +//echo /tkline [nick|ident@host] will temp kline for +//echo specified minutes. +//echo /unkline will remove kline from server list. +//echo /operwall will send a operwall with specified text to the server. +//echo /ov will open up a split window will the level WALLOPS OPNOTES SNOTES +//echo so all server msgs will go to that window. +//echo /mkline will mass kline current channel for specified reason +//echo /mkill will mass kill current channel +//echo /locops will send a msg to all operators on current server +//echo /kline will set a kline for nick or specified ident@host +//echo /modlist view ircd modules. +//echo /modload loads specified ircd module. +//echo /modunload unloads specified ircd module. +//echo /dline reason. will set a dline with reason. (ratbox) +//echo /undline will remove a dline. (ratbox) +//echo binds ^E scroll_backward in ovwin ^D scroll_forward in ovwin -echo ------------------------------------------------------------------- +//echo ------------------------------------------------------------------- } } -if (_winnames(Operview) > 0) { - ^set status_format $(hblk)[$(sc1)operview$(hblk)] $(cl)%>$(hblk)\([$(cl)$servername($winserv(OperView))$(hblk)]\) -} - - -^on #-connect 53 * { - ^set status_format $(hblk)[$(sc1)operview$(hblk)] $(cl)%>$(hblk)\([$(cl)$servername($winserv(OperView))$(hblk)]\) - if (!_pubnick) { - @_pubnick=N - } -} diff -aruN amn.orig/modules/orignick/orignick.m amn/modules/orignick/orignick.m --- amn.orig/modules/orignick/orignick.m Sun Oct 2 23:26:06 2005 +++ amn/modules/orignick/orignick.m Mon Oct 10 16:53:20 2005 @@ -5,14 +5,14 @@ ^timer -del 45 alias orignick { if (![$0]) { - xecho -v [a+c] /orignick /staynick to cancel + xecho -b /orignick /staynick to cancel }{ ^timer -delete 45 @nic=[$0] ^timer -window -1 -refnum 45 -rep -1 $_ort { ^getnick $nic } - xecho -v [a+c] attempting to jupe $nic + xecho -b attempting to jupe $nic } } @@ -20,39 +20,39 @@ ^userhost $nic -cmd { if ([$3@$4] == [@]) { ^nick $nic - xecho -v [a+c] congrads nick juped. /staynick to cancel + xecho -b congrads nick juped. /staynick to cancel } } } alias staynick { ^assign -nic ^timer -delete 45 - xecho -v [a+c] /orignick request canceled. + xecho -b /orignick request canceled. } alias setorig { if (# == 0) { - xecho -v [a+c] orignick delay set to "$_ort" + xecho -b orignick delay set to "$_ort" return; } if ([$0] > 0 && [$0] <=20) { @_ort = [$0] - xecho -v [a+c] orignick delay set to "$_ort" + xecho -b orignick delay set to "$_ort" }{ - xecho -v [a+c] time out of range. Valid numbers are 1-20 + xecho -b time out of range. Valid numbers are 1-20 } } on #-channel_signoff 42 "*" { if ([$1] == nic) { ^nick $nic - xecho -v [a+c] congrads nick juped. /staynick to cancel + xecho -b congrads nick juped. /staynick to cancel } } ^on #-nickname 33 * { if ([$0]== nic) { ^nick $nic - xecho -v [a+c] congrads nick juped. /staynick to cancel + xecho -b congrads nick juped. /staynick to cancel } } diff -aruN amn.orig/modules/relay/relay.m amn/modules/relay/relay.m --- amn.orig/modules/relay/relay.m Mon Oct 10 14:53:43 2005 +++ amn/modules/relay/relay.m Mon Oct 10 17:36:27 2005 @@ -262,7 +262,7 @@ //echo $0 isn't on IRC right now. } }{ -echo usage : /frelm [fake nick] [nick/channel to send to] [fake msg]} +//echo usage : /frelm [fake nick] [nick/channel to send to] [fake msg]} } alias freln { @@ -276,7 +276,7 @@ //echo $0 isn't on IRC right now. } }{ -echo usage: /freln [fake nick] [nick/channel to send to] [fake notice]} +//echo usage: /freln [fake nick] [nick/channel to send to] [fake notice]} } ## end fake stuff. @@ -284,21 +284,21 @@ alias rhelp { if (!$[0]) { -echo -----------------------= Relay Help =-------------------------- +//echo -----------------------= Relay Help =-------------------------- -echo lpaste /lpaste will paste to current window last line recieved. -echo relm /relm then to paste msg lines in buffer. -echo relsm /relsm then to paste sent msg lines in buffer. -echo reln /reln then to paste notice lines in buffer. -echo relsn /relsn then to paste sent notice lines in buffer. -echo paste /paste then to paste line in buffer. -echo relw /relw then to paste line in buffer. -echo rel /rel -l (msg) /rel -n (notice) /rel -s (sendmsg) -echo -echo Note: you do not have to specify numbers or actually paste anything -echo to anyone when seeing what's in the buffer ie: /relm to view the last -echo 15 msgs to you then enter to avoid pasting anything. +//echo lpaste /lpaste will paste to current window last line recieved. +//echo relm /relm then to paste msg lines in buffer. +//echo relsm /relsm then to paste sent msg lines in buffer. +//echo reln /reln then to paste notice lines in buffer. +//echo relsn /relsn then to paste sent notice lines in buffer. +//echo paste /paste then to paste line in buffer. +//echo relw /relw then to paste line in buffer. +//echo rel /rel -l (msg) /rel -n (notice) /rel -s (sendmsg) +//echo +//echo Note: you do not have to specify numbers or actually paste anything +//echo to anyone when seeing what's in the buffer ie: /relm to view the last +//echo 15 msgs to you then enter to avoid pasting anything. -echo ------------------------------------------------------------------- +//echo ------------------------------------------------------------------- } } diff -aruN amn.orig/modules/shitlist/shitlist.m amn/modules/shitlist/shitlist.m --- amn.orig/modules/shitlist/shitlist.m Mon Oct 10 14:53:43 2005 +++ amn/modules/shitlist/shitlist.m Mon Oct 10 17:36:34 2005 @@ -88,14 +88,14 @@ @write($savec @shitreas.$xx=[$getitem(shitreas $xx)]) } @ close($savec) - xecho -v [mod] (shitlist).. saved to $shitsavefile + xecho [mod] (shitlist).. saved to $shitsavefile } alias unshit shitdel alias shitdel if ([$0]) { if (numitems(shitlist)<=[$0]) { //echo $banner no such user! }{ - xecho -v -b deleted shitlist entry $getitem(shitlist $0) + xecho -b deleted shitlist entry $getitem(shitlist $0) @ delitem(shitlist $0) @ delitem(shitreas $0) } @@ -215,19 +215,19 @@ alias shelp { if (!$[0]) { -echo -----------------------= Shitlist Help =-------------------------- +//echo -----------------------= Shitlist Help =-------------------------- -echo addshit /addshit [nick|ident@host] #chan1,#chan2,#chan3... level reason -echo shitlevels 1 - deop users at all time, 2 - kick user when they -echo join the channel, 3 - Ban/Kick user when they join the channel -echo fuck /fuck nick will kickban nick and add nick to your shitlist level 3 -echo listshit /listshit view current users on the shitlist. -echo delshit /delshit # removes user from the shitlist. -echo -= Shitlist Quick Alias =- -echo listbk/listshit -echo addbk/addshit -echo rembk/delshit +//echo addshit /addshit [nick|ident@host] #chan1,#chan2,#chan3... level reason +//echo shitlevels 1 - deop users at all time, 2 - kick user when they +//echo join the channel, 3 - Ban/Kick user when they join the channel +//echo fuck /fuck nick will kickban nick and add nick to your shitlist level 3 +//echo listshit /listshit view current users on the shitlist. +//echo delshit /delshit # removes user from the shitlist. +//echo -= Shitlist Quick Alias =- +//echo listbk/listshit +//echo addbk/addshit +//echo rembk/delshit -echo ------------------------------------------------------------------- +//echo ------------------------------------------------------------------- } } diff -aruN amn.orig/modules/userlist/userlist.m amn/modules/userlist/userlist.m --- amn.orig/modules/userlist/userlist.m Mon Oct 10 14:53:43 2005 +++ amn/modules/userlist/userlist.m Mon Oct 10 17:36:47 2005 @@ -94,7 +94,7 @@ @ write($savec @friends.$xx=[$getitem(friends $xx)]) } @ close($savec) - xecho -v [mod] (userlist).. saved to $frsavefile + xecho [mod] (userlist).. saved to $frsavefile } alias userdel if ([$0]) { @@ -121,14 +121,14 @@ alias setsec { if (# == 0) { - xecho -v [a+c] autop delay set to "$_ss" + xecho -b autop delay set to "$_ss" return; } if ([$0] > 0 && [$0] <=40) { @_ss = [$0] - xecho -v [a+c] autop delay set to "$_ss" + xecho -b autop delay set to "$_ss" }{ - xecho -v [a+c] time out of range. Valid numbers are 1 - 40 + xecho -b time out of range. Valid numbers are 1 - 40 } } @@ -343,22 +343,22 @@ alias uhelp { if (!$[0]) { -echo -----------------------= Userlist Help =-------------------------- +//echo -----------------------= Userlist Help =-------------------------- -echo userlist /userlist will display users from the userlist. -echo adduser /adduser [nick|ident@host] #channel userlevel1,userlevel2, -echo userlevel3 .. password. -echo userlevels ops - will op person requesting for ops ,iops - will -echo instantly op someone when they enter the channel, invite - upon ctcp -echo request, will invite user to channel, voice - will voice person when -echo enters the channel -echo listuser /listuser will display users from the userlist. -echo deluser /deluser # will delete the user from the userlist. -echo addf /addf same as /adduser -echo listf /listf same as /userlist -echo delf /delf same as /deluser -echo remf /remf same as /deluser +//echo userlist /userlist will display users from the userlist. +//echo adduser /adduser [nick|ident@host] #channel userlevel1,userlevel2, +//echo userlevel3 .. password. +//echo userlevels ops - will op person requesting for ops ,iops - will +//echo instantly op someone when they enter the channel, invite - upon ctcp +//echo request, will invite user to channel, voice - will voice person when +//echo enters the channel +//echo listuser /listuser will display users from the userlist. +//echo deluser /deluser # will delete the user from the userlist. +//echo addf /addf same as /adduser +//echo listf /listf same as /userlist +//echo delf /delf same as /deluser +//echo remf /remf same as /deluser -echo ------------------------------------------------------------------- +//echo ------------------------------------------------------------------- } } Date: Mon, 10 Oct 2005 20:34:06 -0400 (EDT) From: zak@ircii.org (Zak) -fixup scan.2 thanks to criminal -remove a TODO -update some things in CHANGES -update development version -add to web for the masses. -NOTE: INDENT is now turned off. //zak diff -aruN amn.orig/CHANGES amn/CHANGES --- amn.orig/CHANGES Mon Oct 10 18:02:59 2005 +++ amn/CHANGES Mon Oct 10 20:29:08 2005 @@ -210,4 +210,13 @@ notice any difference. //skullY -resync to tree, i presume this is skullY's latest or 'tried to commit' //zak -fix dating format. //zak - +-fix scan.2 format to output much nicer and proper like it used to + thanks to criminal //zak +-set indenting OFF, i do not know why this was ever on or needed to be + on in the first place if anyone notices something breaks let me know + this should get rid of the trailing whitespace at the beginning. + and fixing the output_rewrite to actually do what it should do right. //zak +-increment development version to 9. might actually be getting close to + a release now after we decide the politics of what we're going to do about + some questionable skullyisms. //zak +-minor nits to TODO-BUGS. //zak diff -aruN amn.orig/TODO-BUGS amn/TODO-BUGS --- amn.orig/TODO-BUGS Fri Oct 7 12:41:00 2005 +++ amn/TODO-BUGS Mon Oct 10 20:28:50 2005 @@ -18,8 +18,6 @@ ## highest priority TODO. -adjust our 'poor mans' thuttup to be more reasonable. -fixdouble/fixwin or equiv for doublestats --check into the new windowing stuff in -cvs. and correct aliases/add - aliases if needs to be. ## Higher priority requests. @ add a topiclock alias (like bitchx) for xavier. diff -aruN amn.orig/core/sets.m amn/core/sets.m --- amn.orig/core/sets.m Fri Oct 7 11:06:31 2005 +++ amn/core/sets.m Mon Oct 10 20:30:03 2005 @@ -39,7 +39,7 @@ @awayl=[on] @awayr=[Not Here] @a.ver=[amnesiac] -@rel_id=[8] +@rel_id=[9] @a.rel=[1.1d r/$rel_id] @a.date=[20050903] @_ss=[15] diff -aruN amn.orig/sc/scan.2 amn/sc/scan.2 --- amn.orig/sc/scan.2 Sun Oct 2 23:32:35 2005 +++ amn/sc/scan.2 Mon Oct 10 20:22:34 2005 @@ -4,12 +4,12 @@ @format_scan_users=[ $$(hblk)[$$(c1)o$$(hblk)!$$(wht)$$1$(cl)$$(hblk)] $$(hblk)[$$(c1)n$$(hblk)!$$(wht)$$2$$(hblk)] $$(hblk)[$$(c1)v$$(hblk)!$$(wht)$$3$$(hblk)]] @format_scan_width=15 -@format_scan_header=[ $$(hwht)ÚÄÄ$$(cl)Ä$$(hwht)Ä$$(cl)ÄÄÄÄÄ$$(c1)ÄÄ-ÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ$$(hblk)ÄÄÄÄÄÄÄÄÄÄÄ-] +@format_scan_header=[$$(hwht)ÚÄÄ$$(cl)Ä$$(hwht)Ä$$(cl)ÄÄÄÄÄ$$(c1)ÄÄ-ÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ$$(hblk)ÄÄÄÄÄÄÄÄÄÄÄ-] @format_scan_onjoin_nicks_border=[$$(hblk)[$$(c1)³$$(hblk)]] -@format_scan_onjoin_nicks=[ $$(hblk)[$$(cl)$$fix.scan($1)$$(hblk)]] +@format_scan_onjoin_nicks=[$$(hblk)[$$(cl)$$fix.scan($1)$$(hblk)]] @format_scan_nicks_border=[$$(hblk)[$$(c1)³$$(hblk)] -@format_scan_nicks=[ $$(hblk)[$$(cl)$$fix.scan2($1)$$(hblk)] -@format_scan_footer=[ $$(c1)À-$$(hblk)----ÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ----ÄÄ Ä ÄÄÄ] +@format_scan_nicks=[$$(hblk)[$$(cl)$$fix.scan2($1)$$(hblk)] +@format_scan_footer=[$$(c1)À-$$(hblk)----ÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ----ÄÄ Ä ÄÄÄ] @format_scan_users_op=[$$(hblk)[$$(c1)o$$(hblk)!$$(wht)$$1$$(cl)$$(hblk)]] @format_scan_users_non=[$$(hblk)[$$(c1)n$$(hblk)!$$(wht)$$1$$(hblk)]] @format_scan_users_voc=[$$(hblk)[$$(c1)v$$(hblk)!$$(wht)$$1$$(hblk)]] diff -aruN amn.orig/settings amn/settings --- amn.orig/settings Fri Oct 7 10:53:46 2005 +++ amn/settings Mon Oct 10 19:40:07 2005 @@ -11,7 +11,7 @@ set auto_rejoin_delay 5 set num_of_whowas 2 set auto_whowas on -set indent on +set indent off set show_who_hopcount on set show_channel_names off set mode_stripper on Date: Tue, 11 Oct 2005 00:58:06 +0000 From: Zach White This should make zak happy. Fix all the xechos to be xecho $acban where appropriate. May need some fine tuning, but should be pretty ok as is. amn diff diff amn.orig/core/alias.m amn/core/alias.m --- amn.orig/core/alias.m Tue Oct 11 00:52:09 2005 +++ amn/core/alias.m Tue Oct 11 00:51:38 2005 @@ -55,7 +55,7 @@ alias cfinger ctcp $0 finger ## script echo ##still need to clean some of this up. -alias abwecho xecho -b -v $cparse($*) +alias abwecho xecho -v $acban $cparse($*) alias awecho xecho -v $cparse($*) alias aecho //echo $cparse($*) alias abecho xecho -b -- $cparse($*) @@ -137,14 +137,14 @@ alias orw { ^set -output_rewrite ^set output_rewrite $_paste($1-) $1- - xecho -b output indent set to "on" + xecho $acban output indent set to "on" } alias wrap orww alias orww { ^set -output_rewrite ^set output_rewrite $_paste($1-)$1- - xecho -b output linewrap set to "on" + xecho $acban output linewrap set to "on" } ## end output_rewrite sillyness. @@ -192,14 +192,14 @@ } alias fctcp if (![$0]) { - xecho -b syn: /fctcp nick/channel + xecho $acban syn: /fctcp nick/channel }{ notice $0 $chr(1)$1-$chr(1) } alias mw { if (![$0]) { - xecho -b /mw -hidden|split|kill + xecho $acban /mw -hidden|split|kill } switch ($0) { (-hidden) {^window new hide swap last level msgs name msgs} diff amn.orig/core/alias.m.orig amn/core/alias.m.orig --- amn.orig/core/alias.m.orig Thu Jan 1 00:00:00 1970 +++ amn/core/alias.m.orig Mon Oct 10 20:25:31 2005 @@ -0,0 +1,278 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. + +subpackage alias + +## last modified by crapple 10.1.05 + +## various commands. +alias sc scan $* +alias quit bye $* +alias ismask {return ${pass(!@ $0) ? 1 : 0}} +alias recho eval //echo $* +alias save saveall +alias settings config $* + +## more/less info from server. +alias ww whowas $* +alias wi whois $* +alias w whois $* +alias who {//who ${# ? [$*] : T}} +alias links ^quote links $* +alias wii {if (![$0]) {whois $N $N} {whois $0 $0}} +alias smsg quote server :$* +alias svrtime time $S +alias disco disconnect $* +alias sb bans + +## cid(+g) +alias accept { quote accept $*} +alias cid accept $* +alias rmcid { quote accept -$*} +alias acceptlist { quote accept * } +alias cidlist acceptlist +alias rmaccept rmcid $* +alias acceptdel rmcid $* + +## dalnets dcc bullshit so called "protection" +alias allow dccallow $* +alias dccallow {quote dccallow $*} + +## add these nickserv/memoserv/chanserv stuff here. +## not everyone wants to load everything in the services module just +## for these aliases. +alias ms {quote MemoServ $*} +alias ns {quote NickServ $*} +alias cs {quote ChanServ $*} +alias chanserv cs $* +alias nickserv ns $* +alias memoserv ms $* + +## ctcp user aliases +alias ctime ctcp $0 time +alias cinfo ctcp $0 clientinfo +alias cuinfo ctcp $0 userinfo +alias cfinger ctcp $0 finger + +## script echo ##still need to clean some of this up. +alias abwecho xecho -b -v $cparse($*) +alias awecho xecho -v $cparse($*) +alias aecho //echo $cparse($*) +alias abecho xecho -b -- $cparse($*) +alias ce //echo $cparse("$*") + +## to be annoying like xavier. +alias blinky msg $T $cparse("%F%G$*") + +## general user commands +alias umode {^mode $N $*} +alias m msg $* +alias d describe $* +alias j {/join $channame($0) $1-} +alias p part $* +alias k kick $* +alias l part $* +alias host //userhost $* +alias realname {set realname $*} +alias irchost hostname $* +alias unset set -$* +alias unalias alias -$* + +## help shortcuts. +alias a ahelp $* +alias about {more $(loadpath)ans/about.ans} + +## amnesiac configuration cmd's can be saved with /save +alias cumode {config f $*} +alias autoaway {config g $*} +alias kickonban {config i $*} +alias kickops {config j $*} +alias resp {config r $*} +alias timestamp {config t $*} +alias stamp {timestamp $*} +alias protect {config w $*} +alias otime {config p $*} +alias extpub {config h $*} +alias tform {format 3 $*} +alias dstat {config z $*} + +## compat aliases from other irc clients to emulate the same thing. +alias awayt awaytime $* +alias verk {massk $*} +alias csc clear;sc + +## exec commands. +alias iwhois {exec whois $0 $*} +alias touch {exec touch $0- $*} +alias ls ^exec ls -F $* +alias osv {^exec -o uname -amnvp} +alias ps ^exec ps $* +alias mkdir {exec mkdir $*} +alias rm {exec rm -rf $*} +alias hosts {exec host $*} +alias dig {exec dig $*} + +## builtin simplification aliases. +alias arejoin {set auto_rejoin toggle} +alias aww {set auto_whowas toggle} +alias cmd {set command_chars $*} +alias debug {set debug $*} +alias beep {set beep toggle} +alias lls {set lastlog $*} +alias mirc {set mirc_broken_resume toggle} +alias ircname {set realname $*} +alias shist {set scrollback $*} +alias uinfo {set user_information $*} +alias vctcp {set verbose_ctcp togggle} +alias mon {set old_math_parser on} +alias moff {set old_math_parser off} +alias ioff {set -input_prompt} + +## dumps and reload script, for scripters and advanced users in general. +alias adump dump all;fe ($getarrays()) n1 {@delarray($n1)};unload * fe;load ~/.epicrc + +## so ppl can choose their poison on output_rewrite now that we don't have +## static timestamping format. +alias indent orw +alias orw { + ^set -output_rewrite + ^set output_rewrite $_paste($1-) $1- + xecho -b output indent set to "on" +} + +alias wrap orww +alias orww { + ^set -output_rewrite + ^set output_rewrite $_paste($1-)$1- + xecho -b output linewrap set to "on" +} +## end output_rewrite sillyness. + +## CrazyEddie's alias +alias comatch return ${match($*)||rmatch($*)} +## end + +alias _center { +@ number = (word(0 $geom()) - printlen($stripcrap(ANSI,COLOR $*))) / 2 +xecho -w $0 $repeat($trunc(0 $number) )$* + +} + +## long complex aliases below here. +alias fixterm { + exec //echo '$chr(27)\(U' + xecho -r $chr(27)\(U +} + +alias ibm437 fixterm + +alias latin1 { + exec //echo '$chr(27)\(B' + xecho -r $chr(27)\(B + } + +alias cat { + if ([$#]) { + @:ansifile = open($0 R T) + while (!eof($ansifile)) { + //echo $read($ansifile) + } + @close($ansifile) + } +} + +alias evalcat { + if ([$#]) { + @:ansifile = open($0 R T) + while (!eof($ansifile)) { + eval //echo $read($ansifile) + } + @close($ansifile) + } +} + +alias fctcp if (![$0]) { + xecho -b syn: /fctcp nick/channel + }{ + notice $0 $chr(1)$1-$chr(1) +} + +alias mw { + if (![$0]) { + xecho -b /mw -hidden|split|kill + } + switch ($0) { + (-hidden) {^window new hide swap last level msgs name msgs} + (-split) {^window new fixed on size 7 level msgs status_format %>$(hblk)[$(cl)msgs$(hblk)]$(cl) name msgs;^window back} + (-kill) {^window msgs kill} + } + } + + +alias getuhost { + if (userhost($0)==[@]) { + wait for userhost $0 -cmd { + return ${[$4] != [] ? [$3@$4] :} + } + }{ + return $userhost($0) + } + } + +alias bye if ([$0]) { + //quit $(J)[$info(i)] - $(a.ver) : $* +}{ + //eval //quit $(J)[$info(i)] - $(a.ver) : $randread($(loadpath)quit.reasons) +} + +alias supt +{ + msg $T ircII $(J) \($V\) [$info(i)] "$info(r)" client uptime: $tdiff2(${time() - F}) +} + +## taken from cypress +alias _pad { + @ function_return = [$1-$repeat(${[$0] - _printlen($1-)} )] +} + +alias ping { + if (![$0]) { + //ping $C + }{ + //ping $0 + } +} + +alias part { + if ([$0]) { + switch ($0) { + (#*) (&*) (0) (-*) (!*) (+*) { + //quote PART $0 :$1- + } + (*) { + part $C $* + } + } + }{ + //quote PART $C + } +} + +alias rn { + @_rn=[a b c d e f g h i j k l m n o p q r s t u v w x y z 1 2 3 4 5] + fe ($_rn) n1 { + @setitem(_rn $numitems(_rn) $n1) + } + ^nick $(getitem(_rn $rand($numitems(_rn))))$(getitem(_rn $rand($numitems(_rn))))$(getitem(_rn $rand($numitems(_rn))))$(getitem(_rn $rand($numitems(_rn))))$(getitem(_rn $rand($numitems(_rn))))$(getitem(_rn $rand($numitems(_rn)))) +} + +alias ver { + if (![$0]) { + //ctcp $C version + }{ + //ctcp $0 version + } +} + + +oof diff amn.orig/core/bans.m amn/core/bans.m --- amn.orig/core/bans.m Tue Oct 11 00:52:09 2005 +++ amn/core/bans.m Tue Oct 11 00:51:38 2005 @@ -110,24 +110,24 @@ } alias kob { if (![$0]) { - xecho -v -b kick on ban set to "$kickonban"} + xecho -v $acban kick on ban set to "$kickonban"} if (match($0 on off)) {@kickonban = [$0] - xecho -v -b kick on ban set to "$kickonban" + xecho -v $acban kick on ban set to "$kickonban" }{ if ([$0]&&!match($0 on off)) { - xecho -v -b invalid choice + xecho -v $acban invalid choice } } } alias kops { if (![$0]) { - xecho -v -b kick ops on ban set to "$kickops"} + xecho -v $acban kick ops on ban set to "$kickops"} if (match($0 on off)) {@kickops = [$0] - xecho -v -b kick ops on ban set to "$kickops" + xecho -v $acban kick ops on ban set to "$kickops" }{ if ([$0]&&!match($0 on off)) { - xecho -v -b invalid choice + xecho -v $acban invalid choice } } diff amn.orig/core/bans.m.orig amn/core/bans.m.orig --- amn.orig/core/bans.m.orig Thu Jan 1 00:00:00 1970 +++ amn/core/bans.m.orig Mon Oct 10 20:55:43 2005 @@ -0,0 +1,161 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. + +subpackage bans +## Robohak's tban and takeall alias + +alias tban { + ^on 367 - + ^on ^367 * { + @setitem(bans.$1 $numitems(bans.$1) $2-) + } + ^on ^368 * { + on 367 - + if (numitems(bans.$2)) { + @chan=[$2] + for (@:xx=0,xx0 && cc<=numitems(bans.$chan)) { + + mode $chan -b $word(0 $getitem(bans.$chan ${cc-1})) + + } + + } + } + + + @delarray(bans.$chan) + @chan=[] + ^on 368 - + + } + } + { + ^on 368 - + } + } + ^mode $C b + +} + +alias banstat { + if (![$0]) { + ^mode $C b + }{ + ^mode $0 b} + ^on ^367 * { + //echo $(hblk)[$(cl)$[15]1$(hblk)] [$(cl)$[9]before(! $3)$(hblk)] [$(cl)$2$(hblk)] $(cl)$word(3 $stime($4)) + } + wait -cmd ^on ^367 -"*" + + } + +alias takeall if (![$0]) { + ^on ^367 * { + @setitem(ubans $numitems(ubans) $2) + if (numitems(ubans)==4) { + for (@:xx=0,xx<4,@:xx+=4) { + mode $C -bbbb $getitem(ubans $xx) $getitem(ubans ${xx+1}) $getitem(ubans ${xx+2}) $getitem(ubans ${xx+3}) + } + @delarray(ubans) + } + } + ^on ^368 * { + ^on ^367 -"*" + if (:num=numitems(ubans)) { + mode $C -$repeat($num b) $getitem(ubans 0) ${num>1?getitem(ubans 1):[]} ${num>2?getitem(ubans 2):[]} + } + @delarray(ubans) + ^on ^368 -"*" + } + ^mode $C b +} + +alias ub if (![$0]) {^takeall} { + if (match(*!*@* $0)) { + mode $C -b $0 + }{ + ^on ^367 * { + @setitem(ubans $numitems(ubans) $2) + } + ^mode $C +b + ^userhost $0 -cmd { + if (rmatchitem(ubans $0!$3@$4) == -2) { + }{ + ^mode $C -b $getitem(ubans $rmatchitem(ubans $0!$3@$4)) + } + + @delarray(ubans) + } + ^on ^368 ^* + } + +} +alias kob { + if (![$0]) { + xecho -v -b kick on ban set to "$kickonban"} + if (match($0 on off)) {@kickonban = [$0] + xecho -v -b kick on ban set to "$kickonban" + }{ + if ([$0]&&!match($0 on off)) { + xecho -v -b invalid choice + } + } + + } +alias kops { + if (![$0]) { + xecho -v -b kick ops on ban set to "$kickops"} + if (match($0 on off)) {@kickops = [$0] + xecho -v -b kick ops on ban set to "$kickops" + }{ + if ([$0]&&!match($0 on off)) { + xecho -v -b invalid choice + } + } + + } + +^on #-mode_stripped 43 "% % +b*" { + if (kickonban == [on] && [$3] != [*!*@*] && rmatch(*!*$userhost($N) $3) == 0) { + fe ($onchannel($1)) n1 { + @bannick = pattern($3 $n1!$userhost($n1)) + if (kickops ==[on]) { + if (bannick) { + kick $1 $before(! $bannick) banned + } + } + if (kickops ==[off] && !ischanop($n1 $1)) { + if (bannick) { + kick $1 $before(! $bannick) banned + } } + } + + } + } + +alias _selfban { + if ([$0]==[ON] || [$0]==[OFF]) { + @_ubanself = [$0] + xecho -v (sprot).. unban self set to $0 + }{ + xecho -v (sprot).. unban self set to $_ubanself + } +} diff amn.orig/core/channel.m amn/core/channel.m --- amn.orig/core/channel.m Tue Oct 11 00:52:09 2005 +++ amn/core/channel.m Tue Oct 11 00:51:38 2005 @@ -91,7 +91,7 @@ alias qk { if (![$0]) { - xecho -b usage: /qk - will bankick specified nick then unban them after 5 seconds. + xecho $acban usage: /qk - will bankick specified nick then unban them after 5 seconds. }{ bankick $* @_bnick=[$0] diff amn.orig/core/channel.m.orig amn/core/channel.m.orig --- amn.orig/core/channel.m.orig Thu Jan 1 00:00:00 1970 +++ amn/core/channel.m.orig Mon Oct 3 03:00:19 2005 @@ -0,0 +1,361 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. +subpackage channel + +## op/oper commands. +alias bki {bk $*;ignore $0 msgs} +alias kbi {kb $*;ignore $0 msgs} +alias bkt {qk $*} +alias ov operview +alias unban ub $* +alias clearbans ub $* +alias not {^topic -$C } +alias untopic not +alias bans banstat +alias alldop mdeop +alias alldeop mdep +alias mdop mdeop +alias dop {deop $*} +alias allop mop +alias dv devoice $* +alias v voice $* +alias t topic $* +alias c {^mode $C $*} +alias i ixs +alias e exs +alias -I {^mode $C -I $*} +alias -E {^mode $C -e $*} +alias +I {^mode $C +I $*} +alias +E {^mode $C +e $*} +alias bk {bankick $*} +alias kb {bankick $*} +alias cmode {c $*} + +## misc parts. +alias epart emopart $* +alias dpart emopart $* +alias lall partall + +## diff ban types. +alias fuckem lban +alias lban mode $C +bbb *!*@0.0.0.0/1 *!*@128.0.0.0/1 *!*@0000::/1 $0 $0 $0 $0 +alias ip6ban {mode $C +b *!*@0000::/1} +alias ip4ban {mode $C +b *!*@0.0.0.0/1} +alias fakeop mode $C +oo-oo $0 $0 $0 $0 $0 $0 $0 $0 +alias hban {mode $C +b <3!<3@<3} + +## chan info. +alias scano sco $* +alias scanv scv $* +alias scann scn $* +alias n ^names $C + +## misc more complex aliases. + +alias emopart { + part $C $srand$randread($(loadpath)emopart.reasons) +} + +alias partall { + part $sar(g/ /,/$mychannels()) +} + +alias cops { + ^on who -* + ^on ^who * { + if ([$[2]2]==[G*] ^^ [$[2]2]==[H*]) { + xecho -w $winchan $cparse($(c1) $[9]0) $cparse($(c2) $[9]1) $cparse($(c1) $[20]5) $(cl)$3$cparse($(c1)@)$(cl)$4 + } + } + who $C + wait + ^on who -* + ^on ^who * { + xecho -w $winchan $cparse($(c1) $[9]0) $cparse($(c2) $[9]1) $cparse($(c1) $[20]5) $(cl)$3$cparse($(c1)@)$(cl)$4 + } +} + +alias sync { + @cmodes=[$M] + /c +m - $cmodes;/c -m + $cmodes + } + +alias omode { + if ([$0]==[on]) { + umode +sckf + } + if ([$0]==[off]) { + umode -sckf + } + } + +alias qk { + if (![$0]) { + xecho -b usage: /qk - will bankick specified nick then unban them after 5 seconds. + }{ + bankick $* + @_bnick=[$0] + ^timer 5 {ub $_bnick} + } +} + +alias unkey (void) +{ + if (match(*k* $chanmode())) { + //mode $C -k + } else { + xecho -b No key on channel $C + } +} + +alias ban if (![$0]) { + xecho -b syn: /ban nick + }{ + if (match(*!*@* $0)) { + //mode $C +b $0 + }{ + if (userhost($0) == [@]) { + ^userhost $0 -cmd { + if ([$3@$4]!=[@]) { + //mode $C +b $mask($_bt $0!$3@$4) + + } + } + }{ + //mode $C +b $mask($_bt $0!$userhost($0)) + + } + + } +} + +alias inv { + if (![$1]) { + ^invite $0 $C + }{ + ^invite $0 $1 + } +} + +alias kick { + if (numwords($*) == 0) { + xecho -b Usage: /KICK [reason]; + return + } + if ( numwords($*) < 2) { + //kick $C $0 $randread($(loadpath)kick.reasons) + }{ + //kick $C $0 $1- + } +} + +alias 4op { + fe ($*) ii { + ^quote mode $C +oooo $ii $ii $ii $ii + } +} + +alias 4v { + fe ($*) ii { + ^quote mode $C +vvvv $ii $ii $ii $ii + } +} + +alias bankick { + if (![$0]) { + xecho -b syn: /bankick nick + }{ + if (userhost($0) == [@]) { + ^userhost $0 -cmd { + if ([$3@$4]!=[@]) { + //mode $C +b $mask($_bt $0!$3@$4) + } + } + }{ + //mode $C -o+b $0 $mask($_bt $0!$userhost($0)) + } + kick $* + } +} + +alias kickban if (![$0]) { + xecho -b usage: /kickban nick + }{ if ( numwords($*) < 2) { + if (![$@1]) { + kick $* + }{ + kick $C $0 $1- + }} + if (userhost($0) == [@]) { + ^userhost $0 -cmd { + + if ([$3@$4]!=[@]) { + //mode $C +b $mask($_bt $0$3@$4) + } + } + }{ + //mode $C +b $mask($_bt $userhost($0)) + } +} + +alias iban if ([$0]) { + if (userhost($0) == [@]) { + ^userhost $0 -cmd { + if ([$3@$4]!=[@]) { + //mode $C +b *!*$3@* + } + } + }{ + //mode $C +b *!*$before(@ $userhost($0))@* + } + kick $* +} + +alias op if (![$0]) { + banner.lchead + banner.mid syn: /op + banner.foot +}{ + if (match(*#* $*)) { + fe ($1-) ii jj kk ll { + //mode $0 +oooo $ii $jj $kk $ll + } + }{ + fe ($*) ii jj kk ll { + //mode $C +oooo $ii $jj $kk $ll + } + } +} + +alias voice { + fe ($*) ii jj kk ll { + //mode $C +vvvv $ii $jj $kk $ll + } +} + +alias devoice { + fe ($*) ii jj kk ll { + //mode $C -vvvv $ii $jj $kk $ll + } +} + +alias deop { + fe ($*) ii jj kk ll { + //mode $C -oooo $ii $jj $kk $ll + } +} + +alias mv { + fe ($nochops()) ii jj kk ll { + //mode $C +vvvv $ii $jj $kk $ll + } +} + +alias mdv { + fe ($msar(g/?//@//.//+//$pattern(*+* $channel()))) ii jj kk ll { + //mode $C -vvvv $ii $jj $kk $ll + } +} + +alias mreop { + fe ($chops()) ii jj kk ll { + //mode $C +oooo $ii $jj $kk $ll + } +} + +alias mop { + fe ($nochops()) ii jj kk ll { + //mode $C +oooo $ii $jj $kk $ll + } +} + +alias mdeop { + if ([$0]) { + @_chanm=sar(g/,/ /$rest(1 $0-)) + fe ($remw($N $remws($_chanm / $chops()))) o1 o2 o3 o4 { + ^quote mode $C -oooo $o1 $o2 $o3 $o4 + } + xecho -b mass deoping $C minus $_chanm + }{ + fe ($remw($N $chops())) o1 o2 o3 o4 { + ^quote mode $C -oooo $o1 $o2 $o3 $o4 + } + xecho -b mass deoping $C + } + +} + +alias cycle { + @:chan=ischannel($0)?[$0]:C + @:key=key($chan) + xecho -b cycling on channel $chan\, one moment... + ^quote part $chan;wait;join $chan $key +} + +alias ecycle { + @:chan=ischannel($0)?[$0]:C + @:key=key($chan) + xecho -b emo cycling on channel $chan\, one moment... + ^emopart $chan;wait;join $chan $key +} + +alias waitop { + timer $srand($time())$rand(10) { + if (! [$ischanop($0 $1)]) { + mode $1 +o $0 } + } + } + + +alias lk if ([$0]) { + fe ($nochops()) n1 { + if (!ischanvoice($n1)) { + k $n1 $* + } + } +}{ + fe ($nochops()) n1 { + if (!ischanvoice($n1)) { + k $n1 mass kick + } + } +} +alias mko if ([$0]) { + fe ($remw($N $chops())) n1 { + k $n1 $* + } + }{ + fe ($remw($N $chops())) n1 { + k $n1 mass kick + } + } + +alias mkn if ([$0]) { + fe ($remw($N $nochops())) n1 { + k $n1 $* + } + }{ + fe ($remw($N $nochops())) n1 { + k $n1 mass kick + } +} + + +alias massk if (![$0]) { + xecho -b usage: /massk + }{ + @kvar=[$0] + xecho -b kicking all users with $kvar in version reply. + ^ver $C + ^on ^ctcp_reply "% % VERSION *" { + if (ischanop($0 $C)==0 || kickops == [on]) { + if (match(*$kvar* $2-)) { + k $0 $kvar is leet!@#$%^&* + } + } + } + + ^timer 50 ^on ^ctcp_reply -"% % VERSION *" +} + +oof diff amn.orig/core/fkey.m amn/core/fkey.m --- amn.orig/core/fkey.m Tue Oct 11 00:52:09 2005 +++ amn/core/fkey.m Tue Oct 11 00:51:38 2005 @@ -13,117 +13,117 @@ switch ($0) { (1) { if (![$1]) { - xecho -b function key 1 set to $fke1 + xecho $acban function key 1 set to $fke1 }{ @fke1 = [$1-] ^bind ^[[11~ parse_command $fke1 ^bind ^[[[A parse_command $fke1 ^bind ^[OP parse_command $fke1 - xecho -b function key 1 set to $fke1 + xecho $acban function key 1 set to $fke1 } } (2) { if (![$1]) { - xecho -b function key 2 set to $fke2 + xecho $acban function key 2 set to $fke2 }{ @fke2 = [$1-] ^bind ^[[12~ parse_command $fke2 ^bind ^[[[B parse_command $fke2 ^bind ^[OQ parse_command $fke2 - xecho -b function key 2 set to $fke2 + xecho $acban function key 2 set to $fke2 } } (3) { if (![$1]) { - xecho -b function key 3 set to $fke3 + xecho $acban function key 3 set to $fke3 }{ @fke3 = [$1-] ^bind ^[[13~ parse_command $fke3 ^bind ^[[[C parse_command $fke3 ^bind ^[OR parse_command $fke3 - xecho -b function key 3 set to $fke3 + xecho $acban function key 3 set to $fke3 } } (4) { if (![$1]) { - xecho -b function key 4 set to $fke4 + xecho $acban function key 4 set to $fke4 }{ @fke4 = [$1-] ^bind ^[[14~ parse_command $fke4 ^bind ^[[[D parse_command $fke4 ^bind ^[OS parse_command $fke4 - xecho -b function key 4 set to $fke4 + xecho $acban function key 4 set to $fke4 }} (5) { if (![$1]) { - xecho -b function key 5 set to $fke5 + xecho $acban function key 5 set to $fke5 }{ @fke5 = [$1-] ^bind ^[[15~ parse_command $fke5 ^bind ^[[[E parse_command $fke5 - xecho -b function key 5 set to $fke5 + xecho $acban function key 5 set to $fke5 }} (6) { if (![$1]) { - xecho -b function key 6 set to $fke6 + xecho $acban function key 6 set to $fke6 }{ @fke6 = [$1-] ^bind ^[[17~ parse_command $fke6 - xecho -b function key 6 set to $fke6 + xecho $acban function key 6 set to $fke6 }} (7) { if (![$1]) { - xecho -b function key 7 set to $fke7 + xecho $acban function key 7 set to $fke7 }{ @fke7 = [$1-] ^bind ^[[18~ parse_command $fke7 - xecho -b function key 7 set to $fke7 + xecho $acban function key 7 set to $fke7 }} (8) { if (![$1]) { - xecho -b function key 8 set to $fke8 + xecho $acban function key 8 set to $fke8 }{ @fke8 = [$1-] ^bind ^[[19~ parse_command $fke8 - xecho -b function key 8 set to $fke8 + xecho $acban function key 8 set to $fke8 }} (9) { if (![$1]) { - xecho -b function key 9 set to $fke9 + xecho $acban function key 9 set to $fke9 }{ @fke9 = [$1-] ^bind ^[[20~ parse_command $fke9 - xecho -b function key 9 set to $fke9 + xecho $acban function key 9 set to $fke9 }} (10) { if (![$1]) { - xecho -b function key 10 set to $fke10 + xecho $acban function key 10 set to $fke10 }{ @fke10 = [$1-] ^bind ^[[21~ parse_command $fke10 - xecho -b function key 10 set to $fke10 + xecho $acban function key 10 set to $fke10 }} (11) { if (![$1]) { - xecho -b function key 11 set to $fke11 + xecho $acban function key 11 set to $fke11 }{ @fke11 = [$1-] ^bind ^[[23~ parse_command $fke11 - xecho -b function key 11 set to $fke11 + xecho $acban function key 11 set to $fke11 }} (12) { if (![$1]) { - xecho -b function key 12 set to $fke12 + xecho $acban function key 12 set to $fke12 }{ @fke12 = [$1-] ^bind ^[[24~ parse_command $fke12 - xecho -b function key 12 set to $fke12 + xecho $acban function key 12 set to $fke12 }} } } diff amn.orig/core/fkey.m.orig amn/core/fkey.m.orig --- amn.orig/core/fkey.m.orig Thu Jan 1 00:00:00 1970 +++ amn/core/fkey.m.orig Mon Oct 10 20:27:29 2005 @@ -0,0 +1,152 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. +subpackage fkey + +alias fkeys { + load $(loadpath)ans/fkeys.ans +} + +alias fkey { + if (![$0]) { + load $(loadpath)ans/fkeys.ans + }{ + switch ($0) { + (1) { + if (![$1]) { + xecho -b function key 1 set to $fke1 + }{ + @fke1 = [$1-] + ^bind ^[[11~ parse_command $fke1 + ^bind ^[[[A parse_command $fke1 + ^bind ^[OP parse_command $fke1 + xecho -b function key 1 set to $fke1 + } + } + (2) { + if (![$1]) { + xecho -b function key 2 set to $fke2 + }{ + @fke2 = [$1-] + ^bind ^[[12~ parse_command $fke2 + ^bind ^[[[B parse_command $fke2 + ^bind ^[OQ parse_command $fke2 + xecho -b function key 2 set to $fke2 + } } + (3) { + if (![$1]) { + xecho -b function key 3 set to $fke3 + }{ + @fke3 = [$1-] + ^bind ^[[13~ parse_command $fke3 + ^bind ^[[[C parse_command $fke3 + ^bind ^[OR parse_command $fke3 + xecho -b function key 3 set to $fke3 + } } + (4) { + if (![$1]) { + xecho -b function key 4 set to $fke4 + }{ + + @fke4 = [$1-] + ^bind ^[[14~ parse_command $fke4 + ^bind ^[[[D parse_command $fke4 + ^bind ^[OS parse_command $fke4 + xecho -b function key 4 set to $fke4 + }} + (5) { + if (![$1]) { + xecho -b function key 5 set to $fke5 + }{ + @fke5 = [$1-] + ^bind ^[[15~ parse_command $fke5 + ^bind ^[[[E parse_command $fke5 + xecho -b function key 5 set to $fke5 + }} + (6) { + if (![$1]) { + xecho -b function key 6 set to $fke6 + }{ + + @fke6 = [$1-] + ^bind ^[[17~ parse_command $fke6 + xecho -b function key 6 set to $fke6 + }} + (7) { + if (![$1]) { + xecho -b function key 7 set to $fke7 + }{ + @fke7 = [$1-] + ^bind ^[[18~ parse_command $fke7 + xecho -b function key 7 set to $fke7 + }} + (8) { + if (![$1]) { + xecho -b function key 8 set to $fke8 + }{ + + @fke8 = [$1-] + ^bind ^[[19~ parse_command $fke8 + xecho -b function key 8 set to $fke8 + }} + (9) { + if (![$1]) { + xecho -b function key 9 set to $fke9 + }{ + + @fke9 = [$1-] + ^bind ^[[20~ parse_command $fke9 + xecho -b function key 9 set to $fke9 + }} + (10) { + if (![$1]) { + xecho -b function key 10 set to $fke10 + }{ + + @fke10 = [$1-] + ^bind ^[[21~ parse_command $fke10 + xecho -b function key 10 set to $fke10 + }} + + (11) { + if (![$1]) { + xecho -b function key 11 set to $fke11 + }{ + + @fke11 = [$1-] + ^bind ^[[23~ parse_command $fke11 + xecho -b function key 11 set to $fke11 + }} + (12) { + if (![$1]) { + xecho -b function key 12 set to $fke12 + }{ + + @fke12 = [$1-] + ^bind ^[[24~ parse_command $fke12 + xecho -b function key 12 set to $fke12 + }} + } + } +} + +^bind ^[[[A parse_command $fke1 +^bind ^[OP parse_command $fke1 +^bind ^[[11~ parse_command $fke1 +^bind ^[[[B parse_command $fke2 +^bind ^[OQ parse_command $fke2 +^bind ^[[12~ parse_command $fke2 +^bind ^[[[C parse_command $fke3 +^bind ^[OR parse_command $fke3 +^bind ^[[13~ parse_command $fke3 +^bind ^[[[D parse_command $fke4 +^bind ^[OS parse_command $fke4 +^bind ^[[14~ parse_command $fke4 +^bind ^[[[E parse_command $fke5 +^bind ^[[15~ parse_command $fke5 +^bind ^[[17~ parse_command $fke6 +^bind ^[[18~ parse_command $fke7 +^bind ^[[19~ parse_command $fke8 +^bind ^[[20~ parse_command $fke9 +^bind ^[[21~ parse_command $fke10 +^bind ^[[23~ parse_command $fke11 +^bind ^[[24~ parse_command $fke12 diff amn.orig/core/format.m amn/core/format.m --- amn.orig/core/format.m Tue Oct 11 00:52:09 2005 +++ amn/core/format.m Tue Oct 11 00:51:38 2005 @@ -46,66 +46,68 @@ if (isnumber($0)&&[$0] to set msg format - xecho -b current format set to $mform - @format_msg = getitem(mform $mform) + xecho $acban /format a to set msg format + xecho $acban current format set to $mform + @format_msg = getitem(mform $mform) } alias smform if ([$0]) { if (isnumber($0)&&[$0] to set send msg format - xecho -b current format set to $smform - @format_send_msg=getitem(smform $smform) + xecho $acban /format b to set send msg format + xecho $acban current format set to $smform + @format_send_msg=getitem(smform $smform) } alias pubform if ([$0]) { if (isnumber($0)&&[$0] to set public format - xecho -b current format set to $pubform - @format_public=getitem(pubform $pubform) + xecho $acban /format c to set public format + xecho $acban current format set to $pubform + @format_public=getitem(pubform $pubform) } alias spubform if ([$0]) { if (isnumber($0)&&[$0] to set send public format - xecho -b current format set to $spubform - @format_send_public=getitem(spubform $spubform) + xecho -b /format d to set send public format + xecho -b current format set to $spubform + @format_send_public=getitem(spubform $spubform) } @@ -160,10 +163,10 @@ if (isnumber($0)&&[$0] to set public other format - xecho -b current format set to $spuboform + xecho $acban /format e to set public other format + xecho $acban current format set to $spuboform @format_public_other=getitem(spuboform $spuboform) } @@ -190,10 +193,10 @@ if (isnumber($0)&&[$0] to set signoff format - xecho -b current format set to $signform - @format_signoff=getitem(signform $signform) + xecho $acban /format f to set signoff format + xecho $acban current format set to $signform + @format_signoff=getitem(signform $signform) } alias joinform if ([$0]) { if (isnumber($0)&&[$0] to set join format - xecho -b current format set to $joinform - @format_join=getitem(joinform $joinform) + xecho $acban /format g to set join format + xecho $acban current format set to $joinform + @format_join=getitem(joinform $joinform) } @@ -250,10 +253,10 @@ if (isnumber($0)&&[$0] to set leaveoff format - xecho -b current format set to $leaveform - @format_leave=getitem(leaveform $leaveform) + xecho $acban /format h to set leaveoff format + xecho $acban current format set to $leaveform + @format_leave=getitem(leaveform $leaveform) } alias modeform if ([$0]) { if (isnumber($0)&&[$0] to set modeoff format - xecho -b current format set to $modeform - @format_mode=getitem(modeform $modeform) + xecho $acban /format i to set modeoff format + xecho $acban current format set to $modeform + @format_mode=getitem(modeform $modeform) } alias notform if ([$0]) { if (isnumber($0)&&[$0] to set notice format - xecho -b current format set to $notform - @format_notice = getitem(notform $notform) + xecho $acban /format j to set notice format + xecho $acban current format set to $notform + @format_notice = getitem(notform $notform) } + alias pubnotform if ([$0]) { if (isnumber($0)&&[$0] to set public notice format - xecho -b current format set to $pubnotform - @format_public_notice=getitem(pubnotform $pubnotform) + xecho $acban /format z to set public notice format + xecho $acban current format set to $pubnotform + @format_public_notice=getitem(pubnotform $pubnotform) } alias snotform if ([$0]) { if (isnumber($0)&&[$0] to set send notice format - xecho -b current format set to $snotform - @format_send_notice=getitem(snotform $snotform) + xecho $acban /format k to set send notice format + xecho $acban current format set to $snotform + @format_send_notice=getitem(snotform $snotform) } @@ -395,10 +399,10 @@ if (isnumber($0)&&[$0] to set send dcc chat format - xecho -b current format set to $sdcform - @ format_send_dcc_chat = getitem(sdcform $sdcform) + xecho $acban /format l to set send dcc chat format + xecho $acban current format set to $sdcform + @ format_send_dcc_chat = getitem(sdcform $sdcform) } @@ -425,10 +429,10 @@ if (isnumber($0)&&[$0] to set dcc chat format - xecho -b current format set to $dcform - @format_dcc_chat=getitem(dcform $dcform) + xecho $acban /format m to set dcc chat format + xecho $acban current format set to $dcform + @format_dcc_chat=getitem(dcform $dcform) } alias topform if ([$0]) { if (isnumber($0)&&[$0] to set topic format - xecho -b current format set to $topform - @format_topic=getitem(topform $topform) + xecho $acban /format n to set topic format + xecho $acban current format set to $topform + @format_topic=getitem(topform $topform) } alias ctcpform if ([$0]) { if (isnumber($0)&&[$0] to set ctcp format - xecho -b current format set to $ctcpform - @format_ctcp=getitem(ctcpform $ctcpform) + xecho $acban /format o to set ctcp format + xecho $acban current format set to $ctcpform + @format_ctcp=getitem(ctcpform $ctcpform) } @@ -516,10 +520,10 @@ if (isnumber($0)&&[$0] to set send ctcp format - xecho -b current format set to $sctcpform - @format_send_ctcp=getitem(sctcpform $sctcpform) + @ format_send_ctcp=getitem(sctcpform $mm) + xecho $Cparse(%K[%n$mm%K]%n) $fparse(format_send_ctcp crapple #amnesiac 910492823 PING) + } + xecho $acban /format p to set send ctcp format + xecho $acban current format set to $sctcpform + @format_send_ctcp=getitem(sctcpform $sctcpform) } alias echostr if ([$0]) { if (isnumber($0)&&[$0] to set echostr - xecho -b current format set to $echostr + xecho $acban /format q to set echostr + xecho $acban current format set to $echostr } alias ncomp if ([$0]) { if (isnumber($0)&&[$0]%n") kreca$format_nick_comp hi! - xecho -b this is your new nick completion, /fsave to save. + @format_nick_comp=[$getitem(ncomp $0)] + //echo $G $cparse("%K<%ncrapple%K>%n") kreca$format_nick_comp hi! + xecho $acban this is your new nick completion, /fsave to save. @ncomp = [$0] - }{ - xecho -b please make a valid selection. + }{ + xecho $acban please make a valid selection. } }{ ncomp.show @@ -587,29 +592,28 @@ alias ncomp.load if ([$0]) { if (isnumber($0)&&[$0]%n") kreca$format_nick_comp hi! + @format_nick_comp=getitem(ncomp $nc) + xecho $acban $Cparse("%K[%n$([2]nc)%K]%n %K<%ncrapple%K>%n") kreca$format_nick_comp hi! } - xecho -b /format r to set nick completion - xecho -b current format set to $ncomp - @format_nick_comp=getitem(ncomp $ncomp) + xecho $acban /format r to set nick completion + xecho $acban current format set to $ncomp + @format_nick_comp=getitem(ncomp $ncomp) } - alias svform if ([$0]) { if (isnumber($0)&&[$0] to set version format - xecho -b current format set to $svform - @format_sv=getitem(svform $svform) + xecho $acban /format s to set version format + xecho $acban current format set to $svform + @format_sv=getitem(svform $svform) } @@ -637,10 +641,10 @@ if (isnumber($0)&&[$0] to set wall format - xecho -b current format set to $wallform - @format_wall=getitem(wallform $wallform) - @format_bwall=getitem(bwallform $bwallform) + xecho $acban /format v to set wall format + xecho $acban current format set to $wallform + @format_wall=getitem(wallform $wallform) + @format_bwall=getitem(bwallform $bwallform) } alias awayform if ([$0]) { if (isnumber($0)&&[$0] to set away format - xecho -b current format set to $awayform + xecho $acban /format w to set away format + xecho $acban current format set to $awayform @format_away = getitem(awayform $awayform) } + alias actform if ([$0]) { if (isnumber($0)&&[$0] to set action format - xecho -b current format set to $actform - @format_action=getitem(actform $actform) - @format_action_other=getitem(actoform $actoform) + xecho $acban /format x to set action format + xecho $acban current format set to $actform + @format_action=getitem(actform $actform) + @format_action_other=getitem(actoform $actoform) } + alias xdescform if ([$0]) { if (isnumber($0)&&[$0] to set describe format - xecho -b current format set to $descform - @format_desc=getitem(descform $descform) - @format_send_desc=getitem(sdescform $sdescform) - + xecho $acban /format y to set describe format + xecho $acban current format set to $descform + @format_desc=getitem(descform $descform) + @format_send_desc=getitem(sdescform $sdescform) } + alias whoform if ([$0]) { if (isnumber($0)&&[$0] to set who format - xecho -b format set to $whoform + xecho $acban /format 2 to set who format + xecho $acban format set to $whoform @format_who=getitem(whoform $whoform) } @@ -812,10 +816,10 @@ if (isnumber($0)&&[$0] to set nick change format - xecho -b current format set to $nickform + xecho $acban /format u to set nick change format + xecho $acban current format set to $nickform @format_nickname=getitem(nickform $nickform) } @@ -841,10 +845,11 @@ if (isnumber($0)&&[$0]%n timestamp in public format example.) + @format_timestamp_some=getitem(timeform $mm) + xecho $Cparse(%K[%n$mm%K]%n) $fparse(format_timestamp_some)$cparse(%m<%ncrapple%m>%n timestamp in public format example.) } - xecho -b /format 3 to set time stamp format - xecho -b current format set to $timeform + xecho $acban /format 3 to set time stamp format + xecho $acban current format set to $timeform @format_timestamp_some=getitem(timeform $timeform) } alias kickform if ([$0]) { if (isnumber($0)&&[$0] to set kick format - xecho -b current format set to $kickform - @format_kick=getitem(kickform $kickform) + xecho $acban /format 4 to set kick format + xecho $acban current format set to $kickform + @format_kick=getitem(kickform $kickform) } diff amn.orig/core/format.m.orig amn/core/format.m.orig --- amn.orig/core/format.m.orig Thu Jan 1 00:00:00 1970 +++ amn/core/format.m.orig Mon Oct 10 20:32:25 2005 @@ -0,0 +1,894 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. +subpackage format + +alias format { + if ([$#]) { + switch ($0) { + (a) { if ([$#] < 2) {mform.show} {mform $1} } + (b) { if ([$#] < 2) {smform.show} {smform $1} } + (c) { if ([$#] < 2) {pubform.show} {pubform $1} } + (d) { if ([$#] < 2) {spubform.show} {spubform $1} } + (e) { if ([$#] < 2) {spuboform.show} {spuboform $1} } + (f) { if ([$#] < 2) {signform.show} {signform $1} } + (g) { if ([$#] < 2) {joinform.show} {joinform $1} } + (h) { if ([$#] < 2) {leaveform.show} {leaveform $1} } + (i) { if ([$#] < 2) {modeform.show} {modeform $1} } + (j) { if ([$#] < 2) {notform.show} {notform $1} } + (k) { if ([$#] < 2) {snotform.show} {snotform $1} } + (l) { if ([$#] < 2) {sdcform.show} {sdcform $1} } + (m) { if ([$#] < 2) {dcform.show} {dcform $1} } + (n) { if ([$#] < 2) {topform.show} {topform $1} } + (o) { if ([$#] < 2) {ctcpform.show} {ctcpform $1} } + (p) { if ([$#] < 2) {sctcpform.show} {sctcpform $1} } + (q) { if ([$#] < 2) {echostr.show} {echostr $1} } + (r) { if ([$#] < 2) {ncomp.show} {ncomp $1} } + (s) { if ([$#] < 2) {svform.show} {svform $1} } + (t) { if ([$#] < 2) {evalcat $(loadpath)ans/scan.ans} {sformat $1;@snf=[$1]} } + (u) { if ([$#] < 2) {nickform.show} {nickform $1} } + (v) { if ([$#] < 2) {wallform.show} {wallform $1} } + (w) { if ([$#] < 2) {awayform.show} {awayform $1} } + (x) { if ([$#] < 2) {actform.show} {actform $1} } + (y) { if ([$#] < 2) {xdescform.show} {xdescform $1} } + (z) { if ([$#] < 2) {pubnotform.show} {pubnotform $1} } + (1) { if ([$#] < 2) {load $(loadpath)ans/whois.ans} {1format $1;@_whois=[$1]}} + (2) { if ([$#] < 2) {whoform.show} {whoform $1} } + (3) { if ([$#] < 2) {timeform.show} {timeform $1} } + (4) { if ([$#] < 2) {kickform.show} {kickform $1} } + } + }{ + load $(loadpath)ans/format.ans + } +} + + +alias mform if ([$0]) { + if (isnumber($0)&&[$0] to set msg format + xecho -b current format set to $mform + @format_msg = getitem(mform $mform) +} + +alias smform if ([$0]) { + if (isnumber($0)&&[$0] to set send msg format + xecho -b current format set to $smform + @format_send_msg=getitem(smform $smform) +} + + +alias pubform if ([$0]) { + if (isnumber($0)&&[$0] to set public format + xecho -b current format set to $pubform + @format_public=getitem(pubform $pubform) +} + +alias spubform if ([$0]) { + if (isnumber($0)&&[$0] to set send public format + xecho -b current format set to $spubform + @format_send_public=getitem(spubform $spubform) +} + + +alias spuboform if ([$0]) { + if (isnumber($0)&&[$0] to set public other format + xecho -b current format set to $spuboform + @format_public_other=getitem(spuboform $spuboform) +} + + +alias signform if ([$0]) { + if (isnumber($0)&&[$0] to set signoff format + xecho -b current format set to $signform + @format_signoff=getitem(signform $signform) +} + + +alias joinform if ([$0]) { + if (isnumber($0)&&[$0] to set join format + xecho -b current format set to $joinform + @format_join=getitem(joinform $joinform) +} + + +alias leaveform if ([$0]) { + if (isnumber($0)&&[$0] to set leaveoff format + xecho -b current format set to $leaveform + @format_leave=getitem(leaveform $leaveform) +} + +alias modeform if ([$0]) { + if (isnumber($0)&&[$0] to set modeoff format + xecho -b current format set to $modeform + @format_mode=getitem(modeform $modeform) +} + +alias notform if ([$0]) { + if (isnumber($0)&&[$0] to set notice format + xecho -b current format set to $notform + @format_notice = getitem(notform $notform) +} +alias pubnotform if ([$0]) { + if (isnumber($0)&&[$0] to set public notice format + xecho -b current format set to $pubnotform + @format_public_notice=getitem(pubnotform $pubnotform) +} + +alias snotform if ([$0]) { + if (isnumber($0)&&[$0] to set send notice format + xecho -b current format set to $snotform + @format_send_notice=getitem(snotform $snotform) +} + + +alias sdcform if ([$0]) { + if (isnumber($0)&&[$0] to set send dcc chat format + xecho -b current format set to $sdcform + @ format_send_dcc_chat = getitem(sdcform $sdcform) +} + + +alias dcform if ([$0]) { + if (isnumber($0)&&[$0] to set dcc chat format + xecho -b current format set to $dcform + @format_dcc_chat=getitem(dcform $dcform) +} + +alias topform if ([$0]) { + if (isnumber($0)&&[$0] to set topic format + xecho -b current format set to $topform + @format_topic=getitem(topform $topform) +} + +alias ctcpform if ([$0]) { + if (isnumber($0)&&[$0] to set ctcp format + xecho -b current format set to $ctcpform + @format_ctcp=getitem(ctcpform $ctcpform) +} + + +alias sctcpform if ([$0]) { + if (isnumber($0)&&[$0] to set send ctcp format + xecho -b current format set to $sctcpform + @format_send_ctcp=getitem(sctcpform $sctcpform) +} + + +alias echostr if ([$0]) { + if (isnumber($0)&&[$0] to set echostr + xecho -b current format set to $echostr +} + +alias ncomp if ([$0]) { + if (isnumber($0)&&[$0]%n") kreca$format_nick_comp hi! + xecho -b this is your new nick completion, /fsave to save. + @ncomp = [$0] + }{ + xecho -b please make a valid selection. + } +}{ + ncomp.show +} + +alias ncomp.load if ([$0]) { + if (isnumber($0)&&[$0]%n") kreca$format_nick_comp hi! + } + xecho -b /format r to set nick completion + xecho -b current format set to $ncomp + @format_nick_comp=getitem(ncomp $ncomp) +} + + +alias svform if ([$0]) { + if (isnumber($0)&&[$0] to set version format + xecho -b current format set to $svform + @format_sv=getitem(svform $svform) +} + + +alias wallform if ([$0]) { + if (isnumber($0)&&[$0] to set wall format + xecho -b current format set to $wallform + @format_wall=getitem(wallform $wallform) + @format_bwall=getitem(bwallform $bwallform) +} + +alias awayform if ([$0]) { + if (isnumber($0)&&[$0] to set away format + xecho -b current format set to $awayform + @format_away = getitem(awayform $awayform) +} +alias actform if ([$0]) { + if (isnumber($0)&&[$0] to set action format + xecho -b current format set to $actform + @format_action=getitem(actform $actform) + @format_action_other=getitem(actoform $actoform) +} +alias xdescform if ([$0]) { + if (isnumber($0)&&[$0] to set describe format + xecho -b current format set to $descform + @format_desc=getitem(descform $descform) + @format_send_desc=getitem(sdescform $sdescform) + +} +alias whoform if ([$0]) { + if (isnumber($0)&&[$0] to set who format + xecho -b format set to $whoform + @format_who=getitem(whoform $whoform) +} + + +alias nickform if ([$0]) { + if (isnumber($0)&&[$0] to set nick change format + xecho -b current format set to $nickform + @format_nickname=getitem(nickform $nickform) +} + +##timestamp +alias timeform if ([$0]) { + if (isnumber($0)&&[$0]%n timestamp in public format example.) + } + xecho -b /format 3 to set time stamp format + xecho -b current format set to $timeform + @format_timestamp_some=getitem(timeform $timeform) +} + +alias kickform if ([$0]) { + if (isnumber($0)&&[$0] to set kick format + xecho -b current format set to $kickform + @format_kick=getitem(kickform $kickform) +} diff amn.orig/core/fsets.m amn/core/fsets.m --- amn.orig/core/fsets.m Tue Oct 11 00:52:09 2005 +++ amn/core/fsets.m Tue Oct 11 00:51:38 2005 @@ -13,10 +13,10 @@ if (pattern(*$0* $fwords) && [$1]) { @format_choice=[$after(_ $0)] @format_$after(_ $0)=[$1-] - xecho -b fset $0 changed to $1- + xecho $acban fset $0 changed to $1- }{ fe ($pattern(*$0* $fwords)) a1 { - xecho -b $[31]a1 ...... $($a1) + xecho $acban $[31]a1 ...... $($a1) } } } diff amn.orig/core/fsets.m.orig amn/core/fsets.m.orig --- amn.orig/core/fsets.m.orig Thu Jan 1 00:00:00 1970 +++ amn/core/fsets.m.orig Mon Oct 10 20:56:39 2005 @@ -0,0 +1,250 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. +subpackage fsets + +@fwords=[format_scan_onjoin_nicks_border format_scan_nicks_border format_scan_onjoin_nicks format_scan_users_op format_scan_users_non format_scan_users_voc format_scan_users format_scan_header format_scan_nicks format_scan_footer format_timestamp_some format_who format_who_footer format_whois_signon format_whois_actual format_who format_whois_header format_whois_admin format_whois_nick format_whois_name format_whois_channels format_whois_server format_whois_away format_whois_operator format_whois_idle format_whois_unknown format_whois_footer format_whowas_header format_whowas_nick format_whowas_name format_whowas_unknown format_whowas_footer format_sort format_user_non format_chops format_bwall format_msg format_send_msg format_public format_send_public format_public_other format_signoff format_join format_leave format_mode format_notice format_public_notice format_send_notice format_send_dcc_chat format_dcc_chat format_topic format_ctcp format_send_ctcp format_nick_comp format_sv format_wall format_away format_back format_action format_action_other format_desc format_send_desc format_wallop format_nickname format_invite format_dcc_connect format_dcc_request format_kick format_ctcp_reply format_server_notice format_dcc_lost_chat format_dcc_lost_file format_dcc_done_file] +^on ^set "format_*" { + if ([$0]) { + if (!pattern(*$0* $fwords)) { + banner.lchead + banner.mid $banner $0 format not found + banner.lcfoot + }{ + if (pattern(*$0* $fwords) && [$1]) { + @format_choice=[$after(_ $0)] + @format_$after(_ $0)=[$1-] + xecho -b fset $0 changed to $1- + }{ + fe ($pattern(*$0* $fwords)) a1 { + xecho -b $[31]a1 ...... $($a1) + } + } + } + } +} +alias sfset { + @format_choice=[$after(_ $0)] + @format_$after(_ $0)=[$1-] +} + + +alias fset if (![$0]) { + fe ($fwords) _a1 { + set $_a1 + } +}{ + if (pattern(*$0* $fwords)) { + set $0 $1- + } +} + +alias fparse {eval return $(cparse($($*)))} +@ format_msg_group = [%K-$$(c2)$$1%K:$$(c1)$$2%K-%n $$3-] +@ format_wallop = [%K!$$(c1)$$1:$$2%K! %n$$3-] +@ format_nickname = [$$G %c$$1 %nis now known as %m$$2] +@ format_kick = [$$G $$1 was kicked off $$3 by $$(c3)$$2 %K\\\(%n$$4-%K\\\))] +@ format_invite = [$$G %K<$$(c1)\$1%K\\\($$(c2)invite%K.$$(c1)\$2%K\\\)>] +@ format_dcc_connect = [$$G %K[%cdcc%m\(%nconnect%m\)%K]%n connection with %w$$1%K[$$(c2)$$3, port $$4%K]%n established] +@ format_dcc_request = [$$G %K[%cdcc%m\(%nrequest%m\)%K]%n %K\\\(%n$$3%K\\\) %nrequest from %w$$1%K[$$(c1)$$userhost() %K[$$(c3)$$4%K:$$(c3)$$5%K]]] +@ format_ctcp_reply = [$$G CTCP %W$$2 %nreply from $$1: $$3-] +@ format_server_notice = [%K!$$(c1)$$1%K! %n$$2-] +@ format_dcc_lost_chat = [$$G %K[%cdcc%m\(%nchat%m\)%K] %nto %c$$1 %nlost %K\(%n$tolower($4-)%K\)] +@ format_dcc_lost_file = [$$G %K[%cdcc%m\(%file%m\)%K] %nto $$1 $$3 $$4 $$5] +@ format_dcc_done_file = [$$G %K[%cdcc%m\(%ndone%m\)%K]%n %K:$$(c2)$$3 %nto $$1 completed in %K\\\(%W$$4 kb/sec%K\\\)] +@ format_chops = [ %K[%n$$[10]2%K] %K[@$$(c2)$$[9]1%K] %K[%n$$before(@ $userhost($1))%K@%n$$after(@ $userhost($1))%K]] +@ format_user_non = [ %K[%n$$[10]2%K] %K[$$(c2)$$[9]1%K] %K[%n$$before(@ $userhost($1))%K@%n$$after(@ $userhost($1))%K]] +@ format_user_vocs = [ %K[%n$$[10]2%K] %K[v$$(c2)$$[9]1%K] %K[%n$$before(@ $userhost($1))%K@%n$$after(@ $userhost($1))%K]] +@ format_public_notice = [%K-%n$$1%K:%n$$2%K-%n $$3-] +@ format_who=[ %K[%C³%K] %c$$[10]center(10 $2) $[20]center(20 %K\\\(%n$$4%W@%n$$5%K\\\)) %K[%n$$[3]3%K] [%n$$6%m/%c$$8-%K]] +@ format_who_footer=[ ÀÄÄÄÄÄ---%cÄ%C--%cÄÄ%C-%cÄÄÄÄÄÄ---%KÄ%c--%KÄÄ%c-%KÄÄÄÄÄÄÄÄÄ--- -- -] + +## who fsets. +^on ^who * { + xecho $fparse(format_who $*) +} +^on ^315 "*" { + xecho $fparse(format_who_footer $*) +} + +## msg fsets. +^on ^msg_group * {//echo $fparse(format_msg_group $0 $1 $2-)} +^on ^msg * {//echo $fparse(format_msg $0 $userhost() $1-)} +^on ^send_msg * {//echo $fparse(format_send_msg $0 $1-)} + +## notice fsets. +^on ^wallop * //echo $fparse(format_wallop $0 $1 $2-) +^on ^notice * { + if (tolower($right(4 $0)) ==[serv]){ + //echo $fparse(format_notice $0 *@* $1-) + }{ + //echo $fparse(format_notice $0 $userhost() $1-) + } + } + +## public fsets. +^on ^public_notice * //echo $fparse(format_public_notice $0 $1 $2-) +^on ^send_notice * //echo $fparse(format_send_notice $0 $1-) + +## ctcp fsets. +^on ^ctcp * xecho $fparse(format_ctcp $0 $userhost() $1 $2 $3 $4) +^on ^ctcp_reply * //echo $fparse(format_ctcp_reply $0 $2 $3-) +^on ^send_ctcp * if ([$0]==[privmsg]&&[$2]!=[action]) {//echo $fparse(format_send_ctcp $0 $1 $2 $3-)} + +## dcc fsets. +^on ^send_dcc_chat * //echo $fparse(format_send_dcc_chat $0 $1-) +^on ^dcc_chat * //echo $fparse(format_dcc_chat $0 $1-) +^on ^dcc_connect * //echo $fparse(format_dcc_connect $0 $1 $2 $3 $4 $5) +^on ^dcc_request * //echo $fparse(format_dcc_request $0 $1 $2 $3 $4 $5 $6) + +## nutbars dcc lost hooks +^on ^dcc_lost "% CHAT *" { + xecho $fparse(format_dcc_lost_chat $*) +} +## end nutbars dcc lost hooks. + +## fsets with getusers here... +^on ^channel_signoff * { +xecho $fparse(format_signoff $0 $1 $2-) +defer getusers +} +^on ^join * { +xecho $fparse(format_join $0 $1 $2) +defer getusers +} +^on ^part * { +xecho $fparse(format_leave $0 $userhost() $1 $3-) +defer getusers +} +^on ^mode * { +xecho $fparse(format_mode $0 $1 $2 $3-) +defer getusers +} + +## other fsets. +^on ^nickname * //echo $fparse(format_nickname $0 $1) +^on ^invite * //echo $fparse(format_invite $0 $1);//echo $G press Ctrl-K to join;@invchan=[$1] +^on ^kick * //echo $fparse(format_kick $0 $1 $2 $3-) + +## non-moduler fsets. (perm) +^on ^471 * //echo $G $1 channel is full +^on ^475 * //echo $G $1 wrong key, keep trying +^on ^473 * //echo $G $1 you're not invited +^on ^329 * //echo $G channel $1 created at $strftime($2 %a %b %d %T %Z %Y) +^on ^368 * //echo $G $1 ban(s) on $2 +^on ^347 * //echo $G $1 i-exempt(s) on $2 +^on ^349 * //echo $G $1 e-exempt(s) on $2 +^on ^221 * //echo $G current user mode is "$1" +^on ^341 * //echo $G coercing $1 to $2 +^on ^331 * abecho %R\(%n$1%R\)%n topic not set + +## knocks. +^on ^710 * { +@:thenick=word(0 $split(! $2)) +@:therest=mid($strlen($thenick) $strlen($2) $2) +aecho $fparse(format_timestamp_some $($_timess))$(hwht)\<$(cl)knock$(hwht)\>$(cl) $(hred)$0$(cl) $(hwht)$(thenick)$(cl)$therest \($1\) +} + +## topic stuff +^on ^332 * abecho $(grn)\($(cl)$(wht)t$(cl)opic/$1$(grn)\)$(cl) $2- +^on ^333 * abecho $(grn)\($(cl)$(wht)s$(cl)et$(grn)\)$(cl) by $2 at $strftime($3 %a %b %d %T %Z) +^on ^315 * # +^on ^305 * # +^on ^topic * { + if ([$2]==[]) { + //echo $G topic unset by $0 on $1 at $strftime(%a %b %d %T %Z) + }{ + //echo $G $fparse(format_topic $0 $1 $2-) + } +} + +## banlist hooks +^on ^433 * xecho -b $1 $sar(g/:/$(hblk):$(cl) /$2) $3 $4 $5 $6 +^on ^401 * xecho -b $1- +^on ^306 * # +^on ^405 * abecho %m\(%n$1%m\)%n the fascist server won't let you join anymore chans! +^on ^441 * xecho -b $1 isn't on channel $2 +^on ^482 * abecho %m\(%n$1%m\)%n you need to be a chanop yo! +^on ^474 * abecho %m\(%n$1%m\)%n a fascist channel op has banned you. %m\(%n+b%m\) + +## whois stuff + +on ^311 * { + if (format_whois_header) { + xecho $fparse(format_whois_header) + } + xecho $fparse(format_whois_nick $1 $2 $3 $5-) + if (format_whois_name) { + xecho $fparse(format_whois_name $5-) + } +} +on ^319 * xecho $fparse(format_whois_channels $2-) +on ^312 * xecho $fparse(format_whois_server $2 $3-) +on ^301 * xecho $fparse(format_whois_away $1-) +on ^317 * { + xecho $fparse(format_whois_idle $2) + xecho $fparse(format_whois_signon $1 $stime($3)) +} + +on ^318 * { + if (format_whois_footer) { + xecho $fparse(format_whois_footer) + } +} +on ^314 * { + xecho $fparse(format_whowas_header) + xecho $fparse(format_whowas_nick $1 $2 $3) + xecho $fparse(format_whowas_name $5-) +} +on ^338 * { + xecho $fparse(format_whois_actual $*) +} +on ^330 * { + xecho $fparse(format_whois_login $*) +} +on ^308 * { + xecho $fparse(format_whois_admin $1-) +} +on ^313 * { + + ^local rcl. + @ rcl.0 = [has cobwebs spanning him and his computer] + @ rcl.1 = [is most likely overweight and named after a clay cartoon figure] + @ rcl.2 = [is a fascist] + @ rcl.3 = [is a jewish irc warrior] + @ rcl.4 = [epitomizes the pointlessness of irc] + @ rcl.5 = [likes little children and small farm animals.] + @ rcl.6 = [gave up his social life for irk.] + @ rcl.7 = [isn't interested in you unless you're an eight year old male] + @ rcl.8 = [is large and hairy and wants you to pick up his soap.] + @ rcl.9 = [takes pleasure in setting his pubic hair alight] + @ rcl.10 = ['s wife/girlfriend is a slut] + @ rcl.11 = [reads PlayGirl in the toilet] + @ rcl.12 = [is a leeto eyearesee pimp!#@!] + @ rcl.13 = [is a member of the Hair Club for Men] + @ rcl.14 = [says, "You're not fully clean unless you're anally clean!] + @ rcl.15 = [is as helpful to the world as ebola is] + @ rcl.16 = [kisses more ass than you] + @ rcl.17 = [is clueless] + @ rcl.18 = [loves you with all his heart] + @ rcl.19 = [is a doodoo head] + @ rcl.20 = [is a doodlekid] + @ rcl.21 = [is a target for pie-tossing clowns] + @ rcl.22 = ['s body hair is a mystery to science] + @ rcl.23 = [wants you to bend over] + @ rcl.24 = [voted for Bush] + @ rcl.25 = ['s face is more plastic than flesh] + $rcl[$rand(26)] +^randcl +xecho $fparse(format_whois_operator $1 $rcl[$rand(26)]) +} +^on ^401 * { + xecho $fparse(format_whois_header) + xecho $fparse(format_whois_unknown $1) +} +^on ^369 * { + xecho $fparse(format_whowas_footer) +} +^on ^406 * { + xecho $fparse(format_whowas_header) + xecho $fparse(format_whowas_unknown $1) +} diff amn.orig/core/help.m amn/core/help.m --- amn.orig/core/help.m Tue Oct 11 00:52:09 2005 +++ amn/core/help.m Tue Oct 11 00:51:38 2005 @@ -133,7 +133,7 @@ if ([$0]) { if (!match($0 $hwords)) { banner.head - xecho -b command: $0 not found + xecho $acban command: $0 not found banner.foot }{ banner.head diff amn.orig/core/help.m.orig amn/core/help.m.orig --- amn.orig/core/help.m.orig Thu Jan 1 00:00:00 1970 +++ amn/core/help.m.orig Mon Oct 10 20:57:40 2005 @@ -0,0 +1,144 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. +subpackage help + +@hwords=[rn rk vocs bantype fset ban mko mkn massk orignick ub sping bkt dldir ps ls cd dns nslookup fkeys format q bans banstat wii mdop mdeop dop dv v scano scanv scann t k umode m j l wi ver c nochat chat bk op voice deop mop cycle mreop readlog wall user chops sv frelm tsave freln away back format config color sbcolor dict fsave sbar scan wk wlk wn wp wj wc csave banstat bankick cig cops devoice fctcp iban inv kickban kb links lk lsay mdv more mv mw nops not partall qk staynick supt theme tig unban untheme winhelp] +alias ahelp if (![$0]) { +banner.head + @_ohcenter=[${word(0 $geom()) / 2 + 40}] + aecho | $center($_ohcenter a m n e s i a c h e l p) + @_ohwidth=[${word(0 $geom()) / 14}] + fe ($jot(1 $_ohwidth)) n1 { + ^push _htopics ahelp.$n1 + ^push _htopics2 %K[%n\$[10]ahelp\.$(n1)%K] + } + fe ($hwords) n1 { + if (match($n1 $aliasctl(alias match *))) { + ^push hwords2 $n1 + } + } + fe ($hwords2) $_htopics { + eval banner.mid $_htopics2 + } + ^assign -_htopics;^assign -_htopics2;^assign -hwords2 + banner.foot +abecho $a.ver usage -> /ahelp +}{ +@ :rn=[%Wu%nsage%K:%n /rn will change nick to a random nick of 7 chars] +@ :rk=[%Wu%nsage%K:%n /rk will kick a random nick out of your current channel] +@ :winhelp=[%Wu%nsage%K:%n /winhelp will display help menu for windowing shortcuts. +@ :untheme=[%Wu%nsage%K:%n /untheme will make amnesiac revert back to the default theme. +@ :unban=[%Wu%nsage%K:%n /unban will unban nick or host from current channel +@ :tig=[%Wu%nsage%K:%n /tig will display all current ignores and prompt to delete one. +@ :theme=[%Wu%nsage%K:%n /theme will display all amnesiac themes and you can choose which one you want. +@ :supt=[%Wu%nsage%K:%n /supt will paste client version and uptime to current channel +@ :staynick=[%Wu%nsage%K:%n /staynick will cancel /orignick. +@ :qk=[%Wu%nsage%K:%n /qk - will bankick specified nick then unban them after 5 seconds. +@ :bkt=[%Wu%nsage%K:%n /bkt same as qt. +@ :dldir=[%Wu%nsage%K:%n /dldir sets download path. +@ :partall=[%Wu%nsage%K:%n /partall will part all current channels. +@ :not=[%Wu%nsage%K:%n /not will unset topic on current channel. +@ :nops=[%Wu%nsage%K:%n /nops will display all nonops on current channel. +@ :vocs=[%Wu%nsage%K:%n /vocs will display all voiced members on current channel. +@ :mw=[%Wu%nsage%K:%n /mw -hidden|split|kill +@ :mv=[%Wu%nsage%K:%n /mv will mass voice everyone on current channel +@ :more=[%Wu%nsage%K:%n /more will display text file to screen. +@ :mdv=[%Wu%nsage%K:%n /mdv will mass devoice current channel. +@ :lsay=[%Wu%nsage%K:%n /lsay just try it :) +@ :lk=[%Wu%nsage%K:%n /lk will kick all non op'd and voiced lusers from current channel +@ :links=[%Wu%nsage%K:%n /links will give you a server list of all the servers linked to current network +@ :kickban=[%Wu%nsage%K:%n /kickban will kick and ban nick from current channel +@ :kb=[%Wu%nsage%K:%n /kb will kick and ban nick from current channel. +@ :inv=[%Wu%nsage%K:%n /inv will invite nick to current channel. +@ :iban=[%Wu%nsage%K:%n /iban will ban nick by ident from current channel +@ :fctcp=[%Wu%nsage%K:%n /fctcp nick/channel will send a fake ctcp to specifed nick or channel. +@ :devoice=[%Wu%nsage%K:%n /devoice devoices nicks from current channel. +@ :cops=[%Wu%nsage%K:%n /cops to list irc operators on current channel. +@ :cig=[%Wu%nsage%K:%n /cig to ignore public from current or specified channel +@ :bankick=[%Wu%nsage%K:%n /bankick will ban and kick nick from current channel. +@ :q=[%Wu%nsage%K:%n /q nick querys nick +@ :bans=[%Wu%nsage%K:%n /bans shows current banlist on channel +@ :wii=[%Wu%nsage%K:%n /wii nick whois's nick +@ :mdop=[%Wu%nsage%K:%n /mdop <-nick1,nick2,nick3..> mass deops current channel minus nicks specified. +@ :mdeop=[%Wu%nsage%K:%n /mdeop <-nick1,nick2,nick3..> mass deops current channel minus nicks specified. +@ :dop=[%Wu%nsage%K:%n /dop deops nick +@ :dv=[%Wu%nsage%K:%n /dv devoices nick +@ :v=[%Wu%nsage%K:%n /v voices nick +@ :scano=[%Wu%nsage%K:%n /scano scans for current ops on channel +@ :scanv=[%Wu%nsage%K:%n /scanv scans for current voiced on channel +@ :scann=[%Wu%nsage%K:%n /scann scans for current non op/voiced on channel +@ :t=[%Wu%nsage%K:%n /t sets topic for current channel +@ :k=[%Wu%nsage%K:%n /k nick kicks nick with reason +@ :umode=[%Wu%nsage%K:%n /umode changes user mode +@ :m=[%Wu%nsage%K:%n /m nick msgs nick with msg +@ :j=[%Wu%nsage%K:%n /j channel joins channel +@ :l=[%Wu%nsage%K:%n /l leaves current channel +@ :wi=[%Wu%nsage%K:%n /wi whois's nick +@ :ver=[%Wu%nsage%K:%n /ver nick ctcp versions nick +@ :c=[%Wu%nsage%K:%n /c changes mode on current channel +@ :nochat=[%Wu%nsage%K:%n /nochat dcc closes chat with nick +@ :chat=[%Wu%nsage%K:%n /chat sends dcc chat request to nick +@ :bk=[%Wu%nsage%K:%n /bk bankicks nick for reason +@ :op=[%Wu%nsage%K:%n /op ops nick on current channel +@ :voice=[%Wu%nsage%K:%n /voice voices nick on current channel +@ :deop=[%Wu%nsage%K:%n /deop deops nick on current channel +@ :mop=[%Wu%nsage%K:%n /mop mass ops current channel +@ :cycle=[%Wu%nsage%K:%n /cycle leaves then joins current channel +@ :mreop=[%Wu%nsage%K:%n /mreop mass ops current ops on channel +@ :readlog=[%Wu%nsage%K:%n /readlog reads away log +@ :wall=[%Wu%nsage%K:%n /wall mass notices current ops on channel +@ :user=[%Wu%nsage%K:%n /user <-nonops> <-ops> <-sort> hostmask :scans nicks on channel +@ :chops=[%Wu%nsage%K:%n /chops scans op'd nicks on channel +@ :sv=[%Wu%nsage%K:%n /sv shows current client/script version to channel +@ :away=[%Wu%nsage%K:%n /away set yourself away] +@ :back=[%Wu%nsage%K:%n /back turns away off.] +@ :format=[%Wu%nsage%K:%n /format changes format letter to #] +@ :config=[%Wu%nsage%K:%n /config changes config letter to #] +@ :color=[%Wu%nsage%K:%n /color changes color to desired colors] +@ :sbcolor=[%Wu%nsage%K:%n /sbcolor changes sbar color to desired colors] +@ :v=[%Wu%nsage%K:%n /v voices nick] +@ :dict = [%Wu%nsage%K:%n /dict looks up word in online dictionary] +@ :saveall = [%Wu%nsage%K:%n /saveall saves all settings] +@ :fsave = [%Wu%nsage%K:%n /fsave saves all format settings] +@ :sbar = [%Wu%nsage%K:%n /sbar changes sbar to desired number] +@ :scan = [%Wu%nsage%K:%n /scan scans current channel for nicks] +@ :wk = [%Wu%nsage%K:%n /wk kills current window] +@ :wlk = [%Wu%nsage%K:%n /wlk leaves channel and kills window] +@ :wn = [%Wu%nsage%K:%n /wn changes to next window] +@ :wp = [%Wu%nsage%K:%n /wp changes to previous window] +@ :wj = [%Wu%nsage%K:%n /wj opens up new window and joins channel specified] +@ :wc = [%Wu%nsage%K:%n /wc creates new window] +@ :frelm = [%Wu%nsage%K:%n /frelm fakes recvied msg and pastes it to channel] +@ :freln = [%Wu%nsage%K:%n /freln fakes recvied notice and pastes it to channel] +@ :csave = [%Wu%nsage%K:%n /csave saves color settings] +@ :format = [%Wu%nsage%K:%n /format changes format number to selected format +@ :sping = [%Wu%nsage%K:%n /sping pings server and returns lag time to it +@ :ub = [%Wu%nsage%K:%n /ub ub by itself will clear all bans on current channel , /ub nick will unban nick from current channel +@ :ps = [%Wu%nsage%K:%n /ps equivelent to shell command +@ :ls = [%Wu%nsage%K:%n /ls equivelent to shell command +@ :cd = [%Wu%nsage%K:%n /cd equivelent to shell command +@ :dns = [%Wu%nsage%K:%n /dns domain nameserver request to given nick +@ :nslookup = [%Wu%nsage%K:%n /nslookup domain nameserver request to given ip +@ :orignick = [%Wu%nsage%K:%n /orignick will check the specified nick for the amount of seconds you specify in the config. (default is 3) and change to it when that nick signs off +@ :fkeys = [%Wu%nsage%K:%n /fkeys shows which fkeys are bound to which and can be changed by /fkey1 /fkey2 ... +@ :mkn = [%Wu%nsage%K:%n /mkn text will kick all non op'd from channel +@ :mko = [%Wu%nsage%K:%n /mko text will kick all ops from channel +@ :massk = [%Wu%nsage%K:%n /massk will kick all users from the channel with specified version string +@ :ban = [%Wu%nsage%K:%n /ban nick will ban nick's userhost from current channel +@ :fkey = [%Wu%nsage%K:%n /fkey <#1-12> will set function keys to specified command +@ :fset = [%Wu%nsage%K:%n /fset format_choice will change specified format +@ :bantype = [%Wu%nsage%K:%n /bantype Usage: /bantype - When a ban is done on a nick, it uses +@ :banstat = [%Wu%nsage%K:%n /banstat Usage: /banstat will show current bans on channel, who set them and what time they were set + + if ([$0]) { + if (!match($0 $hwords)) { + banner.head + xecho -b command: $0 not found + banner.foot + }{ + banner.head + //echo $cparse("$($*)") + banner.foot + } + } +} diff amn.orig/core/mod.m amn/core/mod.m --- amn.orig/core/mod.m Tue Oct 11 00:52:09 2005 +++ amn/core/mod.m Tue Oct 11 00:51:38 2005 @@ -8,8 +8,8 @@ alias addmod { if (![$0]) { - xecho -b syn: /addmod module1,module2,etc.. - xecho -b valid modules are [$_modules] + xecho $acban syn: /addmod module1,module2,etc.. + xecho $acban valid modules are [$_modules] }{ @_ach=sar(g/,/ /$0) if ([$0]==[*]) { @@ -19,7 +19,7 @@ @setitem(_mods $numitems(_mods) $a1) ^load $(loadpath)modules/$(a1)/$(a1).m } - xecho -b loaded modules $_modules + xecho $acban loaded modules $_modules }{ fe ($_ach) n1 { if (match($n1 $_modules) > 0 && finditem(_mods $n1) < 0) { @@ -28,11 +28,11 @@ ^load $(loadpath)modules/$(n1)/$(n1).m ^push _mlist $n1 }{ - xecho -b $n1 module not found or already loaded. + xecho $acban $n1 module not found or already loaded. } } if (_mlist) { - xecho -b $_mlist module(s) loaded. + xecho $acban $_mlist module(s) loaded. } ^assign -_mlist } @@ -41,7 +41,7 @@ alias listmod { if (numitems(_mods) == 1) { - xecho -b no modules current on list + xecho $acban no modules current on list }{ eval aecho ----------------------= Modules Loaded =------------------ for (@xx=1, xx 0 && finditem(_mods $n1) < 0) { + @setitem(_mods 0 !) + @setitem(_mods $numitems(_mods) $n1) + ^load $(loadpath)modules/$(n1)/$(n1).m + ^push _mlist $n1 + }{ + xecho -b $n1 module not found or already loaded. + } + } + if (_mlist) { + xecho -b $_mlist module(s) loaded. + } + ^assign -_mlist + } + } +} + +alias listmod { + if (numitems(_mods) == 1) { + xecho -b no modules current on list + }{ + eval aecho ----------------------= Modules Loaded =------------------ + for (@xx=1, xx= numitems(_mods) ) + { + @:mod2 = [] + } + { + @ :mod2 = [\(${xx+1}\) $getitem(_mods ${xx+1})] + } + //echo $[30]mod1 $mod2 + } + eval aecho ----------------------------------------------------------- + xecho -b /vmod to list valid modules /emod view module descriptions + } +} + +alias delmod { + if ([$#]) { + if ([$0]==[*]) { + fe ($listarray(_mods)) n1 { + ^unload $n1 + } + @delarray(_mods) + @setitem(_mods 0 !) + xecho -b deleted all modules from list + }{ + @_mch1=sar(g/,/ /$0) + fe ($_mch1) n1 { + if (!match($n1 $jot(1 $words($_modules)))) { + fe ($_mch1) n1 { + ^unload $n1 + @delitem(_mods $finditem(_mods $n1)) + } + } + } + if (match($n1 $jot(1 $words($_modules)))) { + fe ($_mch1) n1 { + ^push _mlist $getitem(_mods $n1) + } + fe ($_mlist) n1 { + @_mdnum=finditem(_mods $n1) + @delitem(_mods $_mdnum) + ^unload $n1 + } + ^assign -_mlist + } + xecho -b deleted module entry $_mch1 + } + }{ + xecho -b usage: /delmod num1,num2,etc.. or name1,name2,etc.. + } +} + +alias modsave { + @rename($modfile $modfile~) + @savemt = open($modfile W) + for (@xx=1, xx and <+nick> in public set to $0 + @showop = [$0] + xecho $acban showing <@nick> and <+nick> in public set to $0 }{ - xecho -b extpub/modeshow set to $showop + xecho $acban extpub/modeshow set to $showop } } diff amn.orig/core/modeshow.m.orig amn/core/modeshow.m.orig --- amn.orig/core/modeshow.m.orig Thu Jan 1 00:00:00 1970 +++ amn/core/modeshow.m.orig Mon Oct 10 20:38:27 2005 @@ -0,0 +1,79 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. +subpackage modeshow + +alias modeshow vocop $* +alias showmodes vocop $* +alias vocop { + if ([$0]==[ON] || [$0]==[OFF]) { + @showop = [$0] + xecho -b showing <@nick> and <+nick> in public set to $0 + }{ + xecho -b extpub/modeshow set to $showop + } +} + + +on ^public * { + @extravar = [] + @thenick =[$0] + if (showop == [on]) { + if (ischanop($0 $1)) { + @extravar = [$(c5)@$(cl)] + } else if (ischanvoice($0 $1)) { + @extravar = [$(c5)+$(cl)] + } + } + if (match($_pubnick* $2-) > 0) { + @thenick=[$(hwht)$0$(cl)] + } + if (match($_r2* $2-) > 0) { + @thenick=[$(hwht)$0$(cl)] + } + if (match($_r3* $2-) > 0) { + @thenick=[$(hwht)$0$(cl)] + } + if (match($_r4* $2-) > 0) { + @thenick=[$(hwht)$0$(cl)] + } + if (winchan($0)==-1 || winchan($winchan($1)) != [$1] ) { + //echo $fparse(format_public $(extravar)$(thenick):$1 $2-) + } else { + //echo $fparse(format_public $(extravar)$thenick $2-) + } + + +} + +on ^public_other * { + @extravar = [] + @thenick =[$0] + if (showop == [on]) { + if (ischanop($0 $1)) { + @extravar = [$(c5)@$(cl)] + } else if (ischanvoice($0 $1)) { + @extravar = [$(c5)+$(cl)] + } + } + if (match($_pubnick* $2-) > 0) { + @thenick=[$(hwht)$0$(cl)] + } + //echo $fparse(format_public_other $(extravar)$(thenick) $1 $2-) + +} + +on ^send_public * { + @extravar = [] + if (showop == [on]) { + if (ischanop($N $0)) { + @extravar = [$(c5)@$(cl)] + } else if (ischanvoice($N $0)) { + @extravar = [$(c5)+$(cl)] + } + } + if (winchan($0)==-1 || winchan($winchan($0)) != [$0] ) { + //echo $fparse(format_send_public ${extravar}$N:$0 $1-) + } else { + //echo $fparse(format_send_public ${extravar}$N $1-) + } +} diff amn.orig/core/paste.m amn/core/paste.m --- amn.orig/core/paste.m Tue Oct 11 00:52:09 2005 +++ amn/core/paste.m Tue Oct 11 00:51:38 2005 @@ -13,9 +13,9 @@ # # # on ^set "paste %" { - xecho -b PASTE is ${paste.on ? [ON] : [OFF]} - xecho -b PASTE_STRIP is ${paste.strip ? [ON] : [OFF]} - xecho -b PASTE_DELAY is $paste.delay + xecho $acban PASTE is ${paste.on ? [ON] : [OFF]} + xecho $acban PASTE_STRIP is ${paste.strip ? [ON] : [OFF]} + xecho $acban PASTE_DELAY is $paste.delay } on ^set "paste toggle" { @@ -25,18 +25,18 @@ on ^set "paste on" { @ paste.on = 1 setup_paste - xecho -b PASTE mode ON -- automatically turns off in $paste.delay seconds. + xecho $acban PASTE mode ON -- automatically turns off in $paste.delay seconds. } on ^set "paste off" { @ paste.on = 0 remove_paste - xecho -b PASTE mode OFF + xecho $acban PASTE mode OFF } # # # on ^set "paste_strip %" { - xecho -b Usage: /SET PASTE_STRIP [ON|OFF] + xecho $acban Usage: /SET PASTE_STRIP [ON|OFF] } on ^set "paste_strip toggle" { @@ -45,21 +45,21 @@ on ^set "paste_strip on" { @ paste.strip = 1 - xecho -b PASTE stripping set to ON + xecho $acban PASTE stripping set to ON } on ^set "paste_strip off" { @ paste.strip = 0 - xecho -b PASTE stripping set to OFF + xecho $acban PASTE stripping set to OFF } # # # on ^set "paste_delay %" { if (!isnumber($1) || [$1] <= 0) { - xecho -b Usage: /SET PASTE_DELAY seconds + xecho $acban Usage: /SET PASTE_DELAY seconds } { @ paste.delay = [$1] - xecho -b PASTE_DELAY set to $paste.delay seconds. + xecho $acban PASTE_DELAY set to $paste.delay seconds. } } diff amn.orig/core/paste.m.orig amn/core/paste.m.orig --- amn.orig/core/paste.m.orig Thu Jan 1 00:00:00 1970 +++ amn/core/paste.m.orig Mon Oct 3 03:10:33 2005 @@ -0,0 +1,92 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. +# hops little paste script so you can paste shit without worrying about +# commands....ctrl-p to toggle.. /set paste for some other shit. +subpackage paste + +@ paste.on = 0 +@ paste.strip = 0 +@ paste.delay = 30 + +# Uncomment this if you want a key binding. +bind ^P parse_command { set paste toggle } + +# # # +on ^set "paste %" { + xecho -b PASTE is ${paste.on ? [ON] : [OFF]} + xecho -b PASTE_STRIP is ${paste.strip ? [ON] : [OFF]} + xecho -b PASTE_DELAY is $paste.delay +} + +on ^set "paste toggle" { + set paste ${paste.on ? [off] : [on]} +} + +on ^set "paste on" { + @ paste.on = 1 + setup_paste + xecho -b PASTE mode ON -- automatically turns off in $paste.delay seconds. +} + +on ^set "paste off" { + @ paste.on = 0 + remove_paste + xecho -b PASTE mode OFF +} + +# # # +on ^set "paste_strip %" { + xecho -b Usage: /SET PASTE_STRIP [ON|OFF] +} + +on ^set "paste_strip toggle" { + set paste_strip ${paste.on ? [off] : [on]} +} + +on ^set "paste_strip on" { + @ paste.strip = 1 + xecho -b PASTE stripping set to ON +} + +on ^set "paste_strip off" { + @ paste.strip = 0 + xecho -b PASTE stripping set to OFF +} + +# # # +on ^set "paste_delay %" { + if (!isnumber($1) || [$1] <= 0) { + xecho -b Usage: /SET PASTE_DELAY seconds + } { + @ paste.delay = [$1] + xecho -b PASTE_DELAY set to $paste.delay seconds. + } +} + +# # # +alias setup_paste +{ + stack push bind ^I + bind ^I self_insert + + stack push on input + on input - + on ^input * { + if (paste.strip) { + //send $0 $1- + } else { + //send $* + } + } + timer -refnum PASTEOFF $paste.delay set paste off +} + +alias remove_paste +{ + on input -* + stack pop on input + stack pop bind ^I + defer ^timer -delete PASTEOFF +} + +#hop'y2k3 diff amn.orig/core/save.m amn/core/save.m --- amn.orig/core/save.m Tue Oct 11 00:52:09 2005 +++ amn/core/save.m Tue Oct 11 00:51:38 2005 @@ -54,7 +54,7 @@ @write($savemt @_r3 = [$_r3]) @write($savemt @_r4 = [$_r4]) @close($savemt) - xecho -b (core).. settings saved to $savefile + xecho $acban (core).. settings saved to $savefile } @@ -112,7 +112,7 @@ @write($fsetsavemt ^sfset format_who_footer $format_who_footer) */ @close($fsetsavemt) - xecho -b (core).. fset settings saved to $(savepath)$fsetsavefile + xecho $acban (core).. fset settings saved to $(savepath)$fsetsavefile } alias fsave { @fsavefile=[$(savepath).a.fsave] @@ -156,7 +156,7 @@ @write($savemt @_whois = [$_whois]) @close($savemt) - xecho -b (core).. format settings saved to $fsavefile + xecho $acban (core).. format settings saved to $fsavefile } alias csave { @@ -174,7 +174,7 @@ @write($savemt @sc3 = [$sc3) @write($savemt @sc4 = [$sc4) @close($savemt) - xecho -b (core).. color settings saved to $csavefile + xecho $acban (core).. color settings saved to $csavefile } alias igsave { @@ -185,7 +185,7 @@ @ write($saveig ^ignore $_igmasks $igtype($_igmasks)) } @close($saveig) - xecho -b (core).. ignores saved to $igsfile + xecho $acban (core).. ignores saved to $igsfile } alias saveall { diff amn.orig/core/save.m.orig amn/core/save.m.orig --- amn.orig/core/save.m.orig Thu Jan 1 00:00:00 1970 +++ amn/core/save.m.orig Mon Oct 10 20:39:21 2005 @@ -0,0 +1,198 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. +subpackage save + +alias asave { + @savefile=[$(savepath).a.save] + @rename($savefile $savefile~) + @savemt = open($savefile W T) + @write($savemt ** amnesiac config file - saved $strftime($time() %D %T)) + @write($savemt @savepath = [$savepath) + @write($savemt notify $notify()) + @write($savemt @fke1 = [$fke1]) + @write($savemt @fke2 = [$fke2]) + @write($savemt @fke3 = [$fke3]) + @write($savemt @fke4 = [$fke4]) + @write($savemt @fke5 = [$fke5]) + @write($savemt @fke6 = [$fke6]) + @write($savemt @fke7 = [$fke7]) + @write($savemt @fke8 = [$fke8]) + @write($savemt @fke9 = [$fke9]) + @write($savemt @fke10 = [$fke10]) + @write($savemt @fke11 = [$fke11]) + @write($savemt @fke12 = [$fke12]) + @write($savemt @plog = [$plog]) + @write($savemt @crapl = [$crapl]) + @write($savemt @msgl = [$msgl]) + @write($savemt @notl = [$notl]) + @write($savemt @dccl = [$dccl]) + @write($savemt @page = [$page]) + @write($savemt @awayt = [$awayt]) + @write($savemt @awayr = [$awayr]) + @write($savemt @statbar=[$statbar]) + @write($savemt @showop = [$showop]) + @write($savemt @kickonban = [$kickonban]) + @write($savemt @kickops =[$kickops]) + @write($savemt @getumode=[$getumode]) + @write($savemt @msgfloodsensor=[$msgfloodsensor]) + @write($savemt @mfloodtimer=[$mfloodtimer]) + @write($savemt @togaway = [$togaway]) + @write($savemt @autoget = [$autoget]) + @write($savemt @togpager = [$togpager]) + @write($savemt @windowdoubles = [$windowdoubles]) + @write($savemt @bt_ = [$bt_]) + @write($savemt @_bt = [$_bt]) + @write($savemt @_ss = [$_ss]) + @write($savemt @_ort = [$_ort]) + @write($savemt @_jwin = [$_jwin]) + @write($savemt @_pubnick = [$_pubnick]) + @write($savemt @_tss = [$_tss]) + @write($savemt @_ovsize = [$_ovsize]) + @write($savemt @_ovmode = [$_ovmode]) + @write($savemt @_ubanself = [$_ubanself]) + @write($savemt @_r2 = [$_r2]) + @write($savemt @_r3 = [$_r3]) + @write($savemt @_r4 = [$_r4]) + @close($savemt) + xecho -b (core).. settings saved to $savefile +} + + +alias fsetsave { + + @rename($(savepath)$fsetsavefile $(savepath)$fsetsavefile~) + @fsetsavemt = open($(savepath)$fsetsavefile W T) + @write($fsetsavemt ** amnesiac format file - saved $strftime($time() %D %T)) + + + fe ($fwords) a1 { + @write($fsetsavemt ^sfset $a1 $($a1)) + } + + +/* + @write($fsetsavemt ^sfset format_msg $format_msg) + @write($fsetsavemt ^sfset format_send_msg $format_send_msg) + @write($fsetsavemt ^sfset format_public $format_public) + @write($fsetsavemt ^sfset format_send_public $format_send_public) + @write($fsetsavemt ^sfset format_public_other $format_public_other) + @write($fsetsavemt ^sfset format_signoff $format_signoff) + @write($fsetsavemt ^sfset format_join $format_join) + @write($fsetsavemt ^sfset format_leave $format_leave) + @write($fsetsavemt ^sfset format_mode $format_mode) + @write($fsetsavemt ^sfset format_kick $format_kick) + @write($fsetsavemt ^sfset format_notice $format_notice) + @write($fsetsavemt ^sfset format_public_notice $format_public_notice) + @write($fsetsavemt ^sfset format_send_notice $format_send_notice) + @write($fsetsavemt ^sfset format_send_dcc_chat $format_send_dcc_chat) + @write($fsetsavemt ^sfset format_dcc_chat $format_dcc_chat) + @write($fsetsavemt ^sfset format_topic $format_topic) + @write($fsetsavemt ^sfset format_ctcp $format_ctcp) + @write($fsetsavemt ^sfset format_send_ctcp $format_send_ctcp) + @write($fsetsavemt ^sfset format_nick_comp $format_nick_comp) + @write($fsetsavemt ^sfset format_sv $format_sv) + @write($fsetsavemt ^sfset format_wall $format_wall) + @write($fsetsavemt ^sfset format_bwall $format_bwall) + @write($fsetsavemt ^sfset format_away $format_away) + @write($fsetsavemt ^sfset format_action $format_action) + @write($fsetsavemt ^sfset format_action_other $format_action_other) + @write($fsetsavemt ^sfset format_desc $format_desc) + @write($fsetsavemt ^sfset format_send_desc $format_send_desc) + @write($fsetsavemt ^sfset format_wallop $format_wallop) + @write($fsetsavemt ^sfset format_nickname $format_nickname) + @write($fsetsavemt ^sfset format_invite $format_invite) + @write($fsetsavemt ^sfset format_dcc_connect $format_dcc_connect) + @write($fsetsavemt ^sfset format_dcc_request $format_dcc_request) + @write($fsetsavemt ^sfset format_ctcp_reply $format_ctcp_reply) + @write($fsetsavemt ^sfset format_server_notice $format_server_notice) + @write($fsetsavemt ^sfset format_dcc_lost_chat $format_dcc_lost_chat) + @write($fsetsavemt ^sfset format_dcc_lost_file $format_dcc_lost_file) + @write($fsetsavemt ^sfset format_dcc_done_file $format_dcc_done_file) + @write($fsetsavemt ^sfset format_who $format_who) + @write($fsetsavemt ^sfset format_who_footer $format_who_footer) +*/ + @close($fsetsavemt) + xecho -b (core).. fset settings saved to $(savepath)$fsetsavefile +} +alias fsave { + @fsavefile=[$(savepath).a.fsave] + @rename($fsavefile $fsavefile~) + @savemt = open($fsavefile W T) + @write($savemt ** amnesiac format file - saved $strftime($time() %D %T)) + @write($savemt @mform = [$mform]) + @write($savemt @smform = [$smform]) + @write($savemt @pubform = [$pubform]) + @write($savemt @spubform = [$spubform]) + @write($savemt @spuboform = [$spuboform]) + @write($savemt @signform = [$signform]) + @write($savemt @joinform = [$joinform]) + @write($savemt @leaveform = [$leaveform]) + @write($savemt @modeform = [$modeform]) + @write($savemt @notform = [$notform]) + @write($savemt @snotform = [$snotform]) + @write($savemt @sdcform = [$sdcform]) + @write($savemt @dcform = [$dcform]) + @write($savemt @topform = [$topform]) + @write($savemt @ctcpform = [$ctcpform]) + @write($savemt @sctcpform = [$sctcpform]) + @write($savemt @echostr = [$echostr]) + @write($savemt @ncomp = [$ncomp]) + @write($savemt @svform = [$svform]) + @write($savemt @snf = [$snf]) + @write($savemt @wallform = [$wallform]) + @write($savemt @bwallform = [$bwallform]) + @write($savemt @awayform = [$awayform]) + @write($savemt @actform = [$actform]) + @write($savemt @actoform = [$actoform]) + @write($savemt @descform = [$descform]) + @write($savemt @sdescform = [$sdescform]) + @write($savemt @scdesc = [$scdesc]) + @write($savemt @pubnotform = [$pubnotform]) + @write($savemt @whoform = [$whoform]) + @write($savemt @whofootform = [$whofootform]) + @write($savemt @nickform = [$nickform]) + @write($savemt @timeform = [$timeform]) + @write($savemt @kickform = [$kickform]) + @write($savemt @_whois = [$_whois]) + @close($savemt) + + xecho -b (core).. format settings saved to $fsavefile +} + +alias csave { + @csavefile=[$(savepath).a.csave] + @rename($csavefile $csavefile~) + @savemt = open($csavefile W T) + @write($savemt ** amnesiac color format file - saved $strftime($time() %D %T)) + @write($savemt @c1 = [$c1) + @write($savemt @c2 = [$c2) + @write($savemt @c3 = [$c3) + @write($savemt @c4 = [$c4) + @write($savemt @c5 = [$c5) + @write($savemt @sc1 = [$sc1) + @write($savemt @sc2 = [$sc2) + @write($savemt @sc3 = [$sc3) + @write($savemt @sc4 = [$sc4) + @close($savemt) + xecho -b (core).. color settings saved to $csavefile +} + +alias igsave { + @igsfile=[$(savepath).a.ig.save] + @rename($igsfile $igsfile~) + @saveig = open($igsfile W T) + fe ($igmask(*)) _igmasks { + @ write($saveig ^ignore $_igmasks $igtype($_igmasks)) + } + @close($saveig) + xecho -b (core).. ignores saved to $igsfile + } + +alias saveall { +@_savevar=[csave asave fsave botsave shitsave usersave fsetsave chansave wordssave modsave igsave nsave] + fe ($_savevar) n1 { + if (match($n1 $aliasctl(alias match *))) { + $n1 + } + } +} diff amn.orig/core/sbar.m amn/core/sbar.m --- amn.orig/core/sbar.m Tue Oct 11 00:52:09 2005 +++ amn/core/sbar.m Tue Oct 11 00:51:38 2005 @@ -13,10 +13,10 @@ if (statbar == [stat.3]) { ^sip2 } - xecho -b $scriptname sbar set to $0 - xecho -b type /asave to save status bar + xecho $acban $scriptname sbar set to $0 + xecho $acban type /asave to save status bar }{ - xecho -b syn: /sbar <1-$(sbar.max)> current sbar is ${hwht}$after(. $statbar) + xecho $acban syn: /sbar <1-$(sbar.max)> current sbar is ${hwht}$after(. $statbar) } oof diff amn.orig/core/sbar.m.orig amn/core/sbar.m.orig --- amn.orig/core/sbar.m.orig Thu Jan 1 00:00:00 1970 +++ amn/core/sbar.m.orig Mon Oct 10 20:39:38 2005 @@ -0,0 +1,33 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. +subpackage sbar + +@ sbar.max = 14 +alias sbar if ([$0] && ([$0] <= sbar.max)) { + @statbar=[stat.$0] + @statnum=[$0] + load $(loadpath)stats/$statbar + if (swsbar == 1) { + ^sip1 + } + if (statbar == [stat.3]) { + ^sip2 + } + xecho -b $scriptname sbar set to $0 + xecho -b type /asave to save status bar + }{ + xecho -b syn: /sbar <1-$(sbar.max)> current sbar is ${hwht}$after(. $statbar) + } +oof + +alias qsbar if ([$0] && ([$0] <= sbar.max)) { + @statbar=[stat.$0] + @statnum=[$0] + load $(loadpath)stats/$statbar + if (swsbar == 1) { + ^sip1 + } + if (statbar == [stat.3]) { + ^sip2 + } +} diff amn.orig/core/scan.m amn/core/scan.m --- amn.orig/core/scan.m Tue Oct 11 00:52:09 2005 +++ amn/core/scan.m Tue Oct 11 00:51:38 2005 @@ -206,6 +206,6 @@ (5) {@snf=5;^eval load ${loadpath}sc/scan.5} (6) {@snf=6;^eval load ${loadpath}sc/scan.6} } - xecho -b scan format set to $(snf) + xecho $acban scan format set to $(snf) } oof diff amn.orig/core/scan.m.orig amn/core/scan.m.orig --- amn.orig/core/scan.m.orig Thu Jan 1 00:00:00 1970 +++ amn/core/scan.m.orig Mon Oct 10 20:39:43 2005 @@ -0,0 +1,211 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. +subpackage scan + +^on ^names * #- +alias fix.scan if ([$0]) { + @_t=[$[10]0] + @_t=msar(g/@/@/+/+/$_t) + @function_return=_t + }{ + @function_return=[$[10]empty_string] +} + + +alias fix.scan2 if ([$0]) { + @_t=[$[11]0] + @_t=msar(g/.?/ /@+/@/@./@/@?/@/.+/+/../ /$strip(/ $(_t))) + @function_return=_t}{@function_return=[$[10]empty_string] +} + +alias fix.scan3 if ([$0]) { + @_t=[$0] + @_t=msar(g/.?/ /@+/@/@./@/@?/@/.+/+/../ /$strip(/ $(_t))) + @function_return=_t +} + +alias fix.scan4 if ([$0]) { + @_t=[$[11]0] + @_t=msar(g/.?/ /@+/$(hcyn)@$(cl)/@./$(hcyn)@$(cl)/@?/$(hcyn)@$(cl)/.+/$(hcyn)+$(cl)/../ /$strip(/ $(_t))) + @function_return=_t}{@function_return=[$[10]empty_string] +} + +### propz to robohak for clueing me into using the 366 numeric for nick list +on ^366 * #- +on #^353 1 * {@nicks#=[$3-]} +on ^366 "*" { + + ^local scan1 + ^push scan1 $pattern(*@* $nicks) + ^push scan1 $pattern(*+* $nicks) + ^push scan1 $filter(*+* $filter(*@* $nicks)) + @nicks.ops=pattern(*@* $nicks) + @nicks.voc=pattern(*+* $nicks) + @nicks.non=filter(*+* $filter(*@* $nicks)) + + ^xecho -w $chanwin($1) $fparse(format_scan_users $#nicks.ops $#nicks.non $#nicks.voc $1) + if (format_scan_header) { + ^xecho -w $chanwin($1) $fparse(format_scan_header) + } + @_swidth=[${word(0 $geom()) / format_scan_width}] + fe ($jot(1 $_swidth)) n1 { + ^push _nlist nlist.$n1 + ^push _nlist2 \$fparse\(format_scan_onjoin_nicks \$nlist\.$n1) + } + fe ($scan1) $_nlist { + eval xecho $$fparse(format_scan_onjoin_nicks_border) $_nlist2 + } + ^assign -_nlist;^assign -_nlist2 + + if (format_scan_footer) { + ^xecho -w $chanwin($1) $fparse(format_scan_footer) + } + ^assign -nicks;assign -scan1 +} + + +alias scan { + if ([$0]) { + @ chan = [$0] + }{ + @ chan = [$C] + } + ^local ops 0 + ^local voc 0 + ^local non 0 + ^push scan1 $pattern(*@* $channel($chan)) + ^push scan1 $pattern(*.+* $channel($chan)) + ^push scan1 $pattern(..* $channel($chan)) + ^push scan1 $pattern(.\\?* $channel($chan)) + @nicks.ops=pattern(*@* $channel($chan)) + @nicks.voc=pattern(*.+* $channel($chan)) + @nicks.non=pattern(*..* $channel($chan)) + ^xecho -w $chanwin($chan) $fparse(format_scan_users $#nicks.ops $#nicks.non $#nicks.voc $chan) + if (format_scan_header) { + ^xecho -w $chanwin($1) $fparse(format_scan_header) + } + @_swidth=[${word(0 $geom()) / format_scan_width}] + fe ($jot(1 $_swidth)) n1 { + ^push _nlist nlist.$n1 + ^push _nlist2 \$fparse\(format_scan_nicks \$nlist\.$n1) + + } + fe ($scan1) $_nlist { + eval ^xecho -w $chanwin($1) $$fparse(format_scan_nicks_border) $_nlist2 + } + ^assign -_nlist;^assign -_nlist2 + if (format_scan_footer) { + ^xecho -w $chanwin($1) $fparse(format_scan_footer) + } + ^assign -nicks;^assign -scan1 +} + + + +alias sco { + if ([$0]) { + @chan=[$0] + }{ + @chan=[$C] + } + ^local nicks.ops 0 + ^push scan1 $pattern(*@* $channel($chan)) + @nicks.ops=chops($chan) + ^xecho -w $chanwin($chan) $fparse(format_scan_users_op $#nicks.ops $chan) + if (format_scan_header) { + ^xecho -w $chanwin($1) $fparse(format_scan_header) + } + @_swidth=[${word(0 $geom()) / format_scan_width}] + fe ($jot(1 $_swidth)) n1 { + ^push _nlist nlist.$n1 + ^push _nlist2 \$fparse\(format_scan_nicks \$nlist\.$n1) + } + fe ($scan1) $_nlist { + eval ^xecho -w $chanwin($1) $$fparse(format_scan_nicks_border) $_nlist2 + } + ^assign -_nlist;^assign -_nlist2 + + if (format_scan_footer) { + ^xecho -w $chanwin($1) $fparse(format_scan_footer) + } + ^assign -nicks.ops;^assign -scan1 +} + + + +alias scn { + if ([$0]) { + @chan=[$0] + }{ + @chan=[$C] + } + ^local nicks.non 0 + ^push scan1 $pattern(*..* $channel($chan)) + ^push scan1 $pattern(*.+* $channel($chan)) + ^push scan1 $pattern(.\\?* $channel($chan)) + @nicks.non=nochops($chan) + xecho -w $chanwin($chan) $fparse(format_scan_users_non $#nicks.non $chan) + if (format_scan_header) { + ^xecho -w $chanwin($3) $fparse(format_scan_header) + } + @_swidth=[${word(0 $geom()) / format_scan_width}] + fe ($jot(1 $_swidth)) n1 { + ^push _nlist nlist.$n1 + ^push _nlist2 \$fparse\(format_scan_nicks \$nlist\.$n1) + + } + fe ($scan1) $_nlist { + eval ^xecho -w $chanwin($1) $$fparse(format_scan_nicks_border) $_nlist2 + } + ^assign -_nlist;^assign -_nlist2 + + + if (format_scan_footer) { + ^xecho -w $chanwin($3) $fparse(format_scan_footer) + } + ^assign -scan1;^assign -chan;^assign -nicks.non +} + +alias scv { + if ([$0]) { + @chan=[$0] + }{ + @chan=[$C] + } + ^local nicks.voc 0 + ^push scan1 $pattern(*.+* $channel($chan)) + @nicks.voc=pattern(*.+* $channel($chan)) + ^xecho -w $chanwin($chan) $fparse(format_scan_users_voc $#nicks.voc $chan) + if (format_scan_header) { + xecho -w $chanwin($3) $fparse(format_scan_header) + } + @_swidth=[${word(0 $geom()) / format_scan_width}] + fe ($jot(1 $_swidth)) n1 { + ^push _nlist nlist.$n1 + ^push _nlist2 \$fparse\(format_scan_nicks \$nlist\.$n1) + } + fe ($scan1) $_nlist { + eval ^xecho -w $chanwin($1) $$fparse(format_scan_nicks_border) $_nlist2 + } + ^assign -_nlist;^assign -_nlist2 + + if (format_scan_footer) { + ^xecho -w $chanwin($3) $fparse(format_scan_footer) + } + ^assign -scan1;^assign -chan;^assign -nicks.voc +} + + + +alias sformat { + switch ($0) { + (1) {@snf=1;^eval load ${loadpath}sc/scan.1} + (2) {@snf=2;^eval load ${loadpath}sc/scan.2} + (3) {@snf=3;^eval load ${loadpath}sc/scan.3} + (4) {@snf=4;^eval load ${loadpath}sc/scan.4} + (5) {@snf=5;^eval load ${loadpath}sc/scan.5} + (6) {@snf=6;^eval load ${loadpath}sc/scan.6} + } + xecho -b scan format set to $(snf) +} +oof diff amn.orig/core/sets.m amn/core/sets.m --- amn.orig/core/sets.m Tue Oct 11 00:52:09 2005 +++ amn/core/sets.m Tue Oct 11 00:51:38 2005 @@ -122,6 +122,7 @@ @timeform=[1] @kickform=[1] @_whois=[4] +@acban=[\[a+c\]] ## default color and sbar color var. @c1 = [\\[0\;36m] diff amn.orig/core/sets.m.orig amn/core/sets.m.orig --- amn.orig/core/sets.m.orig Thu Jan 1 00:00:00 1970 +++ amn/core/sets.m.orig Tue Oct 11 00:30:03 2005 @@ -0,0 +1,135 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. +subpackage sets + +## colour vars. +@ cl = [\\[0m] +@ blk = [\\[0\;30m] +@ blu = [\\[0\;34m] +@ grn = [\\[0\;32m] +@ cyn = [\\[0\;36m] +@ red = [\\[0\;31m] +@ mag = [\\[0\;35m] +@ yel = [\\[0\;33m] +@ wht = [\\[0\;37m] +@ hblk = [\\[1\;30m] +@ hblu = [\\[1\;34m] +@ hgrn = [\\[1\;32m] +@ hcyn = [\\[1\;36m] +@ hred = [\\[1\;31m] +@ hmag = [\\[1\;35m] +@ hyel = [\\[1\;33m] +@ hwht = [\\[1\;37m] +@ bwht = [\\[47m] +@ bmag = [\\[45m] +@ bblu = [\\[44m] +@ bred = [\\[41m] +@ bblk = [\\[40m] +@ bgrn = [\\[42m] +@ byel = [\\[43m] +@ bcyn = [\\[46m] + +## default assigns +@_ort=[3] +@_bt=[3] +@bt_=[better] +@mfloodtimer=[10] +@msgfloodsensor=[60] +@awayt=[60] +@awayl=[on] +@awayr=[Not Here] +@a.ver=[amnesiac] +@rel_id=[9] +@a.rel=[1.1d r/$rel_id] +@a.date=[20050903] +@_ss=[15] +@_ovsize=[5] +@_ovmode=[fibxwzZsy] +@kickonban=[off] +@kickops=[off] +@togpager=[off] +@fke1=[wholeft] +@fke2=[wl] +@fke3=[wsa] +@fke4=[scan] +@fke5=[uptime] +@fke6=[dcc] +@fke7=[listchan] +@fke8=[listbot] +@fke9=[config] +@fke10=[userlist] +@fke11=[shitlist] +@fke12=[ehelp] +@savepath=[~/.amn/] +@crapl=[on] +@msgl=[on] +@notl=[on] +@plog=[on] +@dccl=[on] +@togaway=[off] +@savefile=[.a.save] +@fsavefile=[.a.fsave] +@igsfile=[.a.ig.save] +@csavefile=[.a.csave] +@fsetsavefile=[.a.fsetsave] +@nsavefile=[.a.nsavefile] +@modfile=[$(savepath).mod.save] +@getumode=[iw] +@showop=[off] +@autoget=[off] +@_jwin=[on] +@_pubnick=N +@_tss=[on] +@_r2=[dugewfe] +@_r3=[efguowe] +@_r4=[fgsiuso] +@_boxhead = [ $(hwht)Ú$(cl)Ä$cparse($(c1)Ä)$(cl)ÄÄÄÄÄ$cparse($(c1)ÄÄÄ)$cparse($(c2)ÄÄÄ)$cparse($(c1)Ä)$(cl)Ä$(hblk)Ä- - Ä -$(cl)] +@_boxfoot = [ $cparse($(c1)À)$cparse($(c3)Ä)$(hblk)- ÄÄ -$(cl)] +@_ubanself=[off] + +## default theme vars. +@mform=[39] +@smform=[52] +@pubform=[1] +@spubform=[3] +@spuboform=[1] +@pubnotform=[1] +@signform=[4] +@joinform=[16] +@leaveform=[3] +@modeform=[4] +@notform=[19] +@snotform=[21] +@sdcform=[19] +@dcform=[15] +@topform=[4] +@ctcpform=[3] +@sctcpform=[8] +@echostr=[57] +@ncomp=[15] +@svform=[18] +@snf=[3] +@wallform = [2] +@bwallform=[4] +@awayform=[5] +@actform=[3] +@descform=[2] +@sdescform=[1] +@statbar=[stat.11] +@whoform=[1] +@whofootform=[1] +@nickform=[3] +@timeform=[1] +@kickform=[1] +@_whois=[4] + +## default color and sbar color var. +@c1 = [\\[0\;36m] +@c2 = [\\[1\;36m] +@c3 = [\\[0\;35m] +@c4 = [\\[1\;35m] +@c5 = [\\[0\;36m] +@sc1=[\\[0\;36m] +@sc2=[\\[1\;36m] +@sc3=[\\[0m] +@sc4=[\\[0\;34m] diff amn.orig/core/theme.m amn/core/theme.m --- amn.orig/core/theme.m Tue Oct 11 00:52:09 2005 +++ amn/core/theme.m Tue Oct 11 00:51:38 2005 @@ -63,8 +63,9 @@ @ write($saveth @sc2=[$sc2) @ write($saveth @sc3=[$sc3) @ write($saveth @sc4=[$sc4) + @ write($saveth @acban=[$acban]) @ close($saveth) - xecho -b saved theme file [$(loadpath)themes/$(name).th] $desc + xecho $acban saved theme file [$(loadpath)themes/$(name).th] $desc ^load $(loadpath)themes/$(name).th ^eval load $(loadpath)core/fsets.m ^eval load $(loadpath)core/arrays.m @@ -72,7 +73,7 @@ ^getusers }{ -xecho -b $scriptname usage: /tsave +xecho $acban $scriptname usage: /tsave } # thanks to ttb for some original help w/ read(), but it still didn't work :P @@ -87,27 +88,27 @@ @ close($thfile) //echo $[10]name $[12]auth $desc$repeat(${20-strlen($strip( $stripansicodes($desc)))} ) } - xecho -b current theme is $scdesc + xecho $acban current theme is $scdesc }{ -if (fexist($(loadpath)themes/$0.th)==-1) { xecho -b theme $0 does not exist }{ +if (fexist($(loadpath)themes/$0.th)==-1) { xecho $acban theme $0 does not exist }{ @ name = [$0] ^load $(loadpath)themes/$(0).th ^eval load $(loadpath)core/fsets.m ^eval load $(loadpath)core/arrays.m ^update.f ^getusers - xecho -b loaded theme file [$(0).th] by $auth $desc + xecho $acban loaded theme file [$(0).th] by $auth $desc } } -alias untheme { @name=[];@scdesc=[];xecho -b $scriptname: no longer using a theme;fsave +alias untheme { @name=[];@scdesc=[];xecho $acban $scriptname: no longer using a theme;fsave }[C alias rtheme if ([$0]) { -if (fexist($(loadpath)themes/$0.th)==-1) { xecho -b theme $(0) does not exist! +if (fexist($(loadpath)themes/$0.th)==-1) { xecho $acban theme $(0) does not exist! }{ ^exec rm -rf $(loadpath)themes/$(0).th 1> /dev/null 2> /dev/null -xecho -b theme $(0) has been removed! -}}{xecho -b usage: /rtheme } +xecho $acban theme $(0) has been removed! +}}{xecho $acban usage: /rtheme } ## kreca/crapple 05 ## clogic '98 diff amn.orig/core/theme.m.orig amn/core/theme.m.orig --- amn.orig/core/theme.m.orig Thu Jan 1 00:00:00 1970 +++ amn/core/theme.m.orig Mon Oct 10 20:40:00 2005 @@ -0,0 +1,113 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. +## codelogic's theme module, thanx to robohak for help w/ padding +## modified crapple/kreca 05 +subpackage theme + +alias tsave if ([$1]) { + @ blahfile = $0 + if (fexist($(loadpath)themes/$0.th)) { + @ rename($(loadpath)themes/$0.th $(loadpath)themes/$0.th.old) + ^exec rm $(loadpath)themes/$0.th.old 1> /dev/null 2> /dev/null + } + @saveth = open($(loadpath)themes/$0.th W T) + @author = N + @desc = [$1] + @name = [$0] + @ write($saveth :$author) + @ write($saveth :$desc) + @ write($saveth :$name) + @ write($saveth @auth=[$N]) + @ write($saveth @desc=[$desc]) + @ write($saveth @name=[$name]) + @ write($saveth @scdesc=[\\\($desc\\\)]) + @ write($saveth @mform=$mform) + @ write($saveth @smform=$smform) + @ write($saveth @pubform=$pubform) + @ write($saveth @spubform=$spubform) + @ write($saveth @spuboform=$spuboform) + @ write($saveth @pubnotform=$pubnotform) + @ write($saveth @signform=$signform) + @ write($saveth @joinform=$joinform) + @ write($saveth @leaveform=[$leaveform]) + @ write($saveth @kickform=[$kickform]) + @ write($saveth @modeform=$modeform) + @ write($saveth @notform=$notform) + @ write($saveth @snotform=$snotform) + @ write($saveth @sdcform=$sdcform) + @ write($saveth @dcform=$dcform) + @ write($saveth @topform=$topform) + @ write($saveth @ctcpform=$ctcpform) + @ write($saveth @sctcpform=$sctcpform) + @ write($saveth @echostr=$echostr) + @ write($saveth @ncomp=$ncomp) + @ write($saveth @svform=$svform) + @ write($saveth @snf=$snf) + @ write($saveth @wallform = [$wallform]) + @ write($saveth @bwallform=$bwallform) + @ write($saveth @awayform=$awayform) + @ write($saveth @actform=$actform) + @ write($saveth @actform=$actform) + @ write($saveth @descform=$descform) + @ write($saveth @sdescform=$sdescform) + @ write($saveth @actform=$actform) + @ write($saveth @statbar=[$statbar]) + @ write($saveth @timeform=[$timeform]) + @ write($saveth @_whois=[$_whois]) + @ write($saveth @c1=[$c1) + @ write($saveth @c2=[$c2) + @ write($saveth @c3=[$c3) + @ write($saveth @c4=[$c4) + @ write($saveth @c5=[$c5) + @ write($saveth @sc1=[$sc1) + @ write($saveth @sc2=[$sc2) + @ write($saveth @sc3=[$sc3) + @ write($saveth @sc4=[$sc4) + @ close($saveth) + xecho -b saved theme file [$(loadpath)themes/$(name).th] $desc + ^load $(loadpath)themes/$(name).th + ^eval load $(loadpath)core/fsets.m + ^eval load $(loadpath)core/arrays.m + ^update.f + ^getusers + +}{ +xecho -b $scriptname usage: /tsave +} + +# thanks to ttb for some original help w/ read(), but it still didn't work :P +alias theme if (![$0]) { + //echo file name author description + //echo + fe ($glob($(loadpath)themes\/*.th)) th { + @ :thfile = open($th R T) + @ :auth = after(: $read($thfile)) + @ :desc = after(: $read($thfile)) + @ :name = after(: $read($thfile)) + @ close($thfile) + //echo $[10]name $[12]auth $desc$repeat(${20-strlen($strip( $stripansicodes($desc)))} ) + } + xecho -b current theme is $scdesc +}{ +if (fexist($(loadpath)themes/$0.th)==-1) { xecho -b theme $0 does not exist }{ + @ name = [$0] + ^load $(loadpath)themes/$(0).th + ^eval load $(loadpath)core/fsets.m + ^eval load $(loadpath)core/arrays.m + ^update.f + ^getusers + xecho -b loaded theme file [$(0).th] by $auth $desc +} +} + +alias untheme { @name=[];@scdesc=[];xecho -b $scriptname: no longer using a theme;fsave +}[C +alias rtheme if ([$0]) { +if (fexist($(loadpath)themes/$0.th)==-1) { xecho -b theme $(0) does not exist! +}{ +^exec rm -rf $(loadpath)themes/$(0).th 1> /dev/null 2> /dev/null +xecho -b theme $(0) has been removed! +}}{xecho -b usage: /rtheme } + +## kreca/crapple 05 +## clogic '98 diff amn.orig/core/trickle.m amn/core/trickle.m --- amn.orig/core/trickle.m Tue Oct 11 00:52:09 2005 +++ amn/core/trickle.m Tue Oct 11 00:51:38 2005 @@ -7,7 +7,7 @@ if ( [$#] < 3 || ! ischannel($0)) { - xecho -b usage: /trickle #channel|* nick|nick!ident@host [nick|nick!ident@host] ... command + xecho $acban usage: /trickle #channel|* nick|nick!ident@host [nick|nick!ident@host] ... command return; } @cmd = [$~] diff amn.orig/core/trickle.m.orig amn/core/trickle.m.orig --- amn.orig/core/trickle.m.orig Thu Jan 1 00:00:00 1970 +++ amn/core/trickle.m.orig Mon Oct 10 21:35:48 2005 @@ -0,0 +1,76 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. +subpackage trickle + +alias trickle +{ + + if ( [$#] < 3 || ! ischannel($0)) + { + xecho -b usage: /trickle #channel|* nick|nick!ident@host [nick|nick!ident@host] ... command + return; + } + @cmd = [$~] + @nums=[$#]-2 + eval ^assign allusers $$1-$nums + fe ($allusers) curmatch + { + @tmp = split(! $curmatch) + if ( #tmp == 2) + { + + @preusers=pattern($word(0 $tmp) $chanusers($0)) + @uhosts=userhost($preusers) + @users = copattern( $word(1 $tmp) uhosts preusers) + } else + { + @users= pattern($curmatch $chanusers($0)) + } + fe ($users) curuser + { + eval $cmd $curuser + } + } + +} + +## trickle example swiss army knife features. +alias filter {trickle $*} +alias tscan {trickle $C $* who} +alias tdeop {trickle $C $* deop} +alias top {trickle $C $* op} +alias tkick {trickle $C $* kick} +alias tbk {trickle $C $* bk} +alias tfuck {trickle $C $* fuck} + +alias thelp { + if (!$[0]) { + +//echo -------------= Trickle IRC Swiss Army Knife Help =------------- + +//echo tscan /tscan [ident@host] specified match will show user(s) in +//echo current chan. +//echo tdeop /tdeop [ident@host] specified match will deop user(s) in +//echo current chan. +//echo tkick /tkick [ident@host] specified match will kick user(s) in +//echo current chan. +//echo tbk /tbk [ident@host] specified match will bankick user(s) +//echo in current chan. +//echo top /top [ident@host] specified match will op user(s) in +//echo current chan. +//echo common /common #somechan will compare nicks between current and +//echo specified chan. +input_char "menu paused, hit the ANY key to continue. " +pause +//echo +//echo /trickle can do a wide variety of commands/matches these are just +//echo some of the quick aliases which makes usage of /trickle. +//echo some /trickle usage examples. +//echo /trickle #somechan *!*@*aol.com kill +//echo /trickle #somechan *!ident@* voice +//echo /trickle * wildcard is not working at this time. +//echo /filter is also aliased to trickle for those who can't remember the cmd. +//echo --------------------------------------------------------------------- + + } +} diff amn.orig/core/users.m amn/core/users.m --- amn.orig/core/users.m Tue Oct 11 00:52:09 2005 +++ amn/core/users.m Tue Oct 11 00:51:38 2005 @@ -120,9 +120,9 @@ #silence it up some by crapple. alias common { ^assign common_users $common($chanusers($C) / $chanusers($*)); - eval xecho -b Common users on: $C - $* \($numwords($common_users)\); + eval xecho $acban Common users on: $C - $* \($numwords($common_users)\); fe ($common_users) ii jj kk ll { - xecho -b $fparse(format_scan_nicks $ii) $fparse(format_scan_nicks $jj) $fparse(format_scan_nicks $kk) $fparse(format_scan_nicks $ll) + xecho $acban $fparse(format_scan_nicks $ii) $fparse(format_scan_nicks $jj) $fparse(format_scan_nicks $kk) $fparse(format_scan_nicks $ll) } ^assign -common_users; } diff amn.orig/core/users.m.orig amn/core/users.m.orig --- amn.orig/core/users.m.orig Thu Jan 1 00:00:00 1970 +++ amn/core/users.m.orig Mon Oct 10 20:41:02 2005 @@ -0,0 +1,130 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. +## last modified by crapple on 9.1.05 +subpackage users + +alias chops { + if (![$0]) { + @:chan = [$1] ? [$1] : [$C] + fe ($chops($chan)) _foi { + xecho -v$fparse(format_chops $_foi $chan) + } + }{ + + + if ([$0]=~[*!*@*]) { + @:chan = [$1] ? [$1] : [$C] + fe ($chops($chan)) _n1 { + if (match($0 $_n1!$userhost($_n1))) { + xecho -v$fparse(format_chops $_n1 $chan) + } + } + + } + } +} +alias user if ([$0]) { + switch ($0) { + (-ops) {chops $1-} + (-nonops) {nops $1-} + (-nops) {nops $1-} + (-vocs) {vocs $1-} + + (-kick) { + switch ($1) { + (*#*) { fe ($remw($N $chanusers($1))) n1 { + ^kick $1 $n1 mass user kick + } + } + (-ops) { @:chan = [$2] ? [$2] : [$C] + @:chan2 = [$3] ? [$3] : [$C] + if ([$2]=~[*!*@*]) { + fe ($remw($N $chops($chan2))) n1 { + if (match($2 $n1!$userhost($n1))) { + ^kick $chan2 $n1 op kick match $2 + } + } + }{ fe ($remw($N $chops($chan)) )n1 { + ^kick $chan $n1 mass op kick + } + } } + (-nops) (-nonops) { @:chan = [$2] ? [$2] : [$C] + @:chan2 = [$3] ? [$3] : [$C] + if ([$2]=~[*!*@*]) { + fe ($nochops($chan2)) n1 { + if (match($2 $n1!$userhost($n1))) { + ^kick $chan2 $n1 nonop kick match $2 + } + } + }{ fe ($nochops($chan)) n1 { + ^kick $chan $n1 mass nonop kick + } + } } + + + (*) { if ([$1]=~[*!*@*]) { + @:chan = [$2] ? [$2] : [$C] + fe ($remw($N $chanusers($chan))) n1 { + if (match($1 $n1!$userhost($n1))) { + ^kick $chan $n1 user kick match $1 + } + } + }} + } + } + + (-sort) {chops $1-;nops $1-;vocs $1-} + + + (*) { if ([$0]=~[*!*@*]) { + chops $0-;nops $0-;vocs $0- + } + } + } + + }{ + chops;vocs;nops +} +alias nops { + @:chan = [$1] ? [$1] : [$C] + fe ($nochops($chan)) _foi { + if (![$0]) { + xecho -v$fparse(format_user_non $_foi $chan) + } + + if ([$0]=~[*!*@*] && match($0 $_foi!$userhost($_foi))) { + + xecho -v$fparse(format_user_non $_foi $chan) + } + } +} + + +alias vocs { + @:chan = [$1] ? [$1] : [$C] + fe ($nochops($chan)) _foi { + if (![$0]) { + if (ischanvoice($_foi $C)) { + xecho -v$fparse(format_user_vocs $_foi $chan) + } + } + if ([$0]=~[*!*@*] && match($0 $_foi!$userhost($_foi))) { + if (ischanvoice($_foi $chan) && !ischanop($_foi $chan)) { + xecho -v$fparse(format_user_vocs $_foi $chan) + } + } + } +} + +## common alias done by adam. +#silence it up some by crapple. +alias common { + ^assign common_users $common($chanusers($C) / $chanusers($*)); + eval xecho -b Common users on: $C - $* \($numwords($common_users)\); + fe ($common_users) ii jj kk ll { + xecho -b $fparse(format_scan_nicks $ii) $fparse(format_scan_nicks $jj) $fparse(format_scan_nicks $kk) $fparse(format_scan_nicks $ll) + } + ^assign -common_users; +} + +oof diff amn.orig/core/whois.m amn/core/whois.m --- amn.orig/core/whois.m Tue Oct 11 00:52:09 2005 +++ amn/core/whois.m Tue Oct 11 00:51:38 2005 @@ -11,6 +11,6 @@ (5) {@_whois=5;^eval load ${loadpath}wis/whois.5} (6) {@_whois=6;^eval load ${loadpath}wis/whois.6} } - xecho -b whois format set to $(_whois) + xecho $acban whois format set to $(_whois) } oof diff amn.orig/core/whois.m.orig amn/core/whois.m.orig --- amn.orig/core/whois.m.orig Thu Jan 1 00:00:00 1970 +++ amn/core/whois.m.orig Mon Oct 10 20:41:13 2005 @@ -0,0 +1,16 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. +subpackage whois + +alias 1format { + switch ($0) { + (1) {@_whois=1;^eval load ${loadpath}wis/whois.1} + (2) {@_whois=2;^eval load ${loadpath}wis/whois.2} + (3) {@_whois=3;^eval load ${loadpath}wis/whois.3} + (4) {@_whois=4;^eval load ${loadpath}wis/whois.4} + (5) {@_whois=5;^eval load ${loadpath}wis/whois.5} + (6) {@_whois=6;^eval load ${loadpath}wis/whois.6} + } + xecho -b whois format set to $(_whois) +} +oof diff amn.orig/core/window.m amn/core/window.m --- amn.orig/core/window.m Tue Oct 11 00:52:09 2005 +++ amn/core/window.m Tue Oct 11 00:51:38 2005 @@ -9,7 +9,7 @@ alias wj { if (![$0]) { - xecho -b usage: /wj [key] + xecho $acban usage: /wj [key] } { ^window new channel "$channame($0) $1-" hide swap last } @@ -42,7 +42,7 @@ alias wcs if ([$0]) { ^window new server $0 hide swap last channel "$channame($1) $2-" }{ - xecho -b usage: /wcs server channel key + xecho $acban usage: /wcs server channel key } alias wns wcs $* diff amn.orig/core/window.m.orig amn/core/window.m.orig --- amn.orig/core/window.m.orig Thu Jan 1 00:00:00 1970 +++ amn/core/window.m.orig Mon Oct 3 03:18:23 2005 @@ -0,0 +1,184 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. +# last modified by crapple 9.2.05 +# windowing stuff +subpackage window + +## more complex windowing stuff here. +alias channame if (left(1 $0)==[#] || left(1 $0)==[&]) { return $0 }{ return #$0 } + +alias wj { + if (![$0]) { + xecho -b usage: /wj [key] + } + { ^window new channel "$channame($0) $1-" hide swap last + } +} + +alias winmsg { + ^window new + ^window level msgs + ^window size 5 + ^window refnum 1 +} + +alias query { + window query $* +} + +alias wq { + if (#) { + window new_hide swap last query $0 + } elsif (Q) { + query + ^window $winnum() kill + } +} + +alias _wsact { window swap $leftw(1 $notifywindows()) +;} + +## multiserv stuff. +alias wcs if ([$0]) { + ^window new server $0 hide swap last channel "$channame($1) $2-" + }{ + xecho -b usage: /wcs server channel key +} +alias wns wcs $* + +# Returns the names of all channels belonging to a specific window. +# If no window is specified the current window is used. +# Taken from darkstar. +alias winchannels (win default "$winnum()", void) +{ + @ :serv = winserv($win); + for chan in ($mychannels($serv)) + { + xeval -s $serv { + if (winchan($chan) == win) { + @ push(function_return $chan); + }; + }; + }; +}; + +## shortend aliases. +alias wc {^window new hide swap last} +alias msgwin {wc;wsl;window level msgs,notices;window name messages} +alias wsa ^_wsact +alias wlk {part $C;wk} +alias s {window swap $*} + +## misc. +alias wflush window flush_scrollback +alias cls clear +alias clsa {clear -ALL} + +## for Alien88 +alias wnc2 {window new hide swap last split off channel $0 $1 $2} + +## misc query qwin/name aliases. +alias qw wq $* +alias q query $* +alias dq window remove $* +alias qd dq $* +alias wadd window add $* +alias rwadd dq $* + +## topwin stuff for broken topwin module. +alias topoff window toplines 0 +alias topdel topoff +alias rtop topoff + +## window shortcuts. +alias wsl {window swap last} +alias wka wkh +alias wkh {window kill_all_hidden} +alias wko {window kill_others} +alias wsg {window grow} +alias wss {window shrink} +alias ws {window swap} +alias wn {window next} +alias wp {window previous} +alias wk {window killswap} +alias wlk {part $C;wk} +alias wl window list + +## window toggles/config/options +alias wname {window name $*} +alias wlog window log toggle +alias wfile window logfile $* +alias wlevel window level $* +alias winfo window +alias wnotify window notify toggle +alias wnlevel window notify_level $* +alias wskip window skip toggle +alias wswap window swappable toggle +alias wfix window fixed toggle +alias wlast window lastlog $* +alias whold window hold_mode toggle + +## window toggle simplification. +/* + Copyright (c) 2003 David B. Kratter (BlackJac@EFNet) + This will allow you to toggle between hidden windows 1 through 20 more + easily. Press Esc+1 to toggle between windows 1 and 11, Esc+2 for win- + dows 2 and 12, etc., up through Esc+0 for windows 10 and 20. + + Simplifications by kreca +*/ + +alias toggle.window (number, void) { + if (@number) { + @number= number ? number : 10 + @ :wn = winnum() == number ? number+10 : number + if (winnum($wn) != -1) { + ^window swap $wn + } else { + if ( wn <= 10 && winnum(${wn+10}) != -1) { + ^window swap ${wn+10} + } else if (wn > 10 && winnum($number) != -1) { + ^window swap $number + } + } + } +} + +on #-window_create 123 "*" +{ + if ( windowdoubles == [on] ) { + window $0 double on; + } +} + +fe ($jot(0 9 1)) tt { + bind ^[$tt parse_command toggle.window $tt +} + +alias 1 ^window swap 1 +alias 2 ^window swap 2 +alias 3 ^window swap 3 +alias 4 ^window swap 4 +alias 5 ^window swap 5 +alias 6 ^window swap 6 +alias 7 ^window swap 7 +alias 8 ^window swap 8 +alias 9 ^window swap 9 +alias 0 ^window swap 10 +alias 11 ^window swap 11 +alias 12 ^window swap 12 +alias 13 ^window swap 13 +alias 14 ^window swap 14 +alias 15 ^window swap 15 +alias 16 ^window swap 16 +alias 17 ^window swap 17 +alias 18 ^window swap 18 +alias 19 ^window swap 19 +alias 20 ^window swap 20 +alias 21 ^window swap 21 +alias 22 ^window swap 22 +alias 23 ^window swap 23 +alias 24 ^window swap 24 +alias 25 ^window swap 25 + +oof diff amn.orig/docs/HIDDEN_FORMATS amn/docs/HIDDEN_FORMATS --- amn.orig/docs/HIDDEN_FORMATS Thu Jan 1 00:00:00 1970 +++ amn/docs/HIDDEN_FORMATS Tue Oct 11 00:51:38 2005 @@ -0,0 +1,9 @@ +This is to document the vars that can be adjusted to change visuals but +don't have associated format commands. Can be set in the client, amnrc, +or in themes. + +If you use these to change things you're on your own. Don't bug us about +how they work, because this is basically here at the insisting of one +particularly onery developer. + +acban Amnesiac banner (default: [a+c]) diff amn.orig/docs/HIDDEN_FORMATS.orig amn/docs/HIDDEN_FORMATS.orig diff amn.orig/modules/abot/abot.m amn/modules/abot/abot.m --- amn.orig/modules/abot/abot.m Tue Oct 11 00:52:09 2005 +++ amn/modules/abot/abot.m Tue Oct 11 00:51:38 2005 @@ -26,7 +26,7 @@ @ bothost = after(! $input1) @ botnick = before(! $input1) } else { - if (!getuhost($input1)) { xecho -b $botprompt $input1 is not on irc! }{ + if (!getuhost($input1)) { xecho $acban $botprompt $input1 is not on irc! }{ @ bothost = sar(g/~/\*/$getuhost($input1)) @ botnick = [$input1] }} @@ -36,7 +36,7 @@ @ :botcmd = [$3-] @ setitem(bots 0 !) @ setitem(bots $numitems(bots) $botnick!$bothost $pass $chan $botcmd) - xecho -b $botprompt $Cparse(%nbot added %c$botnick%K!%c$bothost%n pass%K:%c $decode($pass) %nchannel%K:%c $chan%n command%K:%n $botcmd) + xecho $acban $botprompt $Cparse(%nbot added %c$botnick%K!%c$bothost%n pass%K:%c $decode($pass) %nchannel%K:%c $chan%n command%K:%n $botcmd) } } } @@ -120,7 +120,7 @@ @cmd=word(3 $blah2) @pass=decode($word(1 $blah2)) if (ischanop($nick $chan)&&match($host $userhost($nick))) { - xecho -b $botprompt msging $nick for ops on $chan + xecho $acban $botprompt msging $nick for ops on $chan msg $nick $cmd $pass ^assign -chan;^assign -blah;^assign -blah2;^assign -host;^assign -nick;^assign -host;^assign -nick;^assign -cmd;^assign -pass } diff amn.orig/modules/abot/abot.m.orig amn/modules/abot/abot.m.orig --- amn.orig/modules/abot/abot.m.orig Thu Jan 1 00:00:00 1970 +++ amn/modules/abot/abot.m.orig Mon Oct 10 21:36:00 2005 @@ -0,0 +1,155 @@ +# Copyright (c) 2003-2005 Amnesiac Software Project. +# See the 'COPYRIGHT' file for more information. +subpackage autobot + +@ bsavefile = [$(savepath).bot.save] +@ botprompt = [$cparse($(c1)auto)$cparse($(c2)bot)$(hblk):$(cl)] +alias ismask {return ${pass(!@ $0) ? 1 : 0}} +/* shade - ismask() */ +/* thanks =] */ + +#some compat aliases..//zak +alias delbot botdel $* +alias botlist listbot +alias abot listbot +alias rmbot botdel $* +#end. + +alias addbot { + if ( numwords($*) < 4) { + banner.lchead + banner.mid syntax: $Cparse(/addbot %K[%nbotnick%K|%nbotnick%K!%nbotident%K@%nbothost%K]%n password channel opcmd) + banner.lcfoot +}{ + @ :input1 = [$0] + if (ismask($input1)) { + @ bothost = after(! $input1) + @ botnick = before(! $input1) + } else { + if (!getuhost($input1)) { x