Commit c480cbcc authored by Grant's avatar Grant
Browse files

base64 all message parts

parent d437ea94

package.json

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
  "publishConfig": {

    "@sc07:registry": "https://sc07.dev/api/v4/projects/19/packages/npm/"

  },

  "version": "1.0.0",

  "version": "1.0.1",

  "main": "dist/index.js",

  "types": "dist/index.d.ts",

  "files": [

src/events/InstanceBanEvent.ts

+7 −10
Original line number Diff line number Diff line 
import { IBroadcastable } from ".";

import { b64, ub64 } from "../utils";



export class InstanceBanEvent implements IBroadcastable {

  private _hostname: string;
@@ -19,11 +20,9 @@ export class InstanceBanEvent implements IBroadcastable { 
    const [hostname, expiresAt, public_reason] = data.split(":");



    return new this(

      hostname,

      new Date(Buffer.from(expiresAt, "base64").toString()),

      public_reason === "null"

        ? undefined

        : Buffer.from(public_reason, "base64").toString()

      ub64(hostname),

      new Date(ub64(expiresAt)),

      public_reason === "null" ? undefined : ub64(public_reason)

    );

  }
@@ -45,11 +44,9 @@ export class InstanceBanEvent implements IBroadcastable { 


  getMessage() {

    return [

      this._hostname,

      Buffer.from(this._expiresAt.toISOString()).toString("base64"),

      this._public_reason

        ? Buffer.from(this._public_reason).toString("base64")

        : "null",

      b64(this._hostname),

      b64(this._expiresAt.toISOString()),

      this._public_reason ? b64(this._public_reason) : "null",

    ].join(":");

  }

}

src/events/InstanceUnbanEvent.ts

+3 −2
Original line number Diff line number Diff line 
import { IBroadcastable } from ".";

import { b64, ub64 } from "../utils";



export class InstanceUnbanEvent implements IBroadcastable {

  private _hostname: string;
@@ -12,7 +13,7 @@ export class InstanceUnbanEvent implements IBroadcastable { 
  }



  static fromString(data: string): InstanceUnbanEvent {

    return new this(data);

    return new this(ub64(data));

  }



  get hostname() {
@@ -24,6 +25,6 @@ export class InstanceUnbanEvent implements IBroadcastable { 
  }



  getMessage() {

    return this._hostname;

    return b64(this._hostname);

  }

}

src/events/UserBanEvent.ts

+7 −10
Original line number Diff line number Diff line 
import { IBroadcastable } from "..";

import { b64, ub64 } from "../utils";



export class UserBanEvent implements IBroadcastable {

  private _sub: string;
@@ -19,11 +20,9 @@ export class UserBanEvent implements IBroadcastable { 
    const [sub, expiresAt, public_reason] = data.split(":");



    return new this(

      sub,

      new Date(Buffer.from(expiresAt, "base64").toString()),

      public_reason === "null"

        ? undefined

        : Buffer.from(public_reason, "base64").toString()

      ub64(sub),

      new Date(ub64(expiresAt)),

      public_reason === "null" ? undefined : ub64(public_reason)

    );

  }
@@ -45,11 +44,9 @@ export class UserBanEvent implements IBroadcastable { 


  getMessage() {

    return [

      this._sub,

      Buffer.from(this._expiresAt.toISOString()).toString("base64"),

      this._public_reason

        ? Buffer.from(this._public_reason).toString("base64")

        : "null",

      b64(this._sub),

      b64(this._expiresAt.toISOString()),

      this._public_reason ? b64(this._public_reason) : "null",

    ].join(":");

  }

}

src/events/UserUnbanEvent.ts

+3 −2
Original line number Diff line number Diff line 
import { IBroadcastable } from "..";

import { b64, ub64 } from "../utils";



export class UserUnbanEvent implements IBroadcastable {

  private _sub: string;
@@ -12,7 +13,7 @@ export class UserUnbanEvent implements IBroadcastable { 
  }



  static fromString(data: string): UserUnbanEvent {

    return new this(data);

    return new this(ub64(data));

  }



  get sub() {
@@ -24,6 +25,6 @@ export class UserUnbanEvent implements IBroadcastable { 
  }



  getMessage() {

    return this._sub;

    return b64(this._sub);

  }

}