★[tDiary] 3.0系にアップグレードしてみた [00:13]

やったことは以前と同じです。以前は「ツッコミ」を全部「コメント」に治してたりしたんだけど、そこは無しにしました。diff はこんなかんじ。

日記を書いたときに書いた時間をつける。diff

$ diff -c tdiary.rb tdiary.rb.orig

*** tdiary.rb Sat May 28 23:23:10 2011

--- tdiary.rb.orig Fri Apr 29 07:54:12 2011

***************

*** 1531,1544 ****

end

@author = @conf.multi_user ? @cgi.remote_user : nil

- updatetime = Time::now

- updatetimestr = updatetime.strftime(" \[%H:%M\]")

- bodylines = @body.split(/\n/)

- if bodylines.size > 0 then

- bodylines[0] += updatetimestr

- end

- @body = bodylines.join("\n")

-

@io.transaction( @date ) do |diaries|

@diaries = diaries

@diary = self[@date] || @io.diary_factory( @date, @title, '', @conf.style )

--- 1531,1536 ----

speed_commentでコメント名前にデフォルト名を追加、ついでに日付のフォーマットを変更。diff

$ diff -c misc/plugin/speed_comment.rb misc/plugin/speed_comment.rb.orig

*** misc/plugin/speed_comment.rb Sat May 28 23:42:07 2011

--- misc/plugin/speed_comment.rb.orig Fri Apr 29 07:54:12 2011

***************

*** 27,33 ****

r << %Q[<div class="form"><form method="post" action="#{h( @index )}"><p>]

r << %Q[<input type="hidden" name="date" value="#{h( date.strftime( '%Y%m%d' ) )}">]

r << %Q[<input type="hidden" name="mail" value="">]

