Merge branch 'main' into main

.github/ISSUE_TEMPLATE/bug-report.yaml

@@ -0,0 +1,54 @@
+name: 🐛 Bug Report
+description: File a bug report
+title: "[Bug]: "
+labels:
+  - 'type: bug'
+body:
+  - type: markdown
+    attributes:
+      value: Thanks for taking the time to fill out this bug report!
+  - type: textarea
+    attributes:
+      label: Expected Behavior
+      description: What did you expect to happen?
+      placeholder: Tell us what you see!
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Current Behavior
+      description: What happened?
+      placeholder: Tell us what you see!
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: What operating system are you seeing the problem on?
+      multiple: true
+      options:
+        - Linux
+        - Windows
+        - macOS
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Relevant log output
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      render: shell
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Configuration
+      description: Please copy and paste your `dotenv`. This will be automatically formatted into code, so no need for backticks.
+      render: shell
+    validations:
+      required: true
+  - type: checkboxes
+    attributes:
+      label: Code of Conduct
+      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/jef/streetmerchant/blob/main/CODE_OF_CONDUCT.md)
+      options:
+        - label: I agree to follow this project's Code of Conduct
+          required: true

.github/ISSUE_TEMPLATE/feature-request.yaml

@@ -0,0 +1,41 @@
+name: 🚀 Feature Request
+description: Formalize a feature request from GitHub Discussions
+title: "[Feature]: "
+labels:
+  - 'type: feature'
+body:
+  - type: textarea
+    attributes:
+      label: Proposed solution
+      description: What is solution to this feature request?
+      placeholder: Solution description.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Objective
+      description: Link to discussion.
+      placeholder: https://github.com/jef/streetmerchant/discussions
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Goals
+      description: What is the purpose of feature request?
+      placeholder: Add all relevant goals.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Non-goals
+      description: What else could be accomplished with this feature request, but is currently out of scope?
+      placeholder: Add all relevant non-goals.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Anti-goals
+      description: What could go wrong (side effects) if we implement this feature request?
+      placeholder: Add all relevant anti-goals.
+    validations:
+      required: true

.github/workflows/ci.yaml

@@ -16,7 +16,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v2
         with:
-          node-version: 16.2.0
+          node-version: 16.6.1
       - name: Setup build cache
         uses: actions/cache@v2
         with:

.github/workflows/nightly-release.yaml

@@ -4,9 +4,24 @@ on:
     - cron: '0 0 * * *'
   workflow_dispatch: {}
 jobs:
