From fdc0cfce9539f5f50a9f5ed00076c1d8949438fd Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 14 Apr 2026 22:04:47 +0200 Subject: [PATCH] Aufgabenverwaltung angepasst, Eventseite weiter bearbeitet --- .../de/oaa/xxx/admin/AdminController.class | Bin 35301 -> 35957 bytes .../de/oaa/xxx/config/SecurityConfig.class | Bin 10974 -> 14970 bytes .../FeedbackController$FeedbackRequest.class | Bin 1816 -> 1816 bytes .../oaa/xxx/feedback/FeedbackController.class | Bin 5932 -> 7469 bytes .../games/bdsm/controller/AboController.class | Bin 11126 -> 11612 bytes .../controller/AufgabenGruppeController.class | Bin 17478 -> 17569 bytes .../common/aufgaben/AufgabenGruppe.class | Bin 4536 -> 4784 bytes .../aufgaben/AufgabenGruppeDisplay.class | Bin 2130 -> 2378 bytes .../common/entity/AufgabenGruppeEntity.class | Bin 8831 -> 9208 bytes .../repository/AufgabenGruppeRepository.class | Bin 3952 -> 2810 bytes .../controller/VanillaAboController.class | Bin 11541 -> 11826 bytes .../VanillaAufgabenGruppeController.class | Bin 17639 -> 17407 bytes .../xxx/social/NotificationController.class | Bin 6635 -> 6884 bytes ...UserController$LocationFilterRequest.class | Bin 1943 -> 1943 bytes .../user/UserController$NewMemberDto.class | Bin 2396 -> 2396 bytes bin/main/de/oaa/xxx/user/UserController.class | Bin 34932 -> 35020 bytes bin/main/static/admin/admin.html | 15 +- bin/main/static/community/event-detail.html | 13 +- .../static/community/location-detail.html | 43 +- .../static/community/location-events.html | 164 ++++++ bin/main/static/games/bdsm/aufgaben.html | 11 + bin/main/static/games/bdsm/neubdsm.html | 4 +- bin/main/static/userhome.html | 7 +- .../de/oaa/xxx/admin/AdminController.java | 8 +- .../de/oaa/xxx/config/SecurityConfig.java | 11 + .../oaa/xxx/feedback/FeedbackController.java | 33 +- .../games/bdsm/controller/AboController.java | 3 +- .../controller/AufgabenGruppeController.java | 516 +++++++++--------- .../games/common/aufgaben/AufgabenGruppe.java | 1 + .../aufgaben/AufgabenGruppeDisplay.java | 1 + .../common/entity/AufgabenGruppeEntity.java | 5 + .../repository/AufgabenGruppeRepository.java | 37 +- .../controller/VanillaAboController.java | 29 +- .../VanillaAufgabenGruppeController.java | 62 +-- .../xxx/social/NotificationController.java | 8 +- .../java/de/oaa/xxx/user/UserController.java | 3 +- src/main/resources/static/admin/admin.html | 15 +- .../static/community/event-detail.html | 13 +- .../static/community/location-detail.html | 43 +- .../static/community/location-events.html | 164 ++++++ .../resources/static/games/bdsm/aufgaben.html | 11 + .../resources/static/games/bdsm/neubdsm.html | 4 +- src/main/resources/static/userhome.html | 7 +- 43 files changed, 861 insertions(+), 370 deletions(-) create mode 100644 bin/main/static/community/location-events.html create mode 100644 src/main/resources/static/community/location-events.html diff --git a/bin/main/de/oaa/xxx/admin/AdminController.class b/bin/main/de/oaa/xxx/admin/AdminController.class index ac8efa61a2efeb0b1dfaaa441e588a5315763e8b..8be8adef4aa745e938d285e4ed23bbca3d270f3a 100644 GIT binary patch delta 11603 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 literal 10974 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 delta 32 gcmbQiH-m43C@Z7lWHDAFAn6GvYe3}Y^{knU0DklbsQ>@~ diff --git a/bin/main/de/oaa/xxx/feedback/FeedbackController.class b/bin/main/de/oaa/xxx/feedback/FeedbackController.class index 3f13c06b2b62d67d9e402e812a7a1ef2b259de27..2845318c3705782544beb0bdb9535499ca0c693e 100644 GIT binary patch literal 7469 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 E7jW2M!2kdN delta 2300 zcmZWqdw5jE75~ldeeK;za&yD7EYKt%M0T^AfDnWPf+&co7?cEp0;Vgh$(qe3&0Zi- z?SfVN5Yaf+XVVsiN{d!Nav@0zR%@uXT5U_MeOda_R{O9oY)fs=+$CSXul-~0dCZw} zeskuWbDyk#qQ-jh{gD#@mNH9+kD*Gu%BLQV`K`~vl*yaj)5609SKdgVo}+ z8Lw=`S{-W`Y!B}iC!MKX)$62tvdIib8`gg#+SA>>lowT#vL_135XA{R}q{L`&MkESKN2dg;WC^9*y@{g> z8S!RtMrRaRjvl$I=2B_L+x{>|A2JL^F6Fcolu@SGmyt zDcmXE<8`!u7snplE$WIE1O^~<+~b#Y@9$6KdOK5nshZ7n@j*Psu}^|8 zA@Iw)lj+RT&3&m{j`kS7!0|W^5d2hblQ^kITWwN)iQ}MDhP#tpsmpq@o03jj+UX=N z=OnXEPC9*(;!$rhy{_f6)znjj}M0aty&0kCwCqeK;=N4l`^JbM!K? zGZYlFt;l(*izX{nJcu18zJe1vzRECV;QA>lMPhOSm?xh-ijWml4yiRzkG7c$zM2bcOKaq+Khgy~8sA^aK zZ<{rU1NLGazre3_{8GGQmn--+-h8^atcdCO6aJ#(&mtJAQt(&&P1J?nD95`NHpp!L zgX3p7Q=;MT7S5P>p9%*57Skt0{RbHn%@YPA_?N*HD);sM>-sBOyjR*-$qc56r4zR) zCc{jzD-;&(p<+#EoT2=@s0%e*!xS+uJT0$Kq#_ip;EA;5BuRT3f)q`1Gz7^D zad|lf;rEn5aB@~be5vA{)rk$z3esZqcGE~Zop>KEzzm|&+f1TWv;sa7E+hu>BED%9 zg5a^rY8SJ{P$h|rnujs9z|FJFy|Aj?yj0IC^}n?b{5Td2qmfbRHOI#=J$4k~_%N0+ z45P`15v&4Sv@jRfK7)eYy9f8NET5j95s$=m)B zd{N?fqM)IO`{fP=^r*CuGKJf3KV=_w@$?9e$pa(gyey)+7;SqTYQ1_K&(Ll2bX`i^ z5VKhb&(TB3m%W2B4a#hcGCP;Pb*QHCAD5$?MsOVKFdIqCK?nUpddXrtz4fhRbtnBe z1TMxSSU`iIff{rXd0&hpM2D~pC+O$!JTAv;Sb^8c+Zil}ZTJaKIrh@r4 zT_p@HW}L$e9UISKgO2vIXxH%^Lq(o;sdSzva*CEu4lw%4UT7zWvPR3RPeHR^IaFYDkC*4 zQ}#M-%D}Zm>3&dSE`Bck7y7NxI|FBsr0N*@{Gx1QD8URT&;{|?E&Bb(o^r?G@T z;EyCvqNrzSy@!9|9HVw&e&(woq7oL_lzv1>GBAk+SdbM_BQL>1R;&e>L?s7B^grJz B;*$UX diff --git a/bin/main/de/oaa/xxx/games/bdsm/controller/AboController.class b/bin/main/de/oaa/xxx/games/bdsm/controller/AboController.class index 81268fd11981a1f5d2909e1fed3a97f8fb375137..4859963d1e4d0d14b398fbb01643e70db442b2ea 100644 GIT binary patch delta 3130 zcmaJ?d3;pW75=`NH}f)+JIN$4A(LH`KsFnYh>(a7Krt8)LI6Qp8Inl|WP!{i6}RAm z6ct6Ut$Wof;;w)W8Bj#6T9;O9TWPJfXj`?bQq(Sr_S`p6e)_BZW9FWF?>Xmw=R3>$ zWZ|1j{4ajKYY%`%KC{igO{M#>1zT<0O;qc7=_ALqN8*v%_P(A-S8wgyNN2Pqx@I66 zi!0oNdkI%x2QjXqsY$PK=ahbpZbLfm$AdN=AR6=E#4;-_TWkVX`sq_O5y1pl^M4&?SA}3 z;T629U(KB8eGNai@iUzf9OeE6Ue^`DI_sCjc>Q+X_$hwu!y5{}#?3@#S8Q&7*I*}B0rVQbRyW--&q^$?x z>E2=qhb6i(G&%EF#Zs0L#qH7VXgsQ4&1$n2rg60XC{*LEP^=UNM(13cwvWdteuK4o zZ_e!CIK|^Ro(Q$|4fMvRt=0RpPxH<4^8}t~bAp7QuW!#CRjoLYlZb2yYyQCUSX+PB z@@W5bVl#aPW=hw z*3OQ^S18Wm8KT|O)k}D!)KgaT6k9l7XN60x1twz$+~YI-Y?XAdm1in0<`R8wxO{0V zmnwdf-x9w9aQZ-hf3!Dl8p(ibGT=_t5{8>bw_%Zw@1qAh*neo1$uwp1hwSo#R+<8{sHegUTpIs zJ-=X#`x0KNFDTfbF%-n>rWU@VxRICZRfY4oLC-BJ)0;+S=}>;2zO}HRBFHO)c*hTN zvtl1tXL@;ckgFY2^1F&_*q>?hIx*}izTO-Q?Kdmlg4+nYGa8>0>4|1~coT7oK9HSf za;F2uIlk}vc?a*b`2$^3TKHQ<$swlw|0~3L5ki#gi7@p2n?`gL0N1#&DnF z00#xby+<)TtoUsQ!$Uz{FJ)7a8WBz=&se@P+7@r9oE7AD1MD%y1b6C5B}LYwMBNcU z`Hn`CP))tPQbpa7SS%W|`2pS&DVvqRcC1QbuRgV`bm({} zaXB05I0NOFhf1`d5%cAw6-%%HomhyttZT6d7s~xQEJm?dw4|V*3e~a`P&g6KfQ~d# z?p%)4Ad=gWHsW$v^2$ZHLUcXyRwsUlXG&yZt`i8GaFvYBt3_3blhny(IeAuF> z(bY-(Sd0a!sx5CzQ$O~Hu{OTrTAD6&%BfpuzTQ@=t<9Ep+yhl7DhGnVCB>w7# zb9W%=TP{LFz`4{7*nY{+GdrBLfWAu4(7!72=*8yASQ5xoMb&&kcn zsgVDhn=N>mBZL>BLG&&c5`DPE$%7jO*vOF#2~AN7p30B%G|VwyAt}#^ zb5No=N8(s3@t%iCI3G>Ih^f&!iN#dvks56g9ymf@GbVp16|xC59Xy1pRG?pt(q)F7 z&?S{5ZrzT%qUr=|OwE{_N(RTekYHWdDon6GY)J!(zR6&=Pzqck5HA(`^~lF%M?vZ8 zionpxLc2*y5vNFcOv4m$DjVe;FLF7J)5U|KJ>cfa!uS;VO_i-ndgx+Na@s)(+?4s5 z0?mwu4gquuF~KS*Trt5D@`S8A;2Y*?TQRa)cAmmzA#0eklAPhm=&Blv6+& z`#9<33DV1xrI)8;GtR;_QoPqXk*7vR$B}ec=wO$wuPkg_Ddv`#FXk$dJmO>$yTyrD zT#aQ9dk>F>9ET*a630BOwOO>D)i+d@dRsx8t@^3Tk#((biO3`DbqU0Y@@oKse)BmI zYm?GxvYG@0s-*R`uWIzzX_68+_3wczeJX=4^QAegK1D#9VU}K1Q!U*qeI3(hS5*ud zBbPXqZ^U8EMFQ01^H|Z7nNlFjo6jL+7I{kM!doeRE%yVWmFjq}17*I$l$n8IEj3^& z#8j!kDRJP)N9XV(%@VnRGnAXcad=|MiiZH}~q!`#K);xtdZJkCAbi!k2DrF_ckW3jAHdwu@_amblD delta 2782 zcmaJ?33yc189isVH#2$JHzp)QAPFRyK%j&Wk|IJP7z|6oA`x4iB$H&qBmR; zBB%&n+ak15TM$=dbI1Utw6u!0(B0Nn1+87g*4A2WwN?Dz3xw*|ugN#>{rCR+IrskW zAtw9W5p2?bkc_J+IX zMLPq%5u!qEODxDQY3TB=^q2QVgQ4<_;J}kQp2A+$m{jf9r(-`3sI5s& zjzc=0K}@}wRB9X05kHunypzt|_<@dR@tiuIQkDNaeyHIEBJFbEdCQ~0aF0Kv<3~8H zvQjH-KPD!s*U~3WbK?wts^e$aK_mww^Lv9U{n5az-oE9_1BPy<8^6S_G`vV8T@JWt zQGK0`U*jcpBDKizTOBXs74=qXz3VJq({RoR-k2~ZwQxqbZS{=4V5lw7tK)V2PW7c# zJASX@5BQ^cCT)f5O&uHXiiWpTd3r_Rc@!Ag-q!I~Tur!p{XK2rZX=f)=kbn?zvErC zA-%wR9`EURAMX;bNFcf>66mdOGfe)a;{$xCPNg@c;y*e*!fC=5@vjUxaY6Yq3caLN zqlHKb_jZ&=LhTh@ zn(Wb;!{Nk;wm>Kl4XER3t+vHZ=Bd}S${Ztf<_i`X+4noouux|aN2|Tra~#DwOIWHn zY>}gk<1~(yj)$wW+1WmwuRo1r}EAv^`+pn5XxJ1_VYFs^ETRUAv)FB^pUD;M19E} zDR{{Z@=H29*qQ9$`V@AWKIGjxgX~JyxM|R1vbr#Q!l)G9Yv={atvc_=PD1MlMCbau z1Ic!7A+9P`=iC!ibAG1l0XM(O2Q_X}tMYx0?Zmd?1~p-nSACE-LpeuIsr`zRUl%Zo zSadPvH*|KJDR)X5BC~k#Qk(G4Yv~HKMr%rDr|?@w`bTu`;iGEXNUwdj3;{E3j-h>= z(Cd48g!_;`5(z{!?j?$h#O}g|aClkYa*g}cxKR%<;o!+pYb>rwu)!(gXSJGHG`>8J zT~@>~k0|xnkKl30qS=BYcmf!}({UW6EV_ULSQf`&HBeO0KMo1vKS!SPP=rR5pb6Dj zfLT~5|BK+4XFC>SndrK)1S7<{X)q^B;ggkQ$7G31Q>qf3#guA9vYOIHY?3+?(1W{i zkIc3riFs5!9O%x4j(f2g8txNQU4nF*J6mMum|8QswEx>UE-vMwwctCLAnzoxIw8M_ zOTh@fi%G_wMK-=?Y({WW)|minC898|{fh83pnPjORq6z7`{hP;ST~ADCjT!=nDYN9 zQJuy4?VrZ|IRTidab|uRUk^(Nw|_J7UT1xj`=)Xre5?FCm046*_AJV>M0x9FC!wxWkaVyYBK^Z zFuNbDe%Mg=2F2nH8+*jY!mv5xvS8(MVS0slnsbi5GV8#o*wjJe&7xn++j*xct>XsX zWl9@)4>#AD;(b*7GIz**{hGOch!69drnHNX@d-XDp>ib5Q+%5H;lWv~;{k_@S@J&U GaD4)EmP9E4 diff --git a/bin/main/de/oaa/xxx/games/bdsm/controller/AufgabenGruppeController.class b/bin/main/de/oaa/xxx/games/bdsm/controller/AufgabenGruppeController.class index 0a7ab6da1192764b4f96f401cfb4dab7159f9944..9b18d3b1c3dd119ffa5285ffdad46e90b95e5d5e 100644 GIT binary patch delta 2646 zcmZuy3wV>|6@Jf`%b%ow@AQ&VO457NmR=~=(w1JRw9rlj3do=Y2v8PMo+f1qa|P!R z++f2GnGT&GBBF>uG?I287uQWhDGcxeB5o*7H(ugsWAvrr|?0nf{OENB{ zhZR~TFWLI(enyYTD0^nXa+MyX73`a1YrYAF?5R~bO(uGbP;gf*a)v$C{7aScXcb|Y zERVFx=k4kAEBUtlQ{xl#8->=%9jT?dC+R79A+^T1o}N+YX*o14YryZc612n`Twbqp zuFFIl2oau^S@V3hxvn|wp4l#s1ugWPN}K3;xhgG}UXa1Gea7vyL!nn?NBRiePTD2+ zrcdtwno6&un-IqCD%5od!MGgpD<85X<({`!$Fnax}&zx)z+q|b!%#Wyrq^ddnnSTslKh!q1y@6ws=~+ z^IUCVbXe1US5D6yVLYNz4;_^oGBd1yR_Qn?1e0^tEZ0Jxi}5?DwdH+zCNs(Sp-Lao zDS0zA%)8+E`T3 z=U#55g)SpMjQ&mED)bE@T`sev>r}cb_d8iasJvUdTOT zOjbodks^=f9WZSdsj5g5>GJ9PNybc7WQjQc)%-*<7Kwq1D3%EYxrP$Lli6~AVWMm< zcsQoeB!+P28I)lW!$hefhRd%DvUDRvne111HezTLt}uwAQWaIAT80(fuOCTh<^Cke zh?HbGBfm)Y6j{|o>PndVd>C)no_$Go{=kd7Os@+bn*X32j{e%p;tRR8YjxZ|XhlG?~R*|s- z4;%7eLcTmV(3LX`dQ`!TYDAz0u^0s_YSAC}AOoY3i#imc9z!t3-&Qh;;wC`BL?ogK z$(V#IG=s}2*cqTr2Ybvb|EvCR$BD|%*qYYFZ9?=tAm(E*uma( z$mX*a(R@D3=LRIv6;F#u(>zPBR|SlCe~m(s=ypR4LloGLx4_bv+{wCC8v8QgK!^S#8x`l+mCWY zf@k-eUZYGJ6{b-U8WofO-z81u7Xv)kCR~LLH~3Y#%DLX;Mg1Nl z_#XqcL^4oi504iKoU{oe@t8=I=c;V|;(;iO_S|wHEy-fOwS_b}0-~?9SLf95+uAEz zz=&%FSo2uc*!L+!=kv@B%?k><;EXctqM^iYD3gLqF#&%QDeouVqA#2PfQe( k#ALQgg)3gXvRgpX9%PDKiF!2^Z)<= delta 2554 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 literal 4536 zcmbW3Yg5}s6o!wCv9S?>m`jq7%TL;q7d z)6OK5nSSUG=#T33Ju6Gd4zU)0(Q0?kK4-P(J!kdre}Df&L`(E*mQorSRbe=$X`G&( z8a1;aJfq??8jfw4&4Zd*7Phg}dRcRu$HyW|X^lpX%oEe7n|953Ts{&NU!z=2PTT8M zOqb+*)3@rz?(X`7S&h;**cugr8M$)DcP+byIlU~r%AqT)a?`G9)OX_88fBWEa2Ymq z>{=(LF9P=(Y5N)tgqv&kRkA!EyxfjevrWJ0!r@$OD?B|{QvKf91)#E?@0te!`GEzYrU-Cj9zt>g?GShnRI3Rk1~i*IPPwOFFkWvhGV3i0Yu5N#b&bs#1pezmtl4)W_{0eE$+7l z)Bd65X>?aP0(KB`R!B|wK}YJVP@IZ=d`n@I+t|I;5bO4dm+gkj zkqS&M=`_J)*1OqhKau3vjiiNA>xmXBEj*e~ zBFK^+HW#jjz!=EkWMM&0{MnsyN*6cSYA8Mj+x(8xbSq-j;-Wel#ww_UxA~5x8_-}M zuJa*EaV5iBip!L2QIcefIwV_E9@(P4$QGH8)g$u#GS(qwqy8xR$hD|Hjy^IZ>R&-0 z*&){=0b~okqn(5et_3{bM9)C0q3xf3LD&D1W;gK6$iYE+8}E8xK=07I=xOvGy$|>Y zEvq8hcF;4L`V)gGe0vDWoeR22A0~iqsez0{&>c0TiJhibq_iSpP~18vdQ z=SDTv%Ef22{fAOipCrm-S4|$@(6^9BXHw5#mnqKT>6_1KslkxXd@m%a9d|u*zN)`Uq;4k>{nd3{+v4}Z7=d1lO4wI{8z=6|4JeWU6uGcHO^INA4a+O iTz^j6s(Aj{iSXAX-cC+{T~$2)Lq+&WiFf3OAO8=A^4~`Q diff --git a/bin/main/de/oaa/xxx/games/common/aufgaben/AufgabenGruppeDisplay.class b/bin/main/de/oaa/xxx/games/common/aufgaben/AufgabenGruppeDisplay.class index 0c10e7205a32d040365e628ff1442c73f4781e1c..2141bbc01f1ced153b76e5fe3ace177659f68d39 100644 GIT binary patch literal 2378 zcmbW1TTc@~6vxk$($ccfQZ6cpilP)yRuoYI(E^c>R3svO;BB@Y%iwml*-L}p$p=j& zCO-H9{7}YoW^08?+>I}L=5pqD_Wz&DkDuSZ13(G3(vV=VTob0lxp{JOV%B*>cxKgU zG#q8};9Z?tLYbv@W7`dyO|d1trp-U3A;}FxvHD5tz%L38D#1@OYPKfx~%5| zU)tuu!OqqygQUU|3<}|lUb*kPQq^(Ju!L7Va)q=4RcDY2JmC^%py|pM_eEHr0XsyF zC2gGQX*mk(w78PC%}XsVZEo3EAhjly^w%+?I9tK=O{XTZ&;ug|g5p5>*#|_~Y7=LUHzQQzqU7%9jnXqgv9FSiPi_ z<8xm+3X2!Yw$rej_vW@x!bKlys~KQ$&46A=F-T*9U2W>fZ}wSRDfOlSY3M`In7VPs zW172dK!)ZrICr28r_rJTS%T-Jw|Cxr^z)E1?i$b!Mp%9W_kzYu0|tndLRQ65H1xoL zK^iJZuhO+iH2uhc98nDKoJ+&SZj)#e^RI+|g?fAN z;`Kp-b`Dz!+7=yg3v@)&bwq1*L_2jv4|PPdFb*LJPceQA*fTLQjJ)_KGzZ#97j*F)Y+`(rwel6OZ znYeg*7drT?#y^Agf0{FK3iEOC^xSmt{Tlx~+MI>BczVS;_yLW75shDri>Jr2gCErR VQnWcsaq;x#cJMik-_RF-^B1lYI#B=s literal 2130 zcmbW1ZBG+H5XWarX=ynqmIoD3K@>|74xbPKH6W3YR3sw2;N4!k9*ft#<{ldSPQK7Y zV&V%wfFH^@vsY`W#Jl+BW_M@yH#`5Gy&pfneFuOIc%Fq6gXNkqUCzzZ(^J#tb>W*; zw_bOZ$-{Rxw}dh`T7zvbY&67{^cxQUkcBjZp%dQZro)wOzP3(8HDHjlb(Gqvp}V5} zVIUpz;9zHKjX_#r3I@fVsa3`_XcV^2scR5pW5=nIc90}W3$c_5EJ zEa{-Dr|Bw;T$f4)&v06rJ4D|Lwz44|a?8>A-70quxhHAf zT1*GW(r2(z`9DRd0$T*pDRuqD(%jz)OuPwIAnRgBHKi{x`-W0(zys+jOkS)wZryU< zo7+MO4~wp?<$%F819~CDAd3lhwSptR*_|3v=(GV@=)HMf0b*s4b?7Qux@W*3EgAkf8HP*UD$p$r zy%NE(TifFv))NR1i_hY|sJhYCmd@g6QvoA7i^5WHB`O7xIPR(-T{@zDM5cq|adCvl zWsu)@L$4}cO6rI43wwN#+83s=vL1Xe_*&=^aFim2wM8|xMg6ozm9#}=v_(147Lb6A zh~G;%Gtn}%z2&b^{H()9@SD+#c^Jj95e2{)T*euLD{vK)j<=#F(4Gft=q9&sbX7CXA^)j4LQ$B*_IQ&#nJUxsyKCAJM_?*VC#EUbV6i?5%jn8ZR6IlJHI1^`3PKu|$LmS_(@oVwoEF{I#Pp6F^(D?Ou T{8Cap{ma_;L5+W^AJns7+$9`f diff --git a/bin/main/de/oaa/xxx/games/common/entity/AufgabenGruppeEntity.class b/bin/main/de/oaa/xxx/games/common/entity/AufgabenGruppeEntity.class index 84301f8abeb7fc63347329028f52fd5221bcb813..f1d78b377975a903be9149578e0a1d00c6e885da 100644 GIT binary patch literal 9208 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 literal 8831 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 v=xUWF=kv*!D+3Jxxs#U}>`o9DVvhPig&Bafv% literal 3952 zcmcIn+jiST6g|qNZrY?IZQ78Q(xENXE;OQ0UgDCqOzN~QPMq3Fv-&u;$BGhJBSxcK z{s7+K4L$@Oc;Ey00=|aDnUN*Sw-9Tk5B8GJjQ8xb_n9-JzyJO7F90aOvkXiakZ&@R zQ)-@^oR}7EGv93RcALAVU>^5v$;GKz2wE1cGxwzkJdai5fecI;Fn>UgsOeDGGAs21 z){q&vWWYCESf=j@+qGH(VUM{uG@DdX^T4A??AIRc0va&evfbu)r@KBArKSP*vt|FY`?D?TV15nPS*`~7qs`vh zzFl`%!F9Q$(&nyjfLT6o!fyg5P7!VTh&ll>UiX=Usu5~2(h|H)desis*Q3Y#OfdDd z5@>nIw`4VZLZN!OZBr$>WTJ=U)6paoZvUVNni>IVUW!(j-(+&1H)CW>dal7yk*-@e z2E~7E!1bi1C4Vb$90RJ^(OjCmO>Gw$Sd601X!%HO6H}4vPZtiFzF01M9r^~;2V^-{ zLgVHB+k0Omy%ske+^BoD+*jMW;5KWFipIVHbdYnmnbf3e9{F=gRb^PT*b9aJgPJY{l3CTGa6w;bLfC$Pwx`Np{uOf)m>(F7Cc)wu>!-IQAhU zoe4SI?%`Ae7L{k)LEW(%%DKq0Hyt^3zrP@he!OVR^p+ftX~}3u#ua{1b;(fg4Lk)Z z5}Q4?*k|V`-yv0hnBs5gRr}*YRa2UF4mee?T!uxf1WgP*UyBaEPL1noPE@$VkD1V0 zMvdgcLJxzhI)c?cr5+5xF<-u=uI)IqMq6x1tNOiGEEm^zh($K4mCfO2v_XrCn00k>cj|&buh=F(LZH@s7sHTf5~l(a2hXa_ReG zVn5$gWtB*6u)_WsBePM7g&A~AQ=BS0A+Mf+gk@<`*6Ae@E?4%7Rn%IWNp#*}D7JSg zdGk=Fu5(x7Ezf|Xv6Aj27F(vR!If#}UaUM*DTlskFK}hs$1U75gcWy3QL3H#lC@t7 z9(aBaEt!T^B#F{A9jPld9*73pupQhCcYE)j-OKrkI-3pnIlO=;F8pVl(Pv%u)AgIg z^T?SKz9O;^-`X=6tvYA7Efs{bxRmEWmY) zOdGHO>V4)0EMmMTbQ5kNR0y~f4SlF*XJ9!Vx~+$1CKM2a!*}4Ln9ALLDj#bq%ZhqT zC4Rhz7>dN)q=r*JLr4Oj#E|#87>_i@QUYV43ztpi znAH;G&dTv|svJK*i{BSx@_T|7Mdfh2KiQQ5!IXJQ_#Piktbob50{TkoOFbV82o1tw Mc&fj@>dgN7KmN~+<^TWy diff --git a/bin/main/de/oaa/xxx/games/vanilla/controller/VanillaAboController.class b/bin/main/de/oaa/xxx/games/vanilla/controller/VanillaAboController.class index d908d9dc51c8011c8b835fbddec0203fb47b9464..8a3a2f47fc2d26d7d0a67cd0a0616746a090d969 100644 GIT binary patch delta 4660 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 bpOM>XBGSo|&7lJF3o7J(Z$l#)-ok$YO1eMs diff --git a/bin/main/de/oaa/xxx/user/UserController$LocationFilterRequest.class b/bin/main/de/oaa/xxx/user/UserController$LocationFilterRequest.class index 312c4c64c8cee1e51112f17b00b26deb505a1270..b4e9d51ee27c5583da7573d28241f7530879e3ba 100644 GIT binary patch delta 32 hcmbQvKb?QW6jnyQ$x~U4faD1<`5Q!T)?>?L1OT0~2-yGt delta 32 hcmbQvKb?QW6jnyw$x~U4faD1<`5Q!T)?>?L1OT0O2-N@p diff --git a/bin/main/de/oaa/xxx/user/UserController$NewMemberDto.class b/bin/main/de/oaa/xxx/user/UserController$NewMemberDto.class index 417cafd3dcd223ac9a719d3532c5dd154f078511..8f40b45ac0b89b5e751da7af177974c61b90a6d8 100644 GIT binary patch delta 76 zcmca3bVq1|E8FCIY&??#+0?;w3zXgtq*t+XO@6_q38I-98F(iLvWreOW)}pD`>|^> RexF>yZp8R~^J?~ui~#3184Lgb delta 72 zcmca3bVq1|D;wjN$!=^$K(Z1{u3dcvMAP%t`IeBmbIacKFyli>@PJlxBgOyUcjyTqkqo(ocBEMInQ~YbN+0R zbFI?#!CbB~JJP3_&xT~!(}{ieCRt`&LW)&3uk(?-Z~>(WM9~(R0>BNh8#Wk{*$U5P3`U{S7&-*nIaL| z3q`ntyAVX8T@K32+7K`5F@#|~)`xPbmj*acfD(z4NI3bO)z z`qn)cVVsX>EJFvW z>MeFCwGJuVskB{Ksdz1SV?6^XV}m;T0s`EFRyN`Yn{b@XR_peq6498euE>SJg@ zE??3T6I{;Ye8|tx%g=F!XEC67kYC_?eu?WGPyy#Sf#*4yU+LjrTV1HqX@GO1!I#AzdBTzW=56jKC|vVj(hRg4#Wd0-0!CXo#gNLLcB%#OMc@DN#t3 zXsniLD3us%(w=DH0@KszW39QdF1ER;FA#KNhtF5 Mpdtyi{7p9b8=>?Gz5oCK delta 1079 zcmZvbYfzMB6vzMn1IsS5Wvgpt$;%8nIcj53eoDO0^r6&pGe;7Wt!D z4jfEyq`6*MQc_crP+j$ISwc}!-gM)l%k5b4Keyuyug7Xc#Uz{UiTg7$>;%OJqHv`+ z-~`wTKLh~i7B8K#s$Xp>K+4T2anU;qylHXWt1RvO`tEEG$yjDUqdYEB3w`Ef$K zCOis0tHFN@=D}|O5mreb#8d=WL90ZnXGN{?YelH-i8ELcCgLzgR$g~bfSrj5VG^SC zjO9d3WisY+lG3N3ksdR2g`JjE3}u?(TG<=a#>=e z)Le;MqG(GMtxO+ysiKv`#R`n)GGuZ&vRR24EH{&C>p7)XrFAM@rC(8}($z?2y~@^L zw%T*~9u}|xrCf^&Hp0twXyNpqMO@soL}IAo|m`-ecXu$>|hYTfO8ze^Bl?x+Pv4aHSDANvX;GqC|*Shui<6>ggLy9`TQA+ z`3ox5u3;ZG@Hgz>4YSXyOZ_`+ys4w<*FoM=qT8B&2l2eC1GtA5c;ARw zfWG@f9natT9}MDo0Wu{}$31|VGQ><+7s+r30(IHLWH`p?GJ7N#MG}IA5^9#N4-qCA zYnrmT%IImz5e^!5U+Y-FUkIBB?Ba(};*V&tV3GtNTdbHNHWX;1La~`Y`26G_)YAktuelles Bild – neues wählen zum Ersetzen +
@@ -986,7 +993,7 @@ function renderAdminGruppen(gruppen) {
${esc(g.name)}
${g.von ? esc(g.von) + (counts ? ' · ' : '') : ''}${counts || 'Keine Einträge'}
-
Öffentlich
+
Öffentlich${g.vanillaAvailable ? 'Vanilla' : ''}
▶
@@ -1262,6 +1269,7 @@ function openGruppeModal(editId) { document.getElementById('gName').value = g.name || ''; document.getElementById('gVon').value = g.von || ''; document.getElementById('gDesc').value = g.beschreibung || ''; + document.getElementById('gVanilla').checked = g.vanillaAvailable || false; const imgWrap = document.getElementById('gCurrentImgWrap'); if (g.bild) { document.getElementById('gCurrentImg').src = 'data:image/png;base64,' + g.bild; imgWrap.style.display = 'flex'; } else imgWrap.style.display = 'none'; @@ -1270,6 +1278,7 @@ function openGruppeModal(editId) { document.getElementById('gName').value = ''; document.getElementById('gVon').value = ''; document.getElementById('gDesc').value = ''; + document.getElementById('gVanilla').checked = false; document.getElementById('gCurrentImgWrap').style.display = 'none'; } gruppeModal.classList.add('open'); @@ -1348,7 +1357,7 @@ gruppeModalSave.addEventListener('click', async () => { let bildBase64 = null; const fi = document.getElementById('gBild'); if (fi.files.length > 0) bildBase64 = await toBase64(fi.files[0]); - const payload = { name, von: document.getElementById('gVon').value.trim() || null, beschreibung: document.getElementById('gDesc').value.trim() || null, bild: bildBase64 }; + const payload = { name, von: document.getElementById('gVon').value.trim() || null, beschreibung: document.getElementById('gDesc').value.trim() || null, vanillaAvailable: document.getElementById('gVanilla').checked, bild: bildBase64 }; const isEdit = currentEditGruppeId != null; fetch(isEdit ? `/admin/aufgabengruppen/${currentEditGruppeId}` : '/admin/aufgabengruppen', { method: isEdit ? 'PUT' : 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(payload) diff --git a/bin/main/static/community/event-detail.html b/bin/main/static/community/event-detail.html index 4d8fa3b..63b13f4 100644 --- a/bin/main/static/community/event-detail.html +++ b/bin/main/static/community/event-detail.html @@ -195,6 +195,7 @@ function renderPage(evt) { const totalAttendees = (evt.attendees || []).length; const attending = evt.attendingMe; + const isPast = new Date(evt.startAt) < new Date(); document.getElementById('content').innerHTML = `
@@ -211,11 +212,13 @@ function renderPage(evt) {
` : ''}
- + ${isPast + ? `Veranstaltung bereits beendet` + : ``} ${totalAttendees} Teilnehmer*in(nen)
diff --git a/bin/main/static/community/location-detail.html b/bin/main/static/community/location-detail.html index 9e32f6d..ea8e21a 100644 --- a/bin/main/static/community/location-detail.html +++ b/bin/main/static/community/location-detail.html @@ -445,6 +445,9 @@ function renderPage() { ${isOwner ? `` : ''}

Wird geladen…

+ ` : ''; + const authorUrl = p.posterType === 'LOCATION' + ? `/community/location-detail.html?id=${p.locationId || p.authorId}` + : `/community/benutzer.html?userId=${p.authorId}`; + return `
-
${avHtml}
+
${avHtml}
-
${escHtml(p.authorName || p.locationName || '')}
+
${escHtml(p.authorName || p.locationName || '')}
${dateStr}${editedHtml}
${adminBtns} @@ -1401,11 +1420,15 @@ function openLpLb(postId) { + ' ' + new Date(p.createdAt).toLocaleTimeString('de-DE', { hour:'2-digit', minute:'2-digit' }); const editedHtml = p.editedAt ? ' (bearbeitet)' : ''; + const lbAuthorUrl = p.posterType === 'LOCATION' + ? `/community/location-detail.html?id=${p.locationId || p.authorId}` + : `/community/benutzer.html?userId=${p.authorId}`; + document.getElementById('lbPostBody').innerHTML = `
-
${avHtml}
+
${avHtml}
-
${escHtml(p.authorName || p.locationName || '')}
+
${escHtml(p.authorName || p.locationName || '')}
${dateStr}${editedHtml}
diff --git a/bin/main/static/community/location-events.html b/bin/main/static/community/location-events.html new file mode 100644 index 0000000..11dcc80 --- /dev/null +++ b/bin/main/static/community/location-events.html @@ -0,0 +1,164 @@ + + + + + + + Alle Events – xXx Sphere + + + + + + + +
+
+ + ‹ Zurück zur Location + +
Alle Events
+ +
+

Wird geladen…

+
+ + + +
+
+ + + + + diff --git a/bin/main/static/games/bdsm/aufgaben.html b/bin/main/static/games/bdsm/aufgaben.html index 51a768f..c37af00 100644 --- a/bin/main/static/games/bdsm/aufgaben.html +++ b/bin/main/static/games/bdsm/aufgaben.html @@ -95,6 +95,7 @@ } .gruppe-badge-private { background: rgba(233,69,96,0.15); color: var(--color-primary); } .gruppe-badge-public { background: rgba(46,204,113,0.15); color: var(--color-success); } + .gruppe-badge-vanilla { background: #e8f5e9; color: #2e7d32; border: 1px solid #a5d6a7; } .gruppe-toggle { font-size: 0.75rem; color: var(--color-muted); flex-shrink: 0; transition: transform 0.2s; } .gruppe-card.open .gruppe-toggle { transform: rotate(90deg); } @@ -367,6 +368,12 @@ Gruppe veröffentlichen (für alle sichtbar) +
@@ -715,6 +722,7 @@ if (g.privateGruppe) badges.push(`Privat`); else badges.push(`Öffentlich`); if (type === 'user' && g.subscriberCount > 0) badges.push(`♥ ${g.subscriberCount} Abo${g.subscriberCount !== 1 ? 's' : ''}`); + if (g.vanillaAvailable) badges.push(`Vanilla`); return `
@@ -1069,6 +1077,7 @@ pubCb.checked = !g.privateGruppe; pubCb.disabled = g.privateGruppe; // Veröffentlichen nur über den Veröffentlichen-Button document.getElementById('gPublicLabel').style.display = 'block'; + document.getElementById('gVanilla').checked = g.vanillaAvailable || false; const imgWrap = document.getElementById('gCurrentImgWrap'); if (g.bild) { document.getElementById('gCurrentImg').src = 'data:image/png;base64,' + g.bild; @@ -1086,6 +1095,7 @@ document.getElementById('gDesc').value = ''; document.getElementById('gPublic').checked = false; document.getElementById('gPublicLabel').style.display = 'none'; + document.getElementById('gVanilla').checked = false; document.getElementById('gCurrentImgWrap').style.display = 'none'; gruppeModal.classList.add('open'); document.getElementById('gName').focus(); @@ -1119,6 +1129,7 @@ name, beschreibung: document.getElementById('gDesc').value.trim() || null, privateGruppe: isEdit ? !document.getElementById('gPublic').checked : true, + vanillaAvailable: document.getElementById('gVanilla').checked, bild: bildBase64 }; diff --git a/bin/main/static/games/bdsm/neubdsm.html b/bin/main/static/games/bdsm/neubdsm.html index 1ebb504..79cd153 100644 --- a/bin/main/static/games/bdsm/neubdsm.html +++ b/bin/main/static/games/bdsm/neubdsm.html @@ -97,6 +97,7 @@ .item-img { width: 38px; height: 38px; object-fit: cover; border-radius: 6px; flex-shrink: 0; } .gruppe-item-name, .toy-item-name { font-size: 0.95rem; font-weight: 600; color: var(--color-text); } .gruppe-item-desc, .toy-item-desc { display: block; font-size: 0.8rem; color: var(--color-muted); margin-top: 0.15rem; } + .vanilla-badge { display: inline-block; font-size: 0.65rem; font-weight: 700; padding: 0.1rem 0.35rem; border-radius: 3px; background: #e8f5e9; color: #2e7d32; border: 1px solid #a5d6a7; margin-left: 0.35rem; vertical-align: middle; letter-spacing: 0.03em; } .empty-hint { color: var(--color-muted); font-size: 0.875rem; font-style: italic; padding: 0.5rem 0; } .aufgaben-section-label { font-size: 0.78rem; font-weight: 600; color: var(--color-muted); text-transform: uppercase; letter-spacing: 0.04em; margin: 1rem 0 0.5rem 0; } .aufgaben-section-label:first-child { margin-top: 0; } @@ -653,9 +654,10 @@ } ul.innerHTML = gruppen.map(g => { const checked = savedGruppen.has(g.gruppenId); + const vanillaBadge = g.vanillaAvailable ? 'Vanilla' : ''; return `
    • `; }).join(''); diff --git a/bin/main/static/userhome.html b/bin/main/static/userhome.html index cd0abb8..ee59c63 100644 --- a/bin/main/static/userhome.html +++ b/bin/main/static/userhome.html @@ -887,11 +887,14 @@
    ` : ''; const gruppeIdAttr = p.gruppeId ? ` data-gruppe-id="${p.gruppeId}"` : ''; + const authorUrl = p.posterType === 'LOCATION' + ? `/community/location-detail.html?id=${p.locationId || p.authorId}` + : `/community/benutzer.html?userId=${p.authorId}`; return `
    -
    ${avatarHtml}
    +
    ${avatarHtml}
    -
    ${esc(p.authorName)}${privacyLabel}
    +
    ${esc(p.authorName)}${privacyLabel}
    ${fmtDate(p.createdAt)}${editedLabel}${groupBadge}
    ${ownBtns} diff --git a/src/main/java/de/oaa/xxx/admin/AdminController.java b/src/main/java/de/oaa/xxx/admin/AdminController.java index f865425..bc5b9fd 100644 --- a/src/main/java/de/oaa/xxx/admin/AdminController.java +++ b/src/main/java/de/oaa/xxx/admin/AdminController.java @@ -203,8 +203,10 @@ public class AdminController { @GetMapping("/aufgabengruppen") public ResponseEntity> getAufgabengruppen(Principal principal) { requireAdmin(principal); - List list = aufgabenGruppeRepository - .findByUserIdIsNull(PageRequest.of(0, 1000)).getContent(); + List list = aufgabenGruppeRepository.findAll().stream() + .filter(g -> g.getUserId() == null) + .sorted(java.util.Comparator.comparing(AufgabenGruppeEntity::getName, String.CASE_INSENSITIVE_ORDER)) + .toList(); return ResponseEntity.ok(list.stream().map(AufgabenGruppeEntity::toAufgabenGruppe).toList()); } @@ -230,9 +232,11 @@ public class AdminController { entity.setName(gruppe.getName()); entity.setBeschreibung(gruppe.getBeschreibung()); entity.setVon(gruppe.getVon()); + entity.setVanillaAvailable(gruppe.isVanillaAvailable()); if (gruppe.getBild() != null) { entity.setBild(java.util.Base64.getDecoder().decode(gruppe.getBild())); } + aufgabenGruppeRepository.save(entity); return ResponseEntity.noContent().build(); } diff --git a/src/main/java/de/oaa/xxx/config/SecurityConfig.java b/src/main/java/de/oaa/xxx/config/SecurityConfig.java index 02984c7..3548536 100644 --- a/src/main/java/de/oaa/xxx/config/SecurityConfig.java +++ b/src/main/java/de/oaa/xxx/config/SecurityConfig.java @@ -28,6 +28,16 @@ public class SecurityConfig { http .csrf(AbstractHttpConfigurer::disable) .sessionManagement(sm -> sm.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) + .headers(headers -> headers + .frameOptions(frame -> frame.deny()) + .contentTypeOptions(ct -> {}) + .httpStrictTransportSecurity(hsts -> hsts.includeSubDomains(true).maxAgeInSeconds(31536000)) + .addHeaderWriter((request, response) -> { + response.setHeader("X-XSS-Protection", "1; mode=block"); + response.setHeader("Referrer-Policy", "strict-origin-when-cross-origin"); + response.setHeader("Permissions-Policy", "geolocation=(), microphone=(), camera=()"); + }) + ) .exceptionHandling(ex -> ex .authenticationEntryPoint((request, response, authException) -> response.sendRedirect("/login.html"))) @@ -77,6 +87,7 @@ public class SecurityConfig { .requestMatchers("/dating/matches.html").authenticated() .requestMatchers("/community/locations.html").authenticated() .requestMatchers("/community/location-detail.html").authenticated() + .requestMatchers("/community/location-events.html").authenticated() .requestMatchers("/community/events.html").authenticated() .requestMatchers("/community/event-detail.html").authenticated() .requestMatchers("/gruppen/**").authenticated() diff --git a/src/main/java/de/oaa/xxx/feedback/FeedbackController.java b/src/main/java/de/oaa/xxx/feedback/FeedbackController.java index 59c7887..e599e83 100644 --- a/src/main/java/de/oaa/xxx/feedback/FeedbackController.java +++ b/src/main/java/de/oaa/xxx/feedback/FeedbackController.java @@ -4,12 +4,17 @@ import de.oaa.xxx.mail.Email; import de.oaa.xxx.mail.MailService; import de.oaa.xxx.support.SupportUserService; import de.oaa.xxx.user.UserRepository; +import jakarta.servlet.http.HttpServletRequest; +import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import java.security.Principal; +import java.time.Instant; import java.time.LocalDateTime; +import java.util.Map; import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; @RestController @RequestMapping("/api/feedback") @@ -20,6 +25,10 @@ public class FeedbackController { private final UserRepository userRepository; private final SupportUserService supportUserService; + /** Rate-Limiting: Key → letzter Aufruf (Epoch-Sekunden) */ + private final Map lastCallAt = new ConcurrentHashMap<>(); + private static final long RATE_LIMIT_SECONDS = 60; + public FeedbackController(MailService mailService, FeedbackRepository feedbackRepository, UserRepository userRepository, @@ -33,11 +42,29 @@ public class FeedbackController { record FeedbackRequest(String name, String seite, String grund, String text) {} @PostMapping - public ResponseEntity send(@RequestBody FeedbackRequest req, Principal principal) { + public ResponseEntity send(@RequestBody FeedbackRequest req, + Principal principal, + HttpServletRequest httpRequest) { + if (req.text() == null || req.text().isBlank() || req.text().length() < 10 || req.text().length() > 1000) { return ResponseEntity.badRequest().build(); } + // E-Mail-Header-Injection verhindern: Felder dürfen keine Zeilenumbrüche enthalten + if (containsLineBreak(req.name()) || containsLineBreak(req.seite()) || containsLineBreak(req.grund())) { + return ResponseEntity.badRequest().build(); + } + + // Rate-Limiting: 1 Aufruf pro Minute pro eingeloggtem User oder IP + String rateLimitKey = principal != null ? "user:" + principal.getName() + : "ip:" + httpRequest.getRemoteAddr(); + long now = Instant.now().getEpochSecond(); + Long last = lastCallAt.get(rateLimitKey); + if (last != null && (now - last) < RATE_LIMIT_SECONDS) { + return ResponseEntity.status(HttpStatus.TOO_MANY_REQUESTS).build(); + } + lastCallAt.put(rateLimitKey, now); + // Eingeloggten User ermitteln (optional) UUID userId = null; if (principal != null) { @@ -86,4 +113,8 @@ public class FeedbackController { if (s == null) return ""; return s.replace("&", "&").replace("<", "<").replace(">", ">"); } + + private boolean containsLineBreak(String s) { + return s != null && (s.contains("\n") || s.contains("\r")); + } } diff --git a/src/main/java/de/oaa/xxx/games/bdsm/controller/AboController.java b/src/main/java/de/oaa/xxx/games/bdsm/controller/AboController.java index 6c57147..90434da 100644 --- a/src/main/java/de/oaa/xxx/games/bdsm/controller/AboController.java +++ b/src/main/java/de/oaa/xxx/games/bdsm/controller/AboController.java @@ -79,7 +79,8 @@ public class AboController { String namePattern = name != null && !name.isBlank() ? "%" + name.trim() + "%" : null; List dtos = gruppeRepository - .findPublicFromOthers(user.getUserId(), namePattern).stream() + .listAllWithUserAndSearch(user.getUserId(), namePattern, org.springframework.data.domain.PageRequest.of(0, 500)).stream() + .filter(g -> !g.isPrivateGruppe() && g.getUserId() != null && !g.getUserId().equals(user.getUserId())) .map(g -> enrich(g, user.getUserId(), aboRepository.existsByUserIdAndAufgabenGruppe(user.getUserId(), g))) .sorted(Comparator.comparingLong(AufgabenGruppe::getSubscriberCount).reversed() .thenComparing(AufgabenGruppe::getName, String.CASE_INSENSITIVE_ORDER)) diff --git a/src/main/java/de/oaa/xxx/games/bdsm/controller/AufgabenGruppeController.java b/src/main/java/de/oaa/xxx/games/bdsm/controller/AufgabenGruppeController.java index 0866940..42f44da 100644 --- a/src/main/java/de/oaa/xxx/games/bdsm/controller/AufgabenGruppeController.java +++ b/src/main/java/de/oaa/xxx/games/bdsm/controller/AufgabenGruppeController.java @@ -1,257 +1,259 @@ -package de.oaa.xxx.games.bdsm.controller; - -import java.security.Principal; -import java.util.Base64; -import java.util.UUID; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageRequest; -import org.springframework.data.domain.Sort; -import org.springframework.http.ResponseEntity; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.servlet.support.ServletUriComponentsBuilder; - -import de.oaa.xxx.games.common.aufgaben.AufgabenGruppe; -import de.oaa.xxx.games.common.aufgaben.AufgabenGruppeList; -import de.oaa.xxx.games.common.aufgaben.AufgabenGruppePage; -import de.oaa.xxx.games.common.aufgaben.AufgabenGruppeService; -import de.oaa.xxx.games.common.entity.AufgabenGruppeEntity; -import de.oaa.xxx.games.common.repository.AufgabeRepository; -import de.oaa.xxx.games.common.repository.AufgabenGruppeRepository; -import de.oaa.xxx.games.common.repository.FinisherRepository; -import de.oaa.xxx.games.common.repository.GruppenAboRepository; -import de.oaa.xxx.games.common.repository.SperreRepository; -import de.oaa.xxx.games.common.repository.StrafeRepository; -import de.oaa.xxx.subscription.SubscriptionLimitService; -import de.oaa.xxx.user.UserEntity; -import de.oaa.xxx.user.UserService; - -@RestController -@RequestMapping("/gruppe") -@Transactional -public class AufgabenGruppeController { - - private static final Logger LOGGER = LoggerFactory.getLogger(AufgabenGruppeController.class); - private static final int DEFAULT_PAGE_SIZE = 5; - - private final AufgabenGruppeRepository gruppeRepository; - private final AufgabeRepository aufgabeRepository; - private final StrafeRepository strafeRepository; - private final SperreRepository sperreRepository; - private final FinisherRepository finisherRepository; - private final GruppenAboRepository aboRepository; - private final AufgabenGruppeService aufgabenGruppeService; - private final SubscriptionLimitService limitService; - private final UserService userService; - - public AufgabenGruppeController(AufgabenGruppeRepository gruppeRepository, - AufgabeRepository aufgabeRepository, - StrafeRepository strafeRepository, - SperreRepository sperreRepository, - FinisherRepository finisherRepository, - GruppenAboRepository aboRepository, - AufgabenGruppeService aufgabenGruppeService, - SubscriptionLimitService limitService, - UserService userService) { - this.gruppeRepository = gruppeRepository; - this.aufgabeRepository = aufgabeRepository; - this.strafeRepository = strafeRepository; - this.sperreRepository = sperreRepository; - this.finisherRepository = finisherRepository; - this.aboRepository = aboRepository; - this.aufgabenGruppeService = aufgabenGruppeService; - this.limitService = limitService; - this.userService = userService; - } - - // ── Paginierte Listen ── - - @GetMapping("/list/user") - public ResponseEntity listUser( - @RequestParam(name = "page", defaultValue = "0") int page, - @RequestParam(name = "size", defaultValue = "" + DEFAULT_PAGE_SIZE) int size, - Principal principal) { - UserEntity user = resolveUser(principal); - if (user == null) return ResponseEntity.status(401).build(); - Page result = gruppeRepository.findByUserId( - user.getUserId(), PageRequest.of(page, size, Sort.by("name"))); - return ResponseEntity.ok(toGruppePage(result, true)); - } - - @GetMapping("/list/system") - public ResponseEntity listSystem( - @RequestParam(name = "page", defaultValue = "0") int page, - @RequestParam(name = "size", defaultValue = "" + DEFAULT_PAGE_SIZE) int size) { - Page result = gruppeRepository.findByUserIdIsNull( - PageRequest.of(page, size, Sort.by("name"))); - return ResponseEntity.ok(toGruppePage(result)); - } - - // ── Bestehende Endpunkte ── - - @GetMapping("/all") - public ResponseEntity getAll(@RequestParam(required = false) String search, Principal principal) { - UUID userId = userService.requireUser(principal).getUserId(); - String searchPattern = search != null ? "%" + search + "%" : null; - AufgabenGruppeList list = new AufgabenGruppeList(); - list.setGruppen(gruppeRepository.listWithUserAndSearch(userId, searchPattern, PageRequest.of(0, 500)) - .stream().map(AufgabenGruppeEntity::toAufgabenGruppeDisplay).toList()); - return ResponseEntity.ok(list); - } - - @GetMapping("/own") - public ResponseEntity getOwn(@RequestParam("userId") UUID userId) { - AufgabenGruppeList list = new AufgabenGruppeList(); - list.setGruppen(gruppeRepository.findByUserId(userId) - .stream().map(AufgabenGruppeEntity::toAufgabenGruppeDisplay).toList()); - return ResponseEntity.ok(list); - } - - @GetMapping("/{gruppeId}") - public ResponseEntity get(@PathVariable("gruppeId") UUID gruppeId) { - return gruppeRepository.findById(gruppeId) - .map(entity -> ResponseEntity.ok(entity.toAufgabenGruppe())) - .orElse(ResponseEntity.noContent().build()); - } - - // ── Anlegen ── - - @PostMapping - public ResponseEntity create(@RequestBody AufgabenGruppe gruppe, Principal principal) { - if (gruppe.getName() == null || gruppe.getName().isBlank()) { - return ResponseEntity.badRequest().build(); - } - UserEntity user = resolveUser(principal); - if (user == null) return ResponseEntity.status(401).build(); - - if (gruppeRepository.countByUserId(user.getUserId()) >= limitService.maxTaskGroups(user.getUserId())) { - return ResponseEntity.status(409).build(); - } - - AufgabenGruppeEntity entity = AufgabenGruppeEntity.create(gruppe); - entity.setUserId(user.getUserId()); - entity.setPrivateGruppe(true); - gruppeRepository.save(entity); - LOGGER.debug("User {} hat AufgabenGruppe '{}' ({}) erstellt", user.getUserId(), entity.getName(), entity.getGruppenId()); - return ResponseEntity.created( - ServletUriComponentsBuilder.fromCurrentRequest().path("/{id}").buildAndExpand(entity.getGruppenId()).toUri() - ).build(); - } - - // ── Bearbeiten ── - - @PutMapping("/{gruppeId}") - public ResponseEntity update(@PathVariable("gruppeId") UUID gruppeId, - @RequestBody AufgabenGruppe gruppe, - Principal principal) { - if (gruppe.getName() == null || gruppe.getName().isBlank()) { - return ResponseEntity.badRequest().build(); - } - UserEntity user = resolveUser(principal); - if (user == null) return ResponseEntity.status(401).build(); - - AufgabenGruppeEntity entity = gruppeRepository.findById(gruppeId).orElse(null); - if (entity == null) return ResponseEntity.notFound().build(); - if (!user.getUserId().equals(entity.getUserId())) return ResponseEntity.status(403).build(); - - entity.setName(gruppe.getName().trim()); - entity.setBeschreibung(gruppe.getBeschreibung()); - entity.setVon(gruppe.getVon()); - entity.setPrivateGruppe(gruppe.isPrivateGruppe()); - if (gruppe.getBild() != null) { - entity.setBild(Base64.getDecoder().decode(gruppe.getBild())); - } - gruppeRepository.save(entity); - LOGGER.debug("User {} hat AufgabenGruppe {} aktualisiert", user.getUserId(), gruppeId); - return ResponseEntity.ok().build(); - } - - // ── Kopieren (Systemgruppe → eigene) ── - - @PostMapping("/copy/{gruppeId}") - public ResponseEntity copy(@PathVariable("gruppeId") UUID gruppeId, Principal principal) { - UserEntity user = resolveUser(principal); - if (user == null) return ResponseEntity.status(401).build(); - try { - aufgabenGruppeService.copyGruppe(gruppeId, user.getUserId()); - return ResponseEntity.status(201).build(); - } catch (IllegalStateException e) { - return ResponseEntity.status(409).build(); - } catch (IllegalArgumentException e) { - String msg = e.getMessage(); - if (msg != null && msg.contains("nicht gefunden")) return ResponseEntity.notFound().build(); - return ResponseEntity.status(403).build(); - } - } - - // ── Löschen ── - - @DeleteMapping("/{gruppeId}") - public ResponseEntity deleteById(@PathVariable("gruppeId") UUID gruppeId, Principal principal) { - UserEntity user = resolveUser(principal); - if (user == null) return ResponseEntity.status(401).build(); - - AufgabenGruppeEntity entity = gruppeRepository.findById(gruppeId).orElse(null); - if (entity == null) return ResponseEntity.noContent().build(); - if (!user.getUserId().equals(entity.getUserId())) return ResponseEntity.status(403).build(); - - try { - aboRepository.deleteByAufgabenGruppe(entity); - aufgabeRepository.deleteAll(entity.getAufgaben()); - strafeRepository.deleteAll(entity.getStrafen()); - sperreRepository.deleteAll(entity.getSperren()); - finisherRepository.deleteAll(entity.getFinisher()); - gruppeRepository.delete(entity); - return ResponseEntity.accepted().build(); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - return ResponseEntity.internalServerError().build(); - } - } - - @DeleteMapping - public ResponseEntity delete(@RequestBody AufgabenGruppe gruppe) { - try { - gruppeRepository.findById(gruppe.getGruppenId()).ifPresent(gruppeRepository::delete); - return ResponseEntity.accepted().build(); - } catch (Exception exception) { - LOGGER.error(exception.getMessage(), exception); - return ResponseEntity.internalServerError().build(); - } - } - - // ── Hilfsmethoden ── - - private UserEntity resolveUser(Principal principal) { - if (principal == null) return null; - return userService.requireUser(principal); - } - - private AufgabenGruppePage toGruppePage(Page page) { - return toGruppePage(page, false); - } - - private AufgabenGruppePage toGruppePage(Page page, boolean withSubscriberCount) { - AufgabenGruppePage result = new AufgabenGruppePage(); - result.setContent(page.getContent().stream().map(entity -> { - AufgabenGruppe g = entity.toAufgabenGruppe(); - if (withSubscriberCount) g.setSubscriberCount(aboRepository.countByAufgabenGruppe(entity)); - return g; - }).toList()); - result.setCurrentPage(page.getNumber()); - result.setTotalPages(page.getTotalPages()); - result.setTotalElements(page.getTotalElements()); - return result; - } -} +package de.oaa.xxx.games.bdsm.controller; + +import de.oaa.xxx.games.common.aufgaben.AufgabenGruppe; +import de.oaa.xxx.games.common.aufgaben.AufgabenGruppeList; +import de.oaa.xxx.games.common.aufgaben.AufgabenGruppePage; +import de.oaa.xxx.games.common.aufgaben.AufgabenGruppeService; +import de.oaa.xxx.games.common.entity.AufgabenGruppeEntity; +import de.oaa.xxx.games.common.repository.AufgabeRepository; +import de.oaa.xxx.games.common.repository.AufgabenGruppeRepository; +import de.oaa.xxx.games.common.repository.FinisherRepository; +import de.oaa.xxx.games.common.repository.GruppenAboRepository; +import de.oaa.xxx.games.common.repository.SperreRepository; +import de.oaa.xxx.games.common.repository.StrafeRepository; +import de.oaa.xxx.subscription.SubscriptionLimitService; +import de.oaa.xxx.user.UserEntity; +import de.oaa.xxx.user.UserService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Sort; +import org.springframework.http.ResponseEntity; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.servlet.support.ServletUriComponentsBuilder; + +import java.security.Principal; +import java.util.Base64; +import java.util.UUID; + +@RestController +@RequestMapping("/gruppe") +@Transactional +public class AufgabenGruppeController { + + private static final Logger LOGGER = LoggerFactory.getLogger(AufgabenGruppeController.class); + private static final int DEFAULT_PAGE_SIZE = 5; + + private final AufgabenGruppeRepository gruppeRepository; + private final AufgabeRepository aufgabeRepository; + private final StrafeRepository strafeRepository; + private final SperreRepository sperreRepository; + private final FinisherRepository finisherRepository; + private final GruppenAboRepository aboRepository; + private final AufgabenGruppeService aufgabenGruppeService; + private final SubscriptionLimitService limitService; + private final UserService userService; + + public AufgabenGruppeController(AufgabenGruppeRepository gruppeRepository, + AufgabeRepository aufgabeRepository, + StrafeRepository strafeRepository, + SperreRepository sperreRepository, + FinisherRepository finisherRepository, + GruppenAboRepository aboRepository, + AufgabenGruppeService aufgabenGruppeService, + SubscriptionLimitService limitService, + UserService userService) { + this.gruppeRepository = gruppeRepository; + this.aufgabeRepository = aufgabeRepository; + this.strafeRepository = strafeRepository; + this.sperreRepository = sperreRepository; + this.finisherRepository = finisherRepository; + this.aboRepository = aboRepository; + this.aufgabenGruppeService = aufgabenGruppeService; + this.limitService = limitService; + this.userService = userService; + } + + // ── Paginierte Listen (alle Gruppen – BDSM-Verwaltung und Spielstart) ── + + @GetMapping("/list/user") + public ResponseEntity listUser( + @RequestParam(name = "page", defaultValue = "0") int page, + @RequestParam(name = "size", defaultValue = "" + DEFAULT_PAGE_SIZE) int size, + Principal principal) { + UserEntity user = resolveUser(principal); + if (user == null) return ResponseEntity.status(401).build(); + Page result = gruppeRepository.findByUserId( + user.getUserId(), PageRequest.of(page, size, Sort.by("name"))); + return ResponseEntity.ok(toGruppePage(result, true)); + } + + @GetMapping("/list/system") + public ResponseEntity listSystem( + @RequestParam(name = "page", defaultValue = "0") int page, + @RequestParam(name = "size", defaultValue = "" + DEFAULT_PAGE_SIZE) int size) { + Page result = gruppeRepository.findByUserIdIsNull( + PageRequest.of(page, size, Sort.by("name"))); + return ResponseEntity.ok(toGruppePage(result)); + } + + // ── Bestehende Endpunkte ── + + @GetMapping("/all") + public ResponseEntity getAll(@RequestParam(required = false) String search, Principal principal) { + UUID userId = userService.requireUser(principal).getUserId(); + String searchPattern = search != null ? "%" + search + "%" : null; + AufgabenGruppeList list = new AufgabenGruppeList(); + list.setGruppen(gruppeRepository.listAllWithUserAndSearch(userId, searchPattern, PageRequest.of(0, 500)) + .stream().map(AufgabenGruppeEntity::toAufgabenGruppeDisplay).toList()); + return ResponseEntity.ok(list); + } + + @GetMapping("/own") + public ResponseEntity getOwn(@RequestParam("userId") UUID userId) { + AufgabenGruppeList list = new AufgabenGruppeList(); + list.setGruppen(gruppeRepository.findByUserId(userId) + .stream().map(AufgabenGruppeEntity::toAufgabenGruppeDisplay).toList()); + return ResponseEntity.ok(list); + } + + /** Gibt eine einzelne Gruppe zurück – typunabhängig, da BDSM-Spielstart auch vanillaAvailable-Gruppen laden muss. */ + @GetMapping("/{gruppeId}") + public ResponseEntity get(@PathVariable("gruppeId") UUID gruppeId) { + return gruppeRepository.findById(gruppeId) + .map(entity -> ResponseEntity.ok(entity.toAufgabenGruppe())) + .orElse(ResponseEntity.noContent().build()); + } + + // ── Anlegen ── + + @PostMapping + public ResponseEntity create(@RequestBody AufgabenGruppe gruppe, Principal principal) { + if (gruppe.getName() == null || gruppe.getName().isBlank()) { + return ResponseEntity.badRequest().build(); + } + UserEntity user = resolveUser(principal); + if (user == null) return ResponseEntity.status(401).build(); + + if (gruppeRepository.countByUserId(user.getUserId()) >= limitService.maxTaskGroups(user.getUserId())) { + return ResponseEntity.status(409).build(); + } + + AufgabenGruppeEntity entity = AufgabenGruppeEntity.create(gruppe); + entity.setUserId(user.getUserId()); + entity.setPrivateGruppe(true); + // vanillaAvailable kommt aus dem Request-Body (Checkbox im Frontend) + gruppeRepository.save(entity); + LOGGER.debug("User {} hat BDSM-AufgabenGruppe '{}' ({}) erstellt", user.getUserId(), entity.getName(), entity.getGruppenId()); + return ResponseEntity.created( + ServletUriComponentsBuilder.fromCurrentRequest().path("/{id}").buildAndExpand(entity.getGruppenId()).toUri() + ).build(); + } + + // ── Bearbeiten ── + + @PutMapping("/{gruppeId}") + public ResponseEntity update(@PathVariable("gruppeId") UUID gruppeId, + @RequestBody AufgabenGruppe gruppe, + Principal principal) { + if (gruppe.getName() == null || gruppe.getName().isBlank()) { + return ResponseEntity.badRequest().build(); + } + UserEntity user = resolveUser(principal); + if (user == null) return ResponseEntity.status(401).build(); + + AufgabenGruppeEntity entity = gruppeRepository.findById(gruppeId).orElse(null); + if (entity == null) return ResponseEntity.notFound().build(); + if (!user.getUserId().equals(entity.getUserId())) return ResponseEntity.status(403).build(); + + entity.setName(gruppe.getName().trim()); + entity.setBeschreibung(gruppe.getBeschreibung()); + entity.setVon(gruppe.getVon()); + entity.setPrivateGruppe(gruppe.isPrivateGruppe()); + entity.setVanillaAvailable(gruppe.isVanillaAvailable()); + if (gruppe.getBild() != null) { + entity.setBild(Base64.getDecoder().decode(gruppe.getBild())); + } + gruppeRepository.save(entity); + LOGGER.debug("User {} hat BDSM-AufgabenGruppe {} aktualisiert", user.getUserId(), gruppeId); + return ResponseEntity.ok().build(); + } + + // ── Kopieren (Systemgruppe → eigene) ── + + @PostMapping("/copy/{gruppeId}") + public ResponseEntity copy(@PathVariable("gruppeId") UUID gruppeId, Principal principal) { + UserEntity user = resolveUser(principal); + if (user == null) return ResponseEntity.status(401).build(); + try { + aufgabenGruppeService.copyGruppe(gruppeId, user.getUserId()); + return ResponseEntity.status(201).build(); + } catch (IllegalStateException e) { + return ResponseEntity.status(409).build(); + } catch (IllegalArgumentException e) { + String msg = e.getMessage(); + if (msg != null && msg.contains("nicht gefunden")) return ResponseEntity.notFound().build(); + return ResponseEntity.status(403).build(); + } + } + + // ── Löschen ── + + @DeleteMapping("/{gruppeId}") + public ResponseEntity deleteById(@PathVariable("gruppeId") UUID gruppeId, Principal principal) { + UserEntity user = resolveUser(principal); + if (user == null) return ResponseEntity.status(401).build(); + + AufgabenGruppeEntity entity = gruppeRepository.findById(gruppeId).orElse(null); + if (entity == null) return ResponseEntity.noContent().build(); + if (!user.getUserId().equals(entity.getUserId())) return ResponseEntity.status(403).build(); + + try { + aboRepository.deleteByAufgabenGruppe(entity); + aufgabeRepository.deleteAll(entity.getAufgaben()); + strafeRepository.deleteAll(entity.getStrafen()); + sperreRepository.deleteAll(entity.getSperren()); + finisherRepository.deleteAll(entity.getFinisher()); + gruppeRepository.delete(entity); + return ResponseEntity.accepted().build(); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + return ResponseEntity.internalServerError().build(); + } + } + + @DeleteMapping + public ResponseEntity delete(@RequestBody AufgabenGruppe gruppe) { + try { + gruppeRepository.findById(gruppe.getGruppenId()).ifPresent(gruppeRepository::delete); + return ResponseEntity.accepted().build(); + } catch (Exception exception) { + LOGGER.error(exception.getMessage(), exception); + return ResponseEntity.internalServerError().build(); + } + } + + // ── Hilfsmethoden ── + + private UserEntity resolveUser(Principal principal) { + if (principal == null) return null; + return userService.requireUser(principal); + } + + private AufgabenGruppePage toGruppePage(Page page) { + return toGruppePage(page, false); + } + + private AufgabenGruppePage toGruppePage(Page page, boolean withSubscriberCount) { + AufgabenGruppePage result = new AufgabenGruppePage(); + result.setContent(page.getContent().stream().map(entity -> { + AufgabenGruppe g = entity.toAufgabenGruppe(); + if (withSubscriberCount) g.setSubscriberCount(aboRepository.countByAufgabenGruppe(entity)); + return g; + }).toList()); + result.setCurrentPage(page.getNumber()); + result.setTotalPages(page.getTotalPages()); + result.setTotalElements(page.getTotalElements()); + return result; + } +} diff --git a/src/main/java/de/oaa/xxx/games/common/aufgaben/AufgabenGruppe.java b/src/main/java/de/oaa/xxx/games/common/aufgaben/AufgabenGruppe.java index 3062971..bafb5dd 100644 --- a/src/main/java/de/oaa/xxx/games/common/aufgaben/AufgabenGruppe.java +++ b/src/main/java/de/oaa/xxx/games/common/aufgaben/AufgabenGruppe.java @@ -23,4 +23,5 @@ public class AufgabenGruppe { private String bild; private long subscriberCount; private boolean subscribed; + private boolean vanillaAvailable; } diff --git a/src/main/java/de/oaa/xxx/games/common/aufgaben/AufgabenGruppeDisplay.java b/src/main/java/de/oaa/xxx/games/common/aufgaben/AufgabenGruppeDisplay.java index 2512042..1fa2cc7 100644 --- a/src/main/java/de/oaa/xxx/games/common/aufgaben/AufgabenGruppeDisplay.java +++ b/src/main/java/de/oaa/xxx/games/common/aufgaben/AufgabenGruppeDisplay.java @@ -16,4 +16,5 @@ public class AufgabenGruppeDisplay { private boolean privateGruppe; private String bild; private String von; + private boolean vanillaAvailable; } diff --git a/src/main/java/de/oaa/xxx/games/common/entity/AufgabenGruppeEntity.java b/src/main/java/de/oaa/xxx/games/common/entity/AufgabenGruppeEntity.java index 09efbae..5a23ea7 100644 --- a/src/main/java/de/oaa/xxx/games/common/entity/AufgabenGruppeEntity.java +++ b/src/main/java/de/oaa/xxx/games/common/entity/AufgabenGruppeEntity.java @@ -38,6 +38,8 @@ public class AufgabenGruppeEntity { private byte[] bild; @Column private String von; + @Column(columnDefinition = "BOOLEAN DEFAULT FALSE NOT NULL") + private boolean vanillaAvailable = false; @OneToMany(mappedBy = "aufgabenGruppe") private List aufgaben; @OneToMany(mappedBy = "aufgabenGruppe") @@ -62,6 +64,7 @@ public class AufgabenGruppeEntity { gruppe.setPrivateGruppe(privateGruppe); gruppe.setBild(bild != null ? Base64.getEncoder().encodeToString(bild) : null); gruppe.setVon(von); + gruppe.setVanillaAvailable(vanillaAvailable); gruppe.setAufgaben(aufgaben.stream().map(AufgabeEntity::toAufgabe).toList()); gruppe.setStrafen(strafen.stream().map(StrafeEntity::toStrafe).toList()); gruppe.setSperren(sperren.stream().map(SperreEntity::toSperre).toList()); @@ -78,6 +81,7 @@ public class AufgabenGruppeEntity { entity.setPrivateGruppe(gruppe.isPrivateGruppe()); entity.setBild(gruppe.getBild() != null ? Base64.getDecoder().decode(gruppe.getBild()) : null); entity.setVon(gruppe.getVon()); + entity.setVanillaAvailable(gruppe.isVanillaAvailable()); return entity; } @@ -90,6 +94,7 @@ public class AufgabenGruppeEntity { display.setPrivateGruppe(privateGruppe); display.setBild(bild != null ? Base64.getEncoder().encodeToString(bild) : null); display.setVon(von); + display.setVanillaAvailable(vanillaAvailable); return display; } } diff --git a/src/main/java/de/oaa/xxx/games/common/repository/AufgabenGruppeRepository.java b/src/main/java/de/oaa/xxx/games/common/repository/AufgabenGruppeRepository.java index db813fe..b8048f8 100644 --- a/src/main/java/de/oaa/xxx/games/common/repository/AufgabenGruppeRepository.java +++ b/src/main/java/de/oaa/xxx/games/common/repository/AufgabenGruppeRepository.java @@ -1,47 +1,46 @@ package de.oaa.xxx.games.common.repository; +import de.oaa.xxx.games.common.entity.AufgabenGruppeEntity; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; - import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import de.oaa.xxx.games.common.entity.AufgabenGruppeEntity; - import java.util.List; import java.util.UUID; public interface AufgabenGruppeRepository extends JpaRepository { - @Query("select age from AufgabenGruppeEntity age where age.userId = :userId") + // ── Account-Löschung (UserService) ──────────────────────────────────────── + + @Query("select g from AufgabenGruppeEntity g where g.userId = :userId") List findByUserId(@Param("userId") UUID userId); long countByUserId(UUID userId); - Page findByUserIdIsNull(Pageable pageable); + // ── BDSM-Verwaltung: alle Gruppen paginiert ─────────────────────────────── Page findByUserId(UUID userId, Pageable pageable); - @Query("select age from AufgabenGruppeEntity age where (age.privateGruppe = false or age.userId = :userId) and (:search is null or age.name like :search)") - List listWithUserAndSearch(@Param("userId") UUID userId, @Param("search") String search, PageRequest pageable); + Page findByUserIdIsNull(Pageable pageable); - @Query("select age from AufgabenGruppeEntity age where age.privateGruppe = false and (:search is null or age.name like :search)") - List listPublicWithSearch(@Param("search") String search, PageRequest pageable); + // ── Vanilla-Verwaltung: nur vanillaAvailable=true, mit Inhalt ───────────── - @Query("select age from AufgabenGruppeEntity age where age.privateGruppe = false and age.userId is not null and age.userId <> :userId and (:name is null or lower(age.name) like lower(:name))") - List findPublicFromOthers(@Param("userId") UUID userId, @Param("name") String name); + @Query("SELECT g FROM AufgabenGruppeEntity g WHERE g.userId = :userId AND g.vanillaAvailable = true AND (g.aufgaben IS NOT EMPTY OR g.finisher IS NOT EMPTY)") + Page findByUserIdAndVanillaAvailableTrueWithContent(@Param("userId") UUID userId, Pageable pageable); - @Query("SELECT g FROM AufgabenGruppeEntity g WHERE (g.privateGruppe = false OR g.userId = :userId) AND g.strafen IS EMPTY AND g.sperren IS EMPTY AND (:search IS NULL OR g.name LIKE :search)") - List listVanillaSafeWithUserAndSearch(@Param("userId") UUID userId, @Param("search") String search, PageRequest pageable); + @Query("SELECT g FROM AufgabenGruppeEntity g WHERE g.userId IS NULL AND g.vanillaAvailable = true AND (g.aufgaben IS NOT EMPTY OR g.finisher IS NOT EMPTY)") + Page findSystemGroupsByVanillaAvailableTrueWithContent(Pageable pageable); - @Query("SELECT g FROM AufgabenGruppeEntity g WHERE g.privateGruppe = false AND g.userId IS NOT NULL AND g.userId <> :userId AND g.strafen IS EMPTY AND g.sperren IS EMPTY AND (:name IS NULL OR LOWER(g.name) LIKE LOWER(:name))") - List findVanillaSafePublicFromOthers(@Param("userId") UUID userId, @Param("name") String name); + // ── Spielstart-Auswahl ──────────────────────────────────────────────────── - @Query("SELECT g FROM AufgabenGruppeEntity g WHERE g.userId = :userId AND (g.aufgaben IS NOT EMPTY OR g.finisher IS NOT EMPTY)") - Page findByUserIdWithContent(@Param("userId") UUID userId, Pageable pageable); + /** Nur vanillaAvailable-Gruppen – für Vanilla-Spielstart und Vanilla-Suche. */ + @Query("select g from AufgabenGruppeEntity g where g.vanillaAvailable = true and (g.privateGruppe = false or g.userId = :userId) and (:search is null or g.name like :search)") + List listVanillaAvailableWithUserAndSearch(@Param("userId") UUID userId, @Param("search") String search, PageRequest pageable); - @Query("SELECT g FROM AufgabenGruppeEntity g WHERE g.userId IS NULL AND (g.aufgaben IS NOT EMPTY OR g.finisher IS NOT EMPTY)") - Page findSystemGroupsWithContent(Pageable pageable); + /** Alle Gruppen – für BDSM-Spielstart (vanillaAvailable-Gruppen werden im Frontend hervorgehoben). */ + @Query("select g from AufgabenGruppeEntity g where (g.privateGruppe = false or g.userId = :userId) and (:search is null or g.name like :search)") + List listAllWithUserAndSearch(@Param("userId") UUID userId, @Param("search") String search, PageRequest pageable); } diff --git a/src/main/java/de/oaa/xxx/games/vanilla/controller/VanillaAboController.java b/src/main/java/de/oaa/xxx/games/vanilla/controller/VanillaAboController.java index ec975c0..11b28e1 100644 --- a/src/main/java/de/oaa/xxx/games/vanilla/controller/VanillaAboController.java +++ b/src/main/java/de/oaa/xxx/games/vanilla/controller/VanillaAboController.java @@ -6,9 +6,7 @@ import java.util.UUID; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; -import org.springframework.data.domain.Sort; import org.springframework.http.ResponseEntity; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.DeleteMapping; @@ -58,16 +56,21 @@ public class VanillaAboController { Principal principal) { UserEntity user = userService.requireUser(principal); - Page dbPage = aboRepository.findByUserIdWithContent( - user.getUserId(), PageRequest.of(page, size, Sort.by("aufgabenGruppe.name"))); - List dtos = dbPage.getContent().stream() - .map(a -> enrich(a.getAufgabenGruppe(), user.getUserId(), true)) + List all = aboRepository.findByUserId(user.getUserId()).stream() + .map(GruppenAboEntity::getAufgabenGruppe) + .filter(g -> g.isVanillaAvailable() + && !g.isPrivateGruppe() + && (!g.getAufgaben().isEmpty() || !g.getFinisher().isEmpty())) + .map(g -> enrich(g, user.getUserId(), true)) + .sorted(java.util.Comparator.comparing(AufgabenGruppe::getName, String.CASE_INSENSITIVE_ORDER)) .toList(); + int total = all.size(); + int start = page * size; AufgabenGruppePage result = new AufgabenGruppePage(); - result.setContent(dtos); - result.setCurrentPage(dbPage.getNumber()); - result.setTotalPages(dbPage.getTotalPages()); - result.setTotalElements(dbPage.getTotalElements()); + result.setContent(start >= total ? List.of() : all.subList(start, Math.min(start + size, total))); + result.setCurrentPage(page); + result.setTotalPages(total == 0 ? 1 : (int) Math.ceil((double) total / size)); + result.setTotalElements(total); return ResponseEntity.ok(result); } @@ -84,7 +87,8 @@ public class VanillaAboController { String namePattern = name != null && !name.isBlank() ? "%" + name.trim() + "%" : null; List dtos = gruppeRepository - .findVanillaSafePublicFromOthers(user.getUserId(), namePattern).stream() + .listVanillaAvailableWithUserAndSearch(user.getUserId(), namePattern, PageRequest.of(0, 500)).stream() + .filter(g -> !g.isPrivateGruppe() && g.getUserId() != null && !g.getUserId().equals(user.getUserId())) .map(g -> enrich(g, user.getUserId(), aboRepository.existsByUserIdAndAufgabenGruppe(user.getUserId(), g))) .sorted(java.util.Comparator.comparingLong(AufgabenGruppe::getSubscriberCount).reversed() .thenComparing(AufgabenGruppe::getName, String.CASE_INSENSITIVE_ORDER)) @@ -111,8 +115,7 @@ public class VanillaAboController { if (gruppe == null || gruppe.isPrivateGruppe() || user.getUserId().equals(gruppe.getUserId())) { return ResponseEntity.badRequest().build(); } - // Vanilla-safe validation - if (!gruppe.getStrafen().isEmpty() || !gruppe.getSperren().isEmpty()) { + if (!gruppe.isVanillaAvailable()) { return ResponseEntity.status(403).build(); } if (aboRepository.existsByUserIdAndAufgabenGruppe(user.getUserId(), gruppe)) { diff --git a/src/main/java/de/oaa/xxx/games/vanilla/controller/VanillaAufgabenGruppeController.java b/src/main/java/de/oaa/xxx/games/vanilla/controller/VanillaAufgabenGruppeController.java index 064c82b..88c5436 100644 --- a/src/main/java/de/oaa/xxx/games/vanilla/controller/VanillaAufgabenGruppeController.java +++ b/src/main/java/de/oaa/xxx/games/vanilla/controller/VanillaAufgabenGruppeController.java @@ -1,9 +1,19 @@ package de.oaa.xxx.games.vanilla.controller; -import java.security.Principal; -import java.util.Base64; -import java.util.UUID; - +import de.oaa.xxx.games.common.aufgaben.AufgabenGruppe; +import de.oaa.xxx.games.common.aufgaben.AufgabenGruppeList; +import de.oaa.xxx.games.common.aufgaben.AufgabenGruppePage; +import de.oaa.xxx.games.common.aufgaben.AufgabenGruppeService; +import de.oaa.xxx.games.common.entity.AufgabenGruppeEntity; +import de.oaa.xxx.games.common.repository.AufgabeRepository; +import de.oaa.xxx.games.common.repository.AufgabenGruppeRepository; +import de.oaa.xxx.games.common.repository.FinisherRepository; +import de.oaa.xxx.games.common.repository.GruppenAboRepository; +import de.oaa.xxx.games.common.repository.SperreRepository; +import de.oaa.xxx.games.common.repository.StrafeRepository; +import de.oaa.xxx.subscription.SubscriptionLimitService; +import de.oaa.xxx.user.UserEntity; +import de.oaa.xxx.user.UserService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.data.domain.Page; @@ -22,20 +32,9 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; -import de.oaa.xxx.games.common.aufgaben.AufgabenGruppe; -import de.oaa.xxx.games.common.aufgaben.AufgabenGruppeList; -import de.oaa.xxx.games.common.aufgaben.AufgabenGruppePage; -import de.oaa.xxx.games.common.aufgaben.AufgabenGruppeService; -import de.oaa.xxx.games.common.entity.AufgabenGruppeEntity; -import de.oaa.xxx.games.common.repository.AufgabeRepository; -import de.oaa.xxx.games.common.repository.AufgabenGruppeRepository; -import de.oaa.xxx.games.common.repository.FinisherRepository; -import de.oaa.xxx.games.common.repository.GruppenAboRepository; -import de.oaa.xxx.games.common.repository.SperreRepository; -import de.oaa.xxx.games.common.repository.StrafeRepository; -import de.oaa.xxx.subscription.SubscriptionLimitService; -import de.oaa.xxx.user.UserEntity; -import de.oaa.xxx.user.UserService; +import java.security.Principal; +import java.util.Base64; +import java.util.UUID; @RestController @RequestMapping("/vanilla/gruppe") @@ -84,7 +83,7 @@ public class VanillaAufgabenGruppeController { Principal principal) { UserEntity user = resolveUser(principal); if (user == null) return ResponseEntity.status(401).build(); - Page dbPage = gruppeRepository.findByUserIdWithContent( + Page dbPage = gruppeRepository.findByUserIdAndVanillaAvailableTrueWithContent( user.getUserId(), PageRequest.of(page, size, Sort.by("name"))); AufgabenGruppePage result = new AufgabenGruppePage(); result.setContent(dbPage.getContent().stream().map(entity -> { @@ -102,11 +101,10 @@ public class VanillaAufgabenGruppeController { public ResponseEntity listSystem( @RequestParam(name = "page", defaultValue = "0") int page, @RequestParam(name = "size", defaultValue = "" + DEFAULT_PAGE_SIZE) int size) { - Page dbPage = gruppeRepository.findSystemGroupsWithContent( + Page dbPage = gruppeRepository.findSystemGroupsByVanillaAvailableTrueWithContent( PageRequest.of(page, size, Sort.by("name"))); AufgabenGruppePage r = new AufgabenGruppePage(); - r.setContent(dbPage.getContent().stream() - .map(AufgabenGruppeEntity::toAufgabenGruppe).toList()); + r.setContent(dbPage.getContent().stream().map(AufgabenGruppeEntity::toAufgabenGruppe).toList()); r.setCurrentPage(dbPage.getNumber()); r.setTotalPages(dbPage.getTotalPages()); r.setTotalElements(dbPage.getTotalElements()); @@ -120,7 +118,8 @@ public class VanillaAufgabenGruppeController { UUID userId = userService.requireUser(principal).getUserId(); String searchPattern = search != null ? "%" + search + "%" : null; AufgabenGruppeList list = new AufgabenGruppeList(); - list.setGruppen(gruppeRepository.listVanillaSafeWithUserAndSearch(userId, searchPattern, PageRequest.of(0, 500)) + list.setGruppen(gruppeRepository.listVanillaAvailableWithUserAndSearch( + userId, searchPattern, PageRequest.of(0, 500)) .stream().map(AufgabenGruppeEntity::toAufgabenGruppeDisplay).toList()); return ResponseEntity.ok(list); } @@ -129,7 +128,7 @@ public class VanillaAufgabenGruppeController { public ResponseEntity getOwn(@RequestParam("userId") UUID userId) { AufgabenGruppeList list = new AufgabenGruppeList(); list.setGruppen(gruppeRepository.findByUserId(userId).stream() - .filter(g -> g.getStrafen().isEmpty() && g.getSperren().isEmpty()) + .filter(AufgabenGruppeEntity::isVanillaAvailable) .map(AufgabenGruppeEntity::toAufgabenGruppeDisplay).toList()); return ResponseEntity.ok(list); } @@ -137,7 +136,7 @@ public class VanillaAufgabenGruppeController { @GetMapping("/{gruppeId}") public ResponseEntity get(@PathVariable("gruppeId") UUID gruppeId) { return gruppeRepository.findById(gruppeId) - .filter(g -> g.getStrafen().isEmpty() && g.getSperren().isEmpty()) + .filter(AufgabenGruppeEntity::isVanillaAvailable) .map(entity -> ResponseEntity.ok(entity.toAufgabenGruppe())) .orElse(ResponseEntity.status(403).build()); } @@ -159,6 +158,7 @@ public class VanillaAufgabenGruppeController { AufgabenGruppeEntity entity = AufgabenGruppeEntity.create(gruppe); entity.setUserId(user.getUserId()); entity.setPrivateGruppe(true); + entity.setVanillaAvailable(true); gruppeRepository.save(entity); LOGGER.debug("User {} hat Vanilla-AufgabenGruppe '{}' ({}) erstellt", user.getUserId(), entity.getName(), entity.getGruppenId()); return ResponseEntity.created( @@ -181,8 +181,7 @@ public class VanillaAufgabenGruppeController { AufgabenGruppeEntity entity = gruppeRepository.findById(gruppeId).orElse(null); if (entity == null) return ResponseEntity.notFound().build(); if (!user.getUserId().equals(entity.getUserId())) return ResponseEntity.status(403).build(); - // Vanilla-safe check: cannot edit a non-vanilla-safe group - if (!entity.getStrafen().isEmpty() || !entity.getSperren().isEmpty()) return ResponseEntity.status(403).build(); + if (!entity.isVanillaAvailable()) return ResponseEntity.status(403).build(); entity.setName(gruppe.getName().trim()); entity.setBeschreibung(gruppe.getBeschreibung()); @@ -202,10 +201,9 @@ public class VanillaAufgabenGruppeController { public ResponseEntity copy(@PathVariable("gruppeId") UUID gruppeId, Principal principal) { UserEntity user = resolveUser(principal); if (user == null) return ResponseEntity.status(401).build(); - // Only allow copying vanilla-safe groups AufgabenGruppeEntity source = gruppeRepository.findById(gruppeId).orElse(null); if (source == null) return ResponseEntity.notFound().build(); - if (!source.getStrafen().isEmpty() || !source.getSperren().isEmpty()) return ResponseEntity.status(403).build(); + if (!source.isVanillaAvailable()) return ResponseEntity.status(403).build(); try { aufgabenGruppeService.copyGruppe(gruppeId, user.getUserId()); return ResponseEntity.status(201).build(); @@ -228,8 +226,7 @@ public class VanillaAufgabenGruppeController { AufgabenGruppeEntity entity = gruppeRepository.findById(gruppeId).orElse(null); if (entity == null) return ResponseEntity.noContent().build(); if (!user.getUserId().equals(entity.getUserId())) return ResponseEntity.status(403).build(); - // Only allow deletion of vanilla-safe groups - if (!entity.getStrafen().isEmpty() || !entity.getSperren().isEmpty()) return ResponseEntity.status(403).build(); + if (!entity.isVanillaAvailable()) return ResponseEntity.status(403).build(); try { aboRepository.deleteByAufgabenGruppe(entity); @@ -249,7 +246,7 @@ public class VanillaAufgabenGruppeController { public ResponseEntity delete(@RequestBody AufgabenGruppe gruppe) { try { gruppeRepository.findById(gruppe.getGruppenId()).ifPresent(entity -> { - if (entity.getStrafen().isEmpty() && entity.getSperren().isEmpty()) { + if (entity.isVanillaAvailable()) { gruppeRepository.delete(entity); } }); @@ -266,5 +263,4 @@ public class VanillaAufgabenGruppeController { if (principal == null) return null; return userService.requireUser(principal); } - } diff --git a/src/main/java/de/oaa/xxx/social/NotificationController.java b/src/main/java/de/oaa/xxx/social/NotificationController.java index c9820aa..c9339b5 100644 --- a/src/main/java/de/oaa/xxx/social/NotificationController.java +++ b/src/main/java/de/oaa/xxx/social/NotificationController.java @@ -41,7 +41,7 @@ public class NotificationController { n.put("text", m.getText()); n.put("sentAt", m.getSentAt().toString()); n.put("read", m.getReadAt() != null); - n.put("targetUrl", m.getTargetUrl() != null ? m.getTargetUrl() : ""); + n.put("targetUrl", sanitizeTargetUrl(m.getTargetUrl())); userRepository.findById(m.getSenderId()).ifPresent(sender -> { n.put("senderName", sender.getName()); n.put("senderAvatar", sender.getProfilePicture() != null ? sender.getProfilePicture() : ""); @@ -67,6 +67,12 @@ public class NotificationController { return ResponseEntity.noContent().build(); } + /** Erlaubt nur relative Pfade (beginnen mit '/') – verhindert javascript:-URLs und externe Redirects. */ + private String sanitizeTargetUrl(String url) { + if (url == null || url.isBlank()) return ""; + return url.startsWith("/") ? url : ""; + } + @Transactional @PostMapping("/read-all") public ResponseEntity markAllRead(Principal principal) { diff --git a/src/main/java/de/oaa/xxx/user/UserController.java b/src/main/java/de/oaa/xxx/user/UserController.java index f2341e8..1e0ee08 100644 --- a/src/main/java/de/oaa/xxx/user/UserController.java +++ b/src/main/java/de/oaa/xxx/user/UserController.java @@ -283,7 +283,8 @@ public class UserController { } @GetMapping("/{userId}/bdsm-defaults") - public ResponseEntity> getBdsmDefaultsForUser(@PathVariable("userId") UUID userId) { + public ResponseEntity> getBdsmDefaultsForUser(@PathVariable("userId") UUID userId, Principal principal) { + userService.requireUser(principal); var userOpt = userRepository.findById(userId); if (userOpt.isEmpty()) return ResponseEntity.notFound().build(); UserEntity user = userOpt.get(); diff --git a/src/main/resources/static/admin/admin.html b/src/main/resources/static/admin/admin.html index e676490..cadf95c 100644 --- a/src/main/resources/static/admin/admin.html +++ b/src/main/resources/static/admin/admin.html @@ -120,7 +120,8 @@ .gruppe-info { font-size:0.75rem; color:var(--color-muted); margin-top:0.2rem; } .gruppe-badges { display:flex; gap:0.3rem; margin-top:0.25rem; flex-wrap:wrap; } .gruppe-badge { font-size:0.65rem; padding:0.1rem 0.4rem; border-radius:20px; background:rgba(255,255,255,0.07); color:var(--color-muted); } - .gruppe-badge-public { background:rgba(46,204,113,0.15); color:var(--color-success); } + .gruppe-badge-public { background:rgba(46,204,113,0.15); color:var(--color-success); } + .gruppe-badge-vanilla { background:#e8f5e9; color:#2e7d32; border:1px solid #a5d6a7; } .gruppe-toggle { font-size:0.75rem; color:var(--color-muted); flex-shrink:0; transition:transform 0.2s; } .gruppe-card.open .gruppe-toggle { transform:rotate(90deg); } .gruppe-body { border-top:1px solid var(--color-secondary); padding:1rem 1rem 0.75rem; } @@ -277,6 +278,12 @@ Aktuelles Bild – neues wählen zum Ersetzen
    +
    @@ -986,7 +993,7 @@ function renderAdminGruppen(gruppen) {
    ${esc(g.name)}
    ${g.von ? esc(g.von) + (counts ? ' · ' : '') : ''}${counts || 'Keine Einträge'}
    -
    Öffentlich
    +
    Öffentlich${g.vanillaAvailable ? 'Vanilla' : ''}
    ▶
    @@ -1262,6 +1269,7 @@ function openGruppeModal(editId) { document.getElementById('gName').value = g.name || ''; document.getElementById('gVon').value = g.von || ''; document.getElementById('gDesc').value = g.beschreibung || ''; + document.getElementById('gVanilla').checked = g.vanillaAvailable || false; const imgWrap = document.getElementById('gCurrentImgWrap'); if (g.bild) { document.getElementById('gCurrentImg').src = 'data:image/png;base64,' + g.bild; imgWrap.style.display = 'flex'; } else imgWrap.style.display = 'none'; @@ -1270,6 +1278,7 @@ function openGruppeModal(editId) { document.getElementById('gName').value = ''; document.getElementById('gVon').value = ''; document.getElementById('gDesc').value = ''; + document.getElementById('gVanilla').checked = false; document.getElementById('gCurrentImgWrap').style.display = 'none'; } gruppeModal.classList.add('open'); @@ -1348,7 +1357,7 @@ gruppeModalSave.addEventListener('click', async () => { let bildBase64 = null; const fi = document.getElementById('gBild'); if (fi.files.length > 0) bildBase64 = await toBase64(fi.files[0]); - const payload = { name, von: document.getElementById('gVon').value.trim() || null, beschreibung: document.getElementById('gDesc').value.trim() || null, bild: bildBase64 }; + const payload = { name, von: document.getElementById('gVon').value.trim() || null, beschreibung: document.getElementById('gDesc').value.trim() || null, vanillaAvailable: document.getElementById('gVanilla').checked, bild: bildBase64 }; const isEdit = currentEditGruppeId != null; fetch(isEdit ? `/admin/aufgabengruppen/${currentEditGruppeId}` : '/admin/aufgabengruppen', { method: isEdit ? 'PUT' : 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(payload) diff --git a/src/main/resources/static/community/event-detail.html b/src/main/resources/static/community/event-detail.html index 4d8fa3b..63b13f4 100644 --- a/src/main/resources/static/community/event-detail.html +++ b/src/main/resources/static/community/event-detail.html @@ -195,6 +195,7 @@ function renderPage(evt) { const totalAttendees = (evt.attendees || []).length; const attending = evt.attendingMe; + const isPast = new Date(evt.startAt) < new Date(); document.getElementById('content').innerHTML = `
    @@ -211,11 +212,13 @@ function renderPage(evt) {
    ` : ''}
    - + ${isPast + ? `Veranstaltung bereits beendet` + : ``} ${totalAttendees} Teilnehmer*in(nen)
    diff --git a/src/main/resources/static/community/location-detail.html b/src/main/resources/static/community/location-detail.html index 9e32f6d..ea8e21a 100644 --- a/src/main/resources/static/community/location-detail.html +++ b/src/main/resources/static/community/location-detail.html @@ -445,6 +445,9 @@ function renderPage() { ${isOwner ? `` : ''}

    Wird geladen…

    + ` : ''; + const authorUrl = p.posterType === 'LOCATION' + ? `/community/location-detail.html?id=${p.locationId || p.authorId}` + : `/community/benutzer.html?userId=${p.authorId}`; + return `
    -
    ${avHtml}
    +
    ${avHtml}
    -
    ${escHtml(p.authorName || p.locationName || '')}
    +
    ${escHtml(p.authorName || p.locationName || '')}
    ${dateStr}${editedHtml}
    ${adminBtns} @@ -1401,11 +1420,15 @@ function openLpLb(postId) { + ' ' + new Date(p.createdAt).toLocaleTimeString('de-DE', { hour:'2-digit', minute:'2-digit' }); const editedHtml = p.editedAt ? ' (bearbeitet)' : ''; + const lbAuthorUrl = p.posterType === 'LOCATION' + ? `/community/location-detail.html?id=${p.locationId || p.authorId}` + : `/community/benutzer.html?userId=${p.authorId}`; + document.getElementById('lbPostBody').innerHTML = `
    -
    ${avHtml}
    +
    ${avHtml}
    -
    ${escHtml(p.authorName || p.locationName || '')}
    +
    ${escHtml(p.authorName || p.locationName || '')}
    ${dateStr}${editedHtml}
    diff --git a/src/main/resources/static/community/location-events.html b/src/main/resources/static/community/location-events.html new file mode 100644 index 0000000..11dcc80 --- /dev/null +++ b/src/main/resources/static/community/location-events.html @@ -0,0 +1,164 @@ + + + + + + + Alle Events – xXx Sphere + + + + + + + +
    +
    + + ‹ Zurück zur Location + +
    Alle Events
    + +
    +

    Wird geladen…

    +
    + + + +
    +
    + + + + + diff --git a/src/main/resources/static/games/bdsm/aufgaben.html b/src/main/resources/static/games/bdsm/aufgaben.html index 51a768f..c37af00 100644 --- a/src/main/resources/static/games/bdsm/aufgaben.html +++ b/src/main/resources/static/games/bdsm/aufgaben.html @@ -95,6 +95,7 @@ } .gruppe-badge-private { background: rgba(233,69,96,0.15); color: var(--color-primary); } .gruppe-badge-public { background: rgba(46,204,113,0.15); color: var(--color-success); } + .gruppe-badge-vanilla { background: #e8f5e9; color: #2e7d32; border: 1px solid #a5d6a7; } .gruppe-toggle { font-size: 0.75rem; color: var(--color-muted); flex-shrink: 0; transition: transform 0.2s; } .gruppe-card.open .gruppe-toggle { transform: rotate(90deg); } @@ -367,6 +368,12 @@ Gruppe veröffentlichen (für alle sichtbar) +
    @@ -715,6 +722,7 @@ if (g.privateGruppe) badges.push(`Privat`); else badges.push(`Öffentlich`); if (type === 'user' && g.subscriberCount > 0) badges.push(`♥ ${g.subscriberCount} Abo${g.subscriberCount !== 1 ? 's' : ''}`); + if (g.vanillaAvailable) badges.push(`Vanilla`); return `
    @@ -1069,6 +1077,7 @@ pubCb.checked = !g.privateGruppe; pubCb.disabled = g.privateGruppe; // Veröffentlichen nur über den Veröffentlichen-Button document.getElementById('gPublicLabel').style.display = 'block'; + document.getElementById('gVanilla').checked = g.vanillaAvailable || false; const imgWrap = document.getElementById('gCurrentImgWrap'); if (g.bild) { document.getElementById('gCurrentImg').src = 'data:image/png;base64,' + g.bild; @@ -1086,6 +1095,7 @@ document.getElementById('gDesc').value = ''; document.getElementById('gPublic').checked = false; document.getElementById('gPublicLabel').style.display = 'none'; + document.getElementById('gVanilla').checked = false; document.getElementById('gCurrentImgWrap').style.display = 'none'; gruppeModal.classList.add('open'); document.getElementById('gName').focus(); @@ -1119,6 +1129,7 @@ name, beschreibung: document.getElementById('gDesc').value.trim() || null, privateGruppe: isEdit ? !document.getElementById('gPublic').checked : true, + vanillaAvailable: document.getElementById('gVanilla').checked, bild: bildBase64 }; diff --git a/src/main/resources/static/games/bdsm/neubdsm.html b/src/main/resources/static/games/bdsm/neubdsm.html index 1ebb504..79cd153 100644 --- a/src/main/resources/static/games/bdsm/neubdsm.html +++ b/src/main/resources/static/games/bdsm/neubdsm.html @@ -97,6 +97,7 @@ .item-img { width: 38px; height: 38px; object-fit: cover; border-radius: 6px; flex-shrink: 0; } .gruppe-item-name, .toy-item-name { font-size: 0.95rem; font-weight: 600; color: var(--color-text); } .gruppe-item-desc, .toy-item-desc { display: block; font-size: 0.8rem; color: var(--color-muted); margin-top: 0.15rem; } + .vanilla-badge { display: inline-block; font-size: 0.65rem; font-weight: 700; padding: 0.1rem 0.35rem; border-radius: 3px; background: #e8f5e9; color: #2e7d32; border: 1px solid #a5d6a7; margin-left: 0.35rem; vertical-align: middle; letter-spacing: 0.03em; } .empty-hint { color: var(--color-muted); font-size: 0.875rem; font-style: italic; padding: 0.5rem 0; } .aufgaben-section-label { font-size: 0.78rem; font-weight: 600; color: var(--color-muted); text-transform: uppercase; letter-spacing: 0.04em; margin: 1rem 0 0.5rem 0; } .aufgaben-section-label:first-child { margin-top: 0; } @@ -653,9 +654,10 @@ } ul.innerHTML = gruppen.map(g => { const checked = savedGruppen.has(g.gruppenId); + const vanillaBadge = g.vanillaAvailable ? 'Vanilla' : ''; return `
    • `; }).join(''); diff --git a/src/main/resources/static/userhome.html b/src/main/resources/static/userhome.html index cd0abb8..ee59c63 100644 --- a/src/main/resources/static/userhome.html +++ b/src/main/resources/static/userhome.html @@ -887,11 +887,14 @@
    ` : ''; const gruppeIdAttr = p.gruppeId ? ` data-gruppe-id="${p.gruppeId}"` : ''; + const authorUrl = p.posterType === 'LOCATION' + ? `/community/location-detail.html?id=${p.locationId || p.authorId}` + : `/community/benutzer.html?userId=${p.authorId}`; return `
    -
    ${avatarHtml}
    +
    ${avatarHtml}
    -
    ${esc(p.authorName)}${privacyLabel}
    +
    ${esc(p.authorName)}${privacyLabel}
    ${fmtDate(p.createdAt)}${editedLabel}${groupBadge}
    ${ownBtns}