Skip to content
Merged

1.1.7 #318

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
2 changes: 1 addition & 1 deletion apps/desktop/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@trixty/desktop",
"version": "1.1.6",
"version": "1.1.7",
"private": true,
"scripts": {
"dev": "next dev",
Expand Down
2 changes: 1 addition & 1 deletion apps/desktop/src-tauri/Cargo.lock

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

14 changes: 4 additions & 10 deletions apps/desktop/src-tauri/src/discord_rpc.rs
Original file line number Diff line number Diff line change
@@ -1,16 +1,10 @@
use serde::{Deserialize, Serialize};
use serde_json::{json, Value};
#[cfg(unix)]
use std::{env, path::PathBuf};

use log::{error, info, warn};
#[cfg(unix)]
use std::env;
#[cfg(unix)]
use std::path::PathBuf;
use serde::{Deserialize, Serialize};
use serde_json::{json, Value};
use tauri::{AppHandle, Emitter};
#[cfg(unix)]
use std::env;
#[cfg(unix)]
use std::path::PathBuf;
use tokio::io::{AsyncReadExt, AsyncWriteExt};
#[cfg(unix)]
use tokio::net::UnixStream;
Expand Down
2 changes: 1 addition & 1 deletion apps/desktop/src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
],
"withGlobalTauri": false,
"security": {
"csp": "default-src 'self'; img-src 'self' data: asset: https://asset.localhost https://raw.githubusercontent.com; script-src 'self' blob:; style-src 'self' 'unsafe-inline'; connect-src 'self' ipc: http://ipc.localhost https://ipc.localhost; font-src 'self' data:; frame-src *; worker-src 'self' blob:;"
"csp": "default-src 'self'; img-src 'self' data: asset: https://asset.localhost https://raw.githubusercontent.com https://*.sentry.io; script-src 'self' blob: https://cdn.jsdelivr.net; style-src 'self' 'unsafe-inline' https://cdn.jsdelivr.net; connect-src 'self' ipc: http://ipc.localhost https://ipc.localhost https://*.sentry.io https://o4505655594844160.ingest.us.sentry.io; font-src 'self' data: https://cdn.jsdelivr.net; frame-src *; worker-src 'self' blob:;"
}
},
"plugins": {
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"build": "turbo run build",
"desktop": "pnpm --filter @trixty/desktop tauri",
"version:sync": "node scripts/sync-version.mjs"

},
"devDependencies": {
"turbo": "^2"
Expand Down
Loading