refactor: Use slice.Contains() nettype check

Instead using `||` for each nettype query check , simply using `slice.Contains`. Also, checking `any` value is not needed here.
Merge pull request #69 from ditatompel/dependabot/npm_and_yarn/frontend/floating-ui/dom-1.6.8
2025-01-08 05:52:10 +07:00 · 2024-07-29 22:30:03 +07:00 · 2024-07-29 13:22:31 +00:00 · 2024-07-29 13:18:04 +00:00 · 2024-07-29 13:14:30 +00:00 · 2024-07-29 13:10:19 +00:00
3 changed files with 29 additions and 31 deletions
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@ -1,14 +1,14 @@
 {
 	"name": "xmr-nodes-frontend",
-	"version": "v0.0.4",
+	"version": "v0.0.5",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "xmr-nodes-frontend",
-			"version": "v0.0.4",
+			"version": "v0.0.5",
 			"devDependencies": {
-				"@floating-ui/dom": "^1.6.7",
+				"@floating-ui/dom": "^1.6.8",
 				"@skeletonlabs/skeleton": "^2.10.2",
 				"@skeletonlabs/tw-plugin": "^0.4.0",
 				"@sveltejs/adapter-static": "^3.0.2",
@ -22,14 +22,14 @@
 				"eslint": "^9.7.0",
 				"eslint-config-prettier": "^9.1.0",
 				"eslint-plugin-svelte": "^2.43.0",
-				"postcss": "^8.4.39",
+				"postcss": "^8.4.40",
 				"prettier": "^3.3.3",
 				"prettier-plugin-svelte": "^3.2.6",
 				"svelte": "^4.2.18",
 				"svelte-check": "^3.8.4",
 				"tailwindcss": "^3.4.6",
-				"typescript": "^5.5.3",
-				"vite": "^5.3.4"
+				"typescript": "^5.5.4",
+				"vite": "^5.3.5"
 			}
 		},
 		"node_modules/@alloc/quick-lru": {
@ -526,19 +526,19 @@
 			}
 		},
 		"node_modules/@floating-ui/dom": {
-			"version": "1.6.7",
-			"resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.7.tgz",
-			"integrity": "sha512-wmVfPG5o2xnKDU4jx/m4w5qva9FWHcnZ8BvzEe90D/RpwsJaTAVYPEPdQ8sbr/N8zZTAHlZUTQdqg8ZUbzHmng==",
+			"version": "1.6.8",
+			"resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.8.tgz",
+			"integrity": "sha512-kx62rP19VZ767Q653wsP1XZCGIirkE09E0QUGNYTM/ttbbQHqcGPdSfWFxUyyNLc/W6aoJRBajOSXhP6GXjC0Q==",
 			"dev": true,
 			"dependencies": {
 				"@floating-ui/core": "^1.6.0",
-				"@floating-ui/utils": "^0.2.4"
+				"@floating-ui/utils": "^0.2.5"
 			}
 		},
 		"node_modules/@floating-ui/utils": {
-			"version": "0.2.4",
-			"resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.4.tgz",
-			"integrity": "sha512-dWO2pw8hhi+WrXq1YJy2yCuWoL20PddgGaqTgVe4cOS9Q6qklXCiA1tJEqX6BEwRNSCP84/afac9hd4MS+zEUA==",
+			"version": "0.2.5",
+			"resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.5.tgz",
+			"integrity": "sha512-sTcG+QZ6fdEUObICavU+aB3Mp8HY4n14wYHdxK4fXjPmv3PXZZeY5RaguJmGyeH/CJQhX3fqKUtS4qc1LoHwhQ==",
 			"dev": true
 		},
 		"node_modules/@humanwhocodes/module-importer": {
@ -2773,9 +2773,9 @@
 			}
 		},
 		"node_modules/postcss": {
-			"version": "8.4.39",
-			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.39.tgz",
-			"integrity": "sha512-0vzE+lAiG7hZl1/9I8yzKLx3aR9Xbof3fBHKunvMfOCYAtMhrsnccJY2iTURb9EZd5+pLuiNV9/c/GZJOHsgIw==",
+			"version": "8.4.40",
+			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.40.tgz",
+			"integrity": "sha512-YF2kKIUzAofPMpfH6hOi2cGnv/HrUlfucspc7pDyvv7kGdqXrfj8SCl/t8owkEgKEuu8ZcRjSOxFxVLqwChZ2Q==",
 			"dev": true,
 			"funding": [
 				{
@ -3819,9 +3819,9 @@
 			}
 		},
 		"node_modules/typescript": {
-			"version": "5.5.3",
-			"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.3.tgz",
-			"integrity": "sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==",
+			"version": "5.5.4",
+			"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
+			"integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
 			"dev": true,
 			"bin": {
 				"tsc": "bin/tsc",
@ -3877,9 +3877,9 @@
 			"dev": true
 		},
 		"node_modules/vite": {
-			"version": "5.3.4",
-			"resolved": "https://registry.npmjs.org/vite/-/vite-5.3.4.tgz",
-			"integrity": "sha512-Cw+7zL3ZG9/NZBB8C+8QbQZmR54GwqIz+WMI4b3JgdYJvX+ny9AjJXqkGQlDXSXRP9rP0B4tbciRMOVEKulVOA==",
+			"version": "5.3.5",
+			"resolved": "https://registry.npmjs.org/vite/-/vite-5.3.5.tgz",
+			"integrity": "sha512-MdjglKR6AQXQb9JGiS7Rc2wC6uMjcm7Go/NHNO63EwiJXfuk9PgqiP/n5IDJCziMkfw9n4Ubp7lttNwz+8ZVKA==",
 			"dev": true,
 			"dependencies": {
 				"esbuild": "^0.21.3",
--- a/frontend/package.json
+++ b/frontend/package.json
@ -12,7 +12,7 @@
 		"format": "prettier --write ."
 	},
 	"devDependencies": {
-		"@floating-ui/dom": "^1.6.7",
+		"@floating-ui/dom": "^1.6.8",
 		"@skeletonlabs/skeleton": "^2.10.2",
 		"@skeletonlabs/tw-plugin": "^0.4.0",
 		"@sveltejs/adapter-static": "^3.0.2",
@ -26,14 +26,14 @@
 		"eslint": "^9.7.0",
 		"eslint-config-prettier": "^9.1.0",
 		"eslint-plugin-svelte": "^2.43.0",
-		"postcss": "^8.4.39",
+		"postcss": "^8.4.40",
 		"prettier": "^3.3.3",
 		"prettier-plugin-svelte": "^3.2.6",
 		"svelte": "^4.2.18",
 		"svelte-check": "^3.8.4",
 		"tailwindcss": "^3.4.6",
-		"typescript": "^5.5.3",
-		"vite": "^5.3.4"
+		"typescript": "^5.5.4",
+		"vite": "^5.3.5"
 	},
 	"type": "module"
 }
--- a/internal/monero/monero.go
+++ b/internal/monero/monero.go
@ -94,11 +94,9 @@ func (q QueryNodes) toSQL() (args []interface{}, where, sortBy, sortDirection st
 		wq = append(wq, "(hostname LIKE ? OR ip_addr LIKE ?)")
 		args = append(args, "%"+q.Host+"%", "%"+q.Host+"%")
 	}
-	if q.Nettype != "any" {
-		if q.Nettype == "mainnet" || q.Nettype == "stagenet" || q.Nettype == "testnet" {
-			wq = append(wq, "nettype = ?")
-			args = append(args, q.Nettype)
-		}
+	if slices.Contains([]string{"mainnet", "stagenet", "testnet"}, q.Nettype) {
+		wq = append(wq, "nettype = ?")
+		args = append(args, q.Nettype)
 	}
 	if q.Protocol != "any" && slices.Contains([]string{"tor", "http", "https"}, q.Protocol) {
 		if q.Protocol == "tor" {
Author	SHA1	Message	Date
Christian Ditaputratama	97fad6cacb	refactor: Use `slice.Contains()` nettype check Instead using `\|\|` for each nettype query check , simply using `slice.Contains`. Also, checking `any` value is not needed here.	2024-07-29 22:30:03 +07:00
ditatombot[bot]	cf77175210	Merge pull request #69 from ditatompel/dependabot/npm_and_yarn/frontend/floating-ui/dom-1.6.8 Merge pull request #69 This merge action was created automatically. Reviewed-by: ditatompel <ditatompel@users.noreply.github.com>	2024-07-29 13:22:31 +00:00
ditatombot[bot]	ffb3d263c5	Merge pull request #68 from ditatompel/dependabot/npm_and_yarn/frontend/postcss-8.4.40 Merge pull request #68 This merge action was created automatically. Reviewed-by: ditatompel <ditatompel@users.noreply.github.com>	2024-07-29 13:18:04 +00:00
ditatombot[bot]	c6dc4f6a86	Merge pull request #66 from ditatompel/dependabot/npm_and_yarn/frontend/typescript-5.5.4 Merge pull request #66 This merge action was created automatically. Reviewed-by: ditatompel <ditatompel@users.noreply.github.com>	2024-07-29 13:14:30 +00:00
dependabot[bot]	e0a9edf44b	build(deps-dev): bump @floating-ui/dom from 1.6.7 to 1.6.8 in /frontend Bumps [@floating-ui/dom](https://github.com/floating-ui/floating-ui/tree/HEAD/packages/dom) from 1.6.7 to 1.6.8. - [Release notes](https://github.com/floating-ui/floating-ui/releases) - [Changelog](https://github.com/floating-ui/floating-ui/blob/master/packages/dom/CHANGELOG.md) - [Commits](https://github.com/floating-ui/floating-ui/commits/@floating-ui/dom@1.6.8/packages/dom) --- updated-dependencies: - dependency-name: "@floating-ui/dom" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2024-07-29 13:10:19 +00:00
dependabot[bot]	2304b37fb9	build(deps-dev): bump typescript from 5.5.3 to 5.5.4 in /frontend Bumps [typescript](https://github.com/Microsoft/TypeScript) from 5.5.3 to 5.5.4. - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml) - [Commits](https://github.com/Microsoft/TypeScript/compare/v5.5.3...v5.5.4) --- updated-dependencies: - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2024-07-29 13:10:14 +00:00
ditatombot[bot]	5ca60d40f4	Merge pull request #65 from ditatompel/dependabot/npm_and_yarn/frontend/vite-5.3.5 Merge pull request #65 This merge action was created automatically. Reviewed-by: ditatompel <ditatompel@users.noreply.github.com>	2024-07-29 13:09:06 +00:00
dependabot[bot]	db99bb9ff6	build(deps-dev): bump vite from 5.3.4 to 5.3.5 in /frontend Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.3.4 to 5.3.5. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v5.3.5/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2024-07-29 13:05:09 +00:00
dependabot[bot]	e01a6e06f7	build(deps-dev): bump postcss from 8.4.39 to 8.4.40 in /frontend Bumps [postcss](https://github.com/postcss/postcss) from 8.4.39 to 8.4.40. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/8.4.39...8.4.40) --- updated-dependencies: - dependency-name: postcss dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2024-07-29 05:58:43 +00:00