Merge commit '918563704f5ff5eeb1efa31a412ac38f97781e9e' into glitch-soc/merge-upstream

Conflicts: - `app/helpers/theme_helper.rb`: Upstream modified `theme_color_tags` to work on color scheme rather than theme. Updated it as well. - `app/views/layouts/embedded.html.haml`: Upstream changed the embed theme from `mastodon-light` to `system`. Glitch-soc doesn't use a hardcoded value, so ignore the change. - `spec/helpers/theme_helper_spec.rb`: Accomodate `theme_color_tags` changes.
2026-01-16 22:28:08 +01:00
commit b6b6e142ba
@@ -6,15 +6,17 @@ import { createDataLoadingThunk } from 'mastodon/store/typed_functions';
 import { fetchRelationships } from './accounts';
 import { importFetchedAccounts } from './importer';

+const DIRECTORY_FETCH_LIMIT = 20;
+
 export const fetchDirectory = createDataLoadingThunk(
  'directory/fetch',
  async (params: Parameters<typeof apiGetDirectory>[0]) =>
-    apiGetDirectory(params),
+    apiGetDirectory(params, DIRECTORY_FETCH_LIMIT),
  (data, { dispatch }) => {
    dispatch(importFetchedAccounts(data));
    dispatch(fetchRelationships(data.map((x) => x.id)));

-    return { accounts: data };
+    return { accounts: data, isLast: data.length < DIRECTORY_FETCH_LIMIT };
  },
 );

@@ -26,12 +28,15 @@ export const expandDirectory = createDataLoadingThunk(
      'items',
    ]) as ImmutableList<unknown>;

-    return apiGetDirectory({ ...params, offset: loadedItems.size }, 20);
+    return apiGetDirectory(
+      { ...params, offset: loadedItems.size },
+      DIRECTORY_FETCH_LIMIT,
+    );
  },
  (data, { dispatch }) => {
    dispatch(importFetchedAccounts(data));
    dispatch(fetchRelationships(data.map((x) => x.id)));

-    return { accounts: data };
+    return { accounts: data, isLast: data.length < DIRECTORY_FETCH_LIMIT };
  },
 );
@@ -83,6 +83,9 @@ export const Directory: React.FC<{
    (state) =>
      state.user_lists.getIn(['directory', 'isLoading'], true) as boolean,
  );
