EditRoomMessage takes room and message ids as separate parameters (#64)

* EditRoomMessage takes room and message ids as separate parameters

* Bump CHANGELOG for 2.4.0

Author: samuelyallop-pusher

CHANGELOG.md

@@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased](https://github.com/pusher/chatkit-server-node/compare/2.2.0...HEAD)
 
-## [2.3.0](https://github.com/pusher/chatkit-server-node/compare/2.2.0...2.3.0)
+## [2.4.0](https://github.com/pusher/chatkit-server-node/compare/2.2.0...2.4.0)
 
 ### Additions
 - Adds message editing via `edit{Simple,Multipart,}Message`.

src/chatkit.ts

@@ -64,15 +64,11 @@ export interface AttachmentOptions {
 }
 
 export interface EditMessageOptions extends UserIdOptions {
-  roomId: string
-  messageId: string
   text: string
   attachment?: AttachmentOptions
 }
 
 export interface EditMultipartMessageOptions {
-  roomId: string
-  messageId: string
   userId: string
   parts: Array<NewPart>
 }
@@ -580,7 +576,7 @@ export default class Chatkit {
       .then(({ body }) => JSON.parse(body))
   }
 
-  editMessage(options: EditMessageOptions): Promise<void> {
+  editMessage(roomId: string, messageId: string, options: EditMessageOptions): Promise<void> {
     let messagePayload: any = { text: options.text }
 
     if (options.attachment) {
@@ -593,7 +589,7 @@ export default class Chatkit {
     return this.serverInstanceV2
       .request({
         method: "PUT",
-        path: `/rooms/${encodeURIComponent(options.roomId)}/messages/${encodeURIComponent(options.messageId)}`,
+        path: `/rooms/${encodeURIComponent(roomId)}/messages/${encodeURIComponent(messageId)}`,
         jwt: this.generateAccessToken({
           su: true,
           userId: options.userId,
@@ -603,16 +599,14 @@ export default class Chatkit {
       .then(() => {})
   }
 
-  editSimpleMessage(options: EditMessageOptions): Promise<void> {
-    return this.editMultipartMessage({
-      roomId: options.roomId,
-      messageId: options.messageId,
+  editSimpleMessage(roomId: string, messageId: string, options: EditMessageOptions): Promise<void> {
+    return this.editMultipartMessage(roomId, messageId, {
       userId: options.userId,
       parts: [{ type: "text/plain", content: options.text }],
     })
   }
 
-  editMultipartMessage(options: EditMultipartMessageOptions): Promise<void> {
+  editMultipartMessage(roomId: string, messageId: string, options: EditMultipartMessageOptions): Promise<void> {
     if (options.parts.length === 0) {
       return Promise.reject(
         new TypeError("message must contain at least one part"),
@@ -625,7 +619,7 @@ export default class Chatkit {
           part.file
             ? this.uploadAttachment({
                 userId: options.userId,
-                roomId: options.roomId,
+                roomId: roomId,
                 part,
               })
             : part,
@@ -634,7 +628,7 @@ export default class Chatkit {
       .then(parts =>
         this.serverInstance.request({
           method: "PUT",
-          path: `/rooms/${encodeURIComponent(options.roomId)}/messages/${encodeURIComponent(options.messageId)}`,
+          path: `/rooms/${encodeURIComponent(roomId)}/messages/${encodeURIComponent(messageId)}`,
           jwt: this.generateAccessToken({
             su: true,
             userId: options.userId,

tests/main.ts

@@ -850,10 +850,8 @@ test("editMessage", (t, client, end, fail) => {
             })
             .then( () =>
               client
-                .editMessage({
+                .editMessage(room.id, messageId, {
                   userId: user.id,
-                  roomId: room.id,
-                  messageId: messageId,
                   text: "edited" + messageText,
                 })
             )
@@ -910,10 +908,8 @@ test("editSimpleMessage", (t, client, end, fail) => {
             })
             .then( () =>
               client
-                .editSimpleMessage({
+                .editSimpleMessage(room.id, messageId, {
                   userId: user.id,
-                  roomId: room.id,
-                  messageId: messageId,
                   text: "edited" + messageText,
                 })
             )
@@ -974,10 +970,8 @@ test("editMultipartMessage", (t, client, end, fail) => {
             })
             .then( () =>
               client
-                .editMultipartMessage({
+                .editMultipartMessage(room.id, messageId, {
                   userId: user.id,
-                  roomId: room.id,
-                  messageId: messageId,
                   parts: [
                     { type: "text/plain", content: "edited" + messageText },
                     { type: "image/jpeg", url: "https://a.b.com/edited-img.jpg" },