view all » '
+ mycommunities.innerHTML += res
+ }, function() {
+ mycommunities.className = ""
+ })
+ }
+ return false
+}
+
+function openSettings(e) {
+ e.preventDefault()
+ var settings = document.getElementById("settingspopup")
+ if (settings.className == "open") {
+ settings.className = ""
+ return false
+ }
+ settings.className = "open"
+ request(e.target.href + "?xhr=1", "", function(res) {
+ settings.innerHTML = res
+ var options = document.getElementsByClassName("scripting")
+ for (var i = 0; i < options.length; i++) {
+ var input = options[i].getElementsByTagName('input')
+ if (!input.length) { continue }
+ if (localStorage.getItem(input[0].name) == "true") {
+ input[0].checked = "checked"
+ }
+ }
+ document.getElementById("settings").addEventListener("submit", saveSettings)
+ document.getElementById("closesettings").addEventListener("click", closeSettings)
})
return false
}
+
+function closeSettings(e) {
+ e.preventDefault()
+ var settings = document.getElementById("settingspopup")
+ settings.className = ""
+ return false
+}
+
+function saveSettings(e) {
+ e = e || window.event;
+ var targ = e.currentTarget || e.srcElement || e;
+ var data = new FormData(targ)
+ e.preventDefault()
+ request(targ.target, data, function(res) {
+ ["endlessScrolling", "autoLoad"].map(function(x) {
+ localStorage.setItem(x, data.get(x)=="on")
+ })
+ window.location.reload()
+ })
+ return false;
+}
+
+function parseYoutube(url){
+ if (url.indexOf("youtu") == -1) return false
+ var regExp = /^.*(?:(?:youtu\.be\/|v\/|vi\/|u\/\w\/|embed\/|shorts\/)|(?:(?:watch)?\?v(?:i)?=|\&v(?:i)?=))([^#\&\?]*).*/;
+ var match = url.match(regExp);
+ if (match && match.length > 1) {
+ return match[1]
+ }
+ return false
+}
+function youtubeIframe(id) {
+ return '
VIDEO '
+}
+
+function showImages(e) {
+ e = e || window.event;
+ e.preventDefault()
+ var targ = e.currentTarget || e.srcElement || e;
+ var parent = targ.parentNode
+ if (parent.className == "") {
+ parent.className = "selected"
+ toggleImages(true)
+ } else {
+ parent.className = ""
+ toggleImages(false)
+ }
+ return false
+}
+
+function toggleImages(open) {
+ var posts = document.getElementsByClassName("post")
+ for (var i = 0; i < posts.length; i++) {
+ var btn = posts[i].getElementsByClassName("expando-button")[0]
+ if (btn.className.indexOf("hidden") != -1) { continue }
+ var img = posts[i].getElementsByClassName("image")
+ if (!img.length) { continue }
+ var bdy = posts[i].getElementsByClassName("expando")[0]
+ if (open) {
+ bdy.className = 'expando open showimage';
+ btn.className = "expando-button open"
+ } else {
+ bdy.className = 'expando';
+ btn.className = "expando-button"
+ }
+ }
+}
+
+function insertImg(e) {
+ e = e || window.event;
+ var form = uptil(e.target, function(el){ return el.tagName == "FORM" })
+ form.querySelector("input[value=preview]").click()
+ var inputs = form.getElementsByTagName("input")
+ for (var i = 0; i < inputs.length; i++) {
+ inputs[i].disabled = "disabled"
+ }
+}
+
+function setup() {
+ if (showimages = document.getElementById("se")) {
+ showimages.addEventListener("click", showImages)
+ }
+ if (settings = document.getElementById("opensettings")) {
+ settings.addEventListener("click", openSettings)
+ }
+ if (settings = document.getElementById("openmycommunities")) {
+ settings.addEventListener("click", toggleMyCommunities)
+ }
+ if (hidechildren = document.getElementById("hidechildren")){
+ hidechildren.addEventListener("click", hideAllChildComments)
+ }
+ if (lmc = document.getElementById("lmc")){
+ var pager = document.getElementsByClassName("pager")
+ if (pager.length) {
+ pager[0].style.display = "none";
+ }
+ lmc.addEventListener("click", loadMoreComments)
+ }
+ var imgUpload = document.getElementsByClassName("imgupload")
+ for (var i = 0; i < imgUpload.length; i++) {
+ imgUpload[i].addEventListener("change", insertImg)
+ }
+ var posts = document.getElementsByClassName("post")
+ for (var i = 0; i < posts.length; i++) {
+ posts[i].addEventListener("click", postClick)
+ var forms = posts[i].getElementsByClassName("link-btn")
+ for (var f = 0; f < forms.length; f++) {
+ forms[f].addEventListener("submit", formSubmit)
+ }
+ var url = posts[i].getElementsByClassName("url")[0].href
+ if (id = parseYoutube(url)) {
+ var btn = posts[i].getElementsByClassName("expando-button")[0]
+ if (btn.className.indexOf("open") > -1) {
+ posts[i].getElementsByClassName("embed")[0].innerHTML = youtubeIframe(id)
+ } else {
+ btn.className = "expando-button"
+ }
+ }
+ }
+ var comments = document.getElementsByClassName("comment")
+ for (var i = 0; i < comments.length; i++) {
+ comments[i].addEventListener("click", commentClick)
+ }
+}
+setup()
+
+if (localStorage.getItem("endlessScrolling") == "true") {
+ var pager = document.getElementsByClassName("pager")
+ if (pager.length) pager[0].className = "pager hidden"
+ var loadmore = document.getElementById("loadmore")
+ if (loadmore) {
+ loadmore.className = "show"
+ loadmore.addEventListener("click", loadMore)
+ }
+}
+if (localStorage.getItem("autoLoad") == "true") {
+ window.onscroll = function(e) {
+ if ((window.innerHeight + Math.round(window.scrollY)) >= document.body.offsetHeight) {
+ if (localStorage.getItem("endlessScrolling") == "true") {
+ if (loadmore = document.getElementById("loadmore")) {
+ loadmore.click()
+ }
+ }
+ if (lmc = document.getElementById("lmc")) {
+ lmc.click()
+ }
+ }
+ };
+}
+
+// delete cookies without HTTPOnly
+var cookies = document.cookie.split(";");
+for (var i = 0; i < cookies.length; i++) {
+ var cookie = cookies[i];
+ var eqPos = cookie.indexOf("=");
+ var name = eqPos > -1 ? cookie.substr(0, eqPos) : cookie;
+ document.cookie = name + "=;expires=Thu, 01 Jan 1970 00:00:00 GMT;SameSite=None;Secure";
+}
diff --git a/public/ws.js b/public/ws.js
new file mode 100644
index 0000000..08ac7c3
--- /dev/null
+++ b/public/ws.js
@@ -0,0 +1,33 @@
+var ok = false
+var t = 800
+var ws
+var prot = location.protocol == 'https:' ? "wss://":"ws://"
+let port = ":8009"
+
+function start(){
+ let url = prot + document.location.hostname + port + document.location.pathname + document.location.search;
+ console.log('connecting to ', url);
+ ws = new WebSocket(url);
+ ws.onopen = function(){
+ console.log("open");
+ t = 800
+ }
+ ws.onmessage = function(msg){
+ console.log("reload:", msg.data)
+ if (msg.data == "") {
+ return
+ }
+ window.location.reload()
+ }
+ ws.onclose = function(){
+ console.log("close");
+ setTimeout(function(){
+ //start()
+ if (t < 10 * 1000) t += 200
+ }, t);
+ };
+}
+console.log("ws");
+if (typeof WebSocket != 'undefined') {
+ start()
+}
diff --git a/routes.go b/routes.go
index 94253a8..d72d653 100644
--- a/routes.go
+++ b/routes.go
@@ -18,6 +18,7 @@ import (
"github.com/dustin/go-humanize"
"github.com/julienschmidt/httprouter"
+ "github.com/k3a/html2text"
"github.com/rystaf/go-lemmy"
"github.com/rystaf/go-lemmy/types"
"golang.org/x/text/language"
@@ -31,12 +32,12 @@ var funcMap = template.FuncMap{
}
return host
},
- "proxy": func(s string) string {
+ "localize": func(s string) string {
u, err := url.Parse(s)
if err != nil {
return s
}
- return "/" + u.Host + u.Path
+ return "." + u.Path + "@" + u.Host
},
"printer": func(n any) string {
p := message.NewPrinter(language.English)
@@ -110,31 +111,120 @@ var funcMap = template.FuncMap{
}
return false
},
+ "thumbnail": func(p types.Post) string {
+ if p.ThumbnailURL.IsValid() {
+ return p.ThumbnailURL.String() + "?format=jpg&thumbnail=96"
+ }
+ re := regexp.MustCompile(`\/pictrs\/image\/([a-z0-9\-]+)\.([a-z]+)$`)
+ if re.MatchString(p.URL.String()) {
+ return p.URL.String() + "?format=jpg&thumbnail=96"
+ }
+ re = regexp.MustCompile(`^https:\/\/(i\.)?imgur.com\/([a-zA-Z0-9]{5,})(\.[a-zA-Z0-9]+)?`)
+ if re.MatchString(p.URL.String()) {
+ return re.ReplaceAllString(p.URL.String(), "https://i.imgur.com/${2}s.jpg")
+ }
+ if p.URL.IsValid() {
+ return "/_/static/link.png"
+ }
+ return "/_/static/text.png"
+ },
"humanize": humanize.Time,
"markdown": func(host string, body string) template.HTML {
var buf bytes.Buffer
+ re := regexp.MustCompile(`\s---\s`)
+ body = re.ReplaceAllString(body, "\n***\n")
+ // community bangs
+ body = RegReplace(body, `([^\[])!([a-zA-Z0-9_]+)@([a-zA-Z0-9\-]+(\.[a-zA-Z0-9\-]+)+)`, `$1[!$2@$3](/c/$2@$3)`)
if err := md.Convert([]byte(body), &buf); err != nil {
- panic(err)
+ fmt.Println(err)
+ return template.HTML(body)
}
- converted := buf.String()
- converted = strings.Replace(converted, `
$1 $2")
+ return template.HTML(body)
+ },
+ "rmmarkdown": func(body string) string {
+ var buf bytes.Buffer
+ if err := md.Convert([]byte(body), &buf); err != nil {
+ fmt.Println(err)
+ return body
}
- return template.HTML(converted)
+ text := html2text.HTML2TextWithOptions(buf.String(), html2text.WithLinksInnerText())
+ re := regexp.MustCompile(`\<(https?:\/\/|mailto)(?:www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b(?:[-a-zA-Z0-9()@:%_\+.~#?&\/=]*)\>`)
+ return re.ReplaceAllString(text, "")
},
"contains": strings.Contains,
"sub": func(a int32, b int) int {
return int(a) - b
},
+ "add": func(a int32, b int) int {
+ return int(a) + b
+ },
+}
+
+func LemmyLinkRewrite(input string, host string, lemmy_domain string) (body string) {
+ body = input
+ // localize community and user links
+ body = RegReplace(body, `href="https:\/\/([a-zA-Z0-9\.\-]+)\/((c|u|comment|post)\/[^#\?]*?)"`, `href="/$2@$1"`)
+ // remove extra instance tag
+ body = RegReplace(body, `href="(https:\/)?(\/[a-zA-Z0-9\.\-]+)?\/((c|u)\/[a-zA-Z0-9]+@[a-zA-Z0-9\.\-]+)@([a-zA-Z0-9\.\-]+)"`, `href="/$3"`)
+ if lemmy_domain == "" {
+ // add domain to relative links
+ body = RegReplace(body, `href="\/((c|u|post|comment)\/(.*?)")`, `href="/`+host+`/$1`)
+ // convert links to relative
+ body = RegReplace(body, `href="https:\/\/([a-zA-Z0-9\.\-]+\/((c|u|post|comment)\/[a-zA-Z0-9]+"))`, `href="/$1`)
+ } else {
+ // convert local links to relative
+ body = RegReplace(body, `href="https:\/\/`+lemmy_domain+`\/(c\/[a-zA-Z0-9]+"|(c|u|post|comment)\/(.*?)")`, `href="/$1`)
+ body = RegReplace(body, `href="(.*)@`+lemmy_domain+`"`, `href="$1"`)
+ }
+
+ re := regexp.MustCompile(`href="\/?([a-zA-Z0-9\.\-]*)\/(c|u|post|comment)\/(.*?)@(.*?)"`)
+ // assume "old." subdomain is mlmym and remove
+ matches := re.FindAllStringSubmatch(body, -1)
+ for _, match := range matches {
+ if match[4][0:4] == "old." {
+ s := 1
+ if match[1] == "" {
+ s += 1
+ }
+ body = strings.Replace(body, match[0], `href="/`+strings.Join(match[s:4], "/")+"@"+match[4][4:]+`"`, -1)
+ }
+ }
+ // remove redundant instance tag
+ matches = re.FindAllStringSubmatch(body, -1)
+ for _, match := range matches {
+ if match[1] == match[4] {
+ body = strings.Replace(body, match[0], `href="/`+strings.Join(match[1:4], "/")+`"`, -1)
+ }
+ }
+ return body
+}
+
+func RegReplace(input string, match string, replace string) string {
+ re := regexp.MustCompile(match)
+ return re.ReplaceAllString(input, replace)
+}
+
+func getenv(key, fallback string) string {
+ value := os.Getenv(key)
+ if len(value) == 0 {
+ return fallback
+ }
+ return value
}
func Initialize(Host string, r *http.Request) (State, error) {
state := State{
- Host: Host,
- Page: 1,
- Status: http.StatusOK,
+ Host: Host,
+ Page: 1,
+ Status: http.StatusOK,
+ Version: version,
+ }
+ if watch != nil {
+ state.Watch = *watch
}
lemmyDomain := os.Getenv("LEMMY_DOMAIN")
if lemmyDomain != "" {
@@ -157,7 +247,7 @@ func Initialize(Host string, r *http.Request) (State, error) {
token := getCookie(r, "jwt")
user := getCookie(r, "user")
parts := strings.Split(user, ":")
- if len(parts) == 2 {
+ if len(parts) == 2 && token != "" {
if id, err := strconv.Atoi(parts[1]); err == nil {
state.Client.Token = token
sess := Session{
@@ -169,13 +259,28 @@ func Initialize(Host string, r *http.Request) (State, error) {
}
state.Listing = getCookie(r, "DefaultListingType")
state.Sort = getCookie(r, "DefaultSortType")
- state.Dark = getCookie(r, "Dark") != ""
+ state.CommentSort = getCookie(r, "DefaultCommentSortType")
+ if dark := getCookie(r, "Dark"); dark != "" {
+ state.Dark = dark != "0"
+ } else {
+ state.Dark = os.Getenv("DARK") != ""
+ }
+ state.ShowNSFW = getCookie(r, "ShowNSFW") != ""
+ state.HideInstanceNames = getCookie(r, "HideInstanceNames") != ""
+ if hide := getCookie(r, "HideThumbnails"); hide != "" {
+ state.HideThumbnails = hide != "0"
+ } else {
+ state.HideThumbnails = os.Getenv("HIDE_THUMBNAILS") != ""
+ }
state.ParseQuery(r.URL.RawQuery)
if state.Sort == "" {
- state.Sort = "Hot"
+ state.Sort = getenv("SORT", "Hot")
+ }
+ if state.CommentSort == "" {
+ state.CommentSort = getenv("COMMENT_SORT", "Hot")
}
if state.Listing == "" || state.Session == nil && state.Listing == "Subscribed" {
- state.Listing = "All"
+ state.Listing = getenv("LISTING", "All")
}
return state, nil
}
@@ -210,6 +315,8 @@ func Render(w http.ResponseWriter, templateName string, state State) {
if state.Status != http.StatusOK {
w.WriteHeader(state.Status)
}
+ header := w.Header()
+ header.Set("Content-Security-Policy", "script-src 'self'")
err = tmpl.Execute(w, state)
if err != nil {
fmt.Println("execute fail", err)
@@ -219,6 +326,7 @@ func Render(w http.ResponseWriter, templateName string, state State) {
}
func GetRoot(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
data := make(map[string]any)
+ data["Title"] = r.Host
tmpl, err := GetTemplate("root.html")
if err != nil {
fmt.Println("execute fail", err)
@@ -334,7 +442,49 @@ func GetFrontpage(w http.ResponseWriter, r *http.Request, ps httprouter.Params)
if state.Op == "" {
state.GetPosts()
}
- Render(w, "frontpage.html", state)
+ if state.XHR {
+ Render(w, "xhr.html", state)
+ } else {
+ Render(w, "frontpage.html", state)
+ }
+}
+
+func GetCommunities(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+ r.URL.Path = "/search"
+ if ps.ByName("host") != "" {
+ r.URL.Path = "/" + ps.ByName("host") + "/search"
+ }
+ r.URL.RawQuery = "searchtype=Communities&sort=TopMonth"
+ http.Redirect(w, r, r.URL.String(), 301)
+}
+
+func ResolveId(r *http.Request, class string, id string, host string) string {
+ remoteAddr := r.RemoteAddr
+ if r.Header.Get("CF-Connecting-IP") != "" {
+ remoteAddr = r.Header.Get("CF-Connecting-IP")
+ }
+ client := http.Client{Transport: NewAddHeaderTransport(remoteAddr)}
+ c, err := lemmy.NewWithClient("https://"+host, &client)
+ if err != nil {
+ return ""
+ }
+ idn, _ := strconv.Atoi(id)
+ if class == "post" {
+ resp, err := c.Post(context.Background(), types.GetPost{
+ ID: types.NewOptional(idn),
+ })
+ if err != nil {
+ return ""
+ }
+ return resp.PostView.Post.ApID
+ }
+ resp, err := c.Comment(context.Background(), types.GetComment{
+ ID: idn,
+ })
+ if err != nil {
+ return ""
+ }
+ return resp.CommentView.Comment.ApID
}
func GetPost(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
@@ -343,11 +493,40 @@ func GetPost(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
Render(w, "index.html", state)
return
}
+ if path := strings.Split(ps.ByName("postid"), "@"); len(path) > 1 {
+ apid := ResolveId(r, "post", path[0], path[1])
+ if apid != "" {
+ resp, err := state.Client.ResolveObject(context.Background(), types.ResolveObject{
+ Q: apid,
+ })
+ if err != nil {
+ dest := apid
+ if os.Getenv("LEMMY_DOMAIN") == "" {
+ dest = RegReplace(dest, `https:\/\/([a-zA-Z0-9\.\-]+\/post\/\d+)`, `/$1`)
+ }
+ http.Redirect(w, r, dest, 302)
+ return
+ }
+ post, _ := resp.Post.Value()
+ if post.Post.ID > 0 {
+ dest := RegReplace(r.URL.String(), `(([a-zA-Z0-9\.\-]+)?/post/)([a-zA-Z0-9\-\.@]+)`, `$1`)
+ dest += strconv.Itoa(post.Post.ID)
+ http.Redirect(w, r, dest, 302)
+ return
+ } else {
+ http.Redirect(w, r, apid, 302)
+ return
+ }
+ }
+ }
m, _ := url.ParseQuery(r.URL.RawQuery)
if len(m["edit"]) > 0 {
state.Op = "edit_post"
state.GetSite()
}
+ if len(m["content"]) > 0 {
+ state.Content = m["content"][0]
+ }
postid, _ := strconv.Atoi(ps.ByName("postid"))
state.GetPost(postid)
state.GetComments()
@@ -359,6 +538,32 @@ func GetComment(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
Render(w, "index.html", state)
return
}
+ if path := strings.Split(ps.ByName("commentid"), "@"); len(path) > 1 {
+ apid := ResolveId(r, "comment", path[0], path[1])
+ if apid != "" {
+ resp, err := state.Client.ResolveObject(context.Background(), types.ResolveObject{
+ Q: apid,
+ })
+ if err != nil {
+ dest := apid
+ if os.Getenv("LEMMY_DOMAIN") == "" {
+ dest = RegReplace(dest, `https:\/\/([a-zA-Z0-9\.\-]+\/comment\/\d+)`, `/$1`)
+ }
+ http.Redirect(w, r, dest, 302)
+ return
+ }
+ comment, _ := resp.Comment.Value()
+ if comment.Comment.ID > 0 {
+ dest := RegReplace(r.URL.String(), `(([a-zA-Z0-9\.\-]+)?/comment/)([a-zA-Z0-9\-\.@]+)`, `$1`)
+ dest += strconv.Itoa(comment.Comment.ID)
+ http.Redirect(w, r, dest, 302)
+ return
+ } else {
+ http.Redirect(w, r, apid, 302)
+ return
+ }
+ }
+ }
m, _ := url.ParseQuery(r.URL.RawQuery)
if len(m["reply"]) > 0 {
state.Op = "reply"
@@ -366,11 +571,22 @@ func GetComment(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
if len(m["edit"]) > 0 {
state.Op = "edit"
}
+ if r.Method == "POST" && len(m["content"]) > 0 {
+ state.Content = m["content"][0]
+ }
if len(m["source"]) > 0 {
state.Op = "source"
}
+ if len(m["context"]) > 0 {
+ ctx, _ := strconv.Atoi(m["context"][0])
+ state.Context = ctx
+ }
commentid, _ := strconv.Atoi(ps.ByName("commentid"))
state.GetComment(commentid)
+ if state.XHR && len(m["content"]) > 0 {
+ Render(w, "create_comment.html", state)
+ return
+ }
state.GetPost(state.PostID)
Render(w, "index.html", state)
}
@@ -461,10 +677,13 @@ func setCookie(w http.ResponseWriter, host string, name string, value string) {
host = ""
}
cookie := http.Cookie{
- Name: name,
- Value: value,
- MaxAge: 86400 * 30,
- Path: "/" + host,
+ Name: name,
+ Value: value,
+ MaxAge: 86400 * 30,
+ HttpOnly: true,
+ SameSite: http.SameSiteNoneMode,
+ Secure: true,
+ Path: "/" + host,
}
http.SetCookie(w, &cookie)
}
@@ -485,23 +704,49 @@ func Settings(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
Render(w, "index.html", state)
return
}
+ state.GetSite()
switch r.Method {
case "POST":
- for _, name := range []string{"DefaultSortType", "DefaultListingType"} {
- setCookie(w, state.Host, name, r.FormValue(name))
+ for _, name := range []string{"DefaultSortType", "DefaultListingType", "DefaultCommentSortType"} {
+ deleteCookie(w, state.Host, name)
+ setCookie(w, "", name, r.FormValue(name))
}
if r.FormValue("darkmode") != "" {
- setCookie(w, state.Host, "Dark", "1")
+ setCookie(w, "", "Dark", "1")
state.Dark = true
} else {
- deleteCookie(w, state.Host, "Dark")
+ setCookie(w, "", "Dark", "0")
state.Dark = false
}
+ if r.FormValue("shownsfw") != "" {
+ setCookie(w, "", "ShowNSFW", "1")
+ state.ShowNSFW = true
+ } else {
+ deleteCookie(w, state.Host, "ShowNSFW")
+ deleteCookie(w, "", "ShowNSFW")
+ state.ShowNSFW = false
+ }
+ if r.FormValue("hideInstanceNames") != "" {
+ setCookie(w, "", "HideInstanceNames", "1")
+ state.HideInstanceNames = true
+ } else {
+ deleteCookie(w, "", "HideInstanceNames")
+ state.HideInstanceNames = false
+ }
+ if r.FormValue("hideThumbnails") != "" {
+ setCookie(w, "", "HideThumbnails", "1")
+ state.HideInstanceNames = true
+ } else {
+ setCookie(w, "", "HideThumbnails", "0")
+ state.HideInstanceNames = false
+ }
state.Listing = r.FormValue("DefaultListingType")
state.Sort = r.FormValue("DefaultSortType")
+ state.CommentSort = r.FormValue("DefaultCommentSortType")
+ // TODO save user settings
case "GET":
if state.Session != nil {
- // TODO fetch server settings
+ // TODO fetch user settings
}
}
Render(w, "settings.html", state)
@@ -510,6 +755,7 @@ func Settings(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
func SignUpOrLogin(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
state, err := Initialize(ps.ByName("host"), r)
if err != nil {
+ fmt.Println(err)
Render(w, "index.html", state)
return
}
@@ -517,11 +763,19 @@ func SignUpOrLogin(w http.ResponseWriter, r *http.Request, ps httprouter.Params)
var username string
switch r.FormValue("submit") {
case "log in":
- resp, err := state.Client.Login(context.Background(), types.Login{
+ login := types.Login{
UsernameOrEmail: r.FormValue("username"),
Password: r.FormValue("password"),
- })
+ }
+ if r.FormValue("totp") != "" {
+ login.Totp2faToken = types.NewOptional(r.FormValue("totp"))
+ }
+ resp, err := state.Client.Login(context.Background(), login)
if err != nil {
+ if strings.Contains(fmt.Sprintf("%v", err), "missing_totp_token") {
+ state.Op = "2fa"
+ }
+ fmt.Println(err)
state.Error = err
state.GetSite()
state.GetCaptcha()
@@ -531,6 +785,7 @@ func SignUpOrLogin(w http.ResponseWriter, r *http.Request, ps httprouter.Params)
if resp.JWT.IsValid() {
token = resp.JWT.String()
username = r.FormValue("username")
+ deleteCookie(w, state.Host, "ShowNSFW")
}
case "sign up":
register := types.Register{
@@ -574,17 +829,14 @@ func SignUpOrLogin(w http.ResponseWriter, r *http.Request, ps httprouter.Params)
q.Add("alert", alert)
r.URL.RawQuery = q.Encode()
http.Redirect(w, r, r.URL.String(), 301)
+ return
}
}
if token != "" {
- if err != nil {
- state.Error = err
- state.GetSite()
- state.GetCaptcha()
- Render(w, "login.html", state)
+ state.GetUser(username)
+ if state.User == nil {
return
}
- state.GetUser(username)
setCookie(w, state.Host, "jwt", token)
userid := strconv.Itoa(state.User.PersonView.Person.ID)
setCookie(w, state.Host, "user", state.User.PersonView.Person.Name+":"+userid)
@@ -601,7 +853,7 @@ func GetLogin(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
return
}
state.GetSite()
- if state.Site.SiteView.LocalSite.CaptchaEnabled {
+ if state.Site != nil && state.Site.SiteView.LocalSite.CaptchaEnabled {
state.GetCaptcha()
}
m, _ := url.ParseQuery(r.URL.RawQuery)
@@ -667,22 +919,49 @@ func UserOp(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
CommunityID: communityid,
Follow: true,
})
+ case "block":
+ communityid, _ := strconv.Atoi(r.FormValue("communityid"))
+ state.Client.BlockCommunity(context.Background(), types.BlockCommunity{
+ CommunityID: communityid,
+ Block: true,
+ })
+ case "unblock":
+ communityid, _ := strconv.Atoi(r.FormValue("communityid"))
+ state.Client.BlockCommunity(context.Background(), types.BlockCommunity{
+ CommunityID: communityid,
+ Block: false,
+ })
case "logout":
deleteCookie(w, state.Host, "jwt")
deleteCookie(w, state.Host, "user")
case "login":
- resp, err := state.Client.Login(context.Background(), types.Login{
- UsernameOrEmail: r.FormValue("user"),
- Password: r.FormValue("pass"),
- })
- if err != nil {
- state.Status = http.StatusUnauthorized
+ login := types.Login{
+ UsernameOrEmail: r.FormValue("username"),
+ Password: r.FormValue("password"),
}
- if resp.JWT.IsValid() {
- state.GetUser(r.FormValue("user"))
- setCookie(w, state.Host, "jwt", resp.JWT.String())
- userid := strconv.Itoa(state.User.PersonView.Person.ID)
- setCookie(w, state.Host, "user", state.User.PersonView.Person.Name+":"+userid)
+ if r.FormValue("totp") != "" {
+ login.Totp2faToken = types.NewOptional(r.FormValue("totp"))
+ }
+ resp, err := state.Client.Login(context.Background(), login)
+ if err != nil {
+ if strings.Contains(fmt.Sprintf("%v", err), "missing_totp_token") {
+ state.Op = "2fa"
+ }
+ state.GetSite()
+ if state.Site != nil && state.Site.SiteView.LocalSite.CaptchaEnabled {
+ state.GetCaptcha()
+ }
+ state.Status = http.StatusUnauthorized
+ state.Error = err
+ Render(w, "login.html", state)
+ return
+ } else if resp.JWT.IsValid() {
+ state.GetUser(r.FormValue("username"))
+ if state.User != nil {
+ setCookie(w, state.Host, "jwt", resp.JWT.String())
+ userid := strconv.Itoa(state.User.PersonView.Person.ID)
+ setCookie(w, state.Host, "user", state.User.PersonView.Person.Name+":"+userid)
+ }
}
case "create_community":
state.GetSite()
@@ -759,6 +1038,9 @@ func UserOp(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
fmt.Println(err)
}
case "create_post":
+ if state.CommunityName == "" {
+ state.CommunityName = r.FormValue("communityname")
+ }
state.GetCommunity(state.CommunityName)
state.GetSite()
if state.Community == nil {
@@ -805,6 +1087,7 @@ func UserOp(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
post := types.EditPost{
PostID: postid,
Body: types.NewOptional(r.FormValue("body")),
+ Name: types.NewOptional(r.FormValue("name")),
URL: types.NewOptional(r.FormValue("url")),
}
if r.FormValue("url") == "" {
@@ -835,6 +1118,38 @@ func UserOp(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
state.Error = err
fmt.Println(err)
}
+ case "save_post":
+ postid, _ := strconv.Atoi(r.FormValue("postid"))
+ _, err := state.Client.SavePost(context.Background(), types.SavePost{
+ PostID: postid,
+ Save: r.FormValue("submit") == "save",
+ })
+ if err != nil {
+ fmt.Println(err)
+ }
+ if r.FormValue("xhr") != "" {
+ state.GetPost(postid)
+ state.PostID = 0
+ state.Op = "save_post"
+ state.XHR = true
+ Render(w, "index.html", state)
+ return
+ }
+ case "save_comment":
+ commentid, _ := strconv.Atoi(r.FormValue("commentid"))
+ _, err := state.Client.SaveComment(context.Background(), types.SaveComment{
+ CommentID: commentid,
+ Save: r.FormValue("submit") == "save",
+ })
+ if err != nil {
+ fmt.Println(err)
+ }
+ if r.FormValue("xhr") != "" {
+ state.XHR = true
+ state.GetComment(commentid)
+ Render(w, "index.html", state)
+ return
+ }
case "delete_post":
postid, _ := strconv.Atoi(r.FormValue("postid"))
post := types.DeletePost{
@@ -851,6 +1166,22 @@ func UserOp(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
r.URL.Path = "/" + state.Host + "/c/" + resp.PostView.Community.Name
r.URL.RawQuery = ""
}
+ case "read_post":
+ postid, _ := strconv.Atoi(r.FormValue("postid"))
+ post := types.MarkPostAsRead{
+ PostID: postid,
+ Read: true,
+ }
+ if r.FormValue("submit") == "mark unread" {
+ post.Read = false
+ }
+ _, err := state.Client.MarkPostAsRead(context.Background(), post)
+ if err != nil {
+ fmt.Println(err)
+ } else if r.FormValue("xhr") != "" {
+ w.Write([]byte{})
+ return
+ }
case "vote_post":
var score int16
score = 1
@@ -868,6 +1199,8 @@ func UserOp(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
state.Client.CreatePostLike(context.Background(), post)
if r.FormValue("xhr") != "" {
state.GetPost(postid)
+ state.PostID = 0
+ state.Op = "vote_post"
state.XHR = true
Render(w, "index.html", state)
return
@@ -875,7 +1208,7 @@ func UserOp(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
case "vote_comment":
var score int16
score = 1
- if r.FormValue("vote") != "▲" {
+ if r.FormValue("submit") != "▲" {
score = -1
}
if r.FormValue("undo") == strconv.Itoa(int(score)) {
@@ -902,33 +1235,122 @@ func UserOp(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
parentid, _ := strconv.Atoi(r.FormValue("parentid"))
state.GetComment(parentid)
}
- createComment := types.CreateComment{
- Content: r.FormValue("content"),
- PostID: state.PostID,
- }
- if state.CommentID > 0 {
- createComment.ParentID = types.NewOptional(state.CommentID)
- }
- resp, err := state.Client.CreateComment(context.Background(), createComment)
+ content := r.FormValue("content")
+ file, handler, err := r.FormFile("file")
if err == nil {
- postid := strconv.Itoa(state.PostID)
- commentid := strconv.Itoa(resp.CommentView.Comment.ID)
- r.URL.Path = "/" + state.Host + "/post/" + postid
- r.URL.Fragment = "c" + commentid
- } else {
- fmt.Println(err)
+ pres, err := state.UploadImage(file, handler)
+ if err != nil {
+ state.Error = err
+ Render(w, "index.html", state)
+ return
+ }
+ content += ("![](https://" + state.Host + "/pictrs/image/" + pres.Files[0].Filename + ")")
+ }
+ if r.FormValue("submit") == "save" {
+ createComment := types.CreateComment{
+ Content: content,
+ PostID: state.PostID,
+ }
+ if state.CommentID > 0 {
+ createComment.ParentID = types.NewOptional(state.CommentID)
+ }
+ resp, err := state.Client.CreateComment(context.Background(), createComment)
+ if err == nil {
+ if r.FormValue("xhr") != "" {
+ state.XHR = true
+ state.Comments = nil
+ state.GetComment(resp.CommentView.Comment.ID)
+ Render(w, "index.html", state)
+ return
+ }
+ postid := strconv.Itoa(state.PostID)
+ commentid := strconv.Itoa(resp.CommentView.Comment.ID)
+ r.URL.Path = "/" + state.Host + "/post/" + postid
+ r.URL.Fragment = "c" + commentid
+ } else {
+ fmt.Println(err)
+ }
+ } else if r.FormValue("submit") == "preview" {
+ q := r.URL.Query()
+ q.Set("content", content)
+ q.Set("reply", "")
+ if r.FormValue("xhr") != "" {
+ q.Set("xhr", "1")
+ }
+ r.URL.RawQuery = q.Encode()
+ if ps.ByName("postid") != "" {
+ GetPost(w, r, ps)
+ return
+ }
+ if ps.ByName("commentid") != "" {
+ GetComment(w, r, ps)
+ return
+ }
+ } else if r.FormValue("xhr") != "" {
+ w.Write([]byte{})
+ return
+ }
+ if r.FormValue("submit") == "cancel" {
+ r.URL.RawQuery = ""
}
case "edit_comment":
commentid, _ := strconv.Atoi(r.FormValue("commentid"))
- resp, err := state.Client.EditComment(context.Background(), types.EditComment{
- CommentID: commentid,
- Content: types.NewOptional(r.FormValue("content")),
- })
- if err != nil {
- fmt.Println(err)
- } else {
- commentid := strconv.Itoa(resp.CommentView.Comment.ID)
- r.URL.Fragment = "c" + commentid
+ q := r.URL.Query()
+ content := r.FormValue("content")
+ file, handler, err := r.FormFile("file")
+ if err == nil {
+ pres, err := state.UploadImage(file, handler)
+ if err != nil {
+ state.Error = err
+ Render(w, "index.html", state)
+ return
+ }
+ content += ("![](https://" + state.Host + "/pictrs/image/" + pres.Files[0].Filename + ")")
+ }
+
+ if r.FormValue("submit") == "save" {
+ resp, err := state.Client.EditComment(context.Background(), types.EditComment{
+ CommentID: commentid,
+ Content: types.NewOptional(content),
+ })
+ if err != nil {
+ fmt.Println(err)
+ } else {
+ commentid := strconv.Itoa(resp.CommentView.Comment.ID)
+ r.URL.Fragment = "c" + commentid
+ r.URL.RawQuery = ""
+ }
+ } else if r.FormValue("submit") == "preview" {
+ q.Set("content", content)
+ q.Set("edit", "")
+ if r.FormValue("xhr") != "" {
+ q.Set("xhr", "1")
+ }
+ r.URL.RawQuery = q.Encode()
+ if ps.ByName("commentid") != "" {
+ GetComment(w, r, ps)
+ return
+ }
+ } else if r.FormValue("submit") == "cancel" {
+ if ps.ByName("commentid") != "" {
+ if r.FormValue("xhr") != "" {
+ q.Set("xhr", "1")
+ }
+ r.URL.RawQuery = q.Encode()
+ GetComment(w, r, ps)
+ return
+ }
+ } else if r.FormValue("xhr") != "" {
+ w.Write([]byte{})
+ return
+ }
+ if r.FormValue("xhr") != "" {
+ state.XHR = true
+ state.GetComment(commentid)
+ Render(w, "index.html", state)
+ return
+ }
+ if r.FormValue("submit") == "cancel" {
r.URL.RawQuery = ""
}
case "delete_comment":
@@ -944,6 +1366,12 @@ func UserOp(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
r.URL.Fragment = "c" + commentid
r.URL.RawQuery = ""
}
+ case "shownsfw":
+ if r.FormValue("submit") == "continue" {
+ setCookie(w, "", "ShowNSFW", "1")
+ } else {
+ r.URL.Path = "/" + state.Host
+ }
}
http.Redirect(w, r, r.URL.String(), 301)
}
@@ -958,6 +1386,7 @@ func GetRouter() *httprouter.Router {
router.GET("/:host/search", middleware(Search))
router.POST("/:host/search", middleware(UserOp))
router.GET("/:host/inbox", middleware(Inbox))
+ router.POST("/:host/inbox", middleware(UserOp))
router.GET("/:host/login", middleware(GetLogin))
router.POST("/:host/login", middleware(SignUpOrLogin))
router.GET("/:host/settings", middleware(Settings))
@@ -982,12 +1411,14 @@ func GetRouter() *httprouter.Router {
router.POST("/:host/create_post", middleware(UserOp))
router.GET("/:host/create_community", middleware(GetCreateCommunity))
router.POST("/:host/create_community", middleware(UserOp))
+ router.GET("/:host/communities", middleware(GetCommunities))
} else {
router.ServeFiles("/_/static/*filepath", http.Dir("public"))
router.GET("/", middleware(GetFrontpage))
router.GET("/search", middleware(Search))
router.POST("/search", middleware(UserOp))
router.GET("/inbox", middleware(Inbox))
+ router.POST("/inbox", middleware(UserOp))
router.GET("/login", middleware(GetLogin))
router.POST("/login", middleware(SignUpOrLogin))
router.GET("/settings", middleware(Settings))
@@ -1012,6 +1443,7 @@ func GetRouter() *httprouter.Router {
router.POST("/create_post", middleware(UserOp))
router.GET("/create_community", middleware(GetCreateCommunity))
router.POST("/create_community", middleware(UserOp))
+ router.GET("/communities", middleware(GetCommunities))
}
return router
}
diff --git a/screenshot.png b/screenshot.png
deleted file mode 100644
index ca97abe..0000000
Binary files a/screenshot.png and /dev/null differ
diff --git a/screenshot1.png b/screenshot1.png
new file mode 100644
index 0000000..d05c42c
Binary files /dev/null and b/screenshot1.png differ
diff --git a/state.go b/state.go
index c13966c..1e2085a 100644
--- a/state.go
+++ b/state.go
@@ -11,6 +11,8 @@ import (
"mime/multipart"
"net/http"
"net/url"
+ "os"
+ "regexp"
"sort"
"strconv"
"strings"
@@ -33,6 +35,12 @@ func (c *Comment) Submitter() bool {
return c.P.Comment.CreatorID == c.P.Post.CreatorID
}
+func (c *Comment) ParentID() int {
+ path := strings.Split(c.P.Comment.Path, ".")
+ id, _ := strconv.Atoi(path[len(path)-2])
+ return id
+}
+
type Person struct {
types.PersonViewSafe
}
@@ -51,45 +59,85 @@ type Post struct {
}
type Session struct {
- UserName string
- UserID int
+ UserName string
+ UserID int
+ Communities []types.CommunityView
}
type State struct {
- Client *lemmy.Client
- HTTPClient *http.Client
- Session *Session
- Status int
- Error error
- Alert string
- Host string
- CommunityName string
- Community *types.GetCommunityResponse
- TopCommunities []types.CommunityView
- Communities []types.CommunityView
- UnreadCount int64
- Sort string
- Listing string
- Page int
- Parts []string
- Posts []Post
- Comments []Comment
- Activities []Activity
- CommentCount int
- PostID int
- CommentID int
- UserName string
- User *types.GetPersonDetailsResponse
- Now int64
- XHR bool
- Op string
- Site *types.GetSiteResponse
- Query string
- SearchType string
- Captcha *types.CaptchaResponse
- Dark bool
+ Watch bool
+ Version string
+ Client *lemmy.Client
+ HTTPClient *http.Client
+ Session *Session
+ Status int
+ Error error
+ Alert string
+ Host string
+ CommunityName string
+ Community *types.GetCommunityResponse
+ TopCommunities []types.CommunityView
+ Communities []types.CommunityView
+ UnreadCount int64
+ Sort string
+ CommentSort string
+ Listing string
+ Page int
+ Parts []string
+ Posts []Post
+ Comments []Comment
+ Activities []Activity
+ CommentCount int
+ PostID int
+ CommentID int
+ Context int
+ UserName string
+ User *types.GetPersonDetailsResponse
+ Now int64
+ XHR bool
+ Op string
+ Site *types.GetSiteResponse
+ Query string
+ Content string
+ SearchType string
+ Captcha *types.CaptchaResponse
+ Dark bool
+ ShowNSFW bool
+ HideInstanceNames bool
+ HideThumbnails bool
}
+func (s State) Unknown() string {
+ fmt.Println(fmt.Sprintf("%v", s.Error))
+ re := regexp.MustCompile(`(.*?)@(.*?)@`)
+ if strings.Contains(fmt.Sprintf("%v", s.Error), "couldnt_find_community") {
+ matches := re.FindAllStringSubmatch(s.CommunityName+"@", -1)
+ if len(matches) < 1 || len(matches[0]) < 3 {
+ return ""
+ }
+ if matches[0][2] != s.Host {
+ remote := "/" + matches[0][2] + "/c/" + matches[0][1]
+ if os.Getenv("LEMMY_DOMAIN") != "" {
+ remote = "https:/" + remote
+ }
+ return remote
+ }
+ }
+ if strings.Contains(fmt.Sprintf("%v", s.Error), "couldnt_find_that_username_or_email") {
+ matches := re.FindAllStringSubmatch(s.UserName+"@", -1)
+ if len(matches) < 1 || len(matches[0]) < 3 {
+ return ""
+ }
+ if matches[0][2] != s.Host {
+ remote := "/" + matches[0][2] + "/u/" + matches[0][1]
+ if os.Getenv("LEMMY_DOMAIN") != "" {
+ remote = "https:/" + remote
+ }
+ return remote
+ }
+ }
+ return ""
+}
func (p State) SortBy(v string) string {
var q string
if p.Query != "" || p.SearchType == "Communities" {
@@ -155,6 +203,7 @@ func (state *State) ParseQuery(RawQuery string) {
}
if len(m["sort"]) > 0 {
state.Sort = m["sort"][0]
+ state.CommentSort = m["sort"][0]
}
if len(m["communityname"]) > 0 {
state.CommunityName = m["communityname"][0]
@@ -168,6 +217,11 @@ func (state *State) ParseQuery(RawQuery string) {
if len(m["xhr"]) > 0 {
state.XHR = true
}
+ if len(m["view"]) > 0 {
+ if m["view"][0] == "Saved" {
+ state.Op = "Saved"
+ }
+ }
//if len(m["op"]) > 0 {
// state.Op = m["op"][0]
//}
@@ -208,16 +262,27 @@ func (state *State) GetCaptcha() {
}
}
func (state *State) GetSite() {
- token := state.Client.Token
- state.Client.Token = ""
resp, err := state.Client.Site(context.Background(), types.GetSite{})
if err != nil {
+ fmt.Println(err)
state.Status = http.StatusInternalServerError
- state.Host = ""
+ state.Host = "."
+ state.Error = errors.New("unable to retrieve site")
return
}
- state.Client.Token = token
state.Site = resp
+ if !state.Site.MyUser.IsValid() {
+ return
+ }
+ for _, c := range state.Site.MyUser.MustValue().Follows {
+ state.Session.Communities = append(state.Session.Communities, types.CommunityView{
+ Community: c.Community,
+ Subscribed: "Subscribed",
+ })
+ }
+ sort.Slice(state.Session.Communities, func(a, b int) bool {
+ return state.Session.Communities[a].Community.Name < state.Session.Communities[b].Community.Name
+ })
}
func (state *State) GetComment(commentid int) {
@@ -227,9 +292,9 @@ func (state *State) GetComment(commentid int) {
state.CommentID = commentid
cresp, err := state.Client.Comments(context.Background(), types.GetComments{
ParentID: types.NewOptional(state.CommentID),
- Sort: types.NewOptional(types.CommentSortType(state.Sort)),
+ Sort: types.NewOptional(types.CommentSortType(state.CommentSort)),
Type: types.NewOptional(types.ListingType("All")),
- Limit: types.NewOptional(int64(200)),
+ Limit: types.NewOptional(int64(50)),
})
if err != nil {
fmt.Println(err)
@@ -251,6 +316,33 @@ func (state *State) GetComment(commentid int) {
state.Comments = append(state.Comments, comment)
}
}
+ if len(state.Comments) == 0 {
+ return
+ }
+ ctx, err := state.GetContext(state.Context, state.Comments[0])
+ if err != nil {
+ fmt.Println(err)
+ } else {
+ state.Comments = []Comment{ctx}
+ }
+}
+func (state *State) GetContext(depth int, comment Comment) (ctx Comment, err error) {
+ if depth < 1 || comment.ParentID() == 0 {
+ return comment, nil
+ }
+ cresp, err := state.Client.Comment(context.Background(), types.GetComment{
+ ID: comment.ParentID(),
+ })
+ if err != nil {
+ return
+ }
+ ctx, err = state.GetContext(depth-1, Comment{
+ P: cresp.CommentView,
+ State: state,
+ C: []Comment{comment},
+ ChildCount: comment.ChildCount + 1,
+ })
+ return
}
func (state *State) GetComments() {
if state.Sort != "Hot" && state.Sort != "Top" && state.Sort != "Old" && state.Sort != "New" {
@@ -258,9 +350,9 @@ func (state *State) GetComments() {
}
cresp, err := state.Client.Comments(context.Background(), types.GetComments{
PostID: types.NewOptional(state.PostID),
- Sort: types.NewOptional(types.CommentSortType(state.Sort)),
+ Sort: types.NewOptional(types.CommentSortType(state.CommentSort)),
Type: types.NewOptional(types.ListingType("All")),
- Limit: types.NewOptional(int64(200)),
+ Limit: types.NewOptional(int64(50)),
Page: types.NewOptional(int64(state.Page)),
})
if err != nil {
@@ -343,6 +435,7 @@ func (state *State) GetMessages() {
Post: m.Post,
Creator: m.Creator,
Community: m.Community,
+ Counts: m.Counts,
},
Op: unread,
State: state,
@@ -362,12 +455,14 @@ func (state *State) GetUser(username string) {
limit = 1
}
resp, err := state.Client.PersonDetails(context.Background(), types.GetPersonDetails{
- Username: types.NewOptional(state.UserName),
- Page: types.NewOptional(int64(state.Page)),
- Limit: types.NewOptional(int64(limit)),
+ Username: types.NewOptional(state.UserName),
+ Page: types.NewOptional(int64(state.Page)),
+ Limit: types.NewOptional(int64(limit)),
+ SavedOnly: types.NewOptional(state.Op == "Saved"),
})
if err != nil {
fmt.Println(err)
+ state.Error = err
state.Status = http.StatusInternalServerError
return
}
@@ -425,13 +520,16 @@ func (state *State) MarkAllAsRead() {
}
func (state *State) GetPosts() {
- resp, err := state.Client.Posts(context.Background(), types.GetPosts{
- Sort: types.NewOptional(types.SortType(state.Sort)),
- Type: types.NewOptional(types.ListingType(state.Listing)),
- CommunityName: types.NewOptional(state.CommunityName),
- Limit: types.NewOptional(int64(25)),
- Page: types.NewOptional(int64(state.Page)),
- })
+ posts := types.GetPosts{
+ Sort: types.NewOptional(types.SortType(state.Sort)),
+ Type: types.NewOptional(types.ListingType(state.Listing)),
+ Limit: types.NewOptional(int64(25)),
+ Page: types.NewOptional(int64(state.Page)),
+ }
+ if state.CommunityName != "" {
+ posts.CommunityName = types.NewOptional(state.CommunityName)
+ }
+ resp, err := state.Client.Posts(context.Background(), posts)
if err != nil {
fmt.Println(err)
state.Status = http.StatusInternalServerError
@@ -449,7 +547,18 @@ func (state *State) GetPosts() {
func (state *State) Search(searchtype string) {
if state.Query == "" && searchtype == "Communities" {
+ if state.Listing == "Subscribed" {
+ if state.Page > 1 {
+ return
+ }
+ if state.Site == nil {
+ state.GetSite()
+ }
+ state.Communities = state.Session.Communities
+ return
+ }
resp, err := state.Client.Communities(context.Background(), types.ListCommunities{
+ Type: types.NewOptional(types.ListingType(state.Listing)),
Sort: types.NewOptional(types.SortType(state.Sort)),
Limit: types.NewOptional(int64(25)),
Page: types.NewOptional(int64(state.Page)),
@@ -464,7 +573,7 @@ func (state *State) Search(searchtype string) {
search := types.Search{
Q: state.Query,
Sort: types.NewOptional(types.SortType(state.Sort)),
- ListingType: types.NewOptional(types.ListingType("All")),
+ ListingType: types.NewOptional(types.ListingType(state.Listing)),
Type: types.NewOptional(types.SearchType(searchtype)),
Limit: types.NewOptional(int64(25)),
Page: types.NewOptional(int64(state.Page)),
@@ -492,9 +601,13 @@ func (state *State) Search(searchtype string) {
})
}
for _, c := range resp.Comments {
- state.Comments = append(state.Comments, Comment{
+ comment := Comment{
P: c,
State: state,
+ }
+ state.Activities = append(state.Activities, Activity{
+ Timestamp: c.Comment.Published.Time,
+ Comment: &comment,
})
}
state.Communities = resp.Communities
@@ -512,22 +625,22 @@ func (state *State) GetPost(postid int) {
})
if err != nil {
state.Status = http.StatusInternalServerError
+ state.Error = err
return
- } else {
- state.Posts = []Post{Post{
- PostView: resp.PostView,
- State: state,
- }}
- if state.CommentID > 0 && len(state.Posts) > 0 {
- state.Posts[0].Rank = -1
- }
- state.CommunityName = resp.PostView.Community.Name
- cresp := types.GetCommunityResponse{
- CommunityView: resp.CommunityView,
- Moderators: resp.Moderators,
- }
- state.Community = &cresp
}
+ state.Posts = []Post{Post{
+ PostView: resp.PostView,
+ State: state,
+ }}
+ if state.CommentID > 0 && len(state.Posts) > 0 {
+ state.Posts[0].Rank = -1
+ }
+ state.CommunityName = resp.PostView.Community.Name
+ cresp := types.GetCommunityResponse{
+ CommunityView: resp.CommunityView,
+ Moderators: resp.Moderators,
+ }
+ state.Community = &cresp
}
func (state *State) GetCommunity(communityName string) {
@@ -580,19 +693,19 @@ func (state *State) UploadImage(file multipart.File, header *multipart.FileHeade
func getChildren(parent *Comment, pool []types.CommentView, postCreatorID int) {
var children []Comment
- total := -1
+ total := int32(0)
for _, c := range pool {
levels := strings.Split(c.Comment.Path, ".")
for i, l := range levels {
id, _ := strconv.Atoi(l)
if id == parent.P.Comment.ID {
- total = total + 1
if i == (len(levels) - 2) {
children = append(children, Comment{
P: c,
C: children,
State: parent.State,
})
+ total += c.Counts.ChildCount
}
}
@@ -600,7 +713,8 @@ func getChildren(parent *Comment, pool []types.CommentView, postCreatorID int) {
}
for i, _ := range children {
getChildren(&children[i], pool, postCreatorID)
+ parent.ChildCount += 1
}
parent.C = children
- parent.ChildCount = total
+ parent.P.Counts.ChildCount -= total
}
diff --git a/templates/activities.html b/templates/activities.html
index f05c5a4..110419b 100644
--- a/templates/activities.html
+++ b/templates/activities.html
@@ -3,16 +3,23 @@