+  const hasMore = useAppSelector(
+    (state) => !!state.user_lists.getIn(['directory', 'next']),
+  );

  useEffect(() => {
    void dispatch(fetchDirectory({ order, local }));
@@ -182,7 +185,7 @@ export const Directory: React.FC<{

      <LoadMore
        onClick={handleLoadMore}
-        visible={!initialLoad}
+        visible={!initialLoad && hasMore}
        loading={isLoading}
      />
    </div>
@@ -589,6 +589,7 @@
  "load_pending": "{count, plural, one {# новы элемент} few {# новыя элементы} many {# новых элементаў} other {# новых элементаў}}",
  "loading_indicator.label": "Ідзе загрузка…",
  "media_gallery.hide": "Схаваць",
+  "minicard.more_items": "+ яшчэ {count}",
  "moved_to_account_banner.text": "Ваш уліковы запіс {disabledAccount} зараз адключаны, таму што Вы перайшлі на {movedToAccount}.",
  "mute_modal.hide_from_notifications": "Схаваць з апавяшчэнняў",
  "mute_modal.hide_options": "Схаваць опцыі",
@@ -589,6 +589,7 @@
  "load_pending": "{count, plural, one {# nyt element} other {# nye elementer}}",
  "loading_indicator.label": "Indlæser…",
  "media_gallery.hide": "Skjul",
+  "minicard.more_items": "+ {count} mere",
  "moved_to_account_banner.text": "Din konto {disabledAccount} er i øjeblikket deaktiveret, fordi du er flyttet til {movedToAccount}.",
  "mute_modal.hide_from_notifications": "Skjul fra notifikationer",
  "mute_modal.hide_options": "Skjul valgmuligheder",
@@ -589,6 +589,7 @@
  "load_pending": "{count, plural, one {# neuer Beitrag} other {# neue Beiträge}}",
  "loading_indicator.label": "Lädt …",
  "media_gallery.hide": "Ausblenden",
+  "minicard.more_items": "+ {count} weitere",
  "moved_to_account_banner.text": "Dein Konto {disabledAccount} ist derzeit deaktiviert, weil du zu {movedToAccount} umgezogen bist.",
  "mute_modal.hide_from_notifications": "Auch aus den Benachrichtigungen entfernen",
  "mute_modal.hide_options": "Optionen ausblenden",
@@ -589,6 +589,7 @@
  "load_pending": "{count, plural, one {# νέο στοιχείο} other {# νέα στοιχεία}}",
  "loading_indicator.label": "Φόρτωση…",
  "media_gallery.hide": "Απόκρυψη",
+  "minicard.more_items": "+ {count} ακόμα",
  "moved_to_account_banner.text": "Ο λογαριασμός σου {disabledAccount} είναι προσωρινά απενεργοποιημένος επειδή μεταφέρθηκες στον {movedToAccount}.",
  "mute_modal.hide_from_notifications": "Απόκρυψη από ειδοποιήσεις",
  "mute_modal.hide_options": "Απόκρυψη επιλογών",
@@ -589,6 +589,7 @@
  "load_pending": "{count, plural, one {# new item} other {# new items}}",
  "loading_indicator.label": "Loading…",
  "media_gallery.hide": "Hide",
+  "minicard.more_items": "+ {count} more",
  "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
  "mute_modal.hide_from_notifications": "Hide from notifications",
  "mute_modal.hide_options": "Hide options",
@@ -589,6 +589,7 @@
  "load_pending": "{count, plural, one {# elemento nuevo} other {# elementos nuevos}}",
  "loading_indicator.label": "Cargando…",
  "media_gallery.hide": "Ocultar",
+  "minicard.more_items": "y {count} más",
  "moved_to_account_banner.text": "Tu cuenta {disabledAccount} está actualmente deshabilitada porque te mudaste a {movedToAccount}.",
  "mute_modal.hide_from_notifications": "Ocultar en las notificaciones",
  "mute_modal.hide_options": "Ocultar opciones",
@@ -589,6 +589,7 @@
  "load_pending": "{count, plural, one {# nuevo elemento} other {# nuevos elementos}}",
  "loading_indicator.label": "Cargando…",
  "media_gallery.hide": "Ocultar",
+  "minicard.more_items": "y {count} más",
  "moved_to_account_banner.text": "Tu cuenta {disabledAccount} está actualmente deshabilitada porque te has mudado a {movedToAccount}.",
  "mute_modal.hide_from_notifications": "Ocultar de las notificaciones",
  "mute_modal.hide_options": "Ocultar opciones",
@@ -589,6 +589,7 @@
  "load_pending": "{count, plural, one {# nuevo elemento} other {# nuevos elementos}}",
  "loading_indicator.label": "Cargando…",
  "media_gallery.hide": "Ocultar",
+  "minicard.more_items": "y {count} más",
  "moved_to_account_banner.text": "Tu cuenta {disabledAccount} está actualmente deshabilitada porque te has mudado a {movedToAccount}.",
  "mute_modal.hide_from_notifications": "Ocultar de las notificaciones",
  "mute_modal.hide_options": "Ocultar opciones",
@@ -589,6 +589,7 @@
  "load_pending": "{count, plural, one {# nýtt evni} other {# nýggj evni}}",
  "loading_indicator.label": "Innlesur…",
  "media_gallery.hide": "Fjal",
+  "minicard.more_items": "+ {count} meira",
  "moved_to_account_banner.text": "Konta tín {disabledAccount} er í løtuni óvirkin, tí tú flutti til {movedToAccount}.",
  "mute_modal.hide_from_notifications": "Fjal boð",
  "mute_modal.hide_options": "Fjal valmøguleikar",
@@ -589,6 +589,7 @@
  "load_pending": "{count, plural, one {# új elem} other {# új elem}}",
  "loading_indicator.label": "Betöltés…",
  "media_gallery.hide": "Elrejtés",
+  "minicard.more_items": "+ {count} további",
  "moved_to_account_banner.text": "A(z) {disabledAccount} fiókod jelenleg le van tiltva, mert átköltöztél ide: {movedToAccount}.",
  "mute_modal.hide_from_notifications": "Elrejtés az értesítések közül",
  "mute_modal.hide_options": "Beállítások elrejtése",
@@ -589,6 +589,7 @@
  "load_pending": "{count, plural, one {# nýtt atriði} other {# ný atriði}}",
  "loading_indicator.label": "Hleð inn…",
  "media_gallery.hide": "Fela",
+  "minicard.more_items": "+ {count} í viðbót",
  "moved_to_account_banner.text": "Aðgangurinn þinn {disabledAccount} er óvirkur í augnablikinu vegna þess að þú fluttir þig yfir á {movedToAccount}.",
  "mute_modal.hide_from_notifications": "Fela úr tilkynningum",
  "mute_modal.hide_options": "Fela valkosti",
@@ -69,7 +69,7 @@
  "account.mute_short": "Nutildyti",
  "account.muted": "Nutildytas",
  "account.muting": "Užtildymas",
-  "account.mutual": "Jūs sekate vienas kitą",
+  "account.mutual": "Sekate vienas kitą",
  "account.no_bio": "Nėra pateikto aprašymo.",
  "account.open_original_page": "Atidaryti originalų puslapį",
  "account.posts": "Įrašai",
@@ -685,7 +685,7 @@
  "notifications.filter.follows": "Sekimai",
  "notifications.filter.mentions": "Paminėjimai",
  "notifications.filter.polls": "Balsavimo rezultatai",
-  "notifications.filter.statuses": "Naujinimai iš žmonių, kuriuos seki",
+  "notifications.filter.statuses": "Naujienos iš žmonių, kuriuos sekate",
  "notifications.grant_permission": "Suteikti leidimą.",
  "notifications.group": "{count} pranešimai",
  "notifications.mark_as_read": "Pažymėti kiekvieną pranešimą kaip perskaitytą",
@@ -821,7 +821,7 @@
  "report.thanks.title": "Nenori to matyti?",
  "report.thanks.title_actionable": "Ačiū, kad pranešei, mes tai išnagrinėsime.",
  "report.unfollow": "Nebesekti @{name}",
-  "report.unfollow_explanation": "Tu seki šią paskyrą. Jei nori nebematyti jų įrašų savo pagrindiniame sraute, nebesek jų.",
+  "report.unfollow_explanation": "Jūs sekate šią paskyrą. Kad nebematytumėte jų įrašų savo pagrindiniame sraute, nebesekite.",
  "report_notification.attached_statuses": "Pridėti {count, plural, one {{count} įrašas} few {{count} įrašai} many {{count} įrašo} other {{count} įrašų}}",
  "report_notification.categories.legal": "Teisinės",
  "report_notification.categories.legal_sentence": "nelegalus turinys",
@@ -589,6 +589,7 @@
  "load_pending": "{count, plural, one {# novo item} other {# novos itens}}",
  "loading_indicator.label": "A carregar…",
  "media_gallery.hide": "Esconder",
+  "minicard.more_items": "+ {count} mais",
  "moved_to_account_banner.text": "A tua conta {disabledAccount} está neste momento desativada porque migraste para {movedToAccount}.",
  "mute_modal.hide_from_notifications": "Ocultar das notificações",
  "mute_modal.hide_options": "Ocultar opções",
@@ -587,6 +587,7 @@
  "load_pending": "{count, plural,one {# objekt i ri }other {# objekte të rinj }}",
  "loading_indicator.label": "Po ngarkohet…",
  "media_gallery.hide": "Fshihe",
+  "minicard.more_items": "+ {count} më tepër",
  "moved_to_account_banner.text": "Llogaria juaj {disabledAccount} aktualisht është e çaktivizuar, ngaqë kaluat te {movedToAccount}.",
  "mute_modal.hide_from_notifications": "Fshihe prej njoftimeve",
  "mute_modal.hide_options": "Fshihi mundësitë",
@@ -589,6 +589,7 @@
  "load_pending": "{count, plural, one {# tút mới} other {# tút mới}}",
  "loading_indicator.label": "Đang tải…",
  "media_gallery.hide": "Ẩn",
+  "minicard.more_items": "+ {count} khác",
  "moved_to_account_banner.text": "Tài khoản {disabledAccount} của bạn hiện không khả dụng vì bạn đã chuyển sang {movedToAccount}.",
  "mute_modal.hide_from_notifications": "Ẩn thông báo",
  "mute_modal.hide_options": "Ẩn tùy chọn",
@@ -589,6 +589,7 @@
  "load_pending": "{count} 项",
  "loading_indicator.label": "加载中…",
  "media_gallery.hide": "隐藏",
+  "minicard.more_items": "+ 还有 {count} 项",
  "moved_to_account_banner.text": "你的账号 {disabledAccount} 已禁用，因为你已迁移到 {movedToAccount}。",
  "mute_modal.hide_from_notifications": "从通知中隐藏",
  "mute_modal.hide_options": "隐藏选项",
@@ -589,6 +589,7 @@
  "load_pending": "{count, plural, other {# 個新項目}}",
  "loading_indicator.label": "正在載入...",
  "media_gallery.hide": "隱藏",
+  "minicard.more_items": "+ 其餘 {count} 個",
  "moved_to_account_banner.text": "您的帳號 {disabledAccount} 目前已停用，因為您已搬家至 {movedToAccount}。",
  "mute_modal.hide_from_notifications": "於推播通知中隱藏",
  "mute_modal.hide_options": "隱藏選項",
@@ -204,9 +204,9 @@ export default function userLists(state = initialState, action) {
    else if (fetchFeaturedTags.rejected.match(action))
      return state.setIn(['featured_tags', action.meta.arg.accountId, 'isLoading'], false);
    else if (fetchDirectory.fulfilled.match(action))
-      return normalizeList(state, ['directory'], action.payload.accounts, undefined);
+      return normalizeList(state, ['directory'], action.payload.accounts, action.payload.isLast ? null : true);
    else if (expandDirectory.fulfilled.match(action))
-      return appendToList(state, ['directory'], action.payload.accounts, undefined);
+      return appendToList(state, ['directory'], action.payload.accounts, action.payload.isLast ? null : true);
    else if (fetchDirectory.pending.match(action) ||
     expandDirectory.pending.match(action))
      return state.setIn(['directory', 'isLoading'], true);