From cf015bd4b7206600293122934c293eec6b357f44 Mon Sep 17 00:00:00 2001
From: MayaWolf <maya@f-list.net>
Date: Thu, 19 Oct 2017 01:29:28 +0200
Subject: [PATCH] 0.2.4 - also fix theme building
---
bbcode/Editor.vue | 2 +-
chat/ConversationSettings.vue | 14 +++++--
chat/UserMenu.vue | 1 +
chat/common.ts | 1 +
chat/conversations.ts | 60 +++++++++++++---------------
chat/interfaces.ts | 1 +
chat/localize.ts | 6 ++-
chat/slash_commands.ts | 4 +-
chat/user_view.ts | 3 +-
cordova/Index.vue | 6 +++
cordova/config.xml | 1 +
cordova/filesystem.ts | 9 +++--
electron/Index.vue | 12 +++++-
electron/application.json | 2 +-
electron/build/tray.png | Bin 2587 -> 969 bytes
electron/build/tray@2x.png | Bin 0 -> 2587 bytes
electron/importer.ts | 4 +-
fchat/channels.ts | 20 ++++++++--
fchat/characters.ts | 14 +++++--
fchat/interfaces.ts | 2 +-
less/{themes/chat => }/package.json | 1 +
less/{themes/chat => }/yarn.lock | 4 ++
readme.md | 4 +-
23 files changed, 109 insertions(+), 62 deletions(-)
create mode 100644 electron/build/tray@2x.png
rename less/{themes/chat => }/package.json (91%)
rename less/{themes/chat => }/yarn.lock (98%)
diff --git a/bbcode/Editor.vue b/bbcode/Editor.vue
index fa59003..58c4301 100644
--- a/bbcode/Editor.vue
+++ b/bbcode/Editor.vue
@@ -137,7 +137,7 @@
onKeyDown(e: KeyboardEvent): void {
const key = getKey(e);
- if(e.ctrlKey && !e.shiftKey && key !== 'Control') { //tslint:disable-line:curly
+ if((e.metaKey || e.ctrlKey) && !e.shiftKey && key !== 'Control' && key !== 'Meta') { //tslint:disable-line:curly
for(const button of this.buttons)
if(button.key === key) {
e.stopPropagation();
diff --git a/chat/ConversationSettings.vue b/chat/ConversationSettings.vue
index 8bcfc8d..e86bde1 100644
--- a/chat/ConversationSettings.vue
+++ b/chat/ConversationSettings.vue
@@ -16,10 +16,15 @@
<option :value="setting.False">{{l('conversationSettings.false')}}</option>
</select>
</div>
+ <div class="form-group">
+ <label class="control-label" for="defaultHighlights">
+ <input type="checkbox" id="defaultHighlights" v-model="defaultHighlights"/>
+ {{l('settings.defaultHighlights')}}
+ </label>
+ </div>
<div class="form-group">
<label class="control-label" :for="'highlightWords' + conversation.key">{{l('settings.highlightWords')}}</label>
- <input :id="'highlightWords' + conversation.key" class="form-control" v-model="highlightWords"
- :disabled="highlight == setting.Default"/>
+ <input :id="'highlightWords' + conversation.key" class="form-control" v-model="highlightWords"/>
</div>
<div class="form-group">
<label class="control-label" :for="'joinMessages' + conversation.key">{{l('settings.joinMessages')}}</label>
@@ -52,6 +57,7 @@
highlight: Conversation.Setting;
highlightWords: string;
joinMessages: Conversation.Setting;
+ defaultHighlights: boolean;
constructor() {
super();
@@ -64,6 +70,7 @@
this.highlight = settings.highlight;
this.highlightWords = settings.highlightWords.join(',');
this.joinMessages = settings.joinMessages;
+ this.defaultHighlights = settings.defaultHighlights;
};
@Watch('conversation')
@@ -76,7 +83,8 @@
notify: this.notify,
highlight: this.highlight,
highlightWords: this.highlightWords.split(',').filter((x) => x.length),
- joinMessages: this.joinMessages
+ joinMessages: this.joinMessages,
+ defaultHighlights: this.defaultHighlights
};
}
}
diff --git a/chat/UserMenu.vue b/chat/UserMenu.vue
index cf0afe5..46a7f39 100644
--- a/chat/UserMenu.vue
+++ b/chat/UserMenu.vue
@@ -148,6 +148,7 @@
const touch = e instanceof TouchEvent ? e.changedTouches[0] : e;
let node = <Node & {character?: Character, channel?: Channel}>touch.target;
while(node !== document.body) {
+ if(e.type === 'touchstart' && node === this.$refs['menu']) return;
if(node.character !== undefined || node.parentNode === null) break;
node = node.parentNode;
}
diff --git a/chat/common.ts b/chat/common.ts
index ecd5d4a..c3ef161 100644
--- a/chat/common.ts
+++ b/chat/common.ts
@@ -46,6 +46,7 @@ export class ConversationSettings implements Conversation.Settings {
highlight = Conversation.Setting.Default;
highlightWords: string[] = [];
joinMessages = Conversation.Setting.Default;
+ defaultHighlights = true;
}
export function formatTime(this: void | never, date: Date): string {
diff --git a/chat/conversations.ts b/chat/conversations.ts
index 7077db6..cc1140f 100644
--- a/chat/conversations.ts
+++ b/chat/conversations.ts
@@ -439,19 +439,33 @@ 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) => {
+ core.channels.onEvent((type, channel, member) => {
const key = channel.id.toLowerCase();
- if(type === 'join') {
- const conv = new ChannelConversation(channel);
- state.channelMap[key] = conv;
- state.channelConversations.push(conv);
- state.addRecent(conv);
- } else {
+ if(type === 'join')
+ if(member === undefined) {
+ const conv = new ChannelConversation(channel);
+ state.channelMap[key] = conv;
+ state.channelConversations.push(conv);
+ 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));
+ }
+ else if(member === undefined) {
const conv = state.channelMap[key]!;
state.channelConversations.splice(state.channelConversations.indexOf(conv), 1);
delete state.channelMap[key];
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));
}
});
@@ -469,14 +483,10 @@ export default function(this: void): Interfaces.State {
const message = createMessage(MessageType.Message, char, decodeHTML(data.message), time);
conversation.addMessage(message);
- let words: string[];
- if(conversation.settings.highlight !== Interfaces.Setting.Default) {
- words = conversation.settings.highlightWords.slice();
- if(conversation.settings.highlight === Interfaces.Setting.True) words.push(core.connection.character);
- } else {
- words = core.state.settings.highlightWords.slice();
- if(core.state.settings.highlight) words.push(core.connection.character);
- }
+ const words = conversation.settings.highlightWords.slice();
+ if(conversation.settings.defaultHighlights) words.push(...core.state.settings.highlightWords);
+ if(conversation.settings.highlight === Interfaces.Setting.Default && core.state.settings.highlight ||
+ conversation.settings.highlight === Interfaces.Setting.True) words.push(core.connection.character);
//tslint:disable-next-line:no-null-keyword
const results = words.length > 0 ? message.text.match(new RegExp(`\\b(${words.join('|')})\\b`, 'i')) : null;
if(results !== null) {
@@ -523,7 +533,7 @@ export default function(this: void): Interfaces.State {
const message = new EventMessage(l('events.login', `[user]${data.identity}[/user]`), time);
if(isOfInterest(core.characters.get(data.identity))) 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)) conv.addMessage(message);
});
connection.onMessage('FLN', (data, time) => {
const message = new EventMessage(l('events.logout', `[user]${data.character}[/user]`), time);
@@ -531,7 +541,7 @@ export default function(this: void): Interfaces.State {
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) conv.addMessage(message);
});
connection.onMessage('TPN', (data) => {
const conv = state.privateMap[data.character.toLowerCase()];
@@ -660,22 +670,6 @@ export default function(this: void): Interfaces.State {
state.selectedConversation.infoText = data.message;
addEventMessage(new EventMessage(data.message, time));
});
- connection.onMessage('JCH', (data, time) => {
- if(data.character.identity === core.connection.character) return;
- const conv = state.channelMap[data.channel.toLowerCase()]!;
- if(conv.settings.joinMessages === Interfaces.Setting.False || conv.settings.joinMessages === Interfaces.Setting.Default &&
- !core.state.settings.joinMessages) return;
- const text = l('events.channelJoin', `[user]${data.character.identity}[/user]`);
- conv.addMessage(new EventMessage(text, time));
- });
- connection.onMessage('LCH', (data, time) => {
- if(data.character === core.connection.character) return;
- const conv = state.channelMap[data.channel.toLowerCase()]!;
- if(conv.settings.joinMessages === Interfaces.Setting.False || conv.settings.joinMessages === Interfaces.Setting.Default &&
- !core.state.settings.joinMessages) return;
- const text = l('events.channelLeave', `[user]${data.character}[/user]`);
- conv.addMessage(new EventMessage(text, time));
- });
connection.onMessage('ZZZ', (data, time) => {
state.selectedConversation.infoText = data.message;
addEventMessage(new EventMessage(data.message, time));
diff --git a/chat/interfaces.ts b/chat/interfaces.ts
index 3df474e..2fea0e6 100644
--- a/chat/interfaces.ts
+++ b/chat/interfaces.ts
@@ -92,6 +92,7 @@ export namespace Conversation {
readonly highlight: Setting;
readonly highlightWords: ReadonlyArray<string>;
readonly joinMessages: Setting;
+ readonly defaultHighlights: boolean;
}
export const enum UnreadState { None, Unread, Mention }
diff --git a/chat/localize.ts b/chat/localize.ts
index 83f138f..f40bddd 100644
--- a/chat/localize.ts
+++ b/chat/localize.ts
@@ -8,7 +8,7 @@ const strings: {[key: string]: string | undefined} = {
'action.copyLink': 'Copy Link',
'action.suggestions': 'Suggestions',
'action.open': 'Show',
- 'action.quit': 'Exit',
+ 'action.quit': 'Quit',
'action.updateAvailable': 'UPDATE AVAILABLE',
'action.update': 'Restart now!',
'action.cancel': 'Cancel',
@@ -18,6 +18,7 @@ const strings: {[key: string]: string | undefined} = {
'help.rules': 'F-List Rules',
'help.faq': 'F-List FAQ',
'help.report': 'How to report a user',
+ 'help.changelog': 'Changelog',
'title': 'FChat 3.0',
'version': 'Version {0}',
'filter': 'Type to filter...',
@@ -130,6 +131,7 @@ Are you sure?`,
'settings.theme': 'Theme',
'settings.logMessages': 'Log messages',
'settings.logAds': 'Log ads',
+ 'settings.defaultHighlights': 'Use global highlight words',
'conversationSettings.title': 'Settings',
'conversationSettings.action': 'Edit settings for {0}',
'conversationSettings.default': 'Default',
@@ -344,7 +346,7 @@ Are you sure?`,
'status.dnd': 'Do Not Disturb',
'status.idle': 'Idle',
'status.offline': 'Offline',
- 'status.crown': 'Rewarded by Admin',
+ 'status.crown': 'Rewarded',
'importer.importGeneral': 'slimCat data has been detected on your computer.\nWould you like to import general settings?',
'importer.importCharacter': 'slimCat data for this character has been detected on your computer.\nWould you like to import settings and logs?\nThis may take a while.\nAny existing FChat 3.0 data for this character will be overwritten.',
'importer.importing': 'Importing data',
diff --git a/chat/slash_commands.ts b/chat/slash_commands.ts
index 7e0c399..8351972 100644
--- a/chat/slash_commands.ts
+++ b/chat/slash_commands.ts
@@ -42,7 +42,7 @@ export function parse(this: void | never, input: string, context: CommandContext
switch(param.type) {
case ParamType.String:
if(i === command.params.length - 1) values[i] = args.substr(index);
- continue;
+ break;
case ParamType.Enum:
if((param.options !== undefined ? param.options : []).indexOf(value) === -1)
return l('commands.invalidParam', l(`commands.${name}.param${i}`));
@@ -62,7 +62,7 @@ export function parse(this: void | never, input: string, context: CommandContext
const char = core.characters.get(value);
if(char.status === 'offline') return l('commands.invalidCharacter');
}
- index = endIndex + 1;
+ index = endIndex === -1 ? args.length : endIndex + 1;
}
if(command.context !== undefined)
return function(this: Conversation): void {
diff --git a/chat/user_view.ts b/chat/user_view.ts
index 29ea175..b860552 100644
--- a/chat/user_view.ts
+++ b/chat/user_view.ts
@@ -44,7 +44,8 @@ const UserView = Vue.extend({
else rankIcon = '';
} else rankIcon = '';
- const html = (props.showStatus !== undefined ? `<span class="fa fa-fw ${getStatusIcon(character.status)}"></span>` : '') +
+ const html = (props.showStatus !== undefined || character.status === 'crown'
+ ? `<span class="fa fa-fw ${getStatusIcon(character.status)}"></span>` : '') +
(rankIcon !== '' ? `<span class="fa ${rankIcon}"></span>` : '') + character.name;
return createElement('span', {
attrs: {class: `user-view gender-${character.gender !== undefined ? character.gender.toLowerCase() : 'none'}`},
diff --git a/cordova/Index.vue b/cordova/Index.vue
index e3b5b5b..ba3dcc6 100644
--- a/cordova/Index.vue
+++ b/cordova/Index.vue
@@ -59,6 +59,10 @@
import {GeneralSettings, getGeneralSettings, Logs, setGeneralSettings, SettingsStore} from './filesystem';
import Notifications from './notifications';
+ function confirmBack(): void {
+ if(confirm(l('chat.confirmLeave'))) (<Navigator & {app: {exitApp(): void}}>navigator).app.exitApp();
+ }
+
@Component({
components: {chat: Chat, modal: Modal}
})
@@ -105,9 +109,11 @@
const connection = new Connection(Socket, this.settings!.account, this.settings!.password);
connection.onEvent('connected', () => {
Raven.setUserContext({username: core.connection.character});
+ document.addEventListener('backbutton', confirmBack);
});
connection.onEvent('closed', () => {
Raven.setUserContext();
+ document.removeEventListener('backbutton', confirmBack);
});
initCore(connection, Logs, SettingsStore, Notifications);
this.characters = data.characters.sort();
diff --git a/cordova/config.xml b/cordova/config.xml
index 6a141d5..9e0f4be 100644
--- a/cordova/config.xml
+++ b/cordova/config.xml
@@ -6,6 +6,7 @@
</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://*/*" />
diff --git a/cordova/filesystem.ts b/cordova/filesystem.ts
index a2af6c8..4580078 100644
--- a/cordova/filesystem.ts
+++ b/cordova/filesystem.ts
@@ -27,7 +27,7 @@ export class GeneralSettings {
account = '';
password = '';
host = 'wss://chat.f-list.net:9799';
- theme = 'dark';
+ theme = 'default';
}
type Index = {[key: string]: {name: string, index: {[key: number]: number | undefined}} | undefined};
@@ -99,12 +99,13 @@ function serializeMessage(message: Conversation.Message): Blob {
dv.setUint8(5, senderLength);
const textLength = getByteLength(message.text);
dv.setUint16(6, textLength);
- return new Blob([buffer, name, message.text, String.fromCharCode(senderLength + textLength + 10)]);
+ 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);
+ const time = dv.getUint32(0) * 1000;
const type = dv.getUint8(4);
const senderLength = dv.getUint8(5);
const messageLength = dv.getUint16(6);
@@ -183,7 +184,7 @@ export class Logs implements Logging.Persistent {
let messages = new Array<Conversation.Message>(count);
let pos = file.size;
while(pos > 0 && count > 0) {
- const length = new DataView(await readAsArrayBuffer(file)).getUint16(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;
}
diff --git a/electron/Index.vue b/electron/Index.vue
index 9bb80eb..ae9c43c 100644
--- a/electron/Index.vue
+++ b/electron/Index.vue
@@ -88,7 +88,6 @@
{label: l('action.open'), click: () => mainWindow!.show()},
{
label: l('action.quit'),
- role: 'quit',
click: () => {
isClosing = true;
mainWindow!.close();
@@ -201,7 +200,13 @@
},
{type: 'separator'},
{role: 'minimize'},
- {role: 'quit'}
+ process.platform === 'darwin' ? {role: 'quit'} : {
+ label: l('action.quit'),
+ click(): void {
+ isClosing = true;
+ mainWindow!.close();
+ }
+ }
];
electron.remote.Menu.setApplicationMenu(electron.remote.Menu.buildFromTemplate(appMenu));
@@ -220,6 +225,9 @@
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);
diff --git a/electron/application.json b/electron/application.json
index 868317c..3da5470 100644
--- a/electron/application.json
+++ b/electron/application.json
@@ -1,6 +1,6 @@
{
"name": "fchat",
- "version": "0.2.2",
+ "version": "0.2.4",
"author": "The F-List Team",
"description": "F-List.net Chat Client",
"main": "main.js",
diff --git a/electron/build/tray.png b/electron/build/tray.png
index 1c95bc7c3b3fde030abfde761ada576414a6c63e..0a8eab26457928461e5ec7c71980222557939a2d 100644
GIT binary patch
delta 917
zcmV;G18V%66v+o6iBL{Q4GJ0x0000DNk~Le0000G0000G2nGNE03Y-JVUZz2e*;fR
zL_t(|+Dy&MYg|<Tfbs9#d+wccACt+9Gnq-I(<GBNjrD;+&`OAITnM5Fbs_jz_*Yo4
zT5NGIf~yJ&F5DCmABbIuSOrt)qOmlMP12N1lQhXB^Pc-WZd~-+|M*0<I7N~qR4Ntf
z(~}&p)k@{@@z<Sf?nT?l)`dVsf5YB-&~07Y-G1=>=H}M!t=lVXZQKJXkwO4Knk0<o
z^Y7K4eCDHatv=)A@_3$))|yVIv(WFh-}TCkbG;zClq@fQiPoSsMieEaX^NZ8ULZIA
z_31M&&76MvDN2PLM~6)g_8+2@&B@tWX6K)uYR2~E(c;*rmQvVCA)_#&e=s)o&Oqiq
zUT^H<JBr_a|BJ7_{h4-efYvFV>oR@3LajW?A4|(r$I9nQ)%JSpVE?l8M*N~%Ja%cj
z*{3q)ld%kLt={ME{X-njL1WSl0(P1k{GCQvYJ{DG9{K#lMZ4GeNqQs2HwHR0sZ9fI
zDuhlMD-}33cY^6^327Sae;;*ewtKYNU6NsksJlmBi;9~oot1{lEe^4;9EVsaf*|0n
zR~LEz&6n|=3~8DYB`Hfc|K<GWKM-IblYlrJU^%&0q@nz}5DHuRq^1K}<0^~mH`lnc
zxyLX{sN`LaIs+2vW4ktS5)f&Pfv!s1@x)Mjm}-PTD0HgX+Bx9je>c||L;}+kfX0$0
z-e{3D>_glmO(QafiS#|^-cV;3q{<Ro9<6>vwUA+=c8sH;i8Od5O+09!!xoU>8|=tz
zM*cZ)3U3SPB0Qf)JLcKx9QDZ}x0@0r|F;5k5)-sybl_uWO#DITS80a5?}}yT!(Jvo
zVdP92g8)aG%%AjWe>?zJibw84jMO9z^SGh0Z?*bY%-ZB!*LCbprZ)GQa9m{8;)QCC
ztTI?JLFE-r&cbpGh$G@*ikr!x9<F>4wGXbElc%18Ah_Y$hUZpi7Y5Sh@x0`T$2>Or
zAw$<CBLwLnCF~p6NaVd6pA9$HKEbdtr{>O(Bnd_mTvbtTYtQrx^ZrOSyI9YogkUXp
z(4j@r(-?>QyXorE`S#s^F6b063?yiT5C~~A+}r*_G=KSVX>aCiaK~FbF*Q+BU6a=C
rQ6oNRUhA!|UWvkR18G4L0`T7e#y4)&34oz~00000NkvXXu0mjf>h{Fw
delta 2548
zcmV<Q2@Ceg2b&ZjiBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^pPP$e+i*U
zL_t(|+LV_|jGWn3$A9O(zOTNj>gwu;yW7us*cqE40Wvrtgunu!ED#GKgoHpu$_Bv#
z$SNBKB1S?W!~!;KP?R7Mi4}oJAZ3)GnRplrlz2jh!LdDljot2tyQ?47RrS?(?>#Ka
zjwZv*1djAc-{$K4&N=^c&$;5Ne^tJ30^M$h)s+?6Rf}$?!@|-6olb|sT9#LiEgw6!
z{7j7LsZf;9im}H5$tiA3>&fdO_?uf>+t;=>w>Dx<42L7Ox3(EgChQLOc=P&oa>^j`
zeV2~+v79rSGv51)E30dtDLb8yKOCp?lLl`a2!#g$O^{;1$CRr1g=?$Me_h^KU;jeR
z=~B-5{am~^K+YNG-TCE})j#Mjul`CZ+r>}{mey7XWktU~j}L*ImFaZK-u^yE!y_B(
z@daz!7oM2w|7N&z>mLU@gBNnjul>IOVvNl7mVf=nFMj0DPoKN6R?RK2cH#s@t3r$=
zr9=}WkE5%q7X5yYtU?nbf1}ZudOWfVr_O$AY3<a{UHbZq&p+JR`RjM{WsUFrfCj8J
z=FAgkK7aD;`M)d{k9R+K@uyi_K1NX#<ebSlVT=%bAOufv4(lu;1}EU1p;Z<b=TYC{
zjjP|QiV%LW9v}7Y-M#k>RP%dgAjZhT!s7EM&tCY$OW%5fi(#JFe<T`P<848!EYKX;
z+uvtnV~gFv9x+DR?KboMKJ9j!cGadR0%ch+S>NF6-*}m(Y53@mJ^R_M?T6;p^&7wM
zL%=)|qEl4>R5RVVxlf<_(1$<&pV#kle`A}Uty)+sgy2Xq@zUi>Tzd7}+`7Nb;NXa6
z8c`H)EmhTGp;z(bf0^T)ed-iH^Ha~UvvHpXTf2}GSKheE2R`)N?+pffH%EuVzjAIC
zyK7Y?s?ap?>8H+r@J~1QCaiDnV0}RdCC(bW^=xiz@TI^1XKp??pwq6fHeiYXKvFmu
zCw7PXeDBUS_M2Dur+;~w(kixSBdK9ydq7bXJbC^{U-<8DfBpMQs`)!0IPV=fB|81p
z=V|p;@2_tm#$mj}Scfx$pd22J$R^P3bn)H+`VKV-&MQ!&nz{dQ1Zj#dDsnRcV109k
z(<fHu`m4uZ818KSvavQf6${o}>@2SR+U~)KCMw1khyr3TMlb@3&cJNOSPLlnHilVA
zA6+o2v?@o=e+}A95LJvSF;3atJEFa~_DhrD{?9uxUvn)V$f5O_?Au{@c!aosu>qro
zn81i4MhK5GGLBQ4oXM&f5kv%4odJr$8o@b-HDHY)tAHw+GbkL5YeKI}(dmDh@!^XO
zYnN<m?i14_WEG6_7*`--na0^6XM}Fm;>589di^C%e;n&`=J*l|a}~x2le%GZ=YV@#
z1NIL_Z0{X19MzC51_7P5ub|}AFm5uYHTQ8z^+{J0t!HZAJ~xdSu^wYR;sRm<b))E`
zgUd^OKKDDnO0QE<6aniDnw6ZDteKQDlWD_fJmuEi`~1ZhUt~B*7-K*cGy<8dLX3)Y
z)k)`ze~&qF;puFPpeh*aF)m<SiPb=pAEh^EdYy{-P8&tB#$b&>1+a=@K_PgLF_we<
z1IAOu`4W-=pCL!c2~^1n*#>Ju`3Yx3`6DWRCM07J8!*1WQW7zb#FnulIA<t>V>}-7
zaC?v8Xv#Dx1|>Md!hDD0{T^F`5j6#EA5d#RfAkSRM9GjdYQTnS)j40B6yuQ$##+P`
z7+>I|q=_>C^T_$u_6}cr<-1(Hv&&ms2aFma>rAMnQ~I62lgF31dUuCbyNflT$s#DE
zX7=SwCV~NL%a(H?h#{aE#8`|ESYLpvIH;9+ns9ce<ZHJd@P!v|f-CX1g^@>{r*K#+
zf16|FzcwFIct@-9XjU{eh-5U?kOHb1NrE+kw}rUi+=eqAjUd)yT)?`3ElY+|;czs?
z86l-aQ3Mti7l`U+&fmrK?SBe6S%i$n8vGR11V(UH2;#;rc=twO3z7k2EY^FB_t;R7
zjAv9QK(R*XwFA9&!6246(f3_6W+a&$e=SK9ngZm2Xd)#;@Is-o?Y!kiS-LoFoHGdG
z3v4KGMM-ikc1JVOSYw#)l&mba+21SimLF=GBe}7l4a5K`AY>$aS|O{i^|CW!uXViK
zp7{1zO?lP<p}>~~;!AE15_OF9jL_{=oLrgb=F}0q{IKxR)R3lvXpO`Gd6sD_e?r@i
z9>^qr)8!N&lrnv_UA51SrxEKsu5h?uFfGfV$xP~qL8*#@(+fg15JD&r-m&jJW>Q5}
z$xS9215wD0!)k#vLJ>Tz$>4IzddDFK#)n^=Uo^jw!<?Xs3w{Pr3WuWXjw7dYq70sM
zt6i1`HDj?jvF{$a&Ti0D3!<P?e}fhQLD5h!?;~b#_~j%fImD9c`lZ(R;XlkRU-;Ch
zj=11(!Ql(T#K7h_(lia-PMft}hg1D2x9}9`d(=LY8YPNB8$%8bjRlCMRXAF^*Iydf
zldp;mI1!7Aq-JO1k9)_S_yu~)-INm6d#typ7uKhlN!>8l73SwE&MzGBe;_)Fcl4q@
zZoMWFCkc&Uox%Em1|^hj=F?y@-dTTMF;fBTnR7oe8>uO8x>VQQ<EK9vLkEnRm7?^R
z;CQy@=~X4(d(!xbn}Ad$J_s%tTw!qDU<|WVH;G&)a+ApktS{-8kZ!&9C-vdpm*mk-
zXwQ7$CqWDtLypa>t{E-Pf1P~dqd9aCv3Td1isk8!Wu+ZxS0xf7Tceu&R+qvG)>xbv
zj0z+r*O@%dq*}?1U|h*UOGwxM<8O!S_dYAutB6CyVb7fZ7>ETi<P6ipgMSV2Xr*`j
z)N|VEp(-S?EVP8DyN+(V0-zoqabE*26j&5Vf=0-7CQXz$$;2r5f1<^_ozh&r{N?@I
zH+~y2_1m9j_RKRE-?ml>h{Sq-@2fK08PE57A1M}B%0!^f@Jv^kZx<9rfO^8#G%*fs
zY|`1RsWVLtu?7)ORTfkS4@O7d{kK2cyYuGnqWpmK{{`^ajPq!WuN>Wd^W_%xQ@w@x
zCv&^csjjfvcJ#U(e@bVmM`P}p3dx2P1<ej4fx=l@^*-^&mCM`Te&x4PUH?svN#F4%
zd2awQ1{VtAw0W!EAN<|qts7Tlv{wy>hjVd!*cCD>OFiZ-tWOe+EeTD784bxBx3@;u
zUVC}>%Bz2Lw7LGdW>Q~sMM13V*<Sd6eVjf9G1kQt(^s}%N`LJudw09%ujF)ot_mMs
zTU$QU=~UgrEF49Kqn*K9_2J<aRlPcVIC#D2bP($hW8QaO{LcX9aih$Lw#lpj0000<
KMNUMnLSTX?r0W|1
diff --git a/electron/build/tray@2x.png b/electron/build/tray@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c95bc7c3b3fde030abfde761ada576414a6c63e
GIT binary patch
literal 2587
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
literal 0
HcmV?d00001
diff --git a/electron/importer.ts b/electron/importer.ts
index d336487..ef320d0 100644
--- a/electron/importer.ts
+++ b/electron/importer.ts
@@ -98,7 +98,7 @@ function createMessage(line: string, ownCharacter: string, name: string, isChann
let endIndex = line.indexOf('[', lineIndex += 6);
if(endIndex - lineIndex > 20) endIndex = lineIndex + 20;
sender = line.substring(lineIndex, endIndex);
- text = line.substring(endIndex + 6, 65535);
+ text = line.substring(endIndex + 6, 50000);
} else {
if(lineIndex + ownCharacter.length <= line.length && line.substr(lineIndex, ownCharacter.length) === ownCharacter)
sender = ownCharacter;
@@ -117,7 +117,7 @@ function createMessage(line: string, ownCharacter: string, name: string, isChann
lineIndex += 3;
}
} else type = Conversation.Message.Type.Action;
- text = line.substr(lineIndex, 65535);
+ text = line.substr(lineIndex, 50000);
}
return {type, sender: {name: sender}, text, time: addMinutes(date, h * 60 + m)};
}
diff --git a/fchat/channels.ts b/fchat/channels.ts
index a33b28b..2876189 100644
--- a/fchat/channels.ts
+++ b/fchat/channels.ts
@@ -18,6 +18,10 @@ function sortMember(this: void | never, array: Interfaces.Member[], member: Inte
if(member.character.isChatOp && !other.character.isChatOp) break;
if(other.rank > member.rank) continue;
if(member.rank > other.rank) break;
+ if(other.character.isFriend && !member.character.isFriend) continue;
+ if(member.character.isFriend && !other.character.isFriend) break;
+ if(other.character.isBookmarked && !member.character.isBookmarked) continue;
+ if(member.character.isBookmarked && !other.character.isBookmarked) break;
if(name < other.character.name) break;
}
array.splice(i, 0, member);
@@ -37,6 +41,7 @@ class Channel implements Interfaces.Channel {
addMember(member: Interfaces.Member): void {
this.members[member.character.name] = member;
sortMember(this.sortedMembers, member);
+ for(const handler of state.handlers) handler('join', this, member);
}
removeMember(name: string): void {
@@ -44,6 +49,7 @@ class Channel implements Interfaces.Channel {
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);
}
}
@@ -105,12 +111,17 @@ let state: State;
export default function(this: void, connection: Connection, characters: Character.State): Interfaces.State {
state = new State(connection);
let getChannelTimer: NodeJS.Timer | undefined;
- connection.onEvent('connecting', () => {
+ let rejoin: string[] | undefined;
+ connection.onEvent('connecting', (isReconnect) => {
+ if(isReconnect) rejoin = Object.keys(state.joinedMap);
state.joinedChannels = [];
state.joinedMap = {};
});
- connection.onEvent('connected', (isReconnect) => {
- if(isReconnect) queuedJoin(Object.keys(state.joinedChannels));
+ connection.onEvent('connected', () => {
+ if(rejoin !== undefined) {
+ queuedJoin(rejoin);
+ rejoin = undefined;
+ }
const getChannels = () => {
connection.send('CHA');
connection.send('ORS');
@@ -152,7 +163,8 @@ export default function(this: void, connection: Connection, characters: Characte
if(item !== undefined) item.isJoined = true;
} else {
const channel = state.getChannel(data.channel)!;
- channel.addMember(channel.createMember(characters.get(data.character.identity)));
+ const member = channel.createMember(characters.get(data.character.identity));
+ channel.addMember(member);
if(item !== undefined) item.memberCount++;
}
});
diff --git a/fchat/characters.ts b/fchat/characters.ts
index f69a9f6..4978a8b 100644
--- a/fchat/characters.ts
+++ b/fchat/characters.ts
@@ -128,22 +128,28 @@ export default function(this: void, connection: Connection): Interfaces.State {
char.isChatOp = false;
});
connection.onMessage('RTB', (data) => {
+ if(data.type !== 'trackadd' && data.type !== 'trackrem' && data.type !== 'friendadd' && data.type !== 'friendremove') return;
+ const character = state.get(data.name);
switch(data.type) {
case 'trackadd':
state.bookmarkList.push(data.name);
- state.get(data.name).isBookmarked = true;
+ character.isBookmarked = true;
+ if(character.status !== 'offline') state.bookmarks.push(character);
break;
case 'trackrem':
state.bookmarkList.splice(state.bookmarkList.indexOf(data.name), 1);
- state.get(data.name).isBookmarked = false;
+ character.isBookmarked = false;
+ if(character.status !== 'offline') state.bookmarks.splice(state.bookmarks.indexOf(character), 1);
break;
case 'friendadd':
state.friendList.push(data.name);
- state.get(data.name).isFriend = true;
+ character.isFriend = true;
+ if(character.status !== 'offline') state.friends.push(character);
break;
case 'friendremove':
state.friendList.splice(state.friendList.indexOf(data.name), 1);
- state.get(data.name).isFriend = false;
+ character.isFriend = false;
+ if(character.status !== 'offline') state.friends.splice(state.friends.indexOf(character), 1);
}
});
return state;
diff --git a/fchat/interfaces.ts b/fchat/interfaces.ts
index 117da93..6dd982d 100644
--- a/fchat/interfaces.ts
+++ b/fchat/interfaces.ts
@@ -180,7 +180,7 @@ export namespace Character {
export type Character = Character.Character;
export namespace Channel {
- export type EventHandler = (type: 'join' | 'leave', channel: Channel) => void;
+ export type EventHandler = (type: 'join' | 'leave', channel: Channel, member?: Member) => void;
export interface State {
readonly officialChannels: {readonly [key: string]: (ListItem | undefined)};
diff --git a/less/themes/chat/package.json b/less/package.json
similarity index 91%
rename from less/themes/chat/package.json
rename to less/package.json
index a890b86..fac0bdb 100644
--- a/less/themes/chat/package.json
+++ b/less/package.json
@@ -6,6 +6,7 @@
"license": "MIT",
"dependencies": {
"bootstrap": "^3.3.7",
+ "font-awesome": "^4.7.0",
"less": "^2.7.2",
"less-plugin-npm-import": "^2.1.0"
},
diff --git a/less/themes/chat/yarn.lock b/less/yarn.lock
similarity index 98%
rename from less/themes/chat/yarn.lock
rename to less/yarn.lock
index 38f377a..5b21453 100644
--- a/less/themes/chat/yarn.lock
+++ b/less/yarn.lock
@@ -115,6 +115,10 @@ 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"
+font-awesome@^4.7.0:
+ version "4.7.0"
+ resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
+
forever-agent@~0.6.1:
version "0.6.1"
resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
diff --git a/readme.md b/readme.md
index 2bb7e85..8e1cc52 100644
--- a/readme.md
+++ b/readme.md
@@ -31,9 +31,9 @@ See https://electron.atom.io/docs/tutorial/application-distribution/
## 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.
- - Change into the `less/themes/chat` directory.
+ - Change into the `less` directory.
- Run `yarn install`.
- - Run `yarn build {name}.less {name}.css`.
+ - Run `yarn build themes/chat/{name}.less {name}.css`.
## Dependencies
Note: Adding *and upgrading* dependencies should only be done with prior consideration and subsequent testing.