From 414872730c3b6e99640ae576c02ee5f0afde899a Mon Sep 17 00:00:00 2001 From: swag Date: Wed, 3 May 2023 14:07:27 -0400 Subject: [PATCH 1/5] Try some escaping stuff with the feed --- .feed.xml.swp | Bin 0 -> 16384 bytes feed.xml | 149 ++++++++++++++++++++++++++++++ lib/PostText/Controller/Thread.pm | 10 +- 3 files changed, 157 insertions(+), 2 deletions(-) create mode 100644 .feed.xml.swp create mode 100644 feed.xml diff --git a/.feed.xml.swp b/.feed.xml.swp new file mode 100644 index 0000000000000000000000000000000000000000..e4925f547fb78e7c7471e5163c455ae3ee965fa8 GIT binary patch literal 16384 zcmeI&Z)n_P90%~Ho2#{2H?|id_C?ItP~0y6?%Lkd+>LH+b+Y1=TV)KKxy#dDY%V$T z$M&3bI#C8glu;0sfwgOoCQrY)Jk9S(%JS&J5h0(E38rm?m~T8}cF&z{pAqr7>`vO2Gajv4Y4VuAw^q+R zKDN?ESU0_}LuuR!j(e=``qE+74@zt*kj5A@GgCEtm3{ElJOQ4-dK2g(nyNG}^_}9K z!jA1n*1IGAdprT208fA?z!TsJ@C0}QJOQ4-|1g1|zKNVfyEnyce=?r8Et~%xPj|%2 zPb^y>|Hx-N0iFO)fG5Bc;0f>qcmg~Do&ZmPC%_Zn38XLq!z5%E+I4p{0D$NJ3-$lp zRzkjnkKhzM4JRRlW3UH)y_Jwzcpu(@b5MmW?1E1Cwu_MW;3B*UGjJU4fo^DnuWlja zZMXpE;0%m{2s_}9n+f?G&ckak1E*jFZii0zsgsb)@G6{zGthuR*amIz-A#mCf|uYl zJOeIJXoufB&=#15=V2Nqfq@Kv-AKrf@EKf$ryzhD9E08POFJRoz{hYNJa`N$@E~-< zl`VwK!H4h)RN+xL3irZx`1%GyK81JTMR){8;Q=T>2Yj&^=Lg<`=b!|KU%Mkgn_yz zsIsaFs!HWvn#&18gC$*B*o^4op=An|f0%hStM^JKkeQ*r5)(6N3)@RqtVD@GJ;(*-1+5Fyn^U> zy=9_U4T3tAB-^bRb`|fVP)(L)DX4nPFeM)^z}QS`HmSKa*`O9D+wn#9A*L_g89*iR@5l{KpNCP<<$eMz86 zNs}1%EF{slBng#fvs6_QB#}>F5@=E@lE}&UTC6z<^xbJoqS>U4CxLzPqM6;jJgb|}Le><=y5Y?d6&E&~4~7W)WX8ab-Qm&WxQUtcL4 zbc7?N;k|vrBohKJ^n;9mB0(7*7*hI|R~XIHvtqSiTYj+YG)8Z@QyRVFzF0X`s)pk* zyGTfp2zcq;@oCw1#}CXeE{O3l%0^{^Ic6sGnP(gLP;qP0k_|^(GqjmVbkFyNCz$7> z5GsgjMivRt_hG+_3l%IBm{W00)H4OK`6r9}iX^K44b<4*Lsb7SJm3EW_5I6m8ftJK z+y+~r1Aaqoe+gcIX{bOEx?l@jMP2^`%)+w}z){G;X804w`#C=DmFU=f;tB8scmg~D zo&ZmPC%_Zn3Gf7X0VwuSa-M i5?YcmH#MKSF}G%ul8&(aXA%jA=2JK5rsl5=y8Q#!_35nu literal 0 HcmV?d00001 diff --git a/feed.xml b/feed.xml new file mode 100644 index 0000000..0b72d45 --- /dev/null +++ b/feed.xml @@ -0,0 +1,149 @@ + + + + + +Post::Text +http://localhost:3000/thread/list +In UTF-8 we trust. 🫡 +Wed, 03 May 2023 14:05:24 EDT + + +hi +http://localhost:3000/thread/single/305 +<p>ayy... lmao</p> + +Anonymous +305 +Wed, 3 May 2023 14:05:16 EDT + + +hi +http://localhost:3000/thread/single/304 +<p>ayy... lmao</p> + +Anonymous +304 +Wed, 3 May 2023 14:04:36 EDT + + +hi +http://localhost:3000/thread/single/303 +<p>ayy... lmao</p> + +Anonymous +303 +Wed, 3 May 2023 14:00:14 EDT + + +hi +http://localhost:3000/thread/single/302 +<p>ayy... lmao</p> + +Anonymous +302 +Wed, 3 May 2023 13:55:16 EDT + + +hi +http://localhost:3000/thread/single/301 +<p>ayy... lmao</p> + +Anonymous +301 +Fri, 28 Apr 2023 13:04:38 EDT + + +hi +http://localhost:3000/thread/single/300 +<p>ayy... lmao</p> + +Anonymous +300 +Fri, 28 Apr 2023 12:50:03 EDT + + +hi +http://localhost:3000/thread/single/299 +<p>ayy... lmao</p> + +Anonymous +299 +Fri, 28 Apr 2023 12:44:21 EDT + + +hi +http://localhost:3000/thread/single/298 +<p>ayy... lmao</p> + +Anonymous +298 +Wed, 26 Apr 2023 11:03:27 EDT + + +hi +http://localhost:3000/thread/single/297 +<p>ayy... lmao</p> + +Anonymous +297 +Tue, 25 Apr 2023 23:09:02 EDT + + +hi +http://localhost:3000/thread/single/296 +<p>ayy... lmao</p> + +Anonymous +296 +Tue, 25 Apr 2023 22:42:10 EDT + + +hi +http://localhost:3000/thread/single/295 +<p>ayy... lmao</p> + +Anonymous +295 +Tue, 25 Apr 2023 22:09:19 EDT + + +hi +http://localhost:3000/thread/single/294 +<p>ayy... lmao</p> + +Anonymous +294 +Tue, 25 Apr 2023 22:07:55 EDT + + +hi +http://localhost:3000/thread/single/293 +<p>ayy... lmao</p> + +Anonymous +293 +Tue, 25 Apr 2023 18:44:21 EDT + + +hi +http://localhost:3000/thread/single/292 +<p>ayy... lmao</p> + +Anonymous +292 +Tue, 25 Apr 2023 18:43:16 EDT + + +hi +http://localhost:3000/thread/single/291 +<p>ayy... lmao</p> + +Anonymous +291 +Tue, 25 Apr 2023 18:42:26 EDT + + + \ No newline at end of file diff --git a/lib/PostText/Controller/Thread.pm b/lib/PostText/Controller/Thread.pm index b9b1087..8f0b142 100644 --- a/lib/PostText/Controller/Thread.pm +++ b/lib/PostText/Controller/Thread.pm @@ -3,6 +3,7 @@ package PostText::Controller::Thread; use Mojo::Base 'Mojolicious::Controller', -signatures; use Date::Format; use XML::RSS; +use XML::Entities; sub create($self) { my $v; @@ -105,7 +106,12 @@ sub feed($self) { ); for my $thread (@{$threads}) { - my $item_link = + my $description = + XML::Entities::decode( + 'all', + $self->markdown($self->truncate_text($thread->{'body'})) + ); + my $item_link = $self->url_for( single_thread => {thread_id => $thread->{'id'}} )->to_abs; @@ -113,7 +119,7 @@ sub feed($self) { $rss->add_item( title => $thread->{'title'}, link => $item_link, - description => $self->truncate_text($thread->{'body'}), + description => $description, author => $thread->{'author'}, guid => $thread->{'id'}, pubDate => $thread->{'date'} From f88b75fdd44168ba663748a808b40f535482f905 Mon Sep 17 00:00:00 2001 From: swag Date: Fri, 5 May 2023 23:26:58 -0400 Subject: [PATCH 2/5] Some cleanup --- lib/PostText/Controller/Thread.pm | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/lib/PostText/Controller/Thread.pm b/lib/PostText/Controller/Thread.pm index 8f0b142..f913097 100644 --- a/lib/PostText/Controller/Thread.pm +++ b/lib/PostText/Controller/Thread.pm @@ -3,7 +3,6 @@ package PostText::Controller::Thread; use Mojo::Base 'Mojolicious::Controller', -signatures; use Date::Format; use XML::RSS; -use XML::Entities; sub create($self) { my $v; @@ -107,14 +106,10 @@ sub feed($self) { for my $thread (@{$threads}) { my $description = - XML::Entities::decode( - 'all', - $self->markdown($self->truncate_text($thread->{'body'})) - ); - my $item_link = - $self->url_for( - single_thread => {thread_id => $thread->{'id'}} - )->to_abs; + $self->markdown($self->truncate_text($thread->{'body'})); + my $item_link = $self->url_for( + single_thread => {thread_id => $thread->{'id'}} + )->to_abs; $rss->add_item( title => $thread->{'title'}, From dae058c07f98e12cee57f5f531b79fa96ac5816d Mon Sep 17 00:00:00 2001 From: swag Date: Sat, 6 May 2023 00:01:34 -0400 Subject: [PATCH 3/5] Don't escape with HTML::Restrict --- lib/PostText.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/PostText.pm b/lib/PostText.pm index 8ec277f..6b38cfc 100644 --- a/lib/PostText.pm +++ b/lib/PostText.pm @@ -31,7 +31,10 @@ sub startup($self) { }); $self->helper(hr => sub ($c) { - state $hr = HTML::Restrict->new(strip_enclosed_content => []) + state $hr = HTML::Restrict->new( + filter_text => 0, + strip_enclosed_content => [] + ) }); $self->helper(thread => sub ($c) { From b215fb2c5cb1252fafba190b54b4b22ee4cd8b01 Mon Sep 17 00:00:00 2001 From: swag Date: Sat, 6 May 2023 00:29:12 -0400 Subject: [PATCH 4/5] Whoops forgot to kill this file --- feed.xml | 149 ------------------------------------------------------- 1 file changed, 149 deletions(-) delete mode 100644 feed.xml diff --git a/feed.xml b/feed.xml deleted file mode 100644 index 0b72d45..0000000 --- a/feed.xml +++ /dev/null @@ -1,149 +0,0 @@ - - - - - -Post::Text -http://localhost:3000/thread/list -In UTF-8 we trust. 🫡 -Wed, 03 May 2023 14:05:24 EDT - - -hi -http://localhost:3000/thread/single/305 -<p>ayy... lmao</p> - -Anonymous -305 -Wed, 3 May 2023 14:05:16 EDT - - -hi -http://localhost:3000/thread/single/304 -<p>ayy... lmao</p> - -Anonymous -304 -Wed, 3 May 2023 14:04:36 EDT - - -hi -http://localhost:3000/thread/single/303 -<p>ayy... lmao</p> - -Anonymous -303 -Wed, 3 May 2023 14:00:14 EDT - - -hi -http://localhost:3000/thread/single/302 -<p>ayy... lmao</p> - -Anonymous -302 -Wed, 3 May 2023 13:55:16 EDT - - -hi -http://localhost:3000/thread/single/301 -<p>ayy... lmao</p> - -Anonymous -301 -Fri, 28 Apr 2023 13:04:38 EDT - - -hi -http://localhost:3000/thread/single/300 -<p>ayy... lmao</p> - -Anonymous -300 -Fri, 28 Apr 2023 12:50:03 EDT - - -hi -http://localhost:3000/thread/single/299 -<p>ayy... lmao</p> - -Anonymous -299 -Fri, 28 Apr 2023 12:44:21 EDT - - -hi -http://localhost:3000/thread/single/298 -<p>ayy... lmao</p> - -Anonymous -298 -Wed, 26 Apr 2023 11:03:27 EDT - - -hi -http://localhost:3000/thread/single/297 -<p>ayy... lmao</p> - -Anonymous -297 -Tue, 25 Apr 2023 23:09:02 EDT - - -hi -http://localhost:3000/thread/single/296 -<p>ayy... lmao</p> - -Anonymous -296 -Tue, 25 Apr 2023 22:42:10 EDT - - -hi -http://localhost:3000/thread/single/295 -<p>ayy... lmao</p> - -Anonymous -295 -Tue, 25 Apr 2023 22:09:19 EDT - - -hi -http://localhost:3000/thread/single/294 -<p>ayy... lmao</p> - -Anonymous -294 -Tue, 25 Apr 2023 22:07:55 EDT - - -hi -http://localhost:3000/thread/single/293 -<p>ayy... lmao</p> - -Anonymous -293 -Tue, 25 Apr 2023 18:44:21 EDT - - -hi -http://localhost:3000/thread/single/292 -<p>ayy... lmao</p> - -Anonymous -292 -Tue, 25 Apr 2023 18:43:16 EDT - - -hi -http://localhost:3000/thread/single/291 -<p>ayy... lmao</p> - -Anonymous -291 -Tue, 25 Apr 2023 18:42:26 EDT - - - \ No newline at end of file From f0137613ed2a63386e4fcc4a6dd03a8264734faa Mon Sep 17 00:00:00 2001 From: swag Date: Sat, 6 May 2023 00:31:10 -0400 Subject: [PATCH 5/5] Whoops lmao --- templates/layouts/default.html.ep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/layouts/default.html.ep b/templates/layouts/default.html.ep index 088413a..4fbebf2 100644 --- a/templates/layouts/default.html.ep +++ b/templates/layouts/default.html.ep @@ -15,7 +15,7 @@ <%= link_to RSS => threads_feed => {format => 'rss'} %>