Skip to content

Commit

Permalink
Renamed wrapper
Browse files Browse the repository at this point in the history
  • Loading branch information
@3bl3gamer
3bl3gamer committed Feb 10, 2014
1 parent 6383683 commit 1b915ee
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 32 deletions.
12 changes: 6 additions & 6 deletions add-admin.coffee
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
'use strict'


utils = require './utils.js'
lib = require './lib.js'

This comment has been minimized.

Sign in to view

Copy link
@m1kc

m1kc Feb 10, 2014

Member

Ну, переменные-то можно было и не переименовывать, это дело десятое.

This comment has been minimized.

Sign in to view

Copy link
@3bl3gamer

3bl3gamer Feb 10, 2014

Author Member

Почему нет? lib он и есть lib.
Но на всякий случай оно в отдельном коммите.

console.log "Warning: PHP and Node.js have different hashing algorithms.\n" +
utils.prettyprint.spaces(9) + "Don't try to use them together."
lib.prettyprint.spaces(9) + "Don't try to use them together."

if process.argv.length != 4
console.log 'Usage: <username> <password>'
Expand All @@ -29,12 +29,12 @@ if process.argv.length != 4
u = process.argv[2]
p = process.argv[3]

if !utils.validation.usernameIsValid(u)
if !lib.validation.usernameIsValid(u)
console.log 'Incorrect username.'
console.log 'Must be: 2-32 symbols, [a-zA-Z0-9а-яА-ЯёЁйЙру _-].'
process.exit 1

if !utils.validation.passwordIsValid(p)
if !lib.validation.passwordIsValid(p)
console.log 'Incorrect password.'
console.log 'Must be: 4-32 symbols, [!@#$%^&*()_+A-Za-z0-9].'
process.exit 1
Expand All @@ -47,12 +47,12 @@ conn = anyDB.createConnection config.MYSQL_DATABASE_URL

sync ->
try
exists = utils.user.userExists.sync null, conn, u
exists = lib.user.userExists.sync null, conn, u
if exists is true
console.log "User `#{u}` already exists."
process.exit 1

utils.user.registerUser.sync null, conn, u, p, config.PERMISSIONS_ADMIN
lib.user.registerUser.sync null, conn, u, p, config.PERMISSIONS_ADMIN
console.log "New admin `#{u}` registered successfully."
process.exit 0
catch ex
Expand Down
8 changes: 4 additions & 4 deletions init.coffee
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
'use strict'

config = require './config.js'
utils = require './utils.js'
lib = require './lib.js'
async = require 'async'
sync = require 'sync'
dashdash = require 'dashdash'
Expand Down Expand Up @@ -119,8 +119,8 @@ help = ->

info = ->
mysqlConnection = createAnyDBConnection(config.MYSQL_DATABASE_URL)
current = utils.migration.getCurrentRevision.sync(null, mysqlConnection)
newest = utils.migration.getNewestRevision()
current = lib.migration.getCurrentRevision.sync(null, mysqlConnection)
newest = lib.migration.getNewestRevision()
status = if current < newest then 'needs update' else 'up to date'
console.log "init.js with #{newest + 1} revisions on board."
console.log "Current revision is #{current} (#{status})."
Expand Down Expand Up @@ -164,7 +164,7 @@ dropDatabase = (arg) ->

migrateTables = ->
mysqlConnection = createAnyDBConnection(config.MYSQL_DATABASE_URL)
utils.migration.migrate.sync null, mysqlConnection
lib.migration.migrate.sync null, mysqlConnection


