diff --git a/src/app/component/blog/blog-entry/blog-entry.component.html b/src/app/component/blog/blog-entry/blog-entry.component.html index b70d2da32..f351fb3ca 100644 --- a/src/app/component/blog/blog-entry/blog-entry.component.html +++ b/src/app/component/blog/blog-entry/blog-entry.component.html @@ -61,7 +61,11 @@

{responses, plural, =1 {1 citation} other {{{ responses }} citations}} parent {{ sources }} sources - delete + @if (store.account.mod || taggingAccess) { + delete + } tag c.reset()); this.writeAccess = this.auth.writeAccess(this.ref); this.taggingAccess = this.auth.taggingAccess(this.ref); + this.deleteAccess = this.auth.deleteAccess(this.ref); this.icons = uniqueConfigs(sortOrder(this.admin.getIcons(this.ref.tags, this.ref.plugins, getScheme(this.ref.url)))); this.actions = uniqueConfigs(sortOrder(this.admin.getActions(this.ref.tags, this.ref.plugins))); this.groupedActions = groupBy(this.actions.filter(a => this.showAction(a)), a => (a as any)[this.label(a)]); @@ -394,6 +396,17 @@ export class BlogEntryComponent implements OnChanges, OnDestroy { }); } + forceDelete$ = () => { + this.serverError = []; + return this.refs.delete(this.ref.url, this.ref.origin).pipe( + tap(() => this.deleted = true), + catchError((err: HttpErrorResponse) => { + this.serverError = printError(err); + return throwError(() => err); + }), + ); + } + delete$ = () => { this.serverError = []; return (this.admin.getPlugin('plugin/delete') diff --git a/src/app/component/bulk/bulk.component.html b/src/app/component/bulk/bulk.component.html index b7ada9abe..9b6784599 100644 --- a/src/app/component/bulk/bulk.component.html +++ b/src/app/component/bulk/bulk.component.html @@ -11,7 +11,7 @@ thumbnail copy } - delete + delete @if (type === 'ref') { @if (admin.getPlugin('plugin/invoice')) { invoice diff --git a/src/app/component/bulk/bulk.component.ts b/src/app/component/bulk/bulk.component.ts index 9f2c9cc5e..81c7dd019 100644 --- a/src/app/component/bulk/bulk.component.ts +++ b/src/app/component/bulk/bulk.component.ts @@ -268,6 +268,14 @@ export class BulkComponent implements OnChanges, OnDestroy { } } + forceDelete$ = () => { + if (this.type === 'ref') { + return this.batch$(ref => this.refs.delete(ref.url, ref.origin)); + } else { + return this.delete$(); + } + } + copy$ = () => { return this.batch$(ref => { if (ref.origin === this.store.account.origin) return of(null); diff --git a/src/app/component/chat/chat-entry/chat-entry.component.html b/src/app/component/chat/chat-entry/chat-entry.component.html index dc50f428f..cc7df48ed 100644 --- a/src/app/component/chat/chat-entry/chat-entry.component.html +++ b/src/app/component/chat/chat-entry/chat-entry.component.html @@ -35,26 +35,40 @@ } @else { {{ title }} } - + @if (focused && bareRef?.comment) { + + } -
- {comments, plural, =1 {1 comment} other {{{ comments }} comments}} - permalink - delete - tag - approve - ✔️ -
+ @if (ref.created) { +
+ @if (comments) { + {comments, plural, =1 {1 comment} other {{{ comments }} comments}} + } @else { + permalink + } + @if (store.account.mod || taggingAccess) { + delete + } + @if (taggingAccess) { + tag + } + @if (!ref.origin && store.account.mod && !approved && !locked) { + approve + } + @if (store.account.mod && approved) { + ✔️ + } +
+ } @for (e of serverError; track e) { diff --git a/src/app/component/chat/chat-entry/chat-entry.component.ts b/src/app/component/chat/chat-entry/chat-entry.component.ts index 5f5950ebe..940230d94 100644 --- a/src/app/component/chat/chat-entry/chat-entry.component.ts +++ b/src/app/component/chat/chat-entry/chat-entry.component.ts @@ -42,6 +42,7 @@ export class ChatEntryComponent implements OnChanges { deleted = false; writeAccess = false; taggingAccess = false; + deleteAccess = false; serverError: string[] = []; private _allowActions = false; @@ -61,6 +62,7 @@ export class ChatEntryComponent implements OnChanges { this.actionComponents?.forEach(c => c.reset()); this.writeAccess = this.auth.writeAccess(this.ref); this.taggingAccess = this.auth.taggingAccess(this.ref); + this.deleteAccess = this.auth.deleteAccess(this.ref); if (this.ref && this.bareRepost && !this.repostRef) { this.refs.getCurrent(this.url).pipe( catchError(err => err.status === 404 ? of(undefined) : throwError(() => err)), @@ -242,6 +244,17 @@ export class ChatEntryComponent implements OnChanges { }); } + forceDelete$ = () => { + this.serverError = []; + return this.refs.delete(this.ref.url, this.ref.origin).pipe( + tap(() => this.deleted = true), + catchError((err: HttpErrorResponse) => { + this.serverError = printError(err); + return throwError(() => err); + }), + ); + } + delete$ = () => { this.serverError = []; return (this.admin.getPlugin('plugin/delete') diff --git a/src/app/component/comment/comment.component.html b/src/app/component/comment/comment.component.html index 72f50c034..97d6812b2 100644 --- a/src/app/component/comment/comment.component.html +++ b/src/app/component/comment/comment.component.html @@ -86,39 +86,63 @@ [ref]="ref">{{ icon.label }} - - + @if (editing) { + + } @else { + + }
- permalink - reply - {responses, plural, =1 {1 citation} other {{{ responses }} citations}} - {{ sources }} sources + permalink edit - delete - tag - + (click)="replying = !replying" + i18n>reply + @if(responses) { + {responses, plural, =1 {1 citation} other {{{ responses }} citations}} + } + @if (sources > 2) { + {{ sources }} sources + } + @if (writeAccess) { + edit + } + @if (store.account.mod || taggingAccess) { + delete + } + @if (taggingAccess) { + tag + } + @if (canInvoice) { invoice - + [queryParams]="{ url: ref.url }" + i18n>invoice + }
- + @if (replying) { + + }
- + @if ((depth === 1 && comments) || moreComments) { @@ -138,7 +162,7 @@ [routerLink]="['/ref', ref.url, 'comments']" [queryParams]="{ origin: nonLocalOrigin }" i18n> continue this thread - + } @for (e of serverError; track e) {
{{ e }}
diff --git a/src/app/component/comment/comment.component.ts b/src/app/component/comment/comment.component.ts index 936ce18ec..98f554b8e 100644 --- a/src/app/component/comment/comment.component.ts +++ b/src/app/component/comment/comment.component.ts @@ -79,6 +79,7 @@ export class CommentComponent implements OnInit, AfterViewInit, OnChanges, OnDes editing = false; writeAccess = false; taggingAccess = false; + deleteAccess = false; serverError: string[] = []; constructor( @@ -143,6 +144,7 @@ export class CommentComponent implements OnInit, AfterViewInit, OnChanges, OnDes this.collapsed = !this.store.local.isRefToggled('comment:' + this.ref.url, true); this.writeAccess = this.auth.writeAccess(this.ref); this.taggingAccess = this.auth.taggingAccess(this.ref); + this.deleteAccess = this.auth.deleteAccess(this.ref); this.icons = uniqueConfigs(sortOrder(this.admin.getIcons(this.ref.tags, this.ref.plugins, getScheme(this.ref.url)))); this.actions = uniqueConfigs(sortOrder(this.admin.getActions(this.ref.tags, this.ref.plugins))); this.groupedActions = groupBy(this.actions.filter(a => this.showAction(a)), a => (a as any)[this.label(a)]); @@ -377,6 +379,13 @@ export class CommentComponent implements OnInit, AfterViewInit, OnChanges, OnDes } } + forceDelete$ = () => { + const deleted = deleteNotice(this.ref); + deleted.sources = this.ref.sources; + deleted.tags = ['plugin/comment', 'plugin/delete', 'internal']; + return this.store.eventBus.runAndReload$(this.refs.delete(this.ref.url, this.ref.origin), deleted); + } + delete$ = () => { const deleted = deleteNotice(this.ref); deleted.sources = this.ref.sources; diff --git a/src/app/component/ref/ref.component.html b/src/app/component/ref/ref.component.html index 65bbb9930..87a6caa6f 100644 --- a/src/app/component/ref/ref.component.html +++ b/src/app/component/ref/ref.component.html @@ -238,7 +238,11 @@ source } } - delete + @if (store.account.mod || taggingAccess) { + delete + } } @if (ref.upload) { @if (ref.exists) { diff --git a/src/app/component/ref/ref.component.ts b/src/app/component/ref/ref.component.ts index 5b87d590f..2bedd6302 100644 --- a/src/app/component/ref/ref.component.ts +++ b/src/app/component/ref/ref.component.ts @@ -130,6 +130,7 @@ export class RefComponent implements OnChanges, AfterViewInit, OnDestroy { replying = false; writeAccess = false; taggingAccess = false; + deleteAccess = false; serverError: string[] = []; publishChanged = false; @@ -219,6 +220,7 @@ export class RefComponent implements OnChanges, AfterViewInit, OnDestroy { if (this.ref?.upload) this.editForm.get('url')!.enable(); this.writeAccess = this.auth.writeAccess(this.ref); this.taggingAccess = this.auth.taggingAccess(this.ref); + this.deleteAccess = this.auth.deleteAccess(this.ref); this.initFields(this.ref); this.expandPlugins = this.admin.getEmbeds(this.ref); @@ -1016,6 +1018,17 @@ export class RefComponent implements OnChanges, AfterViewInit, OnDestroy { )), ref); } + forceDelete$ = () => { + this.serverError = []; + return this.refs.delete(this.ref.url, this.ref.origin).pipe( + tap(() => this.deleted = true), + catchError((err: HttpErrorResponse) => { + this.serverError = printError(err); + return throwError(() => err); + }), + ); + } + delete$ = () => { this.serverError = []; return (this.local && hasTag('locked', this.ref) @@ -1024,7 +1037,10 @@ export class RefComponent implements OnChanges, AfterViewInit, OnDestroy { ? this.refs.update(deleteNotice(this.ref)).pipe(map(() => {})) : this.refs.delete(this.ref.url, this.ref.origin) ).pipe( - tap(() => this.deleted = true), + tap((cursor: any) => { + if (cursor) + this.deleted = true; + }), catchError((err: HttpErrorResponse) => { this.serverError = printError(err); return throwError(() => err); diff --git a/src/app/service/authz.service.ts b/src/app/service/authz.service.ts index 5d7e0620d..8a0aa3e84 100644 --- a/src/app/service/authz.service.ts +++ b/src/app/service/authz.service.ts @@ -46,6 +46,13 @@ export class AuthzService { return !!capturesAny(this.store.account.access.writeAccess, qualifyTags(ref.tags, ref.origin)); } + deleteAccess(ref: Ref): boolean { + if (!this.store.account.signedIn) return false; + if (this.store.account.mod) return true; + if (ref.origin !== this.store.account.origin) return false; + return this.taggingAccess(ref); + } + queryReadAccess(query?: string): boolean { if (!query) return false; for (const part of query.split(/[-|:!()\s]+/)) { diff --git a/src/theme/common.scss b/src/theme/common.scss index 233a3aa3a..c07fd3434 100644 --- a/src/theme/common.scss +++ b/src/theme/common.scss @@ -1693,6 +1693,10 @@ formly-field-radio, formly-field-multicheckbox { } } +.hotkey .action.force-delete .fake-link { + color: var(--active) !important; +} + .ref.parent-ref { margin-left: 20px; .thumbnail {