Fix almost everything #8

Closed
pablomayobre wants to merge 11 commits from master into master
Showing only changes of commit 5c8da4f25c - Show all commits

View File

@ -62,8 +62,10 @@ function GJ.init(id, key, args)
if args and type(args)=="table" then if args and type(args)=="table" then
for k,v in pairs(args) do for k,v in pairs(args) do
local a = v:match("^gjapi_(.*)") local a = v:match("^gjapi_(.*)")
if a then if a then
key, value = a:match("^(.-)=(.-)$") key, value = a:match("^(.-)=(.-)$")
if key == "username" then if key == "username" then
GJ.username = value GJ.username = value
elseif key == "token" then elseif key == "token" then
@ -72,18 +74,6 @@ function GJ.init(id, key, args)
end end
end end
end end
if id and key then --Not sure about this huge check
if not args then
return true
elseif GJ.username and GJ.userToken then
return true
else
return false, "Username or token not found on args"
end
else
return false, "Game Id or Game Key was nil"
end
end end
function GJ.getCredentials() function GJ.getCredentials()
@ -95,7 +85,7 @@ function GJ.getCredentials()
GJ.userToken = f:read() GJ.userToken = f:read()
return true, GJ.username, GJ.userToken return true, GJ.username, GJ.userToken
else else
return false, "Couldnt read file" return false, "Couldn't find, open or read the \"gjapi-credentials.txt\" file"
end end
end end