From 4d8c2c26deb019fc37c8b2cbeafd6781d9b1f51d Mon Sep 17 00:00:00 2001 From: Rikudou_Sage Date: Wed, 3 Apr 2024 14:18:31 +0200 Subject: [PATCH] Feat: Add list of rebuttals (#185) --- src/app/app.component.html | 10 +++ .../list-rebuttals.component.html | 81 +++++++++++++++++++ .../list-rebuttals.component.scss | 3 + .../list-rebuttals.component.ts | 74 +++++++++++++++++ src/app/rebuttals/rebuttals.module.ts | 7 +- .../services/api-response-helper.service.ts | 10 ++- src/assets/i18n/en.json | 6 +- 7 files changed, 188 insertions(+), 3 deletions(-) create mode 100644 src/app/rebuttals/pages/list-rebuttals/list-rebuttals.component.html create mode 100644 src/app/rebuttals/pages/list-rebuttals/list-rebuttals.component.scss create mode 100644 src/app/rebuttals/pages/list-rebuttals/list-rebuttals.component.ts diff --git a/src/app/app.component.html b/src/app/app.component.html index 650615f..6783a01 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -130,6 +130,16 @@

+ @if (!loggedInInstance.anonymous) { +
  • + + +

    + {{ "app.sidebar.rebuttals" | transloco }} +

    +     +
    • + }
  • diff --git a/src/app/rebuttals/pages/list-rebuttals/list-rebuttals.component.html b/src/app/rebuttals/pages/list-rebuttals/list-rebuttals.component.html new file mode 100644 index 0000000..3d847c1 --- /dev/null +++ b/src/app/rebuttals/pages/list-rebuttals/list-rebuttals.component.html @@ -0,0 +1,81 @@ +@if (loading()) { + +} @else { +
    +
    +
    +

    + +

    +
    +
    + + + + + + + + + + + + @for (instance of instances(); track instance.domain) { + + + + + + + + } @empty { + + + + } + +
    {{'app.instance' | transloco}}{{'app.reasons' | transloco}}{{'app.evidence' | transloco}}{{'app.rebuttal' | transloco}}{{'app.actions' | transloco}}
    + {{instance.domain}} + +
      + @if (instance.censureReasons.length) { +
    • + {{'app.censure' | transloco}}: {{instance.censureReasons.join(', ')}} +
      • + } + @if (instance.hesitationReasons.length) { +
    • + {{'app.hesitation' | transloco}}: {{instance.hesitationReasons.join(', ')}} +
      • + } +
    +     		+ @if (instance.censuresEvidence || instance.hesitationsEvidence) { +
      + @if (instance.censuresEvidence) { +
    • + {{'app.censure' | transloco}}: {{instance.censuresEvidence}} +
      • + } + @if (instance.hesitationsEvidence) { +
    • + {{'app.hesitation' | transloco}}: {{instance.hesitationsEvidence}} +
      • + } +
    + } @else { + {{'app.not_applicable' | transloco}} + } +     		+ {{instance.rebuttal}} + + +   + {{'app.generic_buttons.edit' | transloco}} +
    + {{'app.rebuttal.no_rebuttal_yet' | transloco}} +
    +
    +
    +
    +} diff --git a/src/app/rebuttals/pages/list-rebuttals/list-rebuttals.component.scss b/src/app/rebuttals/pages/list-rebuttals/list-rebuttals.component.scss new file mode 100644 index 0000000..5f5d12d --- /dev/null +++ b/src/app/rebuttals/pages/list-rebuttals/list-rebuttals.component.scss @@ -0,0 +1,3 @@ +:host { + min-width: 100%; +} diff --git a/src/app/rebuttals/pages/list-rebuttals/list-rebuttals.component.ts b/src/app/rebuttals/pages/list-rebuttals/list-rebuttals.component.ts new file mode 100644 index 0000000..6938db8 --- /dev/null +++ b/src/app/rebuttals/pages/list-rebuttals/list-rebuttals.component.ts @@ -0,0 +1,74 @@ +import {Component, computed, input, OnInit, signal} from '@angular/core'; +import {TitleService} from "../../../services/title.service"; +import {TranslatorService} from "../../../services/translator.service"; +import {SharedModule} from "../../../shared/shared.module"; +import {InstanceDetailResponse} from "../../../response/instance-detail.response"; +import {FediseerApiService} from "../../../services/fediseer-api.service"; +import {AuthenticationManagerService} from "../../../services/authentication-manager.service"; +import {toPromise} from "../../../types/resolvable"; +import {filter, map, zip} from "rxjs"; +import {ApiResponseHelperService} from "../../../services/api-response-helper.service"; +import {NormalizedInstanceDetailResponse} from "../../../response/normalized-instance-detail.response"; +import {RouterLink} from "@angular/router"; +import {CachedFediseerApiService} from "../../../services/cached-fediseer-api.service"; + +@Component({ + selector: 'app-list-rebuttals', + standalone: true, + imports: [ + SharedModule, + RouterLink + ], + templateUrl: './list-rebuttals.component.html', + styleUrl: './list-rebuttals.component.scss' +}) +export class ListRebuttalsComponent implements OnInit { + private rawInstances = signal([]); + + public loading = signal(true); + public instances = computed(() => this.rawInstances().map(instance => NormalizedInstanceDetailResponse.fromInstanceDetail(instance))); + public currentInstance = signal(this.authManager.currentInstanceSnapshot.name); + + constructor( + private readonly titleService: TitleService, + private readonly translator: TranslatorService, + private readonly api: FediseerApiService, + private readonly authManager: AuthenticationManagerService, + private readonly apiResponseHelper: ApiResponseHelperService, + private readonly cachedApi: CachedFediseerApiService, + ) { + } + public async ngOnInit(): Promise { + this.titleService.title = this.translator.get('app.my_rebuttals.title'); + this.rawInstances.set(await toPromise(zip([ + this.api.getHesitationsForInstance(this.currentInstance()), + this.api.getCensuresForInstance(this.currentInstance()), + ]).pipe( + map(responses => { + if (this.apiResponseHelper.handleErrors(responses)) { + return []; + } + + return responses[0].successResponse!.instances.concat(responses[1].successResponse!.instances) + .filter(instance => instance.rebuttal?.length) + }), + ))); + this.loading.set(false); + } + + public async removeRebuttal(instance: NormalizedInstanceDetailResponse): Promise { + this.loading.set(true); + const response = await toPromise(this.api.removeRebuttal(instance.domain)); + this.apiResponseHelper.handleErrors(response); + + await Promise.all([ + toPromise(this.cachedApi.getHesitationsForInstance(this.currentInstance(), {clear: true})), + toPromise(this.cachedApi.getCensuresForInstance(this.currentInstance(), {clear: true})), + ]); + this.cachedApi.clearCensuresByInstanceCache(instance.domain); + this.cachedApi.clearHesitationsByInstanceCache(instance.domain); + this.rawInstances.update(value => [...value.filter(rawInstance => rawInstance.domain !== instance.domain)]); + + this.loading.set(false); + } +} diff --git a/src/app/rebuttals/rebuttals.module.ts b/src/app/rebuttals/rebuttals.module.ts index a058987..e50afa4 100644 --- a/src/app/rebuttals/rebuttals.module.ts +++ b/src/app/rebuttals/rebuttals.module.ts @@ -16,7 +16,12 @@ const routes: Routes = [ path: 'edit/:sourceInstance', component: CreateEditRebuttalComponent, canActivate: [Guards.isLoggedIn()], - } + }, + { + path: 'my', + loadComponent: () => import('./pages/list-rebuttals/list-rebuttals.component').then(m => m.ListRebuttalsComponent), + canActivate: [Guards.isLoggedIn()], + }, ]; @NgModule({ diff --git a/src/app/services/api-response-helper.service.ts b/src/app/services/api-response-helper.service.ts index 6dba0a3..d251346 100644 --- a/src/app/services/api-response-helper.service.ts +++ b/src/app/services/api-response-helper.service.ts @@ -11,7 +11,15 @@ export class ApiResponseHelperService { ) { } - public handleErrors(responses: ApiResponse[], mode: MessageType = MessageType.Error): boolean { + public handleErrors(responses: ApiResponse[], mode: MessageType): boolean; + public handleErrors(responses: ApiResponse[]): boolean; + public handleErrors(responses: ApiResponse, mode: MessageType): boolean; + public handleErrors(responses: ApiResponse): boolean; + + public handleErrors(responses: ApiResponse[] | ApiResponse, mode: MessageType = MessageType.Error): boolean { + if (!Array.isArray(responses)) { + responses = [responses]; + } let hasErrors = false; for (const response of responses) { if (!response.success) { diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 64b4386..3f6e76f 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -26,6 +26,7 @@ "app.sidebar.logout": "Logout", "app.sidebar.changelog": "Changelog", "app.sidebar.donate": "Donate", + "app.sidebar.rebuttals": "Rebuttals", "app.footer.created_and_maintained_by": "Created and maintained by [link:authorUrl]{{author}}[/link].", "app.footer.created_by": "Created by [link:authorUrl]{{author}}[/link].", "app.footer.maintained_by": "Maintained by [link:maintainerLink]{{maintainer}}[/link].", @@ -130,6 +131,7 @@ "app.endorsements.my.given.unguaranteed": "No one guaranteed for this instance, you cannot endorse others.", "app.generic_buttons.edit": "Edit", "app.generic_buttons.cancel": "Cancel", + "app.generic_buttons.remove": "Remove", "app.endorsements.my": "My endorsements", "app.logo.alt": "{{fediseer}} logo", "app.list_visibility.open": "Everyone", @@ -197,5 +199,7 @@ "app.rebuttal.deleted": "Rebuttal has been successfully deleted", "app.rebuttal.updated": "Rebuttal has been successfully updated", "app.censure.edit": "Edit censure", - "app.hesitation.edit": "Edit hesitation" + "app.hesitation.edit": "Edit hesitation", + "app.my_rebuttals.title": "My rebuttals", + "app.my_rebuttals.all": "All rebuttals by [b]{{instance}}[/b]" }