Skip to content

Hasemar edits #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hasemar wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Hasemar edits #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
138ac06
added another condition to parse_event logic so the slackbot wont rec…
Jan 14, 2018
f083b8a
adjusted parse_event condition because I found a bug when bot posts w…
Jan 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,6 @@ $RECYCLE.BIN/
Network Trash Folder
Temporary Items
.apdisk

# Visual Studio Code stuff
.vscode
5 changes: 3 additions & 2 deletions bot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,12 @@ def get_bot_id(self):
if api_call.get('ok'):
# retrieve all users so we can find our bot
users = api_call.get('members')
user_id = None
for user in users:
if 'name' in user and user.get('name') == self.bot_name:
return "<@" + user.get('id') + ">"
user_id = "<@" + user.get('id') + ">"

return None
return user_id

def listen(self):
if self.slack_client.rtm_connect(with_team_state=False):
Expand Down
2 changes: 1 addition & 1 deletion event.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def wait_for_event(self):
self.parse_event(event)

def parse_event(self, event):
if event and 'text' in event and self.bot.bot_id in event['text']:
if event and 'text' in event and self.bot.bot_id in event['text'] and event['user'] not in self.bot.bot_id:
self.handle_event(event['user'], event['text'].split(self.bot.bot_id)[1].strip().lower(), event['channel'])

def handle_event(self, user, command, channel):
Expand Down