Git-Mirrors/brozzler
1
0
Fork 0
mirror of https://github.com/internetarchive/brozzler.git synced 2025-04-21 08:06:27 -04:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'ARI-5689' into qa

Browse Source
This commit is contained in:
Barbara Miller 2018-06-27 16:47:46 -07:00
commit 1fffaa9eee
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
brozzler/browser.py
View File

@ -452,7 +452,7 @@ class Browser:
extra_headers=extra_headers,
user_agent=user_agent)
self.navigate_to_page(page_url, timeout=page_timeout)
if password:
if password and not 'facebook.com/groups' in page_url:
self.try_login(username, password, timeout=page_timeout)
# if login redirected us, return to page_url
if page_url != self.url().split('#')[0]:

12
brozzler/js-templates/facebook.js
View File

@ -46,6 +46,18 @@ var umbraState = {'idleSince':null,'expectingSomething':null,'bottomReachedScrol
var umbraIntervalFunc = function() {
// for facebook groups, switch to Discussion tab url
fbURL = window.location.href;
if (fbURL.indexOf("/groups/") !== -1 && fbURL.indexOf("?ref=direct") === -1) {
navlinks = document.querySelectorAll('a._2yau');
navlinks[1].click(); // click current Discussion link
return;
//groupDiscussionURL = fbURL.match("https://www.facebook.com/groups/[^/]+")[0] + "/?ref=direct";
//if (groupDiscussionURL) {
// window.location.href = groupDiscussionURL;
// return;
//}
}
var thingsToScroll = document.querySelectorAll(UMBRA_THINGS_TO_SCROLL_SELECTOR);
var everythingScrolled = true;