Skip to content

Commit 9e70e47

Browse files
committed
Merge branch 'beta' into x/gorm
2 parents 67e6657 + 33fd5df commit 9e70e47

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+143
-48
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ All notable changes to paopao-ce are documented in this file.
182182
CopyrightRightLink: "https://www.paopao.info"
183183
...
184184
```
185+
- add read more contents support for post card in tweets list.
185186
186187
## 0.4.2
187188
### Fixed

config.yaml.sample

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,9 @@ WebProfile:
192192
AllowTweetVideo: true # 是否允许视频推文
193193
AllowUserRegister: true # 是否允许用户注册
194194
AllowPhoneBind: true # 是否允许手机绑定
195+
DefaultTweetMaxLength: 2000 # 推文允许输入的最大长度, 默认2000字,值的范围需要查询后端支持的最大字数
196+
TweetWebEllipsisSize: 400 # Web端推文作为feed显示的最长字数,默认400字
197+
TweetMobileEllipsisSize: 300 # 移动端推文作为feed显示的最长字数,默认300字
195198
DefaultTweetVisibility: friend # 推文可见性,默认好友可见 值: public/following/friend/private
196199
DefaultMsgLoopInterval: 5000 # 拉取未读消息的间隔,单位:毫秒, 默认5000ms
197200
CopyrightTop: "2023 paopao.info"

internal/conf/config.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,10 @@ WebProfile:
257257
AllowTweetVideo: true # 是否允许视频推文
258258
AllowUserRegister: true # 是否允许用户注册
259259
AllowPhoneBind: true # 是否允许手机绑定
260-
DefaultTweetVisibility: friend # 推文可见性,默认好友可见 值: public/following/friend/private
260+
DefaultTweetMaxLength: 2000 # 推文允许输入的最大长度, 默认2000字,值的范围需要查询后端支持的最大字数
261+
TweetWebEllipsisSize: 400 # Web端推文作为feed显示的最长字数,默认400字
262+
TweetMobileEllipsisSize: 300 # 移动端推文作为feed显示的最长字数,默认300字
263+
DefaultTweetVisibility: friend # 推文默认可见性,默认好友可见 值: public/following/friend/private
261264
DefaultMsgLoopInterval: 5000 # 拉取未读消息的间隔,单位:毫秒, 默认5000ms
262265
CopyrightTop: "2023 paopao.info"
263266
CopyrightLeft: "Roc's Me"

internal/conf/setting.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,9 @@ type WebProfileConf struct {
292292
AllowTweetVideo bool `json:"allow_tweet_video"`
293293
AllowUserRegister bool `json:"allow_user_register"`
294294
AllowPhoneBind bool `json:"allow_phone_bind"`
295+
DefaultTweetMaxLength int `json:"default_tweet_max_length"`
296+
TweetWebEllipsisSize int `json:"tweet_web_ellipsis_size"`
297+
TweetMobileEllipsisSize int `json:"tweet_mobile_ellipsis_size"`
295298
DefaultTweetVisibility string `json:"default_tweet_visibility"`
296299
DefaultMsgLoopInterval int `json:"default_msg_loop_interval"`
297300
CopyrightTop string `json:"copyright_top"`

web/.env

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@ VITE_ALLOW_ACTIVATION=false
1919
VITE_ALLOW_PHONE_BIND=true
2020

2121
# 局部参数
22-
VITE_DEFAULT_MSG_LOOP_INTERVAL=5000 # 拉取未读消息的间隔,单位:毫秒, 默认5000ms
23-
VITE_DEFAULT_TWEET_VISIBILITY=friend # 推文可见性,默认好友可见 值: public/following/friend/private
24-
VITE_DEFAULT_TWEET_MAX_LENGTH=400 # 推文最大长度, 默认400字
25-
VITE_DEFAULT_COMMENT_MAX_LENGTH=300 # 评论最大长度, 默认300字
26-
VITE_DEFAULT_REPLY_MAX_LENGTH=300 # 评论最大长度, 默认300字
27-
VITE_RIGHT_FOLLOW_TOPIC_MAX_SIZE=6 # 右侧关注话题最大条目数, 默认6条
28-
VITE_RIGHT_HOT_TOPIC_MAX_SIZE=12 # 右侧热门话题最大条目数, 默认12条
22+
VITE_DEFAULT_MSG_LOOP_INTERVAL=5000 # 拉取未读消息的间隔,单位:毫秒, 默认5000ms
23+
VITE_DEFAULT_TWEET_VISIBILITY=friend # 推文默认可见性,默认好友可见 值: public/following/friend/private
24+
VITE_DEFAULT_TWEET_MAX_LENGTH=2000 # 推文允许输入的最大长度, 默认2000字,值的范围需要查询后端支持的最大字数
25+
VITE_TWEET_WEB_ELLIPSIS_SIZE=400 # Web端推文作为feed显示的最长字数,默认400字
26+
VITE_TWEET_MOBILE_ELLIPSIS_SIZE=300 # 移动端推文作为feed显示的最长字数,默认300字
27+
VITE_DEFAULT_COMMENT_MAX_LENGTH=300 # 评论最大长度, 默认300字
28+
VITE_DEFAULT_REPLY_MAX_LENGTH=300 # 评论最大长度, 默认300字
29+
VITE_RIGHT_FOLLOW_TOPIC_MAX_SIZE=6 # 右侧关注话题最大条目数, 默认6条
30+
VITE_RIGHT_HOT_TOPIC_MAX_SIZE=12 # 右侧热门话题最大条目数, 默认12条
2931
VITE_COPYRIGHT_TOP="2023 paopao.info"
3032
VITE_COPYRIGHT_LEFT="Roc's Me"
3133
VITE_COPYRIGHT_LEFT_LINK=""
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)