ngn/dumb
1
0
Fork 0
Code Issues 1 Pull Requests 3 Actions Packages Activity

feat: add notice for unreviewed annotations, and fix failed tests

Browse Source
This commit is contained in:
rramiachraf 2024-09-18 14:34:20 +01:00
parent c81feb465b
commit 2d4ada55a8
7 changed files with 110 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
data/annotation.go
View File

@ -3,13 +3,15 @@ package data
type AnnotationsResponse struct {
Response struct {
Referent struct {
Annotations []struct {
Body Annotation `json:"body"`
} `json:"annotations"`
Annotations []Annotation `json:"annotations"`
} `json:"referent"`
} `json:"response"`
}
type Annotation struct {
Body struct {
HTML string `json:"html"`
} `json:"body"`
State string `json:"state"`
Verified bool `json:"verified"`
}

8
handlers/annotations.go
View File

@ -62,18 +62,18 @@ func annotations(l *utils.Logger) http.HandlerFunc {
return
}
body := data.Response.Referent.Annotations[0].Body
body.HTML = utils.CleanBody(body.HTML)
annotation := data.Response.Referent.Annotations[0]
annotation.Body.HTML = utils.CleanBody(annotation.Body.HTML)
w.Header().Set("content-type", "application/json")
encoder := json.NewEncoder(w)
if err = encoder.Encode(&body); err != nil {
if err = encoder.Encode(&annotation); err != nil {
l.Error("Error sending response: %s", err.Error())
return
}
if err = setCache("annotation:"+id, body); err != nil {
if err = setCache("annotation:"+id, annotation); err != nil {
l.Error(err.Error())
}
}

9
handlers/annotations_test.go
View File

@ -7,11 +7,12 @@ import (
"os"
"testing"
"github.com/rramiachraf/dumb/data"
"github.com/rramiachraf/dumb/utils"
)
func TestAnnotations(t *testing.T) {
url := "/61590/Black-star-respiration/The-new-moon-rode-high-in-the-crown-of-the-metropolis/annotations"
url := "/943841/Black-star-respiration/Shinin-like-who-on-top-of-this/annotations"
r, err := http.NewRequest(http.MethodGet, url, nil)
if err != nil {
@ -27,13 +28,13 @@ func TestAnnotations(t *testing.T) {
defer rr.Result().Body.Close()
decoder := json.NewDecoder(rr.Result().Body)
annotation := map[string]string{}
var annotation data.Annotation
if err := decoder.Decode(&annotation); err != nil {
t.Fatal(err)
}
if _, exists := annotation["html"]; !exists {
t.Fatalf("html field not found on annotation\n")
if annotation.State != "accepted" {
t.Fatalf("expected state to be %q, got %q\n", "accepted", annotation.State)
}
}

6
handlers/artist_test.go
View File

@ -14,7 +14,6 @@ import (
func TestArtist(t *testing.T) {
url := "/artists/Red-hot-chili-peppers"
name := "Red Hot Chili Peppers"
firstAlbumName := "Cardiff, Wales: 6/23/04"
r, err := http.NewRequest(http.MethodGet, url, nil)
if err != nil {
@ -42,9 +41,4 @@ func TestArtist(t *testing.T) {
if artistName != name {
t.Fatalf("expected %q, got %q\n", name, artistName)
}
albumName := doc.Find("#artist-albumlist > a > p").First().Text()
if albumName != firstAlbumName {
t.Fatalf("expected %q, got %q\n", firstAlbumName, albumName)
}
}

128
static/script.js
View File

@ -1,83 +1,109 @@
const description = document.querySelector("#description > #full")
const summary = document.querySelector("#description > #summary")
const description = document.querySelector("#description > #full");
const summary = document.querySelector("#description > #summary");
function showDescription() {
summary.classList.toggle("hidden")
description.classList.toggle("hidden")
summary.classList.toggle("hidden");
description.classList.toggle("hidden");
}
description && [description, summary].forEach(item => item.onclick = showDescription)
description &&
[description, summary].forEach(
(item) => (item.onclick = showDescription)
);
window.addEventListener("load", () => {
const geniusURL = "https://genius.com" + document.location.pathname + document.location.search
document.getElementById("goto-genius").setAttribute("href", geniusURL)
document.querySelectorAll("#lyrics a").forEach(item => {
item.addEventListener("click", getAnnotation)
})
const geniusURL =
"https://genius.com" +
document.location.pathname +
document.location.search;
document.getElementById("goto-genius").setAttribute("href", geniusURL);
document.querySelectorAll("#lyrics a").forEach((item) => {
item.addEventListener("click", getAnnotation);
});
const linkedAnnotationId = window.location.pathname.match(new RegExp("/(\\d+)"))?.[1]
const linkedAnnotationId = window.location.pathname.match(
new RegExp("/(\\d+)")
)?.[1];
if (linkedAnnotationId) {
const target = document.querySelector(`a[href^="/${linkedAnnotationId}"][class^="ReferentFragmentdesktop__ClickTarget"] > span`)
target?.click()
target?.scrollIntoView()
const target = document.querySelector(
`a[href^="/${linkedAnnotationId}"][class^="ReferentFragmentdesktop__ClickTarget"] > span`
);
target?.click();
target?.scrollIntoView();
}
})
});
function getAnnotation(e) {
e.preventDefault()
e.preventDefault();
//document.querySelector('.annotation')?.remove()
const link = e.currentTarget
const uri = link.getAttribute("href")
const presentAnnotation = link.nextElementSibling.matches(".annotation") && link.nextElementSibling
const unreviewedAnnotation =
'<p id="unreviewed-annotation">This annotation is unreviewed</p>';
const link = e.currentTarget;
const uri = link.getAttribute("href");
const presentAnnotation =
link.nextElementSibling.matches(".annotation") &&
link.nextElementSibling;
if (presentAnnotation) {
presentAnnotation.remove()
return
presentAnnotation.remove();
return;
}
xhr = new XMLHttpRequest()
xhr.open("GET", uri + "/annotations")
xhr.send()
xhr.onreadystatechange = function() {
xhr = new XMLHttpRequest();
xhr.open("GET", uri + "/annotations");
xhr.send();
xhr.onreadystatechange = function () {
if (this.readyState == 4 && this.status == 200) {
const parsedReponse = JSON.parse(this.responseText)
const annotationDiv = document.createElement('div');
annotationDiv.innerHTML = parsedReponse.html
annotationDiv.id = uri
annotationDiv.className = "annotation"
const parsedReponse = JSON.parse(this.responseText);
const annotationDiv = document.createElement("div");
annotationDiv.innerHTML = parsedReponse.body.html;
annotationDiv.id = uri;
annotationDiv.className = "annotation";
if (parsedReponse.state !== "accepted") {
annotationDiv.insertAdjacentHTML(
"afterbegin",
unreviewedAnnotation
);
}
if (!link.nextElementSibling.matches(".annotation")) {
link.insertAdjacentElement('afterend', annotationDiv)
}
link.insertAdjacentElement(
"afterend",
annotationDiv
);
}
}
};
}
window._currentTheme = localStorage.getItem("_theme") || "light"
setTheme(window._currentTheme)
window._currentTheme = localStorage.getItem("_theme") || "light";
setTheme(window._currentTheme);
const themeChooser = document.getElementById("choose-theme")
themeChooser.addEventListener("click", function() {
const themeChooser = document.getElementById("choose-theme");
themeChooser.addEventListener("click", function () {
if (window._currentTheme === "dark") {
setTheme("light")
setTheme("light");
} else {
setTheme("dark")
setTheme("dark");
}
})
});
function setTheme(theme) {
const toggler = document.getElementById("ic_fluent_dark_theme_24_regular")
const toggler = document.getElementById(
"ic_fluent_dark_theme_24_regular"
);
switch (theme) {
case "dark":
toggler.setAttribute("fill", "#fff")
localStorage.setItem("_theme", "dark")
document.body.classList.add("dark")
window._currentTheme = "dark"
return
toggler.setAttribute("fill", "#fff");
localStorage.setItem("_theme", "dark");
document.body.classList.add("dark");
window._currentTheme = "dark";
return;
case "light":
toggler.setAttribute("fill", "#181d31")
localStorage.setItem("_theme", "light")
document.body.classList.remove("dark")
window._currentTheme = "light"
return
toggler.setAttribute("fill", "#181d31");
localStorage.setItem("_theme", "light");
document.body.classList.remove("dark");
window._currentTheme = "light";
return;
}
}

22
style/annotation.css
View File

@ -4,7 +4,8 @@
padding: 2px 6px;
}
.annotation, blockquote {
.annotation,
blockquote {
padding: 1rem;
border-radius: 4px;
background: #eee;
@ -13,21 +14,32 @@
margin: 1rem 0;
}
.annotation img, blockquote img {
.annotation img,
blockquote img {
max-width: 100%;
height: auto;
}
.annotation a, blockquote a {
.annotation a,
blockquote a {
background: none;
font-weight: 500;
}
.annotation ul, blockquote ul {
.annotation ul,
blockquote ul {
padding-left: 1em;
}
.dark .annotation, .dark blockquote {
#unreviewed-annotation {
text-align: center;
font-weight: 500;
color: #be3144;
margin-bottom: 1rem;
}
.dark .annotation,
.dark blockquote {
background-color: #272d44;
color: inherit;
}

3
views/article.templ
View File

@ -1,9 +1,8 @@
package views
import (
"time"
"github.com/rramiachraf/dumb/data"
"time"
)
templ ArticlePage(a data.Article) {