diff --git a/.gitignore b/.gitignore
index c9dec81..f9a15fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,5 @@
node_modules/
/electron/app
/electron/dist
-/cordova/platforms
-/cordova/plugins
-/cordova/www
+/mobile/www
*.vue.ts
\ No newline at end of file
diff --git a/bbcode/Editor.vue b/bbcode/Editor.vue
index 31654af..fce6018 100644
--- a/bbcode/Editor.vue
+++ b/bbcode/Editor.vue
@@ -1,7 +1,10 @@
<template>
<div class="bbcodeEditorContainer">
<slot></slot>
- <div class="btn-group" role="toolbar">
+ <a tabindex="0" class="btn bbcodeEditorButton bbcode-btn" role="button" @click="showToolbar = true" @blur="showToolbar = false">
+ <span class="fa fa-code"></span></a>
+ <div class="bbcode-toolbar" role="toolbar" :style="showToolbar ? 'display:block' : ''" @mousedown.stop.prevent>
+ <button type="button" class="close" aria-label="Close" style="margin-left:10px" @click="showToolbar = false">×</button>
<div class="bbcodeEditorButton btn" v-for="button in buttons" :title="button.title" @click.prevent.stop="apply(button)">
<span :class="'fa ' + button.icon"></span>
</div>
@@ -11,7 +14,7 @@
</div>
</div>
<div class="bbcodeEditorTextarea">
- <textarea ref="input" :value="text" @input="$emit('input', $event.target.value)" v-show="!preview" :maxlength="maxlength"
+ <textarea ref="input" v-model="text" @input="onInput" v-show="!preview" :maxlength="maxlength"
:class="'bbcodeTextAreaTextArea ' + classes" @keyup="onKeyUp" :disabled="disabled" @paste="onPaste"
:placeholder="placeholder" @keypress="$emit('keypress', $event)" @keydown="onKeyDown"></textarea>
<div class="bbcodePreviewArea" v-show="preview">
@@ -57,9 +60,13 @@
element: HTMLTextAreaElement;
maxHeight: number;
minHeight: number;
+ showToolbar = false;
protected parser: BBCodeParser;
protected defaultButtons = defaultButtons;
private isShiftPressed = false;
+ private undoStack: string[] = [];
+ private undoIndex = 0;
+ private lastInput = 0;
created(): void {
this.parser = new CoreBBCodeParser();
@@ -71,6 +78,12 @@
this.maxHeight = parseInt($element.css('max-height'), 10);
//tslint:disable-next-line:strict-boolean-expressions
this.minHeight = parseInt($element.css('min-height'), 10) || $element.outerHeight() || 50;
+ setInterval(() => {
+ if(Date.now() - this.lastInput >= 500 && this.text !== this.undoStack[0] && this.undoIndex === 0) {
+ if(this.undoStack.length >= 30) this.undoStack.pop();
+ this.undoStack.unshift(this.text);
+ }
+ }, 500);
}
get buttons(): EditorButton[] {
@@ -83,8 +96,12 @@
@Watch('value')
watchValue(newValue: string): void {
- this.text = newValue;
this.$nextTick(() => this.resize());
+ if(this.text === newValue) return;
+ this.text = newValue;
+ this.lastInput = 0;
+ this.undoIndex = 0;
+ this.undoStack = [];
}
getSelection(): EditorSelection {
@@ -138,11 +155,35 @@
if(button.endText === undefined)
button.endText = `[/${button.tag}]`;
this.applyText(button.startText, button.endText);
+ this.lastInput = Date.now();
+ }
+
+ onInput(): void {
+ if(this.undoIndex > 0) {
+ this.undoStack = this.undoStack.slice(this.undoIndex);
+ this.undoIndex = 0;
+ }
+ this.$emit('input', this.text);
+ this.lastInput = Date.now();
}
onKeyDown(e: KeyboardEvent): void {
const key = getKey(e);
- if((e.metaKey || e.ctrlKey) && !e.shiftKey && key !== 'Control' && key !== 'Meta') { //tslint:disable-line:curly
+ if((e.metaKey || e.ctrlKey) && !e.shiftKey && key !== 'control' && key !== 'meta') {
+ if(key === 'z') {
+ e.preventDefault();
+ if(this.undoIndex === 0 && this.undoStack[0] !== this.text) this.undoStack.unshift(this.text);
+ if(this.undoStack.length > this.undoIndex + 1) {
+ this.text = this.undoStack[++this.undoIndex];
+ this.lastInput = Date.now();
+ }
+ } else if(key === 'y') {
+ e.preventDefault();
+ if(this.undoIndex > 0) {
+ this.text = this.undoStack[--this.undoIndex];
+ this.lastInput = Date.now();
+ }
+ }
for(const button of this.buttons)
if(button.key === key) {
e.stopPropagation();
@@ -150,12 +191,12 @@
this.apply(button);
break;
}
- } else if(key === 'Shift') this.isShiftPressed = true;
+ } else if(key === 'shift') this.isShiftPressed = true;
this.$emit('keydown', e);
}
onKeyUp(e: KeyboardEvent): void {
- if(getKey(e) === 'Shift') this.isShiftPressed = false;
+ if(getKey(e) === 'shift') this.isShiftPressed = false;
this.$emit('keyup', e);
}
diff --git a/bbcode/core.ts b/bbcode/core.ts
index 2266de6..f6e399e 100644
--- a/bbcode/core.ts
+++ b/bbcode/core.ts
@@ -1,6 +1,6 @@
import {BBCodeCustomTag, BBCodeParser, BBCodeSimpleTag} from './parser';
-const urlFormat = '((?:(?:https?|ftps?|irc):)?\\/\\/[^\\s\\/$.?#"\']+\\.[^\\s"]*)';
+const urlFormat = '((?:https?|ftps?|irc)://[^\\s/$.?#"\']+\\.[^\\s"]+)';
export const findUrlRegex = new RegExp(`(\\[url[=\\]]\\s*)?${urlFormat}`, 'gi');
export const urlRegex = new RegExp(`^${urlFormat}$`);
diff --git a/bbcode/editor.ts b/bbcode/editor.ts
index 635714e..5fadfc6 100644
--- a/bbcode/editor.ts
+++ b/bbcode/editor.ts
@@ -54,13 +54,13 @@ export let defaultButtons: ReadonlyArray<EditorButton> = [
title: 'Superscript (Ctrl+↑)\n\nLifts text above the text baseline. Makes text slightly smaller. Cannot be nested.',
tag: 'sup',
icon: 'fa-superscript',
- key: 'ArrowUp'
+ key: 'arrowup'
},
{
title: 'Subscript (Ctrl+↓)\n\nPushes text below the text baseline. Makes text slightly smaller. Cannot be nested.',
tag: 'sub',
icon: 'fa-subscript',
- key: 'ArrowDown'
+ key: 'arrowdown'
},
{
title: 'URL (Ctrl+L)\n\nCreates a clickable link to another page of your choosing.',
diff --git a/bbcode/standard.ts b/bbcode/standard.ts
index bb885ca..a6a690d 100644
--- a/bbcode/standard.ts
+++ b/bbcode/standard.ts
@@ -160,7 +160,7 @@ export class StandardBBCodeParser extends CoreBBCodeParser {
const showP1 = showInline.hash.substr(0, 2);
const showP2 = showInline.hash.substr(2, 2);
//tslint:disable-next-line:max-line-length
- $(element).replaceWith(`<div><img class="imageBlock" src="${this.settings.staticDomain}images/charinline/${showP1}/${showP2}/${showInline.hash}.${showInline.extension}"/></div>`);
+ $(element).replaceWith(`<div><img class="inline-image" src="${this.settings.staticDomain}images/charinline/${showP1}/${showP2}/${showInline.hash}.${showInline.extension}"/></div>`);
});
return false;
};
@@ -171,7 +171,7 @@ export class StandardBBCodeParser extends CoreBBCodeParser {
} else {
const outerEl = parser.createElement('div');
const el = parser.createElement('img');
- el.className = 'imageBlock';
+ el.className = 'inline-image';
el.src = `${this.settings.staticDomain}images/charinline/${p1}/${p2}/${inline.hash}.${inline.extension}`;
outerEl.appendChild(el);
parent.appendChild(outerEl);
@@ -179,7 +179,7 @@ export class StandardBBCodeParser extends CoreBBCodeParser {
}
}, (_, element, __, ___) => {
// Need to remove any appended contents, because this is a total hack job.
- if(element.className !== 'imageBlock')
+ if(element.className !== 'inline-image')
return;
while(element.firstChild !== null)
element.removeChild(element.firstChild);
diff --git a/chat/ChannelList.vue b/chat/ChannelList.vue
index 40470c4..4f39161 100644
--- a/chat/ChannelList.vue
+++ b/chat/ChannelList.vue
@@ -1,7 +1,7 @@
<template>
<modal :buttons="false" :action="l('chat.channels')" @close="closed">
<div style="display: flex; flex-direction: column;">
- <ul class="nav nav-tabs">
+ <ul class="nav nav-tabs" style="flex-shrink:0">
<li role="presentation" :class="{active: !privateTabShown}">
<a href="#" @click.prevent="privateTabShown = false">{{l('channelList.public')}}</a>
</li>
@@ -73,7 +73,6 @@
const channels: Channel.ListItem[] = [];
if(this.filter.length > 0) {
const search = new RegExp(this.filter.replace(/[^\w]/gi, '\\$&'), 'i');
- //tslint:disable-next-line:forin
for(const key in list) {
const item = list[key]!;
if(search.test(item.name)) channels.push(item);
diff --git a/chat/CharacterSearch.vue b/chat/CharacterSearch.vue
index 62397db..e0d358c 100644
--- a/chat/CharacterSearch.vue
+++ b/chat/CharacterSearch.vue
@@ -112,8 +112,10 @@
this.error = l('characterSearch.error.tooManyResults');
}
});
- core.connection.onMessage('FKS', (data) => this.results = data.characters.filter((x) =>
- core.state.hiddenUsers.indexOf(x) === -1).map((x) => core.characters.get(x)).sort(sort));
+ core.connection.onMessage('FKS', (data) => {
+ this.results = data.characters.filter((x) => core.state.hiddenUsers.indexOf(x) === -1)
+ .map((x) => core.characters.get(x)).sort(sort);
+ });
(<Modal>this.$children[0]).fixDropdowns();
}
diff --git a/chat/Chat.vue b/chat/Chat.vue
index a392a8a..265a0c0 100644
--- a/chat/Chat.vue
+++ b/chat/Chat.vue
@@ -32,7 +32,7 @@
import Channels from '../fchat/channels';
import Characters from '../fchat/characters';
import ChatView from './ChatView.vue';
- import {errorToString, requestNotificationsPermission} from './common';
+ import {errorToString} from './common';
import Conversations from './conversations';
import core from './core';
import l from './localize';
@@ -44,8 +44,8 @@
@Prop({required: true})
readonly ownCharacters: string[];
@Prop({required: true})
- readonly defaultCharacter: string;
- selectedCharacter = this.defaultCharacter;
+ readonly defaultCharacter: string | undefined;
+ selectedCharacter = this.defaultCharacter || this.ownCharacters[0]; //tslint:disable-line:strict-boolean-expressions
error = '';
connecting = false;
connected = false;
@@ -59,10 +59,11 @@
if(isReconnect) (<Modal>this.$refs['reconnecting']).show(true);
if(this.connected) core.notifications.playSound('logout');
this.connected = false;
+ this.connecting = false;
});
core.connection.onEvent('connecting', async() => {
this.connecting = true;
- if(core.state.settings.notifications) await requestNotificationsPermission();
+ if(core.state.settings.notifications) await core.notifications.requestPermission();
});
core.connection.onEvent('connected', () => {
(<Modal>this.$refs['reconnecting']).hide();
diff --git a/chat/ChatView.vue b/chat/ChatView.vue
index e20e98a..1c03963 100644
--- a/chat/ChatView.vue
+++ b/chat/ChatView.vue
@@ -1,77 +1,68 @@
<template>
<div style="height:100%; display: flex; position: relative;" id="chatView" @click="$refs['userMenu'].handleEvent($event)"
- @contextmenu="$refs['userMenu'].handleEvent($event)" @touchstart="$refs['userMenu'].handleEvent($event)"
+ @contextmenu="$refs['userMenu'].handleEvent($event)" @touchstart.passive="$refs['userMenu'].handleEvent($event)"
@touchend="$refs['userMenu'].handleEvent($event)">
- <div class="sidebar sidebar-left" id="sidebar">
- <button @click="sidebarExpanded = !sidebarExpanded" class="btn btn-default btn-xs expander" :aria-label="l('chat.menu')">
- <span class="fa" :class="{'fa-chevron-up': sidebarExpanded, 'fa-chevron-down': !sidebarExpanded}"></span>
- <span class="fa fa-bars fa-rotate-90" style="vertical-align: middle"></span>
- </button>
- <div class="body" :style="sidebarExpanded ? 'display:block' : ''"
- style="width: 200px; padding-right: 5px; height: 100%; overflow: auto;">
- <img :src="characterImage(ownCharacter.name)" v-if="showAvatars" style="float:left; margin-right:5px; width:60px;"/>
- {{ownCharacter.name}}
- <a href="#" @click.prevent="logOut" class="btn"><span class="fa fa-sign-out"></span>{{l('chat.logout')}}</a><br/>
- <div>
- {{l('chat.status')}}
- <a href="#" @click.prevent="$refs['statusDialog'].show()" class="btn">
- <span class="fa fa-fw" :class="getStatusIcon(ownCharacter.status)"></span>{{l('status.' + ownCharacter.status)}}
- </a>
- </div>
- <div style="clear:both;">
- <a href="#" @click.prevent="$refs['searchDialog'].show()" class="btn"><span class="fa fa-search"></span>
- {{l('characterSearch.open')}}</a>
- </div>
- <div><a href="#" @click.prevent="$refs['settingsDialog'].show()" class="btn"><span class="fa fa-cog"></span>
- {{l('settings.open')}}</a></div>
- <div><a href="#" @click.prevent="$refs['recentDialog'].show()" class="btn"><span class="fa fa-history"></span>
- {{l('chat.recentConversations')}}</a></div>
- <div>
- <div class="list-group conversation-nav">
- <a :class="getClasses(conversations.consoleTab)" href="#" @click.prevent="conversations.consoleTab.show()"
- class="list-group-item list-group-item-action">
- {{conversations.consoleTab.name}}
- </a>
- </div>
- </div>
- <div>
- {{l('chat.pms')}}
- <div class="list-group conversation-nav" ref="privateConversations">
- <a v-for="conversation in conversations.privateConversations" href="#" @click.prevent="conversation.show()"
- :class="getClasses(conversation)" :data-character="conversation.character.name"
- class="list-group-item list-group-item-action item-private" :key="conversation.key">
- <img :src="characterImage(conversation.character.name)" v-if="showAvatars"/>
- <div class="name">
- <span>{{conversation.character.name}}</span>
- <div style="text-align:right;line-height:0">
- <span class="fa"
- :class="{'fa-commenting': conversation.typingStatus == 'typing', 'fa-comment': conversation.typingStatus == 'paused'}"
- ></span><span class="pin fa fa-thumb-tack" :class="{'active': conversation.isPinned}" @mousedown.prevent
- @click.stop="conversation.isPinned = !conversation.isPinned" :aria-label="l('chat.pinTab')"></span>
- <span class="fa fa-times leave" @click.stop="conversation.close()"
- :aria-label="l('chat.closeTab')"></span>
- </div>
- </div>
- </a>
- </div>
- </div>
- <div>
- <a href="#" @click.prevent="$refs['channelsDialog'].show()" class="btn"><span class="fa fa-list"></span>
- {{l('chat.channels')}}</a>
- <div class="list-group conversation-nav" ref="channelConversations">
- <a v-for="conversation in conversations.channelConversations" href="#" @click.prevent="conversation.show()"
- :class="getClasses(conversation)" class="list-group-item list-group-item-action item-channel"
- :key="conversation.key"><span class="name">{{conversation.name}}</span><span><span class="pin fa fa-thumb-tack"
- :class="{'active': conversation.isPinned}" @click.stop="conversation.isPinned = !conversation.isPinned"
- :aria-label="l('chat.pinTab')" @mousedown.prevent></span><span class="fa fa-times leave"
- @click.stop="conversation.close()" :aria-label="l('chat.closeTab')"></span></span>
- </a>
- </div>
- </div>
+ <sidebar id="sidebar" :label="l('chat.menu')" icon="fa-bars">
+ <img :src="characterImage(ownCharacter.name)" v-if="showAvatars" style="float:left;margin-right:5px;width:60px"/>
+ {{ownCharacter.name}}
+ <a href="#" @click.prevent="logOut" class="btn"><span class="fa fa-sign-out"></span>{{l('chat.logout')}}</a><br/>
+ <div>
+ {{l('chat.status')}}
+ <a href="#" @click.prevent="$refs['statusDialog'].show()" class="btn">
+ <span class="fa fa-fw" :class="getStatusIcon(ownCharacter.status)"></span>{{l('status.' + ownCharacter.status)}}
+ </a>
</div>
- </div>
+ <div style="clear:both">
+ <a href="#" @click.prevent="$refs['searchDialog'].show()" class="btn"><span class="fa fa-search"></span>
+ {{l('characterSearch.open')}}</a>
+ </div>
+ <div><a href="#" @click.prevent="$refs['settingsDialog'].show()" class="btn"><span class="fa fa-cog"></span>
+ {{l('settings.open')}}</a></div>
+ <div><a href="#" @click.prevent="$refs['recentDialog'].show()" class="btn"><span class="fa fa-history"></span>
+ {{l('chat.recentConversations')}}</a></div>
+ <div class="list-group conversation-nav">
+ <a :class="getClasses(conversations.consoleTab)" href="#" @click.prevent="conversations.consoleTab.show()"
+ class="list-group-item list-group-item-action">
+ {{conversations.consoleTab.name}}
+ </a>
+ </div>
+ {{l('chat.pms')}}
+ <div class="list-group conversation-nav" ref="privateConversations">
+ <a v-for="conversation in conversations.privateConversations" href="#" @click.prevent="conversation.show()"
+ :class="getClasses(conversation)" :data-character="conversation.character.name" data-touch="false"
+ class="list-group-item list-group-item-action item-private" :key="conversation.key">
+ <img :src="characterImage(conversation.character.name)" v-if="showAvatars"/>
+ <div class="name">
+ <span>{{conversation.character.name}}</span>
+ <div style="text-align:right;line-height:0">
+ <span class="fa"
+ :class="{'fa-commenting': conversation.typingStatus == 'typing', 'fa-comment': conversation.typingStatus == 'paused'}"
+ ></span><span class="pin fa fa-thumb-tack" :class="{'active': conversation.isPinned}" @mousedown.prevent
+ @click.stop="conversation.isPinned = !conversation.isPinned" :aria-label="l('chat.pinTab')"></span>
+ <span class="fa fa-times leave" @click.stop="conversation.close()" :aria-label="l('chat.closeTab')"></span>
+ </div>
+ </div>
+ </a>
+ </div>
+ <a href="#" @click.prevent="$refs['channelsDialog'].show()" class="btn"><span class="fa fa-list"></span>
+ {{l('chat.channels')}}</a>
+ <div class="list-group conversation-nav" ref="channelConversations">
+ <a v-for="conversation in conversations.channelConversations" href="#" @click.prevent="conversation.show()"
+ :class="getClasses(conversation)" class="list-group-item list-group-item-action item-channel"
+ :key="conversation.key"><span class="name">{{conversation.name}}</span><span><span class="pin fa fa-thumb-tack"
+ :class="{'active': conversation.isPinned}" @click.stop="conversation.isPinned = !conversation.isPinned"
+ :aria-label="l('chat.pinTab')" @mousedown.prevent></span><span class="fa fa-times leave"
+ @click.stop="conversation.close()" :aria-label="l('chat.closeTab')"></span></span>
+ </a>
+ </div>
+ </sidebar>
<div style="width: 100%; display:flex; flex-direction:column;">
<div id="quick-switcher" class="list-group">
+ <a :class="getClasses(conversations.consoleTab)" href="#" @click.prevent="conversations.consoleTab.show()"
+ class="list-group-item list-group-item-action">
+ <span class="fa fa-home conversation-icon"></span>
+ {{conversations.consoleTab.name}}
+ </a>
<a v-for="conversation in conversations.privateConversations" href="#" @click.prevent="conversation.show()"
:class="getClasses(conversation)" class="list-group-item list-group-item-action" :key="conversation.key">
<img :src="characterImage(conversation.character.name)" v-if="showAvatars"/>
@@ -112,6 +103,7 @@
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 UserList from './UserList.vue';
@@ -120,13 +112,13 @@
const unreadClasses = {
[Conversation.UnreadState.None]: '',
[Conversation.UnreadState.Mention]: 'list-group-item-warning',
- [Conversation.UnreadState.Unread]: 'has-new'
+ [Conversation.UnreadState.Unread]: 'list-group-item-danger'
};
@Component({
components: {
'user-list': UserList, channels: ChannelList, 'status-switcher': StatusSwitcher, 'character-search': CharacterSearch,
- settings: SettingsView, conversation: ConversationView, 'report-dialog': ReportDialog,
+ settings: SettingsView, conversation: ConversationView, 'report-dialog': ReportDialog, sidebar: Sidebar,
'user-menu': UserMenu, 'recent-conversations': RecentConversations
}
})
@@ -140,19 +132,25 @@
mounted(): void {
this.keydownListener = (e: KeyboardEvent) => this.onKeyDown(e);
- document.addEventListener('keydown', this.keydownListener);
+ window.addEventListener('keydown', this.keydownListener);
this.setFontSize(core.state.settings.fontSize);
Sortable.create(this.$refs['privateConversations'], {
animation: 50,
- onEnd: (e: {oldIndex: number, newIndex: number}) => core.conversations.privateConversations[e.oldIndex].sort(e.newIndex)
+ onEnd: async(e: {oldIndex: number, newIndex: number}) => {
+ if(e.oldIndex === e.newIndex) return;
+ return core.conversations.privateConversations[e.oldIndex].sort(e.newIndex);
+ }
});
Sortable.create(this.$refs['channelConversations'], {
animation: 50,
- onEnd: (e: {oldIndex: number, newIndex: number}) => core.conversations.channelConversations[e.oldIndex].sort(e.newIndex)
+ onEnd: async(e: {oldIndex: number, newIndex: number}) => {
+ if(e.oldIndex === e.newIndex) return;
+ return core.conversations.channelConversations[e.oldIndex].sort(e.newIndex);
+ }
});
const ownCharacter = core.characters.ownCharacter;
let idleTimer: number | undefined, idleStatus: Connection.ClientCommands['STA'] | undefined, lastUpdate = 0;
- window.focus = () => {
+ window.addEventListener('focus', () => {
core.notifications.isInBackground = false;
if(idleTimer !== undefined) {
clearTimeout(idleTimer);
@@ -164,8 +162,8 @@
idleStatus = undefined;
}
}, Math.max(lastUpdate + 5 /*core.connection.vars.sta_flood*/ * 1000 + 1000 - Date.now(), 0));
- };
- window.blur = () => {
+ });
+ window.addEventListener('blur', () => {
core.notifications.isInBackground = true;
if(idleTimer !== undefined) clearTimeout(idleTimer);
if(core.state.settings.idleTimer !== 0)
@@ -174,7 +172,7 @@
idleStatus = {status: ownCharacter.status, statusmsg: ownCharacter.statusText};
core.connection.send('STA', {status: 'idle', statusmsg: ownCharacter.statusText});
}, core.state.settings.idleTimer * 60000);
- };
+ });
core.connection.onEvent('closed', () => {
if(idleTimer !== undefined) {
window.clearTimeout(idleTimer);
@@ -189,7 +187,7 @@
}
destroyed(): void {
- document.removeEventListener('keydown', this.keydownListener);
+ window.removeEventListener('keydown', this.keydownListener);
}
onKeyDown(e: KeyboardEvent): void {
@@ -197,9 +195,11 @@
const pms = this.conversations.privateConversations;
const channels = this.conversations.channelConversations;
const console = this.conversations.consoleTab;
- if(getKey(e) === 'ArrowUp' && e.altKey && !e.ctrlKey && !e.shiftKey && !e.metaKey) {
- if(selected === console) return;
- if(Conversation.isPrivate(selected)) {
+ if(getKey(e) === 'arrowup' && e.altKey && !e.ctrlKey && !e.shiftKey && !e.metaKey)
+ if(selected === console) { //tslint:disable-line:curly
+ if(channels.length > 0) channels[channels.length - 1].show();
+ else if(pms.length > 0) pms[pms.length - 1].show();
+ } else if(Conversation.isPrivate(selected)) {
const index = pms.indexOf(selected);
if(index === 0) console.show();
else pms[index - 1].show();
@@ -210,7 +210,7 @@
else console.show();
else channels[index - 1].show();
}
- } else if(getKey(e) === 'ArrowDown' && e.altKey && !e.ctrlKey && !e.shiftKey && !e.metaKey)
+ else if(getKey(e) === 'arrowdown' && e.altKey && !e.ctrlKey && !e.shiftKey && !e.metaKey)
if(selected === console) { //tslint:disable-line:curly - false positive
if(pms.length > 0) pms[0].show();
else if(channels.length > 0) channels[0].show();
@@ -221,7 +221,8 @@
} else pms[index + 1].show();
} else {
const index = channels.indexOf(<Conversation.ChannelConversation>selected);
- if(index !== channels.length - 1) channels[index + 1].show();
+ if(index < channels.length - 1) channels[index + 1].show();
+ else console.show();
}
}
@@ -257,13 +258,13 @@
}
getClasses(conversation: Conversation): string {
- return unreadClasses[conversation.unread] + (conversation === core.conversations.selectedConversation ? ' active' : '');
+ return conversation === core.conversations.selectedConversation ? ' active' : unreadClasses[conversation.unread];
}
}
</script>
<style lang="less">
- @import '~bootstrap/less/variables.less';
+ @import "../less/flist_variables.less";
.list-group.conversation-nav {
margin-bottom: 10px;
@@ -271,6 +272,9 @@
padding: 5px;
display: flex;
align-items: center;
+ border-right: 0;
+ border-top-right-radius: 0;
+ border-bottom-right-radius: 0;
.name {
flex: 1;
overflow: hidden;
@@ -303,6 +307,10 @@
border-bottom-left-radius: 4px;
}
}
+
+ .list-group-item-danger:not(.active) {
+ color: inherit;
+ }
}
#quick-switcher {
@@ -319,6 +327,8 @@
text-align: center;
line-height: 1;
padding: 5px 5px 0;
+ overflow: hidden;
+ flex-shrink: 0;
&:first-child {
border-radius: 4px 0 0 4px;
&:last-child {
@@ -343,6 +353,10 @@
font-size: 2em;
height: 30px;
}
+
+ .list-group-item-danger:not(.active) {
+ color: inherit;
+ }
}
#sidebar {
@@ -350,7 +364,13 @@
padding: 2px 0;
}
@media (min-width: @screen-sm-min) {
- position: static;
+ .sidebar {
+ position: static;
+ margin: 0;
+ padding: 0;
+ height: 100%;
+ }
+
.body {
display: block;
}
diff --git a/chat/CommandHelp.vue b/chat/CommandHelp.vue
index aec8029..fc03ef1 100644
--- a/chat/CommandHelp.vue
+++ b/chat/CommandHelp.vue
@@ -49,7 +49,6 @@
mounted(): void {
const permissions = core.connection.vars.permissions;
- //tslint:disable-next-line:forin
for(const key in commands) {
const command = commands[key]!;
if(command.documented !== undefined ||
diff --git a/chat/ConversationView.vue b/chat/ConversationView.vue
index 1e70916..d489700 100644
--- a/chat/ConversationView.vue
+++ b/chat/ConversationView.vue
@@ -7,10 +7,10 @@
<user :character="conversation.character"></user>
<logs :conversation="conversation"></logs>
<a href="#" @click.prevent="$refs['settingsDialog'].show()" class="btn">
- <span class="fa fa-cog"></span> {{l('conversationSettings.title')}}
+ <span class="fa fa-cog"></span> <span class="btn-text">{{l('conversationSettings.title')}}</span>
</a>
- <a href="#" @click.prevent="reportDialog.report();" class="btn"><span class="fa fa-exclamation"></span>
- {{l('chat.report')}}</a>
+ <a href="#" @click.prevent="reportDialog.report();" class="btn"><span class="fa fa-exclamation-triangle"></span>
+ <span class="btn-text">{{l('chat.report')}}</span></a>
</div>
<div style="overflow: auto">
{{l('status.' + conversation.character.status)}}
@@ -26,15 +26,15 @@
<h4 style="margin: 0; display:inline; vertical-align: middle;">{{conversation.name}}</h4>
<a @click="descriptionExpanded = !descriptionExpanded" class="btn">
<span class="fa" :class="{'fa-chevron-down': !descriptionExpanded, 'fa-chevron-up': descriptionExpanded}"></span>
- {{l('channel.description')}}
+ <span class="btn-text">{{l('channel.description')}}</span>
</a>
<manage-channel :channel="conversation.channel" v-if="isChannelMod"></manage-channel>
<logs :conversation="conversation"></logs>
<a href="#" @click.prevent="$refs['settingsDialog'].show()" class="btn">
- <span class="fa fa-cog"></span> {{l('conversationSettings.title')}}
+ <span class="fa fa-cog"></span> <span class="btn-text">{{l('conversationSettings.title')}}</span>
</a>
<a href="#" @click.prevent="reportDialog.report();" class="btn"><span class="fa fa-exclamation-triangle"></span>
- {{l('chat.report')}}</a>
+ <span class="btn-text">{{l('chat.report')}}</span></a>
</div>
<ul class="nav nav-pills mode-switcher">
<li v-for="mode in modes" :class="{active: conversation.mode == mode, disabled: conversation.channel.mode != 'both'}">
@@ -72,18 +72,18 @@
{{l('chat.typing.' + conversation.typingStatus, conversation.name)}}
</span>
<div v-show="conversation.infoText" style="display:flex;align-items:center">
- <span class="fa fa-times" style="cursor:pointer" @click.stop="conversation.infoText = '';"></span>
+ <span class="fa fa-times" style="cursor:pointer" @click.stop="conversation.infoText = ''"></span>
<span style="flex:1;margin-left:5px">{{conversation.infoText}}</span>
</div>
<div v-show="conversation.errorText" style="display:flex;align-items:center">
- <span class="fa fa-times" style="cursor:pointer" @click.stop="conversation.errorText = '';"></span>
+ <span class="fa fa-times" style="cursor:pointer" @click.stop="conversation.errorText = ''"></span>
<span class="redText" style="flex:1;margin-left:5px">{{conversation.errorText}}</span>
</div>
<div style="position:relative; margin-top:5px;">
<div class="overlay-disable" v-show="adCountdown">{{adCountdown}}</div>
<bbcode-editor v-model="conversation.enteredText" @keydown="onKeyDown" :extras="extraButtons" @input="onInput"
- classes="form-control chat-text-box" :disabled="adCountdown" ref="textBox" style="position:relative;"
- :maxlength="conversation.maxMessageLength">
+ :classes="'form-control chat-text-box' + (conversation.isSendingAds ? ' ads-text-box' : '')" :disabled="adCountdown"
+ ref="textBox" style="position:relative" :maxlength="conversation.maxMessageLength">
<div style="float:right;text-align:right;display:flex;align-items:center">
<div v-show="conversation.maxMessageLength" style="margin-right: 5px;">
{{getByteLength(conversation.enteredText)}} / {{conversation.maxMessageLength}}
@@ -206,9 +206,9 @@
});
}
- onKeyDown(e: KeyboardEvent): void {
+ async onKeyDown(e: KeyboardEvent): Promise<void> {
const editor = <Editor>this.$refs['textBox'];
- if(getKey(e) === 'Tab') {
+ if(getKey(e) === 'tab') {
e.preventDefault();
if(this.conversation.enteredText.length === 0 || this.isConsoleTab) return;
if(this.tabOptions === undefined) {
@@ -242,13 +242,13 @@
}
} else {
if(this.tabOptions !== undefined) this.tabOptions = undefined;
- if(getKey(e) === 'ArrowUp' && this.conversation.enteredText.length === 0
+ if(getKey(e) === 'arrowup' && this.conversation.enteredText.length === 0
&& !e.shiftKey && !e.altKey && !e.ctrlKey && !e.metaKey)
this.conversation.loadLastSent();
- else if(getKey(e) === 'Enter') {
+ else if(getKey(e) === 'enter') {
if(e.shiftKey) return;
e.preventDefault();
- this.conversation.send();
+ await this.conversation.send();
}
}
}
@@ -302,8 +302,7 @@
</script>
<style lang="less">
- @import '~bootstrap/less/variables.less';
-
+ @import "../less/flist_variables.less";
#conversation {
.header {
@media (min-width: @screen-sm-min) {
diff --git a/chat/Logs.vue b/chat/Logs.vue
index 6590313..b1a6014 100644
--- a/chat/Logs.vue
+++ b/chat/Logs.vue
@@ -1,7 +1,8 @@
<template>
<span>
<a href="#" @click.prevent="showLogs" class="btn">
- <span class="fa" :class="isPersistent ? 'fa-file-text-o' : 'fa-download'"></span> {{l('logs.title')}}
+ <span class="fa" :class="isPersistent ? 'fa-file-text-o' : 'fa-download'"></span>
+ <span class="btn-text">{{l('logs.title')}}</span>
</a>
<modal v-if="isPersistent" :buttons="false" ref="dialog" id="logs-dialog" :action="l('logs.title')" dialogClass="modal-lg"
@open="onOpen" class="form-horizontal">
@@ -9,7 +10,7 @@
<label class="col-sm-2">{{l('logs.conversation')}}</label>
<div class="col-sm-10">
<filterable-select v-model="selectedConversation" :options="conversations" :filterFunc="filterConversation"
- buttonClass="form-control" :placeholder="l('filter')">
+ buttonClass="form-control" :placeholder="l('filter')" @input="loadMessages">
<template slot-scope="s">{{s.option && ((s.option.id[0] == '#' ? '#' : '') + s.option.name)}}</template>
</filterable-select>
</div>
@@ -60,7 +61,7 @@
@Prop({required: true})
readonly conversation: Conversation;
selectedConversation: {id: string, name: string} | null = null;
- selectedDate: Date | null = null;
+ selectedDate: string | null = null;
isPersistent = LogInterfaces.isPersistent(core.logs);
conversations = LogInterfaces.isPersistent(core.logs) ? core.logs.conversations : undefined;
l = l;
diff --git a/chat/ManageChannel.vue b/chat/ManageChannel.vue
index 57a6c54..757da67 100644
--- a/chat/ManageChannel.vue
+++ b/chat/ManageChannel.vue
@@ -1,7 +1,7 @@
<template>
<span>
<a href="#" @click.prevent="openDialog" class="btn">
- <span class="fa fa-edit"></span> {{l('manageChannel.open')}}
+ <span class="fa fa-edit"></span> <span class="btn-text">{{l('manageChannel.open')}}</span>
</a>
<modal ref="dialog" :action="l('manageChannel.action', channel.name)" :buttonText="l('manageChannel.submit')" @submit="submit">
<div class="form-group" v-show="channel.id.substr(0, 4) === 'adh-'">
diff --git a/chat/SettingsView.vue b/chat/SettingsView.vue
index 76693f1..6cdb4a4 100644
--- a/chat/SettingsView.vue
+++ b/chat/SettingsView.vue
@@ -52,7 +52,7 @@
</div>
<div class="form-group">
<label class="control-label" for="fontSize">{{l('settings.fontSize')}}</label>
- <input id="fontSize" type="number" min="10" max="24" number class="form-control" v-model="fontSize"/>
+ <input id="fontSize" type="number" min="10" max="24" class="form-control" v-model="fontSize"/>
</div>
</div>
<div v-show="selectedTab == 'notifications'">
@@ -111,7 +111,6 @@
import Component from 'vue-class-component';
import CustomDialog from '../components/custom_dialog';
import Modal from '../components/Modal.vue';
- import {requestNotificationsPermission} from './common';
import core from './core';
import {Settings as SettingsInterface} from './interfaces';
import l from './localize';
@@ -206,9 +205,9 @@
alwaysNotify: this.alwaysNotify,
logMessages: this.logMessages,
logAds: this.logAds,
- fontSize: this.fontSize
+ fontSize: isNaN(this.fontSize) ? 14 : this.fontSize < 10 ? 10 : this.fontSize > 24 ? 24 : this.fontSize
};
- if(this.notifications) await requestNotificationsPermission();
+ if(this.notifications) await core.notifications.requestPermission();
}
}
</script>
diff --git a/chat/Sidebar.vue b/chat/Sidebar.vue
new file mode 100644
index 0000000..e273c19
--- /dev/null
+++ b/chat/Sidebar.vue
@@ -0,0 +1,39 @@
+<template>
+ <div class="sidebar-wrapper" :class="{open: expanded}">
+ <div :class="'sidebar sidebar-' + (right ? 'right' : 'left')">
+ <button @click="expanded = !expanded" class="btn btn-default btn-xs expander" :aria-label="label">
+ <span :class="'fa fa-rotate-270 ' + icon" style="vertical-align: middle" v-if="right"></span>
+ <span class="fa" :class="{'fa-chevron-down': !expanded, 'fa-chevron-up': expanded}"></span>
+ <span :class="'fa fa-rotate-90 ' + icon" style="vertical-align: middle" v-if="!right"></span>
+ </button>
+ <div class="body">
+ <slot></slot>
+ </div>
+ </div>
+ <div class="modal-backdrop in" @click="expanded = false"></div>
+ </div>
+</template>
+
+<script lang="ts">
+ import Vue from 'vue';
+ import Component from 'vue-class-component';
+ import {Prop, Watch} from 'vue-property-decorator';
+
+ @Component
+ export default class Sidebar extends Vue {
+ @Prop()
+ readonly right?: true;
+ @Prop()
+ readonly label?: string;
+ @Prop({required: true})
+ readonly icon: string;
+ @Prop({default: false})
+ readonly open: boolean;
+ expanded = this.open;
+
+ @Watch('open')
+ watchOpen(): void {
+ this.expanded = this.open;
+ }
+ }
+</script>
\ No newline at end of file
diff --git a/chat/UserList.vue b/chat/UserList.vue
index 887ed21..34ad730 100644
--- a/chat/UserList.vue
+++ b/chat/UserList.vue
@@ -1,35 +1,30 @@
<template>
- <div id="user-list" class="sidebar sidebar-right">
- <button @click="expanded = !expanded" class="btn btn-default btn-xs expander" :aria-label="l('users.title')">
- <span class="fa fa-users fa-rotate-270" style="vertical-align: middle"></span>
- <span class="fa" :class="{'fa-chevron-down': !expanded, 'fa-chevron-up': expanded}"></span>
- </button>
- <div class="body" :style="expanded ? 'display:flex' : ''" style="min-width: 200px; flex-direction:column; max-height: 100%;">
- <ul class="nav nav-tabs" style="flex-shrink:0">
- <li role="presentation" :class="{active: !channel || !memberTabShown}">
- <a href="#" @click.prevent="memberTabShown = false">{{l('users.friends')}}</a>
- </li>
- <li role="presentation" :class="{active: memberTabShown}" v-show="channel">
- <a href="#" @click.prevent="memberTabShown = true">{{l('users.members')}}</a>
- </li>
- </ul>
- <div v-show="!channel || !memberTabShown" class="users" style="padding-left: 10px;">
- <h4>{{l('users.friends')}}</h4>
- <div v-for="character in friends" :key="character.name">
- <user :character="character" :showStatus="true"></user>
- </div>
- <h4>{{l('users.bookmarks')}}</h4>
- <div v-for="character in bookmarks" :key="character.name">
- <user :character="character" :showStatus="true"></user>
- </div>
+ <sidebar id="user-list" :label="l('users.title')" icon="fa-users" :right="true" :open="expanded">
+ <ul class="nav nav-tabs" style="flex-shrink:0">
+ <li role="presentation" :class="{active: !channel || !memberTabShown}">
+ <a href="#" @click.prevent="memberTabShown = false">{{l('users.friends')}}</a>
+ </li>
+ <li role="presentation" :class="{active: memberTabShown}" v-show="channel">
+ <a href="#" @click.prevent="memberTabShown = true">{{l('users.members')}}</a>
+ </li>
+ </ul>
+ <div v-show="!channel || !memberTabShown" class="users" style="padding-left:10px">
+ <h4>{{l('users.friends')}}</h4>
+ <div v-for="character in friends" :key="character.name">
+ <user :character="character" :showStatus="true"></user>
</div>
- <div v-if="channel" v-show="memberTabShown" class="users" style="padding: 5px;">
- <div v-for="member in channel.sortedMembers" :key="member.character.name">
- <user :character="member.character" :channel="channel" :showStatus="true"></user>
- </div>
+ <h4>{{l('users.bookmarks')}}</h4>
+ <div v-for="character in bookmarks" :key="character.name">
+ <user :character="character" :showStatus="true"></user>
</div>
</div>
- </div>
+ <div v-if="channel" v-show="memberTabShown" class="users" style="padding:5px">
+ <h4>{{l('users.memberCount', channel.sortedMembers.length)}}</h4>
+ <div v-for="member in channel.sortedMembers" :key="member.character.name">
+ <user :character="member.character" :channel="channel" :showStatus="true"></user>
+ </div>
+ </div>
+ </sidebar>
</template>
<script lang="ts">
@@ -38,14 +33,15 @@
import core from './core';
import {Channel, Character, Conversation} from './interfaces';
import l from './localize';
+ import Sidebar from './Sidebar.vue';
import UserView from './user_view';
@Component({
- components: {user: UserView}
+ components: {user: UserView, sidebar: Sidebar}
})
export default class UserList extends Vue {
memberTabShown = false;
- expanded = window.innerWidth >= 992;
+ expanded = window.innerWidth >= 900;
l = l;
sorter = (x: Character, y: Character) => (x.name < y.name ? -1 : (x.name > y.name ? 1 : 0));
@@ -64,8 +60,7 @@
</script>
<style lang="less">
- @import '~bootstrap/less/variables.less';
-
+ @import "../less/flist_variables.less";
#user-list {
flex-direction: column;
h4 {
@@ -82,8 +77,21 @@
border-top-left-radius: 0;
}
- @media (min-width: @screen-sm-min) {
- position: static;
+ @media (min-width: @screen-md-min) {
+ .sidebar {
+ position: static;
+ margin: 0;
+ padding: 0;
+ height: 100%;
+ }
+
+ .modal-backdrop {
+ display: none;
+ }
+ }
+
+ &.open .body {
+ display: flex;
}
}
</style>
\ No newline at end of file
diff --git a/chat/UserMenu.vue b/chat/UserMenu.vue
index 3eb6e30..18ea205 100644
--- a/chat/UserMenu.vue
+++ b/chat/UserMenu.vue
@@ -115,10 +115,10 @@
this.memo = '';
(<Modal>this.$refs['memo']).show();
try {
- const memo = <{note: string, id: number}>await core.connection.queryApi('character-memo-get.php',
+ const memo = <{note: string | null, id: number}>await core.connection.queryApi('character-memo-get2.php',
{target: this.character!.name});
this.memoId = memo.id;
- this.memo = memo.note;
+ this.memo = memo.note !== null ? memo.note : '';
this.memoLoading = false;
} catch(e) {
alert(errorToString(e));
@@ -165,6 +165,7 @@
if(node.character !== undefined || node.dataset['character'] !== undefined || node.parentNode === null) break;
node = node.parentElement!;
}
+ if(node.dataset['touch'] === 'false' && e.type !== 'contextmenu') return;
if(node.character === undefined)
if(node.dataset['character'] !== undefined) node.character = core.characters.get(node.dataset['character']!);
else {
@@ -174,6 +175,7 @@
switch(e.type) {
case 'click':
if(node.dataset['character'] === undefined) this.onClick(node.character);
+ e.preventDefault();
break;
case 'touchstart':
this.touchTimer = window.setTimeout(() => {
@@ -190,8 +192,8 @@
break;
case 'contextmenu':
this.openMenu(touch, node.character, node.channel);
+ e.preventDefault();
}
- e.preventDefault();
}
private onClick(character: Character): void {
diff --git a/chat/WebSocket.ts b/chat/WebSocket.ts
index fc5be2d..844dcb4 100644
--- a/chat/WebSocket.ts
+++ b/chat/WebSocket.ts
@@ -1,9 +1,11 @@
-import {WebSocketConnection} from '../fchat/interfaces';
+import {WebSocketConnection} from '../fchat';
import l from './localize';
export default class Socket implements WebSocketConnection {
static host = 'wss://chat.f-list.net:9799';
- socket: WebSocket;
+ private socket: WebSocket;
+ private errorHandler: (error: Error) => void;
+ private lastHandler: Promise<void> = Promise.resolve();
constructor() {
this.socket = new WebSocket(Socket.host);
@@ -14,7 +16,9 @@ export default class Socket implements WebSocketConnection {
}
onMessage(handler: (message: string) => void): void {
- this.socket.addEventListener('message', (e) => handler(<string>e.data));
+ this.socket.addEventListener('message', (e) => {
+ this.lastHandler = this.lastHandler.then(() => handler(<string>e.data), this.errorHandler);
+ });
}
onOpen(handler: () => void): void {
@@ -26,6 +30,7 @@ export default class Socket implements WebSocketConnection {
}
onError(handler: (error: Error) => void): void {
+ this.errorHandler = handler;
this.socket.addEventListener('error', () => handler(new Error(l('login.connectError'))));
}
diff --git a/chat/common.ts b/chat/common.ts
index 1f09bbb..a93a53e 100644
--- a/chat/common.ts
+++ b/chat/common.ts
@@ -65,7 +65,7 @@ export function messageToString(this: void | never, msg: Conversation.Message, t
export function getKey(e: KeyboardEvent): string {
/*tslint:disable-next-line:strict-boolean-expressions no-any*///because of old browsers.
- return e.key || (<KeyboardEvent & {keyIdentifier: string}>e).keyIdentifier;
+ return (e.key || (<KeyboardEvent & {keyIdentifier: string}>e).keyIdentifier).toLowerCase();
}
/*tslint:disable:no-any no-unsafe-any*///because errors can be any
@@ -74,10 +74,6 @@ export function errorToString(e: any): string {
}
//tslint:enable
-export async function requestNotificationsPermission(): Promise<void> {
- if((<Window & {Notification: Notification | undefined}>window).Notification !== undefined) await Notification.requestPermission();
-}
-
let messageId = 0;
export class Message implements Conversation.ChatMessage {
diff --git a/chat/conversations.ts b/chat/conversations.ts
index 84dd094..5d686a2 100644
--- a/chat/conversations.ts
+++ b/chat/conversations.ts
@@ -1,4 +1,3 @@
-//tslint:disable:no-floating-promises
import {queuedJoin} from '../fchat/channels';
import {decodeHTML} from '../fchat/common';
import {characterImage, ConversationSettings, EventMessage, Message, messageToString} from './common';
@@ -46,7 +45,7 @@ abstract class Conversation implements Interfaces.Conversation {
set settings(value: Interfaces.Settings) {
this._settings = value;
- state.setSettings(this.key, value);
+ state.setSettings(this.key, value); //tslint:disable-line:no-floating-promises
}
get isPinned(): boolean {
@@ -56,14 +55,14 @@ abstract class Conversation implements Interfaces.Conversation {
set isPinned(value: boolean) {
if(value === this._isPinned) return;
this._isPinned = value;
- state.savePinned();
+ state.savePinned(); //tslint:disable-line:no-floating-promises
}
get reportMessages(): ReadonlyArray<Interfaces.Message> {
return this.allMessages;
}
- send(): void {
+ async send(): Promise<void> {
if(this.enteredText.length === 0) return;
if(isCommand(this.enteredText)) {
const parsed = parseCommand(this.enteredText, this.context);
@@ -75,11 +74,11 @@ abstract class Conversation implements Interfaces.Conversation {
}
} else {
this.lastSent = this.enteredText;
- this.doSend();
+ await this.doSend();
}
}
- abstract addMessage(message: Interfaces.Message): void;
+ abstract async addMessage(message: Interfaces.Message): Promise<void>;
loadLastSent(): void {
this.enteredText = this.lastSent;
@@ -109,7 +108,7 @@ abstract class Conversation implements Interfaces.Conversation {
safeAddMessage(this.messages, message, this.maxMessages);
}
- protected abstract doSend(): void;
+ protected abstract doSend(): Promise<void> | void;
}
class PrivateConversation extends Conversation implements Interfaces.PrivateConversation {
@@ -144,32 +143,34 @@ class PrivateConversation extends Conversation implements Interfaces.PrivateConv
} else if(this.ownTypingStatus !== 'clear') this.setOwnTyping('clear');
}
- addMessage(message: Interfaces.Message): void {
+ async addMessage(message: Interfaces.Message): Promise<void> {
+ await this.logPromise;
this.safeAddMessage(message);
if(message.type !== Interfaces.Message.Type.Event) {
- if(core.state.settings.logMessages) this.logPromise.then(() => core.logs.logMessage(this, message));
+ if(core.state.settings.logMessages) await core.logs.logMessage(this, message);
if(this.settings.notify !== Interfaces.Setting.False && message.sender !== core.characters.ownCharacter)
core.notifications.notify(this, message.sender.name, message.text, characterImage(message.sender.name), 'attention');
- if(this !== state.selectedConversation)
+ if(this !== state.selectedConversation || !state.windowFocused)
this.unread = Interfaces.UnreadState.Mention;
this.typingStatus = 'clear';
}
}
- close(): void {
+ async close(): Promise<void> {
state.privateConversations.splice(state.privateConversations.indexOf(this), 1);
delete state.privateMap[this.character.name.toLowerCase()];
- state.savePinned();
+ await state.savePinned();
if(state.selectedConversation === this) state.show(state.consoleTab);
}
- sort(newIndex: number): void {
+ async sort(newIndex: number): Promise<void> {
state.privateConversations.splice(state.privateConversations.indexOf(this), 1);
state.privateConversations.splice(newIndex, 0, this);
- state.savePinned();
+ return state.savePinned();
}
- protected doSend(): void {
+ protected async doSend(): Promise<void> {
+ await this.logPromise;
if(this.character.status === 'offline') {
this.errorText = l('chat.errorOffline', this.character.name);
return;
@@ -180,7 +181,7 @@ class PrivateConversation extends Conversation implements Interfaces.PrivateConv
core.connection.send('PRI', {recipient: this.name, message: this.enteredText});
const message = createMessage(MessageType.Message, core.characters.ownCharacter, this.enteredText);
this.safeAddMessage(message);
- if(core.state.settings.logMessages) this.logPromise.then(() => core.logs.logMessage(this, message));
+ if(core.state.settings.logMessages) await core.logs.logMessage(this, message);
this.enteredText = '';
}
@@ -255,7 +256,8 @@ class ChannelConversation extends Conversation implements Interfaces.ChannelConv
else safeAddMessage(this[mode], message, 500);
}
- addMessage(message: Interfaces.Message): void {
+ async addMessage(message: Interfaces.Message): Promise<void> {
+ await this.logPromise;
if((message.type === MessageType.Message || message.type === MessageType.Ad) && message.text.match(/^\/warn\b/) !== null) {
const member = this.channel.members[message.sender.name];
if(member !== undefined && member.rank > Channel.Rank.Member || message.sender.isChatOp)
@@ -264,13 +266,13 @@ class ChannelConversation extends Conversation implements Interfaces.ChannelConv
if(message.type === MessageType.Ad) {
this.addModeMessage('ads', message);
- if(core.state.settings.logAds) this.logPromise.then(() => core.logs.logMessage(this, message));
+ if(core.state.settings.logAds) await core.logs.logMessage(this, message);
} else {
this.addModeMessage('chat', message);
if(message.type !== Interfaces.Message.Type.Event) {
if(message.type === Interfaces.Message.Type.Warn) this.addModeMessage('ads', message);
- if(core.state.settings.logMessages) this.logPromise.then(() => core.logs.logMessage(this, message));
- if(this !== state.selectedConversation && this.unread === Interfaces.UnreadState.None)
+ if(core.state.settings.logMessages) await core.logs.logMessage(this, message);
+ if(this !== state.selectedConversation && this.unread === Interfaces.UnreadState.None || !state.windowFocused)
this.unread = Interfaces.UnreadState.Unread;
} else this.addModeMessage('ads', message);
}
@@ -281,16 +283,16 @@ class ChannelConversation extends Conversation implements Interfaces.ChannelConv
core.connection.send('LCH', {channel: this.channel.id});
}
- sort(newIndex: number): void {
+ async sort(newIndex: number): Promise<void> {
state.channelConversations.splice(state.channelConversations.indexOf(this), 1);
state.channelConversations.splice(newIndex, 0, this);
- state.savePinned();
+ return state.savePinned();
}
- protected doSend(): void {
+ protected async doSend(): Promise<void> {
const isAd = this.isSendingAds;
core.connection.send(isAd ? 'LRP' : 'MSG', {channel: this.channel.id, message: this.enteredText});
- this.addMessage(
+ await this.addMessage(
createMessage(isAd ? MessageType.Ad : MessageType.Message, core.characters.ownCharacter, this.enteredText, new Date()));
if(isAd) {
this.adCountdown = core.connection.vars.lfrp_flood;
@@ -317,10 +319,10 @@ class ConsoleConversation extends Conversation {
close(): void {
}
- addMessage(message: Interfaces.Message): void {
+ async addMessage(message: Interfaces.Message): Promise<void> {
this.safeAddMessage(message);
- if(core.state.settings.logMessages) core.logs.logMessage(this, message);
- if(this !== state.selectedConversation) this.unread = Interfaces.UnreadState.Unread;
+ if(core.state.settings.logMessages) await core.logs.logMessage(this, message);
+ if(this !== state.selectedConversation || !state.windowFocused) this.unread = Interfaces.UnreadState.Unread;
}
protected doSend(): void {
@@ -338,6 +340,12 @@ class State implements Interfaces.State {
recent: Interfaces.RecentConversation[] = [];
pinned: {channels: string[], private: string[]};
settings: {[key: string]: Interfaces.Settings};
+ windowFocused: boolean;
+
+ get hasNew(): boolean {
+ return this.privateConversations.some((x) => x.unread === Interfaces.UnreadState.Mention) ||
+ this.channelConversations.some((x) => x.unread === Interfaces.UnreadState.Mention);
+ }
getPrivate(character: Character): PrivateConversation {
const key = character.name.toLowerCase();
@@ -346,7 +354,7 @@ class State implements Interfaces.State {
conv = new PrivateConversation(character);
this.privateConversations.push(conv);
this.privateMap[key] = conv;
- state.addRecent(conv);
+ state.addRecent(conv); //tslint:disable-line:no-floating-promises
return conv;
}
@@ -355,18 +363,18 @@ class State implements Interfaces.State {
return (key[0] === '#' ? this.channelMap : this.privateMap)[key];
}
- savePinned(): void {
+ async savePinned(): Promise<void> {
this.pinned.channels = this.channelConversations.filter((x) => x.isPinned).map((x) => x.channel.id);
this.pinned.private = this.privateConversations.filter((x) => x.isPinned).map((x) => x.name);
- core.settingsStore.set('pinned', this.pinned);
+ await core.settingsStore.set('pinned', this.pinned);
}
- setSettings(key: string, value: Interfaces.Settings): void {
+ async setSettings(key: string, value: Interfaces.Settings): Promise<void> {
this.settings[key] = value;
- core.settingsStore.set('conversationSettings', this.settings);
+ await core.settingsStore.set('conversationSettings', this.settings);
}
- addRecent(conversation: Conversation): void {
+ async addRecent(conversation: Conversation): Promise<void> {
const remove = <T extends Interfaces.RecentConversation>(predicate: (item: T) => boolean) => {
for(let i = 0; i < this.recent.length; ++i)
if(predicate(<T>this.recent[i])) {
@@ -382,7 +390,7 @@ class State implements Interfaces.State {
state.recent.unshift({character: conversation.name});
}
if(this.recent.length >= 50) this.recent.pop();
- core.settingsStore.set('recent', this.recent);
+ await core.settingsStore.set('recent', this.recent);
}
show(conversation: Conversation): void {
@@ -400,7 +408,6 @@ class State implements Interfaces.State {
conversation._isPinned = this.pinned.private.indexOf(conversation.name) !== -1;
this.recent = await core.settingsStore.get('recent') || [];
const settings = <{[key: string]: ConversationSettings}> await core.settingsStore.get('conversationSettings') || {};
- //tslint:disable-next-line:forin
for(const key in settings) {
const settingsItem = new ConversationSettings();
for(const itemKey in settings[key])
@@ -416,9 +423,10 @@ class State implements Interfaces.State {
let state: State;
-function addEventMessage(this: void, message: Interfaces.Message): void {
- state.consoleTab.addMessage(message);
- if(core.state.settings.eventMessages && state.selectedConversation !== state.consoleTab) state.selectedConversation.addMessage(message);
+async function addEventMessage(this: void, message: Interfaces.Message): Promise<void> {
+ await state.consoleTab.addMessage(message);
+ if(core.state.settings.eventMessages && state.selectedConversation !== state.consoleTab)
+ await state.selectedConversation.addMessage(message);
}
function isOfInterest(this: void, character: Character): boolean {
@@ -427,6 +435,11 @@ function isOfInterest(this: void, character: Character): boolean {
export default function(this: void): Interfaces.State {
state = new State();
+ window.addEventListener('focus', () => {
+ state.windowFocused = true;
+ if(state.selectedConversation !== undefined!) state.selectedConversation.unread = Interfaces.UnreadState.None;
+ });
+ window.addEventListener('blur', () => state.windowFocused = false);
const connection = core.connection;
connection.onEvent('connecting', async(isReconnect) => {
state.channelConversations = [];
@@ -444,49 +457,49 @@ export default function(this: void): Interfaces.State {
for(const item of state.pinned.private) state.getPrivate(core.characters.get(item));
queuedJoin(state.pinned.channels.slice());
});
- core.channels.onEvent((type, channel, member) => {
+ core.channels.onEvent(async(type, channel, member) => {
if(type === 'join')
if(member === undefined) {
const conv = new ChannelConversation(channel);
state.channelMap[channel.id] = conv;
state.channelConversations.push(conv);
- state.addRecent(conv);
+ await state.addRecent(conv);
} else {
const conv = state.channelMap[channel.id]!;
if(conv.settings.joinMessages === Interfaces.Setting.False || conv.settings.joinMessages === Interfaces.Setting.Default &&
!core.state.settings.joinMessages) return;
const text = l('events.channelJoin', `[user]${member.character.name}[/user]`);
- conv.addMessage(new EventMessage(text));
+ await conv.addMessage(new EventMessage(text));
}
else if(member === undefined) {
const conv = state.channelMap[channel.id]!;
state.channelConversations.splice(state.channelConversations.indexOf(conv), 1);
delete state.channelMap[channel.id];
- state.savePinned();
+ await state.savePinned();
if(state.selectedConversation === conv) state.show(state.consoleTab);
} else {
const conv = state.channelMap[channel.id]!;
if(conv.settings.joinMessages === Interfaces.Setting.False || conv.settings.joinMessages === Interfaces.Setting.Default &&
!core.state.settings.joinMessages) return;
const text = l('events.channelLeave', `[user]${member.character.name}[/user]`);
- conv.addMessage(new EventMessage(text));
+ await conv.addMessage(new EventMessage(text));
}
});
- connection.onMessage('PRI', (data, time) => {
+ connection.onMessage('PRI', async(data, time) => {
const char = core.characters.get(data.character);
if(char.isIgnored) return connection.send('IGN', {action: 'notify', character: data.character});
const message = createMessage(MessageType.Message, char, decodeHTML(data.message), time);
const conv = state.getPrivate(char);
- conv.addMessage(message);
+ await conv.addMessage(message);
});
- connection.onMessage('MSG', (data, time) => {
+ connection.onMessage('MSG', async(data, time) => {
const char = core.characters.get(data.character);
if(char.isIgnored) return;
const conversation = state.channelMap[data.channel.toLowerCase()];
if(conversation === undefined) return core.channels.leave(data.channel);
const message = createMessage(MessageType.Message, char, decodeHTML(data.message), time);
- conversation.addMessage(message);
+ await conversation.addMessage(message);
const words = conversation.settings.highlightWords.slice();
if(conversation.settings.defaultHighlights) words.push(...core.state.settings.highlightWords);
@@ -497,20 +510,20 @@ export default function(this: void): Interfaces.State {
if(results !== null) {
core.notifications.notify(conversation, data.character, l('chat.highlight', results[0], conversation.name, message.text),
characterImage(data.character), 'attention');
- if(conversation !== state.selectedConversation) conversation.unread = Interfaces.UnreadState.Mention;
+ if(conversation !== state.selectedConversation || !state.windowFocused) conversation.unread = Interfaces.UnreadState.Mention;
message.isHighlight = true;
} else if(conversation.settings.notify === Interfaces.Setting.True)
core.notifications.notify(conversation, conversation.name, messageToString(message),
characterImage(data.character), 'attention');
});
- connection.onMessage('LRP', (data, time) => {
+ connection.onMessage('LRP', async(data, time) => {
const char = core.characters.get(data.character);
if(char.isIgnored || core.state.hiddenUsers.indexOf(char.name) !== -1) return;
const conv = state.channelMap[data.channel.toLowerCase()];
if(conv === undefined) return core.channels.leave(data.channel);
- conv.addMessage(new Message(MessageType.Ad, char, decodeHTML(data.message), time));
+ await conv.addMessage(new Message(MessageType.Ad, char, decodeHTML(data.message), time));
});
- connection.onMessage('RLL', (data, time) => {
+ connection.onMessage('RLL', async(data, time) => {
const sender = core.characters.get(data.character);
if(sender.isIgnored) return;
let text: string;
@@ -525,7 +538,7 @@ export default function(this: void): Interfaces.State {
const channel = (<{channel: string}>data).channel.toLowerCase();
const conversation = state.channelMap[channel];
if(conversation === undefined) return core.channels.leave(channel);
- conversation.addMessage(message);
+ await conversation.addMessage(message);
if(data.type === 'bottle' && data.target === core.connection.character)
core.notifications.notify(conversation, conversation.name, messageToString(message),
characterImage(data.character), 'attention');
@@ -534,63 +547,69 @@ export default function(this: void): Interfaces.State {
data.character === connection.character ? (<{recipient: string}>data).recipient : data.character);
if(char.isIgnored) return connection.send('IGN', {action: 'notify', character: data.character});
const conversation = state.getPrivate(char);
- conversation.addMessage(message);
+ await conversation.addMessage(message);
}
});
- connection.onMessage('NLN', (data, time) => {
+ connection.onMessage('NLN', async(data, time) => {
const message = new EventMessage(l('events.login', `[user]${data.identity}[/user]`), time);
- if(isOfInterest(core.characters.get(data.identity))) addEventMessage(message);
+ if(isOfInterest(core.characters.get(data.identity))) await addEventMessage(message);
const conv = state.privateMap[data.identity.toLowerCase()];
- if(conv !== undefined && (!core.state.settings.eventMessages || conv !== state.selectedConversation)) conv.addMessage(message);
+ if(conv !== undefined && (!core.state.settings.eventMessages || conv !== state.selectedConversation))
+ await conv.addMessage(message);
});
- connection.onMessage('FLN', (data, time) => {
+ connection.onMessage('FLN', async(data, time) => {
const message = new EventMessage(l('events.logout', `[user]${data.character}[/user]`), time);
- if(isOfInterest(core.characters.get(data.character))) addEventMessage(message);
+ if(isOfInterest(core.characters.get(data.character))) await addEventMessage(message);
const conv = state.privateMap[data.character.toLowerCase()];
if(conv === undefined) return;
conv.typingStatus = 'clear';
- if(!core.state.settings.eventMessages || conv !== state.selectedConversation) conv.addMessage(message);
+ if(!core.state.settings.eventMessages || conv !== state.selectedConversation) await conv.addMessage(message);
});
connection.onMessage('TPN', (data) => {
const conv = state.privateMap[data.character.toLowerCase()];
if(conv !== undefined) conv.typingStatus = data.status;
});
- connection.onMessage('CBU', (data, time) => {
+ 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);
conv.infoText = text;
- addEventMessage(new EventMessage(text, time));
+ return addEventMessage(new EventMessage(text, time));
});
- connection.onMessage('CKU', (data, 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);
conv.infoText = text;
- addEventMessage(new EventMessage(text, time));
+ return addEventMessage(new EventMessage(text, time));
});
- connection.onMessage('CTU', (data, 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);
conv.infoText = text;
- addEventMessage(new EventMessage(text, time));
+ return addEventMessage(new EventMessage(text, time));
});
- connection.onMessage('HLO', (data, time) => addEventMessage(new EventMessage(data.message, time)));
- connection.onMessage('BRO', (data, time) => {
+ connection.onMessage('HLO', async(data, time) => addEventMessage(new EventMessage(data.message, 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)));
- addEventMessage(new EventMessage(text, time));
+ return addEventMessage(new EventMessage(text, time));
});
- connection.onMessage('CIU', (data, time) => {
+ connection.onMessage('CIU', async(data, time) => {
const text = l('events.invite', `[user]${data.sender}[/user]`, `[session=${data.title}]${data.name}[/session]`);
- addEventMessage(new EventMessage(text, time));
+ return addEventMessage(new EventMessage(text, time));
});
- connection.onMessage('ERR', (data, time) => {
+ connection.onMessage('ERR', async(data, time) => {
state.selectedConversation.errorText = data.message;
- addEventMessage(new EventMessage(`[color=red]${l('events.error', data.message)}[/color]`, time));
+ return addEventMessage(new EventMessage(`[color=red]${l('events.error', data.message)}[/color]`, time));
});
- connection.onMessage('RTB', (data, time) => {
+
+ connection.onMessage('IGN', async(data, time) => {
+ if(data.action !== 'add' && data.action !== 'delete') return;
+ return addEventMessage(new EventMessage(l(`events.ignore_${data.action}`, data.character), time));
+ });
+ connection.onMessage('RTB', async(data, time) => {
let url = 'https://www.f-list.net/';
let text: string, character: string;
if(data.type === 'comment') { //tslint:disable-line:prefer-switch
@@ -640,13 +659,13 @@ export default function(this: void): Interfaces.State {
data.title !== undefined ? `[url=${url}]${data.title}[/url]` : url);
character = data.name;
}
- addEventMessage(new EventMessage(text, time));
+ await addEventMessage(new EventMessage(text, time));
if(data.type === 'note')
core.notifications.notify(state.consoleTab, character, text, characterImage(character), 'newnote');
});
type SFCMessage = (Interfaces.Message & {sfc: Connection.ServerCommands['SFC'] & {confirmed?: true}});
const sfcList: SFCMessage[] = [];
- connection.onMessage('SFC', (data, time) => {
+ connection.onMessage('SFC', async(data, time) => {
let text: string, message: Interfaces.Message;
if(data.action === 'report') {
text = l('events.report', `[user]${data.character}[/user]`, decodeHTML(data.tab), decodeHTML(data.report));
@@ -663,11 +682,11 @@ export default function(this: void): Interfaces.State {
}
message = new EventMessage(text, time);
}
- addEventMessage(message);
+ return addEventMessage(message);
});
- connection.onMessage('STA', (data, time) => {
+ connection.onMessage('STA', async(data, time) => {
if(data.character === core.connection.character) {
- addEventMessage(new EventMessage(l(data.statusmsg.length > 0 ? 'events.status.ownMessage' : 'events.status.own',
+ await addEventMessage(new EventMessage(l(data.statusmsg.length > 0 ? 'events.status.ownMessage' : 'events.status.own',
l(`status.${data.status}`), decodeHTML(data.statusmsg)), time));
return;
}
@@ -676,17 +695,17 @@ export default function(this: void): Interfaces.State {
const status = l(`status.${data.status}`);
const key = data.statusmsg.length > 0 ? 'events.status.message' : 'events.status';
const message = new EventMessage(l(key, `[user]${data.character}[/user]`, status, decodeHTML(data.statusmsg)), time);
- addEventMessage(message);
+ await addEventMessage(message);
const conv = state.privateMap[data.character.toLowerCase()];
- if(conv !== undefined && core.state.settings.eventMessages && conv !== state.selectedConversation) conv.addMessage(message);
+ if(conv !== undefined && core.state.settings.eventMessages && conv !== state.selectedConversation) await conv.addMessage(message);
});
- connection.onMessage('SYS', (data, time) => {
+ connection.onMessage('SYS', async(data, time) => {
state.selectedConversation.infoText = data.message;
- addEventMessage(new EventMessage(data.message, time));
+ return addEventMessage(new EventMessage(data.message, time));
});
- connection.onMessage('ZZZ', (data, time) => {
+ connection.onMessage('ZZZ', async(data, time) => {
state.selectedConversation.infoText = data.message;
- addEventMessage(new EventMessage(data.message, time));
+ return addEventMessage(new EventMessage(data.message, time));
});
//TODO connection.onMessage('UPT', data =>
return state;
diff --git a/chat/core.ts b/chat/core.ts
index 8758e5b..cebcb92 100644
--- a/chat/core.ts
+++ b/chat/core.ts
@@ -44,9 +44,8 @@ const vue = <Vue & VueState>new Vue({
state
},
watch: {
- 'state.hiddenUsers': (newValue: string[]) => {
- //tslint:disable-next-line:no-floating-promises
- if(data.settingsStore !== undefined) data.settingsStore.set('hiddenUsers', newValue);
+ 'state.hiddenUsers': async(newValue: string[]) => {
+ if(data.settingsStore !== undefined) await data.settingsStore.set('hiddenUsers', newValue);
}
}
});
@@ -92,7 +91,7 @@ export function init(this: void, connection: Connection, logsClass: new() => Log
});
}
-const core = <{
+export interface Core {
readonly connection: Connection
readonly logs: Logs.Basic
readonly state: StateInterface
@@ -107,6 +106,8 @@ const core = <{
register(module: 'characters', state: Character.State): void
reloadSettings(): void
watch<T>(getter: (this: VueState) => T, callback: WatchHandler<T>): void
-}><any>data; /*tslint:disable-line:no-any*///hack
+}
+
+const core = <Core><any>data; /*tslint:disable-line:no-any*///hack
export default core;
\ No newline at end of file
diff --git a/chat/interfaces.ts b/chat/interfaces.ts
index 88121ee..37f7ebb 100644
--- a/chat/interfaces.ts
+++ b/chat/interfaces.ts
@@ -50,8 +50,8 @@ export namespace Conversation {
interface TabConversation extends Conversation {
isPinned: boolean
readonly maxMessageLength: number
- close(): void
- sort(newIndex: number): void
+ close(): Promise<void> | void
+ sort(newIndex: number): Promise<void>
}
export interface PrivateConversation extends TabConversation {
@@ -80,6 +80,7 @@ export namespace Conversation {
readonly consoleTab: Conversation
readonly recent: ReadonlyArray<RecentConversation>
readonly selectedConversation: Conversation
+ readonly hasNew: boolean;
byKey(key: string): Conversation | undefined
getPrivate(character: Character): PrivateConversation
reloadSettings(): void
@@ -110,7 +111,7 @@ export namespace Conversation {
readonly key: string
readonly unread: UnreadState
settings: Settings
- send(): void
+ send(): Promise<void>
loadLastSent(): void
show(): void
loadMore(): void
@@ -121,7 +122,7 @@ export type Conversation = Conversation.Conversation;
export namespace Logs {
export interface Basic {
- logMessage(conversation: Conversation, message: Conversation.Message): void
+ logMessage(conversation: Conversation, message: Conversation.Message): Promise<void> | void
getBacklog(conversation: Conversation): Promise<ReadonlyArray<Conversation.Message>>
}
@@ -177,6 +178,7 @@ export interface Notifications {
isInBackground: boolean
notify(conversation: Conversation, title: string, body: string, icon: string, sound: string): void
playSound(sound: string): void
+ requestPermission(): Promise<void>
}
export interface State {
diff --git a/chat/localize.ts b/chat/localize.ts
index 534d092..aa6f064 100644
--- a/chat/localize.ts
+++ b/chat/localize.ts
@@ -8,7 +8,10 @@ const strings: {[key: string]: string | undefined} = {
'action.copyLink': 'Copy Link',
'action.suggestions': 'Suggestions',
'action.open': 'Show',
+ 'action.close': 'Close',
'action.quit': 'Quit',
+ 'action.newWindow': 'Open new window',
+ 'action.newTab': 'Open new tab',
'action.updateAvailable': 'UPDATE AVAILABLE',
'action.update': 'Restart now!',
'action.cancel': 'Cancel',
@@ -21,9 +24,13 @@ const strings: {[key: string]: string | undefined} = {
'help.faq': 'F-List FAQ',
'help.report': 'How to report a user',
'help.changelog': 'Changelog',
- 'title': 'FChat 3.0',
+ 'fs.error': 'Error writing to disk',
+ 'window.newTab': 'New tab',
+ 'title': 'F-Chat',
'version': 'Version {0}',
'filter': 'Type to filter...',
+ 'confirmYes': 'Yes',
+ 'confirmNo': 'No',
'login.account': 'Username',
'login.password': 'Password',
'login.host': 'Host',
@@ -36,6 +43,7 @@ const strings: {[key: string]: string | undefined} = {
'login.connect': 'Connect',
'login.connecting': 'Connecting...',
'login.connectError': 'Connection error: Could not connect to server',
+ 'login.alreadyLoggedIn': 'You are already logged in on this character in another tab or window.',
'channelList.public': 'Official channels',
'channelList.private': 'Open rooms',
'channelList.create': 'Create room',
@@ -85,6 +93,7 @@ const strings: {[key: string]: string | undefined} = {
'users.friends': 'Friends',
'users.bookmarks': 'Bookmarks',
'users.members': 'Members',
+ 'users.memberCount': '{0} Members',
'chat.report': 'Alert Staff',
'chat.report.description': `
[color=red]Before you alert the moderators, PLEASE READ:[/color]
@@ -136,6 +145,8 @@ Are you sure?`,
'settings.spellcheck.disabled': 'Disabled',
'settings.theme': 'Theme',
'settings.profileViewer': 'Use profile viewer',
+ 'settings.logDir': 'Change log location',
+ 'settings.logDir.confirm': 'Do you want to set your log location to {0}?\n\nNo files will be moved. If you click Yes here, F-Chat will shut down. If you would like to keep your log files, please move them manually.\n\nCurrent log location: {1}',
'settings.logMessages': 'Log messages',
'settings.logAds': 'Log ads',
'settings.fontSize': 'Font size (experimental)',
@@ -206,6 +217,8 @@ Are you sure?`,
'events.logout': '{0} has logged out.',
'events.channelJoin': '{0} has joined the channel.',
'events.channelLeave': '{0} has left the channel.',
+ 'events.ignore_add': 'You are now ignoring {0}\'s messages. Should they go around this by any means, please report it using the Alert Staff button.',
+ 'events.ignore_delete': '{0} is now allowed to send you messages again.',
'commands.unknown': 'Unknown command. For a list of valid commands, please click the ? button.',
'commands.badContext': 'This command cannot be used here. Please use the Help (click the ? button) if you need further information.',
'commands.tooFewParams': 'This command requires more parameters. Please use the Help (click the ? button) if you need further information.',
diff --git a/chat/message_view.ts b/chat/message_view.ts
index 638f621..778c726 100644
--- a/chat/message_view.ts
+++ b/chat/message_view.ts
@@ -1,4 +1,5 @@
import {Component, CreateElement, RenderContext, VNode, VNodeChildren} from 'vue';
+import {Channel} from '../fchat';
import {BBCodeView} from './bbcode';
import {formatTime} from './common';
import core from './core';
@@ -20,9 +21,9 @@ const userPostfix: {[key: number]: string | undefined} = {
//tslint:disable-next-line:variable-name
const MessageView: Component = {
functional: true,
- render(createElement: CreateElement, context: RenderContext): VNode {
- /*tslint:disable:no-unsafe-any*///context.props is any
- const message: Conversation.Message = context.props.message;
+ render(createElement: CreateElement,
+ context: RenderContext<{message: Conversation.Message, classes?: string, channel?: Channel}>): VNode {
+ const message = context.props.message;
const children: (VNode | string | VNodeChildren)[] = [`[${formatTime(message.time)}] `];
/*tslint:disable-next-line:prefer-template*///unreasonable here
let classes = `message message-${Conversation.Message.Type[message.type].toLowerCase()}` +
@@ -39,7 +40,6 @@ const MessageView: Component = {
const node = createElement('div', {attrs: {class: classes}}, children);
node.key = context.data.key;
return node;
- //tslint:enable
}
};
diff --git a/chat/notifications.ts b/chat/notifications.ts
index 0050d34..9f96ef7 100644
--- a/chat/notifications.ts
+++ b/chat/notifications.ts
@@ -27,7 +27,6 @@ export default class Notifications implements Interface {
if(audio === null) {
audio = document.createElement('audio');
audio.id = id;
- //tslint:disable-next-line:forin
for(const name in codecs) {
const src = document.createElement('source');
src.type = `audio/${name}`;
@@ -39,4 +38,8 @@ export default class Notifications implements Interface {
//tslint:disable-next-line:no-floating-promises
audio.play();
}
+
+ async requestPermission(): Promise<void> {
+ await Notification.requestPermission();
+ }
}
\ No newline at end of file
diff --git a/chat/profile_api.ts b/chat/profile_api.ts
index 5314ddb..6c9bb65 100644
--- a/chat/profile_api.ts
+++ b/chat/profile_api.ts
@@ -2,10 +2,14 @@ import Axios from 'axios';
import Vue from 'vue';
import {InlineDisplayMode} from '../bbcode/interfaces';
import {initParser, standardParser} from '../bbcode/standard';
+import CharacterLink from '../components/character_link.vue';
+import CharacterSelect from '../components/character_select.vue';
+import {setCharacters} from '../components/character_select/character_list';
+import DateDisplay from '../components/date_display.vue';
import {registerMethod, Store} from '../site/character_page/data_store';
import {
- Character, CharacterCustom, CharacterFriend, CharacterImage, CharacterImageOld, CharacterInfo, CharacterInfotag, CharacterSettings,
- GuestbookState, KinkChoiceFull, SharedKinks
+ Character, CharacterCustom, CharacterFriend, CharacterImage, CharacterImageOld, CharacterInfo, CharacterInfotag, CharacterKink,
+ CharacterSettings, Friend, FriendRequest, FriendsByCharacter, GuestbookState, KinkChoice, KinkChoiceFull, SharedKinks
} from '../site/character_page/interfaces';
import '../site/directives/vue-select'; //tslint:disable-line:no-import-side-effect
import * as Utils from '../site/utils';
@@ -15,9 +19,12 @@ async function characterData(name: string | undefined): Promise<Character> {
const data = await core.connection.queryApi('character-data.php', {name}) as CharacterInfo & {
badges: string[]
customs_first: boolean
+ character_list: {id: number, name: string}[]
custom_kinks: {[key: number]: {choice: 'fave' | 'yes' | 'maybe' | 'no', name: string, description: string, children: number[]}}
custom_title: string
+ kinks: {[key: string]: string}
infotags: {[key: string]: string}
+ memo: {id: number, memo: string}
settings: CharacterSettings
};
const newKinks: {[key: string]: KinkChoiceFull} = {};
@@ -33,8 +40,7 @@ async function characterData(name: string | undefined): Promise<Character> {
description: custom.description
});
for(const childId of custom.children)
- if(data.kinks[childId] !== undefined)
- newKinks[childId] = parseInt(key, 10);
+ newKinks[childId] = parseInt(key, 10);
}
const newInfotags: {[key: string]: CharacterInfotag} = {};
for(const key in data.infotags) {
@@ -61,9 +67,11 @@ async function characterData(name: string | undefined): Promise<Character> {
infotags: newInfotags,
online_chat: false
},
+ memo: data.memo,
+ character_list: data.character_list,
badges: data.badges,
settings: data.settings,
- bookmarked: false,
+ bookmarked: core.characters.get(data.name).isBookmarked,
self_staff: false
};
}
@@ -147,7 +155,15 @@ async function guestbookGet(id: number, page: number): Promise<GuestbookState> {
return core.connection.queryApi<GuestbookState>('character-guestbook.php', {id, page: page - 1});
}
-export function init(): void {
+async function kinksGet(id: number): Promise<CharacterKink[]> {
+ const data = await core.connection.queryApi<{kinks: {[key: string]: string}}>('character-data.php', {id});
+ return Object.keys(data.kinks).map((key) => {
+ const choice = data.kinks[key];
+ return {id: parseInt(key, 10), choice: <KinkChoice>(choice === 'fave' ? 'favorite' : choice)};
+ });
+}
+
+export function init(characters: {[key: string]: number}): void {
Utils.setDomains('https://www.f-list.net/', 'https://static.f-list.net/');
initParser({
siteDomain: Utils.siteDomain,
@@ -156,6 +172,13 @@ export function init(): void {
inlineDisplayMode: InlineDisplayMode.DISPLAY_ALL
});
+ Vue.component('character-select', CharacterSelect);
+ Vue.component('character-link', CharacterLink);
+ Vue.component('date-display', DateDisplay);
+ setCharacters(Object.keys(characters).map((name) => ({name, id: characters[name]})));
+ core.connection.onEvent('connecting', () => {
+ Utils.Settings.defaultCharacter = characters[core.connection.character];
+ });
Vue.directive('bbcode', (el, binding) => {
while(el.firstChild !== null)
el.removeChild(el.firstChild);
@@ -163,10 +186,34 @@ export function init(): void {
});
registerMethod('characterData', characterData);
registerMethod('contactMethodIconUrl', contactMethodIconUrl);
+ registerMethod('sendNoteUrl', (character: CharacterInfo) => `${Utils.siteDomain}read_notes.php?send=${character.name}`);
registerMethod('fieldsGet', fieldsGet);
registerMethod('friendsGet', friendsGet);
+ registerMethod('kinksGet', kinksGet);
registerMethod('imagesGet', imagesGet);
registerMethod('guestbookPageGet', guestbookGet);
registerMethod('imageUrl', (image: CharacterImageOld) => image.url);
+ registerMethod('memoUpdate', async(id: number, memo: string) => {
+ await core.connection.queryApi('character-memo-save.php', {target: id, note: memo});
+ return {id, memo, updated_at: Date.now() / 1000};
+ });
registerMethod('imageThumbUrl', (image: CharacterImage) => `${Utils.staticDomain}images/charthumb/${image.id}.${image.extension}`);
+ registerMethod('bookmarkUpdate', async(id: number, state: boolean) => {
+ await core.connection.queryApi(`bookmark-${state ? 'add' : 'remove'}.php`, {id});
+ return state;
+ });
+ registerMethod('characterFriends', async(id: number) =>
+ core.connection.queryApi<FriendsByCharacter>('character-friend-list.php', {id}));
+ registerMethod('friendRequest', async(target_id: number, source_id: number) =>
+ (await core.connection.queryApi<{request: FriendRequest}>('request-send2.php', {source_id, target_id})).request);
+ registerMethod('friendDissolve', async(friend: Friend) =>
+ core.connection.queryApi<void>('friend-remove.php', {source_id: friend.source.id, dest_id: friend.target.id}));
+ registerMethod('friendRequestAccept', async(req: FriendRequest) => {
+ await core.connection.queryApi('request-accept.php', {request_id: req.id});
+ return { id: undefined!, source: req.target, target: req.source, createdAt: Date.now() / 1000 };
+ });
+ registerMethod('friendRequestCancel', async(req: FriendRequest) =>
+ core.connection.queryApi<void>('request-cancel.php', {request_id: req.id}));
+ registerMethod('friendRequestIgnore', async(req: FriendRequest) =>
+ core.connection.queryApi<void>('request-deny.php', {request_id: req.id}));
}
\ No newline at end of file
diff --git a/chat/slash_commands.ts b/chat/slash_commands.ts
index 8351972..c5d9ab8 100644
--- a/chat/slash_commands.ts
+++ b/chat/slash_commands.ts
@@ -27,6 +27,7 @@ export function parse(this: void | never, input: string, context: CommandContext
if(command.params !== undefined)
for(let i = 0; i < command.params.length; ++i) {
+ while(args[index] === ' ') ++index;
const param = command.params[i];
if(index === -1)
if(param.optional !== undefined) continue;
@@ -48,7 +49,6 @@ export function parse(this: void | never, input: string, context: CommandContext
return l('commands.invalidParam', l(`commands.${name}.param${i}`));
break;
case ParamType.Number:
- console.log(value);
const num = parseInt(value, 10);
if(isNaN(num))
return l('commands.invalidParam', l(`commands.${name}.param${i}`));
diff --git a/components/Modal.vue b/components/Modal.vue
index 9b2cebe..8db3798 100644
--- a/components/Modal.vue
+++ b/components/Modal.vue
@@ -1,32 +1,41 @@
<template>
- <div tabindex="-1" class="modal flex-modal" :style="isShown ? 'display:flex' : ''"
- style="align-items: flex-start; padding: 30px; justify-content: center;">
- <div class="modal-dialog" :class="dialogClass" style="display: flex; flex-direction: column; max-height: 100%; margin: 0;">
- <div class="modal-content" style="display:flex; flex-direction: column;">
- <div class="modal-header">
- <button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
- <h4 class="modal-title">
- <slot name="title">{{action}}</slot>
- </h4>
- </div>
- <div class="modal-body" style="overflow: auto; display: flex; flex-direction: column">
- <slot></slot>
- </div>
- <div class="modal-footer" v-if="buttons">
- <button type="button" class="btn btn-default" data-dismiss="modal" v-if="showCancel">Cancel</button>
- <button type="button" class="btn" :class="buttonClass" @click="submit" :disabled="disabled">
- {{submitText}}
- </button>
+ <span v-show="isShown">
+ <div tabindex="-1" class="modal flex-modal" @click.self="hideWithCheck"
+ style="align-items:flex-start;padding:30px;justify-content:center;display:flex">
+ <div class="modal-dialog" :class="dialogClass" style="display:flex;flex-direction:column;max-height:100%;margin:0">
+ <div class="modal-content" style="display:flex;flex-direction:column;flex-grow:1">
+ <div class="modal-header" style="flex-shrink:0">
+ <button type="button" class="close" @click="hide" aria-label="Close" v-show="!keepOpen">×</button>
+ <h4 class="modal-title">
+ <slot name="title">{{action}}</slot>
+ </h4>
+ </div>
+ <div class="modal-body" style="overflow: auto; display: flex; flex-direction: column">
+ <slot></slot>
+ </div>
+ <div class="modal-footer" v-if="buttons">
+ <button type="button" class="btn btn-default" @click="hideWithCheck" v-if="showCancel">Cancel</button>
+ <button type="button" class="btn" :class="buttonClass" @click="submit" :disabled="disabled">
+ {{submitText}}
+ </button>
+ </div>
</div>
</div>
</div>
- </div>
+ <div class="modal-backdrop in"></div>
+ </span>
</template>
<script lang="ts">
import Vue from 'vue';
import Component from 'vue-class-component';
import {Prop} from 'vue-property-decorator';
+ import {getKey} from '../chat/common';
+
+ const dialogStack: Modal[] = [];
+ window.addEventListener('keydown', (e) => {
+ if(getKey(e) === 'escape' && dialogStack.length > 0) dialogStack.pop()!.isShown = false;
+ });
@Component
export default class Modal extends Vue {
@@ -45,7 +54,7 @@
@Prop()
readonly buttonText?: string;
isShown = false;
- element: JQuery;
+ keepOpen = false;
get submitText(): string {
return this.buttonText !== undefined ? this.buttonText : this.action;
@@ -53,27 +62,32 @@
submit(e: Event): void {
this.$emit('submit', e);
- if(!e.defaultPrevented) this.hide();
+ if(!e.defaultPrevented) this.hideWithCheck();
}
/*tslint:disable-next-line:typedef*///https://github.com/palantir/tslint/issues/711
show(keepOpen = false): void {
- if(keepOpen) this.element.on('hide.bs.modal', (e) => e.preventDefault());
- this.element.modal('show');
this.isShown = true;
+ this.keepOpen = keepOpen;
+ dialogStack.push(this);
+ this.$emit('open');
}
hide(): void {
- this.element.off('hide.bs.modal');
- this.element.modal('hide');
this.isShown = false;
+ this.$emit('close');
+ dialogStack.pop();
+ }
+
+ private hideWithCheck(): void {
+ if(this.keepOpen) return;
+ this.hide();
}
fixDropdowns(): void {
//tslint:disable-next-line:no-this-assignment
const vm = this;
$('.dropdown', this.$el).on('show.bs.dropdown', function(this: HTMLElement & {menu?: HTMLElement}): void {
- $(document).off('focusin.bs.modal');
if(this.menu !== undefined) {
this.menu.style.display = 'block';
return;
@@ -96,12 +110,6 @@
});
}
- mounted(): void {
- this.element = $(this.$el);
- this.element.on('shown.bs.modal', () => this.$emit('open'));
- this.element.on('hidden.bs.modal', () => this.$emit('close'));
- }
-
beforeDestroy(): void {
if(this.isShown) this.hide();
}
diff --git a/components/character_select.vue b/components/character_select.vue
new file mode 100644
index 0000000..534acda
--- /dev/null
+++ b/components/character_select.vue
@@ -0,0 +1,36 @@
+<template>
+ <select class="form-control" :value="value" @change="emit">
+ <option v-for="o in characters" :value="o.value" v-once>{{o.text}}</option>
+ <slot></slot>
+ </select>
+</template>
+
+<script lang="ts">
+ import Vue from 'vue';
+ import Component from 'vue-class-component';
+ import {Prop} from 'vue-property-decorator';
+ import {getCharacters} from './character_select/character_list';
+
+ interface SelectItem {
+ value: number
+ text: string
+ }
+
+ @Component
+ export default class CharacterSelect extends Vue {
+ @Prop({required: true, type: Number})
+ readonly value: number;
+
+ get characters(): SelectItem[] {
+ const characterList = getCharacters();
+ const characters: SelectItem[] = [];
+ for(const character of characterList)
+ characters.push({value: character.id, text: character.name});
+ return characters;
+ }
+
+ emit(evt: Event): void {
+ this.$emit('input', parseInt((<HTMLSelectElement>evt.target).value, 10));
+ }
+ }
+</script>
\ No newline at end of file
diff --git a/components/character_select/character_list.ts b/components/character_select/character_list.ts
new file mode 100644
index 0000000..5c7f52a
--- /dev/null
+++ b/components/character_select/character_list.ts
@@ -0,0 +1,14 @@
+export interface CharacterItem {
+ readonly name: string
+ readonly id: number
+}
+
+let characterList: ReadonlyArray<CharacterItem> = [];
+
+export function setCharacters(characters: ReadonlyArray<CharacterItem>): void {
+ characterList = characters;
+}
+
+export function getCharacters(): ReadonlyArray<CharacterItem> {
+ return characterList;
+}
\ No newline at end of file
diff --git a/cordova/config.xml b/cordova/config.xml
deleted file mode 100644
index 9e0f4be..0000000
--- a/cordova/config.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<widget id="net.f_list.fchat" version="3.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
- <name>F-Chat 3.0</name>
- <description>
- A cross-platform F-Chat client.
- </description>
- <author email="maya@f-list.net" href="https://www.f-list.net">The F-list Team</author>
- <content src="index.html" />
- <icon src="../electron/build/icon.png" />
- <access origin="*" />
- <allow-intent href="http://*/*" />
- <allow-intent href="https://*/*" />
- <allow-intent href="tel:*" />
- <allow-intent href="sms:*" />
- <allow-intent href="mailto:*" />
- <allow-intent href="geo:*" />
- <platform name="android">
- <allow-intent href="market:*" />
- </platform>
- <platform name="ios">
- <allow-intent href="itms:*" />
- <allow-intent href="itms-apps:*" />
- </platform>
- <engine name="android" spec="^6.2.3" />
- <plugin name="cordova-plugin-file" spec="^4.3.3" />
- <plugin name="cordova-plugin-whitelist" spec="^1.3.2" />
- <plugin name="de.appplant.cordova.plugin.local-notification" spec="^0.8.5" />
-</widget>
diff --git a/cordova/filesystem.ts b/cordova/filesystem.ts
deleted file mode 100644
index 4580078..0000000
--- a/cordova/filesystem.ts
+++ /dev/null
@@ -1,263 +0,0 @@
-import {getByteLength, Message as MessageImpl} from '../chat/common';
-import core from '../chat/core';
-import {Conversation, Logs as Logging, Settings} from '../chat/interfaces';
-
-declare global {
- class TextEncoder {
- readonly encoding: string;
-
- encode(input?: string, options?: {stream: boolean}): Uint8Array;
- }
-
- class TextDecoder {
- readonly encoding: string;
- readonly fatal: boolean;
- readonly ignoreBOM: boolean;
-
- constructor(utfLabel?: string, options?: {fatal?: boolean, ignoreBOM?: boolean})
-
- decode(input?: ArrayBufferView, options?: {stream: boolean}): string;
- }
-}
-
-const dayMs = 86400000;
-let fs: FileSystem;
-
-export class GeneralSettings {
- account = '';
- password = '';
- host = 'wss://chat.f-list.net:9799';
- theme = 'default';
-}
-
-type Index = {[key: string]: {name: string, index: {[key: number]: number | undefined}} | undefined};
-
-/*tslint:disable:promise-function-async*///all of these are simple wrappers
-export function init(): Promise<void> {
- return new Promise((resolve, reject) => {
- document.addEventListener('deviceready', () => {
- window.requestFileSystem(LocalFileSystem.PERSISTENT, 0, (f) => {
- fs = f;
- resolve();
- }, reject);
- });
- });
-}
-
-function readAsString(file: Blob): Promise<string> {
- return new Promise<string>((resolve, reject) => {
- const reader = new FileReader();
- reader.onloadend = () => resolve(<string>reader.result);
- reader.onerror = reject;
- reader.readAsText(file);
- });
-}
-
-function readAsArrayBuffer(file: Blob): Promise<ArrayBuffer> {
- return new Promise<ArrayBuffer>((resolve, reject) => {
- const reader = new FileReader();
- reader.onloadend = () => resolve(<ArrayBuffer>reader.result);
- reader.onerror = reject;
- reader.readAsArrayBuffer(file);
- });
-}
-
-function getFile(root: DirectoryEntry, path: string): Promise<File | undefined> {
- return new Promise<File | undefined>((resolve, reject) => {
- root.getFile(path, {create: false}, (entry) => entry.file((file) => {
- resolve(file);
- }, reject), (e) => {
- if(e.code === FileError.NOT_FOUND_ERR) resolve(undefined);
- else reject(e);
- });
- });
-}
-
-function getWriter(root: DirectoryEntry, path: string): Promise<FileWriter> {
- return new Promise<FileWriter>((resolve, reject) => root.getFile(path, {create: true},
- (file) => file.createWriter(resolve, reject), reject));
-}
-
-function getDir(root: DirectoryEntry, name: string): Promise<DirectoryEntry> {
- return new Promise<DirectoryEntry>((resolve, reject) => root.getDirectory(name, {create: true}, resolve, reject));
-}
-
-function getEntries(root: DirectoryEntry): Promise<ReadonlyArray<Entry>> {
- const reader = root.createReader();
- return new Promise<ReadonlyArray<Entry>>((resolve, reject) => reader.readEntries(resolve, reject));
-}
-
-//tslib:enable
-
-function serializeMessage(message: Conversation.Message): Blob {
- const name = message.type !== Conversation.Message.Type.Event ? message.sender.name : '';
- const buffer = new ArrayBuffer(8);
- const dv = new DataView(buffer);
- dv.setUint32(0, message.time.getTime() / 1000);
- dv.setUint8(4, message.type);
- const senderLength = getByteLength(name);
- dv.setUint8(5, senderLength);
- const textLength = getByteLength(message.text);
- dv.setUint16(6, textLength);
- const length = senderLength + textLength + 8;
- return new Blob([buffer, name, message.text, String.fromCharCode(length >> 255), String.fromCharCode(length % 255)]);
-}
-
-function deserializeMessage(buffer: ArrayBuffer): {message: Conversation.Message, end: number} {
- const dv = new DataView(buffer, 0, 8);
- const time = dv.getUint32(0) * 1000;
- const type = dv.getUint8(4);
- const senderLength = dv.getUint8(5);
- const messageLength = dv.getUint16(6);
- let index = 8;
- const sender = decoder.decode(new DataView(buffer, index, senderLength));
- index += senderLength;
- const text = decoder.decode(new DataView(buffer, index, messageLength));
- return {message: new MessageImpl(type, core.characters.get(sender), text, new Date(time)), end: index + messageLength + 2};
-}
-
-const decoder = new TextDecoder('utf8');
-
-export class Logs implements Logging.Persistent {
- private index: Index = {};
- private logDir: DirectoryEntry;
-
- constructor() {
- core.connection.onEvent('connecting', async() => {
- this.index = {};
- const charDir = await getDir(fs.root, core.connection.character);
- this.logDir = await getDir(charDir, 'logs');
- const entries = await getEntries(this.logDir);
- for(const entry of entries)
- if(entry.name.substr(-4) === '.idx') {
- const file = await new Promise<File>((s, j) => (<FileEntry>entry).file(s, j));
- const buffer = await readAsArrayBuffer(file);
- const dv = new DataView(buffer);
- let offset = dv.getUint8(0);
- const name = decoder.decode(new DataView(buffer, 1, offset++));
- const index: {[key: number]: number} = {};
- for(; offset < dv.byteLength; offset += 7) {
- const key = dv.getUint16(offset);
- index[key] = dv.getUint32(offset + 2) << 8 | dv.getUint8(offset + 6);
- }
- this.index[entry.name.slice(0, -4).toLowerCase()] = {name, index};
- }
- });
- }
-
- async logMessage(conversation: Conversation, message: Conversation.Message): Promise<void> {
- return new Promise<void>((resolve, reject) => {
- this.logDir.getFile(conversation.key, {create: true}, (file) => {
- const serialized = serializeMessage(message);
- const date = Math.floor(message.time.getTime() / dayMs);
- let indexBuffer: {}[] | undefined;
- let index = this.index[conversation.key];
- if(index !== undefined) {
- if(index.index[date] === undefined) indexBuffer = [];
- } else {
- index = this.index[conversation.key] = {name: conversation.name, index: {}};
- const nameLength = getByteLength(conversation.name);
- indexBuffer = [String.fromCharCode(nameLength), conversation.name];
- }
- if(indexBuffer !== undefined)
- file.getMetadata((data) => {
- index!.index[date] = data.size;
- const dv = new DataView(new ArrayBuffer(7));
- dv.setUint16(0, date);
- dv.setUint32(2, data.size >> 8);
- dv.setUint8(6, data.size % 256);
- indexBuffer!.push(dv);
- this.logDir.getFile(`${conversation.key}.idx`, {create: true}, (indexFile) => {
- indexFile.createWriter((writer) => writer.write(new Blob(indexBuffer)), reject);
- }, reject);
- }, reject);
- file.createWriter((writer) => writer.write(serialized), reject);
- resolve();
- }, reject);
- });
- }
-
- async getBacklog(conversation: Conversation): Promise<Conversation.Message[]> {
- const file = await getFile(this.logDir, conversation.key);
- if(file === undefined) return [];
- let count = 20;
- let messages = new Array<Conversation.Message>(count);
- let pos = file.size;
- while(pos > 0 && count > 0) {
- const length = new DataView(await readAsArrayBuffer(file.slice(pos - 2, pos))).getUint16(0);
- pos = pos - length - 2;
- messages[--count] = deserializeMessage(await readAsArrayBuffer(file.slice(pos, pos + length))).message;
- }
- if(count !== 0) messages = messages.slice(count);
- return messages;
- }
-
- async getLogs(key: string, date: Date): Promise<Conversation.Message[]> {
- const file = await getFile(this.logDir, key);
- if(file === undefined) return [];
- const messages: Conversation.Message[] = [];
- const day = date.getTime() / dayMs;
- const index = this.index[key];
- if(index === undefined) return [];
- let pos = index.index[date.getTime() / dayMs];
- if(pos === undefined) return [];
- while(pos < file.size) {
- const deserialized = deserializeMessage(await readAsArrayBuffer(file.slice(pos, pos + 51000)));
- if(Math.floor(deserialized.message.time.getTime() / dayMs) !== day) break;
- messages.push(deserialized.message);
- pos += deserialized.end;
- }
- return messages;
- }
-
- getLogDates(key: string): ReadonlyArray<Date> {
- const entry = this.index[key];
- if(entry === undefined) return [];
- const dates = [];
- for(const date in entry.index) //tslint:disable-line:forin
- dates.push(new Date(parseInt(date, 10) * dayMs));
- return dates;
- }
-
- get conversations(): ReadonlyArray<{id: string, name: string}> {
- const conversations: {id: string, name: string}[] = [];
- for(const key in this.index) conversations.push({id: key, name: this.index[key]!.name});
- conversations.sort((x, y) => (x.name < y.name ? -1 : (x.name > y.name ? 1 : 0)));
- return conversations;
- }
-}
-
-export async function getGeneralSettings(): Promise<GeneralSettings | undefined> {
- const file = await getFile(fs.root, 'settings');
- if(file === undefined) return undefined;
- return <GeneralSettings>JSON.parse(await readAsString(file));
-}
-
-export async function setGeneralSettings(value: GeneralSettings): Promise<void> {
- const writer = await getWriter(fs.root, 'settings');
- writer.write(new Blob([JSON.stringify(value)]));
-}
-
-async function getSettingsDir(character: string = core.connection.character): Promise<DirectoryEntry> {
- return new Promise<DirectoryEntry>((resolve, reject) => {
- fs.root.getDirectory(character, {create: true}, resolve, reject);
- });
-}
-
-export class SettingsStore implements Settings.Store {
- async get<K extends keyof Settings.Keys>(key: K, character?: string): Promise<Settings.Keys[K] | undefined> {
- const dir = await getSettingsDir(character);
- const file = await getFile(dir, key);
- if(file === undefined) return undefined;
- return <Settings.Keys[K]>JSON.parse(await readAsString(file));
- }
-
- async set<K extends keyof Settings.Keys>(key: K, value: Settings.Keys[K]): Promise<void> {
- const writer = await getWriter(await getSettingsDir(), key);
- writer.write(new Blob([JSON.stringify(value)]));
- }
-
- async getAvailableCharacters(): Promise<string[]> {
- return (await getEntries(fs.root)).filter((x) => x.isDirectory).map((x) => x.name);
- }
-}
\ No newline at end of file
diff --git a/cordova/notifications.ts b/cordova/notifications.ts
deleted file mode 100644
index 4fc404a..0000000
--- a/cordova/notifications.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import core from '../chat/core';
-import {Conversation} from '../chat/interfaces';
-import BaseNotifications from '../chat/notifications'; //tslint:disable-line:match-default-export-name
-
-//tslint:disable
-declare global {
- interface Options {
- id?: number
- title?: string
- text?: string
- every?: string
- at?: Date | null
- badge?: number
- sound?: string
- data?: any
- icon?: string
- smallIcon?: string
- ongoing?: boolean
- led?: string
- }
-
- interface CordovaPlugins {
- notification: {
- local: {
- getDefaults(): Options
- setDefaults(options: Options): void
- schedule(notification: Options, callback?: Function, scope?: Object, args?: {skipPermissions: boolean}): void
- update(notification: Options, callback?: Function, scope?: Object, args?: {skipPermissions: boolean}): void
- clear(ids: string, callback?: Function, scope?: Object): void
- clearAll(callback?: Function, scope?: Object): void
- cancel(ids: string, callback?: Function, scope?: Object): void
- cancelAll(callback?: Function, scope?: Object): void
- isPresent(id: string, callback?: Function, scope?: Object): void
- isTriggered(id: string, callback?: Function, scope?: Object): void
- getAllIds(callback?: Function, scope?: Object): void
- getScheduledIds(callback?: Function, scope?: Object): void
- getTriggeredIds(callback?: Function, scope?: Object): void
- get(ids?: number[], callback?: Function, scope?: Object): void
- getScheduled(ids?: number[], callback?: Function, scope?: Object): void
- getTriggered(ids?: number[], callback?: Function, scope?: Object): void
- hasPermission(callback?: Function, scope?: Object): void
- registerPermission(callback?: Function, scope?: Object): void
- on(event: 'schedule' | 'update' | 'click' | 'trigger', handler: (notification: Options) => void): void
- un(event: 'schedule' | 'update' | 'click' | 'trigger', handler: (notification: Options) => void): void
- }
- }
- }
-}
-//tslint:enable
-document.addEventListener('deviceready', () => {
- cordova.plugins.notification.local.on('click', (notification) => {
- const conv = core.conversations.byKey((<{conversation: string}>notification.data).conversation);
- if(conv !== undefined) conv.show();
- });
-});
-
-export default class Notifications extends BaseNotifications {
- notify(conversation: Conversation, title: string, body: string, icon: string, sound: string): void {
- if(!this.isInBackground && conversation === core.conversations.selectedConversation && !core.state.settings.alwaysNotify) return;
- this.playSound(sound);
- if(core.state.settings.notifications)
- cordova.plugins.notification.local.schedule({
- title, text: body, sound, icon, smallIcon: icon, data: {conversation: conversation.key}
- });
- }
-}
\ No newline at end of file
diff --git a/cordova/package.json b/cordova/package.json
deleted file mode 100644
index 1e55c18..0000000
--- a/cordova/package.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
- "name": "fchat",
- "version": "0.2.0",
- "author": "The F-List Team",
- "description": "F-List.net Chat Client",
- "main": "main.js",
- "license": "MIT",
- "cordova": {
- "plugins": {
- "cordova-plugin-whitelist": {},
- "cordova-plugin-file": {},
- "de.appplant.cordova.plugin.local-notification": {}
- },
- "platforms": [
- "android"
- ]
- },
- "scripts": {
- "build": "../node_modules/.bin/webpack",
- "build:dist": "../node_modules/.bin/webpack --env production",
- "watch": "../node_modules/.bin/webpack --watch"
- },
- "dependencies": {
- "cordova-android": "^6.2.3",
- "cordova-plugin-app-event": "^1.2.1",
- "cordova-plugin-compat": "^1.0.0",
- "cordova-plugin-device": "^1.1.6",
- "cordova-plugin-file": "^4.3.3",
- "cordova-plugin-whitelist": "^1.3.2",
- "de.appplant.cordova.plugin.local-notification": "^0.8.5"
- },
- "devDependencies": {
- "@types/cordova": "^0.0.34",
- "qs": "^6.5.0"
- }
-}
\ No newline at end of file
diff --git a/cordova/yarn.lock b/cordova/yarn.lock
deleted file mode 100644
index 85b5a16..0000000
--- a/cordova/yarn.lock
+++ /dev/null
@@ -1,236 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@types/cordova@^0.0.34":
- version "0.0.34"
- resolved "https://registry.yarnpkg.com/@types/cordova/-/cordova-0.0.34.tgz#ea7addf74ecec3d7629827a0c39e2c9addc73d04"
-
-abbrev@1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-
-android-versions@^1.2.0:
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/android-versions/-/android-versions-1.2.1.tgz#3f50baf693e73a512c3c5403542291cead900063"
-
-ansi@^0.3.1:
- version "0.3.1"
- resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21"
-
-balanced-match@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-
-base64-js@0.0.8:
- version "0.0.8"
- resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-0.0.8.tgz#1101e9544f4a76b1bc3b26d452ca96d7a35e7978"
-
-big-integer@^1.6.7:
- version "1.6.25"
- resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.25.tgz#1de45a9f57542ac20121c682f8d642220a34e823"
-
-bplist-parser@^0.1.0:
- version "0.1.1"
- resolved "https://registry.yarnpkg.com/bplist-parser/-/bplist-parser-0.1.1.tgz#d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6"
- dependencies:
- big-integer "^1.6.7"
-
-brace-expansion@^1.1.7:
- version "1.1.8"
- resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"
- dependencies:
- balanced-match "^1.0.0"
- concat-map "0.0.1"
-
-concat-map@0.0.1:
- version "0.0.1"
- resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-
-cordova-android@^6.2.3:
- version "6.3.0"
- resolved "https://registry.yarnpkg.com/cordova-android/-/cordova-android-6.3.0.tgz#da5418433d25c75a5977b428244bbe437d0128d2"
- dependencies:
- android-versions "^1.2.0"
- cordova-common "^2.1.0"
- elementtree "0.1.6"
- nopt "^3.0.1"
- properties-parser "^0.2.3"
- q "^1.4.1"
- shelljs "^0.5.3"
-
-cordova-common@^2.1.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/cordova-common/-/cordova-common-2.1.0.tgz#bb357ee1b9825031ed9db3c56b592efe973d1640"
- dependencies:
- ansi "^0.3.1"
- bplist-parser "^0.1.0"
- cordova-registry-mapper "^1.1.8"
- elementtree "0.1.6"
- glob "^5.0.13"
- minimatch "^3.0.0"
- osenv "^0.1.3"
- plist "^1.2.0"
- q "^1.4.1"
- semver "^5.0.1"
- shelljs "^0.5.3"
- underscore "^1.8.3"
- unorm "^1.3.3"
-
-cordova-plugin-app-event@>=1.1.0, cordova-plugin-app-event@^1.2.1:
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/cordova-plugin-app-event/-/cordova-plugin-app-event-1.2.1.tgz#0eebb14132aa43bb2e5c081a9abdbd97ca2d8132"
-
-cordova-plugin-compat@^1.0.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/cordova-plugin-compat/-/cordova-plugin-compat-1.2.0.tgz#0bc65757276ebd920c012ce920e274177576373e"
-
-cordova-plugin-device@*, cordova-plugin-device@^1.1.6:
- version "1.1.6"
- resolved "https://registry.yarnpkg.com/cordova-plugin-device/-/cordova-plugin-device-1.1.6.tgz#2d21764cad7c9b801523e4e09a30e024b249334b"
-
-cordova-plugin-file@^4.3.3:
- version "4.3.3"
- resolved "https://registry.yarnpkg.com/cordova-plugin-file/-/cordova-plugin-file-4.3.3.tgz#012e97aa1afb91f84916e6341b548366d23de9b9"
-
-cordova-plugin-whitelist@^1.3.2:
- version "1.3.2"
- resolved "https://registry.yarnpkg.com/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.2.tgz#5b6335feb9f5301f3c013b9096cb8885bdbd5076"
-
-cordova-registry-mapper@^1.1.8:
- version "1.1.15"
- resolved "https://registry.yarnpkg.com/cordova-registry-mapper/-/cordova-registry-mapper-1.1.15.tgz#e244b9185b8175473bff6079324905115f83dc7c"
-
-de.appplant.cordova.plugin.local-notification@^0.8.5:
- version "0.8.5"
- resolved "https://registry.yarnpkg.com/de.appplant.cordova.plugin.local-notification/-/de.appplant.cordova.plugin.local-notification-0.8.5.tgz#e0c6a86ea52ac4f41dba67521d91a58a9a42a3bd"
- dependencies:
- cordova-plugin-app-event ">=1.1.0"
- cordova-plugin-device "*"
-
-elementtree@0.1.6:
- version "0.1.6"
- resolved "https://registry.yarnpkg.com/elementtree/-/elementtree-0.1.6.tgz#2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c"
- dependencies:
- sax "0.3.5"
-
-glob@^5.0.13:
- version "5.0.15"
- resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
- dependencies:
- inflight "^1.0.4"
- inherits "2"
- minimatch "2 || 3"
- once "^1.3.0"
- path-is-absolute "^1.0.0"
-
-inflight@^1.0.4:
- version "1.0.6"
- resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
- dependencies:
- once "^1.3.0"
- wrappy "1"
-
-inherits@2:
- version "2.0.3"
- resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-
-lodash@^3.5.0:
- version "3.10.1"
- resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
-
-"minimatch@2 || 3", minimatch@^3.0.0:
- version "3.0.4"
- resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
- dependencies:
- brace-expansion "^1.1.7"
-
-nopt@^3.0.1:
- version "3.0.6"
- resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
- dependencies:
- abbrev "1"
-
-once@^1.3.0:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
- dependencies:
- wrappy "1"
-
-os-homedir@^1.0.0:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-
-os-tmpdir@^1.0.0:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-
-osenv@^0.1.3:
- version "0.1.4"
- resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644"
- dependencies:
- os-homedir "^1.0.0"
- os-tmpdir "^1.0.0"
-
-path-is-absolute@^1.0.0:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-
-plist@^1.2.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/plist/-/plist-1.2.0.tgz#084b5093ddc92506e259f874b8d9b1afb8c79593"
- dependencies:
- base64-js "0.0.8"
- util-deprecate "1.0.2"
- xmlbuilder "4.0.0"
- xmldom "0.1.x"
-
-properties-parser@^0.2.3:
- version "0.2.3"
- resolved "https://registry.yarnpkg.com/properties-parser/-/properties-parser-0.2.3.tgz#f7591255f707abbff227c7b56b637dbb0373a10f"
-
-q@^1.4.1:
- version "1.5.0"
- resolved "https://registry.yarnpkg.com/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1"
-
-qs@^6.5.0:
- version "6.5.1"
- resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
-
-sax@0.3.5:
- version "0.3.5"
- resolved "https://registry.yarnpkg.com/sax/-/sax-0.3.5.tgz#88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d"
-
-semver@^5.0.1:
- version "5.4.1"
- resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
-
-shelljs@^0.5.3:
- version "0.5.3"
- resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.5.3.tgz#c54982b996c76ef0c1e6b59fbdc5825f5b713113"
-
-underscore@^1.8.3:
- version "1.8.3"
- resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"
-
-unorm@^1.3.3:
- version "1.4.1"
- resolved "https://registry.yarnpkg.com/unorm/-/unorm-1.4.1.tgz#364200d5f13646ca8bcd44490271335614792300"
-
-util-deprecate@1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-
-wrappy@1:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-
-xmlbuilder@4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-4.0.0.tgz#98b8f651ca30aa624036f127d11cc66dc7b907a3"
- dependencies:
- lodash "^3.5.0"
-
-xmldom@0.1.x:
- version "0.1.27"
- resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
diff --git a/electron/Index.vue b/electron/Index.vue
index 0f2ffad..0b4270d 100644
--- a/electron/Index.vue
+++ b/electron/Index.vue
@@ -1,5 +1,5 @@
<template>
- <div @mouseover="onMouseOver" id="page" style="position: relative; padding: 10px;">
+ <div @mouseover="onMouseOver" id="page" style="position:relative;padding:5px 10px 10px">
<div v-html="styling"></div>
<div v-if="!characters" style="display:flex; align-items:center; justify-content:center; height: 100%;">
<div class="well well-lg" style="width: 400px;">
@@ -9,7 +9,7 @@
</div>
<div class="form-group">
<label class="control-label" for="account">{{l('login.account')}}</label>
- <input class="form-control" id="account" v-model="account" @keypress.enter="login"/>
+ <input class="form-control" id="account" v-model="settings.account" @keypress.enter="login"/>
</div>
<div class="form-group">
<label class="control-label" for="password">{{l('login.password')}}</label>
@@ -17,7 +17,7 @@
</div>
<div class="form-group" v-show="showAdvanced">
<label class="control-label" for="host">{{l('login.host')}}</label>
- <input class="form-control" id="host" v-model="host" @keypress.enter="login"/>
+ <input class="form-control" id="host" v-model="settings.host" @keypress.enter="login"/>
</div>
<div class="form-group">
<label for="advanced"><input type="checkbox" id="advanced" v-model="showAdvanced"/> {{l('login.advanced')}}</label>
@@ -25,7 +25,7 @@
<div class="form-group">
<label for="save"><input type="checkbox" id="save" v-model="saveLogin"/> {{l('login.save')}}</label>
</div>
- <div class="form-group" style="margin:0">
+ <div class="form-group text-right" style="margin:0">
<button class="btn btn-primary" @click="login" :disabled="loggingIn">
{{l(loggingIn ? 'login.working' : 'login.submit')}}
</button>
@@ -41,7 +41,7 @@
</div>
</modal>
<modal :buttons="false" ref="profileViewer" dialogClass="profile-viewer">
- <character-page :authenticated="false" :hideGroups="true" :name="profileName" :image-preview="true"></character-page>
+ <character-page :authenticated="true" :oldApi="true" :name="profileName" :image-preview="true"></character-page>
<template slot="title">{{profileName}} <a class="btn fa fa-external-link" @click="openProfileInBrowser"></a></template>
</modal>
</div>
@@ -55,7 +55,7 @@
import * as qs from 'querystring';
import * as Raven from 'raven-js';
import {promisify} from 'util';
- import Vue, {ComponentOptions} from 'vue';
+ import Vue from 'vue';
import Component from 'vue-class-component';
import Chat from '../chat/Chat.vue';
import {Settings} from '../chat/common';
@@ -66,51 +66,19 @@
import Modal from '../components/Modal.vue';
import Connection from '../fchat/connection';
import CharacterPage from '../site/character_page/character_page.vue';
- import {nativeRequire} from './common';
- import {GeneralSettings, getGeneralSettings, Logs, setGeneralSettings, SettingsStore} from './filesystem';
+ import {GeneralSettings, nativeRequire} from './common';
+ import {Logs, SettingsStore} from './filesystem';
import * as SlimcatImporter from './importer';
- import {createAppMenu, createContextMenu} from './menu';
import Notifications from './notifications';
- import * as spellchecker from './spellchecker';
+
+ declare module '../chat/interfaces' {
+ interface State {
+ generalSettings?: GeneralSettings
+ }
+ }
const webContents = electron.remote.getCurrentWebContents();
- webContents.on('context-menu', (_, props) => {
- const menuTemplate = createContextMenu(<Electron.ContextMenuParams & {editFlags: {[key: string]: boolean}}>props);
- if(props.misspelledWord !== '') {
- const corrections = spellchecker.getCorrections(props.misspelledWord);
- if(corrections.length > 0) {
- menuTemplate.unshift({type: 'separator'});
- menuTemplate.unshift(...corrections.map((correction: string) => ({
- label: correction,
- click: () => webContents.replaceMisspelling(correction)
- })));
- }
- }
-
- if(menuTemplate.length > 0) electron.remote.Menu.buildFromTemplate(menuTemplate).popup();
- });
-
- const defaultTrayMenu = [
- {label: l('action.open'), click: () => mainWindow!.show()},
- {
- label: l('action.quit'),
- click: () => {
- isClosing = true;
- mainWindow!.close();
- mainWindow = undefined;
- electron.remote.app.quit();
- }
- }
- ];
- let trayMenu = electron.remote.Menu.buildFromTemplate(defaultTrayMenu);
-
- let isClosing = false;
- let mainWindow: Electron.BrowserWindow | undefined = electron.remote.getCurrentWindow();
- //tslint:disable-next-line:no-require-imports
- const tray = new electron.remote.Tray(path.join(__dirname, <string>require('./build/tray.png')));
- tray.setToolTip(l('title'));
- tray.on('click', (_) => mainWindow!.show());
- tray.setContextMenu(trayMenu);
+ const parent = electron.remote.getCurrentWindow().webContents;
/*tslint:disable:no-any*///because this is hacky
const keyStore = nativeRequire<{
@@ -122,8 +90,6 @@
for(const key in keyStore) keyStore[key] = promisify(<(...args: any[]) => any>keyStore[key].bind(keyStore, 'fchat'));
//tslint:enable
- profileApiInit();
-
@Component({
components: {chat: Chat, modal: Modal, characterPage: CharacterPage}
})
@@ -132,205 +98,83 @@
showAdvanced = false;
saveLogin = false;
loggingIn = false;
- account: string;
password = '';
- host: string;
+ character: string | undefined;
characters: string[] | null = null;
error = '';
defaultCharacter: string | null = null;
- settings = new SettingsStore();
l = l;
- currentSettings: GeneralSettings;
- isConnected = false;
+ settings: GeneralSettings;
importProgress = 0;
profileName = '';
- constructor(options?: ComponentOptions<Index>) {
- super(options);
- let settings = getGeneralSettings();
- if(settings === undefined) {
- try {
- if(SlimcatImporter.canImportGeneral() && confirm(l('importer.importGeneral')))
- settings = SlimcatImporter.importGeneral();
- } catch {
- alert(l('importer.error'));
- }
- settings = settings !== undefined ? settings : new GeneralSettings();
- }
- this.account = settings.account;
- this.host = settings.host;
- this.currentSettings = settings;
- }
+ async created(): Promise<void> {
+ if(this.settings.account.length > 0) this.saveLogin = true;
+ keyStore.getPassword(this.settings.account)
+ .then((value: string) => this.password = value, (err: Error) => this.error = err.message);
- created(): void {
- if(this.currentSettings.account.length > 0) {
- keyStore.getPassword(this.currentSettings.account)
- .then((value: string) => this.password = value, (err: Error) => this.error = err.message);
- this.saveLogin = true;
- }
- window.onbeforeunload = () => {
- if(process.env.NODE_ENV !== 'production' || isClosing || !this.isConnected) {
- tray.destroy();
- return;
- }
- if(!this.currentSettings.closeToTray)
- return setImmediate(() => {
- if(confirm(l('chat.confirmLeave'))) {
- isClosing = true;
- mainWindow!.close();
- }
- });
- mainWindow!.hide();
- return false;
- };
+ Vue.set(core.state, 'generalSettings', this.settings);
- const appMenu = createAppMenu();
- const themes = fs.readdirSync(path.join(__dirname, 'themes')).filter((x) => x.substr(-4) === '.css').map((x) => x.slice(0, -4));
- const setTheme = (theme: string) => {
- this.currentSettings.theme = theme;
- setGeneralSettings(this.currentSettings);
- };
- const spellcheckerMenu = new electron.remote.Menu();
- //tslint:disable-next-line:no-floating-promises
- this.addSpellcheckerItems(spellcheckerMenu);
- appMenu[0].submenu = [
- {
- label: l('settings.closeToTray'), type: 'checkbox', checked: this.currentSettings.closeToTray,
- click: (item: Electron.MenuItem) => {
- this.currentSettings.closeToTray = item.checked;
- setGeneralSettings(this.currentSettings);
- }
- }, {
- label: l('settings.profileViewer'), type: 'checkbox', checked: this.currentSettings.profileViewer,
- click: (item: Electron.MenuItem) => {
- this.currentSettings.profileViewer = item.checked;
- setGeneralSettings(this.currentSettings);
- }
- },
- {label: l('settings.spellcheck'), submenu: spellcheckerMenu},
- {
- label: l('settings.theme'),
- submenu: themes.map((x) => ({
- checked: this.currentSettings.theme === x,
- click: () => setTheme(x),
- label: x,
- type: <'radio'>'radio'
- }))
- },
- {type: 'separator'},
- {role: 'minimize'},
- {
- accelerator: process.platform === 'darwin' ? 'Cmd+Q' : undefined,
- label: l('action.quit'),
- click(): void {
- isClosing = true;
- mainWindow!.close();
- }
- }
- ];
- electron.remote.Menu.setApplicationMenu(electron.remote.Menu.buildFromTemplate(appMenu));
-
- let hasUpdate = false;
- electron.ipcRenderer.on('updater-status', (_: Event, status: string) => {
- if(status !== 'update-downloaded' || hasUpdate) return;
- hasUpdate = true;
- const menu = electron.remote.Menu.getApplicationMenu();
- menu.append(new electron.remote.MenuItem({
- label: l('action.updateAvailable'),
- submenu: electron.remote.Menu.buildFromTemplate([{
- label: l('action.update'),
- click: () => {
- if(!this.isConnected || confirm(l('chat.confirmLeave'))) {
- isClosing = true;
- electron.ipcRenderer.send('install-update');
- }
- }
- }, {
- label: l('help.changelog'),
- click: () => electron.shell.openExternal('https://wiki.f-list.net/F-Chat_3.0#Changelog')
- }])
- }));
- electron.remote.Menu.setApplicationMenu(menu);
- });
+ electron.ipcRenderer.on('settings', (_: Event, settings: GeneralSettings) => core.state.generalSettings = this.settings = settings);
electron.ipcRenderer.on('open-profile', (_: Event, name: string) => {
- if(this.currentSettings.profileViewer) {
- const profileViewer = <Modal>this.$refs['profileViewer'];
- this.profileName = name;
- profileViewer.show();
- } else electron.remote.shell.openExternal(`https://www.f-list.net/c/${name}`);
+ const profileViewer = <Modal>this.$refs['profileViewer'];
+ this.profileName = name;
+ profileViewer.show();
});
- }
- async addSpellcheckerItems(menu: Electron.Menu): Promise<void> {
- const dictionaries = await spellchecker.getAvailableDictionaries();
- const selected = this.currentSettings.spellcheckLang;
- menu.append(new electron.remote.MenuItem({
- type: 'radio',
- label: l('settings.spellcheck.disabled'),
- click: this.setSpellcheck.bind(this, undefined)
- }));
- for(const lang of dictionaries)
- menu.append(new electron.remote.MenuItem({
- type: 'radio',
- label: lang,
- checked: lang === selected,
- click: this.setSpellcheck.bind(this, lang)
- }));
- electron.webFrame.setSpellCheckProvider('', false, {spellCheck: spellchecker.check});
- await spellchecker.setDictionary(selected);
- }
-
- async setSpellcheck(lang: string | undefined): Promise<void> {
- this.currentSettings.spellcheckLang = lang;
- setGeneralSettings(this.currentSettings);
- await spellchecker.setDictionary(lang);
+ window.addEventListener('beforeunload', () => {
+ if(this.character !== undefined) electron.ipcRenderer.send('disconnect', this.character);
+ });
}
async login(): Promise<void> {
if(this.loggingIn) return;
this.loggingIn = true;
try {
- if(!this.saveLogin) await keyStore.deletePassword(this.account);
- const data = <{ticket?: string, error: string, characters: string[], default_character: string}>
- (await Axios.post('https://www.f-list.net/json/getApiTicket.php',
- qs.stringify({account: this.account, password: this.password, no_friends: true, no_bookmarks: true}))).data;
+ if(!this.saveLogin) await keyStore.deletePassword(this.settings.account);
+ const data = <{ticket?: string, error: string, characters: {[key: string]: number}, default_character: number}>
+ (await Axios.post('https://www.f-list.net/json/getApiTicket.php', qs.stringify({
+ account: this.settings.account, password: this.password, no_friends: true, no_bookmarks: true,
+ new_character_list: true
+ }))).data;
if(data.error !== '') {
this.error = data.error;
return;
}
- if(this.saveLogin) {
- this.currentSettings.account = this.account;
- await keyStore.setPassword(this.account, this.password);
- this.currentSettings.host = this.host;
- setGeneralSettings(this.currentSettings);
- }
- Socket.host = this.host;
- const connection = new Connection(Socket, this.account, this.password);
+ if(this.saveLogin) electron.ipcRenderer.send('save-login', this.settings.account, this.settings.host);
+ Socket.host = this.settings.host;
+ const connection = new Connection(`F-Chat 3.0 (${process.platform})`, electron.remote.app.getVersion(), Socket,
+ this.settings.account, this.password);
connection.onEvent('connecting', async() => {
- if((await this.settings.get('settings')) === undefined && SlimcatImporter.canImportCharacter(core.connection.character)) {
- if(!confirm(l('importer.importGeneral'))) return this.settings.set('settings', new Settings());
+ if(!electron.ipcRenderer.sendSync('connect', core.connection.character) && process.env.NODE_ENV === 'production') {
+ alert(l('login.alreadyLoggedIn'));
+ return core.connection.close();
+ }
+ this.character = core.connection.character;
+ if((await core.settingsStore.get('settings')) === undefined &&
+ SlimcatImporter.canImportCharacter(core.connection.character)) {
+ if(!confirm(l('importer.importGeneral'))) return core.settingsStore.set('settings', new Settings());
(<Modal>this.$refs['importModal']).show(true);
await SlimcatImporter.importCharacter(core.connection.character, (progress) => this.importProgress = progress);
(<Modal>this.$refs['importModal']).hide();
}
});
connection.onEvent('connected', () => {
- this.isConnected = true;
- tray.setToolTip(document.title = `FChat 3.0 - ${core.connection.character}`);
+ core.watch(() => core.conversations.hasNew, (newValue) => parent.send('has-new', webContents.id, newValue));
+ parent.send('connect', webContents.id, core.connection.character);
Raven.setUserContext({username: core.connection.character});
- trayMenu.insert(0, new electron.remote.MenuItem({label: core.connection.character, enabled: false}));
- trayMenu.insert(1, new electron.remote.MenuItem({type: 'separator'}));
- tray.setContextMenu(trayMenu);
});
connection.onEvent('closed', () => {
- this.isConnected = false;
- tray.setToolTip(document.title = 'FChat 3.0');
+ this.character = undefined;
+ electron.ipcRenderer.send('disconnect', connection.character);
+ parent.send('disconnect', webContents.id);
Raven.setUserContext();
- tray.setContextMenu(trayMenu = electron.remote.Menu.buildFromTemplate(defaultTrayMenu));
});
initCore(connection, Logs, SettingsStore, Notifications);
- this.characters = data.characters.sort();
- this.defaultCharacter = data.default_character;
+ const charNames = Object.keys(data.characters);
+ this.characters = charNames.sort();
+ this.defaultCharacter = charNames.find((x) => data.characters[x] === data.default_character)!;
+ profileApiInit(data.characters);
} catch(e) {
this.error = l('login.error');
if(process.env.NODE_ENV !== 'production') throw e;
@@ -362,10 +206,10 @@
get styling(): string {
try {
- return `<style>${fs.readFileSync(path.join(__dirname, `themes/${this.currentSettings.theme}.css`))}</style>`;
+ return `<style>${fs.readFileSync(path.join(__dirname, `themes/${this.settings.theme}.css`))}</style>`;
} catch(e) {
- if((<Error & {code: string}>e).code === 'ENOENT' && this.currentSettings.theme !== 'default') {
- this.currentSettings.theme = 'default';
+ if((<Error & {code: string}>e).code === 'ENOENT' && this.settings.theme !== 'default') {
+ this.settings.theme = 'default';
return this.styling;
}
throw e;
diff --git a/electron/Window.vue b/electron/Window.vue
new file mode 100644
index 0000000..87800d9
--- /dev/null
+++ b/electron/Window.vue
@@ -0,0 +1,279 @@
+<template>
+ <div style="display:flex;flex-direction:column;height:100%;padding:1px" :class="'platform-' + platform">
+ <div v-html="styling"></div>
+ <div style="display:flex;align-items:stretch;" class="border-bottom" id="window-tabs">
+ <h4>F-Chat</h4>
+ <div :class="'fa fa-cog btn btn-' + (hasUpdate ? 'warning' : 'default')" @click="openMenu"></div>
+ <ul class="nav nav-tabs" style="border-bottom:0" ref="tabs">
+ <li role="presentation" :class="{active: tab === activeTab, hasNew: tab.hasNew && tab !== activeTab}" v-for="tab in tabs"
+ :key="tab.view.id">
+ <a href="#" @click.prevent="show(tab)">
+ <img v-if="tab.user" :src="'https://static.f-list.net/images/avatar/' + tab.user.toLowerCase() + '.png'"/>
+ {{tab.user || l('window.newTab')}}
+ <a href="#" class="fa fa-close btn" :aria-label="l('action.close')" style="margin-left:10px;padding:0;color:inherit"
+ @click.stop="remove(tab)">
+ </a>
+ </a>
+ </li>
+ <li role="presentation" v-show="canOpenTab" class="addTab" id="addTab">
+ <a href="#" @click.prevent="addTab" class="fa fa-plus"></a>
+ </li>
+ </ul>
+ <div style="flex:1;display:flex;justify-content:flex-end;-webkit-app-region:drag;margin-top:3px" class="btn-group"
+ id="windowButtons">
+ <span class="fa fa-window-minimize btn btn-default" @click.stop="minimize"></span>
+ <span :class="'fa btn btn-default fa-window-' + (isMaximized ? 'restore' : 'maximize')" @click="maximize"></span>
+ <span class="fa fa-close fa-lg btn btn-default" @click.stop="close"></span>
+ </div>
+ </div>
+ </div>
+</template>
+
+<script lang="ts">
+ import Sortable = require('sortablejs'); //tslint:disable-line:no-require-imports
+
+ import * as electron from 'electron';
+ import * as fs from 'fs';
+ import * as path from 'path';
+ import * as url from 'url';
+ import Vue from 'vue';
+ import Component from 'vue-class-component';
+ import l from '../chat/localize';
+ import {GeneralSettings} from './common';
+
+ const browserWindow = electron.remote.getCurrentWindow();
+
+ function getWindowBounds(): Electron.Rectangle {
+ const bounds = browserWindow.getContentBounds();
+ const height = document.body.offsetHeight;
+ return {x: 0, y: height, width: bounds.width, height: bounds.height - height};
+ }
+
+ interface Tab {
+ user: string | undefined,
+ view: Electron.BrowserView
+ hasNew: boolean
+ tray: Electron.Tray
+ }
+
+ const trayIcon = path.join(__dirname, <string>require('./build/tray.png')); //tslint:disable-line:no-require-imports
+
+ @Component
+ export default class Window extends Vue {
+ //tslint:disable:no-null-keyword
+ settings: GeneralSettings;
+ tabs: Tab[] = [];
+ activeTab: Tab | null = null;
+ tabMap: {[key: number]: Tab} = {};
+ isMaximized = browserWindow.isMaximized();
+ canOpenTab = true;
+ l = l;
+ hasUpdate = false;
+ platform = process.platform;
+
+ mounted(): void {
+ this.addTab();
+ electron.ipcRenderer.on('settings', (_: Event, settings: GeneralSettings) => this.settings = settings);
+ electron.ipcRenderer.on('allow-new-tabs', (_: Event, allow: boolean) => this.canOpenTab = allow);
+ electron.ipcRenderer.on('open-tab', () => this.addTab());
+ electron.ipcRenderer.on('update-available', () => this.hasUpdate = true);
+ electron.ipcRenderer.on('connect', (_: Event, id: number, name: string) => {
+ const tab = this.tabMap[id];
+ tab.user = name;
+ tab.tray.setToolTip(`${l('title')} - ${tab.user}`);
+ const menu = this.createTrayMenu(tab);
+ menu.unshift({label: tab.user, enabled: false}, {type: 'separator'});
+ tab.tray.setContextMenu(electron.remote.Menu.buildFromTemplate(menu));
+ });
+ electron.ipcRenderer.on('disconnect', (_: Event, id: number) => {
+ const tab = this.tabMap[id];
+ tab.user = undefined;
+ tab.tray.setToolTip(l('title'));
+ tab.tray.setContextMenu(electron.remote.Menu.buildFromTemplate(this.createTrayMenu(tab)));
+ });
+ electron.ipcRenderer.on('has-new', (_: Event, id: number, hasNew: boolean) => {
+ const tab = this.tabMap[id];
+ tab.hasNew = hasNew;
+ electron.ipcRenderer.send('has-new', this.tabs.reduce((cur, t) => cur || t.hasNew, false));
+ });
+ browserWindow.on('maximize', () => {
+ this.isMaximized = true;
+ this.activeTab!.view.setBounds(getWindowBounds());
+ });
+ browserWindow.on('unmaximize', () => {
+ this.isMaximized = false;
+ this.activeTab!.view.setBounds(getWindowBounds());
+ });
+ document.addEventListener('click', () => this.activeTab!.view.webContents.focus());
+ window.addEventListener('focus', () => this.activeTab!.view.webContents.focus());
+
+ Sortable.create(this.$refs['tabs'], {
+ animation: 50,
+ onEnd: (e: {oldIndex: number, newIndex: number}) => {
+ if(e.oldIndex === e.newIndex) return;
+ const tab = this.tabs.splice(e.oldIndex, 1)[0];
+ this.tabs.splice(e.newIndex, 0, tab);
+ },
+ onMove: (e: {related: HTMLElement}) => e.related.id !== 'addTab',
+ filter: '.addTab'
+ });
+
+ window.onbeforeunload = () => {
+ const isConnected = this.tabs.reduce((cur, tab) => cur || tab.user !== undefined, false);
+ if(process.env.NODE_ENV !== 'production' || !isConnected) {
+ this.tabs.forEach((tab) => this.remove(tab, false));
+ return;
+ }
+ if(!this.settings.closeToTray)
+ return setImmediate(() => {
+ if(confirm(l('chat.confirmLeave'))) this.tabs.forEach((tab) => this.remove(tab, false));
+ });
+ browserWindow.hide();
+ return false;
+ };
+ }
+
+ get styling(): string {
+ try {
+ return `<style>${fs.readFileSync(path.join(__dirname, `themes/${this.settings.theme}.css`))}</style>`;
+ } catch(e) {
+ if((<Error & {code: string}>e).code === 'ENOENT' && this.settings.theme !== 'default') {
+ this.settings.theme = 'default';
+ return this.styling;
+ }
+ throw e;
+ }
+ }
+
+ createTrayMenu(tab: Tab): Electron.MenuItemConstructorOptions[] {
+ return [
+ {
+ label: l('action.open'), click: () => {
+ browserWindow.show();
+ this.show(tab);
+ }
+ },
+ {label: l('action.quit'), click: () => this.remove(tab, false)}
+ ];
+ }
+
+ addTab(): void {
+ const tray = new electron.remote.Tray(trayIcon);
+ tray.setToolTip(l('title'));
+ tray.on('click', (_) => browserWindow.show());
+ const view = new electron.remote.BrowserView();
+ view.setAutoResize({width: true, height: true});
+ view.webContents.loadURL(url.format({
+ pathname: path.join(__dirname, 'index.html'),
+ protocol: 'file:',
+ slashes: true,
+ query: {settings: JSON.stringify(this.settings)}
+ }));
+ electron.ipcRenderer.send('tab-added', view.webContents.id);
+ const tab = {active: false, view, user: undefined, hasNew: false, tray};
+ tray.setContextMenu(electron.remote.Menu.buildFromTemplate(this.createTrayMenu(tab)));
+ this.tabs.push(tab);
+ this.tabMap[view.webContents.id] = tab;
+ this.show(tab);
+ }
+
+ show(tab: Tab): void {
+ this.activeTab = tab;
+ browserWindow.setBrowserView(tab.view);
+ tab.view.setBounds(getWindowBounds());
+ }
+
+ remove(tab: Tab, shouldConfirm: boolean = true): void {
+ if(shouldConfirm && tab.user !== undefined && !confirm(l('chat.confirmLeave'))) return;
+ this.tabs.splice(this.tabs.indexOf(tab), 1);
+ delete this.tabMap[tab.view.webContents.id];
+ tab.tray.destroy();
+ tab.view.webContents.loadURL('about:blank');
+ electron.ipcRenderer.send('tab-closed');
+ delete tab.view;
+ if(this.tabs.length === 0) {
+ if(process.env.NODE_ENV === 'production') browserWindow.close();
+ } else if(this.activeTab === tab) this.show(this.tabs[0]);
+ }
+
+ minimize(): void {
+ browserWindow.minimize();
+ }
+
+ maximize(): void {
+ if(browserWindow.isMaximized()) browserWindow.unmaximize();
+ else browserWindow.maximize();
+ }
+
+ close(): void {
+ browserWindow.close();
+ }
+
+ openMenu(): void {
+ electron.remote.Menu.getApplicationMenu().popup();
+ }
+ }
+</script>
+
+<style lang="less">
+ #window-tabs {
+ user-select: none;
+ .btn {
+ border-radius: 0;
+ padding: 5px 15px;
+ display: flex;
+ margin: 0px -1px -1px 0;
+ align-items: center;
+ -webkit-app-region: no-drag;
+ }
+
+ .btn-default {
+ background: transparent;
+ }
+
+ li {
+ height: 100%;
+ a {
+ display: flex;
+ padding: 5px 10px;
+ height: 100%;
+ align-items: center;
+ &:first-child {
+ border-top-left-radius: 0;
+ }
+ }
+
+ img {
+ height: 28px;
+ margin: -5px 3px -5px -5px;
+ }
+
+ &.active {
+ margin-bottom: -2px;
+ }
+ }
+
+ h4 {
+ margin: 0 10px;
+ user-select: none;
+ cursor: default;
+ align-self: center;
+ -webkit-app-region: drag;
+ }
+ }
+
+ #windowButtons .btn {
+ margin: -4px -1px -1px 0;
+ border-top: 0;
+ }
+
+ .platform-darwin {
+ #windowButtons .btn {
+ display: none;
+ }
+
+ #window-tabs h4 {
+ margin: 9px 34px 9px 77px;
+ }
+ }
+</style>
\ No newline at end of file
diff --git a/electron/application.json b/electron/application.json
index 19b1b6c..ac7db23 100644
--- a/electron/application.json
+++ b/electron/application.json
@@ -1,6 +1,6 @@
{
"name": "fchat",
- "version": "0.2.9",
+ "version": "0.2.16",
"author": "The F-List Team",
"description": "F-List.net Chat Client",
"main": "main.js",
diff --git a/electron/build/badge.png b/electron/build/badge.png
new file mode 100644
index 0000000..2781dfd
Binary files /dev/null and b/electron/build/badge.png differ
diff --git a/electron/chat.ts b/electron/chat.ts
index 1cfc92c..f5d099a 100644
--- a/electron/chat.ts
+++ b/electron/chat.ts
@@ -31,17 +31,37 @@
*/
import 'bootstrap/js/collapse.js';
import 'bootstrap/js/dropdown.js';
-import 'bootstrap/js/modal.js';
import 'bootstrap/js/tab.js';
import 'bootstrap/js/transition.js';
import * as electron from 'electron';
+import * as path from 'path';
+import * as qs from 'querystring';
import * as Raven from 'raven-js';
import Vue from 'vue';
import {getKey} from '../chat/common';
import l from '../chat/localize';
import VueRaven from '../chat/vue-raven';
+import {GeneralSettings, nativeRequire} from './common';
+import * as SlimcatImporter from './importer';
import Index from './Index.vue';
+document.addEventListener('keydown', (e: KeyboardEvent) => {
+ if(e.ctrlKey && e.shiftKey && getKey(e) === 'i')
+ electron.remote.getCurrentWebContents().toggleDevTools();
+});
+
+process.env.SPELLCHECKER_PREFER_HUNSPELL = '1';
+const sc = nativeRequire<{
+ Spellchecker: {
+ new(): {
+ isMisspelled(x: string): boolean,
+ setDictionary(name: string | undefined, dir: string): void,
+ getCorrectionsForMisspelling(word: string): ReadonlyArray<string>
+ }
+ }
+}>('spellchecker/build/Release/spellchecker.node');
+const spellchecker = new sc.Spellchecker();
+
if(process.env.NODE_ENV === 'production') {
Raven.config('https://a9239b17b0a14f72ba85e8729b9d1612@sentry.f-list.net/2', {
release: electron.remote.app.getVersion(),
@@ -58,19 +78,81 @@ if(process.env.NODE_ENV === 'production') {
Raven.captureException(<Error>e.reason);
};
- document.addEventListener('keydown', (e: KeyboardEvent) => {
- if(e.ctrlKey && e.shiftKey && getKey(e) === 'I')
- electron.remote.getCurrentWebContents().toggleDevTools();
- });
electron.remote.getCurrentWebContents().on('devtools-opened', () => {
console.log(`%c${l('consoleWarning.head')}`, 'background: red; color: yellow; font-size: 30pt');
console.log(`%c${l('consoleWarning.body')}`, 'font-size: 16pt; color:red');
});
}
-//tslint:disable-next-line:no-unused-expression
-new Index({
- el: '#app'
+const webContents = electron.remote.getCurrentWebContents();
+webContents.on('context-menu', (_, props) => {
+ const hasText = props.selectionText.trim().length > 0;
+ const can = (type: string) => (<Electron.EditFlags & {[key: string]: boolean}>props.editFlags)[`can${type}`] && hasText;
+
+ const menuTemplate: Electron.MenuItemConstructorOptions[] = [];
+ if(hasText || props.isEditable)
+ menuTemplate.push({
+ id: 'copy',
+ label: l('action.copy'),
+ role: can('Copy') ? 'copy' : '',
+ enabled: can('Copy')
+ });
+ if(props.isEditable)
+ menuTemplate.push({
+ id: 'cut',
+ label: l('action.cut'),
+ role: can('Cut') ? 'cut' : '',
+ enabled: can('Cut')
+ }, {
+ id: 'paste',
+ label: l('action.paste'),
+ role: props.editFlags.canPaste ? 'paste' : '',
+ enabled: props.editFlags.canPaste
+ });
+ else if(props.linkURL.length > 0 && props.mediaType === 'none' && props.linkURL.substr(0, props.pageURL.length) !== props.pageURL)
+ menuTemplate.push({
+ id: 'copyLink',
+ label: l('action.copyLink'),
+ click(): void {
+ if(process.platform === 'darwin')
+ electron.clipboard.writeBookmark(props.linkText, props.linkURL);
+ else
+ electron.clipboard.writeText(props.linkURL);
+ }
+ });
+ if(props.misspelledWord !== '') {
+ const corrections = spellchecker.getCorrectionsForMisspelling(props.misspelledWord);
+ if(corrections.length > 0) {
+ menuTemplate.unshift({type: 'separator'});
+ menuTemplate.unshift(...corrections.map((correction: string) => ({
+ label: correction,
+ click: () => webContents.replaceMisspelling(correction)
+ })));
+ }
+ }
+
+ if(menuTemplate.length > 0) electron.remote.Menu.buildFromTemplate(menuTemplate).popup();
});
-electron.ipcRenderer.on('focus', (_: Event, message: boolean) => message ? window.focus() : window.blur());
\ No newline at end of file
+const dictDir = path.join(electron.remote.app.getPath('userData'), 'spellchecker');
+electron.webFrame.setSpellCheckProvider('', false, {spellCheck: (text) => !spellchecker.isMisspelled(text)});
+electron.ipcRenderer.on('settings', async(_: Event, s: GeneralSettings) => spellchecker.setDictionary(s.spellcheckLang, dictDir));
+
+const params = <{[key: string]: string | undefined}>qs.parse(window.location.search.substr(1));
+const settings = <GeneralSettings>JSON.parse(params['settings']!);
+if(params['import'] !== undefined)
+ try {
+ if(SlimcatImporter.canImportGeneral() && confirm(l('importer.importGeneral'))) {
+ SlimcatImporter.importGeneral(settings);
+ electron.ipcRenderer.send('save-login', settings.account, settings.host);
+ }
+ } catch {
+ alert(l('importer.error'));
+ }
+spellchecker.setDictionary(settings.spellcheckLang, dictDir);
+
+//tslint:disable-next-line:no-unused-expression
+new Index({
+ el: '#app',
+ data: {settings}
+});
\ No newline at end of file
diff --git a/electron/common.ts b/electron/common.ts
index 5a9717f..a435f46 100644
--- a/electron/common.ts
+++ b/electron/common.ts
@@ -1,6 +1,18 @@
+import * as electron from 'electron';
import * as fs from 'fs';
import * as path from 'path';
+export class GeneralSettings {
+ account = '';
+ closeToTray = true;
+ profileViewer = true;
+ host = 'wss://chat.f-list.net:9799';
+ logDirectory = path.join(electron.app.getPath('userData'), 'data');
+ spellcheckLang: string | undefined = 'en-GB';
+ theme = 'default';
+ version = electron.app.getVersion();
+}
+
export function mkdir(dir: string): void {
try {
fs.mkdirSync(dir);
@@ -27,7 +39,9 @@ export function mkdir(dir: string): void {
//tslint:disable
const Module = require('module');
+
export function nativeRequire<T>(module: string): T {
return Module.prototype.require.call({paths: Module._nodeModulePaths(__dirname)}, module);
}
+
//tslint:enable
\ No newline at end of file
diff --git a/electron/filesystem.ts b/electron/filesystem.ts
index 7069cf2..6fb79db 100644
--- a/electron/filesystem.ts
+++ b/electron/filesystem.ts
@@ -5,21 +5,20 @@ import * as path from 'path';
import {Message as MessageImpl} from '../chat/common';
import core from '../chat/core';
import {Conversation, Logs as Logging, Settings} from '../chat/interfaces';
+import l from '../chat/localize';
import {mkdir} from './common';
const dayMs = 86400000;
-const baseDir = path.join(electron.remote.app.getPath('userData'), 'data');
-mkdir(baseDir);
const noAssert = process.env.NODE_ENV === 'production';
-export class GeneralSettings {
- account = '';
- closeToTray = true;
- profileViewer = true;
- host = 'wss://chat.f-list.net:9799';
- spellcheckLang: string | undefined = 'en-GB';
- theme = 'default';
+function writeFile(p: fs.PathLike | number, data: string | object | number,
+ options?: {encoding?: string | null; mode?: number | string; flag?: string} | string | null): void {
+ try {
+ fs.writeFileSync(p, data, options);
+ } catch(e) {
+ electron.remote.dialog.showErrorBox(l('fs.error'), (<Error>e).message);
+ }
}
export type Message = Conversation.EventMessage | {
@@ -40,7 +39,7 @@ interface Index {
}
export function getLogDir(this: void, character: string = core.connection.character): string {
- const dir = path.join(baseDir, character, 'logs');
+ const dir = path.join(core.state.generalSettings!.logDirectory, character, 'logs');
mkdir(dir);
return dir;
}
@@ -152,7 +151,7 @@ export class Logs implements Logging.Persistent {
const entry = this.index[key];
if(entry === undefined) return [];
const dates = [];
- for(const item in entry.index) { //tslint:disable:forin
+ for(const item in entry.index) {
const date = new Date(parseInt(item, 10) * dayMs);
dates.push(addMinutes(date, date.getTimezoneOffset()));
}
@@ -185,8 +184,8 @@ export class Logs implements Logging.Persistent {
const hasIndex = this.index[conversation.key] !== undefined;
const indexBuffer = checkIndex(this.index, message, conversation.key, conversation.name,
() => fs.existsSync(file) ? fs.statSync(file).size : 0);
- if(indexBuffer !== undefined) fs.writeFileSync(`${file}.idx`, indexBuffer, {flag: hasIndex ? 'a' : 'wx'});
- fs.writeFileSync(file, buffer, {flag: 'a'});
+ if(indexBuffer !== undefined) writeFile(`${file}.idx`, indexBuffer, {flag: hasIndex ? 'a' : 'wx'});
+ writeFile(file, buffer, {flag: 'a'});
}
get conversations(): ReadonlyArray<{id: string, name: string}> {
@@ -197,18 +196,8 @@ export class Logs implements Logging.Persistent {
}
}
-export function getGeneralSettings(): GeneralSettings | undefined {
- const file = path.join(baseDir, 'settings');
- if(!fs.existsSync(file)) return undefined;
- return <GeneralSettings>JSON.parse(fs.readFileSync(file, 'utf8'));
-}
-
-export function setGeneralSettings(value: GeneralSettings): void {
- fs.writeFileSync(path.join(baseDir, 'settings'), JSON.stringify(value));
-}
-
function getSettingsDir(character: string = core.connection.character): string {
- const dir = path.join(baseDir, character, 'settings');
+ const dir = path.join(core.state.generalSettings!.logDirectory, character, 'settings');
mkdir(dir);
return dir;
}
@@ -221,10 +210,11 @@ export class SettingsStore implements Settings.Store {
}
async getAvailableCharacters(): Promise<ReadonlyArray<string>> {
+ const baseDir = core.state.generalSettings!.logDirectory;
return (fs.readdirSync(baseDir)).filter((x) => fs.lstatSync(path.join(baseDir, x)).isDirectory());
}
async set<K extends keyof Settings.Keys>(key: K, value: Settings.Keys[K]): Promise<void> {
- fs.writeFileSync(path.join(getSettingsDir(), key), JSON.stringify(value));
+ writeFile(path.join(getSettingsDir(), key), JSON.stringify(value));
}
}
\ No newline at end of file
diff --git a/electron/importer.ts b/electron/importer.ts
index 1dae8f0..30de34c 100644
--- a/electron/importer.ts
+++ b/electron/importer.ts
@@ -4,7 +4,8 @@ import * as path from 'path';
import {promisify} from 'util';
import {Settings} from '../chat/common';
import {Conversation} from '../chat/interfaces';
-import {checkIndex, GeneralSettings, getLogDir, Message as LogMessage, serializeMessage, SettingsStore} from './filesystem';
+import {GeneralSettings} from './common';
+import {checkIndex, getLogDir, Message as LogMessage, serializeMessage, SettingsStore} from './filesystem';
function getRoamingDir(): string | undefined {
const appdata = process.env.APPDATA;
@@ -37,7 +38,7 @@ export function canImportCharacter(character: string): boolean {
return getSettingsDir(character) !== undefined;
}
-export function importGeneral(): GeneralSettings | undefined {
+export function importGeneral(data: GeneralSettings): void {
let dir = getLocalDir();
let files: string[] = [];
if(dir !== undefined)
@@ -57,7 +58,6 @@ export function importGeneral(): GeneralSettings | undefined {
}
if(file.length === 0) return;
let elm = new DOMParser().parseFromString(fs.readFileSync(file, 'utf8'), 'application/xml').firstElementChild;
- const data = new GeneralSettings();
if(file.slice(-3) === 'xml') {
if(elm === null) return;
let elements;
@@ -76,7 +76,6 @@ export function importGeneral(): GeneralSettings | undefined {
else if(element.getAttribute('name') === 'Host') data.host = element.firstElementChild.textContent;
}
}
- return data;
}
const charRegex = /([A-Za-z0-9][A-Za-z0-9 \-_]{0,18}[A-Za-z0-9\-_])\b/;
diff --git a/electron/index.html b/electron/index.html
index a911886..9d5b0f1 100644
--- a/electron/index.html
+++ b/electron/index.html
@@ -2,11 +2,12 @@
<html lang="en">
<head>
<meta charset="UTF-8">
- <title>FChat 3.0</title>
+ <title>F-Chat</title>
</head>
<body>
<div id="app">
</div>
+<script type="text/javascript" src="common.js"></script>
<script type="text/javascript" src="chat.js"></script>
</body>
</html>
\ No newline at end of file
diff --git a/electron/main.ts b/electron/main.ts
index 5ef5444..a3e08e1 100644
--- a/electron/main.ts
+++ b/electron/main.ts
@@ -29,22 +29,27 @@
* @version 3.0
* @see {@link https://github.com/f-list/exported|GitHub repo}
*/
+import Axios from 'axios';
import * as electron from 'electron';
import log from 'electron-log'; //tslint:disable-line:match-default-export-name
import {autoUpdater} from 'electron-updater';
+import * as fs from 'fs';
import * as path from 'path';
import * as url from 'url';
-import {mkdir} from './common';
+import {promisify} from 'util';
+import l from '../chat/localize';
+import {GeneralSettings, mkdir} from './common';
import * as windowState from './window_state';
+import BrowserWindow = Electron.BrowserWindow;
// Module to control application life.
const app = electron.app;
-const datadir = process.argv.filter((x) => x.startsWith('--datadir='));
-if(datadir.length > 0) app.setPath('userData', datadir[0].substr('--datadir='.length));
// Keep a global reference of the window object, if you don't, the window will
// be closed automatically when the JavaScript object is garbage collected.
const windows: Electron.BrowserWindow[] = [];
+const characters: string[] = [];
+let tabCount = 0;
const baseDir = app.getPath('userData');
mkdir(baseDir);
@@ -55,70 +60,322 @@ log.transports.file.maxSize = 5 * 1024 * 1024;
log.transports.file.file = path.join(baseDir, 'log.txt');
log.info('Starting application.');
-function sendUpdaterStatusToWindow(status: string, progress?: object): void {
- log.info(status);
- for(const window of windows) window.webContents.send('updater-status', status, progress);
+const dictDir = path.join(baseDir, 'spellchecker');
+mkdir(dictDir);
+const downloadUrl = 'https://client.f-list.net/dictionaries/';
+type DictionaryIndex = {[key: string]: {file: string, time: number} | undefined};
+let availableDictionaries: DictionaryIndex | undefined;
+const writeFile = promisify(fs.writeFile);
+const requestConfig = {responseType: 'arraybuffer'};
+
+async function getAvailableDictionaries(): Promise<ReadonlyArray<string>> {
+ if(availableDictionaries === undefined) {
+ const indexPath = path.join(dictDir, 'index.json');
+ try {
+ if(!fs.existsSync(indexPath) || fs.statSync(indexPath).mtimeMs + 86400000 * 7 < Date.now()) {
+ availableDictionaries = (await Axios.get<DictionaryIndex>(`${downloadUrl}index.json`)).data;
+ await writeFile(indexPath, JSON.stringify(availableDictionaries));
+ } else availableDictionaries = <DictionaryIndex>JSON.parse(fs.readFileSync(indexPath, 'utf8'));
+ } catch(e) {
+ availableDictionaries = {};
+ log.error(`Error loading dictionaries: ${e}`);
+ }
+ }
+ return Object.keys(availableDictionaries).sort();
}
-const updaterEvents = ['checking-for-update', 'update-available', 'update-not-available', 'error', 'update-downloaded'];
-for(const eventName of updaterEvents)
- autoUpdater.on(eventName, () => {
- sendUpdaterStatusToWindow(eventName);
- });
-
-autoUpdater.on('download-progress', (_, progress: object) => {
- sendUpdaterStatusToWindow('download-progress', progress);
-});
-
-function runUpdater(): void {
- autoUpdater.checkForUpdates(); //tslint:disable-line:no-floating-promises
- setInterval(async() => autoUpdater.checkForUpdates(), 3600000);
- electron.ipcMain.on('install-update', () => autoUpdater.quitAndInstall(false, true));
+async function setDictionary(lang: string | undefined): Promise<void> {
+ const dict = availableDictionaries![lang!];
+ if(dict !== undefined) {
+ const dicPath = path.join(dictDir, `${lang}.dic`);
+ if(!fs.existsSync(dicPath) || fs.statSync(dicPath).mtimeMs / 1000 < dict.time) {
+ await writeFile(dicPath, new Buffer((await Axios.get<string>(`${downloadUrl}${dict.file}.dic`, requestConfig)).data));
+ await writeFile(path.join(dictDir, `${lang}.aff`),
+ new Buffer((await Axios.get<string>(`${downloadUrl}${dict.file}.aff`, requestConfig)).data));
+ fs.utimesSync(dicPath, dict.time, dict.time);
+ }
+ }
+ settings.spellcheckLang = lang;
+ setGeneralSettings(settings);
}
-function bindWindowEvents(window: Electron.BrowserWindow): void {
- // Prevent page navigation by opening links in an external browser.
+const settingsDir = path.join(electron.app.getPath('userData'), 'data');
+const file = path.join(settingsDir, 'settings');
+const settings = new GeneralSettings();
+let shouldImportSettings = false;
+if(!fs.existsSync(file)) shouldImportSettings = true;
+else
+ try {
+ Object.assign(settings, <GeneralSettings>JSON.parse(fs.readFileSync(file, 'utf8')));
+ } catch(e) {
+ log.error(`Error loading settings: ${e}`);
+ }
+
+function setGeneralSettings(value: GeneralSettings): void {
+ fs.writeFileSync(path.join(settingsDir, 'settings'), JSON.stringify(value));
+ for(const w of electron.webContents.getAllWebContents()) w.send('settings', settings);
+ shouldImportSettings = false;
+}
+
+async function addSpellcheckerItems(menu: Electron.Menu): Promise<void> {
+ const dictionaries = await getAvailableDictionaries();
+ const selected = settings.spellcheckLang;
+ menu.append(new electron.MenuItem({
+ type: 'radio',
+ label: l('settings.spellcheck.disabled'),
+ click: async() => setDictionary(undefined)
+ }));
+ for(const lang of dictionaries)
+ menu.append(new electron.MenuItem({
+ type: 'radio',
+ label: lang,
+ checked: lang === selected,
+ click: async() => setDictionary(lang)
+ }));
+}
+
+function setUpWebContents(webContents: Electron.WebContents): void {
const openLinkExternally = (e: Event, linkUrl: string) => {
e.preventDefault();
- const profileMatch = linkUrl.match(/^https?:\/\/(www\.)?f-list.net\/c\/(.+)/);
- if(profileMatch !== null) window.webContents.send('open-profile', decodeURIComponent(profileMatch[2]));
+ const profileMatch = linkUrl.match(/^https?:\/\/(www\.)?f-list.net\/c\/(.+)\/?#?/);
+ if(profileMatch !== null && settings.profileViewer) webContents.send('open-profile', decodeURIComponent(profileMatch[2]));
else electron.shell.openExternal(linkUrl);
};
- window.webContents.on('will-navigate', openLinkExternally);
- window.webContents.on('new-window', openLinkExternally);
- // Fix focus events not properly propagating down to the document.
- window.on('focus', () => window.webContents.send('focus', true));
- window.on('blur', () => window.webContents.send('focus', false));
-
- // Save window state when it is being closed.
- window.on('close', () => windowState.setSavedWindowState(window));
+ webContents.on('will-navigate', openLinkExternally);
+ webContents.on('new-window', openLinkExternally);
}
-function createWindow(): void {
+function createWindow(): Electron.BrowserWindow | undefined {
+ if(tabCount >= 3) return;
const lastState = windowState.getSavedWindowState();
- const windowProperties = {...lastState, center: lastState.x === undefined};
+ const windowProperties: Electron.BrowserWindowConstructorOptions & {maximized: boolean} = {
+ ...lastState, center: lastState.x === undefined
+ };
+ if(process.platform === 'darwin') windowProperties.titleBarStyle = 'hiddenInset';
+ else windowProperties.frame = false;
const window = new electron.BrowserWindow(windowProperties);
windows.push(window);
if(lastState.maximized) window.maximize();
window.loadURL(url.format({
- pathname: path.join(__dirname, 'index.html'),
+ pathname: path.join(__dirname, 'window.html'),
protocol: 'file:',
- slashes: true
+ slashes: true,
+ query: {settings: JSON.stringify(settings), import: shouldImportSettings ? 'true' : []}
}));
- bindWindowEvents(window);
+ setUpWebContents(window.webContents);
+ // Save window state when it is being closed.
+ window.on('close', () => windowState.setSavedWindowState(window));
window.on('closed', () => windows.splice(windows.indexOf(window), 1));
- if(process.env.NODE_ENV === 'production') runUpdater();
+ return window;
}
-const running = app.makeSingleInstance(() => {
- if(windows.length < 3) createWindow();
- return true;
-});
+function showPatchNotes(): void {
+ electron.shell.openExternal('https://wiki.f-list.net/F-Chat_3.0#Changelog');
+}
+
+function onReady(): void {
+ app.on('open-file', createWindow);
+
+ if(settings.version !== app.getVersion()) {
+ showPatchNotes();
+ settings.version = app.getVersion();
+ setGeneralSettings(settings);
+ }
+
+ if(process.env.NODE_ENV === 'production') {
+ autoUpdater.checkForUpdates(); //tslint:disable-line:no-floating-promises
+ const updateTimer = setInterval(async() => autoUpdater.checkForUpdates(), 3600000);
+ let hasUpdate = false;
+ autoUpdater.on('update-downloaded', () => {
+ clearInterval(updateTimer);
+ if(hasUpdate) return;
+ hasUpdate = true;
+ const menu = electron.Menu.getApplicationMenu();
+ menu.append(new electron.MenuItem({
+ label: l('action.updateAvailable'),
+ submenu: electron.Menu.buildFromTemplate([{
+ label: l('action.update'),
+ click: () => autoUpdater.quitAndInstall(false, true)
+ }, {
+ label: l('help.changelog'),
+ click: showPatchNotes
+ }])
+ }));
+ electron.Menu.setApplicationMenu(menu);
+ for(const w of windows) w.webContents.send('update-available');
+ });
+ }
+
+ const viewItem = {
+ label: `&${l('action.view')}`,
+ submenu: <Electron.MenuItemConstructorOptions[]>[
+ {role: 'resetzoom'},
+ {role: 'zoomin'},
+ {role: 'zoomout'},
+ {type: 'separator'},
+ {role: 'togglefullscreen'}
+ ]
+ };
+ if(process.env.NODE_ENV !== 'production')
+ viewItem.submenu.unshift({role: 'reload'}, {role: 'forcereload'}, {role: 'toggledevtools'}, {type: 'separator'});
+ const spellcheckerMenu = new electron.Menu();
+ //tslint:disable-next-line:no-floating-promises
+ addSpellcheckerItems(spellcheckerMenu);
+ const themes = fs.readdirSync(path.join(__dirname, 'themes')).filter((x) => x.substr(-4) === '.css').map((x) => x.slice(0, -4));
+ const setTheme = (theme: string) => {
+ settings.theme = theme;
+ setGeneralSettings(settings);
+ };
+ electron.Menu.setApplicationMenu(electron.Menu.buildFromTemplate([
+ {
+ label: `&${l('title')}`,
+ submenu: [
+ {label: l('action.newWindow'), click: createWindow, accelerator: 'CmdOrCtrl+n'},
+ {
+ label: l('action.newTab'),
+ click: (_: Electron.MenuItem, w: Electron.BrowserWindow) => {
+ if(tabCount < 3) w.webContents.send('open-tab');
+ },
+ accelerator: 'CmdOrCtrl+t'
+ },
+ {
+ label: l('settings.logDir'),
+ click: (_, window: BrowserWindow) => {
+ const dir = <string[] | undefined>electron.dialog.showOpenDialog(
+ {defaultPath: new GeneralSettings().logDirectory, properties: ['openDirectory']});
+ if(dir !== undefined) {
+ const button = electron.dialog.showMessageBox(window, {
+ message: l('settings.logDir.confirm', dir[0], settings.logDirectory),
+ buttons: [l('confirmYes'), l('confirmNo')],
+ cancelId: 1
+ });
+ if(button === 0) {
+ for(const w of windows) {
+ w.webContents.on('will-prevent-unload', (e) => e.preventDefault());
+ w.close();
+ }
+ settings.logDirectory = dir[0];
+ setGeneralSettings(settings);
+ app.quit();
+ }
+ }
+ }
+ },
+ {
+ label: l('settings.closeToTray'), type: 'checkbox', checked: settings.closeToTray,
+ click: (item: Electron.MenuItem) => {
+ settings.closeToTray = item.checked;
+ setGeneralSettings(settings);
+ }
+ }, {
+ label: l('settings.profileViewer'), type: 'checkbox', checked: settings.profileViewer,
+ click: (item: Electron.MenuItem) => {
+ settings.profileViewer = item.checked;
+ setGeneralSettings(settings);
+ }
+ },
+ {label: l('settings.spellcheck'), submenu: spellcheckerMenu},
+ {
+ label: l('settings.theme'),
+ submenu: themes.map((x) => ({
+ checked: settings.theme === x,
+ click: () => setTheme(x),
+ label: x,
+ type: <'radio'>'radio'
+ }))
+ },
+ {type: 'separator'},
+ {role: 'minimize'},
+ {
+ accelerator: process.platform === 'darwin' ? 'Cmd+Q' : undefined,
+ label: l('action.quit'),
+ click(_: Electron.MenuItem, w: Electron.BrowserWindow): void {
+ if(characters.length === 0) return app.quit();
+ const button = electron.dialog.showMessageBox(w, {
+ message: l('chat.confirmLeave'),
+ buttons: [l('confirmYes'), l('confirmNo')],
+ cancelId: 1
+ });
+ if(button === 0) app.quit();
+ }
+ }
+ ]
+ }, {
+ label: `&${l('action.edit')}`,
+ submenu: [
+ {role: 'undo'},
+ {role: 'redo'},
+ {type: 'separator'},
+ {role: 'cut'},
+ {role: 'copy'},
+ {role: 'paste'},
+ {role: 'selectall'}
+ ]
+ }, viewItem, {
+ label: `&${l('help')}`,
+ submenu: [
+ {
+ label: l('help.fchat'),
+ click: () => electron.shell.openExternal('https://wiki.f-list.net/F-Chat_3.0')
+ },
+ {
+ label: l('help.feedback'),
+ click: () => electron.shell.openExternal('https://goo.gl/forms/WnLt3Qm3TPt64jQt2')
+ },
+ {
+ label: l('help.rules'),
+ click: () => electron.shell.openExternal('https://wiki.f-list.net/Rules')
+ },
+ {
+ label: l('help.faq'),
+ click: () => electron.shell.openExternal('https://wiki.f-list.net/Frequently_Asked_Questions')
+ },
+ {
+ label: l('help.report'),
+ click: () => electron.shell.openExternal('https://wiki.f-list.net/How_to_Report_a_User#In_chat')
+ },
+ {label: l('version', app.getVersion()), click: showPatchNotes}
+ ]
+ }
+ ]));
+ electron.ipcMain.on('tab-added', (_: Event, id: number) => {
+ const webContents = electron.webContents.fromId(id);
+ setUpWebContents(webContents);
+ ++tabCount;
+ if(tabCount === 3)
+ for(const w of windows) w.webContents.send('allow-new-tabs', false);
+ });
+ electron.ipcMain.on('tab-closed', () => {
+ --tabCount;
+ for(const w of windows) w.webContents.send('allow-new-tabs', true);
+ });
+ electron.ipcMain.on('save-login', (_: Event, account: string, host: string) => {
+ settings.account = account;
+ settings.host = host;
+ setGeneralSettings(settings);
+ });
+ electron.ipcMain.on('connect', (e: Event & {sender: Electron.WebContents}, character: string) => {
+ if(characters.indexOf(character) !== -1) return e.returnValue = false;
+ else characters.push(character);
+ e.returnValue = true;
+ });
+ electron.ipcMain.on('disconnect', (_: Event, character: string) => characters.splice(characters.indexOf(character), 1));
+ const emptyBadge = electron.nativeImage.createEmpty();
+ //tslint:disable-next-line:no-require-imports
+ const badge = electron.nativeImage.createFromPath(path.join(__dirname, <string>require('./build/badge.png')));
+ electron.ipcMain.on('has-new', (e: Event & {sender: Electron.WebContents}, hasNew: boolean) => {
+ if(process.platform === 'darwin') app.dock.setBadge(hasNew ? '!' : '');
+ electron.BrowserWindow.fromWebContents(e.sender).setOverlayIcon(hasNew ? badge : emptyBadge, hasNew ? 'New messages' : '');
+ });
+ createWindow();
+}
+
+const running = app.makeSingleInstance(createWindow);
if(running) app.quit();
-else app.on('ready', createWindow);
+else app.on('ready', onReady);
app.on('window-all-closed', () => app.quit());
\ No newline at end of file
diff --git a/electron/menu.ts b/electron/menu.ts
deleted file mode 100644
index 77362de..0000000
--- a/electron/menu.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-import * as electron from 'electron';
-import l from '../chat/localize';
-
-export function createContextMenu(props: Electron.ContextMenuParams & {editFlags: {[key: string]: boolean}}):
- Electron.MenuItemConstructorOptions[] {
- const hasText = props.selectionText.trim().length > 0;
- const can = (type: string) => props.editFlags[`can${type}`] && hasText;
-
- const menuTemplate: Electron.MenuItemConstructorOptions[] = [];
- if(hasText || props.isEditable)
- menuTemplate.push({
- id: 'copy',
- label: l('action.copy'),
- role: can('Copy') ? 'copy' : '',
- enabled: can('Copy')
- });
- if(props.isEditable)
- menuTemplate.push({
- id: 'cut',
- label: l('action.cut'),
- role: can('Cut') ? 'cut' : '',
- enabled: can('Cut')
- }, {
- id: 'paste',
- label: l('action.paste'),
- role: props.editFlags.canPaste ? 'paste' : '',
- enabled: props.editFlags.canPaste
- });
- else if(props.linkURL.length > 0 && props.mediaType === 'none' && props.linkURL.substr(0, props.pageURL.length) !== props.pageURL)
- menuTemplate.push({
- id: 'copyLink',
- label: l('action.copyLink'),
- click(): void {
- if(process.platform === 'darwin')
- electron.clipboard.writeBookmark(props.linkText, props.linkURL);
- else
- electron.clipboard.writeText(props.linkURL);
- }
- });
- return menuTemplate;
-}
-
-export function createAppMenu(): Electron.MenuItemConstructorOptions[] {
- const viewItem = {
- label: `&${l('action.view')}`,
- submenu: [
- {role: 'resetzoom'},
- {role: 'zoomin'},
- {role: 'zoomout'},
- {type: 'separator'},
- {role: 'togglefullscreen'}
- ]
- };
- const menu: Electron.MenuItemConstructorOptions[] = [
- {
- label: `&${l('title')}`
- }, {
- label: `&${l('action.edit')}`,
- submenu: [
- {role: 'undo'},
- {role: 'redo'},
- {type: 'separator'},
- {role: 'cut'},
- {role: 'copy'},
- {role: 'paste'},
- {role: 'selectall'}
- ]
- }, viewItem, {
- label: `&${l('help')}`,
- submenu: [
- {
- label: l('help.fchat'),
- click: () => electron.shell.openExternal('https://wiki.f-list.net/F-Chat_3.0')
- },
- {
- label: l('help.feedback'),
- click: () => electron.shell.openExternal('https://goo.gl/forms/WnLt3Qm3TPt64jQt2')
- },
- {
- label: l('help.rules'),
- click: () => electron.shell.openExternal('https://wiki.f-list.net/Rules')
- },
- {
- label: l('help.faq'),
- click: () => electron.shell.openExternal('https://wiki.f-list.net/Frequently_Asked_Questions')
- },
- {
- label: l('help.report'),
- click: () => electron.shell.openExternal('https://wiki.f-list.net/How_to_Report_a_User#In_chat')
- },
- {label: l('version', electron.remote.app.getVersion()), enabled: false}
- ]
- }
- ];
- if(process.env.NODE_ENV !== 'production')
- viewItem.submenu.unshift({role: 'reload'}, {role: 'forcereload'}, {role: 'toggledevtools'}, {type: 'separator'});
- return menu;
-}
\ No newline at end of file
diff --git a/electron/notifications.ts b/electron/notifications.ts
index bf1ed47..689d09f 100644
--- a/electron/notifications.ts
+++ b/electron/notifications.ts
@@ -4,11 +4,13 @@ import {Conversation} from '../chat/interfaces';
//tslint:disable-next-line:match-default-export-name
import BaseNotifications from '../chat/notifications';
+const browserWindow = remote.getCurrentWindow();
+
export default class Notifications extends BaseNotifications {
notify(conversation: Conversation, title: string, body: string, icon: string, sound: string): void {
if(!this.isInBackground && conversation === core.conversations.selectedConversation && !core.state.settings.alwaysNotify) return;
this.playSound(sound);
- remote.getCurrentWindow().flashFrame(true);
+ browserWindow.flashFrame(true);
if(core.state.settings.notifications) {
/*tslint:disable-next-line:no-object-literal-type-assertion*///false positive
const notification = new Notification(title, <NotificationOptions & {silent: boolean}>{
@@ -18,7 +20,7 @@ export default class Notifications extends BaseNotifications {
});
notification.onclick = () => {
conversation.show();
- remote.getCurrentWindow().focus();
+ browserWindow.focus();
notification.close();
};
}
diff --git a/electron/package.json b/electron/package.json
index de9a2b3..da6ff2e 100644
--- a/electron/package.json
+++ b/electron/package.json
@@ -1,4 +1,4 @@
- {
+{
"name": "fchat",
"version": "3.0.0",
"author": "The F-List Team",
diff --git a/electron/spellchecker.ts b/electron/spellchecker.ts
deleted file mode 100644
index e73f048..0000000
--- a/electron/spellchecker.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import Axios from 'axios';
-import * as electron from 'electron';
-import * as fs from 'fs';
-import * as path from 'path';
-import {promisify} from 'util';
-import {mkdir, nativeRequire} from './common';
-
-process.env.SPELLCHECKER_PREFER_HUNSPELL = '1';
-const downloadUrl = 'https://client.f-list.net/dictionaries/';
-const dir = path.join(electron.remote.app.getPath('userData'), 'spellchecker');
-mkdir(dir);
-//tslint:disable-next-line
-const sc = nativeRequire<{
- Spellchecker: {
- new(): {
- isMisspelled(x: string): boolean,
- setDictionary(name: string | undefined, dir: string): void,
- getCorrectionsForMisspelling(word: string): ReadonlyArray<string>
- }
- }
-}>('spellchecker/build/Release/spellchecker.node');
-type DictionaryIndex = {[key: string]: {file: string, time: number} | undefined};
-let availableDictionaries: DictionaryIndex | undefined;
-const writeFile = promisify(fs.writeFile);
-const requestConfig = {responseType: 'arraybuffer'};
-const spellchecker = new sc.Spellchecker();
-
-export async function getAvailableDictionaries(): Promise<ReadonlyArray<string>> {
- if(availableDictionaries === undefined) {
- const indexPath = path.join(dir, 'index.json');
- if(!fs.existsSync(indexPath) || fs.statSync(indexPath).mtimeMs + 86400000 * 7 < Date.now()) {
- availableDictionaries = (await Axios.get<DictionaryIndex>(`${downloadUrl}index.json`)).data;
- await writeFile(indexPath, JSON.stringify(availableDictionaries));
- } else availableDictionaries = <DictionaryIndex>JSON.parse(fs.readFileSync(indexPath, 'utf8'));
- }
- return Object.keys(availableDictionaries).sort();
-}
-
-export async function setDictionary(lang: string | undefined): Promise<void> {
- const dict = availableDictionaries![lang!];
- if(dict !== undefined) {
- const dicPath = path.join(dir, `${lang}.dic`);
- if(!fs.existsSync(dicPath) || fs.statSync(dicPath).mtimeMs / 1000 < dict.time) {
- await writeFile(dicPath, new Buffer((await Axios.get<string>(`${downloadUrl}${dict.file}.dic`, requestConfig)).data));
- await writeFile(path.join(dir, `${lang}.aff`),
- new Buffer((await Axios.get<string>(`${downloadUrl}${dict.file}.aff`, requestConfig)).data));
- fs.utimesSync(dicPath, dict.time, dict.time);
- }
- }
- spellchecker.setDictionary(lang, dir);
-}
-
-export function getCorrections(word: string): ReadonlyArray<string> {
- return spellchecker.getCorrectionsForMisspelling(word);
-}
-
-export const check = (text: string) => !spellchecker.isMisspelled(text);
\ No newline at end of file
diff --git a/electron/webpack.config.js b/electron/webpack.config.js
index 184dcec..1be4f4c 100644
--- a/electron/webpack.config.js
+++ b/electron/webpack.config.js
@@ -1,4 +1,5 @@
const path = require('path');
+const CommonsChunkPlugin = require('webpack/lib/optimize/CommonsChunkPlugin');
const webpack = require('webpack');
const UglifyPlugin = require('uglifyjs-webpack-plugin');
const ExtractTextPlugin = require('extract-text-webpack-plugin');
@@ -6,17 +7,55 @@ const fs = require('fs');
const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
const exportLoader = require('../export-loader');
-const config = {
+const mainConfig = {
+ entry: [path.join(__dirname, 'main.ts'), path.join(__dirname, 'application.json')],
+ output: {
+ path: __dirname + '/app',
+ filename: 'main.js'
+ },
+ context: __dirname,
+ target: 'electron-main',
+ module: {
+ loaders: [
+ {
+ test: /\.ts$/,
+ loader: 'ts-loader',
+ options: {
+ configFile: __dirname + '/tsconfig.json',
+ transpileOnly: true
+ }
+ },
+ {test: /application.json$/, loader: 'file-loader?name=package.json'},
+ {test: /\.(png|html)$/, loader: 'file-loader?name=[name].[ext]'}
+ ]
+ },
+ node: {
+ __dirname: false,
+ __filename: false
+ },
+ plugins: [
+ new ForkTsCheckerWebpackPlugin({workers: 2, async: false, tslint: path.join(__dirname, '../tslint.json')}),
+ exportLoader.delayTypecheck
+ ],
+ resolve: {
+ extensions: ['.ts', '.js']
+ },
+ resolveLoader: {
+ modules: [
+ 'node_modules', path.join(__dirname, '../')
+ ]
+ }
+}, rendererConfig = {
entry: {
- chat: [path.join(__dirname, 'chat.ts')],
- main: [path.join(__dirname, 'main.ts'), path.join(__dirname, 'index.html'), path.join(__dirname, 'application.json')]
+ chat: [path.join(__dirname, 'chat.ts'), path.join(__dirname, 'index.html')],
+ window: [path.join(__dirname, 'window.ts'), path.join(__dirname, 'window.html')]
},
output: {
path: __dirname + '/app',
filename: '[name].js'
},
context: __dirname,
- target: 'electron',
+ target: 'electron-renderer',
module: {
loaders: [
{
@@ -41,8 +80,7 @@ const config = {
{test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/octet-stream'},
{test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=image/svg+xml'},
{test: /\.(wav|mp3|ogg)$/, loader: 'file-loader?name=sounds/[name].[ext]'},
- {test: /\.(png|html)$/, loader: 'file-loader?name=[name].[ext]'},
- {test: /application.json$/, loader: 'file-loader?name=package.json'}
+ {test: /\.(png|html)$/, loader: 'file-loader?name=[name].[ext]'}
]
},
node: {
@@ -56,6 +94,7 @@ const config = {
'window.jQuery': 'jquery/dist/jquery.slim.js'
}),
new ForkTsCheckerWebpackPlugin({workers: 2, async: false, tslint: path.join(__dirname, '../tslint.json')}),
+ new CommonsChunkPlugin({name: 'common', minChunks: 2}),
exportLoader.delayTypecheck
],
resolve: {
@@ -77,20 +116,20 @@ module.exports = function(env) {
for(const theme of themes) {
if(!theme.endsWith('.less')) continue;
const absPath = path.join(themesDir, theme);
- config.entry.chat.push(absPath);
+ rendererConfig.entry.chat.push(absPath);
const plugin = new ExtractTextPlugin('themes/' + theme.slice(0, -5) + '.css');
- config.plugins.push(plugin);
- config.module.loaders.push({test: absPath, use: plugin.extract(cssOptions)});
+ rendererConfig.plugins.push(plugin);
+ rendererConfig.module.loaders.push({test: absPath, use: plugin.extract(cssOptions)});
}
if(dist) {
- config.devtool = 'source-map';
- config.plugins.push(
- new UglifyPlugin({sourceMap: true}),
+ mainConfig.devtool = rendererConfig.devtool = 'source-map';
+ const plugins = [new UglifyPlugin({sourceMap: true}),
new webpack.DefinePlugin({'process.env.NODE_ENV': JSON.stringify('production')}),
- new webpack.LoaderOptionsPlugin({minimize: true})
- );
+ new webpack.LoaderOptionsPlugin({minimize: true})];
+ mainConfig.plugins.push(...plugins);
+ rendererConfig.plugins.push(...plugins);
} else {
//config.devtool = 'cheap-module-eval-source-map';
}
- return config;
+ return [mainConfig, rendererConfig];
};
\ No newline at end of file
diff --git a/electron/window.html b/electron/window.html
new file mode 100644
index 0000000..435385c
--- /dev/null
+++ b/electron/window.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <title>F-Chat</title>
+</head>
+<body>
+<div id="app"></div>
+<script type="text/javascript" src="common.js"></script>
+<script type="text/javascript" src="window.js"></script>
+</body>
+</html>
\ No newline at end of file
diff --git a/electron/window.ts b/electron/window.ts
new file mode 100644
index 0000000..b28ab87
--- /dev/null
+++ b/electron/window.ts
@@ -0,0 +1,11 @@
+import * as qs from 'querystring';
+import {GeneralSettings} from './common';
+import Window from './Window.vue';
+
+const params = <{[key: string]: string | undefined}>qs.parse(window.location.search.substr(1));
+const settings = <GeneralSettings>JSON.parse(params['settings']!);
+//tslint:disable-next-line:no-unused-expression
+new Window({
+ el: '#app',
+ data: {settings}
+});
\ No newline at end of file
diff --git a/electron/yarn.lock b/electron/yarn.lock
index bd460e9..7a2d741 100644
--- a/electron/yarn.lock
+++ b/electron/yarn.lock
@@ -3,8 +3,8 @@
"7zip-bin-linux@^1.1.0":
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/7zip-bin-linux/-/7zip-bin-linux-1.1.0.tgz#2ca309fd6a2102e18bd81e3a5d91b39db9adab71"
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/7zip-bin-linux/-/7zip-bin-linux-1.2.0.tgz#c0ddfb640b255e14bd6730c26af45b2669c0193c"
"7zip-bin-mac@^1.0.1":
version "1.0.1"
@@ -14,30 +14,30 @@
version "2.1.1"
resolved "https://registry.yarnpkg.com/7zip-bin-win/-/7zip-bin-win-2.1.1.tgz#8acfc28bb34e53a9476b46ae85a97418e6035c20"
-"7zip-bin@^2.2.7":
- version "2.2.7"
- resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-2.2.7.tgz#724802b8d6bda0bf2cfe61a4b86a820efc8ece93"
+"7zip-bin@^2.3.4":
+ version "2.3.4"
+ resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-2.3.4.tgz#0861a3c99793dd794f4dd6175ec4ddfa6af8bc9d"
optionalDependencies:
"7zip-bin-linux" "^1.1.0"
"7zip-bin-mac" "^1.0.1"
"7zip-bin-win" "^2.1.1"
"@types/node@^8.0.24":
- version "8.0.44"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.44.tgz#5c39800fda4b76dab39a5f28fda676fc500015ac"
+ version "8.5.7"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-8.5.7.tgz#9c498c35af354dcfbca3790fb2e81129e93cf0e2"
-ajv-keywords@^2.1.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.0.tgz#a296e17f7bfae7c1ce4f7e0de53d29cb32162df0"
+ajv-keywords@^2.1.1:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
-ajv@^5.0.0, ajv@^5.1.0, ajv@^5.2.3:
- version "5.2.3"
- resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.2.3.tgz#c06f598778c44c6b161abafe3466b81ad1814ed2"
+ajv@^5.0.0, ajv@^5.1.0, ajv@^5.5.2:
+ version "5.5.2"
+ resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
dependencies:
co "^4.6.0"
fast-deep-equal "^1.0.0"
+ fast-json-stable-stringify "^2.0.0"
json-schema-traverse "^0.3.0"
- json-stable-stringify "^1.0.1"
ansi-align@^2.0.0:
version "2.0.0"
@@ -63,29 +63,6 @@ any-promise@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
-app-package-builder@1.3.0:
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/app-package-builder/-/app-package-builder-1.3.0.tgz#fbe8fc3f76c0b5a6921efe056a4584673e65600c"
- dependencies:
- bluebird-lst "^1.0.4"
- builder-util "^3.0.12"
- builder-util-runtime "^2.2.0"
- fs-extra-p "^4.4.4"
- int64-buffer "^0.1.9"
- js-yaml "^3.10.0"
- rabin-bindings "~1.7.3"
-
-aproba@^1.0.3:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
-
-are-we-there-yet@~1.1.2:
- version "1.1.4"
- resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d"
- dependencies:
- delegates "^1.0.0"
- readable-stream "^2.0.6"
-
argparse@^1.0.7:
version "1.0.9"
resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
@@ -96,12 +73,12 @@ array-find-index@^1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
-asar-integrity@0.2.2:
- version "0.2.2"
- resolved "https://registry.yarnpkg.com/asar-integrity/-/asar-integrity-0.2.2.tgz#ccfacebc3e417a23c65b0549b9824f10684ad9a2"
+asar-integrity@0.2.4:
+ version "0.2.4"
+ resolved "https://registry.yarnpkg.com/asar-integrity/-/asar-integrity-0.2.4.tgz#b7867c9720e08c461d12bc42f005c239af701733"
dependencies:
- bluebird-lst "^1.0.4"
- fs-extra-p "^4.4.3"
+ bluebird-lst "^1.0.5"
+ fs-extra-p "^4.5.0"
asn1@~0.2.3:
version "0.2.3"
@@ -116,8 +93,8 @@ async-exit-hook@^2.0.1:
resolved "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz#8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3"
async@^2.4.1:
- version "2.5.0"
- resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d"
+ version "2.6.0"
+ resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
dependencies:
lodash "^4.14.0"
@@ -151,19 +128,9 @@ big.js@^3.1.3:
version "3.2.0"
resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
-bindings@^1.3.0:
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.3.0.tgz#b346f6ecf6a95f5a815c5839fc7cdb22502f1ed7"
-
-bl@^1.0.0:
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.1.tgz#cac328f7bee45730d404b692203fcb590e172d5e"
- dependencies:
- readable-stream "^2.0.5"
-
-bluebird-lst@^1.0.3, bluebird-lst@^1.0.4:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.4.tgz#7fa1e4daaaf9e4e52f6dd0ec5b32e7ed4ca8cd6d"
+bluebird-lst@^1.0.5:
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.5.tgz#bebc83026b7e92a72871a3dc599e219cbfb002a9"
dependencies:
bluebird "^3.5.1"
@@ -184,8 +151,8 @@ boom@5.x.x:
hoek "4.x.x"
boxen@^1.2.1:
- version "1.2.2"
- resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.2.2.tgz#3f1d4032c30ffea9d4b02c322eaf2ea741dcbce5"
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b"
dependencies:
ansi-align "^2.0.0"
camelcase "^4.0.0"
@@ -193,7 +160,7 @@ boxen@^1.2.1:
cli-boxes "^1.0.0"
string-width "^2.0.0"
term-size "^1.2.0"
- widest-line "^1.0.0"
+ widest-line "^2.0.0"
brace-expansion@^1.1.7:
version "1.1.8"
@@ -202,34 +169,33 @@ brace-expansion@^1.1.7:
balanced-match "^1.0.0"
concat-map "0.0.1"
-builder-util-runtime@2.2.0, builder-util-runtime@^2.0.1, builder-util-runtime@^2.2.0, builder-util-runtime@~2.2.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-2.2.0.tgz#ed414b7a1f3018498ed849499939c7fbd1efb128"
+builder-util-runtime@4.0.0, builder-util-runtime@^4.0.0, builder-util-runtime@~4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-4.0.0.tgz#783a4148164e8f9e2ffd4ffa4c2e0a0886e19496"
dependencies:
- bluebird-lst "^1.0.4"
+ bluebird-lst "^1.0.5"
debug "^3.1.0"
- fs-extra-p "^4.4.4"
+ fs-extra-p "^4.5.0"
sax "^1.2.4"
-builder-util@3.0.12, builder-util@^3.0.12:
- version "3.0.12"
- resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-3.0.12.tgz#01e822becee89b9660b4aaa42250e11920923ab9"
+builder-util@4.1.2, builder-util@^4.1.0:
+ version "4.1.2"
+ resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-4.1.2.tgz#f91b50957f702bd9fb049b2a898b297eab178285"
dependencies:
- "7zip-bin" "^2.2.7"
- bluebird-lst "^1.0.4"
- builder-util-runtime "^2.0.1"
- chalk "^2.1.0"
+ "7zip-bin" "^2.3.4"
+ bluebird-lst "^1.0.5"
+ builder-util-runtime "^4.0.0"
+ chalk "^2.3.0"
debug "^3.1.0"
- fs-extra-p "^4.4.4"
- ini "^1.3.4"
- is-ci "^1.0.10"
+ fs-extra-p "^4.5.0"
+ ini "^1.3.5"
+ is-ci "^1.1.0"
js-yaml "^3.10.0"
- lazy-val "^1.0.2"
- node-emoji "^1.8.1"
+ lazy-val "^1.0.3"
semver "^5.4.1"
source-map-support "^0.5.0"
stat-mode "^0.2.2"
- temp-file "^2.0.3"
+ temp-file "^3.1.0"
tunnel-agent "^0.6.0"
builtin-modules@^1.0.0:
@@ -259,36 +225,32 @@ caseless@~0.12.0:
version "0.12.0"
resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-chalk@^2.0.1, chalk@^2.1.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.1.0.tgz#ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e"
+chalk@^2.0.1, chalk@^2.3.0:
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba"
dependencies:
ansi-styles "^3.1.0"
escape-string-regexp "^1.0.5"
supports-color "^4.0.0"
-chownr@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
-
chromium-pickle-js@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz#04a106672c18b085ab774d983dfa3ea138f22205"
ci-info@^1.0.0:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.1.1.tgz#47b44df118c48d2597b56d342e7e25791060171a"
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.1.2.tgz#03561259db48d0474c8bdc90f5b47b068b6bbfb4"
cli-boxes@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
-cliui@^3.2.0:
- version "3.2.0"
- resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
+cliui@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.0.0.tgz#743d4650e05f36d1ed2575b59638d87322bfbbcc"
dependencies:
- string-width "^1.0.1"
- strip-ansi "^3.0.1"
+ string-width "^2.1.1"
+ strip-ansi "^4.0.0"
wrap-ansi "^2.0.0"
co@^4.6.0:
@@ -300,8 +262,8 @@ code-point-at@^1.0.0:
resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
color-convert@^1.9.0:
- version "1.9.0"
- resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a"
+ version "1.9.1"
+ resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed"
dependencies:
color-name "^1.1.1"
@@ -346,10 +308,6 @@ configstore@^3.0.0:
write-file-atomic "^2.0.0"
xdg-basedir "^3.0.0"
-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-
core-util-is@1.0.2, core-util-is@~1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@@ -378,10 +336,6 @@ crypto-random-string@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
-cuint@^0.2.2:
- version "0.2.2"
- resolved "https://registry.yarnpkg.com/cuint/-/cuint-0.2.2.tgz#408086d409550c2631155619e9fa7bcadc3b991b"
-
currently-unhandled@^0.4.1:
version "0.4.1"
resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
@@ -394,13 +348,7 @@ dashdash@^1.12.0:
dependencies:
assert-plus "^1.0.0"
-debug@2.2.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
- dependencies:
- ms "0.7.1"
-
-debug@^2.1.3, debug@^2.2.0, debug@^2.6.8:
+debug@2.6.9, debug@^2.1.3, debug@^2.2.0, debug@^2.6.8:
version "2.6.9"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
dependencies:
@@ -424,18 +372,13 @@ delayed-stream@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-delegates@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-
-dmg-builder@2.1.2:
- version "2.1.2"
- resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-2.1.2.tgz#a67418839f2d35fec7c4cfe45270b3ad1e08c03a"
+dmg-builder@3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-3.1.0.tgz#11b8ec781b64813116b7ddc9175d673d59e1ad02"
dependencies:
- bluebird-lst "^1.0.4"
- builder-util "^3.0.12"
- debug "^3.1.0"
- fs-extra-p "^4.4.4"
+ bluebird-lst "^1.0.5"
+ builder-util "^4.1.0"
+ fs-extra-p "^4.5.0"
iconv-lite "^0.4.19"
js-yaml "^3.10.0"
parse-color "^1.0.0"
@@ -468,41 +411,53 @@ ejs@^2.5.7:
version "2.5.7"
resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.7.tgz#cc872c168880ae3c7189762fd5ffc00896c9518a"
-electron-builder@^19.33.0:
- version "19.38.0"
- resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-19.38.0.tgz#5af22e566116aaf6120d7c552ca9af6a36969150"
+electron-builder-lib@19.53.2:
+ version "19.53.2"
+ resolved "https://registry.yarnpkg.com/electron-builder-lib/-/electron-builder-lib-19.53.2.tgz#4c8be454b1168ab4411401068d88d78725889b6c"
dependencies:
- "7zip-bin" "^2.2.7"
- app-package-builder "1.3.0"
- asar-integrity "0.2.2"
+ "7zip-bin" "^2.3.4"
+ asar-integrity "0.2.4"
async-exit-hook "^2.0.1"
- bluebird-lst "^1.0.4"
- builder-util "3.0.12"
- builder-util-runtime "2.2.0"
- chalk "^2.1.0"
+ bluebird-lst "^1.0.5"
+ builder-util "4.1.2"
+ builder-util-runtime "4.0.0"
chromium-pickle-js "^0.2.0"
- cuint "^0.2.2"
debug "^3.1.0"
- dmg-builder "2.1.2"
+ dmg-builder "3.1.0"
ejs "^2.5.7"
- electron-download-tf "4.3.4"
electron-osx-sign "0.4.7"
- electron-publish "19.37.0"
- fs-extra-p "^4.4.4"
+ electron-publish "19.52.0"
+ fs-extra-p "^4.5.0"
hosted-git-info "^2.5.0"
- is-ci "^1.0.10"
+ is-ci "^1.1.0"
isbinaryfile "^3.0.2"
js-yaml "^3.10.0"
- lazy-val "^1.0.2"
+ lazy-val "^1.0.3"
minimatch "^3.0.4"
normalize-package-data "^2.4.0"
plist "^2.1.0"
- read-config-file "1.2.0"
+ read-config-file "2.0.1"
sanitize-filename "^1.6.1"
semver "^5.4.1"
- temp-file "^2.0.3"
+ temp-file "^3.1.0"
+
+electron-builder@^19.33.0:
+ version "19.53.2"
+ resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-19.53.2.tgz#568a149950a77ae9eae832db2901eecd04deab4f"
+ dependencies:
+ bluebird-lst "^1.0.5"
+ builder-util "4.1.2"
+ builder-util-runtime "4.0.0"
+ chalk "^2.3.0"
+ electron-builder-lib "19.53.2"
+ electron-download-tf "4.3.4"
+ fs-extra-p "^4.5.0"
+ is-ci "^1.1.0"
+ lazy-val "^1.0.3"
+ read-config-file "2.0.1"
+ sanitize-filename "^1.6.1"
update-notifier "^2.3.0"
- yargs "^9.0.1"
+ yargs "^10.0.3"
electron-download-tf@4.3.4:
version "4.3.4"
@@ -537,8 +492,8 @@ electron-is-dev@^0.3.0:
resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-0.3.0.tgz#14e6fda5c68e9e4ecbeff9ccf037cbd7c05c5afe"
electron-log@^2.2.9:
- version "2.2.9"
- resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-2.2.9.tgz#e0484cb1a8a84593095e3b69f47361ae15d73bdf"
+ version "2.2.13"
+ resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-2.2.13.tgz#15571ca695484fec39ddb9b3a9ff6e83e2a0d980"
electron-osx-sign@0.4.7:
version "0.4.7"
@@ -551,32 +506,32 @@ electron-osx-sign@0.4.7:
minimist "^1.2.0"
plist "^2.1.0"
-electron-publish@19.37.0:
- version "19.37.0"
- resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-19.37.0.tgz#0ae15b4322e9d7fc39540bf7199b12e606be376d"
+electron-publish@19.52.0:
+ version "19.52.0"
+ resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-19.52.0.tgz#25dc36211fbeaa2dea01131e03b438486ee35ce6"
dependencies:
- bluebird-lst "^1.0.4"
- builder-util "^3.0.12"
- builder-util-runtime "^2.0.1"
- chalk "^2.1.0"
- fs-extra-p "^4.4.4"
- mime "^2.0.3"
+ bluebird-lst "^1.0.5"
+ builder-util "^4.1.0"
+ builder-util-runtime "^4.0.0"
+ chalk "^2.3.0"
+ fs-extra-p "^4.5.0"
+ mime "^2.1.0"
electron-updater@^2.8.9:
- version "2.14.0"
- resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-2.14.0.tgz#48001f85f8f3c5cd138c6df7d54677f5b7976054"
+ version "2.18.2"
+ resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-2.18.2.tgz#776b50389b849535425e9e2893d7943ee61e8e3f"
dependencies:
- bluebird-lst "^1.0.4"
- builder-util-runtime "~2.2.0"
+ bluebird-lst "^1.0.5"
+ builder-util-runtime "~4.0.0"
electron-is-dev "^0.3.0"
- fs-extra-p "^4.4.4"
+ fs-extra-p "^4.5.0"
js-yaml "^3.10.0"
- lazy-val "^1.0.2"
+ lazy-val "^1.0.3"
lodash.isequal "^4.5.0"
semver "^5.4.1"
source-map-support "^0.5.0"
-electron@^1.8.0:
+electron@^1.8.1:
version "1.8.1"
resolved "https://registry.yarnpkg.com/electron/-/electron-1.8.1.tgz#19b6f39f2013e204a91a60bc3086dc7a4a07ed88"
dependencies:
@@ -588,12 +543,6 @@ emojis-list@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
-end-of-stream@^1.0.0, end-of-stream@^1.1.0:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.0.tgz#7a90d833efda6cfa6eac0f4949dbb0fad3a63206"
- dependencies:
- once "^1.4.0"
-
env-paths@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-1.0.0.tgz#4168133b42bb05c38a35b1ae4397c8298ab369e0"
@@ -605,8 +554,8 @@ error-ex@^1.2.0:
is-arrayish "^0.2.1"
es6-promise@^4.0.5:
- version "4.1.1"
- resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.1.1.tgz#8811e90915d9a0dba36274f0b242dbda78f9c92a"
+ version "4.2.2"
+ resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.2.tgz#f722d7769af88bd33bc13ec6605e1f92966b82d9"
escape-string-regexp@^1.0.5:
version "1.0.5"
@@ -628,17 +577,13 @@ execa@^0.7.0:
signal-exit "^3.0.0"
strip-eof "^1.0.0"
-expand-template@^1.0.2:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-1.1.0.tgz#e09efba977bf98f9ee0ed25abd0c692e02aec3fc"
-
extend@~3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
extract-text-webpack-plugin@^3.0.0:
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.1.tgz#605a8893faca1dd49bb0d2ca87493f33fd43d102"
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.2.tgz#5f043eaa02f9750a9258b78c0a6e0dc1408fb2f7"
dependencies:
async "^2.4.1"
loader-utils "^1.1.0"
@@ -646,22 +591,30 @@ extract-text-webpack-plugin@^3.0.0:
webpack-sources "^1.0.1"
extract-zip@^1.0.3:
- version "1.6.5"
- resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.5.tgz#99a06735b6ea20ea9b705d779acffcc87cff0440"
+ version "1.6.6"
+ resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.6.tgz#1290ede8d20d0872b429fd3f351ca128ec5ef85c"
dependencies:
concat-stream "1.6.0"
- debug "2.2.0"
+ debug "2.6.9"
mkdirp "0.5.0"
yauzl "2.4.1"
-extsprintf@1.3.0, extsprintf@^1.2.0:
+extsprintf@1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+extsprintf@^1.2.0:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+
fast-deep-equal@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff"
+fast-json-stable-stringify@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
+
fd-slicer@~1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"
@@ -675,7 +628,7 @@ find-up@^1.0.0:
path-exists "^2.0.0"
pinkie-promise "^2.0.0"
-find-up@^2.0.0:
+find-up@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
dependencies:
@@ -693,12 +646,12 @@ form-data@~2.3.1:
combined-stream "^1.0.5"
mime-types "^2.1.12"
-fs-extra-p@^4.4.0, fs-extra-p@^4.4.3, fs-extra-p@^4.4.4:
- version "4.4.4"
- resolved "https://registry.yarnpkg.com/fs-extra-p/-/fs-extra-p-4.4.4.tgz#396ad6f914eb2954e1700fd0e18288301ed45f04"
+fs-extra-p@^4.5.0:
+ version "4.5.0"
+ resolved "https://registry.yarnpkg.com/fs-extra-p/-/fs-extra-p-4.5.0.tgz#b79f3f3fcc0b5e57b7e7caeb06159f958ef15fe8"
dependencies:
- bluebird-lst "^1.0.4"
- fs-extra "^4.0.2"
+ bluebird-lst "^1.0.5"
+ fs-extra "^5.0.0"
fs-extra@^0.30.0:
version "0.30.0"
@@ -710,9 +663,17 @@ fs-extra@^0.30.0:
path-is-absolute "^1.0.0"
rimraf "^2.2.8"
-fs-extra@^4.0.1, fs-extra@^4.0.2:
- version "4.0.2"
- resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.2.tgz#f91704c53d1b461f893452b0c307d9997647ab6b"
+fs-extra@^4.0.1:
+ version "4.0.3"
+ resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
+ dependencies:
+ graceful-fs "^4.1.2"
+ jsonfile "^4.0.0"
+ universalify "^0.1.0"
+
+fs-extra@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-5.0.0.tgz#414d0110cdd06705734d055652c5411260c31abd"
dependencies:
graceful-fs "^4.1.2"
jsonfile "^4.0.0"
@@ -722,19 +683,6 @@ fs.realpath@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-gauge@~2.7.3:
- version "2.7.4"
- resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
- dependencies:
- aproba "^1.0.3"
- console-control-strings "^1.0.0"
- has-unicode "^2.0.0"
- object-assign "^4.1.0"
- signal-exit "^3.0.0"
- string-width "^1.0.1"
- strip-ansi "^3.0.1"
- wide-align "^1.1.0"
-
get-caller-file@^1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
@@ -753,10 +701,6 @@ getpass@^0.1.1:
dependencies:
assert-plus "^1.0.0"
-github-from-package@0.0.0:
- version "0.0.0"
- resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce"
-
glob@^7.0.5:
version "7.1.2"
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
@@ -769,8 +713,8 @@ glob@^7.0.5:
path-is-absolute "^1.0.0"
global-dirs@^0.1.0:
- version "0.1.0"
- resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.0.tgz#10d34039e0df04272e262cf24224f7209434df4f"
+ version "0.1.1"
+ resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445"
dependencies:
ini "^1.3.4"
@@ -809,10 +753,6 @@ has-flag@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
-has-unicode@^2.0.0:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-
hawk@~6.0.2:
version "6.0.2"
resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038"
@@ -871,13 +811,9 @@ inherits@2, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
version "2.0.3"
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-ini@^1.3.4, ini@~1.3.0:
- version "1.3.4"
- resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
-
-int64-buffer@^0.1.9:
- version "0.1.9"
- resolved "https://registry.yarnpkg.com/int64-buffer/-/int64-buffer-0.1.9.tgz#9e039da043b24f78b196b283e04653ef5e990f61"
+ini@^1.3.4, ini@^1.3.5, ini@~1.3.0:
+ version "1.3.5"
+ resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
invert-kv@^1.0.0:
version "1.0.0"
@@ -893,9 +829,9 @@ is-builtin-module@^1.0.0:
dependencies:
builtin-modules "^1.0.0"
-is-ci@^1.0.10:
- version "1.0.10"
- resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.0.10.tgz#f739336b2632365061a9d48270cd56ae3369318e"
+is-ci@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.1.0.tgz#247e4162e7860cebbdaf30b774d6b0ac7dcfe7a5"
dependencies:
ci-info "^1.0.0"
@@ -931,8 +867,8 @@ is-obj@^1.0.0:
resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
is-path-inside@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.0.tgz#fc06e5a1683fbda13de667aff717bbc10a48f37f"
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
dependencies:
path-is-inside "^1.0.1"
@@ -995,12 +931,6 @@ json-schema@0.2.3:
version "0.2.3"
resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
-json-stable-stringify@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
- dependencies:
- jsonify "~0.0.0"
-
json-stringify-safe@~5.0.1:
version "5.0.1"
resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
@@ -1021,10 +951,6 @@ jsonfile@^4.0.0:
optionalDependencies:
graceful-fs "^4.1.6"
-jsonify@~0.0.0:
- version "0.0.0"
- resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
-
jsprim@^1.2.2:
version "1.4.1"
resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
@@ -1035,8 +961,8 @@ jsprim@^1.2.2:
verror "1.10.0"
keytar@^4.0.4:
- version "4.0.4"
- resolved "https://registry.yarnpkg.com/keytar/-/keytar-4.0.4.tgz#59a306f448a1c6a309cd68cb29129095a8c8b1db"
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/keytar/-/keytar-4.1.0.tgz#9e3933e489d656de1a868e1293709313044989d7"
dependencies:
nan "2.5.1"
@@ -1052,9 +978,9 @@ latest-version@^3.0.0:
dependencies:
package-json "^4.0.0"
-lazy-val@^1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.2.tgz#d9b07fb1fce54cbc99b3c611de431b83249369b6"
+lazy-val@^1.0.3:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.3.tgz#bb97b200ef00801d94c317e29dc6ed39e31c5edc"
lcid@^1.0.0:
version "1.0.0"
@@ -1072,15 +998,6 @@ load-json-file@^1.0.0:
pinkie-promise "^2.0.0"
strip-bom "^2.0.0"
-load-json-file@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
- dependencies:
- graceful-fs "^4.1.2"
- parse-json "^2.2.0"
- pify "^2.0.0"
- strip-bom "^3.0.0"
-
loader-utils@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
@@ -1100,10 +1017,6 @@ lodash.isequal@^4.5.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
-lodash.toarray@^4.4.0:
- version "4.4.0"
- resolved "https://registry.yarnpkg.com/lodash.toarray/-/lodash.toarray-4.4.0.tgz#24c4bfcd6b2fba38bfd0594db1179d8e9b656561"
-
lodash@^4.14.0:
version "4.17.4"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
@@ -1127,10 +1040,10 @@ lru-cache@^4.0.1:
yallist "^2.1.2"
make-dir@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.0.0.tgz#97a011751e91dd87cfadef58832ebb04936de978"
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.1.0.tgz#19b4369fe48c116f53c2af95ad102c0e39e85d51"
dependencies:
- pify "^2.3.0"
+ pify "^3.0.0"
map-obj@^1.0.0, map-obj@^1.0.1:
version "1.0.1"
@@ -1167,9 +1080,9 @@ mime-types@^2.1.12, mime-types@~2.1.17:
dependencies:
mime-db "~1.30.0"
-mime@^2.0.3:
- version "2.0.3"
- resolved "https://registry.yarnpkg.com/mime/-/mime-2.0.3.tgz#4353337854747c48ea498330dc034f9f4bbbcc0b"
+mime@^2.1.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/mime/-/mime-2.2.0.tgz#161e541965551d3b549fa1114391e3a3d55b923b"
mimic-fn@^1.0.0:
version "1.1.0"
@@ -1195,16 +1108,6 @@ mkdirp@0.5.0:
dependencies:
minimist "0.0.8"
-mkdirp@^0.5.1:
- version "0.5.1"
- resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
- dependencies:
- minimist "0.0.8"
-
-ms@0.7.1:
- version "0.7.1"
- resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
-
ms@2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -1213,23 +1116,9 @@ nan@2.5.1:
version "2.5.1"
resolved "https://registry.yarnpkg.com/nan/-/nan-2.5.1.tgz#d5b01691253326a97a2bbee9e61c55d8d60351e2"
-nan@^2.0.0, nan@^2.7.0:
- version "2.7.0"
- resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46"
-
-node-abi@^2.1.1:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.1.1.tgz#c9cda256ec8aa99bcab2f6446db38af143338b2a"
-
-node-emoji@^1.8.1:
- version "1.8.1"
- resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.8.1.tgz#6eec6bfb07421e2148c75c6bba72421f8530a826"
- dependencies:
- lodash.toarray "^4.4.0"
-
-noop-logger@^0.1.1:
- version "0.1.1"
- resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2"
+nan@^2.0.0:
+ version "2.8.0"
+ resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a"
normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.4.0:
version "2.4.0"
@@ -1246,15 +1135,6 @@ npm-run-path@^2.0.0:
dependencies:
path-key "^2.0.0"
-npmlog@^4.0.1:
- version "4.1.2"
- resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
- dependencies:
- are-we-there-yet "~1.1.2"
- console-control-strings "~1.1.0"
- gauge "~2.7.3"
- set-blocking "~2.0.0"
-
nugget@^2.0.0, nugget@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/nugget/-/nugget-2.0.1.tgz#201095a487e1ad36081b3432fa3cada4f8d071b0"
@@ -1275,7 +1155,7 @@ oauth-sign@~0.8.2:
version "0.8.2"
resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
-object-assign@^4.0.1, object-assign@^4.1.0:
+object-assign@^4.0.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
@@ -1283,16 +1163,12 @@ object-keys@~0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-0.4.0.tgz#28a6aae7428dd2c3a92f3d95f21335dd204e0336"
-once@^1.3.0, once@^1.3.1, once@^1.4.0:
+once@^1.3.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
dependencies:
wrappy "1"
-os-homedir@^1.0.1:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-
os-locale@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
@@ -1306,8 +1182,10 @@ p-finally@^1.0.0:
resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
p-limit@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc"
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.2.0.tgz#0e92b6bedcb59f022c13d0f1949dc82d15909f1c"
+ dependencies:
+ p-try "^1.0.0"
p-locate@^2.0.0:
version "2.0.0"
@@ -1315,6 +1193,10 @@ p-locate@^2.0.0:
dependencies:
p-limit "^1.1.0"
+p-try@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
+
package-json@^4.0.0:
version "4.0.1"
resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed"
@@ -1366,12 +1248,6 @@ path-type@^1.0.0:
pify "^2.0.0"
pinkie-promise "^2.0.0"
-path-type@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
- dependencies:
- pify "^2.0.0"
-
pend@~1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
@@ -1380,10 +1256,14 @@ performance-now@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-pify@^2.0.0, pify@^2.3.0:
+pify@^2.0.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+pify@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+
pinkie-promise@^2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
@@ -1402,25 +1282,6 @@ plist@^2.1.0:
xmlbuilder "8.2.2"
xmldom "0.1.x"
-prebuild-install@^2.3.0:
- version "2.3.0"
- resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-2.3.0.tgz#19481247df728b854ab57b187ce234211311b485"
- dependencies:
- expand-template "^1.0.2"
- github-from-package "0.0.0"
- minimist "^1.2.0"
- mkdirp "^0.5.1"
- node-abi "^2.1.1"
- noop-logger "^0.1.1"
- npmlog "^4.0.1"
- os-homedir "^1.0.1"
- pump "^1.0.1"
- rc "^1.1.6"
- simple-get "^1.4.2"
- tar-fs "^1.13.0"
- tunnel-agent "^0.6.0"
- xtend "4.0.1"
-
prepend-http@^1.0.1:
version "1.0.4"
resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
@@ -1447,13 +1308,6 @@ pseudomap@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
-pump@^1.0.0, pump@^1.0.1:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.2.tgz#3b3ee6512f94f0e575538c17995f9f16990a5d51"
- dependencies:
- end-of-stream "^1.1.0"
- once "^1.3.1"
-
punycode@^1.4.1:
version "1.4.1"
resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
@@ -1462,14 +1316,6 @@ qs@~6.5.1:
version "6.5.1"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
-rabin-bindings@~1.7.3:
- version "1.7.3"
- resolved "https://registry.yarnpkg.com/rabin-bindings/-/rabin-bindings-1.7.3.tgz#fb6ae9dbf897988bc2504ccf4832ee4f0546d32a"
- dependencies:
- bindings "^1.3.0"
- nan "^2.7.0"
- prebuild-install "^2.3.0"
-
rc@^1.0.1, rc@^1.1.2, rc@^1.1.6, rc@^1.2.1:
version "1.2.2"
resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.2.tgz#d8ce9cb57e8d64d9c7badd9876c7c34cbe3c7077"
@@ -1479,19 +1325,19 @@ rc@^1.0.1, rc@^1.1.2, rc@^1.1.6, rc@^1.2.1:
minimist "^1.2.0"
strip-json-comments "~2.0.1"
-read-config-file@1.2.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-1.2.0.tgz#1fd7dc8ccdad838cac9f686182625290fc94f456"
+read-config-file@2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-2.0.1.tgz#4f6f536508ed8863c50c3a2cfd1dbd82ba961b82"
dependencies:
- ajv "^5.2.3"
- ajv-keywords "^2.1.0"
- bluebird-lst "^1.0.4"
+ ajv "^5.5.2"
+ ajv-keywords "^2.1.1"
+ bluebird-lst "^1.0.5"
dotenv "^4.0.0"
dotenv-expand "^4.0.1"
- fs-extra-p "^4.4.4"
+ fs-extra-p "^4.5.0"
js-yaml "^3.10.0"
json5 "^0.5.1"
- lazy-val "^1.0.2"
+ lazy-val "^1.0.3"
read-pkg-up@^1.0.1:
version "1.0.1"
@@ -1500,13 +1346,6 @@ read-pkg-up@^1.0.1:
find-up "^1.0.0"
read-pkg "^1.0.0"
-read-pkg-up@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
- dependencies:
- find-up "^2.0.0"
- read-pkg "^2.0.0"
-
read-pkg@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
@@ -1515,15 +1354,7 @@ read-pkg@^1.0.0:
normalize-package-data "^2.3.2"
path-type "^1.0.0"
-read-pkg@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
- dependencies:
- load-json-file "^2.0.0"
- normalize-package-data "^2.3.2"
- path-type "^2.0.0"
-
-readable-stream@^2.0.0, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.2.2:
+readable-stream@^2.2.2:
version "2.3.3"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"
dependencies:
@@ -1641,7 +1472,7 @@ semver-diff@^2.0.0:
version "5.4.1"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
-set-blocking@^2.0.0, set-blocking@~2.0.0:
+set-blocking@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
@@ -1659,14 +1490,6 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
-simple-get@^1.4.2:
- version "1.4.3"
- resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-1.4.3.tgz#e9755eda407e96da40c5e5158c9ea37b33becbeb"
- dependencies:
- once "^1.3.1"
- unzip-response "^1.0.0"
- xtend "^4.0.0"
-
single-line-log@^1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/single-line-log/-/single-line-log-1.1.2.tgz#c2f83f273a3e1a16edb0995661da0ed5ef033364"
@@ -1674,8 +1497,8 @@ single-line-log@^1.1.2:
string-width "^1.0.1"
sntp@2.x.x:
- version "2.0.2"
- resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.0.2.tgz#5064110f0af85f7cfdb7d6b67a40028ce52b4b2b"
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8"
dependencies:
hoek "4.x.x"
@@ -1689,14 +1512,10 @@ source-map-support@^0.5.0:
dependencies:
source-map "^0.6.0"
-source-map@^0.6.0:
+source-map@^0.6.0, source-map@~0.6.1:
version "0.6.1"
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-source-map@~0.5.3:
- version "0.5.7"
- resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-
spdx-correct@~1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
@@ -1744,7 +1563,7 @@ stat-mode@^0.2.2:
version "0.2.2"
resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-0.2.2.tgz#e6c80b623123d7d80cf132ce538f346289072502"
-string-width@^1.0.1, string-width@^1.0.2:
+string-width@^1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
dependencies:
@@ -1752,7 +1571,7 @@ string-width@^1.0.1, string-width@^1.0.2:
is-fullwidth-code-point "^1.0.0"
strip-ansi "^3.0.0"
-string-width@^2.0.0:
+string-width@^2.0.0, string-width@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
dependencies:
@@ -1791,10 +1610,6 @@ strip-bom@^2.0.0:
dependencies:
is-utf8 "^0.2.0"
-strip-bom@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-
strip-eof@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
@@ -1823,37 +1638,19 @@ sumchecker@^2.0.2:
debug "^2.2.0"
supports-color@^4.0.0:
- version "4.4.0"
- resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.4.0.tgz#883f7ddabc165142b2a61427f3352ded195d1a3e"
+ version "4.5.0"
+ resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
dependencies:
has-flag "^2.0.0"
-tar-fs@^1.13.0:
- version "1.16.0"
- resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-1.16.0.tgz#e877a25acbcc51d8c790da1c57c9cf439817b896"
- dependencies:
- chownr "^1.0.1"
- mkdirp "^0.5.1"
- pump "^1.0.0"
- tar-stream "^1.1.2"
-
-tar-stream@^1.1.2:
- version "1.5.4"
- resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.5.4.tgz#36549cf04ed1aee9b2a30c0143252238daf94016"
- dependencies:
- bl "^1.0.0"
- end-of-stream "^1.0.0"
- readable-stream "^2.0.0"
- xtend "^4.0.0"
-
-temp-file@^2.0.3:
- version "2.0.3"
- resolved "https://registry.yarnpkg.com/temp-file/-/temp-file-2.0.3.tgz#0de2540629fc77a6406ca56f50214d1f224947ac"
+temp-file@^3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/temp-file/-/temp-file-3.1.0.tgz#d2b3ec52e1b7835248737f2b1815348e86cf8f8b"
dependencies:
async-exit-hook "^2.0.1"
- bluebird-lst "^1.0.3"
- fs-extra-p "^4.4.0"
- lazy-val "^1.0.2"
+ bluebird-lst "^1.0.5"
+ fs-extra-p "^4.5.0"
+ lazy-val "^1.0.3"
term-size@^1.2.0:
version "1.2.0"
@@ -1916,10 +1713,6 @@ universalify@^0.1.0:
version "0.1.1"
resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.1.tgz#fa71badd4437af4c148841e3b3b165f9e9e590b7"
-unzip-response@^1.0.0:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-1.0.2.tgz#b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe"
-
unzip-response@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
@@ -1972,11 +1765,11 @@ verror@1.10.0:
extsprintf "^1.2.0"
webpack-sources@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.0.1.tgz#c7356436a4d13123be2e2426a05d1dad9cbe65cf"
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.1.0.tgz#a101ebae59d6507354d71d8013950a3a8b7a5a54"
dependencies:
source-list-map "^2.0.0"
- source-map "~0.5.3"
+ source-map "~0.6.1"
which-module@^2.0.0:
version "2.0.0"
@@ -1988,17 +1781,11 @@ which@^1.2.9:
dependencies:
isexe "^2.0.0"
-wide-align@^1.1.0:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710"
+widest-line@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.0.tgz#0142a4e8a243f8882c0233aa0e0281aa76152273"
dependencies:
- string-width "^1.0.2"
-
-widest-line@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-1.0.0.tgz#0c09c85c2a94683d0d7eaf8ee097d564bf0e105c"
- dependencies:
- string-width "^1.0.1"
+ string-width "^2.1.1"
wrap-ansi@^2.0.0:
version "2.1.0"
@@ -2031,10 +1818,6 @@ xmldom@0.1.x:
version "0.1.27"
resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
-xtend@4.0.1, xtend@^4.0.0:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
-
xtend@~2.1.1:
version "2.1.2"
resolved "https://registry.yarnpkg.com/xtend/-/xtend-2.1.2.tgz#6efecc2a4dad8e6962c4901b337ce7ba87b5d28b"
@@ -2049,29 +1832,28 @@ yallist@^2.1.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
-yargs-parser@^7.0.0:
- version "7.0.0"
- resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
+yargs-parser@^8.1.0:
+ version "8.1.0"
+ resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-8.1.0.tgz#f1376a33b6629a5d063782944da732631e966950"
dependencies:
camelcase "^4.1.0"
-yargs@^9.0.1:
- version "9.0.1"
- resolved "https://registry.yarnpkg.com/yargs/-/yargs-9.0.1.tgz#52acc23feecac34042078ee78c0c007f5085db4c"
+yargs@^10.0.3:
+ version "10.1.0"
+ resolved "https://registry.yarnpkg.com/yargs/-/yargs-10.1.0.tgz#85d98f2264c7487f18c4607b79c7e4e3b160e69e"
dependencies:
- camelcase "^4.1.0"
- cliui "^3.2.0"
+ cliui "^4.0.0"
decamelize "^1.1.1"
+ find-up "^2.1.0"
get-caller-file "^1.0.1"
os-locale "^2.0.0"
- read-pkg-up "^2.0.0"
require-directory "^2.1.1"
require-main-filename "^1.0.1"
set-blocking "^2.0.0"
string-width "^2.0.0"
which-module "^2.0.0"
y18n "^3.2.1"
- yargs-parser "^7.0.0"
+ yargs-parser "^8.1.0"
yauzl@2.4.1:
version "2.4.1"
diff --git a/fchat/channels.ts b/fchat/channels.ts
index 64e2186..9626765 100644
--- a/fchat/channels.ts
+++ b/fchat/channels.ts
@@ -42,18 +42,18 @@ class Channel implements Interfaces.Channel {
constructor(readonly id: string, readonly name: string) {
}
- addMember(member: SortableMember): void {
+ async addMember(member: SortableMember): Promise<void> {
this.members[member.character.name] = member;
sortMember(this.sortedMembers, member);
- for(const handler of state.handlers) handler('join', this, member);
+ for(const handler of state.handlers) await handler('join', this, member);
}
- removeMember(name: string): void {
+ async removeMember(name: string): Promise<void> {
const member = this.members[name];
if(member !== undefined) {
delete this.members[name];
this.sortedMembers.splice(this.sortedMembers.indexOf(member), 1);
- for(const handler of state.handlers) handler('leave', this, member);
+ for(const handler of state.handlers) await handler('leave', this, member);
}
}
@@ -159,7 +159,7 @@ export default function(this: void, connection: Connection, characters: Characte
}
state.openRooms = channels;
});
- connection.onMessage('JCH', (data) => {
+ connection.onMessage('JCH', async(data) => {
const item = state.getChannelItem(data.channel);
if(data.character.identity === connection.character) {
const id = data.channel.toLowerCase();
@@ -170,11 +170,11 @@ export default function(this: void, connection: Connection, characters: Characte
const channel = state.getChannel(data.channel);
if(channel === undefined) return state.leave(data.channel);
const member = channel.createMember(characters.get(data.character.identity));
- channel.addMember(member);
+ await channel.addMember(member);
if(item !== undefined) item.memberCount++;
}
});
- connection.onMessage('ICH', (data) => {
+ connection.onMessage('ICH', async(data) => {
const channel = state.getChannel(data.channel);
if(channel === undefined) return state.leave(data.channel);
channel.mode = data.mode;
@@ -190,24 +190,24 @@ export default function(this: void, connection: Connection, characters: Characte
channel.sortedMembers = sorted;
const item = state.getChannelItem(data.channel);
if(item !== undefined) item.memberCount = data.users.length;
- for(const handler of state.handlers) handler('join', channel);
+ for(const handler of state.handlers) await handler('join', channel);
});
connection.onMessage('CDS', (data) => {
const channel = state.getChannel(data.channel);
if(channel === undefined) return state.leave(data.channel);
channel.description = decodeHTML(data.description);
});
- connection.onMessage('LCH', (data) => {
+ connection.onMessage('LCH', async(data) => {
const channel = state.getChannel(data.channel);
if(channel === undefined) return;
const item = state.getChannelItem(data.channel);
if(data.character === connection.character) {
state.joinedChannels.splice(state.joinedChannels.indexOf(channel), 1);
delete state.joinedMap[channel.id];
- for(const handler of state.handlers) handler('leave', channel);
+ for(const handler of state.handlers) await handler('leave', channel);
if(item !== undefined) item.isJoined = false;
} else {
- channel.removeMember(data.character);
+ await channel.removeMember(data.character);
if(item !== undefined) item.memberCount--;
}
});
@@ -255,12 +255,11 @@ export default function(this: void, connection: Connection, characters: Characte
if(channel === undefined) return state.leave(data.channel);
channel.mode = data.mode;
});
- connection.onMessage('FLN', (data) => {
+ connection.onMessage('FLN', async(data) => {
for(const key in state.joinedMap)
- state.joinedMap[key]!.removeMember(data.character);
+ await state.joinedMap[key]!.removeMember(data.character);
});
const globalHandler = (data: Connection.ServerCommands['AOP'] | Connection.ServerCommands['DOP']) => {
- //tslint:disable-next-line:forin
for(const key in state.joinedMap) {
const channel = state.joinedMap[key]!;
const member = channel.members[data.character];
diff --git a/fchat/characters.ts b/fchat/characters.ts
index 383f2f3..e7adcec 100644
--- a/fchat/characters.ts
+++ b/fchat/characters.ts
@@ -62,7 +62,6 @@ export default function(this: void, connection: Connection): Interfaces.State {
state.bookmarkList = (<{characters: string[]}>await connection.queryApi('bookmark-list.php')).characters;
state.friendList = ((<{friends: {source: string, dest: string, last_online: number}[]}>await connection.queryApi('friend-list.php'))
.friends).map((x) => x.dest);
- //tslint:disable-next-line:forin
for(const key in state.characters) {
const character = state.characters[key]!;
character.isFriend = state.friendList.indexOf(character.name) !== -1;
@@ -76,7 +75,6 @@ export default function(this: void, connection: Connection): Interfaces.State {
connection.onEvent('connected', async(isReconnect) => {
if(!isReconnect) return;
connection.send('STA', reconnectStatus);
- //tslint:disable-next-line:forin
for(const key in state.characters) {
const char = state.characters[key]!;
char.isIgnored = state.ignoreList.indexOf(key) !== -1;
@@ -97,7 +95,9 @@ export default function(this: void, connection: Connection): Interfaces.State {
state.get(data.character).isIgnored = false;
}
});
- connection.onMessage('ADL', (data) => state.opList = data.ops.slice());
+ connection.onMessage('ADL', (data) => {
+ state.opList = data.ops.slice();
+ });
connection.onMessage('LIS', (data) => {
for(const char of data.characters) {
const character = state.get(char[0]);
@@ -143,6 +143,7 @@ export default function(this: void, connection: Connection): Interfaces.State {
if(character.status !== 'offline') state.bookmarks.splice(state.bookmarks.indexOf(character), 1);
break;
case 'friendadd':
+ if(character.isFriend) return;
state.friendList.push(data.name);
character.isFriend = true;
if(character.status !== 'offline') state.friends.push(character);
diff --git a/fchat/connection.ts b/fchat/connection.ts
index 2623136..7307b59 100644
--- a/fchat/connection.ts
+++ b/fchat/connection.ts
@@ -21,44 +21,50 @@ export default class Connection implements Interfaces.Connection {
private reconnectTimer: NodeJS.Timer;
private ticketProvider: Interfaces.TicketProvider;
private reconnectDelay = 0;
+ private isReconnect = false;
- constructor(private readonly socketProvider: new() => WebSocketConnection, private readonly account: string,
+ constructor(private readonly clientName: string, private readonly version: string,
+ private readonly socketProvider: new() => WebSocketConnection, private readonly account: string,
ticketProvider: Interfaces.TicketProvider | string) {
this.ticketProvider = typeof ticketProvider === 'string' ? async() => this.getTicket(ticketProvider) : ticketProvider;
}
async connect(character: string): Promise<void> {
this.cleanClose = false;
- const isReconnect = this.character === character;
+ this.isReconnect = this.character === character;
this.character = character;
try {
this.ticket = await this.ticketProvider();
} catch(e) {
for(const handler of this.errorHandlers) handler(<Error>e);
+ await this.invokeHandlers('closed', true);
+ this.reconnect();
+ return;
+ }
+ await this.invokeHandlers('connecting', this.isReconnect);
+ if(this.cleanClose) {
+ this.cleanClose = false;
+ await this.invokeHandlers('closed', false);
return;
}
- await this.invokeHandlers('connecting', isReconnect);
const socket = this.socket = new this.socketProvider();
socket.onOpen(() => {
this.send('IDN', {
account: this.account,
character: this.character,
- cname: 'F-Chat',
- cversion: '3.0',
+ cname: this.clientName,
+ cversion: this.version,
method: 'ticket',
ticket: this.ticket
});
});
- socket.onMessage((msg: string) => {
+ socket.onMessage(async(msg: string) => {
const type = <keyof Interfaces.ServerCommands>msg.substr(0, 3);
const data = msg.length > 6 ? <object>JSON.parse(msg.substr(4)) : undefined;
- this.handleMessage(type, data);
+ return this.handleMessage(type, data);
});
socket.onClose(async() => {
- if(!this.cleanClose) {
- setTimeout(async() => this.connect(this.character), this.reconnectDelay);
- this.reconnectDelay = this.reconnectDelay >= 30000 ? 60000 : this.reconnectDelay >= 10000 ? 30000 : 10000;
- }
+ if(!this.cleanClose) this.reconnect();
this.socket = undefined;
await this.invokeHandlers('closed', !this.cleanClose);
});
@@ -74,6 +80,11 @@ export default class Connection implements Interfaces.Connection {
});
}
+ private reconnect(): void {
+ this.reconnectTimer = setTimeout(async() => this.connect(this.character), this.reconnectDelay);
+ this.reconnectDelay = this.reconnectDelay >= 30000 ? 60000 : this.reconnectDelay >= 10000 ? 30000 : 10000;
+ }
+
close(): void {
clearTimeout(this.reconnectTimer);
this.cleanClose = true;
@@ -131,7 +142,11 @@ export default class Connection implements Interfaces.Connection {
}
//tslint:disable:no-unsafe-any no-any
- protected handleMessage<T extends keyof Interfaces.ServerCommands>(type: T, data: any): void {
+ protected async handleMessage<T extends keyof Interfaces.ServerCommands>(type: T, data: any): Promise<void> {
+ const time = new Date();
+ const handlers = <Interfaces.CommandHandler<T>[] | undefined>this.messageHandlers[type];
+ if(handlers !== undefined)
+ for(const handler of handlers) await handler(data, time);
switch(type) {
case 'VAR':
this.vars[data.variable] = data.value;
@@ -149,14 +164,10 @@ export default class Connection implements Interfaces.Connection {
break;
case 'NLN':
if(data.identity === this.character) {
- this.invokeHandlers('connected', this.reconnectDelay !== 0); //tslint:disable-line:no-floating-promises
+ await this.invokeHandlers('connected', this.isReconnect);
this.reconnectDelay = 0;
}
}
- const time = new Date();
- const handlers = <Interfaces.CommandHandler<T>[] | undefined>this.messageHandlers[type];
- if(handlers !== undefined)
- for(const handler of handlers) handler(data, time);
}
//tslint:enable
diff --git a/fchat/interfaces.ts b/fchat/interfaces.ts
index 3da3e42..901eec8 100644
--- a/fchat/interfaces.ts
+++ b/fchat/interfaces.ts
@@ -114,7 +114,7 @@ export namespace Connection {
ZZZ: {message: string}
};
- export type CommandHandler<T extends keyof ServerCommands> = (data: ServerCommands[T], date: Date) => void;
+ export type CommandHandler<T extends keyof ServerCommands> = (data: ServerCommands[T], date: Date) => Promise<void> | void;
export type TicketProvider = () => Promise<string>;
export type EventType = 'connecting' | 'connected' | 'closed';
export type EventHandler = (isReconnect: boolean) => Promise<void> | void;
@@ -180,7 +180,7 @@ export namespace Character {
export type Character = Character.Character;
export namespace Channel {
- export type EventHandler = (type: 'join' | 'leave', channel: Channel, member?: Member) => void;
+ export type EventHandler = (type: 'join' | 'leave', channel: Channel, member?: Member) => Promise<void> | void;
export interface State {
readonly officialChannels: {readonly [key: string]: (ListItem | undefined)};
@@ -230,7 +230,7 @@ export type Channel = Channel.Channel;
export interface WebSocketConnection {
close(): void
- onMessage(handler: (message: string) => void): void
+ onMessage(handler: (message: string) => Promise<void>): void
onOpen(handler: () => void): void
onClose(handler: () => void): void
onError(handler: (error: Error) => void): void
diff --git a/less/bbcode_editor.less b/less/bbcode_editor.less
index 617a17c..422b575 100644
--- a/less/bbcode_editor.less
+++ b/less/bbcode_editor.less
@@ -13,3 +13,30 @@
.alert();
.alert-danger();
}
+
+.bbcode-toolbar {
+ @media (max-width: @screen-xs-max) {
+ background: @text-background-color;
+ padding: 10px;
+ position: absolute;
+ top: 0;
+ border-radius: 3px;
+ z-index: 20;
+ display: none;
+ .btn {
+ margin: 3px;
+ }
+ }
+ @media (min-width: @screen-sm-min) {
+ .btn-group();
+ .close {
+ display:none;
+ }
+ }
+}
+
+.bbcode-btn {
+ @media (min-width: @screen-sm-min) {
+ display: none;
+ }
+}
\ No newline at end of file
diff --git a/less/character_page.less b/less/character_page.less
index 9472ae3..298b245 100644
--- a/less/character_page.less
+++ b/less/character_page.less
@@ -24,6 +24,7 @@
}
.character-links-block {
a {
+ padding: 0 4px;
cursor: pointer;
}
}
@@ -78,10 +79,12 @@
}
.character-kinks {
+ display: flex;
+ flex-wrap: wrap;
margin-top: 15px;
- > .col-xs-3 {
+ > div {
// Fix up padding on columns so they look distinct without being miles apart.
- padding: 0 5px 0 0;
+ padding: 0 5px 5px 0;
}
.kinks-column {
padding: 15px;
@@ -95,6 +98,7 @@
}
.character-kink {
+ position: relative;
.subkink-list {
.well();
margin-bottom: 0;
@@ -143,6 +147,19 @@
background-color: @well-bg;
height: 100%;
margin-top: -20px;
+ .character-image-container {
+ @media (max-width: @screen-xs-max) {
+ display: flex;
+ flex-direction: row-reverse;
+ justify-content: flex-end;
+ }
+ }
+}
+
+@media (min-width: @screen-sm-min) {
+ .profile-body {
+ padding-left: 0;
+ }
}
// Character Images
@@ -150,6 +167,7 @@
.character-image {
.col-xs-2();
.img-thumbnail();
+ max-width: 100%;
vertical-align: middle;
border: none;
display: inline-block;
@@ -213,4 +231,13 @@
max-height: 100%;
max-width: 100%;
}
+}
+
+.friend-item {
+ display: flex;
+ align-items: center;
+ .date {
+ margin-left: 10px;
+ flex:1;
+ }
}
\ No newline at end of file
diff --git a/less/chat.less b/less/chat.less
index dfd1133..6733866 100644
--- a/less/chat.less
+++ b/less/chat.less
@@ -1,5 +1,3 @@
-@import "~bootstrap/less/variables.less";
-
.bg-solid-text {
background: @text-background-color
}
@@ -43,15 +41,38 @@
color: #000;
}
+.sidebar-wrapper {
+ .modal-backdrop {
+ display: none;
+ z-index: 9;
+ }
+
+ &.open {
+ .modal-backdrop {
+ display: block;
+ }
+ .body {
+ display: block;
+ }
+ }
+}
+
.sidebar {
position: absolute;
top: 0;
bottom: 0;
background: @body-bg;
z-index: 10;
+ flex-shrink: 0;
+ margin: -10px;
+ padding: 10px;
.body {
display: none;
+ width: 200px;
+ flex-direction: column;
+ max-height: 100%;
+ overflow: auto;
}
.expander {
@@ -61,7 +82,7 @@
border-color: @btn-default-border;
border-top-right-radius: 0;
border-top-left-radius: 0;
- @media(min-width: @screen-sm-min) {
+ @media (min-width: @screen-sm-min) {
.name {
display: none;
}
@@ -75,10 +96,14 @@
&.sidebar-left {
border-right: solid 1px @panel-default-border;
left: 0;
+ margin-right: 0;
+ padding-right: 0;
.expander {
transform: rotate(270deg) translate3d(0, 0, 0);
transform-origin: 100% 0;
+ -webkit-transform: rotate(270deg) translate3d(0, 0, 0);
+ -webkit-transform-origin: 100% 0;
right: 0;
}
}
@@ -86,16 +111,23 @@
&.sidebar-right {
border-left: solid 1px @panel-default-border;
right: 0;
+ margin-left: 0;
+ padding-left: 0;
.expander {
transform: rotate(90deg) translate3d(0, 0, 0);
transform-origin: 0 0;
+ -webkit-transform: rotate(90deg) translate3d(0, 0, 0);
+ -webkit-transform-origin: 0 0;
}
}
}
.sidebar-fixed() {
position: static;
+ margin: 0;
+ padding: 0;
+ height: 100%;
.body {
display: block;
}
@@ -110,13 +142,22 @@
resize: none;
}
+.ads-text-box {
+ background-color: @state-info-bg;
+}
+
.border-top {
border-top: solid 1px @panel-default-border;
}
+.border-bottom {
+ border-bottom: solid 1px @panel-default-border;
+}
+
.message {
word-wrap: break-word;
word-break: break-word;
+ padding-bottom: 1px;
}
.message-block {
@@ -133,12 +174,14 @@
.messages-both {
.message-ad {
- background-color: @state-info-bg;
+ background-color: @brand-info;
+ padding: 0 2px 2px 2px;
+ box-shadow: @gray -2px -2px 2px inset;
}
}
.message-event {
- color: @gray-light;
+ color: @gray;
}
.message-highlight {
@@ -198,4 +241,21 @@
.profile-viewer {
width: 98%;
+ height: 100%;
+}
+
+#window-tabs .hasNew > a {
+ background-color: @state-warning-bg;
+ border-color: @state-warning-border;
+ color: @state-warning-text;
+ &:hover {
+ background-color: @state-warning-border;
+ }
+}
+
+.btn-text {
+ margin-left: 3px;
+ @media (max-width: @screen-xs-max) {
+ display: none;
+ }
}
\ No newline at end of file
diff --git a/less/flist_overrides.less b/less/flist_overrides.less
index 8d044c0..03cdac8 100644
--- a/less/flist_overrides.less
+++ b/less/flist_overrides.less
@@ -17,9 +17,19 @@ hr {
padding: 15px;
blockquote {
border-color: @blockquote-border-color;
+ font-size: inherit;
}
}
.well-lg {
padding: 20px;
+}
+
+@select-indicator: replace("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 2'%3E%3Cpath fill='@{input-color}' d='M2 2L0 0h4z'/%3E%3C/svg%3E", "#", "%23");
+
+select.form-control {
+ -webkit-appearance: none;
+ background: @input-bg url(@select-indicator) no-repeat right 1rem center;
+ background-size: 8px 10px;
+ padding-right: 25px;
}
\ No newline at end of file
diff --git a/less/flist_variables.less b/less/flist_variables.less
index bd95bbf..5430fa2 100644
--- a/less/flist_variables.less
+++ b/less/flist_variables.less
@@ -1,15 +1,16 @@
+@import "~bootstrap/less/variables.less";
// BBcode colors
@red-color: #f00;
@green-color: #0f0;
@blue-color: #00f;
@yellow-color: #ff0;
@cyan-color: #0ff;
-@purple-color: #f0f;
+@purple-color: #c0f;
@white-color: #fff;
@black-color: #000;
@brown-color: #8a6d3b;
@pink-color: #faa;
-@gray-color: #cccc;
+@gray-color: #ccc;
@orange-color: #f60;
@collapse-header-bg: @well-bg;
@collapse-border: darken(@well-border, 25%);
@@ -17,10 +18,10 @@
// Character page quick kink comparison
@quick-compare-active-border: @black-color;
-@quick-compare-favorite-bg: @brand-success;
-@quick-compare-yes-bg: @brand-info;
-@quick-compare-maybe-bg: @brand-warning;
-@quick-compare-no-bg: @brand-danger;
+@quick-compare-favorite-bg: @state-info-bg;
+@quick-compare-yes-bg: @state-success-bg;
+@quick-compare-maybe-bg: @state-warning-bg;
+@quick-compare-no-bg: @state-danger-bg;
// character page badges
@character-badge-bg: darken(@well-bg, 10%);
@@ -44,4 +45,9 @@
// General color extensions missing from bootstrap
@text-background-color: @body-bg;
-@text-background-color-disabled: @gray-lighter;
\ No newline at end of file
+@text-background-color-disabled: @gray-lighter;
+
+@screen-sm-min: 700px;
+@screen-md-min: 900px;
+@container-sm: 680px;
+@container-md: 880px;
\ No newline at end of file
diff --git a/less/themes/chat/light.less b/less/themes/chat/light.less
index 02d8eab..b24e3f6 100644
--- a/less/themes/chat/light.less
+++ b/less/themes/chat/light.less
@@ -4,10 +4,6 @@
background-color: @gray-lighter;
}
-.whiteText {
- text-shadow: 1px 1px @gray;
-}
-
// Apply variables to theme.
@import "../theme_base_chat.less";
diff --git a/less/themes/theme_base.less b/less/themes/theme_base.less
index 1efd7d7..8151dbd 100644
--- a/less/themes/theme_base.less
+++ b/less/themes/theme_base.less
@@ -43,7 +43,7 @@
// Components w/ JavaScript
@import "~bootstrap/less/modals.less";
//@import "tooltip.less";
-//@import "popovers.less";
+@import "~bootstrap/less/popovers.less";
//@import "carousel.less";
// Utility classes
@import "~bootstrap/less/utilities.less";
diff --git a/less/themes/theme_base_chat.less b/less/themes/theme_base_chat.less
index 8073602..209fe38 100644
--- a/less/themes/theme_base_chat.less
+++ b/less/themes/theme_base_chat.less
@@ -24,7 +24,7 @@
@import "~bootstrap/less/button-groups.less";
//@import "input-groups.less";
@import "~bootstrap/less/navs.less";
-@import "~bootstrap/less/navbar.less";
+//@import "~bootstrap/less/navbar.less";
//@import "breadcrumbs.less";
//@import "~bootstrap/less/pagination.less";
//@import "~bootstrap/less/pager.less";
@@ -36,14 +36,14 @@
@import "~bootstrap/less/progress-bars.less";
//@import "media.less";
@import "~bootstrap/less/list-group.less";
-@import "~bootstrap/less/panels.less";
+//@import "~bootstrap/less/panels.less";
//@import "responsive-embed.less";
@import "~bootstrap/less/wells.less";
@import "~bootstrap/less/close.less";
// Components w/ JavaScript
@import "~bootstrap/less/modals.less";
//@import "tooltip.less";
-//@import "popovers.less";
+@import "~bootstrap/less/popovers.less";
//@import "carousel.less";
// Utility classes
@import "~bootstrap/less/utilities.less";
@@ -55,3 +55,7 @@
@import "../bbcode.less";
@import "../flist_overrides.less";
@import "../chat.less";
+
+html {
+ padding: env(safe-area-inset-top) env(safe-area-inset-right) env(safe-area-inset-bottom) env(safe-area-inset-left);
+}
diff --git a/less/themes/variables/dark.less b/less/themes/variables/dark.less
index 3da3865..d7cde07 100644
--- a/less/themes/variables/dark.less
+++ b/less/themes/variables/dark.less
@@ -1,13 +1,12 @@
//Import variable defaults first.
-@import "~bootstrap/less/variables.less";
@import "../../flist_variables.less";
@gray-base: #000000;
-@gray-darker: lighten(@gray-base, 4%);
-@gray-dark: lighten(@gray-base, 20%);
-@gray: lighten(@gray-base, 55%);
-@gray-light: lighten(@gray-base, 80%);
-@gray-lighter: lighten(@gray-base, 95%);
+@gray-darker: lighten(@gray-base, 5%);
+@gray-dark: lighten(@gray-base, 25%);
+@gray: lighten(@gray-base, 50%);
+@gray-light: lighten(@gray-base, 65%);
+@gray-lighter: lighten(@gray-base, 85%);
@body-bg: @gray-darker;
@text-color: @gray-lighter;
@@ -17,7 +16,7 @@
@brand-warning: #a50;
@brand-danger: #800;
@brand-success: #080;
-@brand-info: #13b;
+@brand-info: #228;
@brand-primary: @brand-info;
@blue-color: #36f;
@@ -45,7 +44,7 @@
@panel-default-heading-bg: @gray;
@panel-default-border: @border-color;
-@input-color: @gray-light;
+@input-color: @gray-lighter;
@input-bg: @text-background-color;
@input-bg-disabled: @text-background-color-disabled;
@input-border: @border-color;
@@ -62,8 +61,8 @@
@navbar-default-link-color: @link-color;
@navbar-default-link-hover-color: @link-hover-color;
-@nav-link-hover-bg: @gray-light;
-@nav-link-hover-color: @gray-dark;
+@nav-link-hover-bg: @gray-dark;
+@nav-link-hover-color: @gray-darker;
@nav-tabs-border-color: @border-color;
@nav-tabs-link-hover-border-color: @border-color;
@@ -97,6 +96,10 @@
@modal-footer-border-color: lighten(spin(@modal-content-bg, -10), 15%);
@modal-header-border-color: @modal-footer-border-color;
+@popover-bg: @body-bg;
+@popover-border-color: @border-color;
+@popover-title-bg: @text-background-color;
+
@badge-color: @gray-darker;
@close-color: saturate(@text-color, 10%);
@@ -111,4 +114,7 @@
@collapse-header-bg: desaturate(@well-bg, 20%);
@white-color: @text-color;
-@purple-color: @gray-light;
\ No newline at end of file
+
+.blackText {
+ text-shadow: @gray-lighter 1px 1px 1px;
+}
\ No newline at end of file
diff --git a/less/themes/variables/default.less b/less/themes/variables/default.less
index 989a5d2..91c910f 100644
--- a/less/themes/variables/default.less
+++ b/less/themes/variables/default.less
@@ -1,12 +1,11 @@
//Import variable defaults first.
-@import "~bootstrap/less/variables.less";
@import "../../flist_variables.less";
@gray-base: #080810;
@gray-darker: lighten(@gray-base, 15%);
@gray-dark: lighten(@gray-base, 25%);
-@gray: lighten(@gray-base, 55%);
-@gray-light: lighten(@gray-base, 73%);
+@gray: lighten(@gray-base, 60%);
+@gray-light: lighten(@gray-base, 75%);
@gray-lighter: lighten(@gray-base, 95%);
// @body-bg: #262626;
@@ -46,7 +45,7 @@
@panel-default-heading-bg: @gray;
@panel-default-border: @border-color;
-@input-color: @gray-light;
+@input-color: @gray-lighter;
@input-bg: @text-background-color;
@input-bg-disabled: @text-background-color-disabled;
@input-border: @border-color;
@@ -63,8 +62,8 @@
@navbar-default-link-color: @link-color;
@navbar-default-link-hover-color: @link-hover-color;
-@nav-link-hover-bg: @gray-light;
-@nav-link-hover-color: @gray-dark;
+@nav-link-hover-bg: @gray-dark;
+@nav-link-hover-color: @gray-darker;
@nav-tabs-border-color: @border-color;
@nav-tabs-link-hover-border-color: @border-color;
@@ -98,6 +97,10 @@
@modal-footer-border-color: lighten(spin(@modal-content-bg, -10), 15%);
@modal-header-border-color: @modal-footer-border-color;
+@popover-bg: @body-bg;
+@popover-border-color: @border-color;
+@popover-title-bg: @text-background-color;
+
@badge-color: @gray-darker;
@close-color: saturate(@text-color, 10%);
@@ -112,4 +115,7 @@
@collapse-header-bg: desaturate(@well-bg, 20%);
@white-color: @text-color;
-@purple-color: @gray-light;
\ No newline at end of file
+
+.blackText {
+ text-shadow: @gray-lighter 1px 1px 1px;
+}
\ No newline at end of file
diff --git a/less/themes/variables/light.less b/less/themes/variables/light.less
index 19fc580..7720237 100644
--- a/less/themes/variables/light.less
+++ b/less/themes/variables/light.less
@@ -1,8 +1,12 @@
//Import variable defaults first.
-@import "~bootstrap/less/variables.less";
@import "../../flist_variables.less";
// Update variables here.
// @body-bg: #00ff00;
@hr-border: @text-color;
-@body-bg: #fafafa;
\ No newline at end of file
+@body-bg: #fafafa;
+@brand-warning: #e09d3e;
+
+.whiteText {
+ text-shadow: @gray-darker 1px 1px 1px;
+}
\ No newline at end of file
diff --git a/less/yarn.lock b/less/yarn.lock
index 5b21453..372a1a5 100644
--- a/less/yarn.lock
+++ b/less/yarn.lock
@@ -2,13 +2,11 @@
# yarn lockfile v1
-ajv@^5.1.0:
- version "5.2.3"
- resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.2.3.tgz#c06f598778c44c6b161abafe3466b81ad1814ed2"
+ajv@^4.9.1:
+ version "4.11.8"
+ resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
dependencies:
co "^4.6.0"
- fast-deep-equal "^1.0.0"
- json-schema-traverse "^0.3.0"
json-stable-stringify "^1.0.1"
asap@~2.0.3:
@@ -23,15 +21,19 @@ assert-plus@1.0.0, assert-plus@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+assert-plus@^0.2.0:
+ version "0.2.0"
+ resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
+
asynckit@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-aws-sign2@~0.7.0:
- version "0.7.0"
- resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+aws-sign2@~0.6.0:
+ version "0.6.0"
+ resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
-aws4@^1.6.0:
+aws4@^1.2.1:
version "1.6.0"
resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
@@ -41,17 +43,11 @@ bcrypt-pbkdf@^1.0.0:
dependencies:
tweetnacl "^0.14.3"
-boom@4.x.x:
- version "4.3.1"
- resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31"
+boom@2.x.x:
+ version "2.10.1"
+ resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
dependencies:
- hoek "4.x.x"
-
-boom@5.x.x:
- version "5.2.0"
- resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02"
- dependencies:
- hoek "4.x.x"
+ hoek "2.x.x"
bootstrap@^3.3.7:
version "3.3.7"
@@ -75,11 +71,11 @@ core-util-is@1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-cryptiles@3.x.x:
- version "3.1.2"
- resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"
+cryptiles@2.x.x:
+ version "2.0.5"
+ resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
dependencies:
- boom "5.x.x"
+ boom "2.x.x"
dashdash@^1.12.0:
version "1.14.1"
@@ -98,22 +94,22 @@ ecc-jsbn@~0.1.1:
jsbn "~0.1.0"
errno@^0.1.1:
- version "0.1.4"
- resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.4.tgz#b896e23a9e5e8ba33871fc996abd3635fc9a1c7d"
+ version "0.1.6"
+ resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.6.tgz#c386ce8a6283f14fc09563b71560908c9bf53026"
dependencies:
- prr "~0.0.0"
+ prr "~1.0.1"
-extend@~3.0.1:
+extend@~3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
-extsprintf@1.3.0, extsprintf@^1.2.0:
+extsprintf@1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-fast-deep-equal@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff"
+extsprintf@^1.2.0:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
font-awesome@^4.7.0:
version "4.7.0"
@@ -123,9 +119,9 @@ forever-agent@~0.6.1:
version "0.6.1"
resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-form-data@~2.3.1:
- version "2.3.1"
- resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.1.tgz#6fb94fbd71885306d73d15cc497fe4cc4ecd44bf"
+form-data@~2.1.1:
+ version "2.1.4"
+ resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1"
dependencies:
asynckit "^0.4.0"
combined-stream "^1.0.5"
@@ -141,35 +137,35 @@ graceful-fs@^4.1.2:
version "4.1.11"
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
-har-schema@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+har-schema@^1.0.5:
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
-har-validator@~5.0.3:
- version "5.0.3"
- resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
+har-validator@~4.2.1:
+ version "4.2.1"
+ resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
dependencies:
- ajv "^5.1.0"
- har-schema "^2.0.0"
+ ajv "^4.9.1"
+ har-schema "^1.0.5"
-hawk@~6.0.2:
- version "6.0.2"
- resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038"
+hawk@~3.1.3:
+ version "3.1.3"
+ resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
dependencies:
- boom "4.x.x"
- cryptiles "3.x.x"
- hoek "4.x.x"
- sntp "2.x.x"
+ boom "2.x.x"
+ cryptiles "2.x.x"
+ hoek "2.x.x"
+ sntp "1.x.x"
-hoek@4.x.x:
- version "4.2.0"
- resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d"
+hoek@2.x.x:
+ version "2.16.3"
+ resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
-http-signature@~1.2.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+http-signature@~1.1.0:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
dependencies:
- assert-plus "^1.0.0"
+ assert-plus "^0.2.0"
jsprim "^1.2.2"
sshpk "^1.7.0"
@@ -189,10 +185,6 @@ jsbn@~0.1.0:
version "0.1.1"
resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-json-schema-traverse@^0.3.0:
- version "0.3.1"
- resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
-
json-schema@0.2.3:
version "0.2.3"
resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
@@ -228,8 +220,8 @@ less-plugin-npm-import@^2.1.0:
resolve "~1.1.6"
less@^2.7.2:
- version "2.7.2"
- resolved "https://registry.yarnpkg.com/less/-/less-2.7.2.tgz#368d6cc73e1fb03981183280918743c5dcf9b3df"
+ version "2.7.3"
+ resolved "https://registry.yarnpkg.com/less/-/less-2.7.3.tgz#cc1260f51c900a9ec0d91fb6998139e02507b63b"
optionalDependencies:
errno "^0.1.1"
graceful-fs "^4.1.2"
@@ -237,22 +229,22 @@ less@^2.7.2:
mime "^1.2.11"
mkdirp "^0.5.0"
promise "^7.1.1"
- request "^2.72.0"
+ request "2.81.0"
source-map "^0.5.3"
mime-db@~1.30.0:
version "1.30.0"
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
-mime-types@^2.1.12, mime-types@~2.1.17:
+mime-types@^2.1.12, mime-types@~2.1.7:
version "2.1.17"
resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
dependencies:
mime-db "~1.30.0"
mime@^1.2.11:
- version "1.4.1"
- resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
+ version "1.6.0"
+ resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
minimist@0.0.8:
version "0.0.8"
@@ -264,13 +256,13 @@ mkdirp@^0.5.0:
dependencies:
minimist "0.0.8"
-oauth-sign@~0.8.2:
+oauth-sign@~0.8.1:
version "0.8.2"
resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
-performance-now@^2.1.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+performance-now@^0.2.0:
+ version "0.2.0"
+ resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
promise@^7.1.1:
version "7.3.1"
@@ -284,58 +276,58 @@ promise@~7.0.1:
dependencies:
asap "~2.0.3"
-prr@~0.0.0:
- version "0.0.0"
- resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a"
+prr@~1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
punycode@^1.4.1:
version "1.4.1"
resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-qs@~6.5.1:
- version "6.5.1"
- resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
+qs@~6.4.0:
+ version "6.4.0"
+ resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
-request@^2.72.0:
- version "2.83.0"
- resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
+request@2.81.0:
+ version "2.81.0"
+ resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
dependencies:
- aws-sign2 "~0.7.0"
- aws4 "^1.6.0"
+ aws-sign2 "~0.6.0"
+ aws4 "^1.2.1"
caseless "~0.12.0"
combined-stream "~1.0.5"
- extend "~3.0.1"
+ extend "~3.0.0"
forever-agent "~0.6.1"
- form-data "~2.3.1"
- har-validator "~5.0.3"
- hawk "~6.0.2"
- http-signature "~1.2.0"
+ form-data "~2.1.1"
+ har-validator "~4.2.1"
+ hawk "~3.1.3"
+ http-signature "~1.1.0"
is-typedarray "~1.0.0"
isstream "~0.1.2"
json-stringify-safe "~5.0.1"
- mime-types "~2.1.17"
- oauth-sign "~0.8.2"
- performance-now "^2.1.0"
- qs "~6.5.1"
- safe-buffer "^5.1.1"
- stringstream "~0.0.5"
- tough-cookie "~2.3.3"
+ mime-types "~2.1.7"
+ oauth-sign "~0.8.1"
+ performance-now "^0.2.0"
+ qs "~6.4.0"
+ safe-buffer "^5.0.1"
+ stringstream "~0.0.4"
+ tough-cookie "~2.3.0"
tunnel-agent "^0.6.0"
- uuid "^3.1.0"
+ uuid "^3.0.0"
resolve@~1.1.6:
version "1.1.7"
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
-safe-buffer@^5.0.1, safe-buffer@^5.1.1:
+safe-buffer@^5.0.1:
version "5.1.1"
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
-sntp@2.x.x:
- version "2.0.2"
- resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.0.2.tgz#5064110f0af85f7cfdb7d6b67a40028ce52b4b2b"
+sntp@1.x.x:
+ version "1.0.9"
+ resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
dependencies:
- hoek "4.x.x"
+ hoek "2.x.x"
source-map@^0.5.3:
version "0.5.7"
@@ -355,11 +347,11 @@ sshpk@^1.7.0:
jsbn "~0.1.0"
tweetnacl "~0.14.0"
-stringstream@~0.0.5:
+stringstream@~0.0.4:
version "0.0.5"
resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
-tough-cookie@~2.3.3:
+tough-cookie@~2.3.0:
version "2.3.3"
resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561"
dependencies:
@@ -375,7 +367,7 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
version "0.14.5"
resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-uuid@^3.1.0:
+uuid@^3.0.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
diff --git a/cordova/Index.vue b/mobile/Index.vue
similarity index 80%
rename from cordova/Index.vue
rename to mobile/Index.vue
index f54359c..cafaf66 100644
--- a/cordova/Index.vue
+++ b/mobile/Index.vue
@@ -33,7 +33,7 @@
<div class="form-group">
<label for="save"><input type="checkbox" id="save" v-model="saveLogin"/> {{l('login.save')}}</label>
</div>
- <div class="form-group">
+ <div class="form-group text-right">
<button class="btn btn-primary" @click="login" :disabled="loggingIn">
{{l(loggingIn ? 'login.working' : 'login.submit')}}
</button>
@@ -42,7 +42,7 @@
</div>
<chat v-else :ownCharacters="characters" :defaultCharacter="defaultCharacter" ref="chat"></chat>
<modal action="Profile" :buttons="false" ref="profileViewer" dialogClass="profile-viewer">
- <character-page :authenticated="false" :hideGroups="true" :name="profileName"></character-page>
+ <character-page :authenticated="false" :oldApi="true" :name="profileName"></character-page>
</modal>
</div>
</template>
@@ -64,12 +64,18 @@
import {GeneralSettings, getGeneralSettings, Logs, setGeneralSettings, SettingsStore} from './filesystem';
import Notifications from './notifications';
+ declare global {
+ interface Window {
+ NativeView: {
+ setTheme(theme: string): void
+ } | undefined;
+ }
+ }
+
function confirmBack(): void {
if(confirm(l('chat.confirmLeave'))) (<Navigator & {app: {exitApp(): void}}>navigator).app.exitApp();
}
- profileApiInit();
-
@Component({
components: {chat: Chat, modal: Modal, characterPage: CharacterPage}
})
@@ -105,7 +111,7 @@
}
get styling(): string {
- //tslint:disable-next-line:no-require-imports
+ if(window.NativeView !== undefined) window.NativeView.setTheme(this.settings!.theme);
return `<style>${require(`../less/themes/chat/${this.settings!.theme}.less`)}</style>`;
}
@@ -113,18 +119,20 @@
if(this.loggingIn) return;
this.loggingIn = true;
try {
- const data = <{ticket?: string, error: string, characters: string[], default_character: string}>
- (await Axios.post('https://www.f-list.net/json/getApiTicket.php', qs.stringify(
- {account: this.settings!.account, password: this.settings!.password, no_friends: true, no_bookmarks: true})
- )).data;
+ const data = <{ticket?: string, error: string, characters: {[key: string]: number}, default_character: number}>
+ (await Axios.post('https://www.f-list.net/json/getApiTicket.php', qs.stringify({
+ account: this.settings!.account, password: this.settings!.password, no_friends: true, no_bookmarks: true,
+ new_character_list: true
+ }))).data;
if(data.error !== '') {
this.error = data.error;
return;
}
- if(this.saveLogin)
- await setGeneralSettings(this.settings!);
+ if(this.saveLogin) await setGeneralSettings(this.settings!);
Socket.host = this.settings!.host;
- const connection = new Connection(Socket, this.settings!.account, this.settings!.password);
+ const version = (<{version: string}>require('./package.json')).version; //tslint:disable-line:no-require-imports
+ const connection = new Connection(`F-Chat 3.0 (Mobile)`, version, Socket,
+ this.settings!.account, this.settings!.password);
connection.onEvent('connected', () => {
Raven.setUserContext({username: core.connection.character});
document.addEventListener('backbutton', confirmBack);
@@ -134,8 +142,14 @@
document.removeEventListener('backbutton', confirmBack);
});
initCore(connection, Logs, SettingsStore, Notifications);
- this.characters = data.characters.sort();
- this.defaultCharacter = data.default_character;
+ const charNames = Object.keys(data.characters);
+ this.characters = charNames.sort();
+ for(const character of charNames)
+ if(data.characters[character] === data.default_character) {
+ this.defaultCharacter = character;
+ break;
+ }
+ profileApiInit(data.characters);
} catch(e) {
this.error = l('login.error');
if(process.env.NODE_ENV !== 'production') throw e;
@@ -150,4 +164,4 @@
html, body, #page {
height: 100%;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/mobile/android/.gitignore b/mobile/android/.gitignore
new file mode 100644
index 0000000..f6e73c5
--- /dev/null
+++ b/mobile/android/.gitignore
@@ -0,0 +1,11 @@
+*.iml
+*.apk
+.gradle
+/local.properties
+.idea/*
+!.idea/modules.xml
+!.idea/misc.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild
diff --git a/mobile/android/.idea/misc.xml b/mobile/android/.idea/misc.xml
new file mode 100644
index 0000000..f5c6d9e
--- /dev/null
+++ b/mobile/android/.idea/misc.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
+</project>
\ No newline at end of file
diff --git a/mobile/android/.idea/modules.xml b/mobile/android/.idea/modules.xml
new file mode 100644
index 0000000..816cb5f
--- /dev/null
+++ b/mobile/android/.idea/modules.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ProjectModuleManager">
+ <modules>
+ <module fileurl="file://$PROJECT_DIR$/.idea/android.iml" filepath="$PROJECT_DIR$/.idea/android.iml" />
+ <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
+ </modules>
+ </component>
+</project>
\ No newline at end of file
diff --git a/mobile/android/app/.gitignore b/mobile/android/app/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/mobile/android/app/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle
new file mode 100644
index 0000000..8c5427c
--- /dev/null
+++ b/mobile/android/app/build.gradle
@@ -0,0 +1,27 @@
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+
+android {
+ compileSdkVersion 27
+ buildToolsVersion "27.0.3"
+ defaultConfig {
+ applicationId "net.f_list.fchat"
+ minSdkVersion 19
+ targetSdkVersion 27
+ versionCode 4
+ versionName "0.1.0"
+ }
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ }
+ }
+}
+
+dependencies {
+ compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+}
+repositories {
+ mavenCentral()
+}
diff --git a/mobile/android/app/proguard-rules.pro b/mobile/android/app/proguard-rules.pro
new file mode 100644
index 0000000..e4fe55e
--- /dev/null
+++ b/mobile/android/app/proguard-rules.pro
@@ -0,0 +1,25 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in C:\Android\android-sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+# public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/mobile/android/app/src/main/AndroidManifest.xml b/mobile/android/app/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..9310b08
--- /dev/null
+++ b/mobile/android/app/src/main/AndroidManifest.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="net.f_list.fchat"
+ xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <uses-permission android:name="android.permission.INTERNET" />
+ <uses-permission android:name="android.permission.VIBRATE" />
+
+ <application
+ android:allowBackup="true"
+ android:icon="@mipmap/ic_launcher"
+ android:label="@string/app_name"
+ android:roundIcon="@mipmap/ic_launcher"
+ android:supportsRtl="true"
+ android:theme="@android:style/Theme.Holo.NoActionBar">
+ <activity android:name=".MainActivity" android:launchMode="singleInstance"
+ android:configChanges="orientation|screenSize">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.LAUNCHER" />
+ </intent-filter>
+ </activity>
+ </application>
+
+</manifest>
\ No newline at end of file
diff --git a/mobile/android/app/src/main/assets/www b/mobile/android/app/src/main/assets/www
new file mode 120000
index 0000000..ac30954
--- /dev/null
+++ b/mobile/android/app/src/main/assets/www
@@ -0,0 +1 @@
+../../../../../www
\ No newline at end of file
diff --git a/mobile/android/app/src/main/kotlin/net/f_list/fchat/File.kt b/mobile/android/app/src/main/kotlin/net/f_list/fchat/File.kt
new file mode 100644
index 0000000..e44f745
--- /dev/null
+++ b/mobile/android/app/src/main/kotlin/net/f_list/fchat/File.kt
@@ -0,0 +1,54 @@
+package net.f_list.fchat
+
+import android.content.Context
+import android.webkit.JavascriptInterface
+import org.json.JSONArray
+import java.io.File
+import java.io.FileInputStream
+import java.io.FileOutputStream
+
+class File(private val ctx: Context) {
+ @JavascriptInterface
+ fun readFile(name: String, s: Long, l: Int): String? {
+ val file = File(ctx.filesDir, name)
+ if(!file.exists()) return null
+ FileInputStream(file).use { fs ->
+ val start = if(s != -1L) s else 0
+ fs.channel.position(start)
+ val maxLength = fs.channel.size() - start
+ val length = if(l != -1 && l < maxLength) l else maxLength.toInt()
+ val bytes = ByteArray(length)
+ fs.read(bytes, 0, length)
+ return String(bytes)
+ }
+ }
+
+ @JavascriptInterface
+ fun readFile(name: String): String? {
+ return readFile(name, -1, -1)
+ }
+
+ @JavascriptInterface
+ fun getSize(name: String) = File(ctx.filesDir, name).length()
+
+ @JavascriptInterface
+ fun writeFile(name: String, data: String) {
+ FileOutputStream(File(ctx.filesDir, name)).use { it.write(data.toByteArray()) }
+ }
+
+ @JavascriptInterface
+ fun append(name: String, data: String) {
+ FileOutputStream(File(ctx.filesDir, name), true).use { it.write(data.toByteArray()) }
+ }
+
+ @JavascriptInterface
+ fun listFiles(name: String) = JSONArray(File(ctx.filesDir, name).listFiles().filter { it.isFile }.map { it.name }).toString()
+
+ @JavascriptInterface
+ fun listDirectories(name: String) = JSONArray(File(ctx.filesDir, name).listFiles().filter { it.isDirectory }.map { it.name }).toString()
+
+ @JavascriptInterface
+ fun ensureDirectory(name: String) {
+ File(ctx.filesDir, name).mkdirs()
+ }
+}
\ No newline at end of file
diff --git a/mobile/android/app/src/main/kotlin/net/f_list/fchat/MainActivity.kt b/mobile/android/app/src/main/kotlin/net/f_list/fchat/MainActivity.kt
new file mode 100644
index 0000000..08741e5
--- /dev/null
+++ b/mobile/android/app/src/main/kotlin/net/f_list/fchat/MainActivity.kt
@@ -0,0 +1,31 @@
+package net.f_list.fchat
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+import android.webkit.WebChromeClient
+import android.webkit.WebView
+
+class MainActivity : Activity() {
+ private lateinit var webView: WebView
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setContentView(R.layout.activity_main)
+ webView = findViewById(R.id.webview)
+ webView.settings.javaScriptEnabled = true
+ webView.settings.mediaPlaybackRequiresUserGesture = false
+ webView.loadUrl("file:///android_asset/www/index.html")
+ webView.addJavascriptInterface(File(this), "NativeFile")
+ webView.addJavascriptInterface(Notifications(this), "NativeNotification")
+ webView.webChromeClient = WebChromeClient()
+ }
+
+ override fun onNewIntent(intent: Intent) {
+ super.onNewIntent(intent)
+ if(intent.action == "notification") {
+ val data = intent.extras.getString("data")
+ webView.evaluateJavascript("document.dispatchEvent(new CustomEvent('notification-clicked',{detail:{data:'$data'}}))", {}) //TODO
+ }
+ }
+}
diff --git a/mobile/android/app/src/main/kotlin/net/f_list/fchat/Notifications.kt b/mobile/android/app/src/main/kotlin/net/f_list/fchat/Notifications.kt
new file mode 100644
index 0000000..93c8214
--- /dev/null
+++ b/mobile/android/app/src/main/kotlin/net/f_list/fchat/Notifications.kt
@@ -0,0 +1,57 @@
+package net.f_list.fchat
+
+import android.app.Notification
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.media.AudioManager
+import android.media.MediaPlayer
+import android.net.Uri
+import android.os.AsyncTask
+import android.os.Vibrator
+import android.webkit.JavascriptInterface
+import java.net.URL
+
+class Notifications(private val ctx: Context) {
+ @JavascriptInterface
+ fun notify(notify: Boolean, title: String, text: String, icon: String, sound: String?, data: String?): Int {
+ val soundUri = if(sound != null) Uri.parse("file://android_asset/www/sounds/$sound.mp3") else null
+ if(!notify) {
+ (ctx.getSystemService(Context.VIBRATOR_SERVICE) as Vibrator).vibrate(400)
+ return 0
+ }
+ if(soundUri != null) {
+ val player = MediaPlayer()
+ val asset = ctx.assets.openFd("www/sounds/$sound.mp3")
+ player.setDataSource(asset.fileDescriptor, asset.startOffset, asset.length)
+ player.setAudioStreamType(AudioManager.STREAM_NOTIFICATION)
+ player.prepare()
+ player.start()
+ }
+ val intent = Intent(ctx, MainActivity::class.java)
+ intent.action = "notification"
+ intent.putExtra("data", data)
+ val notification = Notification.Builder(ctx).setContentTitle(title).setContentText(text).setSmallIcon(R.drawable.ic_notification).setDefaults(Notification.DEFAULT_VIBRATE)
+ .setContentIntent(PendingIntent.getActivity(ctx, 1, intent, PendingIntent.FLAG_UPDATE_CURRENT)).setAutoCancel(true)
+ object : AsyncTask<String, Void, Bitmap>() {
+ override fun doInBackground(vararg args: String): Bitmap {
+ val connection = URL(args[0]).openConnection()
+ return BitmapFactory.decodeStream(connection.getInputStream())
+ }
+
+ override fun onPostExecute(result: Bitmap?) {
+ notification.setLargeIcon(result)
+ (ctx.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager).notify(1, notification.build())
+ }
+ }.execute(icon)
+ return 1
+ }
+
+ @JavascriptInterface
+ fun requestPermission() {
+
+ }
+}
\ No newline at end of file
diff --git a/mobile/android/app/src/main/res/drawable-hdpi/ic_notification.png b/mobile/android/app/src/main/res/drawable-hdpi/ic_notification.png
new file mode 100644
index 0000000..e91bb29
Binary files /dev/null and b/mobile/android/app/src/main/res/drawable-hdpi/ic_notification.png differ
diff --git a/mobile/android/app/src/main/res/drawable-mdpi/ic_notification.png b/mobile/android/app/src/main/res/drawable-mdpi/ic_notification.png
new file mode 100644
index 0000000..03d4592
Binary files /dev/null and b/mobile/android/app/src/main/res/drawable-mdpi/ic_notification.png differ
diff --git a/mobile/android/app/src/main/res/drawable-xhdpi/ic_notification.png b/mobile/android/app/src/main/res/drawable-xhdpi/ic_notification.png
new file mode 100644
index 0000000..9d33c80
Binary files /dev/null and b/mobile/android/app/src/main/res/drawable-xhdpi/ic_notification.png differ
diff --git a/mobile/android/app/src/main/res/drawable-xxhdpi/ic_notification.png b/mobile/android/app/src/main/res/drawable-xxhdpi/ic_notification.png
new file mode 100644
index 0000000..eadd6da
Binary files /dev/null and b/mobile/android/app/src/main/res/drawable-xxhdpi/ic_notification.png differ
diff --git a/mobile/android/app/src/main/res/drawable-xxxhdpi/ic_notification.png b/mobile/android/app/src/main/res/drawable-xxxhdpi/ic_notification.png
new file mode 100644
index 0000000..fd718db
Binary files /dev/null and b/mobile/android/app/src/main/res/drawable-xxxhdpi/ic_notification.png differ
diff --git a/mobile/android/app/src/main/res/layout/activity_main.xml b/mobile/android/app/src/main/res/layout/activity_main.xml
new file mode 100644
index 0000000..52e8a07
--- /dev/null
+++ b/mobile/android/app/src/main/res/layout/activity_main.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ tools:context="net.f_list.fchat.MainActivity">
+
+ <WebView
+ android:id="@+id/webview"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+
+</LinearLayout>
diff --git a/mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..6a6ba41
Binary files /dev/null and b/mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..fab0206
Binary files /dev/null and b/mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..748f78b
Binary files /dev/null and b/mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..451a67f
Binary files /dev/null and b/mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..cb8f54d
Binary files /dev/null and b/mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/mobile/android/app/src/main/res/values/strings.xml b/mobile/android/app/src/main/res/values/strings.xml
new file mode 100644
index 0000000..ff587ba
--- /dev/null
+++ b/mobile/android/app/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+ <string name="app_name">F-Chat</string>
+</resources>
diff --git a/mobile/android/build.gradle b/mobile/android/build.gradle
new file mode 100644
index 0000000..3dfde20
--- /dev/null
+++ b/mobile/android/build.gradle
@@ -0,0 +1,25 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+ ext.kotlin_version = '1.2.10'
+ repositories {
+ jcenter()
+ }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:2.3.0'
+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+
+ // NOTE: Do not place your application dependencies here; they belong
+ // in the individual module build.gradle files
+ }
+}
+
+allprojects {
+ repositories {
+ jcenter()
+ }
+}
+
+task clean(type: Delete) {
+ delete rootProject.buildDir
+}
diff --git a/mobile/android/gradle.properties b/mobile/android/gradle.properties
new file mode 100644
index 0000000..743d692
--- /dev/null
+++ b/mobile/android/gradle.properties
@@ -0,0 +1,13 @@
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx1536m
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
diff --git a/mobile/android/gradle/wrapper/gradle-wrapper.jar b/mobile/android/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..13372ae
Binary files /dev/null and b/mobile/android/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/mobile/android/gradle/wrapper/gradle-wrapper.properties b/mobile/android/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..9a778d6
--- /dev/null
+++ b/mobile/android/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Dec 28 10:00:20 PST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
diff --git a/mobile/android/gradlew b/mobile/android/gradlew
new file mode 100644
index 0000000..9d82f78
--- /dev/null
+++ b/mobile/android/gradlew
@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+ echo "$*"
+}
+
+die ( ) {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+esac
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+ JAVACMD=`cygpath --unix "$JAVACMD"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+ JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/mobile/android/gradlew.bat b/mobile/android/gradlew.bat
new file mode 100644
index 0000000..8a0b282
--- /dev/null
+++ b/mobile/android/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/mobile/android/settings.gradle b/mobile/android/settings.gradle
new file mode 100644
index 0000000..e7b4def
--- /dev/null
+++ b/mobile/android/settings.gradle
@@ -0,0 +1 @@
+include ':app'
diff --git a/cordova/chat.ts b/mobile/chat.ts
similarity index 86%
rename from cordova/chat.ts
rename to mobile/chat.ts
index dccd922..7a73dfa 100644
--- a/cordova/chat.ts
+++ b/mobile/chat.ts
@@ -23,7 +23,7 @@
* SOFTWARE.
*
* This license header applies to this file and all of the non-third-party assets it includes.
- * @file The entry point for the Cordova version of F-Chat 3.0.
+ * @file The entry point for the mobile version of F-Chat 3.0.
* @copyright 2017 F-List
* @author Maya Wolf <maya@f-list.net>
* @version 3.0
@@ -31,15 +31,15 @@
*/
import 'bootstrap/js/dropdown.js';
import 'bootstrap/js/modal.js';
+import 'bootstrap/js/tab.js';
import * as Raven from 'raven-js';
import Vue from 'vue';
import VueRaven from '../chat/vue-raven';
-import {init as fsInit} from './filesystem';
import Index from './Index.vue';
if(process.env.NODE_ENV === 'production') {
Raven.config('https://a9239b17b0a14f72ba85e8729b9d1612@sentry.f-list.net/2', {
- release: `android-${require('./package.json').version}`, //tslint:disable-line:no-require-imports no-unsafe-any
+ release: `mobile-${require('./package.json').version}`, //tslint:disable-line:no-require-imports no-unsafe-any
dataCallback: (data: {culprit: string, exception: {values: {stacktrace: {frames: {filename: string}[]}}[]}}) => {
data.culprit = `~${data.culprit.substr(data.culprit.lastIndexOf('/'))}`;
for(const ex of data.exception.values)
@@ -54,8 +54,6 @@ if(process.env.NODE_ENV === 'production') {
};
}
-fsInit().then(() => { //tslint:disable-line:no-floating-promises
- new Index({ //tslint:disable-line:no-unused-expression
- el: '#app'
- });
+new Index({ //tslint:disable-line:no-unused-expression
+ el: '#app'
});
\ No newline at end of file
diff --git a/mobile/filesystem.ts b/mobile/filesystem.ts
new file mode 100644
index 0000000..a079c3c
--- /dev/null
+++ b/mobile/filesystem.ts
@@ -0,0 +1,182 @@
+import {getByteLength, Message as MessageImpl} from '../chat/common';
+import core from '../chat/core';
+import {Conversation, Logs as Logging, Settings} from '../chat/interfaces';
+
+declare global {
+ const NativeFile: {
+ readFile(name: string): Promise<string | undefined>
+ readFile(name: string, start: number, length: number): Promise<string | undefined>
+ writeFile(name: string, data: string): Promise<void>
+ listDirectories(name: string): Promise<string>
+ listFiles(name: string): Promise<string>
+ getSize(name: string): Promise<number>
+ append(name: string, data: string): Promise<void>
+ ensureDirectory(name: string): Promise<void>
+ };
+}
+
+const dayMs = 86400000;
+
+export class GeneralSettings {
+ account = '';
+ password = '';
+ host = 'wss://chat.f-list.net:9799';
+ theme = 'default';
+}
+
+type Index = {[key: string]: {name: string, index: {[key: number]: number | undefined}} | undefined};
+
+function serializeMessage(message: Conversation.Message): string {
+ const time = message.time.getTime() / 1000;
+ let str = String.fromCharCode((time >> 24) % 256) + String.fromCharCode((time >> 16) % 256)
+ + String.fromCharCode((time >> 8) % 256) + String.fromCharCode(time % 256);
+ str += String.fromCharCode(message.type);
+ if(message.type !== Conversation.Message.Type.Event) {
+ str += String.fromCharCode(message.sender.name.length);
+ str += message.sender.name;
+ } else str += '\0';
+ const textLength = message.text.length;
+ str += String.fromCharCode((textLength >> 8) % 256) + String.fromCharCode(textLength % 256);
+ str += message.text;
+ const length = getByteLength(str);
+ str += String.fromCharCode((length >> 8) % 256) + String.fromCharCode(length % 256);
+ return str;
+}
+
+function deserializeMessage(str: string): {message: Conversation.Message, end: number} {
+ let index = 0;
+ const time = str.charCodeAt(index++) << 24 | str.charCodeAt(index++) << 16 | str.charCodeAt(index++) << 8 | str.charCodeAt(index++);
+ const type = str.charCodeAt(index++);
+ const senderLength = str.charCodeAt(index++);
+ const sender = str.substring(index, index += senderLength);
+ const messageLength = str.charCodeAt(index++) << 8 | str.charCodeAt(index++);
+ const text = str.substring(index, index += messageLength);
+ const end = str.charCodeAt(index++) << 8 | str.charCodeAt(index);
+ return {message: new MessageImpl(type, core.characters.get(sender), text, new Date(time * 1000)), end: end + 2};
+}
+
+export class Logs implements Logging.Persistent {
+ private index: Index = {};
+ private logDir: string;
+
+ constructor() {
+ core.connection.onEvent('connecting', async() => {
+ this.index = {};
+ this.logDir = `${core.connection.character}/logs`;
+ await NativeFile.ensureDirectory(this.logDir);
+ const entries = <string[]>JSON.parse(await NativeFile.listFiles(this.logDir));
+ for(const entry of entries)
+ if(entry.substr(-4) === '.idx') {
+ const str = (await NativeFile.readFile(`${this.logDir}/${entry}`))!;
+ let i = str.charCodeAt(0);
+ const name = str.substr(1, i++);
+ const index: {[key: number]: number} = {};
+ while(i < str.length) {
+ const key = str.charCodeAt(i++) << 8 | str.charCodeAt(i++);
+ index[key] = str.charCodeAt(i++) << 32 | str.charCodeAt(i++) << 24 | str.charCodeAt(i++) << 16 |
+ str.charCodeAt(i++) << 8 | str.charCodeAt(i++);
+ }
+ this.index[entry.slice(0, -4).toLowerCase()] = {name, index};
+ }
+ });
+ }
+
+ async logMessage(conversation: Conversation, message: Conversation.Message): Promise<void> {
+ const file = `${this.logDir}/${conversation.key}`;
+ const serialized = serializeMessage(message);
+ const date = Math.floor(message.time.getTime() / dayMs);
+ let indexBuffer: string | undefined;
+ let index = this.index[conversation.key];
+ if(index !== undefined) {
+ if(index.index[date] === undefined) indexBuffer = '';
+ } else {
+ index = this.index[conversation.key] = {name: conversation.name, index: {}};
+ const nameLength = getByteLength(conversation.name);
+ indexBuffer = String.fromCharCode(nameLength) + conversation.name;
+ }
+ if(indexBuffer !== undefined) {
+ const size = await NativeFile.getSize(file);
+ index.index[date] = size;
+ indexBuffer += String.fromCharCode((date >> 8) % 256) + String.fromCharCode(date % 256) +
+ String.fromCharCode((size >> 32) % 256) + String.fromCharCode((size >> 24) % 256) +
+ String.fromCharCode((size >> 16) % 256) + String.fromCharCode((size >> 8) % 256) + String.fromCharCode(size % 256);
+ await NativeFile.append(`${file}.idx`, indexBuffer);
+ }
+ await NativeFile.append(file, serialized);
+ }
+
+ async getBacklog(conversation: Conversation): Promise<Conversation.Message[]> {
+ const file = `${this.logDir}/${conversation.key}`;
+ let count = 20;
+ let messages = new Array<Conversation.Message>(count);
+ let pos = await NativeFile.getSize(file);
+ while(pos > 0 && count > 0) {
+ const l = (await NativeFile.readFile(file, pos - 2, pos))!;
+ const length = (l.charCodeAt(0) << 8 | l.charCodeAt(1));
+ pos = pos - length - 2;
+ messages[--count] = deserializeMessage((await NativeFile.readFile(file, pos, length))!).message;
+ }
+ if(count !== 0) messages = messages.slice(count);
+ return messages;
+ }
+
+ async getLogs(key: string, date: Date): Promise<Conversation.Message[]> {
+ const file = `${this.logDir}/${key}`;
+ const messages: Conversation.Message[] = [];
+ const day = date.getTime() / dayMs;
+ const index = this.index[key];
+ if(index === undefined) return [];
+ let pos = index.index[date.getTime() / dayMs];
+ if(pos === undefined) return [];
+ const size = await NativeFile.getSize(file);
+ while(pos < size) {
+ const deserialized = deserializeMessage((await NativeFile.readFile(file, pos, 51000))!);
+ if(Math.floor(deserialized.message.time.getTime() / dayMs) !== day) break;
+ messages.push(deserialized.message);
+ pos += deserialized.end;
+ }
+ return messages;
+ }
+
+ getLogDates(key: string): ReadonlyArray<Date> {
+ const entry = this.index[key];
+ if(entry === undefined) return [];
+ const dates = [];
+ for(const date in entry.index)
+ dates.push(new Date(parseInt(date, 10) * dayMs));
+ return dates;
+ }
+
+ get conversations(): ReadonlyArray<{id: string, name: string}> {
+ const conversations: {id: string, name: string}[] = [];
+ for(const key in this.index) conversations.push({id: key, name: this.index[key]!.name});
+ conversations.sort((x, y) => (x.name < y.name ? -1 : (x.name > y.name ? 1 : 0)));
+ return conversations;
+ }
+}
+
+export async function getGeneralSettings(): Promise<GeneralSettings | undefined> {
+ const file = await NativeFile.readFile('!settings');
+ if(file === undefined) return undefined;
+ return <GeneralSettings>JSON.parse(file);
+}
+
+export async function setGeneralSettings(value: GeneralSettings): Promise<void> {
+ return NativeFile.writeFile('!settings', JSON.stringify(value));
+}
+
+export class SettingsStore implements Settings.Store {
+ async get<K extends keyof Settings.Keys>(key: K, character: string = core.connection.character): Promise<Settings.Keys[K] | undefined> {
+ const file = await NativeFile.readFile(`${character}/${key}`);
+ if(file === undefined) return undefined;
+ return <Settings.Keys[K]>JSON.parse(file);
+ }
+
+ async set<K extends keyof Settings.Keys>(key: K, value: Settings.Keys[K]): Promise<void> {
+ return NativeFile.writeFile(`${core.connection.character}/${key}`, JSON.stringify(value));
+ }
+
+ async getAvailableCharacters(): Promise<string[]> {
+ return <string[]>JSON.parse(await NativeFile.listDirectories('/'));
+ }
+}
\ No newline at end of file
diff --git a/cordova/index.html b/mobile/index.html
similarity index 80%
rename from cordova/index.html
rename to mobile/index.html
index b756e2a..a97f3ac 100644
--- a/cordova/index.html
+++ b/mobile/index.html
@@ -2,13 +2,12 @@
<html lang="en">
<head>
<meta charset="UTF-8">
- <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, target-densitydpi=medium-dpi, user-scalable=0" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, target-densitydpi=medium-dpi, user-scalable=0, viewport-fit=cover" />
<title>FChat 3.0</title>
</head>
<body>
<div id="app">
</div>
-<script type="text/javascript" src="cordova.js"></script>
<script type="text/javascript" src="chat.js"></script>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/mobile/ios/.gitignore b/mobile/ios/.gitignore
new file mode 100644
index 0000000..8ca96d0
--- /dev/null
+++ b/mobile/ios/.gitignore
@@ -0,0 +1,2 @@
+.idea/
+xcuserdata/
diff --git a/mobile/ios/F-Chat.xcodeproj/project.pbxproj b/mobile/ios/F-Chat.xcodeproj/project.pbxproj
new file mode 100644
index 0000000..2dc05a2
--- /dev/null
+++ b/mobile/ios/F-Chat.xcodeproj/project.pbxproj
@@ -0,0 +1,364 @@
+// !$*UTF8*$!
+{
+ archiveVersion = 1;
+ classes = {
+ };
+ objectVersion = 48;
+ objects = {
+
+/* Begin PBXBuildFile section */
+ 6C28207F1FF5839A00AB9E78 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6C2820811FF5839A00AB9E78 /* Localizable.strings */; };
+ 6C5C1C591FF14432006A3BA1 /* View.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C5C1C581FF14432006A3BA1 /* View.swift */; };
+ 6CA94BAC1FEFEE7800183A1A /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CA94BAB1FEFEE7800183A1A /* AppDelegate.swift */; };
+ 6CA94BAE1FEFEE7800183A1A /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CA94BAD1FEFEE7800183A1A /* ViewController.swift */; };
+ 6CA94BB11FEFEE7800183A1A /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6CA94BAF1FEFEE7800183A1A /* Main.storyboard */; };
+ 6CA94BB31FEFEE7800183A1A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6CA94BB21FEFEE7800183A1A /* Assets.xcassets */; };
+ 6CA94BB61FEFEE7800183A1A /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6CA94BB41FEFEE7800183A1A /* LaunchScreen.storyboard */; };
+ 6CA94BBE1FEFF2C200183A1A /* www in Resources */ = {isa = PBXBuildFile; fileRef = 6CA94BBD1FEFF2C200183A1A /* www */; };
+ 6CA94BC01FEFFC2F00183A1A /* native.js in Resources */ = {isa = PBXBuildFile; fileRef = 6CA94BBF1FEFFC2F00183A1A /* native.js */; };
+ 6CA94BC21FF009B000183A1A /* File.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CA94BC11FF009B000183A1A /* File.swift */; };
+ 6CA94BC41FF070C800183A1A /* Notification.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CA94BC31FF070C800183A1A /* Notification.swift */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+ 6C2820801FF5839A00AB9E78 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
+ 6C5C1C581FF14432006A3BA1 /* View.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = View.swift; sourceTree = "<group>"; };
+ 6CA94BA81FEFEE7800183A1A /* F-Chat.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "F-Chat.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+ 6CA94BAB1FEFEE7800183A1A /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
+ 6CA94BAD1FEFEE7800183A1A /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
+ 6CA94BB01FEFEE7800183A1A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
+ 6CA94BB21FEFEE7800183A1A /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+ 6CA94BB51FEFEE7800183A1A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
+ 6CA94BB71FEFEE7800183A1A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+ 6CA94BBD1FEFF2C200183A1A /* www */ = {isa = PBXFileReference; lastKnownFileType = folder; name = www; path = ../../www; sourceTree = "<group>"; };
+ 6CA94BBF1FEFFC2F00183A1A /* native.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = native.js; sourceTree = "<group>"; };
+ 6CA94BC11FF009B000183A1A /* File.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = File.swift; sourceTree = "<group>"; };
+ 6CA94BC31FF070C800183A1A /* Notification.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Notification.swift; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+ 6CA94BA51FEFEE7800183A1A /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+ 6CA94B9F1FEFEE7800183A1A = {
+ isa = PBXGroup;
+ children = (
+ 6CA94BAA1FEFEE7800183A1A /* F-Chat */,
+ 6CA94BA91FEFEE7800183A1A /* Products */,
+ );
+ sourceTree = "<group>";
+ };
+ 6CA94BA91FEFEE7800183A1A /* Products */ = {
+ isa = PBXGroup;
+ children = (
+ 6CA94BA81FEFEE7800183A1A /* F-Chat.app */,
+ );
+ name = Products;
+ sourceTree = "<group>";
+ };
+ 6CA94BAA1FEFEE7800183A1A /* F-Chat */ = {
+ isa = PBXGroup;
+ children = (
+ 6C2820811FF5839A00AB9E78 /* Localizable.strings */,
+ 6CA94BBD1FEFF2C200183A1A /* www */,
+ 6CA94BAB1FEFEE7800183A1A /* AppDelegate.swift */,
+ 6CA94BAD1FEFEE7800183A1A /* ViewController.swift */,
+ 6CA94BAF1FEFEE7800183A1A /* Main.storyboard */,
+ 6CA94BB21FEFEE7800183A1A /* Assets.xcassets */,
+ 6CA94BB41FEFEE7800183A1A /* LaunchScreen.storyboard */,
+ 6CA94BB71FEFEE7800183A1A /* Info.plist */,
+ 6CA94BBF1FEFFC2F00183A1A /* native.js */,
+ 6CA94BC11FF009B000183A1A /* File.swift */,
+ 6CA94BC31FF070C800183A1A /* Notification.swift */,
+ 6C5C1C581FF14432006A3BA1 /* View.swift */,
+ );
+ path = "F-Chat";
+ sourceTree = "<group>";
+ };
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+ 6CA94BA71FEFEE7800183A1A /* F-Chat */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = 6CA94BBA1FEFEE7800183A1A /* Build configuration list for PBXNativeTarget "F-Chat" */;
+ buildPhases = (
+ 6CA94BA41FEFEE7800183A1A /* Sources */,
+ 6CA94BA51FEFEE7800183A1A /* Frameworks */,
+ 6CA94BA61FEFEE7800183A1A /* Resources */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ );
+ name = "F-Chat";
+ productName = "F-Chat";
+ productReference = 6CA94BA81FEFEE7800183A1A /* F-Chat.app */;
+ productType = "com.apple.product-type.application";
+ };
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+ 6CA94BA01FEFEE7800183A1A /* Project object */ = {
+ isa = PBXProject;
+ attributes = {
+ LastSwiftUpdateCheck = 0920;
+ LastUpgradeCheck = 0920;
+ ORGANIZATIONNAME = "F-List";
+ TargetAttributes = {
+ 6CA94BA71FEFEE7800183A1A = {
+ CreatedOnToolsVersion = 9.2;
+ ProvisioningStyle = Automatic;
+ SystemCapabilities = {
+ com.apple.BackgroundModes = {
+ enabled = 1;
+ };
+ };
+ };
+ };
+ };
+ buildConfigurationList = 6CA94BA31FEFEE7800183A1A /* Build configuration list for PBXProject "F-Chat" */;
+ compatibilityVersion = "Xcode 8.0";
+ developmentRegion = en;
+ hasScannedForEncodings = 0;
+ knownRegions = (
+ en,
+ Base,
+ );
+ mainGroup = 6CA94B9F1FEFEE7800183A1A;
+ productRefGroup = 6CA94BA91FEFEE7800183A1A /* Products */;
+ projectDirPath = "";
+ projectRoot = "";
+ targets = (
+ 6CA94BA71FEFEE7800183A1A /* F-Chat */,
+ );
+ };
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+ 6CA94BA61FEFEE7800183A1A /* Resources */ = {
+ isa = PBXResourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 6CA94BBE1FEFF2C200183A1A /* www in Resources */,
+ 6C28207F1FF5839A00AB9E78 /* Localizable.strings in Resources */,
+ 6CA94BB61FEFEE7800183A1A /* LaunchScreen.storyboard in Resources */,
+ 6CA94BB31FEFEE7800183A1A /* Assets.xcassets in Resources */,
+ 6CA94BB11FEFEE7800183A1A /* Main.storyboard in Resources */,
+ 6CA94BC01FEFFC2F00183A1A /* native.js in Resources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+ 6CA94BA41FEFEE7800183A1A /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 6CA94BC41FF070C800183A1A /* Notification.swift in Sources */,
+ 6CA94BAE1FEFEE7800183A1A /* ViewController.swift in Sources */,
+ 6C5C1C591FF14432006A3BA1 /* View.swift in Sources */,
+ 6CA94BC21FF009B000183A1A /* File.swift in Sources */,
+ 6CA94BAC1FEFEE7800183A1A /* AppDelegate.swift in Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXVariantGroup section */
+ 6C2820811FF5839A00AB9E78 /* Localizable.strings */ = {
+ isa = PBXVariantGroup;
+ children = (
+ 6C2820801FF5839A00AB9E78 /* en */,
+ );
+ name = Localizable.strings;
+ sourceTree = "<group>";
+ };
+ 6CA94BAF1FEFEE7800183A1A /* Main.storyboard */ = {
+ isa = PBXVariantGroup;
+ children = (
+ 6CA94BB01FEFEE7800183A1A /* Base */,
+ );
+ name = Main.storyboard;
+ sourceTree = "<group>";
+ };
+ 6CA94BB41FEFEE7800183A1A /* LaunchScreen.storyboard */ = {
+ isa = PBXVariantGroup;
+ children = (
+ 6CA94BB51FEFEE7800183A1A /* Base */,
+ );
+ name = LaunchScreen.storyboard;
+ sourceTree = "<group>";
+ };
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+ 6CA94BB81FEFEE7800183A1A /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ CLANG_ANALYZER_NONNULL = YES;
+ CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+ CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+ CLANG_CXX_LIBRARY = "libc++";
+ CLANG_ENABLE_MODULES = YES;
+ CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_COMMA = YES;
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+ CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INFINITE_RECURSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+ CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+ CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+ CLANG_WARN_STRICT_PROTOTYPES = YES;
+ CLANG_WARN_SUSPICIOUS_MOVE = YES;
+ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+ CLANG_WARN_UNREACHABLE_CODE = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+ CODE_SIGN_IDENTITY = "iPhone Developer";
+ COPY_PHASE_STRIP = NO;
+ DEBUG_INFORMATION_FORMAT = dwarf;
+ ENABLE_STRICT_OBJC_MSGSEND = YES;
+ ENABLE_TESTABILITY = YES;
+ GCC_C_LANGUAGE_STANDARD = gnu11;
+ GCC_DYNAMIC_NO_PIC = NO;
+ GCC_NO_COMMON_BLOCKS = YES;
+ GCC_OPTIMIZATION_LEVEL = 0;
+ GCC_PREPROCESSOR_DEFINITIONS = (
+ "DEBUG=1",
+ "$(inherited)",
+ );
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+ GCC_WARN_UNUSED_FUNCTION = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
+ IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+ MTL_ENABLE_DEBUG_INFO = YES;
+ ONLY_ACTIVE_ARCH = YES;
+ SDKROOT = iphoneos;
+ SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+ SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+ };
+ name = Debug;
+ };
+ 6CA94BB91FEFEE7800183A1A /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ CLANG_ANALYZER_NONNULL = YES;
+ CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+ CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+ CLANG_CXX_LIBRARY = "libc++";
+ CLANG_ENABLE_MODULES = YES;
+ CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_COMMA = YES;
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+ CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INFINITE_RECURSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+ CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+ CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+ CLANG_WARN_STRICT_PROTOTYPES = YES;
+ CLANG_WARN_SUSPICIOUS_MOVE = YES;
+ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+ CLANG_WARN_UNREACHABLE_CODE = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+ CODE_SIGN_IDENTITY = "iPhone Developer";
+ COPY_PHASE_STRIP = NO;
+ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ ENABLE_NS_ASSERTIONS = NO;
+ ENABLE_STRICT_OBJC_MSGSEND = YES;
+ GCC_C_LANGUAGE_STANDARD = gnu11;
+ GCC_NO_COMMON_BLOCKS = YES;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+ GCC_WARN_UNUSED_FUNCTION = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
+ IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+ MTL_ENABLE_DEBUG_INFO = NO;
+ SDKROOT = iphoneos;
+ SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+ VALIDATE_PRODUCT = YES;
+ };
+ name = Release;
+ };
+ 6CA94BBB1FEFEE7800183A1A /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+ CODE_SIGN_STYLE = Automatic;
+ DEVELOPMENT_TEAM = VFNA3GCTAR;
+ INFOPLIST_FILE = "F-Chat/Info.plist";
+ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+ PRODUCT_BUNDLE_IDENTIFIER = "net.f-list.F-Chat";
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ SWIFT_VERSION = 4.0;
+ TARGETED_DEVICE_FAMILY = "1,2";
+ };
+ name = Debug;
+ };
+ 6CA94BBC1FEFEE7800183A1A /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+ CODE_SIGN_STYLE = Automatic;
+ DEVELOPMENT_TEAM = VFNA3GCTAR;
+ INFOPLIST_FILE = "F-Chat/Info.plist";
+ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+ PRODUCT_BUNDLE_IDENTIFIER = "net.f-list.F-Chat";
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ SWIFT_VERSION = 4.0;
+ TARGETED_DEVICE_FAMILY = "1,2";
+ };
+ name = Release;
+ };
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+ 6CA94BA31FEFEE7800183A1A /* Build configuration list for PBXProject "F-Chat" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 6CA94BB81FEFEE7800183A1A /* Debug */,
+ 6CA94BB91FEFEE7800183A1A /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
+ 6CA94BBA1FEFEE7800183A1A /* Build configuration list for PBXNativeTarget "F-Chat" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 6CA94BBB1FEFEE7800183A1A /* Debug */,
+ 6CA94BBC1FEFEE7800183A1A /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
+/* End XCConfigurationList section */
+ };
+ rootObject = 6CA94BA01FEFEE7800183A1A /* Project object */;
+}
diff --git a/mobile/ios/F-Chat.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/mobile/ios/F-Chat.xcodeproj/project.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 0000000..fca2a21
--- /dev/null
+++ b/mobile/ios/F-Chat.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+ version = "1.0">
+ <FileRef
+ location = "self:F-Chat.xcodeproj">
+ </FileRef>
+</Workspace>
diff --git a/mobile/ios/F-Chat/AppDelegate.swift b/mobile/ios/F-Chat/AppDelegate.swift
new file mode 100644
index 0000000..ecede7f
--- /dev/null
+++ b/mobile/ios/F-Chat/AppDelegate.swift
@@ -0,0 +1,38 @@
+import UIKit
+
+@UIApplicationMain
+class AppDelegate: UIResponder, UIApplicationDelegate {
+
+ var window: UIWindow?
+
+
+ func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+ // Override point for customization after application launch.
+ return true
+ }
+
+ func applicationWillResignActive(_ application: UIApplication) {
+ // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
+ // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game.
+ }
+
+ func applicationDidEnterBackground(_ application: UIApplication) {
+ // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
+ // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
+ }
+
+ func applicationWillEnterForeground(_ application: UIApplication) {
+ // Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background.
+ }
+
+ func applicationDidBecomeActive(_ application: UIApplication) {
+ // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
+ }
+
+ func applicationWillTerminate(_ application: UIApplication) {
+ // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
+ }
+
+
+}
+
diff --git a/mobile/ios/F-Chat/Assets.xcassets/AppIcon.appiconset/Contents.json b/mobile/ios/F-Chat/Assets.xcassets/AppIcon.appiconset/Contents.json
new file mode 100644
index 0000000..03b7f44
--- /dev/null
+++ b/mobile/ios/F-Chat/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,112 @@
+{
+ "images" : [
+ {
+ "idiom" : "iphone",
+ "size" : "20x20",
+ "filename" : "icon-20@2x.png",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "iphone",
+ "size" : "20x20",
+ "filename" : "icon-20@3x.png",
+ "scale" : "3x"
+ },
+ {
+ "idiom" : "iphone",
+ "size" : "29x29",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "iphone",
+ "size" : "29x29",
+ "scale" : "3x"
+ },
+ {
+ "idiom" : "iphone",
+ "size" : "40x40",
+ "filename" : "icon-40@2x.png",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "iphone",
+ "size" : "40x40",
+ "filename" : "icon-60@2x.png",
+ "scale" : "3x"
+ },
+ {
+ "idiom" : "iphone",
+ "size" : "60x60",
+ "filename" : "icon-60@2x.png",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "iphone",
+ "size" : "60x60",
+ "filename" : "icon-60@3x.png",
+ "scale" : "3x"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "20x20",
+ "filename" : "icon-20.png",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "20x20",
+ "filename" : "icon-20@2x.png",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "29x29",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "29x29",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "40x40",
+ "filename" : "icon-20@2x.png",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "40x40",
+ "filename" : "icon-40@2x.png",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "76x76",
+ "filename" : "icon-76.png",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "76x76",
+ "filename" : "icon-76@2x.png",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "83.5x83.5",
+ "filename" : "icon-83.5@2x.png",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "ios-marketing",
+ "size" : "1024x1024",
+ "filename" : "icon-1024.png",
+ "scale" : "1x"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/mobile/ios/F-Chat/Assets.xcassets/AppIcon.appiconset/icon-1024.png b/mobile/ios/F-Chat/Assets.xcassets/AppIcon.appiconset/icon-1024.png
new file mode 100644
index 0000000..bb03726
Binary files /dev/null and b/mobile/ios/F-Chat/Assets.xcassets/AppIcon.appiconset/icon-1024.png differ
diff --git a/mobile/ios/F-Chat/Assets.xcassets/AppIcon.appiconset/icon-20.png b/mobile/ios/F-Chat/Assets.xcassets/AppIcon.appiconset/icon-20.png
new file mode 100644
index 0000000..f4c69aa
Binary files /dev/null and b/mobile/ios/F-Chat/Assets.xcassets/AppIcon.appiconset/icon-20.png differ
diff --git a/mobile/ios/F-Chat/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png b/mobile/ios/F-Chat/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png
new file mode 100644
index 0000000..9930841
Binary files /dev/null and b/mobile/ios/F-Chat/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png differ
diff --git a/mobile/ios/F-Chat/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png b/mobile/ios/F-Chat/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png
new file mode 100644
index 0000000..337b5b3
Binary files /dev/null and b/mobile/ios/F-Chat/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png differ
diff --git a/mobile/ios/F-Chat/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png b/mobile/ios/F-Chat/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png
new file mode 100644
index 0000000..054e871
Binary files /dev/null and b/mobile/ios/F-Chat/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png differ
diff --git a/mobile/ios/F-Chat/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png b/mobile/ios/F-Chat/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png
new file mode 100644
index 0000000..03b78a4
Binary files /dev/null and b/mobile/ios/F-Chat/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png differ
diff --git a/mobile/ios/F-Chat/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png b/mobile/ios/F-Chat/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png
new file mode 100644
index 0000000..47669e6
Binary files /dev/null and b/mobile/ios/F-Chat/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png differ
diff --git a/mobile/ios/F-Chat/Assets.xcassets/AppIcon.appiconset/icon-76.png b/mobile/ios/F-Chat/Assets.xcassets/AppIcon.appiconset/icon-76.png
new file mode 100644
index 0000000..1a0d9dd
Binary files /dev/null and b/mobile/ios/F-Chat/Assets.xcassets/AppIcon.appiconset/icon-76.png differ
diff --git a/mobile/ios/F-Chat/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png b/mobile/ios/F-Chat/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png
new file mode 100644
index 0000000..b3dd17d
Binary files /dev/null and b/mobile/ios/F-Chat/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png differ
diff --git a/mobile/ios/F-Chat/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png b/mobile/ios/F-Chat/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png
new file mode 100644
index 0000000..c2702a1
Binary files /dev/null and b/mobile/ios/F-Chat/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png differ
diff --git a/mobile/ios/F-Chat/Assets.xcassets/Contents.json b/mobile/ios/F-Chat/Assets.xcassets/Contents.json
new file mode 100644
index 0000000..da4a164
--- /dev/null
+++ b/mobile/ios/F-Chat/Assets.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/mobile/ios/F-Chat/Assets.xcassets/LaunchStoryboard.imageset/Contents.json b/mobile/ios/F-Chat/Assets.xcassets/LaunchStoryboard.imageset/Contents.json
new file mode 100644
index 0000000..872b276
--- /dev/null
+++ b/mobile/ios/F-Chat/Assets.xcassets/LaunchStoryboard.imageset/Contents.json
@@ -0,0 +1,174 @@
+{
+ "images": [
+ {
+ "idiom": "universal",
+ "scale": "1x",
+ "width-class": "compact",
+ "height-class": "compact"
+ },
+ {
+ "idiom": "universal",
+ "scale": "1x",
+ "width-class": "compact"
+ },
+ {
+ "idiom": "universal",
+ "scale": "1x",
+ "height-class": "compact"
+ },
+ {
+ "idiom": "universal",
+ "scale": "1x"
+ },
+ {
+ "idiom": "universal",
+ "scale": "2x",
+ "width-class": "compact",
+ "height-class": "compact",
+ "filename": "Default@2x~universal~comcom.png"
+ },
+ {
+ "idiom": "universal",
+ "scale": "2x",
+ "width-class": "compact",
+ "filename": "Default@2x~universal~comany.png"
+ },
+ {
+ "idiom": "universal",
+ "scale": "2x",
+ "height-class": "compact"
+ },
+ {
+ "idiom": "universal",
+ "scale": "2x",
+ "filename": "Default@2x~universal~anyany.png"
+ },
+ {
+ "idiom": "universal",
+ "scale": "3x",
+ "width-class": "compact",
+ "height-class": "compact"
+ },
+ {
+ "idiom": "universal",
+ "scale": "3x",
+ "width-class": "compact",
+ "filename": "Default@3x~universal~comany.png"
+ },
+ {
+ "idiom": "universal",
+ "scale": "3x",
+ "height-class": "compact",
+ "filename": "Default@3x~universal~anycom.png"
+ },
+ {
+ "idiom": "universal",
+ "scale": "3x",
+ "filename": "Default@3x~universal~anyany.png"
+ },
+ {
+ "idiom": "ipad",
+ "scale": "1x",
+ "width-class": "compact",
+ "height-class": "compact"
+ },
+ {
+ "idiom": "ipad",
+ "scale": "1x",
+ "width-class": "compact"
+ },
+ {
+ "idiom": "ipad",
+ "scale": "1x",
+ "height-class": "compact"
+ },
+ {
+ "idiom": "ipad",
+ "scale": "1x"
+ },
+ {
+ "idiom": "ipad",
+ "scale": "2x",
+ "width-class": "compact",
+ "height-class": "compact"
+ },
+ {
+ "idiom": "ipad",
+ "scale": "2x",
+ "width-class": "compact"
+ },
+ {
+ "idiom": "ipad",
+ "scale": "2x",
+ "height-class": "compact"
+ },
+ {
+ "idiom": "ipad",
+ "scale": "2x"
+ },
+ {
+ "idiom": "iphone",
+ "scale": "1x",
+ "width-class": "compact",
+ "height-class": "compact"
+ },
+ {
+ "idiom": "iphone",
+ "scale": "1x",
+ "width-class": "compact"
+ },
+ {
+ "idiom": "iphone",
+ "scale": "1x",
+ "height-class": "compact"
+ },
+ {
+ "idiom": "iphone",
+ "scale": "1x"
+ },
+ {
+ "idiom": "iphone",
+ "scale": "2x",
+ "width-class": "compact",
+ "height-class": "compact"
+ },
+ {
+ "idiom": "iphone",
+ "scale": "2x",
+ "width-class": "compact"
+ },
+ {
+ "idiom": "iphone",
+ "scale": "2x",
+ "height-class": "compact"
+ },
+ {
+ "idiom": "iphone",
+ "scale": "2x"
+ },
+ {
+ "idiom": "iphone",
+ "scale": "3x",
+ "width-class": "compact",
+ "height-class": "compact"
+ },
+ {
+ "idiom": "iphone",
+ "scale": "3x",
+ "width-class": "compact"
+ },
+ {
+ "idiom": "iphone",
+ "scale": "3x",
+ "height-class": "compact"
+ },
+ {
+ "idiom": "iphone",
+ "scale": "3x"
+ }
+ ],
+ "info": {
+ "author": "Xcode",
+ "version": 1
+ }
+}
\ No newline at end of file
diff --git a/mobile/ios/F-Chat/Assets.xcassets/LaunchStoryboard.imageset/Default@2x~universal~anyany.png b/mobile/ios/F-Chat/Assets.xcassets/LaunchStoryboard.imageset/Default@2x~universal~anyany.png
new file mode 100644
index 0000000..ab83bc8
Binary files /dev/null and b/mobile/ios/F-Chat/Assets.xcassets/LaunchStoryboard.imageset/Default@2x~universal~anyany.png differ
diff --git a/mobile/ios/F-Chat/Assets.xcassets/LaunchStoryboard.imageset/Default@2x~universal~comany.png b/mobile/ios/F-Chat/Assets.xcassets/LaunchStoryboard.imageset/Default@2x~universal~comany.png
new file mode 100644
index 0000000..812887a
Binary files /dev/null and b/mobile/ios/F-Chat/Assets.xcassets/LaunchStoryboard.imageset/Default@2x~universal~comany.png differ
diff --git a/mobile/ios/F-Chat/Assets.xcassets/LaunchStoryboard.imageset/Default@2x~universal~comcom.png b/mobile/ios/F-Chat/Assets.xcassets/LaunchStoryboard.imageset/Default@2x~universal~comcom.png
new file mode 100644
index 0000000..b05451d
Binary files /dev/null and b/mobile/ios/F-Chat/Assets.xcassets/LaunchStoryboard.imageset/Default@2x~universal~comcom.png differ
diff --git a/mobile/ios/F-Chat/Assets.xcassets/LaunchStoryboard.imageset/Default@3x~universal~anyany.png b/mobile/ios/F-Chat/Assets.xcassets/LaunchStoryboard.imageset/Default@3x~universal~anyany.png
new file mode 100644
index 0000000..0533896
Binary files /dev/null and b/mobile/ios/F-Chat/Assets.xcassets/LaunchStoryboard.imageset/Default@3x~universal~anyany.png differ
diff --git a/mobile/ios/F-Chat/Assets.xcassets/LaunchStoryboard.imageset/Default@3x~universal~anycom.png b/mobile/ios/F-Chat/Assets.xcassets/LaunchStoryboard.imageset/Default@3x~universal~anycom.png
new file mode 100644
index 0000000..7edac91
Binary files /dev/null and b/mobile/ios/F-Chat/Assets.xcassets/LaunchStoryboard.imageset/Default@3x~universal~anycom.png differ
diff --git a/mobile/ios/F-Chat/Assets.xcassets/LaunchStoryboard.imageset/Default@3x~universal~comany.png b/mobile/ios/F-Chat/Assets.xcassets/LaunchStoryboard.imageset/Default@3x~universal~comany.png
new file mode 100644
index 0000000..96f1874
Binary files /dev/null and b/mobile/ios/F-Chat/Assets.xcassets/LaunchStoryboard.imageset/Default@3x~universal~comany.png differ
diff --git a/mobile/ios/F-Chat/Base.lproj/LaunchScreen.storyboard b/mobile/ios/F-Chat/Base.lproj/LaunchScreen.storyboard
new file mode 100644
index 0000000..067d7d5
--- /dev/null
+++ b/mobile/ios/F-Chat/Base.lproj/LaunchScreen.storyboard
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+ <dependencies>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+ <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+ </dependencies>
+ <scenes>
+ <!--View Controller-->
+ <scene sceneID="EHf-IW-A2E">
+ <objects>
+ <viewController id="01J-lp-oVM" sceneMemberID="viewController">
+ <layoutGuides>
+ <viewControllerLayoutGuide type="top" id="Llm-lL-Icb"/>
+ <viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
+ </layoutGuides>
+ <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
+ <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="LaunchStoryboard" translatesAutoresizingMaskIntoConstraints="NO" id="2ns-9I-Qjs">
+ <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+ </imageView>
+ </subviews>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <constraints>
+ <constraint firstAttribute="trailing" secondItem="2ns-9I-Qjs" secondAttribute="trailing" id="FZL-3Z-NFz"/>
+ <constraint firstItem="2ns-9I-Qjs" firstAttribute="bottom" secondItem="Ze5-6b-2t3" secondAttribute="bottom" id="L9l-pw-wXj"/>
+ <constraint firstItem="2ns-9I-Qjs" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="oGN-hc-Uzj"/>
+ <constraint firstItem="2ns-9I-Qjs" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="rS9-Wd-zY4"/>
+ </constraints>
+ </view>
+ </viewController>
+ <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
+ </objects>
+ <point key="canvasLocation" x="53" y="375"/>
+ </scene>
+ </scenes>
+ <resources>
+ <image name="LaunchStoryboard" width="1366" height="1366"/>
+ </resources>
+</document>
diff --git a/mobile/ios/F-Chat/Base.lproj/Main.storyboard b/mobile/ios/F-Chat/Base.lproj/Main.storyboard
new file mode 100644
index 0000000..6b9fa94
--- /dev/null
+++ b/mobile/ios/F-Chat/Base.lproj/Main.storyboard
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+ <device id="retina4_7" orientation="portrait">
+ <adaptation id="fullscreen"/>
+ </device>
+ <dependencies>
+ <deployment identifier="iOS"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+ <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+ <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+ </dependencies>
+ <scenes>
+ <!--View Controller-->
+ <scene sceneID="tne-QT-ifu">
+ <objects>
+ <viewController id="BYZ-38-t0r" customClass="ViewController" customModule="F_Chat" customModuleProvider="target" sceneMemberID="viewController">
+ <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
+ <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
+ </view>
+ </viewController>
+ <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
+ </objects>
+ </scene>
+ </scenes>
+</document>
diff --git a/mobile/ios/F-Chat/File.swift b/mobile/ios/F-Chat/File.swift
new file mode 100644
index 0000000..4d893c4
--- /dev/null
+++ b/mobile/ios/F-Chat/File.swift
@@ -0,0 +1,99 @@
+import Foundation
+import WebKit
+
+class File: NSObject, WKScriptMessageHandler {
+ let encoder = JSONEncoder()
+ let fm = FileManager.default;
+ let baseDir = FileManager.default.urls(for: .applicationSupportDirectory, in: .userDomainMask).first!
+
+ override init() {
+ super.init();
+ try! fm.createDirectory(at: baseDir, withIntermediateDirectories: true, attributes: nil)
+ }
+
+ func escape(_ str: String) -> String {
+ return "'" + str.replacingOccurrences(of: "\'", with: "\\\'").replacingOccurrences(of: "\n", with: "\\n") + "'"
+ }
+
+ func userContentController(_ controller: WKUserContentController, didReceive message: WKScriptMessage) {
+ let data = message.body as! [String: AnyObject]
+ let key = data["_id"] as! String
+ do {
+ var result: String?
+ switch(data["_type"] as! String) {
+ case "readFile":
+ result = try readFile(data["name"] as! String, (data["start"] as! NSNumber?)?.uint64Value, data["length"] as! Int?)
+ case "writeFile":
+ try writeFile(data["name"] as! String, data["data"] as! String)
+ case "append":
+ try append(data["name"] as! String, data["data"] as! String)
+ case "listDirectories":
+ result = try listDirectories(data["name"] as! String)
+ case "listFiles":
+ result = try listFiles(data["name"] as! String)
+ case "getSize":
+ result = try getSize(data["name"] as! String)
+ case "ensureDirectory":
+ try ensureDirectory(data["name"] as! String)
+ default:
+ message.webView!.evaluateJavaScript("nativeError('\(key)',new Error('Unknown message type'))")
+ return
+ }
+ let output = result == nil ? "undefined" : result!;
+ message.webView!.evaluateJavaScript("nativeMessage('\(key)',\(output))")
+ } catch(let error) {
+ message.webView!.evaluateJavaScript("nativeError('\(key)',new Error('File-\(data["_type"]!): \(error.localizedDescription)'))")
+ }
+ }
+
+ func readFile(_ name: String, _ start: UInt64?, _ length: Int?) throws -> String? {
+ let url = baseDir.appendingPathComponent(name, isDirectory: false);
+ if(!fm.fileExists(atPath: url.path)) { return nil }
+ let fd = try FileHandle(forReadingFrom: url)
+ fd.seek(toFileOffset: start ?? 0)
+ let data: Data = length != nil ? fd.readData(ofLength: length!) : fd.readDataToEndOfFile();
+ fd.closeFile()
+ return escape(String(data: data, encoding: .utf8)!)
+ }
+
+ func writeFile(_ name: String, _ data: String) throws {
+ try data.write(to: baseDir.appendingPathComponent(name, isDirectory: false), atomically: true, encoding: .utf8)
+ }
+
+ func append(_ name: String, _ data: String) throws {
+ let url = baseDir.appendingPathComponent(name, isDirectory: false);
+ if(!fm.fileExists(atPath: url.path)) {
+ fm.createFile(atPath: url.path, contents: nil)
+ }
+ let fd = try FileHandle(forWritingTo: url)
+ fd.seekToEndOfFile()
+ fd.write(data.data(using: .utf8)!)
+ fd.closeFile()
+ }
+
+ func listDirectories(_ name: String) throws -> String {
+ let dirs = try fm.contentsOfDirectory(at: baseDir.appendingPathComponent(name, isDirectory: true), includingPropertiesForKeys: nil,
+ options: [.skipsHiddenFiles]).filter {
+ try $0.resourceValues(forKeys: [.isDirectoryKey]).isDirectory == true
+ }.map { $0.lastPathComponent }
+ return escape(String(data: try JSONSerialization.data(withJSONObject: dirs), encoding: .utf8)!);
+ }
+
+ func listFiles(_ name: String) throws -> String {
+ let files = try fm.contentsOfDirectory(at: baseDir.appendingPathComponent(name, isDirectory: true), includingPropertiesForKeys: nil,
+ options: [.skipsHiddenFiles]).filter {
+ try $0.resourceValues(forKeys: [.isDirectoryKey]).isDirectory == false
+ }.map { $0.lastPathComponent }
+ return escape(String(data: try JSONSerialization.data(withJSONObject: files), encoding: .utf8)!);
+ }
+
+ func getSize(_ name: String) throws -> String {
+ let path = baseDir.appendingPathComponent(name, isDirectory: false).path;
+ if(!fm.fileExists(atPath: path)) { return "0"; }
+ return String(try fm.attributesOfItem(atPath: path)[.size] as! UInt64)
+ }
+
+ func ensureDirectory(_ name: String) throws {
+ try fm.createDirectory(at: baseDir.appendingPathComponent(name, isDirectory: true), withIntermediateDirectories: true, attributes: nil)
+ }
+}
diff --git a/mobile/ios/F-Chat/Info.plist b/mobile/ios/F-Chat/Info.plist
new file mode 100644
index 0000000..16e5fc9
--- /dev/null
+++ b/mobile/ios/F-Chat/Info.plist
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>$(DEVELOPMENT_LANGUAGE)</string>
+ <key>CFBundleExecutable</key>
+ <string>$(EXECUTABLE_NAME)</string>
+ <key>CFBundleIdentifier</key>
+ <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string>$(PRODUCT_NAME)</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleShortVersionString</key>
+ <string>1.0</string>
+ <key>CFBundleVersion</key>
+ <string>1</string>
+ <key>LSRequiresIPhoneOS</key>
+ <true/>
+ <key>UIBackgroundModes</key>
+ <array>
+ <string>audio</string>
+ </array>
+ <key>UILaunchStoryboardName</key>
+ <string>LaunchScreen</string>
+ <key>UIMainStoryboardFile</key>
+ <string>Main</string>
+ <key>UIRequiredDeviceCapabilities</key>
+ <array>
+ <string>armv7</string>
+ </array>
+ <key>UISupportedInterfaceOrientations</key>
+ <array>
+ <string>UIInterfaceOrientationPortrait</string>
+ <string>UIInterfaceOrientationLandscapeLeft</string>
+ <string>UIInterfaceOrientationLandscapeRight</string>
+ </array>
+ <key>UISupportedInterfaceOrientations~ipad</key>
+ <array>
+ <string>UIInterfaceOrientationPortrait</string>
+ <string>UIInterfaceOrientationPortraitUpsideDown</string>
+ <string>UIInterfaceOrientationLandscapeLeft</string>
+ <string>UIInterfaceOrientationLandscapeRight</string>
+ </array>
+ <key>UIViewControllerBasedStatusBarAppearance</key>
+ <false/>
+</dict>
+</plist>
diff --git a/mobile/ios/F-Chat/Notification.swift b/mobile/ios/F-Chat/Notification.swift
new file mode 100644
index 0000000..1b7848f
--- /dev/null
+++ b/mobile/ios/F-Chat/Notification.swift
@@ -0,0 +1,53 @@
+import Foundation
+import UserNotifications
+import WebKit
+
+class Notification: NSObject, WKScriptMessageHandler, UNUserNotificationCenterDelegate {
+ let center = UNUserNotificationCenter.current()
+ let baseDir = FileManager.default.urls(for: .applicationSupportDirectory, in: .userDomainMask).first!
+ var webView: WKWebView!
+
+ func userContentController(_ controller: WKUserContentController, didReceive message: WKScriptMessage) {
+ center.delegate = self
+ self.webView = message.webView
+ let data = message.body as! [String: AnyObject]
+ let key = data["_id"] as! String
+ let callback = { (result: String?) in
+ let output = result == nil ? "undefined" : "'\(result!)'";
+ DispatchQueue.main.async {
+ message.webView!.evaluateJavaScript("nativeMessage('\(key)',\(output))")
+ }
+ }
+ switch(data["_type"] as! String) {
+ case "notify":
+ notify(data["title"] as! String, data["text"] as! String, data["icon"] as! String, data["data"] as! String, callback)
+ case "requestPermission":
+ requestPermission(callback)
+ default:
+ message.webView!.evaluateJavaScript("nativeError('\(key)',new Error('Unknown message type'))")
+ return
+ }
+ }
+
+ func userNotificationCenter(_ center: UNUserNotificationCenter, didReceive response: UNNotificationResponse, withCompletionHandler completionHandler: @escaping () -> Void) {
+ if(response.actionIdentifier == UNNotificationDefaultActionIdentifier) {
+ webView.evaluateJavaScript("document.dispatchEvent(new CustomEvent('notification-clicked',{detail:{data:'\(response.notification.request.content.userInfo["data"]!)'}}))")
+ }
+ completionHandler()
+ }
+
+ func notify(_ title: String, _ text: String, _ icon: String, _ data: String, _ cb: (String?) -> Void) {
+ let content = UNMutableNotificationContent()
+ content.title = title
+ content.body = text
+ content.userInfo["data"] = data
+ center.add(UNNotificationRequest(identifier: "1", content: content, trigger: UNTimeIntervalNotificationTrigger.init(timeInterval: 1, repeats: false)))
+ cb("1");
+ }
+
+ func requestPermission(_ cb: @escaping (String?) -> Void) {
+ center.requestAuthorization(options: [.alert, .sound]) { (_, _) in
+ cb(nil)
+ }
+ }
+}
diff --git a/mobile/ios/F-Chat/View.swift b/mobile/ios/F-Chat/View.swift
new file mode 100644
index 0000000..cfb1881
--- /dev/null
+++ b/mobile/ios/F-Chat/View.swift
@@ -0,0 +1,22 @@
+import Foundation
+
+import WebKit
+
+class View: NSObject, WKScriptMessageHandler {
+ func userContentController(_ controller: WKUserContentController, didReceive message: WKScriptMessage) {
+ let data = message.body as! [String: AnyObject]
+ let key = data["_id"] as! String
+ switch(data["_type"] as! String) {
+ case "setTheme":
+ setTheme(data["theme"] as! String)
+ default:
+ message.webView!.evaluateJavaScript("nativeError('\(key)',new Error('Unknown message type'))")
+ return
+ }
+ message.webView!.evaluateJavaScript("nativeMessage('\(key)',undefined)")
+ }
+
+ func setTheme(_ theme: String) {
+ UIApplication.shared.statusBarStyle = theme == "light" ? .default : .lightContent;
+ }
+}
diff --git a/mobile/ios/F-Chat/ViewController.swift b/mobile/ios/F-Chat/ViewController.swift
new file mode 100644
index 0000000..cebebbd
--- /dev/null
+++ b/mobile/ios/F-Chat/ViewController.swift
@@ -0,0 +1,61 @@
+import UIKit
+import WebKit
+import AVFoundation
+
+class ViewController: UIViewController, WKNavigationDelegate, WKUIDelegate {
+ var webView: WKWebView!
+ var player = try! AVAudioPlayer(contentsOf: Bundle.main.url(forResource: "www/sounds/login", withExtension: "wav")!)
+
+ override func loadView() {
+ let config = WKWebViewConfiguration()
+ let controller = WKUserContentController()
+ let scriptPath = Bundle.main.path(forResource: "native", ofType: "js")
+ let js = try! String(contentsOfFile: scriptPath!)
+ let userScript = WKUserScript(source: js, injectionTime: WKUserScriptInjectionTime.atDocumentStart, forMainFrameOnly: false)
+ controller.addUserScript(userScript)
+ controller.add(File(), name: "File")
+ controller.add(Notification(), name: "Notification")
+ controller.add(View(), name: "View")
+ config.userContentController = controller
+ config.mediaTypesRequiringUserActionForPlayback = [.video]
+ config.setValue(true, forKey: "_alwaysRunsAtForegroundPriority")
+ webView = WKWebView(frame: .zero, configuration: config)
+ webView.uiDelegate = self
+ view = webView
+ }
+
+ override func viewDidLoad() {
+ super.viewDidLoad()
+ let htmlPath = Bundle.main.path(forResource: "www/index", ofType: "html")
+ let url = URL(fileURLWithPath: htmlPath!, isDirectory: false)
+ webView.loadFileURL(url, allowingReadAccessTo: url)
+ webView.navigationDelegate = self
+ webView.scrollView.isScrollEnabled = false
+ let session = AVAudioSession.sharedInstance();
+ try! session.setCategory(AVAudioSessionCategoryPlayback, with: .mixWithOthers)
+ player.volume = 0
+ player.numberOfLoops = -1;
+ player.play()
+ }
+
+ override func didReceiveMemoryWarning() {
+ super.didReceiveMemoryWarning()
+ // Dispose of any resources that can be recreated.
+ }
+
+ func webView(_ webView: WKWebView, runJavaScriptAlertPanelWithMessage message: String, initiatedByFrame frame: WKFrameInfo,
+ completionHandler: @escaping () -> Void) {
+ let alertController = UIAlertController(title: nil, message: message, preferredStyle: .actionSheet)
+ alertController.addAction(UIAlertAction(title: NSLocalizedString("OK", comment: "OK"), style: .default, handler: { (action) in completionHandler() }))
+ present(alertController, animated: true, completion: nil)
+ }
+
+ func webView(_ webView: WKWebView, runJavaScriptConfirmPanelWithMessage message: String, initiatedByFrame frame: WKFrameInfo,
+ completionHandler: @escaping (Bool) -> Void) {
+ let alertController = UIAlertController(title: nil, message: message, preferredStyle: .actionSheet)
+ alertController.addAction(UIAlertAction(title: NSLocalizedString("OK", comment: "OK"), style: .default, handler: { (action) in completionHandler(true) }))
+ alertController.addAction(UIAlertAction(title: NSLocalizedString("Cancel", comment: "Cancel"), style: .cancel, handler: { (action) in completionHandler(false) }))
+ present(alertController, animated: true, completion: nil)
+ }
+}
+
diff --git a/mobile/ios/F-Chat/en.lproj/Localizable.strings b/mobile/ios/F-Chat/en.lproj/Localizable.strings
new file mode 100644
index 0000000..b4cf972
--- /dev/null
+++ b/mobile/ios/F-Chat/en.lproj/Localizable.strings
@@ -0,0 +1,2 @@
+"Cancel" = "Cancel";
+"OK" = "OK";
diff --git a/mobile/ios/F-Chat/native.js b/mobile/ios/F-Chat/native.js
new file mode 100644
index 0000000..4555696
--- /dev/null
+++ b/mobile/ios/F-Chat/native.js
@@ -0,0 +1,60 @@
+var key = 0;
+var handlers = {};
+
+function sendMessage(handler, type, data) {
+ return new Promise(function(resolve, reject) {
+ data._id = "m" + key++;
+ data._type = type;
+ window.webkit.messageHandlers[handler].postMessage(data);
+ handlers[data._id] = {resolve: resolve, reject: reject};
+ });
+}
+
+window.nativeMessage = function(key, data) {
+ handlers[key].resolve(data);
+ delete handlers[key];
+};
+
+window.nativeError = function(key, error) {
+ handlers[key].reject(error);
+ delete handlers[key];
+};
+
+window.NativeFile = {
+ readFile: function(name, start, length) {
+ return sendMessage('File', 'readFile', {name: name, start: start, length: length});
+ },
+ writeFile: function(name, data) {
+ return sendMessage('File', 'writeFile', {name: name, data: data});
+ },
+ append: function(name, data) {
+ return sendMessage('File', 'append', {name: name, data: data});
+ },
+ listDirectories: function(name) {
+ return sendMessage('File', 'listDirectories', {name: name});
+ },
+ listFiles: function(name) {
+ return sendMessage('File', 'listFiles', {name: name});
+ },
+ getSize: function(name) {
+ return sendMessage('File', 'getSize', {name: name});
+ },
+ ensureDirectory: function(name) {
+ return sendMessage('File', 'ensureDirectory', {name: name});
+ }
+};
+
+window.NativeNotification = {
+ notify: function(title, text, icon, data) {
+ return sendMessage('Notification', 'notify', {title: title, text: text, icon: icon, data: data});
+ },
+ requestPermission: function() {
+ return sendMessage('Notification', 'requestPermission', {});
+ }
+};
+
+window.NativeView = {
+ setTheme: function(theme) {
+ return sendMessage('View', 'setTheme', {theme: theme})
+ }
+};
diff --git a/mobile/ios/F-Chat/www b/mobile/ios/F-Chat/www
new file mode 100644
index 0000000..933a599
--- /dev/null
+++ b/mobile/ios/F-Chat/www
@@ -0,0 +1 @@
+../../www
\ No newline at end of file
diff --git a/mobile/notifications.ts b/mobile/notifications.ts
new file mode 100644
index 0000000..b140850
--- /dev/null
+++ b/mobile/notifications.ts
@@ -0,0 +1,27 @@
+import core from '../chat/core';
+import {Conversation} from '../chat/interfaces';
+import BaseNotifications from '../chat/notifications'; //tslint:disable-line:match-default-export-name
+
+declare global {
+ const NativeNotification: {
+ notify(notify: boolean, title: string, text: string, icon: string, sound: string | undefined, data: string): void
+ requestPermission(): void
+ };
+}
+
+document.addEventListener('notification-clicked', (e: Event) => {
+ const conv = core.conversations.byKey((<Event & {detail: {data: string}}>e).detail.data);
+ if(conv !== undefined) conv.show();
+});
+
+export default class Notifications extends BaseNotifications {
+ notify(conversation: Conversation, title: string, body: string, icon: string, sound: string): void {
+ if(!this.isInBackground && conversation === core.conversations.selectedConversation && !core.state.settings.alwaysNotify) return;
+ NativeNotification.notify(core.state.settings.notifications && this.isInBackground, title, body, icon,
+ core.state.settings.playSound ? sound : undefined, conversation.key);
+ }
+
+ async requestPermission(): Promise<void> {
+ NativeNotification.requestPermission();
+ }
+}
\ No newline at end of file
diff --git a/mobile/package.json b/mobile/package.json
new file mode 100644
index 0000000..b09213c
--- /dev/null
+++ b/mobile/package.json
@@ -0,0 +1,17 @@
+{
+ "name": "net.f_list.fchat",
+ "version": "0.2.10",
+ "displayName": "F-Chat",
+ "author": "The F-List Team",
+ "description": "F-List.net Chat Client",
+ "main": "main.js",
+ "license": "MIT",
+ "scripts": {
+ "build": "../node_modules/.bin/webpack",
+ "build:dist": "../node_modules/.bin/webpack --env production",
+ "watch": "../node_modules/.bin/webpack --watch"
+ },
+ "devDependencies": {
+ "qs": "^6.5.1"
+ }
+}
\ No newline at end of file
diff --git a/cordova/tsconfig.json b/mobile/tsconfig.json
similarity index 100%
rename from cordova/tsconfig.json
rename to mobile/tsconfig.json
diff --git a/cordova/webpack.config.js b/mobile/webpack.config.js
similarity index 100%
rename from cordova/webpack.config.js
rename to mobile/webpack.config.js
diff --git a/mobile/yarn.lock b/mobile/yarn.lock
new file mode 100644
index 0000000..b6a76a7
--- /dev/null
+++ b/mobile/yarn.lock
@@ -0,0 +1,7 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+qs@^6.5.1:
+ version "6.5.1"
+ resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
diff --git a/package.json b/package.json
index 7c4a9c3..317424b 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
"@types/jquery": "^3.2.11",
"@types/node": "^8.0.31",
"@types/sortablejs": "^1.3.31",
- "axios": "^0.16.2",
+ "axios": "^0.17.1",
"bootstrap": "^3.3.7",
"css-loader": "^0.28.4",
"date-fns": "^1.28.5",
@@ -24,7 +24,7 @@
"ts-loader": "^3.0.2",
"tslint": "^5.7.0",
"typescript": "^2.4.2",
- "uglifyjs-webpack-plugin": "1.0.0-beta.3",
+ "uglifyjs-webpack-plugin": "1.1.6",
"url-loader": "^0.6.2",
"vue": "^2.4.2",
"vue-class-component": "^6.0.0",
diff --git a/readme.md b/readme.md
index 8e1cc52..bcd041e 100644
--- a/readme.md
+++ b/readme.md
@@ -1,6 +1,6 @@
# F-List Exported
This repository contains the open source parts of F-list and F-Chat 3.0.
-All necessary files to build F-Chat 3.0 as an Electron, Cordova or web application are included.
+All necessary files to build F-Chat 3.0 as an Electron, mobile or web application are included.
## Setting up a Dev Environment
- Clone the repo
@@ -9,7 +9,7 @@ All necessary files to build F-Chat 3.0 as an Electron, Cordova or web applicati
- IntelliJ IDEA is recommended for development.
## Building for Electron
- - To build native Node assets, you will need to install Python 2.7 and the Visual C++ 2015 Build tools. [More information can be found in the node-gyp docs.](https://github.com/nodejs/node-gyp#installation)
+ - To build native Node assets, you will need to install Python 2.7 and the build tools for your platform. [More information can be found in the node-gyp docs.](https://github.com/nodejs/node-gyp#installation)
- Change into the `electron` directory.
- Run `yarn install` and then `yarn build`/`yarn watch` to build assets. They are placed into the `app` directory.
- You will probably need to rebuild the native dependencies (`spellchecker` and `keytar`) for electron. To do so, run `npm rebuild {NAME} --target={ELECTRON_VERSION} --arch=x64 --dist-url=https://atom.io/download/electron`. [See the electron documentation for more info.](https://github.com/electron/electron/blob/master/docs/tutorial/using-native-node-modules.md)
@@ -20,14 +20,11 @@ See https://electron.atom.io/docs/tutorial/application-distribution/
- Run `yarn build:dist` to create a minified production build.
- Run `./node_modules/.bin/electron-builder` with [options specifying the platform you want to build for](https://www.electron.build/cli).
-## Building for Cordova
- - Change into the `cordova` directory.
- - Install Cordova using `yarn global add cordova`.
- - Run `yarn install`.
- - Create a `www` directory inside the `cordova` directory and then run `cordova prepare` to install dependencies.
- - Run `cordova requirements` to see whether all requirements for building are installed.
- - Run `yarn build`/`yarn watch` to build assets. They are placed into the `www` directory.
- - Run `cordova build`. For Android, the generated APK is now in `platforms/android/build/outputs/apk`.
+## Building for Mobile
+ - Change into the `mobile` directory.
+ - Run `yarn install` and then `yarn build`/`yarn watch` to build assets. They are placed into the `www` directory.
+ - For Android, change into the `android` directory and run `gradlew assembleDebug`. The generated APK is placed into `app/build/outputs/apk`.
+ - For iOS, change into the `ios` directory and open `F-Chat.xcodeproj` using XCode. From there, simply run the App using the play button.
## Building a custom theme
See [the wiki](https://wiki.f-list.net/F-Chat_3.0/Themes) for instructions on how to create a custom theme.
diff --git a/site/character_page/character_page.vue b/site/character_page/character_page.vue
index b4ed63f..f36ec9b 100644
--- a/site/character_page/character_page.vue
+++ b/site/character_page/character_page.vue
@@ -1,12 +1,12 @@
<template>
<div class="row character-page" id="pageBody">
- <div class="alert alert-info" v-show="loading">Loading character information.</div>
- <div class="alert alert-danger" v-show="error">{{error}}</div>
- <div class="col-xs-2" v-if="!loading">
- <sidebar :character="character" @memo="memo" @bookmarked="bookmarked"></sidebar>
+ <div class="alert alert-info" v-show="loading" style="margin:0 15px">Loading character information.</div>
+ <div class="alert alert-danger" v-show="error" style="margin:0 15px">{{error}}</div>
+ <div class="col-sm-3 col-md-2" v-if="!loading">
+ <sidebar :character="character" @memo="memo" @bookmarked="bookmarked" :oldApi="oldApi"></sidebar>
</div>
- <div class="col-xs-10" v-if="!loading">
- <div id="characterView" class="row">
+ <div class="col-sm-9 col-md-10 profile-body" v-if="!loading">
+ <div id="characterView">
<div>
<div v-if="character.ban_reason" id="headerBanReason" class="alert alert-warning">
This character has been banned and is not visible to the public. Reason:
@@ -20,11 +20,11 @@
<br/> {{ character.block_reason }}
</div>
<div v-if="character.memo" id="headerCharacterMemo" class="alert alert-info">Memo: {{ character.memo.memo }}</div>
- <ul class="nav nav-tabs" role="tablist" style="margin-bottom:5px">
+ <ul class="nav nav-tabs" role="tablist">
<li role="presentation" class="active"><a href="#overview" aria-controls="overview" role="tab" data-toggle="tab">Overview</a>
</li>
<li role="presentation"><a href="#infotags" aria-controls="infotags" role="tab" data-toggle="tab">Info</a></li>
- <li role="presentation" v-if="!hideGroups"><a href="#groups" aria-controls="groups" role="tab" data-toggle="tab">Groups</a>
+ <li role="presentation" v-if="!oldApi"><a href="#groups" aria-controls="groups" role="tab" data-toggle="tab">Groups</a>
</li>
<li role="presentation"><a href="#images" aria-controls="images" role="tab"
data-toggle="tab">Images ({{ character.character.image_count }})</a></li>
@@ -36,13 +36,14 @@
<div class="tab-content">
<div role="tabpanel" class="tab-pane active" id="overview" aria-labeledby="overview-tab">
- <div v-bbcode="character.character.description" class="well"></div>
- <character-kinks :character="character"></character-kinks>
+ <div v-bbcode="character.character.description" class="well"
+ style="border-top:0;border-top-left-radius:0;border-top-right-radius:0;"></div>
+ <character-kinks :character="character" :oldApi="oldApi"></character-kinks>
</div>
<div role="tabpanel" class="tab-pane" id="infotags" aria-labeledby="infotags-tab">
<character-infotags :character="character"></character-infotags>
</div>
- <div role="tabpanel" class="tab-pane" id="groups" aria-labeledby="groups-tab" v-if="!hideGroups">
+ <div role="tabpanel" class="tab-pane" id="groups" aria-labeledby="groups-tab" v-if="!oldApi">
<character-groups :character="character" ref="groups"></character-groups>
</div>
<div role="tabpanel" class="tab-pane" id="images" aria-labeledby="images-tab">
@@ -106,7 +107,7 @@
@Prop({required: true})
private readonly authenticated: boolean;
@Prop()
- readonly hideGroups?: true;
+ readonly oldApi?: true;
@Prop()
readonly imagePreview?: true;
private shared: SharedStore = Store;
@@ -118,8 +119,8 @@
this.shared.authenticated = this.authenticated;
}
- mounted(): void {
- if(this.character === null) this._getCharacter().then(); //tslint:disable-line:no-floating-promises
+ async mounted(): Promise<void> {
+ if(this.character === null) await this._getCharacter();
}
beforeDestroy(): void {
@@ -134,8 +135,8 @@
}
@Watch('name')
- onCharacterSet(): void {
- this._getCharacter().then(); //tslint:disable-line:no-floating-promises
+ async onCharacterSet(): Promise<void> {
+ return this._getCharacter();
}
memo(memo: {id: number, memo: string}): void {
diff --git a/site/character_page/friend_dialog.vue b/site/character_page/friend_dialog.vue
index fa60302..e793b7d 100644
--- a/site/character_page/friend_dialog.vue
+++ b/site/character_page/friend_dialog.vue
@@ -1,101 +1,84 @@
<template>
- <div id="friendDialog" tabindex="-1" class="modal" ref="dialog">
- <div class="modal-dialog">
- <div class="modal-content">
- <div class="modal-header">
- <button type="button" class="close" data-dismiss="modal"
- aria-label="Close">×
- </button>
- <h4 class="modal-title">Friends for {{name}}</h4>
- </div>
- <div class="modal-body">
- <div v-show="loading" class="alert alert-info">Loading friend information.</div>
- <div v-show="error" class="alert alert-danger">{{error}}</div>
- <template v-if="!loading">
- <div v-if="existing.length" class="well">
- <h4>Existing Friendships</h4>
- <hr>
- <div v-for="friend in existing">
- <character-link :character="request.source"><img class="character-avatar icon"
- :src="avatarUrl(request.source.name)"/>
- {{request.source.name}}
- </character-link>
- Since:
- <date-display :time="friend.createdAt"></date-display>
- <button type="button" class="btn btn-danger"
- @click="dissolve(friend)">
- Remove
- </button>
- </div>
- </div>
- <div v-if="pending.length" class="well">
- <h4>Pending Requests To Character</h4>
- <hr>
- <div v-for="request in pending">
- <character-link :character="request.source"><img class="character-avatar icon"
- :src="avatarUrl(request.source.name)"/>
- {{request.source.name}}
- </character-link>
- Sent:
- <date-display :time="request.createdAt"></date-display>
- <button type="button" class="btn btn-danger"
- @click="cancel(request)">
- Cancel
- </button>
- </div>
- </div>
- <div v-if="incoming.length" class="well">
- <h4>Pending Requests From Character</h4>
- <hr>
- <div v-for="request in incoming">
- <character-link :character="request.target"><img class="character-avatar icon"
- :src="avatarUrl(request.target.name)"/>
- {{request.target.name}}
- </character-link>
- Sent:
- <date-display :time="request.createdAt"></date-display>
- <button type="button" class="btn btn-success acceptFriend"
- @click="accept(request)">
- Accept
- </button>
- <button type="button" class="btn btn-danger ignoreFriend"
- @click="ignore(request)">
- Ignore
- </button>
- </div>
- </div>
- <div class="well">
- <h4>Request Friendship</h4>
- <hr>
- <div class="form-inline">
- <label class="control-label"
- for="friendRequestCharacter">Character: </label>
- <character-select id="friendRequestCharacter" v-model="ourCharacter"></character-select>
- <button @click="request" class="btn btn-default" :disable="requesting || !ourCharacter">Request</button>
- </div>
- </div>
- </template>
- </div>
- <div class="modal-footer">
- <button type="button" class="btn btn-default" data-dismiss="modal">
- Close
+ <Modal id="memoDialog" :action="'Friends for ' + name" :buttons="false">
+ <div v-show="loading" class="alert alert-info">Loading friend information.</div>
+ <div v-show="error" class="alert alert-danger">{{error}}</div>
+ <template v-if="!loading">
+ <div v-if="existing.length" class="well">
+ <h4>Existing Friendships</h4>
+ <hr>
+ <div v-for="friend in existing" class="friend-item">
+ <character-link :character="friend.source"><img class="character-avatar icon"
+ :src="avatarUrl(friend.source.name)"/>
+ {{friend.source.name}}
+ </character-link>
+ <span class="date">Since: <date-display :time="friend.createdAt"></date-display></span>
+ <button type="button" class="btn btn-danger"
+ @click="dissolve(friend)">
+ Remove
</button>
</div>
</div>
- </div>
- </div>
+ <div v-if="pending.length" class="well">
+ <h4>Pending Requests To Character</h4>
+ <hr>
+ <div v-for="request in pending" class="friend-item">
+ <character-link :character="request.source"><img class="character-avatar icon"
+ :src="avatarUrl(request.source.name)"/>
+ {{request.source.name}}
+ </character-link>
+ <span class="date">Sent: <date-display :time="request.createdAt"></date-display></span>
+ <button type="button" class="btn btn-danger"
+ @click="cancel(request)">
+ Cancel
+ </button>
+ </div>
+ </div>
+ <div v-if="incoming.length" class="well">
+ <h4>Pending Requests From Character</h4>
+ <hr>
+ <div v-for="request in incoming" class="friend-item">
+ <character-link :character="request.target"><img class="character-avatar icon"
+ :src="avatarUrl(request.target.name)"/>
+ {{request.target.name}}
+ </character-link>
+ <span class="date">Sent: <date-display :time="request.createdAt"></date-display></span>
+ <button type="button" class="btn btn-success acceptFriend"
+ @click="accept(request)">
+ Accept
+ </button>
+ <button type="button" class="btn btn-danger ignoreFriend"
+ @click="ignore(request)">
+ Ignore
+ </button>
+ </div>
+ </div>
+ <div class="well">
+ <h4>Request Friendship</h4>
+ <hr>
+ <div class="form-inline">
+ <label class="control-label"
+ for="friendRequestCharacter">Character: </label>
+ <character-select id="friendRequestCharacter" v-model="ourCharacter"></character-select>
+ <button @click="request" class="btn btn-default" :disable="requesting || !ourCharacter">Request</button>
+ </div>
+ </div>
+ </template>
+ </Modal>
</template>
<script lang="ts">
- import Vue from 'vue';
import Component from 'vue-class-component';
import {Prop} from 'vue-property-decorator';
+ import CustomDialog from '../../components/custom_dialog';
+ import Modal from '../../components/Modal.vue';
import * as Utils from '../utils';
import {methods} from './data_store';
import {Character, Friend, FriendRequest} from './interfaces';
- @Component
- export default class FriendDialog extends Vue {
+ @Component({
+ components: {Modal}
+ })
+ export default class FriendDialog extends CustomDialog {
@Prop({required: true})
private readonly character: Character;
@@ -130,8 +113,8 @@
async dissolve(friendship: Friend): Promise<void> {
try {
- await methods.friendDissolve(friendship.id);
- this.existing = Utils.filterOut(this.existing, 'id', friendship.id);
+ await methods.friendDissolve(friendship);
+ this.existing.splice(this.existing.indexOf(friendship), 1);
} catch(e) {
if(Utils.isJSONError(e))
this.error = <string>e.response.data.error;
@@ -141,8 +124,9 @@
async accept(request: FriendRequest): Promise<void> {
try {
- const friend = await methods.friendRequestAccept(request.id);
+ const friend = await methods.friendRequestAccept(request);
this.existing.push(friend);
+ this.incoming.splice(this.incoming.indexOf(request), 1);
} catch(e) {
if(Utils.isJSONError(e))
this.error = <string>e.response.data.error;
@@ -152,8 +136,8 @@
async cancel(request: FriendRequest): Promise<void> {
try {
- await methods.friendRequestCancel(request.id);
- this.pending = Utils.filterOut(this.pending, 'id', request.id);
+ await methods.friendRequestCancel(request);
+ this.pending.splice(this.pending.indexOf(request), 1);
} catch(e) {
if(Utils.isJSONError(e))
this.error = <string>e.response.data.error;
@@ -163,8 +147,8 @@
async ignore(request: FriendRequest): Promise<void> {
try {
- await methods.friendRequestIgnore(request.id);
- this.incoming = Utils.filterOut(this.incoming, 'id', request.id);
+ await methods.friendRequestIgnore(request);
+ this.incoming.splice(this.incoming.indexOf(request), 1);
} catch(e) {
if(Utils.isJSONError(e))
this.error = <string>e.response.data.error;
@@ -173,7 +157,7 @@
}
async show(): Promise<void> {
- $(this.$refs['dialog']).modal('show');
+ super.show();
try {
this.loading = true;
const friendData = await methods.characterFriends(this.character.character.id);
diff --git a/site/character_page/guestbook_post.vue b/site/character_page/guestbook_post.vue
index 58473bd..0894da9 100644
--- a/site/character_page/guestbook_post.vue
+++ b/site/character_page/guestbook_post.vue
@@ -1,13 +1,13 @@
<template>
<div class="guestbook-post" :id="'guestbook-post-' + post.id">
<div class="guestbook-contents" :class="{deleted: post.deleted}">
- <div class="row">
- <div class="col-xs-1 guestbook-avatar">
+ <div style="display:flex;align-items:center">
+ <div class="guestbook-avatar">
<character-link :character="post.character">
<img :src="avatarUrl" class="character-avatar icon"/>
</character-link>
</div>
- <div class="col-xs-10">
+ <div style="flex:1;margin-left:10px">
<span v-show="post.private" class="post-private">*</span>
<span v-show="!post.approved" class="post-unapproved"> (unapproved)</span>
@@ -15,15 +15,13 @@
<character-link :character="post.character"></character-link>, posted <date-display
:time="post.postedAt"></date-display>
</span>
- <button class="btn btn-default" v-show="canEdit" @click="approve" :disabled="approving">
+ <button class="btn btn-default" v-show="canEdit" @click="approve" :disabled="approving" style="margin-left:10px">
{{ (post.approved) ? 'Unapprove' : 'Approve' }}
</button>
</div>
- <div class="col-xs-1 text-right">
- <button class="btn btn-danger" v-show="!post.deleted && (canEdit || post.canEdit)"
- @click="deletePost" :disabled="deleting">Delete
- </button>
- </div>
+ <button class="btn btn-danger" v-show="!post.deleted && (canEdit || post.canEdit)"
+ @click="deletePost" :disabled="deleting">Delete
+ </button>
</div>
<div class="row">
<div class="col-xs-12">
diff --git a/site/character_page/infotags.vue b/site/character_page/infotags.vue
index 730f058..75e3a1e 100644
--- a/site/character_page/infotags.vue
+++ b/site/character_page/infotags.vue
@@ -1,11 +1,9 @@
<template>
- <div class="infotags">
- <div class="infotag-group" v-for="group in groupedInfotags" :key="group.id">
- <div class="col-xs-2">
- <div class="infotag-title">{{group.name}}</div>
- <hr>
- <infotag :infotag="infotag" v-for="infotag in group.infotags" :key="infotag.id"></infotag>
- </div>
+ <div class="infotags row">
+ <div class="infotag-group col-sm-3" v-for="group in groupedInfotags" :key="group.id" style="margin-top:5px">
+ <div class="infotag-title">{{group.name}}</div>
+ <hr>
+ <infotag :infotag="infotag" v-for="infotag in group.infotags" :key="infotag.id"></infotag>
</div>
</div>
</template>
diff --git a/site/character_page/interfaces.ts b/site/character_page/interfaces.ts
index d4eb622..694cb5b 100644
--- a/site/character_page/interfaces.ts
+++ b/site/character_page/interfaces.ts
@@ -29,14 +29,15 @@ export interface StoreMethods {
characterReport(reportData: CharacterReportData): Promise<void>
contactMethodIconUrl(name: string): string
+ sendNoteUrl(character: CharacterInfo): string
fieldsGet(): Promise<void>
- friendDissolve(id: number): Promise<void>
+ friendDissolve(friend: Friend): Promise<void>
friendRequest(target: number, source: number): Promise<FriendRequest>
- friendRequestAccept(id: number): Promise<Friend>
- friendRequestIgnore(id: number): Promise<void>
- friendRequestCancel(id: number): Promise<void>
+ friendRequestAccept(request: FriendRequest): Promise<Friend>
+ friendRequestIgnore(request: FriendRequest): Promise<void>
+ friendRequestCancel(request: FriendRequest): Promise<void>
friendsGet(id: number): Promise<CharacterFriend[]>
diff --git a/site/character_page/kink.vue b/site/character_page/kink.vue
index 38bdd08..6bf3bab 100644
--- a/site/character_page/kink.vue
+++ b/site/character_page/kink.vue
@@ -1,14 +1,20 @@
<template>
- <div class="character-kink" :class="kinkClasses" :id="kinkId" :title="kink.description" @click="toggleSubkinks" :data-custom="customId">
+ <div class="character-kink" :class="kinkClasses" :id="kinkId" @click="toggleSubkinks" :data-custom="customId"
+ @mouseover.stop="showTooltip = true" @mouseout.stop="showTooltip = false">
<i v-show="kink.hasSubkinks" class="fa" :class="{'fa-minus': !listClosed, 'fa-plus': listClosed}"></i>
<i v-show="!kink.hasSubkinks && kink.isCustom" class="fa fa-dot-circle-o custom-kink-icon"></i>
<span class="kink-name">{{ kink.name }}</span>
<template v-if="kink.hasSubkinks">
<div class="subkink-list" :class="{closed: this.listClosed}">
- <kink v-for="subkink in kink.subkinks" :kink="subkink" :key="kink.id" :comparisons="comparisons"
+ <kink v-for="subkink in kink.subkinks" :kink="subkink" :key="subkink.id" :comparisons="comparisons"
:highlights="highlights"></kink>
</div>
</template>
+ <div class="popover top" v-if="showTooltip" style="display:block;bottom:100%;top:initial;margin-bottom:5px">
+ <div class="arrow" style="left:10%"></div>
+ <h3 class="popover-title">{{kink.name}}</h3>
+ <div class="popover-content"><p>{{kink.description}}</p></div>
+ </div>
</div>
</template>
@@ -29,6 +35,7 @@
@Prop({required: true})
readonly comparisons: {[key: number]: string | undefined};
listClosed = true;
+ showTooltip = false;
toggleSubkinks(): void {
if(!this.kink.hasSubkinks)
diff --git a/site/character_page/kinks.vue b/site/character_page/kinks.vue
index bce814e..c652f8e 100644
--- a/site/character_page/kinks.vue
+++ b/site/character_page/kinks.vue
@@ -15,7 +15,7 @@
</div>
</div>
<div class="character-kinks clearfix">
- <div class="col-xs-3 kinks-favorite">
+ <div class="col-xs-6 col-md-3 kinks-favorite">
<div class="kinks-column">
<div class="kinks-header">
Favorite
@@ -25,7 +25,7 @@
:comparisons="comparison"></kink>
</div>
</div>
- <div class="col-xs-3 kinks-yes">
+ <div class="col-xs-6 col-md-3 kinks-yes">
<div class="kinks-column">
<div class="kinks-header">
Yes
@@ -35,7 +35,7 @@
:comparisons="comparison"></kink>
</div>
</div>
- <div class="col-xs-3 kinks-maybe">
+ <div class="col-xs-6 col-md-3 kinks-maybe">
<div class="kinks-column">
<div class="kinks-header">
Maybe
@@ -45,7 +45,7 @@
:comparisons="comparison"></kink>
</div>
</div>
- <div class="col-xs-3 kinks-no">
+ <div class="col-xs-6 col-md-3 kinks-no">
<div class="kinks-column">
<div class="kinks-header">
No
@@ -56,7 +56,7 @@
</div>
</div>
</div>
- <context-menu v-if="shared.authenticated" prop-name="custom" ref="context-menu"></context-menu>
+ <context-menu v-if="shared.authenticated && !oldApi" prop-name="custom" ref="context-menu"></context-menu>
</div>
</template>
@@ -80,6 +80,8 @@
//tslint:disable:no-null-keyword
@Prop({required: true})
private readonly character: Character;
+ @Prop()
+ readonly oldApi?: true;
private shared = Store;
characterToCompare = Utils.Settings.defaultCharacter;
highlightGroup: number | null = null;
@@ -100,7 +102,7 @@
try {
this.loading = true;
this.comparing = true;
- const kinks = await methods.kinksGet(this.character.character.id);
+ const kinks = await methods.kinksGet(this.characterToCompare);
const toAssign: {[key: number]: KinkChoice} = {};
for(const kink of kinks)
toAssign[kink.id] = kink.choice;
@@ -177,7 +179,7 @@
for(const kinkId in characterKinks) {
const kinkChoice = characterKinks[kinkId]!;
const kink = kinks[kinkId];
- if(kink === undefined) return;
+ if(kink === undefined) continue;
const newKink = makeKink(kink);
if(typeof kinkChoice === 'number' && typeof displayCustoms[kinkChoice] !== 'undefined') {
const custom = displayCustoms[kinkChoice]!;
@@ -203,7 +205,7 @@
}
contextMenu(event: TouchEvent): void {
- (<CopyCustomMenu>this.$refs['context-menu']).outerClick(event);
+ if(this.shared.authenticated && !this.oldApi) (<CopyCustomMenu>this.$refs['context-menu']).outerClick(event);
}
}
</script>
\ No newline at end of file
diff --git a/site/character_page/memo_dialog.vue b/site/character_page/memo_dialog.vue
index 215bd43..7148fa3 100644
--- a/site/character_page/memo_dialog.vue
+++ b/site/character_page/memo_dialog.vue
@@ -1,41 +1,29 @@
<template>
- <div id="memoDialog" tabindex="-1" class="modal" ref="dialog">
- <div class="modal-dialog">
- <div class="modal-content">
- <div class="modal-header">
- <button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
- <h4 class="modal-title">Memo for {{name}}</h4>
- </div>
- <div class="modal-body">
- <div class="form-group" v-if="editing">
- <textarea v-model="message" maxlength="1000" class="form-control"></textarea>
- </div>
- <div v-if="!editing">
- <p>{{message}}</p>
-
- <p><a href="#" @click="editing=true">Edit</a></p>
- </div>
- </div>
- <div class="modal-footer">
- <button type="button" class="btn btn-default" data-dismiss="modal">
- Close
- </button>
- <button v-if="editing" class="btn btn-primary" @click="save" :disabled="saving">Save and Close</button>
- </div>
- </div>
+ <Modal id="memoDialog" :action="'Memo for ' + name" buttonText="Save and Close" @close="onClose" @submit="save">
+ <div class="form-group" v-if="editing">
+ <textarea v-model="message" maxlength="1000" class="form-control"></textarea>
</div>
- </div>
+ <div v-else>
+ <p>{{message}}</p>
+
+ <p><a href="#" @click="editing=true">Edit</a></p>
+ </div>
+ </Modal>
</template>
<script lang="ts">
- import Vue from 'vue';
import Component from 'vue-class-component';
import {Prop} from 'vue-property-decorator';
+ import CustomDialog from '../../components/custom_dialog';
+ import Modal from '../../components/Modal.vue';
+ import * as Utils from '../utils';
import {methods} from './data_store';
import {Character} from './interfaces';
- @Component
- export default class MemoDialog extends Vue {
+ @Component({
+ components: {Modal}
+ })
+ export default class MemoDialog extends CustomDialog {
@Prop({required: true})
private readonly character: Character;
@@ -48,24 +36,25 @@
}
show(): void {
+ super.show();
if(this.character.memo !== undefined)
this.message = this.character.memo.memo;
- $(this.$refs['dialog']).modal('show');
+ }
+
+ onClose(): void {
+ this.editing = false;
}
async save(): Promise<void> {
try {
this.saving = true;
const memoReply = await methods.memoUpdate(this.character.character.id, this.message);
- if(this.message === '')
- this.$emit('memo', undefined);
- else
- this.$emit('memo', memoReply);
- this.saving = false;
- $(this.$refs['dialog']).modal('hide');
+ this.$emit('memo', this.message !== '' ? memoReply : undefined);
+ this.hide();
} catch(e) {
- this.saving = false;
+ Utils.ajaxError(e, 'Unable to set memo.');
}
+ this.saving = false;
}
}
</script>
\ No newline at end of file
diff --git a/site/character_page/sidebar.vue b/site/character_page/sidebar.vue
index 5f9e604..f23448c 100644
--- a/site/character_page/sidebar.vue
+++ b/site/character_page/sidebar.vue
@@ -1,10 +1,12 @@
<template>
<div id="character-page-sidebar">
- <span class="character-name">{{ character.character.name }}</span>
- <div v-if="character.character.title" class="character-title">{{ character.character.title }}</div>
- <character-action-menu :character="character"></character-action-menu>
- <div>
- <img :src="avatarUrl(character.character.name)" class="character-avatar">
+ <div class="character-image-container">
+ <div>
+ <span class="character-name">{{ character.character.name }}</span>
+ <div v-if="character.character.title" class="character-title">{{ character.character.title }}</div>
+ <character-action-menu :character="character"></character-action-menu>
+ </div>
+ <img :src="avatarUrl(character.character.name)" class="character-avatar" style="margin-right:10px">
</div>
<div v-if="authenticated" class="character-links-block">
<template v-if="character.is_self">
@@ -13,16 +15,15 @@
<a @click="showDuplicate" class="duplicate-link"><i class="fa fa-copy"></i>Duplicate</a>
</template>
<template v-else>
- <span v-if="character.self_staff || character.settings.prevent_bookmarks !== true">
- <a @click="toggleBookmark" :class="{bookmarked: character.bookmarked, unbookmarked: !character.bookmarked}">
- {{ character.bookmarked ? '-' : '+' }}Bookmark
- </a>
- <span v-if="character.settings.prevent_bookmarks" class="prevents-bookmarks">!</span>
- </span>
- <a @click="showFriends" class="friend-link"><i class="fa fa-user"></i>Friend</a>
- <a @click="showReport" class="report-link"><i class="fa fa-exclamation-triangle"></i>Report</a>
+ <span v-if="character.self_staff || character.settings.prevent_bookmarks !== true">
+ <a @click="toggleBookmark" class="btn" :class="{bookmarked: character.bookmarked, unbookmarked: !character.bookmarked}">
+ {{ character.bookmarked ? '-' : '+' }} Bookmark</a>
+ <span v-if="character.settings.prevent_bookmarks" class="prevents-bookmarks">!</span>
+ </span>
+ <a @click="showFriends" class="friend-link btn"><i class="fa fa-fw fa-user"></i>Friend</a>
+ <a v-if="!oldApi" @click="showReport" class="report-link btn"><i class="fa fa-exclamation-triangle"></i>Report</a>
</template>
- <a @click="showMemo" class="memo-link"><i class="fa fa-sticky-note-o"></i>Memo</a>
+ <a @click="showMemo" class="memo-link btn"><i class="fa fa-sticky-note-o fa-fw"></i>Memo</a>
</div>
<div v-if="character.badges && character.badges.length > 0" class="badges-block">
<div v-for="badge in character.badges" class="character-badge" :class="badgeClass(badge)">
@@ -30,7 +31,8 @@
</div>
</div>
- <a v-if="authenticated && !character.is_self" :href="noteUrl" class="character-page-note-link">Send Note</a>
+ <a v-if="authenticated && !character.is_self" :href="noteUrl" class="character-page-note-link btn" style="padding:0 4px">
+ <span class="fa fa-envelope-o fa-fw"></span>Send Note</a>
<div v-if="character.character.online_chat" @click="showInChat" class="character-page-online-chat">Online In Chat</div>
<div class="contact-block">
@@ -65,7 +67,7 @@
<div class="character-list-block">
<div v-for="listCharacter in character.character_list">
- <img :src="avatarUrl(listCharacter.name)" class="character-avatar icon">
+ <img :src="avatarUrl(listCharacter.name)" class="character-avatar icon" style="margin-right:5px">
<character-link :character="listCharacter.name"></character-link>
</div>
</div>
@@ -74,7 +76,7 @@
<delete-dialog :character="character" ref="delete-dialog"></delete-dialog>
<rename-dialog :character="character" ref="rename-dialog"></rename-dialog>
<duplicate-dialog :character="character" ref="duplicate-dialog"></duplicate-dialog>
- <report-dialog v-if="authenticated && !character.is_self" :character="character" ref="report-dialog"></report-dialog>
+ <report-dialog v-if="!oldApi && authenticated && !character.is_self" :character="character" ref="report-dialog"></report-dialog>
<friend-dialog :character="character" ref="friend-dialog"></friend-dialog>
<block-dialog :character="character" ref="block-dialog"></block-dialog>
</template>
@@ -135,6 +137,8 @@
export default class Sidebar extends Vue {
@Prop({required: true})
readonly character: Character;
+ @Prop()
+ readonly oldApi?: true;
readonly shared: SharedStore = Store;
readonly quickInfoIds: ReadonlyArray<number> = [1, 3, 2, 49, 9, 29, 15, 41, 25]; // Do not sort these.
readonly avatarUrl = Utils.avatarURL;
@@ -208,7 +212,7 @@
}
get noteUrl(): string {
- return `${Utils.siteDomain}notes/folder/1/0?target=${this.character.character.name}`;
+ return methods.sendNoteUrl(this.character.character);
}
get contactMethods(): object[] {
diff --git a/site/flash_display.ts b/site/flash_display.ts
deleted file mode 100644
index c1b27ff..0000000
--- a/site/flash_display.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-import Vue from 'vue';
-
-export type flashMessageType = 'info' | 'success' | 'warning' | 'danger';
-let boundHandler;
-
-interface FlashComponent extends Vue {
- lastId: number
- floating: boolean
- messages: {
- id: number
- message: string
- classes: string
- }[]
- removeMessage(id: number)
-}
-
-export function addFlashMessage(type: flashMessageType, message: string): void {
- instance.addMessage(type, message);
-}
-
-function bindEventHandler(vm): void {
- boundHandler = eventHandler.bind(vm);
- document.addEventListener('scroll', boundHandler);
- document.addEventListener('resize', boundHandler);
-}
-
-function removeHandlers(): void {
- document.removeEventListener('scroll', boundHandler);
- document.removeEventListener('resize', boundHandler);
- boundHandler = undefined;
-}
-
-function eventHandler(this: FlashComponent): void {
- const isElementVisible = (el: Element): boolean => {
- const rect = el.getBoundingClientRect();
- const vHeight = window.innerWidth || document.documentElement.clientHeight;
- const vWidth = window.innerWidth || document.documentElement.clientWidth;
- const efp = (x, y) => document.elementFromPoint(x, y);
- if(rect.top > vHeight || rect.bottom < 0 || rect.left > vWidth || rect.right < 0)
- return false;
- return true;
- //return (el.contains(efp(rect.left, rect.top)) || el.contains(efp(rect.right, rect.top)));
- };
-
- this.floating = !isElementVisible(this.$refs['detector'] as Element);
-}
-
-function addMessage(this: FlashComponent, type: flashMessageType, message: string): void {
- if(!boundHandler) {
- bindEventHandler(this);
- boundHandler();
- }
- const newId = this.lastId++;
- this.messages.push({id: newId, message, classes: `flash-message alert-${type}`});
- setTimeout(() => {
- this.removeMessage(newId);
- }, 15000);
-}
-
-function removeMessage(id: number): void {
- this.messages = this.messages.filter(function(item) {
- return item['id'] !== id;
- });
-
- if(this.messages.length === 0)
- removeHandlers();
-}
-
-interface FlashMessageManager {
- addMessage(type: flashMessageType, message: string): void
- removeMessage(id: number): void
-}
-
-const instance: Vue & FlashMessageManager = new Vue({
- template: '#flashMessagesTemplate',
- el: '#flashMessages',
- data() {
- return {
- lastId: 1,
- messages: [],
- floating: false
- };
- },
- computed: {
- containerClasses(this: FlashComponent): string {
- return this.floating ? 'flash-messages-fixed' : 'flash-messages';
- }
- },
- methods: {
- addMessage,
- removeMessage
- }
-}) as Vue & FlashMessageManager;
\ No newline at end of file
diff --git a/site/utils.ts b/site/utils.ts
index a3f2658..762d708 100644
--- a/site/utils.ts
+++ b/site/utils.ts
@@ -1,7 +1,22 @@
import Axios, {AxiosError, AxiosResponse} from 'axios';
-//import {addFlashMessage, flashMessageType} from './flash_display';
import {InlineDisplayMode} from '../bbcode/interfaces';
+interface Dictionary<T> {
+ [key: string]: T | undefined;
+}
+
+type flashMessageType = 'info' | 'success' | 'warning' | 'danger';
+type flashMessageImpl = (type: flashMessageType, message: string) => void;
+
+
+let flashImpl: flashMessageImpl = (type: flashMessageType, message: string) => {
+ console.log(`${type}: ${message}`);
+};
+
+export function setFlashMessageImplementation(impl: flashMessageImpl): void {
+ flashImpl = impl;
+}
+
export function avatarURL(name: string): string {
const uregex = /^[a-zA-Z0-9_\-\s]+$/;
if(!uregex.test(name)) return '#';
@@ -14,10 +29,6 @@ export function characterURL(name: string): string {
return `${siteDomain}c/${name}`;
}
-interface Dictionary<T> {
- [key: string]: T | undefined;
-}
-
export function groupObjectBy<K extends string, T extends {[k in K]: string | number}>(obj: Dictionary<T>, key: K): Dictionary<T[]> {
const newObject: Dictionary<T[]> = {};
for(const objkey in obj) {
@@ -77,8 +88,8 @@ export function flashSuccess(message: string): void {
flashMessage('success', message);
}
-export function flashMessage(type: string, message: string): void {
- console.log(`${type}: ${message}`); //TODO addFlashMessage(type, message);
+export function flashMessage(type: flashMessageType, message: string): void {
+ flashImpl(type, message);
}
export let siteDomain = '';
diff --git a/yarn.lock b/yarn.lock
index 6631df5..a7a4008 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9,12 +9,12 @@
"@types/jquery" "*"
"@types/jquery@*", "@types/jquery@^3.2.11":
- version "3.2.15"
- resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.2.15.tgz#3f620a9f5a0b296866f4bc729825226d0a35fba6"
+ version "3.2.17"
+ resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.2.17.tgz#01df9805dd5cf83a14cf5bfd81adced7d4fbd970"
"@types/node@^8.0.31":
- version "8.0.44"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.44.tgz#5c39800fda4b76dab39a5f28fda676fc500015ac"
+ version "8.5.7"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-8.5.7.tgz#9c498c35af354dcfbca3790fb2e81129e93cf0e2"
"@types/sortablejs@^1.3.31":
version "1.3.32"
@@ -35,12 +35,12 @@ acorn@^4.0.3:
resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
acorn@^5.0.0:
- version "5.1.2"
- resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.1.2.tgz#911cb53e036807cf0fa778dc5d370fbd864246d7"
+ version "5.3.0"
+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.3.0.tgz#7446d39459c54fb49a80e6ee6478149b940ec822"
-ajv-keywords@^2.0.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.0.tgz#a296e17f7bfae7c1ce4f7e0de53d29cb32162df0"
+ajv-keywords@^2.0.0, ajv-keywords@^2.1.0:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
ajv@^4.9.1:
version "4.11.8"
@@ -49,14 +49,14 @@ ajv@^4.9.1:
co "^4.6.0"
json-stable-stringify "^1.0.1"
-ajv@^5.0.0, ajv@^5.1.0, ajv@^5.1.5:
- version "5.2.3"
- resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.2.3.tgz#c06f598778c44c6b161abafe3466b81ad1814ed2"
+ajv@^5.0.0, ajv@^5.1.5:
+ version "5.5.2"
+ resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
dependencies:
co "^4.6.0"
fast-deep-equal "^1.0.0"
+ fast-json-stable-stringify "^2.0.0"
json-schema-traverse "^0.3.0"
- json-stable-stringify "^1.0.1"
align-text@^0.1.1, align-text@^0.1.3:
version "0.1.4"
@@ -131,8 +131,8 @@ asap@~2.0.3:
resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
asn1.js@^4.0.0:
- version "4.9.1"
- resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.9.1.tgz#48ba240b45a9280e94748990ba597d216617fd40"
+ version "4.9.2"
+ resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.9.2.tgz#8117ef4f7ed87cd8f89044b5bff97ac243a16c9a"
dependencies:
bn.js "^4.0.0"
inherits "^2.0.1"
@@ -161,8 +161,8 @@ async-each@^1.0.0:
resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
async@^2.1.2:
- version "2.5.0"
- resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d"
+ version "2.6.0"
+ resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
dependencies:
lodash "^4.14.0"
@@ -185,22 +185,18 @@ aws-sign2@~0.6.0:
version "0.6.0"
resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
-aws-sign2@~0.7.0:
- version "0.7.0"
- resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
-
-aws4@^1.2.1, aws4@^1.6.0:
+aws4@^1.2.1:
version "1.6.0"
resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
-axios@^0.16.2:
- version "0.16.2"
- resolved "https://registry.yarnpkg.com/axios/-/axios-0.16.2.tgz#ba4f92f17167dfbab40983785454b9ac149c3c6d"
+axios@^0.17.1:
+ version "0.17.1"
+ resolved "https://registry.yarnpkg.com/axios/-/axios-0.17.1.tgz#2d8e3e5d0bdbd7327f91bc814f5c57660f81824d"
dependencies:
- follow-redirects "^1.2.3"
+ follow-redirects "^1.2.5"
is-buffer "^1.1.5"
-babel-code-frame@^6.11.0, babel-code-frame@^6.22.0:
+babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
version "6.26.0"
resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
dependencies:
@@ -231,8 +227,8 @@ big.js@^3.1.3:
resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
binary-extensions@^1.0.0:
- version "1.10.0"
- resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.10.0.tgz#9aeb9a6c5e88638aad171e167f5900abe24835d0"
+ version "1.11.0"
+ resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
block-stream@*:
version "0.0.9"
@@ -254,18 +250,6 @@ boom@2.x.x:
dependencies:
hoek "2.x.x"
-boom@4.x.x:
- version "4.3.1"
- resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31"
- dependencies:
- hoek "4.x.x"
-
-boom@5.x.x:
- version "5.2.0"
- resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02"
- dependencies:
- hoek "4.x.x"
-
bootstrap@^3.3.7:
version "3.3.7"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.3.7.tgz#5a389394549f23330875a3b150656574f8a9eb71"
@@ -290,8 +274,8 @@ brorand@^1.0.1:
resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
browserify-aes@^1.0.0, browserify-aes@^1.0.4:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.1.0.tgz#1d2ad62a8b479f23f0ab631c1be86a82dbccbe48"
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.1.1.tgz#38b7ab55edb806ff2dcda1a7f1620773a477c49f"
dependencies:
buffer-xor "^1.0.3"
cipher-base "^1.0.0"
@@ -335,11 +319,11 @@ browserify-sign@^4.0.0:
inherits "^2.0.1"
parse-asn1 "^5.0.0"
-browserify-zlib@^0.1.4:
- version "0.1.4"
- resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.1.4.tgz#bb35f8a519f600e0fa6b8485241c979d0141fb2d"
+browserify-zlib@^0.2.0:
+ version "0.2.0"
+ resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
dependencies:
- pako "~0.2.0"
+ pako "~1.0.5"
browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
version "1.7.7"
@@ -360,7 +344,7 @@ buffer@^4.3.0:
ieee754 "^1.1.4"
isarray "^1.0.0"
-builtin-modules@^1.0.0:
+builtin-modules@^1.0.0, builtin-modules@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
@@ -368,9 +352,9 @@ builtin-status-codes@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
-cacache@^9.2.9:
- version "9.3.0"
- resolved "https://registry.yarnpkg.com/cacache/-/cacache-9.3.0.tgz#9cd58f2dd0b8c8cacf685b7067b416d6d3cf9db1"
+cacache@^10.0.1:
+ version "10.0.1"
+ resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.1.tgz#3e05f6e616117d9b54665b1b20c8aeb93ea5d36f"
dependencies:
bluebird "^3.5.0"
chownr "^1.0.1"
@@ -382,7 +366,7 @@ cacache@^9.2.9:
move-concurrently "^1.0.1"
promise-inflight "^1.0.1"
rimraf "^2.6.1"
- ssri "^4.1.6"
+ ssri "^5.0.0"
unique-filename "^1.1.0"
y18n "^3.2.1"
@@ -404,8 +388,8 @@ caniuse-api@^1.5.2:
lodash.uniq "^4.5.0"
caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
- version "1.0.30000746"
- resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000746.tgz#501098c66f5fbbf634c02f25508b05e8809910f4"
+ version "1.0.30000787"
+ resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000787.tgz#ca07a281be536a88bd7fac96ba895f3cf53f811b"
caseless@~0.12.0:
version "0.12.0"
@@ -428,9 +412,9 @@ chalk@^1.1.3:
strip-ansi "^3.0.0"
supports-color "^2.0.0"
-chalk@^2.0.1, chalk@^2.1.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.1.0.tgz#ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e"
+chalk@^2.1.0, chalk@^2.3.0:
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba"
dependencies:
ansi-styles "^3.1.0"
escape-string-regexp "^1.0.5"
@@ -485,8 +469,8 @@ cliui@^3.2.0:
wrap-ansi "^2.0.0"
clone@^1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149"
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.3.tgz#298d7e2231660f40c003c2ed3140decf3f53085f"
clone@^2.1.1:
version "2.1.1"
@@ -507,8 +491,8 @@ code-point-at@^1.0.0:
resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
color-convert@^1.3.0, color-convert@^1.9.0:
- version "1.9.0"
- resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a"
+ version "1.9.1"
+ resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed"
dependencies:
color-name "^1.1.1"
@@ -538,7 +522,7 @@ colormin@^1.0.5:
css-color-names "0.0.4"
has "^1.0.1"
-colors@^1.1.2, colors@~1.1.2:
+colors@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
@@ -548,9 +532,9 @@ combined-stream@^1.0.5, combined-stream@~1.0.5:
dependencies:
delayed-stream "~1.0.0"
-commander@^2.9.0, commander@~2.11.0:
- version "2.11.0"
- resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
+commander@^2.9.0, commander@~2.12.1:
+ version "2.12.2"
+ resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555"
commondir@^1.0.1:
version "1.0.1"
@@ -656,15 +640,9 @@ cryptiles@2.x.x:
dependencies:
boom "2.x.x"
-cryptiles@3.x.x:
- version "3.1.2"
- resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"
- dependencies:
- boom "5.x.x"
-
crypto-browserify@^3.11.0:
- version "3.11.1"
- resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.11.1.tgz#948945efc6757a400d6e5e5af47194d10064279f"
+ version "3.12.0"
+ resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
dependencies:
browserify-cipher "^1.0.0"
browserify-sign "^4.0.0"
@@ -676,27 +654,28 @@ crypto-browserify@^3.11.0:
pbkdf2 "^3.0.3"
public-encrypt "^4.0.0"
randombytes "^2.0.0"
+ randomfill "^1.0.3"
css-color-names@0.0.4:
version "0.0.4"
resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
css-loader@^0.28.4:
- version "0.28.7"
- resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.7.tgz#5f2ee989dd32edd907717f953317656160999c1b"
+ version "0.28.8"
+ resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.8.tgz#ff36381464dea18fe60f2601a060ba6445886bd5"
dependencies:
- babel-code-frame "^6.11.0"
+ babel-code-frame "^6.26.0"
css-selector-tokenizer "^0.7.0"
- cssnano ">=2.6.1 <4"
+ cssnano "^3.10.0"
icss-utils "^2.1.0"
loader-utils "^1.0.2"
lodash.camelcase "^4.3.0"
- object-assign "^4.0.1"
+ object-assign "^4.1.1"
postcss "^5.0.6"
- postcss-modules-extract-imports "^1.0.0"
- postcss-modules-local-by-default "^1.0.1"
- postcss-modules-scope "^1.0.0"
- postcss-modules-values "^1.1.0"
+ postcss-modules-extract-imports "^1.1.0"
+ postcss-modules-local-by-default "^1.2.0"
+ postcss-modules-scope "^1.1.0"
+ postcss-modules-values "^1.3.0"
postcss-value-parser "^3.3.0"
source-list-map "^2.0.0"
@@ -712,7 +691,7 @@ cssesc@^0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
-"cssnano@>=2.6.1 <4":
+cssnano@^3.10.0:
version "3.10.0"
resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-3.10.0.tgz#4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38"
dependencies:
@@ -784,12 +763,18 @@ de-indent@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
-debug@^2.2.0, debug@^2.6.9:
+debug@^2.2.0:
version "2.6.9"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
dependencies:
ms "2.0.0"
+debug@^3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+ dependencies:
+ ms "2.0.0"
+
decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
version "1.2.0"
resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
@@ -817,6 +802,10 @@ des.js@^1.0.0:
inherits "^2.0.1"
minimalistic-assert "^1.0.0"
+detect-libc@^1.0.2:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+
diff@^3.2.0:
version "3.4.0"
resolved "https://registry.yarnpkg.com/diff/-/diff-3.4.0.tgz#b1d85507daf3964828de54b37d0d73ba67dda56c"
@@ -848,9 +837,15 @@ ecc-jsbn@~0.1.1:
dependencies:
jsbn "~0.1.0"
+electron-releases@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/electron-releases/-/electron-releases-2.1.0.tgz#c5614bf811f176ce3c836e368a0625782341fd4e"
+
electron-to-chromium@^1.2.7:
- version "1.3.26"
- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.26.tgz#996427294861a74d9c7c82b9260ea301e8c02d66"
+ version "1.3.30"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.30.tgz#9666f532a64586651fc56a72513692e820d06a80"
+ dependencies:
+ electron-releases "^2.1.0"
elliptic@^6.0.0:
version "6.4.0"
@@ -884,10 +879,10 @@ enhanced-resolve@^3.0.0, enhanced-resolve@^3.4.0:
tapable "^0.2.7"
errno@^0.1.1, errno@^0.1.3, errno@^0.1.4:
- version "0.1.4"
- resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.4.tgz#b896e23a9e5e8ba33871fc996abd3635fc9a1c7d"
+ version "0.1.6"
+ resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.6.tgz#c386ce8a6283f14fc09563b71560908c9bf53026"
dependencies:
- prr "~0.0.0"
+ prr "~1.0.1"
error-ex@^1.2.0:
version "1.3.1"
@@ -896,8 +891,8 @@ error-ex@^1.2.0:
is-arrayish "^0.2.1"
es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
- version "0.10.35"
- resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.35.tgz#18ee858ce6a3c45c7d79e91c15fcca9ec568494f"
+ version "0.10.37"
+ resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.37.tgz#0ee741d148b80069ba27d020393756af257defc3"
dependencies:
es6-iterator "~2.0.1"
es6-symbol "~3.1.1"
@@ -1025,7 +1020,7 @@ expand-range@^1.8.1:
dependencies:
fill-range "^2.1.0"
-extend@~3.0.0, extend@~3.0.1:
+extend@~3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
@@ -1035,14 +1030,22 @@ extglob@^0.3.1:
dependencies:
is-extglob "^1.0.0"
-extsprintf@1.3.0, extsprintf@^1.2.0:
+extsprintf@1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+extsprintf@^1.2.0:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+
fast-deep-equal@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff"
+fast-json-stable-stringify@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
+
fastparse@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"
@@ -1092,11 +1095,11 @@ flush-write-stream@^1.0.0:
inherits "^2.0.1"
readable-stream "^2.0.4"
-follow-redirects@^1.2.3:
- version "1.2.5"
- resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.2.5.tgz#ffd3e14cbdd5eaa72f61b6368c1f68516c2a26cc"
+follow-redirects@^1.2.5:
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.3.0.tgz#f684871fc116d2e329fda55ef67687f4fabc905c"
dependencies:
- debug "^2.6.9"
+ debug "^3.1.0"
font-awesome@^4.7.0:
version "4.7.0"
@@ -1117,8 +1120,8 @@ forever-agent@~0.6.1:
resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
fork-ts-checker-webpack-plugin@^0.2.8:
- version "0.2.8"
- resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-0.2.8.tgz#66dc841c29ff8345e0a30755ddeb4ccc3213e210"
+ version "0.2.10"
+ resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-0.2.10.tgz#d0a4080e77e9f5d6e3b43cdce7d26658f9d250c6"
dependencies:
babel-code-frame "^6.22.0"
chalk "^1.1.3"
@@ -1127,6 +1130,7 @@ fork-ts-checker-webpack-plugin@^0.2.8:
lodash.isfunction "^3.0.8"
lodash.isstring "^4.0.1"
lodash.startswith "^4.2.1"
+ minimatch "^3.0.4"
form-data@~2.1.1:
version "2.1.4"
@@ -1136,14 +1140,6 @@ form-data@~2.1.1:
combined-stream "^1.0.5"
mime-types "^2.1.12"
-form-data@~2.3.1:
- version "2.3.1"
- resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.1.tgz#6fb94fbd71885306d73d15cc497fe4cc4ecd44bf"
- dependencies:
- asynckit "^0.4.0"
- combined-stream "^1.0.5"
- mime-types "^2.1.12"
-
from2@^2.1.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
@@ -1165,11 +1161,11 @@ fs.realpath@^1.0.0:
resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
fsevents@^1.0.0:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.2.tgz#3282b713fb3ad80ede0e9fcf4611b5aa6fc033f4"
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.3.tgz#11f82318f5fe7bb2cd22965a108e9306208216d8"
dependencies:
nan "^2.3.0"
- node-pre-gyp "^0.6.36"
+ node-pre-gyp "^0.6.39"
fstream-ignore@^1.0.5:
version "1.0.5"
@@ -1251,10 +1247,6 @@ har-schema@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
-har-schema@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-
har-validator@~4.2.1:
version "4.2.1"
resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
@@ -1262,13 +1254,6 @@ har-validator@~4.2.1:
ajv "^4.9.1"
har-schema "^1.0.5"
-har-validator@~5.0.3:
- version "5.0.3"
- resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
- dependencies:
- ajv "^5.1.0"
- har-schema "^2.0.0"
-
has-ansi@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
@@ -1326,15 +1311,6 @@ hawk@3.1.3, hawk@~3.1.3:
hoek "2.x.x"
sntp "1.x.x"
-hawk@~6.0.2:
- version "6.0.2"
- resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038"
- dependencies:
- boom "4.x.x"
- cryptiles "3.x.x"
- hoek "4.x.x"
- sntp "2.x.x"
-
he@^1.1.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
@@ -1351,10 +1327,6 @@ hoek@2.x.x:
version "2.16.3"
resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
-hoek@4.x.x:
- version "4.2.0"
- resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d"
-
hosted-git-info@^2.1.4:
version "2.5.0"
resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c"
@@ -1371,17 +1343,9 @@ http-signature@~1.1.0:
jsprim "^1.2.2"
sshpk "^1.7.0"
-http-signature@~1.2.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
- dependencies:
- assert-plus "^1.0.0"
- jsprim "^1.2.2"
- sshpk "^1.7.0"
-
-https-browserify@0.0.1:
- version "0.0.1"
- resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-0.0.1.tgz#3f91365cabe60b77ed0ebba24b454e3e09d95a82"
+https-browserify@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
icss-replace-symbols@^1.1.0:
version "1.1.0"
@@ -1433,12 +1397,12 @@ inherits@2.0.1:
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
ini@~1.3.0:
- version "1.3.4"
- resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
+ version "1.3.5"
+ resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
interpret@^1.0.0:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.4.tgz#820cdd588b868ffb191a809506d6c9c8f212b1b0"
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
invert-kv@^1.0.0:
version "1.0.0"
@@ -1459,8 +1423,8 @@ is-binary-path@^1.0.0:
binary-extensions "^1.0.0"
is-buffer@^1.1.5:
- version "1.1.5"
- resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc"
+ version "1.1.6"
+ resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
is-builtin-module@^1.0.0:
version "1.0.0"
@@ -1567,8 +1531,8 @@ jquery@^3.2.1:
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.2.1.tgz#5c4d9de652af6cd0a770154a631bba12b015c787"
js-base64@^2.1.9:
- version "2.3.2"
- resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.3.2.tgz#a79a923666372b580f8e27f51845c6f7e8fbfbaf"
+ version "2.4.0"
+ resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.0.tgz#9e566fee624751a1d720c966cd6226d29d4025aa"
js-tokens@^3.0.2:
version "3.0.2"
@@ -1666,8 +1630,8 @@ less-loader@^4.0.4:
pify "^2.3.0"
less@^2.7.2:
- version "2.7.2"
- resolved "https://registry.yarnpkg.com/less/-/less-2.7.2.tgz#368d6cc73e1fb03981183280918743c5dcf9b3df"
+ version "2.7.3"
+ resolved "https://registry.yarnpkg.com/less/-/less-2.7.3.tgz#cc1260f51c900a9ec0d91fb6998139e02507b63b"
optionalDependencies:
errno "^0.1.1"
graceful-fs "^4.1.2"
@@ -1675,7 +1639,7 @@ less@^2.7.2:
mime "^1.2.11"
mkdirp "^0.5.0"
promise "^7.1.1"
- request "^2.72.0"
+ request "2.81.0"
source-map "^0.5.3"
load-json-file@^2.0.0:
@@ -1754,10 +1718,10 @@ macaddress@^0.2.8:
resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12"
make-dir@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.0.0.tgz#97a011751e91dd87cfadef58832ebb04936de978"
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.1.0.tgz#19b4369fe48c116f53c2af95ad102c0e39e85d51"
dependencies:
- pify "^2.3.0"
+ pify "^3.0.0"
math-expression-evaluator@^1.2.14:
version "1.2.17"
@@ -1812,15 +1776,15 @@ mime-db@~1.30.0:
version "1.30.0"
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
-mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.7:
+mime-types@^2.1.12, mime-types@~2.1.7:
version "2.1.17"
resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
dependencies:
mime-db "~1.30.0"
mime@^1.2.11, mime@^1.4.1:
- version "1.4.1"
- resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
+ version "1.6.0"
+ resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
mimic-fn@^1.0.0:
version "1.1.0"
@@ -1885,41 +1849,42 @@ ms@2.0.0:
resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
nan@^2.3.0:
- version "2.7.0"
- resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46"
+ version "2.8.0"
+ resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a"
node-libs-browser@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.0.0.tgz#a3a59ec97024985b46e958379646f96c4b616646"
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.1.0.tgz#5f94263d404f6e44767d726901fff05478d600df"
dependencies:
assert "^1.1.1"
- browserify-zlib "^0.1.4"
+ browserify-zlib "^0.2.0"
buffer "^4.3.0"
console-browserify "^1.1.0"
constants-browserify "^1.0.0"
crypto-browserify "^3.11.0"
domain-browser "^1.1.1"
events "^1.0.0"
- https-browserify "0.0.1"
- os-browserify "^0.2.0"
+ https-browserify "^1.0.0"
+ os-browserify "^0.3.0"
path-browserify "0.0.0"
- process "^0.11.0"
+ process "^0.11.10"
punycode "^1.2.4"
querystring-es3 "^0.2.0"
- readable-stream "^2.0.5"
+ readable-stream "^2.3.3"
stream-browserify "^2.0.1"
- stream-http "^2.3.1"
- string_decoder "^0.10.25"
- timers-browserify "^2.0.2"
+ stream-http "^2.7.2"
+ string_decoder "^1.0.0"
+ timers-browserify "^2.0.4"
tty-browserify "0.0.0"
url "^0.11.0"
util "^0.10.3"
vm-browserify "0.0.4"
-node-pre-gyp@^0.6.36:
- version "0.6.38"
- resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.38.tgz#e92a20f83416415bb4086f6d1fb78b3da73d113d"
+node-pre-gyp@^0.6.39:
+ version "0.6.39"
+ resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz#c00e96860b23c0e1420ac7befc5044e1d78d8649"
dependencies:
+ detect-libc "^1.0.2"
hawk "3.1.3"
mkdirp "^0.5.1"
nopt "^4.0.1"
@@ -1989,11 +1954,11 @@ number-is-nan@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-oauth-sign@~0.8.1, oauth-sign@~0.8.2:
+oauth-sign@~0.8.1:
version "0.8.2"
resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
-object-assign@^4.0.1, object-assign@^4.1.0:
+object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
@@ -2010,9 +1975,9 @@ once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0:
dependencies:
wrappy "1"
-os-browserify@^0.2.0:
- version "0.2.1"
- resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.2.1.tgz#63fc4ccee5d2d7763d26bbf8601078e6c2e0044f"
+os-browserify@^0.3.0:
+ version "0.3.0"
+ resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
os-homedir@^1.0.0, os-homedir@^1.0.1:
version "1.0.2"
@@ -2042,8 +2007,10 @@ p-finally@^1.0.0:
resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
p-limit@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc"
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.2.0.tgz#0e92b6bedcb59f022c13d0f1949dc82d15909f1c"
+ dependencies:
+ p-try "^1.0.0"
p-locate@^2.0.0:
version "2.0.0"
@@ -2051,9 +2018,13 @@ p-locate@^2.0.0:
dependencies:
p-limit "^1.1.0"
-pako@~0.2.0:
- version "0.2.9"
- resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
+p-try@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
+
+pako@~1.0.5:
+ version "1.0.6"
+ resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
parallel-transform@^1.1.0:
version "1.1.0"
@@ -2128,14 +2099,14 @@ performance-now@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
-performance-now@^2.1.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-
pify@^2.0.0, pify@^2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+pify@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+
pkg-dir@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
@@ -2287,27 +2258,27 @@ postcss-minify-selectors@^2.0.4:
postcss "^5.0.14"
postcss-selector-parser "^2.0.0"
-postcss-modules-extract-imports@^1.0.0:
+postcss-modules-extract-imports@^1.1.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.0.tgz#66140ecece38ef06bf0d3e355d69bf59d141ea85"
dependencies:
postcss "^6.0.1"
-postcss-modules-local-by-default@^1.0.1:
+postcss-modules-local-by-default@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069"
dependencies:
css-selector-tokenizer "^0.7.0"
postcss "^6.0.1"
-postcss-modules-scope@^1.0.0:
+postcss-modules-scope@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90"
dependencies:
css-selector-tokenizer "^0.7.0"
postcss "^6.0.1"
-postcss-modules-values@^1.1.0:
+postcss-modules-values@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20"
dependencies:
@@ -2404,12 +2375,12 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0
supports-color "^3.2.3"
postcss@^6.0.1, postcss@^6.0.8:
- version "6.0.13"
- resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.13.tgz#b9ecab4ee00c89db3ec931145bd9590bbf3f125f"
+ version "6.0.16"
+ resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.16.tgz#112e2fe2a6d2109be0957687243170ea5589e146"
dependencies:
- chalk "^2.1.0"
+ chalk "^2.3.0"
source-map "^0.6.1"
- supports-color "^4.4.0"
+ supports-color "^5.1.0"
prepend-http@^1.0.0:
version "1.0.4"
@@ -2420,14 +2391,14 @@ preserve@^0.2.0:
resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
prettier@^1.7.0:
- version "1.7.4"
- resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.7.4.tgz#5e8624ae9363c80f95ec644584ecdf55d74f93fa"
+ version "1.9.2"
+ resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.9.2.tgz#96bc2132f7a32338e6078aeb29727178c6335827"
process-nextick-args@~1.0.6:
version "1.0.7"
resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
-process@^0.11.0:
+process@^0.11.10:
version "0.11.10"
resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
@@ -2441,9 +2412,9 @@ promise@^7.1.1:
dependencies:
asap "~2.0.3"
-prr@~0.0.0:
- version "0.0.0"
- resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a"
+prr@~1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
pseudomap@^1.0.2:
version "1.0.2"
@@ -2460,8 +2431,8 @@ public-encrypt@^4.0.0:
randombytes "^2.0.1"
pump@^1.0.0:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.2.tgz#3b3ee6512f94f0e575538c17995f9f16990a5d51"
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.3.tgz#5dfe8311c33bbf6fc18261f9f34702c47c08a954"
dependencies:
end-of-stream "^1.1.0"
once "^1.3.1"
@@ -2483,17 +2454,13 @@ punycode@^1.2.4, punycode@^1.4.1:
resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
q@^1.1.2:
- version "1.5.0"
- resolved "https://registry.yarnpkg.com/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1"
+ version "1.5.1"
+ resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
qs@~6.4.0:
version "6.4.0"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
-qs@~6.5.1:
- version "6.5.1"
- resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
-
query-string@^4.1.0:
version "4.3.4"
resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
@@ -2516,15 +2483,22 @@ randomatic@^1.1.3:
is-number "^3.0.0"
kind-of "^4.0.0"
-randombytes@^2.0.0, randombytes@^2.0.1:
+randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
version "2.0.5"
resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.5.tgz#dc009a246b8d09a177b4b7a0ae77bc570f4b1b79"
dependencies:
safe-buffer "^5.1.0"
+randomfill@^1.0.3:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.3.tgz#b96b7df587f01dd91726c418f30553b1418e3d62"
+ dependencies:
+ randombytes "^2.0.5"
+ safe-buffer "^5.1.0"
+
raven-js@^3.17.0:
- version "3.19.1"
- resolved "https://registry.yarnpkg.com/raven-js/-/raven-js-3.19.1.tgz#a5d25646556fc2c86d2b188ae4f425c144c08dd8"
+ version "3.21.0"
+ resolved "https://registry.yarnpkg.com/raven-js/-/raven-js-3.21.0.tgz#609236eb0ec30faf696b552f842a80b426be6258"
rc@^1.1.7:
version "1.2.2"
@@ -2550,7 +2524,7 @@ read-pkg@^2.0.0:
normalize-package-data "^2.3.2"
path-type "^2.0.0"
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.6, readable-stream@^2.3.3:
version "2.3.3"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"
dependencies:
@@ -2656,33 +2630,6 @@ request@2.81.0:
tunnel-agent "^0.6.0"
uuid "^3.0.0"
-request@^2.72.0:
- version "2.83.0"
- resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
- dependencies:
- aws-sign2 "~0.7.0"
- aws4 "^1.6.0"
- caseless "~0.12.0"
- combined-stream "~1.0.5"
- extend "~3.0.1"
- forever-agent "~0.6.1"
- form-data "~2.3.1"
- har-validator "~5.0.3"
- hawk "~6.0.2"
- http-signature "~1.2.0"
- is-typedarray "~1.0.0"
- isstream "~0.1.2"
- json-stringify-safe "~5.0.1"
- mime-types "~2.1.17"
- oauth-sign "~0.8.2"
- performance-now "^2.1.0"
- qs "~6.5.1"
- safe-buffer "^5.1.1"
- stringstream "~0.0.5"
- tough-cookie "~2.3.3"
- tunnel-agent "^0.6.0"
- uuid "^3.1.0"
-
require-directory@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -2696,8 +2643,8 @@ require-main-filename@^1.0.1:
resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
resolve@^1.3.2, resolve@^1.4.0:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.4.0.tgz#a75be01c53da25d934a98ebd0e4c4a7312f92a86"
+ version "1.5.0"
+ resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36"
dependencies:
path-parse "^1.0.5"
@@ -2740,10 +2687,21 @@ schema-utils@^0.3.0:
dependencies:
ajv "^5.0.0"
+schema-utils@^0.4.2:
+ version "0.4.3"
+ resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.3.tgz#e2a594d3395834d5e15da22b48be13517859458e"
+ dependencies:
+ ajv "^5.0.0"
+ ajv-keywords "^2.1.0"
+
"semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.3.0:
version "5.4.1"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
+serialize-javascript@^1.4.0:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.4.0.tgz#7c958514db6ac2443a8abc062dc9f7886a7f6005"
+
set-blocking@^2.0.0, set-blocking@~2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
@@ -2783,12 +2741,6 @@ sntp@1.x.x:
dependencies:
hoek "2.x.x"
-sntp@2.x.x:
- version "2.0.2"
- resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.0.2.tgz#5064110f0af85f7cfdb7d6b67a40028ce52b4b2b"
- dependencies:
- hoek "4.x.x"
-
sort-keys@^1.0.0:
version "1.1.2"
resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
@@ -2796,18 +2748,18 @@ sort-keys@^1.0.0:
is-plain-obj "^1.0.0"
sortablejs@^1.6.0:
- version "1.6.1"
- resolved "https://registry.yarnpkg.com/sortablejs/-/sortablejs-1.6.1.tgz#d120d103fbb9f60c7db27814a1384072e6c6e083"
+ version "1.7.0"
+ resolved "https://registry.yarnpkg.com/sortablejs/-/sortablejs-1.7.0.tgz#80a2b2370abd568e1cec8c271131ef30a904fa28"
source-list-map@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
-source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3:
+source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1:
version "0.5.7"
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-source-map@^0.6.1:
+source-map@^0.6.1, source-map@~0.6.1:
version "0.6.1"
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
@@ -2843,9 +2795,9 @@ sshpk@^1.7.0:
jsbn "~0.1.0"
tweetnacl "~0.14.0"
-ssri@^4.1.6:
- version "4.1.6"
- resolved "https://registry.yarnpkg.com/ssri/-/ssri-4.1.6.tgz#0cb49b6ac84457e7bdd466cb730c3cb623e9a25b"
+ssri@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/ssri/-/ssri-5.0.0.tgz#13c19390b606c821f2a10d02b351c1729b94d8cf"
dependencies:
safe-buffer "^5.1.0"
@@ -2863,7 +2815,7 @@ stream-each@^1.1.0:
end-of-stream "^1.1.0"
stream-shift "^1.0.0"
-stream-http@^2.3.1:
+stream-http@^2.7.2:
version "2.7.2"
resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.7.2.tgz#40a050ec8dc3b53b33d9909415c02c0bf1abfbad"
dependencies:
@@ -2896,17 +2848,13 @@ string-width@^2.0.0:
is-fullwidth-code-point "^2.0.0"
strip-ansi "^4.0.0"
-string_decoder@^0.10.25:
- version "0.10.31"
- resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-
-string_decoder@~1.0.3:
+string_decoder@^1.0.0, string_decoder@~1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
dependencies:
safe-buffer "~5.1.0"
-stringstream@~0.0.4, stringstream@~0.0.5:
+stringstream@~0.0.4:
version "0.0.5"
resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
@@ -2944,9 +2892,15 @@ supports-color@^3.2.3:
dependencies:
has-flag "^1.0.0"
-supports-color@^4.0.0, supports-color@^4.2.1, supports-color@^4.4.0:
- version "4.4.0"
- resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.4.0.tgz#883f7ddabc165142b2a61427f3352ded195d1a3e"
+supports-color@^4.0.0, supports-color@^4.2.1:
+ version "4.5.0"
+ resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
+ dependencies:
+ has-flag "^2.0.0"
+
+supports-color@^5.1.0:
+ version "5.1.0"
+ resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.1.0.tgz#058a021d1b619f7ddf3980d712ea3590ce7de3d5"
dependencies:
has-flag "^2.0.0"
@@ -2967,8 +2921,8 @@ tapable@^0.2.7:
resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.8.tgz#99372a5c999bf2df160afc0d74bed4f47948cd22"
tar-pack@^3.4.0:
- version "3.4.0"
- resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.0.tgz#23be2d7f671a8339376cbdb0b8fe3fdebf317984"
+ version "3.4.1"
+ resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f"
dependencies:
debug "^2.2.0"
fstream "^1.0.10"
@@ -2994,7 +2948,7 @@ through2@^2.0.0:
readable-stream "^2.1.5"
xtend "~4.0.1"
-timers-browserify@^2.0.2:
+timers-browserify@^2.0.4:
version "2.0.4"
resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.4.tgz#96ca53f4b794a5e7c0e1bd7cc88a372298fa01e6"
dependencies:
@@ -3004,31 +2958,32 @@ to-arraybuffer@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
-tough-cookie@~2.3.0, tough-cookie@~2.3.3:
+tough-cookie@~2.3.0:
version "2.3.3"
resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561"
dependencies:
punycode "^1.4.1"
ts-loader@^3.0.2:
- version "3.0.2"
- resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-3.0.2.tgz#e4aa476f54c4197bee0251cd53a783ed3665a629"
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-3.2.0.tgz#23211922179b81f7448754b7fdfca45b8374a15a"
dependencies:
- chalk "^2.0.1"
+ chalk "^2.3.0"
enhanced-resolve "^3.0.0"
loader-utils "^1.0.2"
semver "^5.0.1"
-tslib@^1.7.1:
- version "1.8.0"
- resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.8.0.tgz#dc604ebad64bcbf696d613da6c954aa0e7ea1eb6"
+tslib@^1.7.1, tslib@^1.8.1:
+ version "1.8.1"
+ resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.8.1.tgz#6946af2d1d651a7b1863b531d6e5afa41aa44eac"
tslint@^5.7.0:
- version "5.7.0"
- resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.7.0.tgz#c25e0d0c92fa1201c2bc30e844e08e682b4f3552"
+ version "5.8.0"
+ resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.8.0.tgz#1f49ad5b2e77c76c3af4ddcae552ae4e3612eb13"
dependencies:
babel-code-frame "^6.22.0"
- colors "^1.1.2"
+ builtin-modules "^1.1.1"
+ chalk "^2.1.0"
commander "^2.9.0"
diff "^3.2.0"
glob "^7.1.1"
@@ -3036,13 +2991,13 @@ tslint@^5.7.0:
resolve "^1.3.2"
semver "^5.3.0"
tslib "^1.7.1"
- tsutils "^2.8.1"
+ tsutils "^2.12.1"
-tsutils@^2.8.1:
- version "2.12.1"
- resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.12.1.tgz#f4d95ce3391c8971e46e54c4cf0edb0a21dd5b24"
+tsutils@^2.12.1:
+ version "2.15.0"
+ resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.15.0.tgz#90831e5908cca10b28cdaf83a56dcf8156aed7c6"
dependencies:
- tslib "^1.7.1"
+ tslib "^1.8.1"
tty-browserify@0.0.0:
version "0.0.0"
@@ -3063,15 +3018,15 @@ typedarray@^0.0.6:
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
typescript@^2.4.2:
- version "2.5.3"
- resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.5.3.tgz#df3dcdc38f3beb800d4bc322646b04a3f6ca7f0d"
+ version "2.6.2"
+ resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.2.tgz#3c5b6fd7f6de0914269027f03c0946758f7673a4"
-uglify-es@^3.0.24:
- version "3.1.3"
- resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.1.3.tgz#a21eeb149cb120a1f8302563689e19496550780b"
+uglify-es@^3.3.4:
+ version "3.3.4"
+ resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.4.tgz#2d592678791e5310456bbc95e952139e3b13167a"
dependencies:
- commander "~2.11.0"
- source-map "~0.5.1"
+ commander "~2.12.1"
+ source-map "~0.6.1"
uglify-js@^2.8.29:
version "2.8.29"
@@ -3086,17 +3041,18 @@ uglify-to-browserify@~1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
-uglifyjs-webpack-plugin@1.0.0-beta.3:
- version "1.0.0-beta.3"
- resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.0.0-beta.3.tgz#0715c2ee70bd927685c7cbccda678c6ceab6fc0f"
+uglifyjs-webpack-plugin@1.1.6:
+ version "1.1.6"
+ resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.1.6.tgz#f4ba8449edcf17835c18ba6ae99b9d610857fb19"
dependencies:
- cacache "^9.2.9"
+ cacache "^10.0.1"
find-cache-dir "^1.0.0"
- schema-utils "^0.3.0"
- source-map "^0.5.6"
- uglify-es "^3.0.24"
- webpack-sources "^1.0.1"
- worker-farm "^1.4.1"
+ schema-utils "^0.4.2"
+ serialize-javascript "^1.4.0"
+ source-map "^0.6.1"
+ uglify-es "^3.3.4"
+ webpack-sources "^1.1.0"
+ worker-farm "^1.5.2"
uglifyjs-webpack-plugin@^0.4.6:
version "0.4.6"
@@ -3161,7 +3117,7 @@ util@0.10.3, util@^0.10.3:
dependencies:
inherits "2.0.1"
-uuid@^3.0.0, uuid@^3.1.0:
+uuid@^3.0.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
@@ -3191,16 +3147,16 @@ vm-browserify@0.0.4:
indexof "0.0.1"
vue-class-component@^6.0.0:
- version "6.0.0"
- resolved "https://registry.yarnpkg.com/vue-class-component/-/vue-class-component-6.0.0.tgz#abb87f0acdc77428973401ca3bfaae133c826432"
+ version "6.1.2"
+ resolved "https://registry.yarnpkg.com/vue-class-component/-/vue-class-component-6.1.2.tgz#87ac0265b0db71a3f49f10d90e4f69f9be9c2fbd"
vue-hot-reload-api@^2.2.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.2.0.tgz#9a21b35ced3634434a43ee80efb7350ea8fb206d"
+ version "2.2.4"
+ resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.2.4.tgz#683bd1d026c0d3b3c937d5875679e9a87ec6cd8f"
vue-loader@^13.0.4:
- version "13.3.0"
- resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-13.3.0.tgz#3bf837d490ba5dea6fc07e0835ffa6c688c8af33"
+ version "13.6.2"
+ resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-13.6.2.tgz#43d9688f2c80400916104d1138941aacd7e389cb"
dependencies:
consolidate "^0.14.0"
hash-sum "^1.0.2"
@@ -3231,8 +3187,8 @@ vue-style-loader@^3.0.0:
loader-utils "^1.0.2"
vue-template-compiler@^2.4.2:
- version "2.5.2"
- resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.5.2.tgz#6f198ebc677b8f804315cd33b91e849315ae7177"
+ version "2.5.13"
+ resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.5.13.tgz#12a2aa0ecd6158ac5e5f14d294b0993f399c3d38"
dependencies:
de-indent "^1.0.2"
he "^1.1.0"
@@ -3242,8 +3198,8 @@ vue-template-es2015-compiler@^1.6.0:
resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.6.0.tgz#dc42697133302ce3017524356a6c61b7b69b4a18"
vue@^2.4.2:
- version "2.5.2"
- resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.2.tgz#fd367a87bae7535e47f9dc5c9ec3b496e5feb5a4"
+ version "2.5.13"
+ resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.13.tgz#95bd31e20efcf7a7f39239c9aa6787ce8cf578e1"
watchpack@^1.4.0:
version "1.4.0"
@@ -3253,16 +3209,16 @@ watchpack@^1.4.0:
chokidar "^1.7.0"
graceful-fs "^4.1.2"
-webpack-sources@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.0.1.tgz#c7356436a4d13123be2e2426a05d1dad9cbe65cf"
+webpack-sources@^1.0.1, webpack-sources@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.1.0.tgz#a101ebae59d6507354d71d8013950a3a8b7a5a54"
dependencies:
source-list-map "^2.0.0"
- source-map "~0.5.3"
+ source-map "~0.6.1"
webpack@^3.5.4:
- version "3.8.1"
- resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.8.1.tgz#b16968a81100abe61608b0153c9159ef8bb2bd83"
+ version "3.10.0"
+ resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.10.0.tgz#5291b875078cf2abf42bdd23afe3f8f96c17d725"
dependencies:
acorn "^5.0.0"
acorn-dynamic-import "^2.0.0"
@@ -3315,9 +3271,9 @@ wordwrap@0.0.2:
version "0.0.2"
resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
-worker-farm@^1.4.1:
- version "1.5.0"
- resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.5.0.tgz#adfdf0cd40581465ed0a1f648f9735722afd5c8d"
+worker-farm@^1.5.2:
+ version "1.5.2"
+ resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.5.2.tgz#32b312e5dc3d5d45d79ef44acc2587491cd729ae"
dependencies:
errno "^0.1.4"
xtend "^4.0.1"