From abb0a4bae26a446de93542da6673179b5163634f Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Sun, 11 Apr 2021 23:57:39 -0400
Subject: [PATCH] DEV: Add SCSS helper to replace `asset-uri` and `image-uri`
 (#12664)

---
 app/assets/images/select2-spinner.gif         | Bin 1435 -> 0 bytes
 app/assets/images/select2.png                 | Bin 525 -> 0 bytes
 app/assets/images/select2x2.png               | Bin 759 -> 0 bytes
 app/assets/images/spinner_96.gif              | Bin 11405 -> 0 bytes
 .../stylesheets/common/base/onebox.scss       |  12 +++++---
 .../stylesheets/common/foundation/mixins.scss |  11 +++++++
 lib/stylesheet/functions.rb                   |   2 ++
 lib/stylesheet/importer.rb                    |   7 ++++-
 .../images/favicons/discourse.png             | Bin
 .../google_branding/logo_calendar_128px.png   | Bin
 .../google_branding/logo_calendar_48px.png    | Bin
 .../google_branding/logo_docs_48px.png        | Bin
 .../google_branding/logo_drive_48px.png       | Bin
 .../google_branding/logo_forms_48px.png       | Bin
 .../google_branding/logo_sheets_48px.png      | Bin
 .../google_branding/logo_slides_48px.png      | Bin
 .../images/favicons/google_play.png           | Bin
 .../images/favicons/instagram.png             | Bin
 .../images/favicons/pdf_48px.png              | Bin
 .../images/favicons/pdf_64px.png              | Bin
 .../images/favicons/stackexchange.png         | Bin
 spec/components/stylesheet/compiler_spec.rb   |  29 ++++++++++++++++++
 spec/models/post_analyzer_spec.rb             |   2 +-
 spec/models/post_spec.rb                      |   2 +-
 24 files changed, 58 insertions(+), 7 deletions(-)
 delete mode 100644 app/assets/images/select2-spinner.gif
 delete mode 100644 app/assets/images/select2.png
 delete mode 100644 app/assets/images/select2x2.png
 delete mode 100644 app/assets/images/spinner_96.gif
 rename {app/assets => public}/images/favicons/discourse.png (100%)
 rename {app/assets => public}/images/favicons/google_branding/logo_calendar_128px.png (100%)
 rename {app/assets => public}/images/favicons/google_branding/logo_calendar_48px.png (100%)
 rename {app/assets => public}/images/favicons/google_branding/logo_docs_48px.png (100%)
 rename {app/assets => public}/images/favicons/google_branding/logo_drive_48px.png (100%)
 rename {app/assets => public}/images/favicons/google_branding/logo_forms_48px.png (100%)
 rename {app/assets => public}/images/favicons/google_branding/logo_sheets_48px.png (100%)
 rename {app/assets => public}/images/favicons/google_branding/logo_slides_48px.png (100%)
 rename {app/assets => public}/images/favicons/google_play.png (100%)
 rename {app/assets => public}/images/favicons/instagram.png (100%)
 rename {app/assets => public}/images/favicons/pdf_48px.png (100%)
 rename {app/assets => public}/images/favicons/pdf_64px.png (100%)
 rename {app/assets => public}/images/favicons/stackexchange.png (100%)

diff --git a/app/assets/images/select2-spinner.gif b/app/assets/images/select2-spinner.gif
deleted file mode 100644
index 703391003b296f5abf868210c79a720cea2987b5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1435
zcmZvbdrVVj7{<R-PD@*BIY8CIT50LULj)~Eu}nt_rM2y_l$)!Fu7yoOovHVZpzDDG
zEpn4#!AZ8#0y@GNuq9r?99Q8eQxGL(vZbI7XIxTa6f{d%b?c(b{`>y;@;>kLJim9d
zQZA0uBLD$U1AtbmEhs3sa^(tx!Dwu3jE#*20Jz=myu3V*$5UQjE|<&se13a-I}F2%
zi;LXFC2Cnlx->x}i&-P`gS@}FFJK}S1b|5I+dC8i06yTs>rujyN5@>s(gT{ahndN<
z7W_QhnS-uwRN^tkbWqqjnlOi4G)S@?sp8pn<t5b`2ft%{s3`05&Too(qs}W)(vscR
z#S{^F7xD3!y)(`!O&H^_?xzG(02Bac_!|WN5U(tVkSib%G6Ub<BH;BFJ3ROcLap_N
z;LIkeQz`2g`{$CKNg_YJAsAUD)rZJ!N+6vP1tQzOpLAkmSbNPMGD#%Pu>OY|@*~0B
zft0R1KDn~^B|6EW6P{)Uk6jfUqHzy>#yY)+_a8;X8vuZ_yowfwHvE!SB@@O;ZV5~c
z8S;ts6I?~Yxap*WakYv0-cOumJh1dTE9goKT@!>=8Ab{_DotAlkM~|?m>p9B7^Xlk
z+iFp|XArC4j=BTl=1<;C4}aU>-!W%<@CeEeG0pxqnDCqd&2e4ArHLyXI5)!51H&_d
zNjs^z>=9RISt%%Qx4DqerGYsjgXthVMbtlBjy7G_7i!oH+r6Zk;}v%jm5F1lmBeo0
zbkv1`XH1_zvaeUV*Pjf*t%-ImA)j`0dXnph5_fK{VT#C>RPD}XDW)#{Gu0mr{r63r
zg(9{TKZw`GODiO{ICU#KJaMmT*F^@TA&_J~V(7lfuZY<@hW~E1yIO>qHGQW9&^ffK
z-!g@<=A!L&V-~8OC>x5bHA}dP<RE{Ov$vKdt{W`U-DY)UQX!y4J6trZkI8W~NHJ4F
zEIWlFGKz$4e$rdfBfCOLD!L{wm_}N`%O~v%sXF0v_7<_*z0KWd(o&V=o6~oUg9Mc-
zCjR~6ZTJLvIi|QC#Xek01Ie>R2^WP{{&`FSe|{}FHx-4|!4h8iFPo5P4d^rS_m@oc
z+Kt(t+6TW-RBWWJ7>=f+<_Mpj*DnMhFDI`^**b>vN@}(|%KBDv_qQD*5BTSfYSh7E
zf4c(5N)w*!pKonwvU4P(@cJ;*W5sIX-uBReuDeVcbtvcE?F%%BRP1gjp?`3VlPZp-
z)%X3}2in$|a^e4@<kcCZIkdkXt75!!G@HHIoH2XEI;%hXF{QE@2}$M{s{+@CJ+PzH
zRb{5`=X$cJW2RsCaLaPPlB;^u$TX93o^V7+Q2)eM^maiXg*Sczu;Pa=aJX}^s<=1I
z0k64#&cIt{T5Z{${1#W%{3mCQ)(w)?mEqYL%CG4$(`47<ME##j5X`M=B>SB)cOL8!
zQj)L;{q3L%*+3HzLy%G`2a#}bRC2nZfsH+v>yAVgt$!eI0{^n}x;vko)`KfQY%{i|
z2MiC(LQ2!DRu855$(FJ#qI|*{<lJ5D4g<qFWMm=qtE614D-+b#Ct-$oYV|C^&ExQ)
zq9jh>27<-Uwn66zgN2GJld!y}n;8tfnWnF}ERQm}s%L>Z&|PmDFHD<fmCms7{GfZM
zJDD@&ZL1@Oy3sGEW)K|{yVTSo07gT1Z>~EZwW~SdqJ4<EbK)b8MiFQ$Q}2*$8m*S=
Sjvx53rFw0|%7G*RHvR=W?)1?B

diff --git a/app/assets/images/select2.png b/app/assets/images/select2.png
deleted file mode 100644
index 32c2fc3a22b27657ec7d7e7a07648725073c0a40..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 525
zcmV+o0`mQdP)<h;3K|Lk000e1NJLTq002Ay001Zm1ONa42(nRh0005hNkl<ZcmeIf
z&ub5G9LMq3msYIlTfTEy<AP$D<RHxjYwvxP*nxb>k0RwCm?kX_vM1ZO92_QVH7T{b
zMACM3q4}|IE{oCBT5_0X_4RUD4)~Vo+ox!chnD<TxXWQlqK!K&Q!1RpyrYSAlrTd|
zg=WSvQ%qt?>{B|_^8#ZgXjDpU<PFBWXN%IIg(*ylG0YSv^tZ^8(;{#dGs#+3GmaV5
z&p6643KS@ClB_CXh=*Df&ahRI*uZK1ifb5S%xhMv0=DxF)23=-7-QzyrivKFm{-)O
zdRWgarl^YO#290WswVpQOjZ?fnOpSJPd~lX=#NBg490OuiUTnaIsFc6*sUsy&Ty2Y
zJz8Qm9QTz<G{lo|%*B^*j6}22Y0JdZa5ze_LMg?b_z(`qOyreL9E`8w7>Nhrn2T<u
z5{JU^Eb3x;jE3Wi(uvk+kfg}PUM*Sj4`UULH1=ea78jYunCEmT9d2VLIL}RtIifVk
zV;+;0BzEwL8S0e+1C-gM1zf=7l>)=e^<=bwJf=e_(1+Qt1q@MUmr|e!Gflfh9bK5W
zN`+GxQ{p4Wl)0`{*vUO!GR7r(F{Y^WxQa11s8wooGmmLidOV`cX8rIT@^c6V%D+o*
P00000NkvXXu0mjf9}Mzg

diff --git a/app/assets/images/select2x2.png b/app/assets/images/select2x2.png
deleted file mode 100644
index e0a62658daefeffef908ec5c4729f85e9349437a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 759
zcmeAS@N?(olHy`uVBq!ia0vp^6+j%o!3-pyx;pL#Qo90tLR{Sod^$Qh+S}WKBoK6V
zcJ}x81Gzxp=H>=r0L38;S65eL5wH#r0TisSuLm-EdU_y&$jaK<+90wJ60QKE5uy@E
z0=Yny-QC^I&CL+0RjXD(#DQF(INVGi7w9(57kbe^U)Yoc`2{l+G<^6QAn<R&f(Hs0
z{@l6aaA3pv-#@=5a4Zyg<oavn%qB0M9+qdC9WM88bPLwW2`kD@o5lQo!fo!}w7d6(
z<~T4gFmCX4aSW-5dwcVE-(v#-mH_RIQ|4?=x3N5acH^J_`?m^gDVy)Mn_1v#^HHl6
z{&fmBRrud+S=>8+$x6|n={{>G>`KXM6-(Rod)3o<JELyKEX`SG@zv@(%cQDfzih9S
zZ~Z6pI)9zPo%6A=6I!od*L<G$#P`DlnX0>8jR%|A%oR@_S#5J`*J8HoPgQ1G&o2<X
zns;SOt74?;mj`=ayK`^ydl-7||MJbRD&DWJFAtOb|2K8+*Llj<=jd#HwD#YobDyT?
zY(BXrV+Y^g-J%(-3T*kC?uP4rKYR7mGp*F(qbslP)Stj&EcRyOmepUMN7NT{zRPly
zid$}$duvPPWj8tTDJ%wjbFTR+O=38(zVp)DW`{d(k1<$?pPPQ<*Z1|)`_J#y<hVH}
z*5%AT-Bq8ye&*?z!@<|^^8Eg<)BS}F1P&%2xnG~tcvLW=D?zA{G2Kw1`7uA6O!?Fg
zzRYW)UPa#xnttT)QLzZwqY~W@8Y1S$UHzJ*Y2&BIly*8a)NbyX11l%T&QwtQ-e3NF
z`gLKC|BN$*J6^jtO*!T164E@UD^<LQaRE<E)+UQ~?djE%c?C|fbq7yMeBN+ezJ62Y
ViSJBTyMbwd!PC{xWt~$(695&TbEp6S

diff --git a/app/assets/images/spinner_96.gif b/app/assets/images/spinner_96.gif
deleted file mode 100644
index 0fe33214395e84ceee21777367e1a4db4feee060..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11405
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
F{SQ`dtMUK<

diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss
index 29eb1a03e0c..a5716c7e662 100644
--- a/app/assets/stylesheets/common/base/onebox.scss
+++ b/app/assets/stylesheets/common/base/onebox.scss
@@ -87,7 +87,7 @@ a.loading-onebox {
 
 @mixin onebox-favicon($class, $image) {
   &.#{$class} .source {
-    background: image-url("favicons/#{$image}.png") no-repeat 0% 50%;
+    background: absolute-image-url("/favicons/#{$image}.png") no-repeat 0% 50%;
     background-size: 16px 16px;
     padding-left: 20px;
   }
@@ -289,7 +289,9 @@ aside.onebox {
 
 @mixin gdocs-logo($type) {
   &.g-#{$type}-logo {
-    background: image-url("favicons/google_branding/logo_#{$type}_48px.png")
+    background: absolute-image-url(
+        "/favicons/google_branding/logo_#{$type}_48px.png"
+      )
       no-repeat;
   }
 }
@@ -316,7 +318,9 @@ aside.onebox {
     width: 128px;
     height: 128px;
     &.g-calendar-logo {
-      background: image-url("favicons/google_branding/logo_calendar_128px.png")
+      background: absolute-image-url(
+          "/favicons/google_branding/logo_calendar_128px.png"
+        )
         no-repeat;
     }
   }
@@ -635,7 +639,7 @@ aside.onebox.stackexchange .onebox-body {
     width: 60px;
     height: 50px;
     float: left;
-    background: image-url("favicons/pdf_64px.png") no-repeat;
+    background: absolute-image-url("/favicons/pdf_64px.png") no-repeat;
     background-size: 48px 48px;
     display: inline-block;
   }
diff --git a/app/assets/stylesheets/common/foundation/mixins.scss b/app/assets/stylesheets/common/foundation/mixins.scss
index d6bd2eddce7..28c6b807c49 100644
--- a/app/assets/stylesheets/common/foundation/mixins.scss
+++ b/app/assets/stylesheets/common/foundation/mixins.scss
@@ -194,3 +194,14 @@ $breakpoints: (
     @return "dark";
   }
 }
+
+@function absolute-image-url($path) {
+  // public_image_path is added by the stylesheet importer
+  // it returns a CDN or subfolder path (if applicable).
+  // SCSS will compile (and return the relative path) if public_image_path is missing.
+  @if variable-exists(public_image_path) {
+    @return url("#{$public_image_path}#{$path}");
+  } @else {
+    @return url("#{$path}");
+  }
+}
diff --git a/lib/stylesheet/functions.rb b/lib/stylesheet/functions.rb
index fa1c3330d33..4abc98a51a4 100644
--- a/lib/stylesheet/functions.rb
+++ b/lib/stylesheet/functions.rb
@@ -3,9 +3,11 @@
 module Stylesheet
   module ScssFunctions
     def asset_url(path)
+      Discourse.deprecate("The `asset-url` SCSS function is deprecated. Use `absolute-image-url` instead.")
       SassC::Script::Value::String.new("url('#{ActionController::Base.helpers.asset_url(path.value)}')")
     end
     def image_url(path)
+      Discourse.deprecate("The `image-url` SCSS function is deprecated. Use `absolute-image-url` instead.")
       SassC::Script::Value::String.new("url('#{ActionController::Base.helpers.image_url(path.value)}')")
     end
   end
diff --git a/lib/stylesheet/importer.rb b/lib/stylesheet/importer.rb
index 01ca4686db6..8b02e809c97 100644
--- a/lib/stylesheet/importer.rb
+++ b/lib/stylesheet/importer.rb
@@ -152,8 +152,13 @@ module Stylesheet
       contents
     end
 
+    def public_image_path
+      image_path = UrlHelper.absolute("#{Discourse.base_path}/images")
+      "$public_image_path: \"#{image_path}\"; "
+    end
+
     def prepended_scss
-      "#{color_variables} @import \"common/foundation/variables\"; @import \"common/foundation/mixins\"; "
+      "#{color_variables} #{public_image_path} @import \"common/foundation/variables\"; @import \"common/foundation/mixins\"; "
     end
 
     def initialize(options)
diff --git a/app/assets/images/favicons/discourse.png b/public/images/favicons/discourse.png
similarity index 100%
rename from app/assets/images/favicons/discourse.png
rename to public/images/favicons/discourse.png
diff --git a/app/assets/images/favicons/google_branding/logo_calendar_128px.png b/public/images/favicons/google_branding/logo_calendar_128px.png
similarity index 100%
rename from app/assets/images/favicons/google_branding/logo_calendar_128px.png
rename to public/images/favicons/google_branding/logo_calendar_128px.png
diff --git a/app/assets/images/favicons/google_branding/logo_calendar_48px.png b/public/images/favicons/google_branding/logo_calendar_48px.png
similarity index 100%
rename from app/assets/images/favicons/google_branding/logo_calendar_48px.png
rename to public/images/favicons/google_branding/logo_calendar_48px.png
diff --git a/app/assets/images/favicons/google_branding/logo_docs_48px.png b/public/images/favicons/google_branding/logo_docs_48px.png
similarity index 100%
rename from app/assets/images/favicons/google_branding/logo_docs_48px.png
rename to public/images/favicons/google_branding/logo_docs_48px.png
diff --git a/app/assets/images/favicons/google_branding/logo_drive_48px.png b/public/images/favicons/google_branding/logo_drive_48px.png
similarity index 100%
rename from app/assets/images/favicons/google_branding/logo_drive_48px.png
rename to public/images/favicons/google_branding/logo_drive_48px.png
diff --git a/app/assets/images/favicons/google_branding/logo_forms_48px.png b/public/images/favicons/google_branding/logo_forms_48px.png
similarity index 100%
rename from app/assets/images/favicons/google_branding/logo_forms_48px.png
rename to public/images/favicons/google_branding/logo_forms_48px.png
diff --git a/app/assets/images/favicons/google_branding/logo_sheets_48px.png b/public/images/favicons/google_branding/logo_sheets_48px.png
similarity index 100%
rename from app/assets/images/favicons/google_branding/logo_sheets_48px.png
rename to public/images/favicons/google_branding/logo_sheets_48px.png
diff --git a/app/assets/images/favicons/google_branding/logo_slides_48px.png b/public/images/favicons/google_branding/logo_slides_48px.png
similarity index 100%
rename from app/assets/images/favicons/google_branding/logo_slides_48px.png
rename to public/images/favicons/google_branding/logo_slides_48px.png
diff --git a/app/assets/images/favicons/google_play.png b/public/images/favicons/google_play.png
similarity index 100%
rename from app/assets/images/favicons/google_play.png
rename to public/images/favicons/google_play.png
diff --git a/app/assets/images/favicons/instagram.png b/public/images/favicons/instagram.png
similarity index 100%
rename from app/assets/images/favicons/instagram.png
rename to public/images/favicons/instagram.png
diff --git a/app/assets/images/favicons/pdf_48px.png b/public/images/favicons/pdf_48px.png
similarity index 100%
rename from app/assets/images/favicons/pdf_48px.png
rename to public/images/favicons/pdf_48px.png
diff --git a/app/assets/images/favicons/pdf_64px.png b/public/images/favicons/pdf_64px.png
similarity index 100%
rename from app/assets/images/favicons/pdf_64px.png
rename to public/images/favicons/pdf_64px.png
diff --git a/app/assets/images/favicons/stackexchange.png b/public/images/favicons/stackexchange.png
similarity index 100%
rename from app/assets/images/favicons/stackexchange.png
rename to public/images/favicons/stackexchange.png
diff --git a/spec/components/stylesheet/compiler_spec.rb b/spec/components/stylesheet/compiler_spec.rb
index 6de836e425a..b71b2d6cce3 100644
--- a/spec/components/stylesheet/compiler_spec.rb
+++ b/spec/components/stylesheet/compiler_spec.rb
@@ -87,6 +87,35 @@ describe Stylesheet::Compiler do
     expect(css).not_to include('image-url')
   end
 
+  it "supports absolute-image-url" do
+    scss = Stylesheet::Importer.new({}).prepended_scss
+    scss += ".body{background-image: absolute-image-url('/favicons/github.png');}"
+    css, _map = Stylesheet::Compiler.compile(scss, "test.scss")
+
+    expect(css).to include('url("http://test.localhost/images/favicons/github.png")')
+    expect(css).not_to include('absolute-image-url')
+  end
+
+  it "supports absolute-image-url in subfolder" do
+    set_subfolder "/subfo"
+    scss = Stylesheet::Importer.new({}).prepended_scss
+    scss += ".body{background-image: absolute-image-url('/favicons/github.png');}"
+    css, _map = Stylesheet::Compiler.compile(scss, "test2.scss")
+
+    expect(css).to include('url("http://test.localhost/subfo/images/favicons/github.png")')
+    expect(css).not_to include('absolute-image-url')
+  end
+
+  it "supports absolute-image-url with CDNs" do
+    set_cdn_url "https://awesome.com"
+    scss = Stylesheet::Importer.new({}).prepended_scss
+    scss += ".body{background-image: absolute-image-url('/favicons/github.png');}"
+    css, _map = Stylesheet::Compiler.compile(scss, "test2.scss")
+
+    expect(css).to include('url("https://awesome.com/images/favicons/github.png")')
+    expect(css).not_to include('absolute-image-url')
+  end
+
   context "with a color scheme" do
     it "returns the default color definitions when no color scheme is specified" do
       css, _map = Stylesheet::Compiler.compile_asset("color_definitions")
diff --git a/spec/models/post_analyzer_spec.rb b/spec/models/post_analyzer_spec.rb
index dccd31597ca..f7de1074ee5 100644
--- a/spec/models/post_analyzer_spec.rb
+++ b/spec/models/post_analyzer_spec.rb
@@ -119,7 +119,7 @@ describe PostAnalyzer do
     let(:raw_post_one_image_md) { "![sherlock](http://bbc.co.uk/sherlock.jpg)" }
     let(:raw_post_two_images_html) { "<img src='http://discourse.org/logo.png'> <img src='http://bbc.co.uk/sherlock.jpg'>" }
     let(:raw_post_with_avatars) { '<img alt="smiley" title=":smiley:" src="/assets/emoji/smiley.png" class="avatar"> <img alt="wink" title=":wink:" src="/assets/emoji/wink.png" class="avatar">' }
-    let(:raw_post_with_favicon) { '<img src="/assets/favicons/wikipedia.png" class="favicon">' }
+    let(:raw_post_with_favicon) { '<img src="/images/favicons/discourse.png" class="favicon">' }
     let(:raw_post_with_thumbnail) { '<img src="/assets/emoji/smiley.png" class="thumbnail">' }
     let(:raw_post_with_two_classy_images) { "<img src='http://discourse.org/logo.png' class='classy'> <img src='http://bbc.co.uk/sherlock.jpg' class='classy'>" }
     let(:raw_post_with_two_embedded_media) { '<video width="950" height="700" controls><source src="https://bbc.co.uk/news.mp4" type="video/mp4"></video><audio controls><source type="audio/mpeg" src="https://example.com/audio.mp3"></audio>' }
diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb
index 5db5dab72cf..4108857b481 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -241,7 +241,7 @@ describe Post do
     let(:post_one_image) { post_with_body("![sherlock](http://bbc.co.uk/sherlock.jpg)", newuser) }
     let(:post_two_images) { post_with_body("<img src='http://discourse.org/logo.png'> <img src='http://bbc.co.uk/sherlock.jpg'>", newuser) }
     let(:post_with_avatars) { post_with_body('<img alt="smiley" title=":smiley:" src="/assets/emoji/smiley.png" class="avatar"> <img alt="wink" title=":wink:" src="/assets/emoji/wink.png" class="avatar">', newuser) }
-    let(:post_with_favicon) { post_with_body('<img src="/assets/favicons/wikipedia.png" class="favicon">', newuser) }
+    let(:post_with_favicon) { post_with_body('<img src="/images/favicons/discourse.png" class="favicon">', newuser) }
     let(:post_image_within_quote) { post_with_body('[quote]<img src="coolimage.png">[/quote]', newuser) }
     let(:post_image_within_code) { post_with_body('<code><img src="coolimage.png"></code>', newuser) }
     let(:post_image_within_pre) { post_with_body('<pre><img src="coolimage.png"></pre>', newuser) }