Merge branch 'master' of https://github.com/yasirarism/MissKatyPyro

misskaty/helper/tools.py

@@ -5,6 +5,7 @@ import string
 import time
 from http.cookies import SimpleCookie
 from re import match as re_match
+from typing import Union
 from urllib.parse import urlparse
 
 import psutil
@@ -124,7 +125,7 @@ def get_provider(url):
     return pretty(netloc.split("."))
 
 
-async def search_jw(movie_name: str, locale: str):
+async def search_jw(movie_name: str, locale: Union[str, None] = "ID"):
     m_t_ = ""
     try:
         response = (
@@ -137,17 +138,16 @@ async def search_jw(movie_name: str, locale: str):
     if not response.get("results"):
         LOGGER.error("JustWatch API Error or got Rate Limited.")
         return m_t_
-    for item in response.get("results")["items"]:
-        if movie_name == item.get("title", ""):
-            offers = item.get("offers", [])
-            t_m_ = []
-            for offer in offers:
-                url = offer.get("urls").get("standard_web")
-                if url not in t_m_:
-                    p_o = get_provider(url)
-                    m_t_ += f"<a href='{url}'>{p_o}</a> | "
-                t_m_.append(url)
-            if m_t_ != "":
-                m_t_ = m_t_[:-2].strip()
-            break
+    for item in response["results"]["data"]["popularTitles"]["edges"]:
+        if item["node"]["content"]["title"] == movie_name:
+           t_m_ = []
+           for offer in item["node"].get("offers", []):
+             url = offer["standardWebURL"]
+             if url not in t_m_:
+                 p_o = get_provider(url)
+                 m_t_ += f"<a href='{url}'>{p_o}</a> | "
+             t_m_.append(url)
+        if m_t_ != "":
+            m_t_ = m_t_[:-2].strip()
+        break
     return m_t_

misskaty/plugins/locks.py

@@ -165,7 +165,7 @@ async def locks_func(_, message):
         await tg_lock(message, permissions, data[parameter], state == "lock")
     elif parameter == "all" and state == "lock":
         try:
-            await app.set_chat_permissions(chat_id, ChatPermissions(all_perms=True))
+            await app.set_chat_permissions(chat_id, ChatPermissions(all_perms=False))
             await message.reply_text(f"Locked Everything in {message.chat.title}")
         except ChatAdminRequired:
             await message.reply_msg(