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

Merge pull request #51 from ButterCheezii/no-matcher-hang 

Fix insane bug where some profiles cause client hang
This commit is contained in:
mrstallion 2021-12-20 16:36:39 -06:00 committed by GitHub
parent b4e58f6be7 c539dba6a8
commit 37a45c7f64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chat/preview/CharacterPreview.vue
View File

@ -213,7 +213,7 @@ export default class CharacterPreview extends Vue {
updateCustoms(): void {
this.customs = _.orderBy(
_.map(
_.reject(this.character!.character.customs || [], (c) => _.isUndefined(c)) as CustomKink[],
_.reject(Object.values(this.character!.character.customs ?? []), (c) => _.isUndefined(c)) as CustomKink[],
(c: CustomKink) => _.assign(
{},
c,

24
learn/matcher.ts
View File

@ -337,9 +337,9 @@ export class Matcher {
return _.map(
speciesOptions,
(species) => {
const nc = _.cloneDeep(c);
nc.infotags[TagId.Species] = { string: species };
// Avoid _.cloneDeep because it chokes on array-like objects with very large keys
// _.cloneDeep will happily make arrays with 41 million elements
const nc = {...c, infotags: {...c.infotags, [TagId.Species]: {string: species}}};
return { character: nc, analysis: new CharacterAnalysis(nc) };
}
@ -975,18 +975,14 @@ export class Matcher {
private getAllStandardKinks(c: Character): { [key: number]: KinkChoice } {
const kinks = _.pickBy(c.kinks, _.isString);
_.each(
c.customs,
(custom: any) => {
if (!custom) {
return;
// Avoid using _.forEach on c.customs because lodash thinks it is an array
for (const custom of Object.values(c.customs)) {
if (custom) {
const children = (custom as any).children ?? {};
_.each(children, (child) => kinks[child] = custom.choice);
}
const children = (custom.children) ? custom.children : {};
_.each(children, (child) => kinks[child] = custom.choice);
}
);
}
return kinks as any;
}

17
learn/store/worker.ts
View File

@ -26,7 +26,22 @@ export class WorkerStore implements PermanentIndexedStore {
async getProfile(name: string): Promise<ProfileRecord | undefined> {
return this.workerClient.request('get', { name });
const record: ProfileRecord | undefined = await this.workerClient.request('get', { name });
// fix custom kinks to prevent hangs
if (record && Array.isArray(record.profileData.character.customs)) {
// fix customs because it will crash the client
const customsObject: ProfileRecord['profileData']['character']['customs'] = {};
for (const [key, value] of Object.entries(record.profileData.character.customs)) {
if (value !== undefined) customsObject[key] = value;
}
record.profileData.character.customs = customsObject;
}
return record;
}