+2 -2

api.js

··· 130 130 throw new URLError(`${error}`); 131 131 } 132 132 133 133 - if (url.protocol != 'https:') { 134 134 - throw new URLError('URL must start with https://'); 133 133 + if (url.protocol != 'https:' && url.protocol != 'http:') { 134 134 + throw new URLError('URL must start with http(s)://'); 135 135 } 136 136 137 137 let parts = url.pathname.split('/');

+54 -12

index.html

··· 10 10 font-src 'self'; 11 11 script-src-attr 'none'; 12 12 style-src-attr 'none'; 13 13 - connect-src https:; 13 13 + connect-src https: http://localhost:3000; 14 14 base-uri 'none'; 15 15 form-action 'none';"> 16 16 ··· 49 49 50 50 <li><a href="#" data-action="login">Log in</a></li> 51 51 <li><a href="#" data-action="logout">Log out</a></li> 52 52 + 53 53 + <li class="link"><a href="?">Home</a></li> 54 54 + <li class="link"><a href="?page=posting_stats">Posting stats</a></li> 55 55 + <li class="link"><a href="?page=like_stats">Like stats</a></li> 56 56 + <li class="link"><a href="?page=search">Timeline search</a></li> 57 57 + <li class="link"><a href="?page=search&mode=likes">Archive search</a></li> 52 58 </ul> 53 59 </div> 54 60 ··· 164 170 </div> 165 171 166 172 <div id="private_search_page"> 167 167 - <h2>Archive search *Beta*</h2> 173 173 + <h2>Archive search</h2> 174 174 + 175 175 + <div class="timeline-search"> 176 176 + <form> 177 177 + <p> 178 178 + Fetch timeline posts: <input type="range" min="1" max="60" value="7"> <label>7 days</label> 179 179 + </p> 180 180 + 181 181 + <p> 182 182 + <input type="submit" value="Fetch timeline"> <progress></progress> 183 183 + </p> 184 184 + </form> 185 185 + 186 186 + <p class="archive-status"></p> 187 187 + 188 188 + <hr> 189 189 + </div> 168 190 169 169 - <form> 170 170 - <p> 171 171 - Fetch timeline posts: <input type="range" min="1" max="60" value="7"> <label>7 days</label> 172 172 - </p> 191 191 + <form class="search-form"> 192 192 + <p class="search">Search: <input type="text" class="search-query" autocomplete="off"></p> 173 193 174 174 - <p> 175 175 - <input type="submit" value="Fetch timeline"> <progress></progress> 176 176 - </p> 194 194 + <div class="search-collections"> 195 195 + <input type="radio" name="collection" value="likes" id="collection-likes" checked> <label for="collection-likes">Likes</label> 196 196 + <input type="radio" name="collection" value="reposts" id="collection-reposts"> <label for="collection-reposts">Reposts</label> 197 197 + <input type="radio" name="collection" value="quotes" id="collection-quotes"> <label for="collection-quotes">Quotes</label> 198 198 + <input type="radio" name="collection" value="pins" id="collection-pins"> <label for="collection-pins">Pins</label> 199 199 + </div> 177 200 </form> 178 201 179 179 - <p class="archive-status"></p> 202 202 + <div class="lycan-import"> 203 203 + <form> 204 204 + <h4>Data not imported yet</h4> 205 205 + 206 206 + <p> 207 207 + In order to search within your likes and bookmarks, the posts you've liked or saved need to be imported into a database. 208 208 + This is a one-time process, but it can take several minutes or more, depending on the age of your account. 209 209 + </p> 210 210 + <p> 211 211 + To start the import, press the button below. You can then wait until it finishes, or close this tab and come back a bit later. 212 212 + After the import is complete, the database will be kept up to date automatically going forward. 213 213 + </p> 214 214 + <p> 215 215 + <input type="submit" value="Start import"> 216 216 + </p> 217 217 + </form> 180 218 181 181 - <hr> 219 219 + <div class="import-progress"> 220 220 + <h4>Import in progress</h4> 182 221 183 183 - <p class="search">Search: <input type="text" class="search-query"></p> 222 222 + <p class="import-status"></p> 223 223 + <p><progress></progress> <output></output></p> 224 224 + </div> 225 225 + </div> 184 226 185 227 <div class="results"> 186 228 </div>

+2 -2

like_stats_page.js

··· 27 27 e.preventDefault(); 28 28 29 29 if (!this.scanStartTime) { 30 30 - this.findLikes(); 30 30 + this.findLikes(); 31 31 } else { 32 32 this.stopScan(); 33 33 } ··· 228 228 tr.append( 229 229 $tag('td.no', { text: i + 1 }), 230 230 $tag('td.handle', { 231 231 - html: `<img class="avatar" src="${user.avatar}"> ` + 231 231 + html: `<img class="avatar" src="${user.avatar}"> ` + 232 232 `<a href="https://bsky.app/profile/${user.handle}" target="_blank">${user.handle}</a>` 233 233 }), 234 234 $tag('td.count', { text: user.count })

+9 -2

menu.js

··· 11 11 12 12 html.addEventListener('click', (e) => { 13 13 this.menuElement.style.visibility = 'hidden'; 14 14 + this.icon.classList.remove('active'); 14 15 }); 16 16 + 17 17 + let homeLink = $(this.menuElement.querySelector('a[href="?"]'), HTMLLinkElement); 18 18 + homeLink.href = location.origin + location.pathname; 15 19 16 20 this.icon.addEventListener('click', (e) => { 17 21 e.stopPropagation(); ··· 66 70 } 67 71 68 72 toggleAccountMenu() { 69 69 - this.menuElement.style.visibility = (this.menuElement.style.visibility == 'visible') ? 'hidden' : 'visible'; 73 73 + let isVisible = (this.menuElement.style.visibility == 'visible'); 74 74 + 75 75 + this.menuElement.style.visibility = isVisible ? 'hidden' : 'visible'; 76 76 + this.icon.classList.toggle('active', !isVisible); 70 77 } 71 78 72 79 /** @param {string} buttonName */ ··· 124 131 async loadCurrentUserAvatar() { 125 132 try { 126 133 let url = await api.loadCurrentUserAvatar(); 127 127 - this.showLoggedInStatus(true, url); 134 134 + this.showLoggedInStatus(true, url); 128 135 } catch (error) { 129 136 console.log(error); 130 137 this.showLoggedInStatus(true, null);

+1 -1

minisky.js

··· 301 301 let text = await response.text(); 302 302 let json = text.trim().length > 0 ? JSON.parse(text) : undefined; 303 303 304 304 - if (response.status == 200) { 304 304 + if (response.status >= 200 && response.status < 300) { 305 305 return json; 306 306 } else { 307 307 throw new APIError(response.status, json);

+5

models.js

··· 322 322 return this.record.bridgyOriginalText; 323 323 } 324 324 325 325 + /** @returns {string | undefined} */ 326 326 + get originalFediURL() { 327 327 + return this.record.bridgyOriginalUrl; 328 328 + } 329 329 + 325 330 /** @returns {boolean} */ 326 331 get isRoot() { 327 332 // I AM ROOOT

+1 -1

notifications_page.js

··· 13 13 let finished = false; 14 14 let cursor; 15 15 16 16 - loadInPages((next) => { 16 16 + Paginator.loadInPages((next) => { 17 17 if (isLoading || finished) { return; } 18 18 isLoading = true; 19 19

+73

post_component.js

··· 162 162 if (this.post.embed) { 163 163 let embed = new EmbedComponent(this.post, this.post.embed).buildElement(); 164 164 wrapper.appendChild(embed); 165 165 + 166 166 + if (this.post.originalFediURL) { 167 167 + if (this.post.embed instanceof InlineLinkEmbed && this.post.embed.title.startsWith('Original post on ')) { 168 168 + embed.remove(); 169 169 + } 170 170 + } 171 171 + } 172 172 + 173 173 + if (this.post.originalFediURL) { 174 174 + let link = this.buildFediSourceLink(this.post.originalFediURL); 175 175 + if (link) { 176 176 + wrapper.appendChild(link); 177 177 + } 165 178 } 166 179 167 180 if (this.post.likeCount !== undefined && this.post.repostCount !== undefined) { ··· 301 314 return p; 302 315 } 303 316 317 317 + /** @param {string[]} terms */ 318 318 + 319 319 + highlightSearchResults(terms) { 320 320 + let regexp = new RegExp(`\\b(${terms.join('|')})\\b`, 'gi'); 321 321 + 322 322 + let root = this.rootElement; 323 323 + let body = $(root.querySelector(':scope > .content > .body, :scope > .content > details .body')); 324 324 + let walker = document.createTreeWalker(body, NodeFilter.SHOW_TEXT); 325 325 + let textNodes = []; 326 326 + 327 327 + while (walker.nextNode()) { 328 328 + textNodes.push(walker.currentNode); 329 329 + } 330 330 + 331 331 + for (let node of textNodes) { 332 332 + if (!node.textContent) { continue; } 333 333 + 334 334 + let markedText = document.createDocumentFragment(); 335 335 + let currentPosition = 0; 336 336 + 337 337 + for (;;) { 338 338 + let match = regexp.exec(node.textContent); 339 339 + if (match === null) break; 340 340 + 341 341 + if (match.index > currentPosition) { 342 342 + let earlierText = node.textContent.slice(currentPosition, match.index); 343 343 + markedText.appendChild(document.createTextNode(earlierText)); 344 344 + } 345 345 + 346 346 + let span = $tag('span.highlight', { text: match[0] }); 347 347 + markedText.appendChild(span); 348 348 + 349 349 + currentPosition = match.index + match[0].length; 350 350 + } 351 351 + 352 352 + if (currentPosition < node.textContent.length) { 353 353 + let remainingText = node.textContent.slice(currentPosition); 354 354 + markedText.appendChild(document.createTextNode(remainingText)); 355 355 + } 356 356 + 357 357 + $(node.parentNode).replaceChild(markedText, node); 358 358 + } 359 359 + } 360 360 + 304 361 /** @param {string[]} tags, @returns {HTMLElement} */ 305 362 306 363 buildTagsRow(tags) { ··· 433 490 loadHiddenReplies(loadMoreButton) { 434 491 loadMoreButton.innerHTML = `<img class="loader" src="icons/sunny.png">`; 435 492 this.loadHiddenSubtree(this.post, this.rootElement); 493 493 + } 494 494 + 495 495 + /** @param {string} url, @returns {HTMLElement | undefined} */ 496 496 + 497 497 + buildFediSourceLink(url) { 498 498 + try { 499 499 + let hostname = new URL(url).hostname; 500 500 + let a = $tag('a.fedi-link', { href: url, target: '_blank' }); 501 501 + 502 502 + let box = $tag('div', { html: `<i class="fa-solid fa-arrow-up-right-from-square fa-sm"></i> View on ${hostname}` }); 503 503 + a.append(box); 504 504 + return a; 505 505 + } catch (error) { 506 506 + console.log("Invalid Fedi URL:" + error); 507 507 + return undefined; 508 508 + } 436 509 } 437 510 438 511 /** @param {HTMLLinkElement} authorLink */

+24 -8

posting_stats_page.js

··· 57 57 e.preventDefault(); 58 58 59 59 if (!this.scanStartTime) { 60 60 - this.scanPostingStats(); 60 60 + this.scanPostingStats(); 61 61 } else { 62 62 this.stopScan(); 63 63 } ··· 320 320 keepLastPage: true 321 321 }); 322 322 323 323 - this.updateResultsTable(posts, startTime, requestedDays, { showReposts: false }); 323 323 + this.updateResultsTable(posts, startTime, requestedDays, { showReposts: false }); 324 324 } else if (scanType == 'users') { 325 325 let dids = Object.keys(this.selectedUsers); 326 326 ··· 332 332 this.resetUserProgress(dids); 333 333 334 334 let requests = dids.map(did => this.appView.loadUserTimeline(did, requestedDays, { 335 335 - filter: 'posts_no_replies', 335 335 + filter: 'posts_and_author_threads', 336 336 onPageLoad: (data) => { 337 337 if (this.scanStartTime != startTime) { 338 338 return { cancel: true }; ··· 375 375 let lastDate = feedPostTime(last); 376 376 let daysBack = (startTime - lastDate) / 86400 / 1000; 377 377 378 378 - this.progressBar.value = daysBack; 378 378 + this.progressBar.value = daysBack; 379 379 } 380 380 381 381 /** @param {string[]} dids */ ··· 435 435 * countFetchedDays?: boolean, 436 436 * users?: json[] 437 437 * }} [options] 438 438 + * @returns {Promise<void>} 438 439 */ 439 440 440 440 - updateResultsTable(posts, startTime, requestedDays, options = {}) { 441 441 + async updateResultsTable(posts, startTime, requestedDays, options = {}) { 441 442 if (this.scanStartTime != startTime) { 442 443 return; 443 444 } 444 445 446 446 + let now = new Date().getTime(); 447 447 + 448 448 + if (now - startTime < 100) { 449 449 + // artificial UI delay in case scan finishes immediately 450 450 + await new Promise(resolve => setTimeout(resolve, 100)); 451 451 + } 452 452 + 445 453 let users = {}; 446 454 let total = 0; 447 455 let allReposts = 0; ··· 472 480 473 481 let timeLimit = startTime - requestedDays * 86400 * 1000; 474 482 posts = posts.filter(x => (feedPostTime(x) > timeLimit)); 483 483 + posts.reverse(); 475 484 476 485 if (options.users) { 477 486 for (let user of options.users) { ··· 479 488 } 480 489 } 481 490 491 491 + let ownThreads = new Set(); 492 492 + 482 493 for (let item of posts) { 483 483 - if (item.reply) { continue; } 494 494 + if (item.reply) { 495 495 + if (!ownThreads.has(item.reply.parent.uri)) { 496 496 + continue; 497 497 + } 498 498 + } 484 499 485 500 let user = item.reason ? item.reason.by : item.post.author; 486 501 let handle = user.handle; ··· 493 508 } else { 494 509 users[handle].own += 1; 495 510 allNormalPosts += 1; 511 511 + ownThreads.add(item.post.uri); 496 512 } 497 513 } 498 514 ··· 540 556 tr.append($tag('td.percent', { text: '' })); 541 557 } 542 558 543 543 - this.tableBody.append(tr); 559 559 + this.tableBody.append(tr); 544 560 } 545 561 546 562 let sorted = Object.values(users).sort(this.sortUserRows); ··· 552 568 tr.append( 553 569 $tag('td.no', { text: i + 1 }), 554 570 $tag('td.handle', { 555 555 - html: `<img class="avatar" src="${user.avatar}"> ` + 571 571 + html: `<img class="avatar" src="${user.avatar}"> ` + 556 572 `<a href="https://bsky.app/profile/${user.handle}" target="_blank">${user.handle}</a>` 557 573 }), 558 574

+289 -10

private_search_page.js

··· 3 3 /** @type {number | undefined} */ 4 4 fetchStartTime; 5 5 6 6 + /** @type {number | undefined} */ 7 7 + importTimer; 8 8 + 9 9 + /** @type {string | undefined} */ 10 10 + lycanImportStatus; 11 11 + 6 12 constructor() { 7 13 this.pageElement = $id('private_search_page'); 14 14 + 15 15 + this.header = $(this.pageElement.querySelector('h2')); 8 16 9 17 this.rangeInput = $(this.pageElement.querySelector('input[type="range"]'), HTMLInputElement); 10 18 this.submitButton = $(this.pageElement.querySelector('input[type="submit"]'), HTMLInputElement); ··· 13 21 14 22 this.searchLine = $(this.pageElement.querySelector('.search')); 15 23 this.searchField = $(this.pageElement.querySelector('.search-query'), HTMLInputElement); 24 24 + this.searchForm = $(this.pageElement.querySelector('.search-form'), HTMLFormElement); 16 25 this.results = $(this.pageElement.querySelector('.results')); 17 26 27 27 + this.timelineSearch = $(this.pageElement.querySelector('.timeline-search')); 28 28 + this.timelineSearchForm = $(this.pageElement.querySelector('.timeline-search form'), HTMLFormElement); 29 29 + this.searchCollections = $(this.pageElement.querySelector('.search-collections')); 30 30 + 31 31 + this.lycanImportSection = $(this.pageElement.querySelector('.lycan-import')); 32 32 + this.lycanImportForm = $(this.pageElement.querySelector('.lycan-import form'), HTMLFormElement); 33 33 + this.importProgress = $(this.pageElement.querySelector('.import-progress')); 34 34 + this.importProgressBar = $(this.pageElement.querySelector('.import-progress progress'), HTMLProgressElement); 35 35 + this.importStatusLabel = $(this.pageElement.querySelector('.import-status')); 36 36 + this.importStatusPosition = $(this.pageElement.querySelector('.import-progress output')); 37 37 + 38 38 + this.isCheckingStatus = false; 18 39 this.timelinePosts = []; 19 40 20 41 this.setupEvents(); 42 42 + 43 43 + let params = new URLSearchParams(location.search); 44 44 + this.mode = params.get('mode'); 45 45 + let lycan = params.get('lycan'); 46 46 + 47 47 + if (lycan == 'local') { 48 48 + this.localLycan = new BlueskyAPI('http://localhost:3000', false); 49 49 + } else if (lycan) { 50 50 + this.lycanAddress = `did:web:${lycan}#lycan`; 51 51 + } else { 52 52 + this.lycanAddress = 'did:web:lycan.feeds.blue#lycan'; 53 53 + } 21 54 } 22 55 23 56 setupEvents() { 24 24 - $(this.pageElement.querySelector('form')).addEventListener('submit', (e) => { 57 57 + this.timelineSearchForm.addEventListener('submit', (e) => { 25 58 e.preventDefault(); 26 59 27 60 if (!this.fetchStartTime) { 28 28 - this.fetchTimeline(); 61 61 + this.fetchTimeline(); 29 62 } else { 30 63 this.stopFetch(); 31 64 } ··· 37 70 label.innerText = (days == 1) ? '1 day' : `${days} days`; 38 71 }); 39 72 40 40 - this.searchField.addEventListener('input', (e) => { 41 41 - let query = this.searchField.value.trim().toLowerCase(); 73 73 + this.searchField.addEventListener('keydown', (e) => { 74 74 + if (e.key == 'Enter') { 75 75 + e.preventDefault(); 42 76 43 43 - if (this.searchTimer) { 44 44 - clearTimeout(this.searchTimer); 77 77 + let query = this.searchField.value.trim().toLowerCase(); 78 78 + 79 79 + if (this.mode == 'likes') { 80 80 + this.searchInLycan(query); 81 81 + } else { 82 82 + this.searchInTimeline(query); 83 83 + } 45 84 } 85 85 + }); 46 86 47 47 - this.searchTimer = setTimeout(() => this.searchInTimeline(query), 100); 87 87 + this.lycanImportForm.addEventListener('submit', (e) => { 88 88 + e.preventDefault(); 89 89 + this.startLycanImport(); 48 90 }); 49 91 } 50 92 ··· 56 98 57 99 show() { 58 100 this.pageElement.style.display = 'block'; 101 101 + 102 102 + if (this.mode == 'likes') { 103 103 + this.header.innerText = 'Archive search'; 104 104 + this.timelineSearch.style.display = 'none'; 105 105 + this.searchCollections.style.display = 'block'; 106 106 + this.searchLine.style.display = 'block'; 107 107 + this.lycanImportSection.style.display = 'none'; 108 108 + this.checkLycanImportStatus(); 109 109 + } else { 110 110 + this.header.innerText = 'Timeline search'; 111 111 + this.timelineSearch.style.display = 'block'; 112 112 + this.searchCollections.style.display = 'none'; 113 113 + this.lycanImportSection.style.display = 'none'; 114 114 + } 115 115 + } 116 116 + 117 117 + /** @returns {Promise<void>} */ 118 118 + 119 119 + async checkLycanImportStatus() { 120 120 + if (this.isCheckingStatus) { 121 121 + return; 122 122 + } 123 123 + 124 124 + this.isCheckingStatus = true; 125 125 + 126 126 + try { 127 127 + let response = await this.getImportStatus(); 128 128 + this.showImportStatus(response); 129 129 + } catch (error) { 130 130 + this.showImportError(`Couldn't check import status: ${error}`); 131 131 + } finally { 132 132 + this.isCheckingStatus = false; 133 133 + } 134 134 + } 135 135 + 136 136 + /** @returns {Promise<json>} */ 137 137 + 138 138 + async getImportStatus() { 139 139 + if (this.localLycan) { 140 140 + return await this.localLycan.getRequest('blue.feeds.lycan.getImportStatus', { user: accountAPI.user.did }); 141 141 + } else { 142 142 + return await accountAPI.getRequest('blue.feeds.lycan.getImportStatus', null, { 143 143 + headers: { 'atproto-proxy': this.lycanAddress } 144 144 + }); 145 145 + } 146 146 + } 147 147 + 148 148 + /** @param {json} info */ 149 149 + 150 150 + showImportStatus(info) { 151 151 + console.log(info); 152 152 + 153 153 + if (!info.status) { 154 154 + this.showImportError("Error checking import status"); 155 155 + return; 156 156 + } 157 157 + 158 158 + this.lycanImportStatus = info.status; 159 159 + 160 160 + if (info.status == 'not_started') { 161 161 + this.lycanImportSection.style.display = 'block'; 162 162 + this.lycanImportForm.style.display = 'block'; 163 163 + this.importProgress.style.display = 'none'; 164 164 + this.searchField.disabled = true; 165 165 + 166 166 + this.stopImportTimer(); 167 167 + } else if (info.status == 'in_progress' || info.status == 'scheduled' || info.status == 'requested') { 168 168 + this.lycanImportSection.style.display = 'block'; 169 169 + this.lycanImportForm.style.display = 'none'; 170 170 + this.importProgress.style.display = 'block'; 171 171 + this.searchField.disabled = true; 172 172 + 173 173 + this.showImportProgress(info); 174 174 + this.startImportTimer(); 175 175 + } else if (info.status == 'finished') { 176 176 + this.lycanImportForm.style.display = 'none'; 177 177 + this.importProgress.style.display = 'block'; 178 178 + this.searchField.disabled = false; 179 179 + 180 180 + this.showImportProgress({ status: 'finished', progress: 1.0 }); 181 181 + this.stopImportTimer(); 182 182 + } else { 183 183 + this.showImportError("Error checking import status"); 184 184 + this.stopImportTimer(); 185 185 + } 186 186 + } 187 187 + 188 188 + /** @param {json} info */ 189 189 + 190 190 + showImportProgress(info) { 191 191 + let progress = Math.max(0, Math.min(info.progress || 0)); 192 192 + this.importProgressBar.value = progress; 193 193 + this.importProgressBar.style.display = 'inline'; 194 194 + 195 195 + let percent = Math.round(progress * 100); 196 196 + this.importStatusPosition.innerText = `${percent}%`; 197 197 + 198 198 + if (info.progress == 1.0) { 199 199 + this.importStatusLabel.innerText = `Import complete ✓`; 200 200 + } else if (info.position) { 201 201 + let date = new Date(info.position).toLocaleString(window.dateLocale, { day: 'numeric', month: 'short', year: 'numeric' }); 202 202 + this.importStatusLabel.innerText = `Downloaded data until: ${date}`; 203 203 + } else if (info.status == 'requested') { 204 204 + this.importStatusLabel.innerText = 'Requesting import…'; 205 205 + } else { 206 206 + this.importStatusLabel.innerText = 'Import started…'; 207 207 + } 208 208 + } 209 209 + 210 210 + /** @param {string} message */ 211 211 + 212 212 + showImportError(message) { 213 213 + this.lycanImportSection.style.display = 'block'; 214 214 + this.lycanImportForm.style.display = 'none'; 215 215 + this.importProgress.style.display = 'block'; 216 216 + this.searchField.disabled = true; 217 217 + 218 218 + this.importStatusLabel.innerText = message; 219 219 + this.stopImportTimer(); 220 220 + } 221 221 + 222 222 + startImportTimer() { 223 223 + if (this.importTimer) { 224 224 + return; 225 225 + } 226 226 + 227 227 + this.importTimer = setInterval(() => { 228 228 + this.checkLycanImportStatus(); 229 229 + }, 3000); 230 230 + } 231 231 + 232 232 + stopImportTimer() { 233 233 + if (this.importTimer) { 234 234 + clearInterval(this.importTimer); 235 235 + this.importTimer = undefined; 236 236 + } 237 237 + } 238 238 + 239 239 + /** @returns {Promise<void>} */ 240 240 + 241 241 + async startLycanImport() { 242 242 + this.showImportStatus({ status: 'requested' }); 243 243 + 244 244 + try { 245 245 + if (this.localLycan) { 246 246 + await this.localLycan.postRequest('blue.feeds.lycan.startImport', { 247 247 + user: accountAPI.user.did 248 248 + }); 249 249 + } else { 250 250 + await accountAPI.postRequest('blue.feeds.lycan.startImport', null, { 251 251 + headers: { 'atproto-proxy': this.lycanAddress } 252 252 + }); 253 253 + } 254 254 + 255 255 + this.startImportTimer(); 256 256 + } catch (err) { 257 257 + console.error('Failed to start Lycan import', err); 258 258 + this.showImportError(`Import failed: ${err}`); 259 259 + } 59 260 } 60 261 61 262 /** @returns {Promise<void>} */ ··· 96 297 daysBack = 0; 97 298 } 98 299 99 99 - this.timelinePosts = timeline.map(x => Post.parseFeedPost(x)); 300 300 + this.timelinePosts = timeline; 100 301 101 302 this.archiveStatus.innerText = "Timeline archive fetched: " + ((daysBack == 1) ? '1 day' : `${daysBack} days`); 102 303 this.searchLine.style.display = 'block'; ··· 115 316 return; 116 317 } 117 318 118 118 - let matching = this.timelinePosts.filter(x => x.lowercaseText.includes(query)); 319 319 + let matching = this.timelinePosts 320 320 + .filter(x => x.post.record.text.toLowerCase().includes(query)) 321 321 + .map(x => Post.parseFeedPost(x)); 119 322 120 323 for (let post of matching) { 121 324 let postView = new PostComponent(post, 'feed').buildElement(); ··· 123 326 } 124 327 } 125 328 329 329 + /** @param {string} query */ 330 330 + 331 331 + searchInLycan(query) { 332 332 + if (query.length == 0 || this.lycanImportStatus != 'finished') { 333 333 + return; 334 334 + } 335 335 + 336 336 + this.results.innerHTML = ''; 337 337 + this.lycanImportSection.style.display = 'none'; 338 338 + 339 339 + let collection = this.searchForm.elements['collection'].value; 340 340 + 341 341 + let loading = $tag('p', { text: "..." }); 342 342 + this.results.append(loading); 343 343 + 344 344 + let isLoading = false; 345 345 + let firstPageLoaded = false; 346 346 + let cursor; 347 347 + let finished = false; 348 348 + 349 349 + Paginator.loadInPages(async () => { 350 350 + if (isLoading || finished) { return; } 351 351 + isLoading = true; 352 352 + 353 353 + let response; 354 354 + 355 355 + if (this.localLycan) { 356 356 + let params = { collection, query, user: accountAPI.user.did }; 357 357 + if (cursor) params.cursor = cursor; 358 358 + 359 359 + response = await this.localLycan.getRequest('blue.feeds.lycan.searchPosts', params); 360 360 + } else { 361 361 + let params = { collection, query }; 362 362 + if (cursor) params.cursor = cursor; 363 363 + 364 364 + response = await accountAPI.getRequest('blue.feeds.lycan.searchPosts', params, { 365 365 + headers: { 'atproto-proxy': this.lycanAddress } 366 366 + }); 367 367 + } 368 368 + 369 369 + if (response.posts.length == 0) { 370 370 + let p = $tag('p.results-end', { text: firstPageLoaded ? "No more results." : "No results." }); 371 371 + loading.remove(); 372 372 + this.results.append(p); 373 373 + 374 374 + isLoading = false; 375 375 + finished = true; 376 376 + return; 377 377 + } 378 378 + 379 379 + let records = await accountAPI.loadPosts(response.posts); 380 380 + let posts = records.map(x => new Post(x)); 381 381 + 382 382 + if (!firstPageLoaded) { 383 383 + loading.remove(); 384 384 + firstPageLoaded = true; 385 385 + } 386 386 + 387 387 + for (let post of posts) { 388 388 + let component = new PostComponent(post, 'feed'); 389 389 + let postView = component.buildElement(); 390 390 + this.results.appendChild(postView); 391 391 + 392 392 + component.highlightSearchResults(response.terms); 393 393 + } 394 394 + 395 395 + isLoading = false; 396 396 + cursor = response.cursor; 397 397 + 398 398 + if (!cursor) { 399 399 + finished = true; 400 400 + this.results.append("No more results."); 401 401 + } 402 402 + }); 403 403 + } 404 404 + 126 405 /** @param {json[]} dataPage, @param {number} startTime */ 127 406 128 407 updateProgress(dataPage, startTime) { ··· 133 412 let lastDate = feedPostTime(last); 134 413 let daysBack = (startTime - lastDate) / 86400 / 1000; 135 414 136 136 - this.progressBar.value = daysBack; 415 415 + this.progressBar.value = daysBack; 137 416 } 138 417 139 418 stopFetch() {

+2 -18

skythread.js

··· 341 341 let finished = false; 342 342 let cursor; 343 343 344 344 - loadInPages(() => { 344 344 + Paginator.loadInPages(() => { 345 345 if (isLoading || finished) { return; } 346 346 isLoading = true; 347 347 ··· 389 389 let cursor; 390 390 let finished = false; 391 391 392 392 - loadInPages(() => { 392 392 + Paginator.loadInPages(() => { 393 393 if (isLoading || finished) { return; } 394 394 isLoading = true; 395 395 ··· 440 440 }); 441 441 }); 442 442 } 443 443 - 444 444 - /** @param {Function} callback */ 445 445 - 446 446 - function loadInPages(callback) { 447 447 - let loadIfNeeded = () => { 448 448 - if (window.pageYOffset + window.innerHeight > document.body.offsetHeight - 500) { 449 449 - callback(loadIfNeeded); 450 450 - } 451 451 - }; 452 452 - 453 453 - callback(loadIfNeeded); 454 454 - 455 455 - document.addEventListener('scroll', loadIfNeeded); 456 456 - const resizeObserver = new ResizeObserver(loadIfNeeded); 457 457 - resizeObserver.observe(document.body); 458 458 - }

+166 -6

style.css

··· 127 127 padding: 6px 11px; 128 128 } 129 129 130 130 - #account_menu li a { 130 130 + #account_menu li a[data-action] { 131 131 display: inline-block; 132 132 color: #333; 133 133 font-size: 11pt; ··· 138 138 background-color: hsla(210, 100%, 4%, 0.12); 139 139 } 140 140 141 141 - #account_menu li a:hover { 141 141 + #account_menu li a[data-action]:hover { 142 142 background-color: hsla(210, 100%, 4%, 0.2); 143 143 text-decoration: none; 144 144 + } 145 145 + 146 146 + #account_menu li:not(.link) + li.link { 147 147 + margin-top: 16px; 148 148 + padding-top: 10px; 149 149 + border-top: 1px solid #ccc; 150 150 + } 151 151 + 152 152 + #account_menu li.link { 153 153 + margin-top: 8px; 154 154 + margin-left: 2px; 155 155 + } 156 156 + 157 157 + #account_menu li.link a { 158 158 + font-size: 11pt; 159 159 + color: #333; 144 160 } 145 161 146 162 #account_menu li .check { ··· 486 502 margin-top: 18px; 487 503 } 488 504 505 505 + .post .body .highlight { 506 506 + background-color: rgba(255, 255, 0, 0.75); 507 507 + padding: 1px 2px; 508 508 + margin-left: -1px; 509 509 + margin-right: -1px; 510 510 + } 511 511 + 489 512 .post .quote-embed { 490 513 border: 1px solid #ddd; 491 514 border-radius: 8px; ··· 640 663 color: #aaa; 641 664 } 642 665 666 666 + .post a.fedi-link { 667 667 + display: inline-block; 668 668 + margin-bottom: 6px; 669 669 + margin-top: 2px; 670 670 + } 671 671 + 672 672 + .post a.fedi-link:hover { 673 673 + text-decoration: none; 674 674 + } 675 675 + 676 676 + .post a.fedi-link > div { 677 677 + border: 1px solid #d0d0d0; 678 678 + border-radius: 8px; 679 679 + padding: 5px 9px; 680 680 + color: #555; 681 681 + font-size: 10pt; 682 682 + } 683 683 + 684 684 + .post a.fedi-link i { 685 685 + margin-right: 3px; 686 686 + } 687 687 + 688 688 + .post a.fedi-link:hover > div { 689 689 + background-color: #f6f7f8; 690 690 + border: 1px solid #c8c8c8; 691 691 + } 692 692 + 643 693 .post div.gif img { 644 694 user-select: none; 645 695 -webkit-user-select: none; ··· 923 973 border-radius: 14px; 924 974 vertical-align: middle; 925 975 margin-right: 2px; 926 926 - padding: 2px; 976 976 + padding: 2px; 927 977 } 928 978 929 979 #posting_stats_page .scan-result td.no { ··· 999 1049 border-radius: 14px; 1000 1050 vertical-align: middle; 1001 1051 margin-right: 2px; 1002 1002 - padding: 2px; 1052 1052 + padding: 2px; 1003 1053 } 1004 1054 1005 1055 #private_search_page { ··· 1036 1086 margin-left: 8px; 1037 1087 } 1038 1088 1089 1089 + #private_search_page .search-collections label { 1090 1090 + vertical-align: middle; 1091 1091 + } 1092 1092 + 1093 1093 + #private_search_page .lycan-import { 1094 1094 + display: none; 1095 1095 + 1096 1096 + margin-top: 30px; 1097 1097 + border-top: 1px solid #ccc; 1098 1098 + padding-top: 5px; 1099 1099 + } 1100 1100 + 1101 1101 + #private_search_page .lycan-import form p { 1102 1102 + line-height: 135%; 1103 1103 + } 1104 1104 + 1105 1105 + #private_search_page .lycan-import .import-progress progress { 1106 1106 + margin-left: 0; 1107 1107 + margin-right: 6px; 1108 1108 + } 1109 1109 + 1110 1110 + #private_search_page .lycan-import .import-progress progress + output { 1111 1111 + font-size: 11pt; 1112 1112 + } 1113 1113 + 1114 1114 + #private_search_page .results { 1115 1115 + margin-top: 30px; 1116 1116 + } 1117 1117 + 1118 1118 + #private_search_page .results > .post { 1119 1119 + margin-left: -15px; 1120 1120 + padding-left: 15px; 1121 1121 + border-bottom: 1px solid #ddd; 1122 1122 + padding-bottom: 10px; 1123 1123 + margin-top: 24px; 1124 1124 + } 1125 1125 + 1126 1126 + #private_search_page .results-end { 1127 1127 + font-size: 12pt; 1128 1128 + color: #333; 1129 1129 + } 1130 1130 + 1131 1131 + #private_search_page .post + .results-end { 1132 1132 + font-size: 11pt; 1133 1133 + } 1134 1134 + 1039 1135 @media (prefers-color-scheme: dark) { 1040 1136 body { 1041 1137 background-color: rgb(39, 39, 37); ··· 1060 1156 1061 1157 #search form input { 1062 1158 background-color: transparent; 1159 1159 + } 1160 1160 + 1161 1161 + #account.active { 1162 1162 + color: #333; 1063 1163 } 1064 1164 1065 1165 #account_menu { ··· 1067 1167 border-color: #ccc; 1068 1168 } 1069 1169 1070 1070 - #account_menu li a { 1170 1170 + #account_menu li a[data-action] { 1071 1171 color: #333; 1072 1172 border-color: #bbb; 1073 1173 background-color: hsla(210, 100%, 4%, 0.12); 1074 1174 } 1075 1175 1076 1076 - #account_menu li a:hover { 1176 1176 + #account_menu li a[data-action]:hover { 1077 1177 background-color: hsla(210, 100%, 4%, 0.2); 1078 1178 } 1079 1179 ··· 1155 1255 color: #888; 1156 1256 } 1157 1257 1258 1258 + .post .body .highlight { 1259 1259 + background-color: rgba(255, 255, 0, 0.35); 1260 1260 + } 1261 1261 + 1158 1262 .post .quote-embed { 1159 1263 background-color: #303030; 1160 1264 border-color: #606060; ··· 1204 1308 color: #ff7070; 1205 1309 } 1206 1310 1311 1311 + .post a.link-card > div { 1312 1312 + background-color: #303030; 1313 1313 + border-color: #606060; 1314 1314 + } 1315 1315 + 1316 1316 + .post a.link-card:hover > div { 1317 1317 + background-color: #383838; 1318 1318 + border-color: #707070; 1319 1319 + } 1320 1320 + 1321 1321 + .post a.link-card p.domain { 1322 1322 + color: #666; 1323 1323 + } 1324 1324 + 1325 1325 + .post a.link-card h2 { 1326 1326 + color: #ccc; 1327 1327 + } 1328 1328 + 1329 1329 + .post a.link-card p.description { 1330 1330 + color: #888; 1331 1331 + } 1332 1332 + 1333 1333 + .post a.link-card.record .handle { 1334 1334 + color: #666; 1335 1335 + } 1336 1336 + 1337 1337 + .post a.link-card.record .avatar { 1338 1338 + border-color: #888; 1339 1339 + } 1340 1340 + 1341 1341 + .post a.link-card.record .stats i.fa-heart:hover { 1342 1342 + color: #eee; 1343 1343 + } 1344 1344 + 1345 1345 + .post a.fedi-link > div { 1346 1346 + border-color: #606060; 1347 1347 + color: #909090; 1348 1348 + } 1349 1349 + 1350 1350 + .post a.fedi-link:hover > div { 1351 1351 + background-color: #444; 1352 1352 + border-color: #909090; 1353 1353 + } 1354 1354 + 1207 1355 #posting_stats_page input:disabled + label { 1208 1356 color: #777; 1209 1357 } ··· 1256 1404 1257 1405 #private_search_page .search-query { 1258 1406 border: 1px solid #666; 1407 1407 + } 1408 1408 + 1409 1409 + #private_search_page .lycan-import { 1410 1410 + border-top-color: #888; 1411 1411 + } 1412 1412 + 1413 1413 + #private_search_page .results-end { 1414 1414 + color: #888; 1415 1415 + } 1416 1416 + 1417 1417 + #private_search_page .results > .post { 1418 1418 + border-bottom: 1px solid #555; 1259 1419 } 1260 1420 }

+1 -1

test/ts_test.js

··· 19 19 /** @type {never} */ let x3 = html; 20 20 21 21 document.addEventListener('click', (e) => { 22 22 - let target = $(e.target); 22 22 + let target = $(e.target); 23 23 /** @type {never} */ let x4 = target; 24 24 }); 25 25

+10 -1

thread_page.js

··· 23 23 } 24 24 25 25 return p; 26 26 - } 26 26 + } 27 27 28 28 /** @param {string} url, @returns {Promise<void>} */ 29 29 ··· 64 64 65 65 if (root.parent) { 66 66 let p = this.buildParentLink(root.parent); 67 67 + $id('thread').appendChild(p); 68 68 + } else if (root.parentReference) { 69 69 + let { repo, rkey } = atURI(root.parentReference.uri); 70 70 + let url = linkToPostById(repo, rkey); 71 71 + 72 72 + let handle = api.findHandleByDid(repo); 73 73 + let link = handle ? `See parent post (@${handle})` : "See parent post"; 74 74 + 75 75 + let p = $tag('p.back', { html: `<i class="fa-solid fa-reply"></i><a href="${url}">${link}</a>` }); 67 76 $id('thread').appendChild(p); 68 77 } 69 78 }

+2

types.d.ts

··· 20 20 declare var notificationsPage: NotificationsPage; 21 21 declare var privateSearchPage: PrivateSearchPage; 22 22 23 23 + declare var Paginator: PaginatorType; 24 24 + 23 25 type json = Record<string, any>; 24 26 25 27 function $tag(tag: string): HTMLElement;

+34

utils.js

··· 18 18 } 19 19 20 20 /** 21 21 + * @typedef {object} PaginatorType 22 22 + * @property {(callback: (boolean) => void) => void} loadInPages 23 23 + * @property {(() => void)=} scrollHandler 24 24 + * @property {ResizeObserver=} resizeObserver 25 25 + */ 26 26 + 27 27 + window.Paginator = { 28 28 + loadInPages(callback) { 29 29 + if (this.scrollHandler) { 30 30 + document.removeEventListener('scroll', this.scrollHandler); 31 31 + } 32 32 + 33 33 + if (this.resizeObserver) { 34 34 + this.resizeObserver.disconnect(); 35 35 + } 36 36 + 37 37 + let loadIfNeeded = () => { 38 38 + if (window.pageYOffset + window.innerHeight > document.body.offsetHeight - 500) { 39 39 + callback(loadIfNeeded); 40 40 + } 41 41 + }; 42 42 + 43 43 + callback(loadIfNeeded); 44 44 + 45 45 + document.addEventListener('scroll', loadIfNeeded); 46 46 + const resizeObserver = new ResizeObserver(loadIfNeeded); 47 47 + resizeObserver.observe(document.body); 48 48 + 49 49 + this.scrollHandler = loadIfNeeded; 50 50 + this.resizeObserver = resizeObserver; 51 51 + } 52 52 + }; 53 53 + 54 54 + /** 21 55 * @template T 22 56 * @param {string} tag 23 57 * @param {string | object} params