mcvsoftware/twblue
1
0
Fork 0
mirror of https://github.com/MCV-Software/TWBlue.git synced 2024-11-26 12:53:12 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Create valid account buffers even when session cannot login to the network (works for ignored sessions)

Browse Source
This commit is contained in:
Manuel Cortez 2022-11-16 11:01:52 -06:00
parent 7c80c9d842
commit fefd88b71c
No known key found for this signature in database
GPG Key ID: 9E0735CA15EFE790
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/controller/mainController.py
View File

@ -275,12 +275,7 @@ class Controller(object):
self.streams_checker_function.start() self.streams_checker_function.start()
def create_ignored_session_buffer(self, session): def create_ignored_session_buffer(self, session):
self.accounts.append(session.settings["twitter"]["user_name"]) pub.sendMessage("core.create_account", name=session.get_name(), session_id=session.session_id)
account = buffers.base.AccountBuffer(self.view.nb, session.settings["twitter"]["user_name"], session.settings["twitter"]["user_name"], session.session_id)
account.logged = False
account.setup_account()
self.buffers.append(account)
self.view.add_buffer(account.buffer , name=session.settings["twitter"]["user_name"])
def login_account(self, session_id): def login_account(self, session_id):
for i in sessions.sessions: for i in sessions.sessions:
@ -291,9 +286,11 @@ class Controller(object):
handler.create_buffers(session=session, controller=self, createAccounts=False) handler.create_buffers(session=session, controller=self, createAccounts=False)
self.start_buffers(session) self.start_buffers(session)
def create_account_buffer(self, name, session_id): def create_account_buffer(self, name, session_id, logged=False):
self.accounts.append(name) self.accounts.append(name)
account = buffers.base.AccountBuffer(self.view.nb, name, name, session_id) account = buffers.base.AccountBuffer(self.view.nb, name, name, session_id)
if logged == False:
account.logged = logged
account.setup_account() account.setup_account()
self.buffers.append(account) self.buffers.append(account)
self.view.add_buffer(account.buffer , name=name) self.view.add_buffer(account.buffer , name=name)

2
src/controller/mastodon/handler.py
View File

@ -15,7 +15,7 @@ class Handler(object):
session.get_user_info() session.get_user_info()
name = session.get_name() name = session.get_name()
if createAccounts == True: if createAccounts == True:
pub.sendMessage("core.create_account", name=name, session_id=session.session_id) pub.sendMessage("core.create_account", name=name, session_id=session.session_id, logged=True)
root_position =controller.view.search(name, name) root_position =controller.view.search(name, name)
for i in session.settings['general']['buffer_order']: for i in session.settings['general']['buffer_order']:
if i == 'home': if i == 'home':

2
src/controller/twitter/handler.py
View File

@ -21,7 +21,7 @@ class Handler(object):
session.get_user_info() session.get_user_info()
name = session.get_name() name = session.get_name()
if createAccounts == True: if createAccounts == True:
pub.sendMessage("core.create_account", name=name, session_id=session.session_id) pub.sendMessage("core.create_account", name=name, session_id=session.session_id, logged=True)
root_position =controller.view.search(name, name) root_position =controller.view.search(name, name)
for i in session.settings['general']['buffer_order']: for i in session.settings['general']['buffer_order']:
if i == 'home': if i == 'home':

2
src/sessions/mastodon/session.py
View File

@ -175,5 +175,5 @@ class Session(base.baseSession):
def get_name(self): def get_name(self):
instance = self.settings["mastodon"]["instance"] instance = self.settings["mastodon"]["instance"]
instance = instance.replace("https://", "") instance = instance.replace("https://", "")
user = self.db["user_name"] user = self.settings["mastodon"]["user_name"]
return "Mastodon: {}@{}".format(user, instance) return "Mastodon: {}@{}".format(user, instance)

3
src/sessions/twitter/session.py
View File

@ -674,4 +674,7 @@ class Session(base.baseSession):
pub.sendMessage("sent-dm", data=item, session_name=self.get_name()) pub.sendMessage("sent-dm", data=item, session_name=self.get_name())
def get_name(self): def get_name(self):
if self.logged:
return "Twitter: {}".format(self.db["user_name"]) return "Twitter: {}".format(self.db["user_name"])
else:
return "Twitter: {}".format(self.settings["twitter"]["user_name"])