From 585bb5e095dce75291a586495512af9307b94aac Mon Sep 17 00:00:00 2001 From: "Mr. Stallion" Date: Thu, 23 Dec 2021 22:51:27 -0600 Subject: [PATCH] v1.16.0 --- CHANGELOG.md | 2 +- CONTRIBUTORS.md | 7 +++ LICENSE | 2 +- README.md | 6 +-- chat/CharacterSearch.vue | 2 +- chat/CharacterSearchHistory.vue | 2 +- chat/localize.ts | 2 +- docs/_config.yml | 2 +- electron/main.ts | 18 ++++---- electron/package.json | 2 +- package.json | 4 +- yarn.lock | 76 ++++++++++++++++++++++----------- 12 files changed, 79 insertions(+), 46 deletions(-) create mode 100644 CONTRIBUTORS.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a80eae..3d09fad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ * Upgraded to Electron 14.x * Minor security updates * Added body type search (credit: [@ButterCheezii](https://github.com/ButterCheezii)) -* Link previews can now be pinned with a trackpad (credit: @ButterCheezii) +* Link previews can now be pinned with a trackpad by clicking while pressing alt/option key (credit: @ButterCheezii) * Fixed character preview lag (credit: @ButterCheezii) ## 1.15.1 diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md new file mode 100644 index 0000000..591bcc6 --- /dev/null +++ b/CONTRIBUTORS.md @@ -0,0 +1,7 @@ +# Contributors + +This project contains contributions from: + +* [Mr Stallion, esq.](https://github.com/mrstallion) +* [ButterCheezii](https://github.com/ButterCheezii) +* [F-List Team](https://github.com/f-list) (original F-Chat 3.0 client) diff --git a/LICENSE b/LICENSE index a604a53..fe273f4 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2018 F-List +Copyright (c) 2018-2021 respective contributors listed in `CONTRIBUTORS.md` Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index e003699..eeaea91 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Download -[Windows](https://github.com/mrstallion/fchat-rising/releases/download/v1.15.1/F-Chat-Rising-1.15.1-win.exe) (75 MB) -| [MacOS](https://github.com/mrstallion/fchat-rising/releases/download/v1.15.1/F-Chat-Rising-1.15.1-macos.dmg) (76 MB) -| [Linux](https://github.com/mrstallion/fchat-rising/releases/download/v1.15.1/F-Chat-Rising-1.15.1-linux.AppImage) (76 MB) +[Windows](https://github.com/mrstallion/fchat-rising/releases/download/v1.16.0/F-Chat-Rising-1.16.0-win.exe) (75 MB) +| [MacOS](https://github.com/mrstallion/fchat-rising/releases/download/v1.16.0/F-Chat-Rising-1.16.0-macos.dmg) (76 MB) +| [Linux](https://github.com/mrstallion/fchat-rising/releases/download/v1.16.0/F-Chat-Rising-1.16.0-linux.AppImage) (76 MB) # F-Chat Rising diff --git a/chat/CharacterSearch.vue b/chat/CharacterSearch.vue index 146e5b9..d3ca16c 100644 --- a/chat/CharacterSearch.vue +++ b/chat/CharacterSearch.vue @@ -542,7 +542,7 @@ const filteredHistory = _.map( _.reject(history, (h: SearchData) => (JSON.stringify(h, null, 0) === dataStr)), - (h) => _.merge({ species: [] }, h) + (h) => _.merge({ species: [], bodytypes: [] }, h) ) as ExtendedSearchData[]; const newHistory: ExtendedSearchData[] = _.take(_.concat([data], filteredHistory), 15); diff --git a/chat/CharacterSearchHistory.vue b/chat/CharacterSearchHistory.vue index 25b69f4..f5e5f63 100644 --- a/chat/CharacterSearchHistory.vue +++ b/chat/CharacterSearchHistory.vue @@ -66,7 +66,7 @@ selectStatus(): void { if (this.selectedSearch !== null) { - this.callback(_.merge({species: []}, this.history[this.selectedSearch]) as ExtendedSearchData); + this.callback(_.merge({species: [], bodytypes: []}, this.history[this.selectedSearch]) as ExtendedSearchData); } } diff --git a/chat/localize.ts b/chat/localize.ts index 926604b..36e998e 100644 --- a/chat/localize.ts +++ b/chat/localize.ts @@ -231,7 +231,7 @@ Once this process has started, do not interrupt it or your logs will get corrupt 'characterSearch.roles': 'Dom/sub roles', 'characterSearch.positions': 'Positions', 'characterSearch.species': 'Species (beta)', - 'characterSearch.bodytypes': 'Body Types', + 'characterSearch.bodytypes': 'Body types', 'characterSearch.error.noResults': 'There were no search results.', 'characterSearch.error.throttle': 'You must wait five seconds between searches.', 'characterSearch.error.tooManyResults': 'There are too many search results, please narrow your search.', diff --git a/docs/_config.yml b/docs/_config.yml index 5742837..6f9dc1f 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -50,7 +50,7 @@ theme: jekyll-theme-slate changelog: https://github.com/mrstallion/fchat-rising/blob/master/CHANGELOG.md download: - version: 1.15.1 + version: 1.16.0 url: https://github.com/mrstallion/fchat-rising/releases/download/v%VERSION%/F-Chat-Rising-%VERSION%-%PLATFORM_TAIL% diff --git a/electron/main.ts b/electron/main.ts index 5702d0d..5c136fb 100644 --- a/electron/main.ts +++ b/electron/main.ts @@ -60,6 +60,12 @@ const pck = require('./package.json'); // Module to control application life. const app = electron.app; +// tslint:disable-next-line:no-require-imports +const pngIcon = path.join(__dirname, require('./build/icon.png').default); + +// tslint:disable-next-line:no-require-imports +const winIcon = path.join(__dirname, require('./build/icon.ico').default); + remoteMain.initialize(); // Keep a global reference of the window object, if you don't, the window will @@ -188,15 +194,7 @@ function createWindow(): electron.BrowserWindow | undefined { if(tabCount >= 3) return; const lastState = windowState.getSavedWindowState(); - const pngIcon = electron.nativeImage.createFromPath( - //tslint:disable-next-line:no-require-imports no-unsafe-any - path.join(__dirname, require('./build/icon.png').default) - ); - - const winIcon = electron.nativeImage.createFromPath( - //tslint:disable-next-line:no-require-imports no-unsafe-any - path.join(__dirname, require('./build/icon.ico').default) - ); + console.log('ICon is', process.platform === 'win32' ? winIcon : pngIcon); const windowProperties: electron.BrowserWindowConstructorOptions & {maximized: boolean} = { ...lastState, @@ -222,6 +220,8 @@ function createWindow(): electron.BrowserWindow | undefined { windows.push(window); + // window.setIcon(process.platform === 'win32' ? winIcon : pngIcon); + window.webContents.on('will-attach-webview', () => { const all = electron.webContents.getAllWebContents(); all.forEach((item) => { diff --git a/electron/package.json b/electron/package.json index 690535c..aff5444 100644 --- a/electron/package.json +++ b/electron/package.json @@ -1,6 +1,6 @@ { "name": "fchat", - "version": "1.15.1", + "version": "1.16.0", "author": "The F-List Team and Mister Stallion (Esq.)", "description": "F-List.net Chat Client", "main": "main.js", diff --git a/package.json b/package.json index 3200ee7..774fdee 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "f-list-rising", - "version": "1.15.1", + "version": "1.16.0", "author": "The F-List Team and and Mister Stallion (Esq.)", "description": "A heavily modded F-Chat 3.0 client for F-List", "license": "MIT", @@ -27,7 +27,7 @@ "date-fns": "^2.16.1", "electron": "^14.2.3", "electron-log": "^4.4.3", - "electron-packager": "~15.1.0", + "electron-packager": "^15.4.0", "electron-rebuild": "^3.2.5", "extract-loader": "^5.1.0", "file-loader": "^6.2.0", diff --git a/yarn.lock b/yarn.lock index 03edd26..f8b5099 100644 --- a/yarn.lock +++ b/yarn.lock @@ -118,6 +118,13 @@ resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.2.tgz#30aa825f11d438671d585bd44e7fd564535fc210" integrity sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw== +"@malept/cross-spawn-promise@^1.1.0": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz#504af200af6b98e198bce768bc1730c6936ae01d" + integrity sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ== + dependencies: + cross-spawn "^7.0.1" + "@malept/cross-spawn-promise@^2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-2.0.0.tgz#d0772de1aa680a0bfb9ba2f32b4c828c7857cb9d" @@ -828,7 +835,7 @@ asar@^2.0.1: optionalDependencies: "@types/glob" "^7.1.1" -asar@^3.0.0: +asar@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/asar/-/asar-3.1.0.tgz#70b0509449fe3daccc63beb4d3c7d2e24d3c6473" integrity sha512-vyxPxP5arcAqN4F/ebHd/HhwnAiZtwhglvdmc7BR2f0ywbVNTOpSeyhLDbGXtE/y58hv1oC75TaNIXutnsOZsQ== @@ -2157,6 +2164,15 @@ cosmiconfig@^5.0.0: js-yaml "^3.13.1" parse-json "^4.0.0" +cross-spawn-windows-exe@^1.1.0, cross-spawn-windows-exe@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/cross-spawn-windows-exe/-/cross-spawn-windows-exe-1.2.0.tgz#46253b0f497676e766faf4a7061004618b5ac5ec" + integrity sha512-mkLtJJcYbDCxEG7Js6eUnUNndWjyUZwJ3H7bErmmtOYU/Zb99DyUkpamuIZE0b3bhmJyZ7D90uS6f+CGxRRjOw== + dependencies: + "@malept/cross-spawn-promise" "^1.1.0" + is-wsl "^2.2.0" + which "^2.0.2" + cross-spawn@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982" @@ -2606,7 +2622,7 @@ electron-log@^4.4.3: resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-4.4.3.tgz#01c7f776e0b424b4958662ca7a043344a5fa645f" integrity sha512-IWxkiVLSpbI4if61kTSLMErYwz+Jq/gnHeTtQ8jcAjtlU8rgTIScWBgZJxk3fVnyvW6M+Ci3Bn9ogHgjgDSvNg== -electron-notarize@^1.0.0: +electron-notarize@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-1.1.1.tgz#3ed274b36158c1beb1dbef14e7faf5927e028629" integrity sha512-kufsnqh86CTX89AYNG3NCPoboqnku/+32RxeJ2+7A4Rbm4bbOx0Nc7XTy3/gAlBfpj9xPAxHfhZLOHgfi6cJVw== @@ -2614,10 +2630,10 @@ electron-notarize@^1.0.0: debug "^4.1.1" fs-extra "^9.0.1" -electron-osx-sign@^0.4.11: - version "0.4.17" - resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.4.17.tgz#2727ca0c79e1e4e5ccd3861fb3da9c3c913b006c" - integrity sha512-wUJPmZJQCs1zgdlQgeIpRcvrf7M5/COQaOV68Va1J/SgmWx5KL2otgg+fAae7luw6qz9R8Gvu/Qpe9tAOu/3xQ== +electron-osx-sign@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.5.0.tgz#fc258c5e896859904bbe3d01da06902c04b51c3a" + integrity sha512-icoRLHzFz/qxzDh/N4Pi2z4yVHurlsCAYQvsCSG7fCedJ4UJXBS6PoQyGH71IfcqKupcKeK7HX/NkyfG+v6vlQ== dependencies: bluebird "^3.5.0" compare-version "^0.1.2" @@ -2626,16 +2642,17 @@ electron-osx-sign@^0.4.11: minimist "^1.2.0" plist "^3.0.1" -electron-packager@~15.1.0: - version "15.1.0" - resolved "https://registry.yarnpkg.com/electron-packager/-/electron-packager-15.1.0.tgz#16a3733e4cad26112a2ac36f0b0f35c3b0170eff" - integrity sha512-THNm4bz1DfvR9f0g51+NjuAYELflM8+1vhQ/iv/G8vyZNKzSMuFd5doobngQKq3rRsLdPNZVnGqDdgS884d7Og== +electron-packager@^15.4.0: + version "15.4.0" + resolved "https://registry.yarnpkg.com/electron-packager/-/electron-packager-15.4.0.tgz#07ea036b70cde2062d4c8dce4d907d793b303998" + integrity sha512-JrrLcBP15KGrPj0cZ/ALKGmaQ4gJkn3mocf0E3bRKdR3kxKWYcDRpCvdhksYDXw/r3I6tMEcZ7XzyApWFXdVpw== dependencies: "@electron/get" "^1.6.0" - asar "^3.0.0" + asar "^3.1.0" + cross-spawn-windows-exe "^1.2.0" debug "^4.0.1" - electron-notarize "^1.0.0" - electron-osx-sign "^0.4.11" + electron-notarize "^1.1.1" + electron-osx-sign "^0.5.0" extract-zip "^2.0.0" filenamify "^4.1.0" fs-extra "^9.0.0" @@ -2644,10 +2661,10 @@ electron-packager@~15.1.0: junk "^3.1.0" parse-author "^2.0.0" plist "^3.0.0" - rcedit "^2.0.0" + rcedit "^3.0.1" resolve "^1.1.6" semver "^7.1.3" - yargs-parser "^19.0.1" + yargs-parser "^20.0.0" electron-rebuild@^3.2.5: version "3.2.5" @@ -4089,6 +4106,11 @@ is-directory@^0.3.1: resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1" integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE= +is-docker@^2.0.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" + integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== + is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" @@ -4254,6 +4276,13 @@ is-windows@^1.0.2: resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== +is-wsl@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" + integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== + dependencies: + is-docker "^2.0.0" + isarray@1.0.0, isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" @@ -6084,10 +6113,12 @@ rc@^1.2.7: minimist "^1.2.0" strip-json-comments "~2.0.1" -rcedit@^2.0.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/rcedit/-/rcedit-2.3.0.tgz#951685a079db98a4cc8c21ebab75e374d5a0b108" - integrity sha512-h1gNEl9Oai1oijwyJ1WYqYSXTStHnOcv1KYljg/8WM4NAg3H1KBK3azIaKkQ1WQl+d7PoJpcBMscPfLXVKgCLQ== +rcedit@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/rcedit/-/rcedit-3.0.1.tgz#ae21b43e49c075f4d84df1929832a12c302f3c90" + integrity sha512-XM0Jv40/y4hVAqj/MO70o/IWs4uOsaSoo2mLyk3klFDW+SStLnCtzuQu+1OBTIMGlM8CvaK9ftlYCp6DJ+cMsw== + dependencies: + cross-spawn-windows-exe "^1.1.0" read-pkg-up@^1.0.1: version "1.0.1" @@ -7814,12 +7845,7 @@ yargs-parser@^13.1.2: camelcase "^5.0.0" decamelize "^1.2.0" -yargs-parser@^19.0.1: - version "19.0.4" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-19.0.4.tgz#99183a3a59268b205c6b04177f2a5bfb46e79ba7" - integrity sha512-eXeQm7yXRjPFFyf1voPkZgXQZJjYfjgQUmGPbD2TLtZeIYzvacgWX7sQ5a1HsRgVP+pfKAkRZDNtTGev4h9vhw== - -yargs-parser@^20.2.2: +yargs-parser@^20.0.0, yargs-parser@^20.2.2: version "20.2.9" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==