Hexor/conf_bot
1
0
Fork 0
mirror of https://github.com/house-of-vanity/conf_bot.git synced 2025-07-06 22:34:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reset feature

Browse Source
This commit is contained in:
Alexandr Godless
2018-02-20 18:05:49 +03:00
parent 59b9ab6ac3
commit 67d6f47bc3
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,4 +1,5 @@
assets/cert* assets/cert*
**/settings.ini **/settings.ini
main.db main.db
main.db-journal
settings.ini settings.ini

19
database.py
View File

@ -80,7 +80,9 @@ class DataBase:
LEFT JOIN `user` u ON u.id = r.user_id LEFT JOIN `user` u ON u.id = r.user_id
WHERE u.id = '%s' AND WHERE u.id = '%s' AND
r.conf_id = '%s' AND r.conf_id = '%s' AND
r.id > (SELECT IFNULL(MAX(relation_id), 0) FROM reset WHERE user_id = '%s') r.id > (
SELECT IFNULL(MAX(relation_id), 0) FROM reset WHERE user_id = '%s' AND conf_id = '%s'
)
GROUP BY w.word GROUP BY w.word
ORDER BY count DESC ORDER BY count DESC
LIMIT %s LIMIT %s
@ -109,9 +111,18 @@ class DataBase:
result = self.execute(sql) result = self.execute(sql)
return(result) return(result)
# def reset(self, user_id, conf_id): def reset(self, user_id, conf_id):
# date = int(dt.datetime.now().strftime("%s")) date = int(dt.datetime.now().strftime("%s"))
# sql sql = """
INSERT OR IGNORE INTO reset (user_id, conf_id, date, relation_id)
VALUES ('%s', '%s', '%s', (SELECT MAX(rowid) FROM relations));
""" % (
user_id,
conf_id,
date
)
result = self.execute(sql)
return(result)
def close(self): def close(self):

1
worker.py
View File

@ -43,7 +43,6 @@ class MessageWorker:
self.db.reset( self.db.reset(
conf_id=conf_id, conf_id=conf_id,
user_id=user_id) user_id=user_id)
return True return True
if msg['message']['text'] == '@here': if msg['message']['text'] == '@here':