Skip to content

Commit

Permalink
Merge pull request #33 from ChristianPayne/main
Browse files Browse the repository at this point in the history
v1.4.0
  • Loading branch information
ChristianPayne authored Jan 18, 2025
2 parents ca19748 + fda856e commit 78760ca
Show file tree
Hide file tree
Showing 26 changed files with 1,091 additions and 331 deletions.
17 changes: 17 additions & 0 deletions package-lock.json

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

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ennesults-rs",
"private": true,
"version": "1.3.2",
"version": "1.4.0",
"type": "module",
"scripts": {
"dev": "vite",
Expand All @@ -11,6 +11,7 @@
"tauri": "tauri"
},
"dependencies": {
"@fabianlars/tauri-plugin-oauth": "^2.0.0",
"@sveltejs/kit": "^2.0.0",
"@tauri-apps/api": "^2.0.0-rc.0",
"@tauri-apps/plugin-fs": "^2.0.0-rc",
Expand Down
25 changes: 24 additions & 1 deletion src-tauri/Cargo.lock

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

6 changes: 4 additions & 2 deletions src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ennesults-rs"
version = "1.3.2"
version = "1.4.0"
description = "A Twitch bot created for Ennegineer to kindly insult her chat."
authors = ["Christian Payne"]
license = ""
Expand All @@ -20,7 +20,7 @@ chrono = { version = "0.4", features = ["serde"] }
serde_json = "1.0"
twitch_api = { version = "0.7.0-rc.8", features = ["all"] }
tokio = { version = "1.32.0", features = ["full"] }
reqwest = "0.11.20"
reqwest = { version = "0.11.20", features = ["blocking"] }
twitch-irc = "5.0.1"
tauri-plugin-positioner = "2.0.0-rc"
tauri-plugin-window-state = { version = "2.0.0-rc" }
Expand All @@ -32,6 +32,8 @@ rand = "0.8.5"
thiserror = "2.0.3"
tauri-plugin-process = "2"
serde-inline-default = "0.2.3"
tauri-plugin-oauth = "2"
url-builder = "0.1.1"


[features]
Expand Down
2 changes: 2 additions & 0 deletions src-tauri/capabilities/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
"shell:allow-open",
"shell:default",
"updater:default",
"oauth:allow-start",
"oauth:allow-cancel",
{
"identifier": "fs:scope",
"allow": [
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/gen/schemas/acl-manifests.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-tauri/gen/schemas/capabilities.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"default":{"identifier":"default","description":"Default permissions for the bot.","local":true,"windows":["main"],"permissions":["core:default","fs:default","fs:allow-read-file","fs:allow-write-file","fs:allow-read-dir","fs:allow-mkdir","fs:allow-exists","shell:allow-open","shell:default","updater:default",{"identifier":"fs:scope","allow":["$APP/*"]},"process:default"],"platforms":["macOS","windows"]}}
{"default":{"identifier":"default","description":"Default permissions for the bot.","local":true,"windows":["main"],"permissions":["core:default","fs:default","fs:allow-read-file","fs:allow-write-file","fs:allow-read-dir","fs:allow-mkdir","fs:allow-exists","shell:allow-open","shell:default","updater:default","oauth:allow-start","oauth:allow-cancel",{"identifier":"fs:scope","allow":["$APP/*"]},"process:default"],"platforms":["macOS","windows"]}}
20 changes: 20 additions & 0 deletions src-tauri/gen/schemas/desktop-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -4787,6 +4787,26 @@
"type": "string",
"const": "fs:write-files"
},
{
"description": "Enables the cancel command without any pre-configured scope.",
"type": "string",
"const": "oauth:allow-cancel"
},
{
"description": "Enables the start command without any pre-configured scope.",
"type": "string",
"const": "oauth:allow-start"
},
{
"description": "Denies the cancel command without any pre-configured scope.",
"type": "string",
"const": "oauth:deny-cancel"
},
{
"description": "Denies the start command without any pre-configured scope.",
"type": "string",
"const": "oauth:deny-start"
},
{
"description": "Allows the moveWindow and handleIconState APIs",
"type": "string",
Expand Down
20 changes: 20 additions & 0 deletions src-tauri/gen/schemas/macOS-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -4787,6 +4787,26 @@
"type": "string",
"const": "fs:write-files"
},
{
"description": "Enables the cancel command without any pre-configured scope.",
"type": "string",
"const": "oauth:allow-cancel"
},
{
"description": "Enables the start command without any pre-configured scope.",
"type": "string",
"const": "oauth:allow-start"
},
{
"description": "Denies the cancel command without any pre-configured scope.",
"type": "string",
"const": "oauth:deny-cancel"
},
{
"description": "Denies the start command without any pre-configured scope.",
"type": "string",
"const": "oauth:deny-start"
},
{
"description": "Allows the moveWindow and handleIconState APIs",
"type": "string",
Expand Down
Loading

0 comments on commit 78760ca

Please sign in to comment.