Skip to content

Commit f3b62a4

Browse files
committed
Merge pull request #44 from floatinghotpot/coffee
增加了对二维码认证登录的支持
2 parents 8ef9bf8 + 64c7818 commit f3b62a4

File tree

3 files changed

+330
-5
lines changed

3 files changed

+330
-5
lines changed

main.coffee

+8-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88

99
log = new (require 'log')('debug')
10-
auth = require "./src/qqauth"
10+
auth = require "./src/qqauth_qrcode"
1111
api = require "./src/qqapi"
1212
QQBot = require "./src/qqbot"
1313
defaults = require './src/defaults'
@@ -53,6 +53,13 @@ run = ->
5353
unless ret
5454
log.error "获取信息失败"
5555
process.exit(1)
56+
57+
console.log "Group List:"
58+
console.log " #{v.name} (#{v.gid})" for k, v of bot.group_info.gnamelist
59+
60+
console.log "Buddy List:"
61+
console.log " #{v.nick} (#{v.uin})" for k, v of bot.buddy_info.info
62+
5663
log.info "Entering runloop, Enjoy!"
5764
bot.runloop()
5865

plugins/apiserver.coffee

+11-4
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,19 @@ class APIServer
120120
on_sendmsg : (req,res,params)->
121121
log.info "will send #{params.type} #{params.to} : #{params.msg}"
122122
if params.type == 'buddy'
123-
msg = "unimplement type #{params.type}"
124-
log.warning msg
125-
res.endjson {err:100,msg:msg}
123+
user = params.to
124+
@qqbot.send_message user, params.msg, (ret,e)->
125+
resp_ret = {result:ret}
126+
if e
127+
resp_ret.err = 1
128+
resp_ret.msg = "#{e}"
129+
res.endjson resp_ret
126130

127131
else if params.type == 'group'
128-
group = @qqbot.get_group {name:params.to}
132+
if parseInt(params.to) > 0
133+
group = params.to
134+
else
135+
group = @qqbot.get_group {name:params.to}
129136
@qqbot.send_message_to_group group, params.msg, (ret,e)->
130137
resp_ret = {result:ret}
131138
if e

src/qqauth_qrcode.js

+311
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)