Match logic in user menu
This commit is contained in:
Mr. Stallion
parent
2cff4ed63b
commit
d69cab94ec
|
|
@ -1,7 +1,7 @@
|
|||
# Download
|
||||
[Windows](https://github.com/mrstallion/fchat-rising/releases/download/v1.2.0/F-Chat-Rising-1.2.0-win.exe) (75 MB)
|
||||
| [MacOS](https://github.com/mrstallion/fchat-rising/releases/download/v1.2.0/F-Chat-Rising-1.2.0-macos.dmg) (76 MB)
|
||||
| [Linux](https://github.com/mrstallion/fchat-rising/releases/download/v1.2.0/F-Chat-Rising-1.2.0-linux.AppImage) (76 MB)
|
||||
[Windows](https://github.com/mrstallion/fchat-rising/releases/download/v1.3.0/F-Chat-Rising-1.3.0-win.exe) (75 MB)
|
||||
| [MacOS](https://github.com/mrstallion/fchat-rising/releases/download/v1.3.0/F-Chat-Rising-1.3.0-macos.dmg) (76 MB)
|
||||
| [Linux](https://github.com/mrstallion/fchat-rising/releases/download/v1.3.0/F-Chat-Rising-1.3.0-linux.AppImage) (76 MB)
|
||||
|
||||
|
||||
# F-Chat Rising
|
||||
|
|
|
|||
|
|
@ -9,6 +9,11 @@
|
|||
</div>
|
||||
<bbcode id="userMenuStatus" :text="character.statusText" v-show="character.statusText" class="list-group-item"
|
||||
style="max-height:200px;overflow:auto;clear:both"></bbcode>
|
||||
|
||||
<div v-if="match" class="list-group-item menu-character-score">
|
||||
<span v-for="(score, key) in match" :class="score.getRecommendedClass()"><i :class="score.getRecommendedIcon()"></i> {{getTagDesc(key)}}</span>
|
||||
</div>
|
||||
|
||||
<a tabindex="-1" :href="profileLink" target="_blank" v-if="showProfileFirst" class="list-group-item list-group-item-action">
|
||||
<span class="fa fa-fw fa-user"></span>{{l('user.profile')}}</a>
|
||||
<a tabindex="-1" href="#" @click.prevent="openConversation(true)" class="list-group-item list-group-item-action">
|
||||
|
|
@ -44,18 +49,21 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts">
|
||||
import {Component, Prop} from '@f-list/vue-ts';
|
||||
import Vue from 'vue';
|
||||
import {BBCodeView} from '../bbcode/view';
|
||||
import Modal from '../components/Modal.vue';
|
||||
import CharacterAdView from './character/CharacterAdView.vue';
|
||||
import {characterImage, errorToString, getByteLength, profileLink} from './common';
|
||||
import core from './core';
|
||||
import {Channel, Character} from './interfaces';
|
||||
import l from './localize';
|
||||
import ReportDialog from './ReportDialog.vue';
|
||||
import { Component, Prop } from '@f-list/vue-ts';
|
||||
import Vue from 'vue';
|
||||
import { BBCodeView } from '../bbcode/view';
|
||||
import Modal from '../components/Modal.vue';
|
||||
import CharacterAdView from './character/CharacterAdView.vue';
|
||||
import { characterImage, errorToString, getByteLength, profileLink } from './common';
|
||||
import core from './core';
|
||||
import { Channel, Character } from './interfaces';
|
||||
import l from './localize';
|
||||
import ReportDialog from './ReportDialog.vue';
|
||||
import { Matcher, MatchResultScores } from '../learn/matcher';
|
||||
import { TagId } from '../learn/matcher-types';
|
||||
import _ from 'lodash';
|
||||
|
||||
@Component({
|
||||
@Component({
|
||||
components: {bbcode: BBCodeView(core.bbCodeParser), modal: Modal, 'ad-view': CharacterAdView}
|
||||
})
|
||||
export default class UserMenu extends Vue {
|
||||
|
|
@ -72,6 +80,7 @@
|
|||
memo = '';
|
||||
memoId = 0;
|
||||
memoLoading = false;
|
||||
match: MatchResultScores | null = null;
|
||||
|
||||
openConversation(jump: boolean): void {
|
||||
const conversation = core.conversations.getPrivate(this.character!);
|
||||
|
|
@ -195,6 +204,7 @@
|
|||
switch(e.type) {
|
||||
case 'click':
|
||||
if(node.dataset['character'] === undefined)
|
||||
// tslint:disable-next-line no-floating-promises
|
||||
if(node === this.touchedElement) this.openMenu(touch, node.character, node.channel || undefined);
|
||||
else this.onClick(node.character);
|
||||
e.preventDefault();
|
||||
|
|
@ -203,6 +213,7 @@
|
|||
this.touchedElement = node;
|
||||
break;
|
||||
case 'contextmenu':
|
||||
// tslint:disable-next-line no-floating-promises
|
||||
this.openMenu(touch, node.character, node.channel || undefined);
|
||||
e.preventDefault();
|
||||
}
|
||||
|
|
@ -215,12 +226,29 @@
|
|||
this.showContextMenu = false;
|
||||
}
|
||||
|
||||
private openMenu(touch: MouseEvent | Touch, character: Character, channel: Channel | undefined): void {
|
||||
getTagDesc(key: any): any {
|
||||
return TagId[key].toString().replace(/([A-Z])/g, ' $1').trim();
|
||||
}
|
||||
|
||||
private async openMenu(touch: MouseEvent | Touch, character: Character, channel: Channel | undefined): Promise<void> {
|
||||
this.channel = channel;
|
||||
this.character = character;
|
||||
this.characterImage = undefined;
|
||||
this.showContextMenu = true;
|
||||
this.position = {left: `${touch.clientX}px`, top: `${touch.clientY}px`};
|
||||
this.match = null;
|
||||
|
||||
const myProfile = core.characters.ownProfile;
|
||||
const theirProfile = await core.cache.profileCache.get(this.character.name);
|
||||
|
||||
if (myProfile && theirProfile) {
|
||||
const match = Matcher.identifyBestMatchReport(myProfile.character, theirProfile.character.character);
|
||||
|
||||
if (_.keys(match.merged).length > 0) {
|
||||
this.match = match.merged;
|
||||
}
|
||||
}
|
||||
|
||||
this.$nextTick(() => {
|
||||
const menu = <HTMLElement>this.$refs['menu'];
|
||||
this.characterImage = characterImage(character.name);
|
||||
|
|
@ -233,7 +261,7 @@
|
|||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
<style lang="scss">
|
||||
#userMenu .list-group-item {
|
||||
padding: 3px;
|
||||
}
|
||||
|
|
@ -242,4 +270,45 @@
|
|||
border-top-width: 0;
|
||||
z-index: -1;
|
||||
}
|
||||
|
||||
#userMenu {
|
||||
.menu-character-score {
|
||||
span {
|
||||
padding-left: 3px;
|
||||
padding-right: 3px;
|
||||
margin-bottom: 3px;
|
||||
margin-right: 3px;
|
||||
display: inline-block;
|
||||
border: 1px solid;
|
||||
border-radius: 3px;
|
||||
|
||||
i {
|
||||
color: white;
|
||||
}
|
||||
|
||||
&.match {
|
||||
background-color: var(--scoreMatchBg);
|
||||
border: solid 1px var(--scoreMatchFg);
|
||||
}
|
||||
|
||||
&.weak-match {
|
||||
background-color: var(--scoreWeakMatchBg);
|
||||
border: 1px solid var(--scoreWeakMatchFg);
|
||||
}
|
||||
|
||||
&.weak-mismatch {
|
||||
background-color: var(--scoreWeakMismatchBg);
|
||||
border: 1px solid var(--scoreWeakMismatchFg);
|
||||
}
|
||||
|
||||
&.mismatch {
|
||||
background-color: var(--scoreMismatchBg);
|
||||
border: 1px solid var(--scoreMismatchFg);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -169,6 +169,7 @@ export class ImageDomMutator {
|
|||
this.add('myhentaicomics.com', this.getBaseJsMutatorScript(['#entire_image img', 'video', 'img']));
|
||||
this.add('redgifs.com', this.getBaseJsMutatorScript(['video']));
|
||||
this.add('furaffinity.net', this.getBaseJsMutatorScript(['#submissionImg', 'video', 'img']));
|
||||
this.add('rule34.paheal.net', this.getBaseJsMutatorScript(['#main_image', 'video', 'img']));
|
||||
|
||||
this.add(
|
||||
'pornhub.com',
|
||||
|
|
|
|||
|
|
@ -83,8 +83,15 @@
|
|||
|
||||
[url=https://www.redgifs.com/watch/jampackedwaryafricanparadiseflycatcher-strap-on]Redgifs[/url]
|
||||
|
||||
[url=https://rule34.paheal.net/post/view/3035573#search=Mag%27har_Orc]Paheal.net video[/url]
|
||||
|
||||
[url=https://rule34.paheal.net/post/view/3380309#search=Mag%27har_Orc]Paheal.net image[/url]
|
||||
|
||||
[url=https://64.media.tumblr.com/110e76bb4559440b45d4aa26d58c3cf1/df18d6317be38533-e6/s540x810/ec545ae8a930d33f9175b82fa680f4f179ba834d.gifv]Tumblr image[/url]
|
||||
|
||||
[url=https://morphsbymig.tumblr.com/post/621869669856542720/morphsbymig-denise-milani-the-job-interview]Tumblr iframe[/url]
|
||||
|
||||
[url=https://www.furaffinity.net/view/38851727/]Furaffinity[/url]
|
||||
|
||||
|
||||
Broken
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ export interface MatchReport {
|
|||
them: MatchResult;
|
||||
youMultiSpecies: boolean;
|
||||
themMultiSpecies: boolean;
|
||||
merged: MatchResultScores;
|
||||
score: Scoring | null;
|
||||
}
|
||||
|
||||
|
|
@ -78,25 +79,43 @@ const scoreClasses: ScoreClassMap = {
|
|||
[Scoring.MISMATCH]: 'mismatch'
|
||||
};
|
||||
|
||||
const scoreIcons: ScoreClassMap = {
|
||||
[Scoring.MATCH]: 'fas fa-heart',
|
||||
[Scoring.WEAK_MATCH]: 'fas fa-thumbs-up',
|
||||
[Scoring.NEUTRAL]: 'fas fa-meh',
|
||||
[Scoring.WEAK_MISMATCH]: 'fas fa-question-circle',
|
||||
[Scoring.MISMATCH]: 'fas fa-heart-broken'
|
||||
};
|
||||
|
||||
export class Score {
|
||||
readonly score: Scoring;
|
||||
readonly description: string;
|
||||
readonly shortDesc: string;
|
||||
|
||||
constructor(score: Scoring, description: string = '') {
|
||||
constructor(score: Scoring, description: string = '', shortDesc: string = '') {
|
||||
if ((score !== Scoring.NEUTRAL) && (description === ''))
|
||||
throw new Error('Description must be provided if score is not neutral');
|
||||
|
||||
this.score = score;
|
||||
this.description = description;
|
||||
this.shortDesc = shortDesc;
|
||||
}
|
||||
|
||||
getRecommendedClass(): string {
|
||||
return Score.getClasses(this.score);
|
||||
}
|
||||
|
||||
getRecommendedIcon(): string {
|
||||
return Score.getIcon(this.score);
|
||||
}
|
||||
|
||||
static getClasses(score: Scoring): string {
|
||||
return scoreClasses[score];
|
||||
}
|
||||
|
||||
static getIcon(score: Scoring): string {
|
||||
return scoreIcons[score];
|
||||
}
|
||||
}
|
||||
|
||||
export interface CharacterAnalysisVariation {
|
||||
|
|
@ -168,11 +187,15 @@ export class Matcher {
|
|||
const youThem = new Matcher(you, them, yourAnalysis, theirAnalysis);
|
||||
const themYou = new Matcher(them, you, theirAnalysis, yourAnalysis);
|
||||
|
||||
const youThemMatch = youThem.match();
|
||||
const themYouMatch = themYou.match();
|
||||
|
||||
const report: MatchReport = {
|
||||
you: youThem.match(),
|
||||
them: themYou.match(),
|
||||
you: youThemMatch,
|
||||
them: themYouMatch,
|
||||
youMultiSpecies: false,
|
||||
themMultiSpecies: false,
|
||||
merged: Matcher.mergeResults(youThemMatch, themYouMatch),
|
||||
score: null
|
||||
};
|
||||
|
||||
|
|
@ -196,11 +219,15 @@ export class Matcher {
|
|||
const youThem = new Matcher(yourAnalysis.character, theirAnalysis.character, yourAnalysis.analysis, theirAnalysis.analysis);
|
||||
const themYou = new Matcher(theirAnalysis.character, yourAnalysis.character, theirAnalysis.analysis, yourAnalysis.analysis);
|
||||
|
||||
const youThemMatch = youThem.match();
|
||||
const themYouMatch = themYou.match();
|
||||
|
||||
const report: MatchReport = {
|
||||
you: youThem.match(),
|
||||
them: themYou.match(),
|
||||
you: youThemMatch,
|
||||
them: themYouMatch,
|
||||
youMultiSpecies: (yourCharacterAnalyses.length > 1),
|
||||
themMultiSpecies: (theirCharacterAnalyses.length > 1),
|
||||
merged: Matcher.mergeResults(youThemMatch, themYouMatch),
|
||||
score: null
|
||||
};
|
||||
|
||||
|
|
@ -229,6 +256,32 @@ export class Matcher {
|
|||
return bestReport!;
|
||||
}
|
||||
|
||||
|
||||
// tslint:disable-next-line
|
||||
private static mergeResultScores(scores: MatchResultScores, results: MatchResultScores): void {
|
||||
_.each(scores, (v: Score, k: any) => {
|
||||
if (
|
||||
// tslint:disable-next-line no-unsafe-any
|
||||
((!(k in results)) || (v.score < results[k].score))
|
||||
&& (v.score !== Scoring.NEUTRAL)
|
||||
) {
|
||||
results[k] = v;
|
||||
}
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
static mergeResults(you: MatchResult, them: MatchResult): MatchResultScores {
|
||||
const results: MatchResultScores = {} as any;
|
||||
|
||||
Matcher.mergeResultScores(you.scores, results);
|
||||
Matcher.mergeResultScores(them.scores, results);
|
||||
|
||||
return results;
|
||||
}
|
||||
|
||||
|
||||
static generateAnalysisVariations(c: Character): CharacterAnalysisVariation[] {
|
||||
const speciesOptions = Matcher.getAllSpeciesAsStr(c);
|
||||
|
||||
|
|
@ -753,7 +806,7 @@ export class Matcher {
|
|||
const s = Matcher.getMappedSpecies(mySpecies.string);
|
||||
|
||||
if (!s) {
|
||||
console.log('Unknown species', c.name, mySpecies.string);
|
||||
log.silly('matcher.species.unknown', { character: c.name, species: mySpecies.string });
|
||||
}
|
||||
|
||||
return s;
|
||||
|
|
|
|||
Loading…
Reference in New Issue