fix: muti-channel related problems #68

WangEdward · 2023-05-06T09:52:03Z

修复 message 页面未知通道
增加 /api/channel/short 接口

仍存在的问题：

需要修复设置页面默认推送方式，这里请求 /api/channel/short，把选项替换掉就行了，我不怎么会写 react，大佬就交给你啦😜

message-pusher/web/src/components/PushSetting.js

Lines 83 to 100 in 9e9f643

    
           <Form.Select 
        
             label='默认推送方式' 
        
             name='channel' 
        
             options={[ 
        
               { key: 'email', text: '邮件', value: 'email' }, 
        
               { key: 'test', text: '微信测试号', value: 'test' }, 
        
               { key: 'corp_app', text: '企业微信应用号', value: 'corp_app' }, 
        
               { key: 'corp', text: '企业微信群机器人', value: 'corp' }, 
        
               { key: 'lark', text: '飞书群机器人', value: 'lark' }, 
        
               { key: 'ding', text: '钉钉群机器人', value: 'ding' }, 
        
               { key: 'bark', text: 'Bark App', value: 'bark' }, 
        
               { key: 'client', text: 'WebSocket 客户端', value: 'client' }, 
        
               { key: 'telegram', text: 'Telegram 机器人', value: 'telegram' }, 
        
               { key: 'discord', text: 'Discord 群机器人', value: 'discord' }, 
        
             ]} 
        
             value={inputs.channel} 
        
             onChange={handleInputChange} 
        
           />

songquanpeng · 2023-05-06T10:01:14Z

我没太理解 /api/channel/short 这个接口是干嘛用的。

WangEdward · 2023-05-06T10:06:49Z

因为现在的 channel 识别符为 channel 的 name 字段，所以使用原先诸如 corp_app 、telegram、discord之类的标识符就应该在推送方式中被替代，很多场景下需要使用 channel 名（如设置推送方式），但是 /api/channel/ 请求过于臃肿且有分页因此引入了 /api/channel/short 接口

WangEdward · 2023-05-06T10:12:29Z

此处目前是有 bug 的，使用 option 列表中的设置在请求 push 消息接口时会返回{"message":"无效的渠道名称：wechat_corp","success":false} 因此需要将下拉框的内容替换为 /api/channel/short 返回的内容

songquanpeng · 2023-05-06T10:16:42Z

哦确实，不过需要加的接口应该是用于获取用户的通道列表。

…

