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
@@ -265,8 +296,7 @@ function saveSettings(e) {
var targ = e.currentTarget || e.srcElement || e;
var data = new FormData(targ)
e.preventDefault()
- var params = new URLSearchParams(data).toString()
- request(targ.target, params, function(res) {
+ request(targ.target, data, function(res) {
["endlessScrolling", "autoLoad"].map(function(x) {
localStorage.setItem(x, data.get(x)=="on")
})
@@ -321,6 +351,16 @@ function toggleImages(open) {
}
}
+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)
@@ -328,6 +368,9 @@ function setup() {
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)
}
@@ -338,6 +381,10 @@ function setup() {
}
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)
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 1507480..d72d653 100644
--- a/routes.go
+++ b/routes.go
@@ -32,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)
@@ -119,9 +119,9 @@ var funcMap = template.FuncMap{
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]+)\.([a-z]+)$`)
+ 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/${1}s.$2")
+ return re.ReplaceAllString(p.URL.String(), "https://i.imgur.com/${2}s.jpg")
}
if p.URL.IsValid() {
return "/_/static/link.png"
@@ -133,23 +133,17 @@ var funcMap = template.FuncMap{
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 {
fmt.Println(err)
return template.HTML(body)
}
- converted := buf.String()
- converted = strings.Replace(converted, `
![]()
!$1@$2 `)
- re = regexp.MustCompile(`::: spoiler (.*?)\n([\S\s]*?):::`)
- converted = re.ReplaceAllString(converted, "
$1
$2")
- return template.HTML(converted)
+ body = buf.String()
+ body = strings.Replace(body, `
![]()
$1$2")
+ return template.HTML(body)
},
"rmmarkdown": func(body string) string {
var buf bytes.Buffer
@@ -158,7 +152,7 @@ var funcMap = template.FuncMap{
return body
}
text := html2text.HTML2TextWithOptions(buf.String(), html2text.WithLinksInnerText())
- re := regexp.MustCompile(`\
`)
+ 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,
@@ -170,11 +164,67 @@ var funcMap = template.FuncMap{
},
}
+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 != "" {
@@ -209,14 +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
}
@@ -385,17 +449,84 @@ func GetFrontpage(w http.ResponseWriter, r *http.Request, ps httprouter.Params)
}
}
+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) {
state, err := Initialize(ps.ByName("host"), r)
if err != nil {
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()
@@ -407,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"
@@ -414,6 +571,9 @@ 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"
}
@@ -423,6 +583,10 @@ func GetComment(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
}
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)
}
@@ -540,9 +704,10 @@ 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"} {
+ for _, name := range []string{"DefaultSortType", "DefaultListingType", "DefaultCommentSortType"} {
deleteCookie(w, state.Host, name)
setCookie(w, "", name, r.FormValue(name))
}
@@ -550,8 +715,7 @@ func Settings(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
setCookie(w, "", "Dark", "1")
state.Dark = true
} else {
- deleteCookie(w, state.Host, "Dark")
- deleteCookie(w, "", "Dark")
+ setCookie(w, "", "Dark", "0")
state.Dark = false
}
if r.FormValue("shownsfw") != "" {
@@ -562,8 +726,23 @@ func Settings(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
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 {
@@ -740,6 +919,18 @@ 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")
@@ -755,10 +946,15 @@ func UserOp(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
if err != nil {
if strings.Contains(fmt.Sprintf("%v", err), "missing_totp_token") {
state.Op = "2fa"
- Render(w, "login.html", state)
- return
+ }
+ 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 {
@@ -970,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
@@ -1023,9 +1235,20 @@ func UserOp(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
parentid, _ := strconv.Atoi(r.FormValue("parentid"))
state.GetComment(parentid)
}
+ 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" {
createComment := types.CreateComment{
- Content: r.FormValue("content"),
+ Content: content,
PostID: state.PostID,
}
if state.CommentID > 0 {
@@ -1047,6 +1270,22 @@ func UserOp(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
} 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
@@ -1056,10 +1295,23 @@ func UserOp(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
}
case "edit_comment":
commentid, _ := strconv.Atoi(r.FormValue("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(r.FormValue("content")),
+ Content: types.NewOptional(content),
})
if err != nil {
fmt.Println(err)
@@ -1068,6 +1320,29 @@ func UserOp(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
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
@@ -1136,6 +1411,7 @@ 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))
@@ -1167,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/state.go b/state.go
index 266eddc..1e2085a 100644
--- a/state.go
+++ b/state.go
@@ -11,6 +11,8 @@ import (
"mime/multipart"
"net/http"
"net/url"
+ "os"
+ "regexp"
"sort"
"strconv"
"strings"
@@ -57,47 +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
- Context int
- UserName string
- User *types.GetPersonDetailsResponse
- Now int64
- XHR bool
- Op string
- Site *types.GetSiteResponse
- Query string
- SearchType string
- Captcha *types.CaptchaResponse
- Dark bool
- ShowNSFW 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" {
@@ -163,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]
@@ -221,17 +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.Error = errors.New("site unreachable")
+ 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) {
@@ -241,7 +292,7 @@ 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(50)),
})
@@ -265,6 +316,9 @@ 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)
@@ -296,7 +350,7 @@ 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(50)),
Page: types.NewOptional(int64(state.Page)),
@@ -408,6 +462,7 @@ func (state *State) GetUser(username string) {
})
if err != nil {
fmt.Println(err)
+ state.Error = err
state.Status = http.StatusInternalServerError
return
}
@@ -492,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)),
@@ -507,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)),
@@ -559,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) {
diff --git a/templates/activities.html b/templates/activities.html
index 12b3284..110419b 100644
--- a/templates/activities.html
+++ b/templates/activities.html
@@ -13,7 +13,12 @@
{{$state.User.PersonView.Person.Name }}
{{ end }}
in
- c/{{ $activity.Comment.P.Community.Name }}
+
+ c/{{ if $state.HideInstanceNames -}}
+ {{ $activity.Comment.P.Community.Name }}
+ {{ else -}}
+ {{ fullcname $activity.Comment.P.Community }}
+ {{ end }}
{{ template "comment.html" $activity.Comment }}
@@ -25,10 +30,22 @@