Skip to content

Commit bada6db

Browse files
authored
Merge pull request #18 from vim-jp/escape-liquid
Escape liquid's tag
2 parents cd77134 + bdbcce1 commit bada6db

File tree

7 files changed

+19
-14
lines changed

7 files changed

+19
-14
lines changed

slacklog_pages/golang/2020/03/index.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -3700,7 +3700,7 @@ <h2><a href='/slacklog/'>vim-jp.slack.com log</a> - <a href='/slacklog/golang/'>
37003700
<span class='slacklog-name'>itchyny</span>
37013701
<a class='slacklog-datetime' href='#ts-1584509519.006100'>18日 14:32:00</a>
37023702

3703-
<span class='slacklog-text'>完全に好みですが <code>run: echo &#34;::add-path::$(go env GOPATH)/bin&#34;</code> でPATH通してしまえば <code>${{ env.GOPATH }}/bin/</code> 書かなくても良くなりそう。</span>
3703+
<span class='slacklog-text'>完全に好みですが <code>run: echo &#34;::add-path::$(go env GOPATH)/bin&#34;</code> でPATH通してしまえば <code>$&#123;&#123; env.GOPATH }}/bin/</code> 書かなくても良くなりそう。</span>
37043704
</span>
37053705
<span class='slacklog-message' id='1584509544.006700'>
37063706
<img class='slacklog-icon' src='https://secure.gravatar.com/avatar/4b5a6f711a4e22e617b74058239ade53.jpg?s=48&d=https%3A%2F%2Fa.slack-edge.com%2Fdf10d%2Fimg%2Favatars%2Fava_0007-48.png'>
@@ -9050,7 +9050,7 @@ <h2><a href='/slacklog/'>vim-jp.slack.com log</a> - <a href='/slacklog/golang/'>
90509050
<span class='slacklog-name'>johejo</span>
90519051
<a class='slacklog-datetime' href='#ts-1585640757.436500'>31日 16:45:58</a>
90529052

9053-
<span class='slacklog-text'><pre>$ go list -f &#39;{{join .Imports &#34;\n&#34;}}&#39; ./... | sort | uniq | grep -v github | grep -v gopkg | grep -v &lt;http://golang.org|golang.org&gt;<br>bufio<br>bytes<br>compress/gzip<br>context<br>crypto/sha256<br>database/sql<br>database/sql/driver<br>encoding/base64<br>encoding/csv<br>encoding/hex<br>encoding/json<br>errors<br>expvar<br>flag<br>fmt<br>io<br>io/ioutil<br>log<br>math<br>net<br>net/http<br>net/http/httptest<br>net/http/httputil<br>net/http/pprof<br>net/url<br>os<br>os/exec<br>os/signal<br>path/filepath<br>reflect<br>regexp<br>runtime<br>strconv<br>strings<br>sync<br>syscall<br>testing<br>time</pre></span>
9053+
<span class='slacklog-text'><pre>$ go list -f &#39;&#123;&#123;join .Imports &#34;\n&#34;}}&#39; ./... | sort | uniq | grep -v github | grep -v gopkg | grep -v &lt;http://golang.org|golang.org&gt;<br>bufio<br>bytes<br>compress/gzip<br>context<br>crypto/sha256<br>database/sql<br>database/sql/driver<br>encoding/base64<br>encoding/csv<br>encoding/hex<br>encoding/json<br>errors<br>expvar<br>flag<br>fmt<br>io<br>io/ioutil<br>log<br>math<br>net<br>net/http<br>net/http/httptest<br>net/http/httputil<br>net/http/pprof<br>net/url<br>os<br>os/exec<br>os/signal<br>path/filepath<br>reflect<br>regexp<br>runtime<br>strconv<br>strings<br>sync<br>syscall<br>testing<br>time</pre></span>
90549054
</span>
90559055
<span class='slacklog-message' id='1585640760.436600'>
90569056
<img class='slacklog-icon' src='https://avatars.slack-edge.com/2015-01-15/3417067010_04a676b32692fb2507e1_48.jpg'>

slacklog_pages/lsp/2020/03/index.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -3279,7 +3279,7 @@ <h2><a href='/slacklog/'>vim-jp.slack.com log</a> - <a href='/slacklog/lsp/'>&#3
32793279
<span class='slacklog-name'>mattn</span>
32803280
<a class='slacklog-datetime' href='#ts-1584463159.343500'>18日 01:39:20</a>
32813281

