kittyfangs
/
fchat-rising
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgraded all dependencies

This commit is contained in:
Mr. Stallion 2020-06-29 17:01:06 -05:00
parent 814eb5faec
commit 9879195a41
10 changed files with 566 additions and 255 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
chat/Chat.vue
View File

@ -146,6 +146,16 @@ import {InlineDisplayMode} from '../interfaces';
}); });
core.connection.onEvent('connecting', async() => { core.connection.onEvent('connecting', async() => {
this.connecting = true; this.connecting = true;
if(process.env.NODE_ENV !== 'production') {
log.debug(
{
type: 'connection.connecting',
character: core.characters.ownCharacter?.name
}
);
}
profileApiInit({ profileApiInit({
defaultCharacter: this.defaultCharacter, animateEicons: core.state.settings.animatedEicons, fuzzyDates: true, defaultCharacter: this.defaultCharacter, animateEicons: core.state.settings.animatedEicons, fuzzyDates: true,
inlineDisplayMode: InlineDisplayMode.DISPLAY_ALL inlineDisplayMode: InlineDisplayMode.DISPLAY_ALL
@ -153,6 +163,15 @@ import {InlineDisplayMode} from '../interfaces';
if(core.state.settings.notifications) await core.notifications.requestPermission(); if(core.state.settings.notifications) await core.notifications.requestPermission();
}); });
core.connection.onEvent('connected', () => { core.connection.onEvent('connected', () => {
if(process.env.NODE_ENV !== 'production') {
log.debug(
{
type: 'connection.connected',
character: core.characters.ownCharacter?.name
}
);
}
(<Modal>this.$refs['reconnecting']).hide(); (<Modal>this.$refs['reconnecting']).hide();
this.error = ''; this.error = '';
this.connecting = false; this.connecting = false;
@ -164,7 +183,6 @@ import {InlineDisplayMode} from '../interfaces';
document.title = (hasNew ? '💬 ' : '') + l(core.connection.isOpen ? 'title.connected' : 'title', core.connection.character); document.title = (hasNew ? '💬 ' : '') + l(core.connection.isOpen ? 'title.connected' : 'title', core.connection.character);
}); });
core.connection.onError((e) => { core.connection.onError((e) => {
if(process.env.NODE_ENV !== 'production') { if(process.env.NODE_ENV !== 'production') {
log.debug( log.debug(
{ {
@ -193,7 +211,11 @@ import {InlineDisplayMode} from '../interfaces';
async connect(): Promise<void> { async connect(): Promise<void> {
this.connecting = true; this.connecting = true;
// skipping await
// tslint:disable-next-line: no-floating-promises
await core.notifications.initSounds(['attention', 'login', 'logout', 'modalert', 'newnote']); await core.notifications.initSounds(['attention', 'login', 'logout', 'modalert', 'newnote']);
core.connection.connect(this.selectedCharacter.name); core.connection.connect(this.selectedCharacter.name);
} }
} }

4
chat/Logs.vue
View File

@ -74,7 +74,7 @@
import Zip from './zip'; import Zip from './zip';
function formatDate(this: void, date: Date): string { function formatDate(this: void, date: Date): string {
return format(date, 'YYYY-MM-DD'); return format(date, 'yyyy-MM-DD');
} }
function getLogs(messages: ReadonlyArray<Conversation.Message>): string { function getLogs(messages: ReadonlyArray<Conversation.Message>): string {
@ -325,4 +325,4 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
</style> </style>

12
chat/notifications.ts
View File

@ -1,3 +1,5 @@
// import path from 'path';
import core from './core'; import core from './core';
import {Conversation, Notifications as Interface} from './interfaces'; import {Conversation, Notifications as Interface} from './interfaces';
@ -28,7 +30,9 @@ export default class Notifications implements Interface {
getOptions(conversation: Conversation, body: string, icon: string): getOptions(conversation: Conversation, body: string, icon: string):
NotificationOptions & {badge: string, silent: boolean, renotify: boolean} { NotificationOptions & {badge: string, silent: boolean, renotify: boolean} {
const badge = <string>require(`./assets/ic_notification.png`); //tslint:disable-line:no-require-imports
const badge = <string>require(`./assets/ic_notification.png`).default; //tslint:disable-line:no-require-imports no-unsafe-any
return { return {
body, icon: core.state.settings.showAvatars ? icon : undefined, badge, silent: true, data: {key: conversation.key}, body, icon: core.state.settings.showAvatars ? icon : undefined, badge, silent: true, data: {key: conversation.key},
tag: conversation.key, renotify: true tag: conversation.key, renotify: true
@ -55,13 +59,13 @@ export default class Notifications implements Interface {
for(const name in codecs) { for(const name in codecs) {
const src = document.createElement('source'); const src = document.createElement('source');
src.type = `audio/${name}`; src.type = `audio/${name}`;
//tslint:disable-next-line:no-require-imports src.src = <string>require(`./assets/${sound}.${codecs[name]}`).default; // tslint:disable-line: no-unsafe-any
src.src = <string>require(`./assets/${sound}.${codecs[name]}`);
audio.appendChild(src); audio.appendChild(src);
} }
document.body.appendChild(audio); document.body.appendChild(audio);
audio.volume = 0; audio.volume = 0;
audio.muted = true; audio.muted = true;
const promise = audio.play(); const promise = audio.play();
if(promise instanceof Promise) if(promise instanceof Promise)
promises.push(promise.catch((e) => console.error(e))); promises.push(promise.catch((e) => console.error(e)));
@ -72,4 +76,4 @@ export default class Notifications implements Interface {
async requestPermission(): Promise<void> { async requestPermission(): Promise<void> {
if((<{Notification?: object}>window).Notification !== undefined) await Notification.requestPermission(); if((<{Notification?: object}>window).Notification !== undefined) await Notification.requestPermission();
} }
} }

8
components/date_display.vue
View File

@ -4,7 +4,7 @@
<script lang="ts"> <script lang="ts">
import {Component, Hook, Prop, Watch} from '@f-list/vue-ts'; import {Component, Hook, Prop, Watch} from '@f-list/vue-ts';
import {distanceInWordsToNow, format} from 'date-fns'; import {formatDistanceToNow, format} from 'date-fns';
import Vue from 'vue'; import Vue from 'vue';
import {settings} from '../site/utils'; import {settings} from '../site/utils';
@ -21,8 +21,8 @@
if(this.time === null || this.time === 0) if(this.time === null || this.time === 0)
return; return;
const date = isNaN(+this.time) ? new Date(`${this.time}+00:00`) : new Date(+this.time * 1000); const date = isNaN(+this.time) ? new Date(`${this.time}+00:00`) : new Date(+this.time * 1000);
const absolute = format(date, 'YYYY-MM-DD HH:mm'); const absolute = format(date, 'yyyy-MM-DD HH:mm');
const relative = distanceInWordsToNow(date, {addSuffix: true}); const relative = formatDistanceToNow(date, {addSuffix: true});
if(settings.fuzzyDates) { if(settings.fuzzyDates) {
this.primary = relative; this.primary = relative;
this.secondary = absolute; this.secondary = absolute;
@ -32,4 +32,4 @@
} }
} }
} }
</script> </script>

1
electron/Index.vue
View File

@ -203,6 +203,7 @@
this.loggingIn = true; this.loggingIn = true;
try { try {
if(!this.saveLogin) await keyStore.deletePassword(this.settings.account); if(!this.saveLogin) await keyStore.deletePassword(this.settings.account);
const data = <{ticket?: string, error: string, characters: {[key: string]: number}, default_character: number}> 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({ (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, account: this.settings.account, password: this.password, no_friends: true, no_bookmarks: true,

3
electron/Window.vue
View File

@ -68,7 +68,8 @@
tray: Electron.Tray tray: Electron.Tray
} }
const trayIcon = path.join(__dirname, <string>require('./build/tray.png')); //tslint:disable-line:no-require-imports //tslint:disable-next-line:no-require-imports no-unsafe-any
const trayIcon = path.join(__dirname, <string>require('./build/tray.png').default);
@Component @Component
export default class Window extends Vue { export default class Window extends Vue {

11
electron/main.ts
View File

@ -51,6 +51,7 @@ import MenuItemConstructorOptions = Electron.MenuItemConstructorOptions;
import * as _ from 'lodash'; import * as _ from 'lodash';
import DownloadItem = Electron.DownloadItem; import DownloadItem = Electron.DownloadItem;
//tslint:disable-next-line:no-require-imports
const pck = require('./package.json'); const pck = require('./package.json');
// Module to control application life. // Module to control application life.
@ -287,7 +288,8 @@ function createWindow(): Electron.BrowserWindow | undefined {
} }
function showPatchNotes(): void { function showPatchNotes(): void {
electron.shell.openExternal('https://github.com/mrstallion/fchat-rising/blob/master/CHANGELOG.md'); //tslint:disable-line:no-floating-promises //tslint:disable-next-line: no-floating-promises
electron.shell.openExternal('https://github.com/mrstallion/fchat-rising/blob/master/CHANGELOG.md');
} }
@ -317,6 +319,7 @@ function onReady(): void {
// } // }
// ); // );
//tslint:disable-next-line: no-unsafe-any
const updaterUrl = `https://update.electronjs.org/mrstallion/fchat-rising/${process.platform}-${process.arch}/${pck.version}`; const updaterUrl = `https://update.electronjs.org/mrstallion/fchat-rising/${process.platform}-${process.arch}/${pck.version}`;
if((process.env.NODE_ENV === 'production') && (process.platform !== 'darwin')) { if((process.env.NODE_ENV === 'production') && (process.platform !== 'darwin')) {
electron.autoUpdater.setFeedURL({url: updaterUrl + (settings.beta ? '?channel=beta' : ''), serverType: 'json'}); electron.autoUpdater.setFeedURL({url: updaterUrl + (settings.beta ? '?channel=beta' : ''), serverType: 'json'});
@ -540,8 +543,10 @@ function onReady(): void {
if(index !== -1) characters.splice(index, 1); if(index !== -1) characters.splice(index, 1);
}); });
const emptyBadge = electron.nativeImage.createEmpty(); 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'))); //tslint:disable-next-line:no-require-imports no-unsafe-any
const badge = electron.nativeImage.createFromPath(path.join(__dirname, <string>require('./build/badge.png').default));
electron.ipcMain.on('has-new', (e: Event & {sender: Electron.WebContents}, hasNew: boolean) => { electron.ipcMain.on('has-new', (e: Event & {sender: Electron.WebContents}, hasNew: boolean) => {
if(process.platform === 'darwin') app.dock.setBadge(hasNew ? '!' : ''); if(process.platform === 'darwin') app.dock.setBadge(hasNew ? '!' : '');
const window = electron.BrowserWindow.fromWebContents(e.sender) as BrowserWindow | undefined; const window = electron.BrowserWindow.fromWebContents(e.sender) as BrowserWindow | undefined;

12
electron/webpack.config.js
View File

@ -99,9 +99,15 @@ const mainConfig = {
}), }),
new VueLoaderPlugin(), new VueLoaderPlugin(),
new CopyPlugin( new CopyPlugin(
[ {
{ from: path.resolve(__dirname, '..', 'chat', 'preview', 'assets', '**/*'), to: path.join('preview', 'assets'), context: path.resolve(__dirname, '..', 'chat', 'preview', 'assets') } patterns: [
] {
from: path.resolve(__dirname, '..', 'chat', 'preview', 'assets', '**/*'),
to: path.join('preview', 'assets'),
context: path.resolve(__dirname, '..', 'chat', 'preview', 'assets')
}
]
}
) )
], ],
resolve: { resolve: {

65
package.json
View File

@ -8,53 +8,54 @@
"@f-list/fork-ts-checker-webpack-plugin": "^3.1.1", "@f-list/fork-ts-checker-webpack-plugin": "^3.1.1",
"@f-list/vue-ts": "^1.0.3", "@f-list/vue-ts": "^1.0.3",
"@fortawesome/fontawesome-free": "^5.13.1", "@fortawesome/fontawesome-free": "^5.13.1",
"@types/bluebird": "^3.5.30", "@types/bluebird": "^3.5.32",
"@types/lodash": "^4.14.134", "@types/lodash": "^4.14.157",
"@types/node-fetch": "^2.5.5", "@types/node": "^12.12.47",
"@types/qs": "^6.9.1", "@types/node-fetch": "^2.5.7",
"@types/sortablejs": "^1.10.2", "@types/qs": "^6.9.3",
"@vue/devtools": "^5.1.0", "@types/sortablejs": "^1.10.4",
"axios": "^0.19.0", "@vue/devtools": "^5.3.3",
"axios": "^0.19.2",
"bootstrap": "^4.5.0", "bootstrap": "^4.5.0",
"copy-webpack-plugin": "^5.1.1", "copy-webpack-plugin": "^6.0.2",
"css-loader": "^3.0.0", "css-loader": "^3.6.0",
"date-fns": "^1.30.1", "date-fns": "^2.14.0",
"electron": "^9.0.0-beta.14", "electron": "^9.0.5",
"electron-log": "^4.1.1", "electron-log": "^4.2.2",
"electron-packager": "^14.2.1", "electron-packager": "^15.0.0",
"electron-rebuild": "^1.10.1", "electron-rebuild": "^1.11.0",
"extract-loader": "^3.1.0", "extract-loader": "^5.1.0",
"file-loader": "^4.0.0", "file-loader": "^6.0.0",
"lodash": "^4.17.15", "lodash": "^4.17.15",
"node-sass": "^4.14.1", "node-sass": "^4.14.1",
"optimize-css-assets-webpack-plugin": "^5.0.1", "optimize-css-assets-webpack-plugin": "^5.0.3",
"qs": "^6.9.1", "qs": "^6.9.4",
"raven-js": "^3.27.2", "raven-js": "^3.27.2",
"raw-loader": "^4.0.0", "raw-loader": "^4.0.1",
"sass-loader": "^7.1.0", "sass-loader": "^8.0.2",
"sortablejs": "^1.10.2", "sortablejs": "^1.10.2",
"style-loader": "^0.23.1", "style-loader": "^1.2.1",
"throat": "^5.0.0", "throat": "^5.0.0",
"ts-loader": "^6.0.3", "ts-loader": "^7.0.5",
"tslib": "^1.10.0", "tslib": "^2.0.0",
"tslint": "^5.17.0", "tslint": "^6.1.2",
"typescript": "^3.5.2", "typescript": "^3.9.5",
"vue": "^2.6.8", "vue": "^2.6.11",
"vue-loader": "^15.7.0", "vue-loader": "^15.9.3",
"vue-template-compiler": "^2.6.8", "vue-template-compiler": "^2.6.11",
"webpack": "^4.35.0" "webpack": "^4.43.0"
}, },
"dependencies": { "dependencies": {
"@cliqz/adblocker-electron": "^1.13.0", "@cliqz/adblocker-electron": "^1.16.0",
"bluebird": "^3.7.2", "bluebird": "^3.7.2",
"jquery": "^3.4.1", "jquery": "^3.5.1",
"keytar": "^5.4.0", "keytar": "^5.4.0",
"node-fetch": "^2.6.0" "node-fetch": "^2.6.0"
}, },
"optionalDependencies": { "optionalDependencies": {
"appdmg": "^0.6.0", "appdmg": "^0.6.0",
"electron-squirrel-startup": "^1.0.0", "electron-squirrel-startup": "^1.0.0",
"electron-winstaller": "^3.0.4" "electron-winstaller": "^4.0.0"
}, },
"scripts": { "scripts": {
"postinstall": "electron-rebuild --prebuild-tag-prefix=ignoreprebuilds -f -o keytar" "postinstall": "electron-rebuild --prebuild-tag-prefix=ignoreprebuilds -f -o keytar"

681
yarn.lock
View File

File diff suppressed because it is too large Load Diff