From 8810b29552d898ea08d9e86a28d6ee4091e623e8 Mon Sep 17 00:00:00 2001 From: MayaWolf Date: Fri, 28 Sep 2018 02:08:10 +0200 Subject: [PATCH] 3.0.9 --- chat/Chat.vue | 2 +- chat/ConversationView.vue | 17 +- chat/Logs.vue | 1 + chat/SettingsView.vue | 2 +- chat/bbcode.ts | 1 + chat/conversations.ts | 18 +- chat/localize.ts | 4 +- chat/message_view.ts | 13 +- chat/notifications.ts | 5 +- electron/Window.vue | 31 +- electron/common.ts | 1 + electron/index.html | 1 + electron/main.ts | 30 +- electron/pack.js | 3 +- electron/package.json | 2 +- electron/webpack.config.js | 10 +- electron/window.html | 1 + mobile/Index.vue | 2 +- mobile/android/app/build.gradle | 4 +- .../kotlin/net/f_list/fchat/MainActivity.kt | 52 + .../kotlin/net/f_list/fchat/Notifications.kt | 10 +- mobile/ios/F-Chat/ViewController.swift | 27 +- mobile/package.json | 2 +- package.json | 38 +- readme.md | 2 +- scss/_chat.scss | 46 +- scss/themes/variables/_light_variables.scss | 2 +- webchat/chat.ts | 3 +- webchat/logs.ts | 2 +- webchat/package.json | 2 +- yarn.lock | 2474 ++++++++++------- 31 files changed, 1733 insertions(+), 1075 deletions(-) diff --git a/chat/Chat.vue b/chat/Chat.vue index b72f08b..e419604 100644 --- a/chat/Chat.vue +++ b/chat/Chat.vue @@ -99,7 +99,7 @@ return; } const selection = document.getSelection(); - if(selection.isCollapsed) return; + if(selection === null || selection.isCollapsed) return; const range = selection.getRangeAt(0); let start = range.startContainer, end = range.endContainer; let startValue: string; diff --git a/chat/ConversationView.vue b/chat/ConversationView.vue index 15c589e..f9f2ae7 100644 --- a/chat/ConversationView.vue +++ b/chat/ConversationView.vue @@ -187,8 +187,9 @@ }]; window.addEventListener('resize', this.resizeHandler = () => this.keepScroll()); window.addEventListener('keypress', this.keypressHandler = () => { - if(document.getSelection().isCollapsed && !anyDialogsShown && - (document.activeElement === document.body || document.activeElement.tagName === 'A')) + const selection = document.getSelection(); + if((selection === null || selection.isCollapsed) && !anyDialogsShown && + (document.activeElement === document.body || document.activeElement === null || document.activeElement.tagName === 'A')) (this.$refs['textBox']).focus(); }); window.addEventListener('keydown', this.keydownHandler = ((e: KeyboardEvent) => { @@ -211,11 +212,9 @@ this.adsMode = l('channel.mode.ads'); } else this.adsMode = l('channel.mode.ads.countdown', Math.floor(diff / 60), Math.floor(diff % 60)); }; - if(Date.now() < value) { - if(this.adCountdown === 0) - this.adCountdown = window.setInterval(setAdCountdown, 1000); - setAdCountdown(); - } + if(Date.now() < value && this.adCountdown === 0) + this.adCountdown = window.setInterval(setAdCountdown, 1000); + setAdCountdown(); }); } @@ -261,11 +260,13 @@ } keepScroll(): void { - if(this.scrolledDown) + if(this.scrolledDown) { + this.ignoreScroll = true; this.$nextTick(() => setTimeout(() => { this.ignoreScroll = true; this.messageView.scrollTop = this.messageView.scrollHeight; }, 0)); + } } onMessagesScroll(): void { diff --git a/chat/Logs.vue b/chat/Logs.vue index d4ced14..342efb9 100644 --- a/chat/Logs.vue +++ b/chat/Logs.vue @@ -205,6 +205,7 @@ if(getKey(e) === Keys.KeyA && (e.ctrlKey || e.metaKey) && !e.altKey && !e.shiftKey) { e.preventDefault(); const selection = document.getSelection(); + if(selection === null) return; selection.removeAllRanges(); if(this.messages.length > 0) { const range = document.createRange(); diff --git a/chat/SettingsView.vue b/chat/SettingsView.vue index bf44b5b..47a776d 100644 --- a/chat/SettingsView.vue +++ b/chat/SettingsView.vue @@ -216,7 +216,7 @@ async submit(): Promise { const idleTimer = parseInt(this.idleTimer, 10); - const fontSize = parseInt(this.fontSize, 10); + const fontSize = parseFloat(this.fontSize); core.state.settings = { playSound: this.playSound, clickOpensMessage: this.clickOpensMessage, diff --git a/chat/bbcode.ts b/chat/bbcode.ts index 32e73bf..7a315e1 100644 --- a/chat/bbcode.ts +++ b/chat/bbcode.ts @@ -17,6 +17,7 @@ export const BBCodeView: Component = { insert(node: VNode): void { node.elm!.appendChild(core.bbCodeParser.parseEverything( context.props.text !== undefined ? context.props.text : context.props.unsafeText)); + if(context.props.afterInsert !== undefined) context.props.afterInsert(node.elm); }, destroy(node: VNode): void { const element = ((node.elm).firstChild); diff --git a/chat/conversations.ts b/chat/conversations.ts index 912127f..7180ca0 100644 --- a/chat/conversations.ts +++ b/chat/conversations.ts @@ -613,30 +613,36 @@ export default function(this: void): Interfaces.State { if(conv !== undefined) conv.typingStatus = data.status; }); connection.onMessage('CBU', async(data, time) => { - const text = l('events.ban', data.channel, data.character, data.operator); const conv = state.channelMap[data.channel.toLowerCase()]; if(conv === undefined) return core.channels.leave(data.channel); + const text = l('events.ban', conv.name, data.character, data.operator); conv.infoText = text; return addEventMessage(new EventMessage(text, time)); }); connection.onMessage('CKU', async(data, time) => { - const text = l('events.kick', data.channel, data.character, data.operator); const conv = state.channelMap[data.channel.toLowerCase()]; if(conv === undefined) return core.channels.leave(data.channel); + const text = l('events.kick', conv.name, data.character, data.operator); conv.infoText = text; return addEventMessage(new EventMessage(text, time)); }); connection.onMessage('CTU', async(data, time) => { - const text = l('events.timeout', data.channel, data.character, data.operator, data.length.toString()); const conv = state.channelMap[data.channel.toLowerCase()]; if(conv === undefined) return core.channels.leave(data.channel); + const text = l('events.timeout', conv.name, data.character, data.operator, data.length.toString()); conv.infoText = text; return addEventMessage(new EventMessage(text, time)); }); connection.onMessage('BRO', async(data, time) => { - const text = data.character === undefined ? decodeHTML(data.message) : - l('events.broadcast', `[user]${data.character}[/user]`, decodeHTML(data.message.substr(data.character.length + 23))); - return addEventMessage(new EventMessage(text, time)); + if(data.character !== undefined) { + const content = decodeHTML(data.message.substr(data.character.length + 24)); + const message = new EventMessage(l('events.broadcast', `[user]${data.character}[/user]`, content), time); + await state.consoleTab.addMessage(message); + await core.notifications.notify(state.consoleTab, l('events.broadcast.notification', data.character), content, + characterImage(data.character), 'attention'); + for(const conv of (state.channelConversations).concat(state.privateConversations)) + await conv.addMessage(message); + } else return addEventMessage(new EventMessage(decodeHTML(data.message), time)); }); connection.onMessage('CIU', async(data, time) => { const text = l('events.invite', `[user]${data.sender}[/user]`, `[session=${data.title}]${data.name}[/session]`); diff --git a/chat/localize.ts b/chat/localize.ts index 3e83498..35b9444 100644 --- a/chat/localize.ts +++ b/chat/localize.ts @@ -176,6 +176,7 @@ Current log location: {1}`, 'settings.defaultHighlights': 'Use global highlight words', 'settings.colorBookmarks': 'Show friends/bookmarks in a different colour', 'settings.beta': 'Opt-in to test unstable prerelease updates', + 'settings.hwAcceleration': 'Enable hardware acceleration (requires restart)', 'settings.bbCodeBar': 'Show BBCode formatting bar', 'fixLogs.action': 'Fix corrupted logs', 'fixLogs.text': `There are a few reason log files can become corrupted - log files from old versions with bugs that have since been fixed or incomplete file operations caused by computer crashes are the most common. @@ -221,7 +222,8 @@ Once this process has started, do not interrupt it or your logs will get corrupt 'characterSearch.error.noResults': 'There were no search results.', 'characterSearch.error.throttle': 'You must wait five seconds between searches.', 'characterSearch.error.tooManyResults': 'There are too many search results, please narrow your search.', - 'events.broadcast': '{0} has broadcast {1}', + 'events.broadcast': '{0} has broadcast: {1}', + 'events.broadcast.notification': 'Broadcast from {0}', 'events.invite': '{0} has invited you to join {1}', 'events.error': 'Error: {0}', 'events.rtbCommentReply': '{0} replied to your comment on the {1}: {2}', diff --git a/chat/message_view.ts b/chat/message_view.ts index c0359c0..26d61db 100644 --- a/chat/message_view.ts +++ b/chat/message_view.ts @@ -37,7 +37,18 @@ const MessageView: Component = { userPostfix[message.type] !== undefined ? userPostfix[message.type]! : ' '); if(message.isHighlight) classes += ' message-highlight'; } - children.push(createElement(BBCodeView, {props: {unsafeText: message.text}})); + children.push(createElement(BBCodeView, + {props: {unsafeText: message.text, afterInsert: message.type === Conversation.Message.Type.Ad ? (elm: HTMLElement) => { + setImmediate(() => { + elm = elm.parentElement!; + if(elm.scrollHeight > elm.offsetHeight) { + const expand = document.createElement('div'); + expand.className = 'expand fas fa-caret-down'; + expand.addEventListener('click', function(): void { this.parentElement!.className += ' expanded'; }); + elm.appendChild(expand); + } + }); + } : undefined}})); const node = createElement('div', {attrs: {class: classes}}, children); node.key = context.data.key; return node; diff --git a/chat/notifications.ts b/chat/notifications.ts index 56b34f1..c7729e0 100644 --- a/chat/notifications.ts +++ b/chat/notifications.ts @@ -14,7 +14,8 @@ export default class Notifications implements Interface { async notify(conversation: Conversation, title: string, body: string, icon: string, sound: string): Promise { if(!this.shouldNotify(conversation)) return; this.playSound(sound); - if(core.state.settings.notifications && (Notification).permission === 'granted') { //tslint:disable-line:no-any + if(core.state.settings.notifications && (<{Notification?: object}>window).Notification !== undefined + && Notification.permission === 'granted') { const notification = new Notification(title, this.getOptions(conversation, body, icon)); notification.onclick = () => { conversation.show(); @@ -69,6 +70,6 @@ export default class Notifications implements Interface { } async requestPermission(): Promise { - await Notification.requestPermission(); + if((<{Notification?: object}>window).Notification !== undefined) await Notification.requestPermission(); } } \ No newline at end of file diff --git a/electron/Window.vue b/electron/Window.vue index e321003..a984701 100644 --- a/electron/Window.vue +++ b/electron/Window.vue @@ -1,18 +1,18 @@