Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-12-23 19:22:45 +01:00
Code Issues Projects Releases Wiki Activity
7,751 Commits 3 Branches 126 Tags 40 MiB
e84dc3b5f9
Commit Graph

3742 Commits

Author SHA1 Message Date
Daniel Folkinshteyn
c0986e1122 change Topic to have a default required capability set, for all write operations. 
by default, now only allows chanops, and users with admin or channel,op capability to change topics
 2011-02-25 18:47:56 +01:00
Daniel Folkinshteyn
7ec1ca2070 make later plugin send waiting messages on user join also, not just on privmsg. 2011-02-25 18:38:14 +01:00
Daniel Folkinshteyn
fcaa7863fa add nick validation to later tell 
this avoids plugging the later db with messages for bogus nicks
 2011-02-25 18:37:22 +01:00
Daniel Folkinshteyn
a2da24d202 add a random-synonym getting function to Dict, add tests for it. 
using the moby-thes database from dict.org.
 2011-02-25 18:36:17 +01:00
Daniel Folkinshteyn
b306c5440f add damerau-levenshtein distance to supybot.utils.seq 
use it in factoids invalid command to match possible typos
write tests for same.
 2011-02-25 18:36:09 +01:00
Daniel Folkinshteyn
bdc8fd5285 fix some encoding error for non-ascii langs 2011-02-25 18:36:00 +01:00
Daniel Folkinshteyn
ca045128d7 add detected source language display for 'auto' google translate, add test for auto translate. 2011-02-25 18:35:53 +01:00
Daniel Folkinshteyn
6b324674a7 enable google translate to autodetect language with 'auto' fromlang. 2011-02-25 18:35:44 +01:00
Daniel Folkinshteyn
9b516480af add tests for factoids.alias 2011-02-25 18:35:37 +01:00
Daniel Folkinshteyn
50ac5a05e1 delete leftover debug-prints 2011-02-25 18:35:30 +01:00
Daniel Folkinshteyn
366c2b7c17 add factoids alias function, to link more keys to existing factoids. 2011-02-25 18:35:17 +01:00
Daniel Folkinshteyn
436d2bade8 mod factoids plugin to use a separate key-value relationship table 
this avoids duplication, and allows one to set a bunch of aliases for a factoid, without creating duplicates of the same fact content.
 2011-02-25 18:33:40 +01:00
Daniel Folkinshteyn
471921eab6 make 'factoids info' include usage count in output. add test for same. 2011-02-24 21:03:30 +01:00
nanotube
e71ee8fbb1 don't give up too easily with invalid command, instead search factoid keys with wildcard first. 2011-02-24 21:02:39 +01:00
nanotube
b922890b6f add rank test to factoids, update factoids test code to sqlite3 2011-02-24 21:01:19 +01:00
nanotube
5c0596f484 rename factrank to just rank for consistency 2011-02-24 21:01:08 +01:00
Daniel Folkinshteyn
2b5ffaa940 add replies function to reply plugin, which makes multiple replies, if supybot.reply.oneToOne is false. 2011-02-24 20:58:05 +01:00
Daniel Folkinshteyn
f71464adb3 This merges an old branch i had for sqlite3 factoids+moobotfactoids. 
fix up moobotfactoids+factoids to use the sqlite text_factory=str,
also fixed up a test for factoid search, since it now sorts keys alphabetically.
 2011-02-24 20:55:24 +01:00
Daniel Folkinshteyn
c0ebdddb47 start factoid rankings from 1 not from 0 2011-02-24 20:09:00 +01:00
Daniel Folkinshteyn
34f8557cfd remove rogue test-print 2011-02-24 20:06:35 +01:00
Daniel Folkinshteyn
7351ec1702 sort keys in factoid search output by alphabetically by key name. 2011-02-24 20:03:28 +01:00
Daniel Folkinshteyn
d2ac0e742a implement factoid usage counter 2011-02-24 20:03:03 +01:00
Daniel Folkinshteyn
957998f483 Utilities: add countargs function, returns number of arguments supplied. 
also add tests for it.
 2011-02-20 11:30:50 +01:00
Daniel Folkinshteyn
6381266cfd Utilities: add 'sample' command, a basic interface to random.sample() 
Also add tests for it.
 2011-02-20 11:29:08 +01:00
Valentin Lorentz
9d7287a436 Import MessageParser from gribble repo 2011-02-20 11:14:29 +01:00
Valentin Lorentz
f3a20df8f1 Import Conditional from gribble repo 2011-02-20 11:13:57 +01:00
Daniel Folkinshteyn
f6e3698c24 Scheduler: handle event persistence on plugin reload. 
Write data to disk on unload; populate events dict with events which are
still scheduled on reload.
 2011-02-20 10:43:02 +01:00
Daniel Folkinshteyn
42efc79ef1 Scheduler: add scheduled task persistence. 
The list of tasks scheduled with the Scheduler plugin is now saved
on exit, and restored upon restart.

Previously all scheduled tasks would be forgotten upon bot restart,
which was undesirable behavior.
 2011-02-20 10:41:52 +01:00
Valentin Lorentz
2d265f9d82 Google: update translation 2011-02-14 18:35:53 +01:00
Daniel Folkinshteyn
a6b9d5fe5f Google: fix encoding bug in lucky --snippet; need to pass encoded string to utils.web.htmlToText 2011-02-14 18:27:40 +01:00
Daniel Folkinshteyn
614e6c3f43 Google: in lucky --snippet, properly convert html to text, using utils.web.htmlToText. 2011-02-14 18:27:26 +01:00
Daniel Folkinshteyn
33c6eabf82 Google: add --snippet option to lucky command, which shows the text snippet for the page. 2011-02-14 18:26:50 +01:00
Valentin Lorentz
5395000e76 Change website supybot-fr.tk -> supybot.fr.cr 2011-02-09 17:16:26 +01:00
Valentin Lorentz
c456abd25c Later: fix french translation 2011-01-30 12:04:57 +01:00
Valentin Lorentz
bcc745b956 Update BadWord's .pot and fr.po 2011-01-29 11:52:14 +01:00
Daniel Folkinshteyn
817190ff6b BadWords: improve help for requireWordBoundaries config. 
Make a note that the plugin requires restart or the words set updating,
for changes to this setting to take effect.
 2011-01-29 11:47:23 +01:00
Daniel Folkinshteyn
0e67977cdd Badwords: add plugin docstring, and fix/standardize some method docstrings. 2011-01-29 11:46:14 +01:00
Daniel Folkinshteyn
9665c178aa Scheduler: don't immediately execute commands when restoring repeated events. 2011-01-29 11:45:16 +01:00
Daniel Folkinshteyn
7c7b093b33 Google: add some extra matching capability to google calc 
now should be able to display any 'special' result from google.
 2011-01-29 11:39:59 +01:00
Daniel Folkinshteyn
b0bd346775 Services: add some more strings indicating identification success. 2011-01-29 11:36:48 +01:00
Daniel Folkinshteyn
60bbbc63ab Topic: get shouldn't require capabilities, since it's a read-only operation. 2011-01-29 11:34:10 +01:00
Valentin Lorentz
e8814fc07a Add checkCapabilityButIgnoreOwner converter 2011-01-27 19:32:43 +01:00
Valentin Lorentz
1cceeb7ad1 Fix @String decode utf8 issue 2011-01-26 08:30:20 +01:00
Valentin Lorentz
17248b5d2c Merge branch 'testing' into unit-tests 
Conflicts:
	src/utils/str.py
 2011-01-22 10:29:22 +01:00
