diff --git a/chat/ConversationAdSettings.vue b/chat/ConversationAdSettings.vue new file mode 100644 index 0000000..7ea2476 --- /dev/null +++ b/chat/ConversationAdSettings.vue @@ -0,0 +1,96 @@ + + + + + + diff --git a/chat/ConversationSettings.vue b/chat/ConversationSettings.vue index 4ef18c3..9f53d63 100644 --- a/chat/ConversationSettings.vue +++ b/chat/ConversationSettings.vue @@ -35,19 +35,6 @@ - -
Auto-Posting Channel Ads
- -
- - -
- - @@ -71,7 +58,6 @@ highlightWords!: string; joinMessages!: Conversation.Setting; defaultHighlights!: boolean; - ads!: string[]; load(): void { const settings = this.conversation.settings; @@ -80,11 +66,6 @@ this.highlightWords = settings.highlightWords.join(','); this.joinMessages = settings.joinMessages; this.defaultHighlights = settings.defaultHighlights; - this.ads = settings.adSettings.ads.slice(0); - - if (this.ads.length === 0) { - this.ads.push(''); - } } submit(): void { @@ -94,49 +75,9 @@ highlightWords: this.highlightWords.split(',').map((x) => x.trim()).filter((x) => (x.length > 0)), joinMessages: this.joinMessages, defaultHighlights: this.defaultHighlights, - adSettings: { - ads: this.ads.map((ad: string) => ad.trim()).filter((ad: string) => (ad.length > 0)) - } + adSettings: this.conversation.settings.adSettings }; } - - - addAd(): void { - this.ads.push(''); - } - - - removeAd(index: number): void { - if (confirm('Are you sure you wish to remove this ad?')) { - this.ads.splice(index, 1); - } - } - - - moveAdUp(index: number): void { - const ad = this.ads.splice(index, 1); - - this.ads.splice(index - 1, 0, ad[0]); - } - - - moveAdDown(index: number): void { - const ad = this.ads.splice(index, 1); - - this.ads.splice(index + 1, 0, ad[0]); - } - } - - diff --git a/chat/ConversationView.vue b/chat/ConversationView.vue index dde1e32..aa32cb4 100644 --- a/chat/ConversationView.vue +++ b/chat/ConversationView.vue @@ -50,16 +50,31 @@ {{l('chat.report')}} - + + + + + + + + + + + + +
+ + + + + + + +
+ + +
+
@@ -91,7 +106,7 @@
{{l('admgr.renew')}} - {{l('admgr.setup')}} + {{l('admgr.setup')}}
@@ -130,23 +145,24 @@
{{l('chat.send')}}
+ @@ -166,6 +182,7 @@ import CommandHelp from './CommandHelp.vue'; import { characterImage, getByteLength, getKey } from './common'; import ConversationSettings from './ConversationSettings.vue'; + import ConversationAdSettings from './ConversationAdSettings.vue'; import core from './core'; import {Channel, channelModes, Character, Conversation, Settings} from './interfaces'; import l from './localize'; @@ -177,13 +194,14 @@ import UserView from './UserView.vue'; import UserChannelList from './UserChannelList.vue'; import * as _ from 'lodash'; + import Dropdown from '../components/Dropdown.vue'; @Component({ components: { user: UserView, 'bbcode-editor': Editor, 'manage-channel': ManageChannel, settings: ConversationSettings, logs: Logs, 'message-view': MessageView, bbcode: BBCodeView(core.bbCodeParser), 'command-help': CommandHelp, - 'ad-view': AdView, 'channel-list': UserChannelList + 'ad-view': AdView, 'channel-list': UserChannelList, dropdown: Dropdown, adSettings: ConversationAdSettings } }) export default class ConversationView extends Vue { @@ -447,6 +465,10 @@ (this.$refs['settingsDialog']).show(); } + showAdSettings(): void { + (this.$refs['adSettingsDialog']).show(); + } + showManage(): void { (this.$refs['manageDialog']).show(); } @@ -573,6 +595,47 @@ } } + .btn-toolbar { + .btn-group { + margin-right: 0.3rem; + + &:last-child { + margin-right: 0; + } + + a.btn { + padding-left: 0.5rem; + padding-right: 0.5rem; + + i { + margin-right: 0.4rem; + font-size: 90%; + } + } + + button::before { + display: inline-block; + width: 1.3rem; + height: 1rem; + content: ''; + margin-left: -1.3rem; + margin-right: 0.1rem; + padding-left: 0.3rem; + font-weight: bold; + } + + button.selected::before { + content: '✓'; + } + + &.views { + button.selected::before { + content: '•'; + } + } + } + } + .send-ads-switcher a { padding: 3px 10px; } @@ -584,13 +647,14 @@ .auto-ads { - background-color: rgba(255, 128, 32, 0.8); + background-color: rgb(220, 113, 31); padding-left: 10px; padding-right: 10px; padding-top: 5px; padding-bottom: 5px; margin: 0; position: relative; + margin-top: 5px; .renew-autoposts { display: block; diff --git a/chat/StatusPicker.vue b/chat/StatusPicker.vue index a5cc60e..ca3de7d 100644 --- a/chat/StatusPicker.vue +++ b/chat/StatusPicker.vue @@ -21,14 +21,13 @@ \ No newline at end of file + diff --git a/readme.md b/readme.md index f4d654b..d88a5df 100644 --- a/readme.md +++ b/readme.md @@ -31,7 +31,7 @@ This repository contains a heavily customized version of the mainline F-Chat 3.0 * Custom kink explanations can be expanded inline * Custom kinks are highlighted * Gender, anthro/human preference, age, sexual preference, and sub/dom preference are highlighted if compatible or incompatible - * Guestbook, friend, and group counts are visible on tabs + * Guestbook, friend, and group counts are visible on tab titles * Character images are expanded inline * Cleaner presentation for the side bar details (age, etc.), sorted in most relevant order * Less informative side bar details (views, contact) are separated and shown in a less prominent way @@ -55,17 +55,26 @@ This repository contains a heavily customized version of the mainline F-Chat 3.0 ## How to Set Up Ads -1. Open a conversation channel of your preference, such as `#LFRP` -1. Click `Tab Settings` -1. Enter one or more `Channel Auto-Posting Ads` +1. Open a conversation channel of your preference, such as `#Sex Driven LFRP` +1. Locate `Ads` dropdown at the top right corner of the channel view +1. Click `Ads > Edit Channel Ads` +1. Enter one or more ads 1. Click `Save settings` -1. Click `Auto-Post Ads` +1. Click `Ads > Start Posting Ads` +1. To stop, click `Ads > Stop Posting Ads` ## FAQ -1. The more information you have in your profile (**non-custom** kinks in particular), the better the matching quality will be. -1. Non-binary gender preference matching relies on kinks. For example, if your non-binary character has a preference for females, make sure 'females' are listed as a favorite kink. +1. The more information you have in your profile (**non-custom** kinks in particular), the better the matching quality will be. The algorithm considers the following data points: + * Age + * Gender + * Sexual preference + * Dominance preference + * Human/anthro preference + * Non-custom kinks + * Species +1. Maching for non-binary genders relies on kinks. For example, if your non-binary character has a preference for females, make sure 'females' are listed as a favorite kink. 1. 'Underage' kink is considered to apply to characters aged 16 or above; 'ageplay' kink is considered to apply to characters aged 16 or below. 1. 'Older characters' and 'younger characters' kink preferences are interpreted as age difference of 5+ years. 1. Comparison results will get faster over time, as more and more character data is cached. @@ -75,15 +84,10 @@ This repository contains a heavily customized version of the mainline F-Chat 3.0 * Collect data on ads / responses to determine which ads work best * Preview mode should allow detaching from the main window -* Split chat view / separate window for specific chats? * Improve log browsing -* Reposition ad settings and toggle -* Save character's status messages * Conversation bot API * 'Filter unmatching ads' is not channel specific -- it's either on everywhere or nowhere -* AD UI Cleanup / hide to popovers? -* image loading animation -* Usually submissive vs usually submissive shows up as 'maybe'? +* Bug? Usually submissive vs usually submissive shows up as 'maybe' # F-List Exported