make Newest/Hots/Following tweets in index page work well

CHANGELOG.md

@@ -30,7 +30,50 @@ All notable changes to paopao-ce are documented in this file.
   # 模块开启
   VITE_ENABLE_FRIENDS_BAR=true
   ```
-
+  - add Newest/Hots/Following tweets support in friend bar feature. 
+  mirgration database first(sql ddl file in `scripts/migration/**/*_home_timeline.up.sql`):
+  ```sql
+  CREATE TABLE `p_post_metric` (
+	`id` bigint unsigned NOT NULL AUTO_INCREMENT,
+	`post_id` bigint unsigned NOT NULL,
+	`rank_score` bigint unsigned NOT NULL DEFAULT 0,
+	`incentive_score` int unsigned NOT NULL DEFAULT 0,
+	`decay_factor` int unsigned NOT NULL DEFAULT 0,
+	`motivation_factor` int unsigned NOT NULL DEFAULT 0,
+	`is_del` tinyint NOT NULL DEFAULT 0, -- 是否删除, 0否, 1是
+	`created_on` bigint unsigned NOT NULL DEFAULT '0',
+	`modified_on` bigint unsigned NOT NULL DEFAULT '0',
+	`deleted_on` bigint unsigned NOT NULL DEFAULT '0',
+	PRIMARY KEY (`id`) USING BTREE,
+	KEY `idx_post_metric_post_id_rank_score` (`post_id`,`rank_score`) USING BTREE
+  ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+
+  INSERT INTO p_post_metric (post_id, rank_score, created_on) 
+  SELECT id AS post_id, 
+	  comment_count + upvote_count*2 + collection_count*4 AS rank_score,
+	  created_on
+  FROM p_post
+  WHERE is_del=0;
+
+  -- 原来的可见性: 0公开 1私密 2好友可见 3关注可见
+  -- 现在的可见性: 0私密 10充电可见 20订阅可见 30保留 40保留 50好友可见 60关注可见 70保留 80保留 90公开
+  UPDATE p_post a 
+  SET visibility = (
+	  SELECT
+	  CASE visibility 
+		  WHEN 0 THEN 90 
+		  WHEN 1 THEN 0 
+		  WHEN 2 THEN 50 
+		  WHEN 3 THEN 60 
+		  ELSE 0
+	  END 
+	  FROM
+		  p_post b 
+	  WHERE
+		  a.ID = b.ID 
+  );
+  ```sql
+  
 ## 0.4.2
 ### Fixed
 - fixed remove multi-objects no effects and occurs resource leak error when use Minio as OSS(Object Storage System).[#371](https://github.com/rocboss/paopao-ce/pull/371) [#372](https://github.com/rocboss/paopao-ce/pull/372)  

internal/conf/cache.go

@@ -25,7 +25,7 @@ const (
 	PrefixOnlineUser         = "paopao:onlineuser:"
 	PrefixIdxTweetsNewest    = "paopao:index:tweets:newest:"
 	PrefixIdxTweetsHots      = "paopao:index:tweets:hots:"
-	prefixIdxTweetsFollowing = "paopao:index:tweets:following:"
+	PrefixIdxTweetsFollowing = "paopao:index:tweets:following:"
 	KeySiteStatus            = "paopao:sitestatus"
 	KeyHistoryMaxOnline      = "history.max.online"
 )

internal/conf/db.go

@@ -30,6 +30,7 @@ const (
 	TableContactGroup       = "contact_group"
 	TableMessage            = "message"
 	TablePost               = "post"
+	TablePostMetric         = "post_metric"
 	TablePostByComment      = "post_by_comment"
 	TablePostByMedia        = "post_by_media"
 	TablePostAttachmentBill = "post_attachment_bill"

internal/conf/setting.go

@@ -350,6 +350,7 @@ func (s *databaseConf) TableNames() (res TableNameMap) {
 		TableContactGroup,
 		TableMessage,
 		TablePost,
+		TablePostMetric,
 		TablePostByComment,
 		TablePostByMedia,
 		TablePostAttachmentBill,

internal/core/cs/tweets.go

@@ -16,11 +16,10 @@ const (
 	TweetBlockChargeAttachment
 
 	// 推文可见性
-	TweetVisitPublic TweetVisibleType = iota
+	TweetVisitPublic    TweetVisibleType = 90
-	TweetVisitPrivate
+	TweetVisitPrivate   TweetVisibleType = 0
-	TweetVisitFriend
+	TweetVisitFriend    TweetVisibleType = 50
-	TweetVisitFollowing
+	TweetVisitFollowing TweetVisibleType = 60
-	TweetVisitInvalid
 
 	// 用户推文列表样式
 	StyleUserTweetsGuest uint8 = iota
@@ -29,11 +28,6 @@ const (
 	StyleUserTweetsFriend
 	StyleUserTweetsFollowing
 
-	// 广场推文列表样式
-	StyleIndexTweetsSearch uint8 = iota
-	StyleIndexTweetsNewest
-	StyleIndexTweetsHots
-
 	// 附件类型
 	AttachmentTypeImage AttachmentType = iota + 1
 	AttachmentTypeVideo
@@ -45,7 +39,7 @@ type (
 	// TODO: 优化一下类型为 uint8， 需要底层数据库同步修改
 	TweetBlockType int
 
-	// TweetVisibleType 推文可见性，0公开，1私密，2好友
+	// TweetVisibleType 推文可见性: 0私密 10充电可见 20订阅可见 30保留 40保留 50好友可见 60关注可见 70保留 80保留 90公开',
 	TweetVisibleType uint8
 
 	// AttachmentType 附件类型， 1图片， 2视频， 3其他
@@ -152,3 +146,19 @@ type NewTweetReq struct {
 	Visibility      TweetVisibleType `json:"visibility"`
 	ClientIP        string           `json:"-" binding:"-"`
 }
+
+func (t TweetVisibleType) ToOutValue() (res uint8) {
+	switch t {
+	case TweetVisitPublic:
+		res = 0
+	case TweetVisitPrivate:
+		res = 1
+	case TweetVisitFriend:
+		res = 2
+	case TweetVisitFollowing:
+		res = 3
+	default:
+		res = 1
+	}
+	return
+}

internal/core/ms/tweets.go

@@ -25,10 +25,10 @@ const (
 )
 
 const (
-	PostVisitPublic PostVisibleT = iota
+	PostVisitPublic    = dbr.PostVisitPublic
-	PostVisitPrivate
+	PostVisitPrivate   = dbr.PostVisitPrivate
-	PostVisitFriend
+	PostVisitFriend    = dbr.PostVisitFriend
-	PostVisitInvalid
+	PostVisitFollowing = dbr.PostVisitFollowing
 )
 
 type (

internal/core/search.go

@@ -19,11 +19,10 @@ const (
 	PostVisitPrivate   = dbr.PostVisitPrivate
 	PostVisitFriend    = dbr.PostVisitFriend
 	PostVisitFollowing = dbr.PostVisitFollowing
-	PostVisitInvalid   = dbr.PostVisitInvalid
 )
 
 type (
-	// PostVisibleT 可访问类型，0公开，1私密，2好友
+	// PostVisibleT 可访问类型，可见性: 0私密 10充电可见 20订阅可见 30保留 40保留 50好友可见 60关注可见 70保留 80保留 90公开
 	PostVisibleT = dbr.PostVisibleT
 
 	SearchType string

internal/core/tweets.go

@@ -28,7 +28,9 @@ type TweetService interface {
 	ListUserCommentTweets(user *cs.VistUser, limit int, offset int) ([]*ms.Post, int64, error)
 	ListUserTweets(userId int64, style uint8, justEssence bool, limit, offset int) ([]*ms.Post, int64, error)
 	ListFollowingTweets(userId int64, limit, offset int) ([]*ms.Post, int64, error)
-	ListIndexTweets(style uint8, limit, offset int) ([]*ms.Post, int64, error)
+	ListIndexNewestTweets(limit, offset int) ([]*ms.Post, int64, error)
+	ListIndexHotsTweets(limit, offset int) ([]*ms.Post, int64, error)
+	ListSyncSearchTweets(limit, offset int) ([]*ms.Post, int64, error)
 }
 
 // TweetManageService 推文管理服务，包括创建/删除/更新推文
@@ -38,7 +40,7 @@ type TweetManageService interface {
 	LockPost(post *ms.Post) error
 	StickPost(post *ms.Post) error
 	HighlightPost(userId, postId int64) (int, error)
-	VisiblePost(post *ms.Post, visibility PostVisibleT) error
+	VisiblePost(post *ms.Post, visibility cs.TweetVisibleType) error
 	UpdatePost(post *ms.Post) error
 	CreatePostStar(postID, userID int64) (*ms.PostStar, error)
 	DeletePostStar(p *ms.PostStar) error

internal/dao/jinzhu/dbr/post.go

@@ -11,15 +11,14 @@ import (
 	"gorm.io/gorm"
 )
 
-// PostVisibleT 可访问类型，0公开，1私密，2好友
+// PostVisibleT 可访问类型，可见性: 0私密 10充电可见 20订阅可见 30保留 40保留 50好友可见 60关注可见 70保留 80保留 90公开',
 type PostVisibleT uint8
 
 const (
-	PostVisitPublic PostVisibleT = iota
+	PostVisitPublic    PostVisibleT = 90
-	PostVisitPrivate
+	PostVisitPrivate   PostVisibleT = 0
-	PostVisitFriend
+	PostVisitFriend    PostVisibleT = 50
-	PostVisitFollowing
+	PostVisitFollowing PostVisibleT = 60
-	PostVisitInvalid
 )
 
 type PostByMedia = Post
@@ -65,6 +64,22 @@ type PostFormated struct {
 	IPLoc           string                 `json:"ip_loc"`
 }
 
+func (t PostVisibleT) ToOutValue() (res uint8) {
+	switch t {
+	case PostVisitPublic:
+		res = 0
+	case PostVisitPrivate:
+		res = 1
+	case PostVisitFriend:
+		res = 2
+	case PostVisitFollowing:
+		res = 3
+	default:
+		res = 1
+	}
+	return
+}
+
 func (p *Post) Format() *PostFormated {
 	if p.Model != nil {
 		tagsMap := map[string]int8{}
@@ -212,8 +227,6 @@ func (p PostVisibleT) String() string {
 		return "private"
 	case PostVisitFriend:
 		return "friend"
-	case PostVisitInvalid:
-		return "invalid"
 	default:
 		return "unknow"
 	}

internal/dao/jinzhu/gorm.go

@@ -22,6 +22,7 @@ var (
 	_contactGroup_       string
 	_message_            string
 	_post_               string
+	_post_metric_        string
 	_post_by_comment_    string
 	_post_by_media_      string
 	_postAttachmentBill_ string
@@ -48,6 +49,7 @@ func initTableName() {
 	_contactGroup_ = m[conf.TableContactGroup]
 	_message_ = m[conf.TableMessage]
 	_post_ = m[conf.TablePost]
+	_post_metric_ = m[conf.TablePostMetric]
 	_post_by_comment_ = m[conf.TablePostByComment]
 	_post_by_media_ = m[conf.TablePostByMedia]
 	_postAttachmentBill_ = m[conf.TablePostAttachmentBill]

internal/dao/jinzhu/tweets.go

@@ -5,6 +5,7 @@
 package jinzhu
 
 import (
+	"fmt"
 	"strings"
 	"time"
 
@@ -214,7 +215,6 @@ func (s *tweetManageSrv) CreatePost(post *ms.Post) (*ms.Post, error) {
 
 func (s *tweetManageSrv) DeletePost(post *ms.Post) ([]string, error) {
 	var mediaContents []string
-
 	postId := post.ID
 	postContent := &dbr.PostContent{}
 	err := s.db.Transaction(
@@ -326,15 +326,15 @@ func (s *tweetManageSrv) HighlightPost(userId int64, postId int64) (res int, err
 	return post.IsEssence, nil
 }
 
-func (s *tweetManageSrv) VisiblePost(post *ms.Post, visibility core.PostVisibleT) (err error) {
+func (s *tweetManageSrv) VisiblePost(post *ms.Post, visibility cs.TweetVisibleType) (err error) {
 	oldVisibility := post.Visibility
-	post.Visibility = visibility
+	post.Visibility = ms.PostVisibleT(visibility)
 	// TODO: 这个判断是否可以不要呢
-	if oldVisibility == visibility {
+	if oldVisibility == ms.PostVisibleT(visibility) {
 		return nil
 	}
 	// 私密推文 特殊处理
-	if visibility == dbr.PostVisitPrivate {
+	if visibility == cs.TweetVisitPrivate {
 		// 强制取消置顶
 		// TODO: 置顶推文用户是否有权设置成私密？ 后续完善
 		post.IsTop = 0
@@ -350,7 +350,7 @@ func (s *tweetManageSrv) VisiblePost(post *ms.Post, visibility core.PostVisibleT
 	if oldVisibility == dbr.PostVisitPrivate {
 		// 从私密转为非私密才需要重新创建tag
 		createTags(tx, post.UserID, tags)
-	} else if visibility == dbr.PostVisitPrivate {
+	} else if visibility == cs.TweetVisitPrivate {
 		// 从非私密转为私密才需要删除tag
 		deleteTags(tx, tags)
 	}
@@ -392,19 +392,129 @@ func (s *tweetSrv) GetPosts(conditions ms.ConditionsT, offset, limit int) ([]*ms
 	return (&dbr.Post{}).List(s.db, conditions, offset, limit)
 }
 
-func (s *tweetSrv) ListUserTweets(userId int64, style uint8, justEssence bool, limit, offset int) ([]*ms.Post, int64, error) {
+func (s *tweetSrv) ListUserTweets(userId int64, style uint8, justEssence bool, limit, offset int) (res []*ms.Post, total int64, err error) {
-	// TODO
+	db := s.db.Table(_post_).Where("user_id = ?", userId)
-	return nil, 0, debug.ErrNotImplemented
+	switch style {
+	case cs.StyleUserTweetsAdmin:
+		fallthrough
+	case cs.StyleUserTweetsSelf:
+		db = db.Where("visibility >= ?", cs.TweetVisitPrivate)
+	case cs.StyleUserTweetsFriend:
+		db = db.Where("visibility >= ?", cs.TweetVisitFriend)
+	case cs.StyleUserTweetsFollowing:
+		db = db.Where("visibility >= ?", cs.TweetVisitFollowing)
+	case cs.StyleUserTweetsGuest:
+		fallthrough
+	default:
+		db = db.Where("visibility >= ?", cs.TweetVisitPublic)
+	}
+	if justEssence {
+		db = db.Where("is_essence=1")
+	}
+	if err = db.Count(&total).Error; err != nil {
+		return
+	}
+	if offset >= 0 && limit > 0 {
+		db = db.Offset(offset).Limit(limit)
+	}
+	if err = db.Order("is_top DESC, latest_replied_on DESC").Find(&res).Error; err != nil {
+		return
+	}
+	return
 }
 
-func (s *tweetSrv) ListIndexTweets(style uint8, limit, offset int) ([]*ms.Post, int64, error) {
+func (s *tweetSrv) ListIndexNewestTweets(limit, offset int) (res []*ms.Post, total int64, err error) {
-	// TODO
+	db := s.db.Table(_post_).Where("visibility >= ?", cs.TweetVisitPublic)
-	return nil, 0, debug.ErrNotImplemented
+	if err = db.Count(&total).Error; err != nil {
+		return
+	}
+	if offset >= 0 && limit > 0 {
+		db = db.Offset(offset).Limit(limit)
+	}
+	if err = db.Order("is_top DESC, latest_replied_on DESC").Find(&res).Error; err != nil {
+		return
+	}
+	return
 }
 
-func (s *tweetSrv) ListFollowingTweets(userId int64, limit, offset int) ([]*ms.Post, int64, error) {
+func (s *tweetSrv) ListIndexHotsTweets(limit, offset int) (res []*ms.Post, total int64, err error) {
-	// TODO
+	db := s.db.Table(_post_).Joins(fmt.Sprintf("JOIN %s metric ON %s.id=metric.post_id", _post_metric_, _post_)).Where("visibility >= ?", cs.TweetVisitPublic)
-	return nil, 0, debug.ErrNotImplemented
+	if err = db.Count(&total).Error; err != nil {
+		return
+	}
+	if offset >= 0 && limit > 0 {
+		db = db.Offset(offset).Limit(limit)
+	}
+	if err = db.Order("is_top DESC, metric.rank_score DESC, latest_replied_on DESC").Find(&res).Error; err != nil {
+		return
+	}
+	return
+}
+
+func (s *tweetSrv) ListSyncSearchTweets(limit, offset int) (res []*ms.Post, total int64, err error) {
+	db := s.db.Table(_post_).Where("visibility >= ?", cs.TweetVisitFriend)
+	if err = db.Count(&total).Error; err != nil {
+		return
+	}
+	if offset >= 0 && limit > 0 {
+		db = db.Offset(offset).Limit(limit)
+	}
+	if err = db.Find(&res).Error; err != nil {
+		return
+	}
+	return
+}
+
+func (s *tweetSrv) ListFollowingTweets(userId int64, limit, offset int) (res []*ms.Post, total int64, err error) {
+	beFriendIds, beFollowIds, xerr := s.getUserRelation(userId)
+	if xerr != nil {
+		return nil, 0, xerr
+	}
+	beFriendCount, beFollowCount := len(beFriendIds), len(beFollowIds)
+	db := s.db.Table(_post_)
+	//可见性: 0私密 10充电可见 20订阅可见 30保留 40保留 50好友可见 60关注可见 70保留 80保留 90公开',
+	switch {
+	case beFriendCount > 0 && beFollowCount > 0:
+		db = db.Where("user_id=? OR (visibility>=50 AND user_id IN(?)) OR (visibility>=60 AND user_id IN(?))", userId, beFriendIds, beFollowIds)
+	case beFriendCount > 0 && beFollowCount == 0:
+		db = db.Where("user_id=? OR (visibility>=50 AND user_id IN(?))", userId, beFriendIds)
+	case beFriendCount == 0 && beFollowCount > 0:
+		db = db.Where("user_id=? OR (visibility>=60 AND user_id IN(?))", userId, beFollowIds)
+	case beFriendCount == 0 && beFollowCount == 0:
+		db = db.Where("user_id = ?", userId)
+	}
+	if err = db.Count(&total).Error; err != nil {
+		return
+	}
+	if offset >= 0 && limit > 0 {
+		db = db.Offset(offset).Limit(limit)
+	}
+	if err = db.Find(&res).Error; err != nil {
+		return
+	}
+	return
+}
+
+func (s *tweetSrv) getUserRelation(userId int64) (beFriendIds []int64, beFollowIds []int64, err error) {
+	if err = s.db.Table(_contact_).Where("friend_id=?", userId).Select("user_id").Find(&beFriendIds).Error; err != nil {
+		return
+	}
+	if err = s.db.Table(_following_).Where("user_id=?", userId).Select("follow_id").Find(&beFollowIds).Error; err != nil {
+		return
+	}
+	// 即是好友又是关注者，保留好友去除关注者
+	for _, id := range beFriendIds {
+		for i := 0; i < len(beFollowIds); i++ {
+			// 找到item即删，数据库已经保证唯一性
+			if beFollowIds[i] == id {
+				lastIdx := len(beFollowIds) - 1
+				beFriendIds[i] = beFriendIds[lastIdx]
+				beFollowIds = beFollowIds[:lastIdx]
+				break
+			}
+		}
+	}
+	return
 }
 
 func (s *tweetSrv) GetPostCount(conditions ms.ConditionsT) (int64, error) {

internal/model/web/loose.go

@@ -118,6 +118,6 @@ func (r *TimelineReq) Bind(c *gin.Context) mir.Error {
 		User: user,
 	}
 	r.Page, r.PageSize = app.GetPageInfo(c)
-	r.Query, r.Type = c.Query("query"), "search"
+	r.Query, r.Type, r.Style = c.Query("query"), "search", c.Query("style")
 	return nil
 }

internal/model/web/priv.go

@@ -13,6 +13,7 @@ import (
 	"github.com/alimy/mir/v4"
 	"github.com/gin-gonic/gin"
 	"github.com/rocboss/paopao-ce/internal/core"
+	"github.com/rocboss/paopao-ce/internal/core/cs"
 	"github.com/rocboss/paopao-ce/internal/core/ms"
 	"github.com/rocboss/paopao-ce/internal/model/joint"
 	"github.com/rocboss/paopao-ce/internal/servants/base"
@@ -20,6 +21,17 @@ import (
 	"github.com/rocboss/paopao-ce/pkg/xerror"
 )
 
+const (
+	// 推文可见性
+	TweetVisitPublic TweetVisibleType = iota
+	TweetVisitPrivate
+	TweetVisitFriend
+	TweetVisitFollowing
+	TweetVisitInvalid
+)
+
+type TweetVisibleType cs.TweetVisibleType
+
 type TweetCommentThumbsReq struct {
 	SimpleInfo `json:"-" binding:"-"`
 	TweetId    int64 `json:"tweet_id" binding:"required"`
@@ -45,7 +57,7 @@ type CreateTweetReq struct {
 	Tags            []string           `json:"tags" binding:"required"`
 	Users           []string           `json:"users" binding:"required"`
 	AttachmentPrice int64              `json:"attachment_price"`
-	Visibility      core.PostVisibleT  `json:"visibility"`
+	Visibility      TweetVisibleType   `json:"visibility"`
 	ClientIP        string             `json:"-" binding:"-"`
 }
 
@@ -103,12 +115,12 @@ type HighlightTweetResp struct {
 
 type VisibleTweetReq struct {
 	BaseInfo   `json:"-" binding:"-"`
-	ID         int64             `json:"id"`
+	ID         int64            `json:"id"`
-	Visibility core.PostVisibleT `json:"visibility"`
+	Visibility TweetVisibleType `json:"visibility"`
 }
 
 type VisibleTweetResp struct {
-	Visibility core.PostVisibleT `json:"visibility"`
+	Visibility TweetVisibleType `json:"visibility"`
 }
 
 type CreateCommentReq struct {
@@ -296,3 +308,22 @@ func (r *CreateTweetResp) Render(c *gin.Context) {
 		Id:    r.ID,
 	})
 }
+
+func (t TweetVisibleType) ToVisibleValue() (res cs.TweetVisibleType) {
+	// 原来的可见性: 0公开 1私密 2好友可见 3关注可见
+	//  现在的可见性: 0私密 10充电可见 20订阅可见 30保留 40保留 50好友可见 60关注可见 70保留 80保留 90公开
+	switch t {
+	case TweetVisitPublic:
+		res = cs.TweetVisitPublic
+	case TweetVisitPrivate:
+		res = cs.TweetVisitPrivate
+	case TweetVisitFriend:
+		res = cs.TweetVisitFriend
+	case TweetVisitFollowing:
+		res = cs.TweetVisitFollowing
+	default:
+		// TODO: 默认私密
+		res = cs.TweetVisitPrivate
+	}
+	return
+}

internal/servants/base/base.go

@@ -208,13 +208,8 @@ func (s *DaoServant) pushAllPostToSearch() error {
 	ctx := context.Background()
 	if err := s.Redis.SetPushToSearchJob(ctx); err == nil {
 		defer s.Redis.DelPushToSearchJob(ctx)
-
 		splitNum := 1000
-		// conditions := ms.ConditionsT{
+		posts, totalRows, err := s.Ds.ListSyncSearchTweets(splitNum, 0)
-		// 	"visibility IN ?": []core.PostVisibleT{core.PostVisitPublic, core.PostVisitFriend},
-		// }
-		// totalRows, _ := s.Ds.GetPostCount(conditions)
-		posts, totalRows, err := s.Ds.ListIndexTweets(cs.StyleIndexTweetsSearch, splitNum, 0)
 		if err != nil {
 			return fmt.Errorf("get first page tweets push to search failed: %s", err)
 		}
@@ -240,7 +235,7 @@ func (s *DaoServant) pushAllPostToSearch() error {
 			if i++; i >= nums {
 				break
 			}
-			if posts, _, err = s.Ds.ListIndexTweets(cs.StyleIndexTweetsSearch, splitNum, i*splitNum); err != nil {
+			if posts, _, err = s.Ds.ListSyncSearchTweets(splitNum, i*splitNum); err != nil {
 				return fmt.Errorf("get tweets push to search failed: %s, limit[%d] offset[%d]", err, splitNum, i*splitNum)
 			}
 		}

internal/servants/web/events.go

@@ -14,6 +14,7 @@ import (
 	"github.com/rocboss/paopao-ce/internal/events"
 	"github.com/rocboss/paopao-ce/internal/model/joint"
 	"github.com/rocboss/paopao-ce/internal/model/web"
+	"github.com/sirupsen/logrus"
 )
 
 type cacheUnreadMsgEvent struct {
@@ -30,6 +31,12 @@ type createMessageEvent struct {
 	message *ms.Message
 }
 
+type createTweetEvent struct {
+	event.UnimplementedEvent
+	tweet *ms.Post
+	ac    core.AppCache
+}
+
 func onCacheUnreadMsgEvent(uid int64) {
 	events.OnEvent(&cacheUnreadMsgEvent{
 		ds:  _ds,
@@ -46,6 +53,13 @@ func onCreateMessageEvent(data *ms.Message) {
 	})
 }
 
+func onCreateTweetEvent(tweet *ms.Post) {
+	events.OnEvent(&createTweetEvent{
+		ac:    _ac,
+		tweet: tweet,
+	})
+}
+
 func (e *cacheUnreadMsgEvent) Name() string {
 	return "cacheUnreadMsgEvent"
 }
@@ -86,3 +100,13 @@ func (e *createMessageEvent) Action() (err error) {
 	}
 	return
 }
+
+func (e *createTweetEvent) Name() string {
+	return "createTweetEvent"
+}
+
+func (e *createTweetEvent) Action() (err error) {
+	// TODO: 过期缓存，重新计算rank等
+	logrus.Debug("createTweetEvent post action running")
+	return
+}

internal/servants/web/loose.go

@@ -62,6 +62,8 @@ func (s *looseSrv) Timeline(req *web.TimelineReq) (*web.TimelineResp, mir.Error)
 		logrus.Errorf("Ds.RevampPosts err: %s", err)
 		return nil, web.ErrGetPostsFailed
 	}
+	// TODO: 暂时处理，需要去掉这个步骤
+	visbleTansform(posts)
 	resp := joint.PageRespFrom(posts, req.Page, req.PageSize, res.Total)
 	return &web.TimelineResp{
 		CachePageResp: joint.CachePageResp{
@@ -90,9 +92,9 @@ func (s *looseSrv) getIndexTweets(req *web.TimelineReq, limit int, offset int) (
 			return nil, web.ErrGetPostsNilUser
 		}
 	case web.StyleTweetsNewest:
-		posts, total, xerr = s.Ds.ListIndexTweets(cs.StyleIndexTweetsNewest, limit, offset)
+		posts, total, xerr = s.Ds.ListIndexNewestTweets(limit, offset)
 	case web.StyleTweetsHots:
-		posts, total, xerr = s.Ds.ListIndexTweets(cs.StyleIndexTweetsHots, limit, offset)
+		posts, total, xerr = s.Ds.ListIndexHotsTweets(limit, offset)
 	default:
 		return nil, web.ErrGetPostsUnknowStyle
 	}
@@ -105,6 +107,8 @@ func (s *looseSrv) getIndexTweets(req *web.TimelineReq, limit int, offset int) (
 		logrus.Errorf("getIndexTweets in merge posts occurs error: %s", verr)
 		return nil, web.ErrGetPostFailed
 	}
+	// TODO: 暂时处理，需要去掉这个步骤
+	visbleTansform(postsFormated)
 	resp := joint.PageRespFrom(postsFormated, req.Page, req.PageSize, total)
 	// 缓存处理
 	base.OnCacheRespEvent(s.ac, key, resp, s.idxTweetsExpire)
@@ -203,6 +207,8 @@ func (s *looseSrv) getUserStarTweets(req *web.GetUserTweetsReq, user *cs.VistUse
 		logrus.Errorf("Ds.MergePosts err: %s", err)
 		return nil, web.ErrGetStarsFailed
 	}
+	// TODO: 暂时处理，需要去掉这个步骤
+	visbleTansform(postsFormated)
 	resp := joint.PageRespFrom(postsFormated, req.Page, req.PageSize, totalRows)
 	return &web.GetUserTweetsResp{
 		CachePageResp: joint.CachePageResp{
@@ -234,6 +240,8 @@ func (s *looseSrv) listUserTweets(req *web.GetUserTweetsReq, user *cs.VistUser)
 		logrus.Errorf("s.listUserTweets err: %s", err)
 		return nil, web.ErrGetPostsFailed
 	}
+	// TODO: 暂时处理，需要去掉这个步骤
+	visbleTansform(postFormated)
 	resp := joint.PageRespFrom(postFormated, req.Page, req.PageSize, total)
 	return &web.GetUserTweetsResp{
 		CachePageResp: joint.CachePageResp{
@@ -268,6 +276,8 @@ func (s *looseSrv) getUserPostTweets(req *web.GetUserTweetsReq, user *cs.VistUse
 		logrus.Errorf("s.GetTweetList error[2]: %s", err)
 		return nil, web.ErrGetPostsFailed
 	}
+	// TODO: 暂时处理，需要去掉这个步骤
+	visbleTansform(postsFormated)
 	resp := joint.PageRespFrom(postsFormated, req.Page, req.PageSize, total)
 	return &web.GetUserTweetsResp{
 		CachePageResp: joint.CachePageResp{
@@ -436,10 +446,15 @@ func (s *looseSrv) TweetComments(req *web.TweetCommentsReq) (*web.TweetCommentsR
 }
 
 func newLooseSrv(s *base.DaoServant, ac core.AppCache) api.Loose {
+	cs := conf.CacheSetting
 	return &looseSrv{
-		DaoServant:       s,
+		DaoServant:               s,
-		ac:               ac,
+		ac:                       ac,
-		userTweetsExpire: conf.CacheSetting.UserTweetsExpire,
+		userTweetsExpire:         cs.UserTweetsExpire,
-		prefixUserTweets: conf.PrefixUserTweets,
+		idxTweetsExpire:          cs.IndexTweetsExpire,
+		prefixUserTweets:         conf.PrefixUserTweets,
+		prefixIdxTweetsNewest:    conf.PrefixIdxTweetsNewest,
+		prefixIdxTweetsHots:      conf.PrefixIdxTweetsHots,
+		prefixIdxTweetsFollowing: conf.PrefixIdxTweetsFollowing,
 	}
 }

internal/servants/web/priv.go

@@ -249,7 +249,7 @@ func (s *privSrv) CreateTweet(req *web.CreateTweetReq) (_ *web.CreateTweetResp,
 		IP:              req.ClientIP,
 		IPLoc:           utils.GetIPLoc(req.ClientIP),
 		AttachmentPrice: req.AttachmentPrice,
-		Visibility:      req.Visibility,
+		Visibility:      ms.PostVisibleT(req.Visibility.ToVisibleValue()),
 	}
 	post, err = s.Ds.CreatePost(post)
 	if err != nil {
@@ -309,6 +309,8 @@ func (s *privSrv) CreateTweet(req *web.CreateTweetReq) (_ *web.CreateTweetResp,
 		logrus.Infof("Ds.RevampPosts err: %s", err)
 		return nil, web.ErrCreatePostFailed
 	}
+	// 发推后处理
+	onCreateTweetEvent(post)
 	return (*web.CreateTweetResp)(formatedPosts[0]), nil
 }
 
@@ -598,7 +600,7 @@ func (s *privSrv) StarTweet(req *web.StarTweetReq) (*web.StarTweetResp, mir.Erro
 }
 
 func (s *privSrv) VisibleTweet(req *web.VisibleTweetReq) (*web.VisibleTweetResp, mir.Error) {
-	if req.Visibility >= core.PostVisitInvalid {
+	if req.Visibility >= web.TweetVisitInvalid {
 		return nil, xerror.InvalidParams
 	}
 	post, err := s.Ds.GetPostByID(req.ID)
@@ -608,13 +610,13 @@ func (s *privSrv) VisibleTweet(req *web.VisibleTweetReq) (*web.VisibleTweetResp,
 	if xerr := checkPermision(req.User, post.UserID); xerr != nil {
 		return nil, xerr
 	}
-	if err = s.Ds.VisiblePost(post, req.Visibility); err != nil {
+	if err = s.Ds.VisiblePost(post, req.Visibility.ToVisibleValue()); err != nil {
 		logrus.Warnf("s.Ds.VisiblePost: %s", err)
 		return nil, web.ErrVisblePostFailed
 	}
 
 	// 推送Search
-	post.Visibility = req.Visibility
+	post.Visibility = ms.PostVisibleT(req.Visibility.ToVisibleValue())
 	s.PushPostToSearch(post)
 
 	return &web.VisibleTweetResp{

internal/servants/web/pub.go

@@ -65,6 +65,8 @@ func (s *pubSrv) TweetDetail(req *web.TweetDetailReq) (*web.TweetDetailResp, mir
 			postFormated.Contents = append(postFormated.Contents, content.Format())
 		}
 	}
+	// TODO: 暂时处理办法，后续需要优化去掉这个步骤
+	postFormated.Visibility = ms.PostVisibleT(postFormated.Visibility.ToOutValue())
 	return (*web.TweetDetailResp)(postFormated), nil
 }
 

internal/servants/web/utils.go

@@ -207,3 +207,10 @@ func checkPermision(user *ms.User, targetUserId int64) mir.Error {
 	}
 	return nil
 }
+
+// visbleTansform 可见性等价转换，暂时处理方式，后续需要去掉这个步骤
+func visbleTansform(list []*ms.PostFormated) {
+	for _, post := range list {
+		post.Visibility = ms.PostVisibleT(post.Visibility.ToOutValue())
+	}
+}

web/dist/assets/404-d844c63e.js

@@ -1 +1 @@
-import{_ as s}from"./main-nav.vue_vue_type_style_index_0_lang-31fef671.js";import{u as i}from"./vue-router-e5a2430e.js";import{F as a,e as c,a2 as u}from"./naive-ui-d8de3dda.js";import{d as l,f as d,k as t,w as o,e as f,A as x}from"./@vue-a481fc63.js";import{_ as g}from"./index-fcb35ad4.js";import"./vuex-44de225f.js";import"./vooks-6d99783e.js";import"./evtd-b614532e.js";import"./@vicons-7a4ef312.js";import"./seemly-76b7b838.js";import"./vueuc-39372edb.js";import"./@css-render-7124a1a5.js";import"./vdirs-b0483831.js";import"./@juggle-41516555.js";import"./css-render-6a5c5852.js";import"./@emotion-8a8e73f6.js";import"./lodash-es-8412e618.js";import"./treemate-25c27bff.js";import"./async-validator-dee29e8b.js";import"./date-fns-975a2d8f.js";import"./axios-4a70c6fc.js";import"./moment-2ab8298d.js";/* empty css               */const v=l({__name:"404",setup(h){const e=i(),_=()=>{e.push({path:"/"})};return(k,w)=>{const n=s,p=c,r=u,m=a;return f(),d("div",null,[t(n,{title:"404"}),t(m,{class:"main-content-wrap wrap404",bordered:""},{default:o(()=>[t(r,{status:"404",title:"404 资源不存在",description:"再看看其他的吧"},{footer:o(()=>[t(p,{onClick:_},{default:o(()=>[x("回主页")]),_:1})]),_:1})]),_:1})])}}});const O=g(v,[["__scopeId","data-v-e62daa85"]]);export{O as default};
+import{_ as s}from"./main-nav.vue_vue_type_style_index_0_lang-0888b762.js";import{u as i}from"./vue-router-e5a2430e.js";import{F as a,e as c,a2 as u}from"./naive-ui-d8de3dda.js";import{d as l,f as d,k as t,w as o,e as f,A as x}from"./@vue-a481fc63.js";import{_ as g}from"./index-5faa66a7.js";import"./vuex-44de225f.js";import"./vooks-6d99783e.js";import"./evtd-b614532e.js";import"./@vicons-7a4ef312.js";import"./seemly-76b7b838.js";import"./vueuc-39372edb.js";import"./@css-render-7124a1a5.js";import"./vdirs-b0483831.js";import"./@juggle-41516555.js";import"./css-render-6a5c5852.js";import"./@emotion-8a8e73f6.js";import"./lodash-es-8412e618.js";import"./treemate-25c27bff.js";import"./async-validator-dee29e8b.js";import"./date-fns-975a2d8f.js";import"./axios-4a70c6fc.js";import"./moment-2ab8298d.js";/* empty css               */const v=l({__name:"404",setup(h){const e=i(),_=()=>{e.push({path:"/"})};return(k,w)=>{const n=s,p=c,r=u,m=a;return f(),d("div",null,[t(n,{title:"404"}),t(m,{class:"main-content-wrap wrap404",bordered:""},{default:o(()=>[t(r,{status:"404",title:"404 资源不存在",description:"再看看其他的吧"},{footer:o(()=>[t(p,{onClick:_},{default:o(()=>[x("回主页")]),_:1})]),_:1})]),_:1})])}}});const O=g(v,[["__scopeId","data-v-e62daa85"]]);export{O as default};

web/dist/assets/Anouncement-9133d100.js

@@ -1 +1 @@
-import{_ as F}from"./post-skeleton-f060289d.js";import{_ as N}from"./main-nav.vue_vue_type_style_index_0_lang-31fef671.js";import{u as z}from"./vuex-44de225f.js";import{b as A}from"./vue-router-e5a2430e.js";import{E as R,_ as S}from"./index-fcb35ad4.js";import{F as V,Q as q,I as E,G as I}from"./naive-ui-d8de3dda.js";import{d as P,H as n,b as j,f as o,k as a,w as p,e as t,bf as u,Y as l,F as D,u as G,q as H,j as s,x as _,l as L}from"./@vue-a481fc63.js";import"./vooks-6d99783e.js";import"./evtd-b614532e.js";import"./@vicons-7a4ef312.js";import"./axios-4a70c6fc.js";import"./moment-2ab8298d.js";/* empty css               */import"./seemly-76b7b838.js";import"./vueuc-39372edb.js";import"./@css-render-7124a1a5.js";import"./vdirs-b0483831.js";import"./@juggle-41516555.js";import"./css-render-6a5c5852.js";import"./@emotion-8a8e73f6.js";import"./lodash-es-8412e618.js";import"./treemate-25c27bff.js";import"./async-validator-dee29e8b.js";import"./date-fns-975a2d8f.js";const M={key:0,class:"pagination-wrap"},O={key:0,class:"skeleton-wrap"},Q={key:1},T={key:0,class:"empty-wrap"},U={class:"bill-line"},Y=P({__name:"Anouncement",setup($){const d=z(),g=A(),v=n(!1),i=n([]),r=n(+g.query.p||1),f=n(20),c=n(0),h=m=>{r.value=m};return j(()=>{}),(m,J)=>{const k=N,y=q,x=F,w=E,B=I,C=V;return t(),o("div",null,[a(k,{title:"公告"}),a(C,{class:"main-content-wrap",bordered:""},{footer:p(()=>[c.value>1?(t(),o("div",M,[a(y,{page:r.value,"onUpdate:page":h,"page-slot":u(d).state.collapsedRight?5:8,"page-count":c.value},null,8,["page","page-slot","page-count"])])):l("",!0)]),default:p(()=>[v.value?(t(),o("div",O,[a(x,{num:f.value},null,8,["num"])])):(t(),o("div",Q,[i.value.length===0?(t(),o("div",T,[a(w,{size:"large",description:"暂无数据"})])):l("",!0),(t(!0),o(D,null,G(i.value,e=>(t(),H(B,{key:e.id},{default:p(()=>[s("div",U,[s("div",null,"NO."+_(e.id),1),s("div",null,_(e.reason),1),s("div",{class:L({income:e.change_amount>=0,out:e.change_amount<0})},_((e.change_amount>0?"+":"")+(e.change_amount/100).toFixed(2)),3),s("div",null,_(u(R)(e.created_on)),1)])]),_:2},1024))),128))]))]),_:1})])}}});const ke=S(Y,[["__scopeId","data-v-d4d04859"]]);export{ke as default};
+import{_ as F}from"./post-skeleton-47a1ebec.js";import{_ as N}from"./main-nav.vue_vue_type_style_index_0_lang-0888b762.js";import{u as z}from"./vuex-44de225f.js";import{b as A}from"./vue-router-e5a2430e.js";import{E as R,_ as S}from"./index-5faa66a7.js";import{F as V,Q as q,I as E,G as I}from"./naive-ui-d8de3dda.js";import{d as P,H as n,b as j,f as o,k as a,w as p,e as t,bf as u,Y as l,F as D,u as G,q as H,j as s,x as _,l as L}from"./@vue-a481fc63.js";import"./vooks-6d99783e.js";import"./evtd-b614532e.js";import"./@vicons-7a4ef312.js";import"./axios-4a70c6fc.js";import"./moment-2ab8298d.js";/* empty css               */import"./seemly-76b7b838.js";import"./vueuc-39372edb.js";import"./@css-render-7124a1a5.js";import"./vdirs-b0483831.js";import"./@juggle-41516555.js";import"./css-render-6a5c5852.js";import"./@emotion-8a8e73f6.js";import"./lodash-es-8412e618.js";import"./treemate-25c27bff.js";import"./async-validator-dee29e8b.js";import"./date-fns-975a2d8f.js";const M={key:0,class:"pagination-wrap"},O={key:0,class:"skeleton-wrap"},Q={key:1},T={key:0,class:"empty-wrap"},U={class:"bill-line"},Y=P({__name:"Anouncement",setup($){const d=z(),g=A(),v=n(!1),i=n([]),r=n(+g.query.p||1),f=n(20),c=n(0),h=m=>{r.value=m};return j(()=>{}),(m,J)=>{const k=N,y=q,x=F,w=E,B=I,C=V;return t(),o("div",null,[a(k,{title:"公告"}),a(C,{class:"main-content-wrap",bordered:""},{footer:p(()=>[c.value>1?(t(),o("div",M,[a(y,{page:r.value,"onUpdate:page":h,"page-slot":u(d).state.collapsedRight?5:8,"page-count":c.value},null,8,["page","page-slot","page-count"])])):l("",!0)]),default:p(()=>[v.value?(t(),o("div",O,[a(x,{num:f.value},null,8,["num"])])):(t(),o("div",Q,[i.value.length===0?(t(),o("div",T,[a(w,{size:"large",description:"暂无数据"})])):l("",!0),(t(!0),o(D,null,G(i.value,e=>(t(),H(B,{key:e.id},{default:p(()=>[s("div",U,[s("div",null,"NO."+_(e.id),1),s("div",null,_(e.reason),1),s("div",{class:L({income:e.change_amount>=0,out:e.change_amount<0})},_((e.change_amount>0?"+":"")+(e.change_amount/100).toFixed(2)),3),s("div",null,_(u(R)(e.created_on)),1)])]),_:2},1024))),128))]))]),_:1})])}}});const ke=S(Y,[["__scopeId","data-v-d4d04859"]]);export{ke as default};

web/dist/assets/Collection-2ba2fc81.js

@@ -1 +1 @@
-import{_ as I}from"./whisper-150920d0.js";import{_ as N,a as Q}from"./post-item.vue_vue_type_style_index_0_lang-cfdf25e9.js";import{_ as V}from"./post-skeleton-f060289d.js";import{_ as W}from"./main-nav.vue_vue_type_style_index_0_lang-31fef671.js";import{u as E}from"./vuex-44de225f.js";import{b as G}from"./vue-router-e5a2430e.js";import{Q as H,_ as L}from"./index-fcb35ad4.js";import{d as T,H as s,b as U,f as o,k as n,w as u,bf as h,Y as w,e,F as k,u as y,q as C}from"./@vue-a481fc63.js";import{F as Y,Q as j,I as A,G as D}from"./naive-ui-d8de3dda.js";import"./content-d73d8961.js";import"./@vicons-7a4ef312.js";import"./paopao-video-player-2fe58954.js";import"./copy-to-clipboard-4ef7d3eb.js";import"./@babel-725317a4.js";import"./toggle-selection-93f4ad84.js";import"./vooks-6d99783e.js";import"./evtd-b614532e.js";import"./axios-4a70c6fc.js";import"./moment-2ab8298d.js";/* empty css               */import"./seemly-76b7b838.js";import"./vueuc-39372edb.js";import"./@css-render-7124a1a5.js";import"./vdirs-b0483831.js";import"./@juggle-41516555.js";import"./css-render-6a5c5852.js";import"./@emotion-8a8e73f6.js";import"./lodash-es-8412e618.js";import"./treemate-25c27bff.js";import"./async-validator-dee29e8b.js";import"./date-fns-975a2d8f.js";const J={key:0,class:"skeleton-wrap"},K={key:1},O={key:0,class:"empty-wrap"},X={key:1},Z={key:2},ee={key:0,class:"pagination-wrap"},oe=T({__name:"Collection",setup(te){const m=E(),S=G(),_=s(!1),i=s([]),l=s(+S.query.p||1),p=s(20),r=s(0),c=s(!1),d=s({id:0,avatar:"",username:"",nickname:"",is_admin:!1,is_friend:!0,is_following:!1,created_on:0,follows:0,followings:0,status:1}),f=t=>{d.value=t,c.value=!0},b=()=>{c.value=!1},v=()=>{_.value=!0,H({page:l.value,page_size:p.value}).then(t=>{_.value=!1,i.value=t.list,r.value=Math.ceil(t.pager.total_rows/p.value),window.scrollTo(0,0)}).catch(t=>{_.value=!1})},x=t=>{l.value=t,v()};return U(()=>{v()}),(t,ne)=>{const $=W,z=V,B=A,F=N,g=D,M=Q,P=I,R=Y,q=j;return e(),o("div",null,[n($,{title:"收藏"}),n(R,{class:"main-content-wrap",bordered:""},{default:u(()=>[_.value?(e(),o("div",J,[n(z,{num:p.value},null,8,["num"])])):(e(),o("div",K,[i.value.length===0?(e(),o("div",O,[n(B,{size:"large",description:"暂无数据"})])):w("",!0),h(m).state.desktopModelShow?(e(),o("div",X,[(e(!0),o(k,null,y(i.value,a=>(e(),C(g,{key:a.id},{default:u(()=>[n(F,{post:a,onSendWhisper:f},null,8,["post"])]),_:2},1024))),128))])):(e(),o("div",Z,[(e(!0),o(k,null,y(i.value,a=>(e(),C(g,{key:a.id},{default:u(()=>[n(M,{post:a,onSendWhisper:f},null,8,["post"])]),_:2},1024))),128))]))])),n(P,{show:c.value,user:d.value,onSuccess:b},null,8,["show","user"])]),_:1}),r.value>0?(e(),o("div",ee,[n(q,{page:l.value,"onUpdate:page":x,"page-slot":h(m).state.collapsedRight?5:8,"page-count":r.value},null,8,["page","page-slot","page-count"])])):w("",!0)])}}});const Ne=L(oe,[["__scopeId","data-v-760779af"]]);export{Ne as default};
+import{_ as I}from"./whisper-d959da10.js";import{_ as N,a as Q}from"./post-item.vue_vue_type_style_index_0_lang-d5631a43.js";import{_ as V}from"./post-skeleton-47a1ebec.js";import{_ as W}from"./main-nav.vue_vue_type_style_index_0_lang-0888b762.js";import{u as E}from"./vuex-44de225f.js";import{b as G}from"./vue-router-e5a2430e.js";import{Q as H,_ as L}from"./index-5faa66a7.js";import{d as T,H as s,b as U,f as o,k as n,w as u,bf as h,Y as w,e,F as k,u as y,q as C}from"./@vue-a481fc63.js";import{F as Y,Q as j,I as A,G as D}from"./naive-ui-d8de3dda.js";import"./content-2d41ca0a.js";import"./@vicons-7a4ef312.js";import"./paopao-video-player-2fe58954.js";import"./copy-to-clipboard-4ef7d3eb.js";import"./@babel-725317a4.js";import"./toggle-selection-93f4ad84.js";import"./vooks-6d99783e.js";import"./evtd-b614532e.js";import"./axios-4a70c6fc.js";import"./moment-2ab8298d.js";/* empty css               */import"./seemly-76b7b838.js";import"./vueuc-39372edb.js";import"./@css-render-7124a1a5.js";import"./vdirs-b0483831.js";import"./@juggle-41516555.js";import"./css-render-6a5c5852.js";import"./@emotion-8a8e73f6.js";import"./lodash-es-8412e618.js";import"./treemate-25c27bff.js";import"./async-validator-dee29e8b.js";import"./date-fns-975a2d8f.js";const J={key:0,class:"skeleton-wrap"},K={key:1},O={key:0,class:"empty-wrap"},X={key:1},Z={key:2},ee={key:0,class:"pagination-wrap"},oe=T({__name:"Collection",setup(te){const m=E(),S=G(),_=s(!1),i=s([]),l=s(+S.query.p||1),p=s(20),r=s(0),c=s(!1),d=s({id:0,avatar:"",username:"",nickname:"",is_admin:!1,is_friend:!0,is_following:!1,created_on:0,follows:0,followings:0,status:1}),f=t=>{d.value=t,c.value=!0},b=()=>{c.value=!1},v=()=>{_.value=!0,H({page:l.value,page_size:p.value}).then(t=>{_.value=!1,i.value=t.list,r.value=Math.ceil(t.pager.total_rows/p.value),window.scrollTo(0,0)}).catch(t=>{_.value=!1})},x=t=>{l.value=t,v()};return U(()=>{v()}),(t,ne)=>{const $=W,z=V,B=A,F=N,g=D,M=Q,P=I,R=Y,q=j;return e(),o("div",null,[n($,{title:"收藏"}),n(R,{class:"main-content-wrap",bordered:""},{default:u(()=>[_.value?(e(),o("div",J,[n(z,{num:p.value},null,8,["num"])])):(e(),o("div",K,[i.value.length===0?(e(),o("div",O,[n(B,{size:"large",description:"暂无数据"})])):w("",!0),h(m).state.desktopModelShow?(e(),o("div",X,[(e(!0),o(k,null,y(i.value,a=>(e(),C(g,{key:a.id},{default:u(()=>[n(F,{post:a,onSendWhisper:f},null,8,["post"])]),_:2},1024))),128))])):(e(),o("div",Z,[(e(!0),o(k,null,y(i.value,a=>(e(),C(g,{key:a.id},{default:u(()=>[n(M,{post:a,onSendWhisper:f},null,8,["post"])]),_:2},1024))),128))]))])),n(P,{show:c.value,user:d.value,onSuccess:b},null,8,["show","user"])]),_:1}),r.value>0?(e(),o("div",ee,[n(q,{page:l.value,"onUpdate:page":x,"page-slot":h(m).state.collapsedRight?5:8,"page-count":r.value},null,8,["page","page-slot","page-count"])])):w("",!0)])}}});const Ne=L(oe,[["__scopeId","data-v-760779af"]]);export{Ne as default};

web/dist/assets/Contacts-e25841ce.js

@@ -1 +1 @@
-import{_ as T}from"./whisper-150920d0.js";import{d as F,c as j,r as A,e as s,f as c,k as t,w as n,j as i,y as H,A as L,x as v,bf as g,h as I,H as a,b as U,Y as S,F as z,u as W,q as E}from"./@vue-a481fc63.js";import{F as G,_ as N,b as Q}from"./index-fcb35ad4.js";import{i as Y,p as J}from"./@vicons-7a4ef312.js";import{j as x,o as K,e as X,O as Z,L as ee,F as te,Q as ne,I as oe,G as se}from"./naive-ui-d8de3dda.js";import{_ as ae}from"./post-skeleton-f060289d.js";import{_ as ce}from"./main-nav.vue_vue_type_style_index_0_lang-31fef671.js";import{u as ie}from"./vuex-44de225f.js";import{b as _e}from"./vue-router-e5a2430e.js";import"./axios-4a70c6fc.js";import"./moment-2ab8298d.js";/* empty css               */import"./seemly-76b7b838.js";import"./vueuc-39372edb.js";import"./evtd-b614532e.js";import"./@css-render-7124a1a5.js";import"./vooks-6d99783e.js";import"./vdirs-b0483831.js";import"./@juggle-41516555.js";import"./css-render-6a5c5852.js";import"./@emotion-8a8e73f6.js";import"./lodash-es-8412e618.js";import"./treemate-25c27bff.js";import"./async-validator-dee29e8b.js";import"./date-fns-975a2d8f.js";const re={class:"contact-item"},le={class:"nickname-wrap"},pe={class:"username-wrap"},ue={class:"user-info"},me={class:"info-item"},de={class:"info-item"},fe={class:"item-header-extra"},ve=F({__name:"contact-item",props:{contact:{}},emits:["send-whisper"],setup(C,{emit:h}){const _=C,r=e=>()=>I(x,null,{default:()=>I(e)}),l=j(()=>[{label:"私信",key:"whisper",icon:r(J)}]),u=e=>{switch(e){case"whisper":const o={id:_.contact.user_id,avatar:_.contact.avatar,username:_.contact.username,nickname:_.contact.nickname,is_admin:!1,is_friend:!0,is_following:!1,created_on:0,follows:0,followings:0,status:1};h("send-whisper",o);break}};return(e,o)=>{const m=K,d=A("router-link"),w=X,k=Z,y=ee;return s(),c("div",re,[t(y,{"content-indented":""},{avatar:n(()=>[t(m,{size:54,src:e.contact.avatar},null,8,["src"])]),header:n(()=>[i("span",le,[t(d,{onClick:o[0]||(o[0]=H(()=>{},["stop"])),class:"username-link",to:{name:"user",query:{s:e.contact.username}}},{default:n(()=>[L(v(e.contact.nickname),1)]),_:1},8,["to"])]),i("span",pe," @"+v(e.contact.username),1),i("div",ue,[i("span",me," UID. "+v(e.contact.user_id),1),i("span",de,v(g(G)(e.contact.created_on))+" 加入 ",1)])]),"header-extra":n(()=>[i("div",fe,[t(k,{placement:"bottom-end",trigger:"click",size:"small",options:l.value,onSelect:u},{default:n(()=>[t(w,{quaternary:"",circle:""},{icon:n(()=>[t(g(x),null,{default:n(()=>[t(g(Y))]),_:1})]),_:1})]),_:1},8,["options"])])]),_:1})])}}});const ge=N(ve,[["__scopeId","data-v-d62f19da"]]),he={key:0,class:"skeleton-wrap"},we={key:1},ke={key:0,class:"empty-wrap"},ye={key:0,class:"pagination-wrap"},Ce=F({__name:"Contacts",setup(C){const h=ie(),_=_e(),r=a(!1),l=a([]),u=a(+_.query.p||1),e=a(20),o=a(0),m=a(!1),d=a({id:0,avatar:"",username:"",nickname:"",is_admin:!1,is_friend:!0,is_following:!1,created_on:0,follows:0,followings:0,status:1}),w=p=>{d.value=p,m.value=!0},k=()=>{m.value=!1},y=p=>{u.value=p,$()};U(()=>{$()});const $=(p=!1)=>{l.value.length===0&&(r.value=!0),Q({page:u.value,page_size:e.value}).then(f=>{r.value=!1,l.value=f.list,o.value=Math.ceil(f.pager.total_rows/e.value),p&&setTimeout(()=>{window.scrollTo(0,99999)},50)}).catch(f=>{r.value=!1})};return(p,f)=>{const q=ce,B=ae,M=oe,P=ge,V=se,D=T,O=te,R=ne;return s(),c(z,null,[i("div",null,[t(q,{title:"好友"}),t(O,{class:"main-content-wrap",bordered:""},{default:n(()=>[r.value?(s(),c("div",he,[t(B,{num:e.value},null,8,["num"])])):(s(),c("div",we,[l.value.length===0?(s(),c("div",ke,[t(M,{size:"large",description:"暂无数据"})])):S("",!0),(s(!0),c(z,null,W(l.value,b=>(s(),E(V,{class:"list-item",key:b.user_id},{default:n(()=>[t(P,{contact:b,onSendWhisper:w},null,8,["contact"])]),_:2},1024))),128))])),t(D,{show:m.value,user:d.value,onSuccess:k},null,8,["show","user"])]),_:1})]),o.value>0?(s(),c("div",ye,[t(R,{page:u.value,"onUpdate:page":y,"page-slot":g(h).state.collapsedRight?5:8,"page-count":o.value},null,8,["page","page-slot","page-count"])])):S("",!0)],64)}}});const Qe=N(Ce,[["__scopeId","data-v-e20fef94"]]);export{Qe as default};
+import{_ as T}from"./whisper-d959da10.js";import{d as F,c as j,r as A,e as s,f as c,k as t,w as n,j as i,y as H,A as L,x as v,bf as g,h as I,H as a,b as U,Y as S,F as z,u as W,q as E}from"./@vue-a481fc63.js";import{F as G,_ as N,b as Q}from"./index-5faa66a7.js";import{i as Y,p as J}from"./@vicons-7a4ef312.js";import{j as x,o as K,e as X,O as Z,L as ee,F as te,Q as ne,I as oe,G as se}from"./naive-ui-d8de3dda.js";import{_ as ae}from"./post-skeleton-47a1ebec.js";import{_ as ce}from"./main-nav.vue_vue_type_style_index_0_lang-0888b762.js";import{u as ie}from"./vuex-44de225f.js";import{b as _e}from"./vue-router-e5a2430e.js";import"./axios-4a70c6fc.js";import"./moment-2ab8298d.js";/* empty css               */import"./seemly-76b7b838.js";import"./vueuc-39372edb.js";import"./evtd-b614532e.js";import"./@css-render-7124a1a5.js";import"./vooks-6d99783e.js";import"./vdirs-b0483831.js";import"./@juggle-41516555.js";import"./css-render-6a5c5852.js";import"./@emotion-8a8e73f6.js";import"./lodash-es-8412e618.js";import"./treemate-25c27bff.js";import"./async-validator-dee29e8b.js";import"./date-fns-975a2d8f.js";const re={class:"contact-item"},le={class:"nickname-wrap"},pe={class:"username-wrap"},ue={class:"user-info"},me={class:"info-item"},de={class:"info-item"},fe={class:"item-header-extra"},ve=F({__name:"contact-item",props:{contact:{}},emits:["send-whisper"],setup(C,{emit:h}){const _=C,r=e=>()=>I(x,null,{default:()=>I(e)}),l=j(()=>[{label:"私信",key:"whisper",icon:r(J)}]),u=e=>{switch(e){case"whisper":const o={id:_.contact.user_id,avatar:_.contact.avatar,username:_.contact.username,nickname:_.contact.nickname,is_admin:!1,is_friend:!0,is_following:!1,created_on:0,follows:0,followings:0,status:1};h("send-whisper",o);break}};return(e,o)=>{const m=K,d=A("router-link"),w=X,k=Z,y=ee;return s(),c("div",re,[t(y,{"content-indented":""},{avatar:n(()=>[t(m,{size:54,src:e.contact.avatar},null,8,["src"])]),header:n(()=>[i("span",le,[t(d,{onClick:o[0]||(o[0]=H(()=>{},["stop"])),class:"username-link",to:{name:"user",query:{s:e.contact.username}}},{default:n(()=>[L(v(e.contact.nickname),1)]),_:1},8,["to"])]),i("span",pe," @"+v(e.contact.username),1),i("div",ue,[i("span",me," UID. "+v(e.contact.user_id),1),i("span",de,v(g(G)(e.contact.created_on))+" 加入 ",1)])]),"header-extra":n(()=>[i("div",fe,[t(k,{placement:"bottom-end",trigger:"click",size:"small",options:l.value,onSelect:u},{default:n(()=>[t(w,{quaternary:"",circle:""},{icon:n(()=>[t(g(x),null,{default:n(()=>[t(g(Y))]),_:1})]),_:1})]),_:1},8,["options"])])]),_:1})])}}});const ge=N(ve,[["__scopeId","data-v-d62f19da"]]),he={key:0,class:"skeleton-wrap"},we={key:1},ke={key:0,class:"empty-wrap"},ye={key:0,class:"pagination-wrap"},Ce=F({__name:"Contacts",setup(C){const h=ie(),_=_e(),r=a(!1),l=a([]),u=a(+_.query.p||1),e=a(20),o=a(0),m=a(!1),d=a({id:0,avatar:"",username:"",nickname:"",is_admin:!1,is_friend:!0,is_following:!1,created_on:0,follows:0,followings:0,status:1}),w=p=>{d.value=p,m.value=!0},k=()=>{m.value=!1},y=p=>{u.value=p,$()};U(()=>{$()});const $=(p=!1)=>{l.value.length===0&&(r.value=!0),Q({page:u.value,page_size:e.value}).then(f=>{r.value=!1,l.value=f.list,o.value=Math.ceil(f.pager.total_rows/e.value),p&&setTimeout(()=>{window.scrollTo(0,99999)},50)}).catch(f=>{r.value=!1})};return(p,f)=>{const q=ce,B=ae,M=oe,P=ge,V=se,D=T,O=te,R=ne;return s(),c(z,null,[i("div",null,[t(q,{title:"好友"}),t(O,{class:"main-content-wrap",bordered:""},{default:n(()=>[r.value?(s(),c("div",he,[t(B,{num:e.value},null,8,["num"])])):(s(),c("div",we,[l.value.length===0?(s(),c("div",ke,[t(M,{size:"large",description:"暂无数据"})])):S("",!0),(s(!0),c(z,null,W(l.value,b=>(s(),E(V,{class:"list-item",key:b.user_id},{default:n(()=>[t(P,{contact:b,onSendWhisper:w},null,8,["contact"])]),_:2},1024))),128))])),t(D,{show:m.value,user:d.value,onSuccess:k},null,8,["show","user"])]),_:1})]),o.value>0?(s(),c("div",ye,[t(R,{page:u.value,"onUpdate:page":y,"page-slot":g(h).state.collapsedRight?5:8,"page-count":o.value},null,8,["page","page-slot","page-count"])])):S("",!0)],64)}}});const Qe=N(Ce,[["__scopeId","data-v-e20fef94"]]);export{Qe as default};

web/dist/assets/Home-2a6423f9.css

@@ -1 +1 @@
-.compose-wrap{width:100%;padding:16px;box-sizing:border-box}.compose-wrap .compose-line{display:flex;flex-direction:row}.compose-wrap .compose-line .compose-user{width:42px;height:42px;display:flex;align-items:center}.compose-wrap .compose-line.compose-options{margin-top:6px;padding-left:42px;display:flex;justify-content:space-between}.compose-wrap .compose-line.compose-options .submit-wrap{display:flex;align-items:center}.compose-wrap .compose-line.compose-options .submit-wrap .text-statistic{margin-right:8px;width:20px;height:20px;transform:rotate(180deg)}.compose-wrap .link-wrap{margin-left:42px;margin-right:42px}.compose-wrap .eye-wrap{margin-left:64px}.compose-wrap .login-only-wrap{display:flex;justify-content:center;width:100%}.compose-wrap .login-only-wrap button{margin:0 4px;width:50%}.compose-wrap .login-wrap{display:flex;justify-content:center;width:100%}.compose-wrap .login-wrap .login-banner{margin-bottom:12px;opacity:.8}.compose-wrap .login-wrap button{margin:0 4px}.attachment-list-wrap{margin-top:12px;margin-left:42px}.attachment-list-wrap .n-upload-file-info__thumbnail{overflow:hidden}.dark .compose-wrap{background-color:#101014bf}.tiny-slide-bar .tiny-slide-bar__list>div.tiny-slide-bar__select .slide-bar-item .slide-bar-item-title[data-v-1066affe]{color:#18a058;opacity:.8}.tiny-slide-bar .tiny-slide-bar__list>div:hover .slide-bar-item[data-v-1066affe]{cursor:pointer}.tiny-slide-bar .tiny-slide-bar__list>div:hover .slide-bar-item .slide-bar-item-avatar[data-v-1066affe]{color:#18a058;opacity:.8}.tiny-slide-bar .tiny-slide-bar__list>div:hover .slide-bar-item .slide-bar-item-title[data-v-1066affe]{color:#18a058;opacity:.8}.tiny-slide-bar[data-v-1066affe]{margin-top:-30px;margin-bottom:-30px}.tiny-slide-bar .slide-bar-item[data-v-1066affe]{min-height:170px;width:64px;display:flex;flex-direction:column;justify-content:center;align-items:center;margin-top:8px}.tiny-slide-bar .slide-bar-item .slide-bar-item-title[data-v-1066affe]{justify-content:center;font-size:12px;margin-top:4px;height:40px}.load-more[data-v-1066affe]{margin:20px}.load-more .load-more-wrap[data-v-1066affe]{display:flex;flex-direction:row;justify-content:center;align-items:center;gap:14px}.load-more .load-more-wrap .load-more-spinner[data-v-1066affe]{font-size:14px;opacity:.65}.dark .main-content-wrap[data-v-1066affe],.dark .pagination-wrap[data-v-1066affe],.dark .empty-wrap[data-v-1066affe],.dark .skeleton-wrap[data-v-1066affe]{background-color:#101014bf}.dark .tiny-slide-bar .tiny-slide-bar__list>div.tiny-slide-bar__select .slide-bar-item .slide-bar-item-title[data-v-1066affe]{color:#63e2b7;opacity:.8}.dark .tiny-slide-bar .tiny-slide-bar__list>div:hover .slide-bar-item .slide-bar-item-title[data-v-1066affe]{color:#63e2b7;opacity:.8}
+.compose-wrap{width:100%;padding:16px;box-sizing:border-box}.compose-wrap .compose-line{display:flex;flex-direction:row}.compose-wrap .compose-line .compose-user{width:42px;height:42px;display:flex;align-items:center}.compose-wrap .compose-line.compose-options{margin-top:6px;padding-left:42px;display:flex;justify-content:space-between}.compose-wrap .compose-line.compose-options .submit-wrap{display:flex;align-items:center}.compose-wrap .compose-line.compose-options .submit-wrap .text-statistic{margin-right:8px;width:20px;height:20px;transform:rotate(180deg)}.compose-wrap .link-wrap{margin-left:42px;margin-right:42px}.compose-wrap .eye-wrap{margin-left:64px}.compose-wrap .login-only-wrap{display:flex;justify-content:center;width:100%}.compose-wrap .login-only-wrap button{margin:0 4px;width:50%}.compose-wrap .login-wrap{display:flex;justify-content:center;width:100%}.compose-wrap .login-wrap .login-banner{margin-bottom:12px;opacity:.8}.compose-wrap .login-wrap button{margin:0 4px}.attachment-list-wrap{margin-top:12px;margin-left:42px}.attachment-list-wrap .n-upload-file-info__thumbnail{overflow:hidden}.dark .compose-wrap{background-color:#101014bf}.tiny-slide-bar .tiny-slide-bar__list>div.tiny-slide-bar__select .slide-bar-item .slide-bar-item-title[data-v-bae55427]{color:#18a058;opacity:.8}.tiny-slide-bar .tiny-slide-bar__list>div:hover .slide-bar-item[data-v-bae55427]{cursor:pointer}.tiny-slide-bar .tiny-slide-bar__list>div:hover .slide-bar-item .slide-bar-item-avatar[data-v-bae55427]{color:#18a058;opacity:.8}.tiny-slide-bar .tiny-slide-bar__list>div:hover .slide-bar-item .slide-bar-item-title[data-v-bae55427]{color:#18a058;opacity:.8}.tiny-slide-bar[data-v-bae55427]{margin-top:-30px;margin-bottom:-30px}.tiny-slide-bar .slide-bar-item[data-v-bae55427]{min-height:170px;width:64px;display:flex;flex-direction:column;justify-content:center;align-items:center;margin-top:8px}.tiny-slide-bar .slide-bar-item .slide-bar-item-title[data-v-bae55427]{justify-content:center;font-size:12px;margin-top:4px;height:40px}.load-more[data-v-bae55427]{margin:20px}.load-more .load-more-wrap[data-v-bae55427]{display:flex;flex-direction:row;justify-content:center;align-items:center;gap:14px}.load-more .load-more-wrap .load-more-spinner[data-v-bae55427]{font-size:14px;opacity:.65}.dark .main-content-wrap[data-v-bae55427],.dark .pagination-wrap[data-v-bae55427],.dark .empty-wrap[data-v-bae55427],.dark .skeleton-wrap[data-v-bae55427]{background-color:#101014bf}.dark .tiny-slide-bar .tiny-slide-bar__list>div.tiny-slide-bar__select .slide-bar-item .slide-bar-item-title[data-v-bae55427]{color:#63e2b7;opacity:.8}.dark .tiny-slide-bar .tiny-slide-bar__list>div:hover .slide-bar-item .slide-bar-item-title[data-v-bae55427]{color:#63e2b7;opacity:.8}

web/dist/assets/Topic-5e96d43f.js

@@ -1 +1 @@
-import{A as $,B as M,C as O,D as x,_ as z}from"./index-fcb35ad4.js";import{x as D}from"./@vicons-7a4ef312.js";import{d as F,H as i,c as A,b as q,r as U,e as c,f as _,k as n,w as s,q as b,A as B,x as f,Y as u,bf as h,E as j,al as H,F as Y,u as G}from"./@vue-a481fc63.js";import{o as J,M as C,j as K,e as P,O as Q,L as R,F as W,f as X,g as Z,a as ee,k as oe}from"./naive-ui-d8de3dda.js";import{_ as te}from"./main-nav.vue_vue_type_style_index_0_lang-31fef671.js";import{u as ne}from"./vuex-44de225f.js";import"./vue-router-e5a2430e.js";import"./axios-4a70c6fc.js";import"./moment-2ab8298d.js";/* empty css               */import"./seemly-76b7b838.js";import"./vueuc-39372edb.js";import"./evtd-b614532e.js";import"./@css-render-7124a1a5.js";import"./vooks-6d99783e.js";import"./vdirs-b0483831.js";import"./@juggle-41516555.js";import"./css-render-6a5c5852.js";import"./@emotion-8a8e73f6.js";import"./lodash-es-8412e618.js";import"./treemate-25c27bff.js";import"./async-validator-dee29e8b.js";import"./date-fns-975a2d8f.js";const se={key:0,class:"tag-item"},ae={key:0,class:"tag-quote"},ce={key:1,class:"tag-quote tag-follow"},le={key:0,class:"options"},ie=F({__name:"tag-item",props:{tag:{},showAction:{type:Boolean},checkFollowing:{type:Boolean}},setup(T){const t=T,r=i(!1),m=A(()=>{let e=[];return t.tag.is_following===0?e.push({label:"关注",key:"follow"}):(t.tag.is_top===0?e.push({label:"置顶",key:"stick"}):e.push({label:"取消置顶",key:"unstick"}),e.push({label:"取消关注",key:"unfollow"})),e}),l=e=>{switch(e){case"follow":O({topic_id:t.tag.id}).then(o=>{t.tag.is_following=1,window.$message.success("关注成功")}).catch(o=>{console.log(o)});break;case"unfollow":M({topic_id:t.tag.id}).then(o=>{t.tag.is_following=0,window.$message.success("取消关注")}).catch(o=>{console.log(o)});break;case"stick":$({topic_id:t.tag.id}).then(o=>{t.tag.is_top=o.top_status,window.$message.success("置顶成功")}).catch(o=>{console.log(o)});break;case"unstick":$({topic_id:t.tag.id}).then(o=>{t.tag.is_top=o.top_status,window.$message.success("取消置顶")}).catch(o=>{console.log(o)});break}};return q(()=>{r.value=!1}),(e,o)=>{const w=U("router-link"),g=J,k=C,a=K,d=P,v=Q,p=R;return!e.checkFollowing||e.checkFollowing&&e.tag.is_following===1?(c(),_("div",se,[n(p,null,{header:s(()=>[(c(),b(k,{type:"success",size:"large",round:"",key:e.tag.id},{avatar:s(()=>[n(g,{src:e.tag.user.avatar},null,8,["src"])]),default:s(()=>[n(w,{class:"hash-link",to:{name:"home",query:{q:e.tag.tag,t:"tag"}}},{default:s(()=>[B(" #"+f(e.tag.tag),1)]),_:1},8,["to"]),e.showAction?u("",!0):(c(),_("span",ae,"("+f(e.tag.quote_num)+")",1)),e.showAction?(c(),_("span",ce,"("+f(e.tag.quote_num)+")",1)):u("",!0)]),_:1}))]),"header-extra":s(()=>[e.showAction?(c(),_("div",le,[n(v,{placement:"bottom-end",trigger:"click",size:"small",options:m.value,onSelect:l},{default:s(()=>[n(d,{type:"success",quaternary:"",circle:"",block:""},{icon:s(()=>[n(a,null,{default:s(()=>[n(h(D))]),_:1})]),_:1})]),_:1},8,["options"])])):u("",!0)]),_:1})])):u("",!0)}}});const _e=F({__name:"Topic",setup(T){const t=ne(),r=i([]),m=i("hot"),l=i(!1),e=i(!1),o=i(!1);j(e,()=>{e.value||(window.$message.success("保存成功"),t.commit("refreshTopicFollow"))});const w=A({get:()=>{let a="编辑";return e.value&&(a="保存"),a},set:a=>{}}),g=()=>{l.value=!0,x({type:m.value,num:50}).then(a=>{r.value=a.topics,l.value=!1}).catch(a=>{console.log(a),l.value=!1})},k=a=>{m.value=a,a=="follow"?o.value=!0:o.value=!1,g()};return q(()=>{g()}),(a,d)=>{const v=te,p=X,L=C,V=Z,N=ie,S=ee,E=oe,I=W;return c(),_("div",null,[n(v,{title:"话题"}),n(I,{class:"main-content-wrap tags-wrap",bordered:""},{default:s(()=>[n(V,{type:"line",animated:"","onUpdate:value":k},H({default:s(()=>[n(p,{name:"hot",tab:"热门"}),n(p,{name:"new",tab:"最新"}),h(t).state.userLogined?(c(),b(p,{key:0,name:"follow",tab:"关注"})):u("",!0)]),_:2},[h(t).state.userLogined?{name:"suffix",fn:s(()=>[n(L,{checked:e.value,"onUpdate:checked":d[0]||(d[0]=y=>e.value=y),checkable:""},{default:s(()=>[B(f(w.value),1)]),_:1},8,["checked"])]),key:"0"}:void 0]),1024),n(E,{show:l.value},{default:s(()=>[n(S,null,{default:s(()=>[(c(!0),_(Y,null,G(r.value,y=>(c(),b(N,{tag:y,showAction:h(t).state.userLogined&&e.value,checkFollowing:o.value},null,8,["tag","showAction","checkFollowing"]))),256))]),_:1})]),_:1},8,["show"])]),_:1})])}}});const Se=z(_e,[["__scopeId","data-v-1fb31ecf"]]);export{Se as default};
+import{A as $,B as M,C as O,D as x,_ as z}from"./index-5faa66a7.js";import{x as D}from"./@vicons-7a4ef312.js";import{d as F,H as i,c as A,b as q,r as U,e as c,f as _,k as n,w as s,q as b,A as B,x as f,Y as u,bf as h,E as j,al as H,F as Y,u as G}from"./@vue-a481fc63.js";import{o as J,M as C,j as K,e as P,O as Q,L as R,F as W,f as X,g as Z,a as ee,k as oe}from"./naive-ui-d8de3dda.js";import{_ as te}from"./main-nav.vue_vue_type_style_index_0_lang-0888b762.js";import{u as ne}from"./vuex-44de225f.js";import"./vue-router-e5a2430e.js";import"./axios-4a70c6fc.js";import"./moment-2ab8298d.js";/* empty css               */import"./seemly-76b7b838.js";import"./vueuc-39372edb.js";import"./evtd-b614532e.js";import"./@css-render-7124a1a5.js";import"./vooks-6d99783e.js";import"./vdirs-b0483831.js";import"./@juggle-41516555.js";import"./css-render-6a5c5852.js";import"./@emotion-8a8e73f6.js";import"./lodash-es-8412e618.js";import"./treemate-25c27bff.js";import"./async-validator-dee29e8b.js";import"./date-fns-975a2d8f.js";const se={key:0,class:"tag-item"},ae={key:0,class:"tag-quote"},ce={key:1,class:"tag-quote tag-follow"},le={key:0,class:"options"},ie=F({__name:"tag-item",props:{tag:{},showAction:{type:Boolean},checkFollowing:{type:Boolean}},setup(T){const t=T,r=i(!1),m=A(()=>{let e=[];return t.tag.is_following===0?e.push({label:"关注",key:"follow"}):(t.tag.is_top===0?e.push({label:"置顶",key:"stick"}):e.push({label:"取消置顶",key:"unstick"}),e.push({label:"取消关注",key:"unfollow"})),e}),l=e=>{switch(e){case"follow":O({topic_id:t.tag.id}).then(o=>{t.tag.is_following=1,window.$message.success("关注成功")}).catch(o=>{console.log(o)});break;case"unfollow":M({topic_id:t.tag.id}).then(o=>{t.tag.is_following=0,window.$message.success("取消关注")}).catch(o=>{console.log(o)});break;case"stick":$({topic_id:t.tag.id}).then(o=>{t.tag.is_top=o.top_status,window.$message.success("置顶成功")}).catch(o=>{console.log(o)});break;case"unstick":$({topic_id:t.tag.id}).then(o=>{t.tag.is_top=o.top_status,window.$message.success("取消置顶")}).catch(o=>{console.log(o)});break}};return q(()=>{r.value=!1}),(e,o)=>{const w=U("router-link"),g=J,k=C,a=K,d=P,v=Q,p=R;return!e.checkFollowing||e.checkFollowing&&e.tag.is_following===1?(c(),_("div",se,[n(p,null,{header:s(()=>[(c(),b(k,{type:"success",size:"large",round:"",key:e.tag.id},{avatar:s(()=>[n(g,{src:e.tag.user.avatar},null,8,["src"])]),default:s(()=>[n(w,{class:"hash-link",to:{name:"home",query:{q:e.tag.tag,t:"tag"}}},{default:s(()=>[B(" #"+f(e.tag.tag),1)]),_:1},8,["to"]),e.showAction?u("",!0):(c(),_("span",ae,"("+f(e.tag.quote_num)+")",1)),e.showAction?(c(),_("span",ce,"("+f(e.tag.quote_num)+")",1)):u("",!0)]),_:1}))]),"header-extra":s(()=>[e.showAction?(c(),_("div",le,[n(v,{placement:"bottom-end",trigger:"click",size:"small",options:m.value,onSelect:l},{default:s(()=>[n(d,{type:"success",quaternary:"",circle:"",block:""},{icon:s(()=>[n(a,null,{default:s(()=>[n(h(D))]),_:1})]),_:1})]),_:1},8,["options"])])):u("",!0)]),_:1})])):u("",!0)}}});const _e=F({__name:"Topic",setup(T){const t=ne(),r=i([]),m=i("hot"),l=i(!1),e=i(!1),o=i(!1);j(e,()=>{e.value||(window.$message.success("保存成功"),t.commit("refreshTopicFollow"))});const w=A({get:()=>{let a="编辑";return e.value&&(a="保存"),a},set:a=>{}}),g=()=>{l.value=!0,x({type:m.value,num:50}).then(a=>{r.value=a.topics,l.value=!1}).catch(a=>{console.log(a),l.value=!1})},k=a=>{m.value=a,a=="follow"?o.value=!0:o.value=!1,g()};return q(()=>{g()}),(a,d)=>{const v=te,p=X,L=C,V=Z,N=ie,S=ee,E=oe,I=W;return c(),_("div",null,[n(v,{title:"话题"}),n(I,{class:"main-content-wrap tags-wrap",bordered:""},{default:s(()=>[n(V,{type:"line",animated:"","onUpdate:value":k},H({default:s(()=>[n(p,{name:"hot",tab:"热门"}),n(p,{name:"new",tab:"最新"}),h(t).state.userLogined?(c(),b(p,{key:0,name:"follow",tab:"关注"})):u("",!0)]),_:2},[h(t).state.userLogined?{name:"suffix",fn:s(()=>[n(L,{checked:e.value,"onUpdate:checked":d[0]||(d[0]=y=>e.value=y),checkable:""},{default:s(()=>[B(f(w.value),1)]),_:1},8,["checked"])]),key:"0"}:void 0]),1024),n(E,{show:l.value},{default:s(()=>[n(S,null,{default:s(()=>[(c(!0),_(Y,null,G(r.value,y=>(c(),b(N,{tag:y,showAction:h(t).state.userLogined&&e.value,checkFollowing:o.value},null,8,["tag","showAction","checkFollowing"]))),256))]),_:1})]),_:1},8,["show"])]),_:1})])}}});const Se=z(_e,[["__scopeId","data-v-1fb31ecf"]]);export{Se as default};

web/dist/assets/main-nav.vue_vue_type_style_index_0_lang-0888b762.js

@@ -1 +1 @@
-import{a7 as A}from"./index-fcb35ad4.js";import{u as B}from"./vuex-44de225f.js";import{u as E}from"./vue-router-e5a2430e.js";import{j as z}from"./vooks-6d99783e.js";import{Z as C,_ as N,$ as P,a0 as D}from"./@vicons-7a4ef312.js";import{u as R,a3 as $,a4 as x,j as H,e as I,a5 as V,h as j}from"./naive-ui-d8de3dda.js";import{d as q,H as h,b as F,e as n,f,bf as a,k as e,w as t,Y as c,j as L,q as _,A as U,x as Y,F as Z}from"./@vue-a481fc63.js";const G={key:0},J={class:"navbar"},ae=q({__name:"main-nav",props:{title:{default:""},back:{type:Boolean,default:!1},theme:{type:Boolean,default:!0}},setup(w){const i=w,o=B(),m=E(),l=h(!1),g=h("left"),u=s=>{s?(localStorage.setItem("PAOPAO_THEME","dark"),o.commit("triggerTheme","dark")):(localStorage.setItem("PAOPAO_THEME","light"),o.commit("triggerTheme","light"))},k=()=>{window.history.length<=1?m.push({path:"/"}):m.go(-1)},v=()=>{l.value=!0};return F(()=>{localStorage.getItem("PAOPAO_THEME")||u(z()==="dark"),o.state.desktopModelShow||(window.$store=o,window.$message=R())}),(s,d)=>{const b=A,y=$,M=x,r=H,p=I,O=V,S=j;return n(),f(Z,null,[a(o).state.drawerModelShow?(n(),f("div",G,[e(M,{show:l.value,"onUpdate:show":d[0]||(d[0]=T=>l.value=T),width:212,placement:g.value,resizable:""},{default:t(()=>[e(y,null,{default:t(()=>[e(b)]),_:1})]),_:1},8,["show","placement"])])):c("",!0),e(S,{size:"small",bordered:!0,class:"nav-title-card"},{header:t(()=>[L("div",J,[a(o).state.drawerModelShow&&!s.back?(n(),_(p,{key:0,class:"drawer-btn",onClick:v,quaternary:"",circle:"",size:"medium"},{icon:t(()=>[e(r,null,{default:t(()=>[e(a(C))]),_:1})]),_:1})):c("",!0),s.back?(n(),_(p,{key:1,class:"back-btn",onClick:k,quaternary:"",circle:"",size:"small"},{icon:t(()=>[e(r,null,{default:t(()=>[e(a(N))]),_:1})]),_:1})):c("",!0),U(" "+Y(i.title)+" ",1),i.theme?(n(),_(O,{key:2,value:a(o).state.theme==="dark","onUpdate:value":u,size:"small",class:"theme-switch-wrap"},{"checked-icon":t(()=>[e(r,{component:a(P)},null,8,["component"])]),"unchecked-icon":t(()=>[e(r,{component:a(D)},null,8,["component"])]),_:1},8,["value"])):c("",!0)])]),_:1})],64)}}});export{ae as _};
+import{a7 as A}from"./index-5faa66a7.js";import{u as B}from"./vuex-44de225f.js";import{u as E}from"./vue-router-e5a2430e.js";import{j as z}from"./vooks-6d99783e.js";import{Z as C,_ as N,$ as P,a0 as D}from"./@vicons-7a4ef312.js";import{u as R,a3 as $,a4 as x,j as H,e as I,a5 as V,h as j}from"./naive-ui-d8de3dda.js";import{d as q,H as h,b as F,e as n,f,bf as a,k as e,w as t,Y as c,j as L,q as _,A as U,x as Y,F as Z}from"./@vue-a481fc63.js";const G={key:0},J={class:"navbar"},ae=q({__name:"main-nav",props:{title:{default:""},back:{type:Boolean,default:!1},theme:{type:Boolean,default:!0}},setup(w){const i=w,o=B(),m=E(),l=h(!1),g=h("left"),u=s=>{s?(localStorage.setItem("PAOPAO_THEME","dark"),o.commit("triggerTheme","dark")):(localStorage.setItem("PAOPAO_THEME","light"),o.commit("triggerTheme","light"))},k=()=>{window.history.length<=1?m.push({path:"/"}):m.go(-1)},v=()=>{l.value=!0};return F(()=>{localStorage.getItem("PAOPAO_THEME")||u(z()==="dark"),o.state.desktopModelShow||(window.$store=o,window.$message=R())}),(s,d)=>{const b=A,y=$,M=x,r=H,p=I,O=V,S=j;return n(),f(Z,null,[a(o).state.drawerModelShow?(n(),f("div",G,[e(M,{show:l.value,"onUpdate:show":d[0]||(d[0]=T=>l.value=T),width:212,placement:g.value,resizable:""},{default:t(()=>[e(y,null,{default:t(()=>[e(b)]),_:1})]),_:1},8,["show","placement"])])):c("",!0),e(S,{size:"small",bordered:!0,class:"nav-title-card"},{header:t(()=>[L("div",J,[a(o).state.drawerModelShow&&!s.back?(n(),_(p,{key:0,class:"drawer-btn",onClick:v,quaternary:"",circle:"",size:"medium"},{icon:t(()=>[e(r,null,{default:t(()=>[e(a(C))]),_:1})]),_:1})):c("",!0),s.back?(n(),_(p,{key:1,class:"back-btn",onClick:k,quaternary:"",circle:"",size:"small"},{icon:t(()=>[e(r,null,{default:t(()=>[e(a(N))]),_:1})]),_:1})):c("",!0),U(" "+Y(i.title)+" ",1),i.theme?(n(),_(O,{key:2,value:a(o).state.theme==="dark","onUpdate:value":u,size:"small",class:"theme-switch-wrap"},{"checked-icon":t(()=>[e(r,{component:a(P)},null,8,["component"])]),"unchecked-icon":t(()=>[e(r,{component:a(D)},null,8,["component"])]),_:1},8,["value"])):c("",!0)])]),_:1})],64)}}});export{ae as _};

web/dist/assets/post-skeleton-47a1ebec.js

@@ -1 +1 @@
-import{U as r}from"./naive-ui-d8de3dda.js";import{d as c,e as s,f as n,u as p,j as o,k as t,F as l}from"./@vue-a481fc63.js";import{_ as i}from"./index-fcb35ad4.js";const m={class:"user"},u={class:"content"},d=c({__name:"post-skeleton",props:{num:{default:1}},setup(f){return(_,k)=>{const e=r;return s(!0),n(l,null,p(new Array(_.num),a=>(s(),n("div",{class:"skeleton-item",key:a},[o("div",m,[t(e,{circle:"",size:"small"})]),o("div",u,[t(e,{text:"",repeat:3}),t(e,{text:"",style:{width:"60%"}})])]))),128)}}});const b=i(d,[["__scopeId","data-v-ab0015b4"]]);export{b as _};
+import{U as r}from"./naive-ui-d8de3dda.js";import{d as c,e as s,f as n,u as p,j as o,k as t,F as l}from"./@vue-a481fc63.js";import{_ as i}from"./index-5faa66a7.js";const m={class:"user"},u={class:"content"},d=c({__name:"post-skeleton",props:{num:{default:1}},setup(f){return(_,k)=>{const e=r;return s(!0),n(l,null,p(new Array(_.num),a=>(s(),n("div",{class:"skeleton-item",key:a},[o("div",m,[t(e,{circle:"",size:"small"})]),o("div",u,[t(e,{text:"",repeat:3}),t(e,{text:"",style:{width:"60%"}})])]))),128)}}});const b=i(d,[["__scopeId","data-v-ab0015b4"]]);export{b as _};

web/dist/assets/whisper-d959da10.js

@@ -1 +1 @@
-import{W as b,_ as k}from"./index-fcb35ad4.js";import{R as B,H as C,S as N,b as R,e as U,i as V}from"./naive-ui-d8de3dda.js";import{d as W,H as p,e as $,q as z,w as s,j as a,k as n,A as _,x as i}from"./@vue-a481fc63.js";const H={class:"whisper-wrap"},S={class:"whisper-line"},j={class:"whisper-line send-wrap"},q=W({__name:"whisper",props:{show:{type:Boolean,default:!1},user:{}},emits:["success"],setup(r,{emit:u}){const d=r,o=p(""),t=p(!1),c=()=>{u("success")},m=()=>{t.value=!0,b({user_id:d.user.id,content:o.value}).then(e=>{window.$message.success("发送成功"),t.value=!1,o.value="",c()}).catch(e=>{t.value=!1})};return(e,l)=>{const h=B,w=C,f=N,v=R,g=U,y=V;return $(),z(y,{show:e.show,"onUpdate:show":c,class:"whisper-card",preset:"card",size:"small",title:"私信","mask-closable":!1,bordered:!1,style:{width:"360px"}},{default:s(()=>[a("div",H,[n(f,{"show-icon":!1},{default:s(()=>[_(" 即将发送私信给: "),n(w,{style:{"max-width":"100%"}},{default:s(()=>[n(h,{type:"success"},{default:s(()=>[_(i(e.user.nickname)+"@"+i(e.user.username),1)]),_:1})]),_:1})]),_:1}),a("div",S,[n(v,{type:"textarea",placeholder:"请输入私信内容（请勿发送不和谐内容，否则将会被封号）",autosize:{minRows:5,maxRows:10},value:o.value,"onUpdate:value":l[0]||(l[0]=x=>o.value=x),maxlength:"200","show-count":""},null,8,["value"])]),a("div",j,[n(g,{strong:"",secondary:"",type:"primary",loading:t.value,onClick:m},{default:s(()=>[_(" 发送 ")]),_:1},8,["loading"])])])]),_:1},8,["show"])}}});const M=k(q,[["__scopeId","data-v-0cbfe47c"]]);export{M as _};
+import{W as b,_ as k}from"./index-5faa66a7.js";import{R as B,H as C,S as N,b as R,e as U,i as V}from"./naive-ui-d8de3dda.js";import{d as W,H as p,e as $,q as z,w as s,j as a,k as n,A as _,x as i}from"./@vue-a481fc63.js";const H={class:"whisper-wrap"},S={class:"whisper-line"},j={class:"whisper-line send-wrap"},q=W({__name:"whisper",props:{show:{type:Boolean,default:!1},user:{}},emits:["success"],setup(r,{emit:u}){const d=r,o=p(""),t=p(!1),c=()=>{u("success")},m=()=>{t.value=!0,b({user_id:d.user.id,content:o.value}).then(e=>{window.$message.success("发送成功"),t.value=!1,o.value="",c()}).catch(e=>{t.value=!1})};return(e,l)=>{const h=B,w=C,f=N,v=R,g=U,y=V;return $(),z(y,{show:e.show,"onUpdate:show":c,class:"whisper-card",preset:"card",size:"small",title:"私信","mask-closable":!1,bordered:!1,style:{width:"360px"}},{default:s(()=>[a("div",H,[n(f,{"show-icon":!1},{default:s(()=>[_(" 即将发送私信给: "),n(w,{style:{"max-width":"100%"}},{default:s(()=>[n(h,{type:"success"},{default:s(()=>[_(i(e.user.nickname)+"@"+i(e.user.username),1)]),_:1})]),_:1})]),_:1}),a("div",S,[n(v,{type:"textarea",placeholder:"请输入私信内容（请勿发送不和谐内容，否则将会被封号）",autosize:{minRows:5,maxRows:10},value:o.value,"onUpdate:value":l[0]||(l[0]=x=>o.value=x),maxlength:"200","show-count":""},null,8,["value"])]),a("div",j,[n(g,{strong:"",secondary:"",type:"primary",loading:t.value,onClick:m},{default:s(()=>[_(" 发送 ")]),_:1},8,["loading"])])])]),_:1},8,["show"])}}});const M=k(q,[["__scopeId","data-v-0cbfe47c"]]);export{M as _};

web/dist/index.html

@@ -8,7 +8,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=0" />
   <link rel="manifest" href="/manifest.json" />
   <title>泡泡</title>
-  <script type="module" crossorigin src="/assets/index-fcb35ad4.js"></script>
+  <script type="module" crossorigin src="/assets/index-5faa66a7.js"></script>
   <link rel="modulepreload" crossorigin href="/assets/@vue-a481fc63.js">
   <link rel="modulepreload" crossorigin href="/assets/vue-router-e5a2430e.js">
   <link rel="modulepreload" crossorigin href="/assets/vuex-44de225f.js">

web/src/components/post-detail.vue

@@ -604,16 +604,11 @@ const execHighlightAction = () => {
         });
 };
 const execVisibilityAction = () => {
-    // TODO: 暂时following等价于public
-    let fixedVisit = tempVisibility.value
-    if (fixedVisit == 3) {
-        fixedVisit = 0
-    }
     visibilityPost({
         id: post.value.id,
-        visibility: fixedVisit
+        visibility: tempVisibility.value
     })
-        .then((res) => {
+        .then((_res) => {
             emit('reload');
             window.$message.success('修改可见性成功');
         })

web/src/types/NetParams.d.ts

@@ -152,6 +152,7 @@ declare module NetParams {
   interface PostGetPosts {
     query: string | null;
     type: string;
+    style: "newest" | "hots" | "following" | "search";
     page: number;
     page_size: number;
   }

web/src/views/Home.vue

@@ -168,16 +168,14 @@ const handleBarClick = (data: Item.SlideBarItem, index: number) => {
     }
     switch (data.style) {
     case 1:
-        loadPosts();
+        loadPosts("newest");
         break;
     case 2:
-        // todo: add some other logic
+        loadPosts("hots");
-        loadPosts();
         break;
     case 3:
-        // todo: add some other logic
         route.query.q=null
-        loadPosts();
+        loadPosts("following");
         break;
     case 21:
         targetUsername.value = data.username;
@@ -220,11 +218,12 @@ const loadContacts = () => {
     });
 };
 
-const loadPosts = () => {
+const loadPosts = (style : "newest" | "hots" | "following" | "search") => {
     loading.value = true;
     getPosts({
         query: route.query.q ? decodeURIComponent(route.query.q as string) : null,
         type: route.query.t as string,
+        style: style,
         page: page.value,
         page_size: pageSize.value,
     })
@@ -317,19 +316,17 @@ const onPostSuccess = (post: Item.PostProps) => {
 const loadMorePosts = () => {
     switch (targetStyle.value) {
     case 1:
-        loadPosts();
+        loadPosts("newest");
         break;
     case 2:
-        // todo: add some other logic
+        loadPosts("hots");
-        loadPosts();
         break;
     case 3:
-        // todo: add some other logic
+        loadPosts("following");
-        loadPosts();
         break;
     case 21:
         if (route.query.q) {
-            loadPosts();
+            loadPosts("search");
         } else {
             loadUserPosts();
         }
@@ -352,7 +349,7 @@ const nextPage = () => {
 onMounted(() => {
     reset();
     loadContacts()
-    loadPosts();
+    loadPosts("newest");
 });
 
 watch(

web/src/views/Post.vue

@@ -121,7 +121,6 @@ const loadDefaultComments = ($state: any) => {
     if (defaultNoMore.value) {
         return
     }
-
     getPostComments({
         id: post.value.id as number,
         sort_strategy: 'default',