Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.10.4 #412

Merged
merged 12 commits into from
Jul 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 0 additions & 77 deletions .eslintrc.json

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/eslint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: "18"
node-version: "20"
check-latest: true
cache: "npm"
- name: npm
run: npm install --no-audit --no-fund --only=dev
run: npm install -D --no-audit --no-fund
- name: lint
run: npm run lint
29 changes: 15 additions & 14 deletions config.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
"defaultRestaurants": ["savo", "talli", "rami", "august"],
"additionalRestaurants": ["holvi", "vino", "fernando", "pormestari", "vaihaAsema", "lansiSavo", "lale", "kotiherkku", "ramiVisulahti"],
"customErrorMessages": [
["savo", "Katso lounaslista osoitteesta https://www.vaiha.fi/savo-lounas"],
["vaihaAsema", "Katso lounaslista osoitteesta https://www.vaiha.fi/asema-lounas"],
["talli", "Katso lounaslista osoitteesta https://www.xamkravintolat.fi/tallin-lounaslista/"],
["rami", "Katso lounaslista osoitteesta https://www.raminkonditoria.fi/lounaat"],
["august", "Katso lounaslista osoitteesta https://www.ravintolaaugust.fi/ (sivun alalaita)"],
["holvi", "Katso lounaslista osoitteesta https://www.bistroholvi.fi/#lounas"],
["vino", "Katso lounaslista osoitteesta https://www.ravintolavino.fi/lounas"],
["pormestari", "Katso lounaslista osoitteesta https://www.vaiha.fi/lounas-pormestari"],
["savo", "Tarkasta https://www.vaiha.fi/savo-lounas"],
["vaihaAsema", "Tarkasta https://www.vaiha.fi/asema-lounas"],
["talli", "Tarkasta https://www.xamkravintolat.fi/tallin-lounaslista/"],
["rami", "Tarkasta https://www.raminkonditoria.fi/lounaat"],
["august", "Tarkasta https://www.ravintolaaugust.fi/ (sivun alalaita)"],
["holvi", "Tarkasta https://www.bistroholvi.fi/#lounas"],
["vino", "Tarkasta https://www.ravintolavino.fi/lounas"],
["pormestari", "Tarkasta https://www.vaiha.fi/lounas-pormestari"],
["lale", "Tätä lounaslistaa ei juuri nyt ole saatavissa verkossa"],
["ramiVisulahti", "Katso lounaslista osoitteesta https://www.raminkonditoria.fi/lounaat"],
["lansiSavo", "Katso lounaslista osoitteesta https://www.serviini.fi/lansi-savo"],
["kotiherkku", "Katso lounaslista osoitteesta https://www.serviini.fi/kotiherkku-ruokapuoti"]
["ramiVisulahti", "Tarkasta https://www.raminkonditoria.fi/lounaat"],
["lansiSavo", "Tarkasta https://www.serviini.fi/lansi-savo"],
["kotiherkku", "Tarkasta https://www.serviini.fi/kotiherkku-ruokapuoti"]
],
"gitUrl": "https://github.com/ojaha065/lounasbotti",
"displayVoters": true,
Expand All @@ -39,10 +39,10 @@
["tortilla|burrito", ":burrito:"],
["joulu|rosolli|glögi", ":christmas_tree:"],
["keitto", ":bowl_with_spoon:"],
["((?<!pork)kana(?!nmun))|(broiler)", ":chicken:"],
["((?<!pork)kana(?!nmun))|(broiler)|chicken", ":chicken:"],
["(?:(?<!pa)loh(i|ta){1})|((?<!rans)kala(?!jitelma))|(mui(kut|kkuja){1})|sei(ti|tä)|(?:kampela)|(?:turska)|(?:hauk(i|ea))|silak", ":fish:"],
["(?:liha(?:pul|pyöry))|falafel", ":falafel:"],
["(?:po(?:rsa|ss))|(?:si(?:an|ka))", ":pig2:"],
["(?:po(?:rsa|ss))|(?:si(?:an|ka))|kink", ":pig2:"],
["(?:pekoni)|(?:bacon)", ":bacon:"],
["(?:spagetti)|(?:bolognese)", ":spaghetti:"],
["härk?ä", ":ox:"],
Expand Down Expand Up @@ -76,6 +76,7 @@
["yrtt", ":herb:"],
["BBQ", ":hotsprings:"],
["lei(?:pä|vän)", ":bread:"],
["voita", ":butter:"]
["voita", ":butter:"],
["juusto|cheddar", ":cheese_wedge:"]
]
}
11 changes: 11 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import globals from "globals";
import pluginJs from "@eslint/js";
import tseslint from "typescript-eslint";

export default [
{files: ["**/*.{js,mjs,cjs,ts}"]},
{languageOptions: { globals: globals.node }},
pluginJs.configs.recommended,
...tseslint.configs.recommended,
{ignores: ["node_modules/", "dist/"]}
];
Binary file modified ngrok.exe
Binary file not shown.
Loading