3
0
mirror of https://github.com/reality/dbot.git synced 2024-12-25 20:22:39 +01:00
Commit Graph

813 Commits

Author SHA1 Message Date
reality
f11c227be9 Merge branch 'master' of github.com:reality/depressionbot 2012-12-18 10:03:29 +00:00
Luke Slater
2e3a8e2fdb Merge pull request #71 from SamStudio8/patch-1
Increase grape juice
2012-12-18 01:48:47 -08:00
Sam Nicholls
1c1e1b146a Increase grape juice
Following the module overhaul super-merge it is clear that depressionbot has taken one step closer in his quest to becoming akin to bathing in fine, fine webscale grape juices.
2012-12-18 09:41:05 +00:00
Luke Slater
e7e31a4135 Merge pull request #70 from reality/module_overhaul
Module overhaul. Sweet Jesus.
2012-12-18 01:34:22 -08:00
Luke Slater
e970ab579c Merge pull request #69 from SamStudio8/patch-1
Fixed module loading and dbKeys bug. A+ Merged.
2012-12-18 01:25:42 -08:00
Sam Nicholls
0dc5c6d91f Ensure ignores dbKey exists
Created dbKeys config for ignores module to prevent meltdown.
2012-12-17 12:09:39 -08:00
Sam Nicholls
c9a7254921 Actually save the database
Moved this.save() call to end of reloadModules so new keys are actually saved.
2012-12-17 19:37:33 +00:00
Sam Nicholls
198fe9992d Fixed run.js
Will now create dbKeys
2012-12-17 19:30:50 +00:00
Luke Slater
d0c47d18eb Moved all data loaded from config to be used only from dbot.config. Changed admin key in to admins to avoid clash with admin module config. Admins should probably be a key under dbot.admin module anyway. 2012-12-17 17:18:31 +00:00
Luke Slater
96312303f0 web config data now taken from dbot web config 2012-12-12 18:36:12 +00:00
Luke Slater
918a3c4540 Check for required keys in config 2012-12-12 18:33:29 +00:00
Luke Slater
a431d4c636 Config defaults and file loading changes
* Attempts to load config from default file upon failing to load config.json
* Stops if db fails to load
* Automatically loads config keys into dbot object
2012-12-12 18:25:07 +00:00
Luke Slater
c64e66da17 Module specific config. Allows specify dbKeys to ensure default objects there for use. 2012-12-12 18:07:08 +00:00
Luke Slater
65414f6975 OH THE SHAME. THE SHAME OF IT ALL. 2012-12-11 21:01:37 +00:00
Luke Slater
19c3497f11 reload default strings in updateModules 2012-12-11 20:47:50 +00:00
Luke Slater
b641dcd34a usage info in command 2012-12-11 20:31:11 +00:00
Luke Slater
f72e29398f fixed module unloading 2012-12-11 20:27:18 +00:00
Luke Slater
1f2c7fa835 added try/catch for no usage/string info, moved module load error back to default stringspace 2012-12-11 20:23:31 +00:00
Luke Slater
fbf4242d66 fix js/usage which I already fixed for some reason 2012-12-11 20:08:19 +00:00
Luke Slater
cae8a1fc7d loaded strings and usage from the modules themselves in reloadModules. some other smaller changes. fixed the syntax of the usage json. careful though this dbot init may delete your database. 2012-12-11 20:06:29 +00:00
Luke Slater
cd56a8a197 Added usage.json files for all modules 2012-12-11 16:53:34 +00:00
Luke Slater
96b34c8c31 Moved poll quotes 2012-12-11 16:45:08 +00:00
Luke Slater
dfdcb0d359 moved quotes strings. removed qprune because it is not needed anymore 2012-12-11 16:42:06 +00:00
Luke Slater
34e377f385 moved poll strings 2012-12-11 16:37:05 +00:00
Luke Slater
de84491975 moved kick strings 2012-12-11 16:32:59 +00:00
Luke Slater
4941e50d06 whoops karma isnt supposed to be in this tree 2012-12-11 16:31:20 +00:00
Luke Slater
6d52d5a2b4 moved ignore strings 2012-12-11 16:29:20 +00:00
Luke Slater
5a75c63672 removed drama because why bother 2012-12-11 16:26:59 +00:00
Luke Slater
3a58f6b8b1 moved strings for command 2012-12-11 16:26:29 +00:00
Luke Slater
b622d7a239 give all modules their own folders. overhauled admin strings 2012-12-11 16:18:27 +00:00
Luke Slater
b2ea634d8c Move all the modules to their own directories 2012-12-11 16:04:52 +00:00
Luke Slater
7b515a4cc5 remove autoshorten because the shortener does not exist anymore 2012-12-11 16:02:06 +00:00
Luke Slater
2f8e3ca94d update version of jsbot 2012-12-11 13:14:39 +00:00
Luke Slater
b9748e7510 Merge pull request #61 from SamStudio8/patch-1
Update strings
2012-12-11 03:55:05 -08:00
Luke Slater
e5ad8730e3 Why can no one submit translation updates without syntax errors? 2012-12-11 12:52:38 +01:00
Sam Nicholls
ae11c14431 Update strings
Added missing {url}s, removed unnecessary translations for poll_describe, correcting syntax error.
2012-12-10 13:31:44 +00:00
Luke Slater
099df8d046 Update strings.json
broken suntax
2012-12-08 18:16:54 +01:00
Luke Slater
b5e4ff8487 fix syntax url 2012-12-08 17:13:28 +00:00
Luke Slater
4a1e898e6e merge sam 2012-12-08 17:06:33 +00:00
Luke Slater
7f279d458f Merge pull request #59 from dafrancis/master
Dayum gurl I got you some of that sweet sweet CELTIC LANGUAGE that this bot has been missing
2012-12-06 15:06:41 -08:00
Dafydd Francis
d304cf83a0 Welshifying dbot 2012-12-06 22:31:16 +00:00
Sam Nicholls
7ab477b448 Nobody loves autoshorten. Removed poll from default module list. 2012-12-06 19:37:39 +00:00
Sam Nicholls
78837f9da1 Added url string 2012-12-06 19:33:25 +00:00
Sam Nicholls
96225c59ec Got you some extra plus 2012-12-05 19:17:57 +00:00
Sam Nicholls
c07b0c60f3 dbot.webUrl for autoshorten too 2012-12-05 19:13:04 +00:00
Sam Nicholls
757344d580 Attempt to fix Issue #54 2012-12-05 19:05:19 +00:00
Luke Slater
5e71be8601 missing key in category not found 2012-12-04 18:29:04 +00:00
Luke Slater
f8b1e3316f fix syntax with previous change 2012-12-04 18:27:12 +00:00
Luke Slater
e687cbb429 Added filter to snippets and finally re-added ~rm back to quotes 2012-12-04 18:23:43 +00:00
Luke Slater
a71c047aca typo in usage in report 2012-12-02 16:59:09 +00:00