Merge branch firefish:develop into fix/10404-object-storage-prefix

locales/bul_BG.yml

@@ -1 +1 @@
-{}
+_lang_: Български

locales/ja-JP.yml

@@ -1959,3 +1959,8 @@ donationLink: 寄付ページへのリンク
 removeMember: メンバーを削除
 removeQuote: 引用を削除
 removeRecipient: 宛先を削除
+_feeds:
+  copyFeed: "フィードのURLをコピー"
+  rss: "RSS"
+  atom: "Atom"
+  jsonFeed: "JSONフィード"

packages/backend/src/server/api/endpoints/antennas/notes.ts

@@ -60,13 +60,14 @@ export default define(meta, paramDef, async (ps, user) => {
 		throw new ApiError(meta.errors.noSuchAntenna);
 	}
 
+	const limit = ps.limit + (ps.untilId ? 1 : 0) + (ps.sinceId ? 1 : 0); // untilIdに指定したものも含まれるため+1
 	const noteIdsRes = await redisClient.xrevrange(
 		`antennaTimeline:${antenna.id}`,
-		ps.untilDate || "+",
+		ps.untilDate ?? "+",
-		"-",
+		ps.sinceDate ?? "-",
 		"COUNT",
-		ps.limit + 1,
+		limit,
-	); // untilIdに指定したものも含まれるため+1
+	);
 
 	if (noteIdsRes.length === 0) {
 		return [];
@@ -74,7 +75,7 @@ export default define(meta, paramDef, async (ps, user) => {
 
 	const noteIds = noteIdsRes
 		.map((x) => x[1][1])
-		.filter((x) => x !== ps.untilId);
+		.filter((x) => x !== ps.untilId && x !== ps.sinceId);
 
 	if (noteIds.length === 0) {
 		return [];
@@ -105,7 +106,8 @@ export default define(meta, paramDef, async (ps, user) => {
 	generateMutedUserQuery(query, user);
 	generateBlockedUserQuery(query, user);
 
-	const notes = await query.take(ps.limit).getMany();
+	const notes = await query.getMany();
+	notes.sort((a, b) => (a.id > b.id ? -1 : 1));
 
 	if (notes.length > 0) {
 		readNote(user.id, notes);

patrons.json

@@ -16,7 +16,7 @@
 		"@surfbum@firefish.nz",
 		"@topher@mastodon.online",
 		"@hanicef@stop.voring.me",
-		"@nmkj@firefish.jp",
+		"@nmkj@calckey.jp",
 		"@unattributed@firefish.social",
 		"@cody@misskey.codingneko.com",
 		"@kate@blahaj.zone",
@@ -53,9 +53,9 @@
 		"@riversidebryan@firefish.lgbt",
 		"@aRubes@sloth.run",
 		"@andreasdotorg@firefish.social",
-		"@ozzy@firefish.online",
+		"@ozzy@calckey.online",
 		"@leni@windycity.style",
-		"@mhzmodels@firefish.art",
+		"@mhzmodels@calckey.art",
 		"@ReflexVE@firefish.social",
 		"@mark@firefish.social",
 		"@skyizwhite@himagine.club",
@@ -96,7 +96,7 @@
 		"@seasicksailor@firefish.social",
 		"@geerue@firefish.social",
 		"@WXFanatic@m.ai6yr.org",
-		"@Hunkabilly@firefish.world"
+		"@Hunkabilly@calckey.world"
 	],
 	"sponsors": [
 		"@atomicpoet@firefish.social",