diff --git a/brozzler/browser.py b/brozzler/browser.py index fa633a4..41fe129 100644 --- a/brozzler/browser.py +++ b/brozzler/browser.py @@ -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]: diff --git a/brozzler/js-templates/facebook.js b/brozzler/js-templates/facebook.js index c5c1770..25a5ef9 100644 --- a/brozzler/js-templates/facebook.js +++ b/brozzler/js-templates/facebook.js @@ -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;