@@ -383,6 +390,7 @@
risingShowPortraitNearInput!: boolean;
risingShowPortraitInMessage!: boolean;
+ risingShowHighQualityPortraits!: boolean;
risingFilter!: SmartFilterSettings = {} as any;
@@ -427,6 +435,7 @@
this.risingColorblindMode = settings.risingColorblindMode;
this.risingShowPortraitNearInput = settings.risingShowPortraitNearInput;
this.risingShowPortraitInMessage = settings.risingShowPortraitInMessage;
+ this.risingShowHighQualityPortraits = settings.risingShowHighQualityPortraits;
this.risingFilter = settings.risingFilter;
}
@@ -490,6 +499,7 @@
risingShowUnreadOfflineCount: this.risingShowUnreadOfflineCount,
risingShowPortraitNearInput: this.risingShowPortraitNearInput,
risingShowPortraitInMessage: this.risingShowPortraitInMessage,
+ risingShowHighQualityPortraits: this.risingShowHighQualityPortraits,
risingColorblindMode: this.risingColorblindMode,
risingFilter: {
diff --git a/chat/common.ts b/chat/common.ts
index 0471c89..6fb3a41 100644
--- a/chat/common.ts
+++ b/chat/common.ts
@@ -63,6 +63,7 @@ export class Settings implements ISettings {
risingColorblindMode = false;
risingShowPortraitNearInput = true;
risingShowPortraitInMessage = true;
+ risingShowHighQualityPortraits = true;
risingFilter = {
hideAds: false,
diff --git a/chat/interfaces.ts b/chat/interfaces.ts
index f79f9af..64d99b7 100644
--- a/chat/interfaces.ts
+++ b/chat/interfaces.ts
@@ -237,6 +237,7 @@ export namespace Settings {
readonly risingColorblindMode: boolean;
readonly risingShowPortraitNearInput: boolean;
readonly risingShowPortraitInMessage: boolean;
+ readonly risingShowHighQualityPortraits: boolean;
readonly risingFilter: SmartFilterSettings;
}
diff --git a/electron/blocker/blocker.ts b/electron/blocker/blocker.ts
index ce20a42..d1ab188 100644
--- a/electron/blocker/blocker.ts
+++ b/electron/blocker/blocker.ts
@@ -5,6 +5,7 @@ import path from 'path';
import fs from 'fs';
import * as _ from 'lodash';
import * as electron from 'electron';
+import { NetworkFilter } from '@cliqz/adblocker';
export class BlockerIntegration {
protected static readonly adBlockerLists = [
@@ -53,13 +54,17 @@ export class BlockerIntegration {
log.debug('adblock.session.created');
+ blocker.update({
+ newNetworkFilters: [
+ NetworkFilter.parse('@@||redgifs.com')!,
+ ]
+ });
+
blocker.enableBlockingInSession(session);
- // blocker.enableBlockingInSession(electron.session.defaultSession);
log.debug('adblock.enabled');
BlockerIntegration.configureBlocker(blocker, session);
- // BlockerIntegration.configureBlocker(blocker, electron.session.defaultSession);
log.debug('adblock.session.attached');
diff --git a/learn/profile-cache.ts b/learn/profile-cache.ts
index 48bf84d..d1dca9f 100644
--- a/learn/profile-cache.ts
+++ b/learn/profile-cache.ts
@@ -72,7 +72,7 @@ export class ProfileCache extends AsyncCache
{
}
- async get(name: string, skipStore: boolean = false, fromChannel?: string): Promise {
+ async get(name: string, skipStore: boolean = false, _fromChannel?: string): Promise {
const key = AsyncCache.nameKey(name);
if (key in this.cache) {
@@ -149,7 +149,7 @@ export class ProfileCache extends AsyncCache {
}
}
- isSafeImageURL(url: string): boolean {
+ static isSafeRisingPortraitURL(url: string): boolean {
if (url.match(/^https?:\/\/static\.f-list\.net\//i)) {
return true;
}
@@ -177,14 +177,26 @@ export class ProfileCache extends AsyncCache {
return false;
}
- updateOverrides(c: ComplexCharacter): void {
- const match = c.character.description.match(/\[url=(.*?)]\s*?Rising\s*?Portrait\s*?\[\/url]/i);
+ static detectRisingPortraitURL(description: string): string | null {
+ if (!core.state.settings.risingShowHighQualityPortraits) {
+ return null;
+ }
+
+ const match = description.match(/\[url=(.*?)]\s*?Rising\s*?Portrait\s*?\[\/url]/i);
if (match && match[1]) {
- const avatarUrl = match[1].trim();
+ return match[1].trim();
+ }
- if (!this.isSafeImageURL(avatarUrl)) {
- log.info('portrait.hq.invalid.domain', { name: c.character.name, url: avatarUrl });
+ return null;
+ }
+
+ updateOverrides(c: ComplexCharacter): void {
+ const avatarUrl = ProfileCache.detectRisingPortraitURL(c.character.description);
+
+ if (avatarUrl) {
+ if (!ProfileCache.isSafeRisingPortraitURL(avatarUrl)) {
+ log.info('portrait.hq.invalid.domain', { name, url: avatarUrl });
return;
}
@@ -199,7 +211,6 @@ export class ProfileCache extends AsyncCache {
}
}
-
async register(c: ComplexCharacter, skipStore: boolean = false): Promise {
const k = AsyncCache.nameKey(c.character.name);
const match = ProfileCache.match(c);
diff --git a/learn/recommend/profile-recommendation.ts b/learn/recommend/profile-recommendation.ts
index 9062775..26c8539 100644
--- a/learn/recommend/profile-recommendation.ts
+++ b/learn/recommend/profile-recommendation.ts
@@ -4,6 +4,7 @@ import Axios from 'axios';
import { CharacterAnalysis, Matcher } from '../matcher';
import { FurryPreference, Kink, mammalSpecies, Species } from '../matcher-types';
import { characterImage } from '../../chat/common';
+import { ProfileCache } from '../profile-cache';
export enum ProfileRecommendationLevel {
INFO = 'info',
@@ -39,6 +40,7 @@ export class ProfileRecommendationAnalyzer {
this.recommendations = [];
await this.checkPortrait();
+ await this.checkHqPortrait();
this.checkMissingProperties();
this.checkSpeciesPreferences();
@@ -53,15 +55,25 @@ export class ProfileRecommendationAnalyzer {
}
protected async checkPortrait(): Promise {
- const profileUrl = characterImage(this.profile.character.name);
+ const portraitUrl = characterImage(this.profile.character.name);
- const result = await Axios.head(profileUrl);
+ const result = await Axios.head(portraitUrl);
if (_.trim(result.headers['etag'] || '', '"').trim().toLowerCase() === '639d154d-16c3') {
this.add(`ADD_AVATAR`, ProfileRecommendationLevel.CRITICAL, 'Add an avatar portrait', 'Profiles with an avatar portrait stand out in chats.', 'https://wiki.f-list.net/Guide:_Character_Profiles#Avatar');
}
}
+ protected async checkHqPortrait(): Promise {
+ const profileUrl = ProfileCache.detectRisingPortraitURL(this.profile.character.description);
+
+ if (!profileUrl) {
+ this.add(`ADD_HQ_AVATAR`, ProfileRecommendationLevel.CRITICAL, 'Add a high-quality portrait', 'Profiles with a high-quality portraits stand out in chats with other F-Chat Rising players.', 'https://github.com/hearmeneigh/fchat-rising/wiki/High%E2%80%90Quality-Portraits');
+ } else if (!ProfileCache.isSafeRisingPortraitURL(profileUrl)) {
+ this.add(`ADD_HQ_AVATAR_SAFE_DOMAIN`, ProfileRecommendationLevel.CRITICAL, 'Unsupported high-quality portrait URL', 'High-quality portraits can only point to f-list.net, freeimages.host, e621.net, iili.io, imgur.com, or redgifs.com domains.', 'https://github.com/hearmeneigh/fchat-rising/wiki/High%E2%80%90Quality-Portraits');
+ }
+ }
+
protected checkImages(): void {
if (!this.profile.character.image_count) {
this.add(`ADD_IMAGE`, ProfileRecommendationLevel.CRITICAL, 'Add a profile image', 'Profiles with images are more attractive to other players.', 'https://wiki.f-list.net/Guide:_Character_Profiles#Images');
diff --git a/site/character_page/character_page.vue b/site/character_page/character_page.vue
index 7ebf793..87d9d4d 100644
--- a/site/character_page/character_page.vue
+++ b/site/character_page/character_page.vue
@@ -39,7 +39,7 @@
-
+
@@ -934,4 +934,23 @@
background: var(--headerBackgroundMaskColor) !important;
}
+ .character-description .bbcode {
+ white-space: pre-line !important;
+
+ blockquote {
+ margin: 0;
+ background-color: var(--characterImageWrapperBg);
+ padding: 1em;
+ border-radius: 3px;
+
+ .quoteHeader {
+ border-bottom: 1px solid;
+ text-transform: uppercase;
+ font-weight: bold;
+ font-size: 80%;
+ opacity: 0.7;
+ }
+ }
+ }
+