diff --git a/sam/docs/src/spec.json b/sam/docs/src/spec.json index 5997632a2..90e574bbd 100644 --- a/sam/docs/src/spec.json +++ b/sam/docs/src/spec.json @@ -351,7 +351,7 @@ } }, { - "name": "getReplies", + "name": "replyGet", "path": "/{messageID}/replies", "method": "GET", "title": "Returns all replies to a message", @@ -367,7 +367,7 @@ } }, { - "name": "createReply", + "name": "replyCreate", "path": "/{messageID}/replies", "method": "POST", "title": "Reply to a message", @@ -391,7 +391,7 @@ } }, { - "name": "pin", + "name": "pinCreate", "path": "/{messageID}/pin", "method": "POST", "title": "Pin message to channel (public bookmark)", @@ -407,7 +407,7 @@ } }, { - "name": "removePin", + "name": "pinRemove", "path": "/{messageID}/pin", "method": "DELETE", "title": "Pin message to channel (public bookmark)", @@ -423,7 +423,7 @@ } }, { - "name": "bookmark", + "name": "bookmarkCreate", "path": "/{messageID}/bookmark", "method": "POST", "title": "Bookmark a message (private bookmark)", @@ -439,7 +439,7 @@ } }, { - "name": "removeBookmark", + "name": "bookmarkRemove", "path": "/{messageID}/bookmark", "method": "DELETE", "title": "Remove boomark from message (private bookmark)", @@ -455,7 +455,7 @@ } }, { - "name": "react", + "name": "reactionCreate", "path": "/{messageID}/reaction/{reaction}", "method": "POST", "title": "React to a message", @@ -477,7 +477,7 @@ } }, { - "name": "removeReaction", + "name": "reactionRemove", "path": "/{messageID}/reaction/{reaction}", "method": "DELETE", "title": "Delete reaction from a message", diff --git a/sam/docs/src/spec/message.json b/sam/docs/src/spec/message.json index 66d4ec6f3..fd8799587 100644 --- a/sam/docs/src/spec/message.json +++ b/sam/docs/src/spec/message.json @@ -93,7 +93,7 @@ } }, { - "Name": "getReplies", + "Name": "replyGet", "Method": "GET", "Title": "Returns all replies to a message", "Path": "/{messageID}/replies", @@ -109,7 +109,7 @@ } }, { - "Name": "createReply", + "Name": "replyCreate", "Method": "POST", "Title": "Reply to a message", "Path": "/{messageID}/replies", @@ -133,7 +133,7 @@ } }, { - "Name": "pin", + "Name": "pinCreate", "Method": "POST", "Title": "Pin message to channel (public bookmark)", "Path": "/{messageID}/pin", @@ -149,7 +149,7 @@ } }, { - "Name": "removePin", + "Name": "pinRemove", "Method": "DELETE", "Title": "Pin message to channel (public bookmark)", "Path": "/{messageID}/pin", @@ -165,7 +165,7 @@ } }, { - "Name": "bookmark", + "Name": "bookmarkCreate", "Method": "POST", "Title": "Bookmark a message (private bookmark)", "Path": "/{messageID}/bookmark", @@ -181,7 +181,7 @@ } }, { - "Name": "removeBookmark", + "Name": "bookmarkRemove", "Method": "DELETE", "Title": "Remove boomark from message (private bookmark)", "Path": "/{messageID}/bookmark", @@ -197,7 +197,7 @@ } }, { - "Name": "react", + "Name": "reactionCreate", "Method": "POST", "Title": "React to a message", "Path": "/{messageID}/reaction/{reaction}", @@ -219,7 +219,7 @@ } }, { - "Name": "removeReaction", + "Name": "reactionRemove", "Method": "DELETE", "Title": "Delete reaction from a message", "Path": "/{messageID}/reaction/{reaction}", diff --git a/sam/rest/handlers/message.go b/sam/rest/handlers/message.go index a33cf355d..1bf1230c0 100644 --- a/sam/rest/handlers/message.go +++ b/sam/rest/handlers/message.go @@ -31,14 +31,14 @@ type MessageAPI interface { History(context.Context, *request.MessageHistory) (interface{}, error) Edit(context.Context, *request.MessageEdit) (interface{}, error) Delete(context.Context, *request.MessageDelete) (interface{}, error) - GetReplies(context.Context, *request.MessageGetReplies) (interface{}, error) - CreateReply(context.Context, *request.MessageCreateReply) (interface{}, error) - Pin(context.Context, *request.MessagePin) (interface{}, error) - RemovePin(context.Context, *request.MessageRemovePin) (interface{}, error) - Bookmark(context.Context, *request.MessageBookmark) (interface{}, error) - RemoveBookmark(context.Context, *request.MessageRemoveBookmark) (interface{}, error) - React(context.Context, *request.MessageReact) (interface{}, error) - RemoveReaction(context.Context, *request.MessageRemoveReaction) (interface{}, error) + ReplyGet(context.Context, *request.MessageReplyGet) (interface{}, error) + ReplyCreate(context.Context, *request.MessageReplyCreate) (interface{}, error) + PinCreate(context.Context, *request.MessagePinCreate) (interface{}, error) + PinRemove(context.Context, *request.MessagePinRemove) (interface{}, error) + BookmarkCreate(context.Context, *request.MessageBookmarkCreate) (interface{}, error) + BookmarkRemove(context.Context, *request.MessageBookmarkRemove) (interface{}, error) + ReactionCreate(context.Context, *request.MessageReactionCreate) (interface{}, error) + ReactionRemove(context.Context, *request.MessageReactionRemove) (interface{}, error) } // HTTP API interface @@ -47,14 +47,14 @@ type Message struct { History func(http.ResponseWriter, *http.Request) Edit func(http.ResponseWriter, *http.Request) Delete func(http.ResponseWriter, *http.Request) - GetReplies func(http.ResponseWriter, *http.Request) - CreateReply func(http.ResponseWriter, *http.Request) - Pin func(http.ResponseWriter, *http.Request) - RemovePin func(http.ResponseWriter, *http.Request) - Bookmark func(http.ResponseWriter, *http.Request) - RemoveBookmark func(http.ResponseWriter, *http.Request) - React func(http.ResponseWriter, *http.Request) - RemoveReaction func(http.ResponseWriter, *http.Request) + ReplyGet func(http.ResponseWriter, *http.Request) + ReplyCreate func(http.ResponseWriter, *http.Request) + PinCreate func(http.ResponseWriter, *http.Request) + PinRemove func(http.ResponseWriter, *http.Request) + BookmarkCreate func(http.ResponseWriter, *http.Request) + BookmarkRemove func(http.ResponseWriter, *http.Request) + ReactionCreate func(http.ResponseWriter, *http.Request) + ReactionRemove func(http.ResponseWriter, *http.Request) } func NewMessage(mh MessageAPI) *Message { @@ -87,60 +87,60 @@ func NewMessage(mh MessageAPI) *Message { return mh.Delete(r.Context(), params) }) }, - GetReplies: func(w http.ResponseWriter, r *http.Request) { + ReplyGet: func(w http.ResponseWriter, r *http.Request) { defer r.Body.Close() - params := request.NewMessageGetReplies() + params := request.NewMessageReplyGet() resputil.JSON(w, params.Fill(r), func() (interface{}, error) { - return mh.GetReplies(r.Context(), params) + return mh.ReplyGet(r.Context(), params) }) }, - CreateReply: func(w http.ResponseWriter, r *http.Request) { + ReplyCreate: func(w http.ResponseWriter, r *http.Request) { defer r.Body.Close() - params := request.NewMessageCreateReply() + params := request.NewMessageReplyCreate() resputil.JSON(w, params.Fill(r), func() (interface{}, error) { - return mh.CreateReply(r.Context(), params) + return mh.ReplyCreate(r.Context(), params) }) }, - Pin: func(w http.ResponseWriter, r *http.Request) { + PinCreate: func(w http.ResponseWriter, r *http.Request) { defer r.Body.Close() - params := request.NewMessagePin() + params := request.NewMessagePinCreate() resputil.JSON(w, params.Fill(r), func() (interface{}, error) { - return mh.Pin(r.Context(), params) + return mh.PinCreate(r.Context(), params) }) }, - RemovePin: func(w http.ResponseWriter, r *http.Request) { + PinRemove: func(w http.ResponseWriter, r *http.Request) { defer r.Body.Close() - params := request.NewMessageRemovePin() + params := request.NewMessagePinRemove() resputil.JSON(w, params.Fill(r), func() (interface{}, error) { - return mh.RemovePin(r.Context(), params) + return mh.PinRemove(r.Context(), params) }) }, - Bookmark: func(w http.ResponseWriter, r *http.Request) { + BookmarkCreate: func(w http.ResponseWriter, r *http.Request) { defer r.Body.Close() - params := request.NewMessageBookmark() + params := request.NewMessageBookmarkCreate() resputil.JSON(w, params.Fill(r), func() (interface{}, error) { - return mh.Bookmark(r.Context(), params) + return mh.BookmarkCreate(r.Context(), params) }) }, - RemoveBookmark: func(w http.ResponseWriter, r *http.Request) { + BookmarkRemove: func(w http.ResponseWriter, r *http.Request) { defer r.Body.Close() - params := request.NewMessageRemoveBookmark() + params := request.NewMessageBookmarkRemove() resputil.JSON(w, params.Fill(r), func() (interface{}, error) { - return mh.RemoveBookmark(r.Context(), params) + return mh.BookmarkRemove(r.Context(), params) }) }, - React: func(w http.ResponseWriter, r *http.Request) { + ReactionCreate: func(w http.ResponseWriter, r *http.Request) { defer r.Body.Close() - params := request.NewMessageReact() + params := request.NewMessageReactionCreate() resputil.JSON(w, params.Fill(r), func() (interface{}, error) { - return mh.React(r.Context(), params) + return mh.ReactionCreate(r.Context(), params) }) }, - RemoveReaction: func(w http.ResponseWriter, r *http.Request) { + ReactionRemove: func(w http.ResponseWriter, r *http.Request) { defer r.Body.Close() - params := request.NewMessageRemoveReaction() + params := request.NewMessageReactionRemove() resputil.JSON(w, params.Fill(r), func() (interface{}, error) { - return mh.RemoveReaction(r.Context(), params) + return mh.ReactionRemove(r.Context(), params) }) }, } @@ -154,14 +154,14 @@ func (mh *Message) MountRoutes(r chi.Router, middlewares ...func(http.Handler) h r.Get("/", mh.History) r.Put("/{messageID}", mh.Edit) r.Delete("/{messageID}", mh.Delete) - r.Get("/{messageID}/replies", mh.GetReplies) - r.Post("/{messageID}/replies", mh.CreateReply) - r.Post("/{messageID}/pin", mh.Pin) - r.Delete("/{messageID}/pin", mh.RemovePin) - r.Post("/{messageID}/bookmark", mh.Bookmark) - r.Delete("/{messageID}/bookmark", mh.RemoveBookmark) - r.Post("/{messageID}/reaction/{reaction}", mh.React) - r.Delete("/{messageID}/reaction/{reaction}", mh.RemoveReaction) + r.Get("/{messageID}/replies", mh.ReplyGet) + r.Post("/{messageID}/replies", mh.ReplyCreate) + r.Post("/{messageID}/pin", mh.PinCreate) + r.Delete("/{messageID}/pin", mh.PinRemove) + r.Post("/{messageID}/bookmark", mh.BookmarkCreate) + r.Delete("/{messageID}/bookmark", mh.BookmarkRemove) + r.Post("/{messageID}/reaction/{reaction}", mh.ReactionCreate) + r.Delete("/{messageID}/reaction/{reaction}", mh.ReactionRemove) }) }) } diff --git a/sam/rest/message.go b/sam/rest/message.go index 210722743..5d743ee85 100644 --- a/sam/rest/message.go +++ b/sam/rest/message.go @@ -34,7 +34,7 @@ func (ctrl *Message) Create(ctx context.Context, r *request.MessageCreate) (inte })) } -func (ctrl *Message) CreateReply(ctx context.Context, r *request.MessageCreateReply) (interface{}, error) { +func (ctrl *Message) ReplyCreate(ctx context.Context, r *request.MessageReplyCreate) (interface{}, error) { return ctrl.wrap(ctx)(ctrl.svc.msg.With(ctx).Create(&types.Message{ ChannelID: r.ChannelID, ReplyTo: r.MessageID, @@ -42,7 +42,7 @@ func (ctrl *Message) CreateReply(ctx context.Context, r *request.MessageCreateRe })) } -func (ctrl *Message) GetReplies(ctx context.Context, r *request.MessageGetReplies) (interface{}, error) { +func (ctrl *Message) ReplyGet(ctx context.Context, r *request.MessageReplyGet) (interface{}, error) { return ctrl.wrapSet(ctx)(ctrl.svc.msg.With(ctx).Find(&types.MessageFilter{ ChannelID: r.ChannelID, RepliesTo: r.MessageID, @@ -68,27 +68,27 @@ func (ctrl *Message) Delete(ctx context.Context, r *request.MessageDelete) (inte return nil, ctrl.svc.msg.With(ctx).Delete(r.MessageID) } -func (ctrl *Message) Pin(ctx context.Context, r *request.MessagePin) (interface{}, error) { +func (ctrl *Message) PinCreate(ctx context.Context, r *request.MessagePinCreate) (interface{}, error) { return nil, ctrl.svc.msg.With(ctx).Pin(r.MessageID) } -func (ctrl *Message) RemovePin(ctx context.Context, r *request.MessageRemovePin) (interface{}, error) { +func (ctrl *Message) PinRemove(ctx context.Context, r *request.MessagePinRemove) (interface{}, error) { return nil, ctrl.svc.msg.With(ctx).RemovePin(r.MessageID) } -func (ctrl *Message) Bookmark(ctx context.Context, r *request.MessageBookmark) (interface{}, error) { +func (ctrl *Message) BookmarkCreate(ctx context.Context, r *request.MessageBookmarkCreate) (interface{}, error) { return nil, ctrl.svc.msg.With(ctx).Bookmark(r.MessageID) } -func (ctrl *Message) RemoveBookmark(ctx context.Context, r *request.MessageRemoveBookmark) (interface{}, error) { +func (ctrl *Message) BookmarkRemove(ctx context.Context, r *request.MessageBookmarkRemove) (interface{}, error) { return nil, ctrl.svc.msg.With(ctx).RemoveBookmark(r.MessageID) } -func (ctrl *Message) React(ctx context.Context, r *request.MessageReact) (interface{}, error) { +func (ctrl *Message) ReactionCreate(ctx context.Context, r *request.MessageReactionCreate) (interface{}, error) { return nil, ctrl.svc.msg.With(ctx).React(r.MessageID, r.Reaction) } -func (ctrl *Message) RemoveReaction(ctx context.Context, r *request.MessageRemoveReaction) (interface{}, error) { +func (ctrl *Message) ReactionRemove(ctx context.Context, r *request.MessageReactionRemove) (interface{}, error) { return nil, 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) { diff --git a/sam/rest/request/message.go b/sam/rest/request/message.go index 3ee1c8acb..a430fc5d3 100644 --- a/sam/rest/request/message.go +++ b/sam/rest/request/message.go @@ -221,17 +221,17 @@ func (m *MessageDelete) Fill(r *http.Request) (err error) { var _ RequestFiller = NewMessageDelete() -// Message getReplies request parameters -type MessageGetReplies struct { +// Message replyGet request parameters +type MessageReplyGet struct { MessageID uint64 `json:",string"` ChannelID uint64 `json:",string"` } -func NewMessageGetReplies() *MessageGetReplies { - return &MessageGetReplies{} +func NewMessageReplyGet() *MessageReplyGet { + return &MessageReplyGet{} } -func (m *MessageGetReplies) Fill(r *http.Request) (err error) { +func (m *MessageReplyGet) Fill(r *http.Request) (err error) { if strings.ToLower(r.Header.Get("content-type")) == "application/json" { err = json.NewDecoder(r.Body).Decode(m) @@ -264,20 +264,20 @@ func (m *MessageGetReplies) Fill(r *http.Request) (err error) { return err } -var _ RequestFiller = NewMessageGetReplies() +var _ RequestFiller = NewMessageReplyGet() -// Message createReply request parameters -type MessageCreateReply struct { +// Message replyCreate request parameters +type MessageReplyCreate struct { MessageID uint64 `json:",string"` ChannelID uint64 `json:",string"` Message string } -func NewMessageCreateReply() *MessageCreateReply { - return &MessageCreateReply{} +func NewMessageReplyCreate() *MessageReplyCreate { + return &MessageReplyCreate{} } -func (m *MessageCreateReply) Fill(r *http.Request) (err error) { +func (m *MessageReplyCreate) Fill(r *http.Request) (err error) { if strings.ToLower(r.Header.Get("content-type")) == "application/json" { err = json.NewDecoder(r.Body).Decode(m) @@ -314,19 +314,19 @@ func (m *MessageCreateReply) Fill(r *http.Request) (err error) { return err } -var _ RequestFiller = NewMessageCreateReply() +var _ RequestFiller = NewMessageReplyCreate() -// Message pin request parameters -type MessagePin struct { +// Message pinCreate request parameters +type MessagePinCreate struct { MessageID uint64 `json:",string"` ChannelID uint64 `json:",string"` } -func NewMessagePin() *MessagePin { - return &MessagePin{} +func NewMessagePinCreate() *MessagePinCreate { + return &MessagePinCreate{} } -func (m *MessagePin) Fill(r *http.Request) (err error) { +func (m *MessagePinCreate) Fill(r *http.Request) (err error) { if strings.ToLower(r.Header.Get("content-type")) == "application/json" { err = json.NewDecoder(r.Body).Decode(m) @@ -359,19 +359,19 @@ func (m *MessagePin) Fill(r *http.Request) (err error) { return err } -var _ RequestFiller = NewMessagePin() +var _ RequestFiller = NewMessagePinCreate() -// Message removePin request parameters -type MessageRemovePin struct { +// Message pinRemove request parameters +type MessagePinRemove struct { MessageID uint64 `json:",string"` ChannelID uint64 `json:",string"` } -func NewMessageRemovePin() *MessageRemovePin { - return &MessageRemovePin{} +func NewMessagePinRemove() *MessagePinRemove { + return &MessagePinRemove{} } -func (m *MessageRemovePin) Fill(r *http.Request) (err error) { +func (m *MessagePinRemove) Fill(r *http.Request) (err error) { if strings.ToLower(r.Header.Get("content-type")) == "application/json" { err = json.NewDecoder(r.Body).Decode(m) @@ -404,19 +404,19 @@ func (m *MessageRemovePin) Fill(r *http.Request) (err error) { return err } -var _ RequestFiller = NewMessageRemovePin() +var _ RequestFiller = NewMessagePinRemove() -// Message bookmark request parameters -type MessageBookmark struct { +// Message bookmarkCreate request parameters +type MessageBookmarkCreate struct { MessageID uint64 `json:",string"` ChannelID uint64 `json:",string"` } -func NewMessageBookmark() *MessageBookmark { - return &MessageBookmark{} +func NewMessageBookmarkCreate() *MessageBookmarkCreate { + return &MessageBookmarkCreate{} } -func (m *MessageBookmark) Fill(r *http.Request) (err error) { +func (m *MessageBookmarkCreate) Fill(r *http.Request) (err error) { if strings.ToLower(r.Header.Get("content-type")) == "application/json" { err = json.NewDecoder(r.Body).Decode(m) @@ -449,19 +449,19 @@ func (m *MessageBookmark) Fill(r *http.Request) (err error) { return err } -var _ RequestFiller = NewMessageBookmark() +var _ RequestFiller = NewMessageBookmarkCreate() -// Message removeBookmark request parameters -type MessageRemoveBookmark struct { +// Message bookmarkRemove request parameters +type MessageBookmarkRemove struct { MessageID uint64 `json:",string"` ChannelID uint64 `json:",string"` } -func NewMessageRemoveBookmark() *MessageRemoveBookmark { - return &MessageRemoveBookmark{} +func NewMessageBookmarkRemove() *MessageBookmarkRemove { + return &MessageBookmarkRemove{} } -func (m *MessageRemoveBookmark) Fill(r *http.Request) (err error) { +func (m *MessageBookmarkRemove) Fill(r *http.Request) (err error) { if strings.ToLower(r.Header.Get("content-type")) == "application/json" { err = json.NewDecoder(r.Body).Decode(m) @@ -494,20 +494,20 @@ func (m *MessageRemoveBookmark) Fill(r *http.Request) (err error) { return err } -var _ RequestFiller = NewMessageRemoveBookmark() +var _ RequestFiller = NewMessageBookmarkRemove() -// Message react request parameters -type MessageReact struct { +// Message reactionCreate request parameters +type MessageReactionCreate struct { MessageID uint64 `json:",string"` Reaction string ChannelID uint64 `json:",string"` } -func NewMessageReact() *MessageReact { - return &MessageReact{} +func NewMessageReactionCreate() *MessageReactionCreate { + return &MessageReactionCreate{} } -func (m *MessageReact) Fill(r *http.Request) (err error) { +func (m *MessageReactionCreate) Fill(r *http.Request) (err error) { if strings.ToLower(r.Header.Get("content-type")) == "application/json" { err = json.NewDecoder(r.Body).Decode(m) @@ -541,20 +541,20 @@ func (m *MessageReact) Fill(r *http.Request) (err error) { return err } -var _ RequestFiller = NewMessageReact() +var _ RequestFiller = NewMessageReactionCreate() -// Message removeReaction request parameters -type MessageRemoveReaction struct { +// Message reactionRemove request parameters +type MessageReactionRemove struct { MessageID uint64 `json:",string"` Reaction string ChannelID uint64 `json:",string"` } -func NewMessageRemoveReaction() *MessageRemoveReaction { - return &MessageRemoveReaction{} +func NewMessageReactionRemove() *MessageReactionRemove { + return &MessageReactionRemove{} } -func (m *MessageRemoveReaction) Fill(r *http.Request) (err error) { +func (m *MessageReactionRemove) Fill(r *http.Request) (err error) { if strings.ToLower(r.Header.Get("content-type")) == "application/json" { err = json.NewDecoder(r.Body).Decode(m) @@ -588,4 +588,4 @@ func (m *MessageRemoveReaction) Fill(r *http.Request) (err error) { return err } -var _ RequestFiller = NewMessageRemoveReaction() +var _ RequestFiller = NewMessageReactionRemove()