Valentin Lorentz
e6fc429701 Fix bug with rainbow when message contains numeric characters #SF3140981 2011-01-22 09:59:19 +01:00
Valentin Lorentz
d29ca0a227 Import Time plugin from Supybot-plugin repo 2011-01-22 09:54:53 +01:00
Valentin Lorentz
f13a2c7ee4 Fix translations 2011-01-08 13:35:43 +01:00
Valentin Lorentz
d273ac164e Fix Network localization 2011-01-05 17:22:34 +01:00
Valentin Lorentz
3582286658 Fix Factoids 2011-01-02 09:31:07 +01:00
Valentin Lorentz
6e6fd58ea7 Fix RSS encoding problem 2011-01-01 17:24:13 +01:00
Valentin Lorentz
f45e0b01ac Fix @help monologue french translation 2010-12-23 19:56:23 +01:00
Valentin Lorentz
d008f97383 Fix @Games monologue french translation 2010-12-23 15:51:06 +01:00
Valentin Lorentz
83f3fe1436 Merge branch 'l10n-fr' into testing 2010-12-12 15:05:08 +01:00
Valentin Lorentz
01018b902e Localize the two new strings of Config in French 2010-12-12 15:05:00 +01:00
Valentin Lorentz
59dad0501f Merge branch 'i18n' into l10n-fr 2010-12-12 15:03:22 +01:00
Valentin Lorentz
a739511b73 Internationalize two strings in Config 2010-12-12 15:03:13 +01:00
Valentin Lorentz
c5974046c6 Merge branch 'l10n-fr' into testing 2010-11-26 23:20:29 +01:00
Valentin Lorentz
50d887d67f Merge branch 'i18n' into l10n-fr 2010-11-26 23:19:57 +01:00
Valentin Lorentz
13b194a4fe Fix internationalisation bug in Config plugin 2010-11-26 23:19:05 +01:00
Valentin Lorentz
6629c8d48f Add @reloadlocale to Owner plugin 2010-11-19 17:10:47 +01:00
Valentin Lorentz
bd7f38604e Merge branch 'l10n-fr' into testing 2010-11-19 17:01:46 +01:00
Valentin Lorentz
05560299d9 Later: fix localisation problem 2010-11-17 21:40:11 +01:00
Valentin Lorentz
e5fd3b8a7d Merge branch 'l10n-fr' into testing 2010-11-17 16:50:56 +01:00
Valentin Lorentz
415f79d9a5 Later: fix localization problem 2010-11-17 16:44:34 +01:00
Valentin Lorentz
ad79ec4f7f Merge branch 'l10n-fr' into testing 2010-11-11 12:39:19 +01:00
Valentin Lorentz
4d957e858e Factoids: localize a string 2010-11-11 12:39:13 +01:00
Valentin Lorentz
9ca812c83d Merge branch 'i18n' into l10n-fr 2010-11-11 12:38:32 +01:00
Valentin Lorentz
11f7033ee0 Factoids: Internationalize a config variable 2010-11-11 12:37:21 +01:00
Valentin Lorentz
44c692bdc6 Merge branch 'l10n-fr' into testing 2010-11-03 19:12:06 +01:00
Valentin Lorentz
485c6161ee Plugin: fix a little localization error 2010-11-03 19:12:00 +01:00
Valentin Lorentz
fa336acbac Merge branch 'l10n-fr' into testing 2010-11-03 19:09:50 +01:00
Valentin Lorentz
9bd66a7e7c Plugin: fix two localization error 2010-11-03 19:09:42 +01:00
Valentin Lorentz
27ef96a78a Merge branch 'l10n-fr' into testing 2010-11-01 19:53:58 +01:00
Valentin Lorentz
382bad4a1d AutoMode: fix misspell in french locale 2010-11-01 19:52:28 +01:00
Valentin Lorentz
d2ccb876dd Remove Debian plugin 2010-11-01 15:53:01 +01:00
Valentin Lorentz
0410cf3d0d Merge branch 'l10n-fr' into testing 2010-11-01 11:49:11 +01:00
Valentin Lorentz
ddb3dd5a50 Merge branch 'i18n' into l18n-fr 2010-11-01 11:49:04 +01:00
Valentin Lorentz
4dcd7f7fb4 Bug fixes (mainly the &config help internationalization) 2010-11-01 11:42:33 +01:00
Valentin Lorentz
6dfd334344 Merge branch 'l10n-fr' into testing 2010-10-31 11:32:00 +01:00
Valentin Lorentz
f536540204 Merge branch 'i18n' into l10n-fr 2010-10-31 11:31:53 +01:00
Valentin Lorentz
0360451cb9 Note & Owner : fix missing import for the i18n 2010-10-31 11:29:01 +01:00
Valentin Lorentz
27bb53b560 Merge branch 'l10n-fr' into testing 2010-10-30 21:41:44 +02:00
Valentin Lorentz
32cabd6d27 Status: fix two translations 2010-10-30 13:05:52 +02:00
Valentin Lorentz
f3528c57d4 Merge branch 'l10n-fr' into testing 2010-10-30 12:49:57 +02:00
Valentin Lorentz
caa18e4924 Topic: fix a translation 2010-10-30 12:49:12 +02:00
Valentin Lorentz
be4b1adb52 Merge branch 'l10n-fr' into testing 2010-10-30 12:26:45 +02:00
Valentin Lorentz
ee0df0160f Topic: fix offset between untraslated and translated strings 2010-10-30 12:26:39 +02:00
Valentin Lorentz
a1db8e3ab1 Merge branch 'i18n' into l10n-fr 2010-10-30 12:24:07 +02:00
Valentin Lorentz
595d98df91 Topic: Fix bad doctring 2010-10-30 12:24:02 +02:00
Valentin Lorentz
5e09a9c887 Merge branch 'l10n-fr' into testing 2010-10-30 12:11:29 +02:00
Valentin Lorentz
df3459dc3b Localize Sucess, Time, Todo, Topic, Url, Unix, User, Utilities, and Web into French 2010-10-30 12:10:31 +02:00
Valentin Lorentz
94d69151bc Merge branch 'i18n' into l10n-fr 2010-10-30 11:24:03 +02:00
Valentin Lorentz
52094ec910 User: internationalize a string 2010-10-30 11:23:56 +02:00
Valentin Lorentz
05389a98ef Localize Services, ShrinkUrl, Status, and String into French 2010-10-29 20:19:35 +02:00
Valentin Lorentz
eb8b16f8fb Localize Misc, MoobotFactoids, Network, News, NickCapture, Nikometer, Note, Owner, Plugin, Praise, Protector, Quote, QuoteGrabs, RSS, Relay, Reply, Scheduler, and Seen 2010-10-29 18:10:32 +02:00
Valentin Lorentz
dd11dbab0c Merge branch 'i18n' into l10n-fr 2010-10-29 14:48:03 +02:00
Valentin Lorentz
5339516257 Owner: Add the messages.pot 2010-10-29 14:47:47 +02:00
Valentin Lorentz
f394757a3a Merge branch 'i18n' into l10n-fr 2010-10-29 13:55:06 +02:00
Valentin Lorentz
9ce8b4d59c Note: Add the messages.pot 2010-10-29 13:54:58 +02:00
Valentin Lorentz
28787c77dd Merge branch 'i18n' into l10n-fr 2010-10-29 12:03:16 +02:00
Valentin Lorentz
6c1b91c227 MoobotFactoid: Internationalize a string 2010-10-29 12:03:08 +02:00
Valentin Lorentz
424f5acebe Move MegaHAL and SupySandbox to the Supybot-plugins repository 2010-10-29 09:44:16 +02:00
Valentin Lorentz
520034d3dc Localize Later, Limiter, and Math into French 2010-10-28 19:33:27 +02:00
Valentin Lorentz
47586df8a1 Merge branch 'i18n' into l10n-fr 2010-10-28 16:15:56 +02:00
Valentin Lorentz
172467fb17 Later: refresh messages.pot 2010-10-28 16:15:50 +02:00
Valentin Lorentz
c6b40ebc64 Merge branch 'i18n' into l10n-fr 2010-10-28 16:15:03 +02:00
Valentin Lorentz
4a2c78efb8 Later: fix internationalization problem 2010-10-28 16:14:56 +02:00
Valentin Lorentz
da7888a878 Merge branch 'i18n' into l10n-fr 2010-10-28 16:13:05 +02:00
Valentin Lorentz
4e578da1b7 Later: internationalize a string 2010-10-28 16:12:58 +02:00
Valentin Lorentz
b7651b06a1 Merge branch 'l10n-fr' into testing 2010-10-28 15:45:51 +02:00
Valentin Lorentz
2d1917c9a0 Localized Games, Google, Herald, Internet, Karma, and Lart into French 2010-10-28 15:44:01 +02:00
Valentin Lorentz
3e50b64fb5 Merge branch 'i18n' into l10n-fr 2010-10-28 15:43:39 +02:00
Valentin Lorentz
3fe627ad75 Internationalize a string in Karma 2010-10-28 15:43:31 +02:00
Valentin Lorentz
827ab3532e Merge branch 'i18n' into l10n-fr 2010-10-28 15:18:53 +02:00
Valentin Lorentz
f3a579f3da Add the '<empty>' feature to nItems, and changed ChannelStats localization in order to use it as bug fixer 2010-10-28 15:18:06 +02:00
Valentin Lorentz
9b67f670c2 Localize Dict, Dunno, Factoids, Filter, and Format 2010-10-27 19:48:46 +02:00
Valentin Lorentz
5603e8ef2f Set the author as being ProgVal ;) 2010-10-27 14:20:04 +02:00
Valentin Lorentz
0dbb72dbd3 Internationalize ChannelLogger and Config 2010-10-26 19:23:26 +02:00
Valentin Lorentz
4a25b325cd Merge branch 'i18n' into l10n-fr 2010-10-26 19:23:00 +02:00
Valentin Lorentz
8864a7fc71 Fix Ctcp internationalization 2010-10-26 19:22:39 +02:00
Valentin Lorentz
ecfe196eae Merge branch 'l10n-fr' into testing 2010-10-26 09:33:04 +02:00
Valentin Lorentz
a7eb72fc29 Merge branch 'i18n' into l10n-fr 2010-10-26 09:32:34 +02:00
Valentin Lorentz
db977bf5d2 Fix Python2.5 issue (class decorators) 
Issue S-fr#5
 2010-10-26 09:32:12 +02:00
