karaolidis/fbchat
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make Client.session attribute public

Browse Source
This commit is contained in:
Mads Marquart
2020-01-09 10:54:07 +01:00
parent a5abb05ab3
commit f968e583e8
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/echobot.py
View File

@@ -9,7 +9,7 @@ class EchoBot(fbchat.Client):
print("{} from {} in {}".format(message_object, thread_id, thread_type.name)) print("{} from {} in {}".format(message_object, thread_id, thread_type.name))
# If you're not the author, echo # If you're not the author, echo
if author_id != session.user_id: if author_id != self.session.user_id:
self.send(message_object, thread_id=thread_id, thread_type=thread_type) self.send(message_object, thread_id=thread_id, thread_type=thread_type)

6
examples/keepbot.py
View File

@@ -31,7 +31,7 @@ class KeepBot(fbchat.Client):
self.change_thread_emoji(old_emoji, thread_id=thread_id) self.change_thread_emoji(old_emoji, thread_id=thread_id)
def on_people_added(self, added_ids, author_id, thread_id, **kwargs): def on_people_added(self, added_ids, author_id, thread_id, **kwargs):
if old_thread_id == thread_id and author_id != session.user_id: if old_thread_id == thread_id and author_id != self.session.user_id:
print("{} got added. They will be removed".format(added_ids)) print("{} got added. They will be removed".format(added_ids))
for added_id in added_ids: for added_id in added_ids:
self.remove_user_from_group(added_id, thread_id=thread_id) self.remove_user_from_group(added_id, thread_id=thread_id)
@@ -40,8 +40,8 @@ class KeepBot(fbchat.Client):
# No point in trying to add ourself # No point in trying to add ourself
if ( if (
old_thread_id == thread_id old_thread_id == thread_id
and removed_id != session.user_id and removed_id != self.session.user_id
and author_id != session.user_id and author_id != self.session.user_id
): ):
print("{} got removed. They will be re-added".format(removed_id)) print("{} got removed. They will be re-added".format(removed_id))
self.add_users_to_group(removed_id, thread_id=thread_id) self.add_users_to_group(removed_id, thread_id=thread_id)

14
fbchat/_client.py
View File

@@ -44,15 +44,10 @@ class Client:
""" """
def __init__(self, session): def __init__(self, session):
"""Initialize and log in the client. """Initialize the client model.
Args: Args:
email: Facebook ``email``, ``id`` or ``phone number`` session: The session to use when making requests.
password: Facebook account password
session_cookies (dict): Cookies from a previous session (Will default to login if these are invalid)
Raises:
FBchatException: On failed login
""" """
self._sticky, self._pool = (None, None) self._sticky, self._pool = (None, None)
self._seq = "0" self._seq = "0"
@@ -61,6 +56,11 @@ class Client:
self._buddylist = dict() self._buddylist = dict()
self._session = session self._session = session
@property
def session(self):
"""The session that's used when making requests."""
return self._session
""" """
INTERNAL REQUEST METHODS INTERNAL REQUEST METHODS
""" """