diff --git a/custom/assets/badges/error.png b/custom/assets/badges/error.png index e90912b405..046f18e149 100644 Binary files a/custom/assets/badges/error.png and b/custom/assets/badges/error.png differ diff --git a/custom/assets/badges/info.png b/custom/assets/badges/info.png index ac70544e4a..c6ab300a72 100644 Binary files a/custom/assets/badges/info.png and b/custom/assets/badges/info.png differ diff --git a/custom/assets/badges/not-found.png b/custom/assets/badges/not-found.png index 73d611e0e1..63356530ce 100644 Binary files a/custom/assets/badges/not-found.png and b/custom/assets/badges/not-found.png differ diff --git a/packages/backend/src/server/api/endpoints/antennas/notes.ts b/packages/backend/src/server/api/endpoints/antennas/notes.ts index 6ca71c08e2..4d3bdfb274 100644 --- a/packages/backend/src/server/api/endpoints/antennas/notes.ts +++ b/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, - ); // untilIdに指定したものも含まれるため+1 + limit, + ); 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); diff --git a/patrons.json b/patrons.json index 6544466b9e..450b44fa99 100644 --- a/patrons.json +++ b/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",