From 108525534c28013cfe1897c30e4565f9893f3766 Mon Sep 17 00:00:00 2001 From: Minteck Date: Mon, 10 Oct 2022 20:51:39 +0200 Subject: Update --- app/banner.js | 6 +-- app/bits/assets/graph.js | 11 ++--- app/demo/index.php | 2 +- app/emergency/index.php | 4 +- app/fronters/ponies/auvwc.png | Bin 0 -> 6074 bytes app/fronters/ponies/bbrig.png | Bin 0 -> 5945 bytes app/fronters/ponies/ghrby.png | Bin 0 -> 6337 bytes app/fronters/ponies/mvaws.png | Bin 0 -> 7189 bytes app/fronters/ponies/rirgf.png | Bin 24981 -> 5480 bytes app/fronters/profiles/auvwc.png | Bin 0 -> 504733 bytes app/fronters/profiles/ckqsw.png | Bin 237290 -> 237290 bytes app/fronters/profiles/cmeyc.png | Bin 0 -> 1542918 bytes app/fronters/profiles/dogwu.png | Bin 0 -> 2055 bytes app/fronters/profiles/epvhq.png | Bin 0 -> 825561 bytes app/fronters/profiles/erefx.png | Bin 826530 -> 826530 bytes app/fronters/profiles/erknz.png | Bin 56915 -> 56915 bytes app/fronters/profiles/exidq.png | Bin 0 -> 45898 bytes app/fronters/profiles/ezqym.png | Bin 0 -> 184686 bytes app/fronters/profiles/famxl.png | Bin 0 -> 825561 bytes app/fronters/profiles/gevde.png | Bin 100880 -> 100880 bytes app/fronters/profiles/gfhsr.png | Bin 2283131 -> 2283131 bytes app/fronters/profiles/ghrby.png | Bin 0 -> 167497 bytes app/fronters/profiles/ghuln.png | Bin 370233 -> 370233 bytes app/fronters/profiles/hpwyq.png | Bin 2770 -> 2770 bytes app/fronters/profiles/irxyh.png | Bin 26543 -> 26543 bytes app/fronters/profiles/jhemc.png | Bin 0 -> 100880 bytes app/fronters/profiles/jnbae.png | Bin 60223 -> 60223 bytes app/fronters/profiles/khsbb.png | Bin 249236 -> 249236 bytes app/fronters/profiles/kkhbw.png | Bin 40300 -> 40300 bytes app/fronters/profiles/lllfw.png | Bin 745786 -> 745786 bytes app/fronters/profiles/lzlaq.png | Bin 26543 -> 26543 bytes app/fronters/profiles/mglyq.png | Bin 91476 -> 91476 bytes app/fronters/profiles/mhnqy.png | Bin 27452 -> 27452 bytes app/fronters/profiles/mvaws.png | Bin 0 -> 473421 bytes app/fronters/profiles/pabmo.png | Bin 124750 -> 124750 bytes app/fronters/profiles/ppukh.png | Bin 0 -> 2843 bytes app/fronters/profiles/qbzxm.png | Bin 2843 -> 2843 bytes app/fronters/profiles/qraku.png | Bin 45898 -> 45898 bytes app/fronters/profiles/qzbpf.png | Bin 0 -> 56915 bytes app/fronters/profiles/rdstg.png | Bin 16881 -> 16881 bytes app/fronters/profiles/rirgf.png | Bin 825561 -> 825561 bytes app/fronters/profiles/rpjok.png | Bin 1542918 -> 1542918 bytes app/fronters/profiles/sbxze.png | Bin 50554 -> 50554 bytes app/fronters/profiles/sehke.png | Bin 1947 -> 1947 bytes app/fronters/profiles/sjuao.png | Bin 0 -> 1045570 bytes app/fronters/profiles/souga.png | Bin 0 -> 45898 bytes app/fronters/profiles/tfbob.png | Bin 14049 -> 14049 bytes app/fronters/profiles/tmgiu.png | Bin 260760 -> 260760 bytes app/fronters/profiles/trefr.png | Bin 0 -> 1947 bytes app/fronters/profiles/vahcl.png | Bin 0 -> 45898 bytes app/fronters/profiles/vncoa.png | Bin 46475 -> 46475 bytes app/fronters/profiles/vvsxf.png | Bin 61010 -> 61010 bytes app/fronters/profiles/wjovt.png | Bin 0 -> 2097 bytes app/fronters/profiles/xbvwt.png | Bin 70342 -> 70342 bytes app/fronters/profiles/xcjhj.png | Bin 107053 -> 107053 bytes app/fronters/profiles/ynpba.png | Bin 0 -> 69145 bytes app/fronters/profiles/zajrk.png | Bin 2097 -> 2097 bytes app/fronters/profiles/zdtsg.png | Bin 3046 -> 3046 bytes app/fronters/profiles/zhtzs.png | Bin 673763 -> 673763 bytes app/fronters/profiles/ztfjz.png | Bin 184686 -> 184686 bytes app/fronters/profiles/zzise.png | Bin 69145 -> 69145 bytes app/fronters/script.js | 2 +- app/functions.js | 4 +- app/index.html | 4 +- app/load.js | 105 ++++++++++++++++++++++------------------ app/planner/index.php | 14 +++--- app/sw.js | 29 ++++++++++- 67 files changed, 107 insertions(+), 74 deletions(-) create mode 100644 app/fronters/ponies/auvwc.png create mode 100644 app/fronters/ponies/bbrig.png create mode 100644 app/fronters/ponies/ghrby.png create mode 100644 app/fronters/ponies/mvaws.png create mode 100644 app/fronters/profiles/auvwc.png create mode 100644 app/fronters/profiles/cmeyc.png create mode 100644 app/fronters/profiles/dogwu.png create mode 100644 app/fronters/profiles/epvhq.png create mode 100644 app/fronters/profiles/exidq.png create mode 100644 app/fronters/profiles/ezqym.png create mode 100644 app/fronters/profiles/famxl.png create mode 100644 app/fronters/profiles/ghrby.png create mode 100644 app/fronters/profiles/jhemc.png create mode 100644 app/fronters/profiles/mvaws.png create mode 100644 app/fronters/profiles/ppukh.png create mode 100644 app/fronters/profiles/qzbpf.png create mode 100644 app/fronters/profiles/sjuao.png create mode 100644 app/fronters/profiles/souga.png create mode 100644 app/fronters/profiles/trefr.png create mode 100644 app/fronters/profiles/vahcl.png create mode 100644 app/fronters/profiles/wjovt.png create mode 100644 app/fronters/profiles/ynpba.png (limited to 'app') diff --git a/app/banner.js b/app/banner.js index 6815de1..a3e6173 100644 --- a/app/banner.js +++ b/app/banner.js @@ -183,20 +183,20 @@ async function refreshBanner(offline, french) { ${french ? (data['relations']['marefriends'].length > 1 ? 'Partenaires ' : 'Partenaire ') : `Marefriend${data['relations']['marefriends'].length > 1 ? 's' : ''}`}: ${data['relations']['marefriends'].length > 1 ? '
' : ''} ${data['relations']['marefriends'].map(relation => ` - `).join(``)} + `).join(``)} ${data['relations']['marefriends'].length === 0 ? '-' : ''}
${french ? (data['relations']['sisters'].length > 1 ? 'Sœurs ' : 'Sœur ') : `Sister${data['relations']['sisters'].length > 1 ? 's' : ''}`}: ${data['relations']['sisters'].length > 1 ? '
' : ''} ${data['relations']['sisters'].map(relation => ` - `).join(``)} + `).join(``)} ${data['relations']['sisters'].length === 0 ? '-' : ''}
${data['little'] ? ` ${french ? (data['relations']['sisters'].length > 1 ? 'Caretakers ' : 'Caretaker ') : `Caretaker${data['relations']['caretakers'].length > 1 ? 's' : ''}`}: ${data['relations']['caretakers'].length > 1 ? '
' : ''} ${data['relations']['caretakers'].map(relation => ` - `).join(``)} + `).join(``)} ${data['relations']['caretakers'].length === 0 ? '-' : ''}
` : ''} diff --git a/app/bits/assets/graph.js b/app/bits/assets/graph.js index 908c2e9..0503b99 100755 --- a/app/bits/assets/graph.js +++ b/app/bits/assets/graph.js @@ -25,14 +25,9 @@ const graph = new Chart(ctx, { } }, scaleLabel: "<%=value%>%", - legend: { - display: false - }, - tooltips: { - callbacks: { - label: function(tooltipItem, data) { - return data.labels[tooltipItem.index] + ': ' + data.datasets[tooltipItem.datasetIndex].data[tooltipItem.index] + '€'; - } + plugins: { + legend: { + display: false } } } diff --git a/app/demo/index.php b/app/demo/index.php index 154f099..cd54738 100644 --- a/app/demo/index.php +++ b/app/demo/index.php @@ -1,3 +1,3 @@ + @@ -26,7 +26,7 @@

- +
\ No newline at end of file diff --git a/app/fronters/ponies/auvwc.png b/app/fronters/ponies/auvwc.png new file mode 100644 index 0000000..c87a4f8 Binary files /dev/null and b/app/fronters/ponies/auvwc.png differ diff --git a/app/fronters/ponies/bbrig.png b/app/fronters/ponies/bbrig.png new file mode 100644 index 0000000..c5e2e3c Binary files /dev/null and b/app/fronters/ponies/bbrig.png differ diff --git a/app/fronters/ponies/ghrby.png b/app/fronters/ponies/ghrby.png new file mode 100644 index 0000000..f7fe2f8 Binary files /dev/null and b/app/fronters/ponies/ghrby.png differ diff --git a/app/fronters/ponies/mvaws.png b/app/fronters/ponies/mvaws.png new file mode 100644 index 0000000..5f51abe Binary files /dev/null and b/app/fronters/ponies/mvaws.png differ diff --git a/app/fronters/ponies/rirgf.png b/app/fronters/ponies/rirgf.png index 9f4096c..315321f 100644 Binary files a/app/fronters/ponies/rirgf.png and b/app/fronters/ponies/rirgf.png differ diff --git a/app/fronters/profiles/auvwc.png b/app/fronters/profiles/auvwc.png new file mode 100644 index 0000000..824a20f Binary files /dev/null and b/app/fronters/profiles/auvwc.png differ diff --git a/app/fronters/profiles/ckqsw.png b/app/fronters/profiles/ckqsw.png index aa8b705..c12493f 100644 Binary files a/app/fronters/profiles/ckqsw.png and b/app/fronters/profiles/ckqsw.png differ diff --git a/app/fronters/profiles/cmeyc.png b/app/fronters/profiles/cmeyc.png new file mode 100644 index 0000000..b13c2b1 Binary files /dev/null and b/app/fronters/profiles/cmeyc.png differ diff --git a/app/fronters/profiles/dogwu.png b/app/fronters/profiles/dogwu.png new file mode 100644 index 0000000..4404e65 Binary files /dev/null and b/app/fronters/profiles/dogwu.png differ diff --git a/app/fronters/profiles/epvhq.png b/app/fronters/profiles/epvhq.png new file mode 100644 index 0000000..30b1160 Binary files /dev/null and b/app/fronters/profiles/epvhq.png differ diff --git a/app/fronters/profiles/erefx.png b/app/fronters/profiles/erefx.png index e5175fb..afdef5c 100644 Binary files a/app/fronters/profiles/erefx.png and b/app/fronters/profiles/erefx.png differ diff --git a/app/fronters/profiles/erknz.png b/app/fronters/profiles/erknz.png index 4d1f0dd..2fbea15 100644 Binary files a/app/fronters/profiles/erknz.png and b/app/fronters/profiles/erknz.png differ diff --git a/app/fronters/profiles/exidq.png b/app/fronters/profiles/exidq.png new file mode 100644 index 0000000..9b72e5a Binary files /dev/null and b/app/fronters/profiles/exidq.png differ diff --git a/app/fronters/profiles/ezqym.png b/app/fronters/profiles/ezqym.png new file mode 100644 index 0000000..36d34f6 Binary files /dev/null and b/app/fronters/profiles/ezqym.png differ diff --git a/app/fronters/profiles/famxl.png b/app/fronters/profiles/famxl.png new file mode 100644 index 0000000..9a28b13 Binary files /dev/null and b/app/fronters/profiles/famxl.png differ diff --git a/app/fronters/profiles/gevde.png b/app/fronters/profiles/gevde.png index f08887d..b000840 100644 Binary files a/app/fronters/profiles/gevde.png and b/app/fronters/profiles/gevde.png differ diff --git a/app/fronters/profiles/gfhsr.png b/app/fronters/profiles/gfhsr.png index 1d12f37..72f5a89 100644 Binary files a/app/fronters/profiles/gfhsr.png and b/app/fronters/profiles/gfhsr.png differ diff --git a/app/fronters/profiles/ghrby.png b/app/fronters/profiles/ghrby.png new file mode 100644 index 0000000..c0d75f8 Binary files /dev/null and b/app/fronters/profiles/ghrby.png differ diff --git a/app/fronters/profiles/ghuln.png b/app/fronters/profiles/ghuln.png index d975de1..3856e60 100644 Binary files a/app/fronters/profiles/ghuln.png and b/app/fronters/profiles/ghuln.png differ diff --git a/app/fronters/profiles/hpwyq.png b/app/fronters/profiles/hpwyq.png index 6014172..447f028 100644 Binary files a/app/fronters/profiles/hpwyq.png and b/app/fronters/profiles/hpwyq.png differ diff --git a/app/fronters/profiles/irxyh.png b/app/fronters/profiles/irxyh.png index ff9b84a..652a951 100644 Binary files a/app/fronters/profiles/irxyh.png and b/app/fronters/profiles/irxyh.png differ diff --git a/app/fronters/profiles/jhemc.png b/app/fronters/profiles/jhemc.png new file mode 100644 index 0000000..4c71982 Binary files /dev/null and b/app/fronters/profiles/jhemc.png differ diff --git a/app/fronters/profiles/jnbae.png b/app/fronters/profiles/jnbae.png index 67a3cc6..0a9d069 100644 Binary files a/app/fronters/profiles/jnbae.png and b/app/fronters/profiles/jnbae.png differ diff --git a/app/fronters/profiles/khsbb.png b/app/fronters/profiles/khsbb.png index 4a19d1d..27a85bd 100644 Binary files a/app/fronters/profiles/khsbb.png and b/app/fronters/profiles/khsbb.png differ diff --git a/app/fronters/profiles/kkhbw.png b/app/fronters/profiles/kkhbw.png index db09107..62ff738 100644 Binary files a/app/fronters/profiles/kkhbw.png and b/app/fronters/profiles/kkhbw.png differ diff --git a/app/fronters/profiles/lllfw.png b/app/fronters/profiles/lllfw.png index 922ae6f..c09cfc1 100644 Binary files a/app/fronters/profiles/lllfw.png and b/app/fronters/profiles/lllfw.png differ diff --git a/app/fronters/profiles/lzlaq.png b/app/fronters/profiles/lzlaq.png index 19890f3..3341acf 100644 Binary files a/app/fronters/profiles/lzlaq.png and b/app/fronters/profiles/lzlaq.png differ diff --git a/app/fronters/profiles/mglyq.png b/app/fronters/profiles/mglyq.png index 2350ce9..9258fb2 100644 Binary files a/app/fronters/profiles/mglyq.png and b/app/fronters/profiles/mglyq.png differ diff --git a/app/fronters/profiles/mhnqy.png b/app/fronters/profiles/mhnqy.png index bbc296e..fdd5963 100644 Binary files a/app/fronters/profiles/mhnqy.png and b/app/fronters/profiles/mhnqy.png differ diff --git a/app/fronters/profiles/mvaws.png b/app/fronters/profiles/mvaws.png new file mode 100644 index 0000000..6a2cc05 Binary files /dev/null and b/app/fronters/profiles/mvaws.png differ diff --git a/app/fronters/profiles/pabmo.png b/app/fronters/profiles/pabmo.png index 855989d..5bda618 100644 Binary files a/app/fronters/profiles/pabmo.png and b/app/fronters/profiles/pabmo.png differ diff --git a/app/fronters/profiles/ppukh.png b/app/fronters/profiles/ppukh.png new file mode 100644 index 0000000..a0f10cd Binary files /dev/null and b/app/fronters/profiles/ppukh.png differ diff --git a/app/fronters/profiles/qbzxm.png b/app/fronters/profiles/qbzxm.png index 59cfdaf..21fd437 100644 Binary files a/app/fronters/profiles/qbzxm.png and b/app/fronters/profiles/qbzxm.png differ diff --git a/app/fronters/profiles/qraku.png b/app/fronters/profiles/qraku.png index 0935261..67fb221 100644 Binary files a/app/fronters/profiles/qraku.png and b/app/fronters/profiles/qraku.png differ diff --git a/app/fronters/profiles/qzbpf.png b/app/fronters/profiles/qzbpf.png new file mode 100644 index 0000000..904b914 Binary files /dev/null and b/app/fronters/profiles/qzbpf.png differ diff --git a/app/fronters/profiles/rdstg.png b/app/fronters/profiles/rdstg.png index 3a28375..ac28034 100644 Binary files a/app/fronters/profiles/rdstg.png and b/app/fronters/profiles/rdstg.png differ diff --git a/app/fronters/profiles/rirgf.png b/app/fronters/profiles/rirgf.png index 3fdf039..428032d 100644 Binary files a/app/fronters/profiles/rirgf.png and b/app/fronters/profiles/rirgf.png differ diff --git a/app/fronters/profiles/rpjok.png b/app/fronters/profiles/rpjok.png index 1475d47..283cd2a 100644 Binary files a/app/fronters/profiles/rpjok.png and b/app/fronters/profiles/rpjok.png differ diff --git a/app/fronters/profiles/sbxze.png b/app/fronters/profiles/sbxze.png index 4390c22..f70ee90 100644 Binary files a/app/fronters/profiles/sbxze.png and b/app/fronters/profiles/sbxze.png differ diff --git a/app/fronters/profiles/sehke.png b/app/fronters/profiles/sehke.png index efcdf4a..ef93187 100644 Binary files a/app/fronters/profiles/sehke.png and b/app/fronters/profiles/sehke.png differ diff --git a/app/fronters/profiles/sjuao.png b/app/fronters/profiles/sjuao.png new file mode 100644 index 0000000..16a4dd5 Binary files /dev/null and b/app/fronters/profiles/sjuao.png differ diff --git a/app/fronters/profiles/souga.png b/app/fronters/profiles/souga.png new file mode 100644 index 0000000..fdde626 Binary files /dev/null and b/app/fronters/profiles/souga.png differ diff --git a/app/fronters/profiles/tfbob.png b/app/fronters/profiles/tfbob.png index a63b6e3..edf68db 100644 Binary files a/app/fronters/profiles/tfbob.png and b/app/fronters/profiles/tfbob.png differ diff --git a/app/fronters/profiles/tmgiu.png b/app/fronters/profiles/tmgiu.png index acaf6f3..bb45dc3 100644 Binary files a/app/fronters/profiles/tmgiu.png and b/app/fronters/profiles/tmgiu.png differ diff --git a/app/fronters/profiles/trefr.png b/app/fronters/profiles/trefr.png new file mode 100644 index 0000000..fec4dc3 Binary files /dev/null and b/app/fronters/profiles/trefr.png differ diff --git a/app/fronters/profiles/vahcl.png b/app/fronters/profiles/vahcl.png new file mode 100644 index 0000000..aeb7ba9 Binary files /dev/null and b/app/fronters/profiles/vahcl.png differ diff --git a/app/fronters/profiles/vncoa.png b/app/fronters/profiles/vncoa.png index ac1596f..e49a38f 100644 Binary files a/app/fronters/profiles/vncoa.png and b/app/fronters/profiles/vncoa.png differ diff --git a/app/fronters/profiles/vvsxf.png b/app/fronters/profiles/vvsxf.png index df4566d..009b060 100644 Binary files a/app/fronters/profiles/vvsxf.png and b/app/fronters/profiles/vvsxf.png differ diff --git a/app/fronters/profiles/wjovt.png b/app/fronters/profiles/wjovt.png new file mode 100644 index 0000000..8d40347 Binary files /dev/null and b/app/fronters/profiles/wjovt.png differ diff --git a/app/fronters/profiles/xbvwt.png b/app/fronters/profiles/xbvwt.png index 2b94fa8..2d76e48 100644 Binary files a/app/fronters/profiles/xbvwt.png and b/app/fronters/profiles/xbvwt.png differ diff --git a/app/fronters/profiles/xcjhj.png b/app/fronters/profiles/xcjhj.png index 02a635f..31ca4b9 100644 Binary files a/app/fronters/profiles/xcjhj.png and b/app/fronters/profiles/xcjhj.png differ diff --git a/app/fronters/profiles/ynpba.png b/app/fronters/profiles/ynpba.png new file mode 100644 index 0000000..61e9a74 Binary files /dev/null and b/app/fronters/profiles/ynpba.png differ diff --git a/app/fronters/profiles/zajrk.png b/app/fronters/profiles/zajrk.png index ebfc4d8..3f960fb 100644 Binary files a/app/fronters/profiles/zajrk.png and b/app/fronters/profiles/zajrk.png differ diff --git a/app/fronters/profiles/zdtsg.png b/app/fronters/profiles/zdtsg.png index 1c1704d..e3aff68 100644 Binary files a/app/fronters/profiles/zdtsg.png and b/app/fronters/profiles/zdtsg.png differ diff --git a/app/fronters/profiles/zhtzs.png b/app/fronters/profiles/zhtzs.png index 2af80d2..b802367 100644 Binary files a/app/fronters/profiles/zhtzs.png and b/app/fronters/profiles/zhtzs.png differ diff --git a/app/fronters/profiles/ztfjz.png b/app/fronters/profiles/ztfjz.png index cb81f5f..e604ed1 100644 Binary files a/app/fronters/profiles/ztfjz.png and b/app/fronters/profiles/ztfjz.png differ diff --git a/app/fronters/profiles/zzise.png b/app/fronters/profiles/zzise.png index d200bdf..d767964 100644 Binary files a/app/fronters/profiles/zzise.png and b/app/fronters/profiles/zzise.png differ diff --git a/app/fronters/script.js b/app/fronters/script.js index 6450bba..4e51b22 100755 --- a/app/fronters/script.js +++ b/app/fronters/script.js @@ -1,7 +1,7 @@ function getMiniName(name) { let parts = name.split(" "); - if (parts[0].length > 3 && !parts[0].endsWith("e") && parts[0] !== "Filly" && parts[0] !== "Windy") { + if (parts[0].length > 3 && !parts[0].endsWith("e") && parts[0] !== "Filly" && parts[0] !== "Windy" && parts[1] !== "Brightdawn") { if (parts[0].includes("/")) { return parts[0].split("/")[0]; } else { diff --git a/app/functions.js b/app/functions.js index 207bc42..4d89e30 100644 --- a/app/functions.js +++ b/app/functions.js @@ -1,9 +1,9 @@ -// Function ported from /includes/header.php (line 18) +// Function ported from /includes/header.inc (line 18) // Ported function has matched behavior. function getMiniName(name) { let parts = name.split(" "); - if (parts[0].length > 3 && !parts[0].endsWith("e") && parts[0] !== "Filly" && parts[0] !== "Windy") { + if (parts[0].length > 3 && !parts[0].endsWith("e") && parts[0] !== "Filly" && parts[0] !== "Windy" && parts[1] !== "Brightdawn") { if (parts[0].includes("/")) { return parts[0].split("/")[0]; } else { diff --git a/app/index.html b/app/index.html index 22ee9a9..e8fd5a0 100644 --- a/app/index.html +++ b/app/index.html @@ -291,7 +291,7 @@


-

 Greetings Name!

+

 Greetings Name!


@@ -313,7 +313,7 @@
-

In the other system: Some member

+

In the other system: Some member

diff --git a/app/load.js b/app/load.js index 1be0b57..97b030a 100644 --- a/app/load.js +++ b/app/load.js @@ -17,32 +17,32 @@ window.connected = false; let valuesToGet = { "pluralkit-cloudburst-members": { - url: "/api/data?f=ynmuc-members.json", + url: "/api/data?f=ynmuc/members.json", limited: false, name: "Members at Cloudburst...", }, "pluralkit-cloudburst-fronters": { - url: "/api/data?f=ynmuc-fronters.json", + url: "/api/data?f=ynmuc/fronters.json", limited: false, name: "Fronters at Cloudburst...", }, "pluralkit-cloudburst-switches": { - url: "/api/data?f=ynmuc-switches.json", + url: "/api/data?f=ynmuc/switches.json", limited: false, name: "Switches at Cloudburst...", }, "pluralkit-raindrops-members": { - url: "/api/data?f=gdapd-members.json", + url: "/api/data?f=gdapd/members.json", limited: false, name: "Members at Raindrops...", }, "pluralkit-raindrops-fronters": { - url: "/api/data?f=gdapd-fronters.json", + url: "/api/data?f=gdapd/fronters.json", limited: false, name: "Fronters at Raindrops...", }, "pluralkit-raindrops-switches": { - url: "/api/data?f=gdapd-switches.json", + url: "/api/data?f=gdapd/switches.json", limited: false, name: "Switches at Raindrops...", }, @@ -243,55 +243,64 @@ async function postLoad() { try { let member = window.currentFronter; await (await window.fetch("/bits/Application/SetCurrentIdentity/index.php?Name=" + btoa(member['display_name'] ?? member['name']).replaceAll("+", "-").replaceAll("/", "_") + "&Picture=" + btoa(member['avatar_url'] ?? "./assets/default.png").replaceAll("+", "-").replaceAll("/", "_"))).text(); - } catch (e) {} + } catch (e) { + try { + await (await window.fetch("/bits/Application/SetCurrentIdentity/index.php?Name=" + btoa(window.data['pluralkit-' + window.data['identity'].id + '-members'].filter(i => i.name === "unknown")[0]['display_name']).replaceAll("+", "-").replaceAll("/", "_") + "&Picture=" + btoa(window.data['pluralkit-' + window.data['identity'].id + '-members'].filter(i => i.name === "unknown")[0]['avatar_url']).replaceAll("+", "-").replaceAll("/", "_"))).text(); + } catch (e) {} + } - document.getElementById("home-name").innerText = getMiniName(window.currentFronter['display_name'] ?? window.currentFronter['name']); - document.getElementById("home-avatar").src = window.data['image-me']; - - switch (new Date().getHours()) { - case 0: - case 1: - case 2: - case 3: - case 4: - case 5: - document.getElementById("home-greeting").innerText = "Good night"; - break; - - case 6: - case 7: - case 8: - case 9: - case 10: - case 11: - document.getElementById("home-greeting").innerText = "Good morning"; - break; - - case 12: - case 13: - case 14: - case 15: - case 16: - case 17: - document.getElementById("home-greeting").innerText = "Good afternoon"; - break; - - case 18: - case 19: - case 20: - case 21: - case 22: - case 23: - document.getElementById("home-greeting").innerText = "Good evening"; - break; + try { + document.getElementById("home-name").innerText = getMiniName(window.currentFronter['display_name'] ?? window.currentFronter['name']); + document.getElementById("home-avatar").src = window.data['image-me']; + + switch (new Date().getHours()) { + case 0: + case 1: + case 2: + case 3: + case 4: + case 5: + document.getElementById("home-greeting").innerText = "Good night"; + break; + + case 6: + case 7: + case 8: + case 9: + case 10: + case 11: + document.getElementById("home-greeting").innerText = "Good morning"; + break; + + case 12: + case 13: + case 14: + case 15: + case 16: + case 17: + document.getElementById("home-greeting").innerText = "Good afternoon"; + break; + + case 18: + case 19: + case 20: + case 21: + case 22: + case 23: + document.getElementById("home-greeting").innerText = "Good evening"; + break; + } + } catch (e) { + document.getElementById("home-front").style.display = "none"; } window.otherSystem = window.data.identity.id === "raindrops" ? "cloudburst" : "raindrops"; window.otherFronters = window.data["pluralkit-" + otherSystem + "-fronters"]; document.getElementById("home-other-system").innerText = otherSystem === "raindrops" ? "Raindrops System" : "Cloudburst System"; - document.getElementById("home-other-name").innerText = window.otherFronters.members[0].display_name ?? window.otherFronters.members[0].name; - document.getElementById("home-other-img").src = window.images.profile[otherSystem === "raindrops" ? "gdapd" : "ynmuc"][window.otherFronters.members[0].id]; + if (window.otherFronters.members[0]) document.getElementById("home-other-name").innerText = window.otherFronters.members[0].display_name ?? window.otherFronters.members[0].name; + if (window.otherFronters.members[0]) document.getElementById("home-other-img").src = window.images.profile[otherSystem === "raindrops" ? "gdapd" : "ynmuc"][window.otherFronters.members[0].id]; + if (!window.otherFronters.members[0]) document.getElementById("home-other").style.display = "none"; if (!window.connected) { document.getElementById("home-app-planner").classList.add("disabled"); diff --git a/app/planner/index.php b/app/planner/index.php index 775fec3..0ae3663 100644 --- a/app/planner/index.php +++ b/app/planner/index.php @@ -1,4 +1,4 @@ - + @@ -33,13 +33,13 @@
3 && !str_ends_with($parts[0], "e") && $parts[0] !== "Filly" && $parts[0] !== "Windy") { + if (strlen($parts[0]) > 3 && !str_ends_with($parts[0], "e") && $parts[0] !== "Filly" && $parts[0] !== "Windy" && (isset($parts[1]) && $parts[1] !== "Brightdawn")) { if (str_contains($parts[0], "/")) { return explode("/", $parts[0])[0]; } else { @@ -53,17 +53,19 @@ function getSystemMember(string $system, string $id) { $systemID = $system; - $members = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/$systemID-members.json"), true); + $members = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/$systemID/members.json"), true); $member = null; foreach ($members as $m) { if ($m["id"] === $id) $member = $m; } + $member["system"] = $member["_system"] = $system; + return $member; } - require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/planner.php"; ?> + require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/planner.inc"; ?>
\ No newline at end of file diff --git a/app/sw.js b/app/sw.js index f355509..bb275bb 100644 --- a/app/sw.js +++ b/app/sw.js @@ -57,11 +57,13 @@ let filesToCache = [ "/app/fronters/bootstrap/bootstrap.js", "/app/fronters/bootstrap/bootstrap.js.map", "/app/fronters/index.html", + "/app/fronters/ponies/auvwc.png", "/app/fronters/ponies/ckqsw.png", "/app/fronters/ponies/erefx.png", "/app/fronters/ponies/erknz.png", "/app/fronters/ponies/gevde.png", "/app/fronters/ponies/gfhsr.png", + "/app/fronters/ponies/ghrby.png", "/app/fronters/ponies/hpwyq.png", "/app/fronters/ponies/jnbae.png", "/app/fronters/ponies/khsbb.png", @@ -69,6 +71,7 @@ let filesToCache = [ "/app/fronters/ponies/lllfw.png", "/app/fronters/ponies/mglyq.png", "/app/fronters/ponies/mhnqy.png", + "/app/fronters/ponies/mvaws.png", "/app/fronters/ponies/nabky.png", "/app/fronters/ponies/pabmo.png", "/app/fronters/ponies/qbzxm.png", @@ -86,16 +89,25 @@ let filesToCache = [ "/app/fronters/ponies/zhtzs.png", "/app/fronters/ponies/ztfjz.png", "/app/fronters/ponies/zzise.png", + "/app/fronters/profiles/auvwc.png", "/app/fronters/profiles/ckqsw.png", + "/app/fronters/profiles/cmeyc.png", "/app/fronters/profiles/djnko.png", + "/app/fronters/profiles/dogwu.png", + "/app/fronters/profiles/epvhq.png", "/app/fronters/profiles/erefx.png", "/app/fronters/profiles/erknz.png", + "/app/fronters/profiles/exidq.png", + "/app/fronters/profiles/ezqym.png", + "/app/fronters/profiles/famxl.png", "/app/fronters/profiles/flukm.png", "/app/fronters/profiles/gevde.png", "/app/fronters/profiles/gfhsr.png", + "/app/fronters/profiles/ghrby.png", "/app/fronters/profiles/ghuln.png", "/app/fronters/profiles/hpwyq.png", "/app/fronters/profiles/irxyh.png", + "/app/fronters/profiles/jhemc.png", "/app/fronters/profiles/jnbae.png", "/app/fronters/profiles/khsbb.png", "/app/fronters/profiles/kkhbw.png", @@ -104,25 +116,34 @@ let filesToCache = [ "/app/fronters/profiles/lzlaq.png", "/app/fronters/profiles/mglyq.png", "/app/fronters/profiles/mhnqy.png", + "/app/fronters/profiles/mvaws.png", "/app/fronters/profiles/mxpxm.png", "/app/fronters/profiles/nabky.png", "/app/fronters/profiles/pabmo.png", + "/app/fronters/profiles/ppukh.png", "/app/fronters/profiles/qbzxm.png", "/app/fronters/profiles/qraku.png", + "/app/fronters/profiles/qzbpf.png", "/app/fronters/profiles/rdstg.png", "/app/fronters/profiles/rirgf.png", "/app/fronters/profiles/rmlbf.png", "/app/fronters/profiles/rpjok.png", "/app/fronters/profiles/sbxze.png", "/app/fronters/profiles/sehke.png", + "/app/fronters/profiles/sjuao.png", + "/app/fronters/profiles/souga.png", "/app/fronters/profiles/tfbob.png", "/app/fronters/profiles/tgxst.png", "/app/fronters/profiles/tmgiu.png", + "/app/fronters/profiles/trefr.png", + "/app/fronters/profiles/vahcl.png", "/app/fronters/profiles/vncoa.png", "/app/fronters/profiles/vvsxf.png", + "/app/fronters/profiles/wjovt.png", "/app/fronters/profiles/xbvwt.png", "/app/fronters/profiles/xcjhj.png", "/app/fronters/profiles/ybmig.png", + "/app/fronters/profiles/ynpba.png", "/app/fronters/profiles/zajrk.png", "/app/fronters/profiles/zdtsg.png", "/app/fronters/profiles/zhtzs.png", @@ -160,9 +181,11 @@ let filesToCache = [ "/assets/uploads/pt-duskrainbow.png", "/assets/uploads/pt-fluttershy.png", "/assets/uploads/pt-frostcrystals.png", - "/assets/uploads/pt-izzy.png", + "/assets/uploads/pt-izzymoonbow.png", "/assets/uploads/pt-lavender.png", + "/assets/uploads/pt-lilacbloom.png", "/assets/uploads/pt-mintygrape.png", + "/assets/uploads/pt-mistybrightdawn.png", "/assets/uploads/pt-mistycloud.png", "/assets/uploads/pt-mossystorm.png", "/assets/uploads/pt-pipppetals.png", @@ -172,20 +195,24 @@ let filesToCache = [ "/assets/uploads/pt-scootaloo.png", "/assets/uploads/pt-skydream.png", "/assets/uploads/pt-smolscoots.png", + "/assets/uploads/pt-smolsunny.png", "/assets/uploads/pt-smoltwi.png", "/assets/uploads/pt-starrynight.png", "/assets/uploads/pt-stuffie.png", "/assets/uploads/pt-sunnystarscout.png", "/assets/uploads/pt-sweetiebelle.png", "/assets/uploads/pt-sweetiebot.png", + "/assets/uploads/pt-thunder.png", "/assets/uploads/pt-twilight.png", "/assets/uploads/pt-velvet.png", "/assets/uploads/pt-violetdawn.png", "/assets/uploads/pt-windy.png", "/assets/uploads/pt-windyleaves.png", "/assets/uploads/pt-zippstorm.png", + "/assets/uploads/pt-zoomzephyrwing.png", "/assets/uploads/pt.png", "/assets/uploads/raindrops.png", + "/assets/uploads/ss-lostequestrians.png", "/assets/uploads/ss-sparkles.png" ]; -- cgit