Valentin Lorentz
4aff05f361 RSS: fix mislocated decorator 2010-10-26 09:27:09 +02:00
Valentin Lorentz
ff24c559a7 MegaHAL: Don't prefix answers with the nick. 
Issue S-fr#2
 2010-10-26 09:02:41 +02:00
Valentin Lorentz
cd025be24a MegaHAL: Don't learn private messages. 
Issue S-fr#3
 2010-10-26 09:01:45 +02:00
Valentin Lorentz
7e58815530 Merge branch 'l10n-fr' into testing 2010-10-25 18:45:33 +02:00
Valentin Lorentz
9ea39fc267 Merge branch 'i18n' into l10n-fr 2010-10-25 17:57:11 +02:00
Valentin Lorentz
88414decd2 Localize AutoMode, BadWords, and Channel into French 2010-10-25 17:56:17 +02:00
Valentin Lorentz
007c58703f Remove internationalization of a non-internationalizable string 2010-10-25 13:11:59 +02:00
Valentin Lorentz
7a332860ca Fix config 2010-10-24 15:25:29 +02:00
Valentin Lorentz
47e44d8ae7 Merge branch 'i18n' into testing 2010-10-24 13:50:52 +02:00
Valentin Lorentz
7fb900d8df Fix misspell in Herald 2010-10-24 13:50:46 +02:00
Valentin Lorentz
6ef2503416 Merge branch 'more-plugins' into testing 2010-10-24 13:37:51 +02:00
Valentin Lorentz
cbc129417a Proxyfy MegaHAL and rexrite a (still broken) test case 2010-10-24 13:36:54 +02:00
Valentin Lorentz
42a95a1075 Localize Alias and Anonymous into French 2010-10-24 09:23:01 +02:00
Valentin Lorentz
07710b47ce Create MegaHAL plugin 2010-10-23 18:46:59 +02:00
Valentin Lorentz
8be4aaeff1 Merge branch 'readability' 2010-10-23 10:38:52 +02:00
Valentin Lorentz
e122102e5a Fix a test in Unix plugin 2010-10-20 19:11:00 +02:00
Valentin Lorentz
7d0d1ad09a Merge branch 'i18n' into l10n-fr 2010-10-20 09:40:07 +02:00
Valentin Lorentz
6a9a8d81b8 Internationalize Time, Todo, Topic, URL, Unix, Utilities, and Web 2010-10-20 09:39:44 +02:00
Valentin Lorentz
371a40e004 Internationalize Seen, Services, ShrinkUrl, Status, String, and Success 2010-10-20 09:10:03 +02:00
Valentin Lorentz
e4f198ddf7 Fix in Seen plugin : AssertionError: 'Someone was last seen in #test 0 seconds ago: *** test <test!user@host.domain.tld> has joined #test' does not match 'test has joined' 2010-10-20 08:50:59 +02:00
Valentin Lorentz
aaa0c480af Internationalize Relay, Reply, RSS, Scheduler 2010-10-19 19:50:41 +02:00
Valentin Lorentz
f613eb0f45 Add SupySandbox plugin 2010-10-17 19:59:13 +02:00
Valentin Lorentz
e358b98974 Add Debian plugin 2010-10-17 18:43:34 +02:00
Valentin Lorentz
61780358ee Merge branch 'i18n' into l10n-fr 2010-10-17 18:37:47 +02:00
Valentin Lorentz
029c0cbe80 Internationalize Nickometer, Praise, Protector, Quote, and QuoteGrabs 2010-10-17 18:37:13 +02:00
Valentin Lorentz
ffc609a299 Internationalized MoobotFactoids, News, and NickCapture 2010-10-17 16:59:21 +02:00
Valentin Lorentz
e5e705f78c Fix %n issue in Alias 2010-10-17 16:02:11 +02:00
Valentin Lorentz
7cf5bb7242 Merge branch 'i18n' of github.com:ProgVal/Supybot-fr into i18n 2010-10-17 16:00:13 +02:00
Valentin Lorentz
45de092652 Internationalize Herald, Internet, Karma, Lart, Later, Limiter, Math, and Misc 2010-10-17 15:59:23 +02:00
Valentin Lorentz
203fe3c56a Internationalize Herald, Internet, Karma, Lart, Later, Limiter, Math, and Misc 2010-10-17 15:36:26 +02:00
Valentin Lorentz
9917232d9a Internationalize Filter, Format, Games, and Google 2010-10-17 14:50:31 +02:00
Valentin Lorentz
d14bb0cc16 Internationalize ChannelLogger, Ctcp, Dict, Dunno, Factoids 2010-10-17 11:22:07 +02:00
Valentin Lorentz
ca23f946e5 Internationalize Alias, Anonymous, AutoMode, and BadWord 2010-10-16 18:54:18 +02:00
Valentin Lorentz
1cc1ec93a5 Internationalize Config, Network, Plugin, and User 2010-10-16 13:51:27 +02:00
Valentin Lorentz
b47c7c92a3 Edit Status and Web plugins in order to use %S 2010-10-16 11:37:58 +02:00
Valentin Lorentz
ac1c7790f5 Localized Admin to French 2010-10-16 10:59:50 +02:00
Valentin Lorentz
5fa6ff7bf8 Add an accidentaly removed space 2010-10-16 10:54:33 +02:00
Valentin Lorentz
2a69fd23c4 Little fix to Admin internationalization 2010-10-16 10:51:50 +02:00
Valentin Lorentz
83c066eeab Internationalize Channel 2010-10-16 10:17:51 +02:00
Valentin Lorentz
949d13cdc9 Internationalize Admin 2010-10-16 09:52:00 +02:00
Valentin Lorentz
70af49feb3 Changed .pot file name in ChannelStats. 2010-10-16 09:49:04 +02:00
Valentin Lorentz
850aa279a4 Finish localisation of ChannelStats 2010-10-10 15:43:13 +02:00
Valentin Lorentz
4552038be4 Renamed the .pot file of ChannelStats 2010-10-10 15:12:06 +02:00
Valentin Lorentz
a8319d3c6f Remove debug message and internationalize config.py in ChannelStats 2010-10-10 15:11:41 +02:00
Valentin Lorentz
a750fe6a2e Fix the internationalisation problem for the docstrings 2010-10-10 14:45:25 +02:00
Valentin Lorentz
842221801a Fix the internationalisation problem for the docstrings 2010-10-10 14:45:07 +02:00
Valentin Lorentz
09209056fe Fix some bad meta-data of the French localization of ChannelStats 2010-10-09 11:42:32 +02:00
Valentin Lorentz
50acd3d8d9 Creating the internationalization module and internationalize/localize ChannelStats into French 2010-10-09 11:36:22 +02:00
James Vega
cb48912db6 Services: Correct formatting of "isn't registered" log. 
Closes: Sf#3075937
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-10-03 14:58:38 -04:00
James Vega
26a458b9ec Merge branch 'maint/0.83.4' 2010-09-20 19:46:18 -04:00
James Vega
ca56575eb5 Unix: Use converter to enforce "no spaces" for spell's argument. 
Closes: Sf#3064304
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-09-20 19:44:01 -04:00
James Vega
074ded49e4 Use the plugin name for Owner.defaultplugin's error message. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-09-20 18:20:52 -04:00
James Vega
efdb2b44c1 Merge branch 'maint/0.83.4' 2010-09-09 00:02:18 -04:00
James Vega
154fbc30e9 Games: Re-add some, much higher, upper limits to dice. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-09-09 00:00:47 -04:00
James Vega
0abe22f5d1 Merge branch 'maint/0.83.4' 2010-09-08 23:50:35 -04:00
James Vega
45abdc8248 Karma: Refer to plugins.Karma.rankingDisplay in Karma.karma's help. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-09-08 23:44:40 -04:00
James Vega
b0575cec88 Handle changes to fnmatch.translate in Python 2.6 
Define utils.python.glob2re based on the Python version being used.
Use glob2re in Todo and Note plugins.

