diff --git a/chat/ConversationView.vue b/chat/ConversationView.vue index b0fb5de..c7d1bb7 100644 --- a/chat/ConversationView.vue +++ b/chat/ConversationView.vue @@ -245,6 +245,13 @@ isPrivate = Conversation.isPrivate; showNonMatchingAds = true; + + @Hook('beforeMount') + async onBeforeMount(): Promise { + this.showNonMatchingAds = !await core.settingsStore.get('hideNonMatchingAds'); + } + + @Hook('mounted') mounted(): void { this.extraButtons = [{ @@ -432,8 +439,10 @@ } - toggleNonMatchingAds(): void { + async toggleNonMatchingAds(): Promise { this.showNonMatchingAds = !this.showNonMatchingAds; + + await core.settingsStore.set('hideNonMatchingAds', !this.showNonMatchingAds); } diff --git a/chat/character/CharacterChannelList.vue b/chat/character/CharacterChannelList.vue index bae3fac..a7c95b5 100644 --- a/chat/character/CharacterChannelList.vue +++ b/chat/character/CharacterChannelList.vue @@ -68,7 +68,6 @@ export default class CharacterChannelList extends CustomDialog { jumpToChannel(channel: ChannelConversation): void { channel.show(); } - } diff --git a/chat/interfaces.ts b/chat/interfaces.ts index 695897a..a82e34a 100644 --- a/chat/interfaces.ts +++ b/chat/interfaces.ts @@ -171,6 +171,8 @@ export namespace Settings { hiddenUsers: string[] statusHistory: string[] searchHistory: (ExtendedSearchData | SearchData)[] + hideNonMatchingAds: boolean + hideProfileComparisonSummary: boolean }; export interface Store { diff --git a/site/character_page/character_page.vue b/site/character_page/character_page.vue index 152f1b0..ed3c835 100644 --- a/site/character_page/character_page.vue +++ b/site/character_page/character_page.vue @@ -36,7 +36,7 @@
- +
diff --git a/site/character_page/kink.vue b/site/character_page/kink.vue index df4505c..5d5512d 100644 --- a/site/character_page/kink.vue +++ b/site/character_page/kink.vue @@ -20,13 +20,11 @@ \ No newline at end of file + diff --git a/site/character_page/kinks.vue b/site/character_page/kinks.vue index 10e61bd..488c821 100644 --- a/site/character_page/kinks.vue +++ b/site/character_page/kinks.vue @@ -147,8 +147,8 @@ ) as CharacterKink[]; } - async compareKinks(overridingCharacter?: Character): Promise { - if(this.comparing) { + async compareKinks(overridingCharacter?: Character, forced: boolean = false): Promise { + if ((this.comparing) && (!forced)) { this.comparison = {}; this.comparing = false; this.loading = false; @@ -194,7 +194,7 @@ return; if (core.state.settings.risingAutoCompareKinks) { - await this.compareKinks(core.characters.ownProfile); + await this.compareKinks(core.characters.ownProfile, true); } } @@ -203,7 +203,9 @@ if ((this.character) && (this.character.is_self)) return; - await this.compareKinks(core.characters.ownProfile); + if (core.state.settings.risingAutoCompareKinks) { + await this.compareKinks(core.characters.ownProfile, true); + } } get kinkGroups(): KinkGroup[] { diff --git a/site/character_page/match-report.vue b/site/character_page/match-report.vue index aefcc51..06a6360 100644 --- a/site/character_page/match-report.vue +++ b/site/character_page/match-report.vue @@ -31,11 +31,12 @@ diff --git a/site/character_page/sidebar.vue b/site/character_page/sidebar.vue index d01a2f3..4fed9c6 100644 --- a/site/character_page/sidebar.vue +++ b/site/character_page/sidebar.vue @@ -43,10 +43,10 @@ -
- -
+ + + +
Created