Add hidePush configuration variable

1 files changed, 30 insertions, 17 deletions

diff --git a/plugin.py b/plugin.py
index 5122cd6..303338f 100644
--- a/plugin.py
+++ b/plugin.py
@@ -126,14 +126,15 @@ class GithubHandler(BaseHTTPServer.BaseHTTPRequestHandler):
         commitno = len(data['commits'])
         branch = data['ref'].split('/',2)[2]
 
-        msgs.append( ircmsgs.privmsg(configValue('channel'), "%s @ %s: %s pushed %s %s (%s):" % (
-        ircutils.bold(ircutils.mircColor(branch, "blue")),
-        ircutils.bold(data['repository']['name']),
-        ircutils.mircColor(data['pusher']['name'], "green"),
-        ircutils.bold(str(commitno)),
-        plural(commitno, "commit", "commits"),
-        getShortURL(data['compare'])
-        )) )
+        if configValue("hidePush",None) is False:
+            msgs.append( ircmsgs.privmsg(configValue('channel'), "%s @ %s: %s pushed %s %s (%s):" % (
+            ircutils.bold(ircutils.mircColor(branch, "blue")),
+            ircutils.bold(data['repository']['name']),
+            ircutils.mircColor(data['pusher']['name'], "green"),
+            ircutils.bold(str(commitno)),
+            plural(commitno, "commit", "commits"),
+            getShortURL(data['compare'])
+            )) )
 
         for commit in data['commits']:
             if 'username' in commit['author']:
@@ -148,6 +149,7 @@ class GithubHandler(BaseHTTPServer.BaseHTTPRequestHandler):
                 ircutils.bold(commit['id'][0:6]),
                 getShortURL(commit['url']),
             )) )
+
             commitlines = commit['message'].splitlines()
             for rawline in commitlines:
                 if len(rawline) > 400:
@@ -169,23 +171,34 @@ class GithubHandler(BaseHTTPServer.BaseHTTPRequestHandler):
 
         url = getShortURL("%s/wiki/_compare/%s" % ( data['repository']['html_url'], data['pages'][0]['sha'] ))
 
-        msgs.append( ircmsgs.privmsg(configValue('channel'), "%s: %s modified %s wiki %s (%s):" % (
-        ircutils.bold(data['repository']['name']),
-        ircutils.mircColor(data['sender']['login'], "green"),
-        ircutils.bold(str(pageno)),
-        plural(pageno, "page", "pages"),
-        url
-        )) )
+        if configValue("hidePush",None) is False:
+            msgs.append( ircmsgs.privmsg(configValue('channel'), "%s: %s modified %s wiki %s (%s):" % (
+            ircutils.bold(data['repository']['name']),
+            ircutils.mircColor(data['sender']['login'], "green"),
+            ircutils.bold(str(pageno)),
+            plural(pageno, "page", "pages"),
+            url
+            )) )
+
+        urlShown = False;
 
         for page in data['pages']:
+            if configValue("hidePush") and urlShown is False:
+                pageurl = "(%s)" % (url,)
+                urlShown = True
+            elif configValue("hidePush"):
+                pageurl = ""
+            else:
+                pageurl = "(%s)" % (page['html_url'],)
+
             # Unfortunately github doesn't support edit summaries :(
-            msgs.append( ircmsgs.privmsg(configValue('channel'), "%s: %s %s %s * %s (%s)" % (
+            msgs.append( ircmsgs.privmsg(configValue('channel'), "%s: %s %s %s * %s %s" % (
                 ircutils.bold(data['repository']['name']),
                 ircutils.mircColor(data['sender']['login'], "green"),
                 colorAction(page['action']),
                 ircutils.bold(ircutils.mircColor(page['page_name'], "blue")),
                 ircutils.bold(page['sha'][0:6]),
-                page['html_url'],
+                pageurl,
             )) )
 
         return msgs