From 3845d9f8270b20ac834c3aebfed532ceb7f7be69 Mon Sep 17 00:00:00 2001 From: marxzuckerburg Date: Tue, 29 Sep 2020 19:15:46 +0100 Subject: [PATCH] comrad update! --- comrad/app/screens/login/login.py | 6 +++--- comrad/app/screens/map.py | 4 ++-- comrad/backend/the_telephone.py | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/comrad/app/screens/login/login.py b/comrad/app/screens/login/login.py index 0be0a7d..56e56fc 100644 --- a/comrad/app/screens/login/login.py +++ b/comrad/app/screens/login/login.py @@ -210,9 +210,9 @@ class LoginScreen(BaseScreen): logger.info(f'passkey login succeeded') # get new data - res = await commie.get_updates() - if not res.get('res_login',{}).get('success'): - return {'success':False,'res_refresh':refresh} + # res = await commie.get_updates() + # if not res.get('res_login',{}).get('success'): + # return {'success':False,'res_refresh':refresh} # otherwise, ok self.login_status.text=f'Welcome back, Comrad @{un}' diff --git a/comrad/app/screens/map.py b/comrad/app/screens/map.py index 0aa4e17..7ac71a9 100644 --- a/comrad/app/screens/map.py +++ b/comrad/app/screens/map.py @@ -98,8 +98,8 @@ class MapWidget(MDDialog2): self.label_layout.cols=1 self.label_layout.row_default_height='25sp' self.label_layout.row_force_default='25sp' - self.label_layout.rows=5 - self.label_layout.pos_hint={'y':0} + self.label_layout.rows=10 + self.label_layout.pos_hint={'y':1} self.label_layout.size_hint=(None,None) self.label_layout.width=Window.size[0] self.label_layout.height='300sp' diff --git a/comrad/backend/the_telephone.py b/comrad/backend/the_telephone.py index 835e14e..2b53a39 100644 --- a/comrad/backend/the_telephone.py +++ b/comrad/backend/the_telephone.py @@ -124,13 +124,13 @@ class TheTelephone(Operator): def comrad_request(self,url,allow_clearnet = ALLOW_CLEARNET): if '.onion' in url or not allow_clearnet: return self.tor_request(url) - return requests.get(url,timeout=600) + return requests.get(url,timeout=60) async def comrad_request_async(self,url,allow_clearnet=ALLOW_CLEARNET): import requests_async as requests if '.onion' in url or not allow_clearnet: return await self.tor_request_async(url) - return await requests.get(url,timeout=600) + return await requests.get(url,timeout=60) def tor_request(self,url):