showing post replies bug fix

4 files changed, 27 insertions, 11 deletions

diff --git a/client.go b/client.go
index 930cd6f..80ec75b 100644
--- a/client.go
+++ b/client.go
@@ -183,6 +183,7 @@ func AllNewsGet(w http.ResponseWriter, r *http.Request, db *sql.DB) {
 }
 
 func OutboxGet(w http.ResponseWriter, r *http.Request, db *sql.DB, collection Collection){
+
 	t := template.Must(template.New("").Funcs(template.FuncMap{
 		"proxy": func(url string) string {
 			return MediaProxy(url)
@@ -192,7 +193,13 @@ func OutboxGet(w http.ResponseWriter, r *http.Request, db *sql.DB, collection Co
 		},
 		"parseAttachment": func(obj ObjectBase, catalog bool) template.HTML {
 			return ParseAttachment(obj, catalog)
-		},						
+		},
+		"parseReplyLink": func(actorId string, op string, id string, content string) template.HTML {
+			actor := FingerActor(actorId)
+			title := strings.ReplaceAll(ParseLinkTitle(actor.Id, op, content), `/\<`, ">")
+			link := "<a href=\"" + actor.Name + "/" + shortURL(actor.Outbox, op) + "#" + shortURL(actor.Outbox, id)  + "\" title=\"" + title + "\">&gt;&gt;" + shortURL(actor.Outbox, id) + "</a>"
+			return template.HTML(link)
+		},								
 		"sub": func (i, j int) int { return i - j }}).ParseFiles("./static/main.html", "./static/nposts.html", "./static/top.html", "./static/bottom.html", "./static/posts.html"))
 
 
@@ -300,9 +307,16 @@ func PostGet(w http.ResponseWriter, r *http.Request, db *sql.DB){
 		"short": func(actorName string, url string) string {
 			return shortURL(actorName, url)
 		},
+
 		"parseAttachment": func(obj ObjectBase, catalog bool) template.HTML {
 			return ParseAttachment(obj, catalog)
-		},				
+		},
+		"parseReplyLink": func(actorId string, op string, id string, content string) template.HTML {
+			actor := FingerActor(actorId)
+			title := strings.ReplaceAll(ParseLinkTitle(actor.Id, op, content), `/\&lt;`, ">")
+			link := "<a href=\"" + actor.Name + "/" + shortURL(actor.Outbox, op) + "#" + shortURL(actor.Outbox, id)  + "\" title=\"" + title + "\">&gt;&gt;" + shortURL(actor.Outbox, id) + "</a>"
+			return template.HTML(link)
+		},										
 		"sub": func (i, j int) int { return i - j }}).ParseFiles("./static/main.html", "./static/npost.html", "./static/top.html", "./static/bottom.html", "./static/posts.html"))
 	
 	path := r.URL.Path
