Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
Rosekey
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
freelynetwork
Rosekey
Commits
39c058a4
Commit
39c058a4
authored
2 years ago
by
syuilo
Browse files
Options
Downloads
Plain Diff
Merge branch 'develop' of
https://github.com/misskey-dev/misskey
into develop
parents
d1807ee5
e6a76b31
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.md
+2
-1
2 additions, 1 deletion
CHANGELOG.md
packages/backend/src/server/api/endpoints/following/requests/list.ts
+13
-5
13 additions, 5 deletions
...ckend/src/server/api/endpoints/following/requests/list.ts
with
15 additions
and
6 deletions
CHANGELOG.md
+
2
−
1
View file @
39c058a4
...
...
@@ -51,7 +51,7 @@ You should also include the user name that made the change.
-
0.12.xの変更点についてはこちら https://github.com/syuilo/aiscript/blob/master/CHANGELOG.md#0120
-
0.12.x未満のプラグインは読み込むことはできません
-
iOS15以下のデバイスはサポートされなくなりました
-
Firefox10
9
以下はサポートされなくなりました
-
Firefox1
1
0以下はサポートされなくなりました
#### For app developers
-
API: metaのレスポンスに
`emojis`
プロパティが含まれなくなりました
...
...
@@ -130,6 +130,7 @@ You should also include the user name that made the change.
-
Server: 特定のPNG画像のアップロードに失敗する問題を修正 @usbharu
-
Server: 非公開のクリップのURLでOGPレンダリングされる問題を修正 @syuilo
-
Server: アンテナタイムライン(ストリーミング)が、フォローしていないユーザーの鍵投稿も拾ってしまう @syuilo
-
Server: follow request list api pagination @sim1222
-
Client: パスワードマネージャーなどでユーザー名がオートコンプリートされない問題を修正 @massongit
-
Client: 日付形式の文字列などがカスタム絵文字として表示されるのを修正 @syuilo
-
Client: case insensitive emoji search @saschanaz
...
...
This diff is collapsed.
Click to expand it.
packages/backend/src/server/api/endpoints/following/requests/list.ts
+
13
−
5
View file @
39c058a4
import
{
Inject
,
Injectable
}
from
'
@nestjs/common
'
;
import
{
Endpoint
}
from
'
@/server/api/endpoint-base.js
'
;
import
{
QueryService
}
from
'
@/core/QueryService.js
'
;
import
type
{
FollowRequestsRepository
}
from
'
@/models/index.js
'
;
import
{
FollowRequestEntityService
}
from
'
@/core/entities/FollowRequestEntityService.js
'
;
import
{
DI
}
from
'
@/di-symbols.js
'
;
...
...
@@ -40,7 +41,11 @@ export const meta = {
export
const
paramDef
=
{
type
:
'
object
'
,
properties
:
{},
properties
:
{
sinceId
:
{
type
:
'
string
'
,
format
:
'
misskey:id
'
},
untilId
:
{
type
:
'
string
'
,
format
:
'
misskey:id
'
},
limit
:
{
type
:
'
integer
'
,
minimum
:
1
,
maximum
:
100
,
default
:
10
},
},
required
:
[],
}
as const
;
...
...
@@ -52,13 +57,16 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
private
followRequestsRepository
:
FollowRequestsRepository
,
private
followRequestEntityService
:
FollowRequestEntityService
,
private
queryService
:
QueryService
,
)
{
super
(
meta
,
paramDef
,
async
(
ps
,
me
)
=>
{
const
reqs
=
await
this
.
followRequestsRepository
.
findBy
({
followeeId
:
me
.
id
,
});
const
query
=
this
.
queryService
.
makePaginationQuery
(
this
.
followRequestsRepository
.
createQueryBuilder
(
'
request
'
),
ps
.
sinceId
,
ps
.
untilId
);
const
requests
=
await
query
.
take
(
ps
.
limit
)
.
getMany
();
return
await
Promise
.
all
(
reqs
.
map
(
req
=>
this
.
followRequestEntityService
.
pack
(
req
)));
return
await
Promise
.
all
(
req
uest
s
.
map
(
req
=>
this
.
followRequestEntityService
.
pack
(
req
)));
});
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment