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

More optimization

This commit is contained in:
Mr. Stallion 2021-02-04 19:08:51 -06:00
parent bebcc1f150
commit 7a5f71f801
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,5 +1,9 @@
# Changelog # Changelog
## Canary
* Improved performance on highly advertised channels like LFRP
## 1.10.0 ## 1.10.0
* Moved database queries to a web worker to gain more responsive UI * Moved database queries to a web worker to gain more responsive UI
* Fixed Gelbooru, Gfycat, Hentai-Foundry, Instagram, Twitter, and Vimeo previews * Fixed Gelbooru, Gfycat, Hentai-Foundry, Instagram, Twitter, and Vimeo previews

31
chat/conversations.ts
View File

@ -38,9 +38,11 @@ abstract class Conversation implements Interfaces.Conversation {
_settings: Interfaces.Settings | undefined; _settings: Interfaces.Settings | undefined;
protected abstract context: CommandContext; protected abstract context: CommandContext;
protected maxMessages = 50; protected maxMessages = 50;
protected insertCount = 0;
protected allMessages: Interfaces.Message[] = []; protected allMessages: Interfaces.Message[] = [];
readonly reportMessages: Interfaces.Message[] = []; readonly reportMessages: Interfaces.Message[] = [];
private lastSent = ''; private lastSent = '';
// private loadedMore = false;
adManager: AdManager; adManager: AdManager;
protected static readonly conversationThroat = throat(1); // make sure user posting and ad posting won't get in each others' way protected static readonly conversationThroat = throat(1); // make sure user posting and ad posting won't get in each others' way
@ -100,6 +102,7 @@ abstract class Conversation implements Interfaces.Conversation {
loadMore(): boolean { loadMore(): boolean {
if(this.messages.length >= this.allMessages.length) return false; if(this.messages.length >= this.allMessages.length) return false;
this.maxMessages += 50; this.maxMessages += 50;
// this.loadedMore = true;
this.messages = this.allMessages.slice(-this.maxMessages); this.messages = this.allMessages.slice(-this.maxMessages);
EventBus.$emit('conversation-load-more', { conversation: this }); EventBus.$emit('conversation-load-more', { conversation: this });
@ -116,6 +119,28 @@ abstract class Conversation implements Interfaces.Conversation {
this.lastRead = this.messages[this.messages.length - 1]; this.lastRead = this.messages[this.messages.length - 1];
this.maxMessages = 50; this.maxMessages = 50;
this.messages = this.allMessages.slice(-this.maxMessages); this.messages = this.allMessages.slice(-this.maxMessages);
// this.loadedMore = false;
this.insertCount = 0;
}
// Keeps the message-list from re-rendering every time when full, cleaning up after itself every 200 messages
stretch(): void {
if ((core.conversations.selectedConversation !== this) || (this.messages.length < this.maxMessages)) {
return;
}
if (this.insertCount < 200) {
this.maxMessages += 1;
this.insertCount += 1;
} else {
const removed = this.insertCount;
this.maxMessages -= removed;
this.insertCount = 0;
this.messages = this.allMessages.slice(-this.maxMessages);
log.debug('conversation.view.cleanup', { channel: this.name, removed, left: this.messages.length, limit: this.maxMessages });
}
} }
clear(): void { clear(): void {
@ -197,8 +222,7 @@ class PrivateConversation extends Conversation implements Interfaces.PrivateConv
async addMessage(message: Interfaces.Message): Promise<void> { async addMessage(message: Interfaces.Message): Promise<void> {
await this.logPromise; await this.logPromise;
if (core.conversations.selectedConversation === this) this.stretch();
this.maxMessages += 1;
this.safeAddMessage(message); this.safeAddMessage(message);
if(message.type !== Interfaces.Message.Type.Event) { if(message.type !== Interfaces.Message.Type.Event) {
@ -334,8 +358,7 @@ class ChannelConversation extends Conversation implements Interfaces.ChannelConv
async addMessage(message: Interfaces.Message): Promise<void> { async addMessage(message: Interfaces.Message): Promise<void> {
await this.logPromise; await this.logPromise;
if (core.conversations.selectedConversation === this) this.stretch();
this.maxMessages += 1;
if((message.type === MessageType.Message || message.type === MessageType.Ad) && isWarn(message.text)) { if((message.type === MessageType.Message || message.type === MessageType.Ad) && isWarn(message.text)) {
const member = this.channel.members[message.sender.name]; const member = this.channel.members[message.sender.name];