mcvsoftware/twblue
1
0
Fork 0
mirror of https://github.com/MCV-Software/TWBlue.git synced 2025-08-04 21:16:07 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change session name as identifiable key for every session in TWblue

Browse Source
This commit is contained in:
Manuel Cortez
2022-11-14 17:51:27 -06:00
parent 120da217f5
commit 862dbd0b8a
6 changed files with 98 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sessions/base.py
View File

@@ -60,6 +60,10 @@ class baseSession(object):
self.init_sound()
self.load_persistent_data()
def get_name(self):
pass
def init_sound(self):
try: self.sound = sound.soundSystem(self.settings["sound"])
except: pass

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

@@ -164,3 +164,9 @@ class Session(base.baseSession):
item = self.api_call(call_name="status_post", status=text, _sound="tweet_send.ogg", in_reply_to_id=in_reply_to_id, media_ids=media_ids, visibility=visibility, poll=poll, sensitive=obj["sensitive"], spoiler_text=obj["spoiler_text"])
if item != None:
in_reply_to_id = item["id"]
def get_name(self):
instance = self.settings["mastodon"]["instance"]
instance = instance.replace("https://", "")
user = self.db["user_name"]
return "{}@{} (mastodon)".format(user, instance)

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

@@ -555,7 +555,7 @@ class Session(base.baseSession):
def start_streaming(self):
if config.app["app-settings"]["no_streaming"]:
return
self.stream = streaming.Stream(twitter_api=self.twitter, user=self.db["user_name"], user_id=self.db["user_id"], muted_users=self.db["muted_users"], consumer_key=appkeys.twitter_api_key, consumer_secret=appkeys.twitter_api_secret, access_token=self.settings["twitter"]["user_key"], access_token_secret=self.settings["twitter"]["user_secret"], chunk_size=1025)
self.stream = streaming.Stream(twitter_api=self.twitter, user=self.get_name(), user_id=self.db["user_id"], muted_users=self.db["muted_users"], consumer_key=appkeys.twitter_api_key, consumer_secret=appkeys.twitter_api_secret, access_token=self.settings["twitter"]["user_key"], access_token_secret=self.settings["twitter"]["user_secret"], chunk_size=1025)
self.stream_thread = call_threaded(self.stream.filter, follow=self.stream.users, stall_warnings=True)
def stop_streaming(self):
@@ -570,7 +570,7 @@ class Session(base.baseSession):
if self.logged == False:
return
# Discard processing the status if the streaming sends a tweet for another account.
if self.db["user_name"] != user:
if self.get_name() != user:
return
# the Streaming API sends non-extended tweets with an optional parameter "extended_tweets" which contains full_text and other data.
# so we have to make sure we check it before processing the normal status.
@@ -607,7 +607,7 @@ class Session(base.baseSession):
status = self.check_quoted_status(status)
status = self.check_long_tweet(status)
# Send it to the main controller object.
pub.sendMessage("newTweet", data=status, user=self.db["user_name"], _buffers=buffers_to_send)
pub.sendMessage("newTweet", data=status, user=self.get_name(), _buffers=buffers_to_send)
def check_streams(self):
if config.app["app-settings"]["no_streaming"]:
@@ -621,7 +621,7 @@ class Session(base.baseSession):
def handle_connected(self, user):
if self.logged == False:
return
if user != self.db["user_name"]:
if user != self.get_name():
log.debug("Connected streaming endpoint on account {}".format(user))
def send_tweet(self, *tweets):
@@ -674,3 +674,6 @@ class Session(base.baseSession):
sent_dms.insert(0, item)
self.db["sent_direct_messages"] = sent_dms
pub.sendMessage("sent-dm", data=item, user=self.db["user_name"])
def get_name(self):
return "{} ({})".format(self.db["user_name"], "Twitter")