Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Sharkey
Manage
Activity
Members
Labels
Plan
Issues
338
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
28
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
TransFem.org
Sharkey
Commits
6c982629
Commit
6c982629
authored
2 years ago
by
syuilo
Browse files
Options
Downloads
Plain Diff
Merge branch 'develop'
parents
9d842144
110bbbc7
No related branches found
Branches containing commit
Tags
13.2.6
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
package.json
+1
-1
1 addition, 1 deletion
package.json
packages/backend/src/core/UserFollowingService.ts
+4
-4
4 additions, 4 deletions
packages/backend/src/core/UserFollowingService.ts
with
5 additions
and
5 deletions
package.json
+
1
−
1
View file @
6c982629
{
"name"
:
"misskey"
,
"version"
:
"13.3.
3
"
,
"version"
:
"13.3.
4
"
,
"codename"
:
"nasubi"
,
"repository"
:
{
"type"
:
"git"
,
...
...
This diff is collapsed.
Click to expand it.
packages/backend/src/core/UserFollowingService.ts
+
4
−
4
View file @
6c982629
...
...
@@ -89,8 +89,8 @@ export class UserFollowingService {
await
this
.
userBlockingService
.
unblock
(
follower
,
followee
);
}
else
{
// それ以外は単純に例外
if
(
blocking
!=
null
)
throw
new
IdentifiableError
(
'
710e8fb0-b8c3-4922-be49-d5d93d8e6a6e
'
,
'
blocking
'
);
if
(
blocked
!=
null
)
throw
new
IdentifiableError
(
'
3338392a-f764-498d-8855-db939dcf8c48
'
,
'
blocked
'
);
if
(
blocking
)
throw
new
IdentifiableError
(
'
710e8fb0-b8c3-4922-be49-d5d93d8e6a6e
'
,
'
blocking
'
);
if
(
blocked
)
throw
new
IdentifiableError
(
'
3338392a-f764-498d-8855-db939dcf8c48
'
,
'
blocked
'
);
}
const
followeeProfile
=
await
this
.
userProfilesRepository
.
findOneByOrFail
({
userId
:
followee
.
id
});
...
...
@@ -353,8 +353,8 @@ export class UserFollowingService {
this
.
userBlockingService
.
checkBlocked
(
followee
.
id
,
follower
.
id
),
]);
if
(
blocking
!=
null
)
throw
new
Error
(
'
blocking
'
);
if
(
blocked
!=
null
)
throw
new
Error
(
'
blocked
'
);
if
(
blocking
)
throw
new
Error
(
'
blocking
'
);
if
(
blocked
)
throw
new
Error
(
'
blocked
'
);
const
followRequest
=
await
this
.
followRequestsRepository
.
insert
({
id
:
this
.
idService
.
genId
(),
...
...
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