mir:fixed VisibleTweet error in new web service

auto/api/v1/priv.go

@@ -18,7 +18,7 @@ type Priv interface {
 	CreateCommentReply(*web.CreateCommentReplyReq) (*web.CreateCommentReplyResp, mir.Error)
 	DeleteComment(*web.DeleteCommentReq) mir.Error
 	CreateComment(*web.CreateCommentReq) (*web.CreateCommentResp, mir.Error)
-	VisiblePost(*web.VisiblePostReq) (*web.VisiblePostResp, mir.Error)
+	VisibleTweet(*web.VisibleTweetReq) (*web.VisibleTweetResp, mir.Error)
 	StickTweet(*web.StickTweetReq) (*web.StickTweetResp, mir.Error)
 	LockTweet(*web.LockTweetReq) (*web.LockTweetResp, mir.Error)
 	CollectionTweet(*web.CollectionTweetReq) (*web.CollectionTweetResp, mir.Error)
@@ -37,7 +37,7 @@ type PrivBinding interface {
 	BindCreateCommentReply(*gin.Context) (*web.CreateCommentReplyReq, mir.Error)
 	BindDeleteComment(*gin.Context) (*web.DeleteCommentReq, mir.Error)
 	BindCreateComment(*gin.Context) (*web.CreateCommentReq, mir.Error)
-	BindVisiblePost(*gin.Context) (*web.VisiblePostReq, mir.Error)
+	BindVisibleTweet(*gin.Context) (*web.VisibleTweetReq, mir.Error)
 	BindStickTweet(*gin.Context) (*web.StickTweetReq, mir.Error)
 	BindLockTweet(*gin.Context) (*web.LockTweetReq, mir.Error)
 	BindCollectionTweet(*gin.Context) (*web.CollectionTweetReq, mir.Error)
@@ -56,7 +56,7 @@ type PrivRender interface {
 	RenderCreateCommentReply(*gin.Context, *web.CreateCommentReplyResp, mir.Error)
 	RenderDeleteComment(*gin.Context, mir.Error)
 	RenderCreateComment(*gin.Context, *web.CreateCommentResp, mir.Error)
-	RenderVisiblePost(*gin.Context, *web.VisiblePostResp, mir.Error)
+	RenderVisibleTweet(*gin.Context, *web.VisibleTweetResp, mir.Error)
 	RenderStickTweet(*gin.Context, *web.StickTweetResp, mir.Error)
 	RenderLockTweet(*gin.Context, *web.LockTweetResp, mir.Error)
 	RenderCollectionTweet(*gin.Context, *web.CollectionTweetResp, mir.Error)
@@ -147,13 +147,13 @@ func RegisterPrivServant(e *gin.Engine, s Priv, b PrivBinding, r PrivRender) {
 		default:
 		}
 
-		req, err := b.BindVisiblePost(c)
+		req, err := b.BindVisibleTweet(c)
 		if err != nil {
-			r.RenderVisiblePost(c, nil, err)
+			r.RenderVisibleTweet(c, nil, err)
 			return
 		}
-		resp, err := s.VisiblePost(req)
+		resp, err := s.VisibleTweet(req)
-		r.RenderVisiblePost(c, resp, err)
+		r.RenderVisibleTweet(c, resp, err)
 	})
 
 	router.Handle("POST", "/post/stick", func(c *gin.Context) {
@@ -325,7 +325,7 @@ func (UnimplementedPrivServant) CreateComment(req *web.CreateCommentReq) (*web.C
 	return nil, mir.Errorln(http.StatusNotImplemented, http.StatusText(http.StatusNotImplemented))
 }
 
-func (UnimplementedPrivServant) VisiblePost(req *web.VisiblePostReq) (*web.VisiblePostResp, mir.Error) {
+func (UnimplementedPrivServant) VisibleTweet(req *web.VisibleTweetReq) (*web.VisibleTweetResp, mir.Error) {
 	return nil, mir.Errorln(http.StatusNotImplemented, http.StatusText(http.StatusNotImplemented))
 }
 
@@ -388,7 +388,7 @@ func (r *UnimplementedPrivRender) RenderCreateComment(c *gin.Context, data *web.
 	r.RenderAny(c, data, err)
 }
 
-func (r *UnimplementedPrivRender) RenderVisiblePost(c *gin.Context, data *web.VisiblePostResp, err mir.Error) {
+func (r *UnimplementedPrivRender) RenderVisibleTweet(c *gin.Context, data *web.VisibleTweetResp, err mir.Error) {
 	r.RenderAny(c, data, err)
 }
 
@@ -459,8 +459,8 @@ func (b *UnimplementedPrivBinding) BindCreateComment(c *gin.Context) (*web.Creat
 	return obj, err
 }
 
-func (b *UnimplementedPrivBinding) BindVisiblePost(c *gin.Context) (*web.VisiblePostReq, mir.Error) {
+func (b *UnimplementedPrivBinding) BindVisibleTweet(c *gin.Context) (*web.VisibleTweetReq, mir.Error) {
-	obj := new(web.VisiblePostReq)
+	obj := new(web.VisibleTweetReq)
 	err := b.BindAny(c, obj)
 	return obj, err
 }

internal/model/web/priv.go

@@ -71,13 +71,13 @@ type StickTweetResp struct {
 	StickStatus int `json:"top_status"`
 }
 
-type VisiblePostReq struct {
+type VisibleTweetReq struct {
 	BaseInfo   `json:"-" binding:"-"`
-	ID         int64             `json:"id" binding:"required"`
+	ID         int64             `json:"id"`
-	Visibility core.PostVisibleT `json:"visibility" binding:"required"`
+	Visibility core.PostVisibleT `json:"visibility"`
 }
 
-type VisiblePostResp struct {
+type VisibleTweetResp struct {
 	Visibility core.PostVisibleT `json:"visibility"`
 }
 

internal/servants/web/priv.go

@@ -627,11 +627,11 @@ func (s *privSrv) StarTweet(req *web.StarTweetReq) (*web.StarTweetResp, mir.Erro
 	}, nil
 }
 
-func (s *privSrv) VisiblePost(req *web.VisiblePostReq) (*web.VisiblePostResp, mir.Error) {
+func (s *privSrv) VisibleTweet(req *web.VisibleTweetReq) (*web.VisibleTweetResp, mir.Error) {
 	if req.Visibility >= core.PostVisitInvalid {
 		return nil, xerror.InvalidParams
 	}
-	post, err := s.Ds.GetPostByID(req.User.ID)
+	post, err := s.Ds.GetPostByID(req.ID)
 	if err != nil {
 		return nil, _errVisblePostFailed
 	}
@@ -639,7 +639,7 @@ func (s *privSrv) VisiblePost(req *web.VisiblePostReq) (*web.VisiblePostResp, mi
 		return nil, xerr
 	}
 	if err = s.Ds.VisiblePost(post, req.Visibility); err != nil {
-		logrus.Warnf("update post failure: %v", err)
+		logrus.Warnf("s.Ds.VisiblePost: %s", err)
 		return nil, _errVisblePostFailed
 	}
 
@@ -647,7 +647,7 @@ func (s *privSrv) VisiblePost(req *web.VisiblePostReq) (*web.VisiblePostResp, mi
 	post.Visibility = req.Visibility
 	s.PushPostToSearch(post)
 
-	return &web.VisiblePostResp{
+	return &web.VisibleTweetResp{
 		Visibility: req.Visibility,
 	}, nil
 }

mirc/web/v1/priv.go

@@ -42,8 +42,8 @@ type Priv struct {
 	// StickTweet 置顶动态
 	StickTweet func(Post, web.StickTweetReq) web.StickTweetResp `mir:"/post/stick"`
 
-	// VisiblePost 修改动态可见度
+	// VisibleTweet 修改动态可见度
-	VisiblePost func(Post, web.VisiblePostReq) web.VisiblePostResp `mir:"/post/visibility"`
+	VisibleTweet func(Post, web.VisibleTweetReq) web.VisibleTweetResp `mir:"/post/visibility"`
 
 	// CreateTweetComment 发布动态评论
 	CreateComment func(Post, web.CreateCommentReq) web.CreateCommentResp `mir:"/post/comment"`