Closes: Sf#3059292
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-09-08 23:31:01 -04:00
James Vega
fc2a84fb90 <text> -> <thing> in Karma.karma's help 
Closes: Sf#3057517
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-09-08 22:43:45 -04:00
James Vega
c0e24cef30 Limiter: Fix "reduce limit" test case. 
Closes: Sf#3058142
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-09-08 22:42:07 -04:00
James Vega
c9274606ce Google: Remove Groups snarfer 
The regular expressions were woefully out of date and since there's not a
stable API (or any for that matter), keeping things working is a losing
battle.

Closes: Sf#3057485
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-09-08 22:20:23 -04:00
James Vega
7cf61ad046 Games: Remove arbitrary upper limits on dice command. 
Closes: Sf#3057255
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-09-08 21:35:22 -04:00
James Vega
63244b1e47 News: Use positiveInt converter instead of manual checks. 
Closes: Sf#3059239
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-09-05 01:09:43 -04:00
James Vega
8deb47eb53 Merge branch 'maint/0.83.4' 2010-08-31 19:01:37 -04:00
James Vega
8cc6320768 Channel: Correct specification of "#channel,op" capability. 
Closes: Sf#3055991
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-08-31 19:00:28 -04:00
James Vega
452c019b10 Filter: Rename _(un)code to _(morse|unMorse)code 
Closes: Sf#3056753
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-08-31 18:52:09 -04:00
James Vega
28839f8d00 Merge branch 'maint/0.83.4' 2010-08-31 18:47:09 -04:00
James Vega
bc98577fb1 Dict: Refer to the server config variable in Dict.dict's help. 
Closes: Sf#3056621
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-08-31 18:46:05 -04:00
James Vega
7d87d2f87a Merge branch 'maint/0.83.4' 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-08-29 11:34:55 -04:00
James Vega
577294f489 User: Handle DuplicateHostmask exception in hostmask.add. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-08-29 11:32:39 -04:00
James Vega
de726f90f3 User: Only require name for set.password when changing other user's password. 
Closes: Sf#3055358
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-08-29 11:32:23 -04:00
James Vega
f977a3a260 User: Require set.password be sent in private. 
Closes: Sf#3055365
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-08-29 11:03:41 -04:00
James Vega
07da8cab13 User: Specify chanagename must be used in private in its help. 
Closes: Sf#3055353
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-08-29 10:49:13 -04:00
James Vega
25b987cc58 Model Admin's ignore help after Channel's. 
Closes: Sf#3054919
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-08-29 10:26:59 -04:00
James Vega
0ff414b993 Services: Don't filter outgoing JOIN messages on disabled networks 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit acffde68ab)
 2010-08-24 19:52:22 -04:00
James Vega
3f63917dc2 Use conf.registerGlobalValue to ensure generated values are properly setup. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 0c62204809)
 2010-08-24 19:52:09 -04:00
James Vega
8c280369a6 Services: Properly register the NickServ.password group and child values. 
Closes: Sf#3019174

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit d78f7b6ac5)
 2010-08-24 19:51:51 -04:00
James Vega
0f877166ad Services: Fix conflict with callbacks.Commands.isDisabled 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit f926804f40)
 2010-08-24 19:51:09 -04:00
Daniel Folkinshteyn
abf6df9e13 fix google calc to work when doing a currency conversion. 
made the calcre more generic, so it finds stuff on both math and currency.
nothing a little exploration of google html page source couldn't solve.

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 432228c736)
 2010-08-24 19:50:47 -04:00
Daniel Folkinshteyn
9e1ba9910a make Misc.apropos return plugin name even if command is in only one plugin. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 8daebd1240)
 2010-08-24 19:50:22 -04:00
James Vega
976567c1ac Services: Disable most of the plugin on networks in the disabled list. 
Notify the user when trying to use the commands on a disabled network, ignore
noJoinsUntilIdentified, and don't try communicating with services.

Closes: Sf#3018464

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 9e73f4482c)
 2010-08-24 19:50:11 -04:00
James Vega
246e09cc99 Anonymous: Implement support for allowPrivateTarget config. 
Closes: Sf#2991515

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 57e894de58)
 2010-08-24 19:49:14 -04:00
Daniel Folkinshteyn
e9d55d4bbd fix bug in RSS.announce.list: 
Because the 'channel' argument was declared optional, calling announce.list
off-channel without a channel argument caused an error.

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 40941e044a)
 2010-08-24 19:48:42 -04:00
Daniel Folkinshteyn
fb8d0d320a fix alias bug https://sourceforge.net/tracker/?func=detail&aid=2987147&group_id=58965&atid=489447 
add tests for appropriate behavior

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 8d64d08645)
 2010-08-24 19:45:48 -04:00
James Vega
7869b962d1 Fix the previous Factoids fix. 
channel needs to be part of the args list.

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit fe07ea1146)
 2010-08-24 19:44:56 -04:00
James Vega
b2c45caa66 Factoids: Pass channel to whatis when being called from search 
Thanks to Daniel Folkinshteyn for the fix.

Closes: Sf#2965589

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 209facd242)
 2010-08-24 19:44:45 -04:00
James Vega
be9128b3ec Internet: Use whois-servers.net for all whois lookups. 
rs.internic.net seems to be broken and using $tld.whois-servers.net looks to
be working for everything.

Also need to update the line termination string to use '\r\n' instead of '\n'
since some servers are strict about receiving the former.

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 397cbbe0d3)
 2010-08-24 19:44:18 -04:00
James Vega
8d94ff743c Include hostmasks in JOIN, PART, QUIT logs. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 4a9596608a)
 2010-08-24 19:44:10 -04:00
