Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'misskey-original/develop' into develop

Browse source 
# Conflicts:
#	packages/frontend/src/pages/drop-and-fusion.game.vue
#	packages/frontend/src/pages/drop-and-fusion.vue
#	packages/frontend/src/scripts/drop-and-fusion-engine.ts
This commit is contained in:
mattyatea 2024-01-17 20:22:58 +09:00
commit 04ed64b19b
14 changed files with 99 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packages/backend/src/core/activitypub/ApAudienceService.ts
View file

@ -58,7 +58,7 @@ export class ApAudienceService {
};
}
if (toGroups.followers.length > 0) {
if (toGroups.followers.length > 0 || ccGroups.followers.length > 0) {
return {
visibility: 'followers',
mentionedUsers,

4
packages/backend/src/server/api/endpoints/bubble-game/register.ts
View file

@ -63,8 +63,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
throw new ApiError(meta.errors.invalidSeed);
}
// シードが古すぎる(1時間以上前)のも弾く
if (seedDate.getTime() < now.getTime() - 1000 * 60 * 60) {
// シードが古すぎる(5時間以上前)のも弾く
if (seedDate.getTime() < now.getTime() - 1000 * 60 * 60 * 5) {
throw new ApiError(meta.errors.invalidSeed);
}