diff --git a/database.go b/database.go
index 3d3f9ff..db6a3d1 100644
--- a/database.go
+++ b/database.go
@@ -723,7 +723,7 @@ func GetObjectRepliesDBLimit(db *sql.DB, parent ObjectBase, limit int) (*Collect
 
 	rows, err := db.Query(query, parent.Id, limit)	
 
-	CheckError(err, "error with replies db query")	
+	CheckError(err, "error with replies db query")
 
 	var postCount int
 	var attachCount int
@@ -744,7 +744,8 @@ func GetObjectRepliesDBLimit(db *sql.DB, parent ObjectBase, limit int) (*Collect
 		post.Actor = actor.Id
 
 		var postCnt int
-		var imgCnt int		
+		var imgCnt int
+
 		post.Replies, postCnt, imgCnt = GetObjectRepliesRepliesDB(db, post)
 
 		post.Replies.TotalItems = postCnt
@@ -794,7 +795,8 @@ func GetObjectRepliesDB(db *sql.DB, parent ObjectBase) (*CollectionBase, int, in
 		post.Actor = actor.Id
 
 		var postCnt int
-		var imgCnt int		
+		var imgCnt int
+		
 		post.Replies, postCnt, imgCnt = GetObjectRepliesRepliesDB(db, post)
 
 		post.Replies.TotalItems = postCnt
@@ -857,7 +859,7 @@ func GetObjectRepliesRepliesDB(db *sql.DB, parent ObjectBase) (*CollectionBase,
 
 	query := `select count(x.id) over(), sum(case when RTRIM(x.attachment) = '' then 0 else 1 end) over(), x.id, x.name, x.content, x.type, x.published, x.attributedto, x.attachment, x.preview, x.actor, x.tripcode, x.sensitive from (select * from activitystream where id in (select id from replies where inreplyto=$1) and type='Note' union select * from cacheactivitystream where id in (select id from replies where inreplyto=$1) and type='Note') as x order by x.published asc`	
 
-	rows, err := db.Query(query, parent.Id)	
+	rows, err := db.Query(query, parent.Id)
 
 	CheckError(err, "error with replies replies db query")
 
diff --git a/main.go b/main.go
index f5b8613..17ed9d1 100644
--- a/main.go
+++ b/main.go
@@ -1737,7 +1737,7 @@ func CreateAttachmentObject(file multipart.File, header *multipart.FileHeader) (
 
 func ParseCommentForReplies(db *sql.DB, comment string, op string) []ObjectBase {
 
-	re := regexp.MustCompile(`(>>https?://[A-Za-z0-9_.\-~]+\/[A-Za-z0-9_.\-~]+\/\w+)`)	
+	re := regexp.MustCompile(`(>>(https?://[A-Za-z0-9_.:\-~]+\/[A-Za-z0-9_.\-~]+\/)(f[A-Za-z0-9_.\-~]+-)?([A-Za-z0-9_.\-~]+)?#?([A-Za-z0-9_.\-~]+)?)`)	
 	match := re.FindAllStringSubmatch(comment, -1)
 
 	var links []string
@@ -2410,9 +2410,9 @@ func UpdateObjectWithPreview(db *sql.DB, id string, preview string) {
 
 func ParseCommentForReply(comment string) string {
 	
-	re := regexp.MustCompile("(>>)(https://|http://)?(www\\.)?.+\\/\\w+")	
+	re := regexp.MustCompile(`(>>(https?://[A-Za-z0-9_.:\-~]+\/[A-Za-z0-9_.\-~]+\/)(f[A-Za-z0-9_.\-~]+-)?([A-Za-z0-9_.\-~]+)?#?([A-Za-z0-9_.\-~]+)?)`)
 	match := re.FindAllStringSubmatch(comment, -1)
-	
+
 	var links []string
 
 	for i:= 0; i < len(match); i++ {
diff --git a/static/posts.html b/static/posts.html
index 17421af..67a755c 100644
--- a/static/posts.html
+++ b/static/posts.html
@@ -54,7 +54,7 @@
     {{ end }}
     {{ end }}
     {{ range $replies.OrderedItems }}
-    <div id="{{ .Id }}">
+    <div id="{{ short $board.Actor.Outbox .Id }}">    
       <div  style="display: inline-block; overflow: auto;">
         <div style="float: left; display: block; margin-right: 5px;">>></div>
         <div class="post" style="overflow: auto; padding: 5px; margin-bottom: 2px;">
@@ -100,7 +100,7 @@
           {{ $parentId := .Id }}
           {{ if .Replies.OrderedItems }}
           {{ range .Replies.OrderedItems }}
-          <span id="{{$parentId}}-replyto-{{.Id}}"></span>
+          <span id="{{$parentId}}-replyto-{{.Id}}">{{ parseReplyLink $board.Actor.Id $opId .Id .Content }}</span>
           {{ end }}
           {{ end }}
           <p id="{{ .Id }}-content" style="white-space: pre-wrap; margin: 10px 30px 10px 30px;">{{.ContentHTML}}</p>