diff --git a/chat/AdView.vue b/chat/AdView.vue index ab4ff11..4b5db58 100644 --- a/chat/AdView.vue +++ b/chat/AdView.vue @@ -1,7 +1,7 @@ @@ -107,12 +112,13 @@ import core from './core'; import {Character, Connection, Conversation} from './interfaces'; import l from './localize'; + import PmPartnerAdder from './PmPartnerAdder.vue'; import RecentConversations from './RecentConversations.vue'; import ReportDialog from './ReportDialog.vue'; import SettingsView from './SettingsView.vue'; import Sidebar from './Sidebar.vue'; import StatusSwitcher from './StatusSwitcher.vue'; - import {getStatusIcon} from './user_view'; + import {getStatusIcon} from './UserView.vue'; import UserList from './UserList.vue'; import UserMenu from './UserMenu.vue'; import ImagePreview from './ImagePreview.vue'; @@ -128,7 +134,8 @@ 'user-list': UserList, channels: ChannelList, 'status-switcher': StatusSwitcher, 'character-search': CharacterSearch, settings: SettingsView, conversation: ConversationView, 'report-dialog': ReportDialog, sidebar: Sidebar, 'user-menu': UserMenu, 'recent-conversations': RecentConversations, - 'image-preview': ImagePreview + 'image-preview': ImagePreview, + 'add-pm-partner': PmPartnerAdder } }) export default class ChatView extends Vue { @@ -294,6 +301,10 @@ (this.$refs['statusDialog']).show(); } + showAddPmPartner(): void { + (this.$refs['addPmPartnerDialog']).show(); + } + userMenuHandle(e: MouseEvent | TouchEvent): void { (this.$refs['userMenu']).handleEvent(e); } @@ -329,6 +340,12 @@ user-select: text; } + .pm-add { + font-size: 90%; + float: right; + margin-right: 5px; + } + .list-group.conversation-nav { margin-bottom: 10px; .list-group-item { diff --git a/chat/ConversationView.vue b/chat/ConversationView.vue index a945409..5846c82 100644 --- a/chat/ConversationView.vue +++ b/chat/ConversationView.vue @@ -4,7 +4,7 @@
- + {{l('logs.title')}} @@ -17,6 +17,10 @@ Ads + + + Channels +
{{l('status.' + conversation.character.status)}} @@ -140,7 +144,8 @@ - + +
@@ -163,13 +168,14 @@ import MessageView from './message_view'; import ReportDialog from './ReportDialog.vue'; import {isCommand} from './slash_commands'; - import UserView from './user_view'; + import UserView from './UserView.vue'; + import UserChannelList from './UserChannelList.vue'; @Component({ components: { user: UserView, 'bbcode-editor': Editor, 'manage-channel': ManageChannel, settings: ConversationSettings, logs: Logs, 'message-view': MessageView, bbcode: BBCodeView, 'command-help': CommandHelp, - 'ad-view': AdView + 'ad-view': AdView, 'channel-list': UserChannelList } }) export default class ConversationView extends Vue { @@ -411,6 +417,10 @@ (this.$refs['adViewer']).show(); } + showChannels(): void { + (this.$refs['channelList']).show(); + } + isAutopostingAds(): boolean { return this.conversation.adManager.isActive(); @@ -635,6 +645,43 @@ } } + + .user-view { + .match-found { + margin-left: 3px; + padding-left: 2px; + padding-right: 2px; + border-radius: 3px; + color: rgba(255, 255, 255, 0.8); + font-size: 75%; + padding-top: 0; + padding-bottom: 0; + text-align: center; + display: inline-block; + text-transform: uppercase; + + &.match { + background-color: rgb(0, 142, 0); + border: solid 1px rgb(0, 113, 0); + } + + &.weak-match { + background-color: rgb(0, 80, 0); + border: 1px solid rgb(0, 64, 0); + } + + &.weak-mismatch { + background-color: rgb(152, 134, 0); + border: 1px solid rgb(142, 126, 0); + } + + &.mismatch { + background-color: rgb(171, 0, 0); + border: 1px solid rgb(128, 0, 0); + } + } + } + .message { &.message-event { font-size: 85%; diff --git a/chat/PmPartnerAdder.vue b/chat/PmPartnerAdder.vue new file mode 100644 index 0000000..c6aacc7 --- /dev/null +++ b/chat/PmPartnerAdder.vue @@ -0,0 +1,40 @@ + + + + diff --git a/chat/RecentConversations.vue b/chat/RecentConversations.vue index f6f2bb3..be98bc3 100644 --- a/chat/RecentConversations.vue +++ b/chat/RecentConversations.vue @@ -24,7 +24,7 @@ import core from './core'; import {Character, Conversation} from './interfaces'; import l from './localize'; - import UserView from './user_view'; + import UserView from './UserView.vue'; @Component({ components: {'user-view': UserView, 'channel-view': ChannelView, modal: Modal, tabs: Tabs} diff --git a/chat/StatusSwitcher.vue b/chat/StatusSwitcher.vue index 9bed284..d36d53e 100644 --- a/chat/StatusSwitcher.vue +++ b/chat/StatusSwitcher.vue @@ -30,7 +30,7 @@ import core from './core'; import {Character, userStatuses} from './interfaces'; import l from './localize'; - import {getStatusIcon} from './user_view'; + import {getStatusIcon} from './UserView.vue'; @Component({ components: {modal: Modal, editor: Editor, dropdown: Dropdown} diff --git a/chat/UserChannelList.vue b/chat/UserChannelList.vue new file mode 100644 index 0000000..d0c2ea6 --- /dev/null +++ b/chat/UserChannelList.vue @@ -0,0 +1,76 @@ + + + + + + + \ No newline at end of file diff --git a/chat/UserList.vue b/chat/UserList.vue index f52b652..9ecd8cd 100644 --- a/chat/UserList.vue +++ b/chat/UserList.vue @@ -36,7 +36,7 @@ import {Channel, Character, Conversation} from './interfaces'; import l from './localize'; import Sidebar from './Sidebar.vue'; - import UserView from './user_view'; + import UserView from './UserView.vue'; @Component({ components: {user: UserView, sidebar: Sidebar, tabs: Tabs} diff --git a/chat/UserMenu.vue b/chat/UserMenu.vue index 8d2bd5d..8cd7d09 100644 --- a/chat/UserMenu.vue +++ b/chat/UserMenu.vue @@ -21,6 +21,9 @@ {{l('user.memo')}} {{l('user.' + (character.isBookmarked ? 'unbookmark' : 'bookmark'))}} + + Show ad log + {{l('user.' + (isHidden ? 'unhide' : 'hide'))}} @@ -36,6 +39,7 @@
{{getByteLength(memo)}} / 1000
+
@@ -43,6 +47,7 @@ import {Component, Prop} from '@f-list/vue-ts'; import Vue from 'vue'; import Modal from '../components/Modal.vue'; + import AdView from './AdView.vue'; import {BBCodeView} from './bbcode'; import {characterImage, errorToString, getByteLength, profileLink} from './common'; import core from './core'; @@ -51,7 +56,7 @@ import ReportDialog from './ReportDialog.vue'; @Component({ - components: {bbcode: BBCodeView, modal: Modal} + components: {bbcode: BBCodeView, modal: Modal, 'ad-view': AdView} }) export default class UserMenu extends Vue { @Prop({required: true}) @@ -120,6 +125,30 @@ .catch((e: object) => alert(errorToString(e))); } + + showAdLogs(): void { + if (!this.hasAdLogs()) { + return; + } + + (this.$refs['adViewDialog']).show(); + } + + + hasAdLogs(): boolean { + if (!this.character) { + return false; + } + + const cache = core.cache.adCache.get(this.character.name); + + if (!cache) { + return false; + } + + return (cache.count() > 0); + } + get isChannelMod(): boolean { if(this.channel === undefined) return false; if(core.characters.ownCharacter.isChatOp) return true; diff --git a/chat/UserView.vue b/chat/UserView.vue new file mode 100644 index 0000000..e21c29a --- /dev/null +++ b/chat/UserView.vue @@ -0,0 +1,219 @@ + + + + + + diff --git a/chat/bbcode.ts b/chat/bbcode.ts index 19121bb..17e95f3 100644 --- a/chat/bbcode.ts +++ b/chat/bbcode.ts @@ -8,7 +8,7 @@ import {characterImage} from './common'; import core from './core'; import {Character} from './interfaces'; import {default as UrlView} from '../bbcode/UrlTagView.vue'; -import UserView from './user_view'; +import UserView from './UserView.vue'; export const BBCodeView: Component = { functional: true, diff --git a/chat/event-bus.ts b/chat/event-bus.ts index f9087f9..0eea540 100644 --- a/chat/event-bus.ts +++ b/chat/event-bus.ts @@ -9,6 +9,7 @@ import ChannelConversation = Conversation.ChannelConversation; * 'imagepreview-show': {url: string} * 'imagepreview-toggle-stickyness': {url: string} * 'character-data': {character: Character} + * 'character-score': {character: Character, score: number} * 'private-message': {message: Message} * 'channel-ad': {message: Message, channel: Conversation, profile: ComplexCharacter | undefined} * 'channel-message': {message: Message, channel: Conversation} diff --git a/chat/message_view.ts b/chat/message_view.ts index 6bfee6b..0d47550 100644 --- a/chat/message_view.ts +++ b/chat/message_view.ts @@ -6,7 +6,7 @@ import {BBCodeView} from './bbcode'; import {formatTime} from './common'; import core from './core'; import {Conversation} from './interfaces'; -import UserView from './user_view'; +import UserView from './UserView.vue'; const userPostfix: {[key: number]: string | undefined} = { [Conversation.Message.Type.Message]: ': ', diff --git a/chat/user_view.ts b/chat/user_view.ts deleted file mode 100644 index 75941db..0000000 --- a/chat/user_view.ts +++ /dev/null @@ -1,58 +0,0 @@ -// TODO convert this to single-file once Vue supports it for functional components. -//template: -// {{character.name}} - -import Vue, {CreateElement, RenderContext, VNode} from 'vue'; -import {Channel, Character} from '../fchat'; -import core from './core'; - -export function getStatusIcon(status: Character.Status): string { - switch(status) { - case 'online': - return 'far fa-user'; - case 'looking': - return 'fa fa-eye'; - case 'dnd': - return 'fa fa-minus-circle'; - case 'offline': - return 'fa fa-ban'; - case 'away': - return 'far fa-circle'; - case 'busy': - return 'fa fa-cog'; - case 'idle': - return 'far fa-clock'; - case 'crown': - return 'fa fa-birthday-cake'; - } -} - -//tslint:disable-next-line:variable-name -const UserView = Vue.extend({ - functional: true, - render(this: void | Vue, createElement: CreateElement, context?: RenderContext): VNode { - const props = <{character: Character, channel?: Channel, showStatus?: true, bookmark?: false}>( - context !== undefined ? context.props : (this).$options.propsData); - const character = props.character; - let rankIcon; - if(character.isChatOp) rankIcon = 'far fa-gem'; - else if(props.channel !== undefined) - rankIcon = props.channel.owner === character.name ? 'fa fa-key' : props.channel.opList.indexOf(character.name) !== -1 ? - (props.channel.id.substr(0, 4) === 'adh-' ? 'fa fa-shield-alt' : 'fa fa-star') : ''; - else rankIcon = ''; - const children: (VNode | string)[] = [character.name]; - if(rankIcon !== '') children.unshift(createElement('span', {staticClass: rankIcon})); - if(props.showStatus !== undefined || character.status === 'crown') - children.unshift(createElement('span', {staticClass: `fa-fw ${getStatusIcon(character.status)}`})); - const gender = character.gender !== undefined ? character.gender.toLowerCase() : 'none'; - const isBookmark = props.bookmark !== false && core.connection.isOpen && core.state.settings.colorBookmarks && - (character.isFriend || character.isBookmarked); - return createElement('span', { - attrs: {class: `user-view gender-${gender}${isBookmark ? ' user-bookmark' : ''}`}, - domProps: {character, channel: props.channel, bbcodeTag: 'user'} - }, children); - } -}); - -export default UserView; \ No newline at end of file diff --git a/learn/cache-manager.ts b/learn/cache-manager.ts index e5d3482..06fc6aa 100644 --- a/learn/cache-manager.ts +++ b/learn/cache-manager.ts @@ -3,7 +3,7 @@ import core from '../chat/core'; import { ChannelAdEvent, ChannelMessageEvent, CharacterDataEvent, EventBus } from '../chat/event-bus'; import { Conversation } from '../chat/interfaces'; import { methods } from '../site/character_page/data_store'; -import { Character } from '../site/character_page/interfaces'; +import { Character as ComplexCharacter } from '../site/character_page/interfaces'; import { Gender } from './matcher'; import { AdCache } from './ad-cache'; import { ChannelConversationCache } from './channel-conversation-cache'; @@ -74,7 +74,15 @@ export class CacheManager { } - updateAdScoringForProfile(c: Character, score: number): void { + updateAdScoringForProfile(c: ComplexCharacter, score: number): void { + EventBus.$emit( + 'character-score', + { + character: c, + score + } + ); + _.each( core.conversations.channelConversations, (ch: ChannelConversation) => { @@ -92,7 +100,7 @@ export class CacheManager { } - async addProfile(character: string | Character): Promise { + async addProfile(character: string | ComplexCharacter): Promise { if (typeof character === 'string') { // console.log('Learn discover', character); @@ -237,7 +245,7 @@ export class CacheManager { } - setProfile(c: Character): void { + setProfile(c: ComplexCharacter): void { this.characterProfiler = new CharacterProfiler(c, this.adCache); } } diff --git a/learn/profile-cache.ts b/learn/profile-cache.ts index 0c3681e..cbbcefb 100644 --- a/learn/profile-cache.ts +++ b/learn/profile-cache.ts @@ -30,6 +30,17 @@ export class ProfileCache extends AsyncCache { } + getSync(name: string): CharacterCacheRecord | null { + const key = AsyncCache.nameKey(name); + + if (key in this.cache) { + return this.cache[key]; + } + + return null; + } + + async get(name: string, skipStore: boolean = false): Promise { const key = AsyncCache.nameKey(name); diff --git a/readme.md b/readme.md index 29d66c7..77ab7d5 100644 --- a/readme.md +++ b/readme.md @@ -6,8 +6,8 @@ This repository contains a modified version of the mainline F-Chat 3.0 client. ## Key Differences * Ads view - * Highlight ads from characters most interesting to you / hide ads from characters clearly incompatible - * View recent ads from a character on any channel to which you subscribe + * Highlight ads from characters most interesting to you + * View a character's recent ads * Ad auto-posting * Manage channel's ad settings via "Tab Settings" * Automatically re-post ads every 11-18 minutes (randomized) for up to 180 minutes @@ -35,6 +35,11 @@ This repository contains a modified version of the mainline F-Chat 3.0 client. * Improvements to log browsing * Fix broken BBCode, such as `[big]` in character profiles * Which channels my chart partner is on? +* Reposition ad settings and toggle +* Cache image list, guestbook pages +* Bug: Invalid Ticket +* Bug: Posting on the same second +* Bug: Images tab count is off # F-List Exported