From 4bb03ca492204b2e6819ee439b1e414b6dabb978 Mon Sep 17 00:00:00 2001
From: Denis Arh <denis.arh@kendu.si>
Date: Mon, 6 May 2019 07:58:01 +0200
Subject: [PATCH] Add OK responses on valid pin/bookmark/reaction requests

---
 messaging/rest/channel.go |  3 ++-
 messaging/rest/message.go | 15 ++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/messaging/rest/channel.go b/messaging/rest/channel.go
index ed78f7960..d87f2e1eb 100644
--- a/messaging/rest/channel.go
+++ b/messaging/rest/channel.go
@@ -10,6 +10,7 @@ import (
 	"github.com/crusttech/crust/messaging/rest/request"
 	"github.com/crusttech/crust/messaging/types"
 	"github.com/pkg/errors"
+	"github.com/titpetric/factory/resputil"
 )
 
 var _ = errors.Wrap
@@ -108,7 +109,7 @@ func (ctrl *Channel) Join(ctx context.Context, r *request.ChannelJoin) (interfac
 }
 
 func (ctrl *Channel) Part(ctx context.Context, r *request.ChannelPart) (interface{}, error) {
-	return nil, ctrl.svc.ch.With(ctx).DeleteMember(r.ChannelID, r.UserID)
+	return resputil.OK(), ctrl.svc.ch.With(ctx).DeleteMember(r.ChannelID, r.UserID)
 }
 
 func (ctrl *Channel) Attach(ctx context.Context, r *request.ChannelAttach) (interface{}, error) {
diff --git a/messaging/rest/message.go b/messaging/rest/message.go
index b881cb7eb..5ec3a01ed 100644
--- a/messaging/rest/message.go
+++ b/messaging/rest/message.go
@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/pkg/errors"
+	"github.com/titpetric/factory/resputil"
 
 	"github.com/crusttech/crust/internal/payload"
 	"github.com/crusttech/crust/internal/payload/outgoing"
@@ -58,7 +59,7 @@ func (ctrl Message) ExecuteCommand(ctx context.Context, r *request.MessageExecut
 }
 
 func (ctrl *Message) Delete(ctx context.Context, r *request.MessageDelete) (interface{}, error) {
-	return nil, ctrl.svc.msg.With(ctx).Delete(r.MessageID)
+	return resputil.OK(), ctrl.svc.msg.With(ctx).Delete(r.MessageID)
 }
 
 func (ctrl *Message) MarkAsRead(ctx context.Context, r *request.MessageMarkAsRead) (interface{}, error) {
@@ -66,27 +67,27 @@ func (ctrl *Message) MarkAsRead(ctx context.Context, r *request.MessageMarkAsRea
 }
 
 func (ctrl *Message) PinCreate(ctx context.Context, r *request.MessagePinCreate) (interface{}, error) {
-	return nil, ctrl.svc.msg.With(ctx).Pin(r.MessageID)
+	return resputil.OK(), ctrl.svc.msg.With(ctx).Pin(r.MessageID)
 }
 
 func (ctrl *Message) PinRemove(ctx context.Context, r *request.MessagePinRemove) (interface{}, error) {
-	return nil, ctrl.svc.msg.With(ctx).RemovePin(r.MessageID)
+	return resputil.OK(), ctrl.svc.msg.With(ctx).RemovePin(r.MessageID)
 }
 
 func (ctrl *Message) BookmarkCreate(ctx context.Context, r *request.MessageBookmarkCreate) (interface{}, error) {
-	return nil, ctrl.svc.msg.With(ctx).Bookmark(r.MessageID)
+	return resputil.OK(), ctrl.svc.msg.With(ctx).Bookmark(r.MessageID)
 }
 
 func (ctrl *Message) BookmarkRemove(ctx context.Context, r *request.MessageBookmarkRemove) (interface{}, error) {
-	return nil, ctrl.svc.msg.With(ctx).RemoveBookmark(r.MessageID)
+	return resputil.OK(), ctrl.svc.msg.With(ctx).RemoveBookmark(r.MessageID)
 }
 
 func (ctrl *Message) ReactionCreate(ctx context.Context, r *request.MessageReactionCreate) (interface{}, error) {
-	return nil, ctrl.svc.msg.With(ctx).React(r.MessageID, r.Reaction)
+	return resputil.OK(), ctrl.svc.msg.With(ctx).React(r.MessageID, r.Reaction)
 }
 
 func (ctrl *Message) ReactionRemove(ctx context.Context, r *request.MessageReactionRemove) (interface{}, error) {
-	return nil, ctrl.svc.msg.With(ctx).RemoveReaction(r.MessageID, r.Reaction)
+	return resputil.OK(), ctrl.svc.msg.With(ctx).RemoveReaction(r.MessageID, r.Reaction)
 }
 
 func (ctrl *Message) wrap(ctx context.Context) func(m *types.Message, err error) (*outgoing.Message, error) {