+  check-date:
+    name: Check dates
+    runs-on: ubuntu-latest
+    outputs:
+      should-run: ${{ steps.code-change.outputs.should-run }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+      - name: Check if code has changed with 24 hours
+        continue-on-error: true
+        id: code-change
+        run: |
+          [[ $(git rev-list --after="24 hours" --first-parent HEAD) ]] && echo "::set-output name=should-run::true"
   build-release:
     name: Build and release Docker image
     runs-on: ubuntu-latest
+    needs: check-date
+    if: needs.check-date.outputs.should-run == 'true'
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2

.github/workflows/stale.yaml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Run stale action
-        uses: actions/stale@v3
+        uses: actions/stale@v4
         with:
           close-issue-message: ${{ env.CLOSE_MESSAGE }}
           close-pr-message: ${{ env.CLOSE_MESSAGE }}
@@ -23,6 +23,6 @@ jobs:
           stale-pr-message: ${{ env.STALE_MESSAGE }}
         env:
           CLOSE_MESSAGE: 'This issue has been closed because it is stale. Reopen if necessary.'
-          EXEMPT_LABEL: 'priority: low,priority: medium, priority: high,status: help wanted,status: in progress,status: needs triage'
+          EXEMPT_LABEL: 'priority: low,priority: normal,priority: high,status: help wanted,status: in progress,status: needs triage'
           STALE_LABEL: 'status: stale'
           STALE_MESSAGE: 'This issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 10 days'

.node-version

@@ -1 +1 @@
-16.2.0
+16.6.1

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16.2.0-alpine3.13 AS builder
+FROM node:16.6.1-alpine3.13 AS builder
 
 LABEL org.opencontainers.image.source="https://github.com/jef/streetmerchant"
 
@@ -16,7 +16,7 @@ COPY test/ test/
 RUN npm run compile
 RUN npm prune --production
 
-FROM node:16.2.0-alpine3.13
+FROM node:16.6.1-alpine3.13
 
 RUN apk add --no-cache chromium
 

docs/reference/filter.md

@@ -6,6 +6,7 @@
 | `MAX_PRICE_SERIES_3060TI` | Maximum price allowed for a match, applies 3060 Ti series cards (does not apply to these sites: Nvidia, Asus, EVGA) |
 | `MAX_PRICE_SERIES_3070` | Maximum price allowed for a match, applies 3070 series cards (does not apply to these sites: Nvidia, Asus, EVGA) |
 | `MAX_PRICE_SERIES_3080` | Maximum price allowed for a match, applies 3080 series cards (does not apply to these sites: Nvidia, Asus, EVGA) |
+| `MAX_PRICE_SERIES_3080TI` | Maximum price allowed for a match, applies 3080 Ti series cards (does not apply to these sites: Nvidia, Asus, EVGA) |
 | `MAX_PRICE_SERIES_3090` | Maximum price allowed for a match, applies 3090 series cards (does not apply to these sites: Nvidia, Asus, EVGA) |
 | `MAX_PRICE_SERIES_CORSAIR_SF` | Maximum price allowed for a match, applies to Corsair PSUs |
 | `MAX_PRICE_SERIES_DARKHERO` | Maximum price allowed for a match, applies to ASUS Dark Hero motherboards |
@@ -69,6 +70,7 @@ Used with the `STORES` variable.
 | ARLT | DE | `arlt`|
 | ASUS | US | `asus` |
 | ASUS | DE | `asus-de` |
+| ASUS | ES | `asus-es` |
 | AWD-IT | UK | `awd` |
 | Azerty | NL | `azerty`|
 | B&H | US | `bandh`|
@@ -99,6 +101,7 @@ Used with the `STORES` variable.
 | EBGames | CA | `ebgames`|
 | eBuyer | UK | `ebuyer`|
 | El Corte Inglés | ES | `elcorteingles`|
+| Eletronicamente | ES | `eletronicamente`|
 | Elkjop | NO | `elkjop`|
 | ePrice | IT | `eprice`|
 | Equippr | DE | `equippr`|
@@ -108,8 +111,10 @@ Used with the `STORES` variable.
 | EVGA | US | `evga`|
 | EVGA | EU | `evga-eu`|
 | Expert | DE | `expert`|
+| Extremmedia | ES | `extremmedia`|
 | Futurex | DE | `futurex`|
 | Galaxus | DE | `galaxus`|
+| Game | ES | `game-es`|
 | Game | UK | `game`|
 | Gamestop | US | `gamestop`|
 | Gamestop | DE | `gamestop-de`|
@@ -125,6 +130,7 @@ Used with the `STORES` variable.
 | Komplett | NO | `komplett-no`|
 | Landmark Computers | AU |  `landmark-computers`|
 | Ldlc | FR |  `ldlc`|
+| Ldlc | ES |  `ldlc-es`|
 | Mediamarkt | DE | `mediamarkt`|
 | Mediamarkt | AT | `mediamarkt-at`|
 | Medimax | DE | `medimax`|
@@ -137,6 +143,7 @@ Used with the `STORES` variable.
 | MSY | AU |  `msy`|
 | Multicom | NO |  `multicom`|
 | Mwave | AU | `mwave`|
+| Neobyte | ES | `neobyte`|
 | Netonnet | NO | `netonnet-no`|
 | Newegg | US | `newegg`|
 | Newegg | CA | `newegg-ca`|
@@ -148,6 +155,7 @@ Used with the `STORES` variable.
 | Nvidia | EU/UK | [See below](#nvidia-store-reference) |
 | Office Depot | US | `officedepot`|
 | Ollo | IT | `ollo`|
+| Opirata | ES | `opirata`|
 | Otto | DE | `otto`|
 | Overclockers | UK | `overclockers`|
 | PBTech | AU |  `pbtech`|
@@ -169,6 +177,7 @@ Used with the `STORES` variable.
 | Scan | UK | `scan`|
 | Scorptec | AU | `scorptec`|
 | ShopTo | UK | `shopto`|
+| Siabyte | ES | `siabyte`|
 | Smyths Toys | UK | `smythstoys`|
 | Smyths Toys | IE | `smythstoys-ie`|
 | Spielegrotte | DE | `spielegrotte`|
@@ -178,6 +187,7 @@ Used with the `STORES` variable.
 | TheWarehouse | NZ | `thewarehouse`|
 | TopAchat | GR | `topachat`|
 | Toys R Us | US | `toysrus` |
+| Ultimainformatica | ES | `ultimainformatica`|
 | Umart | AU | `umart`|
 | Unieuro | IT | `unieuro`|
 | Very | UK | `very`|
@@ -249,6 +259,7 @@ Used with the `SHOW_ONLY_SERIES` variable.
 | Nvidia RTX 3060 Ti | `3060ti` |
 | Nvidia RTX 3070 | `3070` |
 | Nvidia RTX 3080 | `3080` |
+| Nvidia RTX 3080 Ti | `3080ti` |
 | Nvidia RTX 3090 | `3090` |
 | Corsair SFX PSU | `sf` |
 | Crosshair VIII | `darkhero` |
@@ -260,7 +271,7 @@ Used with the `SHOW_ONLY_SERIES` variable.
 ## Nvidia Store Reference
 
 ???+ note
-    Use the Nvidia Store to check stock for Founders Edition cards only (3060 Ti/3070/3080/3090). For USA use `bestbuy` instead.
+    Use the Nvidia Store to check stock for Founders Edition cards only (3060 Ti/3070/3080/3080 Ti/3090). For USA use `bestbuy` instead.
 
 ???+ info
     Use the `STORE` variable for your chosen country. For example, to check for a FE card in Belgium you would use the `nvidia-fr` store.

docs/reference/notification.md

@@ -36,6 +36,7 @@ Refer to https://github.com/node-apn/node-apn for config options.
 | `DISCORD_NOTIFY_GROUP_3060TI` | Discord group to notify on 3060 Ti stock |
 | `DISCORD_NOTIFY_GROUP_3070` | Discord group to notify on 3070 stock |
 | `DISCORD_NOTIFY_GROUP_3080` | Discord group to notify on 3080 stock |
+| `DISCORD_NOTIFY_GROUP_3080TI` | Discord group to notify on 3080 Ti stock |
 | `DISCORD_NOTIFY_GROUP_3090` | Discord group to notify on 3090 stock |
 | `DISCORD_NOTIFY_GROUP_RYZEN5600` | Discord group to notify on 5600X stock |
 | `DISCORD_NOTIFY_GROUP_RYZEN5800` | Discord group to notify on 5800X stock |
@@ -183,15 +184,6 @@ API Documentation: [pushover.net/api](https://pushover.net/api)
 | `SLACK_CHANNEL` | Channel for posting |
 | `SLACK_TOKEN` | API token |
 
-## SmartThings
-
-Generate token at [account.smartthings.com/tokens](https://account.smartthings.com/tokens).
-
-| Environment variable | Description |
-|:---:|---|
-| `SMARTTHINGS_TOKEN` | Access token |
-| `SMARTTHINGS_SWITCH_LABEL` | Switch Label of switch to activate|
-
 ## Telegram
 
 | Environment variable | Description |

dotenv-example

@@ -24,7 +24,9 @@ DISCORD_NOTIFY_GROUP=
 DISCORD_NOTIFY_GROUP_3060=
 DISCORD_NOTIFY_GROUP_3060TI=
 DISCORD_NOTIFY_GROUP_3070=
+DISCORD_NOTIFY_GROUP_3070TI=
 DISCORD_NOTIFY_GROUP_3080=
+DISCORD_NOTIFY_GROUP_3080TI=
 DISCORD_NOTIFY_GROUP_3090=
 DISCORD_NOTIFY_GROUP_CORSAIR_SF=
 DISCORD_NOTIFY_GROUP_RX6800=
@@ -54,7 +56,9 @@ LOW_BANDWIDTH=
 MAX_PRICE_SERIES_3060=
 MAX_PRICE_SERIES_3060TI=
 MAX_PRICE_SERIES_3070=
+MAX_PRICE_SERIES_3070TI=
 MAX_PRICE_SERIES_3080=
+MAX_PRICE_SERIES_3080TI=
 MAX_PRICE_SERIES_3090=
 MAX_PRICE_SERIES_CORSAIR_SF=
 MAX_PRICE_SERIES_RX6800=
@@ -115,8 +119,6 @@ SHOW_ONLY_MODELS=
 SHOW_ONLY_SERIES=
 SLACK_CHANNEL=
 SLACK_TOKEN=
-SMARTTHINGS_TOKEN=
-SMARTTHINGS_SWITCH_LABEL=
 SMTP_ADDRESS=
 SMTP_PORT=
 STORES=