commit d499aa0f3c46e3e730b6b7ca012229b4bc53b862 · veryroundbird.house/core

+10 -4

appview/pages/funcmap.go

···

       19
       19
        
       

     

       20
       20
        
       	"github.com/dustin/go-humanize"

     

       21
       21
        
       	"github.com/go-enry/go-enry/v2"

     

       22
       22
       -
       	"github.com/microcosm-cc/bluemonday"

     

       23
       22
        
       	"tangled.sh/tangled.sh/core/appview/filetree"

     

       24
       23
        
       	"tangled.sh/tangled.sh/core/appview/pages/markup"

     

       25
       24
        
       )

     
···

       207
       206
        
       			}

     

       208
       207
        
       			return v.Slice(0, min(n, v.Len())).Interface()

     

       209
       208
        
       		},

     

       210
       210
       -
       

     

       211
       209
        
       		"markdown": func(text string) template.HTML {

     

       212
       212
       -
       			rctx := &markup.RenderContext{RendererType: markup.RendererTypeDefault}

     

       213
       213
       -
       			return template.HTML(bluemonday.UGCPolicy().Sanitize(rctx.RenderMarkdown(text)))

     

       210
       210
       +
       			p.rctx.RendererType = markup.RendererTypeDefault

     

       211
       211
       +
       			htmlString := p.rctx.RenderMarkdown(text)

     

       212
       212
       +
       			sanitized := p.rctx.SanitizeDefault(htmlString)

     

       213
       213
       +
       			return template.HTML(sanitized)

     

       214
       214
       +
       		},

     

       215
       215
       +
       		"description": func(text string) template.HTML {

     

       216
       216
       +
       			p.rctx.RendererType = markup.RendererTypeDefault

     

       217
       217
       +
       			htmlString := p.rctx.RenderMarkdown(text)

     

       218
       218
       +
       			sanitized := p.rctx.SanitizeDescription(htmlString)

     

       219
       219
       +
       			return template.HTML(sanitized)

     

       214
       220
        
       		},

     

       215
       221
        
       		"isNil": func(t any) bool {

     

       216
       222
        
       			// returns false for other "zero" values

+4

appview/pages/markup/markdown.go

···

       164
       164
        
       	return rctx.Sanitizer.defaultPolicy.Sanitize(html)

     

       165
       165
        
       }

     

       166
       166
        
       

     

       167
       167
       +
       func (rctx *RenderContext) SanitizeDescription(html string) string {

     

       168
       168
       +
       	return rctx.Sanitizer.descriptionPolicy.Sanitize(html)

     

       169
       169
       +
       }

     

       170
       170
       +
       

     

       167
       171
        
       type MarkdownTransformer struct {

     

       168
       172
        
       	rctx *RenderContext

     

       169
       173
        
       }

+20 -2

appview/pages/markup/sanitizer.go

···

       11
       11
        
       )

     

       12
       12
        
       

     

       13
       13
        
       type Sanitizer struct {

     

       14
       14
       -
       	defaultPolicy *bluemonday.Policy

     

       14
       14
       +
       	defaultPolicy     *bluemonday.Policy

     

       15
       15
       +
       	descriptionPolicy *bluemonday.Policy

     

       15
       16
        
       }

     

       16
       17
        
       

     

       17
       18
        
       func NewSanitizer() Sanitizer {

     

       18
       19
        
       	return Sanitizer{

     

       19
       19
       -
       		defaultPolicy: defaultPolicy(),

     

       20
       20
       +
       		defaultPolicy:     defaultPolicy(),

     

       21
       21
       +
       		descriptionPolicy: descriptionPolicy(),

     

       20
       22
        
       	}

     

       21
       23
        
       }

     

       22
       24
        
       

     
···

       90
       92
        
       

     

       91
       93
        
       	return policy

     

       92
       94
        
       }

     

       95
       95
       +
       

     

       96
       96
       +
       func descriptionPolicy() *bluemonday.Policy {

     

       97
       97
       +
       	policy := bluemonday.NewPolicy()

     

       98
       98
       +
       	policy.AllowStandardURLs()

     

       99
       99
       +
       

     

       100
       100
       +
       	// allow italics and bold.

     

       101
       101
       +
       	policy.AllowElements("i", "b", "em", "strong")

     

       102
       102
       +
       

     

       103
       103
       +
       	// allow code.

     

       104
       104
       +
       	policy.AllowElements("code")

     

       105
       105
       +
       

     

       106
       106
       +
       	// allow links

     

       107
       107
       +
       	policy.AllowAttrs("href", "target", "rel").OnElements("a")

     

       108
       108
       +
       

     

       109
       109
       +
       	return policy

     

       110
       110
       +
       }

+1 -1

appview/pages/templates/repo/issues/issue.html

···

       13
       13
        
       {{ define "repoContent" }}

     

       14
       14
        
         <header class="pb-4">

     

       15
       15
        
           <h1 class="text-2xl">

     

       16
       16
       -
             {{ .Issue.Title }}

     

       16
       16
       +
             {{ .Issue.Title | description }}

     

       17
       17
        
             <span class="text-gray-500 dark:text-gray-400">

     

       18
       18
        
               #{{ .Issue.IssueId }}

     

       19
       19
        
             </span>

+1 -1

appview/pages/templates/repo/issues/issues.html

···

       50
       50
        
                 <a

     

       51
       51
        
                   href="/{{ $.RepoInfo.FullName }}/issues/{{ .IssueId }}"

     

       52
       52
        
                   class="no-underline hover:underline">

     

       53
       53
       -
                   {{ .Title }}

     

       53
       53
       +
                   {{ .Title | description }}

     

       54
       54
        
                   <span class="text-gray-500">#{{ .IssueId }}</span>

     

       55
       55
        
                 </a>

     

       56
       56
        
               </div>

+1 -1

appview/pages/templates/repo/pulls/fragments/summarizedPullHeader.html

···

       9
       9
        
               </div>

     

       10
       10
        
               <span class="truncate text-sm text-gray-800 dark:text-gray-200">

     

       11
       11
        
                 <span class="text-gray-500 dark:text-gray-400">#{{ .PullId }}</span>

     

       12
       12
       -
                 {{ .Title }}

     

       12
       12
       +
                 {{ .Title | description }}

     

       13
       13
        
               </span>

     

       14
       14
        
             </div>

     

       15
       15

+1 -1

appview/pages/templates/repo/pulls/pull.html

···

       149
       149
        
                           {{ end }}

     

       150
       150
        
                         </div>

     

       151
       151
        
                         <div class="flex items-center">

     

       152
       152
       -
                           <span>{{ .Title }}</span>

     

       152
       152
       +
                           <span>{{ .Title | description }}</span>

     

       153
       153
        
                           {{ if gt (len .Body) 0 }}

     

       154
       154
        
                             <button

     

       155
       155
        
                               class="py-1/2 px-1 mx-2 bg-gray-200 hover:bg-gray-400 rounded dark:bg-gray-700 dark:hover:bg-gray-600"

+1 -1

appview/pages/templates/repo/pulls/pulls.html

···

       60
       60
        
                   <a

     

       61
       61
        
                     href="/{{ $.RepoInfo.FullName }}/pulls/{{ .PullId }}"

     

       62
       62
        
                     class="dark:text-white">

     

       63
       63
       -
                     {{ .Title }}

     

       63
       63
       +
                     {{ .Title | description }}

     

       64
       64
        
                     <span class="text-gray-500 dark:text-gray-400">

     

       65
       65
        
                       #{{ .PullId }}

     

       66
       66
        
                     </span>