From d5bc0ab39cb9c2ffea7cf865fe1c755920c65c05 Mon Sep 17 00:00:00 2001 From: Mizunashi Mana Date: Fri, 21 Jul 2023 17:31:19 +0900 Subject: [PATCH 1/4] Add feeds translations for ja_JP --- locales/ja-JP.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 46a486d916..3333d1a6d4 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1959,3 +1959,8 @@ donationLink: 寄付ページへのリンク removeMember: メンバーを削除 removeQuote: 引用を削除 removeRecipient: 宛先を削除 +_feeds: + copyFeed: "フィードのURLをコピー" + rss: "RSS" + atom: "Atom" + jsonFeed: "JSONフィード" From 9854b313fdbd7fde78972b39eeb6fd163ad1d1db Mon Sep 17 00:00:00 2001 From: Mizunashi Mana Date: Sun, 23 Jul 2023 00:41:55 +0900 Subject: [PATCH 2/4] Add lang translation for bul_BG --- locales/bul_BG.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/bul_BG.yml b/locales/bul_BG.yml index 0967ef424b..ea453824bc 100644 --- a/locales/bul_BG.yml +++ b/locales/bul_BG.yml @@ -1 +1 @@ -{} +_lang_: Български From c0eac56355a0c40ac4d9c0bae82917506e011dc3 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Sun, 23 Jul 2023 14:13:46 -0700 Subject: [PATCH 3/4] fix: :bug: antenna notes pagination repeat --- .../src/server/api/endpoints/antennas/notes.ts | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) 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); From f5a88e70803fd8726dd8d81292d879bf810ba7e1 Mon Sep 17 00:00:00 2001 From: naskya Date: Mon, 24 Jul 2023 00:55:26 +0000 Subject: [PATCH 4/4] Update patrons.json --- patrons.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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",