diff options
| author | Foysal Ahamed <foysal@blueskyweb.xyz> | 2023-08-15 23:32:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-15 14:32:06 -0700 |
| commit | abbc6543f423efdcd26f44666d9847ecd70779dc (patch) | |
| tree | 4324068713cc947f9e28b081bd45fec587ef33ef /src/state/models | |
| parent | a5762c2d7df89bcb89588e2ab8969ea1e8945514 (diff) | |
| download | voidsky-abbc6543f423efdcd26f44666d9847ecd70779dc.tar.zst | |
:sparkles: Repurpose report post modal and re-use for list reporting (#1070)
* :sparkles: Repupose report post modal and re-use for list reporting * :sparkles: Allow reporting a feed generator * :sparkles: :recycle: Refactor report modal into one shared component for reporting different collections * :white_check_mark: Adjust report option selector in tests * :white_check_mark: Add test for list reporting * :recycle: :sparkles: Refactor reason options and add options for list and feedgen * :broom: Cleanup remaining todo * Fix to mutelist react keys * Fix regression from rebase * Improve customfeed mobile header --------- Co-authored-by: Paul Frazee <pfrazee@gmail.com>
Diffstat (limited to 'src/state/models')
| -rw-r--r-- | src/state/models/content/list.ts | 2 | ||||
| -rw-r--r-- | src/state/models/ui/shell.ts | 22 |
2 files changed, 11 insertions, 13 deletions
diff --git a/src/state/models/content/list.ts b/src/state/models/content/list.ts index 2498cf581..5d4ffb4fa 100644 --- a/src/state/models/content/list.ts +++ b/src/state/models/content/list.ts @@ -306,7 +306,7 @@ export class ListModel { this.hasMore = !!this.loadMoreCursor this.list = res.data.list this.items = this.items.concat( - res.data.items.map(item => ({...item, _reactKey: item.subject})), + res.data.items.map(item => ({...item, _reactKey: item.subject.did})), ) } } diff --git a/src/state/models/ui/shell.ts b/src/state/models/ui/shell.ts index 348fa4899..e5fd5d426 100644 --- a/src/state/models/ui/shell.ts +++ b/src/state/models/ui/shell.ts @@ -48,16 +48,15 @@ export interface ModerationDetailsModal { moderation: ModerationUI } -export interface ReportPostModal { - name: 'report-post' - postUri: string - postCid: string -} - -export interface ReportAccountModal { - name: 'report-account' - did: string -} +export type ReportModal = { + name: 'report' +} & ( + | { + uri: string + cid: string + } + | {did: string} +) export interface CreateOrEditMuteListModal { name: 'create-or-edit-mute-list' @@ -159,8 +158,7 @@ export type Modal = // Moderation | ModerationDetailsModal - | ReportAccountModal - | ReportPostModal + | ReportModal | CreateOrEditMuteListModal | ListAddRemoveUserModal |