Juju Charms Collection
scalebot-ircbot package

Merge ~aittner/charms/+source/scalebot-ircbot:prevent-self-triggered-ping-commands into ~ce-hyperscale/charms/+source/scalebot-ircbot:master

  1. Git
  2. lp:~aittner/charms/+source/scalebot-ircbot
  3. prevent-self-triggered-ping-commands
  4. Merge into master
Proposed by Alexandre Erwin Ittner
Status: Merged
Approved by: dann frazier
Approved revision: ce34d7d8b9c3af59aa9158ac4c7617e6151ffe7b
Merged at revision: ce34d7d8b9c3af59aa9158ac4c7617e6151ffe7b
Proposed branch: ~aittner/charms/+source/scalebot-ircbot:prevent-self-triggered-ping-commands
Merge into: ~ce-hyperscale/charms/+source/scalebot-ircbot:master
Diff against target: 16 lines (+3/-2)
1 file modified
files/ircbot.py (+3/-2)
Reviewer Review Type Date Requested Status
dann frazier Approve
Review via email: mp+380232@code.launchpad.net
To post a comment you must log in.
Revision history for this message
dann frazier (dannf) wrote :

wfm

review: Approve
Revision history for this message
Patricia Domingues (patriciasd) wrote :

thanks for fixing it Alexandre :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/files/ircbot.py b/files/ircbot.py
2index 5586926..f18967a 100644
3--- a/files/ircbot.py
4+++ b/files/ircbot.py
5@@ -127,8 +127,9 @@ def scalebot_ircbot(botnick):
6 helpmsg(name)
7 elif message.startswith('help') or message.startswith('!help'):
8 helpmsg(name)
9- elif message == 'oi': # answering 'oi'(Hi) msg - a manual ping.
10- sendmsg('oi')
11+ elif message == 'oi' and name != botnick:
12+ # answering 'oi'(Hi) msg - a manual ping.
13+ sendmsg('hallo')
14
15
16 if __name__ == '__main__':

Subscribers

People subscribed via source and target branches