Ensure Internets outputs HTTPS URLs.

diff --git a/pyva/pyva/src/main/python/internets/cmd_user.py b/pyva/pyva/src/main/python/internets/cmd_user.py
index 9b16b88433ae4b8b4d6e0ca21756ac359308a77d..fcc7ea378c91b91f9bd61d2ee5248f4e96072285 100644 (file)
--- a/pyva/pyva/src/main/python/internets/cmd_user.py
+++ b/pyva/pyva/src/main/python/internets/cmd_user.py
@@ -125,7 +125,7 @@ def command_weather(self, manager, opts, arg, channel, sender, userinfo):
 @bTemperature@b {tempcolor}{w[temp_c]}C / {w[temp_f]}F@o @sep \
 @bPressure@b {w[pressure]}mb @sep @bHumidity@b {w[humidity]}% @sep \
 @bRain@b {w[rain]} @sep \
-Powered by OpenWeatherMap http://openweathermap.org/city/{w[id]} @sep""".format(w=w, tempcolor=code, w_state=w_state)))
+Powered by OpenWeatherMap https://openweathermap.org/city/{w[id]} @sep""".format(w=w, tempcolor=code, w_state=w_state)))
 
 
 def command_forecast(self, manager, opts, arg, channel, sender, userinfo):
@@ -316,7 +316,7 @@ def command_youtube_search(self, manager, opts, arg, channel, sender, userinfo):
        self.msg(channel, """@sep @bYouTube@b %(title)s @sep @bURL@b %(url)s (%(duration)s) @sep @bViews@b %(views)s @sep \
 @bRating@b @c3@b[+]@b %(liked)s likes @c4@b[-]@b %(disliked)s dislikes @sep""" % {
                        'title': res['title'],
-                       'url': 'http://www.youtube.com/watch?v=' + res['id'],
+                       'url': 'https://www.youtube.com/watch?v=' + res['id'],
                        'duration': '%s' % format_hms(res['duration']),
                        'views': format_thousand(res['view_count']),
                        'liked': format_thousand(res['liked']) if res['liked'] else 0,
@@ -389,7 +389,7 @@ def command_twitch(self, manager, opts, arg, channel, sender, userinfo):
                        if res_num:
                                g = games[int(res_num)-1]
                                self.msg(channel, (u"@sep @b{g[name]}@b @sep ranked @b{g[popularity]}@b in popularity @sep " +
-                                                  u"http://www.twitch.tv/search?query={g[name2]} @sep").format(g=g))
+                                                  u"https://www.twitch.tv/search?query={g[name2]} @sep").format(g=g))
                                return
                        self.msg(channel, "Results for @b{}@b".format(arg.replace('+', ' ')))
                        i = 1
@@ -397,7 +397,7 @@ def command_twitch(self, manager, opts, arg, channel, sender, userinfo):
                        for g in games:
                                if i > MAX_RESULTS: break
                                self.msg(channel, (u"@sep [{i}/{total}] @b{g[name]}@b @sep ranked @b{g[popularity]}@b in popularity @sep " +
-                                        u"http://www.twitch.tv/search?query={g[name2]} @sep").format(i=i, g=g, total=total))
+                                        u"https://www.twitch.tv/search?query={g[name2]} @sep").format(i=i, g=g, total=total))
                                i += 1
                        self.notice(sender, "To view a particular result, type: @b.tw -g {} /@unumber@u@b".format(arg.replace('+', ' ')))
 
@@ -429,7 +429,7 @@ def command_twitch(self, manager, opts, arg, channel, sender, userinfo):
                                self.notice(sender, u"To view a particular result, type: @b.tw -t /@unumber@u@b")
                                
                elif 'video' in opts:
-                       self.msg(channel, "@sep http://www.twitch.tv/search?query={} @sep".format(arg.replace(' ', '+')))
+                       self.msg(channel, "@sep https://www.twitch.tv/search?query={} @sep".format(arg.replace(' ', '+')))
 
                else:
                        self.notice(sender, u"Type: @b.help twitch@b for the twitch.tv bot command syntax.")
@@ -533,7 +533,7 @@ def command_imdb(self, manager, opts, arg, channel, sender, userinfo):
        
        self.msg(channel, u"""@sep @b{r[Title]}@b [{r[Year]}] Rated {r[Rated]} @sep @bRating@b {r[imdbRating]}/10, {r[imdbVotes]} votes @sep \
 @bGenre@b {r[Genre]} @sep @bDirector@b {r[Director]} @sep @bActors@b {r[Actors]} @sep @bRuntime@b {r[Runtime]} @sep""".format(r=reply))
-       self.msg(channel, u'@sep @bPlot@b {r[Plot]} @sep @uhttp://www.imdb.com/title/{r[imdbID]}/@u @sep'.format(r=reply))
+       self.msg(channel, u'@sep @bPlot@b {r[Plot]} @sep @uhttps://www.imdb.com/title/{r[imdbID]}/@u @sep'.format(r=reply))
 
 #
 # Registers the user's steam ID and links it to his/her nickname.
@@ -758,7 +758,7 @@ def command_ipinfo(self, manager, opts, arg, channel, sender, userinfo):
 {reply[country_name]} [{reply[country_code]}] @sep{map}""".format(
                                reply = reply,
                                arg = arg.lower(),
-                               map = ' http://maps.google.com/maps?q=%s,%s @sep' % (reply['latitude'], reply['longitude']) if reply['latitude'] and reply['longitude'] else ''))
+                               map = ' https://maps.google.com/maps?q=%s,%s @sep' % (reply['latitude'], reply['longitude']) if reply['latitude'] and reply['longitude'] else ''))
        
 dice_regex = re.compile('^(?:(\d+)d)?(\d+)(?:([\+\-])(\d+))?$')