---Original--- From: ***@***.***> Date: Sat, May 6, 2023 18:12 PM To: ***@***.***>; Cc: ***@***.******@***.***>; Subject: Re: [songquanpeng/message-pusher] fix: muti-channel related problems(PR #68) 此处目前是有 bug 的，使用 option 列表中的设置在请求 push 消息接口时会返回{"message":"无效的渠道名称：wechat_corp","success":false} 因此需要将下拉框的内容替换为 /api/channel/short 返回的内容 — Reply to this email directly, view it on GitHub, or unsubscribe. You are receiving this because you commented.Message ID: ***@***.***>

WangEdward · 2023-05-06T10:19:20Z

/api/channel/short 就是用于获取用户的通道列表的啊😂

WangEdward · 2023-05-06T10:30:57Z

#69

songquanpeng · 2023-05-06T12:30:55Z

我感觉没有必要专门定义一个接口和结构体。

目前打算在 GET /api/channel 上加一个 query 参数来解决这个问题。

WangEdward · 2023-05-06T12:36:58Z

新建结构体是按照 gorm 官方的指南写的 Smart Select Fields
这是 ‘Smart’ 的做法好吧

songquanpeng · 2023-05-06T12:38:38Z

这样，看来有必要找个时间读完官方文档看一下有没有漏掉的最佳实践。

songquanpeng · 2023-05-06T13:19:21Z

改好了：

WangEdward · 2023-05-06T13:23:32Z

model/channel.go

@@ -67,6 +74,11 @@ func GetChannelsByUserId(userId int, startIdx int, num int) (channels []*Channel
 	return channels, err
 }

+func GetBriefChannelsByUserId(userId int) (channels []*BriefChannel, err error) {
+	err = DB.Model(&Channel{}).Select("id", "name", "description").Where("user_id = ? and status = ?", userId, common.ChannelStatusEnabled).Find(&channels).Error


这一小段或许是可以删掉的？.Select("id", "name", "description")

确实，不过应该不影响性能。

WangEdward · 2023-05-06T13:36:18Z

web/src/helpers/render.js

@@ -20,6 +20,13 @@ export function renderChannel(key) {
      </Label>
    );
  }
+  if (key) {


这里要加个判断，不然消息历史页面会显示未知通道，简单方法就直接把 key 打上去，如果要加背景颜色的话可能还是得调 API

为什么会显示未知通道？历史消息的通道类型必然是系统里已有的呀。

我发现这个问题了，问题不是出在这里，而是通道的类型没有传给前端。

确实还是你的方法简单直接，先这样搞算了哈哈哈，又不是不能用。

/api/message/?p=0 这个接口的返回 channel 是什么呢？对，是用户自定义的通道名，那这个通道名会在你的CHANNEL_OPTIONS 里吗？不会😅！

是这样的，v0.4 版本改动后确实忘记处理这里了。

直接渲染就好了：

<Table.Cell> <Label>{message.channel}</Label> </Table.Cell>

就不走 renderChannel 了。

嗯，确实是个好主意

WangEdward added 4 commits May 6, 2023 17:08

fix: unknown channel on message page

e3bc4a1

feat: add get all chanels short api

69f7794

style: temporaryly change label color

a9883dc

fix: update query for new api

aea3634

songquanpeng added 2 commits May 6, 2023 21:17

fix: fix PushSetting page

127702d

fix: fix PushSetting page

09fe761

songquanpeng merged commit c70cc3a into songquanpeng:master May 6, 2023

WangEdward commented May 6, 2023

View reviewed changes

songquanpeng added a commit that referenced this pull request May 6, 2023

fix: render channel name directly (#68)

48902f0

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: muti-channel related problems #68

fix: muti-channel related problems #68

WangEdward commented May 6, 2023

songquanpeng commented May 6, 2023

WangEdward commented May 6, 2023

WangEdward commented May 6, 2023

songquanpeng commented May 6, 2023 via email

WangEdward commented May 6, 2023

WangEdward commented May 6, 2023

songquanpeng commented May 6, 2023

WangEdward commented May 6, 2023 •

edited

Loading

songquanpeng commented May 6, 2023

songquanpeng commented May 6, 2023

WangEdward May 6, 2023

songquanpeng May 6, 2023

WangEdward May 6, 2023

songquanpeng May 6, 2023

songquanpeng May 6, 2023

songquanpeng May 6, 2023

WangEdward May 6, 2023

songquanpeng May 6, 2023

songquanpeng May 6, 2023

WangEdward May 6, 2023

	<Form.Select
	label='默认推送方式'
	name='channel'
	options={[
	{ key: 'email', text: '邮件', value: 'email' },
	{ key: 'test', text: '微信测试号', value: 'test' },
	{ key: 'corp_app', text: '企业微信应用号', value: 'corp_app' },
	{ key: 'corp', text: '企业微信群机器人', value: 'corp' },
	{ key: 'lark', text: '飞书群机器人', value: 'lark' },
	{ key: 'ding', text: '钉钉群机器人', value: 'ding' },
	{ key: 'bark', text: 'Bark App', value: 'bark' },
	{ key: 'client', text: 'WebSocket 客户端', value: 'client' },
	{ key: 'telegram', text: 'Telegram 机器人', value: 'telegram' },
	{ key: 'discord', text: 'Discord 群机器人', value: 'discord' },
	]}
	value={inputs.channel}
	onChange={handleInputChange}
	/>

fix: muti-channel related problems #68

fix: muti-channel related problems #68

Conversation

WangEdward commented May 6, 2023

songquanpeng commented May 6, 2023

WangEdward commented May 6, 2023

WangEdward commented May 6, 2023

songquanpeng commented May 6, 2023 via email

WangEdward commented May 6, 2023

WangEdward commented May 6, 2023

songquanpeng commented May 6, 2023

WangEdward commented May 6, 2023 • edited Loading

songquanpeng commented May 6, 2023

songquanpeng commented May 6, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

WangEdward commented May 6, 2023 •

edited

Loading