refactor: deduplicate section logic and simplify activity flows

app.py

@@ -937,7 +937,7 @@ def classify_paper_event(event: dict):
 
 
 # ============================================================
-# Upvotes activity fetch
+# Upvotes / Likes / Papers activity fetch
 # ============================================================
 def empty_upvotes_state(selected_year: int):
     return empty_bucketed_activity_state(
@@ -972,9 +972,6 @@ def fetch_all_upvotes_activity(username: str, selected_year: int):
     )
 
 
-# ============================================================
-# Likes activity fetch
-# ============================================================
 def empty_likes_state(selected_year: int):
     return empty_bucketed_activity_state(
         selected_year=selected_year,
@@ -1008,9 +1005,6 @@ def fetch_all_likes_activity(username: str, selected_year: int):
     )
 
 
-# ============================================================
-# Papers activity fetch
-# ============================================================
 def empty_papers_state(selected_year: int):
     return empty_bucketed_activity_state(
         selected_year=selected_year,
@@ -1183,100 +1177,24 @@ def render_metric_cards(
     """
 
 
-def render_idle_context_banner(
-    username: str,
-    profile: gr.OAuthProfile | None,
-):
-    username = (username or "").strip()
+# ============================================================
+# Generic banner helpers
+# ============================================================
+def viewer_banner_prefix(profile: gr.OAuthProfile | None) -> list[str]:
     viewer = getattr(profile, "username", None) if profile else None
-
     if viewer:
-        if not username or username.lower() == viewer.lower():
-            return render_status_badge(
-                f"Logged in as <b>{html.escape(viewer)}</b> · Fetch your activity or enter another username"
-            )
-        return render_status_badge(
-            f"Logged in as <b>{html.escape(viewer)}</b> · Ready to fetch <b>{html.escape(username)}</b> · Public repos only"
-        )
+        return [f"Logged in as <b>{html.escape(viewer)}</b>"]
+    return ["Not logged in"]
 
-    if username:
-        return render_status_badge(
-            f"Not logged in · Ready to fetch <b>{html.escape(username)}</b> · Public repos only"
-        )
 
-    return render_status_badge("Not logged in · Enter a username to get started")
-
-
-def render_invalid_username_banner(username: str, error_text: str | None = None):
+def render_generic_invalid_banner(username: str, error_text: str | None = None):
     username = (username or "").strip()
     message = error_text or f"Username or org '{username}' was not found."
     return render_status_badge(html.escape(message))
 
 
-def render_context_banner(app_state: dict | None, profile: gr.OAuthProfile | None):
-    if not app_state or not app_state.get("username"):
-        return render_idle_context_banner("", profile)
-
-    username = app_state["username"]
-    selected_year = int(app_state["selected_year"])
-    is_own = bool(app_state.get("is_own_profile", False))
-    can_toggle = bool(app_state.get("can_toggle_visibility", False))
-    viewer = getattr(profile, "username", None) if profile else None
-
-    parts = []
-
-    if viewer:
-        parts.append(f"Logged in as <b>{html.escape(viewer)}</b>")
-    else:
-        parts.append("Not logged in")
-
-    if viewer and username.lower() == viewer.lower():
-        parts.append("Viewing <b>your activity</b>")
-    else:
-        parts.append(f"Viewing <b>{html.escape(username)}</b>")
-
-    parts.append(str(selected_year))
-
-    if is_own and can_toggle:
-        parts.append("Private repos available")
-    else:
-        parts.append("Public repos only")
-
-    return render_status_badge(" · ".join(parts))
-
-
-def render_fetching_context_banner(
-    username,
-    selected_year,
-    profile: gr.OAuthProfile | None,
-):
-    username = (username or "").strip()
-    selected_year = int(selected_year)
-    viewer = getattr(profile, "username", None) if profile else None
-
-    if not username:
-        return render_idle_context_banner("", profile)
-
-    parts = []
-
-    if viewer:
-        parts.append(f"Logged in as <b>{html.escape(viewer)}</b>")
-    else:
-        parts.append("Not logged in")
-
-    if viewer and username.lower() == viewer.lower():
-        parts.append("Fetching <b>your activity</b>")
-        parts.append(str(selected_year))
-        parts.append("Checking public and private repos")
-    else:
-        parts.append(f"Fetching <b>{html.escape(username)}</b>")
-        parts.append(str(selected_year))
-        parts.append("Checking public repos")
-
-    return render_status_badge(" · ".join(parts))
-
-
-def render_community_idle_banner(
+def render_section_idle_banner(
+    section_label: str,
     username,
     selected_year,
     profile: gr.OAuthProfile | None,
@@ -1285,33 +1203,23 @@ def render_community_idle_banner(
     selected_year = int(selected_year)
     viewer = getattr(profile, "username", None) if profile else None
 
-    parts = []
-    if viewer:
-        parts.append(f"Logged in as <b>{html.escape(viewer)}</b>")
-    else:
-        parts.append("Not logged in")
+    parts = viewer_banner_prefix(profile)
 
     if not username:
-        parts.append("Enter a username to fetch community activity")
+        parts.append(f"Enter a username to fetch {section_label.lower()}")
         return render_status_badge(" · ".join(parts))
 
     if viewer and username.lower() == viewer.lower():
-        parts.append("Fetch your community activity or enter another username")
-        parts.append(str(selected_year))
+        parts.append(f"Fetch your {section_label.lower()} or enter another username")
     else:
-        parts.append(f"Ready to fetch community activity for <b>{html.escape(username)}</b>")
-        parts.append(str(selected_year))
+        parts.append(f"Ready to fetch {section_label.lower()} for <b>{html.escape(username)}</b>")
 
+    parts.append(str(selected_year))
     return render_status_badge(" · ".join(parts))
 
 
-def render_community_invalid_banner(username: str, error_text: str | None = None):
-    username = (username or "").strip()
-    message = error_text or f"Username or org '{username}' was not found."
-    return render_status_badge(html.escape(message))
-
-
-def render_community_fetching_banner(
+def render_section_fetching_banner(
+    section_label: str,
     username,
     selected_year,
     profile: gr.OAuthProfile | None,
@@ -1321,140 +1229,107 @@ def render_community_fetching_banner(
     viewer = getattr(profile, "username", None) if profile else None
 
     if not username:
-        return render_community_idle_banner("", selected_year, profile)
+        return render_section_idle_banner(section_label, "", selected_year, profile)
 
-    parts = []
-    if viewer:
-        parts.append(f"Logged in as <b>{html.escape(viewer)}</b>")
-    else:
-        parts.append("Not logged in")
+    parts = viewer_banner_prefix(profile)
 
     if viewer and username.lower() == viewer.lower():
-        parts.append("Fetching <b>your community activity</b>")
+        parts.append(f"Fetching <b>your {section_label.lower()}</b>")
     else:
-        parts.append(f"Fetching community activity for <b>{html.escape(username)}</b>")
+        parts.append(f"Fetching {section_label.lower()} for <b>{html.escape(username)}</b>")
 
     parts.append(str(selected_year))
     return render_status_badge(" · ".join(parts))
 
 
-def render_community_loaded_banner(
-    community_state: dict | None,
+def render_section_loaded_banner(
+    section_label: str,
+    state: dict | None,
     profile: gr.OAuthProfile | None,
 ):
-    if not community_state or not community_state.get("username"):
-        year = community_state.get("selected_year", datetime.now().year) if community_state else datetime.now().year
-        return render_community_idle_banner("", year, profile)
+    year = state.get("selected_year", datetime.now().year) if state else datetime.now().year
+    if not state or not state.get("username"):
+        return render_section_idle_banner(section_label, "", year, profile)
 
-    username = community_state["username"]
-    selected_year = int(community_state["selected_year"])
+    username = state["username"]
+    selected_year = int(state["selected_year"])
     viewer = getattr(profile, "username", None) if profile else None
 
-    parts = []
-    if viewer:
-        parts.append(f"Logged in as <b>{html.escape(viewer)}</b>")
-    else:
-        parts.append("Not logged in")
+    parts = viewer_banner_prefix(profile)
 
     if viewer and username.lower() == viewer.lower():
-        parts.append("Viewing <b>your community activity</b>")
+        parts.append(f"Viewing <b>your {section_label.lower()}</b>")
     else:
-        parts.append(f"Viewing community activity for <b>{html.escape(username)}</b>")
+        parts.append(f"Viewing {section_label.lower()} for <b>{html.escape(username)}</b>")
 
     parts.append(str(selected_year))
     return render_status_badge(" · ".join(parts))
 
 
-def render_upvotes_idle_banner(
-    username,
-    selected_year,
+# ============================================================
+# Repo-specific banners
+# ============================================================
+def render_idle_context_banner(
+    username: str,
     profile: gr.OAuthProfile | None,
 ):
     username = (username or "").strip()
-    selected_year = int(selected_year)
     viewer = getattr(profile, "username", None) if profile else None
 
-    parts = []
     if viewer:
-        parts.append(f"Logged in as <b>{html.escape(viewer)}</b>")
-    else:
-        parts.append("Not logged in")
+        if not username or username.lower() == viewer.lower():
+            return render_status_badge(
+                f"Logged in as <b>{html.escape(viewer)}</b> · Fetch your activity or enter another username"
+            )
+        return render_status_badge(
+            f"Logged in as <b>{html.escape(viewer)}</b> · Ready to fetch <b>{html.escape(username)}</b> · Public repos only"
+        )
 
-    if not username:
-        parts.append("Enter a username to fetch upvotes activity")
-        return render_status_badge(" · ".join(parts))
+    if username:
+        return render_status_badge(
+            f"Not logged in · Ready to fetch <b>{html.escape(username)}</b> · Public repos only"
+        )
 
-    if viewer and username.lower() == viewer.lower():
-        parts.append("Fetch your upvotes activity or enter another username")
-        parts.append(str(selected_year))
-    else:
-        parts.append(f"Ready to fetch upvotes activity for <b>{html.escape(username)}</b>")
-        parts.append(str(selected_year))
+    return render_status_badge("Not logged in · Enter a username to get started")
 
-    return render_status_badge(" · ".join(parts))
 
+def render_invalid_username_banner(username: str, error_text: str | None = None):
+    return render_generic_invalid_banner(username, error_text)
 
-def render_upvotes_invalid_banner(username: str, error_text: str | None = None):
-    username = (username or "").strip()
-    message = error_text or f"Username or org '{username}' was not found."
-    return render_status_badge(html.escape(message))
 
+def render_context_banner(app_state: dict | None, profile: gr.OAuthProfile | None):
+    if not app_state or not app_state.get("username"):
+        return render_idle_context_banner("", profile)
 
-def render_upvotes_fetching_banner(
-    username,
-    selected_year,
-    profile: gr.OAuthProfile | None,
-):
-    username = (username or "").strip()
-    selected_year = int(selected_year)
+    username = app_state["username"]
+    selected_year = int(app_state["selected_year"])
+    is_own = bool(app_state.get("is_own_profile", False))
+    can_toggle = bool(app_state.get("can_toggle_visibility", False))
     viewer = getattr(profile, "username", None) if profile else None
 
-    if not username:
-        return render_upvotes_idle_banner("", selected_year, profile)
-
     parts = []
+
     if viewer:
         parts.append(f"Logged in as <b>{html.escape(viewer)}</b>")
     else:
         parts.append("Not logged in")
 
     if viewer and username.lower() == viewer.lower():
-        parts.append("Fetching <b>your upvotes activity</b>")
+        parts.append("Viewing <b>your activity</b>")
     else:
-        parts.append(f"Fetching upvotes activity for <b>{html.escape(username)}</b>")
+        parts.append(f"Viewing <b>{html.escape(username)}</b>")
 
     parts.append(str(selected_year))
-    return render_status_badge(" · ".join(parts))
-
 
-def render_upvotes_loaded_banner(
-    upvotes_state: dict | None,
-    profile: gr.OAuthProfile | None,
-):
-    if not upvotes_state or not upvotes_state.get("username"):
-        year = upvotes_state.get("selected_year", datetime.now().year) if upvotes_state else datetime.now().year
-        return render_upvotes_idle_banner("", year, profile)
-
-    username = upvotes_state["username"]
-    selected_year = int(upvotes_state["selected_year"])
-    viewer = getattr(profile, "username", None) if profile else None
-
-    parts = []
-    if viewer:
-        parts.append(f"Logged in as <b>{html.escape(viewer)}</b>")
-    else:
-        parts.append("Not logged in")
-
-    if viewer and username.lower() == viewer.lower():
-        parts.append("Viewing <b>your upvotes activity</b>")
+    if is_own and can_toggle:
+        parts.append("Private repos available")
     else:
-        parts.append(f"Viewing upvotes activity for <b>{html.escape(username)}</b>")
+        parts.append("Public repos only")
 
-    parts.append(str(selected_year))
     return render_status_badge(" · ".join(parts))
 
 
-def render_likes_idle_banner(
+def render_fetching_context_banner(
     username,
     selected_year,
     profile: gr.OAuthProfile | None,
@@ -1463,173 +1338,93 @@ def render_likes_idle_banner(
     selected_year = int(selected_year)
     viewer = getattr(profile, "username", None) if profile else None
 
+    if not username:
+        return render_idle_context_banner("", profile)
+
     parts = []
+
     if viewer:
         parts.append(f"Logged in as <b>{html.escape(viewer)}</b>")
     else:
         parts.append("Not logged in")
 
-    if not username:
-        parts.append("Enter a username to fetch likes activity")
-        return render_status_badge(" · ".join(parts))
-
     if viewer and username.lower() == viewer.lower():
-        parts.append("Fetch your likes activity or enter another username")
+        parts.append("Fetching <b>your activity</b>")
         parts.append(str(selected_year))
+        parts.append("Checking public and private repos")
     else:
-        parts.append(f"Ready to fetch likes activity for <b>{html.escape(username)}</b>")
+        parts.append(f"Fetching <b>{html.escape(username)}</b>")
         parts.append(str(selected_year))
+        parts.append("Checking public repos")
 
     return render_status_badge(" · ".join(parts))
 
 
-def render_likes_invalid_banner(username: str, error_text: str | None = None):
-    username = (username or "").strip()
-    message = error_text or f"Username or org '{username}' was not found."
-    return render_status_badge(html.escape(message))
+# ============================================================
+# Section-specific banner wrappers
+# ============================================================
+def render_community_idle_banner(username, selected_year, profile: gr.OAuthProfile | None):
+    return render_section_idle_banner("community activity", username, selected_year, profile)
 
 
-def render_likes_fetching_banner(
-    username,
-    selected_year,
-    profile: gr.OAuthProfile | None,
-):
-    username = (username or "").strip()
-    selected_year = int(selected_year)
-    viewer = getattr(profile, "username", None) if profile else None
+def render_community_invalid_banner(username: str, error_text: str | None = None):
+    return render_generic_invalid_banner(username, error_text)
 
-    if not username:
-        return render_likes_idle_banner("", selected_year, profile)
 
-    parts = []
-    if viewer:
-        parts.append(f"Logged in as <b>{html.escape(viewer)}</b>")
-    else:
-        parts.append("Not logged in")
+def render_community_fetching_banner(username, selected_year, profile: gr.OAuthProfile | None):
+    return render_section_fetching_banner("community activity", username, selected_year, profile)
 
-    if viewer and username.lower() == viewer.lower():
-        parts.append("Fetching <b>your likes activity</b>")
-    else:
-        parts.append(f"Fetching likes activity for <b>{html.escape(username)}</b>")
 
-    parts.append(str(selected_year))
-    return render_status_badge(" · ".join(parts))
+def render_community_loaded_banner(community_state: dict | None, profile: gr.OAuthProfile | None):
+    return render_section_loaded_banner("community activity", community_state, profile)
 
 
-def render_likes_loaded_banner(
-    likes_state: dict | None,
-    profile: gr.OAuthProfile | None,
-):
-    if not likes_state or not likes_state.get("username"):
-        year = likes_state.get("selected_year", datetime.now().year) if likes_state else datetime.now().year
-        return render_likes_idle_banner("", year, profile)
+def render_upvotes_idle_banner(username, selected_year, profile: gr.OAuthProfile | None):
+    return render_section_idle_banner("upvotes activity", username, selected_year, profile)
 
-    username = likes_state["username"]
-    selected_year = int(likes_state["selected_year"])
-    viewer = getattr(profile, "username", None) if profile else None
 
-    parts = []
-    if viewer:
-        parts.append(f"Logged in as <b>{html.escape(viewer)}</b>")
-    else:
-        parts.append("Not logged in")
+def render_upvotes_invalid_banner(username: str, error_text: str | None = None):
+    return render_generic_invalid_banner(username, error_text)
 
-    if viewer and username.lower() == viewer.lower():
-        parts.append("Viewing <b>your likes activity</b>")
-    else:
-        parts.append(f"Viewing likes activity for <b>{html.escape(username)}</b>")
 
-    parts.append(str(selected_year))
-    return render_status_badge(" · ".join(parts))
+def render_upvotes_fetching_banner(username, selected_year, profile: gr.OAuthProfile | None):
+    return render_section_fetching_banner("upvotes activity", username, selected_year, profile)
 
 
-def render_papers_idle_banner(
-    username,
-    selected_year,
-    profile: gr.OAuthProfile | None,
-):
-    username = (username or "").strip()
-    selected_year = int(selected_year)
-    viewer = getattr(profile, "username", None) if profile else None
+def render_upvotes_loaded_banner(upvotes_state: dict | None, profile: gr.OAuthProfile | None):
+    return render_section_loaded_banner("upvotes activity", upvotes_state, profile)
 
-    parts = []
-    if viewer:
-        parts.append(f"Logged in as <b>{html.escape(viewer)}</b>")
-    else:
-        parts.append("Not logged in")
 
-    if not username:
-        parts.append("Enter a username to fetch papers activity")
-        return render_status_badge(" · ".join(parts))
+def render_likes_idle_banner(username, selected_year, profile: gr.OAuthProfile | None):
+    return render_section_idle_banner("likes activity", username, selected_year, profile)
 
-    if viewer and username.lower() == viewer.lower():
-        parts.append("Fetch your papers activity or enter another username")
-        parts.append(str(selected_year))
-    else:
-        parts.append(f"Ready to fetch papers activity for <b>{html.escape(username)}</b>")
-        parts.append(str(selected_year))
 
-    return render_status_badge(" · ".join(parts))
+def render_likes_invalid_banner(username: str, error_text: str | None = None):
+    return render_generic_invalid_banner(username, error_text)
 
 
-def render_papers_invalid_banner(username: str, error_text: str | None = None):
-    username = (username or "").strip()
-    message = error_text or f"Username or org '{username}' was not found."
-    return render_status_badge(html.escape(message))
+def render_likes_fetching_banner(username, selected_year, profile: gr.OAuthProfile | None):
+    return render_section_fetching_banner("likes activity", username, selected_year, profile)
 
 
-def render_papers_fetching_banner(
-    username,
-    selected_year,
-    profile: gr.OAuthProfile | None,
-):
-    username = (username or "").strip()
-    selected_year = int(selected_year)
-    viewer = getattr(profile, "username", None) if profile else None
+def render_likes_loaded_banner(likes_state: dict | None, profile: gr.OAuthProfile | None):
+    return render_section_loaded_banner("likes activity", likes_state, profile)
 
-    if not username:
-        return render_papers_idle_banner("", selected_year, profile)
 
-    parts = []
-    if viewer:
-        parts.append(f"Logged in as <b>{html.escape(viewer)}</b>")
-    else:
-        parts.append("Not logged in")
+def render_papers_idle_banner(username, selected_year, profile: gr.OAuthProfile | None):
+    return render_section_idle_banner("papers activity", username, selected_year, profile)
 
-    if viewer and username.lower() == viewer.lower():
-        parts.append("Fetching <b>your papers activity</b>")
-    else:
-        parts.append(f"Fetching papers activity for <b>{html.escape(username)}</b>")
-
-    parts.append(str(selected_year))
-    return render_status_badge(" · ".join(parts))
 
+def render_papers_invalid_banner(username: str, error_text: str | None = None):
+    return render_generic_invalid_banner(username, error_text)
 
-def render_papers_loaded_banner(
-    papers_state: dict | None,
-    profile: gr.OAuthProfile | None,
-):
-    if not papers_state or not papers_state.get("username"):
-        year = papers_state.get("selected_year", datetime.now().year) if papers_state else datetime.now().year
-        return render_papers_idle_banner("", year, profile)
-
-    username = papers_state["username"]
-    selected_year = int(papers_state["selected_year"])
-    viewer = getattr(profile, "username", None) if profile else None
 
-    parts = []
-    if viewer:
-        parts.append(f"Logged in as <b>{html.escape(viewer)}</b>")
-    else:
-        parts.append("Not logged in")
+def render_papers_fetching_banner(username, selected_year, profile: gr.OAuthProfile | None):
+    return render_section_fetching_banner("papers activity", username, selected_year, profile)
 
-    if viewer and username.lower() == viewer.lower():
-        parts.append("Viewing <b>your papers activity</b>")
-    else:
-        parts.append(f"Viewing papers activity for <b>{html.escape(username)}</b>")
 
-    parts.append(str(selected_year))
-    return render_status_badge(" · ".join(parts))
+def render_papers_loaded_banner(papers_state: dict | None, profile: gr.OAuthProfile | None):
+    return render_section_loaded_banner("papers activity", papers_state, profile)
 
 
 def render_empty_chart(title: str):
@@ -2340,201 +2135,238 @@ def maybe_reset_community_section(
     )
 
 
-def maybe_reset_upvotes_section(
-    current_upvotes_state,
+# ============================================================
+# Generic helpers for single-chart sections
+# ============================================================
+def prepare_single_section_fetch_ui(
     username,
     selected_year,
-    upvotes_mode,
     profile: gr.OAuthProfile | None,
+    section_label: str,
+):
+    username = (username or "").strip()
+    if username:
+        identity = validate_username(username, profile)
+        if not identity.get("exists"):
+            return render_generic_invalid_banner(username, identity.get("error"))
+    return render_section_fetching_banner(section_label, username, selected_year, profile)
+
+
+def maybe_reset_single_chart_section(
+    current_state,
+    username,
+    selected_year,
+    mode,
+    profile: gr.OAuthProfile | None,
+    *,
+    section_label: str,
+    empty_state_fn,
+    loaded_banner_fn,
+    chart_render_fn,
+    empty_chart_title: str,
+    not_fetched_text: str,
+    needs_fetch_text: str,
+    default_mode: str,
 ):
     username = (username or "").strip()
     selected_year = int(selected_year)
-    upvotes_mode = upvotes_mode or "all"
+    mode = mode or default_mode
 
     identity = validate_username(username, profile) if username else empty_identity("", "No username provided.")
     if username and not identity.get("exists"):
-        state = empty_upvotes_state(selected_year)
+        state = empty_state_fn(selected_year)
         state["username"] = username
         state["selected_year"] = selected_year
         state["logs"] = identity.get("error") or f"Username or org '{username}' was not found."
         return (
             state,
-            render_upvotes_invalid_banner(username, identity.get("error")),
-            gr.update(value="all", visible="hidden"),
-            render_empty_chart("Upvotes"),
+            render_generic_invalid_banner(username, identity.get("error")),
+            gr.update(value=default_mode, visible="hidden"),
+            render_empty_chart(empty_chart_title),
             state["logs"],
         )
 
-    if not current_upvotes_state:
-        state = empty_upvotes_state(selected_year)
+    if not current_state:
+        state = empty_state_fn(selected_year)
         return (
             state,
-            render_upvotes_idle_banner(username, selected_year, profile),
-            gr.update(value="all", visible="hidden"),
-            render_empty_chart("Upvotes"),
-            "Upvotes activity not fetched yet.",
+            render_section_idle_banner(section_label, username, selected_year, profile),
+            gr.update(value=default_mode, visible="hidden"),
+            render_empty_chart(empty_chart_title),
+            not_fetched_text,
         )
 
-    previous_username = (current_upvotes_state.get("username") or "").strip()
-    previous_year = int(current_upvotes_state.get("selected_year") or selected_year)
+    previous_username = (current_state.get("username") or "").strip()
+    previous_year = int(current_state.get("selected_year") or selected_year)
 
     same_username = previous_username.lower() == username.lower()
     same_year = previous_year == selected_year
 
-    if same_username and same_year and current_upvotes_state.get("fetched"):
-        chart = render_upvotes_chart(
-            current_upvotes_state,
-            upvotes_mode,
+    if same_username and same_year and current_state.get("fetched"):
+        chart = chart_render_fn(
+            current_state,
+            mode,
             username=username,
             year=selected_year,
         )
         return (
-            current_upvotes_state,
-            render_upvotes_loaded_banner(current_upvotes_state, profile),
-            gr.update(value=upvotes_mode, visible=True),
+            current_state,
+            loaded_banner_fn(current_state, profile),
+            gr.update(value=mode, visible=True),
             chart,
-            current_upvotes_state.get("logs", "Upvotes activity already fetched."),
+            current_state.get("logs", "Already fetched."),
         )
 
-    state = empty_upvotes_state(selected_year)
+    state = empty_state_fn(selected_year)
     return (
         state,
-        render_upvotes_idle_banner(username, selected_year, profile),
-        gr.update(value="all", visible="hidden"),
-        render_empty_chart("Upvotes"),
-        "Upvotes activity needs to be fetched for the current username/year.",
+        render_section_idle_banner(section_label, username, selected_year, profile),
+        gr.update(value=default_mode, visible="hidden"),
+        render_empty_chart(empty_chart_title),
+        needs_fetch_text,
     )
 
 
-def maybe_reset_likes_section(
-    current_likes_state,
+def fetch_and_render_single_chart_section(
     username,
     selected_year,
-    likes_mode,
+    mode,
     profile: gr.OAuthProfile | None,
+    *,
+    section_label: str,
+    empty_state_fn,
+    fetch_state_fn,
+    loaded_banner_fn,
+    chart_render_fn,
+    empty_chart_title: str,
+    default_mode: str,
 ):
     username = (username or "").strip()
     selected_year = int(selected_year)
-    likes_mode = likes_mode or "all"
+    mode = mode or default_mode
 
-    identity = validate_username(username, profile) if username else empty_identity("", "No username provided.")
+    identity = validate_username(username, profile)
     if username and not identity.get("exists"):
-        state = empty_likes_state(selected_year)
-        state["username"] = username
-        state["selected_year"] = selected_year
-        state["logs"] = identity.get("error") or f"Username or org '{username}' was not found."
+        empty_state = empty_state_fn(selected_year)
+        empty_state["username"] = username
+        empty_state["selected_year"] = selected_year
+        empty_state["logs"] = identity.get("error") or f"Username or org '{username}' was not found."
         return (
-            state,
-            render_likes_invalid_banner(username, identity.get("error")),
-            gr.update(value="all", visible="hidden"),
-            render_empty_chart("Likes"),
-            state["logs"],
+            empty_state,
+            render_generic_invalid_banner(username, identity.get("error")),
+            render_empty_chart(empty_chart_title),
+            empty_state["logs"],
+            gr.update(value=default_mode, visible="hidden"),
         )
 
-    if not current_likes_state:
-        state = empty_likes_state(selected_year)
-        return (
-            state,
-            render_likes_idle_banner(username, selected_year, profile),
-            gr.update(value="all", visible="hidden"),
-            render_empty_chart("Likes"),
-            "Likes activity not fetched yet.",
-        )
+    state = fetch_state_fn(username, selected_year)
 
-    previous_username = (current_likes_state.get("username") or "").strip()
-    previous_year = int(current_likes_state.get("selected_year") or selected_year)
+    chart = chart_render_fn(
+        state,
+        mode,
+        username=username,
+        year=selected_year,
+    )
 
-    same_username = previous_username.lower() == username.lower()
-    same_year = previous_year == selected_year
+    return (
+        state,
+        loaded_banner_fn(state, profile),
+        chart,
+        state["logs"],
+        gr.update(value=mode, visible=True),
+    )
 
-    if same_username and same_year and current_likes_state.get("fetched"):
-        chart = render_likes_chart(
-            current_likes_state,
-            likes_mode,
-            username=username,
-            year=selected_year,
-        )
-        return (
-            current_likes_state,
-            render_likes_loaded_banner(current_likes_state, profile),
-            gr.update(value=likes_mode, visible=True),
-            chart,
-            current_likes_state.get("logs", "Likes activity already fetched."),
-        )
 
-    state = empty_likes_state(selected_year)
-    return (
+def rerender_single_chart_from_state(
+    state,
+    mode,
+    *,
+    empty_title: str,
+    render_fn,
+    default_mode: str,
+):
+    if not state:
+        return render_empty_chart(empty_title)
+    return render_fn(
         state,
-        render_likes_idle_banner(username, selected_year, profile),
-        gr.update(value="all", visible="hidden"),
-        render_empty_chart("Likes"),
-        "Likes activity needs to be fetched for the current username/year.",
+        mode or default_mode,
+        username=(state.get("username") or ""),
+        year=int(state.get("selected_year") or datetime.now().year),
     )
 
 
-def maybe_reset_papers_section(
-    current_papers_state,
+# ============================================================
+# Section wrappers
+# ============================================================
+def maybe_reset_upvotes_section(
+    current_upvotes_state,
     username,
     selected_year,
-    papers_mode,
+    upvotes_mode,
     profile: gr.OAuthProfile | None,
 ):
-    username = (username or "").strip()
-    selected_year = int(selected_year)
-    papers_mode = papers_mode or "all"
-
-    identity = validate_username(username, profile) if username else empty_identity("", "No username provided.")
-    if username and not identity.get("exists"):
-        state = empty_papers_state(selected_year)
-        state["username"] = username
-        state["selected_year"] = selected_year
-        state["logs"] = identity.get("error") or f"Username or org '{username}' was not found."
-        return (
-            state,
-            render_papers_invalid_banner(username, identity.get("error")),
-            gr.update(value="all", visible="hidden"),
-            render_empty_chart("Papers"),
-            state["logs"],
-        )
-
-    if not current_papers_state:
-        state = empty_papers_state(selected_year)
-        return (
-            state,
-            render_papers_idle_banner(username, selected_year, profile),
-            gr.update(value="all", visible="hidden"),
-            render_empty_chart("Papers"),
-            "Papers activity not fetched yet.",
-        )
+    return maybe_reset_single_chart_section(
+        current_upvotes_state,
+        username,
+        selected_year,
+        upvotes_mode,
+        profile,
+        section_label="upvotes activity",
+        empty_state_fn=empty_upvotes_state,
+        loaded_banner_fn=render_upvotes_loaded_banner,
+        chart_render_fn=render_upvotes_chart,
+        empty_chart_title="Upvotes",
+        not_fetched_text="Upvotes activity not fetched yet.",
+        needs_fetch_text="Upvotes activity needs to be fetched for the current username/year.",
+        default_mode="all",
+    )
 
-    previous_username = (current_papers_state.get("username") or "").strip()
-    previous_year = int(current_papers_state.get("selected_year") or selected_year)
 
-    same_username = previous_username.lower() == username.lower()
-    same_year = previous_year == selected_year
+def maybe_reset_likes_section(
+    current_likes_state,
+    username,
+    selected_year,
+    likes_mode,
+    profile: gr.OAuthProfile | None,
+):
+    return maybe_reset_single_chart_section(
+        current_likes_state,
+        username,
+        selected_year,
+        likes_mode,
+        profile,
+        section_label="likes activity",
+        empty_state_fn=empty_likes_state,
+        loaded_banner_fn=render_likes_loaded_banner,
+        chart_render_fn=render_likes_chart,
+        empty_chart_title="Likes",
+        not_fetched_text="Likes activity not fetched yet.",
+        needs_fetch_text="Likes activity needs to be fetched for the current username/year.",
+        default_mode="all",
+    )
 
-    if same_username and same_year and current_papers_state.get("fetched"):
-        chart = render_papers_chart(
-            current_papers_state,
-            papers_mode,
-            username=username,
-            year=selected_year,
-        )
-        return (
-            current_papers_state,
-            render_papers_loaded_banner(current_papers_state, profile),
-            gr.update(value=papers_mode, visible=True),
-            chart,
-            current_papers_state.get("logs", "Papers activity already fetched."),
-        )
 
-    state = empty_papers_state(selected_year)
-    return (
-        state,
-        render_papers_idle_banner(username, selected_year, profile),
-        gr.update(value="all", visible="hidden"),
-        render_empty_chart("Papers"),
-        "Papers activity needs to be fetched for the current username/year.",
+def maybe_reset_papers_section(
+    current_papers_state,
+    username,
+    selected_year,
+    papers_mode,
+    profile: gr.OAuthProfile | None,
+):
+    return maybe_reset_single_chart_section(
+        current_papers_state,
+        username,
+        selected_year,
+        papers_mode,
+        profile,
+        section_label="papers activity",
+        empty_state_fn=empty_papers_state,
+        loaded_banner_fn=render_papers_loaded_banner,
+        chart_render_fn=render_papers_chart,
+        empty_chart_title="Papers",
+        not_fetched_text="Papers activity not fetched yet.",
+        needs_fetch_text="Papers activity needs to be fetched for the current username/year.",
+        default_mode="all",
     )
 
 
@@ -2548,30 +2380,15 @@ def prepare_community_fetch_ui(username, selected_year, profile: gr.OAuthProfile
 
 
 def prepare_upvotes_fetch_ui(username, selected_year, profile: gr.OAuthProfile | None):
-    username = (username or "").strip()
-    if username:
-        identity = validate_username(username, profile)
-        if not identity.get("exists"):
-            return render_upvotes_invalid_banner(username, identity.get("error"))
-    return render_upvotes_fetching_banner(username, selected_year, profile)
+    return prepare_single_section_fetch_ui(username, selected_year, profile, "upvotes activity")
 
 
 def prepare_likes_fetch_ui(username, selected_year, profile: gr.OAuthProfile | None):
-    username = (username or "").strip()
-    if username:
-        identity = validate_username(username, profile)
-        if not identity.get("exists"):
-            return render_likes_invalid_banner(username, identity.get("error"))
-    return render_likes_fetching_banner(username, selected_year, profile)
+    return prepare_single_section_fetch_ui(username, selected_year, profile, "likes activity")
 
 
 def prepare_papers_fetch_ui(username, selected_year, profile: gr.OAuthProfile | None):
-    username = (username or "").strip()
-    if username:
-        identity = validate_username(username, profile)
-        if not identity.get("exists"):
-            return render_papers_invalid_banner(username, identity.get("error"))
-    return render_papers_fetching_banner(username, selected_year, profile)
+    return prepare_single_section_fetch_ui(username, selected_year, profile, "papers activity")
 
 
 def fetch_and_render_community(
@@ -2637,39 +2454,19 @@ def fetch_and_render_upvotes(
     upvotes_mode,
     profile: gr.OAuthProfile | None,
 ):
-    username = (username or "").strip()
-    selected_year = int(selected_year)
-    upvotes_mode = upvotes_mode or "all"
-
-    identity = validate_username(username, profile)
-    if username and not identity.get("exists"):
-        empty_state = empty_upvotes_state(selected_year)
-        empty_state["username"] = username
-        empty_state["selected_year"] = selected_year
-        empty_state["logs"] = identity.get("error") or f"Username or org '{username}' was not found."
-        return (
-            empty_state,
-            render_upvotes_invalid_banner(username, identity.get("error")),
-            render_empty_chart("Upvotes"),
-            empty_state["logs"],
-            gr.update(value="all", visible="hidden"),
-        )
-
-    state = fetch_all_upvotes_activity(username, selected_year)
-
-    chart = render_upvotes_chart(
-        state,
+    _ = current_state
+    return fetch_and_render_single_chart_section(
+        username,
+        selected_year,
         upvotes_mode,
-        username=username,
-        year=selected_year,
-    )
-
-    return (
-        state,
-        render_upvotes_loaded_banner(state, profile),
-        chart,
-        state["logs"],
-        gr.update(value=upvotes_mode, visible=True),
+        profile,
+        section_label="upvotes activity",
+        empty_state_fn=empty_upvotes_state,
+        fetch_state_fn=fetch_all_upvotes_activity,
+        loaded_banner_fn=render_upvotes_loaded_banner,
+        chart_render_fn=render_upvotes_chart,
+        empty_chart_title="Upvotes",
+        default_mode="all",
     )
 
 
@@ -2680,39 +2477,19 @@ def fetch_and_render_likes(
     likes_mode,
     profile: gr.OAuthProfile | None,
 ):
-    username = (username or "").strip()
-    selected_year = int(selected_year)
-    likes_mode = likes_mode or "all"
-
-    identity = validate_username(username, profile)
-    if username and not identity.get("exists"):
-        empty_state = empty_likes_state(selected_year)
-        empty_state["username"] = username
-        empty_state["selected_year"] = selected_year
-        empty_state["logs"] = identity.get("error") or f"Username or org '{username}' was not found."
-        return (
-            empty_state,
-            render_likes_invalid_banner(username, identity.get("error")),
-            render_empty_chart("Likes"),
-            empty_state["logs"],
-            gr.update(value="all", visible="hidden"),
-        )
-
-    state = fetch_all_likes_activity(username, selected_year)
-
-    chart = render_likes_chart(
-        state,
+    _ = current_state
+    return fetch_and_render_single_chart_section(
+        username,
+        selected_year,
         likes_mode,
-        username=username,
-        year=selected_year,
-    )
-
-    return (
-        state,
-        render_likes_loaded_banner(state, profile),
-        chart,
-        state["logs"],
-        gr.update(value=likes_mode, visible=True),
+        profile,
+        section_label="likes activity",
+        empty_state_fn=empty_likes_state,
+        fetch_state_fn=fetch_all_likes_activity,
+        loaded_banner_fn=render_likes_loaded_banner,
+        chart_render_fn=render_likes_chart,
+        empty_chart_title="Likes",
+        default_mode="all",
     )
 
 
@@ -2723,39 +2500,19 @@ def fetch_and_render_papers(
     papers_mode,
     profile: gr.OAuthProfile | None,
 ):
-    username = (username or "").strip()
-    selected_year = int(selected_year)
-    papers_mode = papers_mode or "all"
-
-    identity = validate_username(username, profile)
-    if username and not identity.get("exists"):
-        empty_state = empty_papers_state(selected_year)
-        empty_state["username"] = username
-        empty_state["selected_year"] = selected_year
-        empty_state["logs"] = identity.get("error") or f"Username or org '{username}' was not found."
-        return (
-            empty_state,
-            render_papers_invalid_banner(username, identity.get("error")),
-            render_empty_chart("Papers"),
-            empty_state["logs"],
-            gr.update(value="all", visible="hidden"),
-        )
-
-    state = fetch_all_papers_activity(username, selected_year)
-
-    chart = render_papers_chart(
-        state,
+    _ = current_state
+    return fetch_and_render_single_chart_section(
+        username,
+        selected_year,
         papers_mode,
-        username=username,
-        year=selected_year,
-    )
-
-    return (
-        state,
-        render_papers_loaded_banner(state, profile),
-        chart,
-        state["logs"],
-        gr.update(value=papers_mode, visible=True),
+        profile,
+        section_label="papers activity",
+        empty_state_fn=empty_papers_state,
+        fetch_state_fn=fetch_all_papers_activity,
+        loaded_banner_fn=render_papers_loaded_banner,
+        chart_render_fn=render_papers_chart,
+        empty_chart_title="Papers",
+        default_mode="all",
     )
 
 
@@ -2782,35 +2539,32 @@ def rerender_discussions_from_state(community_state, discussion_mode):
 
 
 def rerender_upvotes_from_state(upvotes_state, upvotes_mode):
-    if not upvotes_state:
-        return render_empty_chart("Upvotes")
-    return render_upvotes_chart(
+    return rerender_single_chart_from_state(
         upvotes_state,
-        upvotes_mode or "all",
-        username=(upvotes_state.get("username") or ""),
-        year=int(upvotes_state.get("selected_year") or datetime.now().year),
+        upvotes_mode,
+        empty_title="Upvotes",
+        render_fn=render_upvotes_chart,
+        default_mode="all",
     )
 
 
 def rerender_likes_from_state(likes_state, likes_mode):
-    if not likes_state:
-        return render_empty_chart("Likes")
-    return render_likes_chart(
+    return rerender_single_chart_from_state(
         likes_state,
-        likes_mode or "all",
-        username=(likes_state.get("username") or ""),
-        year=int(likes_state.get("selected_year") or datetime.now().year),
+        likes_mode,
+        empty_title="Likes",
+        render_fn=render_likes_chart,
+        default_mode="all",
     )
 
 
 def rerender_papers_from_state(papers_state, papers_mode):
-    if not papers_state:
-        return render_empty_chart("Papers")
-    return render_papers_chart(
+    return rerender_single_chart_from_state(
         papers_state,
-        papers_mode or "all",
-        username=(papers_state.get("username") or ""),
-        year=int(papers_state.get("selected_year") or datetime.now().year),
+        papers_mode,
+        empty_title="Papers",
+        render_fn=render_papers_chart,
+        default_mode="all",
     )