feat: add lyrics

sgtm-club · Nov 11, 2020 · f920cfe · f920cfe
1 parent 2b0e64f
commit f920cfe
Show file tree

Hide file tree

Showing 7 changed files with 135 additions and 105 deletions.
diff --git a/api/sgtm.proto b/api/sgtm.proto
@@ -164,6 +164,7 @@ message Post {
   int64 provider_updated_at = 49;
   string provider_metadata = 50;
   string tags = 51; // comma separated list of tags
+  string lyrics = 52;
 
   // soundcloud post
   string soundcloud_secret_token = 80 [(go.field) = {name: 'SoundCloudSecretToken'}];

diff --git a/gen.sum b/gen.sum
diff --git a/pkg/sgtm/page_post-edit.tmpl.html b/pkg/sgtm/page_post-edit.tmpl.html
@@ -21,13 +21,19 @@ <h1><a href="{{.PostEdit.Post.CanonicalURL}}">{{.PostEdit.Post.Title}}</a> &gt;
           <div class="form-group row">
             <label for="staticDescription" class="col-sm-2 col-form-label">Description</label>
             <div class="col-sm-10">
-              <textarea maxlength="500" name="body" class="form-control" placeholder="{{.PostEdit.Post.ProviderDescription}}" id="staticDescription" rows="9">{{.PostEdit.Post.Body}}</textarea>
+              <textarea maxlength="5000" name="body" class="form-control" placeholder="{{.PostEdit.Post.ProviderDescription}}" id="staticDescription" rows="9">{{.PostEdit.Post.Body}}</textarea>
+            </div>
+          </div>
+          <div class="form-group row">
+            <label for="staticLyrics" class="col-sm-2 col-form-label">Lyrics</label>
+            <div class="col-sm-10">
+              <textarea maxlength="5000" name="lyrics" class="form-control" id="staticLyrics" rows="9">{{.PostEdit.Post.Lyrics}}</textarea>
             </div>
           </div>
           <div class="text-right">
             <!--<button name="submit" type="submit" value="published" class="invisible"></button>
                  <button name="submit" type="submit" value="draft" class="btn btn-light text-muted mb-2 my-3" disabled>Save draft</button>-->
-            <button name="submit" type="submit" value="published" class="btn btn-primary mb-2 my-3">🤟 Update</button>
+            <button name="submit" type="submit" value="published" class="btn btn-primary mb-2 my-3">{{":metal:" | emojify}} Update</button>
           </div>
         </form>
       </div>

diff --git a/pkg/sgtm/page_post.go b/pkg/sgtm/page_post.go
@@ -244,6 +244,7 @@ func (svc *Service) postEditPage(box *packr.Box) func(w http.ResponseWriter, r *
 				// FIXME: blacklist, etc
 				fields := map[string]interface{}{}
 				fields["body"] = strings.TrimSpace(r.Form.Get("body"))
+				fields["lyrics"] = strings.TrimSpace(r.Form.Get("lyrics"))
 				if data.PostEdit.Post.Provider == sgtmpb.Provider_IPFS {
 					fields["title"] = r.Form.Get("title")
 				}

diff --git a/pkg/sgtm/page_post.tmpl.html b/pkg/sgtm/page_post.tmpl.html
@@ -40,7 +40,15 @@ <h1>{{.Post.Post.Title}}</h1>
             <code>audio</code> element.
           </audio>
         {{end}}{{end}}
-        {{with .Post.Post.SafeDescription}}{{. | markdownify}}{{end}}
+        {{with .Post.Post.SafeDescription}}
+          <p>{{. | markdownify}}</p>
+        {{end}}
+        {{with .Post.Post.SafeLyrics}}
+          <div>
+            Lyrics:
+            <pre class="border p-2">{{.}}</pre>
+          </div>
+        {{end}}
         {{with .Post.Post.TagList}}<div>📁 Tags: {{range .}}<span class="badge badge-secondary">{{.}}</span> {{end}}</div>{{end}}
         {{if .Post.Post.Duration}}<div>⏱ Duration: <span data-toggle="tooltip" data-placement="right" title="{{.Post.Post.GoDuration}}">{{.Post.Post.GoDuration | prettyDuration}}</span></div>{{end}}
         {{with .Post.Post.BPM}}

diff --git a/pkg/sgtmpb/helpers.go b/pkg/sgtmpb/helpers.go
@@ -42,6 +42,10 @@ func (p *Post) SafeDescription() string {
 	return p.ProviderDescription
 }
 
+func (p *Post) SafeLyrics() string {
+	return strings.TrimSpace(p.Lyrics)
+}
+
 func (p *Post) Filter() {
 	p.ProviderMetadata = ""
 	p.DownloadURL = ""