OSDN > Buscar Software > pybbs > SCM > git > pybbs > Commit

pybbs
Fork

pybbs: Commit

無料の掲示板

Revisión	7c7ddf992acd1f727eace4adf015dc0c02dd87d4 (tree)
Tiempo	2018-09-27 20:01:47
Autor	福家正士 <yamat0jp@yaho...>
Commiter	福家正士

_bot 忘れてた

--- a/botmod.py

+++ b/botmod.py

		@@ -62,10 +62,10 @@ class WebHookHandler(tornado.web.RequestHandler):
62	62	return s
63	63
64	64	def setting(self, dbname):
65		- dbname = dbname.lower()
	65	+ dbname = dbname.lower()+'_bot'
66	66	ca = self.database.tables()
67	67	ca.remove('users_bot')
68		- if dbname[-4:] == '_bot' and dbname in ca:
	68	+ if dbname in ca:
69	69	db = self.database['users_bot']
70	70	item = db.get(where('name') == self.uid)
71	71	if item['dbname'] == dbname:

		@@ -79,7 +79,7 @@ class WebHookHandler(tornado.web.RequestHandler):
79	79	db = self.database.table('users_bot')
80	80	item = db.get(where('name') == self.uid)
81	81	x = item['dbname']
82		- return self.database.table(x), x
	82	+ return self.database.table(x), x[:-4]
83	83
84	84	def post(self):
85	85	'''

		@@ -104,29 +104,35 @@ class WebHookHandler(tornado.web.RequestHandler):
104	104	return
105	105	elif event['type'] == 'join':
106	106	if not tb.get(where('name') == self.uid):
107		- tb.insert({'name':self.uid, 'dbname':'glove'})
	107	+ item = tb['params'].get(where('app') == 'bot')
	108	+ if not item:
	109	+ de = '_bot'
	110	+ else:
	111	+ de = item['default']
	112	+ tb.insert({'name':self.uid, 'dbname':de})
108	113	return
109	114	x = event['message']['text']
110	115	if self.setting(x):
111		- linebot.reply_message(event['replyToken'],
112		- TextSendMessage(text=u'設定完了.'))
	116	+ te = u'設定完了.'
113	117	elif x == '?':
114		- linebot.reply_message(event['replyToken'],
115		- TextSendMessage(text=self.help())
116		- )
	118	+ te = self.help()
117	119	else:
118		- linebot.reply_message(event['replyToken'],
119		- TextSendMessage(text=self.main(x))
120		- )
	120	+ te = self.main(x)
	121	+ linebot.reply_message(event['replyToken'], TextSendMessage(text=te))
121	122
122	123	class InitHandler(tornado.web.RequestHandler):
123	124	def get(self):
	125	+ de = self.get_argument('default', '')
	126	+ if de == '':
	127	+ self.write('set default db name')
	128	+ return
124	129	self.db = TinyDB(st.json)
	130	+ self.db['params'].insert({'app':'bot', 'default':de+'_bot'})
125	131	for x in glob.glob('./*.txt'):
126	132	f = open(x)
127	133	data = f.read()
128	134	f.close()
129		- self.main(x[2:-4], data)
	135	+ self.main(x[2:-4].lower(), data)
130	136
131	137	def main(self, name, data):
132	138	if name == 'requirements':

		@@ -146,7 +152,7 @@ class InitHandler(tornado.web.RequestHandler):
146	152	table.insert(x)
147	153
148	154	class VarParam():
149		- token = os.environ['Access_Token']
	155	+ token = os.environ['long_token']
150	156	ch = os.environ['Channel_Secret']
151	157
152	158	var = VarParam()