new bot in the making, slight improvements to old

bot2/api/__init__.py

@@ -0,0 +1,4 @@
+from . import google
+from . import keys
+from . import reddit
+from . import weather

bot2/api/google.py

@@ -0,0 +1,20 @@
+import googlesearch
+
+
+def query(params):
+    param_string = ""
+    for word in params:
+        param_string += word + "+"
+    param_string = param_string[:-1]
+    search_url = "https://google.com/search?q=" + param_string
+
+    try:
+        res = googlesearch.search(param_string.replace("+"," ") ,num=5,start=0,stop=5)
+        send_string = "Results for <b>" + param_string.replace("+"," ") + "</b>:\n\n"
+        for url in res:
+            send_string += url + "\n\n"
+        send_string += "Search url:\n" + search_url
+    except:
+        send_string = "Search url:\n" + search_url
+
+    return send_string

bot2/api/reddit.py

@@ -0,0 +1,50 @@
+import praw
+try:
+    import bot.api.keys as keys
+except:
+    import keys
+
+stream = praw.Reddit(client_id = keys.reddit_id, client_secret = keys.reddit_secret, user_agent=keys.reddit_user_agent)
+
+def get_top(subreddit, number, return_type="text"):
+    if return_type == "text":
+        message = ""
+        try:
+            for submission in stream.subreddit(subreddit).top(limit=number):
+                if not submission.stickied:
+                    message += "<b>" + submission.title + "</b>" + "\n" + submission.selftext + "\n\n\n"
+            return message
+        except:
+            return "Api call failed, sorry"
+    else:
+        images = []
+        try:
+            for submission in stream.subreddit(subreddit).top(limit=number):
+                if not submission.stickied:
+                    t = {"image": submission.url, "caption": submission.title}
+                    images.append(t)
+            return images
+        except:
+            return ["Api call failed, sorry"]
+
+
+def get_random_rising(subreddit, number, return_type="text"):
+    if return_type == "text":
+        message = ""
+        try:
+            for submission in stream.subreddit(subreddit).random_rising(limit=number):
+                if not submission.stickied:
+                    message += "<b>" + submission.title + "</b>" + "\n" + submission.selftext + "\n\n\n"
+            return message
+        except:
+            return "Api call failed, sorry"
+    else:
+        images = []
+        try:
+            for submission in stream.subreddit(subreddit).random_rising(limit=number):
+                if not submission.stickied:
+                    t = {"image": submission.url, "caption": submission.title}
+                    images.append(t)
+            return images
+        except:
+            return ["Api call failed, sorry"]

bot2/api/weather.py

@@ -0,0 +1,61 @@
+import requests
+# import api.keys
+import datetime
+
+class WeatherFetch():
+    def __init__(self, key):
+        self.last_fetch = datetime.datetime.fromtimestamp(0)
+        self.last_weather = ""
+
+        self.url = "https://api.openweathermap.org/data/2.5/onecall?"
+        self.key = key
+
+    def show_weather(self, location):
+        delta = datetime.datetime.now() - self.last_fetch
+        if delta.total_seconds()/60 > 60 or "\n" not in self.last_weather: # 1 hour passed:
+
+            
+            data = {"lat" : location[0], "lon" : location[1], "exclude" : "minutely,hourly", "appid" : self.key, "units" : "metric"}
+            # today = datetime.datetime.today().weekday()
+            # days = ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"]
+
+            try:
+                weather = requests.get(self.url,params=data).json()
+                # categories = {"Clouds": ":cloud:", "Rain": ":cloud_with_rain:", "Thunderstorm": "thunder_cloud_rain", "Drizzle": ":droplet:", "Snow": ":cloud_snow:", "Clear": ":sun:", "Mist": "Mist", "Smoke": "Smoke", "Haze": "Haze", "Dust": "Dust", "Fog": "Fog", "Sand": "Sand", "Dust": "Dust", "Ash": "Ash", "Squall": "Squall", "Tornado": "Tornado",}
+                now = weather["current"]
+                ret_weather = []
+                ret_weather.append({
+                    "short" : now["weather"][0]["main"],
+                    "temps" : [int(now["temp"])]
+                    })
+                weather_days = weather["daily"]
+                for i, day in enumerate(weather_days):
+                    ret_weather.append({
+                        "short" : day["weather"][0]["main"],
+                        "temps" : [int(day["temp"]["min"]),int(day["temp"]["max"])]
+                        })
+            except:
+                ret_weather = []
+
+            
+            #     now = weather["current"]
+            #     message = "<b>Now:</b> " + categories[now["weather"][0]["main"]] + "\n"
+            #     message += ":thermometer: " + str(int(now["temp"])) + "°\n\n"
+
+            #     weather_days = weather["daily"]
+                
+            #     for i, day in enumerate(weather_days):
+            #         if i == 0:
+            #             message += "<b>" + "Today" + ":</b> " + categories[day["weather"][0]["main"]] + "\n"
+            #         else:
+            #             message += "<b>" + days[(today + i + 1) % 7] + ":</b> " + categories[day["weather"][0]["main"]] + "\n"
+            #         message += ":thermometer: :fast_down_button: " + str(int(day["temp"]["min"])) + "° , :thermometer: :fast_up_button: " + str(int(day["temp"]["max"])) + "°\n\n"
+            # except:
+            #     message = "Query failed, it's my fault, I'm sorry :sad:"
+            
+            self.last_weather = ret_weather
+            self.last_fetch = datetime.datetime.now()
+        else:
+            ret_weather = self.last_weather
+
+        return ret_weather