James Vega
0933621dab Factoids: Prevent empty key or value when adding a factoid. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 10f5a12b7e)
 2010-08-24 19:43:56 -04:00
James Vega
455b5631bc Update plugins to ignore all non-ACTION CTCP messages. 
Also update commands.urlSnarfer to do the same, which allows us to revert
"Don't bother snarfing URLs from non-Action CTCP messages."

This reverts commit 3282e3407e.

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 288d7c6e02)
 2010-08-24 19:42:11 -04:00
Jeremy Fincher
e2cafb2e3d Don't bother snarfing URLs from non-Action CTCP messages. 
(cherry picked from commit 3282e3407e)
 2010-08-24 19:41:49 -04:00
James Vega
f35e68cd65 Network: Properly parse WHOIS response 
The 319 message that indicates which channel(s) a user is in prefix the
channel name with the modes (@, +, !, etc.) applied to that user.  These need
to be stripped from the channel name before we feed it to
irc.state.channels.get(), otherwise when irc.state.channels.get() returns None
we assume the channel can't be private and leak information.
(cherry picked from commit 408ab6f88a)
 2010-08-24 19:41:30 -04:00
James Vega
afb4e1e07f Use 0 when no results are returned for Google.fight 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 3689460d0f)
 2010-08-24 19:40:54 -04:00
James Vega
a7c924b466 Switch from using the various popen flavors to subprocess.Popen 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit fbdc44ca52)
 2010-08-24 19:40:23 -04:00
James Vega
c53f8cd510 Rename Owner.log to Owner.logmark 
Since every plugin has a log method (to do actual logging), the log command
was conflicting with that.  The attempted workaround was overly complicated
and broken.  Simply renaming the command to logmark simplifies everything.

Closes Sf #2889709

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit acaa9b1fd6)
 2010-08-24 19:21:58 -04:00
James Vega
0bd9a8b6f4 Use the correct URLs for the PySqlite website. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 927c8c963a)
 2010-08-24 19:15:27 -04:00
James Vega
dcdbd5bea4 Update references to PySqlite URL 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit f475525237)
 2010-08-24 19:15:17 -04:00
James Vega
f0852a9e45 utils.web: Provide access to the raw httpUrlRe/urlRe strings 
Using the compiled regexps for a PluginRegexp method's __doc__ doesn't work.

Closes Sourceforge #2879862

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 25fc2de643)
 2010-08-24 19:14:58 -04:00
James Vega
bb4e09886a Use utils.web.httpUrlRe for the Web/ShrinkUrl snarfer regexes. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit ca917d3528)
 2010-08-24 19:14:36 -04:00
Benjamin P. Burhans
750fb2ccdc Check for empty word list in BadWords plugin before filtering. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 6418b3d8c3)
 2010-08-24 19:13:09 -04:00
Štěpán Němec
bc1c159d27 QuoteGrabs plugin: Add an `ungrab' command. 
Also add a missing error check in the `list' db method.

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit e922918564)
 2010-08-24 19:09:43 -04:00
Štěpán Němec
4cc8fdecdc Note plugin: Fix erroneous use of __contributors__. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit a693162059)
 2010-08-24 19:03:27 -04:00
James Vega
6bebc383b4 ChannelStats.rank now starts from 1 instead of 0 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 169aee3bc0)
 2010-08-24 19:02:58 -04:00
James Vega
885d60a132 QuoteGrabs: QuoteGrabsRecord at arg needs to be an int. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit cbf68e53e3)
 2010-08-24 19:02:05 -04:00
James Vega
d43d083f44 User: getHostmasks should always return a string 
Since it was calling irc.reply() in one case, we had both that irc.reply being
sent and the irc.reply() of what getHostmasks returned (None in that case).
Bad!

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit dcb247494e)
 2010-08-24 19:01:55 -04:00
James Vega
965f4e79b8 User: Fix hostmask.list to show the user's name not the repr user object 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 9dccada152)
 2010-08-24 19:01:44 -04:00
James Vega
7aeedea6f6 Updated ChannelIdDatabasePlugin's getCommandHelp signature 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit c9329303d3)
 2010-08-24 19:01:26 -04:00
James Vega
26cefc78f4 Channel: alert should not require the caller to have op capability 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit ba29f0787c)
 2010-08-24 19:01:12 -04:00
James Vega
2b0b74dfe0 Google: Keep the list of supported languages in one place. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 461f943d97)
 2010-08-24 19:01:00 -04:00
James Vega
65a180798f QuoteGrabs: Fix incorrect argument order to _grab 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 874508867f)
 2010-08-24 19:00:34 -04:00
Ricky Zhou
4eb30069bf Try using simplejson instead if json-py is installed. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 416a6e8dd2)
 2010-08-24 19:00:14 -04:00
James Vega
3090cffe2c Include String plugin for Utilities' tests. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-07-11 11:04:33 -04:00
James Vega
0bfa0d153c ShrinkUrl: Add serviceRotation config. 
When configured, the outFilter and shrinkSnarfer use cycle through
serviceRotation's list of services.  Otherwise, the default service is used.

Closes: deb#539858

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-07-11 10:47:37 -04:00
James Vega
acffde68ab Services: Don't filter outgoing JOIN messages on disabled networks 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-06-27 19:48:36 -04:00
James Vega
0c62204809 Use conf.registerGlobalValue to ensure generated values are properly setup. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-06-24 00:37:40 -04:00
James Vega
c10d964604 Elide ignored replies from nested command output. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-06-24 00:33:04 -04:00
James Vega
d78f7b6ac5 Services: Properly register the NickServ.password group and child values. 
Closes: Sf#3019174

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-06-21 19:35:35 -04:00
James Vega
f926804f40 Services: Fix conflict with callbacks.Commands.isDisabled 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-06-19 22:38:27 -04:00
Daniel Folkinshteyn
432228c736 fix google calc to work when doing a currency conversion. 
made the calcre more generic, so it finds stuff on both math and currency.
nothing a little exploration of google html page source couldn't solve.

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-06-19 18:01:38 -04:00
Daniel Folkinshteyn
8daebd1240 make Misc.apropos return plugin name even if command is in only one plugin. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-06-19 17:20:20 -04:00
James Vega
9e73f4482c Services: Disable most of the plugin on networks in the disabled list. 
Notify the user when trying to use the commands on a disabled network, ignore
noJoinsUntilIdentified, and don't try communicating with services.

Closes: Sf#3018464

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-06-19 16:59:13 -04:00
James Vega
57e894de58 Anonymous: Implement support for allowPrivateTarget config. 
Closes: Sf#2991515

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-05-24 15:21:58 -04:00
Daniel Folkinshteyn
40941e044a fix bug in RSS.announce.list: 
Because the 'channel' argument was declared optional, calling announce.list
off-channel without a channel argument caused an error.

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-05-24 14:46:04 -04:00
James Vega
5ccb242657 Re-add re import since capability-checking code relies on it. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-05-15 21:55:05 -04:00
Štěpán Němec
18ef6dadfc Topic plugin: Restore topic automatically after join if not set. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-05-11 18:23:33 -04:00
Štěpán Němec
6520d1f282 Topic plugin: Add persistence support. 
Topics now persist between restarts.

Rationale: Useful when reloading/restarting; previously the topics would
be just forgotten. Don't use database, as that would be an unnecessary
overkill and in any case not needed.

