Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
jef authored Jan 5, 2021
2 parents 46343b0 + 8d0a32c commit 3339e0d
Show file tree
Hide file tree
Showing 17 changed files with 1,917 additions and 232 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: google-github-actions/release-please-action@v2.12.3
- uses: google-github-actions/release-please-action@v2.13
id: release
with:
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
3 changes: 2 additions & 1 deletion docs/reference/filter.md
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ Used with the `STORES` variable.
| Umart | AU | `umart`|
| Unieuro | IT | `unieuro`|
| Very | UK | `very`|
| Vuugo | CA | `vuugo` |
| Walmart | US | `walmart`|
| Walmart | CA | `walmart-ca`|
| Wipoid | ES | `wipoid`|
Expand Down Expand Up @@ -170,7 +171,7 @@ Used with the `SHOW_ONLY_BRANDS` and `SHOW_ONLY_MODELS` variables.
| `asus` | `crosshair viii`, `dual`, `dual oc`, `strix`, `strix oc`, `tuf`, `tuf oc` |
| `corsair` | `750 platinum`, `600 platinum` |
| `colorful` | `igame advanced oc`, `igame vulcan oc` |
| `evga` | `ftw3`, `ftw3 ultra`, `ftw3 ultra hydro copper`, `xc3`, `xc3 black`, `xc3 ultra` |
| `evga` | `ftw3`, `ftw3 ultra`, `ftw3 ultra hydro copper`, `xc3`, `xc gaming`, `xc3 black`, `xc3 ultra` |
| `gainward` | `phantom gs`, `phoenix`, `phoenix gs`, `phoenix gs oc` |
| `gigabyte` | `aorus master`, `aorus xtreme`, `aorus xtreme waterforce`, `aorus xtreme waterforce wb`, `eagle`, `eagle oc`, `gaming`, `gaming oc`, `turbo`, `vision`, `vision oc` |
| `galax` | `sg`, `sg oc` |
Expand Down
131 changes: 80 additions & 51 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,16 @@
"redis": "^3.0.2",
"top-user-agents": "^1.0.19",
"twilio": "^3.54.1",
"twitch": "^4.3.6",
"twitch-auth": "^4.3.6",
"twitch-chat-client": "^4.3.6",
"twitch": "^4.3.8",
"twitch-auth": "^4.3.8",
"twitch-chat-client": "^4.3.8",
"twitter": "^1.7.1",
"winston": "^3.3.3"
},
"devDependencies": {
"@types/async": "^3.2.5",
"@types/cheerio": "^0.22.23",
"@types/node": "^14.14.16",
"@types/node": "^14.14.20",
"@types/node-fetch": "^2.5.7",
"@types/node-notifier": "^8.0.0",
"@types/nodemailer": "^6.4.0",
Expand All @@ -70,7 +70,7 @@
"nodemon": "^2.0.6",
"ts-node": "^9.1.1",
"typescript": "^4.1.3",
"webpack": "^5.11.0",
"webpack": "^5.11.1",
"xo": "^0.36.1"
},
"xo": {
Expand Down
6 changes: 4 additions & 2 deletions src/notification/pushover.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,16 @@ export function sendPushoverNotification(link: Link, store: Store) {
? {
message: link.cartUrl ? link.cartUrl : link.url,
priority: pushover.priority,
title: Print.inStock(link, store)
title: Print.inStock(link, store),
...(link.screenshot && {file: `./${link.screenshot}`})
}
: {
expire: pushover.expire,
message: link.cartUrl ? link.cartUrl : link.url,
priority: pushover.priority,
retry: pushover.retry,
title: Print.inStock(link, store)
title: Print.inStock(link, store),
...(link.screenshot && {file: `./${link.screenshot}`})
};

push.send(message, (error: Error) => {
Expand Down
Loading

0 comments on commit 3339e0d

Please sign in to comment.