X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=bot.lua;h=16b872f5a303466180d0f9eb6eb8a37839d01e3a;hb=b846ef0a0aa0b0c27ba15026ae0eaac9664080ba;hp=6a322b3f455e424bdfd212381967ac4b449119c0;hpb=231a118e7b969635f51dd9d9dfff064b5d723d01;p=furrybot.git diff --git a/bot.lua b/bot.lua index 6a322b3..16b872f 100644 --- a/bot.lua +++ b/bot.lua @@ -10,7 +10,7 @@ furrybot.colors = { system = C("#FFFA00"), error = C("#D70029"), detail = C("#FF6683"), - rpg = C("#FFD94E"), + roleplay = C("#FFD94E"), braces = C("#FFFAC0"), info = C("#00FFC3"), fun = C("#A0FF24"), @@ -37,13 +37,13 @@ function furrybot.error_message(player, error, detail) end function furrybot.parse_message(player, message, discord) - if message:find("!") == 1 then + if message:find("!") == 1 and not furrybot.ignored[player] then local args = message:sub(2, #message):split(" ") local cmd = table.remove(args, 1) local func = furrybot.commands[cmd] if func then if furrybot.unsafe_commands[cmd] and discord then - furrybot.error_message(player, "Sorry, you cannot run this command from discord", cmd) + furrybot.error_message(player, "Sorry, you cannot run this command from discord: ", cmd) else func(player, unpack(args)) end @@ -58,14 +58,17 @@ function furrybot.reload() if func then local old_fb = table.copy(furrybot) local status, init = pcall(func) + if status then - init(http, env, storage) - else + status, init = init(http, env, storage) + end + + if not status then furrybot = old_fb - return false, furrybot.colors.error .. "Error: " .. furrybot.colors.detail .. init + furrybot.send("Error: " .. furrybot.colors.detail .. init, furrybot.colors.error) end else - return false, furrybot.colors.error .. "Syntax error: " .. furrybot.colors.detail .. err + furrybot.send("Syntax error: " .. furrybot.colors.detail .. err, furrybot.colors.error) end end @@ -131,17 +134,17 @@ function furrybot.repeat_string(str, times) return msg end -function furrybot.interactive_rpg_command(action) +function furrybot.interactive_roleplay_command(action) return function(name, target) if furrybot.online_or_error(name, target) then - furrybot.send(name .. " " .. action .. " " .. target .. ".", furrybot.colors.rpg) + furrybot.send(name .. " " .. action .. " " .. target .. ".", furrybot.colors.roleplay) end end end -function furrybot.solo_rpg_command(action) +function furrybot.solo_roleplay_command(action) return function(name) - furrybot.send(name .. " " .. action .. ".", furrybot.colors.rpg) + furrybot.send(name .. " " .. action .. ".", furrybot.colors.roleplay) end end @@ -156,42 +159,8 @@ function furrybot.request_command(on_request, on_accept) end end -function furrybot.get_money(name) - local key = name .. ".money" - if storage:contains(key) then - return storage:get_int(key) - else - return 100 - end -end - -function furrybot.set_money(name, money) - storage:set_int(name .. ".money", money) -end +-- General purpose commands -function furrybot.add_money(name, add) - local money = furrybot.get_money(name) - furrybot.set_money(name, money + add) -end - -function furrybot.take_money(name, remove) - local money = furrybot.get_money(name) - local new = money - remove - if new < 0 then - return false - else - furrybot.set_money(name, new) - return true - end -end - -function furrybot.money(money, color) - return furrybot.colors.money .. "$" .. money .. color -end - --- Commands - --- system function furrybot.commands.help() local keys = {} for k in pairs(furrybot.commands) do @@ -229,179 +198,26 @@ end function furrybot.commands.cmd() end --- rpg -furrybot.commands.cry = furrybot.solo_rpg_command("cries") -furrybot.commands.laugh = furrybot.solo_rpg_command("laughs") -furrybot.commands.confused = furrybot.solo_rpg_command("is confused") -furrybot.commands.smile = furrybot.solo_rpg_command("smiles") -furrybot.commands.hug = furrybot.interactive_rpg_command("hugs") -furrybot.commands.cuddle = furrybot.interactive_rpg_command("cuddles") -furrybot.commands.kiss = furrybot.interactive_rpg_command("kisses") -furrybot.commands.hit = furrybot.interactive_rpg_command("hits") -furrybot.commands.slap = furrybot.interactive_rpg_command("slaps") -furrybot.commands.beat = furrybot.interactive_rpg_command("beats") -furrybot.commands.lick = furrybot.interactive_rpg_command("licks") - -furrybot.commands.sex = furrybot.request_command(function(name, target) - furrybot.ping_message(target, name .. " wants to have sex with you. Type !accept to accept or !deny to deny.", furrybot.colors.system) -end, function(name, target) - furrybot.send(name .. " and " .. target .. " are having sex! OwO", furrybot.colors.rpg) -end) -furrybot.commands.bang = furrybot.commands.sex -furrybot.commands.fuck = furrybot.commands.sex - -furrybot.commands.marry = furrybot.request_command(function(name, target) - if storage:contains(name .. ".partner", target) then - furrybot.error_message(name, "You are already married to", storage:get_string(name .. ".partner")) - return false - elseif storage:contains(target .. ".partner", name) then - furrybot.error_message(name, target .. " is already married to", storage:get_string(name .. ".partner")) - return false - else - furrybot.ping_message(target, name .. " proposes to you. Type !accept to accept or !deny to deny.", furrybot.colors.system) - end -end, function(name, target) - storage:set_string(name .. ".partner", target) - storage:set_string(target .. ".partner", name) - furrybot.send("Congratulations, " .. furrybot.ping(name, furrybot.colors.rpg) .. "&" .. furrybot.ping(target, furrybot.colors.rpg) .. ", you are married. You may now kiss :).", furrybot.colors.rpg) -end) -furrybot.commands.propose = furrybot.commands.marry -furrybot.unsafe_commands.marry = true -furrybot.unsafe_commands.propose = true - -function furrybot.commands.divorce(name) - if storage:contains(name .. ".partner") then - local partner = storage:get_string(name .. ".partner") - storage:set_string(name .. ".partner", "") - storage:set_string(partner .. ".partner", "") - furrybot.ping_message(name, "divorces from " .. partner .. " :(", furrybot.colors.rpg) - else - furrybot.error_message(name, "You are not married") - end -end -furrybot.unsafe_commands.divorce = true - -function furrybot.commands.partner(name, target) - target = target or name - if storage:contains(target .. ".partner") then - furrybot.ping_message(name, (target == name and "You are" or target .. " is") .. " married to " .. storage:get_string(target .. ".partner"), furrybot.colors.system) - else - furrybot.error_message(name, (target == name and "You are" or target .. " is") .. " not married") - end -end -furrybot.commands.married = furrybot.commands.partner +return function(_http, _env, _storage) + http, env, storage = _http, _env, _storage --- misc -function furrybot.commands.rolldice(name) - furrybot.ping_message(name, "rolled a dice and got a " .. furrybot.random(1, 6, furrybot.colors.system) .. ".", furrybot.colors.system) -end + for _, f in ipairs {"nsfw", "roleplay", "death", "economy", "random", "http", "operator", "bullshit"} do + local func, err = env.loadfile("clientmods/furrybot/" .. f .. ".lua") -function furrybot.commands.coinflip(name) - furrybot.ping_message(name, "flipped a coin and got " .. furrybot.choose({"Heads", "Tails"}, furrybot.colors.system) .. ".", furrybot.colors.system) -end + if not func then + return false, err + end -function furrybot.commands.choose(name, ...) - local options = {...} - if #options > 1 then - furrybot.ping_message(name, "I choose " .. furrybot.choose(options, "", furrybot.colors.system) .. ".", furrybot.colors.system) - else - furrybot.error_message(name, "Not enough options") + func()(http, env, storage) end -end -function furrybot.commands.dicksize(name, target) - target = target or name - local size = furrybot.strrandom(target, 31242, 2, 10) - local dick = furrybot.repeat_string("=", size) .. "D" - furrybot.send(dick .. furrybot.colors.system .. " <= " .. furrybot.ping(target, furrybot.colors.system) .. "'s Dick", C("#FF4DE1")) -end -furrybot.commands.cocksize = furrybot.commands.dicksize + furrybot.send("FurryBot - " .. C("#170089") .. "https://github.com/EliasFleckenstein03/furrybot", furrybot.colors.system) --- fun -function furrybot.commands.verse(name) - furrybot.json_http_request("https://labs.bible.org/api/?type=json&passage=random", name, function(data) - furrybot.send(data.text .. furrybot.colors.info .. "[" .. data.bookname .. " " .. data.chapter .. "," .. data.verse .. "]", furrybot.colors.fun) - end) -end - -function furrybot.commands.define(name, word) - if word then - furrybot.json_http_request("https://api.dictionaryapi.dev/api/v1/entries/en_US/" .. word:gsub("computer", "person"), name, function(data) - local meaning = data.meaning - local selected = meaning.exclamation or meaning.noun or meaning.verb or meaning.adjective or meaning["transitive verb"] or meaning.adverb or meaning["relative adverb"] - if not selected then - print(dump(meaning)) - furrybot.error_message(name, "Error in parsing response") - else - furrybot.send(word:sub(1, 1):upper() .. word:sub(2, #word):lower() .. ": " .. furrybot.colors.fun .. selected[1].definition, furrybot.colors.info) - end - end) + if furrybot.loaded then + furrybot.send("Reloaded", furrybot.colors.system) else - furrybot.error_message(name, "You need to specify a word") + furrybot.loaded = true end -end -function furrybot.commands.insult(name, target) - if furrybot.online_or_error(name, target, true) then - furrybot.http_request("https://insult.mattbas.org/api/insult", name, function(data) - furrybot.ping_message(target, data, furrybot.colors.fun) - end) - end -end - -function furrybot.commands.joke(name, first, last) - if not first then - first = "Chuck" - last = "Norris" - elseif not last then - last = "" - end - furrybot.json_http_request("http://api.icndb.com/jokes/random?firstName=" .. first .. "&lastName=" .. last, name, function(data) - local joke = data.value.joke:gsub(""", "\""):gsub(" ", " ") - furrybot.send(joke, furrybot.colors.fun) - end) -end - -function furrybot.commands.question(name) - furrybot.json_http_request("https://8ball.delegator.com/magic/JSON/anything", name, function(data) - furrybot.ping_message(name, data.magic.answer, furrybot.colors.fun) - end) -end -furrybot.commands["8ball"] = furrybot.commands.question - --- economy -function furrybot.commands.money(name, target) - target = target or name - furrybot.ping_message(name, (target == name and "You have " or target .. " has ") .. furrybot.money(furrybot.get_money(target), furrybot.colors.system) .. ".", furrybot.colors.system) -end -furrybot.commands.balance = furrybot.commands.money - -function furrybot.commands.pay(name, target, number) - if furrybot.online_or_error(name, target) then - local money = tonumber(number or "") - if not money or money <= 0 or math.floor(money) ~= money then - furrybot.error_message(name, "Invalid amount of money") - else - if furrybot.take_money(name, money) then - furrybot.add_money(target, money) - furrybot.ping_message(target, name .. " has payed you " .. furrybot.money(money, furrybot.colors.system) .. ".", furrybot.colors.system) - else - furrybot.error_message(name, "You don't have enough money") - end - end - end -end -furrybot.unsafe_commands.pay = true - --- send load message -furrybot.send("FurryBot - " .. C("#170089") .. "https://github.com/EliasFleckenstein03/furrybot", furrybot.colors.system) - -if furrybot.loaded then - furrybot.send("Reloaded", furrybot.colors.system) -else - furrybot.loaded = true -end - -return function(_http, _env, _storage) - http, env, storage = _http, _env, _storage + return true end