Adds user whitelisting support #9
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bernardopires
requested changes
May 6, 2017
db_logger.py
Outdated
|
|
||
| try: | ||
| self.cursor.execute("INSERT INTO chat_log (sender, message, channel, date) VALUES (%s, %s, %s, %s)", | ||
| if self.senders_whitelist is not None and sender in self.senders_whitelist: |
There was a problem hiding this comment.
if (self.senders_whitelist is not None and sender in self.senders_whitelist) or (self.senders_whitelist is None):
db_logger.py
Outdated
| if self.senders_whitelist is not None and sender in self.senders_whitelist: | ||
| self.cursor.execute("INSERT INTO chat_log (sender, message, channel, date) VALUES (%s, %s, %s, %s)", | ||
| (sender, message, channel, current_time_in_milli())) | ||
| elif self.senders_whitelist is None: |
There was a problem hiding this comment.
Delete this and the next line
manager.py
Outdated
| self.log_filename = log_filename | ||
| self.channels = channels | ||
| self.db_logger = DatabaseLogger(settings.DATABASE['HOST'], | ||
| if settings.USERS is not None and len(settings.USERS) is not 0: |
There was a problem hiding this comment.
You do not need this if condition here. If settings.USERS is None, it will do exactly what it should.
manager.py
Outdated
| settings.IRC['PASSWORD'], | ||
| self.log_filename) | ||
| bot_db_logger = DatabaseLogger(settings.DATABASE['HOST'], | ||
| if settings.USERS is not None and len(settings.USERS) is not 0: |
users = [] now valid for no users
|
This is working for me. Let me know if any other changes are needed. |
bernardopires
requested changes
May 16, 2017
manager.py
Outdated
| self.log_filename = log_filename | ||
| self.channels = channels | ||
| self.db_logger = DatabaseLogger(settings.DATABASE['HOST'], | ||
| if settings.USERS is not None: |
There was a problem hiding this comment.
Sorry I should have been more explicit here. You don't actually need the if here (neither the else and the contents inside it). In case settings.USERS is None, you will automatically be passing None as the last argument as well.
| settings.IRC['PASSWORD'], | ||
| self.log_filename) | ||
| bot_db_logger = DatabaseLogger(settings.DATABASE['HOST'], | ||
| if settings.USERS is not None: |
Also forgot some formatting below...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Made this modification for a project I'm working on.
Purely feature-enabling, does not change any behaviour if feature is not used.