Fixed some embed issues
This commit is contained in:
parent
b065914a06
commit
08c43f8b04
40
bot.lua
40
bot.lua
|
|
@ -7,23 +7,41 @@ client = discordia.Client()
|
|||
--activate the import system
|
||||
local import = require("import")(require)
|
||||
|
||||
local new_server
|
||||
|
||||
--create server
|
||||
local server = import("classes.server-handler")
|
||||
client:on("ready",function()
|
||||
print("starting test")
|
||||
local new_server = server(client,client:getGuild("766606858667950091"),{
|
||||
autosave_frequency = 5,
|
||||
default_plugins = {
|
||||
"meta",
|
||||
"help",
|
||||
"plugins",
|
||||
"esolang",
|
||||
"tools",
|
||||
"reactions"
|
||||
}
|
||||
})
|
||||
if not new_server then
|
||||
new_server = server(client,client:getGuild("766606858667950091"),{
|
||||
autosave_frequency = 20,
|
||||
default_plugins = {
|
||||
"meta",
|
||||
"help",
|
||||
"plugins",
|
||||
"esolang",
|
||||
"tools",
|
||||
"reactions",
|
||||
"roledefaults"
|
||||
}
|
||||
})
|
||||
new_server = server(client,client:getGuild("640251445949759499"),{
|
||||
autosave_frequency = 20,
|
||||
default_plugins = {
|
||||
"meta",
|
||||
"help",
|
||||
"plugins",
|
||||
"esolang",
|
||||
"tools",
|
||||
"reactions",
|
||||
"roledefaults"
|
||||
}
|
||||
})
|
||||
end
|
||||
end)
|
||||
|
||||
|
||||
--load token
|
||||
local tempfile = io.open("./token","r")
|
||||
if not tempfile then
|
||||
|
|
|
|||
|
|
@ -11,6 +11,22 @@ air.match_strings = function(string)
|
|||
return string,strings
|
||||
end
|
||||
|
||||
local function parse_strings(thing,strings)
|
||||
--find all strings and replace them with string ids with no spaces
|
||||
local strings = strings or {}
|
||||
local string_count = 0
|
||||
local function get_string(text)
|
||||
string_count = string_count + 1
|
||||
local id = "&;"..tostring(string_count)..";&"
|
||||
strings[string_count] = text
|
||||
return id
|
||||
end
|
||||
thing = thing:gsub("(\")\"",get_string)
|
||||
thing = thing:gsub("(\".-[^\\])\"",get_string)
|
||||
thing = thing:gsub("(\')\'",get_string)
|
||||
thing = thing:gsub("(\'.-[^\\])\'",get_string)
|
||||
return thing,strings
|
||||
end
|
||||
--this table will look up special types
|
||||
special_case = {
|
||||
["voiceChannel"] = function(id,client,guild_id)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,347 @@
|
|||
local aliases = {}
|
||||
local fake_message = import("fake_message")
|
||||
local last_message_arrived = discordia.Stopwatch()
|
||||
local unixToString = import("unixToString")
|
||||
local command = import("classes.command")
|
||||
local plugin = import("classes.plugin")("meta")
|
||||
if not config.aliases then
|
||||
config.aliases = {}
|
||||
end
|
||||
|
||||
client:on("messageCreate",function(msg)
|
||||
last_message_arrived:reset()
|
||||
last_message_arrived:start()
|
||||
end)
|
||||
|
||||
local prefix
|
||||
for k,v in pairs(command_handler:get_prefixes()) do
|
||||
if (not prefix) or prefix:len() > v:len() then
|
||||
prefix = v
|
||||
end
|
||||
end
|
||||
|
||||
local function add_alias(name,comm,prefix,description)
|
||||
if (not aliases[name]) then
|
||||
print("[ALIAS] Adding alias \""..name.."\" for \""..comm.."\"")
|
||||
config.aliases[name] = {comm = comm,prefix = prefix}
|
||||
aliases[name] = command(name,{
|
||||
help = "Alias for ``"..comm.."``",
|
||||
usage = ((prefix and globals.prefix) or "")..name,
|
||||
exec = function(msg,args2,opts)
|
||||
print("[ALIAS] Triggerting alias "..tostring(comm).." with args \""..tostring(msg.content).."\"")
|
||||
local str = msg.content:gsub("^%S+ ?","")
|
||||
aftersub = comm:gsub("%.%.%.",str or "")
|
||||
aftersub = aftersub:gsub("%$prefix",prefix or "&")
|
||||
local status,args = require("air").parse(str)
|
||||
for k,v in pairs(args) do
|
||||
aftersub = aftersub:gsub("([^\\])%$"..k,"%1"..v)
|
||||
end
|
||||
command_handler:handle(fake_message(msg,{
|
||||
content = aftersub
|
||||
}))
|
||||
end,
|
||||
options = {
|
||||
prefix = prefix,
|
||||
custom = true
|
||||
}
|
||||
})
|
||||
plugin:add_command(aliases[name])
|
||||
return true
|
||||
else
|
||||
return false
|
||||
end
|
||||
end
|
||||
|
||||
local function remove_alias(name)
|
||||
if config.aliases[name] then
|
||||
config.aliases[name] = nil
|
||||
plugin:remove_command(aliases[name])
|
||||
return true
|
||||
else
|
||||
return false
|
||||
end
|
||||
end
|
||||
|
||||
local function purify_strings(msg,input)
|
||||
local text = input
|
||||
while text:match("<@(%D*)(%d*)>") do
|
||||
local obj,id = text:match("<@(%D*)(%d*)>")
|
||||
local substitution = ""
|
||||
if obj:match("!") then
|
||||
local member = msg.guild:getMember(id)
|
||||
if member then
|
||||
substitution = "@"..member.name
|
||||
end
|
||||
elseif obj:match("&") then
|
||||
local role = msg.guild:getRole(id)
|
||||
if role then
|
||||
substitution = "@"..role.name
|
||||
end
|
||||
end
|
||||
if substitution == "" then
|
||||
substitution = "<\\@"..obj..id..">"
|
||||
end
|
||||
text = text:gsub("<@(%D*)"..id..">",substitution)
|
||||
end
|
||||
text = text:gsub("@everyone","")
|
||||
return text
|
||||
end
|
||||
|
||||
for k,v in pairs(config.aliases) do
|
||||
commdata = v
|
||||
if type(v) == "string" then --legacy format conversion
|
||||
commdata = {comm = v, prefix = false}
|
||||
end
|
||||
add_alias(k,commdata.comm,commdata.prefix)
|
||||
end
|
||||
|
||||
local prefix = command("prefix",{
|
||||
help = "Set prefix",
|
||||
usage = "prefix [(add | remove | list (default)) [<new prefix>]]",
|
||||
users = {
|
||||
[client.owner.id] = 1
|
||||
},
|
||||
roles = {
|
||||
["747042157185073182"] = 1
|
||||
},
|
||||
perms = {
|
||||
"administrator"
|
||||
},
|
||||
exec = function(msg,args,opts)
|
||||
local function list_prefixes(msg)
|
||||
local prefixes = ""
|
||||
for k,v in pairs(command_handler:get_prefixes()) do
|
||||
prefixes = prefixes..v.."\n"
|
||||
end
|
||||
msg:reply({embed = {
|
||||
title = "Prefixes for this server",
|
||||
description = prefixes
|
||||
}})
|
||||
end
|
||||
if args[1] then
|
||||
if args[1] == "add" and args[2] then
|
||||
command_handler:add_prefix(args[2])
|
||||
msg:reply("Added "..args[2].." as a prefix")
|
||||
elseif args[1] == "remove" and args[2] then
|
||||
local status,err = command_handler:remove_prefix(args[2])
|
||||
if status then
|
||||
msg:reply("Removed the "..args[2].." prefix")
|
||||
else
|
||||
msg:reply(err)
|
||||
end
|
||||
elseif args[1] == "list" then
|
||||
list_prefixes(msg)
|
||||
else
|
||||
msg:reply("Syntax error")
|
||||
end
|
||||
else
|
||||
list_prefixes(msg)
|
||||
end
|
||||
end
|
||||
})
|
||||
plugin:add_command(prefix)
|
||||
|
||||
local c_alias = command("alias", {
|
||||
args = {
|
||||
"string","string"
|
||||
},
|
||||
perms = {
|
||||
"administrator"
|
||||
},
|
||||
exec = function(msg,args,opts)
|
||||
if add_alias(args[1],args[2],(opts["prefix"] or opts["p"]),opts["description"]) then
|
||||
msg:reply("Bound ``"..args[1].."`` as an alias to ``"..args[2].."``")
|
||||
else
|
||||
msg:reply("``"..args[1].."`` is already bound")
|
||||
end
|
||||
end
|
||||
})
|
||||
plugin:add_command(c_alias)
|
||||
|
||||
local c_unalias = command("unalias", {
|
||||
args = {
|
||||
"string"
|
||||
},
|
||||
perms = {
|
||||
"administrator"
|
||||
},
|
||||
exec = function(msg,args,opts)
|
||||
if remove_alias(args[1]) then
|
||||
msg:reply("Removed the ``"..args[1].."`` alias")
|
||||
else
|
||||
msg:reply("No such alias")
|
||||
end
|
||||
end
|
||||
})
|
||||
plugin:add_command(c_unalias)
|
||||
|
||||
local c_aliases = command("aliases", {
|
||||
exec = function(msg,args,opts)
|
||||
msg:reply({embed = {
|
||||
title = "Aliases for this server",
|
||||
fields = (function()
|
||||
local fields = {}
|
||||
for k,v in pairs(config.aliases) do
|
||||
table.insert(fields,{name = ((v["prefix"] and prefix) or "")..k,value = v["comm"]})
|
||||
end
|
||||
return fields
|
||||
end)()
|
||||
}})
|
||||
end
|
||||
})
|
||||
plugin:add_command(c_aliases)
|
||||
|
||||
local c_ping = command("ping", {
|
||||
exec = function(msg,args,opts)
|
||||
local before = msg:getDate()
|
||||
local reply = msg:reply("Pong!")
|
||||
if not reply then
|
||||
log("ERROR","Couldn't send the ping reply for some reason")
|
||||
return
|
||||
end
|
||||
local after = reply:getDate()
|
||||
local latency = (after:toMilliseconds() - before:toMilliseconds())
|
||||
last_message_arrived:stop()
|
||||
local uptime = discordia.Date():toSeconds() - server.uptime:toSeconds()
|
||||
local processing = (last_message_arrived:getTime():toMilliseconds())
|
||||
msg:reply({embed = {
|
||||
title = "Stats:",
|
||||
fields = {
|
||||
{name = "Latency",value = tostring(math.floor(latency)).."ms"},
|
||||
{name = "Processing time",value = tostring(math.floor(processing)).."ms"},
|
||||
{name = "Uptime",value = tostring(unixToString(uptime))}
|
||||
}
|
||||
}})
|
||||
end
|
||||
})
|
||||
plugin:add_command(c_ping)
|
||||
|
||||
local c_about = command("about", {
|
||||
exec = function(msg,args,opts)
|
||||
local rand = math.random
|
||||
local author = client:getUser("245973168257368076")
|
||||
msg:reply({embed = {
|
||||
title = "About 512mb.org bot",
|
||||
thumbnail = {
|
||||
url = client.user:getAvatarURL()
|
||||
},
|
||||
color = discordia.Color.fromRGB(rand(50,200),rand(50,200),rand(50,200)).value,
|
||||
description = "512mb.org is an open-source bot written in Lua. It is based on a beta rewrite version of the Suppa-Bot.",
|
||||
fields = {
|
||||
{name = "Source Code: ",value = "https://github.com/512mb-xyz/512mb.org-bot"},
|
||||
{name = "Author: ",value = author.tag},
|
||||
{name = "Invite: ",value = "Not available yet"}
|
||||
},
|
||||
footer = {
|
||||
text = "For any information regarding the bot, contact yessiest on 512mb.org discord."
|
||||
}
|
||||
}})
|
||||
end
|
||||
})
|
||||
plugin:add_command(c_about)
|
||||
|
||||
local c_server = command("server", {
|
||||
exec = function(msg,args,opts)
|
||||
msg:reply({embed = {
|
||||
thumbnail = {
|
||||
url = msg.guild.iconURL
|
||||
},
|
||||
title = msg.guild.name,
|
||||
description = msg.guild.description,
|
||||
fields = {
|
||||
{name = "Members",value = msg.guild.totalMemberCount,inline = true},
|
||||
{name = "Owner",value = (msg.guild.owner and msg.guild.owner.user.tag..":"..msg.guild.owner.user.id),inline = true},
|
||||
{name = "Created At",value = os.date("!%c",msg.guild.createdAt).." (UTC+0)",inline = true},
|
||||
{name = "Text Channels",value = msg.guild.textChannels:count(),inline = true},
|
||||
{name = "Voice Channels",value = msg.guild.voiceChannels:count(),inline = true}
|
||||
}
|
||||
}})
|
||||
end,
|
||||
})
|
||||
plugin:add_command(c_server)
|
||||
|
||||
local c_user = command("user", {
|
||||
exec = function(msg,args,opts)
|
||||
local member = msg.guild:getMember((args[1] or ""):match("%d+")) or msg.guild:getMember(msg.author.id)
|
||||
local roles = ""
|
||||
for k,v in pairs(member.roles) do
|
||||
roles = roles..v.mentionString.."\n"
|
||||
end
|
||||
msg:reply({embed = {
|
||||
title = member.user.tag..":"..member.user.id,
|
||||
thumbnail = {
|
||||
url = member.user:getAvatarURL()
|
||||
},
|
||||
fields = {
|
||||
{name = "Profile Created At",value = os.date("!%c",member.user.createdAt).." (UTC+0)"},
|
||||
{name = "Joined At",value = os.date("!%c",discordia.Date.fromISO(member.joinedAt):toSeconds()).." (UTC+0)",inline = true},
|
||||
{name = "Boosting",value = ((member.premiumSince and "Since "..member.premiumSince) or "No"),inline = true},
|
||||
{name = "Highest Role",value = member.highestRole.mentionString,inline = true},
|
||||
{name = "Roles",value = roles,inline = true}
|
||||
}
|
||||
}})
|
||||
end,
|
||||
})
|
||||
plugin:add_command(c_user)
|
||||
|
||||
local c_speak = command("speak", {
|
||||
args = {
|
||||
"string"
|
||||
},
|
||||
exec = function(msg,args,opts)
|
||||
local text = purify_strings(msg, table.concat(args," "))
|
||||
if opts["unescape"] or opts["u"] then
|
||||
text = text:gsub("\\","")
|
||||
end
|
||||
msg:reply(text)
|
||||
msg:delete()
|
||||
end,
|
||||
})
|
||||
plugin:add_command(c_speak)
|
||||
|
||||
local c_adminSpeak = command("adminSpeak", {
|
||||
args = {
|
||||
"string"
|
||||
},
|
||||
exec = function(msg,args,opts)
|
||||
local text = table.concat(args," ")
|
||||
if opts["unescape"] or opts["u"] then
|
||||
text = text:gsub("\\","")
|
||||
end
|
||||
msg:reply(text)
|
||||
msg:delete()
|
||||
end,
|
||||
perms = {
|
||||
"mentionEveryone"
|
||||
}
|
||||
})
|
||||
plugin:add_command(c_adminSpeak)
|
||||
|
||||
local c_echo = command("echo",{
|
||||
args = {
|
||||
"string"
|
||||
},
|
||||
exec = function(msg,args,opts)
|
||||
local text = purify_strings(msg, table.concat(args," "))
|
||||
if opts["unescape"] or opts["u"] then
|
||||
text = text:gsub("\\","")
|
||||
end
|
||||
msg:reply(text)
|
||||
end,
|
||||
})
|
||||
plugin:add_command(c_echo)
|
||||
|
||||
plugin.removal_callback = function()
|
||||
for k,v in pairs(config.aliases) do
|
||||
remove_alias(k)
|
||||
end
|
||||
end
|
||||
|
||||
local helpdb = import(plugin_path:sub(3,-1).."help")
|
||||
plugin:for_all_commands(function(command)
|
||||
if helpdb[command.name] then
|
||||
command:set_help(helpdb[command.name])
|
||||
end
|
||||
end)
|
||||
|
||||
return plugin
|
||||
|
|
@ -193,12 +193,14 @@ local embed = command("embed",{
|
|||
msg:reply("Invalid embed object")
|
||||
return
|
||||
end
|
||||
local embed_obj,code,err = require("json").decode(embed)
|
||||
local embed_obj,code,err = import("json").decode(embed)
|
||||
if not embed_obj then
|
||||
msg:reply("Error while decoding JSON object: "..tostring(err))
|
||||
return
|
||||
end
|
||||
embed_obj.color = discordia.Color.fromHex(embed_obj.color).value
|
||||
if pcall(discordia.Color.fromHex,embed_obj.color) then
|
||||
embed_obj.color = discordia.Color.fromHex(embed_obj.color).value
|
||||
end
|
||||
msg:reply({embed = embed_obj})
|
||||
end
|
||||
})
|
||||
|
|
|
|||
Loading…
Reference in New Issue