Feat: Add cache for reasons (#115)

Fediseer · Sep 25, 2023 · a52d158 · a52d158
1 parent 9411f5d
commit a52d158
Show file tree

Hide file tree

Showing 9 changed files with 58 additions and 8 deletions.
diff --git a/src/app/censures/pages/censure-instance/censure-instance.component.ts b/src/app/censures/pages/censure-instance/censure-instance.component.ts
@@ -42,7 +42,7 @@ export class CensureInstanceComponent implements OnInit {
 
       this.form.patchValue({instance: query['instance']});
     });
-    let availableReasons = await toPromise(this.api.getUsedReasons());
+    let availableReasons = await toPromise(this.cachedApi.getUsedReasons());
     if (availableReasons === null) {
       this.messageService.createWarning(`Couldn't get list of reasons you've used previously, autocompletion won't work.`);
       availableReasons = [];

diff --git a/src/app/censures/pages/edit-censure-reasons/edit-censure-reasons.component.ts b/src/app/censures/pages/edit-censure-reasons/edit-censure-reasons.component.ts
@@ -42,7 +42,7 @@ export class EditCensureReasonsComponent implements OnInit {
 
     this.activatedRoute.params.subscribe(async params => {
       const targetInstance = params['instance'] as string;
-      let availableReasons = await toPromise(this.api.getUsedReasons());
+      let availableReasons = await toPromise(this.cachedApi.getUsedReasons());
       if (availableReasons === null) {
         this.messageService.createWarning(`Couldn't get list of reasons that were used previously, autocompletion won't work.`);
         availableReasons = [];

diff --git a/src/app/endorsements/pages/edit-endorsement-reasons/edit-endorsement-reasons.component.ts b/src/app/endorsements/pages/edit-endorsement-reasons/edit-endorsement-reasons.component.ts
@@ -43,7 +43,7 @@ export class EditEndorsementReasonsComponent implements OnInit {
 
     this.activatedRoute.params.subscribe(async params => {
       const targetInstance = params['instance'] as string;
-      let availableReasons = await toPromise(this.api.usedEndorsementReasons);
+      let availableReasons = await toPromise(this.cachedApi.getUsedEndorsementReasons());
       if (availableReasons === null) {
         this.messageService.createWarning(this.translator.get('error.reasons.autocompletion.fetch'));
         availableReasons = [];

diff --git a/src/app/endorsements/pages/endorse-instance/endorse-instance.component.ts b/src/app/endorsements/pages/endorse-instance/endorse-instance.component.ts
@@ -37,7 +37,7 @@ export class EndorseInstanceComponent implements OnInit {
   public async ngOnInit(): Promise<void> {
     this.titleService.title = this.translator.get('app.endorsements.add.title');
 
-    const reasons = await toPromise(this.api.usedEndorsementReasons);
+    const reasons = await toPromise(this.cachedApi.getUsedEndorsementReasons());
     if (reasons === null) {
       this.messageService.createWarning(this.translator.get('error.reasons.autocompletion.fetch'));
     } else {

diff --git a/src/app/hesitations/pages/edit-hesitation-reasons/edit-hesitation-reasons.component.ts b/src/app/hesitations/pages/edit-hesitation-reasons/edit-hesitation-reasons.component.ts
@@ -42,7 +42,7 @@ export class EditHesitationReasonsComponent {
 
     this.activatedRoute.params.subscribe(async params => {
       const targetInstance = params['instance'] as string;
-      let availableReasons = await toPromise(this.api.getUsedReasons());
+      let availableReasons = await toPromise(this.cachedApi.getUsedReasons());
       if (availableReasons === null) {
         this.messageService.createWarning(`Couldn't get list of reasons that were used previously, autocompletion won't work.`);
         availableReasons = [];

diff --git a/src/app/hesitations/pages/hesitate-on-instance/hesitate-on-instance.component.ts b/src/app/hesitations/pages/hesitate-on-instance/hesitate-on-instance.component.ts
@@ -43,7 +43,7 @@ export class HesitateOnInstanceComponent implements OnInit {
 
       this.form.patchValue({instance: query['instance']});
     });
-    let availableReasons = await toPromise(this.api.getUsedReasons());
+    let availableReasons = await toPromise(this.cachedApi.getUsedReasons());
     if (availableReasons === null) {
       this.messageService.createWarning(`Couldn't get list of reasons you've used previously, autocompletion won't work.`);
       availableReasons = [];

diff --git a/src/app/services/cached-fediseer-api.service.ts b/src/app/services/cached-fediseer-api.service.ts
@@ -124,6 +124,56 @@ export class CachedFediseerApiService {
     );
   }
 
+  public getUsedEndorsementReasons(cacheConfig: CacheConfiguration = {}): Observable<string[] | null> {
+    cacheConfig.type ??= CacheType.Permanent;
+    cacheConfig.ttl ??= 300;
+
+    const cacheKey = `api.endorsement_reasons${cacheConfig.ttl}`;
+
+    const item = this.getCacheItem<string[] | null>(cacheKey, cacheConfig)!;
+    if (item.isHit && !cacheConfig.clear) {
+      return of(item.value!);
+    }
+
+    return this.api.getUsedEndorsementReasons().pipe(
+      tap(result => {
+        item.value = result;
+        if (item.value === null) {
+          return;
+        }
+        if (cacheConfig.ttl! >= 0) {
+          item.expiresAt = new Date(new Date().getTime() + (cacheConfig.ttl! * 1_000));
+        }
+        this.saveCacheItem(item, cacheConfig);
+      }),
+    );
+  }
+
+  public getUsedReasons(instances: string[] = [], cacheConfig: CacheConfiguration = {}): Observable<string[] | null> {
+    cacheConfig.type ??= CacheType.Permanent;
+    cacheConfig.ttl ??= 300;
+
+    const cacheKey = `api.reasons${cacheConfig.ttl}.${instances.join('_')}`;
+
+    const item = this.getCacheItem<string[] | null>(cacheKey, cacheConfig)!;
+    if (item.isHit && !cacheConfig.clear) {
+      return of(item.value!);
+    }
+
+    return this.api.getUsedReasons(instances).pipe(
+      tap(result => {
+        item.value = result;
+        if (item.value === null) {
+          return;
+        }
+        if (cacheConfig.ttl! >= 0) {
+          item.expiresAt = new Date(new Date().getTime() + (cacheConfig.ttl! * 1_000));
+        }
+        this.saveCacheItem(item, cacheConfig);
+      }),
+    );
+  }
+
   public clearCache(): void {
     this.runtimeCache.clear();
     this.permanentCache.clear();

diff --git a/src/app/services/fediseer-api.service.ts b/src/app/services/fediseer-api.service.ts
@@ -236,7 +236,7 @@ export class FediseerApiService {
     );
   }
 
-  public get usedEndorsementReasons(): Observable<string[] | null> {
+  public getUsedEndorsementReasons(): Observable<string[] | null> {
     const cacheItem = this.runtimeCache.getItem<string[]>(`used_endorsement_reasons`);
     if (cacheItem.isHit) {
       return of(cacheItem.value!);

diff --git a/src/app/synchronization/components/filter-form/filter-form.component.ts b/src/app/synchronization/components/filter-form/filter-form.component.ts
@@ -223,7 +223,7 @@ export class FilterFormComponent<TSettings extends SynchronizationSettings> impl
   private async loadReasons() {
     if (this.availableReasons === null) {
       this.loadingReasons = true;
-      const reasons = await toPromise(this.api.getUsedReasons());
+      const reasons = await toPromise(this.cachedApi.getUsedReasons());
       if (reasons === null) {
         this.messageService.createError('Failed getting list of reasons from the server');
       }