From df1d6a206f90e648149358e611091f96db26dc6c Mon Sep 17 00:00:00 2001 From: dupie Date: Tue, 7 Jul 2015 23:24:40 -0400 Subject: [PATCH] dkjson now required and included cjson broke on latest update a few small improvements giphy public test key now included bible plugin disabled by default because of no default key much updated readme --- README.md | 10 +- bot.lua | 4 +- config.json | 3 +- dkjson.lua | 843 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 853 insertions(+), 7 deletions(-) create mode 100644 dkjson.lua diff --git a/README.md b/README.md index b7bc5f4..7d4b7ec 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,23 @@ # otouto -The plugin-wielding, multi-purpose Telgram chat bot. +The plugin-wielding, multi-purpose Telegram chat bot. Public bot runs on [@mokubot](http://telegram.me/mokubot). -Requires lua-socket, lua-sec, and cjson or dkjson. +Requires lua-socket and lua-sec. [dkjson](https://github.com/LuaDist/dkjson/) is provided. + +`lua bot.lua` ###Configuration Most config.json entries are self-explanatory. +Giphy key provided is the public test key, and is subject to rate limitation. + TIME_OFFSET is the time difference, in seconds, between your system clock. It is often necessary for accurate output of the time plugin. "admins" table includes the ID numbers, as integers, of any privileged users. These will have access to the admin plugin and any addition privileged commands. "people" table is for the personality plugin: `"123456789": "foobar"` -ID number must be a string. \ No newline at end of file +ID number must be a string. diff --git a/bot.lua b/bot.lua index 5af0dce..7551b69 100644 --- a/bot.lua +++ b/bot.lua @@ -3,10 +3,10 @@ HTTP = require('socket.http') HTTPS = require('ssl.https') -JSON = require('cjson') +JSON = require('dkjson') URL = require('socket.url') -VERSION = 2.01 +VERSION = 2.1 function on_msg_receive(msg) diff --git a/config.json b/config.json index 1c92632..d9c9226 100644 --- a/config.json +++ b/config.json @@ -1,7 +1,7 @@ { "BOT_API_KEY": "", "BIBLIA_API_KEY": "", - "GIPHY_API_KEY": "", + "GIPHY_API_KEY": "dc6zaTOxFJmzC", "TIME_OFFSET": 0, "admins": [ 0 @@ -10,7 +10,6 @@ "8ball.lua", "admin.lua", "bandersnatch.lua", - "bible.lua", "btc.lua", "calc.lua", "chatter.lua", diff --git a/dkjson.lua b/dkjson.lua new file mode 100644 index 0000000..b7475ba --- /dev/null +++ b/dkjson.lua @@ -0,0 +1,843 @@ + -- Module options: + local always_try_using_lpeg = true + local register_global_module_table = false + local global_module_name = 'json' + + --[==[ + +David Kolf's JSON module for Lua 5.1/5.2 +======================================== + +*Version 2.4* + +In the default configuration this module writes no global values, not even +the module table. Import it using + + json = require ("dkjson") + +In environments where `require` or a similiar function are not available +and you cannot receive the return value of the module, you can set the +option `register_global_module_table` to `true`. The module table will +then be saved in the global variable with the name given by the option +`global_module_name`. + +Exported functions and values: + +`json.encode (object [, state])` +-------------------------------- + +Create a string representing the object. `Object` can be a table, +a string, a number, a boolean, `nil`, `json.null` or any object with +a function `__tojson` in its metatable. A table can only use strings +and numbers as keys and its values have to be valid objects as +well. It raises an error for any invalid data types or reference +cycles. + +`state` is an optional table with the following fields: + + - `indent` + When `indent` (a boolean) is set, the created string will contain + newlines and indentations. Otherwise it will be one long line. + - `keyorder` + `keyorder` is an array to specify the ordering of keys in the + encoded output. If an object has keys which are not in this array + they are written after the sorted keys. + - `level` + This is the initial level of indentation used when `indent` is + set. For each level two spaces are added. When absent it is set + to 0. + - `buffer` + `buffer` is an array to store the strings for the result so they + can be concatenated at once. When it isn't given, the encode + function will create it temporary and will return the + concatenated result. + - `bufferlen` + When `bufferlen` is set, it has to be the index of the last + element of `buffer`. + - `tables` + `tables` is a set to detect reference cycles. It is created + temporary when absent. Every table that is currently processed + is used as key, the value is `true`. + +When `state.buffer` was set, the return value will be `true` on +success. Without `state.buffer` the return value will be a string. + +`json.decode (string [, position [, null]])` +-------------------------------------------- + +Decode `string` starting at `position` or at 1 if `position` was +omitted. + +`null` is an optional value to be returned for null values. The +default is `nil`, but you could set it to `json.null` or any other +value. + +The return values are the object or `nil`, the position of the next +character that doesn't belong to the object, and in case of errors +an error message. + +Two metatables are created. Every array or object that is decoded gets +a metatable with the `__jsontype` field set to either `array` or +`object`. If you want to provide your own metatables use the syntax + + json.decode (string, position, null, objectmeta, arraymeta) + +To prevent the assigning of metatables pass `nil`: + + json.decode (string, position, null, nil) + +`.__jsonorder` +------------------------- + +`__jsonorder` can overwrite the `keyorder` for a specific table. + +`.__jsontype` +------------------------ + +`__jsontype` can be either `"array"` or `"object"`. This value is only +checked for empty tables. (The default for empty tables is `"array"`). + +`.__tojson (self, state)` +------------------------------------ + +You can provide your own `__tojson` function in a metatable. In this +function you can either add directly to the buffer and return true, +or you can return a string. On errors nil and a message should be +returned. + +`json.null` +----------- + +You can use this value for setting explicit `null` values. + +`json.version` +-------------- + +Set to `"dkjson 2.4"`. + +`json.quotestring (string)` +--------------------------- + +Quote a UTF-8 string and escape critical characters using JSON +escape sequences. This function is only necessary when you build +your own `__tojson` functions. + +`json.addnewline (state)` +------------------------- + +When `state.indent` is set, add a newline to `state.buffer` and spaces +according to `state.level`. + +LPeg support +------------ + +When the local configuration variable `always_try_using_lpeg` is set, +this module tries to load LPeg to replace the `decode` function. The +speed increase is significant. You can get the LPeg module at + . +When LPeg couldn't be loaded, the pure Lua functions stay active. + +In case you don't want this module to require LPeg on its own, +disable the option `always_try_using_lpeg` in the options section at +the top of the module. + +In this case you can later load LPeg support using + +### `json.use_lpeg ()` + +Require the LPeg module and replace the functions `quotestring` and +and `decode` with functions that use LPeg patterns. +This function returns the module table, so you can load the module +using: + + json = require "dkjson".use_lpeg() + +Alternatively you can use `pcall` so the JSON module still works when +LPeg isn't found. + + json = require "dkjson" + pcall (json.use_lpeg) + +### `json.using_lpeg` + +This variable is set to `true` when LPeg was loaded successfully. + +--------------------------------------------------------------------- + +Contact +------- + +You can contact the author by sending an e-mail to 'david' at the +domain 'dkolf.de'. + +--------------------------------------------------------------------- + +*Copyright (C) 2010-2013 David Heiko Kolf* + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + + + +