From cf051b5dc72119e5d621dc2ca68166791352b5e2 Mon Sep 17 00:00:00 2001 From: PidgeyL Date: Fri, 4 Dec 2015 14:23:13 +0100 Subject: [PATCH 1/7] add other_user_name to threads + prevent duplicates in self.threads --- fbchat/client.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/fbchat/client.py b/fbchat/client.py index e65d786..181dbbf 100644 --- a/fbchat/client.py +++ b/fbchat/client.py @@ -64,7 +64,6 @@ class Client(object): raise Exception("id or password is wrong") self.threads = [] - self.threads = [] def _console(self, msg): @@ -220,9 +219,21 @@ class Client(object): j = get_json(r.text) + # Get names for people + participants={} + for participant in j['payload']['participants']: + participants[participant["fbid"]] = participant["name"] + + # Prevent duplicates in self.threads + threadIDs=[getattr(x, "thread_id") for x in self.threads] for thread in j['payload']['threads']: - t = Thread(**thread) - self.threads.append(t) + if thread["thread_id"] not in threadIDs: + try: + thread["other_user_name"] = participants[int(thread["other_user_fbid"])] + except: + thread["other_user_name"] = "" + t = Thread(**thread) + self.threads.append(t) return self.threads From bee459ea208b095129046f0833c6b0e5ec248368 Mon Sep 17 00:00:00 2001 From: PidgeyL Date: Fri, 4 Dec 2015 17:12:31 +0100 Subject: [PATCH 2/7] remove BeautifulSoup error --- fbchat/client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fbchat/client.py b/fbchat/client.py index 181dbbf..17b79ee 100644 --- a/fbchat/client.py +++ b/fbchat/client.py @@ -101,7 +101,7 @@ class Client(object): self.rev = int(r.text.split('"revision":',1)[1].split(",",1)[0]) #self.rev = int(random()*100000) - soup = bs(r.text) + soup = bs(r.text, "lxml") self.fb_dtsg = soup.find("input", {'name':'fb_dtsg'})['value'] for i in self.fb_dtsg: From 75d6b89ca4a5cbc23db9cd47ebcd82f6d344fda7 Mon Sep 17 00:00:00 2001 From: PidgeyL Date: Mon, 7 Dec 2015 13:22:20 +0100 Subject: [PATCH 3/7] adding lxml to prevent the error message --- fbchat/client.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fbchat/client.py b/fbchat/client.py index 181dbbf..29d854e 100644 --- a/fbchat/client.py +++ b/fbchat/client.py @@ -81,7 +81,7 @@ class Client(object): if not (self.email and self.password): raise Exception("id and password or config is needed") - soup = bs(self._get("https://m.facebook.com/").text) + soup = bs(self._get("https://m.facebook.com/").text, "lxml") data = dict((elem['name'], elem['value']) for elem in soup.findAll("input") if elem.has_attr('value') and elem.has_attr('name')) data['email'] = self.email data['pass'] = self.password @@ -101,7 +101,7 @@ class Client(object): self.rev = int(r.text.split('"revision":',1)[1].split(",",1)[0]) #self.rev = int(random()*100000) - soup = bs(r.text) + soup = bs(r.text, "lxml") self.fb_dtsg = soup.find("input", {'name':'fb_dtsg'})['value'] for i in self.fb_dtsg: From 981a8d6a721da1d7cd92ad6ec79b31c65dee983f Mon Sep 17 00:00:00 2001 From: PidgeyL Date: Mon, 7 Dec 2015 13:39:01 +0100 Subject: [PATCH 4/7] fix 'potential bug' --- fbchat/client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fbchat/client.py b/fbchat/client.py index 29d854e..335db12 100644 --- a/fbchat/client.py +++ b/fbchat/client.py @@ -214,7 +214,7 @@ class Client(object): } r = self._post("https://www.facebook.com/ajax/mercury/threadlist_info.php", data) - if not r.ok: + if not r.ok or len(r.text) == 0: return None j = get_json(r.text) From 767ea2de75b125324f70e0bead7d64cea3a999ac Mon Sep 17 00:00:00 2001 From: PidgeyL Date: Mon, 7 Dec 2015 15:37:22 +0100 Subject: [PATCH 5/7] put url data in the top to increase readability --- fbchat/client.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/fbchat/client.py b/fbchat/client.py index 335db12..f1fa8da 100644 --- a/fbchat/client.py +++ b/fbchat/client.py @@ -19,6 +19,12 @@ from bs4 import BeautifulSoup as bs from .utils import * from .models import * +# URLs +LoginURL ="https://m.facebook.com/login.php?login_attempt=1" +SearchURL ="https://www.facebook.com/ajax/typeahead/search.php" +SendURL ="https://www.facebook.com/ajax/mercury/send_messages.php" +MessagesURL="https://www.facebook.com/ajax/mercury/threadlist_info.php" + class Client(object): """A client for the Facebook Chat (Messenger). @@ -87,7 +93,7 @@ class Client(object): data['pass'] = self.password data['login'] = 'Log In' - r = self._post("https://m.facebook.com/login.php?login_attempt=1", data) + r = self._post(LoginURL, data) self.r = r if 'home' in r.url: @@ -146,7 +152,7 @@ class Client(object): '__rev' : self.rev, } - r = self._get("https://www.facebook.com/ajax/typeahead/search.php", payload) + r = self._get(SearchURL, payload) self.j = j = get_json(r.text) self.r = r @@ -192,9 +198,10 @@ class Client(object): 'message_batch[0][has_attachment]' : False } - r = self._post("https://www.facebook.com/ajax/mercury/send_messages.php", data) + r = self._post(SendURL, data) return r.ok + def getThreadList(self, start, end=None): if not end: end = start + 20 @@ -213,7 +220,7 @@ class Client(object): 'inbox[limit]' : end, } - r = self._post("https://www.facebook.com/ajax/mercury/threadlist_info.php", data) + r = self._post(MessagesURL, data) if not r.ok or len(r.text) == 0: return None From 425ecaa93c5c98fcc11abe60ac88efc010d51ae7 Mon Sep 17 00:00:00 2001 From: PidgeyL Date: Tue, 8 Dec 2015 18:04:06 +0100 Subject: [PATCH 6/7] consolidate code & use default payload for get/post --- fbchat/client.py | 49 ++++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/fbchat/client.py b/fbchat/client.py index f1fa8da..b741ec7 100644 --- a/fbchat/client.py +++ b/fbchat/client.py @@ -52,6 +52,7 @@ class Client(object): self.debug = debug self._session = requests.session() self.req_counter = 1; + self.payloadDefault={} if not user_agent: user_agent = choice(USER_AGENTS) @@ -70,17 +71,35 @@ class Client(object): raise Exception("id or password is wrong") self.threads = [] - def _console(self, msg): if self.debug: print(msg) + def _setttstamp(self): + for i in self.fb_dtsg: + self.ttstamp += str(ord(i)) + self.ttstamp += '2' + + def _generatePayload(self, query): + if query: + payload=self.payloadDefault.copy() + payload.update(query) + payload['__req'] = str_base(self.req_counter, 36) + else: + payload = None + self.req_counter+=1 + return payload + def _get(self, url, query=None, timeout=30): - self.req_counter += 1 - return self._session.get(url, headers=self._header, params=query, timeout=timeout) + payload=self._generatePayload(query) + return self._session.get(url, headers=self._header, params=payload, timeout=timeout) def _post(self, url, query=None, timeout=30): - self.req_counter += 1 + payload=self._generatePayload(query) + return self._session.post(url, headers=self._header, data=payload, timeout=timeout) + + def _cleanPost(self, url, query=None, timeout=30): + self.req_counter+=1 return self._session.post(url, headers=self._header, data=query, timeout=timeout) def login(self): @@ -93,8 +112,7 @@ class Client(object): data['pass'] = self.password data['login'] = 'Log In' - r = self._post(LoginURL, data) - self.r = r + r = self._cleanPost(LoginURL, data) if 'home' in r.url: self.client_id = hex(int(random()*2147483648))[2:] @@ -104,15 +122,12 @@ class Client(object): self.ttstamp = '' r = self._get('https://www.facebook.com/') - self.rev = int(r.text.split('"revision":',1)[1].split(",",1)[0]) - #self.rev = int(random()*100000) + self.payloadDefault['__rev']= int(r.text.split('"revision":',1)[1].split(",",1)[0]) + self.payloadDefault['__user']= self.uid soup = bs(r.text, "lxml") self.fb_dtsg = soup.find("input", {'name':'fb_dtsg'})['value'] - - for i in self.fb_dtsg: - self.ttstamp += str(ord(i)) - self.ttstamp += '2' + self._setttstamp() self.form = { 'channel' : self.user_channel, @@ -147,14 +162,10 @@ class Client(object): 'path' : "/home.php", 'request_id' : str(uuid1()), '__a' : '1', - '__user' : self.uid, - '__req' : str_base(self.req_counter, 36), - '__rev' : self.rev, } r = self._get(SearchURL, payload) self.j = j = get_json(r.text) - self.r = r users = [] for entry in j['payload']['entries']: @@ -170,9 +181,6 @@ class Client(object): 'fb_dtsg' : self.fb_dtsg, 'ttstamp' : self.ttstamp, '__a' : '1', - '__user' : self.uid, - '__req' : str_base(self.req_counter, 36), - '__rev' : self.rev, 'message_batch[0][action_type]' : 'ma-type:user-generated-message', 'message_batch[0][author]' : 'fbid:' + str(self.uid), 'message_batch[0][specific_to_list][0]' : 'fbid:' + str(thread_id), @@ -213,9 +221,6 @@ class Client(object): 'fb_dtsg' : self.fb_dtsg, 'ttstamp' : self.ttstamp, '__a' : '1', - '__user' : self.uid, - '__req' : str_base(self.req_counter, 36), - '__rev' : self.rev, 'inbox[offset]' : start, 'inbox[limit]' : end, } From 7ce3062c715baa95d48445eaea23b5d40aefd44b Mon Sep 17 00:00:00 2001 From: PidgeyL Date: Tue, 8 Dec 2015 18:05:08 +0100 Subject: [PATCH 7/7] remove unused import --- fbchat/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fbchat/utils.py b/fbchat/utils.py index 868a2bb..10f8c48 100644 --- a/fbchat/utils.py +++ b/fbchat/utils.py @@ -1,7 +1,7 @@ import re import json from time import time -from random import random, choice +from random import random USER_AGENTS = [ "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.90 Safari/537.36", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_3) AppleWebKit/601.1.10 (KHTML, like Gecko) Version/8.0.5 Safari/601.1.10",