From 68fd4f11b24203d71bbd92f51fe9f19829469de6 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Sat, 9 Jan 2021 12:56:14 +0900
Subject: [PATCH 001/127] Revert "Delete bbb-icons-ori.woff"

This reverts commit 84937a0d076f79076d8df201e3edb278374df0d0.
---
 .../public/fonts/BbbIcons/bbb-icons-ori.woff    | Bin 0 -> 16556 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons-ori.woff

diff --git a/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons-ori.woff b/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons-ori.woff
new file mode 100644
index 0000000000000000000000000000000000000000..8063d6bf985b0c9763682428d38fc671e7af9a22
GIT binary patch
literal 16556
zcmZU4V{|4>xa}L;wr$(CZBJ}YFtKfCVw)4&w%*v9*vXmi+`HEOaclLis=fQ!Ro$z8
zbyYu}N|KUF>gq}WfN(Vc4)Cw2!2>}4YybZuCMih_0DuVt0Q|WCfPAvo9|I^!Np*#P
zUhsd>`2QiYVX{w3TtX565Ze96N&kToKm`a?Qe$ET06>2H<Ffx?tl6r^W@c~V1OR|u
z{^P>`?x_OUuE>8_n3(_TL;uq_{(%$q0FLR$Kk=XTF9tyT59H7SpcOyt-Ms$U{^ODV
zFhtY@LuYT|^=~{7<9{6Tf1#%ga4@mA_@_1h1NXnVyoI7qL7g03-Tu7?{l6Hre<1#D
z1F(7Jm>HWJ8w2)ZA&x|DKRAtW+I6sncV#ydL6QAzDP4!Yd%qF1)7bPtI`HA;iB$kH
z`S9rf%>UQd`sUb&JV<)`ee*4yb_6esg5HM+NWg`-0sxc&0KNYcXYw`79T=Dz7-&to
zhyw{3<_|snlGUG)h(<lpH!%eOivfj)Mou`+8kp-V_{$o!{?f}L2H%7+2$6u>4hlhR
z4h|@#f=~Ewtki^An*m|u@ZLwGv;KvqG6CA<`bgqa7R>%CsIvxCQFv)m79Ot~um_Y4
ztW&(^Q9&)LY=P!bRd~DO&CH#dFUvqYpfdXo0a6@>pCNu*`~IMFb|NnK^_*6GT<2D$
z)u_ODZ?vj=twmc)nT;mAm&;b;Gv}7&VA%m8nEOq8v}Wc(-l36BlIx+oi0nWf>U2Ux
z;t(KsHYT#fCzb+F*J3O%O52peO7<*C#-8CD8Y%7dR=;?>XKC<9G1$Q@WgyIycDOYv
zVI_C<1ncYrZ?yP_r<DI#Vuh)SX5m((8K<)<fd?pE6{9`9IEvnL9`_3U*RB4l-!bda
z!)9^yUA6v^1nNZ}o6qg!i|G6P_|lA9<af;yoMNHlHRn^P0G@4~-NAl}Y=D{XEOrso
zk1vQ(fVKXAYh`R~`O6pwQW6sRFUTEszb_^v81Xbnh`cdQXgbRGx0nt*@yd7jzPz%5
zao^a;uc={J=y4=>06@bQM(97kB_Q})4?6~@9sr>413CY<7A;+HzG@mzLRpJX<a&LD
z4B<Fd%z-H4A|ficAh7$k;vhJ}381;6YPvM`)*Gb?+3Yt`p4nE(l=d4bn6T=BcgiVg
zW$3W#mE5~#Zeck11QsJGR&M!jR4%KEa7De}H^AAGf0s+v{hHO)sIKizOONf1-!3@~
z4Qkwh>d8?}e!5X*j+U;fsy6Xn5_!&{j&rj({js=4l6DgP7puiW`Qc!Z>LD39S86vu
z!2upuk-0~f0HcN81HKTW1@P1vb)4Zqb*$!qye&T4Q9ila++v*EI;kOPlfqNBRN7M7
zQs!9tSO!ztFwtE0jvOM%R3>$Z-dXx1iE<oMCfz*$kU=K?Fyzo+Tw>gad`H?8e|CFf
zdt`e?VgLI0`hf5_?-<jC$yH~oN*_dPK*MP{C$h=4MIWs#b91<RI`@##$;fHPNr>`y
zadz@TvV$CMK0AxG<wBE8bP{V4YqCp{p@J%fb<(9wi_D{pf=puZOfgqd97V3&8~Yj4
zcu|t0Tn}5Xlb?yTjHZf;Kk!d=QrAFGZ0PVr;r>8uD8)o$mz{-)rHP_qg{+RgZc3(x
zzJ56)!<c4mFxEPSH(qLG_2quoV+Vy;T~t&mt%Zn8Va5l)Mr0$gQ6}35BUWYk*fi~!
zp^-kcM9t(ht&Wy<pX`ibx>31m?WC3^hE*l8YlV%0Aq#({>}sWKRMSc-ynrR;SYu<;
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
FAOHx!DOUgh

literal 0
HcmV?d00001


From b50aa4ca9ac3217b418024f9cb7a9393161af227 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Sat, 9 Jan 2021 12:56:30 +0900
Subject: [PATCH 002/127] Revert "Add files via upload"

This reverts commit 391434445ab286a160fde63533fa843175e9e8a0.
---
 .../public/fonts/BbbIcons/bbb-icons.woff        | Bin 16556 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.woff

diff --git a/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.woff b/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.woff
deleted file mode 100644
index 8063d6bf985b0c9763682428d38fc671e7af9a22..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16556
zcmZU4V{|4>xa}L;wr$(CZBJ}YFtKfCVw)4&w%*v9*vXmi+`HEOaclLis=fQ!Ro$z8
zbyYu}N|KUF>gq}WfN(Vc4)Cw2!2>}4YybZuCMih_0DuVt0Q|WCfPAvo9|I^!Np*#P
zUhsd>`2QiYVX{w3TtX565Ze96N&kToKm`a?Qe$ET06>2H<Ffx?tl6r^W@c~V1OR|u
z{^P>`?x_OUuE>8_n3(_TL;uq_{(%$q0FLR$Kk=XTF9tyT59H7SpcOyt-Ms$U{^ODV
zFhtY@LuYT|^=~{7<9{6Tf1#%ga4@mA_@_1h1NXnVyoI7qL7g03-Tu7?{l6Hre<1#D
z1F(7Jm>HWJ8w2)ZA&x|DKRAtW+I6sncV#ydL6QAzDP4!Yd%qF1)7bPtI`HA;iB$kH
z`S9rf%>UQd`sUb&JV<)`ee*4yb_6esg5HM+NWg`-0sxc&0KNYcXYw`79T=Dz7-&to
zhyw{3<_|snlGUG)h(<lpH!%eOivfj)Mou`+8kp-V_{$o!{?f}L2H%7+2$6u>4hlhR
z4h|@#f=~Ewtki^An*m|u@ZLwGv;KvqG6CA<`bgqa7R>%CsIvxCQFv)m79Ot~um_Y4
ztW&(^Q9&)LY=P!bRd~DO&CH#dFUvqYpfdXo0a6@>pCNu*`~IMFb|NnK^_*6GT<2D$
z)u_ODZ?vj=twmc)nT;mAm&;b;Gv}7&VA%m8nEOq8v}Wc(-l36BlIx+oi0nWf>U2Ux
z;t(KsHYT#fCzb+F*J3O%O52peO7<*C#-8CD8Y%7dR=;?>XKC<9G1$Q@WgyIycDOYv
zVI_C<1ncYrZ?yP_r<DI#Vuh)SX5m((8K<)<fd?pE6{9`9IEvnL9`_3U*RB4l-!bda
z!)9^yUA6v^1nNZ}o6qg!i|G6P_|lA9<af;yoMNHlHRn^P0G@4~-NAl}Y=D{XEOrso
zk1vQ(fVKXAYh`R~`O6pwQW6sRFUTEszb_^v81Xbnh`cdQXgbRGx0nt*@yd7jzPz%5
zao^a;uc={J=y4=>06@bQM(97kB_Q})4?6~@9sr>413CY<7A;+HzG@mzLRpJX<a&LD
z4B<Fd%z-H4A|ficAh7$k;vhJ}381;6YPvM`)*Gb?+3Yt`p4nE(l=d4bn6T=BcgiVg
zW$3W#mE5~#Zeck11QsJGR&M!jR4%KEa7De}H^AAGf0s+v{hHO)sIKizOONf1-!3@~
z4Qkwh>d8?}e!5X*j+U;fsy6Xn5_!&{j&rj({js=4l6DgP7puiW`Qc!Z>LD39S86vu
z!2upuk-0~f0HcN81HKTW1@P1vb)4Zqb*$!qye&T4Q9ila++v*EI;kOPlfqNBRN7M7
zQs!9tSO!ztFwtE0jvOM%R3>$Z-dXx1iE<oMCfz*$kU=K?Fyzo+Tw>gad`H?8e|CFf
zdt`e?VgLI0`hf5_?-<jC$yH~oN*_dPK*MP{C$h=4MIWs#b91<RI`@##$;fHPNr>`y
zadz@TvV$CMK0AxG<wBE8bP{V4YqCp{p@J%fb<(9wi_D{pf=puZOfgqd97V3&8~Yj4
zcu|t0Tn}5Xlb?yTjHZf;Kk!d=QrAFGZ0PVr;r>8uD8)o$mz{-)rHP_qg{+RgZc3(x
zzJ56)!<c4mFxEPSH(qLG_2quoV+Vy;T~t&mt%Zn8Va5l)Mr0$gQ6}35BUWYk*fi~!
zp^-kcM9t(ht&Wy<pX`ibx>31m?WC3^hE*l8YlV%0Aq#({>}sWKRMSc-ynrR;SYu<;
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
FAOHx!DOUgh


From 43d987feb69110099687fc3d49a7072573d86e63 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Sat, 9 Jan 2021 12:56:41 +0900
Subject: [PATCH 003/127] Revert "Delete bbb-icons.woff"

This reverts commit 7c245c666d9adc7a8a1b1dc88b01bce749109b2f.
---
 .../public/fonts/BbbIcons/bbb-icons.woff        | Bin 0 -> 17180 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.woff

diff --git a/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.woff b/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.woff
new file mode 100644
index 0000000000000000000000000000000000000000..ab00f58e6669f937c43b295b8a9e89b87db12367
GIT binary patch
literal 17180
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
YdN;r4sozBQtn{{N3j=<~5cmK906vslvH$=8

literal 0
HcmV?d00001


From 4f8b7aa488a1bcfee7518d7d38cfcbf5a2e86860 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Sat, 9 Jan 2021 12:56:46 +0900
Subject: [PATCH 004/127] Revert "Add files via upload"

This reverts commit 6f8c764c4bc35d646d9691cec8298d0ad3b98b11.
---
 .../public/fonts/BbbIcons/bbb-icons-ori.woff    | Bin 16556 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons-ori.woff

diff --git a/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons-ori.woff b/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons-ori.woff
deleted file mode 100644
index 8063d6bf985b0c9763682428d38fc671e7af9a22..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16556
zcmZU4V{|4>xa}L;wr$(CZBJ}YFtKfCVw)4&w%*v9*vXmi+`HEOaclLis=fQ!Ro$z8
zbyYu}N|KUF>gq}WfN(Vc4)Cw2!2>}4YybZuCMih_0DuVt0Q|WCfPAvo9|I^!Np*#P
zUhsd>`2QiYVX{w3TtX565Ze96N&kToKm`a?Qe$ET06>2H<Ffx?tl6r^W@c~V1OR|u
z{^P>`?x_OUuE>8_n3(_TL;uq_{(%$q0FLR$Kk=XTF9tyT59H7SpcOyt-Ms$U{^ODV
zFhtY@LuYT|^=~{7<9{6Tf1#%ga4@mA_@_1h1NXnVyoI7qL7g03-Tu7?{l6Hre<1#D
z1F(7Jm>HWJ8w2)ZA&x|DKRAtW+I6sncV#ydL6QAzDP4!Yd%qF1)7bPtI`HA;iB$kH
z`S9rf%>UQd`sUb&JV<)`ee*4yb_6esg5HM+NWg`-0sxc&0KNYcXYw`79T=Dz7-&to
zhyw{3<_|snlGUG)h(<lpH!%eOivfj)Mou`+8kp-V_{$o!{?f}L2H%7+2$6u>4hlhR
z4h|@#f=~Ewtki^An*m|u@ZLwGv;KvqG6CA<`bgqa7R>%CsIvxCQFv)m79Ot~um_Y4
ztW&(^Q9&)LY=P!bRd~DO&CH#dFUvqYpfdXo0a6@>pCNu*`~IMFb|NnK^_*6GT<2D$
z)u_ODZ?vj=twmc)nT;mAm&;b;Gv}7&VA%m8nEOq8v}Wc(-l36BlIx+oi0nWf>U2Ux
z;t(KsHYT#fCzb+F*J3O%O52peO7<*C#-8CD8Y%7dR=;?>XKC<9G1$Q@WgyIycDOYv
zVI_C<1ncYrZ?yP_r<DI#Vuh)SX5m((8K<)<fd?pE6{9`9IEvnL9`_3U*RB4l-!bda
z!)9^yUA6v^1nNZ}o6qg!i|G6P_|lA9<af;yoMNHlHRn^P0G@4~-NAl}Y=D{XEOrso
zk1vQ(fVKXAYh`R~`O6pwQW6sRFUTEszb_^v81Xbnh`cdQXgbRGx0nt*@yd7jzPz%5
zao^a;uc={J=y4=>06@bQM(97kB_Q})4?6~@9sr>413CY<7A;+HzG@mzLRpJX<a&LD
z4B<Fd%z-H4A|ficAh7$k;vhJ}381;6YPvM`)*Gb?+3Yt`p4nE(l=d4bn6T=BcgiVg
zW$3W#mE5~#Zeck11QsJGR&M!jR4%KEa7De}H^AAGf0s+v{hHO)sIKizOONf1-!3@~
z4Qkwh>d8?}e!5X*j+U;fsy6Xn5_!&{j&rj({js=4l6DgP7puiW`Qc!Z>LD39S86vu
z!2upuk-0~f0HcN81HKTW1@P1vb)4Zqb*$!qye&T4Q9ila++v*EI;kOPlfqNBRN7M7
zQs!9tSO!ztFwtE0jvOM%R3>$Z-dXx1iE<oMCfz*$kU=K?Fyzo+Tw>gad`H?8e|CFf
zdt`e?VgLI0`hf5_?-<jC$yH~oN*_dPK*MP{C$h=4MIWs#b91<RI`@##$;fHPNr>`y
zadz@TvV$CMK0AxG<wBE8bP{V4YqCp{p@J%fb<(9wi_D{pf=puZOfgqd97V3&8~Yj4
zcu|t0Tn}5Xlb?yTjHZf;Kk!d=QrAFGZ0PVr;r>8uD8)o$mz{-)rHP_qg{+RgZc3(x
zzJ56)!<c4mFxEPSH(qLG_2quoV+Vy;T~t&mt%Zn8Va5l)Mr0$gQ6}35BUWYk*fi~!
zp^-kcM9t(ht&Wy<pX`ibx>31m?WC3^hE*l8YlV%0Aq#({>}sWKRMSc-ynrR;SYu<;
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
FAOHx!DOUgh


From 9642e06aa44cb9ecad3dab8f8bb2eaba19a3c3d5 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Sat, 9 Jan 2021 12:56:52 +0900
Subject: [PATCH 005/127] Revert "Delete tmp.woff"

This reverts commit 5141e653599b4d83ddff6123ed59c1e4eb4d18e0.
---
 bigbluebutton-html5/public/fonts/BbbIcons/tmp.woff | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 bigbluebutton-html5/public/fonts/BbbIcons/tmp.woff

diff --git a/bigbluebutton-html5/public/fonts/BbbIcons/tmp.woff b/bigbluebutton-html5/public/fonts/BbbIcons/tmp.woff
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/bigbluebutton-html5/public/fonts/BbbIcons/tmp.woff
@@ -0,0 +1 @@
+

From d77527e17a1f8ae638a8cebbb9d49bb50d2e10bf Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Sat, 9 Jan 2021 12:56:57 +0900
Subject: [PATCH 006/127] Revert "Add files via upload"

This reverts commit c8f7b17b0483910b6fa2750b2138cc3895e57145.
---
 .../public/fonts/BbbIcons/bbb-icons.woff        | Bin 17180 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.woff

diff --git a/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.woff b/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.woff
deleted file mode 100644
index ab00f58e6669f937c43b295b8a9e89b87db12367..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17180
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
YdN;r4sozBQtn{{N3j=<~5cmK906vslvH$=8


From 267dc412d561c3d2eac49959e4b0ada77b8364bd Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Sat, 9 Jan 2021 12:57:02 +0900
Subject: [PATCH 007/127] Revert "Create tmp.woff"

This reverts commit 73c45065944d96f7779971b3535943c96feb2897.
---
 bigbluebutton-html5/public/fonts/BbbIcons/tmp.woff | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 bigbluebutton-html5/public/fonts/BbbIcons/tmp.woff

diff --git a/bigbluebutton-html5/public/fonts/BbbIcons/tmp.woff b/bigbluebutton-html5/public/fonts/BbbIcons/tmp.woff
deleted file mode 100644
index 8b137891791f..000000000000
--- a/bigbluebutton-html5/public/fonts/BbbIcons/tmp.woff
+++ /dev/null
@@ -1 +0,0 @@
-

From d221d290cd5ad33b3c455b09f9da36d5788ee152 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Sat, 9 Jan 2021 12:57:10 +0900
Subject: [PATCH 008/127] Revert "Delete bbb-icons.woff"

This reverts commit 9d01d58527bac04ebbf9be61140a13e7e14d7cc8.
---
 .../public/fonts/BbbIcons/bbb-icons.woff        | Bin 0 -> 16556 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.woff

diff --git a/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.woff b/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.woff
new file mode 100644
index 0000000000000000000000000000000000000000..8063d6bf985b0c9763682428d38fc671e7af9a22
GIT binary patch
literal 16556
zcmZU4V{|4>xa}L;wr$(CZBJ}YFtKfCVw)4&w%*v9*vXmi+`HEOaclLis=fQ!Ro$z8
zbyYu}N|KUF>gq}WfN(Vc4)Cw2!2>}4YybZuCMih_0DuVt0Q|WCfPAvo9|I^!Np*#P
zUhsd>`2QiYVX{w3TtX565Ze96N&kToKm`a?Qe$ET06>2H<Ffx?tl6r^W@c~V1OR|u
z{^P>`?x_OUuE>8_n3(_TL;uq_{(%$q0FLR$Kk=XTF9tyT59H7SpcOyt-Ms$U{^ODV
zFhtY@LuYT|^=~{7<9{6Tf1#%ga4@mA_@_1h1NXnVyoI7qL7g03-Tu7?{l6Hre<1#D
z1F(7Jm>HWJ8w2)ZA&x|DKRAtW+I6sncV#ydL6QAzDP4!Yd%qF1)7bPtI`HA;iB$kH
z`S9rf%>UQd`sUb&JV<)`ee*4yb_6esg5HM+NWg`-0sxc&0KNYcXYw`79T=Dz7-&to
zhyw{3<_|snlGUG)h(<lpH!%eOivfj)Mou`+8kp-V_{$o!{?f}L2H%7+2$6u>4hlhR
z4h|@#f=~Ewtki^An*m|u@ZLwGv;KvqG6CA<`bgqa7R>%CsIvxCQFv)m79Ot~um_Y4
ztW&(^Q9&)LY=P!bRd~DO&CH#dFUvqYpfdXo0a6@>pCNu*`~IMFb|NnK^_*6GT<2D$
z)u_ODZ?vj=twmc)nT;mAm&;b;Gv}7&VA%m8nEOq8v}Wc(-l36BlIx+oi0nWf>U2Ux
z;t(KsHYT#fCzb+F*J3O%O52peO7<*C#-8CD8Y%7dR=;?>XKC<9G1$Q@WgyIycDOYv
zVI_C<1ncYrZ?yP_r<DI#Vuh)SX5m((8K<)<fd?pE6{9`9IEvnL9`_3U*RB4l-!bda
z!)9^yUA6v^1nNZ}o6qg!i|G6P_|lA9<af;yoMNHlHRn^P0G@4~-NAl}Y=D{XEOrso
zk1vQ(fVKXAYh`R~`O6pwQW6sRFUTEszb_^v81Xbnh`cdQXgbRGx0nt*@yd7jzPz%5
zao^a;uc={J=y4=>06@bQM(97kB_Q})4?6~@9sr>413CY<7A;+HzG@mzLRpJX<a&LD
z4B<Fd%z-H4A|ficAh7$k;vhJ}381;6YPvM`)*Gb?+3Yt`p4nE(l=d4bn6T=BcgiVg
zW$3W#mE5~#Zeck11QsJGR&M!jR4%KEa7De}H^AAGf0s+v{hHO)sIKizOONf1-!3@~
z4Qkwh>d8?}e!5X*j+U;fsy6Xn5_!&{j&rj({js=4l6DgP7puiW`Qc!Z>LD39S86vu
z!2upuk-0~f0HcN81HKTW1@P1vb)4Zqb*$!qye&T4Q9ila++v*EI;kOPlfqNBRN7M7
zQs!9tSO!ztFwtE0jvOM%R3>$Z-dXx1iE<oMCfz*$kU=K?Fyzo+Tw>gad`H?8e|CFf
zdt`e?VgLI0`hf5_?-<jC$yH~oN*_dPK*MP{C$h=4MIWs#b91<RI`@##$;fHPNr>`y
zadz@TvV$CMK0AxG<wBE8bP{V4YqCp{p@J%fb<(9wi_D{pf=puZOfgqd97V3&8~Yj4
zcu|t0Tn}5Xlb?yTjHZf;Kk!d=QrAFGZ0PVr;r>8uD8)o$mz{-)rHP_qg{+RgZc3(x
zzJ56)!<c4mFxEPSH(qLG_2quoV+Vy;T~t&mt%Zn8Va5l)Mr0$gQ6}35BUWYk*fi~!
zp^-kcM9t(ht&Wy<pX`ibx>31m?WC3^hE*l8YlV%0Aq#({>}sWKRMSc-ynrR;SYu<;
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
FAOHx!DOUgh

literal 0
HcmV?d00001


From f1be21716b2d3c067b85a0eeb6453d2244274027 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 14:16:58 +0900
Subject: [PATCH 009/127] Update Meeting.java

---
 .../org/bigbluebutton/api/domain/Meeting.java | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java
index 71fa3725418d..67f3e468c0b3 100755
--- a/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java
+++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java
@@ -82,6 +82,9 @@ public class Meeting {
 	private String customCopyright = "";
 	private Boolean muteOnStart = false;
 	private Boolean allowModsToUnmuteUsers = false;
+	
+	private  HashMap<String, UploadRequest> uploadRequests = new HashMap<String, UploadRequest>();
+	private  HashMap<String, UploadedFile> uploadedFiles = new HashMap<String, UploadedFile>();
 
 	private Integer meetingExpireIfNoUserJoinedInMinutes = 5;
 	private Integer meetingExpireWhenLastUserLeftInMinutes = 1;
@@ -145,6 +148,16 @@ record = builder.record;
 	public void addBreakoutRoom(String meetingId) {
 		breakoutRooms.add(meetingId);
 	}
+	
+	public void addUploadRequest(String source, String filename, String userId, String token) {
+               UploadRequest uploadRequest = new UploadRequest(source, filename, userId);
+               uploadRequests.put(token, uploadRequest);
+       }
+
+       public void addUploadedFile(String source, String filename, String contentType, String extension, String uploadId)  {
+               UploadedFile uploadedFile = new UploadedFile(source, filename, contentType, extension);
+               uploadedFiles.put(uploadId, uploadedFile);
+       }
 
 	public List<String> getBreakoutRooms() {
 		return breakoutRooms;
@@ -212,6 +225,29 @@ public void setGuestStatusWithId(String userId, String guestStatus) {
 		}
 
 	}
+	
+	       public Boolean isUploadRequestValid(String source, String filename, String userId, String token) {
+               UploadRequest uploadRequest = uploadRequests.get(token);
+               if (uploadRequest != null) {
+                       return uploadRequest.isValid(source, filename, userId);
+               } else {
+                       return false;
+               }
+       }
+
+       public Boolean hasUploadedFile(String source, String uploadId) {
+               UploadedFile uploadedFile = uploadedFiles.get(uploadId);
+               if (uploadedFile != null) {
+                       return source.equals(uploadedFile.source);
+               } else {
+                       return false;
+               }
+       }
+
+       public UploadedFile getUploadedFile(String uploadId) {
+               UploadedFile uploadedFile = uploadedFiles.get(uploadId);
+               return uploadedFile;
+       }
 
 	public RegisteredUser getRegisteredUserWithAuthToken(String authToken) {
 		for (RegisteredUser ruser : registeredUsers.values()) {

From 08bd1cfae84df779863f6148e5e2558461ba5bea Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 14:19:53 +0900
Subject: [PATCH 010/127] Create UploadedFile.java

---
 .../bigbluebutton/api/domain/UploadedFile.java    | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 bbb-common-web/src/main/java/org/bigbluebutton/api/domain/UploadedFile.java

diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/UploadedFile.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/UploadedFile.java
new file mode 100644
index 000000000000..477a754d38a3
--- /dev/null
+++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/UploadedFile.java
@@ -0,0 +1,15 @@
+package org.bigbluebutton.api.domain;
+
+public class UploadedFile {
+    public final String source;
+    public final String filename;
+    public final String contentType;
+    public final String extension;
+
+    public UploadedFile(String source, String filename, String contentType, String extension) {
+        this.source = source;
+        this.filename = filename;
+        this.contentType = contentType;
+        this.extension = extension;
+    }
+}

From 7ec84b469ce563214c7b883e87cc6c6c3c3e2fed Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 14:20:59 +0900
Subject: [PATCH 011/127] Create UploadRequest.java

---
 .../api/domain/UploadRequest.java             | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 bbb-common-web/src/main/java/org/bigbluebutton/api/domain/UploadRequest.java

diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/UploadRequest.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/UploadRequest.java
new file mode 100644
index 000000000000..2863c18ed51a
--- /dev/null
+++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/UploadRequest.java
@@ -0,0 +1,28 @@
+package org.bigbluebutton.api.domain;
+
+public class UploadRequest {
+    public final String source;
+    public final String filename;
+    public final String userId;
+    private Boolean valid;
+
+    public UploadRequest(String source, String filename, String userId) {
+        this.source = source;
+        this.filename = filename;
+        this.userId = userId;
+        this.valid = true;
+    }
+
+    public Boolean isValid(String source, String filename, String userId) {
+       if (this.valid) {
+            // Invalidate this upload request after the first check
+            this.valid = false;
+            Boolean validSource = source != null && source.equals(this.source);
+            Boolean validFilename = filename != null && filename.equals(this.filename);
+            Boolean validUserId = userId != null && userId.equals(this.userId);
+            return validSource && validFilename && validUserId;
+        } else {
+            return false;
+        }
+    }
+}

From 46e230104f67ad8e6566c582eab52d53cc2ab392 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 14:28:06 +0900
Subject: [PATCH 012/127] Update MeetingService.java

---
 .../org/bigbluebutton/api/MeetingService.java | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
index f09b5366ce0e..992a05ca9e1e 100755
--- a/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
+++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
@@ -49,6 +49,7 @@
 import org.bigbluebutton.api.domain.RegisteredUser;
 import org.bigbluebutton.api.domain.User;
 import org.bigbluebutton.api.domain.UserSession;
+import org.bigbluebutton.api.domain.UploadedFile;
 import org.bigbluebutton.api.messaging.MessageListener;
 import org.bigbluebutton.api.messaging.converters.messages.DestroyMeetingMessage;
 import org.bigbluebutton.api.messaging.converters.messages.EndMeetingMessage;
@@ -66,6 +67,7 @@
 import org.bigbluebutton.api.messaging.messages.MeetingDestroyed;
 import org.bigbluebutton.api.messaging.messages.MeetingEnded;
 import org.bigbluebutton.api.messaging.messages.MeetingStarted;
+import org.bigbluebutton.api.messaging.messages.UploadRequest;
 import org.bigbluebutton.api.messaging.messages.PresentationUploadToken;
 import org.bigbluebutton.api.messaging.messages.RecordChapterBreak;
 import org.bigbluebutton.api.messaging.messages.RegisterUser;
@@ -287,6 +289,33 @@ private void kickOffProcessingOfRecording(Meeting m) {
       processRecording(m);
     }
   }
+  
+  public Boolean isUploadRequestValid(String meetingId, String source, String filename, String userId, String token) {
+    Meeting m = getMeeting(meetingId);
+    if (m != null) {
+      return m.isUploadRequestValid(source, filename, userId, token);
+    } else {
+      return false;
+    }
+  }
+
+  public Boolean isDownloadRequestValid(String meetingId, String source, String uploadId) {
+    Meeting m = getMeeting(meetingId);
+    if (m != null) {
+      return m.hasUploadedFile(source, uploadId);
+    } else {
+      return false;
+    }
+  }
+
+  public UploadedFile getUploadedFile(String meetingId, String uploadId) {
+    Meeting m = getMeeting(meetingId);
+    if (m != null) {
+      return m.getUploadedFile(uploadId);
+    } else {
+      return null;
+    }
+  }
 
   public Boolean authzTokenIsValid(String authzToken) { // Note we DO NOT expire the token
     return uploadAuthzTokens.containsKey(authzToken);
@@ -608,10 +637,33 @@ public void processRecording(Meeting m) {
     }
   }
 
+  public void fileUploaded(
+      String uploadId,
+      String source,
+      String filename,
+      String contentType,
+      String extension,
+      String userId,
+      String meetingId
+    ) {
+    Meeting m = getMeeting(meetingId);
+    if (m != null) {
+      m.addUploadedFile(source, filename, contentType, extension, uploadId);
+      gw.fileUploaded(uploadId, source, filename, contentType, userId, meetingId);
+    }
+  }
+
   public void endMeeting(String meetingId) {
     handle(new EndMeeting(meetingId));
   }
 
+  private void processUploadRequest(UploadRequest message) {
+    Meeting m = getMeeting(message.meetingId);
+    if (m != null) {
+      m.addUploadRequest(message.source, message.filename, message.userId, message.token);
+    }
+  }
+  
   private void processCreateBreakoutRoom(CreateBreakoutRoom message) {
     Meeting parentMeeting = getMeeting(message.parentMeetingId);
     if (parentMeeting != null) {
@@ -1079,6 +1131,8 @@ public void run() {
           processRegisterUser((RegisterUser) message);
         } else if (message instanceof CreateBreakoutRoom) {
           processCreateBreakoutRoom((CreateBreakoutRoom) message);
+        } else if (message instanceof UploadRequest) {
+          processUploadRequest((UploadRequest) message);
         } else if (message instanceof PresentationUploadToken) {
           processPresentationUploadToken((PresentationUploadToken) message);
         } else if (message instanceof GuestStatusChangedEventMsg) {

From 5dd92690ac3eb07cf3c4e2899ba93514a6031345 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 14:29:02 +0900
Subject: [PATCH 013/127] Create UploadRequest.java

---
 .../api/messaging/messages/UploadRequest.java   | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 bbb-common-web/src/main/java/org/bigbluebutton/api/messaging/messages/UploadRequest.java

diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/messaging/messages/UploadRequest.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/messaging/messages/UploadRequest.java
new file mode 100644
index 000000000000..2eec4c72e150
--- /dev/null
+++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/messaging/messages/UploadRequest.java
@@ -0,0 +1,17 @@
+package org.bigbluebutton.api.messaging.messages;
+
+public class UploadRequest implements IMessage  {
+    public final String meetingId;
+    public final String source;
+    public final String filename;
+    public final String userId;
+    public final String token;
+
+    public UploadRequest(String meetingId, String source, String filename, String userId, String token) {
+        this.meetingId = meetingId;
+        this.source = source;
+        this.filename = filename;
+        this.userId = userId;
+        this.token = token;
+    }
+}

From 2671de071990e1c1936532c1e0eb144557ef1ad9 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 14:35:13 +0900
Subject: [PATCH 014/127] Update ParamsProcessorUtil.java

---
 .../bigbluebutton/api/ParamsProcessorUtil.java | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/ParamsProcessorUtil.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/ParamsProcessorUtil.java
index 172265ded770..bc17cbff485c 100755
--- a/bbb-common-web/src/main/java/org/bigbluebutton/api/ParamsProcessorUtil.java
+++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/ParamsProcessorUtil.java
@@ -105,6 +105,8 @@ public class ParamsProcessorUtil {
     private String defaultConfigXML = null;
 
     private Long maxPresentationFileUpload = 30000000L; // 30MB
+    private Long maxUploadSize = 30000000L; // 30MB
+    private String uploadDir;
 
     private Integer clientLogoutTimerInMinutes = 0;
 	private Integer meetingExpireIfNoUserJoinedInMinutes = 5;
@@ -1017,6 +1019,22 @@ public void setMaxPresentationFileUpload(Long maxFileSize) {
 	public Long getMaxPresentationFileUpload() {
 		return maxPresentationFileUpload;
 	}
+	
+	public void setMaxUploadSize(Long maxUploadSize) {
+               this.maxUploadSize = maxUploadSize;
+       }
+
+       public Long getMaxUploadSize() {
+               return maxUploadSize;
+       }
+
+       public void setUploadDir(String uploadDir) {
+               this.uploadDir = uploadDir;
+       }
+
+       public String getUploadDir() {
+               return uploadDir;
+       }
 
 	public void setMuteOnStart(Boolean mute) {
 		defaultMuteOnStart = mute;

From e6d8218ba368347834fd97fc4eee08cee50f3a1d Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 14:39:13 +0900
Subject: [PATCH 015/127] Update Util.java

---
 .../main/java/org/bigbluebutton/api/Util.java | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/Util.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/Util.java
index c0c272ebad93..0afe9ba395d7 100755
--- a/bbb-common-web/src/main/java/org/bigbluebutton/api/Util.java
+++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/Util.java
@@ -127,4 +127,27 @@ public static void makePresentationDownloadable(
 			}
 		}
 	}
+	
+       public static String generateUploadId(String filename) {
+               long timestamp = System.currentTimeMillis();
+               return DigestUtils.sha1Hex(filename) + "-" + timestamp;
+       }
+
+       public static File createUploadDir(String rootDir, String source, String meetingId, String uploadId) {
+               String meetingsPath = rootDir + File.separatorChar + "meetings";
+               String sourcePath = meetingsPath + File.separatorChar + meetingId + File.separatorChar + source;
+               String uploadPath = sourcePath + File.separatorChar + uploadId;
+               File uploadDir = new File(uploadPath);
+               if (uploadDir.mkdirs()) {
+                       return uploadDir;
+               }
+               return null;
+       }
+
+       public static String getDownloadPath(String rootDir, String source, String meetingId, String uploadId) {
+               String meetingsPath = rootDir + File.separatorChar + "meetings";
+               String sourcePath = meetingsPath + File.separatorChar + meetingId + File.separatorChar + source;
+               String downloadPath = sourcePath + File.separatorChar + uploadId;
+               return downloadPath;
+       }
 }

From 31db20bc481c5923a2359f221015fb5c19fa648b Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 14:49:41 +0900
Subject: [PATCH 016/127] Update IBbbWebApiGWApp.java

---
 .../main/java/org/bigbluebutton/api2/IBbbWebApiGWApp.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api2/IBbbWebApiGWApp.java b/bbb-common-web/src/main/java/org/bigbluebutton/api2/IBbbWebApiGWApp.java
index 76b12060b858..5e7e53d08846 100755
--- a/bbb-common-web/src/main/java/org/bigbluebutton/api2/IBbbWebApiGWApp.java
+++ b/bbb-common-web/src/main/java/org/bigbluebutton/api2/IBbbWebApiGWApp.java
@@ -42,6 +42,14 @@ void ejectDuplicateUser(String meetingID, String internalUserId, String fullname
 
   void destroyMeeting(DestroyMeetingMessage msg);
   void endMeeting(EndMeetingMessage msg);
+  void fileUploaded(
+    String uploadId,
+    String source,
+    String filename,
+    String contentType,
+    String userId,
+    String meetingId
+  );
   void sendKeepAlive(String system, Long timestamp);
   void publishedRecording(PublishedRecordingMessage msg);
   void unpublishedRecording(UnpublishedRecordingMessage msg);

From f653692c8822b90c63f95b1f76d20eaca9f8e596 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 14:52:41 +0900
Subject: [PATCH 017/127] Update BbbWebApiGWApp.scala

---
 .../org/bigbluebutton/api2/BbbWebApiGWApp.scala      | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala
index 01ce30586126..79b5ba9e0cd6 100755
--- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala
+++ b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala
@@ -260,6 +260,18 @@ class BbbWebApiGWApp(
     msgToAkkaAppsEventBus.publish(MsgToAkkaApps(toAkkaAppsChannel, event))
   }
 
+  def fileUploaded(
+      uploadId:    String,
+      source:      String,
+      filename:    String,
+      contentType: String,
+      userId:      String,
+      meetingId:   String
+  ): Unit = {
+    val event = MsgBuilder.buildFileUploadedSysMsg(uploadId, source, filename, contentType, userId, meetingId)
+    msgToAkkaAppsEventBus.publish(MsgToAkkaApps(toAkkaAppsChannel, event))
+  }
+
   def publishedRecording(msg: PublishedRecordingMessage): Unit = {
     val event = MsgBuilder.buildPublishedRecordingSysMsg(msg)
     // Probably violating something here, but a new event bus looks just too much for this

From ae04eacdd8726a6251b86334adcb03b9be25b821 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 14:53:52 +0900
Subject: [PATCH 018/127] Update ReceivedJsonMsgHdlrActor.scala

---
 .../org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala
index c78d684342c8..2839bc94e2ab 100755
--- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala
+++ b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala
@@ -88,6 +88,8 @@ class ReceivedJsonMsgHdlrActor(val msgFromAkkaAppsEventBus: MsgFromAkkaAppsEvent
         route[UserRoleChangedEvtMsg](envelope, jsonNode)
       case CreateBreakoutRoomSysCmdMsg.NAME =>
         route[CreateBreakoutRoomSysCmdMsg](envelope, jsonNode)
+      case UploadRequestSysMsg.NAME =>
+        route[UploadRequestSysMsg](envelope, jsonNode)
       case PresentationUploadTokenSysPubMsg.NAME =>
         route[PresentationUploadTokenSysPubMsg](envelope, jsonNode)
       case GuestsWaitingApprovedEvtMsg.NAME =>

From 3c032c79c40d98c02815f95678c2322cd8e5d397 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 14:55:32 +0900
Subject: [PATCH 019/127] Update OldMeetingMsgHdlrActor.scala

---
 .../bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala
index 8c70b881e6f4..ea87570570b9 100755
--- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala
+++ b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala
@@ -36,6 +36,7 @@ class OldMeetingMsgHdlrActor(val olgMsgGW: OldMessageReceivedGW)
       case m: UserBroadcastCamStartedEvtMsg     => handleUserBroadcastCamStartedEvtMsg(m)
       case m: UserBroadcastCamStoppedEvtMsg     => handleUserBroadcastCamStoppedEvtMsg(m)
       case m: CreateBreakoutRoomSysCmdMsg       => handleCreateBreakoutRoomSysCmdMsg(m)
+      case m: UploadRequestSysMsg               => handleUploadRequestSysMsg(m)
       case m: PresentationUploadTokenSysPubMsg  => handlePresentationUploadTokenSysPubMsg(m)
       case m: GuestsWaitingApprovedEvtMsg       => handleGuestsWaitingApprovedEvtMsg(m)
       case m: GuestPolicyChangedEvtMsg          => handleGuestPolicyChangedEvtMsg(m)
@@ -142,6 +143,10 @@ class OldMeetingMsgHdlrActor(val olgMsgGW: OldMessageReceivedGW)
     olgMsgGW.handle(new UserRoleChanged(msg.header.meetingId, msg.body.userId, msg.body.role))
   }
 
+  def handleUploadRequestSysMsg(msg: UploadRequestSysMsg): Unit = {
+    olgMsgGW.handle(new UploadRequest(msg.header.meetingId, msg.body.source, msg.body.filename, msg.body.userId, msg.body.token))
+  }
+
   def handlePresentationUploadTokenSysPubMsg(msg: PresentationUploadTokenSysPubMsg): Unit = {
     olgMsgGW.handle(new PresentationUploadToken(msg.body.podId, msg.body.authzToken, msg.body.filename))
   }

From 15dc72130d68752e0295b06a8d9a2734d9d5be04 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 14:57:17 +0900
Subject: [PATCH 020/127] Update MsgBuilder.scala

---
 .../org/bigbluebutton/api2/MsgBuilder.scala      | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/MsgBuilder.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/MsgBuilder.scala
index 0429f9f11233..a326d9a419df 100755
--- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/MsgBuilder.scala
+++ b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/MsgBuilder.scala
@@ -114,6 +114,22 @@ object MsgBuilder {
     BbbCommonEnvCoreMsg(envelope, req)
   }
 
+  def buildFileUploadedSysMsg(
+      uploadId:    String,
+      source:      String,
+      filename:    String,
+      contentType: String,
+      userId:      String,
+      meetingId:   String
+  ): BbbCommonEnvCoreMsg = {
+    val routing = collection.immutable.HashMap("sender" -> "bbb-web")
+    val envelope = BbbCoreEnvelope(FileUploadedSysMsg.NAME, routing)
+    val header = BbbClientMsgHeader(FileUploadedSysMsg.NAME, meetingId, userId)
+    val body = FileUploadedSysMsgBody(uploadId, source, filename, contentType)
+    val req = FileUploadedSysMsg(header, body)
+    BbbCommonEnvCoreMsg(envelope, req)
+  }
+
   def buildPresentationPageGeneratedPubMsg(msg: DocPageGeneratedProgress): BbbCommonEnvCoreMsg = {
     val routing = collection.immutable.HashMap("sender" -> "bbb-web")
     val envelope = BbbCoreEnvelope(PresentationPageGeneratedSysPubMsg.NAME, routing)

From 1f6099e81e200515992558be4675f90610828784 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 15:00:33 +0900
Subject: [PATCH 021/127] Update ReceivedJsonMsgHandlerActor.scala

---
 .../core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala
index 5d9de23e6a4b..abb107a34221 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala
@@ -287,6 +287,12 @@ class ReceivedJsonMsgHandlerActor(
       case UpdateWebcamsOnlyForModeratorCmdMsg.NAME =>
         routeGenericMsg[UpdateWebcamsOnlyForModeratorCmdMsg](envelope, jsonNode)
 
+      // Upload
+      case UploadRequestReqMsg.NAME =>
+        routeGenericMsg[UploadRequestReqMsg](envelope, jsonNode)
+      case FileUploadedSysMsg.NAME =>
+        routeGenericMsg[FileUploadedSysMsg](envelope, jsonNode)
+
       // Lock settings
       case LockUserInMeetingCmdMsg.NAME =>
         routeGenericMsg[LockUserInMeetingCmdMsg](envelope, jsonNode)

From 7ed60b21f095a6cd8c43d383221d2848dabf2c00 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 15:05:22 +0900
Subject: [PATCH 022/127] Create AbstractUploadRecordEvent.scala

---
 .../events/AbstractUploadRecordEvent.scala    | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 akka-bbb-apps/src/main/scala/org/bigbluebutton/core/record/events/AbstractUploadRecordEvent.scala

diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/record/events/AbstractUploadRecordEvent.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/record/events/AbstractUploadRecordEvent.scala
new file mode 100644
index 000000000000..122a3e708fe7
--- /dev/null
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/record/events/AbstractUploadRecordEvent.scala
@@ -0,0 +1,24 @@
+/**
+ * BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
+ *
+ * Copyright (c) 2017 BigBlueButton Inc. and by respective authors (see below).
+ *
+ * This program is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 3.0 of the License, or (at your option) any later
+ * version.
+ *
+ * BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along
+ * with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package org.bigbluebutton.core.record.events
+
+trait AbstractUploadRecordEvent extends RecordEvent {
+  setModule("UPLOAD")
+}

From 0db429b01e9e1132b1aa06dad6cbe2c6d89cef49 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 15:06:26 +0900
Subject: [PATCH 023/127] Create FileUploadedRecordEvent.scala

---
 .../events/FileUploadedRecordEvent.scala      | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 akka-bbb-apps/src/main/scala/org/bigbluebutton/core/record/events/FileUploadedRecordEvent.scala

diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/record/events/FileUploadedRecordEvent.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/record/events/FileUploadedRecordEvent.scala
new file mode 100644
index 000000000000..7f506a1d67b0
--- /dev/null
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/record/events/FileUploadedRecordEvent.scala
@@ -0,0 +1,49 @@
+/**
+ * BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
+ *
+ * Copyright (c) 2017 BigBlueButton Inc. and by respective authors (see below).
+ *
+ * This program is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 3.0 of the License, or (at your option) any later
+ * version.
+ *
+ * BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along
+ * with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package org.bigbluebutton.core.record.events
+
+class FileUploadedRecordEvent extends AbstractUploadRecordEvent {
+  import FileUploadedRecordEvent._
+
+  setEvent("FileUploadedEvent")
+
+  def setUserId(userId: String) {
+    eventMap.put(USER_ID, userId)
+  }
+
+  def setUploadId(uploadId: String) {
+    eventMap.put(UPLOAD_ID, uploadId)
+  }
+
+  def setSource(source: String) {
+    eventMap.put(SOURCE, source)
+  }
+
+  def setFilename(filename: String) {
+    eventMap.put(FILENAME, filename)
+  }
+}
+
+object FileUploadedRecordEvent {
+  protected final val USER_ID = "userId"
+  protected final val UPLOAD_ID = "uploadId"
+  protected final val SOURCE = "source"
+  protected final val FILENAME = "filename"
+}

From cba79ba77b490956218380c4abeec801865ff4a1 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 15:08:44 +0900
Subject: [PATCH 024/127] Update MeetingActor.scala

---
 .../scala/org/bigbluebutton/core/running/MeetingActor.scala | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
index b410bd7ad35a..ea90dde6ab73 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
@@ -7,6 +7,7 @@ import akka.actor.SupervisorStrategy.Resume
 import org.bigbluebutton.SystemConfiguration
 import org.bigbluebutton.core.apps.groupchats.GroupChatHdlrs
 import org.bigbluebutton.core.apps.presentationpod._
+import org.bigbluebutton.core.apps.upload.UploadApp2x
 import org.bigbluebutton.core.apps.users._
 import org.bigbluebutton.core.apps.whiteboard.ClientToServerLatencyTracerMsgHdlr
 import org.bigbluebutton.core.domain._
@@ -116,6 +117,7 @@ class MeetingActor(
   val usersApp = new UsersApp(liveMeeting, outGW, eventBus)
   val groupChatApp = new GroupChatHdlrs
   val presentationPodsApp = new PresentationPodHdlrs
+  val uploadApp = new UploadApp2x
   val pollApp = new PollApp2x
   val wbApp = new WhiteboardApp2x
 
@@ -422,6 +424,10 @@ class MeetingActor(
       case m: UpdateCaptionOwnerPubMsg                 => captionApp2x.handle(m, liveMeeting, msgBus)
       case m: SendCaptionHistoryReqMsg                 => captionApp2x.handle(m, liveMeeting, msgBus)
 
+      // Upload
+      case m: UploadRequestReqMsg                      => uploadApp.handle(m, liveMeeting, msgBus)
+      case m: FileUploadedSysMsg                       => uploadApp.handle(m, liveMeeting, msgBus)
+
       // Guests
       case m: GetGuestsWaitingApprovalReqMsg           => handleGetGuestsWaitingApprovalReqMsg(m)
       case m: SetGuestPolicyCmdMsg                     => handleSetGuestPolicyMsg(m)

From a86e5f24ada989b8da1b0f6e80fb99f99a38cbe7 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 15:09:47 +0900
Subject: [PATCH 025/127] Update AnalyticsActor.scala

---
 .../main/scala/org/bigbluebutton/core2/AnalyticsActor.scala  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/AnalyticsActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/AnalyticsActor.scala
index 7c08cdfdfd49..b59ea800e124 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/AnalyticsActor.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/AnalyticsActor.scala
@@ -140,6 +140,11 @@ class AnalyticsActor extends Actor with ActorLogging {
       case m: SetGuestPolicyCmdMsg => logMessage(msg)
       case m: GuestPolicyChangedEvtMsg => logMessage(msg)
 
+      // Upload
+      case m: UploadRequestReqMsg => logMessage(msg)
+      case m: UploadRequestRespMsg => logMessage(msg)
+      case m: FileUploadedEvtMsg => logMessage(msg)
+
       // System
       case m: ClientToServerLatencyTracerMsg => traceMessage(msg)
       case m: ServerToClientLatencyTracerMsg => traceMessage(msg)

From cb2c72c0051c40450d2190e4fc0c25bd93d6714b Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 15:11:47 +0900
Subject: [PATCH 026/127] Update RedisRecorderActor.scala

---
 .../endpoint/redis/RedisRecorderActor.scala         | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala
index 3aee1d95028a..dadaedce26fb 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala
@@ -99,6 +99,9 @@ class RedisRecorderActor(
       case m: WebcamsOnlyForModeratorChangedEvtMsg  => handleWebcamsOnlyForModeratorChangedEvtMsg(m)
       case m: MeetingEndingEvtMsg                   => handleEndAndKickAllSysMsg(m)
 
+      // Upload
+      case m: FileUploadedEvtMsg                    => handleFileUploadedEvtMsg(m)
+      
       // Recording
       case m: RecordingChapterBreakSysMsg           => handleRecordingChapterBreakSysMsg(m)
 
@@ -490,6 +493,16 @@ class RedisRecorderActor(
     record(msg.header.meetingId, ev.toMap.asJava)
   }
 
+  private def handleFileUploadedEvtMsg(msg: FileUploadedEvtMsg): Unit = {
+    val ev = new FileUploadedRecordEvent()
+    ev.setUserId(msg.header.userId)
+    ev.setUploadId(msg.body.uploadId)
+    ev.setSource(msg.body.source)
+    ev.setFilename(msg.body.filename)
+
+    record(msg.header.meetingId, ev.toMap.asJava)
+  }
+
   private def handleRecordingChapterBreakSysMsg(msg: RecordingChapterBreakSysMsg): Unit = {
     val ev = new RecordChapterBreakRecordEvent()
     ev.setMeetingId(msg.header.meetingId)

From 4d8a49ff979052b369cbe494e0d994d84dea113c Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 15:14:31 +0900
Subject: [PATCH 027/127] Create FileUploadedSysMsgHdlr.scala

---
 .../apps/upload/FileUploadedSysMsgHdlr.scala  | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/upload/FileUploadedSysMsgHdlr.scala

diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/upload/FileUploadedSysMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/upload/FileUploadedSysMsgHdlr.scala
new file mode 100644
index 000000000000..f9c062e7fe53
--- /dev/null
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/upload/FileUploadedSysMsgHdlr.scala
@@ -0,0 +1,36 @@
+package org.bigbluebutton.core.apps.upload
+
+import org.bigbluebutton.common2.msgs._
+import org.bigbluebutton.core.bus.MessageBus
+import org.bigbluebutton.core.running.LiveMeeting
+
+trait FileUploadedSysMsgHdlr {
+  this: UploadApp2x =>
+
+  def handle(
+      msg:         FileUploadedSysMsg,
+      liveMeeting: LiveMeeting,
+      bus:         MessageBus
+  ): Unit = {
+
+    val meetingId = liveMeeting.props.meetingProp.intId
+    val userId = msg.header.userId
+
+    def broadcastFileUploadedEvtMsg(msg: FileUploadedSysMsg): Unit = {
+      val uploadId = msg.body.uploadId
+      val source = msg.body.source
+      val filename = msg.body.filename
+      
+      val routing = Routing.addMsgToClientRouting(MessageTypes.DIRECT, meetingId, userId)
+      val envelope = BbbCoreEnvelope(FileUploadedEvtMsg.NAME, routing)
+      val header = BbbClientMsgHeader(FileUploadedEvtMsg.NAME, meetingId, userId)
+      val body = FileUploadedEvtMsgBody(uploadId, source, filename)
+      val event = FileUploadedEvtMsg(header, body)
+      val msgEvent = BbbCommonEnvCoreMsg(envelope, event)
+
+      bus.outGW.send(msgEvent)
+    }
+
+    broadcastFileUploadedEvtMsg(msg)
+  }
+}

From c9601f0d6ce891a6597897aa54746b95bf46e016 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 15:15:07 +0900
Subject: [PATCH 028/127] Create UploadApp2x.scala

---
 .../bigbluebutton/core/apps/upload/UploadApp2x.scala  | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/upload/UploadApp2x.scala

diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/upload/UploadApp2x.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/upload/UploadApp2x.scala
new file mode 100644
index 000000000000..e2c29e2cc1c8
--- /dev/null
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/upload/UploadApp2x.scala
@@ -0,0 +1,11 @@
+package org.bigbluebutton.core.apps.upload
+
+import akka.actor.ActorContext
+import akka.event.Logging
+
+class UploadApp2x(implicit val context: ActorContext)
+  extends UploadRequestReqMsgHdlr
+  with FileUploadedSysMsgHdlr {
+
+  val log = Logging(context.system, getClass)
+}

From cf1d246acb5d24b01380e6d5e3f806e7e90e1b4f Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 15:16:29 +0900
Subject: [PATCH 029/127] Create UploadRequestReqMsgHdlr.scala

---
 .../apps/upload/UploadRequestReqMsgHdlr.scala | 65 +++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/upload/UploadRequestReqMsgHdlr.scala

diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/upload/UploadRequestReqMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/upload/UploadRequestReqMsgHdlr.scala
new file mode 100644
index 000000000000..ac1494f8bf3f
--- /dev/null
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/upload/UploadRequestReqMsgHdlr.scala
@@ -0,0 +1,65 @@
+package org.bigbluebutton.core.apps.upload
+
+import org.bigbluebutton.common2.msgs._
+import org.bigbluebutton.core.bus.MessageBus
+import org.bigbluebutton.core.running.LiveMeeting
+import org.bigbluebutton.core.apps.{ PermissionCheck, RightsManagementTrait }
+import org.bigbluebutton.core.util.RandomStringGenerator
+
+trait UploadRequestReqMsgHdlr extends RightsManagementTrait {
+  this: UploadApp2x =>
+
+  def handle(
+      msg:         UploadRequestReqMsg,
+      liveMeeting: LiveMeeting,
+      bus:         MessageBus
+  ): Unit = {
+
+    val meetingId = liveMeeting.props.meetingProp.intId
+    val userId = msg.header.userId
+    val source = msg.body.source
+    val filename = msg.body.filename
+    val timestamp = msg.body.timestamp
+    
+    // To system
+    def broadcastUploadRequestSysMsg(
+        msg:   UploadRequestReqMsg,
+        token: String
+    ): Unit = {
+
+      val routing = collection.immutable.HashMap("sender" -> "bbb-apps-akka")
+      val envelope = BbbCoreEnvelope(UploadRequestSysMsg.NAME, routing)
+      val header = BbbCoreHeaderWithMeetingId(UploadRequestSysMsg.NAME, meetingId)
+      val body = UploadRequestSysMsgBody(source, filename, userId, token)
+      val event = UploadRequestSysMsg(header, body)
+      val msgEvent = BbbCommonEnvCoreMsg(envelope, event)
+
+      bus.outGW.send(msgEvent)
+    }
+
+    // To client
+    def broadcastUploadRequestRespMsg(
+        msg:     UploadRequestReqMsg,
+        success: Boolean             = false,
+        token:   String              = null
+    ): Unit = {
+
+      val routing = Routing.addMsgToClientRouting(MessageTypes.DIRECT, meetingId, userId)
+      val envelope = BbbCoreEnvelope(UploadRequestRespMsg.NAME, routing)
+      val header = BbbClientMsgHeader(UploadRequestRespMsg.NAME, meetingId, userId)
+      val body = UploadRequestRespMsgBody(source, filename, userId, success, timestamp, token)
+      val event = UploadRequestRespMsg(header, body)
+      val msgEvent = BbbCommonEnvCoreMsg(envelope, event)
+
+      bus.outGW.send(msgEvent)
+    }
+
+    if (permissionFailed(PermissionCheck.GUEST_LEVEL, PermissionCheck.MOD_LEVEL, liveMeeting.users2x, userId)) {
+      broadcastUploadRequestRespMsg(msg)
+    } else {
+      val token = RandomStringGenerator.randomAlphanumericString(32)
+      broadcastUploadRequestSysMsg(msg, token)
+      broadcastUploadRequestRespMsg(msg, true, token)
+    }
+  }
+}

From c9953d916fe055d7e7d433e050debb0ac91b6048 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 15:18:54 +0900
Subject: [PATCH 030/127] Update meetingHasEnded.js

---
 .../imports/api/meetings/server/modifiers/meetingHasEnded.js  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bigbluebutton-html5/imports/api/meetings/server/modifiers/meetingHasEnded.js b/bigbluebutton-html5/imports/api/meetings/server/modifiers/meetingHasEnded.js
index ec9a24abf32a..e8ce3e99cc8d 100755
--- a/bigbluebutton-html5/imports/api/meetings/server/modifiers/meetingHasEnded.js
+++ b/bigbluebutton-html5/imports/api/meetings/server/modifiers/meetingHasEnded.js
@@ -20,6 +20,8 @@ import clearUserInfo from '/imports/api/users-infos/server/modifiers/clearUserIn
 import clearConnectionStatus from '/imports/api/connection-status/server/modifiers/clearConnectionStatus';
 import clearScreenshare from '/imports/api/screenshare/server/modifiers/clearScreenshare';
 import clearNote from '/imports/api/note/server/modifiers/clearNote';
+import clearUploadRequest from '/imports/api/upload/server/modifiers/clearUploadRequest';
+import clearUploadedFile from '/imports/api/upload/server/modifiers/clearUploadedFile';
 import clearNetworkInformation from '/imports/api/network-information/server/modifiers/clearNetworkInformation';
 import clearMeetingTimeRemaining from '/imports/api/meetings/server/modifiers/clearMeetingTimeRemaining';
 import clearLocalSettings from '/imports/api/local-settings/server/modifiers/clearLocalSettings';
@@ -49,6 +51,8 @@ export default function meetingHasEnded(meetingId) {
     clearUserInfo(meetingId);
     clearConnectionStatus(meetingId);
     clearNote(meetingId);
+    clearUploadRequest(meetingId);
+    clearUploadedFile(meetingId);
     clearNetworkInformation(meetingId);
     clearLocalSettings(meetingId);
     clearMeetingTimeRemaining(meetingId);

From 9af004a9085b1c8f09b478526f3f8a55541cd364 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 15:21:14 +0900
Subject: [PATCH 031/127] Create index.js

---
 bigbluebutton-html5/imports/api/upload/index.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 bigbluebutton-html5/imports/api/upload/index.js

diff --git a/bigbluebutton-html5/imports/api/upload/index.js b/bigbluebutton-html5/imports/api/upload/index.js
new file mode 100644
index 000000000000..7ad70ab6a365
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/upload/index.js
@@ -0,0 +1,14 @@
+import { Meteor } from 'meteor/meteor';
+
+const UploadRequest = new Mongo.Collection('upload-request');
+const UploadedFile = new Mongo.Collection('uploaded-file');
+
+if (Meteor.isServer) {
+  UploadRequest._ensureIndex({ meetingId: 1 });
+  UploadedFile._ensureIndex({ meetingId: 1 });
+}
+
+export {
+  UploadRequest,
+  UploadedFile,
+};

From 7e96a47ed17887a5666bd65319266f13e0b695ae Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 15:21:55 +0900
Subject: [PATCH 032/127] Create index.js

---
 bigbluebutton-html5/imports/api/upload/server/index.js | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 bigbluebutton-html5/imports/api/upload/server/index.js

diff --git a/bigbluebutton-html5/imports/api/upload/server/index.js b/bigbluebutton-html5/imports/api/upload/server/index.js
new file mode 100644
index 000000000000..92451ac76bf2
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/upload/server/index.js
@@ -0,0 +1,3 @@
+import './eventHandlers';
+import './methods';
+import './publishers';

From 9476ec5894c8ce58307272b6633bfa43776f72c2 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 15:22:34 +0900
Subject: [PATCH 033/127] Create eventHandlers.js

---
 .../imports/api/upload/server/eventHandlers.js              | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 bigbluebutton-html5/imports/api/upload/server/eventHandlers.js

diff --git a/bigbluebutton-html5/imports/api/upload/server/eventHandlers.js b/bigbluebutton-html5/imports/api/upload/server/eventHandlers.js
new file mode 100644
index 000000000000..d0e5f7171880
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/upload/server/eventHandlers.js
@@ -0,0 +1,6 @@
+import RedisPubSub from '/imports/startup/server/redis';
+import handleUploadRequestResp from './handlers/uploadRequestResp';
+import handleFileUploadedEvt from './handlers/fileUploadedEvt';
+
+RedisPubSub.on('UploadRequestRespMsg', handleUploadRequestResp);
+RedisPubSub.on('FileUploadedEvtMsg', handleFileUploadedEvt);

From 2c329c6a03f10ed0df7c98dda2057b85eaf7da27 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 15:23:45 +0900
Subject: [PATCH 034/127] Create publishers.js

---
 .../imports/api/upload/server/publishers.js   | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 bigbluebutton-html5/imports/api/upload/server/publishers.js

diff --git a/bigbluebutton-html5/imports/api/upload/server/publishers.js b/bigbluebutton-html5/imports/api/upload/server/publishers.js
new file mode 100644
index 000000000000..01e450147b57
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/upload/server/publishers.js
@@ -0,0 +1,54 @@
+import { Meteor } from 'meteor/meteor';
+//import { check } from 'meteor/check';
+import {
+  UploadRequest,
+  UploadedFile,
+} from '/imports/api/upload';
+import Logger from '/imports/startup/server/logger';
+//Suga
+import { extractCredentials } from '/imports/api/common/server/helpers';
+
+// Somebody still sends credentials. This will be a security issue...
+function uploadRequest(credentials, source, filename) {
+  if (!this.userId) {
+    return UploadRequest.find({ meetingId: ''});
+  }
+  //const { meetingId, requesterUserId } = credentials; // this also works
+  const { meetingId, requesterUserId } = extractCredentials(this.userId);
+
+  const selector = {
+    meetingId,
+    userId: requesterUserId,
+    source,
+    filename,
+  };
+
+  Logger.debug(`Publishing upload request for ${meetingId} ${requesterUserId}`);
+
+  return UploadRequest.find(selector);
+}
+
+function publishRequest(...args) {
+  const boundUploadRequest = uploadRequest.bind(this);
+  return boundUploadRequest(...args);
+}
+
+Meteor.publish('upload-request', publishRequest);
+
+function uploadedFile() {
+  if (!this.userId) {
+    return UploadedFile.find({ meetingId: ''});
+  }
+  const { meetingId } = extractCredentials(this.userId);
+  
+  Logger.debug(`Publishing uploaded file for ${meetingId}`);
+
+  return UploadedFile.find({ meetingId });
+}
+
+function publishUpload(...args) {
+  const boundUploadedFile = uploadedFile.bind(this);
+  return boundUploadedFile(...args);
+}
+
+Meteor.publish('uploaded-file', publishUpload);

From 9d7926806ad708f6004252963bd982ff278c21d9 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 15:24:12 +0900
Subject: [PATCH 035/127] Create helpers.js

---
 bigbluebutton-html5/imports/api/upload/server/helpers.js | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 bigbluebutton-html5/imports/api/upload/server/helpers.js

diff --git a/bigbluebutton-html5/imports/api/upload/server/helpers.js b/bigbluebutton-html5/imports/api/upload/server/helpers.js
new file mode 100644
index 000000000000..e4d5df9e94d8
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/upload/server/helpers.js
@@ -0,0 +1,9 @@
+import { Meteor } from 'meteor/meteor';
+
+const UPLOAD = Meteor.settings.public.upload;
+
+const isNotificationEnabled = () => UPLOAD.notification;
+
+export {
+  isNotificationEnabled,
+};

From 8ae6384c4135be78c65b245260fcbead496060fc Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 15:24:42 +0900
Subject: [PATCH 036/127] Create methods.js

---
 bigbluebutton-html5/imports/api/upload/server/methods.js | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 bigbluebutton-html5/imports/api/upload/server/methods.js

diff --git a/bigbluebutton-html5/imports/api/upload/server/methods.js b/bigbluebutton-html5/imports/api/upload/server/methods.js
new file mode 100644
index 000000000000..a410dd7a218c
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/upload/server/methods.js
@@ -0,0 +1,6 @@
+import { Meteor } from 'meteor/meteor';
+import requestUpload from './methods/requestUpload';
+
+Meteor.methods({
+  requestUpload,
+});

From ac96ec0a74cbb227b0a30b851fae087c84fe7d5a Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 15:26:48 +0900
Subject: [PATCH 037/127] Create addNotification.js

---
 .../server/modifiers/addNotification.js       | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 bigbluebutton-html5/imports/api/upload/server/modifiers/addNotification.js

diff --git a/bigbluebutton-html5/imports/api/upload/server/modifiers/addNotification.js b/bigbluebutton-html5/imports/api/upload/server/modifiers/addNotification.js
new file mode 100644
index 000000000000..41456b5bc8a5
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/upload/server/modifiers/addNotification.js
@@ -0,0 +1,57 @@
+import flat from 'flat';
+import { check } from 'meteor/check';
+import Logger from '/imports/startup/server/logger';
+import { GroupChatMsg } from '/imports/api/group-chat-msg';
+
+const CHAT = Meteor.settings.public.chat;
+const SYSTEM_ID = CHAT.type_system;
+const CHAT_ID = 'MAIN-PUBLIC-GROUP-CHAT';
+
+export default function addUploadedFileMsg(meetingId, userId, uploadId, source, filename) {
+  check(meetingId, String);
+  check(userId, String);
+  check(uploadId, String);
+  check(source, String);
+  check(filename, String);
+
+  const now = Date.now();
+
+  const upload = {
+    uploadId,
+    source,
+    filename,
+  };
+
+  const selector = {
+    meetingId,
+    chatId: CHAT_ID,
+    id: `upload-msg-${now}`,
+  };
+
+  const modifier = {
+    $set: {
+      meetingId,
+      chatId: CHAT_ID,
+      message: '',
+      upload,
+      sender: SYSTEM_ID,
+      timestamp: now,
+    },
+  };
+  
+  const cb = (err, numChanged) => {
+    if (err) {
+      return Logger.error(`Adding group-chat-msg uploaded file to collection: ${err}`);
+    }
+
+    const { insertedId } = numChanged;
+
+    if (insertedId) {
+      return Logger.info(`Added group-chat-msg uploaded file meetingId=${meetingId}`);
+    }
+
+    return Logger.info(`Upserted group-chat-msg uploaded file meetingId=${meetingId}`);
+  };
+
+  return GroupChatMsg.upsert(selector, modifier, cb);
+}

From 98aac8f4832fed3feeec0ab3c6642ca92d6be6d6 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 15:28:04 +0900
Subject: [PATCH 038/127] Create addUploadRequest.js

---
 .../server/modifiers/addUploadRequest.js      | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 bigbluebutton-html5/imports/api/upload/server/modifiers/addUploadRequest.js

diff --git a/bigbluebutton-html5/imports/api/upload/server/modifiers/addUploadRequest.js b/bigbluebutton-html5/imports/api/upload/server/modifiers/addUploadRequest.js
new file mode 100644
index 000000000000..2cc0d482d63a
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/upload/server/modifiers/addUploadRequest.js
@@ -0,0 +1,44 @@
+import { check } from 'meteor/check';
+import Logger from '/imports/startup/server/logger';
+import { UploadRequest } from '/imports/api/upload';
+
+export default function addUploadRequest(meetingId, source, filename, userId, success, timestamp, token) {
+  check(source, String);
+  check(filename, String);
+  check(userId, String);
+  check(success, Boolean);
+  check(timestamp, Number);
+
+  if (success) {
+    check(token, String);
+  }
+
+  const selector = {
+    meetingId,
+    source,
+    userId,
+    filename,
+    timestamp,
+  };
+
+  const modifier = {
+    meetingId,
+    source,
+    userId,
+    filename,
+    success,
+    timestamp,
+    token,
+  };
+
+  const cb = (err) => {
+    if (err) {
+      Logger.error(`Upserting upload request: ${err}`);
+      return;
+    }
+
+    Logger.debug(`Upserting upload request filename=${filename} user=${userId} meeting=${meetingId}`);
+  };
+
+  return UploadRequest.upsert(selector, modifier, cb);
+}

From 6b5a6ef127ca9226a5fb127aa641dc6e7a4d36ca Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 15:28:32 +0900
Subject: [PATCH 039/127] Create clearUploadRequest.js

---
 .../upload/server/modifiers/clearUploadRequest.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 bigbluebutton-html5/imports/api/upload/server/modifiers/clearUploadRequest.js

diff --git a/bigbluebutton-html5/imports/api/upload/server/modifiers/clearUploadRequest.js b/bigbluebutton-html5/imports/api/upload/server/modifiers/clearUploadRequest.js
new file mode 100644
index 000000000000..b8b1bf3ee50b
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/upload/server/modifiers/clearUploadRequest.js
@@ -0,0 +1,15 @@
+import { UploadRequest } from '/imports/api/upload';
+import Logger from '/imports/startup/server/logger';
+
+export default function clearUploadRequest(meetingId) {
+  if (meetingId) {
+    return UploadRequest.remove({ meetingId }, () => {
+      Logger.info(`Cleared UploadRequest (${meetingId})`);
+    });
+  }
+
+  // clearing upload requests for the whole server
+  return UploadRequest.remove({}, () => {
+    Logger.info('Cleared UploadRequest (all)');
+  });
+}

From a21d438336808e9a4f3893bb2a4f495d9d69d952 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 15:29:08 +0900
Subject: [PATCH 040/127] Create addUploadedFile.js

---
 .../server/modifiers/addUploadedFile.js       | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 bigbluebutton-html5/imports/api/upload/server/modifiers/addUploadedFile.js

diff --git a/bigbluebutton-html5/imports/api/upload/server/modifiers/addUploadedFile.js b/bigbluebutton-html5/imports/api/upload/server/modifiers/addUploadedFile.js
new file mode 100644
index 000000000000..4e4c95cd5bc8
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/upload/server/modifiers/addUploadedFile.js
@@ -0,0 +1,35 @@
+import { check } from 'meteor/check';
+import Logger from '/imports/startup/server/logger';
+import { UploadedFile } from '/imports/api/upload';
+
+export default function addUploadedFile(meetingId, userId, uploadId, source, filename) {
+  check(meetingId, String);
+  check(userId, String);
+  check(uploadId, String);
+  check(source, String);
+  check(filename, String);
+
+  const selector = {
+    meetingId,
+    uploadId,
+  };
+
+  const modifier = {
+    meetingId,
+    userId,
+    uploadId,
+    source,
+    filename,
+  };
+
+  const cb = (err) => {
+    if (err) {
+      Logger.error(`Upserting upload file: ${err}`);
+      return;
+    }
+
+    Logger.debug(`Upserting uploaded file filename=${filename} meeting=${meetingId} source=${source}`);
+  };
+
+  return UploadedFile.upsert(selector, modifier, cb);
+}

From 2f5dec15712f0e59a23ff39d54fe2e9c8a266980 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 15:29:51 +0900
Subject: [PATCH 041/127] Create clearUploadedFile.js

---
 .../upload/server/modifiers/clearUploadedFile.js  | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 bigbluebutton-html5/imports/api/upload/server/modifiers/clearUploadedFile.js

diff --git a/bigbluebutton-html5/imports/api/upload/server/modifiers/clearUploadedFile.js b/bigbluebutton-html5/imports/api/upload/server/modifiers/clearUploadedFile.js
new file mode 100644
index 000000000000..98fec2dffc4f
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/upload/server/modifiers/clearUploadedFile.js
@@ -0,0 +1,15 @@
+import { UploadedFile } from '/imports/api/upload';
+import Logger from '/imports/startup/server/logger';
+
+export default function clearUploadedFile(meetingId) {
+  if (meetingId) {
+    return UploadedFile.remove({ meetingId }, () => {
+      Logger.info(`Cleared UploadedFile (${meetingId})`);
+    });
+  }
+
+  // clearing uploaded files for the whole server
+  return UploadedFile.remove({}, () => {
+    Logger.info('Cleared UploadedFile (all)');
+  });
+}

From d7d2f5a39c6c6dd79e68c1d94d6c7f1b591a54d4 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 15:30:55 +0900
Subject: [PATCH 042/127] Create fileUploadedEvt.js

---
 .../upload/server/handlers/fileUploadedEvt.js | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 bigbluebutton-html5/imports/api/upload/server/handlers/fileUploadedEvt.js

diff --git a/bigbluebutton-html5/imports/api/upload/server/handlers/fileUploadedEvt.js b/bigbluebutton-html5/imports/api/upload/server/handlers/fileUploadedEvt.js
new file mode 100644
index 000000000000..14e627f2cbea
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/upload/server/handlers/fileUploadedEvt.js
@@ -0,0 +1,24 @@
+import { check } from 'meteor/check';
+import { isNotificationEnabled } from '../helpers';
+import addNotification from '../modifiers/addNotification';
+import addUploadedFile from '../modifiers/addUploadedFile';
+
+export default function handleFileUploadedEvt({ header, body }, meetingId) {
+  check(body, Object);
+  check(header, Object);
+  check(meetingId, String);
+
+  const { userId } = header;
+
+  const {
+    uploadId,
+    source,
+    filename,
+  } = body;
+
+  if (isNotificationEnabled()) {
+    addNotification(meetingId, userId, uploadId, source, filename);
+  }
+  
+  return addUploadedFile(meetingId, userId, uploadId, source, filename);
+}

From 7403b201f1b82852db030257eb040a7f852c6e68 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 15:31:15 +0900
Subject: [PATCH 043/127] Create uploadRequestResp.js

---
 .../server/handlers/uploadRequestResp.js       | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 bigbluebutton-html5/imports/api/upload/server/handlers/uploadRequestResp.js

diff --git a/bigbluebutton-html5/imports/api/upload/server/handlers/uploadRequestResp.js b/bigbluebutton-html5/imports/api/upload/server/handlers/uploadRequestResp.js
new file mode 100644
index 000000000000..f4f0c110ecd2
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/upload/server/handlers/uploadRequestResp.js
@@ -0,0 +1,18 @@
+import { check } from 'meteor/check';
+import addUploadRequest from '../modifiers/addUploadRequest';
+
+export default function handleUploadRequestResp({ body }, meetingId) {
+  check(body, Object);
+  check(meetingId, String);
+
+  const {
+    source,
+    filename,
+    userId,
+    success,
+    timestamp,
+    token,
+  } = body;
+
+  return addUploadRequest(meetingId, source, filename, userId, success, timestamp, token);
+}

From e7e33e61799f2a4013df0159ca2565f19076275a Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 15:32:07 +0900
Subject: [PATCH 044/127] Create requestUpload.js

---
 .../upload/server/methods/requestUpload.js    | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 bigbluebutton-html5/imports/api/upload/server/methods/requestUpload.js

diff --git a/bigbluebutton-html5/imports/api/upload/server/methods/requestUpload.js b/bigbluebutton-html5/imports/api/upload/server/methods/requestUpload.js
new file mode 100644
index 000000000000..4cd5b1ffd47b
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/upload/server/methods/requestUpload.js
@@ -0,0 +1,27 @@
+import RedisPubSub from '/imports/startup/server/redis';
+import { check } from 'meteor/check';
+import { extractCredentials } from '/imports/api/common/server/helpers';
+
+//export default function requestUpload(credentials, source, filename, timestamp) {
+export default function requestUpload(source, filename, timestamp) {
+  const REDIS_CONFIG = Meteor.settings.private.redis;
+  const CHANNEL = REDIS_CONFIG.channels.toAkkaApps;
+  const EVENT_NAME = 'UploadRequestReqMsg';
+
+  //const { meetingId, requesterUserId } = credentials;
+const { meetingId, requesterUserId } = extractCredentials(this.userId);
+
+  check(meetingId, String);
+  check(requesterUserId, String);
+  check(source, String);
+  check(filename, String);
+  check(timestamp, Number)
+
+  const payload = {
+    source,
+    filename,
+    timestamp,
+  };
+
+  return RedisPubSub.publishUserMessage(CHANNEL, EVENT_NAME, meetingId, requesterUserId, payload);
+}

From 09a072068c3f375cf7600191537965008f8c096d Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 15:38:54 +0900
Subject: [PATCH 045/127] Update component.jsx

---
 .../actions-dropdown/component.jsx            | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
index 1a84ba7a5a8f..b7907b9c5843 100755
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
@@ -8,6 +8,7 @@ import DropdownTrigger from '/imports/ui/components/dropdown/trigger/component';
 import DropdownContent from '/imports/ui/components/dropdown/content/component';
 import DropdownList from '/imports/ui/components/dropdown/list/component';
 import DropdownListItem from '/imports/ui/components/dropdown/list/item/component';
+import MediaUploadContainer from '/imports/ui/components/upload/media/container';
 import { withModalMounter } from '/imports/ui/components/modal/service';
 import withShortcutHelper from '/imports/ui/components/shortcut-help/service';
 import DropdownListSeparator from '/imports/ui/components/dropdown/list/separator/component';
@@ -24,6 +25,7 @@ const propTypes = {
   shortcuts: PropTypes.string,
   handleTakePresenter: PropTypes.func.isRequired,
   allowExternalVideo: PropTypes.bool.isRequired,
+  isMediaUploadEnabled: PropTypes.bool.isRequired,
   stopExternalVideoShare: PropTypes.func.isRequired,
 };
 
@@ -44,6 +46,14 @@ const intlMessages = defineMessages({
     id: 'app.actionsBar.actionsDropdown.presentationDesc',
     description: 'adds context to upload presentation option',
   },
+  uploadMediaLabel: {
+    id: 'app.actionsBar.actionsDropdown.uploadMediaLabel',
+    description: 'Upload media option label',
+  },
+  uploadMediaDesc: {
+    id: 'app.actionsBar.actionsDropdown.uploadMediaDesc',
+    description: 'adds context to upload media option',
+  },
   desktopShareDesc: {
     id: 'app.actionsBar.actionsDropdown.desktopShareDesc',
     description: 'adds context to desktop share option',
@@ -93,12 +103,14 @@ class ActionsDropdown extends PureComponent {
     super(props);
 
     this.presentationItemId = _.uniqueId('action-item-');
+    this.uploadMediaId = _.uniqueId('action-item-');
     this.pollId = _.uniqueId('action-item-');
     this.takePresenterId = _.uniqueId('action-item-');
     this.selectUserRandId = _.uniqueId('action-item-');
 
     this.handleExternalVideoClick = this.handleExternalVideoClick.bind(this);
     this.makePresentationItems = this.makePresentationItems.bind(this);
+    this.handleUploadMediaClick = this.handleUploadMediaClick.bind(this);
   }
 
   componentDidUpdate(prevProps) {
@@ -114,6 +126,7 @@ class ActionsDropdown extends PureComponent {
       intl,
       amIPresenter,
       allowExternalVideo,
+      isMediaUploadEnabled,
       handleTakePresenter,
       isSharingVideo,
       isPollingEnabled,
@@ -128,6 +141,8 @@ class ActionsDropdown extends PureComponent {
       presentationDesc,
       takePresenter,
       takePresenterDesc,
+      uploadMediaLabel,
+      uploadMediaDesc,
     } = intlMessages;
 
     const {
@@ -199,6 +214,17 @@ class ActionsDropdown extends PureComponent {
           />
         )
         : null),
+      (amIPresenter && isMediaUploadEnabled
+        ? (
+          <DropdownListItem
+            icon="upload"
+            label={formatMessage(uploadMediaLabel)}
+            description={formatMessage(uploadMediaDesc)}
+            key={this.uploadMediaId}
+            onClick={this.handleUploadMediaClick}
+          />
+        )
+        : null),
     ]);
   }
 
@@ -243,6 +269,11 @@ class ActionsDropdown extends PureComponent {
     mountModal(<ExternalVideoModal />);
   }
 
+  handleUploadMediaClick() {
+    const { mountModal } = this.props;
+    mountModal(<MediaUploadContainer />);
+  }
+
   render() {
     const {
       intl,

From 0410e172a88d0787696e783cdec3a495116a51a0 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 15:39:52 +0900
Subject: [PATCH 046/127] Update component.jsx

---
 .../imports/ui/components/actions-bar/component.jsx             | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
index c43f8fe1b2d0..02dc84d02225 100755
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
@@ -32,6 +32,7 @@ class ActionsBar extends PureComponent {
       isPollingEnabled,
       isThereCurrentPresentation,
       allowExternalVideo,
+      isMediaUploadEnabled,
     } = this.props;
 
     const actionBarClasses = {};
@@ -53,6 +54,7 @@ class ActionsBar extends PureComponent {
             amIModerator,
             isPollingEnabled,
             allowExternalVideo,
+            isMediaUploadEnabled,
             handleTakePresenter,
             intl,
             isSharingVideo,

From a5002c199c0465512d02c4fde94ddf9004a1734e Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 15:43:13 +0900
Subject: [PATCH 047/127] Update container.jsx

---
 .../imports/ui/components/actions-bar/container.jsx             | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx
index f75cf3d683bb..4ee217acb3bc 100644
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx
@@ -9,6 +9,7 @@ import Presentations from '/imports/api/presentations';
 import ActionsBar from './component';
 import Service from './service';
 import ExternalVideoService from '/imports/ui/components/external-video-player/service';
+import MediaUploadService from '/imports/ui/components/upload/media/service';
 import CaptionsService from '/imports/ui/components/captions/service';
 import {
   shareScreen,
@@ -48,5 +49,6 @@ export default withTracker(() => ({
   isPollingEnabled: POLLING_ENABLED,
   isThereCurrentPresentation: Presentations.findOne({ meetingId: Auth.meetingID, current: true },
     { fields: {} }),
+  isMediaUploadEnabled: MediaUploadService.isEnabled(),
   allowExternalVideo: Meteor.settings.public.externalVideoPlayer.enabled,
 }))(injectIntl(ActionsBarContainer));

From 9ba17bd28c978c577dbe4aad77d033865944f35d Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 15:47:14 +0900
Subject: [PATCH 048/127] Update component.jsx

---
 .../message-list-item/component.jsx           | 40 ++++++++++++-------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/component.jsx b/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/component.jsx
index a856ebf204bd..232f373240b7 100644
--- a/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/component.jsx
@@ -6,6 +6,7 @@ import Icon from '/imports/ui/components/icon/component';
 import UserAvatar from '/imports/ui/components/user-avatar/component';
 import cx from 'classnames';
 import Message from './message/component';
+import UploadService from '/imports/ui/components/upload/service';
 import PollService from '/imports/ui/components/poll/service';
 import { styles } from './styles';
 
@@ -76,25 +77,34 @@ class MessageListItem extends Component {
       messages,
       chatAreaId,
       handleReadMessage,
+      intl,
     } = this.props;
 
     return (
       <div className={styles.item}>
         <div className={styles.messages}>
-          {messages.map(message => (
-            message.text !== ''
-              ? (
-                <Message
-                  className={(message.id ? styles.systemMessage : styles.systemMessageNoBorder)}
-                  key={message.id ? message.id : _.uniqueId('id-')}
-                  text={message.text}
-                  time={message.time}
-                  isSystemMessage={message.id ? true : false}
-                  chatAreaId={chatAreaId}
-                  handleReadMessage={handleReadMessage}
-                />
-              ) : null
-          ))}
+        {messages.map(message => {
+          const {
+            id,
+            time,
+            upload,
+          } = message;
+
+          const text = upload ? UploadService.getNotification(upload, intl) : message.text;
+
+          if (text === '') return null;
+
+          return (
+            <Message
+              className={(id ? styles.systemMessage : null)}
+              key={_.uniqueId('id-')}
+              text={text}
+              time={time}
+              chatAreaId={chatAreaId}
+              handleReadMessage={handleReadMessage}
+            />
+          );
+        })}
         </div>
       </div>
     );
@@ -231,7 +241,7 @@ class MessageListItem extends Component {
       user,
     } = this.props;
 
-    if (!user) {
+    if (!user || (user && !user.name)) {
       return this.renderSystemMessage();
     }
 

From 1633023cd750ee6184680990d37e2428167e6fc6 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 15:49:20 +0900
Subject: [PATCH 049/127] Update service.js

---
 bigbluebutton-html5/imports/ui/components/chat/service.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/chat/service.js b/bigbluebutton-html5/imports/ui/components/chat/service.js
index 3c58740b9110..16e0a04184d3 100755
--- a/bigbluebutton-html5/imports/ui/components/chat/service.js
+++ b/bigbluebutton-html5/imports/ui/components/chat/service.js
@@ -69,15 +69,18 @@ const mapGroupMessage = (message) => {
 const reduceGroupMessages = (previous, current) => {
   const lastMessage = previous[previous.length - 1];
   const currentMessage = current;
-  currentMessage.content = [{
+  const content = {
     id: current.id,
     text: current.message,
     time: current.timestamp,
     color: current.color,
-  }];
+  };
   if (!lastMessage || !currentMessage.chatId === PUBLIC_GROUP_CHAT_ID) {
     return previous.concat(currentMessage);
   }
+  // I do not like this
+  if (current.upload) content['upload'] = current.upload;
+  currentMessage.content = [content];
   // Check if the last message is from the same user and time discrepancy
   // between the two messages exceeds window and then group current
   // message with the last one

From f674821b48da0abb06c031feb6dfef5d9c12727a Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 15:50:25 +0900
Subject: [PATCH 050/127] Update component.jsx

---
 .../imports/ui/components/external-video-player/component.jsx  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx b/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx
index b659cd52dc4d..fc350b87491d 100644
--- a/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx
@@ -60,6 +60,9 @@ class VideoPlayer extends Component {
           controls: true,
           autoPlay: true,
           playsInline: true,
+          controls: true,
+          autoPlay: true,
+          playsInline: true,
         },
       },
       dailymotion: {

From 7feeab089e9d0e83d4a923f6647c55885307962a Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 15:55:59 +0900
Subject: [PATCH 051/127] Update component.jsx

---
 .../external-video-player/modal/component.jsx | 65 +++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/bigbluebutton-html5/imports/ui/components/external-video-player/modal/component.jsx b/bigbluebutton-html5/imports/ui/components/external-video-player/modal/component.jsx
index 502c23f78e33..694c2221aad5 100644
--- a/bigbluebutton-html5/imports/ui/components/external-video-player/modal/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/external-video-player/modal/component.jsx
@@ -1,7 +1,9 @@
 import React, { Component } from 'react';
 import { withModalMounter } from '/imports/ui/components/modal/service';
+import Icon from '/imports/ui/components/icon/component';
 import Modal from '/imports/ui/components/modal/simple/component';
 import Button from '/imports/ui/components/button/component';
+import UploadMediaService from '/imports/ui/components/upload/media/service';
 
 import { defineMessages, injectIntl } from 'react-intl';
 import { isUrlValid } from '../service';
@@ -33,6 +35,10 @@ const intlMessages = defineMessages({
     id: 'app.externalVideo.close',
     description: 'Close',
   },
+  filename: {
+    id: 'app.externalVideo.filename',
+    description: 'Media filename',
+  },
   note: {
     id: 'app.externalVideo.noteLabel',
     description: 'provides hint about Shared External videos',
@@ -54,6 +60,7 @@ class ExternalVideoModal extends Component {
     this.updateVideoUrlHandler = this.updateVideoUrlHandler.bind(this);
     this.renderUrlError = this.renderUrlError.bind(this);
     this.updateVideoUrlHandler = this.updateVideoUrlHandler.bind(this);
+    this.onMediaFileClick = this.onMediaFileClick.bind(this);
   }
 
   startWatchingHandler() {
@@ -72,6 +79,18 @@ class ExternalVideoModal extends Component {
     this.setState({ url: ev.target.value });
   }
 
+  onMediaFileClick(id) {
+    const {
+      startWatching,
+      closeModal,
+    } = this.props;
+
+    const url = UploadMediaService.getDownloadURL(id);
+
+    startWatching(url.trim());
+    closeModal();
+  }
+
   renderUrlError() {
     const { intl } = this.props;
     const { url } = this.state;
@@ -89,6 +108,51 @@ class ExternalVideoModal extends Component {
     );
   }
 
+  renderItem(item) {
+    const { intl } = this.props;
+
+    return (
+      <tr
+        key={item.uploadId}
+        className={styles.item}
+        onClick={() => this.onMediaFileClick(item.uploadId)}
+      >
+        <td className={styles.icon}>
+          <Icon iconName="file" />
+        </td>
+        <th className={styles.name}>
+          <span>{item.filename}</span>
+        </th>
+      </tr>
+    );
+  }
+
+  renderFiles() {
+    const {
+      intl,
+      files,
+    } = this.props;
+
+    if (files.length === 0) return null;
+
+    return (
+      <div className={styles.list}>
+        <table className={styles.table}>
+          <thead>
+            <tr>
+              <th className={styles.hidden}>
+                {intl.formatMessage(intlMessages.filename)}
+              </th>
+            </tr>
+          </thead>
+          <tbody>
+            {files.map(item => this.renderItem(item))}
+          </tbody>
+        </table>
+      </div>
+    );
+  }
+
   render() {
     const { intl, closeModal } = this.props;
     const { url, sharing } = this.state;
@@ -129,6 +193,7 @@ class ExternalVideoModal extends Component {
             {this.renderUrlError()}
           </div>
 
+          {this.renderFiles()}
           <Button
             className={styles.startBtn}
             label={intl.formatMessage(intlMessages.start)}

From 9e02fd51fb26492a6b4948291d1625f70460f246 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 15:56:42 +0900
Subject: [PATCH 052/127] Update container.jsx

---
 .../ui/components/external-video-player/modal/container.jsx     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bigbluebutton-html5/imports/ui/components/external-video-player/modal/container.jsx b/bigbluebutton-html5/imports/ui/components/external-video-player/modal/container.jsx
index 9df57b0e6291..83e577f6f4b9 100644
--- a/bigbluebutton-html5/imports/ui/components/external-video-player/modal/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/external-video-player/modal/container.jsx
@@ -3,6 +3,7 @@ import { withTracker } from 'meteor/react-meteor-data';
 import { withModalMounter } from '/imports/ui/components/modal/service';
 import ExternalVideoModal from './component';
 import { startWatching, getVideoUrl } from '../service';
+import UploadMediaService from '/imports/ui/components/upload/media/service';
 
 const ExternalVideoModalContainer = props => <ExternalVideoModal {...props} />;
 
@@ -11,5 +12,6 @@ export default withModalMounter(withTracker(({ mountModal }) => ({
     mountModal(null);
   },
   startWatching,
+  files: UploadMediaService.getMediaFiles(),
   videoUrl: getVideoUrl(),
 }))(ExternalVideoModalContainer));

From d1aa58bd9c147cceb8315d047a14c1c1a977000f Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 16:03:35 +0900
Subject: [PATCH 053/127] Update styles.scss

---
 .../external-video-player/modal/styles.scss   | 97 ++++++++++++++++++-
 1 file changed, 95 insertions(+), 2 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/external-video-player/modal/styles.scss b/bigbluebutton-html5/imports/ui/components/external-video-player/modal/styles.scss
index 7000a00ef03e..7b217216f3a8 100755
--- a/bigbluebutton-html5/imports/ui/components/external-video-player/modal/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/external-video-player/modal/styles.scss
@@ -1,6 +1,7 @@
 @import "/imports/ui/stylesheets/variables/breakpoints";
 @import "/imports/ui/components/modal/simple/styles";
 @import "/imports/ui/stylesheets/mixins/focus";
+@import "/imports/ui/stylesheets/mixins/_scrollable";
 
 .header {
   margin: 0;
@@ -82,7 +83,6 @@
   margin: 0;
   width: 40%;
   display: block;
-  position: absolute;
   bottom:   20px;
   color: var(--color-white) !important;
   background-color: var(--color-link) !important;
@@ -132,7 +132,7 @@
 
 .urlError {
   color: red;
-  padding: 1em 0 2.5em 0;
+  padding: 1em 0;
 
   :global(.animationsEnabled) & {
     transition: 1s;
@@ -145,3 +145,96 @@
   font-style: italic;
   padding-top: var(--sm-padding-y);
 }
+
+.icon {
+  width: 1%;
+}
+
+.icon > i {
+  font-size: 1.35rem;
+}
+
+.item {
+  cursor: pointer;
+}
+
+.name {
+  height: 1rem;
+  width: auto;
+  position: relative;
+
+  &:before {
+    content: "\00a0";
+    visibility: hidden;
+  }
+
+  > span {
+    @extend %text-elipsis;
+    position: absolute;
+    left: 0;
+    right: 0;
+
+    [dir="rtl"] & {
+      right: 1rem;
+    }
+  }
+}
+
+.hidden {
+  position: absolute;
+  overflow: hidden;
+  clip: rect(0 0 0 0);
+  height: 1px; width: 1px;
+  margin: -1px; padding: 0; border: 0;
+}
+
+.list {
+  @include scrollbox-vertical();
+  max-height: 35vh;
+  width: 100%;
+  padding: .5rem 0;
+}
+
+.table {
+  width: 100%;
+  border-spacing: 0;
+  border-collapse: collapse;
+
+  > thead {
+  }
+
+  > tbody {
+    text-align: left;
+
+    [dir="rtl"] & {
+      text-align: right;
+    }
+
+    > tr {
+      border-bottom: 1px solid var(--color-gray-light);
+
+      &:last-child {
+        border-bottom: 0;
+      }
+
+      &:hover,
+      &:focus {
+        background-color: transparentize(#8B9AA8, .85);
+      }
+
+      th,
+      td {
+        padding: calc(var(--sm-padding-y) * 2) calc(var(--sm-padding-x) / 2);
+        white-space: nowrap;
+      }
+
+      th {
+        font-weight: bold;
+        color: var(--color-gray-dark);
+      }
+
+      td {
+      }
+    }
+  }
+}

From 6ef1be93e7f1905723f79e6363c3250ea9347c88 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 16:04:35 +0900
Subject: [PATCH 054/127] Update component.jsx

---
 .../imports/ui/components/subscriptions/component.jsx            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bigbluebutton-html5/imports/ui/components/subscriptions/component.jsx b/bigbluebutton-html5/imports/ui/components/subscriptions/component.jsx
index 49dbde2496b3..4832bdb3a8ab 100755
--- a/bigbluebutton-html5/imports/ui/components/subscriptions/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/subscriptions/component.jsx
@@ -20,6 +20,7 @@ const SUBSCRIPTIONS = [
   'presentation-pods', 'users-settings', 'guestUser', 'users-infos', 'note', 'meeting-time-remaining',
   'network-information', 'local-settings', 'users-typing', 'record-meetings', 'video-streams',
   'connection-status', 'voice-call-states',
+  'uploaded-file',
 ];
 
 class Subscriptions extends Component {

From 51ca4ffd6e9192232137f0bb99f71092923b6605 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 16:07:07 +0900
Subject: [PATCH 055/127] Create service.js

---
 .../imports/ui/components/upload/service.js   | 137 ++++++++++++++++++
 1 file changed, 137 insertions(+)
 create mode 100644 bigbluebutton-html5/imports/ui/components/upload/service.js

diff --git a/bigbluebutton-html5/imports/ui/components/upload/service.js b/bigbluebutton-html5/imports/ui/components/upload/service.js
new file mode 100644
index 000000000000..8a7f69702da9
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/upload/service.js
@@ -0,0 +1,137 @@
+import { defineMessages, injectIntl } from 'react-intl';
+import axios from 'axios';
+import { UploadRequest } from '/imports/api/upload';
+import Auth from '/imports/ui/services/auth';
+import { notify } from '/imports/ui/services/notification';
+import { makeCall } from '/imports/ui/services/api';
+
+const UPLOAD = Meteor.settings.public.upload;
+const DOWNLOAD = Meteor.settings.public.download;
+
+const intlMessages = defineMessages({
+  uploading: {
+    id: 'app.upload.toast.uploading',
+    description: 'Upload toast file uploading',
+  },
+  completed: {
+    id: 'app.upload.toast.completed',
+    description: 'Upload toast file completed',
+  },
+  401: {
+    id: 'app.upload.toast.error.401',
+    description: 'Upload toast error unauthorized',
+  },
+  408: {
+    id: 'app.upload.toast.error.408',
+    description: 'Upload toast error request timeout',
+  },
+  header: {
+    id: 'app.upload.notification.header',
+    description: 'Uploaded file notification header',
+  },
+  disclaimer: {
+    id: 'app.upload.notification.disclaimer',
+    description: 'Uploaded file notification disclaimer',
+  },
+});
+
+const requestUpload = (source, filename) => {
+  return new Promise((resolve, reject) => {
+    const timestamp = new Date().getTime();
+    makeCall('requestUpload', source, filename, timestamp);
+    
+    let comp;
+    const timeout = setTimeout(() => {
+      if (comp) comp.stop();
+      reject(408);
+    }, UPLOAD.timeout);
+
+    Tracker.autorun(computation => {
+      comp = computation;
+
+      const subscription = Meteor.subscribe('upload-request', Auth.credentials, source, filename);
+      if (!subscription.ready()) return;
+
+      const {
+        meetingId,
+        requesterUserId: userId,
+      } = Auth.credentials;
+
+      const request = UploadRequest.findOne({
+        source,
+        meetingId,
+        userId,
+        filename,
+        timestamp,
+      });
+
+      if (!request) return;
+      clearTimeout(timeout);
+      computation.stop();
+
+      if (!request.success) {
+        reject(401);
+      } else {
+        resolve(request.token);
+      }
+    });
+  });
+};
+
+const upload = (source, files, intl) => {
+  files.forEach(file => {
+    requestUpload(source, file.filename).then(token => {
+      notify(intl.formatMessage(intlMessages.uploading, ({ 0: file.filename })), 'info', 'upload');
+      post(source, file, token, intl);
+    }).catch(code => {
+      notify(intl.formatMessage(intlMessages[code], ({ 0: file.filename })), 'error', 'upload');
+    });
+  });
+};
+
+const post = (source, file, token, intl) => {
+  const {
+    meetingId,
+    requesterUserId: userId,
+  } = Auth.credentials;
+
+  const url = `${UPLOAD.endpoint}/${source}/${token}`;
+  
+  const data = new FormData();
+  data.append('file', file.file);
+
+  const config = {
+    headers: {
+      'Content-Type': 'multipart/form-data',
+      'X-Meeting-ID': meetingId,
+      'X-User-ID': userId,
+      'X-Filename': file.filename,
+    },
+  };
+
+  axios.post(url, data, config).then(resp => {
+    notify(intl.formatMessage(intlMessages.completed, ({ 0: file.filename })), 'info', 'upload');
+  }).catch(error => {
+    notify(error, 'error', 'upload');
+  });
+};
+
+const buildDownloadURL = (source, uploadId) => {
+  return Auth.authenticateURL(`${DOWNLOAD.endpoint}/${source}/${uploadId}`);
+};
+
+const getNotification = ({ source, uploadId, filename }, intl) => {
+  const downloadURL = buildDownloadURL(source, uploadId);
+
+  const header = `<b>${intl.formatMessage(intlMessages.header)}:</b>`;
+  const link = `<a target="_blank" href="${downloadURL}">${filename}</a>`;
+  const disclaimer = `<i>${intl.formatMessage(intlMessages.disclaimer)}</i>`;
+
+  return `${header}<br>${link}<br><br>${disclaimer}`;
+};
+
+export default {
+  upload,
+  buildDownloadURL,
+  getNotification,
+};

From 7e84fcdfb414704b2e87d96e882ce7850b3dd0a0 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 16:09:53 +0900
Subject: [PATCH 056/127] Create component.jsx

---
 .../ui/components/upload/media/component.jsx  | 201 ++++++++++++++++++
 1 file changed, 201 insertions(+)
 create mode 100644 bigbluebutton-html5/imports/ui/components/upload/media/component.jsx

diff --git a/bigbluebutton-html5/imports/ui/components/upload/media/component.jsx b/bigbluebutton-html5/imports/ui/components/upload/media/component.jsx
new file mode 100644
index 000000000000..4a95bd81d2f9
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/upload/media/component.jsx
@@ -0,0 +1,201 @@
+import React, { Component } from 'react';
+import { defineMessages, injectIntl } from 'react-intl';
+import cx from 'classnames';
+import _ from 'lodash';
+import Dropzone from 'react-dropzone';
+import Icon from '/imports/ui/components/icon/component';
+import { withModalMounter } from '/imports/ui/components/modal/service';
+import Modal from '/imports/ui/components/modal/simple/component';
+import Button from '/imports/ui/components/button/component';
+import Service from './service';
+import UploadService from '../service';
+import { styles } from './styles';
+
+const intlMessages = defineMessages({
+  title: {
+    id: 'app.upload.media.title',
+    description: 'Media upload modal title',
+  },
+  message: {
+    id: 'app.upload.media.message',
+    description: 'Media upload modal message',
+  },
+  filename: {
+    id: 'app.upload.media.filename',
+    description: 'Media upload modal media filename',
+  },
+  options: {
+    id: 'app.upload.media.options',
+    description: 'Media upload modal media options',
+  },
+  remove: {
+    id: 'app.upload.media.remove',
+    description: 'Media upload modal remove media',
+  },
+  upload: {
+    id: 'app.upload.media.upload',
+    description: 'Media upload modal upload button',
+  },
+  cancel: {
+    id: 'app.upload.media.cancel',
+    description: 'Media upload modal cancel button',
+  },
+});
+
+class MediaUpload extends Component {
+  constructor(props) {
+    super(props);
+
+    this.state = { files: [] };
+
+    this.source = Service.getSource();
+    this.maxSize = Service.getMaxSize();
+    this.validFiles = Service.getMediaValidFiles();
+
+    this.handleOnDrop = this.handleOnDrop.bind(this);
+  }
+
+  handleOnDrop(acceptedFiles, rejectedFiles) {
+    const filesToUpload = acceptedFiles.map(file => {
+      const id = _.uniqueId(file.name);
+
+      return {
+        file,
+        id,
+        filename: file.name,
+      }
+    });
+
+    this.setState(({ files }) => ({ files: files.concat(filesToUpload) }));
+  }
+
+  handleRemove(item) {
+    const { files } = this.state;
+    const index = files.indexOf(item);
+
+    files.splice(index, 1);
+
+    this.setState({ files });
+  }
+
+  handleUpload(files) {
+    const {
+      closeModal,
+      intl,
+    } = this.props;
+
+    UploadService.upload(this.source, files, intl);
+    closeModal();
+  }
+
+  renderItem(item) {
+    const { intl } = this.props;
+
+    return (
+      <tr key={item.id}>
+        <td className={styles.icon}>
+          <Icon iconName="file" />
+        </td>
+        <th className={styles.name}>
+          <span>{item.filename}</span>
+        </th>
+        <td className={styles.actions}>
+          <Button
+            className={cx(styles.action, styles.remove)}
+            label={intl.formatMessage(intlMessages.remove)}
+            aria-label={`${intl.formatMessage(intlMessages.remove)} ${item.filename}`}
+            size="sm"
+            icon="delete"
+            hideLabel
+            onClick={() => this.handleRemove(item)}
+          />
+        </td>
+      </tr>
+    );
+  }
+
+  renderFiles() {
+    const { intl } = this.props;
+    const { files } = this.state;
+
+    if (files.length === 0) return null;
+    
+    return (
+      <div className={styles.list}>
+        <table className={styles.table}>
+          <thead>
+            <tr>
+              <th className={styles.hidden}>
+                {intl.formatMessage(intlMessages.filename)}
+              </th>
+              <th className={styles.hidden}>
+                {intl.formatMessage(intlMessages.options)}
+              </th>
+            </tr>
+          </thead>
+          <tbody>
+            {files.map(item => this.renderItem(item))}
+          </tbody>
+        </table>
+      </div>
+    );
+  }
+
+  render() {
+    const {
+      intl,
+      closeModal,
+    } = this.props;
+
+    const { files } = this.state;
+
+    return (
+      <Modal
+        overlayClassName={styles.overlay}
+        className={styles.modal}
+        onRequestClose={closeModal}
+        hideBorder
+        contentLabel={intl.formatMessage(intlMessages.title)}
+      >
+        <header className={styles.header}>
+          <h3 className={styles.title}>
+            {intl.formatMessage(intlMessages.title)}
+          </h3>
+        </header>
+        <div className={styles.content}>
+          {this.renderFiles()}
+          <Dropzone
+            multiple
+            className={styles.dropzone}
+            activeClassName={styles.dropzoneActive}
+            accept={this.validFiles.map(type => type.extension)}
+            maxSize={this.maxSize}
+            disablepreview="true"
+            onDrop={this.handleOnDrop}
+          >
+            <Icon className={styles.dropzoneIcon} iconName="upload" />
+            <p className={styles.dropzoneMessage}>
+              {intl.formatMessage(intlMessages.message)}
+            </p>
+          </Dropzone>
+        </div>
+        <div className={styles.footer}>
+          <div className={styles.buttons}>
+            <Button
+              label={intl.formatMessage(intlMessages.cancel)}
+              onClick={closeModal}
+            />
+            <Button
+              color="primary"
+              label={intl.formatMessage(intlMessages.upload)}
+              onClick={() => this.handleUpload(files)}
+              disabled={files.length === 0}
+            />
+          </div>
+        </div>
+      </Modal>
+    );
+  }
+}
+
+export default injectIntl(withModalMounter(MediaUpload));

From 29b14d07e412341eb6328b882851a15bfb4f56cd Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 16:10:31 +0900
Subject: [PATCH 057/127] Create container.jsx

---
 .../imports/ui/components/upload/media/container.jsx | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 bigbluebutton-html5/imports/ui/components/upload/media/container.jsx

diff --git a/bigbluebutton-html5/imports/ui/components/upload/media/container.jsx b/bigbluebutton-html5/imports/ui/components/upload/media/container.jsx
new file mode 100644
index 000000000000..df088d9df949
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/upload/media/container.jsx
@@ -0,0 +1,12 @@
+import React from 'react';
+import { withTracker } from 'meteor/react-meteor-data';
+import { withModalMounter } from '/imports/ui/components/modal/service';
+import Service from './service';
+import MediaUpload from './component';
+
+const MediaUploadContainer = props => <MediaUpload {...props} />;
+
+export default withModalMounter(withTracker(({ mountModal }) => ({
+  closeModal: () => mountModal(null),
+  isEnabled: Service.isEnabled(),
+}))(MediaUploadContainer));

From 9a9110942f3d3b88879f8162e791037c281c42b1 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 16:11:22 +0900
Subject: [PATCH 058/127] Create service.js

---
 .../ui/components/upload/media/service.js     | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 bigbluebutton-html5/imports/ui/components/upload/media/service.js

diff --git a/bigbluebutton-html5/imports/ui/components/upload/media/service.js b/bigbluebutton-html5/imports/ui/components/upload/media/service.js
new file mode 100644
index 000000000000..d7c261d40410
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/upload/media/service.js
@@ -0,0 +1,44 @@
+import { UploadedFile } from '/imports/api/upload';
+import Auth from '/imports/ui/services/auth';
+import UploadService from '../service';
+
+const MEDIA_UPLOAD = Meteor.settings.public.upload.media;
+const DOWNLOAD = Meteor.settings.public.download;
+
+const isEnabled = () => {
+  return MEDIA_UPLOAD.enabled;
+};
+
+const getSource = () => {
+  return MEDIA_UPLOAD.source;
+};
+
+const getMaxSize = () => {
+  return MEDIA_UPLOAD.maxSize;
+};
+
+const getMediaValidFiles = () => {
+  return MEDIA_UPLOAD.validFiles;
+};
+
+const getMediaFiles = () => {
+  return UploadedFile.find({
+    meetingId: Auth.meetingID,
+    source: MEDIA_UPLOAD.source,
+  }).fetch()
+};
+
+const getDownloadURL = uploadId => {
+  const { source } = MEDIA_UPLOAD;
+
+  return UploadService.buildDownloadURL(source, uploadId);
+};
+
+export default {
+  isEnabled,
+  getSource,
+  getMaxSize,
+  getMediaValidFiles,
+  getMediaFiles,
+  getDownloadURL,
+};

From a45e423d715a4a76c540259cfe6461db7db1480e Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 16:14:34 +0900
Subject: [PATCH 059/127] Create styles.scss

---
 .../ui/components/upload/media/styles.scss    | 237 ++++++++++++++++++
 1 file changed, 237 insertions(+)
 create mode 100644 bigbluebutton-html5/imports/ui/components/upload/media/styles.scss

diff --git a/bigbluebutton-html5/imports/ui/components/upload/media/styles.scss b/bigbluebutton-html5/imports/ui/components/upload/media/styles.scss
new file mode 100644
index 000000000000..d19906c78467
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/upload/media/styles.scss
@@ -0,0 +1,237 @@
+@import "/imports/ui/stylesheets/variables/_all";
+@import "/imports/ui/components/modal/simple/styles";
+@import "/imports/ui/stylesheets/mixins/focus";
+@import "/imports/ui/stylesheets/mixins/_scrollable";
+
+.header {
+  margin: 0;
+  padding: 0;
+  border: none;
+  line-height: 2rem;
+}
+
+.content {
+  align-items: center;
+  display: flex;
+  flex-direction: column;
+  padding: .5rem 0 2rem 0;
+  overflow: hidden;
+}
+
+.overlay {
+  @extend .overlay;
+}
+
+.modal {
+  @extend .modal;
+  padding: 1.5rem;
+  min-height: 20rem;
+}
+
+.title {
+  text-align: center;
+  font-weight: 400;
+  font-size: 1.3rem;
+  color: var(--color-background);
+  white-space: normal;
+
+  @include mq($small-only) {
+    font-size: 1rem;
+    padding: 0 1rem;
+  }
+}
+
+.dropzoneWrapper {
+  width: 100%;
+  display: flex;
+  margin-top: calc(var(--lg-padding-y) * 5);
+}
+
+.dropzone {
+  flex: auto;
+  border: 2px dashed;
+  border-radius: var(--border-radius);
+  padding: calc(var(--lg-padding-y) * 2.5) var(--lg-padding-x);
+  text-align: center;
+  font-size: var(--font-size-large);
+  cursor: pointer;
+  width: 100%;
+}
+
+.dropzoneActive {
+  background-color: var(--color-gray-lighter);
+}
+
+.dropzoneIcon {
+  font-size: calc(var(--font-size-large) * 3);
+}
+
+.dropzoneMessage {
+  margin: var(--md-padding-y) 0;
+}
+
+.hidden {
+  position: absolute;
+  overflow: hidden;
+  clip: rect(0 0 0 0);
+  height: 1px; width: 1px;
+  margin: -1px; padding: 0; border: 0;
+}
+
+.list {
+  @include scrollbox-vertical();
+  max-height: 35vh;
+  width: 100%;
+  padding: .5rem 0;
+}
+
+.table {
+  width: 100%;
+  border-spacing: 0;
+  border-collapse: collapse;
+
+  > thead {
+  }
+
+  > tbody {
+    text-align: left;
+
+    [dir="rtl"] & {
+      text-align: right;
+    }
+    
+    > tr {
+      border-bottom: 1px solid var(--color-gray-light);
+
+      &:last-child {
+        border-bottom: 0;
+      }
+
+      &:hover,
+      &:focus {
+        background-color: transparentize(#8B9AA8, .85);
+      }
+
+      th,
+      td {
+        padding: calc(var(--sm-padding-y) * 2) calc(var(--sm-padding-x) / 2);
+        white-space: nowrap;
+      }
+
+      th {
+        font-weight: bold;
+        color: var(--color-gray-dark);
+      }
+
+      td {
+      }
+    }
+  }
+}
+
+.icon,
+.actions {
+  width: 1%;
+}
+
+.actions {
+  text-align: left;
+
+  [dir="rtl"] & {
+    text-align: right;
+  }
+}
+
+.icon > i {
+  font-size: 1.35rem;
+}
+
+.name {
+  height: 1rem;
+  width: auto;
+  position: relative;
+
+  &:before {
+    content: "\00a0";
+    visibility: hidden;
+  }
+
+  > span {
+    @extend %text-elipsis;
+    position: absolute;
+    left: 0;
+    right: 0;
+
+    [dir="rtl"] & {
+      right: 1rem;
+    }
+  }
+}
+
+.action {
+  div > i {
+    margin-top: .25rem;
+  }
+}
+
+.action,
+.action > i {
+  display: inline-block;
+  border: none;
+  background: transparent;
+  cursor: pointer;
+  font-size: 1.35rem;
+  color: var(--color-gray-light);
+  padding: 0;
+
+  :global(.animationsEnabled) & {
+    transition: all .25s;
+  }
+
+  :hover, :focus {
+    padding: unset !important;
+  }
+}
+
+.remove {
+  background-color: transparent;
+  border: 0 !important;
+
+  & > i:focus,
+  & > i:hover {
+    color: var(--color-danger) !important;
+    background-color: transparent;
+  }
+
+  &[aria-disabled="true"] {
+    cursor: not-allowed;
+    opacity: .5;
+    box-shadow: none;
+    pointer-events: none;
+  }
+}
+
+.buttons {
+  margin-left: auto;
+  margin-right: 3px;
+
+
+  [dir="rtl"] & {
+    margin-right: auto;
+    margin-left: 3px;
+  }
+
+  :first-child {
+    margin-right: 3px;
+    margin-left: inherit;
+
+    [dir="rtl"] & {
+      margin-right: inherit;
+      margin-left: 3px;
+    }
+  }
+}
+
+.footer {
+  display: flex;
+}

From 2344684b3aeddb08dc89edbefdbcb7ec036e1be9 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 16:16:58 +0900
Subject: [PATCH 060/127] Update settings.yml

---
 .../private/config/settings.yml               | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/bigbluebutton-html5/private/config/settings.yml b/bigbluebutton-html5/private/config/settings.yml
index 887f50c0d7a5..7b7ff92a4462 100755
--- a/bigbluebutton-html5/private/config/settings.yml
+++ b/bigbluebutton-html5/private/config/settings.yml
@@ -379,6 +379,25 @@ public:
       - danger
       - critical
     help: STATS_HELP_URL
+  upload:
+    endpoint: /bigbluebutton/upload
+    timeout: 5000
+    notification: true
+    media:
+      enabled: true
+      maxSize: 900000000
+      source: media
+      validFiles:
+        - extension: .mp3
+          type: audio/mp3
+        - extension: .ogg
+          type: audio/ogg
+        - extension: .mp4
+          type: video/mp4
+        - extension: .webm
+          type: video/webm
+  download:
+    endpoint: /bigbluebutton/download
   presentation:
     allowDownloadable: true
     defaultPresentationFile: default.pdf

From fe643c283956d7e4c58735fd9a502cc64096c3a3 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 16:19:24 +0900
Subject: [PATCH 061/127] Update en.json

---
 bigbluebutton-html5/private/locales/en.json | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/bigbluebutton-html5/private/locales/en.json b/bigbluebutton-html5/private/locales/en.json
index 62b62aefdf6c..dbbd6a828f01 100755
--- a/bigbluebutton-html5/private/locales/en.json
+++ b/bigbluebutton-html5/private/locales/en.json
@@ -48,6 +48,19 @@
     "app.captions.pad.dictationStop": "Stop dictation",
     "app.captions.pad.dictationOnDesc": "Turns speech recognition on",
     "app.captions.pad.dictationOffDesc": "Turns speech recognition off",
+    "app.upload.toast.uploading": "Uploading {0}",
+    "app.upload.toast.completed": "Completed {0}",
+    "app.upload.toast.error.401": "Unauthorized {0}",
+    "app.upload.toast.error.408": "Request timeout {0}",
+    "app.upload.notification.header": "A file was uploaded",
+    "app.upload.notification.disclaimer": "Note that your browser might not support this type of file.",
+    "app.upload.media.title": "Media upload",
+    "app.upload.media.message": "Drag or select media files to be uploaded",
+    "app.upload.media.filename": "Media filename",
+    "app.upload.media.options": "Media options",
+    "app.upload.media.remove": "Remove",
+    "app.upload.media.upload": "Upload",
+    "app.upload.media.cancel": "Cancel",
     "app.note.title": "Shared Notes",
     "app.note.label": "Note",
     "app.note.hideNoteLabel": "Hide note",
@@ -364,6 +377,8 @@
     "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "Screenshare locked",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Stop sharing your screen",
     "app.actionsBar.actionsDropdown.presentationDesc": "Upload your presentation",
+    "app.actionsBar.actionsDropdown.uploadMediaLabel": "Upload a media file",
+    "app.actionsBar.actionsDropdown.uploadMediaDesc": "Upload your local media file",
     "app.actionsBar.actionsDropdown.initPollDesc": "Initiate a poll",
     "app.actionsBar.actionsDropdown.desktopShareDesc": "Share your screen with others",
     "app.actionsBar.actionsDropdown.stopDesktopShareDesc": "Stop sharing your screen with",
@@ -733,6 +748,7 @@
     "app.externalVideo.urlInput": "Add Video URL",
     "app.externalVideo.urlError": "This video URL isn't supported",
     "app.externalVideo.close": "Close",
+    "app.externalVideo.filename": "Media filename",
     "app.externalVideo.autoPlayWarning": "Play the video to enable media synchronization",
     "app.network.connection.effective.slow": "We're noticing connectivity issues.",
     "app.network.connection.effective.slow.help": "More information",

From 23510c2b66c5cb745f3ec8b50a8b2d1430947e2b Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 16:26:53 +0900
Subject: [PATCH 062/127] Update ja.json

---
 bigbluebutton-html5/private/locales/ja.json | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/bigbluebutton-html5/private/locales/ja.json b/bigbluebutton-html5/private/locales/ja.json
index 9fbe50e8cc0f..aab91cd0ed70 100644
--- a/bigbluebutton-html5/private/locales/ja.json
+++ b/bigbluebutton-html5/private/locales/ja.json
@@ -48,6 +48,19 @@
     "app.captions.pad.dictationStop": "口述終了",
     "app.captions.pad.dictationOnDesc": "音声認識オン",
     "app.captions.pad.dictationOffDesc": "音声認識オフ",
+    "app.upload.toast.uploading": "アップロード中 {0}",
+    "app.upload.toast.completed": "完了 {0}",
+    "app.upload.toast.error.401": "許可がありません {0}",
+    "app.upload.toast.error.408": "要求がタイムアウトしました {0}",
+    "app.upload.notification.header": "ファイルがアップロードされました",
+    "app.upload.notification.disclaimer": "ブラウザがこのタイプのファイルをサポートしない可能性に注意してください",
+    "app.upload.media.title": "メディアアップロード",
+    "app.upload.media.message": "アップロードするメディアファイルをドラッグまたは選択してください",
+    "app.upload.media.filename": "メディアファイル名",
+    "app.upload.media.options": "メディアオプション",
+    "app.upload.media.remove": "削除",
+    "app.upload.media.upload": "アップロード",
+    "app.upload.media.cancel": "",
     "app.note.title": "共有メモ",
     "app.note.label": "メモ",
     "app.note.hideNoteLabel": "メモを隠す",
@@ -364,6 +377,8 @@
     "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "画面共有ロック",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "画面共有をやめる",
     "app.actionsBar.actionsDropdown.presentationDesc": "プレゼンテーションをアップロード",
+    "app.actionsBar.actionsDropdown.uploadMediaLabel": "メディアファイルをアップロード",
+    "app.actionsBar.actionsDropdown.uploadMediaDesc": "ローカルのメディアファイルをアップロード",
     "app.actionsBar.actionsDropdown.initPollDesc": "投票を初期化",
     "app.actionsBar.actionsDropdown.desktopShareDesc": "他の人と画面を共有する",
     "app.actionsBar.actionsDropdown.stopDesktopShareDesc": "画面共有をやめる：",
@@ -733,6 +748,7 @@
     "app.externalVideo.urlInput": "動画URLを追加",
     "app.externalVideo.urlError": "この動画URLは再生できませんでした",
     "app.externalVideo.close": "閉じる",
+    "app.externalVideo.filename": "メディアファイル名",
     "app.externalVideo.autoPlayWarning": "音声同期するには動画を再生してください",
     "app.network.connection.effective.slow": "接続の問題が発生しました",
     "app.network.connection.effective.slow.help": "ヘルプ",

From 1b2a5ac74f56f4b4d351353a488af5b8c95e2478 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 16:31:58 +0900
Subject: [PATCH 063/127] Update ja.json

---
 bigbluebutton-html5/private/locales/ja.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bigbluebutton-html5/private/locales/ja.json b/bigbluebutton-html5/private/locales/ja.json
index aab91cd0ed70..53fa1dbd46c7 100644
--- a/bigbluebutton-html5/private/locales/ja.json
+++ b/bigbluebutton-html5/private/locales/ja.json
@@ -60,7 +60,7 @@
     "app.upload.media.options": "メディアオプション",
     "app.upload.media.remove": "削除",
     "app.upload.media.upload": "アップロード",
-    "app.upload.media.cancel": "",
+    "app.upload.media.cancel": "キャンセル",
     "app.note.title": "共有メモ",
     "app.note.label": "メモ",
     "app.note.hideNoteLabel": "メモを隠す",

From f5c25ee40d20beae302d7438a615762f72348da6 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 17:34:33 +0900
Subject: [PATCH 064/127] Create UploadMsgs.scala

---
 .../common2/msgs/UploadMsgs.scala             | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/UploadMsgs.scala

diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/UploadMsgs.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/UploadMsgs.scala
new file mode 100644
index 000000000000..5c973f1e8a58
--- /dev/null
+++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/UploadMsgs.scala
@@ -0,0 +1,25 @@
+package org.bigbluebutton.common2.msgs
+
+// client to akka-apps
+object UploadRequestReqMsg { val NAME = "UploadRequestReqMsg" }
+case class UploadRequestReqMsg(header: BbbClientMsgHeader, body: UploadRequestReqMsgBody) extends StandardMsg
+case class UploadRequestReqMsgBody(source: String, filename: String, timestamp: Long)
+
+// akka-apps to client
+object UploadRequestRespMsg { val NAME = "UploadRequestRespMsg" }
+case class UploadRequestRespMsg(header: BbbClientMsgHeader, body: UploadRequestRespMsgBody) extends StandardMsg
+case class UploadRequestRespMsgBody(source: String, filename: String, userId: String, success: Boolean, timestamp: Long, token: String = null)
+
+object FileUploadedEvtMsg { val NAME = "FileUploadedEvtMsg" }
+case class FileUploadedEvtMsg(header: BbbClientMsgHeader, body: FileUploadedEvtMsgBody) extends StandardMsg
+case class FileUploadedEvtMsgBody(uploadId: String, source: String, filename: String)
+
+// akka-apps to bbb-web
+object UploadRequestSysMsg { val NAME = "UploadRequestSysMsg" }
+case class UploadRequestSysMsg(header: BbbCoreHeaderWithMeetingId, body: UploadRequestSysMsgBody) extends BbbCoreMsg
+case class UploadRequestSysMsgBody(source: String, filename: String, userId: String, token: String)
+
+// bbb-web to akka-apps
+object FileUploadedSysMsg { val NAME = "FileUploadedSysMsg" }
+case class FileUploadedSysMsg(header: BbbClientMsgHeader, body: FileUploadedSysMsgBody) extends StandardMsg
+case class FileUploadedSysMsgBody(uploadId: String, source: String, filename: String, contentType: String)

From 35f71655a822c86e0491d7132cbf60d8b157a07d Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 17:40:24 +0900
Subject: [PATCH 065/127] Update component.jsx

---
 .../ui/components/external-video-player/modal/component.jsx   | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/external-video-player/modal/component.jsx b/bigbluebutton-html5/imports/ui/components/external-video-player/modal/component.jsx
index 694c2221aad5..4f00624cf115 100644
--- a/bigbluebutton-html5/imports/ui/components/external-video-player/modal/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/external-video-player/modal/component.jsx
@@ -187,12 +187,8 @@ class ExternalVideoModal extends Component {
             <div className={styles.externalVideoNote} id="external-video-note">
               {intl.formatMessage(intlMessages.note)}
             </div>
-          </div>
-
-          <div>
             {this.renderUrlError()}
           </div>
-
           {this.renderFiles()}
           <Button
             className={styles.startBtn}

From 331f98305b6e2d1d92808e712fd3ddf30e8461c7 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 17:44:05 +0900
Subject: [PATCH 066/127] Update main.js

---
 bigbluebutton-html5/server/main.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bigbluebutton-html5/server/main.js b/bigbluebutton-html5/server/main.js
index f80a2ed45c29..2e952a50a597 100755
--- a/bigbluebutton-html5/server/main.js
+++ b/bigbluebutton-html5/server/main.js
@@ -23,6 +23,7 @@ import '/imports/api/network-information/server';
 import '/imports/api/users-infos/server';
 import '/imports/api/connection-status/server';
 import '/imports/api/note/server';
+import '/imports/api/upload/server';
 import '/imports/api/external-videos/server';
 import '/imports/api/guest-users/server';
 import '/imports/api/local-settings/server';

From 86c75a8553e752daa462039228f97335f547e49e Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 19:56:31 +0900
Subject: [PATCH 067/127] Update bbb-web.nginx

---
 bigbluebutton-web/bbb-web.nginx | 68 +++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/bigbluebutton-web/bbb-web.nginx b/bigbluebutton-web/bbb-web.nginx
index 120d2dcf8af9..b306fc0974de 100755
--- a/bigbluebutton-web/bbb-web.nginx
+++ b/bigbluebutton-web/bbb-web.nginx
@@ -128,5 +128,73 @@
             proxy_set_header        X-textTrack-track $textTrack;
             proxy_set_header        X-Original-URI $request_uri;
         }
+	
+	# For the implementation, you need to add these directly to /etc/bigbluebutton/nginx/web
+			location ~ "^\/bigbluebutton\/upload\/(?<source>[a-z]+)\/(?<token>[a-zA-Z0-9]{32})$" {
+			proxy_pass                 http://127.0.0.1:8090;
+			proxy_redirect             default;
+			proxy_set_header           X-Forwarded-For $proxy_add_x_forwarded_for;
+			proxy_set_header           X-Source $source;
+
+			# Allow 30M uploaded files
+			client_max_body_size       900m;
+			client_body_buffer_size    128k;
+
+			proxy_connect_timeout      90;
+			proxy_send_timeout         90;
+			proxy_read_timeout         90;
+
+			proxy_buffer_size          4k;
+			proxy_buffers              4 32k;
+			proxy_busy_buffers_size    64k;
+			proxy_temp_file_write_size 64k;
+
+			include fastcgi_params;
+
+			proxy_request_buffering    off;
+
+			# Send a sub-request bbb-web to refuse before loading
+			auth_request /bigbluebutton/upload/check;
+		}
 
+		location = /bigbluebutton/upload/check {
+			internal;
+			proxy_pass                 http://127.0.0.1:8090;
+			proxy_redirect             default;
+			proxy_set_header           Content-Length "";
+			proxy_set_header           X-Forwarded-For $proxy_add_x_forwarded_for;
+			proxy_set_header           X-Original-URI $request_uri;
+			proxy_set_header           X-Content-Length $http_content_length;
+			proxy_set_header           X-Source $source;
+			proxy_set_header           X-Token $token;
+
+			# Allow 30M uploaded files
+			client_max_body_size       900m;
+			client_body_buffer_size    128k;
+
+			proxy_pass_request_body    off;
+			proxy_request_buffering    off;
+		}
+
+		location ~ "^\/bigbluebutton\/download\/(?<source>[a-z]+)\/(?<id>[a-zA-Z0-9-]+)$" {
+			proxy_pass                 http://127.0.0.1:8090;
+			proxy_redirect             default;
+			proxy_set_header           X-Forwarded-For $proxy_add_x_forwarded_for;
+			proxy_set_header           X-Original-URI $request_uri;
+			proxy_set_header           X-Source $source;
+			proxy_set_header           X-Upload-ID $id;
+
+			# Send a sub-request bbb-web to refuse before loading
+			auth_request /bigbluebutton/download/check;
+		}
+
+		location = /bigbluebutton/download/check {
+			internal;
+			proxy_pass                 http://127.0.0.1:8090;
+			proxy_pass_request_body    off;
+			proxy_set_header           Content-Length "";
+			proxy_set_header           X-Original-URI $request_uri;
+			proxy_set_header           X-Source $source;
+			proxy_set_header           X-Upload-ID $id;
+		}
 	}

From beecb598fca3c85aaedfdd42a0ee97a8701bdaaa Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 20:10:38 +0900
Subject: [PATCH 068/127] Update bigbluebutton.properties

---
 .../grails-app/conf/bigbluebutton.properties           | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/bigbluebutton-web/grails-app/conf/bigbluebutton.properties b/bigbluebutton-web/grails-app/conf/bigbluebutton.properties
index 9036abaf127a..201b737c5390 100755
--- a/bigbluebutton-web/grails-app/conf/bigbluebutton.properties
+++ b/bigbluebutton-web/grails-app/conf/bigbluebutton.properties
@@ -84,6 +84,13 @@ maxNumPages=200
 #----------------------------------------------------
 # Maximum file size for an uploaded presentation (default 30MB).
 maxFileSizeUpload=30000000
+#----------------------------------------------------
+# Maximum file size for an generic upload (default 30MB).
+maxUploadSize=900000000
+
+#----------------------------------------------------
+# Directory where BigBlueButton stores uploaded files.
+uploadDir=/var/bigbluebutton
 
 #----------------------------------------------------
 # Maximum swf file size for load to the client (default 500000).
@@ -238,6 +245,7 @@ enteredUsersTimeout=45000
 # This URL is where the BBB client is accessible. When a user sucessfully
 # enters a name and password, she is redirected here to load the client.
 # Do not commit changes to this field.
+# You need to change this according to https://docs.bigbluebutton.org/2.2/dev.html#developing-bbb-web
 bigbluebutton.web.serverURL=http://bigbluebutton.example.com
 
 
@@ -266,6 +274,7 @@ defaultConfigURL=${bigbluebutton.web.serverURL}/client/conf/config.xml
 apiVersion=2.0
 
 # Salt which is used by 3rd-party apps to authenticate api calls
+# You need to change this according to https://docs.bigbluebutton.org/2.2/dev.html#developing-bbb-web
 securitySalt=330a8b08c3b4c61533e1d0c5ce1ac88f
 
 
@@ -327,6 +336,7 @@ accessControlAllowOrigin=${bigbluebutton.web.serverURL}
 checkBBBServerEvery=10
 
 # The Red5 server where FS will publish as RTMP stream
+# You need to change this, although this is not written in the doc.
 screenshareRtmpServer=192.168.246.131
 
 # The Red5 app that receives the published RTMP stream

From 6f2c551387ac5dd6648dc76f45f16bce5eaf1ec2 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 20:12:18 +0900
Subject: [PATCH 069/127] Update resources.xml

---
 bigbluebutton-web/grails-app/conf/spring/resources.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bigbluebutton-web/grails-app/conf/spring/resources.xml b/bigbluebutton-web/grails-app/conf/spring/resources.xml
index a7ca3763a06e..21b9b34a247b 100755
--- a/bigbluebutton-web/grails-app/conf/spring/resources.xml
+++ b/bigbluebutton-web/grails-app/conf/spring/resources.xml
@@ -147,6 +147,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
         <property name="userInactivityThresholdInMinutes" value="${userInactivityThresholdInMinutes}"/>
         <property name="userActivitySignResponseDelayInMinutes" value="${userActivitySignResponseDelayInMinutes}"/>
         <property name="maxPresentationFileUpload" value="${maxFileSizeUpload}"/>
+        <property name="maxUploadSize" value="${maxUploadSize}"/>
+        <property name="uploadDir" value="${uploadDir}"/>
         <property name="clientLogoutTimerInMinutes" value="${clientLogoutTimerInMinutes}"/>
         <property name="muteOnStart" value="${muteOnStart}"/>
         <property name="allowModsToUnmuteUsers" value="${allowModsToUnmuteUsers}"/>

From 518a90f7933d1676c83d11d9520bb8c5089bf7c5 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 20:14:38 +0900
Subject: [PATCH 070/127] Update UrlMappings.groovy

---
 .../org/bigbluebutton/web/UrlMappings.groovy     | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/UrlMappings.groovy b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/UrlMappings.groovy
index 10d573ce34a7..ae010e8b6393 100755
--- a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/UrlMappings.groovy
+++ b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/UrlMappings.groovy
@@ -99,6 +99,22 @@ class UrlMappings {
       action = [GET:'checkAuthorization']
     }
 
+    "/bigbluebutton/upload/$source/$token"(controller: "upload") {
+      action = [POST: 'upload']
+    }
+
+    "/bigbluebutton/upload/check"(controller: "upload") {
+      action = [GET: 'check']
+    }
+
+    "/bigbluebutton/download/$source/$id"(controller: "download") {
+      action = [GET: 'download']
+    }
+
+    "/bigbluebutton/download/check"(controller: "download") {
+      action = [GET: 'check']
+    }
+
     "/bigbluebutton/$controller/$action?/$id?(.${format})?" {
       constraints {
         // apply constraints here

From bb125288bab158584cbebaccc4482879e54b6ee5 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 20:15:40 +0900
Subject: [PATCH 071/127] Create DownloadController.groovy

---
 .../web/controllers/DownloadController.groovy | 84 +++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/DownloadController.groovy

diff --git a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/DownloadController.groovy b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/DownloadController.groovy
new file mode 100644
index 000000000000..0119dc7ddfee
--- /dev/null
+++ b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/DownloadController.groovy
@@ -0,0 +1,84 @@
+package org.bigbluebutton.web.controllers
+
+import org.bigbluebutton.api.MeetingService
+import org.bigbluebutton.api.ParamsProcessorUtil
+import org.bigbluebutton.api.util.ParamsUtil
+import org.bigbluebutton.api.Util
+
+class DownloadController {
+  MeetingService meetingService
+  ParamsProcessorUtil paramsProcessorUtil
+
+  def check = {
+    def uri = request.getHeader("x-original-uri")
+    def source = request.getHeader("x-source")
+    def uploadId = request.getHeader("x-upload-id")
+
+    def sessionToken = ParamsUtil.getSessionToken(uri)
+    def userSession = meetingService.getUserSessionWithAuthToken(sessionToken)
+    if (userSession != null) {
+      def meetingId = userSession.meetingID
+
+      def validRequest = meetingService.isDownloadRequestValid(meetingId, source, uploadId)
+
+      if (validRequest) {
+        response.setStatus(200)
+        response.addHeader("Cache-Control", "no-cache")
+        response.contentType = 'plain/text'
+        response.outputStream << 'valid-download'
+      } else {
+        log.debug("Download failed. Invalid.")
+        response.setStatus(404)
+        response.addHeader("Cache-Control", "no-cache")
+        response.contentType = 'plain/text'
+        response.outputStream << 'invalid-download'
+      }
+    } else {
+      log.debug("Download failed. Invalid session.")
+      response.setStatus(404)
+      response.addHeader("Cache-Control", "no-cache")
+      response.contentType = 'plain/text'
+      response.outputStream << 'invalid-session'
+    }
+  }
+
+  def download = {
+    def uri = request.getHeader("x-original-uri")
+    def sessionToken = ParamsUtil.getSessionToken(uri)
+    def userSession = meetingService.getUserSessionWithAuthToken(sessionToken)
+
+    def meetingId = userSession.meetingID
+    def meeting = meetingService.getNotEndedMeetingWithId(meetingId)
+    if (meeting == null) {
+      log.debug("Download failed. No meeting running " + meetingId + ".")
+      response.setStatus(404)
+      response.addHeader("Cache-Control", "no-cache")
+      response.contentType = 'plain/text'
+      response.outputStream << 'no-meeting'
+    } else {
+      def source = request.getHeader("x-source")
+      def uploadId = request.getHeader("x-upload-id")
+      try {
+        def rootDir = paramsProcessorUtil.getUploadDir()
+        def uploadedFile = meetingService.getUploadedFile(meetingId, uploadId)
+        def downloadPath = Util.getDownloadPath(rootDir, source, meetingId, uploadId)
+        def filename = uploadId + "." + uploadedFile.extension
+        def file = new File(downloadPath + File.separatorChar + filename)
+        if (file.exists()) {
+          def bytes = file.readBytes()
+          response.addHeader("Cache-Control", "no-cache")
+          response.contentType = uploadedFile.contentType
+          response.outputStream << bytes;
+        } else {
+          log.debug("Download failed. No meeting running " + meetingId + ".")
+          response.setStatus(404)
+          response.addHeader("Cache-Control", "no-cache")
+          response.contentType = 'plain/text'
+          response.outputStream << 'no-meeting'
+        }
+      } catch (IOException e) {
+        log.debug("Download failed.")
+      }
+    }
+  }
+}

From 011cd3b151d2b2b0e7e0339c85eeb6578cb29838 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 20:16:08 +0900
Subject: [PATCH 072/127] Create UploadController.groovy

---
 .../web/controllers/UploadController.groovy   | 92 +++++++++++++++++++
 1 file changed, 92 insertions(+)
 create mode 100644 bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/UploadController.groovy

diff --git a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/UploadController.groovy b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/UploadController.groovy
new file mode 100644
index 000000000000..488d800d1cd1
--- /dev/null
+++ b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/UploadController.groovy
@@ -0,0 +1,92 @@
+package org.bigbluebutton.web.controllers
+
+import org.bigbluebutton.api.MeetingService
+import org.bigbluebutton.api.ParamsProcessorUtil
+import org.bigbluebutton.api.Util
+
+import org.apache.commons.io.FilenameUtils
+
+class UploadController {
+  MeetingService meetingService
+  ParamsProcessorUtil paramsProcessorUtil
+
+  def check = {
+    def meetingId = request.getHeader("x-meeting-id")
+    def source = request.getHeader("x-source")
+    def filename = request.getHeader("x-filename")
+    def userId = request.getHeader("x-user-id")
+    def token = request.getHeader("x-token")
+    def contentLength = request.getHeader("x-content-length")
+
+    def uploadSize = 0
+    if (contentLength.isNumber()) {
+      uploadSize = contentLength as int
+    }
+
+    def validRequest = meetingService.isUploadRequestValid(meetingId, source, filename, userId, token)
+
+    def maxUploadSize = paramsProcessorUtil.getMaxUploadSize()
+    def validSize = uploadSize != 0 && uploadSize < maxUploadSize
+
+    if (validRequest && validSize) {
+      response.setStatus(200)
+      response.addHeader("Cache-Control", "no-cache")
+      response.contentType = 'plain/text'
+      response.outputStream << 'valid-upload'
+    } else {
+      log.debug("Upload failed. Invalid")
+      response.setStatus(404)
+      response.addHeader("Cache-Control", "no-cache")
+      response.contentType = 'plain/text'
+      response.outputStream << 'invalid-upload'
+    }
+  }
+
+  def upload = {
+    def meetingId = request.getHeader("x-meeting-id")
+    def userId = request.getHeader("x-user-id")
+    def meeting = meetingService.getNotEndedMeetingWithId(meetingId)
+    if (meeting == null) {
+      log.debug("Upload failed. No meeting running " + meetingId + ".")
+      response.setStatus(404)
+      response.addHeader("Cache-Control", "no-cache")
+      response.contentType = 'plain/text'
+      response.outputStream << 'no-meeting'
+    } else {
+      def file = request.getFile('file')
+      if (file && !file.empty) {
+        def filename = file.getOriginalFilename()
+        def contentType = file.getContentType()
+        def extension = FilenameUtils.getExtension(filename)
+        def source = request.getHeader("x-source")
+
+        def rootDir = paramsProcessorUtil.getUploadDir()
+        def uploadId = Util.generateUploadId(filename)
+        def uploadDir = Util.createUploadDir(rootDir, source, meetingId, uploadId)
+
+        if (uploadDir != null) {
+          def localFilename = uploadId + "." + extension
+          def localFilePath = uploadDir.absolutePath + File.separatorChar + localFilename
+          def localFile = new File(localFilePath)
+          file.transferTo(localFile)
+
+          meetingService.fileUploaded(uploadId, source, filename, contentType, extension, userId, meetingId)
+        } else {
+          log.debug("Upload failed. Could not create upload dir.")
+          response.addHeader("Cache-Control", "no-cache")
+          response.contentType = 'plain/text'
+          response.outputStream << 'upload-failed'
+        }
+      } else {
+        log.debug("Upload failed. Empty file.")
+        response.addHeader("Cache-Control", "no-cache")
+        response.contentType = 'plain/text'
+        response.outputStream << 'upload-failed'
+      }
+      log.debug("Upload succeeded.")
+      response.addHeader("Cache-Control", "no-cache")
+      response.contentType = 'plain/text'
+      response.outputStream << 'upload-success'
+    }
+  }
+}

From e92f0b7d4fcc72c25fb929461326ffd08854b9b7 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 20:20:37 +0900
Subject: [PATCH 073/127] Update turn-stun-servers.xml

---
 bigbluebutton-web/grails-app/conf/spring/turn-stun-servers.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bigbluebutton-web/grails-app/conf/spring/turn-stun-servers.xml b/bigbluebutton-web/grails-app/conf/spring/turn-stun-servers.xml
index 90913545e05c..06d4fc7b416c 100755
--- a/bigbluebutton-web/grails-app/conf/spring/turn-stun-servers.xml
+++ b/bigbluebutton-web/grails-app/conf/spring/turn-stun-servers.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
+NOTE that you need to overwrite this with /usr/share/bbb-web/WEB-INF/classes/spring/turn-stun-servers.xml before executing ./deploy.sh of bbb-common-web!!!
 
 BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
 

From 71ce28da21505622b192d3370ff2f01cc73e8004 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 20:24:23 +0900
Subject: [PATCH 074/127] Update archive.rb

---
 record-and-playback/core/scripts/archive/archive.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/record-and-playback/core/scripts/archive/archive.rb b/record-and-playback/core/scripts/archive/archive.rb
index ea57e6ffa775..5fcae933df4c 100755
--- a/record-and-playback/core/scripts/archive/archive.rb
+++ b/record-and-playback/core/scripts/archive/archive.rb
@@ -167,6 +167,7 @@ def archive_has_recording_marks?(meeting_id, raw_archive_dir, break_timestamp)
 recording_dir = props['recording_dir']
 raw_archive_dir = "#{recording_dir}/raw"
 deskshare_dir = props['raw_deskshare_src']
+upload_dir = props['raw_upload_src']
 screenshare_dir = props['raw_screenshare_src']
 redis_host = props['redis_host']
 redis_port = props['redis_port']
@@ -205,6 +206,8 @@ def archive_has_recording_marks?(meeting_id, raw_archive_dir, break_timestamp)
 # Kurento media
 archive_directory("#{kurento_screenshare_dir}/#{meeting_id}", "#{target_dir}/deskshare")
 archive_directory("#{kurento_video_dir}/#{meeting_id}", "#{target_dir}/video/#{meeting_id}")
+# Uploaded media
+archive_directory("#{upload_dir}/#{meeting_id}", "#{target_dir}/upload")
 
 # If this was the last (or only) segment in a recording, delete the original media files
 if break_timestamp.nil?

From 85498a05440bbb64a878829ea62522b0230914a3 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 20:25:32 +0900
Subject: [PATCH 075/127] Update bigbluebutton.yml

---
 record-and-playback/core/scripts/bigbluebutton.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/record-and-playback/core/scripts/bigbluebutton.yml b/record-and-playback/core/scripts/bigbluebutton.yml
index 50d4132b1676..16f31e5870f0 100755
--- a/record-and-playback/core/scripts/bigbluebutton.yml
+++ b/record-and-playback/core/scripts/bigbluebutton.yml
@@ -6,6 +6,7 @@ kurento_screenshare_src: /var/kurento/screenshare
 raw_screenshare_src: /usr/share/red5/webapps/screenshare/streams
 raw_webrtc_deskshare_src: /usr/share/red5/webapps/video-broadcast/streams
 raw_deskshare_src: /var/bigbluebutton/deskshare
+raw_upload_src: /var/bigbluebutton/meetings
 raw_presentation_src: /var/bigbluebutton
 notes_endpoint: http://localhost:9001/p
 # Specify the notes formats we archive

From c5fe44bbfde6b5211083eaf9314dd905d754302d Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 20:30:30 +0900
Subject: [PATCH 076/127] Update deploy.sh

---
 record-and-playback/deploy.sh | 83 ++++++++++++-----------------------
 1 file changed, 27 insertions(+), 56 deletions(-)

diff --git a/record-and-playback/deploy.sh b/record-and-playback/deploy.sh
index a29d8c9d1a76..f2aebdd71245 100755
--- a/record-and-playback/deploy.sh
+++ b/record-and-playback/deploy.sh
@@ -39,61 +39,32 @@ function deploy_format() {
 }
 
 deploy_format "presentation"
-
-CAPTIONS_DIR=/var/bigbluebutton/captions/
-if [ ! -d "$CAPTIONS_DIR" ]; then
-  sudo mkdir -p $CAPTIONS_DIR
-fi
-
-EVENTS_DIR=/var/bigbluebutton/events/
-if [ ! -d "$EVENTS_DIR" ]; then
-  sudo mkdir -p $EVENTS_DIR
-fi
-
-PLAYBACK_DIR=/var/bigbluebutton/playback/
-if [ ! -d "$PLAYBACK_DIR" ]; then
-  sudo mkdir -p $PLAYBACK_DIR
-fi
-
-REC_RAW_DIR=/var/bigbluebutton/recording/raw/
-if [ ! -d "$REC_RAW_DIR" ]; then
-  sudo mkdir -p $REC_RAW_DIR
-fi
-
-REC_PROC_DIR=/var/bigbluebutton/recording/process/
-if [ ! -d "$REC_PROC_DIR" ]; then
-  sudo mkdir -p $REC_PROC_DIR
-fi
-
-REC_PUB_DIR=/var/bigbluebutton/recording/publish/
-if [ ! -d "$REC_PUB_DIR" ]; then
-  sudo mkdir -p $REC_PUB_DIR
-fi
-
-REC_STATUS_ENDED_DIR=/var/bigbluebutton/recording/status/ended/
-if [ ! -d "$REC_STATUS_ENDED_DIR" ]; then
-  sudo mkdir -p $REC_STATUS_ENDED_DIR
-fi
-
-REC_STATUS_RECORDED_DIR=/var/bigbluebutton/recording/status/recorded/
-if [ ! -d "$REC_STATUS_RECORDED_DIR" ]; then
-  sudo mkdir -p $REC_STATUS_RECORDED_DIR
-fi
-
-REC_STATUS_ARCHIVED_DIR=/var/bigbluebutton/recording/status/archived/
-if [ ! -d "$REC_STATUS_ARCHIVED_DIR" ]; then
-  sudo mkdir -p $REC_STATUS_ARCHIVED_DIR
-fi
-
-REC_STATUS_PROCESSED_DIR=/var/bigbluebutton/recording/status/processed/
-if [ ! -d "$REC_STATUS_PROCESSED_DIR" ]; then
-  sudo mkdir -p $REC_STATUS_PROCESSED_DIR
-fi
-
-REC_STATUS_SANITY_DIR=/var/bigbluebutton/recording/status/sanity/
-if [ ! -d "$REC_STATUS_SANITY_DIR" ]; then
-  sudo mkdir -p $REC_STATUS_SANITY_DIR
-fi
+## NOTE these changes are not necessary. You can Probably make the "meeting" directly manually if not present.
+
+BASE_DIR="/var/bigbluebutton"
+RECORDING_DIR="$BASE_DIR/recording"
+STATUS_DIR="$RECORDING_DIR/status"
+
+DIRS=(
+	"$BASE_DIR/captions/"
+	"$BASE_DIR/meetings/"
+	"$BASE_DIR/events/"
+	"$BASE_DIR/playback/"
+	"$RECORDING_DIR/raw/"
+	"$RECORDING_DIR/process/"
+	"$RECORDING_DIR/publish/"
+	"$RECORDING_DIR/status/ended/"
+	"$STATUS_DIR/recorded/"
+	"$STATUS_DIR/archived/"
+	"$STATUS_DIR/processed/"
+	"$STATUS_DIR/sanity/"
+)
+
+for i in "${DIRS[@]}"; do
+	if [ ! -d "$i" ]; then
+		sudo mkdir -p $i
+	fi
+done
 
 sudo mv /usr/local/bigbluebutton/core/scripts/*.nginx /etc/bigbluebutton/nginx/
 sudo service nginx reload
@@ -101,4 +72,4 @@ sudo chown -R bigbluebutton:bigbluebutton /var/bigbluebutton/ /var/log/bigbluebu
 sudo chown -R red5:red5 /var/bigbluebutton/screenshare/
 
 #cd /usr/local/bigbluebutton/core/
-#sudo bundle install
\ No newline at end of file
+#sudo bundle install

From d62b4b28a28f7bbeb81dd810b3195af10786d703 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 20:40:53 +0900
Subject: [PATCH 077/127] Update MeetingService.java

---
 .../java/org/bigbluebutton/api/MeetingService.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
index 992a05ca9e1e..e740b87a6022 100755
--- a/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
+++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
@@ -657,13 +657,6 @@ public void endMeeting(String meetingId) {
     handle(new EndMeeting(meetingId));
   }
 
-  private void processUploadRequest(UploadRequest message) {
-    Meeting m = getMeeting(message.meetingId);
-    if (m != null) {
-      m.addUploadRequest(message.source, message.filename, message.userId, message.token);
-    }
-  }
-  
   private void processCreateBreakoutRoom(CreateBreakoutRoom message) {
     Meeting parentMeeting = getMeeting(message.parentMeetingId);
     if (parentMeeting != null) {
@@ -773,6 +766,13 @@ private void processGuestStatusChangedEventMsg(GuestStatusChangedEventMsg messag
 
   }
 
+  private void processUploadRequest(UploadRequest message) {
+    Meeting m = getMeeting(message.meetingId);
+    if (m != null) {
+      m.addUploadRequest(message.source, message.filename, message.userId, message.token);
+    }
+  }
+  
   private void processPresentationUploadToken(PresentationUploadToken message) {
     uploadAuthzTokens.put(message.authzToken, message);
   }

From 2574c109cb9bf4af0ac2f2482f9fc2d9a3430058 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 20:46:29 +0900
Subject: [PATCH 078/127] Update Meeting.java

---
 .../src/main/java/org/bigbluebutton/api/domain/Meeting.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java
index 67f3e468c0b3..0f3547590a92 100755
--- a/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java
+++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java
@@ -226,7 +226,7 @@ public void setGuestStatusWithId(String userId, String guestStatus) {
 
 	}
 	
-	       public Boolean isUploadRequestValid(String source, String filename, String userId, String token) {
+       public Boolean isUploadRequestValid(String source, String filename, String userId, String token) {
                UploadRequest uploadRequest = uploadRequests.get(token);
                if (uploadRequest != null) {
                        return uploadRequest.isValid(source, filename, userId);

From 9d4946a93a32aa768a9f32ef707f498f36f6b6ac Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 20:54:52 +0900
Subject: [PATCH 079/127] Update service.js

---
 bigbluebutton-html5/imports/ui/components/chat/service.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/chat/service.js b/bigbluebutton-html5/imports/ui/components/chat/service.js
index 16e0a04184d3..5739437ec546 100755
--- a/bigbluebutton-html5/imports/ui/components/chat/service.js
+++ b/bigbluebutton-html5/imports/ui/components/chat/service.js
@@ -75,12 +75,12 @@ const reduceGroupMessages = (previous, current) => {
     time: current.timestamp,
     color: current.color,
   };
-  if (!lastMessage || !currentMessage.chatId === PUBLIC_GROUP_CHAT_ID) {
-    return previous.concat(currentMessage);
-  }
   // I do not like this
   if (current.upload) content['upload'] = current.upload;
   currentMessage.content = [content];
+  if (!lastMessage || !currentMessage.chatId === PUBLIC_GROUP_CHAT_ID) {
+    return previous.concat(currentMessage);
+  }
   // Check if the last message is from the same user and time discrepancy
   // between the two messages exceeds window and then group current
   // message with the last one

From 04eaf7e2acd503b5afd5b451ee961530ffc1e56d Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 20:58:43 +0900
Subject: [PATCH 080/127] Update component.jsx

---
 .../imports/ui/components/external-video-player/component.jsx  | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx b/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx
index fc350b87491d..b659cd52dc4d 100644
--- a/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx
@@ -60,9 +60,6 @@ class VideoPlayer extends Component {
           controls: true,
           autoPlay: true,
           playsInline: true,
-          controls: true,
-          autoPlay: true,
-          playsInline: true,
         },
       },
       dailymotion: {

From 836682acc29be612ea289a2a2a468b51738cd70f Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 21:10:40 +0900
Subject: [PATCH 081/127] Update archive.rb

---
 record-and-playback/core/scripts/archive/archive.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/record-and-playback/core/scripts/archive/archive.rb b/record-and-playback/core/scripts/archive/archive.rb
index 5fcae933df4c..acd0b63207e4 100755
--- a/record-and-playback/core/scripts/archive/archive.rb
+++ b/record-and-playback/core/scripts/archive/archive.rb
@@ -167,6 +167,7 @@ def archive_has_recording_marks?(meeting_id, raw_archive_dir, break_timestamp)
 recording_dir = props['recording_dir']
 raw_archive_dir = "#{recording_dir}/raw"
 deskshare_dir = props['raw_deskshare_src']
+# Note: modify directly /usr/local/bigbluebutton/core/scripts/archive/archive.rb
 upload_dir = props['raw_upload_src']
 screenshare_dir = props['raw_screenshare_src']
 redis_host = props['redis_host']
@@ -206,6 +207,7 @@ def archive_has_recording_marks?(meeting_id, raw_archive_dir, break_timestamp)
 # Kurento media
 archive_directory("#{kurento_screenshare_dir}/#{meeting_id}", "#{target_dir}/deskshare")
 archive_directory("#{kurento_video_dir}/#{meeting_id}", "#{target_dir}/video/#{meeting_id}")
+# Note: modify directly /usr/local/bigbluebutton/core/scripts/archive/archive.rb
 # Uploaded media
 archive_directory("#{upload_dir}/#{meeting_id}", "#{target_dir}/upload")
 

From fdeeab41074192f4e9bfadc15708bfaaca204f70 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 11 Feb 2021 21:11:31 +0900
Subject: [PATCH 082/127] Update bigbluebutton.yml

---
 record-and-playback/core/scripts/bigbluebutton.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/record-and-playback/core/scripts/bigbluebutton.yml b/record-and-playback/core/scripts/bigbluebutton.yml
index 16f31e5870f0..d5400cdbe0c5 100755
--- a/record-and-playback/core/scripts/bigbluebutton.yml
+++ b/record-and-playback/core/scripts/bigbluebutton.yml
@@ -6,6 +6,7 @@ kurento_screenshare_src: /var/kurento/screenshare
 raw_screenshare_src: /usr/share/red5/webapps/screenshare/streams
 raw_webrtc_deskshare_src: /usr/share/red5/webapps/video-broadcast/streams
 raw_deskshare_src: /var/bigbluebutton/deskshare
+# Note: modify directly /usr/local/bigbluebutton/core/scripts/archive/archive.rb
 raw_upload_src: /var/bigbluebutton/meetings
 raw_presentation_src: /var/bigbluebutton
 notes_endpoint: http://localhost:9001/p

From ed8d838fcba398e0596428797b8d96c45772bd2c Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Fri, 12 Feb 2021 01:08:12 +0900
Subject: [PATCH 083/127] Update addNotification.js

---
 .../server/modifiers/addNotification.js       | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/bigbluebutton-html5/imports/api/upload/server/modifiers/addNotification.js b/bigbluebutton-html5/imports/api/upload/server/modifiers/addNotification.js
index 41456b5bc8a5..6ba853c7e038 100644
--- a/bigbluebutton-html5/imports/api/upload/server/modifiers/addNotification.js
+++ b/bigbluebutton-html5/imports/api/upload/server/modifiers/addNotification.js
@@ -39,19 +39,15 @@ export default function addUploadedFileMsg(meetingId, userId, uploadId, source,
     },
   };
   
-  const cb = (err, numChanged) => {
-    if (err) {
-      return Logger.error(`Adding group-chat-msg uploaded file to collection: ${err}`);
-    }
-
-    const { insertedId } = numChanged;
+  try {
+    const { insertedId, numberAffected } =  GroupChatMsg.upsert(selector, modifier);
 
     if (insertedId) {
-      return Logger.info(`Added group-chat-msg uploaded file meetingId=${meetingId}`);
+      Logger.info(`Added group-chat-msg uploaded file meetingId=${meetingId}`);
+    } else if (numberAffected){
+      Logger.info(`Upserted group-chat-msg uploaded file meetingId=${meetingId}`);
     }
-
-    return Logger.info(`Upserted group-chat-msg uploaded file meetingId=${meetingId}`);
-  };
-
-  return GroupChatMsg.upsert(selector, modifier, cb);
+  } catch (err) {
+      Logger.error(`Adding group-chat-msg uploaded file to collection: ${err}`);
+  }
 }

From 4709d18b3202f68f3fe074ec096db7b323b151f9 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Fri, 12 Feb 2021 01:09:14 +0900
Subject: [PATCH 084/127] Update addUploadRequest.js

---
 .../upload/server/modifiers/addUploadRequest.js  | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/bigbluebutton-html5/imports/api/upload/server/modifiers/addUploadRequest.js b/bigbluebutton-html5/imports/api/upload/server/modifiers/addUploadRequest.js
index 2cc0d482d63a..312bb0d7ef06 100644
--- a/bigbluebutton-html5/imports/api/upload/server/modifiers/addUploadRequest.js
+++ b/bigbluebutton-html5/imports/api/upload/server/modifiers/addUploadRequest.js
@@ -31,14 +31,12 @@ export default function addUploadRequest(meetingId, source, filename, userId, su
     token,
   };
 
-  const cb = (err) => {
-    if (err) {
-      Logger.error(`Upserting upload request: ${err}`);
-      return;
+  try {
+    const { numberAffected } = UploadRequest.upsert(selector, modifier);
+    if (numberAffected) {
+      Logger.debug(`Upserting upload request filename=${filename} user=${userId} meeting=${meetingId}`);
     }
-
-    Logger.debug(`Upserting upload request filename=${filename} user=${userId} meeting=${meetingId}`);
-  };
-
-  return UploadRequest.upsert(selector, modifier, cb);
+  } catch (err) {
+    Logger.error(`Upserting upload request: ${err}`);
+  }
 }

From 78080be8e90facfa3f10dd15047f7698cee46599 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Fri, 12 Feb 2021 01:10:20 +0900
Subject: [PATCH 085/127] Update addUploadedFile.js

---
 .../upload/server/modifiers/addUploadedFile.js   | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/bigbluebutton-html5/imports/api/upload/server/modifiers/addUploadedFile.js b/bigbluebutton-html5/imports/api/upload/server/modifiers/addUploadedFile.js
index 4e4c95cd5bc8..1999517158bc 100644
--- a/bigbluebutton-html5/imports/api/upload/server/modifiers/addUploadedFile.js
+++ b/bigbluebutton-html5/imports/api/upload/server/modifiers/addUploadedFile.js
@@ -22,14 +22,12 @@ export default function addUploadedFile(meetingId, userId, uploadId, source, fil
     filename,
   };
 
-  const cb = (err) => {
-    if (err) {
-      Logger.error(`Upserting upload file: ${err}`);
-      return;
+  try {
+    const { numberAffected } = UploadedFile.upsert(selector, modifier);
+    if (numberAffected) {
+      Logger.debug(`Upserting uploaded file filename=${filename} meeting=${meetingId} source=${source}`);
     }
-
-    Logger.debug(`Upserting uploaded file filename=${filename} meeting=${meetingId} source=${source}`);
-  };
-
-  return UploadedFile.upsert(selector, modifier, cb);
+  } catch (err) {
+    Logger.error(`Upserting upload file: ${err}`);
+  }
 }

From a16d01c9464725b4d7b7872b5409ff40e068229c Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Tue, 4 May 2021 17:55:29 +0900
Subject: [PATCH 086/127] Update en.json

---
 bigbluebutton-html5/private/locales/en.json | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/bigbluebutton-html5/private/locales/en.json b/bigbluebutton-html5/private/locales/en.json
index dbbd6a828f01..62b62aefdf6c 100755
--- a/bigbluebutton-html5/private/locales/en.json
+++ b/bigbluebutton-html5/private/locales/en.json
@@ -48,19 +48,6 @@
     "app.captions.pad.dictationStop": "Stop dictation",
     "app.captions.pad.dictationOnDesc": "Turns speech recognition on",
     "app.captions.pad.dictationOffDesc": "Turns speech recognition off",
-    "app.upload.toast.uploading": "Uploading {0}",
-    "app.upload.toast.completed": "Completed {0}",
-    "app.upload.toast.error.401": "Unauthorized {0}",
-    "app.upload.toast.error.408": "Request timeout {0}",
-    "app.upload.notification.header": "A file was uploaded",
-    "app.upload.notification.disclaimer": "Note that your browser might not support this type of file.",
-    "app.upload.media.title": "Media upload",
-    "app.upload.media.message": "Drag or select media files to be uploaded",
-    "app.upload.media.filename": "Media filename",
-    "app.upload.media.options": "Media options",
-    "app.upload.media.remove": "Remove",
-    "app.upload.media.upload": "Upload",
-    "app.upload.media.cancel": "Cancel",
     "app.note.title": "Shared Notes",
     "app.note.label": "Note",
     "app.note.hideNoteLabel": "Hide note",
@@ -377,8 +364,6 @@
     "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "Screenshare locked",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Stop sharing your screen",
     "app.actionsBar.actionsDropdown.presentationDesc": "Upload your presentation",
-    "app.actionsBar.actionsDropdown.uploadMediaLabel": "Upload a media file",
-    "app.actionsBar.actionsDropdown.uploadMediaDesc": "Upload your local media file",
     "app.actionsBar.actionsDropdown.initPollDesc": "Initiate a poll",
     "app.actionsBar.actionsDropdown.desktopShareDesc": "Share your screen with others",
     "app.actionsBar.actionsDropdown.stopDesktopShareDesc": "Stop sharing your screen with",
@@ -748,7 +733,6 @@
     "app.externalVideo.urlInput": "Add Video URL",
     "app.externalVideo.urlError": "This video URL isn't supported",
     "app.externalVideo.close": "Close",
-    "app.externalVideo.filename": "Media filename",
     "app.externalVideo.autoPlayWarning": "Play the video to enable media synchronization",
     "app.network.connection.effective.slow": "We're noticing connectivity issues.",
     "app.network.connection.effective.slow.help": "More information",

From 2d8060471c0551d9775aba40fb7e23f4e5b09a2f Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Tue, 4 May 2021 17:58:38 +0900
Subject: [PATCH 087/127] Update ja.json

---
 bigbluebutton-html5/private/locales/ja.json | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/bigbluebutton-html5/private/locales/ja.json b/bigbluebutton-html5/private/locales/ja.json
index 53fa1dbd46c7..9fbe50e8cc0f 100644
--- a/bigbluebutton-html5/private/locales/ja.json
+++ b/bigbluebutton-html5/private/locales/ja.json
@@ -48,19 +48,6 @@
     "app.captions.pad.dictationStop": "口述終了",
     "app.captions.pad.dictationOnDesc": "音声認識オン",
     "app.captions.pad.dictationOffDesc": "音声認識オフ",
-    "app.upload.toast.uploading": "アップロード中 {0}",
-    "app.upload.toast.completed": "完了 {0}",
-    "app.upload.toast.error.401": "許可がありません {0}",
-    "app.upload.toast.error.408": "要求がタイムアウトしました {0}",
-    "app.upload.notification.header": "ファイルがアップロードされました",
-    "app.upload.notification.disclaimer": "ブラウザがこのタイプのファイルをサポートしない可能性に注意してください",
-    "app.upload.media.title": "メディアアップロード",
-    "app.upload.media.message": "アップロードするメディアファイルをドラッグまたは選択してください",
-    "app.upload.media.filename": "メディアファイル名",
-    "app.upload.media.options": "メディアオプション",
-    "app.upload.media.remove": "削除",
-    "app.upload.media.upload": "アップロード",
-    "app.upload.media.cancel": "キャンセル",
     "app.note.title": "共有メモ",
     "app.note.label": "メモ",
     "app.note.hideNoteLabel": "メモを隠す",
@@ -377,8 +364,6 @@
     "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "画面共有ロック",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "画面共有をやめる",
     "app.actionsBar.actionsDropdown.presentationDesc": "プレゼンテーションをアップロード",
-    "app.actionsBar.actionsDropdown.uploadMediaLabel": "メディアファイルをアップロード",
-    "app.actionsBar.actionsDropdown.uploadMediaDesc": "ローカルのメディアファイルをアップロード",
     "app.actionsBar.actionsDropdown.initPollDesc": "投票を初期化",
     "app.actionsBar.actionsDropdown.desktopShareDesc": "他の人と画面を共有する",
     "app.actionsBar.actionsDropdown.stopDesktopShareDesc": "画面共有をやめる：",
@@ -748,7 +733,6 @@
     "app.externalVideo.urlInput": "動画URLを追加",
     "app.externalVideo.urlError": "この動画URLは再生できませんでした",
     "app.externalVideo.close": "閉じる",
-    "app.externalVideo.filename": "メディアファイル名",
     "app.externalVideo.autoPlayWarning": "音声同期するには動画を再生してください",
     "app.network.connection.effective.slow": "接続の問題が発生しました",
     "app.network.connection.effective.slow.help": "ヘルプ",

From b33528d684c77e58edc7f6dfa7302ebe36f35d5a Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Tue, 4 May 2021 18:20:01 +0900
Subject: [PATCH 088/127] Update component.jsx

---
 .../message-list-item/component.jsx           | 40 +++++++------------
 1 file changed, 15 insertions(+), 25 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/component.jsx b/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/component.jsx
index 232f373240b7..a856ebf204bd 100644
--- a/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/component.jsx
@@ -6,7 +6,6 @@ import Icon from '/imports/ui/components/icon/component';
 import UserAvatar from '/imports/ui/components/user-avatar/component';
 import cx from 'classnames';
 import Message from './message/component';
-import UploadService from '/imports/ui/components/upload/service';
 import PollService from '/imports/ui/components/poll/service';
 import { styles } from './styles';
 
@@ -77,34 +76,25 @@ class MessageListItem extends Component {
       messages,
       chatAreaId,
       handleReadMessage,
-      intl,
     } = this.props;
 
     return (
       <div className={styles.item}>
         <div className={styles.messages}>
-        {messages.map(message => {
-          const {
-            id,
-            time,
-            upload,
-          } = message;
-
-          const text = upload ? UploadService.getNotification(upload, intl) : message.text;
-
-          if (text === '') return null;
-
-          return (
-            <Message
-              className={(id ? styles.systemMessage : null)}
-              key={_.uniqueId('id-')}
-              text={text}
-              time={time}
-              chatAreaId={chatAreaId}
-              handleReadMessage={handleReadMessage}
-            />
-          );
-        })}
+          {messages.map(message => (
+            message.text !== ''
+              ? (
+                <Message
+                  className={(message.id ? styles.systemMessage : styles.systemMessageNoBorder)}
+                  key={message.id ? message.id : _.uniqueId('id-')}
+                  text={message.text}
+                  time={message.time}
+                  isSystemMessage={message.id ? true : false}
+                  chatAreaId={chatAreaId}
+                  handleReadMessage={handleReadMessage}
+                />
+              ) : null
+          ))}
         </div>
       </div>
     );
@@ -241,7 +231,7 @@ class MessageListItem extends Component {
       user,
     } = this.props;
 
-    if (!user || (user && !user.name)) {
+    if (!user) {
       return this.renderSystemMessage();
     }
 

From 31ff31521a0931600ef4563474ce728d6e20e973 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Tue, 4 May 2021 19:09:05 +0900
Subject: [PATCH 089/127] Update en.json

---
 bigbluebutton-html5/public/locales/en.json | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/bigbluebutton-html5/public/locales/en.json b/bigbluebutton-html5/public/locales/en.json
index dc2c9d45722c..64792369b9a5 100755
--- a/bigbluebutton-html5/public/locales/en.json
+++ b/bigbluebutton-html5/public/locales/en.json
@@ -49,6 +49,19 @@
     "app.captions.pad.dictationStop": "Stop dictation",
     "app.captions.pad.dictationOnDesc": "Turns speech recognition on",
     "app.captions.pad.dictationOffDesc": "Turns speech recognition off",
+    "app.upload.toast.uploading": "Uploading {0}",
+    "app.upload.toast.completed": "Completed {0}",
+    "app.upload.toast.error.401": "Unauthorized {0}",
+    "app.upload.toast.error.408": "Request timeout {0}",
+    "app.upload.notification.header": "A file was uploaded",
+    "app.upload.notification.disclaimer": "Note that your browser might not support this type of file.",
+    "app.upload.media.title": "Media upload",
+    "app.upload.media.message": "Drag or select media files to be uploaded",
+    "app.upload.media.filename": "Media filename",
+    "app.upload.media.options": "Media options",
+    "app.upload.media.remove": "Remove",
+    "app.upload.media.upload": "Upload",
+    "app.upload.media.cancel": "Cancel",
     "app.textInput.sendLabel": "Send",
     "app.note.title": "Shared Notes",
     "app.note.label": "Note",
@@ -392,6 +405,8 @@
     "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "Screenshare locked",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Stop sharing your screen",
     "app.actionsBar.actionsDropdown.presentationDesc": "Upload your presentation",
+    "app.actionsBar.actionsDropdown.uploadMediaLabel": "Upload a media file",
+    "app.actionsBar.actionsDropdown.uploadMediaDesc": "Upload your local media file",
     "app.actionsBar.actionsDropdown.initPollDesc": "Initiate a poll",
     "app.actionsBar.actionsDropdown.desktopShareDesc": "Share your screen with others",
     "app.actionsBar.actionsDropdown.stopDesktopShareDesc": "Stop sharing your screen with",
@@ -785,6 +800,7 @@
     "app.externalVideo.urlInput": "Add Video URL",
     "app.externalVideo.urlError": "This video URL isn't supported",
     "app.externalVideo.close": "Close",
+    "app.externalVideo.filename": "Media filename",
     "app.externalVideo.autoPlayWarning": "Play the video to enable media synchronization",
     "app.network.connection.effective.slow": "We're noticing connectivity issues.",
     "app.network.connection.effective.slow.help": "More information",

From dcd350a07dbb64050cbabd9a6463364477ee2fec Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Tue, 4 May 2021 19:10:31 +0900
Subject: [PATCH 090/127] Update ja.json

---
 bigbluebutton-html5/public/locales/ja.json | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/bigbluebutton-html5/public/locales/ja.json b/bigbluebutton-html5/public/locales/ja.json
index 49525860fecc..67733281d9c4 100644
--- a/bigbluebutton-html5/public/locales/ja.json
+++ b/bigbluebutton-html5/public/locales/ja.json
@@ -48,6 +48,19 @@
     "app.captions.pad.dictationStop": "口述終了",
     "app.captions.pad.dictationOnDesc": "音声認識オン",
     "app.captions.pad.dictationOffDesc": "音声認識オフ",
+    "app.upload.toast.uploading": "アップロード中 {0}",
+    "app.upload.toast.completed": "完了 {0}",
+    "app.upload.toast.error.401": "許可がありません {0}",
+    "app.upload.toast.error.408": "要求がタイムアウトしました {0}",
+    "app.upload.notification.header": "ファイルがアップロードされました",
+    "app.upload.notification.disclaimer": "ブラウザがこのタイプのファイルをサポートしない可能性に注意してください",
+    "app.upload.media.title": "メディアアップロード",
+    "app.upload.media.message": "アップロードするメディアファイルをドラッグまたは選択してください",
+    "app.upload.media.filename": "メディアファイル名",
+    "app.upload.media.options": "メディアオプション",
+    "app.upload.media.remove": "削除",
+    "app.upload.media.upload": "アップロード",
+    "app.upload.media.cancel": "キャンセル",
     "app.textInput.sendLabel": "送る",
     "app.note.title": "共有メモ",
     "app.note.label": "メモ",
@@ -388,6 +401,8 @@
     "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "画面共有ロック",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "画面共有をやめる",
     "app.actionsBar.actionsDropdown.presentationDesc": "プレゼンテーションをアップロード",
+    "app.actionsBar.actionsDropdown.uploadMediaLabel": "メディアファイルをアップロード",
+    "app.actionsBar.actionsDropdown.uploadMediaDesc": "ローカルのメディアファイルをアップロード",
     "app.actionsBar.actionsDropdown.initPollDesc": "投票を初期化",
     "app.actionsBar.actionsDropdown.desktopShareDesc": "他の人と画面を共有する",
     "app.actionsBar.actionsDropdown.stopDesktopShareDesc": "画面共有をやめる：",
@@ -781,6 +796,7 @@
     "app.externalVideo.urlInput": "動画URLを追加",
     "app.externalVideo.urlError": "この動画URLは再生できませんでした",
     "app.externalVideo.close": "閉じる",
+    "app.externalVideo.filename": "メディアファイル名",
     "app.externalVideo.autoPlayWarning": "音声同期するには動画を再生してください",
     "app.network.connection.effective.slow": "接続の問題が発生しました",
     "app.network.connection.effective.slow.help": "ヘルプ",

From 7b65fb0c7b01b6735882c5c942ed9ab0ab6c5f2d Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Tue, 4 May 2021 19:14:50 +0900
Subject: [PATCH 091/127] Update component.jsx

---
 .../time-window-chat-item/component.jsx       | 40 ++++++++++++-------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/chat/time-window-list/time-window-chat-item/component.jsx b/bigbluebutton-html5/imports/ui/components/chat/time-window-list/time-window-chat-item/component.jsx
index 859ed751e80c..ac189bcfa02d 100644
--- a/bigbluebutton-html5/imports/ui/components/chat/time-window-list/time-window-chat-item/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/chat/time-window-list/time-window-chat-item/component.jsx
@@ -6,6 +6,7 @@ import UserAvatar from '/imports/ui/components/user-avatar/component';
 import cx from 'classnames';
 import ChatLogger from '/imports/ui/components/chat/chat-logger/ChatLogger';
 import MessageChatItem from './message-chat-item/component';
+import UploadService from '/imports/ui/components/upload/service';
 import PollService from '/imports/ui/components/poll/service';
 import Icon from '/imports/ui/components/icon/component';
 import { styles } from './styles';
@@ -85,21 +86,30 @@ class TimeWindowChatItem extends PureComponent {
     return (
       <div className={styles.item} key={`time-window-chat-item-${messageKey}`}>
         <div className={styles.messages}>
-          {messages.map(message => (
-            message.text !== ''
-              ? (
-                <MessageChatItem
-                  className={(message.id ? styles.systemMessage : styles.systemMessageNoBorder)}
-                  key={message.id ? message.id : _.uniqueId('id-')}
-                  text={intlMessages[message.text] ? intl.formatMessage(intlMessages[message.text]) : message.text }
-                  time={message.time}
-                  isSystemMessage={message.id ? true : false}
-                  systemMessageType={message.text === 'PUBLIC_CHAT_CLEAR' ? 'chatClearMessageText' : 'chatWelcomeMessageText'}
-                  chatAreaId={chatAreaId}
-                  handleReadMessage={handleReadMessage}
-                />
-              ) : null
-          ))}
+        {messages.map(message => {
+          const {
+            id,
+            time,
+            upload,
+          } = message;
+
+          const text = upload ? UploadService.getNotification(upload, intl) : (intlMessages[message.text] ? intl.formatMessage(intlMessages[message.text]) : message.text);
+
+          if (text === '') return null;
+
+          return (
+            <MessageChatItem
+              className={(id ? styles.systemMessage : styles.systemMessageNoBorder)}
+              key={message.id ? message.id : _.uniqueId('id-')}
+              text={text}
+              time={time}
+              isSystemMessage={id ? true : false}
+              systemMessageType={message.text === 'PUBLIC_CHAT_CLEAR' ? 'chatClearMessageText' : 'chatWelcomeMessageText'}
+              chatAreaId={chatAreaId}
+              handleReadMessage={handleReadMessage}
+            />
+          );
+        })}
         </div>
       </div>
     );

From 29e1490197204a56b922670ae8ccd68c62af881d Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Wed, 5 May 2021 08:13:48 +0900
Subject: [PATCH 092/127] Update ja.json

---
 bigbluebutton-html5/public/locales/ja.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bigbluebutton-html5/public/locales/ja.json b/bigbluebutton-html5/public/locales/ja.json
index 67733281d9c4..5d005432dd36 100644
--- a/bigbluebutton-html5/public/locales/ja.json
+++ b/bigbluebutton-html5/public/locales/ja.json
@@ -53,7 +53,7 @@
     "app.upload.toast.error.401": "許可がありません {0}",
     "app.upload.toast.error.408": "要求がタイムアウトしました {0}",
     "app.upload.notification.header": "ファイルがアップロードされました",
-    "app.upload.notification.disclaimer": "ブラウザがこのタイプのファイルをサポートしない可能性に注意してください",
+    "app.upload.notification.disclaimer": "ブラウザが、このファイルタイプをサポートしていない可能性もあります。注意してください",
     "app.upload.media.title": "メディアアップロード",
     "app.upload.media.message": "アップロードするメディアファイルをドラッグまたは選択してください",
     "app.upload.media.filename": "メディアファイル名",

From 52078e999c81d246c91b61166e92107e31cb5336 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Wed, 5 May 2021 08:17:02 +0900
Subject: [PATCH 093/127] Update context.jsx

---
 .../components/components-data/chat-context/context.jsx   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/components-data/chat-context/context.jsx b/bigbluebutton-html5/imports/ui/components/components-data/chat-context/context.jsx
index 738fcce96a7a..7dc06ebc2e6a 100644
--- a/bigbluebutton-html5/imports/ui/components/components-data/chat-context/context.jsx
+++ b/bigbluebutton-html5/imports/ui/components/components-data/chat-context/context.jsx
@@ -67,15 +67,17 @@ const generateStateWithNewMessage = (msg, state, msgType = MESSAGE_TYPES.HISTORY
 
     const indexValue = chatIndex ? (chatIndex + 1) : 1;
     const messageKey = key + '-' + indexValue;
+    const content = [{ id: msg.id, text: msg.message, time: msg.timestamp }];
+    if (msg.upload) {
+      content[0].upload = msg.upload;
+    }
     const tempGroupMessage = {
       [messageKey]: {
         ...restMsg,
         key: messageKey,
         lastTimestamp: msg.timestamp,
         read: msg.chatId === PUBLIC_CHAT_KEY && msg.timestamp <= getLoginTime() ? true : !!removedMessagesReadState[msg.id],
-        content: [
-          { id: msg.id, text: msg.message, time: msg.timestamp },
-        ],
+        content,
       }
     };
   

From cc2fc545cf6e6f63eddc74aecdc96d30ddae5267 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Wed, 5 May 2021 08:23:29 +0900
Subject: [PATCH 094/127] Update addNotification.js

---
 .../imports/api/upload/server/modifiers/addNotification.js    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bigbluebutton-html5/imports/api/upload/server/modifiers/addNotification.js b/bigbluebutton-html5/imports/api/upload/server/modifiers/addNotification.js
index 6ba853c7e038..df8d7cad705c 100644
--- a/bigbluebutton-html5/imports/api/upload/server/modifiers/addNotification.js
+++ b/bigbluebutton-html5/imports/api/upload/server/modifiers/addNotification.js
@@ -6,6 +6,8 @@ import { GroupChatMsg } from '/imports/api/group-chat-msg';
 const CHAT = Meteor.settings.public.chat;
 const SYSTEM_ID = CHAT.type_system;
 const CHAT_ID = 'MAIN-PUBLIC-GROUP-CHAT';
+const CHAT_CONFIG = Meteor.settings.public.chat;
+const SYSTEM_CHAT_TYPE = CHAT_CONFIG.type_system;
 
 export default function addUploadedFileMsg(meetingId, userId, uploadId, source, filename) {
   check(meetingId, String);
@@ -25,7 +27,7 @@ export default function addUploadedFileMsg(meetingId, userId, uploadId, source,
   const selector = {
     meetingId,
     chatId: CHAT_ID,
-    id: `upload-msg-${now}`,
+    id: `${SYSTEM_CHAT_TYPE}-upload-msg-${now}`,
   };
 
   const modifier = {

From ae9a8dd1b750080f372d4d5551fc5019c77bad71 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Wed, 5 May 2021 10:49:28 +0900
Subject: [PATCH 095/127] Update service.js

---
 .../imports/ui/components/chat/service.js          | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/chat/service.js b/bigbluebutton-html5/imports/ui/components/chat/service.js
index 9355f41744e5..9c990d03d614 100755
--- a/bigbluebutton-html5/imports/ui/components/chat/service.js
+++ b/bigbluebutton-html5/imports/ui/components/chat/service.js
@@ -81,15 +81,19 @@ const mapGroupMessage = (message) => {
 const reduceGroupMessages = (previous, current) => {
   const lastMessage = previous[previous.length - 1];
   const currentMessage = current;
-  const content = {
+  currentMessage.content = [{
+//  const content = {
     id: current.id,
     text: current.message,
     time: current.timestamp,
     color: current.color,
-  };
-  // I do not like this
-  if (current.upload) content['upload'] = current.upload;
-  currentMessage.content = [content];
+  }];
+//  };
+//  // I (Pedro) do not like this 
+      //-> [21.05.05 for BBB2.3] It is transferring "upload" under curreneMessage.content,
+      //    which is done now by ui/component/components-data/chat-context/context.jsx
+//  if (current.upload) content['upload'] = current.upload;
+//  currentMessage.content = [content];
   if (!lastMessage) {
     return previous.concat(currentMessage);
   }

From 652161587ca3246cd137e401be93221dbaa7de3b Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Sat, 12 Jun 2021 15:21:34 +0900
Subject: [PATCH 096/127] Update Meeting.java

---
 .../src/main/java/org/bigbluebutton/api/domain/Meeting.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java
index 1af656b910c8..7e295997df22 100755
--- a/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java
+++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java
@@ -86,7 +86,7 @@ public class Meeting {
 	private Boolean allowModsToUnmuteUsers = false;
 	private Boolean meetingKeepEvents;
   
-  private  HashMap<String, UploadRequest> uploadRequests = new HashMap<String, UploadRequest>();
+	private  HashMap<String, UploadRequest> uploadRequests = new HashMap<String, UploadRequest>();
 	private  HashMap<String, UploadedFile> uploadedFiles = new HashMap<String, UploadedFile>();
 
 	private Integer meetingExpireIfNoUserJoinedInMinutes = 5;
@@ -241,9 +241,9 @@ public void setGuestStatusWithId(String userId, String guestStatus) {
 
 	}
   
-  public Boolean isUploadRequestValid(String source, String filename, String userId, String token) {
+	public Boolean isUploadRequestValid(String source, String filename, String userId, String token) {
 		UploadRequest uploadRequest = uploadRequests.get(token);
-	  if (uploadRequest != null) {
+		if (uploadRequest != null) {
 			return uploadRequest.isValid(source, filename, userId);
 		} else {
 			return false;

From 25ed1ddd232fab453fa1ab7d0a1e87948a90923d Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Sat, 12 Jun 2021 22:25:41 +0900
Subject: [PATCH 097/127] Update component.jsx

---
 .../chat/time-window-list/time-window-chat-item/component.jsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bigbluebutton-html5/imports/ui/components/chat/time-window-list/time-window-chat-item/component.jsx b/bigbluebutton-html5/imports/ui/components/chat/time-window-list/time-window-chat-item/component.jsx
index cacf8d83d3d9..3d3ecaf51cad 100644
--- a/bigbluebutton-html5/imports/ui/components/chat/time-window-list/time-window-chat-item/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/chat/time-window-list/time-window-chat-item/component.jsx
@@ -102,7 +102,7 @@ class TimeWindowChatItem extends PureComponent {
                 <MessageChatItem
                   className={(message.id ? styles.systemMessage : styles.systemMessageNoBorder)}
                   key={message.id ? message.id : _.uniqueId('id-')}
-                  text={intlMessages[message.text] ? intl.formatMessage(intlMessages[message.text]) : message.text }
+                  text={intlMessages[text] ? intl.formatMessage(intlMessages[text]) : text }
                   time={message.time}
                   isSystemMessage={message.id ? true : false}
                   systemMessageType={message.text === CHAT_CLEAR_MESSAGE ? 'chatClearMessageText' : 'chatWelcomeMessageText'}

From 6281981cf53ae42a769162e09c7a65fc09567349 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Wed, 29 Sep 2021 20:17:16 +0900
Subject: [PATCH 098/127] Update component.jsx

---
 .../ui/components/actions-bar/actions-dropdown/component.jsx    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
index c3ecfd4c90a1..cbe04f0185e4 100755
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
@@ -219,7 +219,7 @@ class ActionsDropdown extends PureComponent {
       actions.push({
         icon: "upload",
         label: formatMessage(uploadMediaLabel),
-        key: this.uploadMediaI,
+        key: this.uploadMediaId,
         onClick: this.handleUploadMediaClick,
       })
     }

From 15addd3fa8f97fb5d3bade521d65c494913dec06 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Wed, 29 Sep 2021 20:17:37 +0900
Subject: [PATCH 099/127] Update component.jsx

---
 .../ui/components/actions-bar/actions-dropdown/component.jsx    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
index c3ecfd4c90a1..cbe04f0185e4 100755
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
@@ -219,7 +219,7 @@ class ActionsDropdown extends PureComponent {
       actions.push({
         icon: "upload",
         label: formatMessage(uploadMediaLabel),
-        key: this.uploadMediaI,
+        key: this.uploadMediaId,
         onClick: this.handleUploadMediaClick,
       })
     }

From 92fadce1df1946c5e94ff56e22e9fc835bdfc3b4 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 30 Sep 2021 11:13:43 +0900
Subject: [PATCH 100/127] Update Meeting.java

---
 .../org/bigbluebutton/api/domain/Meeting.java | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java
index 44e87f67174d..d2633189ec0f 100755
--- a/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java
+++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java
@@ -87,10 +87,10 @@ public class Meeting {
 	private Boolean muteOnStart = false;
 	private Boolean allowModsToUnmuteUsers = false;
 	private Boolean meetingKeepEvents;
-
-  private  HashMap<String, UploadRequest> uploadRequests = new HashMap<String, UploadRequest>();
+	
+	private  HashMap<String, UploadRequest> uploadRequests = new HashMap<String, UploadRequest>();
 	private  HashMap<String, UploadedFile> uploadedFiles = new HashMap<String, UploadedFile>();
-  
+
 	private Integer meetingExpireIfNoUserJoinedInMinutes = 5;
 	private Integer meetingExpireWhenLastUserLeftInMinutes = 1;
 	private Integer userInactivityInspectTimerInMinutes = 120;
@@ -164,19 +164,19 @@ public void addBreakoutRoom(String meetingId) {
 		breakoutRooms.add(meetingId);
 	}
 
-  public void addUploadRequest(String source, String filename, String userId, String token) {
+	public List<String> getBreakoutRooms() {
+		return breakoutRooms;
+	}
+	
+	public void addUploadRequest(String source, String filename, String userId, String token) {
 		UploadRequest uploadRequest = new UploadRequest(source, filename, userId);
 		uploadRequests.put(token, uploadRequest);
 	}
-
+	
 	public void addUploadedFile(String source, String filename, String contentType, String extension, String uploadId)  {
 		UploadedFile uploadedFile = new UploadedFile(source, filename, contentType, extension);
 		uploadedFiles.put(uploadId, uploadedFile);
 	}
-  
-	public List<String> getBreakoutRooms() {
-		return breakoutRooms;
-	}
 
 	public Map<String, String> getPads() {
 		return pads;
@@ -214,29 +214,29 @@ public void setGuestStatusWithId(String userId, String guestStatus) {
 
 	}
 
-  public Boolean isUploadRequestValid(String source, String filename, String userId, String token) {
+	public Boolean isUploadRequestValid(String source, String filename, String userId, String token) {
 		UploadRequest uploadRequest = uploadRequests.get(token);
 		if (uploadRequest != null) {
-			return uploadRequest.isValid(source, filename, userId);
+			return uploadRequest.isValid(source, filename, userId);^
 		} else {
 			return false;
 		}
 	}
-
+	
 	public Boolean hasUploadedFile(String source, String uploadId) {
-		UploadedFile uploadedFile = uploadedFiles.get(uploadId);
+		UploadedFile uploadedFile = uploadedFiles.get(uploadId);^
 		if (uploadedFile != null) {
 			return source.equals(uploadedFile.source);
 		} else {
 			return false;
 		}
 	}
-
+	
 	public UploadedFile getUploadedFile(String uploadId) {
 		UploadedFile uploadedFile = uploadedFiles.get(uploadId);
 		return uploadedFile;
 	}
-
+	
 	public RegisteredUser getRegisteredUserWithAuthToken(String authToken) {
 		for (RegisteredUser ruser : registeredUsers.values()) {
 			if (ruser.authToken.equals(authToken)) {

From cc4dfa2a8a14b33555b0d8c2f25cf67f2ae42e3b Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 30 Sep 2021 12:42:47 +0900
Subject: [PATCH 101/127] Add files via upload

---
 .../org/bigbluebutton/api/domain/Meeting.java | 1910 ++++++++---------
 1 file changed, 937 insertions(+), 973 deletions(-)

diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java
index d2633189ec0f..3b7875d821b3 100755
--- a/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java
+++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java
@@ -1,973 +1,937 @@
-/**
-* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
-*
-* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below).
-*
-* This program is free software; you can redistribute it and/or modify it under the
-* terms of the GNU Lesser General Public License as published by the Free Software
-* Foundation; either version 3.0 of the License, or (at your option) any later
-* version.
-*
-* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
-* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public License along
-* with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-package org.bigbluebutton.api.domain;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.locks.Lock;
-
-import org.apache.commons.lang3.RandomStringUtils;
-
-public class Meeting {
-
-	public static final String ROLE_MODERATOR = "MODERATOR";
-	public static final String ROLE_ATTENDEE = "VIEWER";
-
-	private String name;
-	private String extMeetingId;
-	private String intMeetingId;
-	private String parentMeetingId = "bbb-none"; // Initialize so we don't send null in the json message.
-	private Integer sequence = 0;
-	private Boolean freeJoin = false;
-  private Integer duration = 0;
-	private long createdTime = 0;
-	private long startTime = 0;
-	private long endTime = 0;
-	private boolean forciblyEnded = false;
-	private String telVoice;
-	private String webVoice;
-	private String moderatorPass;
-	private String viewerPass;
-	private Boolean learningDashboardEnabled;
-	private int learningDashboardCleanupDelayInMinutes;
-	private String learningDashboardAccessToken;
-	private String welcomeMsgTemplate;
-	private String welcomeMsg;
-	private String modOnlyMessage = "";
-	private String logoutUrl;
-	private int logoutTimer = 0;
-	private int maxUsers;
-	private String bannerColor = "#FFFFFF";
-	private String bannerText = "";
-	private boolean record;
-	private boolean autoStartRecording = false;
-	private boolean allowStartStopRecording = false;
-	private boolean haveRecordingMarks = false;
-	private boolean webcamsOnlyForModerator = false;
-	private String dialNumber;
-	private String defaultAvatarURL;
-	private String guestPolicy = GuestPolicy.ASK_MODERATOR;
-	private String guestLobbyMessage = "";
-	private Boolean authenticatedGuest = false;
-	private String meetingLayout = MeetingLayout.SMART_LAYOUT;
-	private boolean userHasJoined = false;
-	private Map<String, String> pads;
-	private Map<String, String> metadata;
-	private Map<String, Object> userCustomData;
-	private final ConcurrentMap<String, User> users;
-	private final ConcurrentMap<String, RegisteredUser> registeredUsers;
-	private final ConcurrentMap<String, Long> enteredUsers;
-	private final Boolean isBreakout;
-	private final List<String> breakoutRooms = new ArrayList<>();
-	private String customLogoURL = "";
-	private String customCopyright = "";
-	private Boolean muteOnStart = false;
-	private Boolean allowModsToUnmuteUsers = false;
-	private Boolean meetingKeepEvents;
-	
-	private  HashMap<String, UploadRequest> uploadRequests = new HashMap<String, UploadRequest>();
-	private  HashMap<String, UploadedFile> uploadedFiles = new HashMap<String, UploadedFile>();
-
-	private Integer meetingExpireIfNoUserJoinedInMinutes = 5;
-	private Integer meetingExpireWhenLastUserLeftInMinutes = 1;
-	private Integer userInactivityInspectTimerInMinutes = 120;
-	private Integer userInactivityThresholdInMinutes = 30;
-    private Integer userActivitySignResponseDelayInMinutes = 5;
-    private Boolean endWhenNoModerator = false;
-    private Integer endWhenNoModeratorDelayInMinutes = 1;
-
-	public final BreakoutRoomsParams breakoutRoomsParams;
-	public final LockSettingsParams lockSettingsParams;
-
-	public final Boolean allowDuplicateExtUserid;
-
-	private String meetingEndedCallbackURL = "";
-
-	private Integer html5InstanceId;
-
-    public Meeting(Meeting.Builder builder) {
-        name = builder.name;
-        extMeetingId = builder.externalId;
-        intMeetingId = builder.internalId;
-        viewerPass = builder.viewerPass;
-        moderatorPass = builder.moderatorPass;
-		learningDashboardEnabled = builder.learningDashboardEnabled;
-		learningDashboardCleanupDelayInMinutes = builder.learningDashboardCleanupDelayInMinutes;
-		learningDashboardAccessToken = builder.learningDashboardAccessToken;
-        maxUsers = builder.maxUsers;
-        bannerColor = builder.bannerColor;
-        bannerText = builder.bannerText;
-        logoutUrl = builder.logoutUrl;
-        logoutTimer = builder.logoutTimer;
-        defaultAvatarURL = builder.defaultAvatarURL;
-        record = builder.record;
-        autoStartRecording = builder.autoStartRecording;
-        allowStartStopRecording = builder.allowStartStopRecording;
-        webcamsOnlyForModerator = builder.webcamsOnlyForModerator;
-        duration = builder.duration;
-        webVoice = builder.webVoice;
-        telVoice = builder.telVoice;
-        welcomeMsgTemplate = builder.welcomeMsgTemplate;
-        welcomeMsg = builder.welcomeMsg;
-        dialNumber = builder.dialNumber;
-        metadata = builder.metadata;
-        createdTime = builder.createdTime;
-        isBreakout = builder.isBreakout;
-        guestPolicy = builder.guestPolicy;
-        authenticatedGuest = builder.authenticatedGuest;
-				meetingLayout = builder.meetingLayout;
-        breakoutRoomsParams = builder.breakoutRoomsParams;
-        lockSettingsParams = builder.lockSettingsParams;
-        allowDuplicateExtUserid = builder.allowDuplicateExtUserid;
-        endWhenNoModerator = builder.endWhenNoModerator;
-        endWhenNoModeratorDelayInMinutes = builder.endWhenNoModeratorDelayInMinutes;
-        html5InstanceId = builder.html5InstanceId;
-
-        /*
-         * A pad is a pair of padId and readOnlyId that represents
-         * valid etherpads instances for this meeting. They can be:
-         *  - shared notes
-         *  - closed captions
-         */
-        pads = new HashMap<>();
-        userCustomData = new HashMap<>();
-
-        users = new ConcurrentHashMap<>();
-        registeredUsers = new ConcurrentHashMap<>();
-        enteredUsers = new  ConcurrentHashMap<>();
-    }
-
-	public void addBreakoutRoom(String meetingId) {
-		breakoutRooms.add(meetingId);
-	}
-
-	public List<String> getBreakoutRooms() {
-		return breakoutRooms;
-	}
-	
-	public void addUploadRequest(String source, String filename, String userId, String token) {
-		UploadRequest uploadRequest = new UploadRequest(source, filename, userId);
-		uploadRequests.put(token, uploadRequest);
-	}
-	
-	public void addUploadedFile(String source, String filename, String contentType, String extension, String uploadId)  {
-		UploadedFile uploadedFile = new UploadedFile(source, filename, contentType, extension);
-		uploadedFiles.put(uploadId, uploadedFile);
-	}
-
-	public Map<String, String> getPads() {
-		return pads;
-	}
-
-	public Map<String, String> getMetadata() {
-		return metadata;
-	}
-
-	public Collection<User> getUsers() {
-		return users.isEmpty() ? Collections.<User>emptySet() : Collections.unmodifiableCollection(users.values());
-	}
-
-	public ConcurrentMap<String, User> getUsersMap() {
-	    return users;
-	}
-
-	public void guestIsWaiting(String userId) {
-		RegisteredUser ruser = registeredUsers.get(userId);
-		if (ruser != null) {
-			ruser.updateGuestWaitedOn();
-		}
-	}
-
-	public void setGuestStatusWithId(String userId, String guestStatus) {
-    	User user = getUserById(userId);
-    	if (user != null) {
-    		user.setGuestStatus(guestStatus);
-		}
-
-		RegisteredUser ruser = registeredUsers.get(userId);
-		if (ruser != null) {
-			ruser.setGuestStatus(guestStatus);
-		}
-
-	}
-
-	public Boolean isUploadRequestValid(String source, String filename, String userId, String token) {
-		UploadRequest uploadRequest = uploadRequests.get(token);
-		if (uploadRequest != null) {
-			return uploadRequest.isValid(source, filename, userId);^
-		} else {
-			return false;
-		}
-	}
-	
-	public Boolean hasUploadedFile(String source, String uploadId) {
-		UploadedFile uploadedFile = uploadedFiles.get(uploadId);^
-		if (uploadedFile != null) {
-			return source.equals(uploadedFile.source);
-		} else {
-			return false;
-		}
-	}
-	
-	public UploadedFile getUploadedFile(String uploadId) {
-		UploadedFile uploadedFile = uploadedFiles.get(uploadId);
-		return uploadedFile;
-	}
-	
-	public RegisteredUser getRegisteredUserWithAuthToken(String authToken) {
-		for (RegisteredUser ruser : registeredUsers.values()) {
-			if (ruser.authToken.equals(authToken)) {
-				return ruser;
-			}
-		}
-
-		return null;
-	}
-
-	public String getGuestStatusWithAuthToken(String authToken) {
-		RegisteredUser rUser = getRegisteredUserWithAuthToken(authToken);
-		if (rUser != null) {
-			return rUser.getGuestStatus();
-		}
-
-		return GuestPolicy.DENY;
-	}
-
-	public int getHtml5InstanceId() { return html5InstanceId; }
-
-    public void setHtml5InstanceId(int instanceId) { html5InstanceId = instanceId; }
-
-    public long getStartTime() {
-		return startTime;
-	}
-
-	public void setStartTime(long t) {
-		startTime = t;
-	}
-
-	public long getCreateTime() {
-		return createdTime;
-	}
-
-	public void setSequence(Integer s) {
-        sequence = s;
-    }
-
-	public Integer getSequence() {
-        return sequence;
-    }
-
-    public Boolean isFreeJoin() {
-        return freeJoin;
-    }
-
-    public void setFreeJoin(Boolean freeJoin) {
-        this.freeJoin = freeJoin;
-    }
-
-	public Integer getDuration() {
-		return duration;
-	}
-
-	public long getEndTime() {
-		return endTime;
-	}
-
-	public void setModeratorOnlyMessage(String msg) {
-		modOnlyMessage = msg;
-	}
-
-	public String getModeratorOnlyMessage() {
-		return modOnlyMessage;
-	}
-
-	public void setEndTime(long t) {
-		endTime = t;
-	}
-
-	public boolean isRunning() {
-		return ! users.isEmpty();
-	}
-
-	public Boolean isBreakout() {
-	  return isBreakout;
-	}
-
-    public void setHaveRecordingMarks(boolean marks) {
-        haveRecordingMarks = marks;
-    }
-
-    public boolean haveRecordingMarks() {
-        return  haveRecordingMarks;
-    }
-
-	public String getName() {
-		return name;
-	}
-
-	public boolean isForciblyEnded() {
-		return forciblyEnded;
-	}
-
-	public void setForciblyEnded(boolean forciblyEnded) {
-		this.forciblyEnded = forciblyEnded;
-	}
-
-	public String getExternalId() {
-		return extMeetingId;
-	}
-
-	public String getInternalId() {
-		return intMeetingId;
-	}
-
-	public void setParentMeetingId(String p) {
-        parentMeetingId = p;
-    }
-
-	public String getParentMeetingId() {
-	    return parentMeetingId;
-	}
-
-	public String getWebVoice() {
-		return webVoice;
-	}
-
-	public String getTelVoice() {
-		return telVoice;
-	}
-
-	public String getModeratorPassword() {
-		return moderatorPass;
-	}
-
-	public String getViewerPassword() {
-		return viewerPass;
-	}
-
-	public Boolean getLearningDashboardEnabled() {
-		return learningDashboardEnabled;
-	}
-
-	public int getLearningDashboardCleanupDelayInMinutes() {
-		return learningDashboardCleanupDelayInMinutes;
-	}
-
-	public String getLearningDashboardAccessToken() {
-		return learningDashboardAccessToken;
-	}
-
-  public String getWelcomeMessageTemplate() {
-    return welcomeMsgTemplate;
-  }
-
-	public String getWelcomeMessage() {
-		return welcomeMsg;
-	}
-
-	public String getDefaultAvatarURL() {
-		return defaultAvatarURL;
-	}
-
-	public void setGuestPolicy(String policy) {
-		guestPolicy = policy;
-	}
-
-	public String getGuestPolicy() {
-    	return guestPolicy;
-	}
-
-	public void setGuestLobbyMessage(String message) {
-		guestLobbyMessage = message;
-	}
-
-	public String getGuestLobbyMessage() {
-		return guestLobbyMessage;
-	}
-
-	public void setAuthenticatedGuest(Boolean authGuest) {
-		authenticatedGuest = authGuest;
-	}
-
-	public Boolean getAuthenticatedGuest() {
-		return authenticatedGuest;
-	}
-
-	public void setMeetingLayout(String layout) {
-		meetingLayout = layout;
-	}
-
-	public String getMeetingLayout() {
-		return meetingLayout;
-	}
-
-	private String getUnauthenticatedGuestStatus(Boolean guest) {
-		if (guest) {
-			switch(guestPolicy) {
-				case GuestPolicy.ALWAYS_ACCEPT:
-				case GuestPolicy.ALWAYS_ACCEPT_AUTH:
-					return GuestPolicy.ALLOW;
-				case GuestPolicy.ASK_MODERATOR:
-					return GuestPolicy.WAIT;
-				case GuestPolicy.ALWAYS_DENY:
-					return GuestPolicy.DENY;
-				default:
-					return GuestPolicy.DENY;
-			}
-		} else {
-			return GuestPolicy.ALLOW;
-		}
-	}
-
-	public String calcGuestStatus(String role, Boolean guest, Boolean authned) {
-		if (!authenticatedGuest) return getUnauthenticatedGuestStatus(guest);
-
-		// Allow moderators all the time.
-		if (ROLE_MODERATOR.equals(role)) {
-			return GuestPolicy.ALLOW;
-		}
-
-		if (GuestPolicy.ALWAYS_ACCEPT.equals(guestPolicy)) {
-			return GuestPolicy.ALLOW;
-		} else if (GuestPolicy.ALWAYS_DENY.equals(guestPolicy)) {
-			return GuestPolicy.DENY;
-		} else if (GuestPolicy.ASK_MODERATOR.equals(guestPolicy)) {
-			if  (guest || (!ROLE_MODERATOR.equals(role) && authned)) {
-				return GuestPolicy.WAIT ;
-			}
-			return GuestPolicy.ALLOW;
-		} else if (GuestPolicy.ALWAYS_ACCEPT_AUTH.equals(guestPolicy)) {
-			if (guest){
-				// Only ask moderator for guests.
-				return GuestPolicy.WAIT ;
-			}
-			return GuestPolicy.ALLOW;
-		}
-		return GuestPolicy.DENY ;
-	}
-
-
-	public String getLogoutUrl() {
-		return logoutUrl;
-	}
-
-	public int getMaxUsers() {
-		return maxUsers;
-	}
-
-	public int getLogoutTimer() {
-		return logoutTimer;
-	}
-
-	public String getBannerColor() {
-		return bannerColor;
-	}
-
-	public String getBannerText() {
-		return bannerText;
-	}
-
-	public boolean isRecord() {
-		return record;
-	}
-
-	public boolean getAutoStartRecording() {
-		return autoStartRecording;
-	}
-
-	public boolean getAllowStartStopRecording() {
-		return allowStartStopRecording;
-	}
-
-    public boolean getWebcamsOnlyForModerator() {
-        return webcamsOnlyForModerator;
-    }
-
-	public boolean hasUserJoined() {
-		return userHasJoined;
-	}
-
-	public String getCustomLogoURL() {
-		return customLogoURL;
-	}
-
-	public void setCustomLogoURL(String url) {
-		customLogoURL = url;
-	}
-
-	public void setCustomCopyright(String copyright) {
-    	customCopyright = copyright;
-	}
-
-	public String getCustomCopyright() {
-    	return customCopyright;
-	}
-
-	public void setMuteOnStart(Boolean mute) {
-    	muteOnStart = mute;
-	}
-
-	public Boolean getMuteOnStart() {
-    	return muteOnStart;
-	}
-
-  public void setMeetingKeepEvents(Boolean mke) {
-    meetingKeepEvents = mke;
-  }
-
-  public Boolean getMeetingKeepEvents() {
-    return meetingKeepEvents;
-  }
-
-	public void setAllowModsToUnmuteUsers(Boolean value) {
-		allowModsToUnmuteUsers = value;
-	}
-
-	public Boolean getAllowModsToUnmuteUsers() {
-		return allowModsToUnmuteUsers;
-	}
-
-	public void userJoined(User user) {
-		User u = getUserById(user.getInternalUserId());
-		if (u != null) {
-			u.joined();
-		} else {
-			if (!userHasJoined) userHasJoined = true;
-			this.users.put(user.getInternalUserId(), user);
-			// Clean this user up from the entered user's list
-			removeEnteredUser(user.getInternalUserId());
-		}
-	}
-
-	public User userLeft(String userId) {
-		User user = getUserById(userId);
-		if (user != null) {
-			user.left();
-		}
-
-		return user;
-	}
-
-	public User removeUser(String userId) {
-		return this.users.remove(userId);
-	}
-
-	public User getUserById(String id){
-		return this.users.get(id);
-	}
-
-    public User getUserWithExternalId(String externalUserId) {
-        for (Map.Entry<String, User> entry : users.entrySet()) {
-            User u = entry.getValue();
-            if (u.getExternalUserId().equals(externalUserId)) {
-                return u;
-            }
-        }
-        return null;
-    }
-
-
-	public int getNumUsers(){
-		return this.users.size();
-	}
-
-    public int getNumModerators() {
-        int sum = 0;
-        for (Map.Entry<String, User> entry : users.entrySet()) {
-            User u = entry.getValue();
-            if (u.isModerator())
-                sum++;
-        }
-        return sum;
-    }
-
-	public String getDialNumber() {
-		return dialNumber;
-	}
-
-    public int getNumListenOnly() {
-        int sum = 0;
-        for (Map.Entry<String, User> entry : users.entrySet()) {
-            User u = entry.getValue();
-            if (u.isListeningOnly())
-                sum++;
-        }
-        return sum;
-    }
-
-    public int getNumVoiceJoined() {
-        int sum = 0;
-        for (Map.Entry<String, User> entry : users.entrySet()) {
-            User u = entry.getValue();
-            if (u.isVoiceJoined())
-                sum++;
-        }
-        return sum;
-    }
-
-    public int getNumVideos() {
-        int sum = 0;
-        for (Map.Entry<String, User> entry : users.entrySet()) {
-            User u = entry.getValue();
-            sum += u.getStreams().size();
-        }
-        return sum;
-    }
-
-	public void addPad(String padId, String readOnlyId) {
-		pads.put(padId, readOnlyId);
-	}
-
-	public Boolean hasPad(String id) {
-		return pads.containsKey(id) || pads.containsValue(id);
-	}
-
-	public void addUserCustomData(String userID, Map<String, String> data) {
-		userCustomData.put(userID, data);
-	}
-
-	public void setMeetingExpireWhenLastUserLeftInMinutes(Integer value) {
-		meetingExpireWhenLastUserLeftInMinutes = value;
-	}
-
-	public Integer getmeetingExpireWhenLastUserLeftInMinutes() {
-		return meetingExpireWhenLastUserLeftInMinutes;
-	}
-
-
-	public void setMeetingExpireIfNoUserJoinedInMinutes(Integer value) {
-		meetingExpireIfNoUserJoinedInMinutes = value;
-	}
-
-	public Integer getMeetingExpireIfNoUserJoinedInMinutes() {
-		return meetingExpireIfNoUserJoinedInMinutes;
-	}
-
-   public Integer getUserInactivityInspectTimerInMinutes() {
-        return userInactivityInspectTimerInMinutes;
-    }
-
-    public void setUserInactivityInspectTimerInMinutes(Integer userInactivityInjspectTimerInMinutes) {
-        this.userInactivityInspectTimerInMinutes = userInactivityInjspectTimerInMinutes;
-    }
-
-    public Integer getUserInactivityThresholdInMinutes() {
-        return userInactivityThresholdInMinutes;
-    }
-
-    public void setUserInactivityThresholdInMinutes(Integer userInactivityThresholdInMinutes) {
-        this.userInactivityThresholdInMinutes = userInactivityThresholdInMinutes;
-    }
-
-    public Integer getUserActivitySignResponseDelayInMinutes() {
-        return userActivitySignResponseDelayInMinutes;
-    }
-
-    public void setUserActivitySignResponseDelayInMinutes(Integer userActivitySignResponseDelayInMinutes) {
-        this.userActivitySignResponseDelayInMinutes = userActivitySignResponseDelayInMinutes;
-    }
-
-	public Boolean getEndWhenNoModerator() {
-		return endWhenNoModerator;
-	}
-
-	public void setEndWhenNoModerator(Boolean endWhenNoModerator) {
-		this.endWhenNoModerator = endWhenNoModerator;
-	}
-
-	public Integer getEndWhenNoModeratorDelayInMinutes() {
-		return endWhenNoModeratorDelayInMinutes;
-	}
-
-	public void setEndWhenNoModeratorDelayInMinutes(Integer endWhenNoModeratorDelayInMinutes) {
-		this.endWhenNoModeratorDelayInMinutes = endWhenNoModeratorDelayInMinutes;
-	}
-
-    public String getMeetingEndedCallbackURL() {
-    	return meetingEndedCallbackURL;
-    }
-
-    public void setMeetingEndedCallbackURL(String meetingEndedCallbackURL) {
-    	this.meetingEndedCallbackURL = meetingEndedCallbackURL;
-    }
-
-	public Map<String, Object> getUserCustomData(String userID){
-		return (Map<String, Object>) userCustomData.get(userID);
-	}
-
-	public void userRegistered(RegisteredUser user) {
-        this.registeredUsers.put(user.userId, user);
-    }
-
-    public RegisteredUser userUnregistered(String userid) {
-		return this.registeredUsers.remove(userid);
-    }
-
-    public ConcurrentMap<String, RegisteredUser> getRegisteredUsers() {
-        return registeredUsers;
-    }
-
-    public ConcurrentMap<String, Long> getEnteredUsers() {
-        return this.enteredUsers;
-    }
-
-    public void userEntered(String userId) {
-        // Skip if user already joined
-        User u = getUserById(userId);
-        if (u != null) return;
-
-        if (!enteredUsers.containsKey(userId)) {
-            Long time = System.currentTimeMillis();
-            this.enteredUsers.put(userId, time);
-        }
-    }
-
-    public Long removeEnteredUser(String userId) {
-        return this.enteredUsers.remove(userId);
-    }
-
-    public Long getEnteredUserById(String userId) {
-        return this.enteredUsers.get(userId);
-    }
-
-    /***
-	 * Meeting Builder
-	 *
-	 */
-	public static class Builder {
-    	private String name;
-    	private String externalId;
-    	private String internalId;
-    	private int maxUsers;
-    	private boolean record;
-    	private boolean autoStartRecording;
-        private boolean allowStartStopRecording;
-        private boolean webcamsOnlyForModerator;
-    	private String moderatorPass;
-    	private String viewerPass;
-    	private Boolean learningDashboardEnabled;
-    	private int learningDashboardCleanupDelayInMinutes;
-    	private String learningDashboardAccessToken;
-    	private int duration;
-    	private String webVoice;
-    	private String telVoice;
-    	private String welcomeMsgTemplate;
-    	private String welcomeMsg;
-    	private String logoutUrl;
-    	private String bannerColor;
-    	private String bannerText;
-    	private int logoutTimer;
-    	private Map<String, String> metadata;
-    	private String dialNumber;
-    	private String defaultAvatarURL;
-    	private long createdTime;
-    	private boolean isBreakout;
-    	private String guestPolicy;
-    	private Boolean authenticatedGuest;
-			private String meetingLayout;
-    	private BreakoutRoomsParams breakoutRoomsParams;
-    	private LockSettingsParams lockSettingsParams;
-		private Boolean allowDuplicateExtUserid;
-		private Boolean endWhenNoModerator;
-		private Integer endWhenNoModeratorDelayInMinutes;
-		private int html5InstanceId;
-
-    	public Builder(String externalId, String internalId, long createTime) {
-    		this.externalId = externalId;
-    		this.internalId = internalId;
-    		this.createdTime = createTime;
-    	}
-
-    	public Builder withName(String name) {
-    		this.name = name;
-    		return this;
-    	}
-
-    	public Builder withDuration(int minutes) {
-    		duration = minutes;
-    		return this;
-    	}
-
-    	public Builder withMaxUsers(int n) {
-    		maxUsers = n;
-    		return this;
-    	}
-
-    	public Builder withRecording(boolean record) {
-    		this.record = record;
-    		return this;
-    	}
-
-    	public Builder withAutoStartRecording(boolean start) {
-    		this.autoStartRecording = start;
-    		return this;
-    	}
-
-    	public Builder withAllowStartStopRecording(boolean allow) {
-    		this.allowStartStopRecording = allow;
-    		return this;
-    	}
-
-        public Builder withWebcamsOnlyForModerator(boolean only) {
-            this.webcamsOnlyForModerator = only;
-            return this;
-        }
-
-    	public Builder withWebVoice(String w) {
-    		this.webVoice = w;
-    		return this;
-    	}
-
-    	public Builder withTelVoice(String t) {
-    		this.telVoice = t;
-    		return this;
-    	}
-
-    	public Builder withDialNumber(String d) {
-    		this.dialNumber = d;
-    		return this;
-    	}
-
-    	public Builder withModeratorPass(String p) {
-    		this.moderatorPass = p;
-    		return this;
-    	}
-
-    	public Builder withViewerPass(String p) {
-	    	this.viewerPass = p;
-	    	return this;
-	    }
-    	
-    	public Builder withLearningDashboardEnabled(Boolean e) {
-	    	this.learningDashboardEnabled = e;
-	    	return this;
-	    }
-
-    	public Builder withLearningDashboardCleanupDelayInMinutes(int m) {
-	    	this.learningDashboardCleanupDelayInMinutes = m;
-	    	return this;
-	    }
-
-    	public Builder withLearningDashboardAccessToken(String t) {
-	    	this.learningDashboardAccessToken = t;
-	    	return this;
-	    }
-
-    	public Builder withWelcomeMessage(String w) {
-    		welcomeMsg = w;
-    		return this;
-    	}
-
-	    public Builder withWelcomeMessageTemplate(String w) {
-            welcomeMsgTemplate = w;
-            return this;
-        }
-
-    	public Builder withDefaultAvatarURL(String w) {
-    		defaultAvatarURL = w;
-    		return this;
-    	}
-
-    	public Builder isBreakout(Boolean b) {
-    	  isBreakout = b;
-    	  return this;
-    	}
-
-    	public Builder withLogoutUrl(String l) {
-    		logoutUrl = l;
-    		return this;
-    	}
-
-    	public Builder withLogoutTimer(int l) {
-    		logoutTimer = l;
-    		return this;
-    	}
-
-    	public Builder withBannerColor(String c) {
-    		bannerColor = c;
-    		return this;
-    	}
-
-    	public Builder withBannerText(String t) {
-    		bannerText = t;
-    		return this;
-    	}
-
-    	public Builder withMetadata(Map<String, String> m) {
-    		metadata = m;
-    		return this;
-    	}
-
-    	public Builder withGuestPolicy(String policy) {
-    		guestPolicy = policy;
-    		return  this;
-			}
-
-    	public Builder withAuthenticatedGuest(Boolean authGuest) {
-    		authenticatedGuest = authGuest;
-    		return this;
-    	}
-
-			public Builder withMeetingLayout(String layout) {
-				meetingLayout = layout;
-				return this;
-			}
-
-		public Builder withBreakoutRoomsParams(BreakoutRoomsParams params) {
-    		breakoutRoomsParams = params;
-    		return this;
-		}
-
-		public Builder withLockSettingsParams(LockSettingsParams params) {
-    		lockSettingsParams = params;
-    		return  this;
-		}
-
-		public Builder withAllowDuplicateExtUserid(Boolean allowDuplicateExtUserid) {
-    		this.allowDuplicateExtUserid = allowDuplicateExtUserid;
-    		return this;
-		}
-
-		public Builder withEndWhenNoModerator(Boolean endWhenNoModerator) {
-    		this.endWhenNoModerator = endWhenNoModerator;
-    		return this;
-		}
-
-		public Builder withEndWhenNoModeratorDelayInMinutes(Integer endWhenNoModeratorDelayInMinutes) {
-    		this.endWhenNoModeratorDelayInMinutes = endWhenNoModeratorDelayInMinutes;
-    		return this;
-		}
-
-		public Builder withHTML5InstanceId(int instanceId) {
-    		html5InstanceId = instanceId;
-    		return this;
-		}
-
-    	public Meeting build() {
-    		return new Meeting(this);
-    	}
-    }
-}
+/**
+* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
+*
+* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below).
+*
+* This program is free software; you can redistribute it and/or modify it under the
+* terms of the GNU Lesser General Public License as published by the Free Software
+* Foundation; either version 3.0 of the License, or (at your option) any later
+* version.
+*
+* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
+* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public License along
+* with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+package org.bigbluebutton.api.domain;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.locks.Lock;
+
+import org.apache.commons.lang3.RandomStringUtils;
+
+public class Meeting {
+
+	public static final String ROLE_MODERATOR = "MODERATOR";
+	public static final String ROLE_ATTENDEE = "VIEWER";
+
+	private String name;
+	private String extMeetingId;
+	private String intMeetingId;
+	private String parentMeetingId = "bbb-none"; // Initialize so we don't send null in the json message.
+	private Integer sequence = 0;
+	private Boolean freeJoin = false;
+  private Integer duration = 0;
+	private long createdTime = 0;
+	private long startTime = 0;
+	private long endTime = 0;
+	private boolean forciblyEnded = false;
+	private String telVoice;
+	private String webVoice;
+	private String moderatorPass;
+	private String viewerPass;
+	private Boolean learningDashboardEnabled;
+	private int learningDashboardCleanupDelayInMinutes;
+	private String learningDashboardAccessToken;
+	private String welcomeMsgTemplate;
+	private String welcomeMsg;
+	private String modOnlyMessage = "";
+	private String logoutUrl;
+	private int logoutTimer = 0;
+	private int maxUsers;
+	private String bannerColor = "#FFFFFF";
+	private String bannerText = "";
+	private boolean record;
+	private boolean autoStartRecording = false;
+	private boolean allowStartStopRecording = false;
+	private boolean haveRecordingMarks = false;
+	private boolean webcamsOnlyForModerator = false;
+	private String dialNumber;
+	private String defaultAvatarURL;
+	private String guestPolicy = GuestPolicy.ASK_MODERATOR;
+	private String guestLobbyMessage = "";
+	private Boolean authenticatedGuest = false;
+	private String meetingLayout = MeetingLayout.SMART_LAYOUT;
+	private boolean userHasJoined = false;
+	private Map<String, String> pads;
+	private Map<String, String> metadata;
+	private Map<String, Object> userCustomData;
+	private final ConcurrentMap<String, User> users;
+	private final ConcurrentMap<String, RegisteredUser> registeredUsers;
+	private final ConcurrentMap<String, Long> enteredUsers;
+	private final Boolean isBreakout;
+	private final List<String> breakoutRooms = new ArrayList<>();
+	private String customLogoURL = "";
+	private String customCopyright = "";
+	private Boolean muteOnStart = false;
+	private Boolean allowModsToUnmuteUsers = false;
+	private Boolean meetingKeepEvents;
+
+	private Integer meetingExpireIfNoUserJoinedInMinutes = 5;
+	private Integer meetingExpireWhenLastUserLeftInMinutes = 1;
+	private Integer userInactivityInspectTimerInMinutes = 120;
+	private Integer userInactivityThresholdInMinutes = 30;
+    private Integer userActivitySignResponseDelayInMinutes = 5;
+    private Boolean endWhenNoModerator = false;
+    private Integer endWhenNoModeratorDelayInMinutes = 1;
+
+	public final BreakoutRoomsParams breakoutRoomsParams;
+	public final LockSettingsParams lockSettingsParams;
+
+	public final Boolean allowDuplicateExtUserid;
+
+	private String meetingEndedCallbackURL = "";
+
+	private Integer html5InstanceId;
+
+    public Meeting(Meeting.Builder builder) {
+        name = builder.name;
+        extMeetingId = builder.externalId;
+        intMeetingId = builder.internalId;
+        viewerPass = builder.viewerPass;
+        moderatorPass = builder.moderatorPass;
+		learningDashboardEnabled = builder.learningDashboardEnabled;
+		learningDashboardCleanupDelayInMinutes = builder.learningDashboardCleanupDelayInMinutes;
+		learningDashboardAccessToken = builder.learningDashboardAccessToken;
+        maxUsers = builder.maxUsers;
+        bannerColor = builder.bannerColor;
+        bannerText = builder.bannerText;
+        logoutUrl = builder.logoutUrl;
+        logoutTimer = builder.logoutTimer;
+        defaultAvatarURL = builder.defaultAvatarURL;
+        record = builder.record;
+        autoStartRecording = builder.autoStartRecording;
+        allowStartStopRecording = builder.allowStartStopRecording;
+        webcamsOnlyForModerator = builder.webcamsOnlyForModerator;
+        duration = builder.duration;
+        webVoice = builder.webVoice;
+        telVoice = builder.telVoice;
+        welcomeMsgTemplate = builder.welcomeMsgTemplate;
+        welcomeMsg = builder.welcomeMsg;
+        dialNumber = builder.dialNumber;
+        metadata = builder.metadata;
+        createdTime = builder.createdTime;
+        isBreakout = builder.isBreakout;
+        guestPolicy = builder.guestPolicy;
+        authenticatedGuest = builder.authenticatedGuest;
+				meetingLayout = builder.meetingLayout;
+        breakoutRoomsParams = builder.breakoutRoomsParams;
+        lockSettingsParams = builder.lockSettingsParams;
+        allowDuplicateExtUserid = builder.allowDuplicateExtUserid;
+        endWhenNoModerator = builder.endWhenNoModerator;
+        endWhenNoModeratorDelayInMinutes = builder.endWhenNoModeratorDelayInMinutes;
+        html5InstanceId = builder.html5InstanceId;
+
+        /*
+         * A pad is a pair of padId and readOnlyId that represents
+         * valid etherpads instances for this meeting. They can be:
+         *  - shared notes
+         *  - closed captions
+         */
+        pads = new HashMap<>();
+        userCustomData = new HashMap<>();
+
+        users = new ConcurrentHashMap<>();
+        registeredUsers = new ConcurrentHashMap<>();
+        enteredUsers = new  ConcurrentHashMap<>();
+    }
+
+	public void addBreakoutRoom(String meetingId) {
+		breakoutRooms.add(meetingId);
+	}
+
+	public List<String> getBreakoutRooms() {
+		return breakoutRooms;
+	}
+
+	public Map<String, String> getPads() {
+		return pads;
+	}
+
+	public Map<String, String> getMetadata() {
+		return metadata;
+	}
+
+	public Collection<User> getUsers() {
+		return users.isEmpty() ? Collections.<User>emptySet() : Collections.unmodifiableCollection(users.values());
+	}
+
+	public ConcurrentMap<String, User> getUsersMap() {
+	    return users;
+	}
+
+	public void guestIsWaiting(String userId) {
+		RegisteredUser ruser = registeredUsers.get(userId);
+		if (ruser != null) {
+			ruser.updateGuestWaitedOn();
+		}
+	}
+
+	public void setGuestStatusWithId(String userId, String guestStatus) {
+    	User user = getUserById(userId);
+    	if (user != null) {
+    		user.setGuestStatus(guestStatus);
+		}
+
+		RegisteredUser ruser = registeredUsers.get(userId);
+		if (ruser != null) {
+			ruser.setGuestStatus(guestStatus);
+		}
+
+	}
+
+	public RegisteredUser getRegisteredUserWithAuthToken(String authToken) {
+		for (RegisteredUser ruser : registeredUsers.values()) {
+			if (ruser.authToken.equals(authToken)) {
+				return ruser;
+			}
+		}
+
+		return null;
+	}
+
+	public String getGuestStatusWithAuthToken(String authToken) {
+		RegisteredUser rUser = getRegisteredUserWithAuthToken(authToken);
+		if (rUser != null) {
+			return rUser.getGuestStatus();
+		}
+
+		return GuestPolicy.DENY;
+	}
+
+	public int getHtml5InstanceId() { return html5InstanceId; }
+
+    public void setHtml5InstanceId(int instanceId) { html5InstanceId = instanceId; }
+
+    public long getStartTime() {
+		return startTime;
+	}
+
+	public void setStartTime(long t) {
+		startTime = t;
+	}
+
+	public long getCreateTime() {
+		return createdTime;
+	}
+
+	public void setSequence(Integer s) {
+        sequence = s;
+    }
+
+	public Integer getSequence() {
+        return sequence;
+    }
+
+    public Boolean isFreeJoin() {
+        return freeJoin;
+    }
+
+    public void setFreeJoin(Boolean freeJoin) {
+        this.freeJoin = freeJoin;
+    }
+
+	public Integer getDuration() {
+		return duration;
+	}
+
+	public long getEndTime() {
+		return endTime;
+	}
+
+	public void setModeratorOnlyMessage(String msg) {
+		modOnlyMessage = msg;
+	}
+
+	public String getModeratorOnlyMessage() {
+		return modOnlyMessage;
+	}
+
+	public void setEndTime(long t) {
+		endTime = t;
+	}
+
+	public boolean isRunning() {
+		return ! users.isEmpty();
+	}
+
+	public Boolean isBreakout() {
+	  return isBreakout;
+	}
+
+    public void setHaveRecordingMarks(boolean marks) {
+        haveRecordingMarks = marks;
+    }
+
+    public boolean haveRecordingMarks() {
+        return  haveRecordingMarks;
+    }
+
+	public String getName() {
+		return name;
+	}
+
+	public boolean isForciblyEnded() {
+		return forciblyEnded;
+	}
+
+	public void setForciblyEnded(boolean forciblyEnded) {
+		this.forciblyEnded = forciblyEnded;
+	}
+
+	public String getExternalId() {
+		return extMeetingId;
+	}
+
+	public String getInternalId() {
+		return intMeetingId;
+	}
+
+	public void setParentMeetingId(String p) {
+        parentMeetingId = p;
+    }
+
+	public String getParentMeetingId() {
+	    return parentMeetingId;
+	}
+
+	public String getWebVoice() {
+		return webVoice;
+	}
+
+	public String getTelVoice() {
+		return telVoice;
+	}
+
+	public String getModeratorPassword() {
+		return moderatorPass;
+	}
+
+	public String getViewerPassword() {
+		return viewerPass;
+	}
+
+	public Boolean getLearningDashboardEnabled() {
+		return learningDashboardEnabled;
+	}
+
+	public int getLearningDashboardCleanupDelayInMinutes() {
+		return learningDashboardCleanupDelayInMinutes;
+	}
+
+	public String getLearningDashboardAccessToken() {
+		return learningDashboardAccessToken;
+	}
+
+  public String getWelcomeMessageTemplate() {
+    return welcomeMsgTemplate;
+  }
+
+	public String getWelcomeMessage() {
+		return welcomeMsg;
+	}
+
+	public String getDefaultAvatarURL() {
+		return defaultAvatarURL;
+	}
+
+	public void setGuestPolicy(String policy) {
+		guestPolicy = policy;
+	}
+
+	public String getGuestPolicy() {
+    	return guestPolicy;
+	}
+
+	public void setGuestLobbyMessage(String message) {
+		guestLobbyMessage = message;
+	}
+
+	public String getGuestLobbyMessage() {
+		return guestLobbyMessage;
+	}
+
+	public void setAuthenticatedGuest(Boolean authGuest) {
+		authenticatedGuest = authGuest;
+	}
+
+	public Boolean getAuthenticatedGuest() {
+		return authenticatedGuest;
+	}
+
+	public void setMeetingLayout(String layout) {
+		meetingLayout = layout;
+	}
+
+	public String getMeetingLayout() {
+		return meetingLayout;
+	}
+
+	private String getUnauthenticatedGuestStatus(Boolean guest) {
+		if (guest) {
+			switch(guestPolicy) {
+				case GuestPolicy.ALWAYS_ACCEPT:
+				case GuestPolicy.ALWAYS_ACCEPT_AUTH:
+					return GuestPolicy.ALLOW;
+				case GuestPolicy.ASK_MODERATOR:
+					return GuestPolicy.WAIT;
+				case GuestPolicy.ALWAYS_DENY:
+					return GuestPolicy.DENY;
+				default:
+					return GuestPolicy.DENY;
+			}
+		} else {
+			return GuestPolicy.ALLOW;
+		}
+	}
+
+	public String calcGuestStatus(String role, Boolean guest, Boolean authned) {
+		if (!authenticatedGuest) return getUnauthenticatedGuestStatus(guest);
+
+		// Allow moderators all the time.
+		if (ROLE_MODERATOR.equals(role)) {
+			return GuestPolicy.ALLOW;
+		}
+
+		if (GuestPolicy.ALWAYS_ACCEPT.equals(guestPolicy)) {
+			return GuestPolicy.ALLOW;
+		} else if (GuestPolicy.ALWAYS_DENY.equals(guestPolicy)) {
+			return GuestPolicy.DENY;
+		} else if (GuestPolicy.ASK_MODERATOR.equals(guestPolicy)) {
+			if  (guest || (!ROLE_MODERATOR.equals(role) && authned)) {
+				return GuestPolicy.WAIT ;
+			}
+			return GuestPolicy.ALLOW;
+		} else if (GuestPolicy.ALWAYS_ACCEPT_AUTH.equals(guestPolicy)) {
+			if (guest){
+				// Only ask moderator for guests.
+				return GuestPolicy.WAIT ;
+			}
+			return GuestPolicy.ALLOW;
+		}
+		return GuestPolicy.DENY ;
+	}
+
+
+	public String getLogoutUrl() {
+		return logoutUrl;
+	}
+
+	public int getMaxUsers() {
+		return maxUsers;
+	}
+
+	public int getLogoutTimer() {
+		return logoutTimer;
+	}
+
+	public String getBannerColor() {
+		return bannerColor;
+	}
+
+	public String getBannerText() {
+		return bannerText;
+	}
+
+	public boolean isRecord() {
+		return record;
+	}
+
+	public boolean getAutoStartRecording() {
+		return autoStartRecording;
+	}
+
+	public boolean getAllowStartStopRecording() {
+		return allowStartStopRecording;
+	}
+
+    public boolean getWebcamsOnlyForModerator() {
+        return webcamsOnlyForModerator;
+    }
+
+	public boolean hasUserJoined() {
+		return userHasJoined;
+	}
+
+	public String getCustomLogoURL() {
+		return customLogoURL;
+	}
+
+	public void setCustomLogoURL(String url) {
+		customLogoURL = url;
+	}
+
+	public void setCustomCopyright(String copyright) {
+    	customCopyright = copyright;
+	}
+
+	public String getCustomCopyright() {
+    	return customCopyright;
+	}
+
+	public void setMuteOnStart(Boolean mute) {
+    	muteOnStart = mute;
+	}
+
+	public Boolean getMuteOnStart() {
+    	return muteOnStart;
+	}
+
+  public void setMeetingKeepEvents(Boolean mke) {
+    meetingKeepEvents = mke;
+  }
+
+  public Boolean getMeetingKeepEvents() {
+    return meetingKeepEvents;
+  }
+
+	public void setAllowModsToUnmuteUsers(Boolean value) {
+		allowModsToUnmuteUsers = value;
+	}
+
+	public Boolean getAllowModsToUnmuteUsers() {
+		return allowModsToUnmuteUsers;
+	}
+
+	public void userJoined(User user) {
+		User u = getUserById(user.getInternalUserId());
+		if (u != null) {
+			u.joined();
+		} else {
+			if (!userHasJoined) userHasJoined = true;
+			this.users.put(user.getInternalUserId(), user);
+			// Clean this user up from the entered user's list
+			removeEnteredUser(user.getInternalUserId());
+		}
+	}
+
+	public User userLeft(String userId) {
+		User user = getUserById(userId);
+		if (user != null) {
+			user.left();
+		}
+
+		return user;
+	}
+
+	public User removeUser(String userId) {
+		return this.users.remove(userId);
+	}
+
+	public User getUserById(String id){
+		return this.users.get(id);
+	}
+
+    public User getUserWithExternalId(String externalUserId) {
+        for (Map.Entry<String, User> entry : users.entrySet()) {
+            User u = entry.getValue();
+            if (u.getExternalUserId().equals(externalUserId)) {
+                return u;
+            }
+        }
+        return null;
+    }
+
+
+	public int getNumUsers(){
+		return this.users.size();
+	}
+
+    public int getNumModerators() {
+        int sum = 0;
+        for (Map.Entry<String, User> entry : users.entrySet()) {
+            User u = entry.getValue();
+            if (u.isModerator())
+                sum++;
+        }
+        return sum;
+    }
+
+	public String getDialNumber() {
+		return dialNumber;
+	}
+
+    public int getNumListenOnly() {
+        int sum = 0;
+        for (Map.Entry<String, User> entry : users.entrySet()) {
+            User u = entry.getValue();
+            if (u.isListeningOnly())
+                sum++;
+        }
+        return sum;
+    }
+
+    public int getNumVoiceJoined() {
+        int sum = 0;
+        for (Map.Entry<String, User> entry : users.entrySet()) {
+            User u = entry.getValue();
+            if (u.isVoiceJoined())
+                sum++;
+        }
+        return sum;
+    }
+
+    public int getNumVideos() {
+        int sum = 0;
+        for (Map.Entry<String, User> entry : users.entrySet()) {
+            User u = entry.getValue();
+            sum += u.getStreams().size();
+        }
+        return sum;
+    }
+
+	public void addPad(String padId, String readOnlyId) {
+		pads.put(padId, readOnlyId);
+	}
+
+	public Boolean hasPad(String id) {
+		return pads.containsKey(id) || pads.containsValue(id);
+	}
+
+	public void addUserCustomData(String userID, Map<String, String> data) {
+		userCustomData.put(userID, data);
+	}
+
+	public void setMeetingExpireWhenLastUserLeftInMinutes(Integer value) {
+		meetingExpireWhenLastUserLeftInMinutes = value;
+	}
+
+	public Integer getmeetingExpireWhenLastUserLeftInMinutes() {
+		return meetingExpireWhenLastUserLeftInMinutes;
+	}
+
+
+	public void setMeetingExpireIfNoUserJoinedInMinutes(Integer value) {
+		meetingExpireIfNoUserJoinedInMinutes = value;
+	}
+
+	public Integer getMeetingExpireIfNoUserJoinedInMinutes() {
+		return meetingExpireIfNoUserJoinedInMinutes;
+	}
+
+   public Integer getUserInactivityInspectTimerInMinutes() {
+        return userInactivityInspectTimerInMinutes;
+    }
+
+    public void setUserInactivityInspectTimerInMinutes(Integer userInactivityInjspectTimerInMinutes) {
+        this.userInactivityInspectTimerInMinutes = userInactivityInjspectTimerInMinutes;
+    }
+
+    public Integer getUserInactivityThresholdInMinutes() {
+        return userInactivityThresholdInMinutes;
+    }
+
+    public void setUserInactivityThresholdInMinutes(Integer userInactivityThresholdInMinutes) {
+        this.userInactivityThresholdInMinutes = userInactivityThresholdInMinutes;
+    }
+
+    public Integer getUserActivitySignResponseDelayInMinutes() {
+        return userActivitySignResponseDelayInMinutes;
+    }
+
+    public void setUserActivitySignResponseDelayInMinutes(Integer userActivitySignResponseDelayInMinutes) {
+        this.userActivitySignResponseDelayInMinutes = userActivitySignResponseDelayInMinutes;
+    }
+
+	public Boolean getEndWhenNoModerator() {
+		return endWhenNoModerator;
+	}
+
+	public void setEndWhenNoModerator(Boolean endWhenNoModerator) {
+		this.endWhenNoModerator = endWhenNoModerator;
+	}
+
+	public Integer getEndWhenNoModeratorDelayInMinutes() {
+		return endWhenNoModeratorDelayInMinutes;
+	}
+
+	public void setEndWhenNoModeratorDelayInMinutes(Integer endWhenNoModeratorDelayInMinutes) {
+		this.endWhenNoModeratorDelayInMinutes = endWhenNoModeratorDelayInMinutes;
+	}
+
+    public String getMeetingEndedCallbackURL() {
+    	return meetingEndedCallbackURL;
+    }
+
+    public void setMeetingEndedCallbackURL(String meetingEndedCallbackURL) {
+    	this.meetingEndedCallbackURL = meetingEndedCallbackURL;
+    }
+
+	public Map<String, Object> getUserCustomData(String userID){
+		return (Map<String, Object>) userCustomData.get(userID);
+	}
+
+	public void userRegistered(RegisteredUser user) {
+        this.registeredUsers.put(user.userId, user);
+    }
+
+    public RegisteredUser userUnregistered(String userid) {
+		return this.registeredUsers.remove(userid);
+    }
+
+    public ConcurrentMap<String, RegisteredUser> getRegisteredUsers() {
+        return registeredUsers;
+    }
+
+    public ConcurrentMap<String, Long> getEnteredUsers() {
+        return this.enteredUsers;
+    }
+
+    public void userEntered(String userId) {
+        // Skip if user already joined
+        User u = getUserById(userId);
+        if (u != null) return;
+
+        if (!enteredUsers.containsKey(userId)) {
+            Long time = System.currentTimeMillis();
+            this.enteredUsers.put(userId, time);
+        }
+    }
+
+    public Long removeEnteredUser(String userId) {
+        return this.enteredUsers.remove(userId);
+    }
+
+    public Long getEnteredUserById(String userId) {
+        return this.enteredUsers.get(userId);
+    }
+
+    /***
+	 * Meeting Builder
+	 *
+	 */
+	public static class Builder {
+    	private String name;
+    	private String externalId;
+    	private String internalId;
+    	private int maxUsers;
+    	private boolean record;
+    	private boolean autoStartRecording;
+        private boolean allowStartStopRecording;
+        private boolean webcamsOnlyForModerator;
+    	private String moderatorPass;
+    	private String viewerPass;
+    	private Boolean learningDashboardEnabled;
+    	private int learningDashboardCleanupDelayInMinutes;
+    	private String learningDashboardAccessToken;
+    	private int duration;
+    	private String webVoice;
+    	private String telVoice;
+    	private String welcomeMsgTemplate;
+    	private String welcomeMsg;
+    	private String logoutUrl;
+    	private String bannerColor;
+    	private String bannerText;
+    	private int logoutTimer;
+    	private Map<String, String> metadata;
+    	private String dialNumber;
+    	private String defaultAvatarURL;
+    	private long createdTime;
+    	private boolean isBreakout;
+    	private String guestPolicy;
+    	private Boolean authenticatedGuest;
+			private String meetingLayout;
+    	private BreakoutRoomsParams breakoutRoomsParams;
+    	private LockSettingsParams lockSettingsParams;
+		private Boolean allowDuplicateExtUserid;
+		private Boolean endWhenNoModerator;
+		private Integer endWhenNoModeratorDelayInMinutes;
+		private int html5InstanceId;
+
+    	public Builder(String externalId, String internalId, long createTime) {
+    		this.externalId = externalId;
+    		this.internalId = internalId;
+    		this.createdTime = createTime;
+    	}
+
+    	public Builder withName(String name) {
+    		this.name = name;
+    		return this;
+    	}
+
+    	public Builder withDuration(int minutes) {
+    		duration = minutes;
+    		return this;
+    	}
+
+    	public Builder withMaxUsers(int n) {
+    		maxUsers = n;
+    		return this;
+    	}
+
+    	public Builder withRecording(boolean record) {
+    		this.record = record;
+    		return this;
+    	}
+
+    	public Builder withAutoStartRecording(boolean start) {
+    		this.autoStartRecording = start;
+    		return this;
+    	}
+
+    	public Builder withAllowStartStopRecording(boolean allow) {
+    		this.allowStartStopRecording = allow;
+    		return this;
+    	}
+
+        public Builder withWebcamsOnlyForModerator(boolean only) {
+            this.webcamsOnlyForModerator = only;
+            return this;
+        }
+
+    	public Builder withWebVoice(String w) {
+    		this.webVoice = w;
+    		return this;
+    	}
+
+    	public Builder withTelVoice(String t) {
+    		this.telVoice = t;
+    		return this;
+    	}
+
+    	public Builder withDialNumber(String d) {
+    		this.dialNumber = d;
+    		return this;
+    	}
+
+    	public Builder withModeratorPass(String p) {
+    		this.moderatorPass = p;
+    		return this;
+    	}
+
+    	public Builder withViewerPass(String p) {
+	    	this.viewerPass = p;
+	    	return this;
+	    }
+    	
+    	public Builder withLearningDashboardEnabled(Boolean e) {
+	    	this.learningDashboardEnabled = e;
+	    	return this;
+	    }
+
+    	public Builder withLearningDashboardCleanupDelayInMinutes(int m) {
+	    	this.learningDashboardCleanupDelayInMinutes = m;
+	    	return this;
+	    }
+
+    	public Builder withLearningDashboardAccessToken(String t) {
+	    	this.learningDashboardAccessToken = t;
+	    	return this;
+	    }
+
+    	public Builder withWelcomeMessage(String w) {
+    		welcomeMsg = w;
+    		return this;
+    	}
+
+	    public Builder withWelcomeMessageTemplate(String w) {
+            welcomeMsgTemplate = w;
+            return this;
+        }
+
+    	public Builder withDefaultAvatarURL(String w) {
+    		defaultAvatarURL = w;
+    		return this;
+    	}
+
+    	public Builder isBreakout(Boolean b) {
+    	  isBreakout = b;
+    	  return this;
+    	}
+
+    	public Builder withLogoutUrl(String l) {
+    		logoutUrl = l;
+    		return this;
+    	}
+
+    	public Builder withLogoutTimer(int l) {
+    		logoutTimer = l;
+    		return this;
+    	}
+
+    	public Builder withBannerColor(String c) {
+    		bannerColor = c;
+    		return this;
+    	}
+
+    	public Builder withBannerText(String t) {
+    		bannerText = t;
+    		return this;
+    	}
+
+    	public Builder withMetadata(Map<String, String> m) {
+    		metadata = m;
+    		return this;
+    	}
+
+    	public Builder withGuestPolicy(String policy) {
+    		guestPolicy = policy;
+    		return  this;
+			}
+
+    	public Builder withAuthenticatedGuest(Boolean authGuest) {
+    		authenticatedGuest = authGuest;
+    		return this;
+    	}
+
+			public Builder withMeetingLayout(String layout) {
+				meetingLayout = layout;
+				return this;
+			}
+
+		public Builder withBreakoutRoomsParams(BreakoutRoomsParams params) {
+    		breakoutRoomsParams = params;
+    		return this;
+		}
+
+		public Builder withLockSettingsParams(LockSettingsParams params) {
+    		lockSettingsParams = params;
+    		return  this;
+		}
+
+		public Builder withAllowDuplicateExtUserid(Boolean allowDuplicateExtUserid) {
+    		this.allowDuplicateExtUserid = allowDuplicateExtUserid;
+    		return this;
+		}
+
+		public Builder withEndWhenNoModerator(Boolean endWhenNoModerator) {
+    		this.endWhenNoModerator = endWhenNoModerator;
+    		return this;
+		}
+
+		public Builder withEndWhenNoModeratorDelayInMinutes(Integer endWhenNoModeratorDelayInMinutes) {
+    		this.endWhenNoModeratorDelayInMinutes = endWhenNoModeratorDelayInMinutes;
+    		return this;
+		}
+
+		public Builder withHTML5InstanceId(int instanceId) {
+    		html5InstanceId = instanceId;
+    		return this;
+		}
+
+    	public Meeting build() {
+    		return new Meeting(this);
+    	}
+    }
+}

From 4721d6ef6aa7f37b29a10ce1d01d365d5ed896d9 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 30 Sep 2021 12:54:56 +0900
Subject: [PATCH 102/127] Update Meeting.java

---
 .../org/bigbluebutton/api/domain/Meeting.java | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java
index 3b7875d821b3..beeddd9a7c85 100755
--- a/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java
+++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java
@@ -88,6 +88,9 @@ public class Meeting {
 	private Boolean allowModsToUnmuteUsers = false;
 	private Boolean meetingKeepEvents;
 
+	private  HashMap<String, UploadRequest> uploadRequests = new HashMap<String, UploadRequest>();
+	private  HashMap<String, UploadedFile> uploadedFiles = new HashMap<String, UploadedFile>();
+	
 	private Integer meetingExpireIfNoUserJoinedInMinutes = 5;
 	private Integer meetingExpireWhenLastUserLeftInMinutes = 1;
 	private Integer userInactivityInspectTimerInMinutes = 120;
@@ -165,6 +168,16 @@ public List<String> getBreakoutRooms() {
 		return breakoutRooms;
 	}
 
+	public void addUploadRequest(String source, String filename, String userId, String token) {
+		UploadRequest uploadRequest = new UploadRequest(source, filename, userId);
+		uploadRequests.put(token, uploadRequest);
+	}
+	
+	public void addUploadedFile(String source, String filename, String contentType, String extension, String uploadId)  {
+		UploadedFile uploadedFile = new UploadedFile(source, filename, contentType, extension);
+		uploadedFiles.put(uploadId, uploadedFile);
+	}
+	
 	public Map<String, String> getPads() {
 		return pads;
 	}
@@ -201,6 +214,29 @@ public void setGuestStatusWithId(String userId, String guestStatus) {
 
 	}
 
+	public Boolean isUploadRequestValid(String source, String filename, String userId, String token) {
+		UploadRequest uploadRequest = uploadRequests.get(token);
+		if (uploadRequest != null) {
+			return uploadRequest.isValid(source, filename, userId);
+		} else {
+			return false;
+		}
+	}
+	
+	public Boolean hasUploadedFile(String source, String uploadId) {
+		UploadedFile uploadedFile = uploadedFiles.get(uploadId);
+		if (uploadedFile != null) {
+			return source.equals(uploadedFile.source);
+		} else {
+			return false;
+		}
+	}
+	
+	public UploadedFile getUploadedFile(String uploadId) {
+		UploadedFile uploadedFile = uploadedFiles.get(uploadId);
+		return uploadedFile;
+	}
+	
 	public RegisteredUser getRegisteredUserWithAuthToken(String authToken) {
 		for (RegisteredUser ruser : registeredUsers.values()) {
 			if (ruser.authToken.equals(authToken)) {

From 084b12689fdce5aa0ed22b0394ae9c9eb690401c Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 30 Sep 2021 12:59:12 +0900
Subject: [PATCH 103/127] Add files via upload

---
 .../bigbluebutton/api2/IBbbWebApiGWApp.java   | 112 ++++++++----------
 1 file changed, 52 insertions(+), 60 deletions(-)

diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api2/IBbbWebApiGWApp.java b/bbb-common-web/src/main/java/org/bigbluebutton/api2/IBbbWebApiGWApp.java
index d1a310b95efd..fd32c7759a43 100755
--- a/bbb-common-web/src/main/java/org/bigbluebutton/api2/IBbbWebApiGWApp.java
+++ b/bbb-common-web/src/main/java/org/bigbluebutton/api2/IBbbWebApiGWApp.java
@@ -1,60 +1,52 @@
-package org.bigbluebutton.api2;
-
-import java.util.Map;
-
-import org.bigbluebutton.api.domain.BreakoutRoomsParams;
-import org.bigbluebutton.api.domain.LockSettingsParams;
-import org.bigbluebutton.api.messaging.converters.messages.DestroyMeetingMessage;
-import org.bigbluebutton.api.messaging.converters.messages.EndMeetingMessage;
-import org.bigbluebutton.api.messaging.converters.messages.PublishedRecordingMessage;
-import org.bigbluebutton.api.messaging.converters.messages.UnpublishedRecordingMessage;
-import org.bigbluebutton.api.messaging.converters.messages.DeletedRecordingMessage;
-import org.bigbluebutton.presentation.messages.IDocConversionMsg;
-
-public interface IBbbWebApiGWApp {
-  void send(String channel, String message);
-  void createMeeting(String meetingID, String externalMeetingID,
-                     String parentMeetingID, String meetingName, Boolean recorded,
-                     String voiceBridge, Integer duration, Boolean autoStartRecording,
-                     Boolean allowStartStopRecording, Boolean webcamsOnlyForModerator,
-                     String moderatorPass, String viewerPass, Boolean learningDashboardEnabled, String learningDashboardAccessToken, Long createTime,
-                     String createDate, Boolean isBreakout, Integer sequence, Boolean freejoin, Map<String, String> metadata,
-                     String guestPolicy, Boolean authenticatedGuest, String meetingLayout, String welcomeMsgTemplate, String welcomeMsg, String modOnlyMessage,
-                     String dialNumber, Integer maxUsers,
-                     Integer meetingExpireIfNoUserJoinedInMinutes,
-                     Integer meetingExpireWhenLastUserLeftInMinutes,
-                     Integer userInactivityInspectTimerInMinutes,
-                     Integer userInactivityThresholdInMinutes,
-                     Integer userActivitySignResponseDelayInMinutes,
-                     Boolean endWhenNoModerator,
-                     Integer endWhenNoModeratorDelayInMinutes,
-                     Boolean muteOnStart,
-                     Boolean allowModsToUnmuteUsers,
-                     Boolean keepEvents,
-                     BreakoutRoomsParams breakoutParams,
-                     LockSettingsParams lockSettingsParams,
-                     Integer html5InstanceId);
-
-  void registerUser(String meetingID, String internalUserId, String fullname, String role,
-                    String externUserID, String authToken, String avatarURL,
-                    Boolean guest, Boolean authed, String guestStatus);
-  void ejectDuplicateUser(String meetingID, String internalUserId, String fullname,
-                    String externUserID);
-  void guestWaitingLeft(String meetingID, String internalUserId);
-
-  void destroyMeeting(DestroyMeetingMessage msg);
-  void endMeeting(EndMeetingMessage msg);
-    void fileUploaded(
-    String uploadId,
-    String source,
-    String filename,
-    String contentType,
-    String userId,
-    String meetingId
-  );
-  void sendKeepAlive(String system, Long bbbWebTimestamp, Long akkaAppsTimestamp);
-  void publishedRecording(PublishedRecordingMessage msg);
-  void unpublishedRecording(UnpublishedRecordingMessage msg);
-  void deletedRecording(DeletedRecordingMessage msg);
-  void sendDocConversionMsg(IDocConversionMsg msg);
-}
+package org.bigbluebutton.api2;
+
+import java.util.Map;
+
+import org.bigbluebutton.api.domain.BreakoutRoomsParams;
+import org.bigbluebutton.api.domain.LockSettingsParams;
+import org.bigbluebutton.api.messaging.converters.messages.DestroyMeetingMessage;
+import org.bigbluebutton.api.messaging.converters.messages.EndMeetingMessage;
+import org.bigbluebutton.api.messaging.converters.messages.PublishedRecordingMessage;
+import org.bigbluebutton.api.messaging.converters.messages.UnpublishedRecordingMessage;
+import org.bigbluebutton.api.messaging.converters.messages.DeletedRecordingMessage;
+import org.bigbluebutton.presentation.messages.IDocConversionMsg;
+
+public interface IBbbWebApiGWApp {
+  void send(String channel, String message);
+  void createMeeting(String meetingID, String externalMeetingID,
+                     String parentMeetingID, String meetingName, Boolean recorded,
+                     String voiceBridge, Integer duration, Boolean autoStartRecording,
+                     Boolean allowStartStopRecording, Boolean webcamsOnlyForModerator,
+                     String moderatorPass, String viewerPass, Boolean learningDashboardEnabled, String learningDashboardAccessToken, Long createTime,
+                     String createDate, Boolean isBreakout, Integer sequence, Boolean freejoin, Map<String, String> metadata,
+                     String guestPolicy, Boolean authenticatedGuest, String meetingLayout, String welcomeMsgTemplate, String welcomeMsg, String modOnlyMessage,
+                     String dialNumber, Integer maxUsers,
+                     Integer meetingExpireIfNoUserJoinedInMinutes,
+                     Integer meetingExpireWhenLastUserLeftInMinutes,
+                     Integer userInactivityInspectTimerInMinutes,
+                     Integer userInactivityThresholdInMinutes,
+                     Integer userActivitySignResponseDelayInMinutes,
+                     Boolean endWhenNoModerator,
+                     Integer endWhenNoModeratorDelayInMinutes,
+                     Boolean muteOnStart,
+                     Boolean allowModsToUnmuteUsers,
+                     Boolean keepEvents,
+                     BreakoutRoomsParams breakoutParams,
+                     LockSettingsParams lockSettingsParams,
+                     Integer html5InstanceId);
+
+  void registerUser(String meetingID, String internalUserId, String fullname, String role,
+                    String externUserID, String authToken, String avatarURL,
+                    Boolean guest, Boolean authed, String guestStatus);
+  void ejectDuplicateUser(String meetingID, String internalUserId, String fullname,
+                    String externUserID);
+  void guestWaitingLeft(String meetingID, String internalUserId);
+
+  void destroyMeeting(DestroyMeetingMessage msg);
+  void endMeeting(EndMeetingMessage msg);
+  void sendKeepAlive(String system, Long bbbWebTimestamp, Long akkaAppsTimestamp);
+  void publishedRecording(PublishedRecordingMessage msg);
+  void unpublishedRecording(UnpublishedRecordingMessage msg);
+  void deletedRecording(DeletedRecordingMessage msg);
+  void sendDocConversionMsg(IDocConversionMsg msg);
+}

From a2d8048435b1c44422d88c45f7b5d760dbe9b070 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 30 Sep 2021 13:01:05 +0900
Subject: [PATCH 104/127] Update IBbbWebApiGWApp.java

---
 .../main/java/org/bigbluebutton/api2/IBbbWebApiGWApp.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api2/IBbbWebApiGWApp.java b/bbb-common-web/src/main/java/org/bigbluebutton/api2/IBbbWebApiGWApp.java
index fd32c7759a43..5ee842d46fdc 100755
--- a/bbb-common-web/src/main/java/org/bigbluebutton/api2/IBbbWebApiGWApp.java
+++ b/bbb-common-web/src/main/java/org/bigbluebutton/api2/IBbbWebApiGWApp.java
@@ -44,6 +44,14 @@ void ejectDuplicateUser(String meetingID, String internalUserId, String fullname
 
   void destroyMeeting(DestroyMeetingMessage msg);
   void endMeeting(EndMeetingMessage msg);
+  void fileUploaded(
+    String uploadId,
+    String source,
+    String filename,
+    String contentType,
+    String userId,
+    String meetingId
+    );
   void sendKeepAlive(String system, Long bbbWebTimestamp, Long akkaAppsTimestamp);
   void publishedRecording(PublishedRecordingMessage msg);
   void unpublishedRecording(UnpublishedRecordingMessage msg);

From 7ea3293b3cf3e12cd0d4253c2466ee80d427509b Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 30 Sep 2021 13:01:40 +0900
Subject: [PATCH 105/127] Add files via upload

---
 .../org/bigbluebutton/api/MeetingService.java | 2601 ++++++++---------
 1 file changed, 1274 insertions(+), 1327 deletions(-)

diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
index b65a1af06b9c..f40faacc63f5 100755
--- a/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
+++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
@@ -1,1327 +1,1274 @@
-/**
- * BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
- * <p>
- * Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below).
- * <p>
- * This program is free software; you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software
- * Foundation; either version 3.0 of the License, or (at your option) any later
- * version.
- * <p>
- * BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * <p>
- * You should have received a copy of the GNU Lesser General Public License along
- * with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.bigbluebutton.api;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.AbstractMap;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.TreeMap;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
-import java.util.concurrent.LinkedBlockingQueue;
-
-import com.google.gson.JsonObject;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.http.client.utils.URIBuilder;
-import org.bigbluebutton.api.HTML5LoadBalancingService;
-import org.bigbluebutton.api.domain.GuestPolicy;
-import org.bigbluebutton.api.domain.Meeting;
-import org.bigbluebutton.api.domain.Recording;
-import org.bigbluebutton.api.domain.RegisteredUser;
-import org.bigbluebutton.api.domain.User;
-import org.bigbluebutton.api.domain.UserSession;
-import org.bigbluebutton.api.domain.UploadedFile;
-import org.bigbluebutton.api.domain.MeetingLayout;
-import org.bigbluebutton.api.messaging.MessageListener;
-import org.bigbluebutton.api.messaging.converters.messages.DestroyMeetingMessage;
-import org.bigbluebutton.api.messaging.converters.messages.EndMeetingMessage;
-import org.bigbluebutton.api.messaging.converters.messages.PublishedRecordingMessage;
-import org.bigbluebutton.api.messaging.converters.messages.UnpublishedRecordingMessage;
-import org.bigbluebutton.api.messaging.converters.messages.DeletedRecordingMessage;
-import org.bigbluebutton.api.messaging.messages.*;
-import org.bigbluebutton.api2.IBbbWebApiGWApp;
-import org.bigbluebutton.api2.domain.UploadedTrack;
-import org.bigbluebutton.common2.redis.RedisStorageService;
-import org.bigbluebutton.presentation.PresentationUrlDownloadService;
-import org.bigbluebutton.presentation.imp.SwfSlidesGenerationProgressNotifier;
-import org.bigbluebutton.web.services.WaitingGuestCleanupTimerTask;
-import org.bigbluebutton.web.services.UserCleanupTimerTask;
-import org.bigbluebutton.web.services.EnteredUserCleanupTimerTask;
-import org.bigbluebutton.web.services.callback.CallbackUrlService;
-import org.bigbluebutton.web.services.callback.MeetingEndedEvent;
-import org.bigbluebutton.web.services.turn.StunTurnService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.gson.Gson;
-
-public class MeetingService implements MessageListener {
-  private static Logger log = LoggerFactory.getLogger(MeetingService.class);
-
-  private BlockingQueue<IMessage> receivedMessages = new LinkedBlockingQueue<IMessage>();
-  private volatile boolean processMessage = false;
-
-  private final Executor msgProcessorExec = Executors.newSingleThreadExecutor();
-  private final Executor runExec = Executors.newSingleThreadExecutor();
-
-  /**
-   * http://ria101.wordpress.com/2011/12/12/concurrenthashmap-avoid-a-common-misuse/
-   */
-  private final ConcurrentMap<String, Meeting> meetings;
-  private final ConcurrentMap<String, UserSession> sessions;
-
-  private RecordingService recordingService;
-  private LearningDashboardService learningDashboardService;
-  private WaitingGuestCleanupTimerTask waitingGuestCleaner;
-  private UserCleanupTimerTask userCleaner;
-  private EnteredUserCleanupTimerTask enteredUserCleaner;
-  private StunTurnService stunTurnService;
-  private RedisStorageService storeService;
-  private CallbackUrlService callbackUrlService;
-  private HTML5LoadBalancingService html5LoadBalancingService;
-  private SwfSlidesGenerationProgressNotifier notifier;
-
-  private long usersTimeout;
-  private long enteredUsersTimeout;
-
-  private ParamsProcessorUtil paramsProcessorUtil;
-  private PresentationUrlDownloadService presDownloadService;
-
-  private IBbbWebApiGWApp gw;
-
-  private  HashMap<String, PresentationUploadToken> uploadAuthzTokens;
-
-  public MeetingService() {
-    meetings = new ConcurrentHashMap<String, Meeting>(8, 0.9f, 1);
-    sessions = new ConcurrentHashMap<String, UserSession>(8, 0.9f, 1);
-    uploadAuthzTokens = new HashMap<String, PresentationUploadToken>();
-  }
-
-  public void addUserSession(String token, UserSession user) {
-    sessions.put(token, user);
-  }
-
-  public String getTokenByUserId(String internalUserId) {
-      String result = null;
-      for (Entry<String, UserSession> e : sessions.entrySet()) {
-          String token = e.getKey();
-          UserSession userSession = e.getValue();
-          if (userSession.internalUserId.equals(internalUserId)) {
-              result = token;
-          }
-      }
-      return result;
-  }
-
-  public void registerUser(String meetingID, String internalUserId,
-                           String fullname, String role, String externUserID,
-                           String authToken, String avatarURL, Boolean guest,
-                           Boolean authed, String guestStatus) {
-    handle(new RegisterUser(meetingID, internalUserId, fullname, role,
-      externUserID, authToken, avatarURL, guest, authed, guestStatus));
-
-    Meeting m = getMeeting(meetingID);
-    if (m != null) {
-      RegisteredUser ruser = new RegisteredUser(authToken, internalUserId, guestStatus);
-      m.userRegistered(ruser);
-    }
-  }
-
-  public Boolean isPadValid(String padId, String sessionToken) {
-    UserSession us = getUserSessionWithAuthToken(sessionToken);
-    if (us == null) return false;
-
-    Meeting m = getMeeting(us.meetingID);
-    if (m == null) return false;
-
-    if (m.hasPad(padId)) {
-      return true;
-    } else {
-      return false;
-    }
-  }
-
-  public UserSession getUserSessionWithUserId(String userId) {
-    for (UserSession userSession : sessions.values()) {
-      if (userSession.internalUserId.equals(userId)) {
-        return userSession;
-      }
-    }
-
-    return null;
-  }
-
-  public UserSession getUserSessionWithAuthToken(String token) {
-    return sessions.get(token);
-  }
-
-  public UserSession removeUserSessionWithAuthToken(String token) {
-    UserSession user = sessions.remove(token);
-    if (user != null) {
-      log.debug("Found user {} token={} to meeting {}", user.fullname, token, user.meetingID);
-    }
-    return user;
-  }
-
-  /**
-   * Remove users who did not successfully reconnected to the meeting.
-   */
-  public void purgeUsers() {
-    for (AbstractMap.Entry<String, Meeting> entry : this.meetings.entrySet()) {
-      Long now = System.currentTimeMillis();
-      Meeting meeting = entry.getValue();
-
-      for (AbstractMap.Entry<String, User> userEntry : meeting.getUsersMap().entrySet()) {
-        String userId = userEntry.getKey();
-        User user = userEntry.getValue();
-
-        if (!user.hasLeft()) continue;
-
-        long elapsedTime = now - user.getLeftOn();
-        if (elapsedTime >= usersTimeout) {
-          meeting.removeUser(userId);
-
-          Map<String, Object> logData = new HashMap<>();
-          logData.put("meetingId", meeting.getInternalId());
-          logData.put("userId", userId);
-          logData.put("logCode", "removed_user");
-          logData.put("description", "User left and was removed from the meeting.");
-
-          Gson gson = new Gson();
-          String logStr = gson.toJson(logData);
-
-          log.info(" --analytics-- data={}", logStr);
-        }
-      }
-    }
-  }
-
-  /**
-   * Remove entered users who did not join.
-   */
-  public void purgeEnteredUsers() {
-    for (AbstractMap.Entry<String, Meeting> entry : this.meetings.entrySet()) {
-      Long now = System.currentTimeMillis();
-      Meeting meeting = entry.getValue();
-
-      for (AbstractMap.Entry<String, Long> enteredUser : meeting.getEnteredUsers().entrySet()) {
-        String userId = enteredUser.getKey();
-
-        long elapsedTime = now - enteredUser.getValue();
-        if (elapsedTime >= enteredUsersTimeout) {
-          meeting.removeEnteredUser(userId);
-
-          Map<String, Object> logData = new HashMap<>();
-          logData.put("meetingId", meeting.getInternalId());
-          logData.put("userId", userId);
-          logData.put("logCode", "purged_entered_user");
-          logData.put("description", "Purged user that called ENTER from the API but never joined");
-
-          Gson gson = new Gson();
-          String logStr = gson.toJson(logData);
-
-          log.info(" --analytics-- data={}", logStr);
-        }
-      }
-    }
-  }
-
-  public void guestIsWaiting(String meetingId, String userId) {
-    Meeting m = getMeeting(meetingId);
-    if (m != null) {
-      m.guestIsWaiting(userId);
-    }
-  }
-
-  /**
-   * Remove registered waiting guest users who left the waiting page.
-   */
-  public void purgeWaitingGuestUsers() {
-    for (AbstractMap.Entry<String, Meeting> entry : this.meetings.entrySet()) {
-      Long now = System.currentTimeMillis();
-      Meeting meeting = entry.getValue();
-
-      ConcurrentMap<String, User> users = meeting.getUsersMap();
-
-      for (AbstractMap.Entry<String, RegisteredUser> registeredUser : meeting.getRegisteredUsers().entrySet()) {
-        String registeredUserID = registeredUser.getKey();
-        RegisteredUser ru = registeredUser.getValue();
-
-        long elapsedTime = now - ru.getGuestWaitedOn();
-        if (elapsedTime >= 15000 && ru.getGuestStatus() == GuestPolicy.WAIT) {
-          if (meeting.userUnregistered(registeredUserID) != null) {
-            gw.guestWaitingLeft(meeting.getInternalId(), registeredUserID);
-          };
-        }
-      }
-    }
-  }
-
-
-  private void kickOffProcessingOfRecording(Meeting m) {
-    if (m.isRecord() && m.getNumUsers() == 0) {
-      processRecording(m);
-    }
-  }
-  
-  public Boolean isUploadRequestValid(String meetingId, String source, String filename, String userId, String token) {
-    Meeting m = getMeeting(meetingId);
-    if (m != null) {
-      return m.isUploadRequestValid(source, filename, userId, token);
-    } else {
-      return false;
-    }
-  }
-
-  public Boolean isDownloadRequestValid(String meetingId, String source, String uploadId) {
-    Meeting m = getMeeting(meetingId);
-    if (m != null) {
-      return m.hasUploadedFile(source, uploadId);
-    } else {
-      return false;
-    }
-  }
-
-  public UploadedFile getUploadedFile(String meetingId, String uploadId) {
-    Meeting m = getMeeting(meetingId);
-    if (m != null) {
-      return m.getUploadedFile(uploadId);
-    } else {
-      return null;
-    }
-  }
-
-  public Boolean authzTokenIsValid(String authzToken) { // Note we DO NOT expire the token
-    return uploadAuthzTokens.containsKey(authzToken);
-  }
-
-  public Boolean authzTokenIsValidAndExpired(String authzToken) {  // Note we DO expire the token
-    Boolean valid = uploadAuthzTokens.containsKey(authzToken);
-    expirePresentationUploadToken(authzToken);
-    return valid;
-  }
-
-  public PresentationUploadToken getPresentationUploadToken(String authzToken) {
-    if(uploadAuthzTokens.containsKey(authzToken)) {
-      return uploadAuthzTokens.get(authzToken);
-    } else {
-      return null;
-    }
-  }
-
-  public void sendPresentationUploadMaxFilesizeMessage(PresentationUploadToken presUploadToken, int uploadedFileSize, int maxUploadFileSize) {
-    notifier.sendUploadFileTooLargeMessage(presUploadToken, uploadedFileSize, maxUploadFileSize);
-  }
-
-  private void removeUserSessions(String meetingId) {
-    Iterator<Map.Entry<String, UserSession>> iterator = sessions.entrySet().iterator();
-    while (iterator.hasNext()) {
-      Map.Entry<String, UserSession> entry = iterator.next();
-      UserSession userSession = entry.getValue();
-
-      if (userSession.meetingID.equals(meetingId)) {
-        iterator.remove();
-      }
-    }
-  }
-
-  private void destroyMeeting(String meetingId) {
-    gw.destroyMeeting(new DestroyMeetingMessage(meetingId));
-  }
-
-  public Collection<Meeting> getMeetings() {
-    return meetings.isEmpty() ? Collections.<Meeting>emptySet()
-      : Collections.unmodifiableCollection(meetings.values());
-  }
-
-  public Collection<UserSession> getSessions() {
-    return sessions.isEmpty() ? Collections.<UserSession>emptySet()
-      : Collections.unmodifiableCollection(sessions.values());
-  }
-
-  public synchronized boolean createMeeting(Meeting m) {
-    String internalMeetingId = paramsProcessorUtil.convertToInternalMeetingId(m.getExternalId());
-    Meeting existingId = getNotEndedMeetingWithId(internalMeetingId);
-    Meeting existingTelVoice = getNotEndedMeetingWithTelVoice(m.getTelVoice());
-    Meeting existingWebVoice = getNotEndedMeetingWithWebVoice(m.getWebVoice());
-    if (existingId == null && existingTelVoice == null && existingWebVoice == null) {
-      meetings.put(m.getInternalId(), m);
-      handle(new CreateMeeting(m));
-      return true;
-    }
-
-    return false;
-  }
-
-  private boolean storeEvents(Meeting m) {
-    return m.isRecord() || m.getMeetingKeepEvents();
-  }
-
-  private void handleCreateMeeting(Meeting m) {
-    if (m.isBreakout()) {
-      Meeting parent = meetings.get(m.getParentMeetingId());
-      parent.addBreakoutRoom(m.getExternalId());
-      if (storeEvents(parent)) {
-        storeService.addBreakoutRoom(parent.getInternalId(), m.getInternalId());
-      }
-    }
-
-    if (storeEvents(m)) {
-      Map<String, String> metadata = new TreeMap<>();
-      metadata.putAll(m.getMetadata());
-      // TODO: Need a better way to store these values for recordings
-      metadata.put("meetingId", m.getExternalId());
-      metadata.put("meetingName", m.getName());
-      metadata.put("isBreakout", m.isBreakout().toString());
-
-      storeService.recordMeetingInfo(m.getInternalId(), metadata);
-
-      if (m.isBreakout()) {
-        Map<String, String> breakoutMetadata = new TreeMap<>();
-        breakoutMetadata.put("meetingId", m.getExternalId());
-        breakoutMetadata.put("sequence", m.getSequence().toString());
-        breakoutMetadata.put("freeJoin", m.isFreeJoin().toString());
-        breakoutMetadata.put("parentMeetingId", m.getParentMeetingId());
-        storeService.recordBreakoutInfo(m.getInternalId(), breakoutMetadata);
-      }
-    }
-
-    Map<String, Object> logData = new HashMap<>();
-    logData.put("meetingId", m.getInternalId());
-    logData.put("externalMeetingId", m.getExternalId());
-    if (m.isBreakout()) {
-      logData.put("sequence", m.getSequence());
-      logData.put("freeJoin", m.isFreeJoin());
-      logData.put("parentMeetingId", m.getParentMeetingId());
-    }
-    logData.put("name", m.getName());
-    logData.put("duration", m.getDuration());
-    logData.put("isBreakout", m.isBreakout());
-    logData.put("webcamsOnlyForModerator", m.getWebcamsOnlyForModerator());
-    logData.put("record", m.isRecord());
-    logData.put("logCode", "create_meeting");
-    logData.put("description", "Create meeting.");
-
-    logData.put("meetingKeepEvents", m.getMeetingKeepEvents());
-    logData.put("meetingLayout", m.getMeetingLayout());
-
-    Gson gson = new Gson();
-    String logStr = gson.toJson(logData);
-
-    log.info(" --analytics-- data={}", logStr);
-
-    gw.createMeeting(m.getInternalId(), m.getExternalId(), m.getParentMeetingId(), m.getName(), m.isRecord(),
-            m.getTelVoice(), m.getDuration(), m.getAutoStartRecording(), m.getAllowStartStopRecording(),
-            m.getWebcamsOnlyForModerator(), m.getModeratorPassword(), m.getViewerPassword(),
-            m.getLearningDashboardEnabled(), m.getLearningDashboardAccessToken(), m.getCreateTime(),
-            formatPrettyDate(m.getCreateTime()), m.isBreakout(), m.getSequence(), m.isFreeJoin(), m.getMetadata(),
-            m.getGuestPolicy(), m.getAuthenticatedGuest(), m.getMeetingLayout(), m.getWelcomeMessageTemplate(), m.getWelcomeMessage(), m.getModeratorOnlyMessage(),
-            m.getDialNumber(), m.getMaxUsers(),
-            m.getMeetingExpireIfNoUserJoinedInMinutes(), m.getmeetingExpireWhenLastUserLeftInMinutes(),
-            m.getUserInactivityInspectTimerInMinutes(), m.getUserInactivityThresholdInMinutes(),
-            m.getUserActivitySignResponseDelayInMinutes(), m.getEndWhenNoModerator(), m.getEndWhenNoModeratorDelayInMinutes(),
-            m.getMuteOnStart(), m.getAllowModsToUnmuteUsers(), m.getMeetingKeepEvents(),
-            m.breakoutRoomsParams,
-            m.lockSettingsParams, m.getHtml5InstanceId());
-  }
-
-  private String formatPrettyDate(Long timestamp) {
-    return new Date(timestamp).toString();
-  }
-
-  private void processCreateMeeting(CreateMeeting message) {
-    handleCreateMeeting(message.meeting);
-  }
-
-  private void processRegisterUser(RegisterUser message) {
-    Meeting m = getMeeting(message.meetingID);
-    if (m != null) {
-      User prevUser = m.getUserWithExternalId(message.externUserID);
-      if (prevUser != null) {
-        Map<String, Object> logData = new HashMap<>();
-        logData.put("meetingId", m.getInternalId());
-        logData.put("externalMeetingId", m.getExternalId());
-        logData.put("name", m.getName());
-        logData.put("extUserId", prevUser.getExternalUserId());
-        logData.put("intUserId", prevUser.getInternalUserId());
-        logData.put("username", prevUser.getFullname());
-        logData.put("logCode", "duplicate_user_with_external_userid");
-        logData.put("description", "Duplicate user with external userid.");
-
-        Gson gson = new Gson();
-        String logStr = gson.toJson(logData);
-        log.info(" --analytics-- data={}", logStr);
-
-        if (!m.allowDuplicateExtUserid) {
-          gw.ejectDuplicateUser(message.meetingID,
-                  prevUser.getInternalUserId(), prevUser.getFullname(),
-                  prevUser.getExternalUserId());
-        }
-
-      }
-
-    }
-    gw.registerUser(message.meetingID,
-      message.internalUserId, message.fullname, message.role,
-      message.externUserID, message.authToken, message.avatarURL, message.guest,
-            message.authed, message.guestStatus);
-  }
-
-    public Meeting getMeeting(String meetingId) {
-        if (meetingId == null)
-            return null;
-        for (Map.Entry<String, Meeting> entry : meetings.entrySet()) {
-            String key = entry.getKey();
-            if (key.startsWith(meetingId))
-                return entry.getValue();
-        }
-
-        return null;
-    }
-
-  public Collection<Meeting> getMeetingsWithId(String meetingId) {
-    if (meetingId == null)
-      return Collections.<Meeting>emptySet();
-
-    Collection<Meeting> m = new HashSet<>();
-
-    for (Map.Entry<String, Meeting> entry : meetings.entrySet()) {
-        String key = entry.getKey();
-        if (key.startsWith(meetingId))
-            m.add(entry.getValue());
-    }
-
-    return m;
-  }
-
-  public Meeting getNotEndedMeetingWithId(String meetingId) {
-      if (meetingId == null)
-          return null;
-      for (Map.Entry<String, Meeting> entry : meetings.entrySet()) {
-          String key = entry.getKey();
-          if (key.startsWith(meetingId)) {
-              Meeting m = entry.getValue();
-              if (!m.isForciblyEnded())
-                  return m;
-          }
-      }
-      return null;
-  }
-
-  public Meeting getNotEndedMeetingWithTelVoice(String telVoice) {
-      if (telVoice == null)
-          return null;
-      for (Map.Entry<String, Meeting> entry : meetings.entrySet()) {
-          Meeting m = entry.getValue();
-          if (telVoice.equals(m.getTelVoice())) {
-              if (!m.isForciblyEnded())
-                  return m;
-          }
-      }
-      return null;
-  }
-
-  public Meeting getNotEndedMeetingWithWebVoice(String webVoice) {
-      if (webVoice == null)
-          return null;
-      for (Map.Entry<String, Meeting> entry : meetings.entrySet()) {
-          Meeting m = entry.getValue();
-          if (webVoice.equals(m.getWebVoice())) {
-              if (!m.isForciblyEnded())
-                  return m;
-          }
-      }
-      return null;
-  }
-
-  public Boolean validateTextTrackSingleUseToken(String recordId, String caption, String token) {
-    return recordingService.validateTextTrackSingleUseToken(recordId, caption, token);
-  }
-
-  public String getRecordingTextTracks(String recordId) {
-    return recordingService.getRecordingTextTracks(recordId);
-  }
-
-  public String putRecordingTextTrack(String recordId, String kind, String lang, File file, String label,
-          String origFilename, String trackId, String contentType, String tempFilename) {
-
-    Map<String, Object> logData = new HashMap<>();
-    logData.put("recordId", recordId);
-    logData.put("kind", kind);
-    logData.put("lang", lang);
-    logData.put("label", label);
-    logData.put("origFilename", origFilename);
-    logData.put("contentType", contentType);
-    logData.put("tempFilename", tempFilename);
-    logData.put("logCode", "recording_captions_uploaded");
-    logData.put("description", "Captions for recording uploaded.");
-
-    Gson gson = new Gson();
-    String logStr = gson.toJson(logData);
-    log.info(" --analytics-- data={}", logStr);
-
-      UploadedTrack track = new UploadedTrack(recordId, kind, lang, label, origFilename, file, trackId,
-              getCaptionTrackInboxDir(), contentType, tempFilename);
-      return recordingService.putRecordingTextTrack(track);
-  }
-
-  public String getCaptionTrackInboxDir() {
-  	return recordingService.getCaptionTrackInboxDir();
-  }
-
-  public String getCaptionsDir() {
-    return recordingService.getCaptionsDir();
-  }
-
-  public boolean isRecordingExist(String recordId) {
-    return recordingService.isRecordingExist(recordId);
-  }
-
-  public String getRecordings2x(List<String> idList, List<String> states, Map<String, String> metadataFilters) {
-    return recordingService.getRecordings2x(idList, states, metadataFilters);
-  }
-
-  public boolean existsAnyRecording(List<String> idList) {
-    return recordingService.existAnyRecording(idList);
-  }
-
-  public void setPublishRecording(List<String> idList, boolean publish) {
-    for (String id : idList) {
-      if (publish) {
-        if (recordingService.changeState(id, Recording.STATE_PUBLISHED)) {
-          gw.publishedRecording(new PublishedRecordingMessage(id));
-        }
-      } else {
-        if (recordingService.changeState(id, Recording.STATE_UNPUBLISHED)) {
-          gw.unpublishedRecording(new UnpublishedRecordingMessage(id));
-        }
-      }
-    }
-  }
-
-  public void deleteRecordings(List<String> idList) {
-    for (String id : idList) {
-      if (recordingService.changeState(id, Recording.STATE_DELETED)) {
-        gw.deletedRecording(new DeletedRecordingMessage(id));
-      }
-    }
-  }
-
-  public void updateRecordings(List<String> idList, Map<String, String> metaParams) {
-    recordingService.updateMetaParams(idList, metaParams);
-  }
-
-  public void processRecording(Meeting m) {
-    if (m.isRecord()) {
-      Map<String, Object> logData = new HashMap<String, Object>();
-      logData.put("meetingId", m.getInternalId());
-      logData.put("externalMeetingId", m.getExternalId());
-      logData.put("name", m.getName());
-      logData.put("logCode", "kick_off_ingest_and_processing");
-      logData.put("description", "Start processing of recording.");
-
-      Gson gson = new Gson();
-      String logStr = gson.toJson(logData);
-
-      log.info(" --analytics-- data={}", logStr);
-      recordingService.startIngestAndProcessing(m.getInternalId());
-    }
-  }
-
-  public void fileUploaded(
-      String uploadId,
-      String source,
-      String filename,
-      String contentType,
-      String extension,
-      String userId,
-      String meetingId
-    ) {
-    Meeting m = getMeeting(meetingId);
-    if (m != null) {
-      m.addUploadedFile(source, filename, contentType, extension, uploadId);
-      gw.fileUploaded(uploadId, source, filename, contentType, userId, meetingId);
-    }
-  }
-
-  public void endMeeting(String meetingId) {
-    handle(new EndMeeting(meetingId));
-  }
-
-  private void processCreateBreakoutRoom(CreateBreakoutRoom message) {
-    Meeting parentMeeting = getMeeting(message.parentMeetingId);
-    if (parentMeeting != null) {
-
-      Map<String, String> params = new HashMap<>();
-      params.put(ApiParams.NAME, message.name);
-      params.put(ApiParams.MEETING_ID, message.meetingId);
-      params.put(ApiParams.PARENT_MEETING_ID, message.parentMeetingId);
-      params.put(ApiParams.IS_BREAKOUT, "true");
-      params.put(ApiParams.SEQUENCE, message.sequence.toString());
-      params.put(ApiParams.FREE_JOIN, message.freeJoin.toString());
-      params.put(ApiParams.ATTENDEE_PW, message.viewerPassword);
-      params.put(ApiParams.MODERATOR_PW, message.moderatorPassword);
-      params.put(ApiParams.DIAL_NUMBER, message.dialNumber);
-      params.put(ApiParams.VOICE_BRIDGE, message.voiceConfId);
-      params.put(ApiParams.DURATION, message.durationInMinutes.toString());
-      params.put(ApiParams.RECORD, message.record.toString());
-      params.put(ApiParams.WELCOME, getMeeting(message.parentMeetingId).getWelcomeMessageTemplate());
-
-      Map<String, String> parentMeetingMetadata = parentMeeting.getMetadata();
-
-      String metaPrefix = "meta_";
-      for (String key : parentMeetingMetadata.keySet()) {
-        String metaName = metaPrefix + key;
-        // Inject metadata from parent meeting into the breakout room.
-        params.put(metaName, parentMeetingMetadata.get(key));
-      }
-
-      Meeting breakout = paramsProcessorUtil.processCreateParams(params);
-
-      createMeeting(breakout);
-
-      presDownloadService.extractPresentationPage(message.parentMeetingId,
-        message.sourcePresentationId,
-        message.sourcePresentationSlide, breakout.getInternalId());
-    } else {
-      Map<String, Object> logData = new HashMap<String, Object>();
-      logData.put("meetingId", message.meetingId);
-      logData.put("parentMeetingId", message.parentMeetingId);
-      logData.put("name", message.name);
-      logData.put("logCode", "create_breakout_failed");
-      logData.put("reason", "Parent not found.");
-      logData.put("description", "Create breakout failed.");
-
-      Gson gson = new Gson();
-      String logStr = gson.toJson(logData);
-
-      log.error(" --analytics-- data={}", logStr);
-    }
-  }
-
-  private void processUpdateRecordingStatus(UpdateRecordingStatus message) {
-    Meeting m = getMeeting(message.meetingId);
-      // Set only once
-      if (m != null && message.recording && !m.haveRecordingMarks()) {
-          m.setHaveRecordingMarks(message.recording);
-      }
-  }
-
-  private void processEndMeeting(EndMeeting message) {
-    gw.endMeeting(new EndMeetingMessage(message.meetingId));
-  }
-
-  private void processRemoveEndedMeeting(MeetingEnded message) {
-    Meeting m = getMeeting(message.meetingId);
-    if (m != null) {
-      m.setForciblyEnded(true);
-      processRecording(m);
-      if (m.getMeetingKeepEvents()) {
-        // The creation of the ended tag must occur after the creation of the
-        // recorded tag to avoid concurrency issues at the recording scripts
-        recordingService.markAsEnded(m.getInternalId());
-      }
-      destroyMeeting(m.getInternalId());
-      meetings.remove(m.getInternalId());
-      removeUserSessions(m.getInternalId());
-
-      Map<String, Object> logData = new HashMap<>();
-      logData.put("meetingId", m.getInternalId());
-      logData.put("externalMeetingId", m.getExternalId());
-      logData.put("name", m.getName());
-      logData.put("duration", m.getDuration());
-      logData.put("record", m.isRecord());
-      logData.put("logCode", "meeting_removed_from_running");
-      logData.put("description", "Meeting removed from list of running meetings.");
-
-      Gson gson = new Gson();
-      String logStr = gson.toJson(logData);
-
-      log.info(" --analytics-- data={}", logStr);
-    }
-  }
-
-  private void processGuestStatusChangedEventMsg(GuestStatusChangedEventMsg message) {
-    Meeting m = getMeeting(message.meetingId);
-    if (m != null) {
-      for (GuestsStatus guest : message.guests) {
-        User user = m.getUserById(guest.userId);
-        if (user != null) user.setGuestStatus(guest.status);
-      }
-    }
-
-    for (GuestsStatus guest : message.guests) {
-      UserSession userSession = getUserSessionWithUserId(guest.userId);
-      if (userSession != null) userSession.guestStatus = guest.status;
-    }
-
-  }
-
-  private void processUploadRequest(UploadRequest message) {
-    Meeting m = getMeeting(message.meetingId);
-    if (m != null) {
-      m.addUploadRequest(message.source, message.filename, message.userId, message.token);
-    }
-  }
-  
-  private void processPresentationUploadToken(PresentationUploadToken message) {
-    uploadAuthzTokens.put(message.authzToken, message);
-  }
-
-  private void expirePresentationUploadToken(String usedToken) {
-    uploadAuthzTokens.remove(usedToken);
-  }
-
-  public void addUserCustomData(String meetingId, String userID,
-                                Map<String, String> userCustomData) {
-    Meeting m = getMeeting(meetingId);
-    if (m != null) {
-      m.addUserCustomData(userID, userCustomData);
-    }
-  }
-
-  private void meetingStarted(MeetingStarted message) {
-    Meeting m = getMeeting(message.meetingId);
-    if (m != null) {
-      if (m.getStartTime() == 0) {
-        long now = System.currentTimeMillis();
-        m.setStartTime(now);
-
-        Map<String, Object> logData = new HashMap<>();
-        logData.put("meetingId", m.getInternalId());
-        logData.put("externalMeetingId", m.getExternalId());
-        if (m.isBreakout()) {
-          logData.put("parentMeetingId", m.getParentMeetingId());
-        }
-        logData.put("name", m.getName());
-        logData.put("duration", m.getDuration());
-        logData.put("record", m.isRecord());
-        logData.put("isBreakout", m.isBreakout());
-        logData.put("logCode", "meeting_started");
-        logData.put("description", "Meeting has started.");
-
-        Gson gson = new Gson();
-        String logStr = gson.toJson(logData);
-
-        log.info(" --analytics-- data={}", logStr);
-      } else {
-        Map<String, Object> logData = new HashMap<>();
-        logData.put("meetingId", m.getInternalId());
-        logData.put("externalMeetingId", m.getExternalId());
-        if (m.isBreakout()) {
-          logData.put("parentMeetingId", m.getParentMeetingId());
-        }
-        logData.put("name", m.getName());
-        logData.put("duration", m.getDuration());
-        logData.put("record", m.isRecord());
-        logData.put("isBreakout", m.isBreakout());
-        logData.put("logCode", "meeting_restarted");
-        logData.put("description", "Meeting has restarted.");
-
-        Gson gson = new Gson();
-        String logStr = gson.toJson(logData);
-
-        log.info(" --analytics-- data={}", logStr);
-      }
-    }
-  }
-
-  private void meetingDestroyed(MeetingDestroyed message) {
-    Meeting m = getMeeting(message.meetingId);
-    if (m != null) {
-      long now = System.currentTimeMillis();
-      m.setEndTime(now);
-
-      Map<String, Object> logData = new HashMap<>();
-      logData.put("meetingId", m.getInternalId());
-      logData.put("externalMeetingId", m.getExternalId());
-      logData.put("name", m.getName());
-      logData.put("duration", m.getDuration());
-      logData.put("record", m.isRecord());
-      logData.put("logCode", "meeting_destroyed");
-      logData.put("description", "Meeting has been destroyed.");
-
-      Gson gson = new Gson();
-      String logStr = gson.toJson(logData);
-
-      log.info(" --analytics-- data={}", logStr);
-    }
-  }
-
-  private void meetingEnded(MeetingEnded message) {
-    Meeting m = getMeeting(message.meetingId);
-    if (m != null) {
-      long now = System.currentTimeMillis();
-      m.setEndTime(now);
-
-      Map<String, Object> logData = new HashMap<>();
-      logData.put("meetingId", m.getInternalId());
-      logData.put("externalMeetingId", m.getExternalId());
-      logData.put("name", m.getName());
-      logData.put("duration", m.getDuration());
-      logData.put("record", m.isRecord());
-      logData.put("logCode", "meeting_ended");
-      logData.put("description", "Meeting has ended.");
-
-      Gson gson = new Gson();
-      String logStr = gson.toJson(logData);
-
-      log.info(" --analytics-- data={}", logStr);
-
-      String endCallbackUrl = "endCallbackUrl".toLowerCase();
-      Map<String, String> metadata = m.getMetadata();
-      if (!m.isBreakout()) {
-        if (metadata.containsKey(endCallbackUrl)) {
-          String callbackUrl = metadata.get(endCallbackUrl);
-          try {
-            callbackUrl = new URIBuilder(new URI(callbackUrl))
-              .addParameter("recordingmarks", m.haveRecordingMarks() ? "true" : "false")
-              .addParameter("meetingID", m.getExternalId()).build().toURL().toString();
-            MeetingEndedEvent event = new MeetingEndedEvent(m.getInternalId(), m.getExternalId(), m.getName(), callbackUrl);
-            processMeetingEndedCallback(event);
-          } catch (Exception e) {
-            log.error("Error in callback url=[{}]", callbackUrl, e);
-          }
-        }
-
-        if (! StringUtils.isEmpty(m.getMeetingEndedCallbackURL())) {
-          String meetingEndedCallbackURL = m.getMeetingEndedCallbackURL();
-          callbackUrlService.handleMessage(new MeetingEndedEvent(m.getInternalId(), m.getExternalId(), m.getName(), meetingEndedCallbackURL));
-        }
-      }
-
-      //Remove Learning Dashboard files
-      if(m.getLearningDashboardCleanupDelayInMinutes() > 0) {
-        learningDashboardService.removeJsonDataFile(message.meetingId, m.getLearningDashboardCleanupDelayInMinutes());
-      }
-
-      processRemoveEndedMeeting(message);
-    }
-  }
-
-  private void processMeetingEndedCallback(MeetingEndedEvent event) {
-    try {
-      callbackUrlService.handleMessage(event);
-    } catch (Exception e) {
-      log.error("Error in callback url=[{}]", event.getCallbackUrl(), e);
-    }
-  }
-
-  private void userJoined(UserJoined message) {
-    Meeting m = getMeeting(message.meetingId);
-    if (m != null) {
-      if (m.getNumUsers() == 0) {
-        // First user joins the meeting. Reset the end time to zero
-        // in case the meeting has been rejoined.
-        m.setEndTime(0);
-      }
-
-      User user = new User(message.userId, message.externalUserId,
-        message.name, message.role, message.avatarURL, message.guest, message.guestStatus,
-              message.clientType);
-      m.userJoined(user);
-      m.setGuestStatusWithId(user.getInternalUserId(), message.guestStatus);
-      UserSession userSession = getUserSessionWithUserId(user.getInternalUserId());
-      if (userSession != null) {
-        userSession.guestStatus = message.guestStatus;
-      }
-
-      Map<String, Object> logData = new HashMap<>();
-      logData.put("meetingId", m.getInternalId());
-      logData.put("externalMeetingId", m.getExternalId());
-      logData.put("name", m.getName());
-      logData.put("userId", message.userId);
-      logData.put("externalUserId", user.getExternalUserId());
-      logData.put("username", user.getFullname());
-      logData.put("role", user.getRole());
-      logData.put("guest", user.isGuest());
-      logData.put("guestStatus", user.getGuestStatus());
-      logData.put("logCode", "user_joined_message");
-      logData.put("description", "User joined the meeting.");
-      logData.put("clientType", user.getClientType());
-
-      Gson gson = new Gson();
-      String logStr = gson.toJson(logData);
-      log.info(" --analytics-- data={}", logStr);
-    }
-  }
-
-  private void userLeft(UserLeft message) {
-    Meeting m = getMeeting(message.meetingId);
-    if (m != null) {
-      User user = m.userLeft(message.userId);
-      if (user != null) {
-
-        Map<String, Object> logData = new HashMap<>();
-        logData.put("meetingId", m.getInternalId());
-        logData.put("externalMeetingId", m.getExternalId());
-        logData.put("name", m.getName());
-        logData.put("userId", message.userId);
-        logData.put("externalUserId", user.getExternalUserId());
-        logData.put("username", user.getFullname());
-        logData.put("role", user.getRole());
-        logData.put("guest", user.isGuest());
-        logData.put("guestStatus", user.getGuestStatus());
-        logData.put("logCode", "user_left_message");
-        logData.put("description", "User left the meeting.");
-
-        Gson gson = new Gson();
-        String logStr = gson.toJson(logData);
-
-        log.info(" --analytics-- data={}", logStr);
-
-        if (m.getNumUsers() == 0) {
-          // Last user the meeting. Mark this as the time
-          // the meeting ended.
-          m.setEndTime(System.currentTimeMillis());
-        }
-      }
-    }
-  }
-
-  private void updatedStatus(UserStatusChanged message) {
-    Meeting m = getMeeting(message.meetingId);
-    if (m != null) {
-      User user = m.getUserById(message.userId);
-      if (user != null) {
-        user.setStatus(message.status, message.value);
-      }
-    }
-  }
-
-  public void processLearningDashboard(LearningDashboard message) {
-    //Get all data from Json instead of getMeeting(message.meetingId), to process messages received even after meeting ended
-    JsonObject activityJsonObject = new Gson().fromJson(message.activityJson, JsonObject.class).getAsJsonObject();
-    String learningDashboardAccessToken = activityJsonObject.get("learningDashboardAccessToken").getAsString();
-
-    Map<String, Object> logData = new HashMap<String, Object>();
-    logData.put("meetingId", activityJsonObject.get("intId").getAsString());
-    logData.put("externalMeetingId", activityJsonObject.get("extId").getAsString());
-    logData.put("name", activityJsonObject.get("name").getAsString());
-    logData.put("logCode", "update_activity_json");
-    logData.put("description", "Updating activities json.");
-
-    Gson gson = new Gson();
-    String logStr = gson.toJson(logData);
-
-    log.info(" --analytics-- data={}", logStr);
-
-    learningDashboardService.writeJsonDataFile(message.meetingId, learningDashboardAccessToken, message.activityJson);
-  }
-
-  @Override
-  public void handle(IMessage message) {
-    receivedMessages.add(message);
-  }
-
-  public void setParamsProcessorUtil(ParamsProcessorUtil util) {
-    this.paramsProcessorUtil = util;
-  }
-
-  public void setPresDownloadService(
-    PresentationUrlDownloadService presDownloadService) {
-    this.presDownloadService = presDownloadService;
-  }
-
-  public void userJoinedVoice(UserJoinedVoice message) {
-    Meeting m = getMeeting(message.meetingId);
-    if (m != null) {
-      User user = m.getUserById(message.userId);
-      if (user != null) {
-        user.setVoiceJoined(true);
-      } else {
-        if (message.userId.startsWith("v_")) {
-          // A dial-in user joined the meeting. Dial-in users by convention has userId that starts with "v_".
-                    User vuser = new User(message.userId, message.userId, message.name, "DIAL-IN-USER", "",
-                            true, GuestPolicy.ALLOW, "DIAL-IN");
-          vuser.setVoiceJoined(true);
-          m.userJoined(vuser);
-        }
-      }
-    }
-  }
-
-  public void userLeftVoice(UserLeftVoice message) {
-    Meeting m = getMeeting(message.meetingId);
-    if (m != null) {
-      User user = m.getUserById(message.userId);
-      if (user != null) {
-        if (message.userId.startsWith("v_")) {
-          // A dial-in user left the meeting. Dial-in users by convention has userId that starts with "v_".
-          User vuser = m.userLeft(message.userId);
-        } else {
-          user.setVoiceJoined(false);
-          // userLeftVoice is also used when user leaves Global (listenonly)
-          // audio. Also tetting listenOnly to false is not a problem,
-          // once user can't join both voice/mic and global/listenonly
-          // at the same time.
-          user.setListeningOnly(false);
-        }
-      }
-    }
-  }
-
-  public void userListeningOnly(UserListeningOnly message) {
-    Meeting m = getMeeting(message.meetingId);
-    if (m != null) {
-      User user = m.getUserById(message.userId);
-      if (user != null) {
-        user.setListeningOnly(message.listenOnly);
-      }
-    }
-  }
-
-  public void userSharedWebcam(UserSharedWebcam message) {
-    Meeting m = getMeeting(message.meetingId);
-    if (m != null) {
-      User user = m.getUserById(message.userId);
-      if (user != null) {
-        user.addStream(message.stream);
-      }
-    }
-  }
-
-  public void userUnsharedWebcam(UserUnsharedWebcam message) {
-    Meeting m = getMeeting(message.meetingId);
-    if (m != null) {
-      User user = m.getUserById(message.userId);
-      if (user != null) {
-        user.removeStream(message.stream);
-      }
-    }
-  }
-
-  private void userRoleChanged(UserRoleChanged message) {
-    Meeting m = getMeeting(message.meetingId);
-    if (m != null) {
-      User user = m.getUserById(message.userId);
-      if (user != null) {
-        user.setRole(message.role);
-        String sessionToken = getTokenByUserId(user.getInternalUserId());
-        if (sessionToken != null) {
-            UserSession userSession = getUserSessionWithAuthToken(sessionToken);
-            userSession.role = message.role;
-            sessions.replace(sessionToken, userSession);
-        }
-        log.debug("Setting new role in meeting {} for participant: {}", message.meetingId, user.getFullname());
-        return;
-      }
-      log.warn("The participant {} doesn't exist in the meeting {}", message.userId, message.meetingId);
-      return;
-    }
-    log.warn("The meeting {} doesn't exist", message.meetingId);
-  }
-
-  private void processMessage(final IMessage message) {
-    Runnable task = new Runnable() {
-      public void run() {
-        if (message instanceof MeetingStarted) {
-          meetingStarted((MeetingStarted) message);
-        } else if (message instanceof MeetingDestroyed) {
-          meetingDestroyed((MeetingDestroyed) message);
-        } else if (message instanceof MeetingEnded) {
-          meetingEnded((MeetingEnded) message);
-        } else if (message instanceof UserJoined) {
-          userJoined((UserJoined) message);
-        } else if (message instanceof UserLeft) {
-          userLeft((UserLeft) message);
-        } else if (message instanceof UserStatusChanged) {
-          updatedStatus((UserStatusChanged) message);
-        } else if (message instanceof UserRoleChanged) {
-          userRoleChanged((UserRoleChanged) message);
-        } else if (message instanceof UserJoinedVoice) {
-          userJoinedVoice((UserJoinedVoice) message);
-        } else if (message instanceof UserLeftVoice) {
-          userLeftVoice((UserLeftVoice) message);
-        } else if (message instanceof UserListeningOnly) {
-          userListeningOnly((UserListeningOnly) message);
-        } else if (message instanceof UserSharedWebcam) {
-          userSharedWebcam((UserSharedWebcam) message);
-        } else if (message instanceof UserUnsharedWebcam) {
-          userUnsharedWebcam((UserUnsharedWebcam) message);
-        } else if (message instanceof CreateMeeting) {
-          processCreateMeeting((CreateMeeting) message);
-        } else if (message instanceof EndMeeting) {
-          processEndMeeting((EndMeeting) message);
-        } else if (message instanceof RegisterUser) {
-          processRegisterUser((RegisterUser) message);
-        } else if (message instanceof CreateBreakoutRoom) {
-          processCreateBreakoutRoom((CreateBreakoutRoom) message);
-        } else if (message instanceof UploadRequest) {
-          processUploadRequest((UploadRequest) message);
-        } else if (message instanceof PresentationUploadToken) {
-          processPresentationUploadToken((PresentationUploadToken) message);
-        } else if (message instanceof GuestStatusChangedEventMsg) {
-          processGuestStatusChangedEventMsg((GuestStatusChangedEventMsg) message);
-        } else if (message instanceof GuestPolicyChanged) {
-          processGuestPolicyChanged((GuestPolicyChanged) message);
-        } else if (message instanceof GuestLobbyMessageChanged) {
-          processGuestLobbyMessageChanged((GuestLobbyMessageChanged) message);
-        } else if (message instanceof RecordChapterBreak) {
-          processRecordingChapterBreak((RecordChapterBreak) message);
-        } else if (message instanceof AddPad) {
-          processAddPad((AddPad) message);
-        } else if (message instanceof AddCaptionsPads) {
-          processAddCaptionsPads((AddCaptionsPads) message);
-        } else if (message instanceof MakePresentationDownloadableMsg) {
-          processMakePresentationDownloadableMsg((MakePresentationDownloadableMsg) message);
-        } else if (message instanceof UpdateRecordingStatus) {
-          processUpdateRecordingStatus((UpdateRecordingStatus) message);
-        } else if (message instanceof LearningDashboard) {
-          processLearningDashboard((LearningDashboard) message);
-        }
-      }
-    };
-
-    runExec.execute(task);
-  }
-
-  public void processGuestPolicyChanged(GuestPolicyChanged msg) {
-    Meeting m = getMeeting(msg.meetingId);
-    if (m != null) {
-      m.setGuestPolicy(msg.policy);
-    }
-  }
-
-  public void processGuestLobbyMessageChanged(GuestLobbyMessageChanged msg) {
-    Meeting m = getMeeting(msg.meetingId);
-    if (m != null) {
-      m.setGuestLobbyMessage(msg.message);
-    }
-  }
-
-  public void processAddPad(AddPad msg) {
-    Meeting m = getMeeting(msg.meetingId);
-    if (m != null) {
-      m.addPad(msg.padId, msg.readOnlyId);
-    }
-  }
-
-  public void processAddCaptionsPads(AddCaptionsPads msg) {
-    Meeting m = getMeeting(msg.meetingId);
-    if (m != null) {
-      for (String padId : msg.padIds) {
-        m.addPad(padId, "undefined");
-      }
-    }
-  }
-
-  public void processRecordingChapterBreak(RecordChapterBreak msg) {
-    recordingService.kickOffRecordingChapterBreak(msg.meetingId, msg.timestamp);
-  }
-
-  private void processMakePresentationDownloadableMsg(MakePresentationDownloadableMsg msg) {
-    recordingService.processMakePresentationDownloadableMsg(msg);
-  }
-
-  public File getDownloadablePresentationFile(String meetingId, String presId, String presFilename) {
-    return recordingService.getDownloadablePresentationFile(meetingId, presId, presFilename);
-  }
-
-  public void start() {
-    log.info("Starting Meeting Service.");
-    try {
-      processMessage = true;
-      Runnable messageReceiver = new Runnable() {
-        public void run() {
-          while (processMessage) {
-            try {
-              IMessage msg = receivedMessages.take();
-              processMessage(msg);
-            } catch (InterruptedException e) {
-              log.error("InterruptedException while starting Meeting Service", e);
-            } catch (Exception e) {
-              log.error("Handling unexpected exception", e);
-            }
-          }
-        }
-      };
-
-      msgProcessorExec.execute(messageReceiver);
-    } catch (Exception e) {
-      log.error("Error PRocessing Message");
-    }
-  }
-
-  public void stop() {
-    processMessage = false;
-    waitingGuestCleaner.stop();
-    userCleaner.stop();
-    enteredUserCleaner.stop();
-  }
-
-  public void setRecordingService(RecordingService s) {
-    recordingService = s;
-  }
-
-  public void setLearningDashboardService(LearningDashboardService s) {
-    learningDashboardService = s;
-  }
-
-  public void setRedisStorageService(RedisStorageService mess) {
-    storeService = mess;
-  }
-
-  public void setCallbackUrlService(CallbackUrlService service) {
-    callbackUrlService = service;
-  }
-
-  public void setGw(IBbbWebApiGWApp gw) {
-    this.gw = gw;
-  }
-
-  public void setWaitingGuestCleanupTimerTask(WaitingGuestCleanupTimerTask c) {
-    waitingGuestCleaner = c;
-    waitingGuestCleaner.setMeetingService(this);
-    waitingGuestCleaner.start();
-  }
-
-  public void setEnteredUserCleanupTimerTask(EnteredUserCleanupTimerTask c) {
-    enteredUserCleaner = c;
-    enteredUserCleaner.setMeetingService(this);
-    enteredUserCleaner.start();
-  }
-
-  public void setUserCleanupTimerTask(UserCleanupTimerTask c) {
-    userCleaner = c;
-    userCleaner.setMeetingService(this);
-    userCleaner.start();
-  }
-
-  public void setStunTurnService(StunTurnService s) {
-    stunTurnService = s;
-  }
-
-  public void setUsersTimeout(long value) {
-    usersTimeout = value;
-  }
-
-  public void setEnteredUsersTimeout(long value) {
-    enteredUsersTimeout = value;
-  }
-
-  public void setSwfSlidesGenerationProgressNotifier(SwfSlidesGenerationProgressNotifier notifier) {
-    this.notifier = notifier;
-  }
-
-}
+/**
+ * BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
+ * <p>
+ * Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below).
+ * <p>
+ * This program is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 3.0 of the License, or (at your option) any later
+ * version.
+ * <p>
+ * BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU Lesser General Public License along
+ * with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.bigbluebutton.api;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.AbstractMap;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.TreeMap;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedBlockingQueue;
+
+import com.google.gson.JsonObject;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.client.utils.URIBuilder;
+import org.bigbluebutton.api.HTML5LoadBalancingService;
+import org.bigbluebutton.api.domain.GuestPolicy;
+import org.bigbluebutton.api.domain.Meeting;
+import org.bigbluebutton.api.domain.Recording;
+import org.bigbluebutton.api.domain.RegisteredUser;
+import org.bigbluebutton.api.domain.User;
+import org.bigbluebutton.api.domain.UserSession;
+import org.bigbluebutton.api.domain.MeetingLayout;
+import org.bigbluebutton.api.messaging.MessageListener;
+import org.bigbluebutton.api.messaging.converters.messages.DestroyMeetingMessage;
+import org.bigbluebutton.api.messaging.converters.messages.EndMeetingMessage;
+import org.bigbluebutton.api.messaging.converters.messages.PublishedRecordingMessage;
+import org.bigbluebutton.api.messaging.converters.messages.UnpublishedRecordingMessage;
+import org.bigbluebutton.api.messaging.converters.messages.DeletedRecordingMessage;
+import org.bigbluebutton.api.messaging.messages.*;
+import org.bigbluebutton.api2.IBbbWebApiGWApp;
+import org.bigbluebutton.api2.domain.UploadedTrack;
+import org.bigbluebutton.common2.redis.RedisStorageService;
+import org.bigbluebutton.presentation.PresentationUrlDownloadService;
+import org.bigbluebutton.presentation.imp.SwfSlidesGenerationProgressNotifier;
+import org.bigbluebutton.web.services.WaitingGuestCleanupTimerTask;
+import org.bigbluebutton.web.services.UserCleanupTimerTask;
+import org.bigbluebutton.web.services.EnteredUserCleanupTimerTask;
+import org.bigbluebutton.web.services.callback.CallbackUrlService;
+import org.bigbluebutton.web.services.callback.MeetingEndedEvent;
+import org.bigbluebutton.web.services.turn.StunTurnService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.gson.Gson;
+
+public class MeetingService implements MessageListener {
+  private static Logger log = LoggerFactory.getLogger(MeetingService.class);
+
+  private BlockingQueue<IMessage> receivedMessages = new LinkedBlockingQueue<IMessage>();
+  private volatile boolean processMessage = false;
+
+  private final Executor msgProcessorExec = Executors.newSingleThreadExecutor();
+  private final Executor runExec = Executors.newSingleThreadExecutor();
+
+  /**
+   * http://ria101.wordpress.com/2011/12/12/concurrenthashmap-avoid-a-common-misuse/
+   */
+  private final ConcurrentMap<String, Meeting> meetings;
+  private final ConcurrentMap<String, UserSession> sessions;
+
+  private RecordingService recordingService;
+  private LearningDashboardService learningDashboardService;
+  private WaitingGuestCleanupTimerTask waitingGuestCleaner;
+  private UserCleanupTimerTask userCleaner;
+  private EnteredUserCleanupTimerTask enteredUserCleaner;
+  private StunTurnService stunTurnService;
+  private RedisStorageService storeService;
+  private CallbackUrlService callbackUrlService;
+  private HTML5LoadBalancingService html5LoadBalancingService;
+  private SwfSlidesGenerationProgressNotifier notifier;
+
+  private long usersTimeout;
+  private long enteredUsersTimeout;
+
+  private ParamsProcessorUtil paramsProcessorUtil;
+  private PresentationUrlDownloadService presDownloadService;
+
+  private IBbbWebApiGWApp gw;
+
+  private  HashMap<String, PresentationUploadToken> uploadAuthzTokens;
+
+  public MeetingService() {
+    meetings = new ConcurrentHashMap<String, Meeting>(8, 0.9f, 1);
+    sessions = new ConcurrentHashMap<String, UserSession>(8, 0.9f, 1);
+    uploadAuthzTokens = new HashMap<String, PresentationUploadToken>();
+  }
+
+  public void addUserSession(String token, UserSession user) {
+    sessions.put(token, user);
+  }
+
+  public String getTokenByUserId(String internalUserId) {
+      String result = null;
+      for (Entry<String, UserSession> e : sessions.entrySet()) {
+          String token = e.getKey();
+          UserSession userSession = e.getValue();
+          if (userSession.internalUserId.equals(internalUserId)) {
+              result = token;
+          }
+      }
+      return result;
+  }
+
+  public void registerUser(String meetingID, String internalUserId,
+                           String fullname, String role, String externUserID,
+                           String authToken, String avatarURL, Boolean guest,
+                           Boolean authed, String guestStatus) {
+    handle(new RegisterUser(meetingID, internalUserId, fullname, role,
+      externUserID, authToken, avatarURL, guest, authed, guestStatus));
+
+    Meeting m = getMeeting(meetingID);
+    if (m != null) {
+      RegisteredUser ruser = new RegisteredUser(authToken, internalUserId, guestStatus);
+      m.userRegistered(ruser);
+    }
+  }
+
+  public Boolean isPadValid(String padId, String sessionToken) {
+    UserSession us = getUserSessionWithAuthToken(sessionToken);
+    if (us == null) return false;
+
+    Meeting m = getMeeting(us.meetingID);
+    if (m == null) return false;
+
+    if (m.hasPad(padId)) {
+      return true;
+    } else {
+      return false;
+    }
+  }
+
+  public UserSession getUserSessionWithUserId(String userId) {
+    for (UserSession userSession : sessions.values()) {
+      if (userSession.internalUserId.equals(userId)) {
+        return userSession;
+      }
+    }
+
+    return null;
+  }
+
+  public UserSession getUserSessionWithAuthToken(String token) {
+    return sessions.get(token);
+  }
+
+  public UserSession removeUserSessionWithAuthToken(String token) {
+    UserSession user = sessions.remove(token);
+    if (user != null) {
+      log.debug("Found user {} token={} to meeting {}", user.fullname, token, user.meetingID);
+    }
+    return user;
+  }
+
+  /**
+   * Remove users who did not successfully reconnected to the meeting.
+   */
+  public void purgeUsers() {
+    for (AbstractMap.Entry<String, Meeting> entry : this.meetings.entrySet()) {
+      Long now = System.currentTimeMillis();
+      Meeting meeting = entry.getValue();
+
+      for (AbstractMap.Entry<String, User> userEntry : meeting.getUsersMap().entrySet()) {
+        String userId = userEntry.getKey();
+        User user = userEntry.getValue();
+
+        if (!user.hasLeft()) continue;
+
+        long elapsedTime = now - user.getLeftOn();
+        if (elapsedTime >= usersTimeout) {
+          meeting.removeUser(userId);
+
+          Map<String, Object> logData = new HashMap<>();
+          logData.put("meetingId", meeting.getInternalId());
+          logData.put("userId", userId);
+          logData.put("logCode", "removed_user");
+          logData.put("description", "User left and was removed from the meeting.");
+
+          Gson gson = new Gson();
+          String logStr = gson.toJson(logData);
+
+          log.info(" --analytics-- data={}", logStr);
+        }
+      }
+    }
+  }
+
+  /**
+   * Remove entered users who did not join.
+   */
+  public void purgeEnteredUsers() {
+    for (AbstractMap.Entry<String, Meeting> entry : this.meetings.entrySet()) {
+      Long now = System.currentTimeMillis();
+      Meeting meeting = entry.getValue();
+
+      for (AbstractMap.Entry<String, Long> enteredUser : meeting.getEnteredUsers().entrySet()) {
+        String userId = enteredUser.getKey();
+
+        long elapsedTime = now - enteredUser.getValue();
+        if (elapsedTime >= enteredUsersTimeout) {
+          meeting.removeEnteredUser(userId);
+
+          Map<String, Object> logData = new HashMap<>();
+          logData.put("meetingId", meeting.getInternalId());
+          logData.put("userId", userId);
+          logData.put("logCode", "purged_entered_user");
+          logData.put("description", "Purged user that called ENTER from the API but never joined");
+
+          Gson gson = new Gson();
+          String logStr = gson.toJson(logData);
+
+          log.info(" --analytics-- data={}", logStr);
+        }
+      }
+    }
+  }
+
+  public void guestIsWaiting(String meetingId, String userId) {
+    Meeting m = getMeeting(meetingId);
+    if (m != null) {
+      m.guestIsWaiting(userId);
+    }
+  }
+
+  /**
+   * Remove registered waiting guest users who left the waiting page.
+   */
+  public void purgeWaitingGuestUsers() {
+    for (AbstractMap.Entry<String, Meeting> entry : this.meetings.entrySet()) {
+      Long now = System.currentTimeMillis();
+      Meeting meeting = entry.getValue();
+
+      ConcurrentMap<String, User> users = meeting.getUsersMap();
+
+      for (AbstractMap.Entry<String, RegisteredUser> registeredUser : meeting.getRegisteredUsers().entrySet()) {
+        String registeredUserID = registeredUser.getKey();
+        RegisteredUser ru = registeredUser.getValue();
+
+        long elapsedTime = now - ru.getGuestWaitedOn();
+        if (elapsedTime >= 15000 && ru.getGuestStatus() == GuestPolicy.WAIT) {
+          if (meeting.userUnregistered(registeredUserID) != null) {
+            gw.guestWaitingLeft(meeting.getInternalId(), registeredUserID);
+          };
+        }
+      }
+    }
+  }
+
+
+  private void kickOffProcessingOfRecording(Meeting m) {
+    if (m.isRecord() && m.getNumUsers() == 0) {
+      processRecording(m);
+    }
+  }
+
+  public Boolean authzTokenIsValid(String authzToken) { // Note we DO NOT expire the token
+    return uploadAuthzTokens.containsKey(authzToken);
+  }
+
+  public Boolean authzTokenIsValidAndExpired(String authzToken) {  // Note we DO expire the token
+    Boolean valid = uploadAuthzTokens.containsKey(authzToken);
+    expirePresentationUploadToken(authzToken);
+    return valid;
+  }
+
+  public PresentationUploadToken getPresentationUploadToken(String authzToken) {
+    if(uploadAuthzTokens.containsKey(authzToken)) {
+      return uploadAuthzTokens.get(authzToken);
+    } else {
+      return null;
+    }
+  }
+
+  public void sendPresentationUploadMaxFilesizeMessage(PresentationUploadToken presUploadToken, int uploadedFileSize, int maxUploadFileSize) {
+    notifier.sendUploadFileTooLargeMessage(presUploadToken, uploadedFileSize, maxUploadFileSize);
+  }
+
+  private void removeUserSessions(String meetingId) {
+    Iterator<Map.Entry<String, UserSession>> iterator = sessions.entrySet().iterator();
+    while (iterator.hasNext()) {
+      Map.Entry<String, UserSession> entry = iterator.next();
+      UserSession userSession = entry.getValue();
+
+      if (userSession.meetingID.equals(meetingId)) {
+        iterator.remove();
+      }
+    }
+  }
+
+  private void destroyMeeting(String meetingId) {
+    gw.destroyMeeting(new DestroyMeetingMessage(meetingId));
+  }
+
+  public Collection<Meeting> getMeetings() {
+    return meetings.isEmpty() ? Collections.<Meeting>emptySet()
+      : Collections.unmodifiableCollection(meetings.values());
+  }
+
+  public Collection<UserSession> getSessions() {
+    return sessions.isEmpty() ? Collections.<UserSession>emptySet()
+      : Collections.unmodifiableCollection(sessions.values());
+  }
+
+  public synchronized boolean createMeeting(Meeting m) {
+    String internalMeetingId = paramsProcessorUtil.convertToInternalMeetingId(m.getExternalId());
+    Meeting existingId = getNotEndedMeetingWithId(internalMeetingId);
+    Meeting existingTelVoice = getNotEndedMeetingWithTelVoice(m.getTelVoice());
+    Meeting existingWebVoice = getNotEndedMeetingWithWebVoice(m.getWebVoice());
+    if (existingId == null && existingTelVoice == null && existingWebVoice == null) {
+      meetings.put(m.getInternalId(), m);
+      handle(new CreateMeeting(m));
+      return true;
+    }
+
+    return false;
+  }
+
+  private boolean storeEvents(Meeting m) {
+    return m.isRecord() || m.getMeetingKeepEvents();
+  }
+
+  private void handleCreateMeeting(Meeting m) {
+    if (m.isBreakout()) {
+      Meeting parent = meetings.get(m.getParentMeetingId());
+      parent.addBreakoutRoom(m.getExternalId());
+      if (storeEvents(parent)) {
+        storeService.addBreakoutRoom(parent.getInternalId(), m.getInternalId());
+      }
+    }
+
+    if (storeEvents(m)) {
+      Map<String, String> metadata = new TreeMap<>();
+      metadata.putAll(m.getMetadata());
+      // TODO: Need a better way to store these values for recordings
+      metadata.put("meetingId", m.getExternalId());
+      metadata.put("meetingName", m.getName());
+      metadata.put("isBreakout", m.isBreakout().toString());
+
+      storeService.recordMeetingInfo(m.getInternalId(), metadata);
+
+      if (m.isBreakout()) {
+        Map<String, String> breakoutMetadata = new TreeMap<>();
+        breakoutMetadata.put("meetingId", m.getExternalId());
+        breakoutMetadata.put("sequence", m.getSequence().toString());
+        breakoutMetadata.put("freeJoin", m.isFreeJoin().toString());
+        breakoutMetadata.put("parentMeetingId", m.getParentMeetingId());
+        storeService.recordBreakoutInfo(m.getInternalId(), breakoutMetadata);
+      }
+    }
+
+    Map<String, Object> logData = new HashMap<>();
+    logData.put("meetingId", m.getInternalId());
+    logData.put("externalMeetingId", m.getExternalId());
+    if (m.isBreakout()) {
+      logData.put("sequence", m.getSequence());
+      logData.put("freeJoin", m.isFreeJoin());
+      logData.put("parentMeetingId", m.getParentMeetingId());
+    }
+    logData.put("name", m.getName());
+    logData.put("duration", m.getDuration());
+    logData.put("isBreakout", m.isBreakout());
+    logData.put("webcamsOnlyForModerator", m.getWebcamsOnlyForModerator());
+    logData.put("record", m.isRecord());
+    logData.put("logCode", "create_meeting");
+    logData.put("description", "Create meeting.");
+
+    logData.put("meetingKeepEvents", m.getMeetingKeepEvents());
+    logData.put("meetingLayout", m.getMeetingLayout());
+
+    Gson gson = new Gson();
+    String logStr = gson.toJson(logData);
+
+    log.info(" --analytics-- data={}", logStr);
+
+    gw.createMeeting(m.getInternalId(), m.getExternalId(), m.getParentMeetingId(), m.getName(), m.isRecord(),
+            m.getTelVoice(), m.getDuration(), m.getAutoStartRecording(), m.getAllowStartStopRecording(),
+            m.getWebcamsOnlyForModerator(), m.getModeratorPassword(), m.getViewerPassword(),
+            m.getLearningDashboardEnabled(), m.getLearningDashboardAccessToken(), m.getCreateTime(),
+            formatPrettyDate(m.getCreateTime()), m.isBreakout(), m.getSequence(), m.isFreeJoin(), m.getMetadata(),
+            m.getGuestPolicy(), m.getAuthenticatedGuest(), m.getMeetingLayout(), m.getWelcomeMessageTemplate(), m.getWelcomeMessage(), m.getModeratorOnlyMessage(),
+            m.getDialNumber(), m.getMaxUsers(),
+            m.getMeetingExpireIfNoUserJoinedInMinutes(), m.getmeetingExpireWhenLastUserLeftInMinutes(),
+            m.getUserInactivityInspectTimerInMinutes(), m.getUserInactivityThresholdInMinutes(),
+            m.getUserActivitySignResponseDelayInMinutes(), m.getEndWhenNoModerator(), m.getEndWhenNoModeratorDelayInMinutes(),
+            m.getMuteOnStart(), m.getAllowModsToUnmuteUsers(), m.getMeetingKeepEvents(),
+            m.breakoutRoomsParams,
+            m.lockSettingsParams, m.getHtml5InstanceId());
+  }
+
+  private String formatPrettyDate(Long timestamp) {
+    return new Date(timestamp).toString();
+  }
+
+  private void processCreateMeeting(CreateMeeting message) {
+    handleCreateMeeting(message.meeting);
+  }
+
+  private void processRegisterUser(RegisterUser message) {
+    Meeting m = getMeeting(message.meetingID);
+    if (m != null) {
+      User prevUser = m.getUserWithExternalId(message.externUserID);
+      if (prevUser != null) {
+        Map<String, Object> logData = new HashMap<>();
+        logData.put("meetingId", m.getInternalId());
+        logData.put("externalMeetingId", m.getExternalId());
+        logData.put("name", m.getName());
+        logData.put("extUserId", prevUser.getExternalUserId());
+        logData.put("intUserId", prevUser.getInternalUserId());
+        logData.put("username", prevUser.getFullname());
+        logData.put("logCode", "duplicate_user_with_external_userid");
+        logData.put("description", "Duplicate user with external userid.");
+
+        Gson gson = new Gson();
+        String logStr = gson.toJson(logData);
+        log.info(" --analytics-- data={}", logStr);
+
+        if (!m.allowDuplicateExtUserid) {
+          gw.ejectDuplicateUser(message.meetingID,
+                  prevUser.getInternalUserId(), prevUser.getFullname(),
+                  prevUser.getExternalUserId());
+        }
+
+      }
+
+    }
+    gw.registerUser(message.meetingID,
+      message.internalUserId, message.fullname, message.role,
+      message.externUserID, message.authToken, message.avatarURL, message.guest,
+            message.authed, message.guestStatus);
+  }
+
+    public Meeting getMeeting(String meetingId) {
+        if (meetingId == null)
+            return null;
+        for (Map.Entry<String, Meeting> entry : meetings.entrySet()) {
+            String key = entry.getKey();
+            if (key.startsWith(meetingId))
+                return entry.getValue();
+        }
+
+        return null;
+    }
+
+  public Collection<Meeting> getMeetingsWithId(String meetingId) {
+    if (meetingId == null)
+      return Collections.<Meeting>emptySet();
+
+    Collection<Meeting> m = new HashSet<>();
+
+    for (Map.Entry<String, Meeting> entry : meetings.entrySet()) {
+        String key = entry.getKey();
+        if (key.startsWith(meetingId))
+            m.add(entry.getValue());
+    }
+
+    return m;
+  }
+
+  public Meeting getNotEndedMeetingWithId(String meetingId) {
+      if (meetingId == null)
+          return null;
+      for (Map.Entry<String, Meeting> entry : meetings.entrySet()) {
+          String key = entry.getKey();
+          if (key.startsWith(meetingId)) {
+              Meeting m = entry.getValue();
+              if (!m.isForciblyEnded())
+                  return m;
+          }
+      }
+      return null;
+  }
+
+  public Meeting getNotEndedMeetingWithTelVoice(String telVoice) {
+      if (telVoice == null)
+          return null;
+      for (Map.Entry<String, Meeting> entry : meetings.entrySet()) {
+          Meeting m = entry.getValue();
+          if (telVoice.equals(m.getTelVoice())) {
+              if (!m.isForciblyEnded())
+                  return m;
+          }
+      }
+      return null;
+  }
+
+  public Meeting getNotEndedMeetingWithWebVoice(String webVoice) {
+      if (webVoice == null)
+          return null;
+      for (Map.Entry<String, Meeting> entry : meetings.entrySet()) {
+          Meeting m = entry.getValue();
+          if (webVoice.equals(m.getWebVoice())) {
+              if (!m.isForciblyEnded())
+                  return m;
+          }
+      }
+      return null;
+  }
+
+  public Boolean validateTextTrackSingleUseToken(String recordId, String caption, String token) {
+    return recordingService.validateTextTrackSingleUseToken(recordId, caption, token);
+  }
+
+  public String getRecordingTextTracks(String recordId) {
+    return recordingService.getRecordingTextTracks(recordId);
+  }
+
+  public String putRecordingTextTrack(String recordId, String kind, String lang, File file, String label,
+          String origFilename, String trackId, String contentType, String tempFilename) {
+
+    Map<String, Object> logData = new HashMap<>();
+    logData.put("recordId", recordId);
+    logData.put("kind", kind);
+    logData.put("lang", lang);
+    logData.put("label", label);
+    logData.put("origFilename", origFilename);
+    logData.put("contentType", contentType);
+    logData.put("tempFilename", tempFilename);
+    logData.put("logCode", "recording_captions_uploaded");
+    logData.put("description", "Captions for recording uploaded.");
+
+    Gson gson = new Gson();
+    String logStr = gson.toJson(logData);
+    log.info(" --analytics-- data={}", logStr);
+
+      UploadedTrack track = new UploadedTrack(recordId, kind, lang, label, origFilename, file, trackId,
+              getCaptionTrackInboxDir(), contentType, tempFilename);
+      return recordingService.putRecordingTextTrack(track);
+  }
+
+  public String getCaptionTrackInboxDir() {
+  	return recordingService.getCaptionTrackInboxDir();
+  }
+
+  public String getCaptionsDir() {
+    return recordingService.getCaptionsDir();
+  }
+
+  public boolean isRecordingExist(String recordId) {
+    return recordingService.isRecordingExist(recordId);
+  }
+
+  public String getRecordings2x(List<String> idList, List<String> states, Map<String, String> metadataFilters) {
+    return recordingService.getRecordings2x(idList, states, metadataFilters);
+  }
+
+  public boolean existsAnyRecording(List<String> idList) {
+    return recordingService.existAnyRecording(idList);
+  }
+
+  public void setPublishRecording(List<String> idList, boolean publish) {
+    for (String id : idList) {
+      if (publish) {
+        if (recordingService.changeState(id, Recording.STATE_PUBLISHED)) {
+          gw.publishedRecording(new PublishedRecordingMessage(id));
+        }
+      } else {
+        if (recordingService.changeState(id, Recording.STATE_UNPUBLISHED)) {
+          gw.unpublishedRecording(new UnpublishedRecordingMessage(id));
+        }
+      }
+    }
+  }
+
+  public void deleteRecordings(List<String> idList) {
+    for (String id : idList) {
+      if (recordingService.changeState(id, Recording.STATE_DELETED)) {
+        gw.deletedRecording(new DeletedRecordingMessage(id));
+      }
+    }
+  }
+
+  public void updateRecordings(List<String> idList, Map<String, String> metaParams) {
+    recordingService.updateMetaParams(idList, metaParams);
+  }
+
+  public void processRecording(Meeting m) {
+    if (m.isRecord()) {
+      Map<String, Object> logData = new HashMap<String, Object>();
+      logData.put("meetingId", m.getInternalId());
+      logData.put("externalMeetingId", m.getExternalId());
+      logData.put("name", m.getName());
+      logData.put("logCode", "kick_off_ingest_and_processing");
+      logData.put("description", "Start processing of recording.");
+
+      Gson gson = new Gson();
+      String logStr = gson.toJson(logData);
+
+      log.info(" --analytics-- data={}", logStr);
+      recordingService.startIngestAndProcessing(m.getInternalId());
+    }
+  }
+
+  public void endMeeting(String meetingId) {
+    handle(new EndMeeting(meetingId));
+  }
+
+  private void processCreateBreakoutRoom(CreateBreakoutRoom message) {
+    Meeting parentMeeting = getMeeting(message.parentMeetingId);
+    if (parentMeeting != null) {
+
+      Map<String, String> params = new HashMap<>();
+      params.put(ApiParams.NAME, message.name);
+      params.put(ApiParams.MEETING_ID, message.meetingId);
+      params.put(ApiParams.PARENT_MEETING_ID, message.parentMeetingId);
+      params.put(ApiParams.IS_BREAKOUT, "true");
+      params.put(ApiParams.SEQUENCE, message.sequence.toString());
+      params.put(ApiParams.FREE_JOIN, message.freeJoin.toString());
+      params.put(ApiParams.ATTENDEE_PW, message.viewerPassword);
+      params.put(ApiParams.MODERATOR_PW, message.moderatorPassword);
+      params.put(ApiParams.DIAL_NUMBER, message.dialNumber);
+      params.put(ApiParams.VOICE_BRIDGE, message.voiceConfId);
+      params.put(ApiParams.DURATION, message.durationInMinutes.toString());
+      params.put(ApiParams.RECORD, message.record.toString());
+      params.put(ApiParams.WELCOME, getMeeting(message.parentMeetingId).getWelcomeMessageTemplate());
+
+      Map<String, String> parentMeetingMetadata = parentMeeting.getMetadata();
+
+      String metaPrefix = "meta_";
+      for (String key : parentMeetingMetadata.keySet()) {
+        String metaName = metaPrefix + key;
+        // Inject metadata from parent meeting into the breakout room.
+        params.put(metaName, parentMeetingMetadata.get(key));
+      }
+
+      Meeting breakout = paramsProcessorUtil.processCreateParams(params);
+
+      createMeeting(breakout);
+
+      presDownloadService.extractPresentationPage(message.parentMeetingId,
+        message.sourcePresentationId,
+        message.sourcePresentationSlide, breakout.getInternalId());
+    } else {
+      Map<String, Object> logData = new HashMap<String, Object>();
+      logData.put("meetingId", message.meetingId);
+      logData.put("parentMeetingId", message.parentMeetingId);
+      logData.put("name", message.name);
+      logData.put("logCode", "create_breakout_failed");
+      logData.put("reason", "Parent not found.");
+      logData.put("description", "Create breakout failed.");
+
+      Gson gson = new Gson();
+      String logStr = gson.toJson(logData);
+
+      log.error(" --analytics-- data={}", logStr);
+    }
+  }
+
+  private void processUpdateRecordingStatus(UpdateRecordingStatus message) {
+    Meeting m = getMeeting(message.meetingId);
+      // Set only once
+      if (m != null && message.recording && !m.haveRecordingMarks()) {
+          m.setHaveRecordingMarks(message.recording);
+      }
+  }
+
+  private void processEndMeeting(EndMeeting message) {
+    gw.endMeeting(new EndMeetingMessage(message.meetingId));
+  }
+
+  private void processRemoveEndedMeeting(MeetingEnded message) {
+    Meeting m = getMeeting(message.meetingId);
+    if (m != null) {
+      m.setForciblyEnded(true);
+      processRecording(m);
+      if (m.getMeetingKeepEvents()) {
+        // The creation of the ended tag must occur after the creation of the
+        // recorded tag to avoid concurrency issues at the recording scripts
+        recordingService.markAsEnded(m.getInternalId());
+      }
+      destroyMeeting(m.getInternalId());
+      meetings.remove(m.getInternalId());
+      removeUserSessions(m.getInternalId());
+
+      Map<String, Object> logData = new HashMap<>();
+      logData.put("meetingId", m.getInternalId());
+      logData.put("externalMeetingId", m.getExternalId());
+      logData.put("name", m.getName());
+      logData.put("duration", m.getDuration());
+      logData.put("record", m.isRecord());
+      logData.put("logCode", "meeting_removed_from_running");
+      logData.put("description", "Meeting removed from list of running meetings.");
+
+      Gson gson = new Gson();
+      String logStr = gson.toJson(logData);
+
+      log.info(" --analytics-- data={}", logStr);
+    }
+  }
+
+  private void processGuestStatusChangedEventMsg(GuestStatusChangedEventMsg message) {
+    Meeting m = getMeeting(message.meetingId);
+    if (m != null) {
+      for (GuestsStatus guest : message.guests) {
+        User user = m.getUserById(guest.userId);
+        if (user != null) user.setGuestStatus(guest.status);
+      }
+    }
+
+    for (GuestsStatus guest : message.guests) {
+      UserSession userSession = getUserSessionWithUserId(guest.userId);
+      if (userSession != null) userSession.guestStatus = guest.status;
+    }
+
+  }
+
+  private void processPresentationUploadToken(PresentationUploadToken message) {
+    uploadAuthzTokens.put(message.authzToken, message);
+  }
+
+  private void expirePresentationUploadToken(String usedToken) {
+    uploadAuthzTokens.remove(usedToken);
+  }
+
+  public void addUserCustomData(String meetingId, String userID,
+                                Map<String, String> userCustomData) {
+    Meeting m = getMeeting(meetingId);
+    if (m != null) {
+      m.addUserCustomData(userID, userCustomData);
+    }
+  }
+
+  private void meetingStarted(MeetingStarted message) {
+    Meeting m = getMeeting(message.meetingId);
+    if (m != null) {
+      if (m.getStartTime() == 0) {
+        long now = System.currentTimeMillis();
+        m.setStartTime(now);
+
+        Map<String, Object> logData = new HashMap<>();
+        logData.put("meetingId", m.getInternalId());
+        logData.put("externalMeetingId", m.getExternalId());
+        if (m.isBreakout()) {
+          logData.put("parentMeetingId", m.getParentMeetingId());
+        }
+        logData.put("name", m.getName());
+        logData.put("duration", m.getDuration());
+        logData.put("record", m.isRecord());
+        logData.put("isBreakout", m.isBreakout());
+        logData.put("logCode", "meeting_started");
+        logData.put("description", "Meeting has started.");
+
+        Gson gson = new Gson();
+        String logStr = gson.toJson(logData);
+
+        log.info(" --analytics-- data={}", logStr);
+      } else {
+        Map<String, Object> logData = new HashMap<>();
+        logData.put("meetingId", m.getInternalId());
+        logData.put("externalMeetingId", m.getExternalId());
+        if (m.isBreakout()) {
+          logData.put("parentMeetingId", m.getParentMeetingId());
+        }
+        logData.put("name", m.getName());
+        logData.put("duration", m.getDuration());
+        logData.put("record", m.isRecord());
+        logData.put("isBreakout", m.isBreakout());
+        logData.put("logCode", "meeting_restarted");
+        logData.put("description", "Meeting has restarted.");
+
+        Gson gson = new Gson();
+        String logStr = gson.toJson(logData);
+
+        log.info(" --analytics-- data={}", logStr);
+      }
+    }
+  }
+
+  private void meetingDestroyed(MeetingDestroyed message) {
+    Meeting m = getMeeting(message.meetingId);
+    if (m != null) {
+      long now = System.currentTimeMillis();
+      m.setEndTime(now);
+
+      Map<String, Object> logData = new HashMap<>();
+      logData.put("meetingId", m.getInternalId());
+      logData.put("externalMeetingId", m.getExternalId());
+      logData.put("name", m.getName());
+      logData.put("duration", m.getDuration());
+      logData.put("record", m.isRecord());
+      logData.put("logCode", "meeting_destroyed");
+      logData.put("description", "Meeting has been destroyed.");
+
+      Gson gson = new Gson();
+      String logStr = gson.toJson(logData);
+
+      log.info(" --analytics-- data={}", logStr);
+    }
+  }
+
+  private void meetingEnded(MeetingEnded message) {
+    Meeting m = getMeeting(message.meetingId);
+    if (m != null) {
+      long now = System.currentTimeMillis();
+      m.setEndTime(now);
+
+      Map<String, Object> logData = new HashMap<>();
+      logData.put("meetingId", m.getInternalId());
+      logData.put("externalMeetingId", m.getExternalId());
+      logData.put("name", m.getName());
+      logData.put("duration", m.getDuration());
+      logData.put("record", m.isRecord());
+      logData.put("logCode", "meeting_ended");
+      logData.put("description", "Meeting has ended.");
+
+      Gson gson = new Gson();
+      String logStr = gson.toJson(logData);
+
+      log.info(" --analytics-- data={}", logStr);
+
+      String endCallbackUrl = "endCallbackUrl".toLowerCase();
+      Map<String, String> metadata = m.getMetadata();
+      if (!m.isBreakout()) {
+        if (metadata.containsKey(endCallbackUrl)) {
+          String callbackUrl = metadata.get(endCallbackUrl);
+          try {
+            callbackUrl = new URIBuilder(new URI(callbackUrl))
+              .addParameter("recordingmarks", m.haveRecordingMarks() ? "true" : "false")
+              .addParameter("meetingID", m.getExternalId()).build().toURL().toString();
+            MeetingEndedEvent event = new MeetingEndedEvent(m.getInternalId(), m.getExternalId(), m.getName(), callbackUrl);
+            processMeetingEndedCallback(event);
+          } catch (Exception e) {
+            log.error("Error in callback url=[{}]", callbackUrl, e);
+          }
+        }
+
+        if (! StringUtils.isEmpty(m.getMeetingEndedCallbackURL())) {
+          String meetingEndedCallbackURL = m.getMeetingEndedCallbackURL();
+          callbackUrlService.handleMessage(new MeetingEndedEvent(m.getInternalId(), m.getExternalId(), m.getName(), meetingEndedCallbackURL));
+        }
+      }
+
+      //Remove Learning Dashboard files
+      if(m.getLearningDashboardCleanupDelayInMinutes() > 0) {
+        learningDashboardService.removeJsonDataFile(message.meetingId, m.getLearningDashboardCleanupDelayInMinutes());
+      }
+
+      processRemoveEndedMeeting(message);
+    }
+  }
+
+  private void processMeetingEndedCallback(MeetingEndedEvent event) {
+    try {
+      callbackUrlService.handleMessage(event);
+    } catch (Exception e) {
+      log.error("Error in callback url=[{}]", event.getCallbackUrl(), e);
+    }
+  }
+
+  private void userJoined(UserJoined message) {
+    Meeting m = getMeeting(message.meetingId);
+    if (m != null) {
+      if (m.getNumUsers() == 0) {
+        // First user joins the meeting. Reset the end time to zero
+        // in case the meeting has been rejoined.
+        m.setEndTime(0);
+      }
+
+      User user = new User(message.userId, message.externalUserId,
+        message.name, message.role, message.avatarURL, message.guest, message.guestStatus,
+              message.clientType);
+      m.userJoined(user);
+      m.setGuestStatusWithId(user.getInternalUserId(), message.guestStatus);
+      UserSession userSession = getUserSessionWithUserId(user.getInternalUserId());
+      if (userSession != null) {
+        userSession.guestStatus = message.guestStatus;
+      }
+
+      Map<String, Object> logData = new HashMap<>();
+      logData.put("meetingId", m.getInternalId());
+      logData.put("externalMeetingId", m.getExternalId());
+      logData.put("name", m.getName());
+      logData.put("userId", message.userId);
+      logData.put("externalUserId", user.getExternalUserId());
+      logData.put("username", user.getFullname());
+      logData.put("role", user.getRole());
+      logData.put("guest", user.isGuest());
+      logData.put("guestStatus", user.getGuestStatus());
+      logData.put("logCode", "user_joined_message");
+      logData.put("description", "User joined the meeting.");
+      logData.put("clientType", user.getClientType());
+
+      Gson gson = new Gson();
+      String logStr = gson.toJson(logData);
+      log.info(" --analytics-- data={}", logStr);
+    }
+  }
+
+  private void userLeft(UserLeft message) {
+    Meeting m = getMeeting(message.meetingId);
+    if (m != null) {
+      User user = m.userLeft(message.userId);
+      if (user != null) {
+
+        Map<String, Object> logData = new HashMap<>();
+        logData.put("meetingId", m.getInternalId());
+        logData.put("externalMeetingId", m.getExternalId());
+        logData.put("name", m.getName());
+        logData.put("userId", message.userId);
+        logData.put("externalUserId", user.getExternalUserId());
+        logData.put("username", user.getFullname());
+        logData.put("role", user.getRole());
+        logData.put("guest", user.isGuest());
+        logData.put("guestStatus", user.getGuestStatus());
+        logData.put("logCode", "user_left_message");
+        logData.put("description", "User left the meeting.");
+
+        Gson gson = new Gson();
+        String logStr = gson.toJson(logData);
+
+        log.info(" --analytics-- data={}", logStr);
+
+        if (m.getNumUsers() == 0) {
+          // Last user the meeting. Mark this as the time
+          // the meeting ended.
+          m.setEndTime(System.currentTimeMillis());
+        }
+      }
+    }
+  }
+
+  private void updatedStatus(UserStatusChanged message) {
+    Meeting m = getMeeting(message.meetingId);
+    if (m != null) {
+      User user = m.getUserById(message.userId);
+      if (user != null) {
+        user.setStatus(message.status, message.value);
+      }
+    }
+  }
+
+  public void processLearningDashboard(LearningDashboard message) {
+    //Get all data from Json instead of getMeeting(message.meetingId), to process messages received even after meeting ended
+    JsonObject activityJsonObject = new Gson().fromJson(message.activityJson, JsonObject.class).getAsJsonObject();
+    String learningDashboardAccessToken = activityJsonObject.get("learningDashboardAccessToken").getAsString();
+
+    Map<String, Object> logData = new HashMap<String, Object>();
+    logData.put("meetingId", activityJsonObject.get("intId").getAsString());
+    logData.put("externalMeetingId", activityJsonObject.get("extId").getAsString());
+    logData.put("name", activityJsonObject.get("name").getAsString());
+    logData.put("logCode", "update_activity_json");
+    logData.put("description", "Updating activities json.");
+
+    Gson gson = new Gson();
+    String logStr = gson.toJson(logData);
+
+    log.info(" --analytics-- data={}", logStr);
+
+    learningDashboardService.writeJsonDataFile(message.meetingId, learningDashboardAccessToken, message.activityJson);
+  }
+
+  @Override
+  public void handle(IMessage message) {
+    receivedMessages.add(message);
+  }
+
+  public void setParamsProcessorUtil(ParamsProcessorUtil util) {
+    this.paramsProcessorUtil = util;
+  }
+
+  public void setPresDownloadService(
+    PresentationUrlDownloadService presDownloadService) {
+    this.presDownloadService = presDownloadService;
+  }
+
+  public void userJoinedVoice(UserJoinedVoice message) {
+    Meeting m = getMeeting(message.meetingId);
+    if (m != null) {
+      User user = m.getUserById(message.userId);
+      if (user != null) {
+        user.setVoiceJoined(true);
+      } else {
+        if (message.userId.startsWith("v_")) {
+          // A dial-in user joined the meeting. Dial-in users by convention has userId that starts with "v_".
+                    User vuser = new User(message.userId, message.userId, message.name, "DIAL-IN-USER", "",
+                            true, GuestPolicy.ALLOW, "DIAL-IN");
+          vuser.setVoiceJoined(true);
+          m.userJoined(vuser);
+        }
+      }
+    }
+  }
+
+  public void userLeftVoice(UserLeftVoice message) {
+    Meeting m = getMeeting(message.meetingId);
+    if (m != null) {
+      User user = m.getUserById(message.userId);
+      if (user != null) {
+        if (message.userId.startsWith("v_")) {
+          // A dial-in user left the meeting. Dial-in users by convention has userId that starts with "v_".
+          User vuser = m.userLeft(message.userId);
+        } else {
+          user.setVoiceJoined(false);
+          // userLeftVoice is also used when user leaves Global (listenonly)
+          // audio. Also tetting listenOnly to false is not a problem,
+          // once user can't join both voice/mic and global/listenonly
+          // at the same time.
+          user.setListeningOnly(false);
+        }
+      }
+    }
+  }
+
+  public void userListeningOnly(UserListeningOnly message) {
+    Meeting m = getMeeting(message.meetingId);
+    if (m != null) {
+      User user = m.getUserById(message.userId);
+      if (user != null) {
+        user.setListeningOnly(message.listenOnly);
+      }
+    }
+  }
+
+  public void userSharedWebcam(UserSharedWebcam message) {
+    Meeting m = getMeeting(message.meetingId);
+    if (m != null) {
+      User user = m.getUserById(message.userId);
+      if (user != null) {
+        user.addStream(message.stream);
+      }
+    }
+  }
+
+  public void userUnsharedWebcam(UserUnsharedWebcam message) {
+    Meeting m = getMeeting(message.meetingId);
+    if (m != null) {
+      User user = m.getUserById(message.userId);
+      if (user != null) {
+        user.removeStream(message.stream);
+      }
+    }
+  }
+
+  private void userRoleChanged(UserRoleChanged message) {
+    Meeting m = getMeeting(message.meetingId);
+    if (m != null) {
+      User user = m.getUserById(message.userId);
+      if (user != null) {
+        user.setRole(message.role);
+        String sessionToken = getTokenByUserId(user.getInternalUserId());
+        if (sessionToken != null) {
+            UserSession userSession = getUserSessionWithAuthToken(sessionToken);
+            userSession.role = message.role;
+            sessions.replace(sessionToken, userSession);
+        }
+        log.debug("Setting new role in meeting {} for participant: {}", message.meetingId, user.getFullname());
+        return;
+      }
+      log.warn("The participant {} doesn't exist in the meeting {}", message.userId, message.meetingId);
+      return;
+    }
+    log.warn("The meeting {} doesn't exist", message.meetingId);
+  }
+
+  private void processMessage(final IMessage message) {
+    Runnable task = new Runnable() {
+      public void run() {
+        if (message instanceof MeetingStarted) {
+          meetingStarted((MeetingStarted) message);
+        } else if (message instanceof MeetingDestroyed) {
+          meetingDestroyed((MeetingDestroyed) message);
+        } else if (message instanceof MeetingEnded) {
+          meetingEnded((MeetingEnded) message);
+        } else if (message instanceof UserJoined) {
+          userJoined((UserJoined) message);
+        } else if (message instanceof UserLeft) {
+          userLeft((UserLeft) message);
+        } else if (message instanceof UserStatusChanged) {
+          updatedStatus((UserStatusChanged) message);
+        } else if (message instanceof UserRoleChanged) {
+          userRoleChanged((UserRoleChanged) message);
+        } else if (message instanceof UserJoinedVoice) {
+          userJoinedVoice((UserJoinedVoice) message);
+        } else if (message instanceof UserLeftVoice) {
+          userLeftVoice((UserLeftVoice) message);
+        } else if (message instanceof UserListeningOnly) {
+          userListeningOnly((UserListeningOnly) message);
+        } else if (message instanceof UserSharedWebcam) {
+          userSharedWebcam((UserSharedWebcam) message);
+        } else if (message instanceof UserUnsharedWebcam) {
+          userUnsharedWebcam((UserUnsharedWebcam) message);
+        } else if (message instanceof CreateMeeting) {
+          processCreateMeeting((CreateMeeting) message);
+        } else if (message instanceof EndMeeting) {
+          processEndMeeting((EndMeeting) message);
+        } else if (message instanceof RegisterUser) {
+          processRegisterUser((RegisterUser) message);
+        } else if (message instanceof CreateBreakoutRoom) {
+          processCreateBreakoutRoom((CreateBreakoutRoom) message);
+        } else if (message instanceof PresentationUploadToken) {
+          processPresentationUploadToken((PresentationUploadToken) message);
+        } else if (message instanceof GuestStatusChangedEventMsg) {
+          processGuestStatusChangedEventMsg((GuestStatusChangedEventMsg) message);
+        } else if (message instanceof GuestPolicyChanged) {
+          processGuestPolicyChanged((GuestPolicyChanged) message);
+        } else if (message instanceof GuestLobbyMessageChanged) {
+          processGuestLobbyMessageChanged((GuestLobbyMessageChanged) message);
+        } else if (message instanceof RecordChapterBreak) {
+          processRecordingChapterBreak((RecordChapterBreak) message);
+        } else if (message instanceof AddPad) {
+          processAddPad((AddPad) message);
+        } else if (message instanceof AddCaptionsPads) {
+          processAddCaptionsPads((AddCaptionsPads) message);
+        } else if (message instanceof MakePresentationDownloadableMsg) {
+          processMakePresentationDownloadableMsg((MakePresentationDownloadableMsg) message);
+        } else if (message instanceof UpdateRecordingStatus) {
+          processUpdateRecordingStatus((UpdateRecordingStatus) message);
+        } else if (message instanceof LearningDashboard) {
+          processLearningDashboard((LearningDashboard) message);
+        }
+      }
+    };
+
+    runExec.execute(task);
+  }
+
+  public void processGuestPolicyChanged(GuestPolicyChanged msg) {
+    Meeting m = getMeeting(msg.meetingId);
+    if (m != null) {
+      m.setGuestPolicy(msg.policy);
+    }
+  }
+
+  public void processGuestLobbyMessageChanged(GuestLobbyMessageChanged msg) {
+    Meeting m = getMeeting(msg.meetingId);
+    if (m != null) {
+      m.setGuestLobbyMessage(msg.message);
+    }
+  }
+
+  public void processAddPad(AddPad msg) {
+    Meeting m = getMeeting(msg.meetingId);
+    if (m != null) {
+      m.addPad(msg.padId, msg.readOnlyId);
+    }
+  }
+
+  public void processAddCaptionsPads(AddCaptionsPads msg) {
+    Meeting m = getMeeting(msg.meetingId);
+    if (m != null) {
+      for (String padId : msg.padIds) {
+        m.addPad(padId, "undefined");
+      }
+    }
+  }
+
+  public void processRecordingChapterBreak(RecordChapterBreak msg) {
+    recordingService.kickOffRecordingChapterBreak(msg.meetingId, msg.timestamp);
+  }
+
+  private void processMakePresentationDownloadableMsg(MakePresentationDownloadableMsg msg) {
+    recordingService.processMakePresentationDownloadableMsg(msg);
+  }
+
+  public File getDownloadablePresentationFile(String meetingId, String presId, String presFilename) {
+    return recordingService.getDownloadablePresentationFile(meetingId, presId, presFilename);
+  }
+
+  public void start() {
+    log.info("Starting Meeting Service.");
+    try {
+      processMessage = true;
+      Runnable messageReceiver = new Runnable() {
+        public void run() {
+          while (processMessage) {
+            try {
+              IMessage msg = receivedMessages.take();
+              processMessage(msg);
+            } catch (InterruptedException e) {
+              log.error("InterruptedException while starting Meeting Service", e);
+            } catch (Exception e) {
+              log.error("Handling unexpected exception", e);
+            }
+          }
+        }
+      };
+
+      msgProcessorExec.execute(messageReceiver);
+    } catch (Exception e) {
+      log.error("Error PRocessing Message");
+    }
+  }
+
+  public void stop() {
+    processMessage = false;
+    waitingGuestCleaner.stop();
+    userCleaner.stop();
+    enteredUserCleaner.stop();
+  }
+
+  public void setRecordingService(RecordingService s) {
+    recordingService = s;
+  }
+
+  public void setLearningDashboardService(LearningDashboardService s) {
+    learningDashboardService = s;
+  }
+
+  public void setRedisStorageService(RedisStorageService mess) {
+    storeService = mess;
+  }
+
+  public void setCallbackUrlService(CallbackUrlService service) {
+    callbackUrlService = service;
+  }
+
+  public void setGw(IBbbWebApiGWApp gw) {
+    this.gw = gw;
+  }
+
+  public void setWaitingGuestCleanupTimerTask(WaitingGuestCleanupTimerTask c) {
+    waitingGuestCleaner = c;
+    waitingGuestCleaner.setMeetingService(this);
+    waitingGuestCleaner.start();
+  }
+
+  public void setEnteredUserCleanupTimerTask(EnteredUserCleanupTimerTask c) {
+    enteredUserCleaner = c;
+    enteredUserCleaner.setMeetingService(this);
+    enteredUserCleaner.start();
+  }
+
+  public void setUserCleanupTimerTask(UserCleanupTimerTask c) {
+    userCleaner = c;
+    userCleaner.setMeetingService(this);
+    userCleaner.start();
+  }
+
+  public void setStunTurnService(StunTurnService s) {
+    stunTurnService = s;
+  }
+
+  public void setUsersTimeout(long value) {
+    usersTimeout = value;
+  }
+
+  public void setEnteredUsersTimeout(long value) {
+    enteredUsersTimeout = value;
+  }
+
+  public void setSwfSlidesGenerationProgressNotifier(SwfSlidesGenerationProgressNotifier notifier) {
+    this.notifier = notifier;
+  }
+
+}

From 26aeefa215a67764cdc3573476b5b468afce6398 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Thu, 30 Sep 2021 13:13:15 +0900
Subject: [PATCH 106/127] Update MeetingService.java

---
 .../org/bigbluebutton/api/MeetingService.java | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
index f40faacc63f5..e63f6f6e6df4 100755
--- a/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
+++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
@@ -50,6 +50,7 @@
 import org.bigbluebutton.api.domain.RegisteredUser;
 import org.bigbluebutton.api.domain.User;
 import org.bigbluebutton.api.domain.UserSession;
+import org.bigbluebutton.api.domain.UploadedFile;
 import org.bigbluebutton.api.domain.MeetingLayout;
 import org.bigbluebutton.api.messaging.MessageListener;
 import org.bigbluebutton.api.messaging.converters.messages.DestroyMeetingMessage;
@@ -283,6 +284,33 @@ private void kickOffProcessingOfRecording(Meeting m) {
     }
   }
 
+  public Boolean isUploadRequestValid(String meetingId, String source, String filename, String userId, String token) {
+    Meeting m = getMeeting(meetingId);
+    if (m != null) {
+      return m.isUploadRequestValid(source, filename, userId, token);
+     } else {
+      return false;
+    }
+  }
+  
+  public Boolean isDownloadRequestValid(String meetingId, String source, String uploadId) {
+    Meeting m = getMeeting(meetingId);
+    if (m != null) {
+      return m.hasUploadedFile(source, uploadId);
+     } else {
+      return false;
+    }
+  }
+  
+  public UploadedFile getUploadedFile(String meetingId, String uploadId) {
+    Meeting m = getMeeting(meetingId);
+    if (m != null) {
+      return m.getUploadedFile(uploadId);
+     } else {
+      return null;
+    }
+  }
+  
   public Boolean authzTokenIsValid(String authzToken) { // Note we DO NOT expire the token
     return uploadAuthzTokens.containsKey(authzToken);
   }
@@ -620,6 +648,22 @@ public void processRecording(Meeting m) {
     }
   }
 
+  public void fileUploaded(
+    String uploadId,
+    String source,
+    String filename,
+    String contentType,
+    String extension,
+    String userId,
+    String meetingId
+   ) {
+    Meeting m = getMeeting(meetingId);
+    if (m != null) {
+      m.addUploadedFile(source, filename, contentType, extension, uploadId);
+      gw.fileUploaded(uploadId, source, filename, contentType, userId, meetingId);
+    }
+  }
+  
   public void endMeeting(String meetingId) {
     handle(new EndMeeting(meetingId));
   }
@@ -733,6 +777,13 @@ private void processGuestStatusChangedEventMsg(GuestStatusChangedEventMsg messag
 
   }
 
+  private void processUploadRequest(UploadRequest message) {
+    Meeting m = getMeeting(message.meetingId);
+    if (m != null) {
+      m.addUploadRequest(message.source, message.filename, message.userId, message.token);
+    }
+  }
+  
   private void processPresentationUploadToken(PresentationUploadToken message) {
     uploadAuthzTokens.put(message.authzToken, message);
   }
@@ -1116,6 +1167,8 @@ public void run() {
           processRegisterUser((RegisterUser) message);
         } else if (message instanceof CreateBreakoutRoom) {
           processCreateBreakoutRoom((CreateBreakoutRoom) message);
+        } else if (message instanceof UploadRequest) {
+          processUploadRequest((UploadRequest) message);
         } else if (message instanceof PresentationUploadToken) {
           processPresentationUploadToken((PresentationUploadToken) message);
         } else if (message instanceof GuestStatusChangedEventMsg) {

From 97cdd009058d0c38dca9226cdc4524fd46e39769 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Sat, 8 Jan 2022 12:42:06 +0900
Subject: [PATCH 107/127] uploader notification -> false

---
 bigbluebutton-html5/private/config/settings.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bigbluebutton-html5/private/config/settings.yml b/bigbluebutton-html5/private/config/settings.yml
index ca7b54f0547f..253c21f784d8 100755
--- a/bigbluebutton-html5/private/config/settings.yml
+++ b/bigbluebutton-html5/private/config/settings.yml
@@ -589,7 +589,7 @@ public:
   upload:
     endpoint: /bigbluebutton/upload
     timeout: 5000
-    notification: true
+    notification: false
     media:
       enabled: true
       maxSize: 900000000

From 0d15d4fdc29537447907eb99d3e4a398fdf2a8cd Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Sat, 15 Jan 2022 00:10:05 +0900
Subject: [PATCH 108/127] error is object in axios

---
 bigbluebutton-html5/imports/ui/components/upload/service.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bigbluebutton-html5/imports/ui/components/upload/service.js b/bigbluebutton-html5/imports/ui/components/upload/service.js
index 8a7f69702da9..282ab33a8e4d 100644
--- a/bigbluebutton-html5/imports/ui/components/upload/service.js
+++ b/bigbluebutton-html5/imports/ui/components/upload/service.js
@@ -112,7 +112,7 @@ const post = (source, file, token, intl) => {
   axios.post(url, data, config).then(resp => {
     notify(intl.formatMessage(intlMessages.completed, ({ 0: file.filename })), 'info', 'upload');
   }).catch(error => {
-    notify(error, 'error', 'upload');
+    notify'Upload error: ' + error.response, 'error', 'upload');
   });
 };
 

From e111f5df3dbea718fa97e6accdb01d8781826cd9 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Sat, 15 Jan 2022 00:31:45 +0900
Subject: [PATCH 109/127] Update service.js

---
 bigbluebutton-html5/imports/ui/components/upload/service.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bigbluebutton-html5/imports/ui/components/upload/service.js b/bigbluebutton-html5/imports/ui/components/upload/service.js
index 282ab33a8e4d..f40fbe373ccc 100644
--- a/bigbluebutton-html5/imports/ui/components/upload/service.js
+++ b/bigbluebutton-html5/imports/ui/components/upload/service.js
@@ -112,7 +112,8 @@ const post = (source, file, token, intl) => {
   axios.post(url, data, config).then(resp => {
     notify(intl.formatMessage(intlMessages.completed, ({ 0: file.filename })), 'info', 'upload');
   }).catch(error => {
-    notify'Upload error: ' + error.response, 'error', 'upload');
+    console.log("Upload error", error.message);
+    notify('Upload error' + error.message, 'error', 'upload');
   });
 };
 

From d43de3e7ce172e0323bb64ee3f4982db4f1d55e8 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Sat, 15 Jan 2022 21:23:22 +0900
Subject: [PATCH 110/127] encode japanese filename

---
 bigbluebutton-html5/imports/ui/components/upload/service.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bigbluebutton-html5/imports/ui/components/upload/service.js b/bigbluebutton-html5/imports/ui/components/upload/service.js
index f40fbe373ccc..0c5e543ac369 100644
--- a/bigbluebutton-html5/imports/ui/components/upload/service.js
+++ b/bigbluebutton-html5/imports/ui/components/upload/service.js
@@ -105,7 +105,7 @@ const post = (source, file, token, intl) => {
       'Content-Type': 'multipart/form-data',
       'X-Meeting-ID': meetingId,
       'X-User-ID': userId,
-      'X-Filename': file.filename,
+      'X-Filename': encodeURI(file.filename),
     },
   };
 

From 4e70eb83587e364ad81977f4ad010f59410eafb7 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Sat, 15 Jan 2022 21:25:53 +0900
Subject: [PATCH 111/127] camelcase for file player attributes

---
 .../imports/ui/components/external-video-player/component.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx b/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx
index e6a744ca755d..08419e0b32df 100644
--- a/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx
@@ -95,8 +95,8 @@ class VideoPlayer extends Component {
       file: {
         attributes: {
           controls: isPresenter ? 'controls' : '',
-          autoplay: 'autoplay',
-          playsinline: 'playsinline',
+          autoPlay: 'autoplay',
+          playsInline: 'playsinline',
         },
       },
       facebook: {

From 288d4067022b22018b644058db66269fdaf03fc2 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Sat, 15 Jan 2022 21:31:06 +0900
Subject: [PATCH 112/127] decode Japanese filename

---
 .../org/bigbluebutton/web/controllers/UploadController.groovy   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/UploadController.groovy b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/UploadController.groovy
index 488d800d1cd1..29506504f2f0 100644
--- a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/UploadController.groovy
+++ b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/UploadController.groovy
@@ -13,7 +13,7 @@ class UploadController {
   def check = {
     def meetingId = request.getHeader("x-meeting-id")
     def source = request.getHeader("x-source")
-    def filename = request.getHeader("x-filename")
+    def filename = URLDecoder.decode(request.getHeader("x-filename"), 'utf-8')
     def userId = request.getHeader("x-user-id")
     def token = request.getHeader("x-token")
     def contentLength = request.getHeader("x-content-length")

From 45af74404b47a9f8feae863653e31d1dd71886cd Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Sat, 15 Jan 2022 23:41:21 +0900
Subject: [PATCH 113/127] add a note

---
 .../imports/ui/components/upload/media/component.jsx       | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/bigbluebutton-html5/imports/ui/components/upload/media/component.jsx b/bigbluebutton-html5/imports/ui/components/upload/media/component.jsx
index 4a95bd81d2f9..ceff06ec2340 100644
--- a/bigbluebutton-html5/imports/ui/components/upload/media/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/upload/media/component.jsx
@@ -16,6 +16,10 @@ const intlMessages = defineMessages({
     id: 'app.upload.media.title',
     description: 'Media upload modal title',
   },
+  note: {
+    id: 'app.upload.media.note',
+    description: 'Media upload modal note',
+  },
   message: {
     id: 'app.upload.media.message',
     description: 'Media upload modal message',
@@ -162,6 +166,9 @@ class MediaUpload extends Component {
             {intl.formatMessage(intlMessages.title)}
           </h3>
         </header>
+        <h4 className={styles.content}>
+          {intl.formatMessage(intlMessages.note)}
+        </h4>
         <div className={styles.content}>
           {this.renderFiles()}
           <Dropzone

From e777d3b60a13f207efa20fa98e458f4b0198f2f2 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Sat, 15 Jan 2022 23:46:19 +0900
Subject: [PATCH 114/127] Update en.json

---
 bigbluebutton-html5/public/locales/en.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bigbluebutton-html5/public/locales/en.json b/bigbluebutton-html5/public/locales/en.json
index f92f186a4c56..4cd96223178f 100755
--- a/bigbluebutton-html5/public/locales/en.json
+++ b/bigbluebutton-html5/public/locales/en.json
@@ -58,6 +58,7 @@
     "app.upload.notification.header": "A file was uploaded",
     "app.upload.notification.disclaimer": "Note that your browser might not support this type of file.",
     "app.upload.media.title": "Media upload",
+    "app.upload.media.note": "Uploaded media can be shared from the external video sharing modal",
     "app.upload.media.message": "Drag or select media files to be uploaded",
     "app.upload.media.filename": "Media filename",
     "app.upload.media.options": "Media options",

From bddf5a5c1bd7450feb164aa32411f4698153fc23 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Sat, 15 Jan 2022 23:47:23 +0900
Subject: [PATCH 115/127] Update ja.json

---
 bigbluebutton-html5/public/locales/ja.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bigbluebutton-html5/public/locales/ja.json b/bigbluebutton-html5/public/locales/ja.json
index 7c4b2f475944..f63391f928a0 100644
--- a/bigbluebutton-html5/public/locales/ja.json
+++ b/bigbluebutton-html5/public/locales/ja.json
@@ -58,6 +58,7 @@
     "app.upload.notification.header": "ファイルがアップロードされました",
     "app.upload.notification.disclaimer": "ブラウザが、このファイルタイプをサポートしていない可能性もあります。注意してください",
     "app.upload.media.title": "メディアアップロード",
+    "app.upload.media.note": "アップロードされたファイルは外部動画共有モーダルから共有できます",
     "app.upload.media.message": "アップロードするメディアファイルをドラッグまたは選択してください",
     "app.upload.media.filename": "メディアファイル名",
     "app.upload.media.options": "メディアオプション",

From fb3d17b646cdaaf94259ad8324d24c2dd70bb7ed Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Tue, 18 Jan 2022 13:22:08 +0900
Subject: [PATCH 116/127] to increase upload size ~600Mb?

---
 bigbluebutton-web/run-prod.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bigbluebutton-web/run-prod.sh b/bigbluebutton-web/run-prod.sh
index 5a2177779e5c..caecbbe653b4 100755
--- a/bigbluebutton-web/run-prod.sh
+++ b/bigbluebutton-web/run-prod.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-exec java -Dgrails.env=prod -Dserver.address=127.0.0.1 -Dserver.port=8090 -Xms384m -Xmx384m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/bigbluebutton/diagnostics -cp WEB-INF/lib/*:/:WEB-INF/classes/:. org.springframework.boot.loader.WarLauncher
+exec java -Dgrails.env=prod -Dserver.address=127.0.0.1 -Dserver.port=8090 -Xms384m -Xmx1024m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/bigbluebutton/diagnostics -cp WEB-INF/lib/*:/:WEB-INF/classes/:. org.springframework.boot.loader.WarLauncher

From 1ba652e68629e5c97b8713d1d48e1615441d400d Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Tue, 18 Jan 2022 13:26:30 +0900
Subject: [PATCH 117/127] 900M

---
 .../main/java/org/bigbluebutton/api/ParamsProcessorUtil.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/ParamsProcessorUtil.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/ParamsProcessorUtil.java
index 51c929c07601..a82545068773 100755
--- a/bbb-common-web/src/main/java/org/bigbluebutton/api/ParamsProcessorUtil.java
+++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/ParamsProcessorUtil.java
@@ -107,7 +107,7 @@ public class ParamsProcessorUtil {
 		private boolean defaultLockSettingsLockOnJoinConfigurable;
 
     private Long maxPresentationFileUpload = 30000000L; // 30MB
-    private Long maxUploadSize = 30000000L; // 30MB
+    private Long maxUploadSize = 900000000L; // 900MB - but probably doesn't matter
     private String uploadDir;
 
     private Integer clientLogoutTimerInMinutes = 0;

From 8f558a65bcc6ef7cb61d975ce5f62ef179f1a31d Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Tue, 18 Jan 2022 13:42:40 +0900
Subject: [PATCH 118/127] up to 500MB

---
 bigbluebutton-html5/public/locales/ja.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bigbluebutton-html5/public/locales/ja.json b/bigbluebutton-html5/public/locales/ja.json
index f63391f928a0..5cc56b69b24e 100644
--- a/bigbluebutton-html5/public/locales/ja.json
+++ b/bigbluebutton-html5/public/locales/ja.json
@@ -58,7 +58,7 @@
     "app.upload.notification.header": "ファイルがアップロードされました",
     "app.upload.notification.disclaimer": "ブラウザが、このファイルタイプをサポートしていない可能性もあります。注意してください",
     "app.upload.media.title": "メディアアップロード",
-    "app.upload.media.note": "アップロードされたファイルは外部動画共有モーダルから共有できます",
+    "app.upload.media.note": "500MBまでアップロード可能です。アップロードされたファイルは外部動画共有モーダルから共有できます",
     "app.upload.media.message": "アップロードするメディアファイルをドラッグまたは選択してください",
     "app.upload.media.filename": "メディアファイル名",
     "app.upload.media.options": "メディアオプション",

From 7bfe32aae211a5ef1f4334c39556badc2fa60c30 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Tue, 18 Jan 2022 20:58:41 +0900
Subject: [PATCH 119/127] media format

---
 bigbluebutton-html5/public/locales/ja.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bigbluebutton-html5/public/locales/ja.json b/bigbluebutton-html5/public/locales/ja.json
index 5cc56b69b24e..4a3a435a7080 100644
--- a/bigbluebutton-html5/public/locales/ja.json
+++ b/bigbluebutton-html5/public/locales/ja.json
@@ -58,7 +58,7 @@
     "app.upload.notification.header": "ファイルがアップロードされました",
     "app.upload.notification.disclaimer": "ブラウザが、このファイルタイプをサポートしていない可能性もあります。注意してください",
     "app.upload.media.title": "メディアアップロード",
-    "app.upload.media.note": "500MBまでアップロード可能です。アップロードされたファイルは外部動画共有モーダルから共有できます",
+    "app.upload.media.note": "mp4, mp3, ogg, webm形式の動画、音声ファイルを500MBまでアップロード可能です。アップロードされたファイルは外部動画共有モーダルから共有できます",
     "app.upload.media.message": "アップロードするメディアファイルをドラッグまたは選択してください",
     "app.upload.media.filename": "メディアファイル名",
     "app.upload.media.options": "メディアオプション",

From 60f65f1fc66f923f7475042533bc4c75be260aa8 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Sat, 29 Jan 2022 19:43:24 +0900
Subject: [PATCH 120/127] presentation 100mb

---
 bigbluebutton-web/bbb-web.nginx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bigbluebutton-web/bbb-web.nginx b/bigbluebutton-web/bbb-web.nginx
index 5fa3f769c26a..50a8035a1d54 100755
--- a/bigbluebutton-web/bbb-web.nginx
+++ b/bigbluebutton-web/bbb-web.nginx
@@ -37,7 +37,7 @@
 			}
 
 			# high limit for presentation as bbb-web will reject upload if larger than configured
-			client_max_body_size       1000m;
+			client_max_body_size       100m;
 			client_body_buffer_size    128k;
 
 			proxy_connect_timeout      90;
@@ -89,7 +89,7 @@
 			proxy_set_header	X-Original-Content-Length $http_content_length;
 
 			# high limit for presentation as bbb-web will reject upload if larger than configured
-			client_max_body_size       1000m;
+			client_max_body_size       100m;
 			client_body_buffer_size    128k;
 
 			proxy_pass_request_body off;
@@ -134,7 +134,7 @@
             }
 
             # Allow 30M uploaded presentation document.
-            client_max_body_size       30m;
+            client_max_body_size       100m;
             client_body_buffer_size    128k;
 
             proxy_connect_timeout      90;

From 6d519abb3363aa39121c6ac17d50a5b86960828e Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Sat, 29 Jan 2022 19:48:43 +0900
Subject: [PATCH 121/127] revert the change

---
 bigbluebutton-web/bbb-web.nginx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bigbluebutton-web/bbb-web.nginx b/bigbluebutton-web/bbb-web.nginx
index 50a8035a1d54..5fa3f769c26a 100755
--- a/bigbluebutton-web/bbb-web.nginx
+++ b/bigbluebutton-web/bbb-web.nginx
@@ -37,7 +37,7 @@
 			}
 
 			# high limit for presentation as bbb-web will reject upload if larger than configured
-			client_max_body_size       100m;
+			client_max_body_size       1000m;
 			client_body_buffer_size    128k;
 
 			proxy_connect_timeout      90;
@@ -89,7 +89,7 @@
 			proxy_set_header	X-Original-Content-Length $http_content_length;
 
 			# high limit for presentation as bbb-web will reject upload if larger than configured
-			client_max_body_size       100m;
+			client_max_body_size       1000m;
 			client_body_buffer_size    128k;
 
 			proxy_pass_request_body off;
@@ -134,7 +134,7 @@
             }
 
             # Allow 30M uploaded presentation document.
-            client_max_body_size       100m;
+            client_max_body_size       30m;
             client_body_buffer_size    128k;
 
             proxy_connect_timeout      90;

From 29a40046e6e7a5eac829cb98009df868d9f46a2c Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Sun, 30 Jan 2022 09:30:42 +0900
Subject: [PATCH 122/127] Update en.json

---
 bigbluebutton-html5/public/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bigbluebutton-html5/public/locales/en.json b/bigbluebutton-html5/public/locales/en.json
index 4cd96223178f..53f840439453 100755
--- a/bigbluebutton-html5/public/locales/en.json
+++ b/bigbluebutton-html5/public/locales/en.json
@@ -439,7 +439,7 @@
     "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "Screenshare locked",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "Stop sharing your screen",
     "app.actionsBar.actionsDropdown.presentationDesc": "Upload your presentation",
-    "app.actionsBar.actionsDropdown.uploadMediaLabel": "Upload a media file",
+    "app.actionsBar.actionsDropdown.uploadMediaLabel": "Upload a movie/audio file temporarily",
     "app.actionsBar.actionsDropdown.uploadMediaDesc": "Upload your local media file",
     "app.actionsBar.actionsDropdown.initPollDesc": "Initiate a poll",
     "app.actionsBar.actionsDropdown.desktopShareDesc": "Share your screen with others",

From b6de5b0bafd09c56628c46c479efcc8340a3311c Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Sun, 30 Jan 2022 09:39:08 +0900
Subject: [PATCH 123/127] Update ja.json

---
 bigbluebutton-html5/public/locales/ja.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bigbluebutton-html5/public/locales/ja.json b/bigbluebutton-html5/public/locales/ja.json
index 4a3a435a7080..f91dd271a7c1 100644
--- a/bigbluebutton-html5/public/locales/ja.json
+++ b/bigbluebutton-html5/public/locales/ja.json
@@ -58,7 +58,7 @@
     "app.upload.notification.header": "ファイルがアップロードされました",
     "app.upload.notification.disclaimer": "ブラウザが、このファイルタイプをサポートしていない可能性もあります。注意してください",
     "app.upload.media.title": "メディアアップロード",
-    "app.upload.media.note": "mp4, mp3, ogg, webm形式の動画、音声ファイルを500MBまでアップロード可能です。アップロードされたファイルは外部動画共有モーダルから共有できます",
+    "app.upload.media.note": "mp4, mp3, ogg, webm形式の動画、音声ファイルを500MBまでアップロード可能です。アップロードされたファイルは「インターネット上の動画を共有」から共有できます",
     "app.upload.media.message": "アップロードするメディアファイルをドラッグまたは選択してください",
     "app.upload.media.filename": "メディアファイル名",
     "app.upload.media.options": "メディアオプション",
@@ -437,7 +437,7 @@
     "app.actionsBar.actionsDropdown.lockedDesktopShareLabel": "画面共有ロック",
     "app.actionsBar.actionsDropdown.stopDesktopShareLabel": "画面共有をやめる",
     "app.actionsBar.actionsDropdown.presentationDesc": "プレゼンテーションをアップロード",
-    "app.actionsBar.actionsDropdown.uploadMediaLabel": "メディアファイルをアップロード",
+    "app.actionsBar.actionsDropdown.uploadMediaLabel": "動画や音声ファイルを一時的にアップロード",
     "app.actionsBar.actionsDropdown.uploadMediaDesc": "ローカルのメディアファイルをアップロード",
     "app.actionsBar.actionsDropdown.initPollDesc": "投票を初期化",
     "app.actionsBar.actionsDropdown.desktopShareDesc": "他の人と画面を共有する",

From 027aab00677de58fde1169ad82d6aa40c210529f Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Sun, 30 Jan 2022 14:27:06 +0900
Subject: [PATCH 124/127] Update ja.json

---
 bigbluebutton-html5/public/locales/ja.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bigbluebutton-html5/public/locales/ja.json b/bigbluebutton-html5/public/locales/ja.json
index f91dd271a7c1..7689d428d425 100644
--- a/bigbluebutton-html5/public/locales/ja.json
+++ b/bigbluebutton-html5/public/locales/ja.json
@@ -58,7 +58,7 @@
     "app.upload.notification.header": "ファイルがアップロードされました",
     "app.upload.notification.disclaimer": "ブラウザが、このファイルタイプをサポートしていない可能性もあります。注意してください",
     "app.upload.media.title": "メディアアップロード",
-    "app.upload.media.note": "mp4, mp3, ogg, webm形式の動画、音声ファイルを500MBまでアップロード可能です。アップロードされたファイルは「インターネット上の動画を共有」から共有できます",
+    "app.upload.media.note": "mp4, mp3, ogg, webm形式の動画、音声ファイルを500MBまでアップロード可能です。アップロードされたファイルは「インターネット上の動画を共有」から共有できます。ただしファイルのシークは今のところChromeやEdgeでは行えません（nginxの設定がrange requestsに対応していないため）。Firefoxでは可能です。",
     "app.upload.media.message": "アップロードするメディアファイルをドラッグまたは選択してください",
     "app.upload.media.filename": "メディアファイル名",
     "app.upload.media.options": "メディアオプション",

From 18cf8fa90fa3dbe9697867e35a8d0d20be665e2b Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Fri, 4 Feb 2022 21:28:01 +0900
Subject: [PATCH 125/127] Update run-prod.sh

---
 bigbluebutton-web/run-prod.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bigbluebutton-web/run-prod.sh b/bigbluebutton-web/run-prod.sh
index caecbbe653b4..a3918b98ef54 100755
--- a/bigbluebutton-web/run-prod.sh
+++ b/bigbluebutton-web/run-prod.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-exec java -Dgrails.env=prod -Dserver.address=127.0.0.1 -Dserver.port=8090 -Xms384m -Xmx1024m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/bigbluebutton/diagnostics -cp WEB-INF/lib/*:/:WEB-INF/classes/:. org.springframework.boot.loader.WarLauncher
+exec java -Dgrails.env=prod -Dserver.address=127.0.0.1 -Dserver.port=8090 -Xms384m -Xmx4m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/bigbluebutton/diagnostics -cp WEB-INF/lib/*:/:WEB-INF/classes/:. org.springframework.boot.loader.WarLauncher

From 721b1ef7bf12bf926f1eec12dcadb1fd8bfa5b26 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Fri, 4 Feb 2022 21:32:40 +0900
Subject: [PATCH 126/127] Update ja.json

---
 bigbluebutton-html5/public/locales/ja.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bigbluebutton-html5/public/locales/ja.json b/bigbluebutton-html5/public/locales/ja.json
index 7689d428d425..c98c97e14e44 100644
--- a/bigbluebutton-html5/public/locales/ja.json
+++ b/bigbluebutton-html5/public/locales/ja.json
@@ -58,7 +58,7 @@
     "app.upload.notification.header": "ファイルがアップロードされました",
     "app.upload.notification.disclaimer": "ブラウザが、このファイルタイプをサポートしていない可能性もあります。注意してください",
     "app.upload.media.title": "メディアアップロード",
-    "app.upload.media.note": "mp4, mp3, ogg, webm形式の動画、音声ファイルを500MBまでアップロード可能です。アップロードされたファイルは「インターネット上の動画を共有」から共有できます。ただしファイルのシークは今のところChromeやEdgeでは行えません（nginxの設定がrange requestsに対応していないため）。Firefoxでは可能です。",
+    "app.upload.media.note": "mp4、mp3、ogg、webm形式の動画、音声ファイルを1000MBまでアップロード可能です。アップロードされたファイルは「インターネット上の動画を共有」から共有できます。",
     "app.upload.media.message": "アップロードするメディアファイルをドラッグまたは選択してください",
     "app.upload.media.filename": "メディアファイル名",
     "app.upload.media.options": "メディアオプション",

From e5f40c6fd726702f734be2b69f0ebc6cfba29975 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Fri, 4 Feb 2022 21:45:03 +0900
Subject: [PATCH 127/127] enable seeking on Chrome

---
 .../web/controllers/DownloadController.groovy | 51 +++++++++++++++++--
 1 file changed, 46 insertions(+), 5 deletions(-)

diff --git a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/DownloadController.groovy b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/DownloadController.groovy
index 0119dc7ddfee..65e03649af52 100644
--- a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/DownloadController.groovy
+++ b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/DownloadController.groovy
@@ -64,17 +64,58 @@ class DownloadController {
         def downloadPath = Util.getDownloadPath(rootDir, source, meetingId, uploadId)
         def filename = uploadId + "." + uploadedFile.extension
         def file = new File(downloadPath + File.separatorChar + filename)
+        def fileSize = file.length()
         if (file.exists()) {
-          def bytes = file.readBytes()
-          response.addHeader("Cache-Control", "no-cache")
+          long startByte = 0
+          long endByte = fileSize - 1
+          String range = request.getHeader('range')
+          if(range) {
+            String[] rangeKeyValue = range.split('=')
+            String[] rangeEnds = rangeKeyValue[1].split('-')
+            if (rangeEnds.length > 0 && rangeEnds[0] != '') {
+              startByte = rangeEnds[0].toLong()
+            }
+            if (rangeEnds.length > 1 && rangeEnds[1] != '') {
+              endByte = rangeEnds[1].toLong()
+            }
+          }
+          def contentLength = (endByte - startByte) + 1
+/*
+          // the below is very memory consuming
+          //  -> https://stackoverflow.com/questions/2824486/groovy-grails-how-do-you-stream-or-buffer-a-large-file-in-a-controllers-respon
+          //  -> https://www.baeldung.com/groovy-io
+          def bytes = new byte[contentLength]
+          def inputStream = file.newInputStream()
+          inputStream.skip(startByte)
+          inputStream.read(bytes, 0, bytes.length) //it's important to set zero for the second argument: see https://stackoverflow.com/questions/23071164/grails-ios-specific-returning-video-mp4-file-gives-broken-pipe-exception-g
+          response.reset()
+          response.setStatus(206)
           response.contentType = uploadedFile.contentType
-          response.outputStream << bytes;
+          response.addHeader("Accept-Ranges", "bytes")
+          response.addHeader("Content-Range", "bytes ${startByte}-${endByte}/${fileSize}")
+          response.addHeader("Content-Length", "${contentLength}")
+          response.addHeader("Cache-Control", "no-cache")
+          response.outputStream << bytes
+*/
+
+          file.withInputStream { stream ->
+            stream.skip(startByte)
+            response.reset()
+            response.setStatus(206)
+            response.contentType = uploadedFile.contentType
+            response.addHeader("Accept-Ranges", "bytes")
+            response.addHeader("Content-Range", "bytes ${startByte}-${endByte}/${fileSize}")
+            response.addHeader("Content-Length", "${contentLength}")
+            response.addHeader("Cache-Control", "no-cache")
+            response.outputStream << stream
+            //response.outputStream.flush() // seems unnecessary
+          }
         } else {
-          log.debug("Download failed. No meeting running " + meetingId + ".")
+          log.debug("Download failed. No uploaded file found in the meeting " + meetingId + ".")
           response.setStatus(404)
           response.addHeader("Cache-Control", "no-cache")
           response.contentType = 'plain/text'
-          response.outputStream << 'no-meeting'
+          response.outputStream << 'no-file'
         }
       } catch (IOException e) {
         log.debug("Download failed.")