natty
/
calckey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finalise POST-Move

This commit is contained in:
cutestnekoaqua 2022-12-16 01:06:12 +01:00
parent 8ba9380743
commit 3cdcc207b9
No known key found for this signature in database
GPG Key ID: 6BF0964A5069C1E0
6 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
locales/de-DE.yml
View File

@ -89,7 +89,7 @@ privacy: "Privatsphäre"
makeFollowManuallyApprove: "Follow-Anfragen benötigen Bestätigung"
defaultNoteVisibility: "Standardsichtbarkeit"
follow: "Folgen"
followRequest: "Follow-Anfrage senden"
followRequest: "Follow anfragen"
followRequests: "Follow-Anfragen"
unfollow: "Nicht mehr folgen"
followRequestPending: "Follow-Anfrage ausstehend"

2
locales/en-US.yml
View File

@ -89,7 +89,7 @@ privacy: "Privacy"
makeFollowManuallyApprove: "Follow requests require approval"
defaultNoteVisibility: "Default visibility"
follow: "Follow"
followRequest: "Send follow request"
followRequest: "Request follow"
followRequests: "Follow requests"
unfollow: "Unfollow"
followRequestPending: "Follow request pending"

1
packages/backend/src/server/api/endpoints/antennas/create.ts
View File

@ -62,6 +62,7 @@ export const paramDef = {
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, user) => {
if(user.movedToUri != null) throw new ApiError(meta.errors.noSuchUserGroup);
let userList;
let userGroupJoining;

4
packages/backend/src/server/api/endpoints/app/create.ts
View File

@ -31,6 +31,10 @@ export const paramDef = {
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, user) => {
if(user && user.movedToUri != null) return await Apps.pack("", null, {
detail: true,
includeSecret: true,
});;
// Generate secret
const secret = secureRndstr(32, true);

2
packages/backend/src/server/api/endpoints/notes/create.ts
View File

@ -169,7 +169,7 @@ export const paramDef = {
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, user) => {
if(user.movedToUri) throw new ApiError(meta.errors.accountLocked);
if(user.movedToUri != null) throw new ApiError(meta.errors.accountLocked);
let visibleUsers: User[] = [];
if (ps.visibleUserIds) {
visibleUsers = await Users.findBy({

6
packages/backend/src/server/api/endpoints/notes/reactions/create.ts
View File

@ -28,6 +28,11 @@ export const meta = {
code: 'YOU_HAVE_BEEN_BLOCKED',
id: '20ef5475-9f38-4e4c-bd33-de6d979498ec',
},
accountLocked: {
message: 'You migrated. Your account is now locked.',
code: 'ACCOUNT_LOCKED',
id: 'd390d7e1-8a5e-46ed-b625-06271cafd3d3',
},
},
} as const;
@ -42,6 +47,7 @@ export const paramDef = {
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, user) => {
if(user.movedToUri != null) throw new ApiError(meta.errors.accountLocked);
const note = await getNote(ps.noteId, user).catch(err => {
if (err.id === '9725d0ce-ba28-4dde-95a7-2cbb2c15de24') throw new ApiError(meta.errors.noSuchNote);
throw err;