diff --git a/src/components/Comments.astro b/src/components/Comments.astro
index 8977e72..694dbea 100644
--- a/src/components/Comments.astro
+++ b/src/components/Comments.astro
@@ -1,5 +1,7 @@
 ---
 import {siteConfig} from "../config";
+import FediverseComments from "./helper/comments/Fediverse.astro";
+
 const method = siteConfig.comments.type
 const ArtalkConfig = siteConfig.comments.artalk
 const giscusConfig = siteConfig.comments.giscus
@@ -7,7 +9,7 @@ interface Props {
     path?: string;
 }
 
-const { path='/' } = Astro.props;
+let { path='/' } = Astro.props;
 ---
 {method === 'artalk' &&
     <div>
@@ -45,4 +47,5 @@ const { path='/' } = Astro.props;
       crossorigin="anonymous"
       async
     ></script>
-)}
\ No newline at end of file
+)}
+{method === 'fediverse' && <FediverseComments path={path} /> }
\ No newline at end of file
diff --git a/src/components/helper/comments/Fediverse.astro b/src/components/helper/comments/Fediverse.astro
new file mode 100644
index 0000000..9b1017c
--- /dev/null
+++ b/src/components/helper/comments/Fediverse.astro
@@ -0,0 +1,249 @@
+---
+  import { siteConfig } from "../../../config";
+
+  const fediverseConfig = siteConfig.comments.fediverse;
+  const {
+    instanceDomain,
+    useV2api,
+    token,
+    useReverseProxy,
+    reverseProxyUrl,
+    accountId
+  } = fediverseConfig;
+
+  interface Props {
+    path: string;
+  }
+
+  const { path } = Astro.props;
+
+  // Create the full URL to search for
+  const fullSiteUrl = Astro.url.host;
+  const postUrl = `https://${fullSiteUrl}${path.startsWith('/') ? path : '/' + path}`;
+
+  // Define the search API endpoint based on configuration
+  let searchEndpoint;
+  if (useReverseProxy && reverseProxyUrl) {
+    searchEndpoint = reverseProxyUrl;
+  } else {
+    const apiVersion = useV2api ? 'v2' : 'v1';
+    searchEndpoint = `https://${instanceDomain}/api/${apiVersion}/search`;
+  }
+  ---
+
+  <div class="fediverse-comments">
+    <div class="fediverse-status">
+      <div id="loading-message">Loading comments from the Fediverse...</div>
+      <div id="error-message" style="display: none;"></div>
+      <div id="no-posts-message" style="display: none;">
+        No discussions found for this post on the Fediverse yet.
+      </div>
+    </div>
+    <div id="fediverse-replies"></div>
+  </div>
+
+  <script define:vars={{
+    searchEndpoint,
+    postUrl,
+    token,
+    useReverseProxy,
+    accountId,
+    instanceDomain
+  }}>
+    async function fetchFediverseComments() {
+      const loadingEl = document.getElementById('loading-message');
+      const errorEl = document.getElementById('error-message');
+      const noPostsEl = document.getElementById('no-posts-message');
+      const repliesContainer = document.getElementById('fediverse-replies');
+
+      try {
+        // Define request parameters
+        const params = new URLSearchParams();
+        if (!useReverseProxy) {
+          params.append('q', postUrl);
+          params.append('type', 'statuses');
+          if (accountId) {
+            params.append('account_id', accountId);
+          }
+        }
+
+        // Prepare fetch options
+        const options = {
+          method: 'GET',
+          headers: {
+            'Accept': 'application/json',
+          }
+        };
+
+        if (token && !useReverseProxy) {
+          options.headers['Authorization'] = `Bearer ${token}`;
+        }
+
+        // Make the API request
+        const url = useReverseProxy
+          ? `${searchEndpoint}?url=${encodeURIComponent(postUrl)}`
+          : `${searchEndpoint}?${params.toString()}`;
+
+        const response = await fetch(url, options);
+
+        if (!response.ok) {
+          throw new Error(`Failed to fetch comments: ${response.statusText}`);
+        }
+
+        const data = await response.json();
+
+        // Process the statuses
+        const statuses = data.statuses || [];
+
+        if (statuses.length === 0) {
+          loadingEl.style.display = 'none';
+          noPostsEl.style.display = 'block';
+          return;
+        }
+
+        // Find the original post (by checking for our URL)
+        const originalPost = statuses[0]
+
+        if (!originalPost) {
+          loadingEl.style.display = 'none';
+          noPostsEl.style.display = 'block';
+          return;
+        }
+
+        // Fetch the status and its context (replies)
+        const statusId = originalPost.id;
+        const contextUrl = `https://${instanceDomain}/api/v1/statuses/${statusId}/context`;
+        const contextResponse = await fetch(contextUrl, options);
+
+        if (!contextResponse.ok) {
+          throw new Error(`Failed to fetch replies: ${contextResponse.statusText}`);
+        }
+
+        const contextData = await contextResponse.json();
+        const replies = contextData.descendants || [];
+
+        // Render replies
+        if (replies.length > 0) {
+          const repliesHtml = replies.map(reply => `
+            <div class="reply">
+              <div class="post-header">
+                <img src="${reply.account.avatar}" alt="${reply.account.display_name}" class="avatar">
+                <div class="post-meta">
+                  <div class="post-author">${reply.account.display_name}</div>
+                  <div class="post-username">@${reply.account.acct}</div>
+                </div>
+              </div>
+              <div class="reply-content">
+                ${reply.content}
+              </div>
+              <div class="post-stats">
+                <span>🔁 ${reply.reblogs_count || 0}</span>
+                <span>⭐ ${reply.favourites_count || 0}</span>
+              </div>
+              <div class="post-link">
+                <a href="${reply.url}" target="_blank" rel="noopener noreferrer">View reply</a>
+              </div>
+            </div>
+          `).join('');
+
+          repliesContainer.innerHTML += `
+            <div class="replies-container">
+              ${repliesHtml}
+            </div>
+          `;
+        }
+
+        loadingEl.style.display = 'none';
+
+      } catch (error) {
+        console.error('Error fetching Fediverse comments:', error);
+        loadingEl.style.display = 'none';
+        errorEl.textContent = `Failed to load comments: ${error.message}`;
+        errorEl.style.display = 'block';
+      }
+    }
+
+    // Call the fetch function when the component is loaded
+    document.addEventListener('DOMContentLoaded', fetchFediverseComments);
+  </script>
+
+  <style>
+    .fediverse-comments {
+      margin-top: 2rem;
+      font-family: system-ui, -apple-system, BlinkMacSystemFont, sans-serif;
+    }
+
+    .fediverse-status {
+      margin-bottom: 1rem;
+    }
+
+    #error-message {
+      color: #e74c3c;
+      padding: 0.5rem;
+      border-left: 3px solid #e74c3c;
+    }
+
+    .original-post, .reply {
+      border: 1px solid var(--border-color, #ddd);
+      border-radius: 8px;
+      padding: 1rem;
+      margin-bottom: 1rem;
+      background-color: var(--comment-bg, rgba(0, 0, 0, 0.02));
+    }
+
+    .post-header, .reply-header {
+      display: flex;
+      align-items: center;
+      margin-bottom: 0.5rem;
+    }
+
+    .avatar {
+      width: 48px;
+      height: 48px;
+      border-radius: 50%;
+      margin-right: 0.75rem;
+    }
+
+    .post-author {
+      font-weight: bold;
+    }
+
+    .post-username {
+      opacity: 0.7;
+      font-size: 0.9rem;
+    }
+
+    .post-content, .reply-content {
+      margin: 0.75rem 0;
+      overflow-wrap: break-word;
+    }
+
+    .post-stats {
+      display: flex;
+      gap: 1rem;
+      margin-top: 0.5rem;
+      font-size: 0.9rem;
+      color: var(--text-secondary, #666);
+    }
+
+    .post-link {
+      margin-top: 0.5rem;
+      font-size: 0.9rem;
+    }
+
+    .post-link a {
+      color: var(--link-color, #0366d6);
+      text-decoration: none;
+    }
+
+    .post-link a:hover {
+      text-decoration: underline;
+    }
+
+    .replies-container {
+      margin-top: 1rem;
+      margin-left: 1rem;
+      border-left: 2px solid var(--border-color, #ddd);
+      padding-left: 1rem;
+    }
+  </style>
\ No newline at end of file
diff --git a/src/config.ts b/src/config.ts
index a0d1c00..0dbf2b0 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -2,7 +2,7 @@ export const siteConfig = {
     title: '/var/log/mercury',
     description: 'A blog about software development, technology, and life.',
     comments: {
-        type: 'artalk', // 'artalk','giscus','fediverse','hatsu'
+        type: 'fediverse', // 'artalk','giscus','fediverse','hatsu'
         artalk: {
             instanceDomain: '', // the domain of your artalk instance
         },
@@ -24,14 +24,20 @@ export const siteConfig = {
         fediverse: {
             // use Mastodon (compatible) api to search posts and parse replies
             // it will search for the post's link by default
-            instanceDomain: '', // the domain of the fediverse instance to search posts from
-            useV2api: false, // use /api/v2/search instead of /api/v1/search to search on instance using newer version of mastodon
-            token: process.env.MASTODON_API_TOKEN, // the token to use to authenticate with the fediverse instance, usually a read:search-only token
-            // or use a reverse proxy api to return posts on instance, useful if you publish the site in SSG mode.
-            // the instanceDomain and token will be ignored if useReverseProxy is true and reverseProxyUrl is used.
-            useReverseProxy: false,
+            // the comments are rendered at the client side (by now)
+            // a reverse proxy is required in pure client-side rendering mode to get the posts from the fediverse instance
+            useReverseProxy: true,
             reverseProxyUrl: '', // the url of the reverse proxy, usually a cloudflare worker proxying the search api
-            accountId: '' // the account id to search posts from, can be got from api like: https://{instance}/api/v1/accounts/{username without domain part}
+            // the reverse proxy should be able to handle the following request:
+            // GET /api/v1/search?q={query}&type=statuses&account_id=12345678
+            // GET /api/v1/statuses/12345678/context
+            // response body should be returned from the origin fediverse instance as-is.
+            accountId: '', // the account id to search posts from, can be got from api like: https://{instance}/api/v1/accounts/{username without domain part}
+            // for development purpose only (by now):
+            // TODO: render the comments on the server-side when in server-side render/hybrid render mode
+            instanceDomain: '', // the domain of the fediverse instance to search posts from
+            useV2api: true, // use /api/v2/search instead of /api/v1/search to search on instance using newer version of mastodon/pleroma/akkoma
+            token: process.env.MASTODON_API_TOKEN, // the token to use to authenticate with the fediverse instance, usually a read:search-only token
         },
         hatsu: {
             // use hatsu.cli.rs to get replies from the fediverse