-
{{.Title}}
+{{.SafeTitle}}
{{with .TagList}}
📁 Tags: {{range .}}{{.}} {{end}}
{{end}}
{{if .Duration}}⏱ Duration: {{.GoDuration | prettyDuration}}
{{end}}
diff --git a/pkg/sgtm/page_new.go b/pkg/sgtm/page_new.go
index a6662ec..c11739f 100644
--- a/pkg/sgtm/page_new.go
+++ b/pkg/sgtm/page_new.go
@@ -69,7 +69,7 @@ func (svc *Service) newPage(box *packr.Box) func(w http.ResponseWriter, r *http.
First(&alreadyExists).
Error
if err == nil && alreadyExists.ID != 0 {
- data.New.URLInvalidMsg = fmt.Sprintf(`This track already exists: %s.`, alreadyExists.ID, alreadyExists.Title)
+ data.New.URLInvalidMsg = fmt.Sprintf(`This track already exists: %s.`, alreadyExists.ID, alreadyExists.SafeTitle())
return nil
}
}
@@ -93,7 +93,7 @@ func (svc *Service) newPage(box *packr.Box) func(w http.ResponseWriter, r *http.
Visibility: sgtmpb.Visibility_Public,
AuthorID: data.User.ID,
Slug: "",
- Title: filename,
+ ProviderTitle: filename,
SortDate: time.Now().UnixNano(),
URL: "https://ipfs.io/ipfs/" + cid,
Provider: sgtmpb.Provider_IPFS,
@@ -107,12 +107,12 @@ func (svc *Service) newPage(box *packr.Box) func(w http.ResponseWriter, r *http.
// FIXME: check if valid SoundCloud link
post := sgtmpb.Post{
- Kind: sgtmpb.Post_TrackKind,
- Visibility: sgtmpb.Visibility_Public,
- AuthorID: data.User.ID,
- Slug: "",
- Title: "",
- SortDate: time.Now().UnixNano(),
+ Kind: sgtmpb.Post_TrackKind,
+ Visibility: sgtmpb.Visibility_Public,
+ AuthorID: data.User.ID,
+ Slug: "",
+ ProviderTitle: "",
+ SortDate: time.Now().UnixNano(),
}
u, err := url.Parse(fileURL)
@@ -150,7 +150,7 @@ func (svc *Service) newPage(box *packr.Box) func(w http.ResponseWriter, r *http.
First(&alreadyExists).
Error
if err == nil && alreadyExists.ID != 0 {
- data.New.URLInvalidMsg = fmt.Sprintf(`This track already exists: %s.`, alreadyExists.CanonicalURL(), alreadyExists.Title)
+ data.New.URLInvalidMsg = fmt.Sprintf(`This track already exists: %s.`, alreadyExists.CanonicalURL(), alreadyExists.SafeTitle())
return nil
}
}
@@ -167,7 +167,7 @@ func (svc *Service) newPage(box *packr.Box) func(w http.ResponseWriter, r *http.
}
post.ProviderMetadata = godev.JSON(track)
- post.Title = track.Title
+ post.ProviderTitle = track.Title
createdAt, err := time.Parse("2006/01/02 15:04:05 +0000", track.CreatedAt)
if err == nil {
post.ProviderCreatedAt = createdAt.UnixNano()
diff --git a/pkg/sgtm/page_open.tmpl.html b/pkg/sgtm/page_open.tmpl.html
index 336b3df..2ebaf2e 100644
--- a/pkg/sgtm/page_open.tmpl.html
+++ b/pkg/sgtm/page_open.tmpl.html
@@ -82,13 +82,13 @@ Activities
{{with eq $kind "ViewHomeKind"}}🏠 View home page{{end}} {{with eq $kind "LoginKind"}}👌 Login{{end}} {{with eq $kind "RegisterKind"}}👋 Register{{end}} - {{with eq $kind "TrackKind"}}🎶 Post {{$post.Title}}{{end}} - {{with eq $kind "CommentKind"}}{{with $post.TargetPost}}✏️ Comment {{$post.TargetPost.Title}}{{end}}{{end}} + {{with eq $kind "TrackKind"}}🎶 Post {{$post.SafeTitle}}{{end}} + {{with eq $kind "CommentKind"}}{{with $post.TargetPost}}✏️ Comment {{$post.TargetPost.SafeTitle}}{{end}}{{end}} {{with eq $kind "ViewProfileKind"}}{{with $post.TargetUser}}👤 View {{$post.TargetUser.DisplayName}} profile{{end}}{{end}} {{with eq $kind "ViewPostKind"}} {{with $post.TargetPost}} - 🎶 View {{$post.TargetPost.Title}} + 🎶 View {{$post.TargetPost.SafeTitle}} {{end}} {{end}} {{$post.CreatedAt | fromUnixNano | prettyAgo}} diff --git a/pkg/sgtm/page_post-edit.tmpl.html b/pkg/sgtm/page_post-edit.tmpl.html index 2e06ad7..4b7a4b2 100644 --- a/pkg/sgtm/page_post-edit.tmpl.html +++ b/pkg/sgtm/page_post-edit.tmpl.html @@ -8,16 +8,14 @@
-