From fc34192921c8a0521192aed3813f930fa1c84ef2 Mon Sep 17 00:00:00 2001 From: "Mr. Stallion" Date: Mon, 3 Jan 2022 12:09:42 -0600 Subject: [PATCH] New version --- CHANGELOG.md | 3 +++ README.md | 8 ++++---- chat/SettingsView.vue | 2 ++ chat/UserView.vue | 4 ++-- docs/_config.yml | 2 +- electron/package.json | 2 +- learn/filter/smart-filter.ts | 8 ++++---- package.json | 2 +- 8 files changed, 18 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ce03ff5..f3a29e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## 1.17.1 +* Fixes to smart filters + ## 1.17.0 * Added a way to hide/filter out characters, messages, and ads (Settings > Smart Filters) * Added MacOS M1 build diff --git a/README.md b/README.md index 25e9107..e35aa87 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # Download -[Windows](https://github.com/mrstallion/fchat-rising/releases/download/v1.17.0/F-Chat-Rising-1.17.0-win.exe) (82 MB) -| [MacOS Intel](https://github.com/mrstallion/fchat-rising/releases/download/v1.17.0/F-Chat-Rising-1.17.0-macos.dmg) (82 MB) -| [MacOS M1](https://github.com/mrstallion/fchat-rising/releases/download/v1.17.0/F-Chat-Rising-1.17.0-macos.dmg) (84 MB) -| [Linux](https://github.com/mrstallion/fchat-rising/releases/download/v1.17.0/F-Chat-Rising-1.17.0-linux.AppImage) (82 MB) +[Windows](https://github.com/mrstallion/fchat-rising/releases/download/v1.17.1/F-Chat-Rising-1.17.1-win.exe) (82 MB) +| [MacOS Intel](https://github.com/mrstallion/fchat-rising/releases/download/v1.17.1/F-Chat-Rising-1.17.1-macos-intel.dmg) (82 MB) +| [MacOS M1](https://github.com/mrstallion/fchat-rising/releases/download/v1.17.1/F-Chat-Rising-1.17.1-macos-m1.dmg) (84 MB) +| [Linux](https://github.com/mrstallion/fchat-rising/releases/download/v1.17.1/F-Chat-Rising-1.17.1-linux.AppImage) (82 MB) # F-Chat Rising diff --git a/chat/SettingsView.vue b/chat/SettingsView.vue index c14d9fa..a1718f4 100644 --- a/chat/SettingsView.vue +++ b/chat/SettingsView.vue @@ -395,6 +395,8 @@ this.bbCodeBar = settings.bbCodeBar; this.availableImports = (await core.settingsStore.getAvailableCharacters()).filter((x) => x !== core.connection.character); + // settings.rising + this.risingAdScore = settings.risingAdScore; this.risingLinkPreview = settings.risingLinkPreview; this.risingAutoCompareKinks = settings.risingAutoCompareKinks; diff --git a/chat/UserView.vue b/chat/UserView.vue index 15f378b..ce1fc9e 100644 --- a/chat/UserView.vue +++ b/chat/UserView.vue @@ -70,13 +70,13 @@ export function getStatusClasses( if ((showStatus) || (character.status === 'crown')) statusClass = `fa-fw ${getStatusIcon(character.status)}`; - const cache = ((showMatch) && ((core.state.settings.risingAdScore) || (core.state.settings.risingFilter.showFilterIcon))) + const cache = (((showMatch) && (core.state.settings.risingAdScore)) || (core.state.settings.risingFilter.showFilterIcon)) ? core.cache.profileCache.getSync(character.name) : undefined; // undefined == not interested // null == no cache hit - if (cache === null) { + if ((cache === null) && (showMatch)) { void core.cache.addProfile(character.name); } diff --git a/docs/_config.yml b/docs/_config.yml index a8471b6..3a2b271 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.17.0 + version: 1.17.1 url: https://github.com/mrstallion/fchat-rising/releases/download/v%VERSION%/F-Chat-Rising-%VERSION%-%PLATFORM_TAIL% diff --git a/electron/package.json b/electron/package.json index 9253541..8dd64f0 100644 --- a/electron/package.json +++ b/electron/package.json @@ -1,6 +1,6 @@ { "name": "fchat", - "version": "1.17.0", + "version": "1.17.1", "author": "The F-List Team and Mister Stallion (Esq.)", "description": "F-List.net Chat Client", "main": "main.js", diff --git a/learn/filter/smart-filter.ts b/learn/filter/smart-filter.ts index 900fe2a..569a4fa 100644 --- a/learn/filter/smart-filter.ts +++ b/learn/filter/smart-filter.ts @@ -74,7 +74,7 @@ export class SmartFilter { const build = Matcher.getTagValueList(TagId.Build, c); - return !!build && !!_.find(this.opts.builds || [], build); + return build !== null && _.findIndex(this.opts.builds || [], (b) => b === build) >= 0; } testGenders(c: Character): boolean { @@ -84,7 +84,7 @@ export class SmartFilter { const gender = Matcher.getTagValueList(TagId.Gender, c); - return !!gender && !!_.find(this.opts.genders || [], gender); + return gender !== null && _.findIndex(this.opts.genders || [], (g) => g === gender) >= 0; } testBodyTypes(c: Character): boolean { @@ -94,7 +94,7 @@ export class SmartFilter { const bodyType = Matcher.getTagValueList(TagId.BodyType, c); - return !!bodyType && !!_.find(this.opts.bodyTypes || [], bodyType); + return bodyType !== null && _.findIndex(this.opts.bodyTypes || [], (b) => b === bodyType) >= 0; } testSpecies(c: Character): boolean { @@ -104,7 +104,7 @@ export class SmartFilter { const species = Matcher.species(c); - return !!species && !!_.find(this.opts.species || [], species); + return species !== null && _.findIndex(this.opts.species || [], (s) => s === species) >= 0; } testIsHuman(c: Character): boolean { diff --git a/package.json b/package.json index 0883a1e..e76655c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "f-list-rising", - "version": "1.17.0", + "version": "1.17.1", "author": "The F-List Team and and Mister Stallion (Esq.)", "description": "A heavily modded F-Chat 3.0 client for F-List", "license": "MIT",