Minor style fixes
parent
c6cdbe1c64
commit
abdd31d38e
|
@ -19,7 +19,7 @@ module Vrobot4
|
|||
def self.loadBot botinfo
|
||||
servers = []
|
||||
botinfo["servers"].each {|servinfo| servers << loadServer(servinfo)}
|
||||
{:info => botinfo, :servs => servers}
|
||||
{info: botinfo, servs: servers}
|
||||
end
|
||||
|
||||
def self.runBots bots
|
||||
|
|
|
@ -62,7 +62,7 @@ module Vrobot4::Server
|
|||
end
|
||||
|
||||
def onCommand m, cnam, argv
|
||||
Vrobot4.log :DEBUG, "command", cnam.to_s, argv.to_s
|
||||
Vrobot4.log :DEBUGV, "command", cnam.to_s, argv.to_s
|
||||
super
|
||||
end
|
||||
end
|
||||
|
|
|
@ -43,7 +43,7 @@ module Vrobot4::Module
|
|||
def onCommand m, cnam, argv
|
||||
if (cmd = get_cmd m, cnam)
|
||||
begin; cmd.run(m, argv)
|
||||
rescue; m.reply "error:", $!.to_s; end
|
||||
rescue; m.reply "Error:", $!.to_s; end
|
||||
return true
|
||||
else
|
||||
return false
|
||||
|
@ -62,9 +62,9 @@ module Vrobot4::Module
|
|||
protected
|
||||
def check_args argv, req, opt = ""
|
||||
if argv.length < req.length
|
||||
raise ArgumentError, "not enough arguments"
|
||||
raise ArgumentError, "Not enough arguments"
|
||||
elsif argv.length > req.length + opt.length
|
||||
raise ArgumentError, "too many arguments"
|
||||
raise ArgumentError, "Too many arguments"
|
||||
else
|
||||
(0...req.length).each do |i|
|
||||
check_arg argv[i], i, req[i]
|
||||
|
@ -81,7 +81,7 @@ module Vrobot4::Module
|
|||
case req
|
||||
when 'N'
|
||||
unless Vrobot4.is_num? arg
|
||||
raise ArgumentError, "expected a number for arg " + i.to_s
|
||||
raise ArgumentError, "Expected a number for arg " + i.to_s
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -91,9 +91,9 @@ module Vrobot4::Module
|
|||
|
||||
def self.add_module_type type, name, server: nil, servflags: nil
|
||||
@@module_types[name] = {
|
||||
:type => type,
|
||||
:server => server,
|
||||
:servflags => servflags ? /[#{servflags}]/ : nil
|
||||
type: type,
|
||||
server: server,
|
||||
servflags: servflags ? /[#{servflags}]/ : nil
|
||||
}
|
||||
Vrobot4.log :INFO, "added module type:", name
|
||||
end
|
||||
|
|
|
@ -12,19 +12,13 @@ module Vrobot4::Server
|
|||
class Message
|
||||
attr_reader :msg, :user, :chan, :serv
|
||||
|
||||
def initialize(
|
||||
msg: nil,
|
||||
user: nil,
|
||||
chan: nil,
|
||||
serv: nil,
|
||||
reply: nil,
|
||||
reply_b: nil)
|
||||
@msg = msg
|
||||
@user = user
|
||||
@chan = chan
|
||||
@serv = serv
|
||||
@reply = reply
|
||||
@reply_b = reply_b
|
||||
def initialize(**info)
|
||||
@msg = info[:msg] if info.key? :msg
|
||||
@user = info[:user] if info.key? :user
|
||||
@chan = info[:chan] if info.key? :chan
|
||||
@serv = info[:serv] if info.key? :serv
|
||||
@reply = info[:reply] if info.key? :reply
|
||||
@reply_b = info[:reply_b] if info.key? :reply_b
|
||||
end
|
||||
|
||||
def reply *args
|
||||
|
@ -82,7 +76,7 @@ module Vrobot4::Server
|
|||
|
||||
private
|
||||
def load_permissions pinf
|
||||
@mprm = {:chan => {}, :role => {}, :glob => {}}
|
||||
@mprm = {chan: {}, role: {}, glob: {}}
|
||||
pinf.each do |perm|
|
||||
mod = Vrobot4::Module.get_module_type(perm["module"])[:type]
|
||||
if perm.key? "channel"
|
||||
|
|
|
@ -1,33 +1,33 @@
|
|||
require 'discordrb'
|
||||
|
||||
class Sv_Discord < Vrobot4::Server::Server
|
||||
class User < Vrobot4::Server::User
|
||||
attr_reader :real
|
||||
|
||||
def initialize user, admins
|
||||
@real = user
|
||||
@name = user.name
|
||||
@roles = "v"
|
||||
if user.is_a? Discordrb::Member
|
||||
@roles += "o" if admins.select {|role| user.role? role}.any?
|
||||
@roles += "O" if user.owner?
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
class Channel < Vrobot4::Server::Channel
|
||||
attr_reader :real
|
||||
|
||||
def initialize chan
|
||||
@real = chan
|
||||
@name = "#" + chan.name
|
||||
end
|
||||
end
|
||||
|
||||
class Sv_Discord < Vrobot4::Server::AudioServer
|
||||
Vrobot4::Server.add_server_type self, "Discord"
|
||||
|
||||
attr_reader :bot
|
||||
|
||||
class User < Vrobot4::Server::User
|
||||
attr_reader :real
|
||||
|
||||
def initialize user, admins
|
||||
@real = user
|
||||
@name = user.name
|
||||
@roles = "v"
|
||||
if user.is_a? Discordrb::Member
|
||||
@roles += "o" if admins.select {|role| user.role? role}.any?
|
||||
@roles += "O" if user.owner?
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
class Channel < Vrobot4::Server::Channel
|
||||
attr_reader :real
|
||||
|
||||
def initialize chan
|
||||
@real = chan
|
||||
@name = "#" + chan.name
|
||||
end
|
||||
end
|
||||
|
||||
def initialize info
|
||||
super
|
||||
|
||||
|
|
Loading…
Reference in New Issue