fix: notice messages status value
This commit is contained in:
parent
86d634d94f
commit
877a20350d
|
@ -25,7 +25,7 @@ class Users::MessagesController < Users::BaseController
|
||||||
"sender": 4,
|
"sender": 4,
|
||||||
"receiver": 2,
|
"receiver": 2,
|
||||||
"content": "Atme Message Content 2",
|
"content": "Atme Message Content 2",
|
||||||
"status": 0,
|
"status": 2,
|
||||||
"type": 2,
|
"type": 2,
|
||||||
"source": "IssueAtme",
|
"source": "IssueAtme",
|
||||||
"notification_url": "http://www.baidu.com",
|
"notification_url": "http://www.baidu.com",
|
||||||
|
@ -47,7 +47,7 @@ class Users::MessagesController < Users::BaseController
|
||||||
"sender": -1,
|
"sender": -1,
|
||||||
"receiver": 2,
|
"receiver": 2,
|
||||||
"content": "Notification Message Content 2",
|
"content": "Notification Message Content 2",
|
||||||
"status": 0,
|
"status": 2,
|
||||||
"type": 1,
|
"type": 1,
|
||||||
"source": "IssueChanged",
|
"source": "IssueChanged",
|
||||||
"notification_url": "http://www.baidu.com",
|
"notification_url": "http://www.baidu.com",
|
||||||
|
@ -58,7 +58,7 @@ class Users::MessagesController < Users::BaseController
|
||||||
"sender": -1,
|
"sender": -1,
|
||||||
"receiver": 2,
|
"receiver": 2,
|
||||||
"content": "Notification Message Content 3",
|
"content": "Notification Message Content 3",
|
||||||
"status": 0,
|
"status": 2,
|
||||||
"type": 1,
|
"type": 1,
|
||||||
"source": "ProjectJoined",
|
"source": "ProjectJoined",
|
||||||
"notification_url": "http://www.baidu.com",
|
"notification_url": "http://www.baidu.com",
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<!--
|
<!--
|
||||||
* @Date: 2021-03-01 10:35:21
|
* @Date: 2021-03-01 10:35:21
|
||||||
* @LastEditors: viletyy
|
* @LastEditors: viletyy
|
||||||
* @LastEditTime: 2021-09-09 16:24:28
|
* @LastEditTime: 2021-09-10 16:07:14
|
||||||
* @FilePath: /forgeplus/app/docs/slate/source/includes/_users.md
|
* @FilePath: /forgeplus/app/docs/slate/source/includes/_users.md
|
||||||
-->
|
-->
|
||||||
# Users
|
# Users
|
||||||
|
@ -67,7 +67,7 @@ await octokit.request('GET /api/users/:login/messages.json')
|
||||||
参数 | 类型 | 字段说明
|
参数 | 类型 | 字段说明
|
||||||
--------- | ----------- | -----------
|
--------- | ----------- | -----------
|
||||||
|type | string | 消息类型,不传为所有消息,notification为系统消息,atme为@我消息|
|
|type | string | 消息类型,不传为所有消息,notification为系统消息,atme为@我消息|
|
||||||
|status | integer | 是否已读,不传为所有消息,0为未读,1为已读 |
|
|status | integer | 是否已读,不传为所有消息,1为未读,2为已读 |
|
||||||
|limit | integer | 每页个数 |
|
|limit | integer | 每页个数 |
|
||||||
|page | integer | 页码 |
|
|page | integer | 页码 |
|
||||||
|
|
||||||
|
@ -79,7 +79,7 @@ await octokit.request('GET /api/users/:login/messages.json')
|
||||||
|unread_notification | integer | 未读系统通知数量 |
|
|unread_notification | integer | 未读系统通知数量 |
|
||||||
|unread_atme | integer | 未读@我数量 |
|
|unread_atme | integer | 未读@我数量 |
|
||||||
|messages.id | integer | 消息id |
|
|messages.id | integer | 消息id |
|
||||||
|messages.status | integer | 消息是否已读,0为未读,1为已读 |
|
|messages.status | integer | 消息是否已读,1为未读,2为已读 |
|
||||||
|messages.content | string | 消息内容 |
|
|messages.content | string | 消息内容 |
|
||||||
|messages.notification_url | string | 消息跳转地址 |
|
|messages.notification_url | string | 消息跳转地址 |
|
||||||
|messages.source | string | 消息来源 |
|
|messages.source | string | 消息来源 |
|
||||||
|
@ -136,6 +136,7 @@ await octokit.request('GET /api/users/:login/messages.json')
|
||||||
"content": "Atme Message Content 1",
|
"content": "Atme Message Content 1",
|
||||||
"notification_url": "http://www.baidu.com",
|
"notification_url": "http://www.baidu.com",
|
||||||
"source": "PullRequestAtme",
|
"source": "PullRequestAtme",
|
||||||
|
"time_ago": "1天前",
|
||||||
"type": "atme",
|
"type": "atme",
|
||||||
"sender": {
|
"sender": {
|
||||||
"id": 5,
|
"id": 5,
|
||||||
|
@ -151,6 +152,7 @@ await octokit.request('GET /api/users/:login/messages.json')
|
||||||
"content": "Atme Message Content 2",
|
"content": "Atme Message Content 2",
|
||||||
"notification_url": "http://www.baidu.com",
|
"notification_url": "http://www.baidu.com",
|
||||||
"source": "IssueAtme",
|
"source": "IssueAtme",
|
||||||
|
"time_ago": "1天前",
|
||||||
"type": "atme",
|
"type": "atme",
|
||||||
"sender": {
|
"sender": {
|
||||||
"id": 4,
|
"id": 4,
|
||||||
|
@ -166,6 +168,7 @@ await octokit.request('GET /api/users/:login/messages.json')
|
||||||
"content": "Notification Message Content 1",
|
"content": "Notification Message Content 1",
|
||||||
"notification_url": "http://www.baidu.com",
|
"notification_url": "http://www.baidu.com",
|
||||||
"source": "IssueDelete",
|
"source": "IssueDelete",
|
||||||
|
"time_ago": "1天前",
|
||||||
"type": "notification"
|
"type": "notification"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -174,6 +177,7 @@ await octokit.request('GET /api/users/:login/messages.json')
|
||||||
"content": "Notification Message Content 2",
|
"content": "Notification Message Content 2",
|
||||||
"notification_url": "http://www.baidu.com",
|
"notification_url": "http://www.baidu.com",
|
||||||
"source": "IssueChanged",
|
"source": "IssueChanged",
|
||||||
|
"time_ago": "1天前",
|
||||||
"type": "notification"
|
"type": "notification"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -182,6 +186,7 @@ await octokit.request('GET /api/users/:login/messages.json')
|
||||||
"content": "Notification Message Content 3",
|
"content": "Notification Message Content 3",
|
||||||
"notification_url": "http://www.baidu.com",
|
"notification_url": "http://www.baidu.com",
|
||||||
"source": "ProjectJoined",
|
"source": "ProjectJoined",
|
||||||
|
"time_ago": "1天前",
|
||||||
"type": "notification"
|
"type": "notification"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
@ -6,6 +6,8 @@ json.status message["status"]
|
||||||
json.content message["content"]
|
json.content message["content"]
|
||||||
json.notification_url message["notification_url"]
|
json.notification_url message["notification_url"]
|
||||||
json.source message["source"]
|
json.source message["source"]
|
||||||
|
json.time_ago time_from_now(message["created_at"].to_time)
|
||||||
|
|
||||||
case message["type"]
|
case message["type"]
|
||||||
when 1
|
when 1
|
||||||
json.type "notification"
|
json.type "notification"
|
||||||
|
|
|
@ -921,7 +921,7 @@ Success — a happy kitten is an authenticated kitten!
|
||||||
<!--
|
<!--
|
||||||
* @Date: 2021-03-01 10:35:21
|
* @Date: 2021-03-01 10:35:21
|
||||||
* @LastEditors: viletyy
|
* @LastEditors: viletyy
|
||||||
* @LastEditTime: 2021-09-09 16:24:28
|
* @LastEditTime: 2021-09-10 16:07:14
|
||||||
* @FilePath: /forgeplus/app/docs/slate/source/includes/_users.md
|
* @FilePath: /forgeplus/app/docs/slate/source/includes/_users.md
|
||||||
-->
|
-->
|
||||||
<h1 id='users'>Users</h1><h2 id='1ae74893b1'>获取当前登陆用户信息</h2>
|
<h1 id='users'>Users</h1><h2 id='1ae74893b1'>获取当前登陆用户信息</h2>
|
||||||
|
@ -1009,7 +1009,7 @@ Success — a happy kitten is an authenticated kitten!
|
||||||
<tr>
|
<tr>
|
||||||
<td>status</td>
|
<td>status</td>
|
||||||
<td>integer</td>
|
<td>integer</td>
|
||||||
<td>是否已读,不传为所有消息,0为未读,1为已读</td>
|
<td>是否已读,不传为所有消息,1为未读,2为已读</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>limit</td>
|
<td>limit</td>
|
||||||
|
@ -1058,7 +1058,7 @@ Success — a happy kitten is an authenticated kitten!
|
||||||
<tr>
|
<tr>
|
||||||
<td>messages.status</td>
|
<td>messages.status</td>
|
||||||
<td>integer</td>
|
<td>integer</td>
|
||||||
<td>消息是否已读,0为未读,1为已读</td>
|
<td>消息是否已读,1为未读,2为已读</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>messages.content</td>
|
<td>messages.content</td>
|
||||||
|
@ -1230,6 +1230,7 @@ Success — a happy kitten is an authenticated kitten!
|
||||||
</span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">"Atme Message Content 1"</span><span class="p">,</span><span class="w">
|
</span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">"Atme Message Content 1"</span><span class="p">,</span><span class="w">
|
||||||
</span><span class="nl">"notification_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://www.baidu.com"</span><span class="p">,</span><span class="w">
|
</span><span class="nl">"notification_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://www.baidu.com"</span><span class="p">,</span><span class="w">
|
||||||
</span><span class="nl">"source"</span><span class="p">:</span><span class="w"> </span><span class="s2">"PullRequestAtme"</span><span class="p">,</span><span class="w">
|
</span><span class="nl">"source"</span><span class="p">:</span><span class="w"> </span><span class="s2">"PullRequestAtme"</span><span class="p">,</span><span class="w">
|
||||||
|
</span><span class="nl">"time_ago"</span><span class="p">:</span><span class="w"> </span><span class="s2">"1天前"</span><span class="p">,</span><span class="w">
|
||||||
</span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"atme"</span><span class="p">,</span><span class="w">
|
</span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"atme"</span><span class="p">,</span><span class="w">
|
||||||
</span><span class="nl">"sender"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
|
</span><span class="nl">"sender"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
|
||||||
</span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">5</span><span class="p">,</span><span class="w">
|
</span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">5</span><span class="p">,</span><span class="w">
|
||||||
|
@ -1245,6 +1246,7 @@ Success — a happy kitten is an authenticated kitten!
|
||||||
</span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">"Atme Message Content 2"</span><span class="p">,</span><span class="w">
|
</span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">"Atme Message Content 2"</span><span class="p">,</span><span class="w">
|
||||||
</span><span class="nl">"notification_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://www.baidu.com"</span><span class="p">,</span><span class="w">
|
</span><span class="nl">"notification_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://www.baidu.com"</span><span class="p">,</span><span class="w">
|
||||||
</span><span class="nl">"source"</span><span class="p">:</span><span class="w"> </span><span class="s2">"IssueAtme"</span><span class="p">,</span><span class="w">
|
</span><span class="nl">"source"</span><span class="p">:</span><span class="w"> </span><span class="s2">"IssueAtme"</span><span class="p">,</span><span class="w">
|
||||||
|
</span><span class="nl">"time_ago"</span><span class="p">:</span><span class="w"> </span><span class="s2">"1天前"</span><span class="p">,</span><span class="w">
|
||||||
</span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"atme"</span><span class="p">,</span><span class="w">
|
</span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"atme"</span><span class="p">,</span><span class="w">
|
||||||
</span><span class="nl">"sender"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
|
</span><span class="nl">"sender"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
|
||||||
</span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">4</span><span class="p">,</span><span class="w">
|
</span><span class="nl">"id"</span><span class="p">:</span><span class="w"> </span><span class="mi">4</span><span class="p">,</span><span class="w">
|
||||||
|
@ -1260,6 +1262,7 @@ Success — a happy kitten is an authenticated kitten!
|
||||||
</span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">"Notification Message Content 1"</span><span class="p">,</span><span class="w">
|
</span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">"Notification Message Content 1"</span><span class="p">,</span><span class="w">
|
||||||
</span><span class="nl">"notification_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://www.baidu.com"</span><span class="p">,</span><span class="w">
|
</span><span class="nl">"notification_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://www.baidu.com"</span><span class="p">,</span><span class="w">
|
||||||
</span><span class="nl">"source"</span><span class="p">:</span><span class="w"> </span><span class="s2">"IssueDelete"</span><span class="p">,</span><span class="w">
|
</span><span class="nl">"source"</span><span class="p">:</span><span class="w"> </span><span class="s2">"IssueDelete"</span><span class="p">,</span><span class="w">
|
||||||
|
</span><span class="nl">"time_ago"</span><span class="p">:</span><span class="w"> </span><span class="s2">"1天前"</span><span class="p">,</span><span class="w">
|
||||||
</span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"notification"</span><span class="w">
|
</span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"notification"</span><span class="w">
|
||||||
</span><span class="p">},</span><span class="w">
|
</span><span class="p">},</span><span class="w">
|
||||||
</span><span class="p">{</span><span class="w">
|
</span><span class="p">{</span><span class="w">
|
||||||
|
@ -1268,6 +1271,7 @@ Success — a happy kitten is an authenticated kitten!
|
||||||
</span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">"Notification Message Content 2"</span><span class="p">,</span><span class="w">
|
</span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">"Notification Message Content 2"</span><span class="p">,</span><span class="w">
|
||||||
</span><span class="nl">"notification_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://www.baidu.com"</span><span class="p">,</span><span class="w">
|
</span><span class="nl">"notification_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://www.baidu.com"</span><span class="p">,</span><span class="w">
|
||||||
</span><span class="nl">"source"</span><span class="p">:</span><span class="w"> </span><span class="s2">"IssueChanged"</span><span class="p">,</span><span class="w">
|
</span><span class="nl">"source"</span><span class="p">:</span><span class="w"> </span><span class="s2">"IssueChanged"</span><span class="p">,</span><span class="w">
|
||||||
|
</span><span class="nl">"time_ago"</span><span class="p">:</span><span class="w"> </span><span class="s2">"1天前"</span><span class="p">,</span><span class="w">
|
||||||
</span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"notification"</span><span class="w">
|
</span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"notification"</span><span class="w">
|
||||||
</span><span class="p">},</span><span class="w">
|
</span><span class="p">},</span><span class="w">
|
||||||
</span><span class="p">{</span><span class="w">
|
</span><span class="p">{</span><span class="w">
|
||||||
|
@ -1276,6 +1280,7 @@ Success — a happy kitten is an authenticated kitten!
|
||||||
</span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">"Notification Message Content 3"</span><span class="p">,</span><span class="w">
|
</span><span class="nl">"content"</span><span class="p">:</span><span class="w"> </span><span class="s2">"Notification Message Content 3"</span><span class="p">,</span><span class="w">
|
||||||
</span><span class="nl">"notification_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://www.baidu.com"</span><span class="p">,</span><span class="w">
|
</span><span class="nl">"notification_url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"http://www.baidu.com"</span><span class="p">,</span><span class="w">
|
||||||
</span><span class="nl">"source"</span><span class="p">:</span><span class="w"> </span><span class="s2">"ProjectJoined"</span><span class="p">,</span><span class="w">
|
</span><span class="nl">"source"</span><span class="p">:</span><span class="w"> </span><span class="s2">"ProjectJoined"</span><span class="p">,</span><span class="w">
|
||||||
|
</span><span class="nl">"time_ago"</span><span class="p">:</span><span class="w"> </span><span class="s2">"1天前"</span><span class="p">,</span><span class="w">
|
||||||
</span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"notification"</span><span class="w">
|
</span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"notification"</span><span class="w">
|
||||||
</span><span class="p">}</span><span class="w">
|
</span><span class="p">}</span><span class="w">
|
||||||
</span><span class="p">]</span><span class="w">
|
</span><span class="p">]</span><span class="w">
|
||||||
|
|
Loading…
Reference in New Issue