express-ext 0.5.0 → 0.5.2

package/lib/index.js

@@ -99,7 +99,6 @@ var FollowController = (function () {
     this.id = id && id.length > 0 ? id : "id"
     this.follow = this.follow.bind(this)
     this.unfollow = this.unfollow.bind(this)
-    this.checkFollow = this.checkFollow.bind(this)
   }
   FollowController.prototype.follow = function (req, res) {
     var _this = this
@@ -141,25 +140,6 @@ var FollowController = (function () {
         return http_1.handleError(err, res, _this.log)
       })
   }
-  FollowController.prototype.checkFollow = function (req, res) {
-    var _this = this
-    var userId = res.locals[this.userId]
-    var id = req.params[this.id]
-    if (!id || id.length === 0) {
-      return res.status(400).end("'" + this.id + "' cannot be empty")
-    }
-    if (!userId || userId.length === 0) {
-      return res.status(400).end("'" + this.userId + "' cannot be empty")
-    }
-    this.service
-      .checkFollow(userId, id)
-      .then(function (count) {
-        return res.status(200).json(count).end()
-      })
-      .catch(function (err) {
-        return http_1.handleError(err, res, _this.log)
-      })
-  }
   return FollowController
 })()
 exports.FollowController = FollowController
@@ -348,7 +328,7 @@ function escapeHTML(input) {
 exports.escapeHTML = escapeHTML
 function generateChip(value, text, noClose, hasStar) {
   var s = noClose ? "" : '<span class="close" onclick="removeChip(event)"></span>'
-  var t = hasStar ? '<i className="star highlight"></i>' : ""
+  var t = hasStar ? '<i class="star highlight"></i>' : ""
   return '<div class="chip" data-value="' + escapeHTML(value) + '">' + escapeHTML(text) + t + s + "</div>"
 }
 exports.generateChip = generateChip

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "express-ext",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "description": "express-ext",
   "main": "./lib/index.js",
   "types": "./src/index.ts",

package/src/index.ts

@@ -93,7 +93,6 @@ export class SavedController {
 export interface FollowService {
   follow(id: string, target: string): Promise<number>
   unfollow(id: string, target: string): Promise<number>
-  checkFollow(id: string, target: string): Promise<number>
 }
 // tslint:disable-next-line:max-classes-per-file
 export class FollowController {
@@ -102,11 +101,10 @@ export class FollowController {
     this.id = id && id.length > 0 ? id : "id"
     this.follow = this.follow.bind(this)
     this.unfollow = this.unfollow.bind(this)
-    this.checkFollow = this.checkFollow.bind(this)
   }
   protected userId: string
   protected id: string
-  follow(req: Request, res: Response): void {
+  follow(req: Request, res: Response) {
     const userId: string = res.locals[this.userId]
     const id = req.params[this.id]
     if (!id || id.length === 0) {
@@ -123,7 +121,7 @@ export class FollowController {
       })
       .catch((err) => handleError(err, res, this.log))
   }
-  unfollow(req: Request, res: Response): void {
+  unfollow(req: Request, res: Response) {
     const userId: string = res.locals[this.userId]
     const id = req.params[this.id]
     if (!id || id.length === 0) {
@@ -140,22 +138,6 @@ export class FollowController {
       })
       .catch((err) => handleError(err, res, this.log))
   }
-  checkFollow(req: Request, res: Response): void {
-    const userId: string = res.locals[this.userId]
-    const id = req.params[this.id]
-    if (!id || id.length === 0) {
-      return res.status(400).end(`'${this.id}' cannot be empty`)
-    }
-    if (!userId || userId.length === 0) {
-      return res.status(400).end(`'${this.userId}' cannot be empty`)
-    }
-    this.service
-      .checkFollow(userId, id)
-      .then((count) => {
-        return res.status(200).json(count).end()
-      })
-      .catch((err) => handleError(err, res, this.log))
-  }
 }
 export interface ReactService {
   react(id: string, author: string, reaction: string): Promise<number>
@@ -171,7 +153,7 @@ export class UserReactionController {
     this.checkReaction = this.checkReaction.bind(this)
   }
   id: string
-  react(req: Request, res: Response): void {
+  react(req: Request, res: Response) {
     const id = req.params.id
     const author = req.params.author
     const reaction = req.params.reaction
@@ -194,7 +176,7 @@ export class UserReactionController {
       })
       .catch((err) => handleError(err, res, this.log))
   }
-  unreact(req: Request, res: Response): void {
+  unreact(req: Request, res: Response) {
     const id = req.params.id
     const author = req.params.author
     const reaction = req.params.reaction
@@ -217,7 +199,7 @@ export class UserReactionController {
       })
       .catch((err) => handleError(err, res, this.log))
   }
-  checkReaction(req: Request, res: Response): void {
+  checkReaction(req: Request, res: Response) {
     const id = req.params.id
     const author = req.params.author
     if (!id || id.length === 0) {
@@ -332,7 +314,7 @@ export function escapeHTML(input: string): string {
 }
 export function generateChip(value: string, text: string, noClose?: boolean, hasStar?: boolean): string {
   const s = noClose ? "" : `<span class="close" onclick="removeChip(event)"></span>`
-  const t = hasStar ? `<i className="star highlight"></i>` : ""
+  const t = hasStar ? `<i class="star highlight"></i>` : ""
   return `<div class="chip" data-value="${escapeHTML(value)}">${escapeHTML(text)}${t}${s}</div>`
 }
 export function generateTags(v?: string[] | null, noClose?: boolean): string {