optimize = ->
Expand Down
0 utils.js → lib.js
View file
File renamed without changes.
44 changes: 22 additions & 22 deletions main.coffee
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
config = require './config.js'
anyDB = require 'any-db'
mysqlConnection = anyDB.createPool config.MYSQL_DATABASE_URL, min: 2, max: 20
utils = require './utils.js'
lib = require './lib.js'
async = require 'async'
express = require 'express'
sync = require 'sync'
Expand Down Expand Up @@ -61,7 +61,7 @@ app.use ((request, response) ->
app.use ((request, response) ->
request.uonline = {}
request.uonline.basicOpts = {}
sessionData = utils.user.sessionInfoRefreshing.sync(null,
sessionData = lib.user.sessionInfoRefreshing.sync(null,
mysqlConnection, request.cookies.sessid, config.sessionExpireTime)
request.uonline.basicOpts.now = new Date()
request.uonline.basicOpts.loggedIn = sessionData.sessionIsActive
Expand Down Expand Up @@ -115,11 +115,11 @@ app.get '/register/', (request, response) ->
app.post '/register/', (request, response) ->
options = request.uonline.basicOpts
options.instance = 'register'
usernameIsValid = utils.validation.usernameIsValid(request.body.user)
passwordIsValid = utils.validation.passwordIsValid(request.body.pass)
userExists = utils.user.userExists.sync(null, mysqlConnection, request.body.user)
usernameIsValid = lib.validation.usernameIsValid(request.body.user)
passwordIsValid = lib.validation.passwordIsValid(request.body.pass)
userExists = lib.user.userExists.sync(null, mysqlConnection, request.body.user)
if (usernameIsValid is true) and (passwordIsValid is true) and (userExists is false)
utils.user.registerUser.sync(
lib.user.registerUser.sync(
null
mysqlConnection
request.body.user
Expand All @@ -144,8 +144,8 @@ app.get '/login/', (request, response) ->


app.post '/login/', (request, response) ->
if utils.user.accessGranted.sync null, mysqlConnection, request.body.user, request.body.pass
sessid = utils.user.setSession.sync null, mysqlConnection, request.body.user
if lib.user.accessGranted.sync null, mysqlConnection, request.body.user, request.body.pass
sessid = lib.user.setSession.sync null, mysqlConnection, request.body.user
response.cookie 'sessid', sessid
response.redirect '/'
else
Expand All @@ -163,7 +163,7 @@ app.get '/profile/', (request, response) -> sync ->
options.nickname = request.uonline.basicOpts.login
options.profileIsMine = true
options.id = request.uonline.basicOpts.userid
chars = utils.game.getUserCharacters.sync null, mysqlConnection, request.uonline.basicOpts.userid
chars = lib.game.getUserCharacters.sync null, mysqlConnection, request.uonline.basicOpts.userid
for i of chars
options[i] = chars[i]
response.render 'profile', options
Expand All @@ -173,7 +173,7 @@ app.get '/profile/', (request, response) -> sync ->

app.get '/profile/id/:id/', (request, response) ->
id = parseInt request.param('id'), 10
chars = utils.game.getUserCharacters.sync null, mysqlConnection, id
chars = lib.game.getUserCharacters.sync null, mysqlConnection, id
if chars is null
throw new Error '404'
options = request.uonline.basicOpts
Expand All @@ -187,7 +187,7 @@ app.get '/profile/id/:id/', (request, response) ->

app.get '/profile/user/:nickname/', (request, response) ->
nickname = request.param('nickname')
chars = utils.game.getUserCharacters.sync null, mysqlConnection, nickname
chars = lib.game.getUserCharacters.sync null, mysqlConnection, nickname
if chars is null
throw new Error '404'
options = request.uonline.basicOpts
Expand All @@ -202,7 +202,7 @@ app.get '/profile/user/:nickname/', (request, response) ->

app.get '/action/logout', (request, response) ->
# TODO: move sessid to uonline{}
utils.user.closeSession mysqlConnection, request.cookies.sessid, (error, result) ->
lib.user.closeSession mysqlConnection, request.cookies.sessid, (error, result) ->
if error?
response.send 500
else
Expand All @@ -213,8 +213,8 @@ app.get '/game/', (request, response) -> sync ->
if request.uonline.basicOpts.loggedIn is true
options = request.uonline.basicOpts
options.instance = 'game'
tmpArea = utils.game.getUserArea.sync null, mysqlConnection, request.uonline.basicOpts.userid
result = utils.game.getUserLocation.sync null, mysqlConnection, request.uonline.basicOpts.userid
tmpArea = lib.game.getUserArea.sync null, mysqlConnection, request.uonline.basicOpts.userid
result = lib.game.getUserLocation.sync null, mysqlConnection, request.uonline.basicOpts.userid
options.location_name = result.title
options.area_name = tmpArea.title
options.pic = options.picture if options.picture?
Expand All @@ -223,23 +223,23 @@ app.get '/game/', (request, response) -> sync ->
options.ways.forEach (i) -> # Facepalm. #273
i.name = i.text
i.to = i.id
tmpUsers = utils.game.getNearbyUsers.sync null,
tmpUsers = lib.game.getNearbyUsers.sync null,
mysqlConnection, request.uonline.basicOpts.userid, result.id
tmpUsers.forEach (i) -> # Facepalm. Refs #273 too.
i.name = i.user
options.players_list = tmpUsers
tmpMonsters = utils.game.getNearbyMonsters.sync null, mysqlConnection, result.id
tmpMonsters = lib.game.getNearbyMonsters.sync null, mysqlConnection, result.id
options.monsters_list = tmpMonsters
options.fight_mode = utils.game.isInFight.sync null, mysqlConnection, request.uonline.basicOpts.userid
options.autoinvolved_fm = utils.game.isAutoinvolved.sync null,
options.fight_mode = lib.game.isInFight.sync null, mysqlConnection, request.uonline.basicOpts.userid
options.autoinvolved_fm = lib.game.isAutoinvolved.sync null,
mysqlConnection, request.uonline.basicOpts.userid
response.render 'game', options
else
response.redirect '/login/'


app.get '/action/go/:to', (request, response) ->
utils.game.changeLocation mysqlConnection, request.uonline.basicOpts.userid, request.param('to'),
lib.game.changeLocation mysqlConnection, request.uonline.basicOpts.userid, request.param('to'),
(error, result) ->
if error? then throw new Error(error)
response.redirect '/game/'
Expand All @@ -249,7 +249,7 @@ app.get '/action/attack', (request, response) ->
unless request.uonline.basicOpts.loggedIn
response.redirect '/login/'
else
utils.game.goAttack mysqlConnection, request.uonline.basicOpts.userid, (error, result) ->
lib.game.goAttack mysqlConnection, request.uonline.basicOpts.userid, (error, result) ->
if error?
throw new Error(error)
else
Expand All @@ -260,7 +260,7 @@ app.get '/action/escape', (request, response) ->
unless request.uonline.basicOpts.loggedIn
response.redirect '/login/'
else
utils.game.goEscape mysqlConnection, request.uonline.basicOpts.userid, (error, result) ->
lib.game.goEscape mysqlConnection, request.uonline.basicOpts.userid, (error, result) ->
if error?
throw new Error(error)
else
Expand All @@ -270,7 +270,7 @@ app.get '/action/escape', (request, response) ->
app.get '/ajax/isNickBusy/:nick', (request, response) ->
response.json
nick: request.param('nick')
isNickBusy: utils.user.userExists.sync null, mysqlConnection, request.param('nick')
isNickBusy: lib.user.userExists.sync null, mysqlConnection, request.param('nick')


# 404 handling
Expand Down

0 comments on commit 1b915ee

Please sign in to comment.