! r << %Q[#{h( comment_name_label )} : <input class="field" name="name" size="#{@conf['speed_comment.name_size']}" value="#{h( @conf.to_native(@cgi.cookies['tdiary'][0] || comment_name_value ))}">]

r << %Q[#{h( comment_body_label )} : <input class="field" name="body" size="#{@conf['speed_comment.body_size']}">]

r << %Q[<input type="submit" name="comment" value="#{h( comment_submit_label )}">]

r << %Q[</p></form></div>]

--- 27,33 ----

r << %Q[<div class="form"><form method="post" action="#{h( @index )}"><p>]

r << %Q[<input type="hidden" name="date" value="#{h( date.strftime( '%Y%m%d' ) )}">]

r << %Q[<input type="hidden" name="mail" value="">]

! r << %Q[#{h( comment_name_label )} : <input class="field" name="name" size="#{@conf['speed_comment.name_size']}" value="#{h( @conf.to_native(@cgi.cookies['tdiary'][0] || '' ))}">]

r << %Q[#{h( comment_body_label )} : <input class="field" name="body" size="#{@conf['speed_comment.body_size']}">]

r << %Q[<input type="submit" name="comment" value="#{h( comment_submit_label )}">]

r << %Q[</p></form></div>]

$ diff -c plugin/en/00default.rb plugin/en/00default.rb.orig

*** plugin/en/00default.rb Sat May 28 23:45:42 2011

--- plugin/en/00default.rb.orig Sat May 28 23:34:36 2011

***************

*** 55,62 ****

def comment_description_short; 'TSUKKOMI!!'; end

def comment_name_label; 'Name'; end

def comment_name_label_short; 'Name'; end

- def comment_name_default; 'NoName'; end

- def comment_name_value; @cgi.cookies['tdiary'][0] =~ /\S/ ? @cgi.cookies['tdiary'][0] : comment_name_default; end

def comment_mail_label; 'E-mail'; end

def comment_mail_label_short; 'Mail'; end

def comment_body_label; 'Comment'; end

--- 55,60 ----

***************

*** 73,84 ****

def navi_update; "Append"; end

def navi_edit; "Edit"; end

def navi_preference; "Preference"; end

! def navi_prev_diary(date); "Prev(#{date.strftime(@date_format)})"; end

! def navi_next_diary(date); "Next(#{date.strftime(@date_format)})"; end

def navi_prev_month; "Prev month"; end

def navi_next_month; "Next month"; end

! def navi_prev_nyear(date); "Prev(#{date.strftime('%m-%d')})"; end

! def navi_next_nyear(date); "Next(#{date.strftime('%m-%d')})"; end

def navi_prev_ndays; "#{@conf.latest_limit} days before"; end

def navi_next_ndays; "#{@conf.latest_limit} days after"; end

--- 71,82 ----

def navi_update; "Append"; end

def navi_edit; "Edit"; end

def navi_preference; "Preference"; end

! def navi_prev_diary(date); "Prev(#{date.strftime('%m/%d')})"; end

! def navi_next_diary(date); "Next(#{date.strftime('%m/%d')})"; end

def navi_prev_month; "Prev month"; end

def navi_next_month; "Next month"; end

! def navi_prev_nyear(date); "Prev(#{date.strftime('%m/%d')})"; end

! def navi_next_nyear(date); "Next(#{date.strftime('%m/%d')})"; end

def navi_prev_ndays; "#{@conf.latest_limit} days before"; end

def navi_next_ndays; "#{@conf.latest_limit} days after"; end

plugin/ja/00default.rb の diff は文字化けしてうまくとれないので説明だけ

def comment_name_label_short; '名前'; end

+ def comment_name_default; '名無し猫さん'; end

+ def comment_name_value; @cgi.cookies['tdiary'][0] =~ /\S/ ? @cgi.cookies['tdiary'][0] : comment_name_default; end

def comment_mail_label; 'E-mail'; end

常に日付を表示。diff

$ diff -c plugin/00default.rb plugin/00default.rb.orig

*** plugin/00default.rb Sat May 28 23:29:56 2011

--- plugin/00default.rb.orig Fri Apr 29 07:54:12 2011

***************

*** 140,146 ****

else

result = navi_item( h(@update), h(navi_update), "nofollow")

end

! result << navi_item( "#{h @update}?conf=default", h(navi_preference) )

result

end

--- 140,146 ----

else

result = navi_item( h(@update), h(navi_update), "nofollow")

end

! result << navi_item( "#{h @update}?conf=default", h(navi_preference) ) if /^(latest|month|day|comment|conf|nyear|category.*)$/ !~ @mode

result

end

***************

*** 160,166 ****

else

result << %Q[<A HREF="#{h @update}" ACCESSKEY="5">[5]#{mobile_navi_update}</A>]

end

! result << %Q[<A HREF="#{h @update}?conf=default" ACCESSKEY="8">[8]#{mobile_navi_preference}</A>]

result.join('|')

end

--- 160,166 ----

else

result << %Q[<A HREF="#{h @update}" ACCESSKEY="5">[5]#{mobile_navi_update}</A>]

end

! result << %Q[<A HREF="#{h @update}?conf=default" ACCESSKEY="8">[8]#{mobile_navi_preference}</A>] unless /^(latest|month|day|conf|nyear)$/ === @mode

result.join('|')

end

あと theme/freadiary/ を追加して、suexecなので*.rbのパーミッションをu+xしたくらい。案外すんなり動きました。

&lt;と&gt;間違えてえらいことになった。酔っぱらいのときにこんな作業やるもんじゃないね。(s)

★[tDiary] 3.0系にアップグレードしてみた その2 [07:53]

古いコメントを受け付けないパッチを忘れてました。google とかの検索に引っかかるらしくて、古い日記に外国語のわけわからないspamが付くんですよ。それを回避するためのパッチです。diff

$ diff -c tdiary/filter/spam.rb tdiary/filter/spam.rb.orig

*** tdiary/filter/spam.rb Sun May 29 07:47:57 2011

--- tdiary/filter/spam.rb.orig Fri Apr 29 07:54:12 2011

***************

*** 204,214 ****

return false if black_url?( comment.body )

- if diary.date < Time.now - 24*60*60*90 # 90 days

- comment.show = false

- return @filter_mode;

- end

-

if %r{/\.\/} =~ ENV['REQUEST_URI']

debug( "REQUEST_URI contains %r{/\./}: #{ENV['REQUEST_URI']}" )

comment.show = false

--- 204,209 ----

1日寝ただけで10個くらいついてたよ。いちいち消すのめんどかった。(s)