3282-
<span class='slacklog-text'>これやると <code>{{ &#34;fo{&#34; }}</code> みたいな事できないんですよね。(やらないけど)</span>
3282+
<span class='slacklog-text'>これやると <code>&#123;&#123; &#34;fo{&#34; }}</code> みたいな事できないんですよね。(やらないけど)</span>
32833283
</span>
32843284
<span class='slacklog-message' id='1584463168.343800'>
32853285
<img class='slacklog-icon' src='https://avatars.slack-edge.com/2018-07-31/407982080133_30e238cd92e6c88883f9_48.png'>
@@ -3293,7 +3293,7 @@ <h2><a href='/slacklog/'>vim-jp.slack.com log</a> - <a href='/slacklog/lsp/'>&#3
32933293
<span class='slacklog-name'>mattn</span>
32943294
<a class='slacklog-datetime' href='#ts-1584463178.344100'>18日 01:39:39</a>
32953295

3296-
<span class='slacklog-text'><code>{{ &#34;foo}}&#34; }}</code></span>
3296+
<span class='slacklog-text'><code>&#123;&#123; &#34;foo}}&#34; }}</code></span>
32973297
</span>
32983298
<span class='slacklog-message' id='1584463197.344300'>
32993299
<img class='slacklog-icon' src='https://avatars.slack-edge.com/2019-11-14/833953864853_aa245483338df08cd3b2_48.png'>
@@ -3336,7 +3336,7 @@ <h2><a href='/slacklog/'>vim-jp.slack.com log</a> - <a href='/slacklog/lsp/'>&#3
33363336
<span class='slacklog-name'>mattn</span>
33373337
<a class='slacklog-datetime' href='#ts-1584463302.346500'>18日 01:41:43</a>
33383338

3339-
<span class='slacklog-text'>最初から <code>{{.}}</code> は入ってましたね。</span>
3339+
<span class='slacklog-text'>最初から <code>&#123;&#123;.}}</code> は入ってましたね。</span>
33403340
</span>
33413341
<span class='slacklog-message' id='1584463319.347100'>
33423342
<img class='slacklog-icon' src='https://secure.gravatar.com/avatar/b52d91913fe73adf7f68f393c397a6d5.jpg?s=48&d=https%3A%2F%2Fa.slack-edge.com%2Fdf10d%2Fimg%2Favatars%2Fava_0022-48.png'>
@@ -3350,7 +3350,7 @@ <h2><a href='/slacklog/'>vim-jp.slack.com log</a> - <a href='/slacklog/lsp/'>&#3
33503350
<span class='slacklog-name'>heavenshell</span>
33513351
<a class='slacklog-datetime' href='#ts-1584463355.347700'>18日 01:42:36</a>
33523352

3353-
<span class='slacklog-text'><code>{{ }}</code> の最初の出自ってどこなんだろう。Django template あたりなのかな…。</span>
3353+
<span class='slacklog-text'><code>&#123;&#123; }}</code> の最初の出自ってどこなんだろう。Django template あたりなのかな…。</span>
33543354
</span>
33553355
<span class='slacklog-message' id='1584463375.348200'>
33563356
<img class='slacklog-icon' src='https://avatars.slack-edge.com/2018-07-31/407982080133_30e238cd92e6c88883f9_48.png'>

slacklog_pages/plugins/2020/03/index.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -2344,7 +2344,7 @@ <h2><a href='/slacklog/'>vim-jp.slack.com log</a> - <a href='/slacklog/plugins/'
23442344
<span class='slacklog-attachment-github-serviceicon'><img src='https://a.slack-edge.com/80588/img/unfurl_icons/github.png'></span>
23452345
<span class='slacklog-attachment-github-servicename'>GitHub</span>
23462346
<span class='slacklog-attachment-github-title'><a href='https://github.com/mattn/vim-sonictemplate/issues/41'>PHPでpostfix completionができない · Issue #41 · mattn/vim-sonictemplate</a></span>
2347-
<span class='slacklog-attachment-github-text'>概要 golangで動作したPostfix Completionの設定をPHPに移植したところ、 入力した文字が消去されるのみで、置換されない。 環境 nvim 0.5.0 debian8 最小環境 &amp;quot; minimum setting {{{ if empty(glob(&amp;#39;~/.config/nvim/autoload/plug.vim&amp;#39;)) silent !cur...</span>
2347+
<span class='slacklog-attachment-github-text'>概要 golangで動作したPostfix Completionの設定をPHPに移植したところ、 入力した文字が消去されるのみで、置換されない。 環境 nvim 0.5.0 debian8 最小環境 &amp;quot; minimum setting &#123;&#123;{ if empty(glob(&amp;#39;~/.config/nvim/autoload/plug.vim&amp;#39;)) silent !cur...</span>
23482348
</span>
23492349
</span>
23502350
</span>
@@ -2416,7 +2416,7 @@ <h2><a href='/slacklog/'>vim-jp.slack.com log</a> - <a href='/slacklog/plugins/'
24162416
<span class='slacklog-name'>mattn</span>
24172417
<a class='slacklog-datetime' href='#ts-1584604908.002400'>19日 17:01:49</a>
24182418

2419-
<span class='slacklog-text'>でもこんなので勘違いしてたら<br><pre>var foo[] = {{&#34;foo&#34;:&#34;bar&#34;}, {|}}</pre><br>こういう奴編集できない。</span>
2419+
<span class='slacklog-text'>でもこんなので勘違いしてたら<br><pre>var foo[] = &#123;&#123;&#34;foo&#34;:&#34;bar&#34;}, {|}}</pre><br>こういう奴編集できない。</span>
24202420
</span>
24212421
<span class='slacklog-message' id='1584604946.002600'>
24222422
<img class='slacklog-icon' src='https://avatars.slack-edge.com/2018-05-31/373472791093_ed16847a152da533e013_48.png'>

slacklog_pages/plugins/2020/04/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ <h2><a href='/slacklog/'>vim-jp.slack.com log</a> - <a href='/slacklog/plugins/'
134134
<span class='slacklog-name'>Tsuyoshi CHO</span>
135135
<a class='slacklog-datetime' href='#ts-1585737635.152700'>1日 19:40:36</a>
136136

137-
<span class='slacklog-text'>若干記述がアレだけど自分はこれくらい<br><pre>function! s:relativenumber_toggle(mode) abort &#34; {{{<br> let enter = a:mode ==? &#39;enter&#39;<br><br> if enter<br> let b:relativenumber = &amp;l:relativenumber &#34; backup<br> setlocal norelativenumber<br> else<br> if get(b:,&#39;relativenumber&#39;, 1)<br> &#34; if backup value is relativenumber is active, re-active<br> setlocal relativenumber<br> endif<br> endif<br>endfunction &#34; }}}<br>augroup MyAutoGroup<br> autocmd WinLeave,InsertEnter * nested call s:relativenumber_toggle(&#39;enter&#39;)<br> autocmd WinEnter,InsertLeave * nested call s:relativenumber_toggle(&#39;leave&#39;)<br>augroup END</pre></span>
137+
<span class='slacklog-text'>若干記述がアレだけど自分はこれくらい<br><pre>function! s:relativenumber_toggle(mode) abort &#34; &#123;&#123;{<br> let enter = a:mode ==? &#39;enter&#39;<br><br> if enter<br> let b:relativenumber = &amp;l:relativenumber &#34; backup<br> setlocal norelativenumber<br> else<br> if get(b:,&#39;relativenumber&#39;, 1)<br> &#34; if backup value is relativenumber is active, re-active<br> setlocal relativenumber<br> endif<br> endif<br>endfunction &#34; }}}<br>augroup MyAutoGroup<br> autocmd WinLeave,InsertEnter * nested call s:relativenumber_toggle(&#39;enter&#39;)<br> autocmd WinEnter,InsertLeave * nested call s:relativenumber_toggle(&#39;leave&#39;)<br>augroup END</pre></span>
138138
</span>
139139
<span class='slacklog-message' id='1585737642.153000'>
140140
<img class='slacklog-icon' src='https://secure.gravatar.com/avatar/da34283a48f2b5323a65e4bf548a3b25.jpg?s=48&d=https%3A%2F%2Fa.slack-edge.com%2Fdf10d%2Fimg%2Favatars%2Fava_0011-48.png'>

slacklog_pages/question/2020/03/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -4658,7 +4658,7 @@ <h2><a href='/slacklog/'>vim-jp.slack.com log</a> - <a href='/slacklog/question/
46584658
<span class='slacklog-name'>Tsuyoshi CHO</span>
46594659
<a class='slacklog-datetime' href='#ts-1585571527.074900'>30日 21:32:08</a>
46604660

4661-
<span class='slacklog-text'><pre>function! s:popup_cancel(rawchar, ...) abort &#34; {{{<br> let result = &#39;&#39;<br> if dein#is_sourced(&#39;asyncomplete.vim&#39;)<br> let result = result . asyncomplete#cancel_popup()<br> if a:0<br> let result = result . a:1<br> endif<br> else<br> let result = result . a:rawchar<br> endif<br> return result<br>endfunction &#34; }}}<br><br>inoremap &lt;expr&gt;&lt;silent&gt; &lt;C-e&gt;<br> \ pumvisible() ? &lt;SID&gt;popup_cancel(&#34;\&lt;C-e&gt;&#34; ) : &#34;\&lt;C-e&gt;&#34;</pre><br>こんな感じで、cancel_popupが発動することは確認できています(失敗してたときは、C-eで閉じても直ぐに再popupだったし、確認もしてます)</span>
4661+
<span class='slacklog-text'><pre>function! s:popup_cancel(rawchar, ...) abort &#34; &#123;&#123;{<br> let result = &#39;&#39;<br> if dein#is_sourced(&#39;asyncomplete.vim&#39;)<br> let result = result . asyncomplete#cancel_popup()<br> if a:0<br> let result = result . a:1<br> endif<br> else<br> let result = result . a:rawchar<br> endif<br> return result<br>endfunction &#34; }}}<br><br>inoremap &lt;expr&gt;&lt;silent&gt; &lt;C-e&gt;<br> \ pumvisible() ? &lt;SID&gt;popup_cancel(&#34;\&lt;C-e&gt;&#34; ) : &#34;\&lt;C-e&gt;&#34;</pre><br>こんな感じで、cancel_popupが発動することは確認できています(失敗してたときは、C-eで閉じても直ぐに再popupだったし、確認もしてます)</span>
46624662
</span>
46634663
<span class='slacklog-message' id='1585571585.075900'>
46644664
<img class='slacklog-icon' src='https://avatars.slack-edge.com/2018-05-31/373472791093_ed16847a152da533e013_48.png'>

slacklog_pages/random/2020/03/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -5920,7 +5920,7 @@ <h2><a href='/slacklog/'>vim-jp.slack.com log</a> - <a href='/slacklog/random/'>
59205920
<span class='slacklog-name'>tyru</span>
59215921
<a class='slacklog-datetime' href='#ts-1584255973.245900'>15日 16:06:14</a>
59225922

5923-
<span class='slacklog-text'>ふと caw.vim の initial commit 調べたら10年前でもうそんなに前…!?<br>ってなったので入れてるプラグインで一番古いやつ10個調べてみた。<br>年月が過ぎるの早すぎて笑ってる<br><pre>for repo in $(volt list -f &#39;{{ range .Repos }}{{ println .Path }}{{ end }}&#39;); do (cd ~/volt/repos/$repo &amp;&amp; echo -e &#34;$(git show -s --format=%ci &#34;$(git rev-list --max-parents=0 HEAD | head -1)&#34;)\t$repo&#34;) 2&gt;/dev/null; done | sort | head</pre></span>
5923+
<span class='slacklog-text'>ふと caw.vim の initial commit 調べたら10年前でもうそんなに前…!?<br>ってなったので入れてるプラグインで一番古いやつ10個調べてみた。<br>年月が過ぎるの早すぎて笑ってる<br><pre>for repo in $(volt list -f &#39;&#123;&#123; range .Repos }}&#123;&#123; println .Path }}&#123;&#123; end }}&#39;); do (cd ~/volt/repos/$repo &amp;&amp; echo -e &#34;$(git show -s --format=%ci &#34;$(git rev-list --max-parents=0 HEAD | head -1)&#34;)\t$repo&#34;) 2&gt;/dev/null; done | sort | head</pre></span>
59245924
<details class='slacklog-thread'>
59255925
<summary class-'slacklog-thread-summary'>1 件の返信
59265926
<span class='slacklog-thread-mtime'>最終返信:15日 16:31:03</span>

update_slack_logs.go

+8-3
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,13 @@ func genChannelPerMonthIndex(inDir, tmplFile string, channel *channel, msgPerMon
167167
var reMention = regexp.MustCompile(`&lt;@(\w+?)&gt;`)
168168
var reChannel = regexp.MustCompile(`&lt;#\w+?\|([^&]+?)&gt;`)
169169
var reNewline = regexp.MustCompile(`\n`)
170-
var text2Html = func(text string) string {
170+
var escapeSpecialChars = func(text string) string {
171171
text = html.EscapeString(html.UnescapeString(text))
172+
text = strings.Replace(text, "{{", "&#123;&#123;", -1)
173+
return strings.Replace(text, "{%", "&#123;&#37;", -1)
174+
}
175+
var text2Html = func(text string) string {
176+
text = escapeSpecialChars(text)
172177
text = reNewline.ReplaceAllString(text, "<br>")
173178
chunks := reCode.Split(text, -1)
174179
for i := range chunks {
@@ -246,9 +251,9 @@ func genChannelPerMonthIndex(inDir, tmplFile string, channel *channel, msgPerMon
246251
},
247252
"username": func(msg *message) string {
248253
if msg.Subtype == "bot_message" {
249-
return msg.Username
254+
return escapeSpecialChars(msg.Username)
250255
}
251-
return getDisplayNameByUserId(msg.User, userMap)
256+
return escapeSpecialChars(getDisplayNameByUserId(msg.User, userMap))
252257
},
253258
"userIconUrl": func(msg *message) string {
254259
switch msg.Subtype {

0 commit comments

Comments
 (0)