src/app/modules/channels/channel.component.html

@@ -126,7 +126,14 @@
  </section>
 
  <!-- Subscriptions list -->
- <section class="mdl-cell mdl-cell--8-col" *ngIf="filter == 'subscriptions'">
+ <section
+ class="mdl-cell mdl-cell--8-col"
+ *ngIf="
+ filter == 'subscriptions' ||
+ filter == 'subscribers' ||
+ filter == 'requests'
+ "
+ >
  <div class="mdl-card m-channel--subscribers-tabs">
  <div class="mdl-tabs__tab-bar">
  <a
@@ -160,52 +167,18 @@
  <m-channel--subscriptions
  [channel]="user"
  class="mdl-grid"
+ *ngIf="filter === 'subscriptions'"
  ></m-channel--subscriptions>
- </section>
-
- <!-- Subscriptions list -->
- <section
- class="mdl-cell mdl-cell--8-col"
- *ngIf="filter == 'subscribers' || filter == 'requests'"
- >
- <div class="mdl-card m-channel--subscribers-tabs">
- <div class="mdl-tabs__tab-bar">
- <a
- [routerLink]="['/', user.username, 'subscribers']"
- class="mdl-tabs__tab"
- [ngClass]="{ 'is-active': filter === 'subscribers' }"
- i18n="@@MINDS__CHANNELS__SUBSCRIBERS_WITH_COUNT"
- >
- Subscribers ({{ user.subscribers_count }})
- </a>
- <a
- [routerLink]="['/', user.username, 'subscriptions']"
- class="mdl-tabs__tab"
- [ngClass]="{ 'is-active': filter === 'subscriptions' }"
- i18n="@@MINDS__CHANNELS__SUBSCRIPTIONS_WITH_COUNT"
- >
- Subscriptions ({{ user.subscriptions_count }})
- </a>
-
- <a
- [routerLink]="['/', user.username, 'requests']"
- *ngIf="user.mode === 2 && user.guid == session.getLoggedInUser().guid"
- class="mdl-tabs__tab"
- [ngClass]="{ 'is-active': filter === 'requests' }"
- >
- Requests
- </a>
- </div>
- </div>
 
  <m-channel--subscribers
  [channel]="user"
  class="mdl-grid"
+ *ngIf="filter === 'subscribers'"
  ></m-channel--subscribers>
- </section>
 
- <section class="mdl-cell mdl-cell--8-col" *ngIf="filter == 'requests'">
- <m-subscriptionsRequests__list></m-subscriptionsRequests__list>
+ <m-subscriptionsRequests__list
+ *ngIf="filter == 'requests'"
+ ></m-subscriptionsRequests__list>
  </section>
 </div>
 

src/app/modules/channels/requests/request.component.html

@@ -12,12 +12,17 @@
  </div>
  <div class="m-layout__spacer"></div>
  <ng-container *ngIf="!request.completed; else completed">
- <button class="m-btn m-btn--action m-btn--slim" (click)="accept($event)">
+ <button
+ class="m-btn m-btn--action m-btn--slim"
+ (click)="accept()"
+ [disabled]="!canApprove"
+ >
  Accept
  </button>
  <button
  class="m-btn m-btn--destructive m-btn--slim"
- (click)="decline($event)"
+ (click)="decline()"
+ [disabled]="!canDecline"
  >
  Decline
  </button>

src/app/modules/channels/requests/request.component.ts

 import { Component, Input } from '@angular/core';
 import { Client } from '../../../services/api';
+import { FeaturesService } from '../../../services/features.service';
+import { PermissionsService } from '../../../common/services/permissions/permissions.service';
+import { Session } from '../../../services/session';
+import { Flags } from '../../../common/services/permissions/flags';
 
 @Component({
  selector: 'm-subscriptionsRequests__request',
@@ -9,7 +13,30 @@ export class SubscriptionsRequestsRequestComponent {
  minds = window.Minds;
  @Input() request;
 
- constructor(private client: Client) {}
+ get canApprove() {
+ if (this.featuresService.has('permissions')) {
+ return this.permissionsService.canInteract(
+ this.session.getLoggedInUser(),
+ Flags.APPROVE_SUBSCRIBER
+ );
+ }
+ }
+
+ get canDecline() {
+ if (this.featuresService.has('permissions')) {
+ return this.permissionsService.canInteract(
+ this.session.getLoggedInUser(),
+ Flags.APPROVE_SUBSCRIBER
+ );
+ }
+ }
+
+ constructor(
+ private client: Client,
+ private session: Session,
+ private featuresService: FeaturesService,
+ private permissionsService: PermissionsService
+ ) {}
 
  async accept() {
  this.request.declined = false;