mcvsoftware/twblue
1
0
Fork 0
mirror of https://github.com/MCV-Software/TWBlue.git synced 2024-10-16 17:39:15 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed more conflicts

Browse Source
This commit is contained in:
Manuel Cortez 2022-11-08 08:48:35 -06:00
parent c8c242a27f
commit 6f69426f03
No known key found for this signature in database
GPG Key ID: 9E0735CA15EFE790
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/controller/buffers/twitter/base.py
View File

@ -471,18 +471,11 @@ class BaseBuffer(base.Buffer):
def onFocus(self, *args, **kwargs): def onFocus(self, *args, **kwargs):
tweet = self.get_tweet() tweet = self.get_tweet()
<<<<<<< HEAD
if self.session.settings["general"]["relative_times"] == True: if self.session.settings["general"]["relative_times"] == True:
# fix this: # fix this:
original_date = arrow.get(self.session.db[self.name][self.buffer.list.get_selected()].created_at, locale="en") original_date = arrow.get(self.session.db[self.name][self.buffer.list.get_selected()].created_at, locale="en")
ts = original_date.humanize(locale=languageHandler.getLanguage()) ts = original_date.humanize(locale=languageHandler.getLanguage())
self.buffer.list.list.SetItem(self.buffer.list.get_selected(), 2, ts) self.buffer.list.list.SetItem(self.buffer.list.get_selected(), 2, ts)
=======
# fix this:
original_date = arrow.get(self.session.db[self.name][self.buffer.list.get_selected()].created_at, locale="en")
ts = original_date.humanize(locale=languageHandler.getLanguage())
self.buffer.list.list.SetItem(self.buffer.list.get_selected(), 2, ts)
>>>>>>> next-gen
if self.session.settings['sound']['indicate_audio'] and utils.is_audio(tweet): if self.session.settings['sound']['indicate_audio'] and utils.is_audio(tweet):
self.session.sound.play("audio.ogg") self.session.sound.play("audio.ogg")
if self.session.settings['sound']['indicate_geo'] and utils.is_geocoded(tweet): if self.session.settings['sound']['indicate_geo'] and utils.is_geocoded(tweet):

3
src/controller/buffers/twitter/trends.py
View File

@ -1,9 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import time import time
import wx import wx
from wxUI import buffers, commonMessageDialogs, menus
from controller import user, messages
from controller import messages
import widgetUtils import widgetUtils
import output import output
import logging import logging

9
src/controller/mainController.py
View File

@ -286,8 +286,9 @@ class Controller(object):
for i in sessions.sessions: for i in sessions.sessions:
if sessions.sessions[i].session_id == session_id: session = sessions.sessions[i] if sessions.sessions[i].session_id == session_id: session = sessions.sessions[i]
session.login() session.login()
session.db = dict() handler = self.get_handler(type=session.type)
self.create_buffers(session, False) if handler != None and hasattr(handler, "create_buffers"):
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):
@ -1036,7 +1037,9 @@ class Controller(object):
sm.fill_list() sm.fill_list()
sm.show() sm.show()
for i in sm.new_sessions: for i in sm.new_sessions:
self.create_buffers(sessions.sessions[i]) handler = self.get_handler(type=sessions.sessions[i].type)
if handler != None and hasattr(handler, "create-buffers"):
handler.create_buffers(controller=self, session=sessions.sessions[i])
call_threaded(self.start_buffers, sessions.sessions[i]) call_threaded(self.start_buffers, sessions.sessions[i])
for i in sm.removed_sessions: for i in sm.removed_sessions:
if sessions.sessions[i].logged == True: if sessions.sessions[i].logged == True: