1.2.0 #208

cal4 · 2024-09-14T04:24:09Z

No description provided.

added self.activities.dashboardPopUpModalCloseCross()

Added: def click_element_if_visible(self, element): try: if element.is_displayed() and element.is_enabled(): element.click() logging.info("Dashboard pop-up registered and closed, needs to be done once on new accounts") else: pass except (ElementNotInteractableException, NoSuchElementException): pass def dashboardPopUpModalCloseCross(self): try: element = self.webdriver.find_element(By.CSS_SELECTOR, ".dashboardPopUpPopUpSelectButton") self.click_element_if_visible(element) time.sleep(0.25) except NoSuchElementException: return -goodluck

Lock/Bann checked after Login.

Lock/Bann checked after Login. ![WindowsTerminal_DuWk5GlKDp](https://github.com/user-attachments/assets/833da479-b27e-4528-82c7-d886cd3ac26b) ![WindowsTerminal_KrtE7GRBGd](https://github.com/user-attachments/assets/856130b5-c984-4420-8bdd-1b11a33bd934) i smoked a good J

some cross on its way to pop gets accepted and never comes back (very sad story) idk if its added already or not, i was told to create something if its to late - delete it. -goodluck

Added configuration to set the logger level in config Also configs for toggling incomplete promotions and exceptions from apprise notifications Added chrome option --disable-http2 as suggested in (#185)

I've added #195 and #194, in the process i realized having both config-private.yaml and config.yaml was unnecessary, so now config.yaml is automatically ignored and only config.yaml.sample should be committed, the user should manually rename the file after configuring it as instructed in the updated README I was getting the same problem as #185 so i tried using the --disable-http2 flag and it seems to have fixed the issue i've also kinda fixed the ipapi ratelimited, it will still happen but now it instead of always using US as the default it will use the user configured country code, this does not block searches anymore for that day, the language is useless since its just the browser language, default will still be 'en'

Couple more again, tried to get another called "Find somewhere new to explore" but I couldn't get it to trigger.

(cherry picked from commit 33ee0e6)

(cherry picked from commit 1e4977b)

(cherry picked from commit 8bb5381)

(cherry picked from commit a0a9651)

…cache-dir instead of pip

Few more promos, also tried to get the one below but couldn't figure out what it wanted. ![image](https://github.com/user-attachments/assets/17ab4e71-7bf9-4087-abd5-4b7969669b74)

@charlesbel

Moved the (still WIP) Docker Implementation PR from @charlesbel's repo. Old discussion can be found [here](charlesbel#431). Currently it supports two environmental variables: - `RUN_ONCE`: if set to `true`, runs the script once and then quits - `CRON_SCHEDULE`: you can supply a valid cron schedule, or by default it will just run daily at 4 AM. Builds can be auto-triggered (GitHub Actions) by setting a tag to the commits. TODO: - [ ] Pass command line options to the script - [ ] ??? (Suggestions are very much welcomed!)

edited some wording on apprise notification

adgwfs · 2024-11-05T15:37:15Z

I also get AttributeError: alpha_2 on Debian 12 and not in a docker

Yeah this'll need to be fixed. Shouldn't be too tough but haven't bothered with it and hoping/inviting someone facing the issue to fork this and put up a fix.

In my case, currentLocale returns ('Chinese (Traditional)_Taiwan', '950')
it will raise AttributeError: alpha_2 since both Chinese (Traditional) and Taiwan is not in the list ISO 639-3 / ISO_3166-1

so i have to set like currentLocale = ["Chinese_Taiwan, Province of China"] or something
and it will be ok... at least on AttributeError: alpha_2 problem

but i got another error

Traceback (most recent call last):
  File "C:\Users\user\Downloads\MS-Rewards-Farmer-develop\MS-Rewards-Farmer-develop\main.py", line 39, in main
    earned_points = executeBot(currentAccount, args)
                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "C:\Users\user\Downloads\MS-Rewards-Farmer-develop\MS-Rewards-Farmer-develop\main.py", line 246, in executeBot
    searches.bingSearches()
  File "C:\Users\user\Downloads\MS-Rewards-Farmer-develop\MS-Rewards-Farmer-develop\src\searches.py", line 110, in bingSearches
    desktopAndMobileRemaining = self.browser.getRemainingSearches(
                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "C:\Users\user\Downloads\MS-Rewards-Farmer-develop\MS-Rewards-Farmer-develop\src\browser.py", line 283, in getRemainingSearches
    pcSearch: dict = counters["PCSearch"][0]
                     ~~~~~~~~^^^^^^^^^^^^
KeyError: 'PCSearch'

and the following is my counters:

{
    "ActivityAndQuiz": [
        {
            "name": None,
            "priority": 0,
            "isRewardable": False,
            "activityType": None,
            "hash": None,
            "attributes": None,
            "offerId": "",
            "complete": False,
            "activityProgress": 0,
            "activityProgressMax": 0,
            "pointProgressMax": 0,
            "pointProgress": 0,
            "promotionType": "",
            "promotionSubtype": "",
            "title": "",
            "description": "",
            "showcaseTitle": "",
            "showcaseDescription": "",
            "imageUrl": "",
            "smallImageUrl": "",
            "backgroundImageUrl": "",
            "showcaseBackgroundImageUrl": "",
            "showcaseBackgroundLargeImageUrl": "",
            "iconUrl": "",
            "animatedIconUrl": "",
            "animatedLargeBackgroundImageUrl": "",
            "destinationUrl": "",
            "linkText": "",
            "isRecurring": False,
            "isHidden": False,
            "level": "",
            "slidesCount": 0,
            "legalText": "",
            "legalLinkText": "",
            "machineTranslation": "",
            "showUnsupportedLangNote": "",
            "target": "",
            "rewardable": False,
            "exclusiveLockedFeatureType": "notsupported",
            "exclusiveLockedFeatureStatus": "notsupported",
            "shouldScrollToTarget": False,
            "inProgress": ""
        }
    ],
    "DailyPoint": [
        {
            "name": None,
            "priority": 0,
            "isRewardable": False,
            "activityType": None,
            "hash": None,
            "attributes": None,
            "offerId": "",
            "complete": False,
            "activityProgress": 0,
            "activityProgressMax": 0,
            "pointProgressMax": 0,
            "pointProgress": 0,
            "promotionType": "",
            "promotionSubtype": "",
            "title": "",
            "description": "",
            "showcaseTitle": "",
            "showcaseDescription": "",
            "imageUrl": "",
            "smallImageUrl": "",
            "backgroundImageUrl": "",
            "showcaseBackgroundImageUrl": "",
            "showcaseBackgroundLargeImageUrl": "",
            "iconUrl": "",
            "animatedIconUrl": "",
            "animatedLargeBackgroundImageUrl": "",
            "destinationUrl": "",
            "linkText": "",
            "isRecurring": False,
            "isHidden": False,
            "level": "",
            "slidesCount": 0,
            "legalText": "",
            "legalLinkText": "",
            "machineTranslation": "",
            "showUnsupportedLangNote": "",
            "target": "",
            "rewardable": False,
            "exclusiveLockedFeatureType": "notsupported",
            "exclusiveLockedFeatureStatus": "notsupported",
            "shouldScrollToTarget": False,
            "inProgress": ""
        }
    ]
}

cal4 · 2024-11-06T14:12:47Z

Yeah the locale problem isn't a difficult fix (but is why this PR is a draft and not being merged to master, yet). I'm just not affected by it and don't care enough to fix it, tbh. I invite someone that is affected to fork and fix.

The KeyError: 'PCSearch' is an existing issue that has been exposed by the increased amount of calls to getRemainingSearches (which solves other problems). I've seen it crop up intermittently but don't have a good idea why it occurs occasionally.

jdeath · 2024-11-07T01:07:21Z

It does crop up, but usually goes away. I have worked around it by changing to below code. Could check if PCSearch key is there, and if not, switch to this logic,

        userStatus = self.utils.getDashboardData()["userStatus"]
        searchPoints = 1
        counters = userStatus["counters"]
        pcSearch: dict = counters["pcSearch"][0]
        mobileSearch: dict = counters["mobileSearch"][0]
        pointProgressMax: int = pcSearch["pointProgressMax"]

Send an Apprise notification when receiving a code to validate with Microsoft Authentificator. This allows users to run the bot in the background, even if they aren't connected/their session expires. Also convenient if you're not paying attention to the terminal and have phone notifications muted. Example: ![image](https://github.com/user-attachments/assets/8b3bb2b0-74fe-4f97-b5c1-17766fe3dc0b)

Change userAgentGenerator.py to use lowercase keys in getEdgeVersions Fixes #232

@staticmethod

#237) 1. keyError in getEdgeVersions Looks like users "randomly" get response json with capitalized or uncapitalized key. Thus, add temp function to ignore the capitalization. 3. Key Error in `getLanguageCountry()` country in config.yaml is using key 'geolocation', while it's fetched by the wrong key 'location' ```yaml default: geolocation: US # Replace with your country code https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2 ``` ```python @staticmethod def getLanguageCountry(language: str, country: str) -> tuple[str, str]: if not country: country = CONFIG.get("default").get("location") ```

Allows to enhance CLI & scripting experience with this project. For example, can be used for re-launch the program automatically if it failed.

OmegaBlurz and others added 30 commits September 3, 2024 09:36

Update morePromotions.py

05611c7

Update dailySet.py

4400d48

added self.activities.dashboardPopUpModalCloseCross()

Update login.py

cd30d85

Lock/Bann checked after Login.

Pork shoulders (#200)

39bdfea

some cross on its way to pop gets accepted and never comes back (very sad story) idk if its added already or not, i was told to create something if its to late - delete it. -goodluck

Refactor getRemainingSearches

568a721

Add fixme

cb3c668

Put logging back

4560eae

.gitignore

2986396

removed config.yaml

f8f29b3

Merged config-private into config.yaml

102d90b

Added configuration to set the logger level in config Also configs for toggling incomplete promotions and exceptions from apprise notifications Added chrome option --disable-http2 as suggested in (#185)

Restored configurarion files

dcdfdce

Update morePromotions.py

cc7d4c2

Couple more again, tried to get another called "Find somewhere new to explore" but I couldn't get it to trigger.

First Docker implementation

4d8ed73

(cherry picked from commit 33ee0e6)

Removed duplicate options from cherry-pick

ab079fc

Added first GitHub Action to push on Docker Hub

245adb1

(cherry picked from commit 1e4977b)

Added Docker image versioning based on GitHub tags

b2160cd

(cherry picked from commit 8bb5381)

Added 15s timeout to support 2FA

97a4616

(cherry picked from commit a0a9651)

chore: Update Dockerfile to use apt-get instead of apt, and pip --no-…

7893e12

…cache-dir instead of pip

Delete the apt-get lists after installing packages

653392f

Removed unused 2FA import

b08ae39

Fixed Docker semantic versioning

c8082ef

Add more promos (#205)

57560e8

Few more promos, also tried to get the one below but couldn't figure out what it wanted. ![image](https://github.com/user-attachments/assets/17ab4e71-7bf9-4087-abd5-4b7969669b74)

Change action to match username specified in secret

ab4a8a7

Update morePromotions.py

fa5194f

edited some wording on apprise notification

Add config singletons, combine default configs

ed8c7d6

Make search simpler and remove failing terms completely

f726e57

cal4 added 3 commits November 5, 2024 14:04

Remove deprecated classes

c936439

Up timeToWait and use default

6bed6fc

Fix import order

50dc6dc

cal4 mentioned this pull request Nov 6, 2024

Timeout Exception after a few searches as in #185 #221

Open

2 tasks

cal4 and others added 17 commits November 7, 2024 13:13

Increase base_delay_in_seconds

8f6ec04

Sleep 5-10 minutes after success

d9d6e7d

Get points from dashboard since more reliable

68602ed

Remove scrolls

ef098d9

Remove comment

245d3b1

Log incomplete activities

ef42d25

Check for level before getting remaining mobile searches

81afb32

Fix Discover open job roles

6511198

Add new activities

2e2540c

Add apprise notification on login with phone code

815001a

Add login notifications configuration in config.yaml

b6ee600

Update userAgentGenerator.py

0785ba2

Update userAgentGenerator.py

68e4c7f

Update userAgentGenerator.py

a1352d8

Fix Edge API (#233)

9a21404

Change userAgentGenerator.py to use lowercase keys in getEdgeVersions Fixes #232

fix: resolve KeyError in getEdgeVersions and bug in getLanguageCountry

7974152

cal4 mentioned this pull request Dec 9, 2024

fix: resolve KeyError in getEdgeVersions and bug in getLanguageCountry #237

Merged

cal4 and others added 5 commits December 8, 2024 21:09

Handle when daily_set_date exists but is empty

6d23c75

Add ability to more generically ignore activities

2bf51d3

Exit 1 on exception

c6d5889

Exit 1 on error (#244)

8604039

Allows to enhance CLI & scripting experience with this project. For example, can be used for re-launch the program automatically if it failed.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

1.2.0 #208

1.2.0 #208

cal4 commented Sep 14, 2024

adgwfs commented Nov 5, 2024

cal4 commented Nov 6, 2024 •

edited

Loading

jdeath commented Nov 7, 2024

1.2.0 #208

Are you sure you want to change the base?

1.2.0 #208

Conversation

cal4 commented Sep 14, 2024

adgwfs commented Nov 5, 2024

cal4 commented Nov 6, 2024 • edited Loading

jdeath commented Nov 7, 2024

cal4 commented Nov 6, 2024 •

edited

Loading