Skip to content

Commit 5386e64

Browse files
madawei2699madawei2699
committed
fix bugs
1 parent ca868aa commit 5386e64

File tree

6 files changed

+162
-76
lines changed

6 files changed

+162
-76
lines changed

‎src/background/worker.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,11 @@ async function callCustomEndpoint(settings, requestData) {
125125
function getSummaryLength(length) {
126126
switch (length) {
127127
case 'short':
128-
return 150;
128+
return 256;
129129
case 'medium':
130-
return 300;
130+
return 512;
131131
case 'long':
132-
return 500;
132+
return 1024;
133133
default:
134134
return 300;
135135
}

‎src/content/index.js

+43-23
Original file line numberDiff line numberDiff line change
@@ -127,31 +127,59 @@ class ContentScript {
127127

128128
this.updateSidebarContent({
129129
loading: true,
130-
message: 'Analyzing main post...'
130+
message: 'Analyzing discussion...'
131131
});
132132

133133
sidebar.classList.add('visible');
134134
this.sidebarVisible = true;
135-
135+
136136
const content = this.parser.getPageContent();
137137
if (!content) {
138138
throw new Error('Could not extract page content');
139139
}
140140

141-
// Summarize main post
142-
const mainPostSummary = await this.summarizeContent({
143-
type: 'main_post',
144-
title: content.mainPost.title,
145-
text: content.mainPost.text || content.mainPost.url,
146-
url: content.mainPost.url
141+
// Build complete discussion content
142+
let fullDiscussion = '';
143+
144+
// Add main post information
145+
if (content.mainPost) {
146+
fullDiscussion += `Title: ${content.mainPost.title}\n`;
147+
if (content.mainPost.url) fullDiscussion += `URL: ${content.mainPost.url}\n`;
148+
if (content.mainPost.by) fullDiscussion += `Author: ${content.mainPost.by}\n`;
149+
if (content.mainPost.text) fullDiscussion += `\nContent:\n${content.mainPost.text}\n`;
150+
}
151+
152+
// Add comments
153+
if (content.threads && content.threads.length > 0) {
154+
fullDiscussion += '\n\nDiscussion:\n';
155+
content.threads.forEach((thread, index) => {
156+
// Add top-level comment
157+
if (thread.root) {
158+
fullDiscussion += `\n[${thread.root.by || 'anonymous'}]: ${thread.root.text || ''}\n`;
159+
160+
// Add replies
161+
if (thread.replies && thread.replies.length > 0) {
162+
thread.replies.forEach(reply => {
163+
const indent = ' '.repeat(reply.level || 1);
164+
fullDiscussion += `${indent}↳ [${reply.by || 'anonymous'}]: ${reply.text || ''}\n`;
165+
});
166+
}
167+
}
168+
});
169+
}
170+
171+
// Send complete content for summarization
172+
const summary = await this.summarizeContent({
173+
content: fullDiscussion,
174+
type: 'discussion'
147175
});
148-
149-
// Update sidebar with summary
176+
177+
// Update sidebar display
150178
this.updateSidebarContent({
151179
type: 'main_post',
152-
title: content.mainPost.title,
153-
summary: mainPostSummary,
154-
threadCount: this.parser.getTopLevelComments().length
180+
title: content.mainPost?.title || 'Discussion',
181+
summary: summary,
182+
threadCount: content.threads?.length || 0
155183
});
156184

157185
return { success: true };
@@ -164,22 +192,14 @@ class ContentScript {
164192
throw error;
165193
}
166194
}
167-
195+
168196
async summarizeContent(data) {
169197
try {
170-
// Prepare thread content for summarization
171-
const threadContent = `
172-
Title: ${data.title || 'No Title'}
173-
Content: ${data.text || 'No Content'}
174-
`.trim();
175-
176-
// Send summarization request to background worker
177198
const response = await chrome.runtime.sendMessage({
178199
type: 'SUMMARIZE',
179200
data: {
180-
content: threadContent,
201+
content: data.content,
181202
type: data.type,
182-
url: data.url,
183203
language: this.settings?.language || 'chinese'
184204
}
185205
});

‎src/content/parsers/hn.js

+82-44
Original file line numberDiff line numberDiff line change
@@ -11,80 +11,103 @@ export class HNParser extends BaseParser {
1111
'Hacker News Discussion';
1212
}
1313

14-
getPageContent() {
15-
if (!this.isDiscussionPage()) {
16-
return null;
17-
}
18-
19-
// Get main post content
20-
const mainPost = {
21-
title: this.getTitle(),
22-
url: document.querySelector('.titleline a')?.href,
23-
text: document.querySelector('.toptext')?.textContent,
24-
by: document.querySelector('.hnuser')?.textContent,
25-
time: document.querySelector('.age')?.textContent
26-
};
27-
28-
// Get all comments
29-
const threads = this.getTopLevelComments().map(comment =>
30-
this.parseCommentThread(comment)
31-
);
32-
33-
return {
34-
mainPost,
35-
threads
36-
};
37-
}
38-
3914
getTopLevelComments() {
40-
// Get top-level comments
41-
return Array.from(
42-
document.querySelectorAll('.comment-tree > tbody > tr.athing.comtr')
43-
);
15+
return Array.from(document.querySelectorAll('.comment-tree > tbody > tr.athing.comtr'));
4416
}
4517

4618
parseCommentThread(rootComment) {
4719
if (!rootComment?.classList?.contains('comtr')) {
48-
console.warn('Invalid comment element provided');
20+
log.warn('Invalid comment element provided');
4921
return null;
5022
}
51-
23+
5224
const thread = {
5325
id: rootComment.id,
5426
root: this.parseComment(rootComment),
5527
replies: [],
56-
level: 0
28+
level: this.getCommentIndent(rootComment),
5729
};
58-
59-
// Get all replies
30+
6031
let currentElement = rootComment.nextElementSibling;
61-
const rootIndent = this.getCommentIndent(rootComment);
62-
32+
const rootIndent = thread.level;
33+
6334
while (currentElement) {
6435
const isComment = currentElement.classList.contains('comtr');
6536
if (!isComment) {
6637
currentElement = currentElement.nextElementSibling;
6738
continue;
6839
}
69-
40+
7041
const currentIndent = this.getCommentIndent(currentElement);
71-
72-
// If indentation is less than or equal to root, it's a new thread
42+
7343
if (currentIndent <= rootIndent) {
7444
break;
7545
}
76-
77-
// Add reply to thread
46+
7847
const reply = this.parseComment(currentElement);
7948
if (reply) {
8049
reply.level = currentIndent - rootIndent;
8150
thread.replies.push(reply);
8251
}
83-
52+
8453
currentElement = currentElement.nextElementSibling;
8554
}
86-
55+
8756
return thread;
57+
}
58+
59+
getPageContent() {
60+
if (!this.isDiscussionPage()) {
61+
return null;
62+
}
63+
64+
// Get main post content
65+
const mainPost = {
66+
title: this.getTitle(),
67+
url: document.querySelector('.titleline a')?.href,
68+
text: document.querySelector('.toptext')?.textContent,
69+
by: document.querySelector('.hnuser')?.textContent,
70+
time: document.querySelector('.age')?.textContent
71+
};
72+
73+
// Get and process all comments in a single pass
74+
const threads = this.processComments();
75+
76+
return {
77+
mainPost,
78+
threads
79+
};
80+
}
81+
82+
processComments() {
83+
// Process top-level comments and nested threads in a single pass
84+
const comments = [];
85+
const commentElements = Array.from(document.querySelectorAll('.comment-tree > tbody > tr.athing.comtr'));
86+
87+
let currentThread = null;
88+
commentElements.forEach((commentElement) => {
89+
const currentIndent = this.getCommentIndent(commentElement);
90+
91+
if (!currentThread || currentIndent === 0) {
92+
// Start a new thread if we are at top-level or after ending a previous thread
93+
currentThread = {
94+
id: commentElement.id,
95+
root: this.parseComment(commentElement),
96+
replies: [],
97+
level: 0
98+
};
99+
comments.push(currentThread);
100+
} else if (currentThread && currentIndent > currentThread.level) {
101+
// Add nested comments to the current thread based on indentation level
102+
const reply = this.parseComment(commentElement);
103+
if (reply) {
104+
reply.level = currentIndent - currentThread.level;
105+
currentThread.replies.push(reply);
106+
}
107+
}
108+
});
109+
110+
return comments;
88111
}
89112

90113
parseComment(commentElement) {
@@ -101,7 +124,7 @@ export class HNParser extends BaseParser {
101124
by: userElement?.textContent || '',
102125
time: ageElement?.getAttribute('title') || ageElement?.textContent || '',
103126
score: scoreElement?.textContent || '',
104-
element: commentElement, // Keep DOM reference for later use
127+
element: commentElement,
105128
level: this.getCommentIndent(commentElement)
106129
};
107130
}
@@ -120,6 +143,21 @@ export class HNParser extends BaseParser {
120143
if (comment) {
121144
comment.scrollIntoView({ behavior: 'smooth', block: 'center' });
122145
this.highlightComment(comment);
146+
147+
// Add specific HN highlight style
148+
comment.style.backgroundColor = '#f6f6ef';
149+
comment.style.borderLeft = '3px solid #ff6600';
150+
151+
// Remove highlight after 3 seconds
152+
setTimeout(() => {
153+
comment.style.backgroundColor = '';
154+
comment.style.borderLeft = '';
155+
}, 3000);
123156
}
124157
}
158+
159+
destroy() {
160+
// Remove any added styles or elements
161+
document.getElementById('highlight-styles')?.remove();
162+
}
125163
}

‎src/popup/popup.css

+12
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,16 @@ body {
4242

4343
::-webkit-scrollbar-thumb:hover {
4444
background: #666;
45+
}
46+
47+
.line-clamp-2 {
48+
display: -webkit-box;
49+
-webkit-line-clamp: 2;
50+
-webkit-box-orient: vertical;
51+
overflow: hidden;
52+
word-break: break-word;
53+
}
54+
55+
.break-words {
56+
word-break: break-word;
4557
}

‎src/popup/popup.html

+11-3
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,17 @@ <h1 class="text-lg font-semibold text-gray-800">Community TL;DR</h1>
4141
</div>
4242

4343
<div id="onCommunity" class="hidden">
44-
<div class="flex items-center justify-between mb-2">
45-
<span class="text-sm font-medium text-gray-700">Current Page:</span>
46-
<span id="pageType" class="text-sm text-gray-600"></span>
44+
<div class="bg-gray-50 rounded-md p-3 mb-4">
45+
<div class="flex flex-col">
46+
<div class="mb-1">
47+
<span class="text-xs font-medium text-gray-500">TYPE</span>
48+
<span id="pageType" class="text-sm font-medium text-gray-700 ml-2">Discussion</span>
49+
</div>
50+
<div class="mt-1">
51+
<span class="text-xs font-medium text-gray-500">TITLE</span>
52+
<div id="pageTitle" class="text-sm text-gray-800 mt-1 line-clamp-2 break-words"></div>
53+
</div>
54+
</div>
4755
</div>
4856
<div id="threadInfo" class="text-sm text-gray-600"></div>
4957
</div>

‎src/popup/popup.js

+11-3
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,17 @@ class PopupManager {
5555
const pageInfo = await this.sendMessageToTab('getPageInfo');
5656
console.log('Page info:', pageInfo);
5757

58-
// Update page type display
59-
document.getElementById('pageType').textContent =
60-
pageInfo.isDiscussion ? 'Discussion' : 'Listing';
58+
// Update page type
59+
const pageTypeElement = document.getElementById('pageType');
60+
if (pageTypeElement) {
61+
pageTypeElement.textContent = pageInfo.isDiscussion ? 'Discussion' : 'Listing';
62+
}
63+
64+
// Update page title
65+
const pageTitleElement = document.getElementById('pageTitle');
66+
if (pageTitleElement) {
67+
pageTitleElement.textContent = pageInfo.title || 'Untitled';
68+
}
6169

6270
// Update button visibility
6371
document.getElementById('summarizeBtn').style.display =

0 commit comments

Comments
 (0)