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

fix ad flooding bug

This commit is contained in:
Mr. Stallion 2022-09-03 10:46:40 -07:00
parent a2be4e8d51
commit 2800e80c17
6 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,5 +1,8 @@
# Changelog # Changelog
## 1.19.2
* Fixed a bug that could lead to ad flooding if the client experienced frequent connection drops
## 1.19.1 ## 1.19.1
* Performance improvement for players who connect multiple characters at the same time * Performance improvement for players who connect multiple characters at the same time
* Limit max height of the status message banner on character profile * Limit max height of the status message banner on character profile

5
chat/ads/ConversationAdSettings.vue
View File

@ -62,8 +62,9 @@
...this.conversation.settings, ...this.conversation.settings,
adSettings: { adSettings: {
ads: this.ads.map((ad: string) => ad.trim()).filter((ad: string) => (ad.length > 0)), ...this.conversation.settings.adSettings,
randomOrder: this.randomOrder ads: this.ads.map((ad: string) => ad.trim()).filter((ad: string) => (ad.length > 0)),
randomOrder: this.randomOrder
} }
}; };
} }

13
chat/ads/ad-manager.ts
View File

@ -107,7 +107,11 @@ export class AdManager {
Math.random() * AdManager.POST_VARIANCE; Math.random() * AdManager.POST_VARIANCE;
this.adIndex = this.adIndex + 1; this.adIndex = this.adIndex + 1;
this.nextPostDue = new Date(Date.now() + nextInMs);
this.nextPostDue = new Date(Math.max(
Date.now() + nextInMs,
chanConv.settings.adSettings.lastAdTimestamp + (core.connection.vars.lfrp_flood * 1000)
));
// tslint:disable-next-line: no-unnecessary-type-assertion // tslint:disable-next-line: no-unnecessary-type-assertion
this.interval = setTimeout( this.interval = setTimeout(
@ -165,7 +169,12 @@ export class AdManager {
this.adIndex = 0; this.adIndex = 0;
this.active = true; this.active = true;
this.nextPostDue = new Date(Date.now() + initialWait);
this.nextPostDue = new Date(Math.max(
Date.now() + initialWait,
this.conversation.settings.adSettings.lastAdTimestamp + (core.connection.vars.lfrp_flood * 1000)
));
this.expireDue = new Date(Date.now() + AdManager.POSTING_PERIOD); this.expireDue = new Date(Date.now() + AdManager.POSTING_PERIOD);
this.adMap = this.generateAdMap(); this.adMap = this.generateAdMap();

3
chat/common.ts
View File

@ -100,6 +100,7 @@ export class Settings implements ISettings {
export class AdSettings implements Conversation.AdSettings { export class AdSettings implements Conversation.AdSettings {
ads: string[] = []; ads: string[] = [];
randomOrder = false; randomOrder = false;
lastAdTimestamp = 0;
} }
@ -109,7 +110,7 @@ export class ConversationSettings implements Conversation.Settings {
highlightWords: string[] = []; highlightWords: string[] = [];
joinMessages = Conversation.Setting.Default; joinMessages = Conversation.Setting.Default;
defaultHighlights = true; defaultHighlights = true;
adSettings: Conversation.AdSettings = { ads: [], randomOrder: false }; adSettings: Conversation.AdSettings = { ads: [], randomOrder: false, lastAdTimestamp: 0 };
} }
function pad(num: number): string | number { function pad(num: number): string | number {

2
chat/conversations.ts
View File

@ -484,6 +484,8 @@ class ChannelConversation extends Conversation implements Interfaces.ChannelConv
); );
this.nextAd = Date.now() + core.connection.vars.lfrp_flood * 1000; this.nextAd = Date.now() + core.connection.vars.lfrp_flood * 1000;
this.settings.adSettings.lastAdTimestamp = Date.now();
} }
); );
} }

1
chat/interfaces.ts
View File

@ -113,6 +113,7 @@ export namespace Conversation {
export interface AdSettings { export interface AdSettings {
readonly ads: string[]; readonly ads: string[];
readonly randomOrder: boolean; readonly randomOrder: boolean;
lastAdTimestamp: number;
} }
export const enum UnreadState { None, Unread, Mention } export const enum UnreadState { None, Unread, Mention }