Dorada za vreme funckiju

- samo slova smeju u ime grada
- dodao i englesku verziju `!weather`

functions.py

@@ -4,8 +4,8 @@ import scraper_functions as sf
 def processmsg(msg, rcpt):
     if "youtube.com/watch" in msg:
         return msg.replace("youtube.com", "iv.datura.network")
-    elif msg.startswith("!wiki"):
+    elif msg.startswith("!"):
-        return sf.query_external_website("https://en.wikipedia.org/wiki/", msg.split(" ")[1])
+        return command(msg, "")
     elif "good bot" in msg:
         return "^_^"
 
@@ -13,10 +13,22 @@ def command(msg, rcpt):
     if msg.startswith("!help"):
         response = "chatbot commands:"  + "\n"
         response += "!help            Show this help page" + "\n"
-        response += "!ai [message]    Ask llama2"
+        response += "!ai [message]    Ask llama2" + "\n"
+        response += "!wiki [message]    Ask wiki\n"
+        response += "!tasks           Show active tasks from the taskmanager\n"
+        response += "!vreme [city] | !prognoza [city] | !weather [city]    Show weather for [city]\n"
         return response
     elif msg.startswith("!ai"):
         client = ollama.Client(host='https://ollama.krov.dmz.rs')
         response = client.chat(model='llama2-uncensored:latest', messages=[{'role':'user','content':f'{msg[4:]}'}])
         return(response['message']['content'])
+    elif msg.startswith("!wiki"):
+        cmd, query = msg.split(" ", 1)
+        return sf.query_external_website("https://en.wikipedia.org", "/wiki/" + query)
+    elif msg.startswith("!tasks"):
+        content = sf.getDmzTasks("https://todo.dmz.rs/")
+        return content
+    elif msg.startswith("!vreme") or msg.startswith("!prognoza") or msg.startswith("!weather"):
+        _, query = msg.split(" ", 1)
+        return sf.get_weather(query)
 

scraper_functions.py

@@ -1,12 +1,57 @@
 import requests
 from bs4 import BeautifulSoup
+from urllib.parse import quote
+
+def getSoup(base_url, query = ""):
+    page = requests.get(base_url + quote(query))
+    soup = BeautifulSoup(page.content, "html.parser")
+    return soup
 
 def query_external_website(base_url, query):
     try:
-        page = requests.get(base_url + query)
+        soup = getSoup(base_url, query)
-        soup = BeautifulSoup(page.content, "html.parser")
+        title = soup.find(id="firstHeading").text
-        title = soup.find("span", class_="mw-page-title-main").text
+        mainContentElement = soup.find(id="mw-content-text")
-        content = soup.find(id="mw-content-text").select("p")[2].text
+        if "This page is a redirect" in mainContentElement.text:
-        return "\nTITLE:\n" + title + "\n\nCONTENT:\n" + content + "\n\nFULL LINK:\n" + base_url + query
+            redirectLink = mainContentElement.find(class_="redirectMsg").find_all("a")[0]["href"]
-    except:
+            return query_external_website(base_url, redirectLink)
-        return "Can't parse search result :("
+        content = next((paragraph for paragraph in mainContentElement.select("p") if not paragraph.has_attr("class")), None)
+        if content == None:
+            raise Exception("Can't parse search result :(")
+        return "\nTITLE:\n" + title + "\n\nCONTENT:\n" + content.text + "\n\nFULL LINK:\n" + base_url + quote(query)
+    except Exception as e:
+        return e
+
+def getDmzTasks(url):
+    try:
+        soup = getSoup(url)
+        tasks = soup.find_all(class_="task")
+        result = "\nActive tasks:\n"
+        for task in tasks:
+            taskIndex = task.select("div")[0].text
+            taskTitle = task.select("div")[1].text
+            result += taskIndex + " " + taskTitle
+            taskSoup = getSoup(url + task.find("a")["href"][1:])
+            description = taskSoup.find("main").select("section")[0].find("p").text
+            result += "\n\tDescription:\n" + "\t\t" + description + "\n"
+            result += "\tAssigned users:\n" + "\t\t"
+            assignedUsers = taskSoup.find_all(class_="user-info-wrap")
+            if len(assignedUsers) == 0:
+                result += "None! Be the first :)\n"
+                result += "\tLink: " + url + task.find("a")["href"][1:] + "\n\n"
+                continue
+            usersList = ""
+            for user in assignedUsers:
+                usersList += user.find("div").text.split(": ")[1] + ", "
+            result += usersList[:-2] + "\n"
+            result += "\tLink: " + url + task.find("a")["href"][1:] + "\n\n"
+        return result
+    except Exception as e:
+        return e
+
+def get_weather(city:str) -> str:
+    url = f"https://wttr.in/{city}?format=3"
+    if not city.isalpha():
+        return "no such city"
+    resp = requests.get(url)
+    return resp.content.decode("utf-8").strip()