(Also, remove the unused `re' module import.)

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-05-11 18:22:37 -04:00
James Vega
41fd218b8d ChannelStats: Fix rank to work with selfStats 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-05-11 17:50:43 -04:00
Daniel Folkinshteyn
814d89e200 topic now checks for +t mode before denying topic changes, and also allows halfops in addition to ops. 
default required capabilities for topic changes (if topic is +t and user is not an op or halfop), are chan,op and chan,halfop
thanks jemfinch for the suggestions.

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-04-14 22:57:01 -04:00
Daniel Folkinshteyn
063dd24677 change Topic to have a default required capability set, for all write operations. 
by default, now only allows chanops, and users with admin or channel,op capability to change topics

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-04-14 22:56:52 -04:00
Daniel Folkinshteyn
f880037e41 for Alias, make doc string say "at least x args" if there are optional args in addition to required args. 
yay for cosmetic improvements. :)

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-04-14 22:29:58 -04:00
Daniel Folkinshteyn
8d64d08645 fix alias bug https://sourceforge.net/tracker/?func=detail&aid=2987147&group_id=58965&atid=489447 
add tests for appropriate behavior

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-04-14 22:25:40 -04:00
James Vega
fe07ea1146 Fix the previous Factoids fix. 
channel needs to be part of the args list.

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-04-11 11:04:45 -04:00
James Vega
209facd242 Factoids: Pass channel to whatis when being called from search 
Thanks to Daniel Folkinshteyn for the fix.

Closes: Sf#2965589

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-04-11 10:36:55 -04:00
James Vega
397cbbe0d3 Internet: Use whois-servers.net for all whois lookups. 
rs.internic.net seems to be broken and using $tld.whois-servers.net looks to
be working for everything.

Also need to update the line termination string to use '\r\n' instead of '\n'
since some servers are strict about receiving the former.

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-03-03 08:33:44 -05:00
James Vega
4a9596608a Include hostmasks in JOIN, PART, QUIT logs. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-02-28 21:17:35 -05:00
James Vega
10f5a12b7e Factoids: Prevent empty key or value when adding a factoid. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-02-05 18:50:48 -05:00
James Vega
288d7c6e02 Update plugins to ignore all non-ACTION CTCP messages. 
Also update commands.urlSnarfer to do the same, which allows us to revert
"Don't bother snarfing URLs from non-Action CTCP messages."

This reverts commit 3282e3407e.

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-01-28 08:14:44 -05:00
Jeremy Fincher
3282e3407e Don't bother snarfing URLs from non-Action CTCP messages. 2010-01-28 06:35:53 -06:00
Štěpán Němec
9e15d03375 Filter plugin: improve the `uniud' replacements. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-01-27 19:01:54 -05:00
Štěpán Němec
3a992ba78e Format plugin: Delete stray `configure' definition from plugin.py. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2010-01-15 21:57:07 -05:00
James Vega
408ab6f88a Network: Properly parse WHOIS response 
The 319 message that indicates which channel(s) a user is in prefix the
channel name with the modes (@, +, !, etc.) applied to that user.  These need
to be stripped from the channel name before we feed it to
irc.state.channels.get(), otherwise when irc.state.channels.get() returns None
we assume the channel can't be private and leak information.
 2010-01-10 20:17:10 -05:00
James Vega
3689460d0f Use 0 when no results are returned for Google.fight 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-11-28 21:21:00 -05:00
James Vega
fbdc44ca52 Switch from using the various popen flavors to subprocess.Popen 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-11-22 14:31:58 -05:00
hairball
a594d0e95c Small typos and doc fixes. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-11-04 22:54:46 -05:00
James Vega
a453f56284 ShrinkUrl: Use tinyurl's api-create page to avoid screen-scraping. 
Set snarfThrottle to 0 while testing since we know there's nothing other than
the test input that could be causing us to snarf.  Fixes some intermittent
test failures due to fast snarf responses.

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-11-04 22:37:53 -05:00
James Vega
082ee59d32 Change a couple tests so they fail for real reasons instead of fake. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-11-01 19:08:34 -05:00
James Vega
acaa9b1fd6 Rename Owner.log to Owner.logmark 
Since every plugin has a log method (to do actual logging), the log command
was conflicting with that.  The attempted workaround was overly complicated
and broken.  Simply renaming the command to logmark simplifies everything.

Closes Sf #2889709

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-10-31 18:22:14 -04:00
James Vega
213d304e54 ChannelStats: Add tracking of max users for a channel. 
Closes Sf #1032038

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-10-27 19:28:34 -04:00
James Vega
927c8c963a Use the correct URLs for the PySqlite website. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-10-21 22:48:04 -04:00
James Vega
f475525237 Update references to PySqlite URL 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-10-21 22:43:26 -04:00
James Vega
4c9efc044b Replace Factoids.factoidPrefix with Factoids.format 
Factoids.format makes use of registry.TemplatedString so the user can specify
excactly how they want the factoid reply to be formed.

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-10-15 22:37:59 -04:00
James Vega
5af38453a8 Update Topic to use registry.TemplatedString 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-10-15 22:35:17 -04:00
James Vega
25fc2de643 utils.web: Provide access to the raw httpUrlRe/urlRe strings 
Using the compiled regexps for a PluginRegexp method's __doc__ doesn't work.

Closes Sourceforge #2879862

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-10-15 22:16:38 -04:00
James Vega
c4de386d8f ShrinkUrl: Remove our 'lazy biotch' message and length check. 
If someone wants to specifically request that a URL, which can't possibly be
made shorter using a specific service, be shrunk, we should abide their
request.
 2009-10-08 23:14:42 -04:00
James Vega
de4218b26e ShrinkUrl: Add support for x0.no 2009-10-08 22:58:57 -04:00
James Vega
d8c13c1f21 Rewrite ShrinkUrl's tests to ease testing of new services. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-10-08 22:28:02 -04:00
James Vega
924b57eca3 ShrinkUrl: Lower snarfThrottle to .5 second while testing. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-10-04 23:30:08 -04:00
James Vega
9d66399420 ShrinkUrl: Add support for xrl.us 
Closes one part of Debian #539858

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-10-04 23:30:02 -04:00
James Vega
200f716011 ShrinkUrl: Uniformly handle errors while shrinking via ShrinkError. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-10-04 22:08:55 -04:00
James Vega
c055b16ea8 ShrinkUrl: Use getattr() to simplify use of the growing number of services. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-10-04 21:54:20 -04:00
James Vega
ca917d3528 Use utils.web.httpUrlRe for the Web/ShrinkUrl snarfer regexes. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-10-04 21:41:05 -04:00
James Vega
22b3ccfbde ShrinkUrl: Generalize CdbShrunkenUrlDB's support for the different dbs. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-09-29 20:11:47 -04:00
Benjamin P. Burhans
6418b3d8c3 Check for empty word list in BadWords plugin before filtering. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-09-16 01:20:52 -04:00
James Vega
28b4b4742e Correct Unix.fortune.offensive's description to use -a. 
Closes deb#545780

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-09-09 07:49:17 -04:00
James Vega
eff20402ac Change canonize => normalize 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-08-27 16:41:34 -04:00
Štěpán Němec
e922918564 QuoteGrabs plugin: Add an `ungrab' command. 
Also add a missing error check in the `list' db method.

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-08-27 14:47:09 -04:00
Štěpán Němec
a66034f852 Fix some typos/wordings. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-08-26 16:34:12 -04:00
Štěpán Němec
a693162059 Note plugin: Fix erroneous use of __contributors__. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-08-26 15:43:10 -04:00
James Vega
169aee3bc0 ChannelStats.rank now starts from 1 instead of 0 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-08-20 10:48:41 -04:00
James Vega
c376b8e796 Channel: Allow kick to accept multiple nicks. 
Closes: Sf patch #1813467

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-07-20 18:08:21 -04:00
James Vega
cbf68e53e3 QuoteGrabs: QuoteGrabsRecord at arg needs to be an int. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-07-18 20:27:45 -04:00
James Vega
dcb247494e User: getHostmasks should always return a string 
Since it was calling irc.reply() in one case, we had both that irc.reply being
sent and the irc.reply() of what getHostmasks returned (None in that case).
Bad!

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-07-16 11:39:20 -04:00
James Vega
9dccada152 User: Fix hostmask.list to show the user's name not the repr user object 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-07-16 11:28:43 -04:00
James Vega
c9329303d3 Updated ChannelIdDatabasePlugin's getCommandHelp signature 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-07-14 20:32:57 -04:00
Jeremy Fincher
43129239d6 Added Seen.since, which lets a user see messages which were sent since the last time he parted a channel. 2009-07-01 15:40:58 -05:00
James Vega
ba29f0787c Channel: alert should not require the caller to have op capability 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-06-30 11:06:17 -04:00
James Vega
461f943d97 Google: Keep the list of supported languages in one place. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-06-26 18:21:16 -04:00
James Vega
874508867f QuoteGrabs: Fix incorrect argument order to _grab 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-06-26 16:58:46 -04:00
Jeremy Fincher
b9d6277e30 Added supybot.abuse.flood.command.invalid.notify, a configuration variable determining whether the bot will notify infractors of their ignoring. 2009-06-09 10:40:05 -05:00
Ricky Zhou
416a6e8dd2 Try using simplejson instead if json-py is installed. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-06-03 04:28:45 -04:00
James Vega
afa49be456 Channel: Chunk mass mode changes according to supported['MODES'] 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-05-25 10:38:49 -04:00
James Vega
b644e30bb6 Channel: Fix test failures from making ignores and bans use banmask 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-05-25 10:00:51 -04:00
James Vega
8bd37dbff7 Channel: Don't let nicks leak private info. 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-05-25 00:30:13 -04:00
James Vega
54dda880d4 Add a pluginCommands kwarg to Commands.listCommands. 
Plugins which implement their own listCommands method should pass their
non-typically discoverable commands to Commands.listCommands via this
mechanism.  This means that the de-duplication of commands is performed in one
spot instead of having each plugin implement it on their on in their
listCommands method.

This reverts commits 0ce829af6215b97e725f4d6d580d1151950be869 and
09fb0e6fc974445a3414fb03a94625f8538d4570.

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-05-22 18:52:15 -04:00
James Vega
d7dee482ca Google: Ensure we don't try to use the 3rd party json module. 
json-py provides a different interface than simplejson (renamed json when
included with Python2.6).  As such, we test for the different interface and
raise an error when we encounter it.

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-05-19 00:55:17 -04:00
James Vega
cca36ed9f2 Factoids: Add simpleSyntax argument to getCommandHelp. 
It helps to properly override the parent class's method so that Misc.help
doesn't error when trying to get Factoids.learn's help.

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-05-18 11:09:18 -04:00
James Vega
0d98118247 Allow getCommandHelp to be told whether to use simpleSyntax. 
Use this to force Misc.help to ignore simpleSyntax since the user has
explicitly asked for the help.

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-05-18 03:12:54 -04:00
James Vega
d7237104ae Math: Update the units info from ConvertAll 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-05-18 00:44:59 -04:00
James Vega
5fda0df4a9 Update dateutil to latest version and include all files 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-05-11 12:16:28 -04:00
James Vega
fea4cc2962 Fix setup.py and add local/__init__.py so Time can be installed 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-05-11 11:23:49 -04:00
Jeremy Fincher
279c00a925 Fixed dateutil to use the "local" subdirectory format. 2009-05-08 12:36:37 -05:00
James Vega
8c66ed9a3f Add Success plugin from supybot-plugins package 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-05-07 22:52:16 -04:00
James Vega
f3a1e36727 Add Dunno plugin from supybot-plugins package 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-05-07 22:50:32 -04:00
James Vega
2b09c70bc3 Remove the Insult plugin 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-05-07 22:43:09 -04:00
James Vega
0615846ab3 Fix getCommandHelp's use of dynamic.msg 
Default chan to None so we can still retrieve a config value if dynamic.msg
isn't valid (e.g., when running supybot-plugin-doc).

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-04-28 08:14:46 -04:00
James Vega
faed698932 Return a fake MakeDB function when documenting plugins. 
There's no need to actually search for valid database backends when
documenting.  It only gets in the way of the actual document generation
process.

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-04-27 19:31:58 -04:00
James Vega
4285df0809 Factoids: Fix thinko in getCommandHelp 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-04-23 16:05:31 -04:00
James Vega
5301390290 BadWords: Only send a msg stripped of formatting if it had bad words 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-04-14 19:59:59 -04:00
James Vega
f2df22ef1a User: Add private constraint to hostmask.add since a password may be given 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-04-08 16:55:40 -04:00
James Vega
d6f6f32219 Factoids: Add an __init__ function which calls our parents' __init__s 
This ensures that we actually get self.dbCache defined in Factoids

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-04-06 17:30:53 -04:00
James Vega
804fbe8209 String: Trim trailing \n from encode's response. 
Certain encode functions, like base64, add a trailing \n which simply clutters
the response for Supybot.

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-04-06 11:29:11 -04:00
James Vega
6a0b667817 String: Update the codecs URL in encode/decode's help 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-04-06 11:27:04 -04:00
James Vega
ebfe8e66f3 String: Give a more useful message when decoding base64 fails 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-04-06 11:26:15 -04:00
James Vega
dfbec681d1 Limiter: Always set the limit above the current number of users 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-04-03 11:05:48 -04:00
James Vega
187620dddc User: Prevent set.password from failing with an unknown hostmask 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-04-01 14:33:19 -04:00
James Vega
d8297dfd3f Google: Modify our local simplejson to work pre-Python2.6 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-03-31 07:50:41 -04:00
James Vega
13715a0ca3 Google: Fix calc by basing the regex off the calc img 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-03-19 21:10:46 -04:00
James Vega
7b906fbf54 Fully qualify the call to universalImport so we don't get a NameError. 
Also added some ImportError handlers to aid letting users of distribution
packages know if the distributions strip out the local module copies.

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-03-19 20:33:17 -04:00
James Vega
843b6d0d02 Config: Show global and channel values for Config.config 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-03-18 14:41:02 -04:00
James Vega
4e8dde4994 Alias: Add a useful README 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-03-15 22:13:42 -04:00
James Vega
dc68e112df Add simplejson to the Google plugin and use universalImport 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-03-15 19:55:14 -04:00
James Vega
abd122ce04 Add dictclient to the Dict plugin and use universalImport 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-03-15 19:27:44 -04:00
James Vega
0b65c483dc Update RSS's README with the new announce syntax 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-03-15 19:19:14 -04:00
Jeremy Fincher
ce8b3a556f Merge branch 'master' of ssh://jemfinch@supybot.git.sourceforge.net/gitroot/supybot 2009-03-12 13:49:15 -05:00
Jeremy Fincher
d73b1eecf7 Moved BadWords's kick-check to an inFilter rather than doPrivmsg, so ignored people can still be kicked. 2009-03-12 13:47:12 -05:00
James Vega
22da325656 Math: Move convertcore to the local directory 
There's no need to try importing a system-wide copy (for now) as convertcore
is our own munging of convertall's code into a form that's easy for us to use.
This may change in the future.

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-03-11 19:58:21 -04:00
James Vega
3fd92e7f24 RSS: Move feedparser to the local directory 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-03-11 19:43:23 -04:00
James Vega
ed32faabe1 Math: Remove extra try block in favor of universalImport 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-03-11 14:06:25 -04:00
Jeremy Fincher
5076241bcd Fixed RSS to include a feedparser which doesn't override the globally-installed one, using universalImport. 2009-03-11 14:06:16 -04:00
Jeremy Fincher
a86b4694d7 Added utils.python.universalImport to make the previous idiom cleaner. 2009-03-11 14:05:53 -04:00
Jeremy Fincher
d6ad5b051f Fix math to be capable of using externally-installed third-party packages, while still providing them for people who don't have them externally installed. 2009-03-11 14:05:26 -04:00
James Vega
f539e65b8e Misc.last: Prevent potential information leaks 
Add required predicates which
1) Do not retrieve messages from a channel the calling user isn't in
2) Do not retrieve messages from a +s channel unless the calling user is in a
   query or in that channel

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-03-08 01:09:25 -05:00
James Vega
856f372303 ChannelLogger: Use a sane timestamp for filenameTimestamp 
Closes #2591305

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-03-08 00:08:59 -05:00
James Vega
d59ac366b3 ShrinkUrl: Add shrinkSnarfer.showDomain config 
As requested by BeteNoire, add a config option to disable showing the domain
of the URL shrunk by the snarfer.

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-03-07 23:46:50 -05:00
James Vega
62acb0c998 Make RSS.announce a nested plugin 
This simplifies the interface for dealing with announced feeds by providing
separate "announce add", "announce remove", "announce list" commands as
opposed to the one "announce" command with confusing syntax.

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-02-28 00:10:10 -05:00
James Vega
0e05fe67c7 No need to define RSS.listCommands 
Doing so can lead to RSS feeds being listed multiple times.

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-02-27 23:36:29 -05:00
James Vega
46a4076988 Add .gitignore 
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
 2009-02-27 14:17:31 -05:00
Jeremy Fincher
4de0bb31f9 Corrected slight inaccuracy in a configuration parameter's help. 2009-03-11 13:37:27 -04:00
James Vega
8d21b7a8cf Google: Rename safeSearch to searchFilter to ease upgrades 2009-03-11 13:37:27 -04:00
Jeremy Fincher
ad25afa900 Added supybot.plugins.AutoMode.owner, so the bot can choose not to automode owners. 2009-03-11 13:37:27 -04:00
James Vega
125d542706 Google: Fix Language.normalize to not prepend the empty string with 'lang_' 2009-03-11 13:37:27 -04:00
James Vega
feeded6135 Config: Differentiate between (un)settable config vars 
Config.{set,get,default} should only be called on settable config
variables.  Detect whether the given argument is settable and emit an
error if not.  This avoids an uncaught exception.
 2009-03-11 13:37:27 -04:00
James Vega
730bca616b Karma: Remove getName function which hasn't been used since 2004 2009-03-11 13:37:27 -04:00
James Vega
ce469b0851 ChannelLogger: Allow logging to be disabled on specific channels 2009-03-11 13:37:27 -04:00
James Vega
125e24ceda Channel.kban: Fall-back to exact hostmask when banmask matches the bot. 2009-03-11 13:37:27 -04:00
James Vega
42ef99a152 Use getBanmask for Channel.{ignore,ban}.add 2009-03-11 13:37:27 -04:00
James Vega
89874f0c3f AutoMode: Use protocols.irc.banmask when banning 2009-03-11 13:37:27 -04:00
James Vega
775fe6fd4c Move plugins.Channel.banmask to protocols.irc.banmask 
Also add protocols.irc.banmask.makeBanmask as a common function for
getting a banmask from a hostmask.
 2009-03-11 13:37:27 -04:00
James Vega
20dd2a0782 No need to define Alias.listCommands. 
Doing so can actually result in duplicate alias listings.
 2009-03-11 13:37:27 -04:00
James Vega
62897a9663 Workaround Python's idiocy with float -> str -> float conversions 2009-03-11 13:37:26 -04:00
James Vega
0bc16641b9 Use the timestamp formatter instead of duplicating the code 2009-03-11 13:37:26 -04:00
James Vega
1f3d9e64a3 Add test to ensure quoted factoids are preserved 2009-03-11 13:37:26 -04:00
James Vega
08a0531bf7 Update Factoids.getCommandHelp to respect supybot.reply.showSimpleSyntax 2009-03-11 13:37:26 -04:00
James Vega
9cc917bd36 Guard feedparser import and warn the user if it's not available 2009-03-11 13:37:26 -04:00
James Vega
e938c4d31b Remove dictclient from Dict/ and update Dict/README.txt 2009-03-11 13:37:26 -04:00
James Vega
0ade3a0a4d Remove feedparser from RSS/ and update RSS/README.txt 2009-03-11 13:37:26 -04:00
James Vega
1f4d1fca9f Add test for a bug Tar-Get brought up on IRC 2009-03-11 13:37:26 -04:00
James Vega
507b95a2eb Fix a couple Misc tests 2009-03-11 13:37:26 -04:00
James Vega
0a4c66071b Adjust testTitle to take into account /.'s slight change 2009-03-11 13:37:26 -04:00
James Vega
6590bf898a Do not directly import sets. supybot.utils provides __builtins__['set'] 2009-03-11 13:37:26 -04:00
James Vega
828d41e37d Add utils/crypt.py as a Python version-agnostic crypt module 2009-03-11 13:37:26 -04:00
James Vega
614fa22038 Fix a syntax error in the last command flood commit 2009-03-11 13:37:26 -04:00
James Vega
300443c8f6 Finish the implementation of command flood prevention 2009-03-11 13:37:26 -04:00
James Vega
b99b2c7f64 Add tests for recent bug-fixes 2009-03-11 13:37:26 -04:00
James Vega
cfe0ee8462 Actually set the 'rsz' option if it isn't defined. 2009-03-11 13:37:25 -04:00
James Vega
f772fbf284 Forgot to utf-8 encode the URL from a Google search 2009-03-11 13:37:25 -04:00
James Vega
6cfde5bcc9 Update googleSnarfer to use the new search method 2009-03-11 13:37:25 -04:00
James Vega
2b7c36c747 Remove unused SOAP.py from old Google implementation 2009-03-11 13:37:25 -04:00
James Vega
cbc91c6a26 Use a more appropriate message if the URL definitely has no title. 2009-03-11 13:37:25 -04:00
James Vega
a946effc79 Fix a copy/paste error in User.capabilities help 2009-03-11 13:37:25 -04:00
James Vega
88ca711d6a Change translate to use the (limited) translatable language list. 2009-03-11 13:37:25 -04:00
James Vega
1fbf61c571 Correct parsing of defaultLanguage parameter. 2009-03-11 13:37:25 -04:00
James Vega
62a8306fbb Rewrite most of Google to use the new AJAX API. 
Add a translate command as well.
 2009-03-11 13:37:25 -04:00
Jeremy Fincher
de69f9da17 Backed out my previous change. I should know better than to question the all-knowing jamessan. 2009-03-11 13:37:25 -04:00
Jeremy Fincher
bec12b6877 Made jamessan's code agree with his comment (and the maximum integer that can fit into two bytes). 2009-03-11 13:37:25 -04:00
James Vega
699bb15f23 Fix a test failure by limiting random.randrange to [-32768, 32767] 2009-03-11 13:37:25 -04:00
James Vega
d39846ae68 Add a pointer to importantPlugins config var in defaultplugin's help. 2009-03-11 13:37:25 -04:00
James Vega
ac2fe7db3a Add azn and uniud commands. 2009-03-11 13:37:25 -04:00
Daniel DiPaolo
2672cf6080 Fixed for a certain user whose name starts with a J and has "Finch" in it. 2009-03-11 13:37:25 -04:00
Jeremy Fincher
1bf4f5554f Added tests for later notes. 2009-03-11 13:37:25 -04:00
Jeremy Fincher
1979f5ad35 Fixed bugs, added tests, etc. 2009-03-11 13:37:25 -04:00
Jeremy Fincher
9a43f04248 Fixed final syntax error, added test. 2009-03-11 13:37:25 -04:00
Jeremy Fincher
67d262a575 Fixed another bug in the new rank command. 2009-03-11 13:37:25 -04:00
Jeremy Fincher
8fefeaa11f Fixed a few bugs in the new rank command. 2009-03-11 13:37:25 -04:00
Jeremy Fincher
479c11e71b Added Later.remove. 2009-03-11 13:37:25 -04:00
Jeremy Fincher
7f7fd4d2c5 Added ChannelStats.rank. 2009-03-11 13:37:24 -04:00
James Vega
7bb3b1ec60 Merge the changes from the python25compat branch into the trunk 2009-03-11 13:37:24 -04:00
James Vega
b24eedf596 Use the hostmask argument isProtected is given instead of trying to use a non-existant variable. 2009-03-11 13:37:24 -04:00