frontend/src/app/bans/history-format.service.ts

@@ -32,7 +32,7 @@ export class HistoryFormatService {
   public getExpiredTime(entry: PunishmentHistory): string {
     let suffix: string = '';
     if (entry.removedBy !== null && entry.removedBy !== undefined) {
-      suffix = '(Unbanned by ' + entry.removedBy + ')';
+      suffix = '(' + entry.removedBy + ')';
     }
     if (entry.expiryTime <= 0) {
       return "Permanent " + this.getType(entry) + " " + suffix;

frontend/src/app/bans/history/history.component.html

@@ -22,14 +22,14 @@
         <td class="historyType" (click)="showDetailedPunishment(entry)">
           {{ this.historyFormat.getType(entry) }}
         </td>
-        <td class="historyPlayer" (click)="setSearch(entry.username, 'player')">
+        <td class="historyPlayer" (click)="setSearch(entry.type, entry.username, 'player')">
           <div class="playerContainer">
             <img class="avatar" [ngSrc]="this.historyFormat.getAvatarUrl(entry.uuid)" width="25" height="25"
                  alt="{{entry.username}}'s Minecraft skin">
             <span class="username">{{ entry.username }}</span>
           </div>
         </td>
-        <td class="historyPlayer" (click)="setSearch(entry.punishedBy, 'staff')">
+        <td class="historyPlayer" (click)="setSearch(entry.type, entry.punishedBy, 'staff')">
           <div class="playerContainer">
             <img class="avatar" [ngSrc]="this.historyFormat.getAvatarUrl(entry.punishedByUuid)" width="25" height="25"
                  alt="{{entry.punishedBy}}'s Minecraft skin">

frontend/src/app/bans/history/history.component.ts

@@ -93,10 +93,25 @@ export class HistoryComponent implements OnInit, OnChanges {
     ).subscribe();
   }
 
-  setSearch(name: string, userType: 'player' | 'staff') {
+  setSearch(type: PunishmentHistory.TypeEnum, name: string, userType: 'player' | 'staff') {
+    let punishmentType: 'all' | 'ban' | 'mute' | 'kick' | 'warn' = 'all';
+    switch (type) {
+      case 'ban':
+        punishmentType = 'ban';
+        break;
+      case 'mute':
+        punishmentType = 'mute';
+        break;
+      case 'kick':
+        punishmentType = 'kick';
+        break;
+      case 'warn':
+        punishmentType = 'warn';
+        break;
+    }
     let searchParams: SearchParams = {
       userType: userType,
-      punishmentType: 'all',
+      punishmentType: punishmentType,
       searchTerm: name
     }
     this.selectItem.emit(searchParams);