diff --git a/assets/sif/item.json b/assets/serverdata/item.json similarity index 100% rename from assets/sif/item.json rename to assets/serverdata/item.json diff --git a/assets/sif/love.json b/assets/serverdata/love.json similarity index 100% rename from assets/sif/love.json rename to assets/serverdata/love.json diff --git a/assets/sif/notes/Live_0001.json b/assets/serverdata/notes/Live_0001.json similarity index 100% rename from assets/sif/notes/Live_0001.json rename to assets/serverdata/notes/Live_0001.json diff --git a/assets/sif/notes/Live_0002.json b/assets/serverdata/notes/Live_0002.json similarity index 100% rename from assets/sif/notes/Live_0002.json rename to assets/serverdata/notes/Live_0002.json diff --git a/assets/sif/notes/Live_0003.json b/assets/serverdata/notes/Live_0003.json similarity index 100% rename from assets/sif/notes/Live_0003.json rename to assets/serverdata/notes/Live_0003.json diff --git a/assets/sif/notes/Live_0004.json b/assets/serverdata/notes/Live_0004.json similarity index 100% rename from assets/sif/notes/Live_0004.json rename to assets/serverdata/notes/Live_0004.json diff --git a/assets/sif/notes/Live_0005.json b/assets/serverdata/notes/Live_0005.json similarity index 100% rename from assets/sif/notes/Live_0005.json rename to assets/serverdata/notes/Live_0005.json diff --git a/assets/sif/notes/Live_0006.json b/assets/serverdata/notes/Live_0006.json similarity index 100% rename from assets/sif/notes/Live_0006.json rename to assets/serverdata/notes/Live_0006.json diff --git a/assets/sif/notes/Live_0007.json b/assets/serverdata/notes/Live_0007.json similarity index 100% rename from assets/sif/notes/Live_0007.json rename to assets/serverdata/notes/Live_0007.json diff --git a/assets/sif/notes/Live_0008.json b/assets/serverdata/notes/Live_0008.json similarity index 100% rename from assets/sif/notes/Live_0008.json rename to assets/serverdata/notes/Live_0008.json diff --git a/assets/sif/notes/Live_0009.json b/assets/serverdata/notes/Live_0009.json similarity index 100% rename from assets/sif/notes/Live_0009.json rename to assets/serverdata/notes/Live_0009.json diff --git a/assets/sif/notes/Live_0010.json b/assets/serverdata/notes/Live_0010.json similarity index 100% rename from assets/sif/notes/Live_0010.json rename to assets/serverdata/notes/Live_0010.json diff --git a/assets/sif/notes/Live_0011.json b/assets/serverdata/notes/Live_0011.json similarity index 100% rename from assets/sif/notes/Live_0011.json rename to assets/serverdata/notes/Live_0011.json diff --git a/assets/sif/notes/Live_0012.json b/assets/serverdata/notes/Live_0012.json similarity index 100% rename from assets/sif/notes/Live_0012.json rename to assets/serverdata/notes/Live_0012.json diff --git a/assets/sif/notes/Live_0013.json b/assets/serverdata/notes/Live_0013.json similarity index 100% rename from assets/sif/notes/Live_0013.json rename to assets/serverdata/notes/Live_0013.json diff --git a/assets/sif/notes/Live_0014.json b/assets/serverdata/notes/Live_0014.json similarity index 100% rename from assets/sif/notes/Live_0014.json rename to assets/serverdata/notes/Live_0014.json diff --git a/assets/sif/notes/Live_0015.json b/assets/serverdata/notes/Live_0015.json similarity index 100% rename from assets/sif/notes/Live_0015.json rename to assets/serverdata/notes/Live_0015.json diff --git a/assets/sif/notes/Live_0016.json b/assets/serverdata/notes/Live_0016.json similarity index 100% rename from assets/sif/notes/Live_0016.json rename to assets/serverdata/notes/Live_0016.json diff --git a/assets/sif/notes/Live_0017.json b/assets/serverdata/notes/Live_0017.json similarity index 100% rename from assets/sif/notes/Live_0017.json rename to assets/serverdata/notes/Live_0017.json diff --git a/assets/sif/notes/Live_0018.json b/assets/serverdata/notes/Live_0018.json similarity index 100% rename from assets/sif/notes/Live_0018.json rename to assets/serverdata/notes/Live_0018.json diff --git a/assets/sif/notes/Live_0019.json b/assets/serverdata/notes/Live_0019.json similarity index 100% rename from assets/sif/notes/Live_0019.json rename to assets/serverdata/notes/Live_0019.json diff --git a/assets/sif/notes/Live_0020.json b/assets/serverdata/notes/Live_0020.json similarity index 100% rename from assets/sif/notes/Live_0020.json rename to assets/serverdata/notes/Live_0020.json diff --git a/assets/sif/notes/Live_0021.json b/assets/serverdata/notes/Live_0021.json similarity index 100% rename from assets/sif/notes/Live_0021.json rename to assets/serverdata/notes/Live_0021.json diff --git a/assets/sif/notes/Live_0022.json b/assets/serverdata/notes/Live_0022.json similarity index 100% rename from assets/sif/notes/Live_0022.json rename to assets/serverdata/notes/Live_0022.json diff --git a/assets/sif/notes/Live_0023.json b/assets/serverdata/notes/Live_0023.json similarity index 100% rename from assets/sif/notes/Live_0023.json rename to assets/serverdata/notes/Live_0023.json diff --git a/assets/sif/notes/Live_0024.json b/assets/serverdata/notes/Live_0024.json similarity index 100% rename from assets/sif/notes/Live_0024.json rename to assets/serverdata/notes/Live_0024.json diff --git a/assets/sif/notes/Live_0025.json b/assets/serverdata/notes/Live_0025.json similarity index 100% rename from assets/sif/notes/Live_0025.json rename to assets/serverdata/notes/Live_0025.json diff --git a/assets/sif/notes/Live_0026.json b/assets/serverdata/notes/Live_0026.json similarity index 100% rename from assets/sif/notes/Live_0026.json rename to assets/serverdata/notes/Live_0026.json diff --git a/assets/sif/notes/Live_0027.json b/assets/serverdata/notes/Live_0027.json similarity index 100% rename from assets/sif/notes/Live_0027.json rename to assets/serverdata/notes/Live_0027.json diff --git a/assets/sif/notes/Live_0028.json b/assets/serverdata/notes/Live_0028.json similarity index 100% rename from assets/sif/notes/Live_0028.json rename to assets/serverdata/notes/Live_0028.json diff --git a/assets/sif/notes/Live_0029.json b/assets/serverdata/notes/Live_0029.json similarity index 100% rename from assets/sif/notes/Live_0029.json rename to assets/serverdata/notes/Live_0029.json diff --git a/assets/sif/notes/Live_0030.json b/assets/serverdata/notes/Live_0030.json similarity index 100% rename from assets/sif/notes/Live_0030.json rename to assets/serverdata/notes/Live_0030.json diff --git a/assets/sif/notes/Live_0037.json b/assets/serverdata/notes/Live_0037.json similarity index 100% rename from assets/sif/notes/Live_0037.json rename to assets/serverdata/notes/Live_0037.json diff --git a/assets/sif/notes/Live_0038.json b/assets/serverdata/notes/Live_0038.json similarity index 100% rename from assets/sif/notes/Live_0038.json rename to assets/serverdata/notes/Live_0038.json diff --git a/assets/sif/notes/Live_0039.json b/assets/serverdata/notes/Live_0039.json similarity index 100% rename from assets/sif/notes/Live_0039.json rename to assets/serverdata/notes/Live_0039.json diff --git a/assets/sif/notes/Live_0040.json b/assets/serverdata/notes/Live_0040.json similarity index 100% rename from assets/sif/notes/Live_0040.json rename to assets/serverdata/notes/Live_0040.json diff --git a/assets/sif/notes/Live_0041.json b/assets/serverdata/notes/Live_0041.json similarity index 100% rename from assets/sif/notes/Live_0041.json rename to assets/serverdata/notes/Live_0041.json diff --git a/assets/sif/notes/Live_0042.json b/assets/serverdata/notes/Live_0042.json similarity index 100% rename from assets/sif/notes/Live_0042.json rename to assets/serverdata/notes/Live_0042.json diff --git a/assets/sif/notes/Live_0046.json b/assets/serverdata/notes/Live_0046.json similarity index 100% rename from assets/sif/notes/Live_0046.json rename to assets/serverdata/notes/Live_0046.json diff --git a/assets/sif/notes/Live_0047.json b/assets/serverdata/notes/Live_0047.json similarity index 100% rename from assets/sif/notes/Live_0047.json rename to assets/serverdata/notes/Live_0047.json diff --git a/assets/sif/notes/Live_0048.json b/assets/serverdata/notes/Live_0048.json similarity index 100% rename from assets/sif/notes/Live_0048.json rename to assets/serverdata/notes/Live_0048.json diff --git a/assets/sif/notes/Live_0049.json b/assets/serverdata/notes/Live_0049.json similarity index 100% rename from assets/sif/notes/Live_0049.json rename to assets/serverdata/notes/Live_0049.json diff --git a/assets/sif/notes/Live_0050.json b/assets/serverdata/notes/Live_0050.json similarity index 100% rename from assets/sif/notes/Live_0050.json rename to assets/serverdata/notes/Live_0050.json diff --git a/assets/sif/notes/Live_0051.json b/assets/serverdata/notes/Live_0051.json similarity index 100% rename from assets/sif/notes/Live_0051.json rename to assets/serverdata/notes/Live_0051.json diff --git a/assets/sif/notes/Live_0052.json b/assets/serverdata/notes/Live_0052.json similarity index 100% rename from assets/sif/notes/Live_0052.json rename to assets/serverdata/notes/Live_0052.json diff --git a/assets/sif/notes/Live_0053.json b/assets/serverdata/notes/Live_0053.json similarity index 100% rename from assets/sif/notes/Live_0053.json rename to assets/serverdata/notes/Live_0053.json diff --git a/assets/sif/notes/Live_0054.json b/assets/serverdata/notes/Live_0054.json similarity index 100% rename from assets/sif/notes/Live_0054.json rename to assets/serverdata/notes/Live_0054.json diff --git a/assets/sif/notes/Live_0055.json b/assets/serverdata/notes/Live_0055.json similarity index 100% rename from assets/sif/notes/Live_0055.json rename to assets/serverdata/notes/Live_0055.json diff --git a/assets/sif/notes/Live_0056.json b/assets/serverdata/notes/Live_0056.json similarity index 100% rename from assets/sif/notes/Live_0056.json rename to assets/serverdata/notes/Live_0056.json diff --git a/assets/sif/notes/Live_0057.json b/assets/serverdata/notes/Live_0057.json similarity index 100% rename from assets/sif/notes/Live_0057.json rename to assets/serverdata/notes/Live_0057.json diff --git a/assets/sif/notes/Live_0058.json b/assets/serverdata/notes/Live_0058.json similarity index 100% rename from assets/sif/notes/Live_0058.json rename to assets/serverdata/notes/Live_0058.json diff --git a/assets/sif/notes/Live_0059.json b/assets/serverdata/notes/Live_0059.json similarity index 100% rename from assets/sif/notes/Live_0059.json rename to assets/serverdata/notes/Live_0059.json diff --git a/assets/sif/notes/Live_0060.json b/assets/serverdata/notes/Live_0060.json similarity index 100% rename from assets/sif/notes/Live_0060.json rename to assets/serverdata/notes/Live_0060.json diff --git a/assets/sif/notes/Live_0061.json b/assets/serverdata/notes/Live_0061.json similarity index 100% rename from assets/sif/notes/Live_0061.json rename to assets/serverdata/notes/Live_0061.json diff --git a/assets/sif/notes/Live_0062.json b/assets/serverdata/notes/Live_0062.json similarity index 100% rename from assets/sif/notes/Live_0062.json rename to assets/serverdata/notes/Live_0062.json diff --git a/assets/sif/notes/Live_0063.json b/assets/serverdata/notes/Live_0063.json similarity index 100% rename from assets/sif/notes/Live_0063.json rename to assets/serverdata/notes/Live_0063.json diff --git a/assets/sif/notes/Live_0068.json b/assets/serverdata/notes/Live_0068.json similarity index 100% rename from assets/sif/notes/Live_0068.json rename to assets/serverdata/notes/Live_0068.json diff --git a/assets/sif/notes/Live_0069.json b/assets/serverdata/notes/Live_0069.json similarity index 100% rename from assets/sif/notes/Live_0069.json rename to assets/serverdata/notes/Live_0069.json diff --git a/assets/sif/notes/Live_0070.json b/assets/serverdata/notes/Live_0070.json similarity index 100% rename from assets/sif/notes/Live_0070.json rename to assets/serverdata/notes/Live_0070.json diff --git a/assets/sif/notes/Live_0071.json b/assets/serverdata/notes/Live_0071.json similarity index 100% rename from assets/sif/notes/Live_0071.json rename to assets/serverdata/notes/Live_0071.json diff --git a/assets/sif/notes/Live_0072.json b/assets/serverdata/notes/Live_0072.json similarity index 100% rename from assets/sif/notes/Live_0072.json rename to assets/serverdata/notes/Live_0072.json diff --git a/assets/sif/notes/Live_0073.json b/assets/serverdata/notes/Live_0073.json similarity index 100% rename from assets/sif/notes/Live_0073.json rename to assets/serverdata/notes/Live_0073.json diff --git a/assets/sif/notes/Live_0074.json b/assets/serverdata/notes/Live_0074.json similarity index 100% rename from assets/sif/notes/Live_0074.json rename to assets/serverdata/notes/Live_0074.json diff --git a/assets/sif/notes/Live_0075.json b/assets/serverdata/notes/Live_0075.json similarity index 100% rename from assets/sif/notes/Live_0075.json rename to assets/serverdata/notes/Live_0075.json diff --git a/assets/sif/notes/Live_0076.json b/assets/serverdata/notes/Live_0076.json similarity index 100% rename from assets/sif/notes/Live_0076.json rename to assets/serverdata/notes/Live_0076.json diff --git a/assets/sif/notes/Live_0077.json b/assets/serverdata/notes/Live_0077.json similarity index 100% rename from assets/sif/notes/Live_0077.json rename to assets/serverdata/notes/Live_0077.json diff --git a/assets/sif/notes/Live_0078.json b/assets/serverdata/notes/Live_0078.json similarity index 100% rename from assets/sif/notes/Live_0078.json rename to assets/serverdata/notes/Live_0078.json diff --git a/assets/sif/notes/Live_0079.json b/assets/serverdata/notes/Live_0079.json similarity index 100% rename from assets/sif/notes/Live_0079.json rename to assets/serverdata/notes/Live_0079.json diff --git a/assets/sif/notes/Live_0080.json b/assets/serverdata/notes/Live_0080.json similarity index 100% rename from assets/sif/notes/Live_0080.json rename to assets/serverdata/notes/Live_0080.json diff --git a/assets/sif/notes/Live_0081.json b/assets/serverdata/notes/Live_0081.json similarity index 100% rename from assets/sif/notes/Live_0081.json rename to assets/serverdata/notes/Live_0081.json diff --git a/assets/sif/notes/Live_0082.json b/assets/serverdata/notes/Live_0082.json similarity index 100% rename from assets/sif/notes/Live_0082.json rename to assets/serverdata/notes/Live_0082.json diff --git a/assets/sif/notes/Live_0083.json b/assets/serverdata/notes/Live_0083.json similarity index 100% rename from assets/sif/notes/Live_0083.json rename to assets/serverdata/notes/Live_0083.json diff --git a/assets/sif/notes/Live_0084.json b/assets/serverdata/notes/Live_0084.json similarity index 100% rename from assets/sif/notes/Live_0084.json rename to assets/serverdata/notes/Live_0084.json diff --git a/assets/sif/notes/Live_0088.json b/assets/serverdata/notes/Live_0088.json similarity index 100% rename from assets/sif/notes/Live_0088.json rename to assets/serverdata/notes/Live_0088.json diff --git a/assets/sif/notes/Live_0089.json b/assets/serverdata/notes/Live_0089.json similarity index 100% rename from assets/sif/notes/Live_0089.json rename to assets/serverdata/notes/Live_0089.json diff --git a/assets/sif/notes/Live_0090.json b/assets/serverdata/notes/Live_0090.json similarity index 100% rename from assets/sif/notes/Live_0090.json rename to assets/serverdata/notes/Live_0090.json diff --git a/assets/sif/notes/Live_0091.json b/assets/serverdata/notes/Live_0091.json similarity index 100% rename from assets/sif/notes/Live_0091.json rename to assets/serverdata/notes/Live_0091.json diff --git a/assets/sif/notes/Live_0092.json b/assets/serverdata/notes/Live_0092.json similarity index 100% rename from assets/sif/notes/Live_0092.json rename to assets/serverdata/notes/Live_0092.json diff --git a/assets/sif/notes/Live_0096.json b/assets/serverdata/notes/Live_0096.json similarity index 100% rename from assets/sif/notes/Live_0096.json rename to assets/serverdata/notes/Live_0096.json diff --git a/assets/sif/notes/Live_0097.json b/assets/serverdata/notes/Live_0097.json similarity index 100% rename from assets/sif/notes/Live_0097.json rename to assets/serverdata/notes/Live_0097.json diff --git a/assets/sif/notes/Live_0098.json b/assets/serverdata/notes/Live_0098.json similarity index 100% rename from assets/sif/notes/Live_0098.json rename to assets/serverdata/notes/Live_0098.json diff --git a/assets/sif/notes/Live_0099.json b/assets/serverdata/notes/Live_0099.json similarity index 100% rename from assets/sif/notes/Live_0099.json rename to assets/serverdata/notes/Live_0099.json diff --git a/assets/sif/notes/Live_0104.json b/assets/serverdata/notes/Live_0104.json similarity index 100% rename from assets/sif/notes/Live_0104.json rename to assets/serverdata/notes/Live_0104.json diff --git a/assets/sif/notes/Live_0112.json b/assets/serverdata/notes/Live_0112.json similarity index 100% rename from assets/sif/notes/Live_0112.json rename to assets/serverdata/notes/Live_0112.json diff --git a/assets/sif/notes/Live_0113.json b/assets/serverdata/notes/Live_0113.json similarity index 100% rename from assets/sif/notes/Live_0113.json rename to assets/serverdata/notes/Live_0113.json diff --git a/assets/sif/notes/Live_0114.json b/assets/serverdata/notes/Live_0114.json similarity index 100% rename from assets/sif/notes/Live_0114.json rename to assets/serverdata/notes/Live_0114.json diff --git a/assets/sif/notes/Live_0115.json b/assets/serverdata/notes/Live_0115.json similarity index 100% rename from assets/sif/notes/Live_0115.json rename to assets/serverdata/notes/Live_0115.json diff --git a/assets/sif/notes/Live_0116.json b/assets/serverdata/notes/Live_0116.json similarity index 100% rename from assets/sif/notes/Live_0116.json rename to assets/serverdata/notes/Live_0116.json diff --git a/assets/sif/notes/Live_0124.json b/assets/serverdata/notes/Live_0124.json similarity index 100% rename from assets/sif/notes/Live_0124.json rename to assets/serverdata/notes/Live_0124.json diff --git a/assets/sif/notes/Live_0125.json b/assets/serverdata/notes/Live_0125.json similarity index 100% rename from assets/sif/notes/Live_0125.json rename to assets/serverdata/notes/Live_0125.json diff --git a/assets/sif/notes/Live_0126.json b/assets/serverdata/notes/Live_0126.json similarity index 100% rename from assets/sif/notes/Live_0126.json rename to assets/serverdata/notes/Live_0126.json diff --git a/assets/sif/notes/Live_0127.json b/assets/serverdata/notes/Live_0127.json similarity index 100% rename from assets/sif/notes/Live_0127.json rename to assets/serverdata/notes/Live_0127.json diff --git a/assets/sif/notes/Live_0128.json b/assets/serverdata/notes/Live_0128.json similarity index 100% rename from assets/sif/notes/Live_0128.json rename to assets/serverdata/notes/Live_0128.json diff --git a/assets/sif/notes/Live_0129.json b/assets/serverdata/notes/Live_0129.json similarity index 100% rename from assets/sif/notes/Live_0129.json rename to assets/serverdata/notes/Live_0129.json diff --git a/assets/sif/notes/Live_0148.json b/assets/serverdata/notes/Live_0148.json similarity index 100% rename from assets/sif/notes/Live_0148.json rename to assets/serverdata/notes/Live_0148.json diff --git a/assets/sif/notes/Live_0149.json b/assets/serverdata/notes/Live_0149.json similarity index 100% rename from assets/sif/notes/Live_0149.json rename to assets/serverdata/notes/Live_0149.json diff --git a/assets/sif/notes/Live_0150.json b/assets/serverdata/notes/Live_0150.json similarity index 100% rename from assets/sif/notes/Live_0150.json rename to assets/serverdata/notes/Live_0150.json diff --git a/assets/sif/notes/Live_0151.json b/assets/serverdata/notes/Live_0151.json similarity index 100% rename from assets/sif/notes/Live_0151.json rename to assets/serverdata/notes/Live_0151.json diff --git a/assets/sif/notes/Live_0152.json b/assets/serverdata/notes/Live_0152.json similarity index 100% rename from assets/sif/notes/Live_0152.json rename to assets/serverdata/notes/Live_0152.json diff --git a/assets/sif/notes/Live_0181.json b/assets/serverdata/notes/Live_0181.json similarity index 100% rename from assets/sif/notes/Live_0181.json rename to assets/serverdata/notes/Live_0181.json diff --git a/assets/sif/notes/Live_0182.json b/assets/serverdata/notes/Live_0182.json similarity index 100% rename from assets/sif/notes/Live_0182.json rename to assets/serverdata/notes/Live_0182.json diff --git a/assets/sif/notes/Live_0183.json b/assets/serverdata/notes/Live_0183.json similarity index 100% rename from assets/sif/notes/Live_0183.json rename to assets/serverdata/notes/Live_0183.json diff --git a/assets/sif/notes/Live_0259.json b/assets/serverdata/notes/Live_0259.json similarity index 100% rename from assets/sif/notes/Live_0259.json rename to assets/serverdata/notes/Live_0259.json diff --git a/assets/sif/notes/Live_0260.json b/assets/serverdata/notes/Live_0260.json similarity index 100% rename from assets/sif/notes/Live_0260.json rename to assets/serverdata/notes/Live_0260.json diff --git a/assets/sif/notes/Live_0261.json b/assets/serverdata/notes/Live_0261.json similarity index 100% rename from assets/sif/notes/Live_0261.json rename to assets/serverdata/notes/Live_0261.json diff --git a/assets/sif/notes/Live_0262.json b/assets/serverdata/notes/Live_0262.json similarity index 100% rename from assets/sif/notes/Live_0262.json rename to assets/serverdata/notes/Live_0262.json diff --git a/assets/sif/notes/Live_0270.json b/assets/serverdata/notes/Live_0270.json similarity index 100% rename from assets/sif/notes/Live_0270.json rename to assets/serverdata/notes/Live_0270.json diff --git a/assets/sif/notes/Live_0271.json b/assets/serverdata/notes/Live_0271.json similarity index 100% rename from assets/sif/notes/Live_0271.json rename to assets/serverdata/notes/Live_0271.json diff --git a/assets/sif/notes/Live_0272.json b/assets/serverdata/notes/Live_0272.json similarity index 100% rename from assets/sif/notes/Live_0272.json rename to assets/serverdata/notes/Live_0272.json diff --git a/assets/sif/notes/Live_0303.json b/assets/serverdata/notes/Live_0303.json similarity index 100% rename from assets/sif/notes/Live_0303.json rename to assets/serverdata/notes/Live_0303.json diff --git a/assets/sif/notes/Live_0304.json b/assets/serverdata/notes/Live_0304.json similarity index 100% rename from assets/sif/notes/Live_0304.json rename to assets/serverdata/notes/Live_0304.json diff --git a/assets/sif/notes/Live_0305.json b/assets/serverdata/notes/Live_0305.json similarity index 100% rename from assets/sif/notes/Live_0305.json rename to assets/serverdata/notes/Live_0305.json diff --git a/assets/sif/notes/Live_0306.json b/assets/serverdata/notes/Live_0306.json similarity index 100% rename from assets/sif/notes/Live_0306.json rename to assets/serverdata/notes/Live_0306.json diff --git a/assets/sif/notes/Live_0314.json b/assets/serverdata/notes/Live_0314.json similarity index 100% rename from assets/sif/notes/Live_0314.json rename to assets/serverdata/notes/Live_0314.json diff --git a/assets/sif/notes/Live_0315.json b/assets/serverdata/notes/Live_0315.json similarity index 100% rename from assets/sif/notes/Live_0315.json rename to assets/serverdata/notes/Live_0315.json diff --git a/assets/sif/notes/Live_0316.json b/assets/serverdata/notes/Live_0316.json similarity index 100% rename from assets/sif/notes/Live_0316.json rename to assets/serverdata/notes/Live_0316.json diff --git a/assets/sif/notes/Live_0346.json b/assets/serverdata/notes/Live_0346.json similarity index 100% rename from assets/sif/notes/Live_0346.json rename to assets/serverdata/notes/Live_0346.json diff --git a/assets/sif/notes/Live_0347.json b/assets/serverdata/notes/Live_0347.json similarity index 100% rename from assets/sif/notes/Live_0347.json rename to assets/serverdata/notes/Live_0347.json diff --git a/assets/sif/notes/Live_0348.json b/assets/serverdata/notes/Live_0348.json similarity index 100% rename from assets/sif/notes/Live_0348.json rename to assets/serverdata/notes/Live_0348.json diff --git a/assets/sif/notes/Live_0349.json b/assets/serverdata/notes/Live_0349.json similarity index 100% rename from assets/sif/notes/Live_0349.json rename to assets/serverdata/notes/Live_0349.json diff --git a/assets/sif/notes/Live_0350.json b/assets/serverdata/notes/Live_0350.json similarity index 100% rename from assets/sif/notes/Live_0350.json rename to assets/serverdata/notes/Live_0350.json diff --git a/assets/sif/notes/Live_0358.json b/assets/serverdata/notes/Live_0358.json similarity index 100% rename from assets/sif/notes/Live_0358.json rename to assets/serverdata/notes/Live_0358.json diff --git a/assets/sif/notes/Live_0359.json b/assets/serverdata/notes/Live_0359.json similarity index 100% rename from assets/sif/notes/Live_0359.json rename to assets/serverdata/notes/Live_0359.json diff --git a/assets/sif/notes/Live_0360.json b/assets/serverdata/notes/Live_0360.json similarity index 100% rename from assets/sif/notes/Live_0360.json rename to assets/serverdata/notes/Live_0360.json diff --git a/assets/sif/notes/Live_0390.json b/assets/serverdata/notes/Live_0390.json similarity index 100% rename from assets/sif/notes/Live_0390.json rename to assets/serverdata/notes/Live_0390.json diff --git a/assets/sif/notes/Live_0391.json b/assets/serverdata/notes/Live_0391.json similarity index 100% rename from assets/sif/notes/Live_0391.json rename to assets/serverdata/notes/Live_0391.json diff --git a/assets/sif/notes/Live_0392.json b/assets/serverdata/notes/Live_0392.json similarity index 100% rename from assets/sif/notes/Live_0392.json rename to assets/serverdata/notes/Live_0392.json diff --git a/assets/sif/notes/Live_0393.json b/assets/serverdata/notes/Live_0393.json similarity index 100% rename from assets/sif/notes/Live_0393.json rename to assets/serverdata/notes/Live_0393.json diff --git a/assets/sif/notes/Live_0402.json b/assets/serverdata/notes/Live_0402.json similarity index 100% rename from assets/sif/notes/Live_0402.json rename to assets/serverdata/notes/Live_0402.json diff --git a/assets/sif/notes/Live_0403.json b/assets/serverdata/notes/Live_0403.json similarity index 100% rename from assets/sif/notes/Live_0403.json rename to assets/serverdata/notes/Live_0403.json diff --git a/assets/sif/notes/Live_0404.json b/assets/serverdata/notes/Live_0404.json similarity index 100% rename from assets/sif/notes/Live_0404.json rename to assets/serverdata/notes/Live_0404.json diff --git a/assets/sif/notes/Live_0413.json b/assets/serverdata/notes/Live_0413.json similarity index 100% rename from assets/sif/notes/Live_0413.json rename to assets/serverdata/notes/Live_0413.json diff --git a/assets/sif/notes/Live_0414.json b/assets/serverdata/notes/Live_0414.json similarity index 100% rename from assets/sif/notes/Live_0414.json rename to assets/serverdata/notes/Live_0414.json diff --git a/assets/sif/notes/Live_0415.json b/assets/serverdata/notes/Live_0415.json similarity index 100% rename from assets/sif/notes/Live_0415.json rename to assets/serverdata/notes/Live_0415.json diff --git a/assets/sif/notes/Live_0416.json b/assets/serverdata/notes/Live_0416.json similarity index 100% rename from assets/sif/notes/Live_0416.json rename to assets/serverdata/notes/Live_0416.json diff --git a/assets/sif/notes/Live_0425.json b/assets/serverdata/notes/Live_0425.json similarity index 100% rename from assets/sif/notes/Live_0425.json rename to assets/serverdata/notes/Live_0425.json diff --git a/assets/sif/notes/Live_0426.json b/assets/serverdata/notes/Live_0426.json similarity index 100% rename from assets/sif/notes/Live_0426.json rename to assets/serverdata/notes/Live_0426.json diff --git a/assets/sif/notes/Live_0427.json b/assets/serverdata/notes/Live_0427.json similarity index 100% rename from assets/sif/notes/Live_0427.json rename to assets/serverdata/notes/Live_0427.json diff --git a/assets/sif/notes/Live_0436.json b/assets/serverdata/notes/Live_0436.json similarity index 100% rename from assets/sif/notes/Live_0436.json rename to assets/serverdata/notes/Live_0436.json diff --git a/assets/sif/notes/Live_0437.json b/assets/serverdata/notes/Live_0437.json similarity index 100% rename from assets/sif/notes/Live_0437.json rename to assets/serverdata/notes/Live_0437.json diff --git a/assets/sif/notes/Live_0438.json b/assets/serverdata/notes/Live_0438.json similarity index 100% rename from assets/sif/notes/Live_0438.json rename to assets/serverdata/notes/Live_0438.json diff --git a/assets/sif/notes/Live_0439.json b/assets/serverdata/notes/Live_0439.json similarity index 100% rename from assets/sif/notes/Live_0439.json rename to assets/serverdata/notes/Live_0439.json diff --git a/assets/sif/notes/Live_0440.json b/assets/serverdata/notes/Live_0440.json similarity index 100% rename from assets/sif/notes/Live_0440.json rename to assets/serverdata/notes/Live_0440.json diff --git a/assets/sif/notes/Live_0441.json b/assets/serverdata/notes/Live_0441.json similarity index 100% rename from assets/sif/notes/Live_0441.json rename to assets/serverdata/notes/Live_0441.json diff --git a/assets/sif/notes/Live_0442.json b/assets/serverdata/notes/Live_0442.json similarity index 100% rename from assets/sif/notes/Live_0442.json rename to assets/serverdata/notes/Live_0442.json diff --git a/assets/sif/notes/Live_0443.json b/assets/serverdata/notes/Live_0443.json similarity index 100% rename from assets/sif/notes/Live_0443.json rename to assets/serverdata/notes/Live_0443.json diff --git a/assets/sif/notes/Live_0444.json b/assets/serverdata/notes/Live_0444.json similarity index 100% rename from assets/sif/notes/Live_0444.json rename to assets/serverdata/notes/Live_0444.json diff --git a/assets/sif/notes/Live_0445.json b/assets/serverdata/notes/Live_0445.json similarity index 100% rename from assets/sif/notes/Live_0445.json rename to assets/serverdata/notes/Live_0445.json diff --git a/assets/sif/notes/Live_0446.json b/assets/serverdata/notes/Live_0446.json similarity index 100% rename from assets/sif/notes/Live_0446.json rename to assets/serverdata/notes/Live_0446.json diff --git a/assets/sif/notes/Live_0455.json b/assets/serverdata/notes/Live_0455.json similarity index 100% rename from assets/sif/notes/Live_0455.json rename to assets/serverdata/notes/Live_0455.json diff --git a/assets/sif/notes/Live_0456.json b/assets/serverdata/notes/Live_0456.json similarity index 100% rename from assets/sif/notes/Live_0456.json rename to assets/serverdata/notes/Live_0456.json diff --git a/assets/sif/notes/Live_0457.json b/assets/serverdata/notes/Live_0457.json similarity index 100% rename from assets/sif/notes/Live_0457.json rename to assets/serverdata/notes/Live_0457.json diff --git a/assets/sif/notes/Live_0458.json b/assets/serverdata/notes/Live_0458.json similarity index 100% rename from assets/sif/notes/Live_0458.json rename to assets/serverdata/notes/Live_0458.json diff --git a/assets/sif/notes/Live_0459.json b/assets/serverdata/notes/Live_0459.json similarity index 100% rename from assets/sif/notes/Live_0459.json rename to assets/serverdata/notes/Live_0459.json diff --git a/assets/sif/notes/Live_0460.json b/assets/serverdata/notes/Live_0460.json similarity index 100% rename from assets/sif/notes/Live_0460.json rename to assets/serverdata/notes/Live_0460.json diff --git a/assets/sif/notes/Live_0461.json b/assets/serverdata/notes/Live_0461.json similarity index 100% rename from assets/sif/notes/Live_0461.json rename to assets/serverdata/notes/Live_0461.json diff --git a/assets/sif/notes/Live_0462.json b/assets/serverdata/notes/Live_0462.json similarity index 100% rename from assets/sif/notes/Live_0462.json rename to assets/serverdata/notes/Live_0462.json diff --git a/assets/sif/notes/Live_0463.json b/assets/serverdata/notes/Live_0463.json similarity index 100% rename from assets/sif/notes/Live_0463.json rename to assets/serverdata/notes/Live_0463.json diff --git a/assets/sif/notes/Live_0475.json b/assets/serverdata/notes/Live_0475.json similarity index 100% rename from assets/sif/notes/Live_0475.json rename to assets/serverdata/notes/Live_0475.json diff --git a/assets/sif/notes/Live_0476.json b/assets/serverdata/notes/Live_0476.json similarity index 100% rename from assets/sif/notes/Live_0476.json rename to assets/serverdata/notes/Live_0476.json diff --git a/assets/sif/notes/Live_0477.json b/assets/serverdata/notes/Live_0477.json similarity index 100% rename from assets/sif/notes/Live_0477.json rename to assets/serverdata/notes/Live_0477.json diff --git a/assets/sif/notes/Live_0478.json b/assets/serverdata/notes/Live_0478.json similarity index 100% rename from assets/sif/notes/Live_0478.json rename to assets/serverdata/notes/Live_0478.json diff --git a/assets/sif/notes/Live_0479.json b/assets/serverdata/notes/Live_0479.json similarity index 100% rename from assets/sif/notes/Live_0479.json rename to assets/serverdata/notes/Live_0479.json diff --git a/assets/sif/notes/Live_0480.json b/assets/serverdata/notes/Live_0480.json similarity index 100% rename from assets/sif/notes/Live_0480.json rename to assets/serverdata/notes/Live_0480.json diff --git a/assets/sif/notes/Live_0481.json b/assets/serverdata/notes/Live_0481.json similarity index 100% rename from assets/sif/notes/Live_0481.json rename to assets/serverdata/notes/Live_0481.json diff --git a/assets/sif/notes/Live_0482.json b/assets/serverdata/notes/Live_0482.json similarity index 100% rename from assets/sif/notes/Live_0482.json rename to assets/serverdata/notes/Live_0482.json diff --git a/assets/sif/notes/Live_0483.json b/assets/serverdata/notes/Live_0483.json similarity index 100% rename from assets/sif/notes/Live_0483.json rename to assets/serverdata/notes/Live_0483.json diff --git a/assets/sif/notes/Live_0484.json b/assets/serverdata/notes/Live_0484.json similarity index 100% rename from assets/sif/notes/Live_0484.json rename to assets/serverdata/notes/Live_0484.json diff --git a/assets/sif/notes/Live_0485.json b/assets/serverdata/notes/Live_0485.json similarity index 100% rename from assets/sif/notes/Live_0485.json rename to assets/serverdata/notes/Live_0485.json diff --git a/assets/sif/notes/Live_0486.json b/assets/serverdata/notes/Live_0486.json similarity index 100% rename from assets/sif/notes/Live_0486.json rename to assets/serverdata/notes/Live_0486.json diff --git a/assets/sif/notes/Live_0487.json b/assets/serverdata/notes/Live_0487.json similarity index 100% rename from assets/sif/notes/Live_0487.json rename to assets/serverdata/notes/Live_0487.json diff --git a/assets/sif/notes/Live_0496.json b/assets/serverdata/notes/Live_0496.json similarity index 100% rename from assets/sif/notes/Live_0496.json rename to assets/serverdata/notes/Live_0496.json diff --git a/assets/sif/notes/Live_0497.json b/assets/serverdata/notes/Live_0497.json similarity index 100% rename from assets/sif/notes/Live_0497.json rename to assets/serverdata/notes/Live_0497.json diff --git a/assets/sif/notes/Live_0498.json b/assets/serverdata/notes/Live_0498.json similarity index 100% rename from assets/sif/notes/Live_0498.json rename to assets/serverdata/notes/Live_0498.json diff --git a/assets/sif/notes/Live_0507.json b/assets/serverdata/notes/Live_0507.json similarity index 100% rename from assets/sif/notes/Live_0507.json rename to assets/serverdata/notes/Live_0507.json diff --git a/assets/sif/notes/Live_0508.json b/assets/serverdata/notes/Live_0508.json similarity index 100% rename from assets/sif/notes/Live_0508.json rename to assets/serverdata/notes/Live_0508.json diff --git a/assets/sif/notes/Live_0509.json b/assets/serverdata/notes/Live_0509.json similarity index 100% rename from assets/sif/notes/Live_0509.json rename to assets/serverdata/notes/Live_0509.json diff --git a/assets/sif/notes/Live_0510.json b/assets/serverdata/notes/Live_0510.json similarity index 100% rename from assets/sif/notes/Live_0510.json rename to assets/serverdata/notes/Live_0510.json diff --git a/assets/sif/notes/Live_0511.json b/assets/serverdata/notes/Live_0511.json similarity index 100% rename from assets/sif/notes/Live_0511.json rename to assets/serverdata/notes/Live_0511.json diff --git a/assets/sif/notes/Live_0520.json b/assets/serverdata/notes/Live_0520.json similarity index 100% rename from assets/sif/notes/Live_0520.json rename to assets/serverdata/notes/Live_0520.json diff --git a/assets/sif/notes/Live_0521.json b/assets/serverdata/notes/Live_0521.json similarity index 100% rename from assets/sif/notes/Live_0521.json rename to assets/serverdata/notes/Live_0521.json diff --git a/assets/sif/notes/Live_0522.json b/assets/serverdata/notes/Live_0522.json similarity index 100% rename from assets/sif/notes/Live_0522.json rename to assets/serverdata/notes/Live_0522.json diff --git a/assets/sif/notes/Live_0534.json b/assets/serverdata/notes/Live_0534.json similarity index 100% rename from assets/sif/notes/Live_0534.json rename to assets/serverdata/notes/Live_0534.json diff --git a/assets/sif/notes/Live_0535.json b/assets/serverdata/notes/Live_0535.json similarity index 100% rename from assets/sif/notes/Live_0535.json rename to assets/serverdata/notes/Live_0535.json diff --git a/assets/sif/notes/Live_0536.json b/assets/serverdata/notes/Live_0536.json similarity index 100% rename from assets/sif/notes/Live_0536.json rename to assets/serverdata/notes/Live_0536.json diff --git a/assets/sif/notes/Live_0537.json b/assets/serverdata/notes/Live_0537.json similarity index 100% rename from assets/sif/notes/Live_0537.json rename to assets/serverdata/notes/Live_0537.json diff --git a/assets/sif/notes/Live_0538.json b/assets/serverdata/notes/Live_0538.json similarity index 100% rename from assets/sif/notes/Live_0538.json rename to assets/serverdata/notes/Live_0538.json diff --git a/assets/sif/notes/Live_0539.json b/assets/serverdata/notes/Live_0539.json similarity index 100% rename from assets/sif/notes/Live_0539.json rename to assets/serverdata/notes/Live_0539.json diff --git a/assets/sif/notes/Live_0540.json b/assets/serverdata/notes/Live_0540.json similarity index 100% rename from assets/sif/notes/Live_0540.json rename to assets/serverdata/notes/Live_0540.json diff --git a/assets/sif/notes/Live_0549.json b/assets/serverdata/notes/Live_0549.json similarity index 100% rename from assets/sif/notes/Live_0549.json rename to assets/serverdata/notes/Live_0549.json diff --git a/assets/sif/notes/Live_0550.json b/assets/serverdata/notes/Live_0550.json similarity index 100% rename from assets/sif/notes/Live_0550.json rename to assets/serverdata/notes/Live_0550.json diff --git a/assets/sif/notes/Live_0551.json b/assets/serverdata/notes/Live_0551.json similarity index 100% rename from assets/sif/notes/Live_0551.json rename to assets/serverdata/notes/Live_0551.json diff --git a/assets/sif/notes/Live_0552.json b/assets/serverdata/notes/Live_0552.json similarity index 100% rename from assets/sif/notes/Live_0552.json rename to assets/serverdata/notes/Live_0552.json diff --git a/assets/sif/notes/Live_0561.json b/assets/serverdata/notes/Live_0561.json similarity index 100% rename from assets/sif/notes/Live_0561.json rename to assets/serverdata/notes/Live_0561.json diff --git a/assets/sif/notes/Live_0562.json b/assets/serverdata/notes/Live_0562.json similarity index 100% rename from assets/sif/notes/Live_0562.json rename to assets/serverdata/notes/Live_0562.json diff --git a/assets/sif/notes/Live_0563.json b/assets/serverdata/notes/Live_0563.json similarity index 100% rename from assets/sif/notes/Live_0563.json rename to assets/serverdata/notes/Live_0563.json diff --git a/assets/sif/notes/Live_0564.json b/assets/serverdata/notes/Live_0564.json similarity index 100% rename from assets/sif/notes/Live_0564.json rename to assets/serverdata/notes/Live_0564.json diff --git a/assets/sif/notes/Live_0565.json b/assets/serverdata/notes/Live_0565.json similarity index 100% rename from assets/sif/notes/Live_0565.json rename to assets/serverdata/notes/Live_0565.json diff --git a/assets/sif/notes/Live_0566.json b/assets/serverdata/notes/Live_0566.json similarity index 100% rename from assets/sif/notes/Live_0566.json rename to assets/serverdata/notes/Live_0566.json diff --git a/assets/sif/notes/Live_0567.json b/assets/serverdata/notes/Live_0567.json similarity index 100% rename from assets/sif/notes/Live_0567.json rename to assets/serverdata/notes/Live_0567.json diff --git a/assets/sif/notes/Live_0568.json b/assets/serverdata/notes/Live_0568.json similarity index 100% rename from assets/sif/notes/Live_0568.json rename to assets/serverdata/notes/Live_0568.json diff --git a/assets/sif/notes/Live_0569.json b/assets/serverdata/notes/Live_0569.json similarity index 100% rename from assets/sif/notes/Live_0569.json rename to assets/serverdata/notes/Live_0569.json diff --git a/assets/sif/notes/Live_0578.json b/assets/serverdata/notes/Live_0578.json similarity index 100% rename from assets/sif/notes/Live_0578.json rename to assets/serverdata/notes/Live_0578.json diff --git a/assets/sif/notes/Live_0579.json b/assets/serverdata/notes/Live_0579.json similarity index 100% rename from assets/sif/notes/Live_0579.json rename to assets/serverdata/notes/Live_0579.json diff --git a/assets/sif/notes/Live_0580.json b/assets/serverdata/notes/Live_0580.json similarity index 100% rename from assets/sif/notes/Live_0580.json rename to assets/serverdata/notes/Live_0580.json diff --git a/assets/sif/notes/Live_0589.json b/assets/serverdata/notes/Live_0589.json similarity index 100% rename from assets/sif/notes/Live_0589.json rename to assets/serverdata/notes/Live_0589.json diff --git a/assets/sif/notes/Live_0590.json b/assets/serverdata/notes/Live_0590.json similarity index 100% rename from assets/sif/notes/Live_0590.json rename to assets/serverdata/notes/Live_0590.json diff --git a/assets/sif/notes/Live_0591.json b/assets/serverdata/notes/Live_0591.json similarity index 100% rename from assets/sif/notes/Live_0591.json rename to assets/serverdata/notes/Live_0591.json diff --git a/assets/sif/notes/Live_0592.json b/assets/serverdata/notes/Live_0592.json similarity index 100% rename from assets/sif/notes/Live_0592.json rename to assets/serverdata/notes/Live_0592.json diff --git a/assets/sif/notes/Live_0593.json b/assets/serverdata/notes/Live_0593.json similarity index 100% rename from assets/sif/notes/Live_0593.json rename to assets/serverdata/notes/Live_0593.json diff --git a/assets/sif/notes/Live_0594.json b/assets/serverdata/notes/Live_0594.json similarity index 100% rename from assets/sif/notes/Live_0594.json rename to assets/serverdata/notes/Live_0594.json diff --git a/assets/sif/notes/Live_0601.json b/assets/serverdata/notes/Live_0601.json similarity index 100% rename from assets/sif/notes/Live_0601.json rename to assets/serverdata/notes/Live_0601.json diff --git a/assets/sif/notes/Live_0603.json b/assets/serverdata/notes/Live_0603.json similarity index 100% rename from assets/sif/notes/Live_0603.json rename to assets/serverdata/notes/Live_0603.json diff --git a/assets/sif/notes/Live_0604.json b/assets/serverdata/notes/Live_0604.json similarity index 100% rename from assets/sif/notes/Live_0604.json rename to assets/serverdata/notes/Live_0604.json diff --git a/assets/sif/notes/Live_0605.json b/assets/serverdata/notes/Live_0605.json similarity index 100% rename from assets/sif/notes/Live_0605.json rename to assets/serverdata/notes/Live_0605.json diff --git a/assets/sif/notes/Live_0606.json b/assets/serverdata/notes/Live_0606.json similarity index 100% rename from assets/sif/notes/Live_0606.json rename to assets/serverdata/notes/Live_0606.json diff --git a/assets/sif/notes/Live_0615.json b/assets/serverdata/notes/Live_0615.json similarity index 100% rename from assets/sif/notes/Live_0615.json rename to assets/serverdata/notes/Live_0615.json diff --git a/assets/sif/notes/Live_0616.json b/assets/serverdata/notes/Live_0616.json similarity index 100% rename from assets/sif/notes/Live_0616.json rename to assets/serverdata/notes/Live_0616.json diff --git a/assets/sif/notes/Live_0617.json b/assets/serverdata/notes/Live_0617.json similarity index 100% rename from assets/sif/notes/Live_0617.json rename to assets/serverdata/notes/Live_0617.json diff --git a/assets/sif/notes/Live_0618.json b/assets/serverdata/notes/Live_0618.json similarity index 100% rename from assets/sif/notes/Live_0618.json rename to assets/serverdata/notes/Live_0618.json diff --git a/assets/sif/notes/Live_0619.json b/assets/serverdata/notes/Live_0619.json similarity index 100% rename from assets/sif/notes/Live_0619.json rename to assets/serverdata/notes/Live_0619.json diff --git a/assets/sif/notes/Live_0620.json b/assets/serverdata/notes/Live_0620.json similarity index 100% rename from assets/sif/notes/Live_0620.json rename to assets/serverdata/notes/Live_0620.json diff --git a/assets/sif/notes/Live_0621.json b/assets/serverdata/notes/Live_0621.json similarity index 100% rename from assets/sif/notes/Live_0621.json rename to assets/serverdata/notes/Live_0621.json diff --git a/assets/sif/notes/Live_0628.json b/assets/serverdata/notes/Live_0628.json similarity index 100% rename from assets/sif/notes/Live_0628.json rename to assets/serverdata/notes/Live_0628.json diff --git a/assets/sif/notes/Live_0630.json b/assets/serverdata/notes/Live_0630.json similarity index 100% rename from assets/sif/notes/Live_0630.json rename to assets/serverdata/notes/Live_0630.json diff --git a/assets/sif/notes/Live_0631.json b/assets/serverdata/notes/Live_0631.json similarity index 100% rename from assets/sif/notes/Live_0631.json rename to assets/serverdata/notes/Live_0631.json diff --git a/assets/sif/notes/Live_0632.json b/assets/serverdata/notes/Live_0632.json similarity index 100% rename from assets/sif/notes/Live_0632.json rename to assets/serverdata/notes/Live_0632.json diff --git a/assets/sif/notes/Live_0633.json b/assets/serverdata/notes/Live_0633.json similarity index 100% rename from assets/sif/notes/Live_0633.json rename to assets/serverdata/notes/Live_0633.json diff --git a/assets/sif/notes/Live_0634.json b/assets/serverdata/notes/Live_0634.json similarity index 100% rename from assets/sif/notes/Live_0634.json rename to assets/serverdata/notes/Live_0634.json diff --git a/assets/sif/notes/Live_0635.json b/assets/serverdata/notes/Live_0635.json similarity index 100% rename from assets/sif/notes/Live_0635.json rename to assets/serverdata/notes/Live_0635.json diff --git a/assets/sif/notes/Live_0636.json b/assets/serverdata/notes/Live_0636.json similarity index 100% rename from assets/sif/notes/Live_0636.json rename to assets/serverdata/notes/Live_0636.json diff --git a/assets/sif/notes/Live_0648.json b/assets/serverdata/notes/Live_0648.json similarity index 100% rename from assets/sif/notes/Live_0648.json rename to assets/serverdata/notes/Live_0648.json diff --git a/assets/sif/notes/Live_0649.json b/assets/serverdata/notes/Live_0649.json similarity index 100% rename from assets/sif/notes/Live_0649.json rename to assets/serverdata/notes/Live_0649.json diff --git a/assets/sif/notes/Live_0650.json b/assets/serverdata/notes/Live_0650.json similarity index 100% rename from assets/sif/notes/Live_0650.json rename to assets/serverdata/notes/Live_0650.json diff --git a/assets/sif/notes/Live_0651.json b/assets/serverdata/notes/Live_0651.json similarity index 100% rename from assets/sif/notes/Live_0651.json rename to assets/serverdata/notes/Live_0651.json diff --git a/assets/sif/notes/Live_0652.json b/assets/serverdata/notes/Live_0652.json similarity index 100% rename from assets/sif/notes/Live_0652.json rename to assets/serverdata/notes/Live_0652.json diff --git a/assets/sif/notes/Live_0659.json b/assets/serverdata/notes/Live_0659.json similarity index 100% rename from assets/sif/notes/Live_0659.json rename to assets/serverdata/notes/Live_0659.json diff --git a/assets/sif/notes/Live_0661.json b/assets/serverdata/notes/Live_0661.json similarity index 100% rename from assets/sif/notes/Live_0661.json rename to assets/serverdata/notes/Live_0661.json diff --git a/assets/sif/notes/Live_0662.json b/assets/serverdata/notes/Live_0662.json similarity index 100% rename from assets/sif/notes/Live_0662.json rename to assets/serverdata/notes/Live_0662.json diff --git a/assets/sif/notes/Live_0663.json b/assets/serverdata/notes/Live_0663.json similarity index 100% rename from assets/sif/notes/Live_0663.json rename to assets/serverdata/notes/Live_0663.json diff --git a/assets/sif/notes/Live_0664.json b/assets/serverdata/notes/Live_0664.json similarity index 100% rename from assets/sif/notes/Live_0664.json rename to assets/serverdata/notes/Live_0664.json diff --git a/assets/sif/notes/Live_0665.json b/assets/serverdata/notes/Live_0665.json similarity index 100% rename from assets/sif/notes/Live_0665.json rename to assets/serverdata/notes/Live_0665.json diff --git a/assets/sif/notes/Live_0666.json b/assets/serverdata/notes/Live_0666.json similarity index 100% rename from assets/sif/notes/Live_0666.json rename to assets/serverdata/notes/Live_0666.json diff --git a/assets/sif/notes/Live_0678.json b/assets/serverdata/notes/Live_0678.json similarity index 100% rename from assets/sif/notes/Live_0678.json rename to assets/serverdata/notes/Live_0678.json diff --git a/assets/sif/notes/Live_0679.json b/assets/serverdata/notes/Live_0679.json similarity index 100% rename from assets/sif/notes/Live_0679.json rename to assets/serverdata/notes/Live_0679.json diff --git a/assets/sif/notes/Live_0680.json b/assets/serverdata/notes/Live_0680.json similarity index 100% rename from assets/sif/notes/Live_0680.json rename to assets/serverdata/notes/Live_0680.json diff --git a/assets/sif/notes/Live_0681.json b/assets/serverdata/notes/Live_0681.json similarity index 100% rename from assets/sif/notes/Live_0681.json rename to assets/serverdata/notes/Live_0681.json diff --git a/assets/sif/notes/Live_0688.json b/assets/serverdata/notes/Live_0688.json similarity index 100% rename from assets/sif/notes/Live_0688.json rename to assets/serverdata/notes/Live_0688.json diff --git a/assets/sif/notes/Live_0690.json b/assets/serverdata/notes/Live_0690.json similarity index 100% rename from assets/sif/notes/Live_0690.json rename to assets/serverdata/notes/Live_0690.json diff --git a/assets/sif/notes/Live_0691.json b/assets/serverdata/notes/Live_0691.json similarity index 100% rename from assets/sif/notes/Live_0691.json rename to assets/serverdata/notes/Live_0691.json diff --git a/assets/sif/notes/Live_0692.json b/assets/serverdata/notes/Live_0692.json similarity index 100% rename from assets/sif/notes/Live_0692.json rename to assets/serverdata/notes/Live_0692.json diff --git a/assets/sif/notes/Live_0693.json b/assets/serverdata/notes/Live_0693.json similarity index 100% rename from assets/sif/notes/Live_0693.json rename to assets/serverdata/notes/Live_0693.json diff --git a/assets/sif/notes/Live_0702.json b/assets/serverdata/notes/Live_0702.json similarity index 100% rename from assets/sif/notes/Live_0702.json rename to assets/serverdata/notes/Live_0702.json diff --git a/assets/sif/notes/Live_0703.json b/assets/serverdata/notes/Live_0703.json similarity index 100% rename from assets/sif/notes/Live_0703.json rename to assets/serverdata/notes/Live_0703.json diff --git a/assets/sif/notes/Live_0704.json b/assets/serverdata/notes/Live_0704.json similarity index 100% rename from assets/sif/notes/Live_0704.json rename to assets/serverdata/notes/Live_0704.json diff --git a/assets/sif/notes/Live_0705.json b/assets/serverdata/notes/Live_0705.json similarity index 100% rename from assets/sif/notes/Live_0705.json rename to assets/serverdata/notes/Live_0705.json diff --git a/assets/sif/notes/Live_0706.json b/assets/serverdata/notes/Live_0706.json similarity index 100% rename from assets/sif/notes/Live_0706.json rename to assets/serverdata/notes/Live_0706.json diff --git a/assets/sif/notes/Live_0707.json b/assets/serverdata/notes/Live_0707.json similarity index 100% rename from assets/sif/notes/Live_0707.json rename to assets/serverdata/notes/Live_0707.json diff --git a/assets/sif/notes/Live_0708.json b/assets/serverdata/notes/Live_0708.json similarity index 100% rename from assets/sif/notes/Live_0708.json rename to assets/serverdata/notes/Live_0708.json diff --git a/assets/sif/notes/Live_0709.json b/assets/serverdata/notes/Live_0709.json similarity index 100% rename from assets/sif/notes/Live_0709.json rename to assets/serverdata/notes/Live_0709.json diff --git a/assets/sif/notes/Live_0713.json b/assets/serverdata/notes/Live_0713.json similarity index 100% rename from assets/sif/notes/Live_0713.json rename to assets/serverdata/notes/Live_0713.json diff --git a/assets/sif/notes/Live_0714.json b/assets/serverdata/notes/Live_0714.json similarity index 100% rename from assets/sif/notes/Live_0714.json rename to assets/serverdata/notes/Live_0714.json diff --git a/assets/sif/notes/Live_0715.json b/assets/serverdata/notes/Live_0715.json similarity index 100% rename from assets/sif/notes/Live_0715.json rename to assets/serverdata/notes/Live_0715.json diff --git a/assets/sif/notes/Live_0716.json b/assets/serverdata/notes/Live_0716.json similarity index 100% rename from assets/sif/notes/Live_0716.json rename to assets/serverdata/notes/Live_0716.json diff --git a/assets/sif/notes/Live_0718.json b/assets/serverdata/notes/Live_0718.json similarity index 100% rename from assets/sif/notes/Live_0718.json rename to assets/serverdata/notes/Live_0718.json diff --git a/assets/sif/notes/Live_0719.json b/assets/serverdata/notes/Live_0719.json similarity index 100% rename from assets/sif/notes/Live_0719.json rename to assets/serverdata/notes/Live_0719.json diff --git a/assets/sif/notes/Live_0720.json b/assets/serverdata/notes/Live_0720.json similarity index 100% rename from assets/sif/notes/Live_0720.json rename to assets/serverdata/notes/Live_0720.json diff --git a/assets/sif/notes/Live_0721.json b/assets/serverdata/notes/Live_0721.json similarity index 100% rename from assets/sif/notes/Live_0721.json rename to assets/serverdata/notes/Live_0721.json diff --git a/assets/sif/notes/Live_0749.json b/assets/serverdata/notes/Live_0749.json similarity index 100% rename from assets/sif/notes/Live_0749.json rename to assets/serverdata/notes/Live_0749.json diff --git a/assets/sif/notes/Live_0750.json b/assets/serverdata/notes/Live_0750.json similarity index 100% rename from assets/sif/notes/Live_0750.json rename to assets/serverdata/notes/Live_0750.json diff --git a/assets/sif/notes/Live_0751.json b/assets/serverdata/notes/Live_0751.json similarity index 100% rename from assets/sif/notes/Live_0751.json rename to assets/serverdata/notes/Live_0751.json diff --git a/assets/sif/notes/Live_0752.json b/assets/serverdata/notes/Live_0752.json similarity index 100% rename from assets/sif/notes/Live_0752.json rename to assets/serverdata/notes/Live_0752.json diff --git a/assets/sif/notes/Live_0753.json b/assets/serverdata/notes/Live_0753.json similarity index 100% rename from assets/sif/notes/Live_0753.json rename to assets/serverdata/notes/Live_0753.json diff --git a/assets/sif/notes/Live_0754.json b/assets/serverdata/notes/Live_0754.json similarity index 100% rename from assets/sif/notes/Live_0754.json rename to assets/serverdata/notes/Live_0754.json diff --git a/assets/sif/notes/Live_0755.json b/assets/serverdata/notes/Live_0755.json similarity index 100% rename from assets/sif/notes/Live_0755.json rename to assets/serverdata/notes/Live_0755.json diff --git a/assets/sif/notes/Live_0756.json b/assets/serverdata/notes/Live_0756.json similarity index 100% rename from assets/sif/notes/Live_0756.json rename to assets/serverdata/notes/Live_0756.json diff --git a/assets/sif/notes/Live_0763.json b/assets/serverdata/notes/Live_0763.json similarity index 100% rename from assets/sif/notes/Live_0763.json rename to assets/serverdata/notes/Live_0763.json diff --git a/assets/sif/notes/Live_0765.json b/assets/serverdata/notes/Live_0765.json similarity index 100% rename from assets/sif/notes/Live_0765.json rename to assets/serverdata/notes/Live_0765.json diff --git a/assets/sif/notes/Live_0766.json b/assets/serverdata/notes/Live_0766.json similarity index 100% rename from assets/sif/notes/Live_0766.json rename to assets/serverdata/notes/Live_0766.json diff --git a/assets/sif/notes/Live_0767.json b/assets/serverdata/notes/Live_0767.json similarity index 100% rename from assets/sif/notes/Live_0767.json rename to assets/serverdata/notes/Live_0767.json diff --git a/assets/sif/notes/Live_0768.json b/assets/serverdata/notes/Live_0768.json similarity index 100% rename from assets/sif/notes/Live_0768.json rename to assets/serverdata/notes/Live_0768.json diff --git a/assets/sif/notes/Live_0791.json b/assets/serverdata/notes/Live_0791.json similarity index 100% rename from assets/sif/notes/Live_0791.json rename to assets/serverdata/notes/Live_0791.json diff --git a/assets/sif/notes/Live_0792.json b/assets/serverdata/notes/Live_0792.json similarity index 100% rename from assets/sif/notes/Live_0792.json rename to assets/serverdata/notes/Live_0792.json diff --git a/assets/sif/notes/Live_0793.json b/assets/serverdata/notes/Live_0793.json similarity index 100% rename from assets/sif/notes/Live_0793.json rename to assets/serverdata/notes/Live_0793.json diff --git a/assets/sif/notes/Live_0794.json b/assets/serverdata/notes/Live_0794.json similarity index 100% rename from assets/sif/notes/Live_0794.json rename to assets/serverdata/notes/Live_0794.json diff --git a/assets/sif/notes/Live_0797.json b/assets/serverdata/notes/Live_0797.json similarity index 100% rename from assets/sif/notes/Live_0797.json rename to assets/serverdata/notes/Live_0797.json diff --git a/assets/sif/notes/Live_0798.json b/assets/serverdata/notes/Live_0798.json similarity index 100% rename from assets/sif/notes/Live_0798.json rename to assets/serverdata/notes/Live_0798.json diff --git a/assets/sif/notes/Live_0799.json b/assets/serverdata/notes/Live_0799.json similarity index 100% rename from assets/sif/notes/Live_0799.json rename to assets/serverdata/notes/Live_0799.json diff --git a/assets/sif/notes/Live_0803.json b/assets/serverdata/notes/Live_0803.json similarity index 100% rename from assets/sif/notes/Live_0803.json rename to assets/serverdata/notes/Live_0803.json diff --git a/assets/sif/notes/Live_0804.json b/assets/serverdata/notes/Live_0804.json similarity index 100% rename from assets/sif/notes/Live_0804.json rename to assets/serverdata/notes/Live_0804.json diff --git a/assets/sif/notes/Live_0805.json b/assets/serverdata/notes/Live_0805.json similarity index 100% rename from assets/sif/notes/Live_0805.json rename to assets/serverdata/notes/Live_0805.json diff --git a/assets/sif/notes/Live_0806.json b/assets/serverdata/notes/Live_0806.json similarity index 100% rename from assets/sif/notes/Live_0806.json rename to assets/serverdata/notes/Live_0806.json diff --git a/assets/sif/notes/Live_0810.json b/assets/serverdata/notes/Live_0810.json similarity index 100% rename from assets/sif/notes/Live_0810.json rename to assets/serverdata/notes/Live_0810.json diff --git a/assets/sif/notes/Live_0811.json b/assets/serverdata/notes/Live_0811.json similarity index 100% rename from assets/sif/notes/Live_0811.json rename to assets/serverdata/notes/Live_0811.json diff --git a/assets/sif/notes/Live_0812.json b/assets/serverdata/notes/Live_0812.json similarity index 100% rename from assets/sif/notes/Live_0812.json rename to assets/serverdata/notes/Live_0812.json diff --git a/assets/sif/notes/Live_0813.json b/assets/serverdata/notes/Live_0813.json similarity index 100% rename from assets/sif/notes/Live_0813.json rename to assets/serverdata/notes/Live_0813.json diff --git a/assets/sif/notes/Live_0814.json b/assets/serverdata/notes/Live_0814.json similarity index 100% rename from assets/sif/notes/Live_0814.json rename to assets/serverdata/notes/Live_0814.json diff --git a/assets/sif/notes/Live_0831.json b/assets/serverdata/notes/Live_0831.json similarity index 100% rename from assets/sif/notes/Live_0831.json rename to assets/serverdata/notes/Live_0831.json diff --git a/assets/sif/notes/Live_0832.json b/assets/serverdata/notes/Live_0832.json similarity index 100% rename from assets/sif/notes/Live_0832.json rename to assets/serverdata/notes/Live_0832.json diff --git a/assets/sif/notes/Live_0833.json b/assets/serverdata/notes/Live_0833.json similarity index 100% rename from assets/sif/notes/Live_0833.json rename to assets/serverdata/notes/Live_0833.json diff --git a/assets/sif/notes/Live_0834.json b/assets/serverdata/notes/Live_0834.json similarity index 100% rename from assets/sif/notes/Live_0834.json rename to assets/serverdata/notes/Live_0834.json diff --git a/assets/sif/notes/Live_0835.json b/assets/serverdata/notes/Live_0835.json similarity index 100% rename from assets/sif/notes/Live_0835.json rename to assets/serverdata/notes/Live_0835.json diff --git a/assets/sif/notes/Live_0836.json b/assets/serverdata/notes/Live_0836.json similarity index 100% rename from assets/sif/notes/Live_0836.json rename to assets/serverdata/notes/Live_0836.json diff --git a/assets/sif/notes/Live_0837.json b/assets/serverdata/notes/Live_0837.json similarity index 100% rename from assets/sif/notes/Live_0837.json rename to assets/serverdata/notes/Live_0837.json diff --git a/assets/sif/notes/Live_0838.json b/assets/serverdata/notes/Live_0838.json similarity index 100% rename from assets/sif/notes/Live_0838.json rename to assets/serverdata/notes/Live_0838.json diff --git a/assets/sif/notes/Live_0842.json b/assets/serverdata/notes/Live_0842.json similarity index 100% rename from assets/sif/notes/Live_0842.json rename to assets/serverdata/notes/Live_0842.json diff --git a/assets/sif/notes/Live_0843.json b/assets/serverdata/notes/Live_0843.json similarity index 100% rename from assets/sif/notes/Live_0843.json rename to assets/serverdata/notes/Live_0843.json diff --git a/assets/sif/notes/Live_0844.json b/assets/serverdata/notes/Live_0844.json similarity index 100% rename from assets/sif/notes/Live_0844.json rename to assets/serverdata/notes/Live_0844.json diff --git a/assets/sif/notes/Live_0845.json b/assets/serverdata/notes/Live_0845.json similarity index 100% rename from assets/sif/notes/Live_0845.json rename to assets/serverdata/notes/Live_0845.json diff --git a/assets/sif/notes/Live_0849.json b/assets/serverdata/notes/Live_0849.json similarity index 100% rename from assets/sif/notes/Live_0849.json rename to assets/serverdata/notes/Live_0849.json diff --git a/assets/sif/notes/Live_0850.json b/assets/serverdata/notes/Live_0850.json similarity index 100% rename from assets/sif/notes/Live_0850.json rename to assets/serverdata/notes/Live_0850.json diff --git a/assets/sif/notes/Live_0851.json b/assets/serverdata/notes/Live_0851.json similarity index 100% rename from assets/sif/notes/Live_0851.json rename to assets/serverdata/notes/Live_0851.json diff --git a/assets/sif/notes/Live_0852.json b/assets/serverdata/notes/Live_0852.json similarity index 100% rename from assets/sif/notes/Live_0852.json rename to assets/serverdata/notes/Live_0852.json diff --git a/assets/sif/notes/Live_0866.json b/assets/serverdata/notes/Live_0866.json similarity index 100% rename from assets/sif/notes/Live_0866.json rename to assets/serverdata/notes/Live_0866.json diff --git a/assets/sif/notes/Live_0867.json b/assets/serverdata/notes/Live_0867.json similarity index 100% rename from assets/sif/notes/Live_0867.json rename to assets/serverdata/notes/Live_0867.json diff --git a/assets/sif/notes/Live_0868.json b/assets/serverdata/notes/Live_0868.json similarity index 100% rename from assets/sif/notes/Live_0868.json rename to assets/serverdata/notes/Live_0868.json diff --git a/assets/sif/notes/Live_0869.json b/assets/serverdata/notes/Live_0869.json similarity index 100% rename from assets/sif/notes/Live_0869.json rename to assets/serverdata/notes/Live_0869.json diff --git a/assets/sif/notes/Live_0871.json b/assets/serverdata/notes/Live_0871.json similarity index 100% rename from assets/sif/notes/Live_0871.json rename to assets/serverdata/notes/Live_0871.json diff --git a/assets/sif/notes/Live_0872.json b/assets/serverdata/notes/Live_0872.json similarity index 100% rename from assets/sif/notes/Live_0872.json rename to assets/serverdata/notes/Live_0872.json diff --git a/assets/sif/notes/Live_0873.json b/assets/serverdata/notes/Live_0873.json similarity index 100% rename from assets/sif/notes/Live_0873.json rename to assets/serverdata/notes/Live_0873.json diff --git a/assets/sif/notes/Live_0874.json b/assets/serverdata/notes/Live_0874.json similarity index 100% rename from assets/sif/notes/Live_0874.json rename to assets/serverdata/notes/Live_0874.json diff --git a/assets/sif/notes/Live_s0361.json b/assets/serverdata/notes/Live_s0361.json similarity index 100% rename from assets/sif/notes/Live_s0361.json rename to assets/serverdata/notes/Live_s0361.json diff --git a/assets/sif/notes/Live_s0362.json b/assets/serverdata/notes/Live_s0362.json similarity index 100% rename from assets/sif/notes/Live_s0362.json rename to assets/serverdata/notes/Live_s0362.json diff --git a/assets/sif/notes/Live_s0363.json b/assets/serverdata/notes/Live_s0363.json similarity index 100% rename from assets/sif/notes/Live_s0363.json rename to assets/serverdata/notes/Live_s0363.json diff --git a/assets/sif/notes/Live_s0364.json b/assets/serverdata/notes/Live_s0364.json similarity index 100% rename from assets/sif/notes/Live_s0364.json rename to assets/serverdata/notes/Live_s0364.json diff --git a/assets/sif/notes/Live_s0365.json b/assets/serverdata/notes/Live_s0365.json similarity index 100% rename from assets/sif/notes/Live_s0365.json rename to assets/serverdata/notes/Live_s0365.json diff --git a/assets/sif/notes/Live_s0371.json b/assets/serverdata/notes/Live_s0371.json similarity index 100% rename from assets/sif/notes/Live_s0371.json rename to assets/serverdata/notes/Live_s0371.json diff --git a/assets/sif/notes/Live_s0372.json b/assets/serverdata/notes/Live_s0372.json similarity index 100% rename from assets/sif/notes/Live_s0372.json rename to assets/serverdata/notes/Live_s0372.json diff --git a/assets/sif/notes/Live_s0373.json b/assets/serverdata/notes/Live_s0373.json similarity index 100% rename from assets/sif/notes/Live_s0373.json rename to assets/serverdata/notes/Live_s0373.json diff --git a/assets/sif/notes/Live_s0374.json b/assets/serverdata/notes/Live_s0374.json similarity index 100% rename from assets/sif/notes/Live_s0374.json rename to assets/serverdata/notes/Live_s0374.json diff --git a/assets/sif/notes/Live_s0375.json b/assets/serverdata/notes/Live_s0375.json similarity index 100% rename from assets/sif/notes/Live_s0375.json rename to assets/serverdata/notes/Live_s0375.json diff --git a/assets/sif/notes/Live_s0376.json b/assets/serverdata/notes/Live_s0376.json similarity index 100% rename from assets/sif/notes/Live_s0376.json rename to assets/serverdata/notes/Live_s0376.json diff --git a/assets/sif/notes/Live_s0377.json b/assets/serverdata/notes/Live_s0377.json similarity index 100% rename from assets/sif/notes/Live_s0377.json rename to assets/serverdata/notes/Live_s0377.json diff --git a/assets/sif/notes/Live_s0378.json b/assets/serverdata/notes/Live_s0378.json similarity index 100% rename from assets/sif/notes/Live_s0378.json rename to assets/serverdata/notes/Live_s0378.json diff --git a/assets/sif/notes/Live_s0385.json b/assets/serverdata/notes/Live_s0385.json similarity index 100% rename from assets/sif/notes/Live_s0385.json rename to assets/serverdata/notes/Live_s0385.json diff --git a/assets/sif/notes/Live_s0386.json b/assets/serverdata/notes/Live_s0386.json similarity index 100% rename from assets/sif/notes/Live_s0386.json rename to assets/serverdata/notes/Live_s0386.json diff --git a/assets/sif/notes/Live_s0387.json b/assets/serverdata/notes/Live_s0387.json similarity index 100% rename from assets/sif/notes/Live_s0387.json rename to assets/serverdata/notes/Live_s0387.json diff --git a/assets/sif/notes/Live_s0388.json b/assets/serverdata/notes/Live_s0388.json similarity index 100% rename from assets/sif/notes/Live_s0388.json rename to assets/serverdata/notes/Live_s0388.json diff --git a/assets/sif/notes/Live_s0389.json b/assets/serverdata/notes/Live_s0389.json similarity index 100% rename from assets/sif/notes/Live_s0389.json rename to assets/serverdata/notes/Live_s0389.json diff --git a/assets/sif/notes/Live_s0390.json b/assets/serverdata/notes/Live_s0390.json similarity index 100% rename from assets/sif/notes/Live_s0390.json rename to assets/serverdata/notes/Live_s0390.json diff --git a/assets/sif/notes/Live_s0391.json b/assets/serverdata/notes/Live_s0391.json similarity index 100% rename from assets/sif/notes/Live_s0391.json rename to assets/serverdata/notes/Live_s0391.json diff --git a/assets/sif/notes/Live_s0392.json b/assets/serverdata/notes/Live_s0392.json similarity index 100% rename from assets/sif/notes/Live_s0392.json rename to assets/serverdata/notes/Live_s0392.json diff --git a/assets/sif/notes/Live_s0393.json b/assets/serverdata/notes/Live_s0393.json similarity index 100% rename from assets/sif/notes/Live_s0393.json rename to assets/serverdata/notes/Live_s0393.json diff --git a/assets/sif/notes/Live_s0394.json b/assets/serverdata/notes/Live_s0394.json similarity index 100% rename from assets/sif/notes/Live_s0394.json rename to assets/serverdata/notes/Live_s0394.json diff --git a/assets/sif/notes/Live_s0395.json b/assets/serverdata/notes/Live_s0395.json similarity index 100% rename from assets/sif/notes/Live_s0395.json rename to assets/serverdata/notes/Live_s0395.json diff --git a/assets/sif/notes/Live_s0396.json b/assets/serverdata/notes/Live_s0396.json similarity index 100% rename from assets/sif/notes/Live_s0396.json rename to assets/serverdata/notes/Live_s0396.json diff --git a/assets/sif/notes/Live_s0397.json b/assets/serverdata/notes/Live_s0397.json similarity index 100% rename from assets/sif/notes/Live_s0397.json rename to assets/serverdata/notes/Live_s0397.json diff --git a/assets/sif/notes/Live_s0398.json b/assets/serverdata/notes/Live_s0398.json similarity index 100% rename from assets/sif/notes/Live_s0398.json rename to assets/serverdata/notes/Live_s0398.json diff --git a/assets/sif/notes/Live_s0399.json b/assets/serverdata/notes/Live_s0399.json similarity index 100% rename from assets/sif/notes/Live_s0399.json rename to assets/serverdata/notes/Live_s0399.json diff --git a/assets/sif/notes/Live_s0400.json b/assets/serverdata/notes/Live_s0400.json similarity index 100% rename from assets/sif/notes/Live_s0400.json rename to assets/serverdata/notes/Live_s0400.json diff --git a/assets/sif/notes/Live_s0401.json b/assets/serverdata/notes/Live_s0401.json similarity index 100% rename from assets/sif/notes/Live_s0401.json rename to assets/serverdata/notes/Live_s0401.json diff --git a/assets/sif/notes/Live_s0402.json b/assets/serverdata/notes/Live_s0402.json similarity index 100% rename from assets/sif/notes/Live_s0402.json rename to assets/serverdata/notes/Live_s0402.json diff --git a/assets/sif/notes/Live_s0405.json b/assets/serverdata/notes/Live_s0405.json similarity index 100% rename from assets/sif/notes/Live_s0405.json rename to assets/serverdata/notes/Live_s0405.json diff --git a/assets/sif/notes/Live_s0406.json b/assets/serverdata/notes/Live_s0406.json similarity index 100% rename from assets/sif/notes/Live_s0406.json rename to assets/serverdata/notes/Live_s0406.json diff --git a/assets/sif/notes/Live_s0407.json b/assets/serverdata/notes/Live_s0407.json similarity index 100% rename from assets/sif/notes/Live_s0407.json rename to assets/serverdata/notes/Live_s0407.json diff --git a/assets/sif/notes/Live_s0408.json b/assets/serverdata/notes/Live_s0408.json similarity index 100% rename from assets/sif/notes/Live_s0408.json rename to assets/serverdata/notes/Live_s0408.json diff --git a/assets/sif/notes/Live_s0409.json b/assets/serverdata/notes/Live_s0409.json similarity index 100% rename from assets/sif/notes/Live_s0409.json rename to assets/serverdata/notes/Live_s0409.json diff --git a/assets/sif/notes/Live_s0410.json b/assets/serverdata/notes/Live_s0410.json similarity index 100% rename from assets/sif/notes/Live_s0410.json rename to assets/serverdata/notes/Live_s0410.json diff --git a/assets/sif/notes/Live_s0411.json b/assets/serverdata/notes/Live_s0411.json similarity index 100% rename from assets/sif/notes/Live_s0411.json rename to assets/serverdata/notes/Live_s0411.json diff --git a/assets/sif/notes/Live_s0412.json b/assets/serverdata/notes/Live_s0412.json similarity index 100% rename from assets/sif/notes/Live_s0412.json rename to assets/serverdata/notes/Live_s0412.json diff --git a/assets/sif/notes/Live_s0413.json b/assets/serverdata/notes/Live_s0413.json similarity index 100% rename from assets/sif/notes/Live_s0413.json rename to assets/serverdata/notes/Live_s0413.json diff --git a/assets/sif/notes/Live_s0414.json b/assets/serverdata/notes/Live_s0414.json similarity index 100% rename from assets/sif/notes/Live_s0414.json rename to assets/serverdata/notes/Live_s0414.json diff --git a/assets/sif/notes/Live_s0415.json b/assets/serverdata/notes/Live_s0415.json similarity index 100% rename from assets/sif/notes/Live_s0415.json rename to assets/serverdata/notes/Live_s0415.json diff --git a/assets/sif/notes/Live_s0416.json b/assets/serverdata/notes/Live_s0416.json similarity index 100% rename from assets/sif/notes/Live_s0416.json rename to assets/serverdata/notes/Live_s0416.json diff --git a/assets/sif/notes/Live_s0417.json b/assets/serverdata/notes/Live_s0417.json similarity index 100% rename from assets/sif/notes/Live_s0417.json rename to assets/serverdata/notes/Live_s0417.json diff --git a/assets/sif/notes/Live_s0418.json b/assets/serverdata/notes/Live_s0418.json similarity index 100% rename from assets/sif/notes/Live_s0418.json rename to assets/serverdata/notes/Live_s0418.json diff --git a/assets/sif/notes/Live_s0419.json b/assets/serverdata/notes/Live_s0419.json similarity index 100% rename from assets/sif/notes/Live_s0419.json rename to assets/serverdata/notes/Live_s0419.json diff --git a/assets/sif/notes/Live_s0420.json b/assets/serverdata/notes/Live_s0420.json similarity index 100% rename from assets/sif/notes/Live_s0420.json rename to assets/serverdata/notes/Live_s0420.json diff --git a/assets/sif/notes/Live_s0421.json b/assets/serverdata/notes/Live_s0421.json similarity index 100% rename from assets/sif/notes/Live_s0421.json rename to assets/serverdata/notes/Live_s0421.json diff --git a/assets/sif/notes/Live_s0432.json b/assets/serverdata/notes/Live_s0432.json similarity index 100% rename from assets/sif/notes/Live_s0432.json rename to assets/serverdata/notes/Live_s0432.json diff --git a/assets/sif/notes/Live_s0433.json b/assets/serverdata/notes/Live_s0433.json similarity index 100% rename from assets/sif/notes/Live_s0433.json rename to assets/serverdata/notes/Live_s0433.json diff --git a/assets/sif/notes/Live_s0434.json b/assets/serverdata/notes/Live_s0434.json similarity index 100% rename from assets/sif/notes/Live_s0434.json rename to assets/serverdata/notes/Live_s0434.json diff --git a/assets/sif/notes/Live_s0435.json b/assets/serverdata/notes/Live_s0435.json similarity index 100% rename from assets/sif/notes/Live_s0435.json rename to assets/serverdata/notes/Live_s0435.json diff --git a/assets/sif/notes/Live_s0436.json b/assets/serverdata/notes/Live_s0436.json similarity index 100% rename from assets/sif/notes/Live_s0436.json rename to assets/serverdata/notes/Live_s0436.json diff --git a/assets/sif/notes/Live_s0437.json b/assets/serverdata/notes/Live_s0437.json similarity index 100% rename from assets/sif/notes/Live_s0437.json rename to assets/serverdata/notes/Live_s0437.json diff --git a/assets/sif/notes/Live_s0438.json b/assets/serverdata/notes/Live_s0438.json similarity index 100% rename from assets/sif/notes/Live_s0438.json rename to assets/serverdata/notes/Live_s0438.json diff --git a/assets/sif/notes/Live_s0439.json b/assets/serverdata/notes/Live_s0439.json similarity index 100% rename from assets/sif/notes/Live_s0439.json rename to assets/serverdata/notes/Live_s0439.json diff --git a/assets/sif/notes/Live_s0440.json b/assets/serverdata/notes/Live_s0440.json similarity index 100% rename from assets/sif/notes/Live_s0440.json rename to assets/serverdata/notes/Live_s0440.json diff --git a/assets/sif/notes/Live_s0441.json b/assets/serverdata/notes/Live_s0441.json similarity index 100% rename from assets/sif/notes/Live_s0441.json rename to assets/serverdata/notes/Live_s0441.json diff --git a/assets/sif/notes/Live_s0442.json b/assets/serverdata/notes/Live_s0442.json similarity index 100% rename from assets/sif/notes/Live_s0442.json rename to assets/serverdata/notes/Live_s0442.json diff --git a/assets/sif/notes/Live_s0443.json b/assets/serverdata/notes/Live_s0443.json similarity index 100% rename from assets/sif/notes/Live_s0443.json rename to assets/serverdata/notes/Live_s0443.json diff --git a/assets/sif/notes/Live_s0444.json b/assets/serverdata/notes/Live_s0444.json similarity index 100% rename from assets/sif/notes/Live_s0444.json rename to assets/serverdata/notes/Live_s0444.json diff --git a/assets/sif/notes/Live_s0445.json b/assets/serverdata/notes/Live_s0445.json similarity index 100% rename from assets/sif/notes/Live_s0445.json rename to assets/serverdata/notes/Live_s0445.json diff --git a/assets/sif/notes/Live_s0446.json b/assets/serverdata/notes/Live_s0446.json similarity index 100% rename from assets/sif/notes/Live_s0446.json rename to assets/serverdata/notes/Live_s0446.json diff --git a/assets/sif/notes/Live_s0453.json b/assets/serverdata/notes/Live_s0453.json similarity index 100% rename from assets/sif/notes/Live_s0453.json rename to assets/serverdata/notes/Live_s0453.json diff --git a/assets/sif/notes/Live_s0454.json b/assets/serverdata/notes/Live_s0454.json similarity index 100% rename from assets/sif/notes/Live_s0454.json rename to assets/serverdata/notes/Live_s0454.json diff --git a/assets/sif/notes/Live_s0455.json b/assets/serverdata/notes/Live_s0455.json similarity index 100% rename from assets/sif/notes/Live_s0455.json rename to assets/serverdata/notes/Live_s0455.json diff --git a/assets/sif/notes/Live_s0456.json b/assets/serverdata/notes/Live_s0456.json similarity index 100% rename from assets/sif/notes/Live_s0456.json rename to assets/serverdata/notes/Live_s0456.json diff --git a/assets/sif/notes/Live_s0457.json b/assets/serverdata/notes/Live_s0457.json similarity index 100% rename from assets/sif/notes/Live_s0457.json rename to assets/serverdata/notes/Live_s0457.json diff --git a/assets/sif/notes/Live_s0458.json b/assets/serverdata/notes/Live_s0458.json similarity index 100% rename from assets/sif/notes/Live_s0458.json rename to assets/serverdata/notes/Live_s0458.json diff --git a/assets/sif/notes/Live_s0459.json b/assets/serverdata/notes/Live_s0459.json similarity index 100% rename from assets/sif/notes/Live_s0459.json rename to assets/serverdata/notes/Live_s0459.json diff --git a/assets/sif/notes/Live_s0460.json b/assets/serverdata/notes/Live_s0460.json similarity index 100% rename from assets/sif/notes/Live_s0460.json rename to assets/serverdata/notes/Live_s0460.json diff --git a/assets/sif/notes/Live_s0461.json b/assets/serverdata/notes/Live_s0461.json similarity index 100% rename from assets/sif/notes/Live_s0461.json rename to assets/serverdata/notes/Live_s0461.json diff --git a/assets/sif/notes/Live_s0462.json b/assets/serverdata/notes/Live_s0462.json similarity index 100% rename from assets/sif/notes/Live_s0462.json rename to assets/serverdata/notes/Live_s0462.json diff --git a/assets/sif/notes/Live_s0463.json b/assets/serverdata/notes/Live_s0463.json similarity index 100% rename from assets/sif/notes/Live_s0463.json rename to assets/serverdata/notes/Live_s0463.json diff --git a/assets/sif/notes/Live_s0464.json b/assets/serverdata/notes/Live_s0464.json similarity index 100% rename from assets/sif/notes/Live_s0464.json rename to assets/serverdata/notes/Live_s0464.json diff --git a/assets/sif/notes/Live_s0465.json b/assets/serverdata/notes/Live_s0465.json similarity index 100% rename from assets/sif/notes/Live_s0465.json rename to assets/serverdata/notes/Live_s0465.json diff --git a/assets/sif/notes/Live_s0466.json b/assets/serverdata/notes/Live_s0466.json similarity index 100% rename from assets/sif/notes/Live_s0466.json rename to assets/serverdata/notes/Live_s0466.json diff --git a/assets/sif/notes/Live_s0467.json b/assets/serverdata/notes/Live_s0467.json similarity index 100% rename from assets/sif/notes/Live_s0467.json rename to assets/serverdata/notes/Live_s0467.json diff --git a/assets/sif/notes/Live_s0468.json b/assets/serverdata/notes/Live_s0468.json similarity index 100% rename from assets/sif/notes/Live_s0468.json rename to assets/serverdata/notes/Live_s0468.json diff --git a/assets/sif/notes/Live_s0469.json b/assets/serverdata/notes/Live_s0469.json similarity index 100% rename from assets/sif/notes/Live_s0469.json rename to assets/serverdata/notes/Live_s0469.json diff --git a/assets/sif/notes/Live_s0470.json b/assets/serverdata/notes/Live_s0470.json similarity index 100% rename from assets/sif/notes/Live_s0470.json rename to assets/serverdata/notes/Live_s0470.json diff --git a/assets/sif/notes/Live_s0471.json b/assets/serverdata/notes/Live_s0471.json similarity index 100% rename from assets/sif/notes/Live_s0471.json rename to assets/serverdata/notes/Live_s0471.json diff --git a/assets/sif/notes/Live_s0472.json b/assets/serverdata/notes/Live_s0472.json similarity index 100% rename from assets/sif/notes/Live_s0472.json rename to assets/serverdata/notes/Live_s0472.json diff --git a/assets/sif/notes/Live_s0473.json b/assets/serverdata/notes/Live_s0473.json similarity index 100% rename from assets/sif/notes/Live_s0473.json rename to assets/serverdata/notes/Live_s0473.json diff --git a/assets/sif/notes/Live_s0482.json b/assets/serverdata/notes/Live_s0482.json similarity index 100% rename from assets/sif/notes/Live_s0482.json rename to assets/serverdata/notes/Live_s0482.json diff --git a/assets/sif/notes/Live_s0483.json b/assets/serverdata/notes/Live_s0483.json similarity index 100% rename from assets/sif/notes/Live_s0483.json rename to assets/serverdata/notes/Live_s0483.json diff --git a/assets/sif/notes/Live_s0484.json b/assets/serverdata/notes/Live_s0484.json similarity index 100% rename from assets/sif/notes/Live_s0484.json rename to assets/serverdata/notes/Live_s0484.json diff --git a/assets/sif/notes/Live_s0485.json b/assets/serverdata/notes/Live_s0485.json similarity index 100% rename from assets/sif/notes/Live_s0485.json rename to assets/serverdata/notes/Live_s0485.json diff --git a/assets/sif/notes/Live_s0486.json b/assets/serverdata/notes/Live_s0486.json similarity index 100% rename from assets/sif/notes/Live_s0486.json rename to assets/serverdata/notes/Live_s0486.json diff --git a/assets/sif/notes/Live_s0487.json b/assets/serverdata/notes/Live_s0487.json similarity index 100% rename from assets/sif/notes/Live_s0487.json rename to assets/serverdata/notes/Live_s0487.json diff --git a/assets/sif/notes/Live_s0488.json b/assets/serverdata/notes/Live_s0488.json similarity index 100% rename from assets/sif/notes/Live_s0488.json rename to assets/serverdata/notes/Live_s0488.json diff --git a/assets/sif/notes/Live_s0489.json b/assets/serverdata/notes/Live_s0489.json similarity index 100% rename from assets/sif/notes/Live_s0489.json rename to assets/serverdata/notes/Live_s0489.json diff --git a/assets/sif/notes/Live_s0490.json b/assets/serverdata/notes/Live_s0490.json similarity index 100% rename from assets/sif/notes/Live_s0490.json rename to assets/serverdata/notes/Live_s0490.json diff --git a/assets/sif/notes/Live_s0491.json b/assets/serverdata/notes/Live_s0491.json similarity index 100% rename from assets/sif/notes/Live_s0491.json rename to assets/serverdata/notes/Live_s0491.json diff --git a/assets/sif/notes/Live_s0492.json b/assets/serverdata/notes/Live_s0492.json similarity index 100% rename from assets/sif/notes/Live_s0492.json rename to assets/serverdata/notes/Live_s0492.json diff --git a/assets/sif/notes/Live_s0493.json b/assets/serverdata/notes/Live_s0493.json similarity index 100% rename from assets/sif/notes/Live_s0493.json rename to assets/serverdata/notes/Live_s0493.json diff --git a/assets/sif/notes/Live_s0494.json b/assets/serverdata/notes/Live_s0494.json similarity index 100% rename from assets/sif/notes/Live_s0494.json rename to assets/serverdata/notes/Live_s0494.json diff --git a/assets/sif/notes/Live_s0495.json b/assets/serverdata/notes/Live_s0495.json similarity index 100% rename from assets/sif/notes/Live_s0495.json rename to assets/serverdata/notes/Live_s0495.json diff --git a/assets/sif/notes/Live_s0496.json b/assets/serverdata/notes/Live_s0496.json similarity index 100% rename from assets/sif/notes/Live_s0496.json rename to assets/serverdata/notes/Live_s0496.json diff --git a/assets/sif/notes/Live_s0497.json b/assets/serverdata/notes/Live_s0497.json similarity index 100% rename from assets/sif/notes/Live_s0497.json rename to assets/serverdata/notes/Live_s0497.json diff --git a/assets/sif/notes/Live_s0498.json b/assets/serverdata/notes/Live_s0498.json similarity index 100% rename from assets/sif/notes/Live_s0498.json rename to assets/serverdata/notes/Live_s0498.json diff --git a/assets/sif/notes/Live_s0499.json b/assets/serverdata/notes/Live_s0499.json similarity index 100% rename from assets/sif/notes/Live_s0499.json rename to assets/serverdata/notes/Live_s0499.json diff --git a/assets/sif/notes/Live_s0500.json b/assets/serverdata/notes/Live_s0500.json similarity index 100% rename from assets/sif/notes/Live_s0500.json rename to assets/serverdata/notes/Live_s0500.json diff --git a/assets/sif/notes/Live_s0501.json b/assets/serverdata/notes/Live_s0501.json similarity index 100% rename from assets/sif/notes/Live_s0501.json rename to assets/serverdata/notes/Live_s0501.json diff --git a/assets/sif/notes/Live_s0502.json b/assets/serverdata/notes/Live_s0502.json similarity index 100% rename from assets/sif/notes/Live_s0502.json rename to assets/serverdata/notes/Live_s0502.json diff --git a/assets/sif/notes/Live_s0503.json b/assets/serverdata/notes/Live_s0503.json similarity index 100% rename from assets/sif/notes/Live_s0503.json rename to assets/serverdata/notes/Live_s0503.json diff --git a/assets/sif/notes/Live_s0504.json b/assets/serverdata/notes/Live_s0504.json similarity index 100% rename from assets/sif/notes/Live_s0504.json rename to assets/serverdata/notes/Live_s0504.json diff --git a/assets/sif/notes/Live_s0505.json b/assets/serverdata/notes/Live_s0505.json similarity index 100% rename from assets/sif/notes/Live_s0505.json rename to assets/serverdata/notes/Live_s0505.json diff --git a/assets/sif/notes/Live_s0506.json b/assets/serverdata/notes/Live_s0506.json similarity index 100% rename from assets/sif/notes/Live_s0506.json rename to assets/serverdata/notes/Live_s0506.json diff --git a/assets/sif/notes/Live_s0507.json b/assets/serverdata/notes/Live_s0507.json similarity index 100% rename from assets/sif/notes/Live_s0507.json rename to assets/serverdata/notes/Live_s0507.json diff --git a/assets/sif/notes/Live_s0508.json b/assets/serverdata/notes/Live_s0508.json similarity index 100% rename from assets/sif/notes/Live_s0508.json rename to assets/serverdata/notes/Live_s0508.json diff --git a/assets/sif/notes/Live_s0509.json b/assets/serverdata/notes/Live_s0509.json similarity index 100% rename from assets/sif/notes/Live_s0509.json rename to assets/serverdata/notes/Live_s0509.json diff --git a/assets/sif/notes/Live_s0510.json b/assets/serverdata/notes/Live_s0510.json similarity index 100% rename from assets/sif/notes/Live_s0510.json rename to assets/serverdata/notes/Live_s0510.json diff --git a/assets/sif/notes/Live_s0511.json b/assets/serverdata/notes/Live_s0511.json similarity index 100% rename from assets/sif/notes/Live_s0511.json rename to assets/serverdata/notes/Live_s0511.json diff --git a/assets/sif/notes/Live_s0512.json b/assets/serverdata/notes/Live_s0512.json similarity index 100% rename from assets/sif/notes/Live_s0512.json rename to assets/serverdata/notes/Live_s0512.json diff --git a/assets/sif/notes/Live_s0513.json b/assets/serverdata/notes/Live_s0513.json similarity index 100% rename from assets/sif/notes/Live_s0513.json rename to assets/serverdata/notes/Live_s0513.json diff --git a/assets/sif/notes/Live_s0514.json b/assets/serverdata/notes/Live_s0514.json similarity index 100% rename from assets/sif/notes/Live_s0514.json rename to assets/serverdata/notes/Live_s0514.json diff --git a/assets/sif/notes/Live_s0515.json b/assets/serverdata/notes/Live_s0515.json similarity index 100% rename from assets/sif/notes/Live_s0515.json rename to assets/serverdata/notes/Live_s0515.json diff --git a/assets/sif/notes/Live_s0516.json b/assets/serverdata/notes/Live_s0516.json similarity index 100% rename from assets/sif/notes/Live_s0516.json rename to assets/serverdata/notes/Live_s0516.json diff --git a/assets/sif/notes/Live_s0517.json b/assets/serverdata/notes/Live_s0517.json similarity index 100% rename from assets/sif/notes/Live_s0517.json rename to assets/serverdata/notes/Live_s0517.json diff --git a/assets/sif/notes/Live_s0518.json b/assets/serverdata/notes/Live_s0518.json similarity index 100% rename from assets/sif/notes/Live_s0518.json rename to assets/serverdata/notes/Live_s0518.json diff --git a/assets/sif/notes/Live_s0519.json b/assets/serverdata/notes/Live_s0519.json similarity index 100% rename from assets/sif/notes/Live_s0519.json rename to assets/serverdata/notes/Live_s0519.json diff --git a/assets/sif/notes/Live_s0520.json b/assets/serverdata/notes/Live_s0520.json similarity index 100% rename from assets/sif/notes/Live_s0520.json rename to assets/serverdata/notes/Live_s0520.json diff --git a/assets/sif/notes/Live_s0521.json b/assets/serverdata/notes/Live_s0521.json similarity index 100% rename from assets/sif/notes/Live_s0521.json rename to assets/serverdata/notes/Live_s0521.json diff --git a/assets/sif/notes/Live_s0522.json b/assets/serverdata/notes/Live_s0522.json similarity index 100% rename from assets/sif/notes/Live_s0522.json rename to assets/serverdata/notes/Live_s0522.json diff --git a/assets/sif/notes/Live_s0523.json b/assets/serverdata/notes/Live_s0523.json similarity index 100% rename from assets/sif/notes/Live_s0523.json rename to assets/serverdata/notes/Live_s0523.json diff --git a/assets/sif/notes/Live_s0524.json b/assets/serverdata/notes/Live_s0524.json similarity index 100% rename from assets/sif/notes/Live_s0524.json rename to assets/serverdata/notes/Live_s0524.json diff --git a/assets/sif/notes/Live_s0525.json b/assets/serverdata/notes/Live_s0525.json similarity index 100% rename from assets/sif/notes/Live_s0525.json rename to assets/serverdata/notes/Live_s0525.json diff --git a/assets/sif/notes/Live_s0526.json b/assets/serverdata/notes/Live_s0526.json similarity index 100% rename from assets/sif/notes/Live_s0526.json rename to assets/serverdata/notes/Live_s0526.json diff --git a/assets/sif/notes/Live_s0527.json b/assets/serverdata/notes/Live_s0527.json similarity index 100% rename from assets/sif/notes/Live_s0527.json rename to assets/serverdata/notes/Live_s0527.json diff --git a/assets/sif/notes/Live_s0528.json b/assets/serverdata/notes/Live_s0528.json similarity index 100% rename from assets/sif/notes/Live_s0528.json rename to assets/serverdata/notes/Live_s0528.json diff --git a/assets/sif/notes/Live_s0529.json b/assets/serverdata/notes/Live_s0529.json similarity index 100% rename from assets/sif/notes/Live_s0529.json rename to assets/serverdata/notes/Live_s0529.json diff --git a/assets/sif/notes/Live_s0530.json b/assets/serverdata/notes/Live_s0530.json similarity index 100% rename from assets/sif/notes/Live_s0530.json rename to assets/serverdata/notes/Live_s0530.json diff --git a/assets/sif/notes/Live_s0531.json b/assets/serverdata/notes/Live_s0531.json similarity index 100% rename from assets/sif/notes/Live_s0531.json rename to assets/serverdata/notes/Live_s0531.json diff --git a/assets/sif/notes/Live_s0532.json b/assets/serverdata/notes/Live_s0532.json similarity index 100% rename from assets/sif/notes/Live_s0532.json rename to assets/serverdata/notes/Live_s0532.json diff --git a/assets/sif/notes/Live_s0533.json b/assets/serverdata/notes/Live_s0533.json similarity index 100% rename from assets/sif/notes/Live_s0533.json rename to assets/serverdata/notes/Live_s0533.json diff --git a/assets/sif/notes/Live_s0534.json b/assets/serverdata/notes/Live_s0534.json similarity index 100% rename from assets/sif/notes/Live_s0534.json rename to assets/serverdata/notes/Live_s0534.json diff --git a/assets/sif/notes/Live_s0535.json b/assets/serverdata/notes/Live_s0535.json similarity index 100% rename from assets/sif/notes/Live_s0535.json rename to assets/serverdata/notes/Live_s0535.json diff --git a/assets/sif/notes/Live_s0536.json b/assets/serverdata/notes/Live_s0536.json similarity index 100% rename from assets/sif/notes/Live_s0536.json rename to assets/serverdata/notes/Live_s0536.json diff --git a/assets/sif/notes/Live_s0537.json b/assets/serverdata/notes/Live_s0537.json similarity index 100% rename from assets/sif/notes/Live_s0537.json rename to assets/serverdata/notes/Live_s0537.json diff --git a/assets/sif/notes/Live_s0538.json b/assets/serverdata/notes/Live_s0538.json similarity index 100% rename from assets/sif/notes/Live_s0538.json rename to assets/serverdata/notes/Live_s0538.json diff --git a/assets/sif/notes/Live_s0539.json b/assets/serverdata/notes/Live_s0539.json similarity index 100% rename from assets/sif/notes/Live_s0539.json rename to assets/serverdata/notes/Live_s0539.json diff --git a/assets/sif/notes/Live_s0551.json b/assets/serverdata/notes/Live_s0551.json similarity index 100% rename from assets/sif/notes/Live_s0551.json rename to assets/serverdata/notes/Live_s0551.json diff --git a/assets/sif/notes/Live_s0552.json b/assets/serverdata/notes/Live_s0552.json similarity index 100% rename from assets/sif/notes/Live_s0552.json rename to assets/serverdata/notes/Live_s0552.json diff --git a/assets/sif/notes/Live_s0553.json b/assets/serverdata/notes/Live_s0553.json similarity index 100% rename from assets/sif/notes/Live_s0553.json rename to assets/serverdata/notes/Live_s0553.json diff --git a/assets/sif/notes/Live_s0554.json b/assets/serverdata/notes/Live_s0554.json similarity index 100% rename from assets/sif/notes/Live_s0554.json rename to assets/serverdata/notes/Live_s0554.json diff --git a/assets/sif/notes/Live_s0555.json b/assets/serverdata/notes/Live_s0555.json similarity index 100% rename from assets/sif/notes/Live_s0555.json rename to assets/serverdata/notes/Live_s0555.json diff --git a/assets/sif/notes/Live_s0556.json b/assets/serverdata/notes/Live_s0556.json similarity index 100% rename from assets/sif/notes/Live_s0556.json rename to assets/serverdata/notes/Live_s0556.json diff --git a/assets/sif/notes/Live_s0557.json b/assets/serverdata/notes/Live_s0557.json similarity index 100% rename from assets/sif/notes/Live_s0557.json rename to assets/serverdata/notes/Live_s0557.json diff --git a/assets/sif/notes/Live_s0558.json b/assets/serverdata/notes/Live_s0558.json similarity index 100% rename from assets/sif/notes/Live_s0558.json rename to assets/serverdata/notes/Live_s0558.json diff --git a/assets/sif/notes/Live_s0559.json b/assets/serverdata/notes/Live_s0559.json similarity index 100% rename from assets/sif/notes/Live_s0559.json rename to assets/serverdata/notes/Live_s0559.json diff --git a/assets/sif/notes/Live_s0560.json b/assets/serverdata/notes/Live_s0560.json similarity index 100% rename from assets/sif/notes/Live_s0560.json rename to assets/serverdata/notes/Live_s0560.json diff --git a/assets/sif/notes/Live_s0561.json b/assets/serverdata/notes/Live_s0561.json similarity index 100% rename from assets/sif/notes/Live_s0561.json rename to assets/serverdata/notes/Live_s0561.json diff --git a/assets/sif/notes/Live_s0562.json b/assets/serverdata/notes/Live_s0562.json similarity index 100% rename from assets/sif/notes/Live_s0562.json rename to assets/serverdata/notes/Live_s0562.json diff --git a/assets/sif/notes/Live_s0563.json b/assets/serverdata/notes/Live_s0563.json similarity index 100% rename from assets/sif/notes/Live_s0563.json rename to assets/serverdata/notes/Live_s0563.json diff --git a/assets/sif/notes/Live_s0564.json b/assets/serverdata/notes/Live_s0564.json similarity index 100% rename from assets/sif/notes/Live_s0564.json rename to assets/serverdata/notes/Live_s0564.json diff --git a/assets/sif/notes/Live_s0565.json b/assets/serverdata/notes/Live_s0565.json similarity index 100% rename from assets/sif/notes/Live_s0565.json rename to assets/serverdata/notes/Live_s0565.json diff --git a/assets/sif/notes/Live_s0566.json b/assets/serverdata/notes/Live_s0566.json similarity index 100% rename from assets/sif/notes/Live_s0566.json rename to assets/serverdata/notes/Live_s0566.json diff --git a/assets/sif/notes/Live_s0567.json b/assets/serverdata/notes/Live_s0567.json similarity index 100% rename from assets/sif/notes/Live_s0567.json rename to assets/serverdata/notes/Live_s0567.json diff --git a/assets/sif/notes/Live_s0568.json b/assets/serverdata/notes/Live_s0568.json similarity index 100% rename from assets/sif/notes/Live_s0568.json rename to assets/serverdata/notes/Live_s0568.json diff --git a/assets/sif/notes/Live_s0569.json b/assets/serverdata/notes/Live_s0569.json similarity index 100% rename from assets/sif/notes/Live_s0569.json rename to assets/serverdata/notes/Live_s0569.json diff --git a/assets/sif/notes/Live_s0570.json b/assets/serverdata/notes/Live_s0570.json similarity index 100% rename from assets/sif/notes/Live_s0570.json rename to assets/serverdata/notes/Live_s0570.json diff --git a/assets/sif/notes/Live_s0571.json b/assets/serverdata/notes/Live_s0571.json similarity index 100% rename from assets/sif/notes/Live_s0571.json rename to assets/serverdata/notes/Live_s0571.json diff --git a/assets/sif/notes/Live_s0572.json b/assets/serverdata/notes/Live_s0572.json similarity index 100% rename from assets/sif/notes/Live_s0572.json rename to assets/serverdata/notes/Live_s0572.json diff --git a/assets/sif/notes/Live_s0573.json b/assets/serverdata/notes/Live_s0573.json similarity index 100% rename from assets/sif/notes/Live_s0573.json rename to assets/serverdata/notes/Live_s0573.json diff --git a/assets/sif/notes/Live_s0574.json b/assets/serverdata/notes/Live_s0574.json similarity index 100% rename from assets/sif/notes/Live_s0574.json rename to assets/serverdata/notes/Live_s0574.json diff --git a/assets/sif/notes/Live_s0575.json b/assets/serverdata/notes/Live_s0575.json similarity index 100% rename from assets/sif/notes/Live_s0575.json rename to assets/serverdata/notes/Live_s0575.json diff --git a/assets/sif/notes/Live_s0576.json b/assets/serverdata/notes/Live_s0576.json similarity index 100% rename from assets/sif/notes/Live_s0576.json rename to assets/serverdata/notes/Live_s0576.json diff --git a/assets/sif/notes/Live_s0577.json b/assets/serverdata/notes/Live_s0577.json similarity index 100% rename from assets/sif/notes/Live_s0577.json rename to assets/serverdata/notes/Live_s0577.json diff --git a/assets/sif/notes/Live_s0578.json b/assets/serverdata/notes/Live_s0578.json similarity index 100% rename from assets/sif/notes/Live_s0578.json rename to assets/serverdata/notes/Live_s0578.json diff --git a/assets/sif/notes/Live_s0579.json b/assets/serverdata/notes/Live_s0579.json similarity index 100% rename from assets/sif/notes/Live_s0579.json rename to assets/serverdata/notes/Live_s0579.json diff --git a/assets/sif/notes/Live_s0580.json b/assets/serverdata/notes/Live_s0580.json similarity index 100% rename from assets/sif/notes/Live_s0580.json rename to assets/serverdata/notes/Live_s0580.json diff --git a/assets/sif/notes/Live_s0581.json b/assets/serverdata/notes/Live_s0581.json similarity index 100% rename from assets/sif/notes/Live_s0581.json rename to assets/serverdata/notes/Live_s0581.json diff --git a/assets/sif/notes/Live_s0582.json b/assets/serverdata/notes/Live_s0582.json similarity index 100% rename from assets/sif/notes/Live_s0582.json rename to assets/serverdata/notes/Live_s0582.json diff --git a/assets/sif/notes/Live_s0583.json b/assets/serverdata/notes/Live_s0583.json similarity index 100% rename from assets/sif/notes/Live_s0583.json rename to assets/serverdata/notes/Live_s0583.json diff --git a/assets/sif/notes/Live_s0584.json b/assets/serverdata/notes/Live_s0584.json similarity index 100% rename from assets/sif/notes/Live_s0584.json rename to assets/serverdata/notes/Live_s0584.json diff --git a/assets/sif/notes/Live_s0585.json b/assets/serverdata/notes/Live_s0585.json similarity index 100% rename from assets/sif/notes/Live_s0585.json rename to assets/serverdata/notes/Live_s0585.json diff --git a/assets/sif/notes/Live_s0586.json b/assets/serverdata/notes/Live_s0586.json similarity index 100% rename from assets/sif/notes/Live_s0586.json rename to assets/serverdata/notes/Live_s0586.json diff --git a/assets/sif/notes/Live_s0587.json b/assets/serverdata/notes/Live_s0587.json similarity index 100% rename from assets/sif/notes/Live_s0587.json rename to assets/serverdata/notes/Live_s0587.json diff --git a/assets/sif/notes/Live_s0588.json b/assets/serverdata/notes/Live_s0588.json similarity index 100% rename from assets/sif/notes/Live_s0588.json rename to assets/serverdata/notes/Live_s0588.json diff --git a/assets/sif/notes/Live_s0589.json b/assets/serverdata/notes/Live_s0589.json similarity index 100% rename from assets/sif/notes/Live_s0589.json rename to assets/serverdata/notes/Live_s0589.json diff --git a/assets/sif/notes/Live_s0596.json b/assets/serverdata/notes/Live_s0596.json similarity index 100% rename from assets/sif/notes/Live_s0596.json rename to assets/serverdata/notes/Live_s0596.json diff --git a/assets/sif/notes/Live_s0597.json b/assets/serverdata/notes/Live_s0597.json similarity index 100% rename from assets/sif/notes/Live_s0597.json rename to assets/serverdata/notes/Live_s0597.json diff --git a/assets/sif/notes/Live_s0598.json b/assets/serverdata/notes/Live_s0598.json similarity index 100% rename from assets/sif/notes/Live_s0598.json rename to assets/serverdata/notes/Live_s0598.json diff --git a/assets/sif/notes/Live_s0599.json b/assets/serverdata/notes/Live_s0599.json similarity index 100% rename from assets/sif/notes/Live_s0599.json rename to assets/serverdata/notes/Live_s0599.json diff --git a/assets/sif/notes/Live_s0600.json b/assets/serverdata/notes/Live_s0600.json similarity index 100% rename from assets/sif/notes/Live_s0600.json rename to assets/serverdata/notes/Live_s0600.json diff --git a/assets/sif/notes/Live_s0601.json b/assets/serverdata/notes/Live_s0601.json similarity index 100% rename from assets/sif/notes/Live_s0601.json rename to assets/serverdata/notes/Live_s0601.json diff --git a/assets/sif/notes/Live_s0602.json b/assets/serverdata/notes/Live_s0602.json similarity index 100% rename from assets/sif/notes/Live_s0602.json rename to assets/serverdata/notes/Live_s0602.json diff --git a/assets/sif/notes/Live_s0603.json b/assets/serverdata/notes/Live_s0603.json similarity index 100% rename from assets/sif/notes/Live_s0603.json rename to assets/serverdata/notes/Live_s0603.json diff --git a/assets/sif/notes/Live_s0604.json b/assets/serverdata/notes/Live_s0604.json similarity index 100% rename from assets/sif/notes/Live_s0604.json rename to assets/serverdata/notes/Live_s0604.json diff --git a/assets/sif/notes/Live_s0605.json b/assets/serverdata/notes/Live_s0605.json similarity index 100% rename from assets/sif/notes/Live_s0605.json rename to assets/serverdata/notes/Live_s0605.json diff --git a/assets/sif/notes/Live_s0606.json b/assets/serverdata/notes/Live_s0606.json similarity index 100% rename from assets/sif/notes/Live_s0606.json rename to assets/serverdata/notes/Live_s0606.json diff --git a/assets/sif/notes/Live_s0607.json b/assets/serverdata/notes/Live_s0607.json similarity index 100% rename from assets/sif/notes/Live_s0607.json rename to assets/serverdata/notes/Live_s0607.json diff --git a/assets/sif/notes/Live_s0608.json b/assets/serverdata/notes/Live_s0608.json similarity index 100% rename from assets/sif/notes/Live_s0608.json rename to assets/serverdata/notes/Live_s0608.json diff --git a/assets/sif/notes/Live_s0609.json b/assets/serverdata/notes/Live_s0609.json similarity index 100% rename from assets/sif/notes/Live_s0609.json rename to assets/serverdata/notes/Live_s0609.json diff --git a/assets/sif/notes/Live_s0610.json b/assets/serverdata/notes/Live_s0610.json similarity index 100% rename from assets/sif/notes/Live_s0610.json rename to assets/serverdata/notes/Live_s0610.json diff --git a/assets/sif/notes/Live_s0611.json b/assets/serverdata/notes/Live_s0611.json similarity index 100% rename from assets/sif/notes/Live_s0611.json rename to assets/serverdata/notes/Live_s0611.json diff --git a/assets/sif/notes/Live_s0612.json b/assets/serverdata/notes/Live_s0612.json similarity index 100% rename from assets/sif/notes/Live_s0612.json rename to assets/serverdata/notes/Live_s0612.json diff --git a/assets/sif/notes/Live_s0613.json b/assets/serverdata/notes/Live_s0613.json similarity index 100% rename from assets/sif/notes/Live_s0613.json rename to assets/serverdata/notes/Live_s0613.json diff --git a/assets/sif/notes/Live_s0614.json b/assets/serverdata/notes/Live_s0614.json similarity index 100% rename from assets/sif/notes/Live_s0614.json rename to assets/serverdata/notes/Live_s0614.json diff --git a/assets/sif/notes/Live_s0615.json b/assets/serverdata/notes/Live_s0615.json similarity index 100% rename from assets/sif/notes/Live_s0615.json rename to assets/serverdata/notes/Live_s0615.json diff --git a/assets/sif/notes/Live_s0616.json b/assets/serverdata/notes/Live_s0616.json similarity index 100% rename from assets/sif/notes/Live_s0616.json rename to assets/serverdata/notes/Live_s0616.json diff --git a/assets/sif/notes/Live_s0617.json b/assets/serverdata/notes/Live_s0617.json similarity index 100% rename from assets/sif/notes/Live_s0617.json rename to assets/serverdata/notes/Live_s0617.json diff --git a/assets/sif/notes/Live_s0618.json b/assets/serverdata/notes/Live_s0618.json similarity index 100% rename from assets/sif/notes/Live_s0618.json rename to assets/serverdata/notes/Live_s0618.json diff --git a/assets/sif/notes/Live_s0619.json b/assets/serverdata/notes/Live_s0619.json similarity index 100% rename from assets/sif/notes/Live_s0619.json rename to assets/serverdata/notes/Live_s0619.json diff --git a/assets/sif/notes/Live_s0620.json b/assets/serverdata/notes/Live_s0620.json similarity index 100% rename from assets/sif/notes/Live_s0620.json rename to assets/serverdata/notes/Live_s0620.json diff --git a/assets/sif/notes/Live_s0621.json b/assets/serverdata/notes/Live_s0621.json similarity index 100% rename from assets/sif/notes/Live_s0621.json rename to assets/serverdata/notes/Live_s0621.json diff --git a/assets/sif/notes/Live_s0622.json b/assets/serverdata/notes/Live_s0622.json similarity index 100% rename from assets/sif/notes/Live_s0622.json rename to assets/serverdata/notes/Live_s0622.json diff --git a/assets/sif/notes/Live_s0623.json b/assets/serverdata/notes/Live_s0623.json similarity index 100% rename from assets/sif/notes/Live_s0623.json rename to assets/serverdata/notes/Live_s0623.json diff --git a/assets/sif/notes/Live_s0624.json b/assets/serverdata/notes/Live_s0624.json similarity index 100% rename from assets/sif/notes/Live_s0624.json rename to assets/serverdata/notes/Live_s0624.json diff --git a/assets/sif/notes/Live_s0625.json b/assets/serverdata/notes/Live_s0625.json similarity index 100% rename from assets/sif/notes/Live_s0625.json rename to assets/serverdata/notes/Live_s0625.json diff --git a/assets/sif/notes/Live_s0626.json b/assets/serverdata/notes/Live_s0626.json similarity index 100% rename from assets/sif/notes/Live_s0626.json rename to assets/serverdata/notes/Live_s0626.json diff --git a/assets/sif/notes/Live_s0627.json b/assets/serverdata/notes/Live_s0627.json similarity index 100% rename from assets/sif/notes/Live_s0627.json rename to assets/serverdata/notes/Live_s0627.json diff --git a/assets/sif/notes/Live_s0628.json b/assets/serverdata/notes/Live_s0628.json similarity index 100% rename from assets/sif/notes/Live_s0628.json rename to assets/serverdata/notes/Live_s0628.json diff --git a/assets/sif/notes/Live_s0629.json b/assets/serverdata/notes/Live_s0629.json similarity index 100% rename from assets/sif/notes/Live_s0629.json rename to assets/serverdata/notes/Live_s0629.json diff --git a/assets/sif/notes/Live_s0630.json b/assets/serverdata/notes/Live_s0630.json similarity index 100% rename from assets/sif/notes/Live_s0630.json rename to assets/serverdata/notes/Live_s0630.json diff --git a/assets/sif/notes/Live_s0631.json b/assets/serverdata/notes/Live_s0631.json similarity index 100% rename from assets/sif/notes/Live_s0631.json rename to assets/serverdata/notes/Live_s0631.json diff --git a/assets/sif/notes/Live_s0632.json b/assets/serverdata/notes/Live_s0632.json similarity index 100% rename from assets/sif/notes/Live_s0632.json rename to assets/serverdata/notes/Live_s0632.json diff --git a/assets/sif/notes/Live_s0633.json b/assets/serverdata/notes/Live_s0633.json similarity index 100% rename from assets/sif/notes/Live_s0633.json rename to assets/serverdata/notes/Live_s0633.json diff --git a/assets/sif/notes/Live_s0634.json b/assets/serverdata/notes/Live_s0634.json similarity index 100% rename from assets/sif/notes/Live_s0634.json rename to assets/serverdata/notes/Live_s0634.json diff --git a/assets/sif/notes/Live_s0641.json b/assets/serverdata/notes/Live_s0641.json similarity index 100% rename from assets/sif/notes/Live_s0641.json rename to assets/serverdata/notes/Live_s0641.json diff --git a/assets/sif/notes/Live_s0642.json b/assets/serverdata/notes/Live_s0642.json similarity index 100% rename from assets/sif/notes/Live_s0642.json rename to assets/serverdata/notes/Live_s0642.json diff --git a/assets/sif/notes/Live_s0643.json b/assets/serverdata/notes/Live_s0643.json similarity index 100% rename from assets/sif/notes/Live_s0643.json rename to assets/serverdata/notes/Live_s0643.json diff --git a/assets/sif/notes/Live_s0644.json b/assets/serverdata/notes/Live_s0644.json similarity index 100% rename from assets/sif/notes/Live_s0644.json rename to assets/serverdata/notes/Live_s0644.json diff --git a/assets/sif/notes/Live_s0645.json b/assets/serverdata/notes/Live_s0645.json similarity index 100% rename from assets/sif/notes/Live_s0645.json rename to assets/serverdata/notes/Live_s0645.json diff --git a/assets/sif/notes/Live_s0646.json b/assets/serverdata/notes/Live_s0646.json similarity index 100% rename from assets/sif/notes/Live_s0646.json rename to assets/serverdata/notes/Live_s0646.json diff --git a/assets/sif/notes/Live_s0647.json b/assets/serverdata/notes/Live_s0647.json similarity index 100% rename from assets/sif/notes/Live_s0647.json rename to assets/serverdata/notes/Live_s0647.json diff --git a/assets/sif/notes/Live_s0648.json b/assets/serverdata/notes/Live_s0648.json similarity index 100% rename from assets/sif/notes/Live_s0648.json rename to assets/serverdata/notes/Live_s0648.json diff --git a/assets/sif/notes/Live_s0649.json b/assets/serverdata/notes/Live_s0649.json similarity index 100% rename from assets/sif/notes/Live_s0649.json rename to assets/serverdata/notes/Live_s0649.json diff --git a/assets/sif/notes/Live_s0650.json b/assets/serverdata/notes/Live_s0650.json similarity index 100% rename from assets/sif/notes/Live_s0650.json rename to assets/serverdata/notes/Live_s0650.json diff --git a/assets/sif/notes/Live_s0651.json b/assets/serverdata/notes/Live_s0651.json similarity index 100% rename from assets/sif/notes/Live_s0651.json rename to assets/serverdata/notes/Live_s0651.json diff --git a/assets/sif/notes/Live_s0652.json b/assets/serverdata/notes/Live_s0652.json similarity index 100% rename from assets/sif/notes/Live_s0652.json rename to assets/serverdata/notes/Live_s0652.json diff --git a/assets/sif/notes/Live_s0653.json b/assets/serverdata/notes/Live_s0653.json similarity index 100% rename from assets/sif/notes/Live_s0653.json rename to assets/serverdata/notes/Live_s0653.json diff --git a/assets/sif/notes/Live_s0654.json b/assets/serverdata/notes/Live_s0654.json similarity index 100% rename from assets/sif/notes/Live_s0654.json rename to assets/serverdata/notes/Live_s0654.json diff --git a/assets/sif/notes/Live_s0655.json b/assets/serverdata/notes/Live_s0655.json similarity index 100% rename from assets/sif/notes/Live_s0655.json rename to assets/serverdata/notes/Live_s0655.json diff --git a/assets/sif/notes/Live_s0656.json b/assets/serverdata/notes/Live_s0656.json similarity index 100% rename from assets/sif/notes/Live_s0656.json rename to assets/serverdata/notes/Live_s0656.json diff --git a/assets/sif/notes/Live_s0657.json b/assets/serverdata/notes/Live_s0657.json similarity index 100% rename from assets/sif/notes/Live_s0657.json rename to assets/serverdata/notes/Live_s0657.json diff --git a/assets/sif/notes/Live_s0658.json b/assets/serverdata/notes/Live_s0658.json similarity index 100% rename from assets/sif/notes/Live_s0658.json rename to assets/serverdata/notes/Live_s0658.json diff --git a/assets/sif/notes/Live_s0659.json b/assets/serverdata/notes/Live_s0659.json similarity index 100% rename from assets/sif/notes/Live_s0659.json rename to assets/serverdata/notes/Live_s0659.json diff --git a/assets/sif/notes/Live_s0660.json b/assets/serverdata/notes/Live_s0660.json similarity index 100% rename from assets/sif/notes/Live_s0660.json rename to assets/serverdata/notes/Live_s0660.json diff --git a/assets/sif/notes/Live_s0661.json b/assets/serverdata/notes/Live_s0661.json similarity index 100% rename from assets/sif/notes/Live_s0661.json rename to assets/serverdata/notes/Live_s0661.json diff --git a/assets/sif/notes/Live_s0662.json b/assets/serverdata/notes/Live_s0662.json similarity index 100% rename from assets/sif/notes/Live_s0662.json rename to assets/serverdata/notes/Live_s0662.json diff --git a/assets/sif/notes/Live_s0663.json b/assets/serverdata/notes/Live_s0663.json similarity index 100% rename from assets/sif/notes/Live_s0663.json rename to assets/serverdata/notes/Live_s0663.json diff --git a/assets/sif/notes/Live_s0664.json b/assets/serverdata/notes/Live_s0664.json similarity index 100% rename from assets/sif/notes/Live_s0664.json rename to assets/serverdata/notes/Live_s0664.json diff --git a/assets/sif/notes/Live_s0665.json b/assets/serverdata/notes/Live_s0665.json similarity index 100% rename from assets/sif/notes/Live_s0665.json rename to assets/serverdata/notes/Live_s0665.json diff --git a/assets/sif/notes/Live_s0666.json b/assets/serverdata/notes/Live_s0666.json similarity index 100% rename from assets/sif/notes/Live_s0666.json rename to assets/serverdata/notes/Live_s0666.json diff --git a/assets/sif/notes/Live_s0667.json b/assets/serverdata/notes/Live_s0667.json similarity index 100% rename from assets/sif/notes/Live_s0667.json rename to assets/serverdata/notes/Live_s0667.json diff --git a/assets/sif/notes/Live_s0668.json b/assets/serverdata/notes/Live_s0668.json similarity index 100% rename from assets/sif/notes/Live_s0668.json rename to assets/serverdata/notes/Live_s0668.json diff --git a/assets/sif/notes/Live_s0669.json b/assets/serverdata/notes/Live_s0669.json similarity index 100% rename from assets/sif/notes/Live_s0669.json rename to assets/serverdata/notes/Live_s0669.json diff --git a/assets/sif/notes/Live_s0670.json b/assets/serverdata/notes/Live_s0670.json similarity index 100% rename from assets/sif/notes/Live_s0670.json rename to assets/serverdata/notes/Live_s0670.json diff --git a/assets/sif/notes/Live_s0671.json b/assets/serverdata/notes/Live_s0671.json similarity index 100% rename from assets/sif/notes/Live_s0671.json rename to assets/serverdata/notes/Live_s0671.json diff --git a/assets/sif/notes/Live_s0672.json b/assets/serverdata/notes/Live_s0672.json similarity index 100% rename from assets/sif/notes/Live_s0672.json rename to assets/serverdata/notes/Live_s0672.json diff --git a/assets/sif/notes/Live_s0673.json b/assets/serverdata/notes/Live_s0673.json similarity index 100% rename from assets/sif/notes/Live_s0673.json rename to assets/serverdata/notes/Live_s0673.json diff --git a/assets/sif/notes/Live_s0677.json b/assets/serverdata/notes/Live_s0677.json similarity index 100% rename from assets/sif/notes/Live_s0677.json rename to assets/serverdata/notes/Live_s0677.json diff --git a/assets/sif/notes/Live_s0678.json b/assets/serverdata/notes/Live_s0678.json similarity index 100% rename from assets/sif/notes/Live_s0678.json rename to assets/serverdata/notes/Live_s0678.json diff --git a/assets/sif/notes/Live_s0679.json b/assets/serverdata/notes/Live_s0679.json similarity index 100% rename from assets/sif/notes/Live_s0679.json rename to assets/serverdata/notes/Live_s0679.json diff --git a/assets/sif/notes/Live_s0680.json b/assets/serverdata/notes/Live_s0680.json similarity index 100% rename from assets/sif/notes/Live_s0680.json rename to assets/serverdata/notes/Live_s0680.json diff --git a/assets/sif/notes/Live_s0681.json b/assets/serverdata/notes/Live_s0681.json similarity index 100% rename from assets/sif/notes/Live_s0681.json rename to assets/serverdata/notes/Live_s0681.json diff --git a/assets/sif/notes/Live_s0682.json b/assets/serverdata/notes/Live_s0682.json similarity index 100% rename from assets/sif/notes/Live_s0682.json rename to assets/serverdata/notes/Live_s0682.json diff --git a/assets/sif/notes/Live_s0683.json b/assets/serverdata/notes/Live_s0683.json similarity index 100% rename from assets/sif/notes/Live_s0683.json rename to assets/serverdata/notes/Live_s0683.json diff --git a/assets/sif/notes/Live_s0684.json b/assets/serverdata/notes/Live_s0684.json similarity index 100% rename from assets/sif/notes/Live_s0684.json rename to assets/serverdata/notes/Live_s0684.json diff --git a/assets/sif/notes/Live_s0685.json b/assets/serverdata/notes/Live_s0685.json similarity index 100% rename from assets/sif/notes/Live_s0685.json rename to assets/serverdata/notes/Live_s0685.json diff --git a/assets/sif/notes/Live_s0686.json b/assets/serverdata/notes/Live_s0686.json similarity index 100% rename from assets/sif/notes/Live_s0686.json rename to assets/serverdata/notes/Live_s0686.json diff --git a/assets/sif/notes/Live_s0687.json b/assets/serverdata/notes/Live_s0687.json similarity index 100% rename from assets/sif/notes/Live_s0687.json rename to assets/serverdata/notes/Live_s0687.json diff --git a/assets/sif/notes/Live_s0688.json b/assets/serverdata/notes/Live_s0688.json similarity index 100% rename from assets/sif/notes/Live_s0688.json rename to assets/serverdata/notes/Live_s0688.json diff --git a/assets/sif/notes/Live_s0689.json b/assets/serverdata/notes/Live_s0689.json similarity index 100% rename from assets/sif/notes/Live_s0689.json rename to assets/serverdata/notes/Live_s0689.json diff --git a/assets/sif/notes/Live_s0690.json b/assets/serverdata/notes/Live_s0690.json similarity index 100% rename from assets/sif/notes/Live_s0690.json rename to assets/serverdata/notes/Live_s0690.json diff --git a/assets/sif/notes/Live_s0691.json b/assets/serverdata/notes/Live_s0691.json similarity index 100% rename from assets/sif/notes/Live_s0691.json rename to assets/serverdata/notes/Live_s0691.json diff --git a/assets/sif/notes/Live_s0692.json b/assets/serverdata/notes/Live_s0692.json similarity index 100% rename from assets/sif/notes/Live_s0692.json rename to assets/serverdata/notes/Live_s0692.json diff --git a/assets/sif/notes/Live_s0693.json b/assets/serverdata/notes/Live_s0693.json similarity index 100% rename from assets/sif/notes/Live_s0693.json rename to assets/serverdata/notes/Live_s0693.json diff --git a/assets/sif/notes/Live_s0694.json b/assets/serverdata/notes/Live_s0694.json similarity index 100% rename from assets/sif/notes/Live_s0694.json rename to assets/serverdata/notes/Live_s0694.json diff --git a/assets/sif/notes/Live_s0695.json b/assets/serverdata/notes/Live_s0695.json similarity index 100% rename from assets/sif/notes/Live_s0695.json rename to assets/serverdata/notes/Live_s0695.json diff --git a/assets/sif/notes/Live_s0696.json b/assets/serverdata/notes/Live_s0696.json similarity index 100% rename from assets/sif/notes/Live_s0696.json rename to assets/serverdata/notes/Live_s0696.json diff --git a/assets/sif/notes/Live_s0697.json b/assets/serverdata/notes/Live_s0697.json similarity index 100% rename from assets/sif/notes/Live_s0697.json rename to assets/serverdata/notes/Live_s0697.json diff --git a/assets/sif/notes/Live_s0698.json b/assets/serverdata/notes/Live_s0698.json similarity index 100% rename from assets/sif/notes/Live_s0698.json rename to assets/serverdata/notes/Live_s0698.json diff --git a/assets/sif/notes/Live_s0699.json b/assets/serverdata/notes/Live_s0699.json similarity index 100% rename from assets/sif/notes/Live_s0699.json rename to assets/serverdata/notes/Live_s0699.json diff --git a/assets/sif/notes/Live_s0700.json b/assets/serverdata/notes/Live_s0700.json similarity index 100% rename from assets/sif/notes/Live_s0700.json rename to assets/serverdata/notes/Live_s0700.json diff --git a/assets/sif/notes/Live_s0703.json b/assets/serverdata/notes/Live_s0703.json similarity index 100% rename from assets/sif/notes/Live_s0703.json rename to assets/serverdata/notes/Live_s0703.json diff --git a/assets/sif/notes/Live_s0704.json b/assets/serverdata/notes/Live_s0704.json similarity index 100% rename from assets/sif/notes/Live_s0704.json rename to assets/serverdata/notes/Live_s0704.json diff --git a/assets/sif/notes/Live_s0705.json b/assets/serverdata/notes/Live_s0705.json similarity index 100% rename from assets/sif/notes/Live_s0705.json rename to assets/serverdata/notes/Live_s0705.json diff --git a/assets/sif/notes/Live_s0706.json b/assets/serverdata/notes/Live_s0706.json similarity index 100% rename from assets/sif/notes/Live_s0706.json rename to assets/serverdata/notes/Live_s0706.json diff --git a/assets/sif/notes/Live_s0707.json b/assets/serverdata/notes/Live_s0707.json similarity index 100% rename from assets/sif/notes/Live_s0707.json rename to assets/serverdata/notes/Live_s0707.json diff --git a/assets/sif/notes/Live_s0708.json b/assets/serverdata/notes/Live_s0708.json similarity index 100% rename from assets/sif/notes/Live_s0708.json rename to assets/serverdata/notes/Live_s0708.json diff --git a/assets/sif/notes/Live_s0709.json b/assets/serverdata/notes/Live_s0709.json similarity index 100% rename from assets/sif/notes/Live_s0709.json rename to assets/serverdata/notes/Live_s0709.json diff --git a/assets/sif/notes/Live_s0710.json b/assets/serverdata/notes/Live_s0710.json similarity index 100% rename from assets/sif/notes/Live_s0710.json rename to assets/serverdata/notes/Live_s0710.json diff --git a/assets/sif/notes/Live_s0711.json b/assets/serverdata/notes/Live_s0711.json similarity index 100% rename from assets/sif/notes/Live_s0711.json rename to assets/serverdata/notes/Live_s0711.json diff --git a/assets/sif/notes/Live_s0712.json b/assets/serverdata/notes/Live_s0712.json similarity index 100% rename from assets/sif/notes/Live_s0712.json rename to assets/serverdata/notes/Live_s0712.json diff --git a/assets/sif/notes/Live_s0713.json b/assets/serverdata/notes/Live_s0713.json similarity index 100% rename from assets/sif/notes/Live_s0713.json rename to assets/serverdata/notes/Live_s0713.json diff --git a/assets/sif/notes/Live_s0714.json b/assets/serverdata/notes/Live_s0714.json similarity index 100% rename from assets/sif/notes/Live_s0714.json rename to assets/serverdata/notes/Live_s0714.json diff --git a/assets/sif/notes/Live_s0715.json b/assets/serverdata/notes/Live_s0715.json similarity index 100% rename from assets/sif/notes/Live_s0715.json rename to assets/serverdata/notes/Live_s0715.json diff --git a/assets/sif/notes/Live_s0716.json b/assets/serverdata/notes/Live_s0716.json similarity index 100% rename from assets/sif/notes/Live_s0716.json rename to assets/serverdata/notes/Live_s0716.json diff --git a/assets/sif/notes/Live_s0717.json b/assets/serverdata/notes/Live_s0717.json similarity index 100% rename from assets/sif/notes/Live_s0717.json rename to assets/serverdata/notes/Live_s0717.json diff --git a/assets/sif/notes/Live_s0718.json b/assets/serverdata/notes/Live_s0718.json similarity index 100% rename from assets/sif/notes/Live_s0718.json rename to assets/serverdata/notes/Live_s0718.json diff --git a/assets/sif/notes/Live_s0719.json b/assets/serverdata/notes/Live_s0719.json similarity index 100% rename from assets/sif/notes/Live_s0719.json rename to assets/serverdata/notes/Live_s0719.json diff --git a/assets/sif/notes/Live_s0720.json b/assets/serverdata/notes/Live_s0720.json similarity index 100% rename from assets/sif/notes/Live_s0720.json rename to assets/serverdata/notes/Live_s0720.json diff --git a/assets/sif/notes/Live_s0721.json b/assets/serverdata/notes/Live_s0721.json similarity index 100% rename from assets/sif/notes/Live_s0721.json rename to assets/serverdata/notes/Live_s0721.json diff --git a/assets/sif/notes/Live_s0722.json b/assets/serverdata/notes/Live_s0722.json similarity index 100% rename from assets/sif/notes/Live_s0722.json rename to assets/serverdata/notes/Live_s0722.json diff --git a/assets/sif/notes/Live_s0725.json b/assets/serverdata/notes/Live_s0725.json similarity index 100% rename from assets/sif/notes/Live_s0725.json rename to assets/serverdata/notes/Live_s0725.json diff --git a/assets/sif/notes/Live_s0726.json b/assets/serverdata/notes/Live_s0726.json similarity index 100% rename from assets/sif/notes/Live_s0726.json rename to assets/serverdata/notes/Live_s0726.json diff --git a/assets/sif/notes/Live_s0727.json b/assets/serverdata/notes/Live_s0727.json similarity index 100% rename from assets/sif/notes/Live_s0727.json rename to assets/serverdata/notes/Live_s0727.json diff --git a/assets/sif/notes/Live_s0728.json b/assets/serverdata/notes/Live_s0728.json similarity index 100% rename from assets/sif/notes/Live_s0728.json rename to assets/serverdata/notes/Live_s0728.json diff --git a/assets/sif/notes/Live_s0729.json b/assets/serverdata/notes/Live_s0729.json similarity index 100% rename from assets/sif/notes/Live_s0729.json rename to assets/serverdata/notes/Live_s0729.json diff --git a/assets/sif/notes/Live_s0730.json b/assets/serverdata/notes/Live_s0730.json similarity index 100% rename from assets/sif/notes/Live_s0730.json rename to assets/serverdata/notes/Live_s0730.json diff --git a/assets/sif/notes/Live_s0731.json b/assets/serverdata/notes/Live_s0731.json similarity index 100% rename from assets/sif/notes/Live_s0731.json rename to assets/serverdata/notes/Live_s0731.json diff --git a/assets/sif/notes/Live_s0732.json b/assets/serverdata/notes/Live_s0732.json similarity index 100% rename from assets/sif/notes/Live_s0732.json rename to assets/serverdata/notes/Live_s0732.json diff --git a/assets/sif/notes/Live_s0733.json b/assets/serverdata/notes/Live_s0733.json similarity index 100% rename from assets/sif/notes/Live_s0733.json rename to assets/serverdata/notes/Live_s0733.json diff --git a/assets/sif/notes/Live_s0734.json b/assets/serverdata/notes/Live_s0734.json similarity index 100% rename from assets/sif/notes/Live_s0734.json rename to assets/serverdata/notes/Live_s0734.json diff --git a/assets/sif/notes/Live_s0735.json b/assets/serverdata/notes/Live_s0735.json similarity index 100% rename from assets/sif/notes/Live_s0735.json rename to assets/serverdata/notes/Live_s0735.json diff --git a/assets/sif/notes/Live_s0736.json b/assets/serverdata/notes/Live_s0736.json similarity index 100% rename from assets/sif/notes/Live_s0736.json rename to assets/serverdata/notes/Live_s0736.json diff --git a/assets/sif/notes/Live_s0737.json b/assets/serverdata/notes/Live_s0737.json similarity index 100% rename from assets/sif/notes/Live_s0737.json rename to assets/serverdata/notes/Live_s0737.json diff --git a/assets/sif/notes/Live_s0738.json b/assets/serverdata/notes/Live_s0738.json similarity index 100% rename from assets/sif/notes/Live_s0738.json rename to assets/serverdata/notes/Live_s0738.json diff --git a/assets/sif/notes/Live_s0739.json b/assets/serverdata/notes/Live_s0739.json similarity index 100% rename from assets/sif/notes/Live_s0739.json rename to assets/serverdata/notes/Live_s0739.json diff --git a/assets/sif/notes/Live_s0740.json b/assets/serverdata/notes/Live_s0740.json similarity index 100% rename from assets/sif/notes/Live_s0740.json rename to assets/serverdata/notes/Live_s0740.json diff --git a/assets/sif/notes/Live_s0741.json b/assets/serverdata/notes/Live_s0741.json similarity index 100% rename from assets/sif/notes/Live_s0741.json rename to assets/serverdata/notes/Live_s0741.json diff --git a/assets/sif/notes/Live_s0742.json b/assets/serverdata/notes/Live_s0742.json similarity index 100% rename from assets/sif/notes/Live_s0742.json rename to assets/serverdata/notes/Live_s0742.json diff --git a/assets/sif/notes/Live_s0743.json b/assets/serverdata/notes/Live_s0743.json similarity index 100% rename from assets/sif/notes/Live_s0743.json rename to assets/serverdata/notes/Live_s0743.json diff --git a/assets/sif/notes/Live_s0744.json b/assets/serverdata/notes/Live_s0744.json similarity index 100% rename from assets/sif/notes/Live_s0744.json rename to assets/serverdata/notes/Live_s0744.json diff --git a/assets/sif/notes/Live_s0745.json b/assets/serverdata/notes/Live_s0745.json similarity index 100% rename from assets/sif/notes/Live_s0745.json rename to assets/serverdata/notes/Live_s0745.json diff --git a/assets/sif/notes/Live_s0746.json b/assets/serverdata/notes/Live_s0746.json similarity index 100% rename from assets/sif/notes/Live_s0746.json rename to assets/serverdata/notes/Live_s0746.json diff --git a/assets/sif/notes/Live_s0747.json b/assets/serverdata/notes/Live_s0747.json similarity index 100% rename from assets/sif/notes/Live_s0747.json rename to assets/serverdata/notes/Live_s0747.json diff --git a/assets/sif/notes/Live_s0748.json b/assets/serverdata/notes/Live_s0748.json similarity index 100% rename from assets/sif/notes/Live_s0748.json rename to assets/serverdata/notes/Live_s0748.json diff --git a/assets/sif/notes/Live_s0749.json b/assets/serverdata/notes/Live_s0749.json similarity index 100% rename from assets/sif/notes/Live_s0749.json rename to assets/serverdata/notes/Live_s0749.json diff --git a/assets/sif/notes/Live_s0750.json b/assets/serverdata/notes/Live_s0750.json similarity index 100% rename from assets/sif/notes/Live_s0750.json rename to assets/serverdata/notes/Live_s0750.json diff --git a/assets/sif/notes/Live_s0751.json b/assets/serverdata/notes/Live_s0751.json similarity index 100% rename from assets/sif/notes/Live_s0751.json rename to assets/serverdata/notes/Live_s0751.json diff --git a/assets/sif/notes/Live_s0764.json b/assets/serverdata/notes/Live_s0764.json similarity index 100% rename from assets/sif/notes/Live_s0764.json rename to assets/serverdata/notes/Live_s0764.json diff --git a/assets/sif/notes/Live_s0765.json b/assets/serverdata/notes/Live_s0765.json similarity index 100% rename from assets/sif/notes/Live_s0765.json rename to assets/serverdata/notes/Live_s0765.json diff --git a/assets/sif/notes/Live_s0766.json b/assets/serverdata/notes/Live_s0766.json similarity index 100% rename from assets/sif/notes/Live_s0766.json rename to assets/serverdata/notes/Live_s0766.json diff --git a/assets/sif/notes/Live_s0767.json b/assets/serverdata/notes/Live_s0767.json similarity index 100% rename from assets/sif/notes/Live_s0767.json rename to assets/serverdata/notes/Live_s0767.json diff --git a/assets/sif/notes/Live_s0768.json b/assets/serverdata/notes/Live_s0768.json similarity index 100% rename from assets/sif/notes/Live_s0768.json rename to assets/serverdata/notes/Live_s0768.json diff --git a/assets/sif/notes/Live_s0769.json b/assets/serverdata/notes/Live_s0769.json similarity index 100% rename from assets/sif/notes/Live_s0769.json rename to assets/serverdata/notes/Live_s0769.json diff --git a/assets/sif/notes/Live_s0770.json b/assets/serverdata/notes/Live_s0770.json similarity index 100% rename from assets/sif/notes/Live_s0770.json rename to assets/serverdata/notes/Live_s0770.json diff --git a/assets/sif/notes/Live_s0771.json b/assets/serverdata/notes/Live_s0771.json similarity index 100% rename from assets/sif/notes/Live_s0771.json rename to assets/serverdata/notes/Live_s0771.json diff --git a/assets/sif/notes/Live_s0772.json b/assets/serverdata/notes/Live_s0772.json similarity index 100% rename from assets/sif/notes/Live_s0772.json rename to assets/serverdata/notes/Live_s0772.json diff --git a/assets/sif/notes/Live_s0773.json b/assets/serverdata/notes/Live_s0773.json similarity index 100% rename from assets/sif/notes/Live_s0773.json rename to assets/serverdata/notes/Live_s0773.json diff --git a/assets/sif/notes/Live_s0774.json b/assets/serverdata/notes/Live_s0774.json similarity index 100% rename from assets/sif/notes/Live_s0774.json rename to assets/serverdata/notes/Live_s0774.json diff --git a/assets/sif/notes/Live_s0775.json b/assets/serverdata/notes/Live_s0775.json similarity index 100% rename from assets/sif/notes/Live_s0775.json rename to assets/serverdata/notes/Live_s0775.json diff --git a/assets/sif/notes/Live_s0776.json b/assets/serverdata/notes/Live_s0776.json similarity index 100% rename from assets/sif/notes/Live_s0776.json rename to assets/serverdata/notes/Live_s0776.json diff --git a/assets/sif/notes/Live_s0777.json b/assets/serverdata/notes/Live_s0777.json similarity index 100% rename from assets/sif/notes/Live_s0777.json rename to assets/serverdata/notes/Live_s0777.json diff --git a/assets/sif/notes/Live_s0778.json b/assets/serverdata/notes/Live_s0778.json similarity index 100% rename from assets/sif/notes/Live_s0778.json rename to assets/serverdata/notes/Live_s0778.json diff --git a/assets/sif/notes/Live_s0779.json b/assets/serverdata/notes/Live_s0779.json similarity index 100% rename from assets/sif/notes/Live_s0779.json rename to assets/serverdata/notes/Live_s0779.json diff --git a/assets/sif/notes/Live_s0780.json b/assets/serverdata/notes/Live_s0780.json similarity index 100% rename from assets/sif/notes/Live_s0780.json rename to assets/serverdata/notes/Live_s0780.json diff --git a/assets/sif/notes/Live_s0781.json b/assets/serverdata/notes/Live_s0781.json similarity index 100% rename from assets/sif/notes/Live_s0781.json rename to assets/serverdata/notes/Live_s0781.json diff --git a/assets/sif/notes/Live_s0782.json b/assets/serverdata/notes/Live_s0782.json similarity index 100% rename from assets/sif/notes/Live_s0782.json rename to assets/serverdata/notes/Live_s0782.json diff --git a/assets/sif/notes/Live_s0783.json b/assets/serverdata/notes/Live_s0783.json similarity index 100% rename from assets/sif/notes/Live_s0783.json rename to assets/serverdata/notes/Live_s0783.json diff --git a/assets/sif/notes/Live_s0784.json b/assets/serverdata/notes/Live_s0784.json similarity index 100% rename from assets/sif/notes/Live_s0784.json rename to assets/serverdata/notes/Live_s0784.json diff --git a/assets/sif/notes/Live_s0785.json b/assets/serverdata/notes/Live_s0785.json similarity index 100% rename from assets/sif/notes/Live_s0785.json rename to assets/serverdata/notes/Live_s0785.json diff --git a/assets/sif/notes/Live_s0786.json b/assets/serverdata/notes/Live_s0786.json similarity index 100% rename from assets/sif/notes/Live_s0786.json rename to assets/serverdata/notes/Live_s0786.json diff --git a/assets/sif/notes/Live_s0787.json b/assets/serverdata/notes/Live_s0787.json similarity index 100% rename from assets/sif/notes/Live_s0787.json rename to assets/serverdata/notes/Live_s0787.json diff --git a/assets/sif/notes/Live_s0788.json b/assets/serverdata/notes/Live_s0788.json similarity index 100% rename from assets/sif/notes/Live_s0788.json rename to assets/serverdata/notes/Live_s0788.json diff --git a/assets/sif/notes/Live_s0789.json b/assets/serverdata/notes/Live_s0789.json similarity index 100% rename from assets/sif/notes/Live_s0789.json rename to assets/serverdata/notes/Live_s0789.json diff --git a/assets/sif/notes/Live_s0790.json b/assets/serverdata/notes/Live_s0790.json similarity index 100% rename from assets/sif/notes/Live_s0790.json rename to assets/serverdata/notes/Live_s0790.json diff --git a/assets/sif/notes/Live_s0791.json b/assets/serverdata/notes/Live_s0791.json similarity index 100% rename from assets/sif/notes/Live_s0791.json rename to assets/serverdata/notes/Live_s0791.json diff --git a/assets/sif/notes/Live_s0792.json b/assets/serverdata/notes/Live_s0792.json similarity index 100% rename from assets/sif/notes/Live_s0792.json rename to assets/serverdata/notes/Live_s0792.json diff --git a/assets/sif/notes/Live_s0793.json b/assets/serverdata/notes/Live_s0793.json similarity index 100% rename from assets/sif/notes/Live_s0793.json rename to assets/serverdata/notes/Live_s0793.json diff --git a/assets/sif/notes/Live_s0794.json b/assets/serverdata/notes/Live_s0794.json similarity index 100% rename from assets/sif/notes/Live_s0794.json rename to assets/serverdata/notes/Live_s0794.json diff --git a/assets/sif/notes/Live_s0795.json b/assets/serverdata/notes/Live_s0795.json similarity index 100% rename from assets/sif/notes/Live_s0795.json rename to assets/serverdata/notes/Live_s0795.json diff --git a/assets/sif/notes/Live_s0802.json b/assets/serverdata/notes/Live_s0802.json similarity index 100% rename from assets/sif/notes/Live_s0802.json rename to assets/serverdata/notes/Live_s0802.json diff --git a/assets/sif/notes/Live_s0803.json b/assets/serverdata/notes/Live_s0803.json similarity index 100% rename from assets/sif/notes/Live_s0803.json rename to assets/serverdata/notes/Live_s0803.json diff --git a/assets/sif/notes/Live_s0804.json b/assets/serverdata/notes/Live_s0804.json similarity index 100% rename from assets/sif/notes/Live_s0804.json rename to assets/serverdata/notes/Live_s0804.json diff --git a/assets/sif/notes/Live_s0805.json b/assets/serverdata/notes/Live_s0805.json similarity index 100% rename from assets/sif/notes/Live_s0805.json rename to assets/serverdata/notes/Live_s0805.json diff --git a/assets/sif/notes/Live_s0806.json b/assets/serverdata/notes/Live_s0806.json similarity index 100% rename from assets/sif/notes/Live_s0806.json rename to assets/serverdata/notes/Live_s0806.json diff --git a/assets/sif/notes/Live_s0807.json b/assets/serverdata/notes/Live_s0807.json similarity index 100% rename from assets/sif/notes/Live_s0807.json rename to assets/serverdata/notes/Live_s0807.json diff --git a/assets/sif/notes/Live_s0808.json b/assets/serverdata/notes/Live_s0808.json similarity index 100% rename from assets/sif/notes/Live_s0808.json rename to assets/serverdata/notes/Live_s0808.json diff --git a/assets/sif/notes/Live_s0809.json b/assets/serverdata/notes/Live_s0809.json similarity index 100% rename from assets/sif/notes/Live_s0809.json rename to assets/serverdata/notes/Live_s0809.json diff --git a/assets/sif/notes/Live_s0810.json b/assets/serverdata/notes/Live_s0810.json similarity index 100% rename from assets/sif/notes/Live_s0810.json rename to assets/serverdata/notes/Live_s0810.json diff --git a/assets/sif/notes/Live_s0811.json b/assets/serverdata/notes/Live_s0811.json similarity index 100% rename from assets/sif/notes/Live_s0811.json rename to assets/serverdata/notes/Live_s0811.json diff --git a/assets/sif/notes/Live_s0812.json b/assets/serverdata/notes/Live_s0812.json similarity index 100% rename from assets/sif/notes/Live_s0812.json rename to assets/serverdata/notes/Live_s0812.json diff --git a/assets/sif/notes/Live_s0813.json b/assets/serverdata/notes/Live_s0813.json similarity index 100% rename from assets/sif/notes/Live_s0813.json rename to assets/serverdata/notes/Live_s0813.json diff --git a/assets/sif/notes/Live_s0814.json b/assets/serverdata/notes/Live_s0814.json similarity index 100% rename from assets/sif/notes/Live_s0814.json rename to assets/serverdata/notes/Live_s0814.json diff --git a/assets/sif/notes/Live_s0815.json b/assets/serverdata/notes/Live_s0815.json similarity index 100% rename from assets/sif/notes/Live_s0815.json rename to assets/serverdata/notes/Live_s0815.json diff --git a/assets/sif/notes/Live_s0816.json b/assets/serverdata/notes/Live_s0816.json similarity index 100% rename from assets/sif/notes/Live_s0816.json rename to assets/serverdata/notes/Live_s0816.json diff --git a/assets/sif/notes/Live_s0817.json b/assets/serverdata/notes/Live_s0817.json similarity index 100% rename from assets/sif/notes/Live_s0817.json rename to assets/serverdata/notes/Live_s0817.json diff --git a/assets/sif/notes/Live_s0818.json b/assets/serverdata/notes/Live_s0818.json similarity index 100% rename from assets/sif/notes/Live_s0818.json rename to assets/serverdata/notes/Live_s0818.json diff --git a/assets/sif/notes/Live_s0819.json b/assets/serverdata/notes/Live_s0819.json similarity index 100% rename from assets/sif/notes/Live_s0819.json rename to assets/serverdata/notes/Live_s0819.json diff --git a/assets/sif/notes/Live_s0820.json b/assets/serverdata/notes/Live_s0820.json similarity index 100% rename from assets/sif/notes/Live_s0820.json rename to assets/serverdata/notes/Live_s0820.json diff --git a/assets/sif/notes/Live_s0821.json b/assets/serverdata/notes/Live_s0821.json similarity index 100% rename from assets/sif/notes/Live_s0821.json rename to assets/serverdata/notes/Live_s0821.json diff --git a/assets/sif/notes/Live_s0822.json b/assets/serverdata/notes/Live_s0822.json similarity index 100% rename from assets/sif/notes/Live_s0822.json rename to assets/serverdata/notes/Live_s0822.json diff --git a/assets/sif/notes/Live_s0823.json b/assets/serverdata/notes/Live_s0823.json similarity index 100% rename from assets/sif/notes/Live_s0823.json rename to assets/serverdata/notes/Live_s0823.json diff --git a/assets/sif/notes/Live_s0824.json b/assets/serverdata/notes/Live_s0824.json similarity index 100% rename from assets/sif/notes/Live_s0824.json rename to assets/serverdata/notes/Live_s0824.json diff --git a/assets/sif/notes/Live_s0825.json b/assets/serverdata/notes/Live_s0825.json similarity index 100% rename from assets/sif/notes/Live_s0825.json rename to assets/serverdata/notes/Live_s0825.json diff --git a/assets/sif/notes/Live_s0826.json b/assets/serverdata/notes/Live_s0826.json similarity index 100% rename from assets/sif/notes/Live_s0826.json rename to assets/serverdata/notes/Live_s0826.json diff --git a/assets/sif/notes/Live_s0827.json b/assets/serverdata/notes/Live_s0827.json similarity index 100% rename from assets/sif/notes/Live_s0827.json rename to assets/serverdata/notes/Live_s0827.json diff --git a/assets/sif/notes/Live_s0828.json b/assets/serverdata/notes/Live_s0828.json similarity index 100% rename from assets/sif/notes/Live_s0828.json rename to assets/serverdata/notes/Live_s0828.json diff --git a/assets/sif/notes/Live_s0829.json b/assets/serverdata/notes/Live_s0829.json similarity index 100% rename from assets/sif/notes/Live_s0829.json rename to assets/serverdata/notes/Live_s0829.json diff --git a/assets/sif/notes/Live_s0830.json b/assets/serverdata/notes/Live_s0830.json similarity index 100% rename from assets/sif/notes/Live_s0830.json rename to assets/serverdata/notes/Live_s0830.json diff --git a/assets/sif/notes/Live_s0831.json b/assets/serverdata/notes/Live_s0831.json similarity index 100% rename from assets/sif/notes/Live_s0831.json rename to assets/serverdata/notes/Live_s0831.json diff --git a/assets/sif/notes/Live_s0832.json b/assets/serverdata/notes/Live_s0832.json similarity index 100% rename from assets/sif/notes/Live_s0832.json rename to assets/serverdata/notes/Live_s0832.json diff --git a/assets/sif/notes/Live_s0833.json b/assets/serverdata/notes/Live_s0833.json similarity index 100% rename from assets/sif/notes/Live_s0833.json rename to assets/serverdata/notes/Live_s0833.json diff --git a/assets/sif/notes/Live_s0834.json b/assets/serverdata/notes/Live_s0834.json similarity index 100% rename from assets/sif/notes/Live_s0834.json rename to assets/serverdata/notes/Live_s0834.json diff --git a/assets/sif/notes/Live_s0835.json b/assets/serverdata/notes/Live_s0835.json similarity index 100% rename from assets/sif/notes/Live_s0835.json rename to assets/serverdata/notes/Live_s0835.json diff --git a/assets/sif/notes/Live_s0836.json b/assets/serverdata/notes/Live_s0836.json similarity index 100% rename from assets/sif/notes/Live_s0836.json rename to assets/serverdata/notes/Live_s0836.json diff --git a/assets/sif/notes/Live_s0837.json b/assets/serverdata/notes/Live_s0837.json similarity index 100% rename from assets/sif/notes/Live_s0837.json rename to assets/serverdata/notes/Live_s0837.json diff --git a/assets/sif/notes/Live_s0838.json b/assets/serverdata/notes/Live_s0838.json similarity index 100% rename from assets/sif/notes/Live_s0838.json rename to assets/serverdata/notes/Live_s0838.json diff --git a/assets/sif/notes/Live_s0839.json b/assets/serverdata/notes/Live_s0839.json similarity index 100% rename from assets/sif/notes/Live_s0839.json rename to assets/serverdata/notes/Live_s0839.json diff --git a/assets/sif/notes/Live_s0840.json b/assets/serverdata/notes/Live_s0840.json similarity index 100% rename from assets/sif/notes/Live_s0840.json rename to assets/serverdata/notes/Live_s0840.json diff --git a/assets/sif/notes/Live_s0841.json b/assets/serverdata/notes/Live_s0841.json similarity index 100% rename from assets/sif/notes/Live_s0841.json rename to assets/serverdata/notes/Live_s0841.json diff --git a/assets/sif/notes/Live_s0842.json b/assets/serverdata/notes/Live_s0842.json similarity index 100% rename from assets/sif/notes/Live_s0842.json rename to assets/serverdata/notes/Live_s0842.json diff --git a/assets/sif/notes/Live_s0843.json b/assets/serverdata/notes/Live_s0843.json similarity index 100% rename from assets/sif/notes/Live_s0843.json rename to assets/serverdata/notes/Live_s0843.json diff --git a/assets/sif/notes/Live_s0844.json b/assets/serverdata/notes/Live_s0844.json similarity index 100% rename from assets/sif/notes/Live_s0844.json rename to assets/serverdata/notes/Live_s0844.json diff --git a/assets/sif/notes/Live_s0845.json b/assets/serverdata/notes/Live_s0845.json similarity index 100% rename from assets/sif/notes/Live_s0845.json rename to assets/serverdata/notes/Live_s0845.json diff --git a/assets/sif/notes/Live_s0846.json b/assets/serverdata/notes/Live_s0846.json similarity index 100% rename from assets/sif/notes/Live_s0846.json rename to assets/serverdata/notes/Live_s0846.json diff --git a/assets/sif/notes/Live_s0847.json b/assets/serverdata/notes/Live_s0847.json similarity index 100% rename from assets/sif/notes/Live_s0847.json rename to assets/serverdata/notes/Live_s0847.json diff --git a/assets/sif/notes/Live_s0848.json b/assets/serverdata/notes/Live_s0848.json similarity index 100% rename from assets/sif/notes/Live_s0848.json rename to assets/serverdata/notes/Live_s0848.json diff --git a/assets/sif/notes/Live_s0849.json b/assets/serverdata/notes/Live_s0849.json similarity index 100% rename from assets/sif/notes/Live_s0849.json rename to assets/serverdata/notes/Live_s0849.json diff --git a/assets/sif/notes/Live_s0850.json b/assets/serverdata/notes/Live_s0850.json similarity index 100% rename from assets/sif/notes/Live_s0850.json rename to assets/serverdata/notes/Live_s0850.json diff --git a/assets/sif/notes/Live_s0851.json b/assets/serverdata/notes/Live_s0851.json similarity index 100% rename from assets/sif/notes/Live_s0851.json rename to assets/serverdata/notes/Live_s0851.json diff --git a/assets/sif/notes/Live_s0852.json b/assets/serverdata/notes/Live_s0852.json similarity index 100% rename from assets/sif/notes/Live_s0852.json rename to assets/serverdata/notes/Live_s0852.json diff --git a/assets/sif/notes/Live_s0853.json b/assets/serverdata/notes/Live_s0853.json similarity index 100% rename from assets/sif/notes/Live_s0853.json rename to assets/serverdata/notes/Live_s0853.json diff --git a/assets/sif/notes/Live_s0854.json b/assets/serverdata/notes/Live_s0854.json similarity index 100% rename from assets/sif/notes/Live_s0854.json rename to assets/serverdata/notes/Live_s0854.json diff --git a/assets/sif/notes/Live_s0855.json b/assets/serverdata/notes/Live_s0855.json similarity index 100% rename from assets/sif/notes/Live_s0855.json rename to assets/serverdata/notes/Live_s0855.json diff --git a/assets/sif/notes/Live_s0856.json b/assets/serverdata/notes/Live_s0856.json similarity index 100% rename from assets/sif/notes/Live_s0856.json rename to assets/serverdata/notes/Live_s0856.json diff --git a/assets/sif/notes/Live_s0857.json b/assets/serverdata/notes/Live_s0857.json similarity index 100% rename from assets/sif/notes/Live_s0857.json rename to assets/serverdata/notes/Live_s0857.json diff --git a/assets/sif/notes/Live_s0858.json b/assets/serverdata/notes/Live_s0858.json similarity index 100% rename from assets/sif/notes/Live_s0858.json rename to assets/serverdata/notes/Live_s0858.json diff --git a/assets/sif/notes/Live_s0859.json b/assets/serverdata/notes/Live_s0859.json similarity index 100% rename from assets/sif/notes/Live_s0859.json rename to assets/serverdata/notes/Live_s0859.json diff --git a/assets/sif/notes/Live_s0860.json b/assets/serverdata/notes/Live_s0860.json similarity index 100% rename from assets/sif/notes/Live_s0860.json rename to assets/serverdata/notes/Live_s0860.json diff --git a/assets/sif/notes/Live_s0863.json b/assets/serverdata/notes/Live_s0863.json similarity index 100% rename from assets/sif/notes/Live_s0863.json rename to assets/serverdata/notes/Live_s0863.json diff --git a/assets/sif/notes/Live_s0864.json b/assets/serverdata/notes/Live_s0864.json similarity index 100% rename from assets/sif/notes/Live_s0864.json rename to assets/serverdata/notes/Live_s0864.json diff --git a/assets/sif/notes/Live_s0865.json b/assets/serverdata/notes/Live_s0865.json similarity index 100% rename from assets/sif/notes/Live_s0865.json rename to assets/serverdata/notes/Live_s0865.json diff --git a/assets/sif/notes/Live_s0866.json b/assets/serverdata/notes/Live_s0866.json similarity index 100% rename from assets/sif/notes/Live_s0866.json rename to assets/serverdata/notes/Live_s0866.json diff --git a/assets/sif/notes/Live_s0867.json b/assets/serverdata/notes/Live_s0867.json similarity index 100% rename from assets/sif/notes/Live_s0867.json rename to assets/serverdata/notes/Live_s0867.json diff --git a/assets/sif/notes/Live_s0868.json b/assets/serverdata/notes/Live_s0868.json similarity index 100% rename from assets/sif/notes/Live_s0868.json rename to assets/serverdata/notes/Live_s0868.json diff --git a/assets/sif/notes/Live_s0869.json b/assets/serverdata/notes/Live_s0869.json similarity index 100% rename from assets/sif/notes/Live_s0869.json rename to assets/serverdata/notes/Live_s0869.json diff --git a/assets/sif/notes/Live_s0870.json b/assets/serverdata/notes/Live_s0870.json similarity index 100% rename from assets/sif/notes/Live_s0870.json rename to assets/serverdata/notes/Live_s0870.json diff --git a/assets/sif/notes/Live_s0871.json b/assets/serverdata/notes/Live_s0871.json similarity index 100% rename from assets/sif/notes/Live_s0871.json rename to assets/serverdata/notes/Live_s0871.json diff --git a/assets/sif/notes/Live_s0872.json b/assets/serverdata/notes/Live_s0872.json similarity index 100% rename from assets/sif/notes/Live_s0872.json rename to assets/serverdata/notes/Live_s0872.json diff --git a/assets/sif/notes/Live_s0873.json b/assets/serverdata/notes/Live_s0873.json similarity index 100% rename from assets/sif/notes/Live_s0873.json rename to assets/serverdata/notes/Live_s0873.json diff --git a/assets/sif/notes/Live_s0874.json b/assets/serverdata/notes/Live_s0874.json similarity index 100% rename from assets/sif/notes/Live_s0874.json rename to assets/serverdata/notes/Live_s0874.json diff --git a/assets/sif/notes/Live_s0875.json b/assets/serverdata/notes/Live_s0875.json similarity index 100% rename from assets/sif/notes/Live_s0875.json rename to assets/serverdata/notes/Live_s0875.json diff --git a/assets/sif/notes/Live_s0876.json b/assets/serverdata/notes/Live_s0876.json similarity index 100% rename from assets/sif/notes/Live_s0876.json rename to assets/serverdata/notes/Live_s0876.json diff --git a/assets/sif/notes/Live_s0877.json b/assets/serverdata/notes/Live_s0877.json similarity index 100% rename from assets/sif/notes/Live_s0877.json rename to assets/serverdata/notes/Live_s0877.json diff --git a/assets/sif/notes/Live_s0878.json b/assets/serverdata/notes/Live_s0878.json similarity index 100% rename from assets/sif/notes/Live_s0878.json rename to assets/serverdata/notes/Live_s0878.json diff --git a/assets/sif/notes/Live_s0879.json b/assets/serverdata/notes/Live_s0879.json similarity index 100% rename from assets/sif/notes/Live_s0879.json rename to assets/serverdata/notes/Live_s0879.json diff --git a/assets/sif/notes/Live_s0880.json b/assets/serverdata/notes/Live_s0880.json similarity index 100% rename from assets/sif/notes/Live_s0880.json rename to assets/serverdata/notes/Live_s0880.json diff --git a/assets/sif/notes/Live_s0881.json b/assets/serverdata/notes/Live_s0881.json similarity index 100% rename from assets/sif/notes/Live_s0881.json rename to assets/serverdata/notes/Live_s0881.json diff --git a/assets/sif/notes/Live_s0882.json b/assets/serverdata/notes/Live_s0882.json similarity index 100% rename from assets/sif/notes/Live_s0882.json rename to assets/serverdata/notes/Live_s0882.json diff --git a/assets/sif/notes/Live_s0883.json b/assets/serverdata/notes/Live_s0883.json similarity index 100% rename from assets/sif/notes/Live_s0883.json rename to assets/serverdata/notes/Live_s0883.json diff --git a/assets/sif/notes/Live_s0884.json b/assets/serverdata/notes/Live_s0884.json similarity index 100% rename from assets/sif/notes/Live_s0884.json rename to assets/serverdata/notes/Live_s0884.json diff --git a/assets/sif/notes/Live_s0885.json b/assets/serverdata/notes/Live_s0885.json similarity index 100% rename from assets/sif/notes/Live_s0885.json rename to assets/serverdata/notes/Live_s0885.json diff --git a/assets/sif/notes/Live_s0886.json b/assets/serverdata/notes/Live_s0886.json similarity index 100% rename from assets/sif/notes/Live_s0886.json rename to assets/serverdata/notes/Live_s0886.json diff --git a/assets/sif/notes/Live_s0887.json b/assets/serverdata/notes/Live_s0887.json similarity index 100% rename from assets/sif/notes/Live_s0887.json rename to assets/serverdata/notes/Live_s0887.json diff --git a/assets/sif/notes/Live_s0888.json b/assets/serverdata/notes/Live_s0888.json similarity index 100% rename from assets/sif/notes/Live_s0888.json rename to assets/serverdata/notes/Live_s0888.json diff --git a/assets/sif/notes/Live_s0889.json b/assets/serverdata/notes/Live_s0889.json similarity index 100% rename from assets/sif/notes/Live_s0889.json rename to assets/serverdata/notes/Live_s0889.json diff --git a/assets/sif/notes/Live_s0890.json b/assets/serverdata/notes/Live_s0890.json similarity index 100% rename from assets/sif/notes/Live_s0890.json rename to assets/serverdata/notes/Live_s0890.json diff --git a/assets/sif/notes/Live_s0891.json b/assets/serverdata/notes/Live_s0891.json similarity index 100% rename from assets/sif/notes/Live_s0891.json rename to assets/serverdata/notes/Live_s0891.json diff --git a/assets/sif/notes/Live_s0892.json b/assets/serverdata/notes/Live_s0892.json similarity index 100% rename from assets/sif/notes/Live_s0892.json rename to assets/serverdata/notes/Live_s0892.json diff --git a/assets/sif/notes/Live_s0893.json b/assets/serverdata/notes/Live_s0893.json similarity index 100% rename from assets/sif/notes/Live_s0893.json rename to assets/serverdata/notes/Live_s0893.json diff --git a/assets/sif/notes/Live_s0894.json b/assets/serverdata/notes/Live_s0894.json similarity index 100% rename from assets/sif/notes/Live_s0894.json rename to assets/serverdata/notes/Live_s0894.json diff --git a/assets/sif/notes/Live_s0895.json b/assets/serverdata/notes/Live_s0895.json similarity index 100% rename from assets/sif/notes/Live_s0895.json rename to assets/serverdata/notes/Live_s0895.json diff --git a/assets/sif/notes/Live_s0896.json b/assets/serverdata/notes/Live_s0896.json similarity index 100% rename from assets/sif/notes/Live_s0896.json rename to assets/serverdata/notes/Live_s0896.json diff --git a/assets/sif/notes/Live_s0897.json b/assets/serverdata/notes/Live_s0897.json similarity index 100% rename from assets/sif/notes/Live_s0897.json rename to assets/serverdata/notes/Live_s0897.json diff --git a/assets/sif/notes/Live_s0898.json b/assets/serverdata/notes/Live_s0898.json similarity index 100% rename from assets/sif/notes/Live_s0898.json rename to assets/serverdata/notes/Live_s0898.json diff --git a/assets/sif/notes/Live_s0899.json b/assets/serverdata/notes/Live_s0899.json similarity index 100% rename from assets/sif/notes/Live_s0899.json rename to assets/serverdata/notes/Live_s0899.json diff --git a/assets/sif/notes/Live_s0900.json b/assets/serverdata/notes/Live_s0900.json similarity index 100% rename from assets/sif/notes/Live_s0900.json rename to assets/serverdata/notes/Live_s0900.json diff --git a/assets/sif/notes/Live_s0901.json b/assets/serverdata/notes/Live_s0901.json similarity index 100% rename from assets/sif/notes/Live_s0901.json rename to assets/serverdata/notes/Live_s0901.json diff --git a/assets/sif/notes/Live_s0902.json b/assets/serverdata/notes/Live_s0902.json similarity index 100% rename from assets/sif/notes/Live_s0902.json rename to assets/serverdata/notes/Live_s0902.json diff --git a/assets/sif/notes/Live_s0903.json b/assets/serverdata/notes/Live_s0903.json similarity index 100% rename from assets/sif/notes/Live_s0903.json rename to assets/serverdata/notes/Live_s0903.json diff --git a/assets/sif/notes/Live_s0904.json b/assets/serverdata/notes/Live_s0904.json similarity index 100% rename from assets/sif/notes/Live_s0904.json rename to assets/serverdata/notes/Live_s0904.json diff --git a/assets/sif/notes/Live_s0905.json b/assets/serverdata/notes/Live_s0905.json similarity index 100% rename from assets/sif/notes/Live_s0905.json rename to assets/serverdata/notes/Live_s0905.json diff --git a/assets/sif/notes/Live_s0906.json b/assets/serverdata/notes/Live_s0906.json similarity index 100% rename from assets/sif/notes/Live_s0906.json rename to assets/serverdata/notes/Live_s0906.json diff --git a/assets/sif/notes/Live_s0907.json b/assets/serverdata/notes/Live_s0907.json similarity index 100% rename from assets/sif/notes/Live_s0907.json rename to assets/serverdata/notes/Live_s0907.json diff --git a/assets/sif/notes/Live_s0908.json b/assets/serverdata/notes/Live_s0908.json similarity index 100% rename from assets/sif/notes/Live_s0908.json rename to assets/serverdata/notes/Live_s0908.json diff --git a/assets/sif/notes/Live_s0909.json b/assets/serverdata/notes/Live_s0909.json similarity index 100% rename from assets/sif/notes/Live_s0909.json rename to assets/serverdata/notes/Live_s0909.json diff --git a/assets/sif/notes/Live_s0910.json b/assets/serverdata/notes/Live_s0910.json similarity index 100% rename from assets/sif/notes/Live_s0910.json rename to assets/serverdata/notes/Live_s0910.json diff --git a/assets/sif/notes/Live_s0911.json b/assets/serverdata/notes/Live_s0911.json similarity index 100% rename from assets/sif/notes/Live_s0911.json rename to assets/serverdata/notes/Live_s0911.json diff --git a/assets/sif/notes/Live_s0912.json b/assets/serverdata/notes/Live_s0912.json similarity index 100% rename from assets/sif/notes/Live_s0912.json rename to assets/serverdata/notes/Live_s0912.json diff --git a/assets/sif/notes/Live_s0913.json b/assets/serverdata/notes/Live_s0913.json similarity index 100% rename from assets/sif/notes/Live_s0913.json rename to assets/serverdata/notes/Live_s0913.json diff --git a/assets/sif/notes/Live_s0914.json b/assets/serverdata/notes/Live_s0914.json similarity index 100% rename from assets/sif/notes/Live_s0914.json rename to assets/serverdata/notes/Live_s0914.json diff --git a/assets/sif/notes/Live_s0915.json b/assets/serverdata/notes/Live_s0915.json similarity index 100% rename from assets/sif/notes/Live_s0915.json rename to assets/serverdata/notes/Live_s0915.json diff --git a/assets/sif/notes/Live_s0916.json b/assets/serverdata/notes/Live_s0916.json similarity index 100% rename from assets/sif/notes/Live_s0916.json rename to assets/serverdata/notes/Live_s0916.json diff --git a/assets/sif/notes/Live_s0917.json b/assets/serverdata/notes/Live_s0917.json similarity index 100% rename from assets/sif/notes/Live_s0917.json rename to assets/serverdata/notes/Live_s0917.json diff --git a/assets/sif/notes/Live_s0918.json b/assets/serverdata/notes/Live_s0918.json similarity index 100% rename from assets/sif/notes/Live_s0918.json rename to assets/serverdata/notes/Live_s0918.json diff --git a/assets/sif/notes/Live_s0919.json b/assets/serverdata/notes/Live_s0919.json similarity index 100% rename from assets/sif/notes/Live_s0919.json rename to assets/serverdata/notes/Live_s0919.json diff --git a/assets/sif/notes/Live_s0920.json b/assets/serverdata/notes/Live_s0920.json similarity index 100% rename from assets/sif/notes/Live_s0920.json rename to assets/serverdata/notes/Live_s0920.json diff --git a/assets/sif/notes/Live_s0921.json b/assets/serverdata/notes/Live_s0921.json similarity index 100% rename from assets/sif/notes/Live_s0921.json rename to assets/serverdata/notes/Live_s0921.json diff --git a/assets/sif/notes/Live_s0922.json b/assets/serverdata/notes/Live_s0922.json similarity index 100% rename from assets/sif/notes/Live_s0922.json rename to assets/serverdata/notes/Live_s0922.json diff --git a/assets/sif/notes/Live_s0923.json b/assets/serverdata/notes/Live_s0923.json similarity index 100% rename from assets/sif/notes/Live_s0923.json rename to assets/serverdata/notes/Live_s0923.json diff --git a/assets/sif/notes/Live_s0924.json b/assets/serverdata/notes/Live_s0924.json similarity index 100% rename from assets/sif/notes/Live_s0924.json rename to assets/serverdata/notes/Live_s0924.json diff --git a/assets/sif/notes/Live_s0925.json b/assets/serverdata/notes/Live_s0925.json similarity index 100% rename from assets/sif/notes/Live_s0925.json rename to assets/serverdata/notes/Live_s0925.json diff --git a/assets/sif/notes/Live_s0926.json b/assets/serverdata/notes/Live_s0926.json similarity index 100% rename from assets/sif/notes/Live_s0926.json rename to assets/serverdata/notes/Live_s0926.json diff --git a/assets/sif/notes/Live_s0927.json b/assets/serverdata/notes/Live_s0927.json similarity index 100% rename from assets/sif/notes/Live_s0927.json rename to assets/serverdata/notes/Live_s0927.json diff --git a/assets/sif/notes/Live_s0928.json b/assets/serverdata/notes/Live_s0928.json similarity index 100% rename from assets/sif/notes/Live_s0928.json rename to assets/serverdata/notes/Live_s0928.json diff --git a/assets/sif/notes/Live_s0929.json b/assets/serverdata/notes/Live_s0929.json similarity index 100% rename from assets/sif/notes/Live_s0929.json rename to assets/serverdata/notes/Live_s0929.json diff --git a/assets/sif/notes/Live_s0930.json b/assets/serverdata/notes/Live_s0930.json similarity index 100% rename from assets/sif/notes/Live_s0930.json rename to assets/serverdata/notes/Live_s0930.json diff --git a/assets/sif/notes/Live_s0931.json b/assets/serverdata/notes/Live_s0931.json similarity index 100% rename from assets/sif/notes/Live_s0931.json rename to assets/serverdata/notes/Live_s0931.json diff --git a/assets/sif/notes/Live_s0932.json b/assets/serverdata/notes/Live_s0932.json similarity index 100% rename from assets/sif/notes/Live_s0932.json rename to assets/serverdata/notes/Live_s0932.json diff --git a/assets/sif/notes/Live_s0933.json b/assets/serverdata/notes/Live_s0933.json similarity index 100% rename from assets/sif/notes/Live_s0933.json rename to assets/serverdata/notes/Live_s0933.json diff --git a/assets/sif/notes/Live_s0934.json b/assets/serverdata/notes/Live_s0934.json similarity index 100% rename from assets/sif/notes/Live_s0934.json rename to assets/serverdata/notes/Live_s0934.json diff --git a/assets/sif/notes/Live_s0935.json b/assets/serverdata/notes/Live_s0935.json similarity index 100% rename from assets/sif/notes/Live_s0935.json rename to assets/serverdata/notes/Live_s0935.json diff --git a/assets/sif/notes/Live_s0936.json b/assets/serverdata/notes/Live_s0936.json similarity index 100% rename from assets/sif/notes/Live_s0936.json rename to assets/serverdata/notes/Live_s0936.json diff --git a/assets/sif/notes/Live_s0937.json b/assets/serverdata/notes/Live_s0937.json similarity index 100% rename from assets/sif/notes/Live_s0937.json rename to assets/serverdata/notes/Live_s0937.json diff --git a/assets/sif/notes/Live_s0938.json b/assets/serverdata/notes/Live_s0938.json similarity index 100% rename from assets/sif/notes/Live_s0938.json rename to assets/serverdata/notes/Live_s0938.json diff --git a/assets/sif/notes/Live_s0939.json b/assets/serverdata/notes/Live_s0939.json similarity index 100% rename from assets/sif/notes/Live_s0939.json rename to assets/serverdata/notes/Live_s0939.json diff --git a/assets/sif/notes/Live_s0940.json b/assets/serverdata/notes/Live_s0940.json similarity index 100% rename from assets/sif/notes/Live_s0940.json rename to assets/serverdata/notes/Live_s0940.json diff --git a/assets/sif/notes/Live_s0941.json b/assets/serverdata/notes/Live_s0941.json similarity index 100% rename from assets/sif/notes/Live_s0941.json rename to assets/serverdata/notes/Live_s0941.json diff --git a/assets/sif/notes/Live_s0942.json b/assets/serverdata/notes/Live_s0942.json similarity index 100% rename from assets/sif/notes/Live_s0942.json rename to assets/serverdata/notes/Live_s0942.json diff --git a/assets/sif/notes/Live_s0943.json b/assets/serverdata/notes/Live_s0943.json similarity index 100% rename from assets/sif/notes/Live_s0943.json rename to assets/serverdata/notes/Live_s0943.json diff --git a/assets/sif/notes/Live_s0944.json b/assets/serverdata/notes/Live_s0944.json similarity index 100% rename from assets/sif/notes/Live_s0944.json rename to assets/serverdata/notes/Live_s0944.json diff --git a/assets/sif/notes/Live_s0945.json b/assets/serverdata/notes/Live_s0945.json similarity index 100% rename from assets/sif/notes/Live_s0945.json rename to assets/serverdata/notes/Live_s0945.json diff --git a/assets/sif/notes/Live_s0946.json b/assets/serverdata/notes/Live_s0946.json similarity index 100% rename from assets/sif/notes/Live_s0946.json rename to assets/serverdata/notes/Live_s0946.json diff --git a/assets/sif/notes/Live_s0947.json b/assets/serverdata/notes/Live_s0947.json similarity index 100% rename from assets/sif/notes/Live_s0947.json rename to assets/serverdata/notes/Live_s0947.json diff --git a/assets/sif/notes/Live_s0948.json b/assets/serverdata/notes/Live_s0948.json similarity index 100% rename from assets/sif/notes/Live_s0948.json rename to assets/serverdata/notes/Live_s0948.json diff --git a/assets/sif/notes/Live_s0949.json b/assets/serverdata/notes/Live_s0949.json similarity index 100% rename from assets/sif/notes/Live_s0949.json rename to assets/serverdata/notes/Live_s0949.json diff --git a/assets/sif/notes/Live_s0950.json b/assets/serverdata/notes/Live_s0950.json similarity index 100% rename from assets/sif/notes/Live_s0950.json rename to assets/serverdata/notes/Live_s0950.json diff --git a/assets/sif/notes/Live_s0951.json b/assets/serverdata/notes/Live_s0951.json similarity index 100% rename from assets/sif/notes/Live_s0951.json rename to assets/serverdata/notes/Live_s0951.json diff --git a/assets/sif/notes/Live_s0952.json b/assets/serverdata/notes/Live_s0952.json similarity index 100% rename from assets/sif/notes/Live_s0952.json rename to assets/serverdata/notes/Live_s0952.json diff --git a/assets/sif/notes/Live_s0953.json b/assets/serverdata/notes/Live_s0953.json similarity index 100% rename from assets/sif/notes/Live_s0953.json rename to assets/serverdata/notes/Live_s0953.json diff --git a/assets/sif/notes/Live_s0954.json b/assets/serverdata/notes/Live_s0954.json similarity index 100% rename from assets/sif/notes/Live_s0954.json rename to assets/serverdata/notes/Live_s0954.json diff --git a/assets/sif/notes/Live_s0955.json b/assets/serverdata/notes/Live_s0955.json similarity index 100% rename from assets/sif/notes/Live_s0955.json rename to assets/serverdata/notes/Live_s0955.json diff --git a/assets/sif/notes/Live_s0956.json b/assets/serverdata/notes/Live_s0956.json similarity index 100% rename from assets/sif/notes/Live_s0956.json rename to assets/serverdata/notes/Live_s0956.json diff --git a/assets/sif/notes/Live_s0957.json b/assets/serverdata/notes/Live_s0957.json similarity index 100% rename from assets/sif/notes/Live_s0957.json rename to assets/serverdata/notes/Live_s0957.json diff --git a/assets/sif/notes/Live_s0958.json b/assets/serverdata/notes/Live_s0958.json similarity index 100% rename from assets/sif/notes/Live_s0958.json rename to assets/serverdata/notes/Live_s0958.json diff --git a/assets/sif/notes/Live_s0959.json b/assets/serverdata/notes/Live_s0959.json similarity index 100% rename from assets/sif/notes/Live_s0959.json rename to assets/serverdata/notes/Live_s0959.json diff --git a/assets/sif/notes/Live_s0960.json b/assets/serverdata/notes/Live_s0960.json similarity index 100% rename from assets/sif/notes/Live_s0960.json rename to assets/serverdata/notes/Live_s0960.json diff --git a/assets/sif/notes/Live_s0961.json b/assets/serverdata/notes/Live_s0961.json similarity index 100% rename from assets/sif/notes/Live_s0961.json rename to assets/serverdata/notes/Live_s0961.json diff --git a/assets/sif/notes/Live_s0962.json b/assets/serverdata/notes/Live_s0962.json similarity index 100% rename from assets/sif/notes/Live_s0962.json rename to assets/serverdata/notes/Live_s0962.json diff --git a/assets/sif/notes/Live_s0963.json b/assets/serverdata/notes/Live_s0963.json similarity index 100% rename from assets/sif/notes/Live_s0963.json rename to assets/serverdata/notes/Live_s0963.json diff --git a/assets/sif/notes/Live_s0964.json b/assets/serverdata/notes/Live_s0964.json similarity index 100% rename from assets/sif/notes/Live_s0964.json rename to assets/serverdata/notes/Live_s0964.json diff --git a/assets/sif/notes/Live_s0965.json b/assets/serverdata/notes/Live_s0965.json similarity index 100% rename from assets/sif/notes/Live_s0965.json rename to assets/serverdata/notes/Live_s0965.json diff --git a/assets/sif/notes/Live_s0966.json b/assets/serverdata/notes/Live_s0966.json similarity index 100% rename from assets/sif/notes/Live_s0966.json rename to assets/serverdata/notes/Live_s0966.json diff --git a/assets/sif/notes/Live_s0967.json b/assets/serverdata/notes/Live_s0967.json similarity index 100% rename from assets/sif/notes/Live_s0967.json rename to assets/serverdata/notes/Live_s0967.json diff --git a/assets/sif/notes/Live_s0968.json b/assets/serverdata/notes/Live_s0968.json similarity index 100% rename from assets/sif/notes/Live_s0968.json rename to assets/serverdata/notes/Live_s0968.json diff --git a/assets/sif/notes/Live_s0969.json b/assets/serverdata/notes/Live_s0969.json similarity index 100% rename from assets/sif/notes/Live_s0969.json rename to assets/serverdata/notes/Live_s0969.json diff --git a/assets/sif/notes/Live_s0970.json b/assets/serverdata/notes/Live_s0970.json similarity index 100% rename from assets/sif/notes/Live_s0970.json rename to assets/serverdata/notes/Live_s0970.json diff --git a/assets/sif/notes/Live_s0971.json b/assets/serverdata/notes/Live_s0971.json similarity index 100% rename from assets/sif/notes/Live_s0971.json rename to assets/serverdata/notes/Live_s0971.json diff --git a/assets/sif/notes/Live_s0972.json b/assets/serverdata/notes/Live_s0972.json similarity index 100% rename from assets/sif/notes/Live_s0972.json rename to assets/serverdata/notes/Live_s0972.json diff --git a/assets/sif/notes/Live_s0973.json b/assets/serverdata/notes/Live_s0973.json similarity index 100% rename from assets/sif/notes/Live_s0973.json rename to assets/serverdata/notes/Live_s0973.json diff --git a/assets/sif/notes/Live_s0974.json b/assets/serverdata/notes/Live_s0974.json similarity index 100% rename from assets/sif/notes/Live_s0974.json rename to assets/serverdata/notes/Live_s0974.json diff --git a/assets/sif/notes/Live_s0975.json b/assets/serverdata/notes/Live_s0975.json similarity index 100% rename from assets/sif/notes/Live_s0975.json rename to assets/serverdata/notes/Live_s0975.json diff --git a/assets/sif/notes/Live_s0976.json b/assets/serverdata/notes/Live_s0976.json similarity index 100% rename from assets/sif/notes/Live_s0976.json rename to assets/serverdata/notes/Live_s0976.json diff --git a/assets/sif/notes/Live_s0977.json b/assets/serverdata/notes/Live_s0977.json similarity index 100% rename from assets/sif/notes/Live_s0977.json rename to assets/serverdata/notes/Live_s0977.json diff --git a/assets/sif/notes/Live_s0978.json b/assets/serverdata/notes/Live_s0978.json similarity index 100% rename from assets/sif/notes/Live_s0978.json rename to assets/serverdata/notes/Live_s0978.json diff --git a/assets/sif/notes/Live_s0979.json b/assets/serverdata/notes/Live_s0979.json similarity index 100% rename from assets/sif/notes/Live_s0979.json rename to assets/serverdata/notes/Live_s0979.json diff --git a/assets/sif/notes/Live_s0980.json b/assets/serverdata/notes/Live_s0980.json similarity index 100% rename from assets/sif/notes/Live_s0980.json rename to assets/serverdata/notes/Live_s0980.json diff --git a/assets/sif/notes/Live_s0981.json b/assets/serverdata/notes/Live_s0981.json similarity index 100% rename from assets/sif/notes/Live_s0981.json rename to assets/serverdata/notes/Live_s0981.json diff --git a/assets/sif/notes/Live_s0982.json b/assets/serverdata/notes/Live_s0982.json similarity index 100% rename from assets/sif/notes/Live_s0982.json rename to assets/serverdata/notes/Live_s0982.json diff --git a/assets/sif/notes/Live_s0983.json b/assets/serverdata/notes/Live_s0983.json similarity index 100% rename from assets/sif/notes/Live_s0983.json rename to assets/serverdata/notes/Live_s0983.json diff --git a/assets/sif/notes/Live_s0984.json b/assets/serverdata/notes/Live_s0984.json similarity index 100% rename from assets/sif/notes/Live_s0984.json rename to assets/serverdata/notes/Live_s0984.json diff --git a/assets/sif/notes/Live_s0985.json b/assets/serverdata/notes/Live_s0985.json similarity index 100% rename from assets/sif/notes/Live_s0985.json rename to assets/serverdata/notes/Live_s0985.json diff --git a/assets/sif/notes/Live_s0986.json b/assets/serverdata/notes/Live_s0986.json similarity index 100% rename from assets/sif/notes/Live_s0986.json rename to assets/serverdata/notes/Live_s0986.json diff --git a/assets/sif/notes/Live_s0987.json b/assets/serverdata/notes/Live_s0987.json similarity index 100% rename from assets/sif/notes/Live_s0987.json rename to assets/serverdata/notes/Live_s0987.json diff --git a/assets/sif/notes/Live_s0988.json b/assets/serverdata/notes/Live_s0988.json similarity index 100% rename from assets/sif/notes/Live_s0988.json rename to assets/serverdata/notes/Live_s0988.json diff --git a/assets/sif/notes/Live_s0989.json b/assets/serverdata/notes/Live_s0989.json similarity index 100% rename from assets/sif/notes/Live_s0989.json rename to assets/serverdata/notes/Live_s0989.json diff --git a/assets/sif/notes/Live_s0990.json b/assets/serverdata/notes/Live_s0990.json similarity index 100% rename from assets/sif/notes/Live_s0990.json rename to assets/serverdata/notes/Live_s0990.json diff --git a/assets/sif/notes/Live_s0991.json b/assets/serverdata/notes/Live_s0991.json similarity index 100% rename from assets/sif/notes/Live_s0991.json rename to assets/serverdata/notes/Live_s0991.json diff --git a/assets/sif/notes/Live_s0992.json b/assets/serverdata/notes/Live_s0992.json similarity index 100% rename from assets/sif/notes/Live_s0992.json rename to assets/serverdata/notes/Live_s0992.json diff --git a/assets/sif/notes/Live_s0993.json b/assets/serverdata/notes/Live_s0993.json similarity index 100% rename from assets/sif/notes/Live_s0993.json rename to assets/serverdata/notes/Live_s0993.json diff --git a/assets/sif/notes/Live_s0994.json b/assets/serverdata/notes/Live_s0994.json similarity index 100% rename from assets/sif/notes/Live_s0994.json rename to assets/serverdata/notes/Live_s0994.json diff --git a/assets/sif/notes/Live_s0995.json b/assets/serverdata/notes/Live_s0995.json similarity index 100% rename from assets/sif/notes/Live_s0995.json rename to assets/serverdata/notes/Live_s0995.json diff --git a/assets/sif/notes/Live_s0996.json b/assets/serverdata/notes/Live_s0996.json similarity index 100% rename from assets/sif/notes/Live_s0996.json rename to assets/serverdata/notes/Live_s0996.json diff --git a/assets/sif/notes/Live_s0997.json b/assets/serverdata/notes/Live_s0997.json similarity index 100% rename from assets/sif/notes/Live_s0997.json rename to assets/serverdata/notes/Live_s0997.json diff --git a/assets/sif/notes/Live_s0998.json b/assets/serverdata/notes/Live_s0998.json similarity index 100% rename from assets/sif/notes/Live_s0998.json rename to assets/serverdata/notes/Live_s0998.json diff --git a/assets/sif/notes/Live_s0999.json b/assets/serverdata/notes/Live_s0999.json similarity index 100% rename from assets/sif/notes/Live_s0999.json rename to assets/serverdata/notes/Live_s0999.json diff --git a/assets/sif/notes/Live_s1000.json b/assets/serverdata/notes/Live_s1000.json similarity index 100% rename from assets/sif/notes/Live_s1000.json rename to assets/serverdata/notes/Live_s1000.json diff --git a/assets/sif/notes/Live_s1001.json b/assets/serverdata/notes/Live_s1001.json similarity index 100% rename from assets/sif/notes/Live_s1001.json rename to assets/serverdata/notes/Live_s1001.json diff --git a/assets/sif/notes/Live_s1002.json b/assets/serverdata/notes/Live_s1002.json similarity index 100% rename from assets/sif/notes/Live_s1002.json rename to assets/serverdata/notes/Live_s1002.json diff --git a/assets/sif/notes/Live_s1003.json b/assets/serverdata/notes/Live_s1003.json similarity index 100% rename from assets/sif/notes/Live_s1003.json rename to assets/serverdata/notes/Live_s1003.json diff --git a/assets/sif/notes/Live_s1004.json b/assets/serverdata/notes/Live_s1004.json similarity index 100% rename from assets/sif/notes/Live_s1004.json rename to assets/serverdata/notes/Live_s1004.json diff --git a/assets/sif/notes/Live_s1005.json b/assets/serverdata/notes/Live_s1005.json similarity index 100% rename from assets/sif/notes/Live_s1005.json rename to assets/serverdata/notes/Live_s1005.json diff --git a/assets/sif/notes/Live_s1006.json b/assets/serverdata/notes/Live_s1006.json similarity index 100% rename from assets/sif/notes/Live_s1006.json rename to assets/serverdata/notes/Live_s1006.json diff --git a/assets/sif/notes/Live_s1007.json b/assets/serverdata/notes/Live_s1007.json similarity index 100% rename from assets/sif/notes/Live_s1007.json rename to assets/serverdata/notes/Live_s1007.json diff --git a/assets/sif/notes/Live_s1008.json b/assets/serverdata/notes/Live_s1008.json similarity index 100% rename from assets/sif/notes/Live_s1008.json rename to assets/serverdata/notes/Live_s1008.json diff --git a/assets/sif/notes/Live_s1009.json b/assets/serverdata/notes/Live_s1009.json similarity index 100% rename from assets/sif/notes/Live_s1009.json rename to assets/serverdata/notes/Live_s1009.json diff --git a/assets/sif/notes/Live_s1010.json b/assets/serverdata/notes/Live_s1010.json similarity index 100% rename from assets/sif/notes/Live_s1010.json rename to assets/serverdata/notes/Live_s1010.json diff --git a/assets/sif/notes/Live_s1011.json b/assets/serverdata/notes/Live_s1011.json similarity index 100% rename from assets/sif/notes/Live_s1011.json rename to assets/serverdata/notes/Live_s1011.json diff --git a/assets/sif/notes/Live_s1012.json b/assets/serverdata/notes/Live_s1012.json similarity index 100% rename from assets/sif/notes/Live_s1012.json rename to assets/serverdata/notes/Live_s1012.json diff --git a/assets/sif/notes/Live_s1013.json b/assets/serverdata/notes/Live_s1013.json similarity index 100% rename from assets/sif/notes/Live_s1013.json rename to assets/serverdata/notes/Live_s1013.json diff --git a/assets/sif/notes/Live_s1014.json b/assets/serverdata/notes/Live_s1014.json similarity index 100% rename from assets/sif/notes/Live_s1014.json rename to assets/serverdata/notes/Live_s1014.json diff --git a/assets/sif/notes/Live_s1015.json b/assets/serverdata/notes/Live_s1015.json similarity index 100% rename from assets/sif/notes/Live_s1015.json rename to assets/serverdata/notes/Live_s1015.json diff --git a/assets/sif/notes/Live_s1016.json b/assets/serverdata/notes/Live_s1016.json similarity index 100% rename from assets/sif/notes/Live_s1016.json rename to assets/serverdata/notes/Live_s1016.json diff --git a/assets/sif/notes/Live_s1017.json b/assets/serverdata/notes/Live_s1017.json similarity index 100% rename from assets/sif/notes/Live_s1017.json rename to assets/serverdata/notes/Live_s1017.json diff --git a/assets/sif/notes/Live_s1018.json b/assets/serverdata/notes/Live_s1018.json similarity index 100% rename from assets/sif/notes/Live_s1018.json rename to assets/serverdata/notes/Live_s1018.json diff --git a/assets/sif/notes/Live_s1019.json b/assets/serverdata/notes/Live_s1019.json similarity index 100% rename from assets/sif/notes/Live_s1019.json rename to assets/serverdata/notes/Live_s1019.json diff --git a/assets/sif/notes/Live_s1020.json b/assets/serverdata/notes/Live_s1020.json similarity index 100% rename from assets/sif/notes/Live_s1020.json rename to assets/serverdata/notes/Live_s1020.json diff --git a/assets/sif/notes/Live_s1021.json b/assets/serverdata/notes/Live_s1021.json similarity index 100% rename from assets/sif/notes/Live_s1021.json rename to assets/serverdata/notes/Live_s1021.json diff --git a/assets/sif/notes/Live_s1022.json b/assets/serverdata/notes/Live_s1022.json similarity index 100% rename from assets/sif/notes/Live_s1022.json rename to assets/serverdata/notes/Live_s1022.json diff --git a/assets/sif/notes/Live_s1023.json b/assets/serverdata/notes/Live_s1023.json similarity index 100% rename from assets/sif/notes/Live_s1023.json rename to assets/serverdata/notes/Live_s1023.json diff --git a/assets/sif/notes/Live_s1024.json b/assets/serverdata/notes/Live_s1024.json similarity index 100% rename from assets/sif/notes/Live_s1024.json rename to assets/serverdata/notes/Live_s1024.json diff --git a/assets/sif/notes/Live_s1025.json b/assets/serverdata/notes/Live_s1025.json similarity index 100% rename from assets/sif/notes/Live_s1025.json rename to assets/serverdata/notes/Live_s1025.json diff --git a/assets/sif/notes/Live_s1026.json b/assets/serverdata/notes/Live_s1026.json similarity index 100% rename from assets/sif/notes/Live_s1026.json rename to assets/serverdata/notes/Live_s1026.json diff --git a/assets/sif/notes/Live_s1027.json b/assets/serverdata/notes/Live_s1027.json similarity index 100% rename from assets/sif/notes/Live_s1027.json rename to assets/serverdata/notes/Live_s1027.json diff --git a/assets/sif/notes/Live_s1028.json b/assets/serverdata/notes/Live_s1028.json similarity index 100% rename from assets/sif/notes/Live_s1028.json rename to assets/serverdata/notes/Live_s1028.json diff --git a/assets/sif/notes/Live_s1029.json b/assets/serverdata/notes/Live_s1029.json similarity index 100% rename from assets/sif/notes/Live_s1029.json rename to assets/serverdata/notes/Live_s1029.json diff --git a/assets/sif/notes/Live_s1030.json b/assets/serverdata/notes/Live_s1030.json similarity index 100% rename from assets/sif/notes/Live_s1030.json rename to assets/serverdata/notes/Live_s1030.json diff --git a/assets/sif/notes/Live_s1031.json b/assets/serverdata/notes/Live_s1031.json similarity index 100% rename from assets/sif/notes/Live_s1031.json rename to assets/serverdata/notes/Live_s1031.json diff --git a/assets/sif/notes/Live_s1032.json b/assets/serverdata/notes/Live_s1032.json similarity index 100% rename from assets/sif/notes/Live_s1032.json rename to assets/serverdata/notes/Live_s1032.json diff --git a/assets/sif/notes/Live_s1033.json b/assets/serverdata/notes/Live_s1033.json similarity index 100% rename from assets/sif/notes/Live_s1033.json rename to assets/serverdata/notes/Live_s1033.json diff --git a/assets/sif/notes/Live_s1034.json b/assets/serverdata/notes/Live_s1034.json similarity index 100% rename from assets/sif/notes/Live_s1034.json rename to assets/serverdata/notes/Live_s1034.json diff --git a/assets/sif/notes/Live_s1035.json b/assets/serverdata/notes/Live_s1035.json similarity index 100% rename from assets/sif/notes/Live_s1035.json rename to assets/serverdata/notes/Live_s1035.json diff --git a/assets/sif/notes/Live_s1036.json b/assets/serverdata/notes/Live_s1036.json similarity index 100% rename from assets/sif/notes/Live_s1036.json rename to assets/serverdata/notes/Live_s1036.json diff --git a/assets/sif/notes/Live_s1037.json b/assets/serverdata/notes/Live_s1037.json similarity index 100% rename from assets/sif/notes/Live_s1037.json rename to assets/serverdata/notes/Live_s1037.json diff --git a/assets/sif/notes/Live_s1038.json b/assets/serverdata/notes/Live_s1038.json similarity index 100% rename from assets/sif/notes/Live_s1038.json rename to assets/serverdata/notes/Live_s1038.json diff --git a/assets/sif/notes/Live_s1039.json b/assets/serverdata/notes/Live_s1039.json similarity index 100% rename from assets/sif/notes/Live_s1039.json rename to assets/serverdata/notes/Live_s1039.json diff --git a/assets/sif/notes/Live_s1040.json b/assets/serverdata/notes/Live_s1040.json similarity index 100% rename from assets/sif/notes/Live_s1040.json rename to assets/serverdata/notes/Live_s1040.json diff --git a/assets/sif/notes/Live_s1041.json b/assets/serverdata/notes/Live_s1041.json similarity index 100% rename from assets/sif/notes/Live_s1041.json rename to assets/serverdata/notes/Live_s1041.json diff --git a/assets/sif/notes/Live_s1042.json b/assets/serverdata/notes/Live_s1042.json similarity index 100% rename from assets/sif/notes/Live_s1042.json rename to assets/serverdata/notes/Live_s1042.json diff --git a/assets/sif/notes/Live_s1043.json b/assets/serverdata/notes/Live_s1043.json similarity index 100% rename from assets/sif/notes/Live_s1043.json rename to assets/serverdata/notes/Live_s1043.json diff --git a/assets/sif/notes/Live_s1044.json b/assets/serverdata/notes/Live_s1044.json similarity index 100% rename from assets/sif/notes/Live_s1044.json rename to assets/serverdata/notes/Live_s1044.json diff --git a/assets/sif/notes/Live_s1045.json b/assets/serverdata/notes/Live_s1045.json similarity index 100% rename from assets/sif/notes/Live_s1045.json rename to assets/serverdata/notes/Live_s1045.json diff --git a/assets/sif/notes/Live_s1046.json b/assets/serverdata/notes/Live_s1046.json similarity index 100% rename from assets/sif/notes/Live_s1046.json rename to assets/serverdata/notes/Live_s1046.json diff --git a/assets/sif/notes/Live_s1047.json b/assets/serverdata/notes/Live_s1047.json similarity index 100% rename from assets/sif/notes/Live_s1047.json rename to assets/serverdata/notes/Live_s1047.json diff --git a/assets/sif/notes/Live_s1048.json b/assets/serverdata/notes/Live_s1048.json similarity index 100% rename from assets/sif/notes/Live_s1048.json rename to assets/serverdata/notes/Live_s1048.json diff --git a/assets/sif/notes/Live_s1049.json b/assets/serverdata/notes/Live_s1049.json similarity index 100% rename from assets/sif/notes/Live_s1049.json rename to assets/serverdata/notes/Live_s1049.json diff --git a/assets/sif/notes/Live_s1050.json b/assets/serverdata/notes/Live_s1050.json similarity index 100% rename from assets/sif/notes/Live_s1050.json rename to assets/serverdata/notes/Live_s1050.json diff --git a/assets/sif/notes/Live_s1051.json b/assets/serverdata/notes/Live_s1051.json similarity index 100% rename from assets/sif/notes/Live_s1051.json rename to assets/serverdata/notes/Live_s1051.json diff --git a/assets/sif/notes/Live_s1052.json b/assets/serverdata/notes/Live_s1052.json similarity index 100% rename from assets/sif/notes/Live_s1052.json rename to assets/serverdata/notes/Live_s1052.json diff --git a/assets/sif/notes/Live_s1053.json b/assets/serverdata/notes/Live_s1053.json similarity index 100% rename from assets/sif/notes/Live_s1053.json rename to assets/serverdata/notes/Live_s1053.json diff --git a/assets/sif/notes/Live_s1054.json b/assets/serverdata/notes/Live_s1054.json similarity index 100% rename from assets/sif/notes/Live_s1054.json rename to assets/serverdata/notes/Live_s1054.json diff --git a/assets/sif/notes/Live_s1055.json b/assets/serverdata/notes/Live_s1055.json similarity index 100% rename from assets/sif/notes/Live_s1055.json rename to assets/serverdata/notes/Live_s1055.json diff --git a/assets/sif/notes/Live_s1056.json b/assets/serverdata/notes/Live_s1056.json similarity index 100% rename from assets/sif/notes/Live_s1056.json rename to assets/serverdata/notes/Live_s1056.json diff --git a/assets/sif/notes/Live_s1057.json b/assets/serverdata/notes/Live_s1057.json similarity index 100% rename from assets/sif/notes/Live_s1057.json rename to assets/serverdata/notes/Live_s1057.json diff --git a/assets/sif/notes/Live_s1058.json b/assets/serverdata/notes/Live_s1058.json similarity index 100% rename from assets/sif/notes/Live_s1058.json rename to assets/serverdata/notes/Live_s1058.json diff --git a/assets/sif/notes/Live_s1059.json b/assets/serverdata/notes/Live_s1059.json similarity index 100% rename from assets/sif/notes/Live_s1059.json rename to assets/serverdata/notes/Live_s1059.json diff --git a/assets/sif/notes/Live_s1060.json b/assets/serverdata/notes/Live_s1060.json similarity index 100% rename from assets/sif/notes/Live_s1060.json rename to assets/serverdata/notes/Live_s1060.json diff --git a/assets/sif/notes/Live_s1061.json b/assets/serverdata/notes/Live_s1061.json similarity index 100% rename from assets/sif/notes/Live_s1061.json rename to assets/serverdata/notes/Live_s1061.json diff --git a/assets/sif/notes/Live_s1062.json b/assets/serverdata/notes/Live_s1062.json similarity index 100% rename from assets/sif/notes/Live_s1062.json rename to assets/serverdata/notes/Live_s1062.json diff --git a/assets/sif/notes/Live_s1063.json b/assets/serverdata/notes/Live_s1063.json similarity index 100% rename from assets/sif/notes/Live_s1063.json rename to assets/serverdata/notes/Live_s1063.json diff --git a/assets/sif/notes/Live_s1064.json b/assets/serverdata/notes/Live_s1064.json similarity index 100% rename from assets/sif/notes/Live_s1064.json rename to assets/serverdata/notes/Live_s1064.json diff --git a/assets/sif/notes/Live_s1065.json b/assets/serverdata/notes/Live_s1065.json similarity index 100% rename from assets/sif/notes/Live_s1065.json rename to assets/serverdata/notes/Live_s1065.json diff --git a/assets/sif/notes/Live_s1066.json b/assets/serverdata/notes/Live_s1066.json similarity index 100% rename from assets/sif/notes/Live_s1066.json rename to assets/serverdata/notes/Live_s1066.json diff --git a/assets/sif/notes/Live_s1067.json b/assets/serverdata/notes/Live_s1067.json similarity index 100% rename from assets/sif/notes/Live_s1067.json rename to assets/serverdata/notes/Live_s1067.json diff --git a/assets/sif/notes/Live_s1068.json b/assets/serverdata/notes/Live_s1068.json similarity index 100% rename from assets/sif/notes/Live_s1068.json rename to assets/serverdata/notes/Live_s1068.json diff --git a/assets/sif/notes/Live_s1069.json b/assets/serverdata/notes/Live_s1069.json similarity index 100% rename from assets/sif/notes/Live_s1069.json rename to assets/serverdata/notes/Live_s1069.json diff --git a/assets/sif/notes/Live_s1070.json b/assets/serverdata/notes/Live_s1070.json similarity index 100% rename from assets/sif/notes/Live_s1070.json rename to assets/serverdata/notes/Live_s1070.json diff --git a/assets/sif/notes/Live_s1071.json b/assets/serverdata/notes/Live_s1071.json similarity index 100% rename from assets/sif/notes/Live_s1071.json rename to assets/serverdata/notes/Live_s1071.json diff --git a/assets/sif/notes/Live_s1072.json b/assets/serverdata/notes/Live_s1072.json similarity index 100% rename from assets/sif/notes/Live_s1072.json rename to assets/serverdata/notes/Live_s1072.json diff --git a/assets/sif/notes/Live_s1073.json b/assets/serverdata/notes/Live_s1073.json similarity index 100% rename from assets/sif/notes/Live_s1073.json rename to assets/serverdata/notes/Live_s1073.json diff --git a/assets/sif/notes/Live_s1074.json b/assets/serverdata/notes/Live_s1074.json similarity index 100% rename from assets/sif/notes/Live_s1074.json rename to assets/serverdata/notes/Live_s1074.json diff --git a/assets/sif/notes/Live_s1075.json b/assets/serverdata/notes/Live_s1075.json similarity index 100% rename from assets/sif/notes/Live_s1075.json rename to assets/serverdata/notes/Live_s1075.json diff --git a/assets/sif/notes/Live_s1076.json b/assets/serverdata/notes/Live_s1076.json similarity index 100% rename from assets/sif/notes/Live_s1076.json rename to assets/serverdata/notes/Live_s1076.json diff --git a/assets/sif/notes/Live_s1077.json b/assets/serverdata/notes/Live_s1077.json similarity index 100% rename from assets/sif/notes/Live_s1077.json rename to assets/serverdata/notes/Live_s1077.json diff --git a/assets/sif/notes/Live_s1078.json b/assets/serverdata/notes/Live_s1078.json similarity index 100% rename from assets/sif/notes/Live_s1078.json rename to assets/serverdata/notes/Live_s1078.json diff --git a/assets/sif/notes/Live_s1079.json b/assets/serverdata/notes/Live_s1079.json similarity index 100% rename from assets/sif/notes/Live_s1079.json rename to assets/serverdata/notes/Live_s1079.json diff --git a/assets/sif/notes/Live_s1080.json b/assets/serverdata/notes/Live_s1080.json similarity index 100% rename from assets/sif/notes/Live_s1080.json rename to assets/serverdata/notes/Live_s1080.json diff --git a/assets/sif/notes/Live_s1081.json b/assets/serverdata/notes/Live_s1081.json similarity index 100% rename from assets/sif/notes/Live_s1081.json rename to assets/serverdata/notes/Live_s1081.json diff --git a/assets/sif/notes/Live_s1082.json b/assets/serverdata/notes/Live_s1082.json similarity index 100% rename from assets/sif/notes/Live_s1082.json rename to assets/serverdata/notes/Live_s1082.json diff --git a/assets/sif/notes/Live_s1083.json b/assets/serverdata/notes/Live_s1083.json similarity index 100% rename from assets/sif/notes/Live_s1083.json rename to assets/serverdata/notes/Live_s1083.json diff --git a/assets/sif/notes/Live_s1084.json b/assets/serverdata/notes/Live_s1084.json similarity index 100% rename from assets/sif/notes/Live_s1084.json rename to assets/serverdata/notes/Live_s1084.json diff --git a/assets/sif/notes/Live_s1085.json b/assets/serverdata/notes/Live_s1085.json similarity index 100% rename from assets/sif/notes/Live_s1085.json rename to assets/serverdata/notes/Live_s1085.json diff --git a/assets/sif/notes/Live_s1086.json b/assets/serverdata/notes/Live_s1086.json similarity index 100% rename from assets/sif/notes/Live_s1086.json rename to assets/serverdata/notes/Live_s1086.json diff --git a/assets/sif/notes/Live_s1087.json b/assets/serverdata/notes/Live_s1087.json similarity index 100% rename from assets/sif/notes/Live_s1087.json rename to assets/serverdata/notes/Live_s1087.json diff --git a/assets/sif/notes/Live_s1088.json b/assets/serverdata/notes/Live_s1088.json similarity index 100% rename from assets/sif/notes/Live_s1088.json rename to assets/serverdata/notes/Live_s1088.json diff --git a/assets/sif/notes/Live_s1089.json b/assets/serverdata/notes/Live_s1089.json similarity index 100% rename from assets/sif/notes/Live_s1089.json rename to assets/serverdata/notes/Live_s1089.json diff --git a/assets/sif/notes/Live_s1090.json b/assets/serverdata/notes/Live_s1090.json similarity index 100% rename from assets/sif/notes/Live_s1090.json rename to assets/serverdata/notes/Live_s1090.json diff --git a/assets/sif/notes/Live_s1091.json b/assets/serverdata/notes/Live_s1091.json similarity index 100% rename from assets/sif/notes/Live_s1091.json rename to assets/serverdata/notes/Live_s1091.json diff --git a/assets/sif/notes/Live_s1092.json b/assets/serverdata/notes/Live_s1092.json similarity index 100% rename from assets/sif/notes/Live_s1092.json rename to assets/serverdata/notes/Live_s1092.json diff --git a/assets/sif/notes/Live_s1093.json b/assets/serverdata/notes/Live_s1093.json similarity index 100% rename from assets/sif/notes/Live_s1093.json rename to assets/serverdata/notes/Live_s1093.json diff --git a/assets/sif/notes/Live_s1094.json b/assets/serverdata/notes/Live_s1094.json similarity index 100% rename from assets/sif/notes/Live_s1094.json rename to assets/serverdata/notes/Live_s1094.json diff --git a/assets/sif/notes/Live_s1095.json b/assets/serverdata/notes/Live_s1095.json similarity index 100% rename from assets/sif/notes/Live_s1095.json rename to assets/serverdata/notes/Live_s1095.json diff --git a/assets/sif/notes/Live_s1096.json b/assets/serverdata/notes/Live_s1096.json similarity index 100% rename from assets/sif/notes/Live_s1096.json rename to assets/serverdata/notes/Live_s1096.json diff --git a/assets/sif/notes/Live_s1097.json b/assets/serverdata/notes/Live_s1097.json similarity index 100% rename from assets/sif/notes/Live_s1097.json rename to assets/serverdata/notes/Live_s1097.json diff --git a/assets/sif/notes/Live_s1098.json b/assets/serverdata/notes/Live_s1098.json similarity index 100% rename from assets/sif/notes/Live_s1098.json rename to assets/serverdata/notes/Live_s1098.json diff --git a/assets/sif/notes/Live_s1099.json b/assets/serverdata/notes/Live_s1099.json similarity index 100% rename from assets/sif/notes/Live_s1099.json rename to assets/serverdata/notes/Live_s1099.json diff --git a/assets/sif/notes/Live_s1100.json b/assets/serverdata/notes/Live_s1100.json similarity index 100% rename from assets/sif/notes/Live_s1100.json rename to assets/serverdata/notes/Live_s1100.json diff --git a/assets/sif/notes/Live_s1101.json b/assets/serverdata/notes/Live_s1101.json similarity index 100% rename from assets/sif/notes/Live_s1101.json rename to assets/serverdata/notes/Live_s1101.json diff --git a/assets/sif/notes/Live_s1102.json b/assets/serverdata/notes/Live_s1102.json similarity index 100% rename from assets/sif/notes/Live_s1102.json rename to assets/serverdata/notes/Live_s1102.json diff --git a/assets/sif/notes/Live_s1103.json b/assets/serverdata/notes/Live_s1103.json similarity index 100% rename from assets/sif/notes/Live_s1103.json rename to assets/serverdata/notes/Live_s1103.json diff --git a/assets/sif/notes/Live_s1104.json b/assets/serverdata/notes/Live_s1104.json similarity index 100% rename from assets/sif/notes/Live_s1104.json rename to assets/serverdata/notes/Live_s1104.json diff --git a/assets/sif/notes/Live_s1105.json b/assets/serverdata/notes/Live_s1105.json similarity index 100% rename from assets/sif/notes/Live_s1105.json rename to assets/serverdata/notes/Live_s1105.json diff --git a/assets/sif/notes/Live_s1106.json b/assets/serverdata/notes/Live_s1106.json similarity index 100% rename from assets/sif/notes/Live_s1106.json rename to assets/serverdata/notes/Live_s1106.json diff --git a/assets/sif/notes/Live_s1107.json b/assets/serverdata/notes/Live_s1107.json similarity index 100% rename from assets/sif/notes/Live_s1107.json rename to assets/serverdata/notes/Live_s1107.json diff --git a/assets/sif/notes/Live_s1108.json b/assets/serverdata/notes/Live_s1108.json similarity index 100% rename from assets/sif/notes/Live_s1108.json rename to assets/serverdata/notes/Live_s1108.json diff --git a/assets/sif/notes/Live_s1109.json b/assets/serverdata/notes/Live_s1109.json similarity index 100% rename from assets/sif/notes/Live_s1109.json rename to assets/serverdata/notes/Live_s1109.json diff --git a/assets/sif/notes/Live_s1110.json b/assets/serverdata/notes/Live_s1110.json similarity index 100% rename from assets/sif/notes/Live_s1110.json rename to assets/serverdata/notes/Live_s1110.json diff --git a/assets/sif/notes/Live_s1111.json b/assets/serverdata/notes/Live_s1111.json similarity index 100% rename from assets/sif/notes/Live_s1111.json rename to assets/serverdata/notes/Live_s1111.json diff --git a/assets/sif/notes/Live_s1112.json b/assets/serverdata/notes/Live_s1112.json similarity index 100% rename from assets/sif/notes/Live_s1112.json rename to assets/serverdata/notes/Live_s1112.json diff --git a/assets/sif/notes/Live_s1113.json b/assets/serverdata/notes/Live_s1113.json similarity index 100% rename from assets/sif/notes/Live_s1113.json rename to assets/serverdata/notes/Live_s1113.json diff --git a/assets/sif/notes/Live_s1114.json b/assets/serverdata/notes/Live_s1114.json similarity index 100% rename from assets/sif/notes/Live_s1114.json rename to assets/serverdata/notes/Live_s1114.json diff --git a/assets/sif/notes/Live_s1115.json b/assets/serverdata/notes/Live_s1115.json similarity index 100% rename from assets/sif/notes/Live_s1115.json rename to assets/serverdata/notes/Live_s1115.json diff --git a/assets/sif/notes/Live_s1116.json b/assets/serverdata/notes/Live_s1116.json similarity index 100% rename from assets/sif/notes/Live_s1116.json rename to assets/serverdata/notes/Live_s1116.json diff --git a/assets/sif/notes/Live_s1117.json b/assets/serverdata/notes/Live_s1117.json similarity index 100% rename from assets/sif/notes/Live_s1117.json rename to assets/serverdata/notes/Live_s1117.json diff --git a/assets/sif/notes/Live_s1118.json b/assets/serverdata/notes/Live_s1118.json similarity index 100% rename from assets/sif/notes/Live_s1118.json rename to assets/serverdata/notes/Live_s1118.json diff --git a/assets/sif/notes/Live_s1119.json b/assets/serverdata/notes/Live_s1119.json similarity index 100% rename from assets/sif/notes/Live_s1119.json rename to assets/serverdata/notes/Live_s1119.json diff --git a/assets/sif/notes/Live_s1120.json b/assets/serverdata/notes/Live_s1120.json similarity index 100% rename from assets/sif/notes/Live_s1120.json rename to assets/serverdata/notes/Live_s1120.json diff --git a/assets/sif/notes/Live_s1121.json b/assets/serverdata/notes/Live_s1121.json similarity index 100% rename from assets/sif/notes/Live_s1121.json rename to assets/serverdata/notes/Live_s1121.json diff --git a/assets/sif/notes/Live_s1122.json b/assets/serverdata/notes/Live_s1122.json similarity index 100% rename from assets/sif/notes/Live_s1122.json rename to assets/serverdata/notes/Live_s1122.json diff --git a/assets/sif/notes/Live_s1123.json b/assets/serverdata/notes/Live_s1123.json similarity index 100% rename from assets/sif/notes/Live_s1123.json rename to assets/serverdata/notes/Live_s1123.json diff --git a/assets/sif/notes/Live_s1124.json b/assets/serverdata/notes/Live_s1124.json similarity index 100% rename from assets/sif/notes/Live_s1124.json rename to assets/serverdata/notes/Live_s1124.json diff --git a/assets/sif/notes/Live_s1125.json b/assets/serverdata/notes/Live_s1125.json similarity index 100% rename from assets/sif/notes/Live_s1125.json rename to assets/serverdata/notes/Live_s1125.json diff --git a/assets/sif/notes/Live_s1126.json b/assets/serverdata/notes/Live_s1126.json similarity index 100% rename from assets/sif/notes/Live_s1126.json rename to assets/serverdata/notes/Live_s1126.json diff --git a/assets/sif/notes/Live_s1127.json b/assets/serverdata/notes/Live_s1127.json similarity index 100% rename from assets/sif/notes/Live_s1127.json rename to assets/serverdata/notes/Live_s1127.json diff --git a/assets/sif/notes/Live_s1128.json b/assets/serverdata/notes/Live_s1128.json similarity index 100% rename from assets/sif/notes/Live_s1128.json rename to assets/serverdata/notes/Live_s1128.json diff --git a/assets/sif/notes/Live_s1129.json b/assets/serverdata/notes/Live_s1129.json similarity index 100% rename from assets/sif/notes/Live_s1129.json rename to assets/serverdata/notes/Live_s1129.json diff --git a/assets/sif/notes/Live_s1130.json b/assets/serverdata/notes/Live_s1130.json similarity index 100% rename from assets/sif/notes/Live_s1130.json rename to assets/serverdata/notes/Live_s1130.json diff --git a/assets/sif/notes/Live_s1131.json b/assets/serverdata/notes/Live_s1131.json similarity index 100% rename from assets/sif/notes/Live_s1131.json rename to assets/serverdata/notes/Live_s1131.json diff --git a/assets/sif/notes/Live_s1132.json b/assets/serverdata/notes/Live_s1132.json similarity index 100% rename from assets/sif/notes/Live_s1132.json rename to assets/serverdata/notes/Live_s1132.json diff --git a/assets/sif/notes/Live_s1133.json b/assets/serverdata/notes/Live_s1133.json similarity index 100% rename from assets/sif/notes/Live_s1133.json rename to assets/serverdata/notes/Live_s1133.json diff --git a/assets/sif/notes/Live_s1134.json b/assets/serverdata/notes/Live_s1134.json similarity index 100% rename from assets/sif/notes/Live_s1134.json rename to assets/serverdata/notes/Live_s1134.json diff --git a/assets/sif/notes/Live_s1135.json b/assets/serverdata/notes/Live_s1135.json similarity index 100% rename from assets/sif/notes/Live_s1135.json rename to assets/serverdata/notes/Live_s1135.json diff --git a/assets/sif/notes/Live_s1136.json b/assets/serverdata/notes/Live_s1136.json similarity index 100% rename from assets/sif/notes/Live_s1136.json rename to assets/serverdata/notes/Live_s1136.json diff --git a/assets/sif/notes/Live_s1137.json b/assets/serverdata/notes/Live_s1137.json similarity index 100% rename from assets/sif/notes/Live_s1137.json rename to assets/serverdata/notes/Live_s1137.json diff --git a/assets/sif/notes/Live_s1138.json b/assets/serverdata/notes/Live_s1138.json similarity index 100% rename from assets/sif/notes/Live_s1138.json rename to assets/serverdata/notes/Live_s1138.json diff --git a/assets/sif/notes/Live_s1139.json b/assets/serverdata/notes/Live_s1139.json similarity index 100% rename from assets/sif/notes/Live_s1139.json rename to assets/serverdata/notes/Live_s1139.json diff --git a/assets/sif/notes/Live_s1140.json b/assets/serverdata/notes/Live_s1140.json similarity index 100% rename from assets/sif/notes/Live_s1140.json rename to assets/serverdata/notes/Live_s1140.json diff --git a/assets/sif/notes/Live_s1141.json b/assets/serverdata/notes/Live_s1141.json similarity index 100% rename from assets/sif/notes/Live_s1141.json rename to assets/serverdata/notes/Live_s1141.json diff --git a/assets/sif/notes/Live_s1142.json b/assets/serverdata/notes/Live_s1142.json similarity index 100% rename from assets/sif/notes/Live_s1142.json rename to assets/serverdata/notes/Live_s1142.json diff --git a/assets/sif/notes/Live_s1143.json b/assets/serverdata/notes/Live_s1143.json similarity index 100% rename from assets/sif/notes/Live_s1143.json rename to assets/serverdata/notes/Live_s1143.json diff --git a/assets/sif/notes/Live_s1144.json b/assets/serverdata/notes/Live_s1144.json similarity index 100% rename from assets/sif/notes/Live_s1144.json rename to assets/serverdata/notes/Live_s1144.json diff --git a/assets/sif/notes/Live_s1145.json b/assets/serverdata/notes/Live_s1145.json similarity index 100% rename from assets/sif/notes/Live_s1145.json rename to assets/serverdata/notes/Live_s1145.json diff --git a/assets/sif/notes/Live_s1146.json b/assets/serverdata/notes/Live_s1146.json similarity index 100% rename from assets/sif/notes/Live_s1146.json rename to assets/serverdata/notes/Live_s1146.json diff --git a/assets/sif/notes/Live_s1147.json b/assets/serverdata/notes/Live_s1147.json similarity index 100% rename from assets/sif/notes/Live_s1147.json rename to assets/serverdata/notes/Live_s1147.json diff --git a/assets/sif/notes/Live_s1148.json b/assets/serverdata/notes/Live_s1148.json similarity index 100% rename from assets/sif/notes/Live_s1148.json rename to assets/serverdata/notes/Live_s1148.json diff --git a/assets/sif/notes/Live_s1149.json b/assets/serverdata/notes/Live_s1149.json similarity index 100% rename from assets/sif/notes/Live_s1149.json rename to assets/serverdata/notes/Live_s1149.json diff --git a/assets/sif/notes/Live_s1150.json b/assets/serverdata/notes/Live_s1150.json similarity index 100% rename from assets/sif/notes/Live_s1150.json rename to assets/serverdata/notes/Live_s1150.json diff --git a/assets/sif/notes/Live_s1151.json b/assets/serverdata/notes/Live_s1151.json similarity index 100% rename from assets/sif/notes/Live_s1151.json rename to assets/serverdata/notes/Live_s1151.json diff --git a/assets/sif/notes/Live_s1152.json b/assets/serverdata/notes/Live_s1152.json similarity index 100% rename from assets/sif/notes/Live_s1152.json rename to assets/serverdata/notes/Live_s1152.json diff --git a/assets/sif/notes/Live_s1153.json b/assets/serverdata/notes/Live_s1153.json similarity index 100% rename from assets/sif/notes/Live_s1153.json rename to assets/serverdata/notes/Live_s1153.json diff --git a/assets/sif/notes/Live_s1154.json b/assets/serverdata/notes/Live_s1154.json similarity index 100% rename from assets/sif/notes/Live_s1154.json rename to assets/serverdata/notes/Live_s1154.json diff --git a/assets/sif/notes/Live_s1155.json b/assets/serverdata/notes/Live_s1155.json similarity index 100% rename from assets/sif/notes/Live_s1155.json rename to assets/serverdata/notes/Live_s1155.json diff --git a/assets/sif/notes/Live_s1156.json b/assets/serverdata/notes/Live_s1156.json similarity index 100% rename from assets/sif/notes/Live_s1156.json rename to assets/serverdata/notes/Live_s1156.json diff --git a/assets/sif/notes/Live_s1157.json b/assets/serverdata/notes/Live_s1157.json similarity index 100% rename from assets/sif/notes/Live_s1157.json rename to assets/serverdata/notes/Live_s1157.json diff --git a/assets/sif/notes/Live_s1158.json b/assets/serverdata/notes/Live_s1158.json similarity index 100% rename from assets/sif/notes/Live_s1158.json rename to assets/serverdata/notes/Live_s1158.json diff --git a/assets/sif/notes/Live_s1159.json b/assets/serverdata/notes/Live_s1159.json similarity index 100% rename from assets/sif/notes/Live_s1159.json rename to assets/serverdata/notes/Live_s1159.json diff --git a/assets/sif/notes/Live_s1160.json b/assets/serverdata/notes/Live_s1160.json similarity index 100% rename from assets/sif/notes/Live_s1160.json rename to assets/serverdata/notes/Live_s1160.json diff --git a/assets/sif/notes/Live_s1161.json b/assets/serverdata/notes/Live_s1161.json similarity index 100% rename from assets/sif/notes/Live_s1161.json rename to assets/serverdata/notes/Live_s1161.json diff --git a/assets/sif/notes/Live_s1162.json b/assets/serverdata/notes/Live_s1162.json similarity index 100% rename from assets/sif/notes/Live_s1162.json rename to assets/serverdata/notes/Live_s1162.json diff --git a/assets/sif/notes/Live_s1163.json b/assets/serverdata/notes/Live_s1163.json similarity index 100% rename from assets/sif/notes/Live_s1163.json rename to assets/serverdata/notes/Live_s1163.json diff --git a/assets/sif/notes/Live_s1164.json b/assets/serverdata/notes/Live_s1164.json similarity index 100% rename from assets/sif/notes/Live_s1164.json rename to assets/serverdata/notes/Live_s1164.json diff --git a/assets/sif/notes/Live_s1165.json b/assets/serverdata/notes/Live_s1165.json similarity index 100% rename from assets/sif/notes/Live_s1165.json rename to assets/serverdata/notes/Live_s1165.json diff --git a/assets/sif/notes/Live_s1166.json b/assets/serverdata/notes/Live_s1166.json similarity index 100% rename from assets/sif/notes/Live_s1166.json rename to assets/serverdata/notes/Live_s1166.json diff --git a/assets/sif/notes/Live_s1167.json b/assets/serverdata/notes/Live_s1167.json similarity index 100% rename from assets/sif/notes/Live_s1167.json rename to assets/serverdata/notes/Live_s1167.json diff --git a/assets/sif/notes/Live_s1168.json b/assets/serverdata/notes/Live_s1168.json similarity index 100% rename from assets/sif/notes/Live_s1168.json rename to assets/serverdata/notes/Live_s1168.json diff --git a/assets/sif/notes/Live_s1169.json b/assets/serverdata/notes/Live_s1169.json similarity index 100% rename from assets/sif/notes/Live_s1169.json rename to assets/serverdata/notes/Live_s1169.json diff --git a/assets/sif/notes/Live_s1170.json b/assets/serverdata/notes/Live_s1170.json similarity index 100% rename from assets/sif/notes/Live_s1170.json rename to assets/serverdata/notes/Live_s1170.json diff --git a/assets/sif/notes/Live_s1171.json b/assets/serverdata/notes/Live_s1171.json similarity index 100% rename from assets/sif/notes/Live_s1171.json rename to assets/serverdata/notes/Live_s1171.json diff --git a/assets/sif/notes/Live_s1172.json b/assets/serverdata/notes/Live_s1172.json similarity index 100% rename from assets/sif/notes/Live_s1172.json rename to assets/serverdata/notes/Live_s1172.json diff --git a/assets/sif/notes/Live_s1173.json b/assets/serverdata/notes/Live_s1173.json similarity index 100% rename from assets/sif/notes/Live_s1173.json rename to assets/serverdata/notes/Live_s1173.json diff --git a/assets/sif/notes/Live_s1174.json b/assets/serverdata/notes/Live_s1174.json similarity index 100% rename from assets/sif/notes/Live_s1174.json rename to assets/serverdata/notes/Live_s1174.json diff --git a/assets/sif/notes/Live_s1175.json b/assets/serverdata/notes/Live_s1175.json similarity index 100% rename from assets/sif/notes/Live_s1175.json rename to assets/serverdata/notes/Live_s1175.json diff --git a/assets/sif/notes/Live_s1176.json b/assets/serverdata/notes/Live_s1176.json similarity index 100% rename from assets/sif/notes/Live_s1176.json rename to assets/serverdata/notes/Live_s1176.json diff --git a/assets/sif/notes/Live_s1177.json b/assets/serverdata/notes/Live_s1177.json similarity index 100% rename from assets/sif/notes/Live_s1177.json rename to assets/serverdata/notes/Live_s1177.json diff --git a/assets/sif/notes/Live_s1178.json b/assets/serverdata/notes/Live_s1178.json similarity index 100% rename from assets/sif/notes/Live_s1178.json rename to assets/serverdata/notes/Live_s1178.json diff --git a/assets/sif/notes/Live_s1179.json b/assets/serverdata/notes/Live_s1179.json similarity index 100% rename from assets/sif/notes/Live_s1179.json rename to assets/serverdata/notes/Live_s1179.json diff --git a/assets/sif/notes/Live_s1180.json b/assets/serverdata/notes/Live_s1180.json similarity index 100% rename from assets/sif/notes/Live_s1180.json rename to assets/serverdata/notes/Live_s1180.json diff --git a/assets/sif/notes/Live_s1181.json b/assets/serverdata/notes/Live_s1181.json similarity index 100% rename from assets/sif/notes/Live_s1181.json rename to assets/serverdata/notes/Live_s1181.json diff --git a/assets/sif/notes/Live_s1182.json b/assets/serverdata/notes/Live_s1182.json similarity index 100% rename from assets/sif/notes/Live_s1182.json rename to assets/serverdata/notes/Live_s1182.json diff --git a/assets/sif/notes/Live_s1183.json b/assets/serverdata/notes/Live_s1183.json similarity index 100% rename from assets/sif/notes/Live_s1183.json rename to assets/serverdata/notes/Live_s1183.json diff --git a/assets/sif/notes/Live_s1184.json b/assets/serverdata/notes/Live_s1184.json similarity index 100% rename from assets/sif/notes/Live_s1184.json rename to assets/serverdata/notes/Live_s1184.json diff --git a/assets/sif/notes/Live_s1185.json b/assets/serverdata/notes/Live_s1185.json similarity index 100% rename from assets/sif/notes/Live_s1185.json rename to assets/serverdata/notes/Live_s1185.json diff --git a/assets/sif/notes/Live_s1186.json b/assets/serverdata/notes/Live_s1186.json similarity index 100% rename from assets/sif/notes/Live_s1186.json rename to assets/serverdata/notes/Live_s1186.json diff --git a/assets/sif/notes/Live_s1187.json b/assets/serverdata/notes/Live_s1187.json similarity index 100% rename from assets/sif/notes/Live_s1187.json rename to assets/serverdata/notes/Live_s1187.json diff --git a/assets/sif/notes/Live_s1188.json b/assets/serverdata/notes/Live_s1188.json similarity index 100% rename from assets/sif/notes/Live_s1188.json rename to assets/serverdata/notes/Live_s1188.json diff --git a/assets/sif/notes/Live_s1189.json b/assets/serverdata/notes/Live_s1189.json similarity index 100% rename from assets/sif/notes/Live_s1189.json rename to assets/serverdata/notes/Live_s1189.json diff --git a/assets/sif/notes/Live_s1190.json b/assets/serverdata/notes/Live_s1190.json similarity index 100% rename from assets/sif/notes/Live_s1190.json rename to assets/serverdata/notes/Live_s1190.json diff --git a/assets/sif/notes/Live_s1191.json b/assets/serverdata/notes/Live_s1191.json similarity index 100% rename from assets/sif/notes/Live_s1191.json rename to assets/serverdata/notes/Live_s1191.json diff --git a/assets/sif/notes/Live_s1192.json b/assets/serverdata/notes/Live_s1192.json similarity index 100% rename from assets/sif/notes/Live_s1192.json rename to assets/serverdata/notes/Live_s1192.json diff --git a/assets/sif/notes/Live_s1193.json b/assets/serverdata/notes/Live_s1193.json similarity index 100% rename from assets/sif/notes/Live_s1193.json rename to assets/serverdata/notes/Live_s1193.json diff --git a/assets/sif/notes/Live_s1194.json b/assets/serverdata/notes/Live_s1194.json similarity index 100% rename from assets/sif/notes/Live_s1194.json rename to assets/serverdata/notes/Live_s1194.json diff --git a/assets/sif/notes/Live_s1195.json b/assets/serverdata/notes/Live_s1195.json similarity index 100% rename from assets/sif/notes/Live_s1195.json rename to assets/serverdata/notes/Live_s1195.json diff --git a/assets/sif/notes/Live_s1196.json b/assets/serverdata/notes/Live_s1196.json similarity index 100% rename from assets/sif/notes/Live_s1196.json rename to assets/serverdata/notes/Live_s1196.json diff --git a/assets/sif/notes/Live_s1197.json b/assets/serverdata/notes/Live_s1197.json similarity index 100% rename from assets/sif/notes/Live_s1197.json rename to assets/serverdata/notes/Live_s1197.json diff --git a/assets/sif/notes/Live_s1198.json b/assets/serverdata/notes/Live_s1198.json similarity index 100% rename from assets/sif/notes/Live_s1198.json rename to assets/serverdata/notes/Live_s1198.json diff --git a/assets/sif/notes/Live_s1199.json b/assets/serverdata/notes/Live_s1199.json similarity index 100% rename from assets/sif/notes/Live_s1199.json rename to assets/serverdata/notes/Live_s1199.json diff --git a/assets/sif/notes/Live_s1200.json b/assets/serverdata/notes/Live_s1200.json similarity index 100% rename from assets/sif/notes/Live_s1200.json rename to assets/serverdata/notes/Live_s1200.json diff --git a/assets/sif/notes/Live_s1201.json b/assets/serverdata/notes/Live_s1201.json similarity index 100% rename from assets/sif/notes/Live_s1201.json rename to assets/serverdata/notes/Live_s1201.json diff --git a/assets/sif/notes/Live_s1202.json b/assets/serverdata/notes/Live_s1202.json similarity index 100% rename from assets/sif/notes/Live_s1202.json rename to assets/serverdata/notes/Live_s1202.json diff --git a/assets/sif/notes/Live_s1203.json b/assets/serverdata/notes/Live_s1203.json similarity index 100% rename from assets/sif/notes/Live_s1203.json rename to assets/serverdata/notes/Live_s1203.json diff --git a/assets/sif/notes/Live_s1204.json b/assets/serverdata/notes/Live_s1204.json similarity index 100% rename from assets/sif/notes/Live_s1204.json rename to assets/serverdata/notes/Live_s1204.json diff --git a/assets/sif/notes/Live_s1205.json b/assets/serverdata/notes/Live_s1205.json similarity index 100% rename from assets/sif/notes/Live_s1205.json rename to assets/serverdata/notes/Live_s1205.json diff --git a/assets/sif/notes/Live_s1206.json b/assets/serverdata/notes/Live_s1206.json similarity index 100% rename from assets/sif/notes/Live_s1206.json rename to assets/serverdata/notes/Live_s1206.json diff --git a/assets/sif/notes/Live_s1207.json b/assets/serverdata/notes/Live_s1207.json similarity index 100% rename from assets/sif/notes/Live_s1207.json rename to assets/serverdata/notes/Live_s1207.json diff --git a/assets/sif/notes/Live_s1208.json b/assets/serverdata/notes/Live_s1208.json similarity index 100% rename from assets/sif/notes/Live_s1208.json rename to assets/serverdata/notes/Live_s1208.json diff --git a/assets/sif/notes/Live_s1209.json b/assets/serverdata/notes/Live_s1209.json similarity index 100% rename from assets/sif/notes/Live_s1209.json rename to assets/serverdata/notes/Live_s1209.json diff --git a/assets/sif/notes/Live_s1210.json b/assets/serverdata/notes/Live_s1210.json similarity index 100% rename from assets/sif/notes/Live_s1210.json rename to assets/serverdata/notes/Live_s1210.json diff --git a/assets/sif/notes/Live_s1211.json b/assets/serverdata/notes/Live_s1211.json similarity index 100% rename from assets/sif/notes/Live_s1211.json rename to assets/serverdata/notes/Live_s1211.json diff --git a/assets/sif/notes/Live_s1212.json b/assets/serverdata/notes/Live_s1212.json similarity index 100% rename from assets/sif/notes/Live_s1212.json rename to assets/serverdata/notes/Live_s1212.json diff --git a/assets/sif/notes/Live_s1213.json b/assets/serverdata/notes/Live_s1213.json similarity index 100% rename from assets/sif/notes/Live_s1213.json rename to assets/serverdata/notes/Live_s1213.json diff --git a/assets/sif/notes/Live_s1214.json b/assets/serverdata/notes/Live_s1214.json similarity index 100% rename from assets/sif/notes/Live_s1214.json rename to assets/serverdata/notes/Live_s1214.json diff --git a/assets/sif/notes/Live_s1215.json b/assets/serverdata/notes/Live_s1215.json similarity index 100% rename from assets/sif/notes/Live_s1215.json rename to assets/serverdata/notes/Live_s1215.json diff --git a/assets/sif/notes/Live_s1216.json b/assets/serverdata/notes/Live_s1216.json similarity index 100% rename from assets/sif/notes/Live_s1216.json rename to assets/serverdata/notes/Live_s1216.json diff --git a/assets/sif/notes/Live_s1217.json b/assets/serverdata/notes/Live_s1217.json similarity index 100% rename from assets/sif/notes/Live_s1217.json rename to assets/serverdata/notes/Live_s1217.json diff --git a/assets/sif/notes/Live_s1218.json b/assets/serverdata/notes/Live_s1218.json similarity index 100% rename from assets/sif/notes/Live_s1218.json rename to assets/serverdata/notes/Live_s1218.json diff --git a/assets/sif/notes/Live_s1219.json b/assets/serverdata/notes/Live_s1219.json similarity index 100% rename from assets/sif/notes/Live_s1219.json rename to assets/serverdata/notes/Live_s1219.json diff --git a/assets/sif/notes/Live_s1220.json b/assets/serverdata/notes/Live_s1220.json similarity index 100% rename from assets/sif/notes/Live_s1220.json rename to assets/serverdata/notes/Live_s1220.json diff --git a/assets/sif/notes/Live_s1221.json b/assets/serverdata/notes/Live_s1221.json similarity index 100% rename from assets/sif/notes/Live_s1221.json rename to assets/serverdata/notes/Live_s1221.json diff --git a/assets/sif/notes/Live_s1222.json b/assets/serverdata/notes/Live_s1222.json similarity index 100% rename from assets/sif/notes/Live_s1222.json rename to assets/serverdata/notes/Live_s1222.json diff --git a/assets/sif/notes/Live_s1223.json b/assets/serverdata/notes/Live_s1223.json similarity index 100% rename from assets/sif/notes/Live_s1223.json rename to assets/serverdata/notes/Live_s1223.json diff --git a/assets/sif/notes/Live_s1224.json b/assets/serverdata/notes/Live_s1224.json similarity index 100% rename from assets/sif/notes/Live_s1224.json rename to assets/serverdata/notes/Live_s1224.json diff --git a/assets/sif/notes/Live_s1225.json b/assets/serverdata/notes/Live_s1225.json similarity index 100% rename from assets/sif/notes/Live_s1225.json rename to assets/serverdata/notes/Live_s1225.json diff --git a/assets/sif/notes/Live_s1226.json b/assets/serverdata/notes/Live_s1226.json similarity index 100% rename from assets/sif/notes/Live_s1226.json rename to assets/serverdata/notes/Live_s1226.json diff --git a/assets/sif/notes/Live_s1227.json b/assets/serverdata/notes/Live_s1227.json similarity index 100% rename from assets/sif/notes/Live_s1227.json rename to assets/serverdata/notes/Live_s1227.json diff --git a/assets/sif/notes/Live_s1228.json b/assets/serverdata/notes/Live_s1228.json similarity index 100% rename from assets/sif/notes/Live_s1228.json rename to assets/serverdata/notes/Live_s1228.json diff --git a/assets/sif/notes/Live_s1229.json b/assets/serverdata/notes/Live_s1229.json similarity index 100% rename from assets/sif/notes/Live_s1229.json rename to assets/serverdata/notes/Live_s1229.json diff --git a/assets/sif/notes/Live_s1230.json b/assets/serverdata/notes/Live_s1230.json similarity index 100% rename from assets/sif/notes/Live_s1230.json rename to assets/serverdata/notes/Live_s1230.json diff --git a/assets/sif/notes/Live_s1231.json b/assets/serverdata/notes/Live_s1231.json similarity index 100% rename from assets/sif/notes/Live_s1231.json rename to assets/serverdata/notes/Live_s1231.json diff --git a/assets/sif/notes/Live_s1232.json b/assets/serverdata/notes/Live_s1232.json similarity index 100% rename from assets/sif/notes/Live_s1232.json rename to assets/serverdata/notes/Live_s1232.json diff --git a/assets/sif/notes/Live_s1233.json b/assets/serverdata/notes/Live_s1233.json similarity index 100% rename from assets/sif/notes/Live_s1233.json rename to assets/serverdata/notes/Live_s1233.json diff --git a/assets/sif/notes/Live_s1234.json b/assets/serverdata/notes/Live_s1234.json similarity index 100% rename from assets/sif/notes/Live_s1234.json rename to assets/serverdata/notes/Live_s1234.json diff --git a/assets/sif/notes/Live_s1235.json b/assets/serverdata/notes/Live_s1235.json similarity index 100% rename from assets/sif/notes/Live_s1235.json rename to assets/serverdata/notes/Live_s1235.json diff --git a/assets/sif/notes/Live_s1236.json b/assets/serverdata/notes/Live_s1236.json similarity index 100% rename from assets/sif/notes/Live_s1236.json rename to assets/serverdata/notes/Live_s1236.json diff --git a/assets/sif/notes/Live_s1237.json b/assets/serverdata/notes/Live_s1237.json similarity index 100% rename from assets/sif/notes/Live_s1237.json rename to assets/serverdata/notes/Live_s1237.json diff --git a/assets/sif/notes/Live_s1238.json b/assets/serverdata/notes/Live_s1238.json similarity index 100% rename from assets/sif/notes/Live_s1238.json rename to assets/serverdata/notes/Live_s1238.json diff --git a/assets/sif/notes/Live_s1239.json b/assets/serverdata/notes/Live_s1239.json similarity index 100% rename from assets/sif/notes/Live_s1239.json rename to assets/serverdata/notes/Live_s1239.json diff --git a/assets/sif/notes/Live_s1240.json b/assets/serverdata/notes/Live_s1240.json similarity index 100% rename from assets/sif/notes/Live_s1240.json rename to assets/serverdata/notes/Live_s1240.json diff --git a/assets/sif/notes/Live_s1241.json b/assets/serverdata/notes/Live_s1241.json similarity index 100% rename from assets/sif/notes/Live_s1241.json rename to assets/serverdata/notes/Live_s1241.json diff --git a/assets/sif/notes/Live_s1242.json b/assets/serverdata/notes/Live_s1242.json similarity index 100% rename from assets/sif/notes/Live_s1242.json rename to assets/serverdata/notes/Live_s1242.json diff --git a/assets/sif/notes/Live_s1243.json b/assets/serverdata/notes/Live_s1243.json similarity index 100% rename from assets/sif/notes/Live_s1243.json rename to assets/serverdata/notes/Live_s1243.json diff --git a/assets/sif/notes/Live_s1244.json b/assets/serverdata/notes/Live_s1244.json similarity index 100% rename from assets/sif/notes/Live_s1244.json rename to assets/serverdata/notes/Live_s1244.json diff --git a/assets/sif/notes/Live_s1245.json b/assets/serverdata/notes/Live_s1245.json similarity index 100% rename from assets/sif/notes/Live_s1245.json rename to assets/serverdata/notes/Live_s1245.json diff --git a/assets/sif/notes/Live_s1246.json b/assets/serverdata/notes/Live_s1246.json similarity index 100% rename from assets/sif/notes/Live_s1246.json rename to assets/serverdata/notes/Live_s1246.json diff --git a/assets/sif/notes/Live_s1247.json b/assets/serverdata/notes/Live_s1247.json similarity index 100% rename from assets/sif/notes/Live_s1247.json rename to assets/serverdata/notes/Live_s1247.json diff --git a/assets/sif/notes/Live_s1248.json b/assets/serverdata/notes/Live_s1248.json similarity index 100% rename from assets/sif/notes/Live_s1248.json rename to assets/serverdata/notes/Live_s1248.json diff --git a/assets/sif/notes/Live_s1249.json b/assets/serverdata/notes/Live_s1249.json similarity index 100% rename from assets/sif/notes/Live_s1249.json rename to assets/serverdata/notes/Live_s1249.json diff --git a/assets/sif/notes/Live_s1250.json b/assets/serverdata/notes/Live_s1250.json similarity index 100% rename from assets/sif/notes/Live_s1250.json rename to assets/serverdata/notes/Live_s1250.json diff --git a/assets/sif/notes/Live_s1251.json b/assets/serverdata/notes/Live_s1251.json similarity index 100% rename from assets/sif/notes/Live_s1251.json rename to assets/serverdata/notes/Live_s1251.json diff --git a/assets/sif/notes/Live_s1252.json b/assets/serverdata/notes/Live_s1252.json similarity index 100% rename from assets/sif/notes/Live_s1252.json rename to assets/serverdata/notes/Live_s1252.json diff --git a/assets/sif/notes/Live_s1253.json b/assets/serverdata/notes/Live_s1253.json similarity index 100% rename from assets/sif/notes/Live_s1253.json rename to assets/serverdata/notes/Live_s1253.json diff --git a/assets/sif/notes/Live_s1254.json b/assets/serverdata/notes/Live_s1254.json similarity index 100% rename from assets/sif/notes/Live_s1254.json rename to assets/serverdata/notes/Live_s1254.json diff --git a/assets/sif/notes/Live_s1255.json b/assets/serverdata/notes/Live_s1255.json similarity index 100% rename from assets/sif/notes/Live_s1255.json rename to assets/serverdata/notes/Live_s1255.json diff --git a/assets/sif/notes/Live_s1256.json b/assets/serverdata/notes/Live_s1256.json similarity index 100% rename from assets/sif/notes/Live_s1256.json rename to assets/serverdata/notes/Live_s1256.json diff --git a/assets/sif/notes/Live_s1257.json b/assets/serverdata/notes/Live_s1257.json similarity index 100% rename from assets/sif/notes/Live_s1257.json rename to assets/serverdata/notes/Live_s1257.json diff --git a/assets/sif/notes/Live_s1258.json b/assets/serverdata/notes/Live_s1258.json similarity index 100% rename from assets/sif/notes/Live_s1258.json rename to assets/serverdata/notes/Live_s1258.json diff --git a/assets/sif/notes/Live_s1259.json b/assets/serverdata/notes/Live_s1259.json similarity index 100% rename from assets/sif/notes/Live_s1259.json rename to assets/serverdata/notes/Live_s1259.json diff --git a/assets/sif/notes/Live_s1260.json b/assets/serverdata/notes/Live_s1260.json similarity index 100% rename from assets/sif/notes/Live_s1260.json rename to assets/serverdata/notes/Live_s1260.json diff --git a/assets/sif/notes/Live_s1261.json b/assets/serverdata/notes/Live_s1261.json similarity index 100% rename from assets/sif/notes/Live_s1261.json rename to assets/serverdata/notes/Live_s1261.json diff --git a/assets/sif/notes/Live_s1262.json b/assets/serverdata/notes/Live_s1262.json similarity index 100% rename from assets/sif/notes/Live_s1262.json rename to assets/serverdata/notes/Live_s1262.json diff --git a/assets/sif/notes/Live_s1263.json b/assets/serverdata/notes/Live_s1263.json similarity index 100% rename from assets/sif/notes/Live_s1263.json rename to assets/serverdata/notes/Live_s1263.json diff --git a/assets/sif/notes/Live_s1264.json b/assets/serverdata/notes/Live_s1264.json similarity index 100% rename from assets/sif/notes/Live_s1264.json rename to assets/serverdata/notes/Live_s1264.json diff --git a/assets/sif/notes/Live_s1265.json b/assets/serverdata/notes/Live_s1265.json similarity index 100% rename from assets/sif/notes/Live_s1265.json rename to assets/serverdata/notes/Live_s1265.json diff --git a/assets/sif/notes/Live_s1266.json b/assets/serverdata/notes/Live_s1266.json similarity index 100% rename from assets/sif/notes/Live_s1266.json rename to assets/serverdata/notes/Live_s1266.json diff --git a/assets/sif/notes/Live_s1267.json b/assets/serverdata/notes/Live_s1267.json similarity index 100% rename from assets/sif/notes/Live_s1267.json rename to assets/serverdata/notes/Live_s1267.json diff --git a/assets/sif/notes/Live_s1268.json b/assets/serverdata/notes/Live_s1268.json similarity index 100% rename from assets/sif/notes/Live_s1268.json rename to assets/serverdata/notes/Live_s1268.json diff --git a/assets/sif/notes/Live_s1269.json b/assets/serverdata/notes/Live_s1269.json similarity index 100% rename from assets/sif/notes/Live_s1269.json rename to assets/serverdata/notes/Live_s1269.json diff --git a/assets/sif/notes/Live_s1270.json b/assets/serverdata/notes/Live_s1270.json similarity index 100% rename from assets/sif/notes/Live_s1270.json rename to assets/serverdata/notes/Live_s1270.json diff --git a/assets/sif/notes/Live_s1271.json b/assets/serverdata/notes/Live_s1271.json similarity index 100% rename from assets/sif/notes/Live_s1271.json rename to assets/serverdata/notes/Live_s1271.json diff --git a/assets/sif/notes/Live_s1272.json b/assets/serverdata/notes/Live_s1272.json similarity index 100% rename from assets/sif/notes/Live_s1272.json rename to assets/serverdata/notes/Live_s1272.json diff --git a/assets/sif/notes/Live_s1273.json b/assets/serverdata/notes/Live_s1273.json similarity index 100% rename from assets/sif/notes/Live_s1273.json rename to assets/serverdata/notes/Live_s1273.json diff --git a/assets/sif/notes/Live_s1274.json b/assets/serverdata/notes/Live_s1274.json similarity index 100% rename from assets/sif/notes/Live_s1274.json rename to assets/serverdata/notes/Live_s1274.json diff --git a/assets/sif/notes/Live_s1275.json b/assets/serverdata/notes/Live_s1275.json similarity index 100% rename from assets/sif/notes/Live_s1275.json rename to assets/serverdata/notes/Live_s1275.json diff --git a/assets/sif/notes/Live_s1276.json b/assets/serverdata/notes/Live_s1276.json similarity index 100% rename from assets/sif/notes/Live_s1276.json rename to assets/serverdata/notes/Live_s1276.json diff --git a/assets/sif/notes/Live_s1277.json b/assets/serverdata/notes/Live_s1277.json similarity index 100% rename from assets/sif/notes/Live_s1277.json rename to assets/serverdata/notes/Live_s1277.json diff --git a/assets/sif/notes/Live_s1278.json b/assets/serverdata/notes/Live_s1278.json similarity index 100% rename from assets/sif/notes/Live_s1278.json rename to assets/serverdata/notes/Live_s1278.json diff --git a/assets/sif/notes/Live_s1279.json b/assets/serverdata/notes/Live_s1279.json similarity index 100% rename from assets/sif/notes/Live_s1279.json rename to assets/serverdata/notes/Live_s1279.json diff --git a/assets/sif/notes/Live_s1280.json b/assets/serverdata/notes/Live_s1280.json similarity index 100% rename from assets/sif/notes/Live_s1280.json rename to assets/serverdata/notes/Live_s1280.json diff --git a/assets/sif/notes/Live_s1281.json b/assets/serverdata/notes/Live_s1281.json similarity index 100% rename from assets/sif/notes/Live_s1281.json rename to assets/serverdata/notes/Live_s1281.json diff --git a/assets/sif/notes/Live_s1282.json b/assets/serverdata/notes/Live_s1282.json similarity index 100% rename from assets/sif/notes/Live_s1282.json rename to assets/serverdata/notes/Live_s1282.json diff --git a/assets/sif/notes/Live_s1283.json b/assets/serverdata/notes/Live_s1283.json similarity index 100% rename from assets/sif/notes/Live_s1283.json rename to assets/serverdata/notes/Live_s1283.json diff --git a/assets/sif/notes/Live_s1284.json b/assets/serverdata/notes/Live_s1284.json similarity index 100% rename from assets/sif/notes/Live_s1284.json rename to assets/serverdata/notes/Live_s1284.json diff --git a/assets/sif/notes/Live_s1285.json b/assets/serverdata/notes/Live_s1285.json similarity index 100% rename from assets/sif/notes/Live_s1285.json rename to assets/serverdata/notes/Live_s1285.json diff --git a/assets/sif/notes/Live_s1286.json b/assets/serverdata/notes/Live_s1286.json similarity index 100% rename from assets/sif/notes/Live_s1286.json rename to assets/serverdata/notes/Live_s1286.json diff --git a/assets/sif/notes/Live_s1287.json b/assets/serverdata/notes/Live_s1287.json similarity index 100% rename from assets/sif/notes/Live_s1287.json rename to assets/serverdata/notes/Live_s1287.json diff --git a/assets/sif/notes/Live_s1288.json b/assets/serverdata/notes/Live_s1288.json similarity index 100% rename from assets/sif/notes/Live_s1288.json rename to assets/serverdata/notes/Live_s1288.json diff --git a/assets/sif/notes/Live_s1289.json b/assets/serverdata/notes/Live_s1289.json similarity index 100% rename from assets/sif/notes/Live_s1289.json rename to assets/serverdata/notes/Live_s1289.json diff --git a/assets/sif/notes/Live_s1290.json b/assets/serverdata/notes/Live_s1290.json similarity index 100% rename from assets/sif/notes/Live_s1290.json rename to assets/serverdata/notes/Live_s1290.json diff --git a/assets/sif/notes/Live_s1291.json b/assets/serverdata/notes/Live_s1291.json similarity index 100% rename from assets/sif/notes/Live_s1291.json rename to assets/serverdata/notes/Live_s1291.json diff --git a/assets/sif/notes/Live_s1292.json b/assets/serverdata/notes/Live_s1292.json similarity index 100% rename from assets/sif/notes/Live_s1292.json rename to assets/serverdata/notes/Live_s1292.json diff --git a/assets/sif/notes/Live_s1293.json b/assets/serverdata/notes/Live_s1293.json similarity index 100% rename from assets/sif/notes/Live_s1293.json rename to assets/serverdata/notes/Live_s1293.json diff --git a/assets/sif/notes/Live_s1294.json b/assets/serverdata/notes/Live_s1294.json similarity index 100% rename from assets/sif/notes/Live_s1294.json rename to assets/serverdata/notes/Live_s1294.json diff --git a/assets/sif/notes/Live_s1295.json b/assets/serverdata/notes/Live_s1295.json similarity index 100% rename from assets/sif/notes/Live_s1295.json rename to assets/serverdata/notes/Live_s1295.json diff --git a/assets/sif/notes/Live_s1296.json b/assets/serverdata/notes/Live_s1296.json similarity index 100% rename from assets/sif/notes/Live_s1296.json rename to assets/serverdata/notes/Live_s1296.json diff --git a/assets/sif/notes/Live_s1297.json b/assets/serverdata/notes/Live_s1297.json similarity index 100% rename from assets/sif/notes/Live_s1297.json rename to assets/serverdata/notes/Live_s1297.json diff --git a/assets/sif/notes/Live_s1298.json b/assets/serverdata/notes/Live_s1298.json similarity index 100% rename from assets/sif/notes/Live_s1298.json rename to assets/serverdata/notes/Live_s1298.json diff --git a/assets/sif/notes/Live_s1299.json b/assets/serverdata/notes/Live_s1299.json similarity index 100% rename from assets/sif/notes/Live_s1299.json rename to assets/serverdata/notes/Live_s1299.json diff --git a/assets/sif/notes/Live_s1300.json b/assets/serverdata/notes/Live_s1300.json similarity index 100% rename from assets/sif/notes/Live_s1300.json rename to assets/serverdata/notes/Live_s1300.json diff --git a/assets/sif/notes/Live_s1301.json b/assets/serverdata/notes/Live_s1301.json similarity index 100% rename from assets/sif/notes/Live_s1301.json rename to assets/serverdata/notes/Live_s1301.json diff --git a/assets/sif/notes/Live_s1302.json b/assets/serverdata/notes/Live_s1302.json similarity index 100% rename from assets/sif/notes/Live_s1302.json rename to assets/serverdata/notes/Live_s1302.json diff --git a/assets/sif/notes/Live_s1303.json b/assets/serverdata/notes/Live_s1303.json similarity index 100% rename from assets/sif/notes/Live_s1303.json rename to assets/serverdata/notes/Live_s1303.json diff --git a/assets/sif/notes/Live_s1304.json b/assets/serverdata/notes/Live_s1304.json similarity index 100% rename from assets/sif/notes/Live_s1304.json rename to assets/serverdata/notes/Live_s1304.json diff --git a/assets/sif/notes/Live_s1305.json b/assets/serverdata/notes/Live_s1305.json similarity index 100% rename from assets/sif/notes/Live_s1305.json rename to assets/serverdata/notes/Live_s1305.json diff --git a/assets/sif/notes/Live_s1306.json b/assets/serverdata/notes/Live_s1306.json similarity index 100% rename from assets/sif/notes/Live_s1306.json rename to assets/serverdata/notes/Live_s1306.json diff --git a/assets/sif/notes/Live_s1307.json b/assets/serverdata/notes/Live_s1307.json similarity index 100% rename from assets/sif/notes/Live_s1307.json rename to assets/serverdata/notes/Live_s1307.json diff --git a/assets/sif/notes/Live_s1308.json b/assets/serverdata/notes/Live_s1308.json similarity index 100% rename from assets/sif/notes/Live_s1308.json rename to assets/serverdata/notes/Live_s1308.json diff --git a/assets/sif/notes/Live_s1309.json b/assets/serverdata/notes/Live_s1309.json similarity index 100% rename from assets/sif/notes/Live_s1309.json rename to assets/serverdata/notes/Live_s1309.json diff --git a/assets/sif/notes/Live_s1310.json b/assets/serverdata/notes/Live_s1310.json similarity index 100% rename from assets/sif/notes/Live_s1310.json rename to assets/serverdata/notes/Live_s1310.json diff --git a/assets/sif/notes/Live_s1311.json b/assets/serverdata/notes/Live_s1311.json similarity index 100% rename from assets/sif/notes/Live_s1311.json rename to assets/serverdata/notes/Live_s1311.json diff --git a/assets/sif/notes/Live_s1312.json b/assets/serverdata/notes/Live_s1312.json similarity index 100% rename from assets/sif/notes/Live_s1312.json rename to assets/serverdata/notes/Live_s1312.json diff --git a/assets/sif/notes/Live_s1313.json b/assets/serverdata/notes/Live_s1313.json similarity index 100% rename from assets/sif/notes/Live_s1313.json rename to assets/serverdata/notes/Live_s1313.json diff --git a/assets/sif/notes/Live_s1314.json b/assets/serverdata/notes/Live_s1314.json similarity index 100% rename from assets/sif/notes/Live_s1314.json rename to assets/serverdata/notes/Live_s1314.json diff --git a/assets/sif/notes/Live_s1315.json b/assets/serverdata/notes/Live_s1315.json similarity index 100% rename from assets/sif/notes/Live_s1315.json rename to assets/serverdata/notes/Live_s1315.json diff --git a/assets/sif/notes/Live_s1316.json b/assets/serverdata/notes/Live_s1316.json similarity index 100% rename from assets/sif/notes/Live_s1316.json rename to assets/serverdata/notes/Live_s1316.json diff --git a/assets/sif/notes/Live_s1317.json b/assets/serverdata/notes/Live_s1317.json similarity index 100% rename from assets/sif/notes/Live_s1317.json rename to assets/serverdata/notes/Live_s1317.json diff --git a/assets/sif/notes/Live_s1318.json b/assets/serverdata/notes/Live_s1318.json similarity index 100% rename from assets/sif/notes/Live_s1318.json rename to assets/serverdata/notes/Live_s1318.json diff --git a/assets/sif/notes/Live_s1319.json b/assets/serverdata/notes/Live_s1319.json similarity index 100% rename from assets/sif/notes/Live_s1319.json rename to assets/serverdata/notes/Live_s1319.json diff --git a/assets/sif/notes/Live_s1320.json b/assets/serverdata/notes/Live_s1320.json similarity index 100% rename from assets/sif/notes/Live_s1320.json rename to assets/serverdata/notes/Live_s1320.json diff --git a/assets/sif/notes/Live_s1321.json b/assets/serverdata/notes/Live_s1321.json similarity index 100% rename from assets/sif/notes/Live_s1321.json rename to assets/serverdata/notes/Live_s1321.json diff --git a/assets/sif/notes/Live_s1322.json b/assets/serverdata/notes/Live_s1322.json similarity index 100% rename from assets/sif/notes/Live_s1322.json rename to assets/serverdata/notes/Live_s1322.json diff --git a/assets/sif/notes/Live_s1323.json b/assets/serverdata/notes/Live_s1323.json similarity index 100% rename from assets/sif/notes/Live_s1323.json rename to assets/serverdata/notes/Live_s1323.json diff --git a/assets/sif/notes/Live_s1324.json b/assets/serverdata/notes/Live_s1324.json similarity index 100% rename from assets/sif/notes/Live_s1324.json rename to assets/serverdata/notes/Live_s1324.json diff --git a/assets/sif/notes/Live_s1325.json b/assets/serverdata/notes/Live_s1325.json similarity index 100% rename from assets/sif/notes/Live_s1325.json rename to assets/serverdata/notes/Live_s1325.json diff --git a/assets/sif/notes/Live_s1326.json b/assets/serverdata/notes/Live_s1326.json similarity index 100% rename from assets/sif/notes/Live_s1326.json rename to assets/serverdata/notes/Live_s1326.json diff --git a/assets/sif/notes/Live_s1327.json b/assets/serverdata/notes/Live_s1327.json similarity index 100% rename from assets/sif/notes/Live_s1327.json rename to assets/serverdata/notes/Live_s1327.json diff --git a/assets/sif/notes/Live_s1328.json b/assets/serverdata/notes/Live_s1328.json similarity index 100% rename from assets/sif/notes/Live_s1328.json rename to assets/serverdata/notes/Live_s1328.json diff --git a/assets/sif/notes/Live_s1329.json b/assets/serverdata/notes/Live_s1329.json similarity index 100% rename from assets/sif/notes/Live_s1329.json rename to assets/serverdata/notes/Live_s1329.json diff --git a/assets/sif/notes/Live_s1330.json b/assets/serverdata/notes/Live_s1330.json similarity index 100% rename from assets/sif/notes/Live_s1330.json rename to assets/serverdata/notes/Live_s1330.json diff --git a/assets/sif/notes/Live_s1331.json b/assets/serverdata/notes/Live_s1331.json similarity index 100% rename from assets/sif/notes/Live_s1331.json rename to assets/serverdata/notes/Live_s1331.json diff --git a/assets/sif/notes/Live_s1332.json b/assets/serverdata/notes/Live_s1332.json similarity index 100% rename from assets/sif/notes/Live_s1332.json rename to assets/serverdata/notes/Live_s1332.json diff --git a/assets/sif/notes/Live_s1333.json b/assets/serverdata/notes/Live_s1333.json similarity index 100% rename from assets/sif/notes/Live_s1333.json rename to assets/serverdata/notes/Live_s1333.json diff --git a/assets/sif/notes/Live_s1334.json b/assets/serverdata/notes/Live_s1334.json similarity index 100% rename from assets/sif/notes/Live_s1334.json rename to assets/serverdata/notes/Live_s1334.json diff --git a/assets/sif/notes/Live_s1335.json b/assets/serverdata/notes/Live_s1335.json similarity index 100% rename from assets/sif/notes/Live_s1335.json rename to assets/serverdata/notes/Live_s1335.json diff --git a/assets/sif/notes/Live_s1336.json b/assets/serverdata/notes/Live_s1336.json similarity index 100% rename from assets/sif/notes/Live_s1336.json rename to assets/serverdata/notes/Live_s1336.json diff --git a/assets/sif/notes/Live_s1337.json b/assets/serverdata/notes/Live_s1337.json similarity index 100% rename from assets/sif/notes/Live_s1337.json rename to assets/serverdata/notes/Live_s1337.json diff --git a/assets/sif/notes/Live_s1338.json b/assets/serverdata/notes/Live_s1338.json similarity index 100% rename from assets/sif/notes/Live_s1338.json rename to assets/serverdata/notes/Live_s1338.json diff --git a/assets/sif/notes/Live_s1339.json b/assets/serverdata/notes/Live_s1339.json similarity index 100% rename from assets/sif/notes/Live_s1339.json rename to assets/serverdata/notes/Live_s1339.json diff --git a/assets/sif/notes/Live_s1340.json b/assets/serverdata/notes/Live_s1340.json similarity index 100% rename from assets/sif/notes/Live_s1340.json rename to assets/serverdata/notes/Live_s1340.json diff --git a/assets/sif/notes/Live_s1341.json b/assets/serverdata/notes/Live_s1341.json similarity index 100% rename from assets/sif/notes/Live_s1341.json rename to assets/serverdata/notes/Live_s1341.json diff --git a/assets/sif/notes/Live_s1342.json b/assets/serverdata/notes/Live_s1342.json similarity index 100% rename from assets/sif/notes/Live_s1342.json rename to assets/serverdata/notes/Live_s1342.json diff --git a/assets/sif/notes/Live_s1343.json b/assets/serverdata/notes/Live_s1343.json similarity index 100% rename from assets/sif/notes/Live_s1343.json rename to assets/serverdata/notes/Live_s1343.json diff --git a/assets/sif/notes/Live_s1344.json b/assets/serverdata/notes/Live_s1344.json similarity index 100% rename from assets/sif/notes/Live_s1344.json rename to assets/serverdata/notes/Live_s1344.json diff --git a/assets/sif/notes/Live_s1345.json b/assets/serverdata/notes/Live_s1345.json similarity index 100% rename from assets/sif/notes/Live_s1345.json rename to assets/serverdata/notes/Live_s1345.json diff --git a/assets/sif/notes/Live_s1346.json b/assets/serverdata/notes/Live_s1346.json similarity index 100% rename from assets/sif/notes/Live_s1346.json rename to assets/serverdata/notes/Live_s1346.json diff --git a/assets/sif/notes/Live_s1347.json b/assets/serverdata/notes/Live_s1347.json similarity index 100% rename from assets/sif/notes/Live_s1347.json rename to assets/serverdata/notes/Live_s1347.json diff --git a/assets/sif/notes/Live_s1348.json b/assets/serverdata/notes/Live_s1348.json similarity index 100% rename from assets/sif/notes/Live_s1348.json rename to assets/serverdata/notes/Live_s1348.json diff --git a/assets/sif/notes/Live_s1349.json b/assets/serverdata/notes/Live_s1349.json similarity index 100% rename from assets/sif/notes/Live_s1349.json rename to assets/serverdata/notes/Live_s1349.json diff --git a/assets/sif/notes/Live_s1350.json b/assets/serverdata/notes/Live_s1350.json similarity index 100% rename from assets/sif/notes/Live_s1350.json rename to assets/serverdata/notes/Live_s1350.json diff --git a/assets/sif/notes/Live_s1351.json b/assets/serverdata/notes/Live_s1351.json similarity index 100% rename from assets/sif/notes/Live_s1351.json rename to assets/serverdata/notes/Live_s1351.json diff --git a/assets/sif/notes/Live_s1352.json b/assets/serverdata/notes/Live_s1352.json similarity index 100% rename from assets/sif/notes/Live_s1352.json rename to assets/serverdata/notes/Live_s1352.json diff --git a/assets/sif/notes/Live_s1353.json b/assets/serverdata/notes/Live_s1353.json similarity index 100% rename from assets/sif/notes/Live_s1353.json rename to assets/serverdata/notes/Live_s1353.json diff --git a/assets/sif/notes/Live_s1354.json b/assets/serverdata/notes/Live_s1354.json similarity index 100% rename from assets/sif/notes/Live_s1354.json rename to assets/serverdata/notes/Live_s1354.json diff --git a/assets/sif/notes/Live_s1355.json b/assets/serverdata/notes/Live_s1355.json similarity index 100% rename from assets/sif/notes/Live_s1355.json rename to assets/serverdata/notes/Live_s1355.json diff --git a/assets/sif/notes/Live_s1356.json b/assets/serverdata/notes/Live_s1356.json similarity index 100% rename from assets/sif/notes/Live_s1356.json rename to assets/serverdata/notes/Live_s1356.json diff --git a/assets/sif/notes/Live_s1357.json b/assets/serverdata/notes/Live_s1357.json similarity index 100% rename from assets/sif/notes/Live_s1357.json rename to assets/serverdata/notes/Live_s1357.json diff --git a/assets/sif/notes/Live_s1358.json b/assets/serverdata/notes/Live_s1358.json similarity index 100% rename from assets/sif/notes/Live_s1358.json rename to assets/serverdata/notes/Live_s1358.json diff --git a/assets/sif/notes/Live_s1359.json b/assets/serverdata/notes/Live_s1359.json similarity index 100% rename from assets/sif/notes/Live_s1359.json rename to assets/serverdata/notes/Live_s1359.json diff --git a/assets/sif/notes/Live_s1360.json b/assets/serverdata/notes/Live_s1360.json similarity index 100% rename from assets/sif/notes/Live_s1360.json rename to assets/serverdata/notes/Live_s1360.json diff --git a/assets/sif/notes/Live_s1361.json b/assets/serverdata/notes/Live_s1361.json similarity index 100% rename from assets/sif/notes/Live_s1361.json rename to assets/serverdata/notes/Live_s1361.json diff --git a/assets/sif/notes/Live_s1362.json b/assets/serverdata/notes/Live_s1362.json similarity index 100% rename from assets/sif/notes/Live_s1362.json rename to assets/serverdata/notes/Live_s1362.json diff --git a/assets/sif/notes/Live_s1363.json b/assets/serverdata/notes/Live_s1363.json similarity index 100% rename from assets/sif/notes/Live_s1363.json rename to assets/serverdata/notes/Live_s1363.json diff --git a/assets/sif/notes/Live_s1364.json b/assets/serverdata/notes/Live_s1364.json similarity index 100% rename from assets/sif/notes/Live_s1364.json rename to assets/serverdata/notes/Live_s1364.json diff --git a/assets/sif/notes/Live_s1365.json b/assets/serverdata/notes/Live_s1365.json similarity index 100% rename from assets/sif/notes/Live_s1365.json rename to assets/serverdata/notes/Live_s1365.json diff --git a/assets/sif/notes/Live_s1366.json b/assets/serverdata/notes/Live_s1366.json similarity index 100% rename from assets/sif/notes/Live_s1366.json rename to assets/serverdata/notes/Live_s1366.json diff --git a/assets/sif/notes/Live_s1367.json b/assets/serverdata/notes/Live_s1367.json similarity index 100% rename from assets/sif/notes/Live_s1367.json rename to assets/serverdata/notes/Live_s1367.json diff --git a/assets/sif/notes/Live_s1368.json b/assets/serverdata/notes/Live_s1368.json similarity index 100% rename from assets/sif/notes/Live_s1368.json rename to assets/serverdata/notes/Live_s1368.json diff --git a/assets/sif/notes/Live_s1369.json b/assets/serverdata/notes/Live_s1369.json similarity index 100% rename from assets/sif/notes/Live_s1369.json rename to assets/serverdata/notes/Live_s1369.json diff --git a/assets/sif/notes/Live_s1370.json b/assets/serverdata/notes/Live_s1370.json similarity index 100% rename from assets/sif/notes/Live_s1370.json rename to assets/serverdata/notes/Live_s1370.json diff --git a/assets/sif/notes/Live_s1371.json b/assets/serverdata/notes/Live_s1371.json similarity index 100% rename from assets/sif/notes/Live_s1371.json rename to assets/serverdata/notes/Live_s1371.json diff --git a/assets/sif/notes/Live_s1372.json b/assets/serverdata/notes/Live_s1372.json similarity index 100% rename from assets/sif/notes/Live_s1372.json rename to assets/serverdata/notes/Live_s1372.json diff --git a/assets/sif/notes/Live_s1373.json b/assets/serverdata/notes/Live_s1373.json similarity index 100% rename from assets/sif/notes/Live_s1373.json rename to assets/serverdata/notes/Live_s1373.json diff --git a/assets/sif/notes/Live_s1374.json b/assets/serverdata/notes/Live_s1374.json similarity index 100% rename from assets/sif/notes/Live_s1374.json rename to assets/serverdata/notes/Live_s1374.json diff --git a/assets/sif/notes/Live_s1375.json b/assets/serverdata/notes/Live_s1375.json similarity index 100% rename from assets/sif/notes/Live_s1375.json rename to assets/serverdata/notes/Live_s1375.json diff --git a/assets/sif/notes/Live_s1376.json b/assets/serverdata/notes/Live_s1376.json similarity index 100% rename from assets/sif/notes/Live_s1376.json rename to assets/serverdata/notes/Live_s1376.json diff --git a/assets/sif/notes/Live_s1377.json b/assets/serverdata/notes/Live_s1377.json similarity index 100% rename from assets/sif/notes/Live_s1377.json rename to assets/serverdata/notes/Live_s1377.json diff --git a/assets/sif/notes/Live_s1378.json b/assets/serverdata/notes/Live_s1378.json similarity index 100% rename from assets/sif/notes/Live_s1378.json rename to assets/serverdata/notes/Live_s1378.json diff --git a/assets/sif/notes/Live_s1379.json b/assets/serverdata/notes/Live_s1379.json similarity index 100% rename from assets/sif/notes/Live_s1379.json rename to assets/serverdata/notes/Live_s1379.json diff --git a/assets/sif/notes/Live_s1380.json b/assets/serverdata/notes/Live_s1380.json similarity index 100% rename from assets/sif/notes/Live_s1380.json rename to assets/serverdata/notes/Live_s1380.json diff --git a/assets/sif/notes/Live_s1381.json b/assets/serverdata/notes/Live_s1381.json similarity index 100% rename from assets/sif/notes/Live_s1381.json rename to assets/serverdata/notes/Live_s1381.json diff --git a/assets/sif/notes/Live_s1382.json b/assets/serverdata/notes/Live_s1382.json similarity index 100% rename from assets/sif/notes/Live_s1382.json rename to assets/serverdata/notes/Live_s1382.json diff --git a/assets/sif/notes/Live_s1383.json b/assets/serverdata/notes/Live_s1383.json similarity index 100% rename from assets/sif/notes/Live_s1383.json rename to assets/serverdata/notes/Live_s1383.json diff --git a/assets/sif/notes/Live_s1384.json b/assets/serverdata/notes/Live_s1384.json similarity index 100% rename from assets/sif/notes/Live_s1384.json rename to assets/serverdata/notes/Live_s1384.json diff --git a/assets/sif/notes/Live_s1385.json b/assets/serverdata/notes/Live_s1385.json similarity index 100% rename from assets/sif/notes/Live_s1385.json rename to assets/serverdata/notes/Live_s1385.json diff --git a/assets/sif/notes/Live_s1386.json b/assets/serverdata/notes/Live_s1386.json similarity index 100% rename from assets/sif/notes/Live_s1386.json rename to assets/serverdata/notes/Live_s1386.json diff --git a/assets/sif/notes/Live_s1387.json b/assets/serverdata/notes/Live_s1387.json similarity index 100% rename from assets/sif/notes/Live_s1387.json rename to assets/serverdata/notes/Live_s1387.json diff --git a/assets/sif/notes/Live_s1388.json b/assets/serverdata/notes/Live_s1388.json similarity index 100% rename from assets/sif/notes/Live_s1388.json rename to assets/serverdata/notes/Live_s1388.json diff --git a/assets/sif/notes/Live_s1389.json b/assets/serverdata/notes/Live_s1389.json similarity index 100% rename from assets/sif/notes/Live_s1389.json rename to assets/serverdata/notes/Live_s1389.json diff --git a/assets/sif/notes/Live_s1390.json b/assets/serverdata/notes/Live_s1390.json similarity index 100% rename from assets/sif/notes/Live_s1390.json rename to assets/serverdata/notes/Live_s1390.json diff --git a/assets/sif/notes/Live_s1391.json b/assets/serverdata/notes/Live_s1391.json similarity index 100% rename from assets/sif/notes/Live_s1391.json rename to assets/serverdata/notes/Live_s1391.json diff --git a/assets/sif/notes/Live_s1392.json b/assets/serverdata/notes/Live_s1392.json similarity index 100% rename from assets/sif/notes/Live_s1392.json rename to assets/serverdata/notes/Live_s1392.json diff --git a/assets/sif/notes/Live_s1393.json b/assets/serverdata/notes/Live_s1393.json similarity index 100% rename from assets/sif/notes/Live_s1393.json rename to assets/serverdata/notes/Live_s1393.json diff --git a/assets/sif/notes/Live_s1394.json b/assets/serverdata/notes/Live_s1394.json similarity index 100% rename from assets/sif/notes/Live_s1394.json rename to assets/serverdata/notes/Live_s1394.json diff --git a/assets/sif/notes/Live_s1395.json b/assets/serverdata/notes/Live_s1395.json similarity index 100% rename from assets/sif/notes/Live_s1395.json rename to assets/serverdata/notes/Live_s1395.json diff --git a/assets/sif/notes/Live_s1396.json b/assets/serverdata/notes/Live_s1396.json similarity index 100% rename from assets/sif/notes/Live_s1396.json rename to assets/serverdata/notes/Live_s1396.json diff --git a/assets/sif/notes/Live_s1397.json b/assets/serverdata/notes/Live_s1397.json similarity index 100% rename from assets/sif/notes/Live_s1397.json rename to assets/serverdata/notes/Live_s1397.json diff --git a/assets/sif/notes/Live_s1398.json b/assets/serverdata/notes/Live_s1398.json similarity index 100% rename from assets/sif/notes/Live_s1398.json rename to assets/serverdata/notes/Live_s1398.json diff --git a/assets/sif/notes/Live_s1399.json b/assets/serverdata/notes/Live_s1399.json similarity index 100% rename from assets/sif/notes/Live_s1399.json rename to assets/serverdata/notes/Live_s1399.json diff --git a/assets/sif/notes/Live_s1400.json b/assets/serverdata/notes/Live_s1400.json similarity index 100% rename from assets/sif/notes/Live_s1400.json rename to assets/serverdata/notes/Live_s1400.json diff --git a/assets/sif/notes/Live_s1401.json b/assets/serverdata/notes/Live_s1401.json similarity index 100% rename from assets/sif/notes/Live_s1401.json rename to assets/serverdata/notes/Live_s1401.json diff --git a/assets/sif/notes/Live_s1402.json b/assets/serverdata/notes/Live_s1402.json similarity index 100% rename from assets/sif/notes/Live_s1402.json rename to assets/serverdata/notes/Live_s1402.json diff --git a/assets/sif/notes/Live_s1403.json b/assets/serverdata/notes/Live_s1403.json similarity index 100% rename from assets/sif/notes/Live_s1403.json rename to assets/serverdata/notes/Live_s1403.json diff --git a/assets/sif/notes/Live_s1404.json b/assets/serverdata/notes/Live_s1404.json similarity index 100% rename from assets/sif/notes/Live_s1404.json rename to assets/serverdata/notes/Live_s1404.json diff --git a/assets/sif/notes/Live_s1405.json b/assets/serverdata/notes/Live_s1405.json similarity index 100% rename from assets/sif/notes/Live_s1405.json rename to assets/serverdata/notes/Live_s1405.json diff --git a/assets/sif/notes/Live_s1406.json b/assets/serverdata/notes/Live_s1406.json similarity index 100% rename from assets/sif/notes/Live_s1406.json rename to assets/serverdata/notes/Live_s1406.json diff --git a/assets/sif/notes/Live_s1407.json b/assets/serverdata/notes/Live_s1407.json similarity index 100% rename from assets/sif/notes/Live_s1407.json rename to assets/serverdata/notes/Live_s1407.json diff --git a/assets/sif/notes/Live_s1408.json b/assets/serverdata/notes/Live_s1408.json similarity index 100% rename from assets/sif/notes/Live_s1408.json rename to assets/serverdata/notes/Live_s1408.json diff --git a/assets/sif/notes/Live_s1409.json b/assets/serverdata/notes/Live_s1409.json similarity index 100% rename from assets/sif/notes/Live_s1409.json rename to assets/serverdata/notes/Live_s1409.json diff --git a/assets/sif/notes/Live_s1410.json b/assets/serverdata/notes/Live_s1410.json similarity index 100% rename from assets/sif/notes/Live_s1410.json rename to assets/serverdata/notes/Live_s1410.json diff --git a/assets/sif/notes/Live_s1411.json b/assets/serverdata/notes/Live_s1411.json similarity index 100% rename from assets/sif/notes/Live_s1411.json rename to assets/serverdata/notes/Live_s1411.json diff --git a/assets/sif/notes/Live_s1412.json b/assets/serverdata/notes/Live_s1412.json similarity index 100% rename from assets/sif/notes/Live_s1412.json rename to assets/serverdata/notes/Live_s1412.json diff --git a/assets/sif/notes/Live_s1413.json b/assets/serverdata/notes/Live_s1413.json similarity index 100% rename from assets/sif/notes/Live_s1413.json rename to assets/serverdata/notes/Live_s1413.json diff --git a/assets/sif/notes/Live_s1414.json b/assets/serverdata/notes/Live_s1414.json similarity index 100% rename from assets/sif/notes/Live_s1414.json rename to assets/serverdata/notes/Live_s1414.json diff --git a/assets/sif/notes/Live_s1415.json b/assets/serverdata/notes/Live_s1415.json similarity index 100% rename from assets/sif/notes/Live_s1415.json rename to assets/serverdata/notes/Live_s1415.json diff --git a/assets/sif/notes/Live_s1416.json b/assets/serverdata/notes/Live_s1416.json similarity index 100% rename from assets/sif/notes/Live_s1416.json rename to assets/serverdata/notes/Live_s1416.json diff --git a/assets/sif/notes/Live_s1417.json b/assets/serverdata/notes/Live_s1417.json similarity index 100% rename from assets/sif/notes/Live_s1417.json rename to assets/serverdata/notes/Live_s1417.json diff --git a/assets/sif/notes/Live_s1418.json b/assets/serverdata/notes/Live_s1418.json similarity index 100% rename from assets/sif/notes/Live_s1418.json rename to assets/serverdata/notes/Live_s1418.json diff --git a/assets/sif/notes/Live_s1419.json b/assets/serverdata/notes/Live_s1419.json similarity index 100% rename from assets/sif/notes/Live_s1419.json rename to assets/serverdata/notes/Live_s1419.json diff --git a/assets/sif/notes/Live_s1420.json b/assets/serverdata/notes/Live_s1420.json similarity index 100% rename from assets/sif/notes/Live_s1420.json rename to assets/serverdata/notes/Live_s1420.json diff --git a/assets/sif/notes/Live_s1421.json b/assets/serverdata/notes/Live_s1421.json similarity index 100% rename from assets/sif/notes/Live_s1421.json rename to assets/serverdata/notes/Live_s1421.json diff --git a/assets/sif/notes/Live_s1422.json b/assets/serverdata/notes/Live_s1422.json similarity index 100% rename from assets/sif/notes/Live_s1422.json rename to assets/serverdata/notes/Live_s1422.json diff --git a/assets/sif/notes/Live_s1423.json b/assets/serverdata/notes/Live_s1423.json similarity index 100% rename from assets/sif/notes/Live_s1423.json rename to assets/serverdata/notes/Live_s1423.json diff --git a/assets/sif/notes/Live_s1424.json b/assets/serverdata/notes/Live_s1424.json similarity index 100% rename from assets/sif/notes/Live_s1424.json rename to assets/serverdata/notes/Live_s1424.json diff --git a/assets/sif/notes/Live_s1425.json b/assets/serverdata/notes/Live_s1425.json similarity index 100% rename from assets/sif/notes/Live_s1425.json rename to assets/serverdata/notes/Live_s1425.json diff --git a/assets/sif/notes/Live_s1426.json b/assets/serverdata/notes/Live_s1426.json similarity index 100% rename from assets/sif/notes/Live_s1426.json rename to assets/serverdata/notes/Live_s1426.json diff --git a/assets/sif/notes/Live_s1427.json b/assets/serverdata/notes/Live_s1427.json similarity index 100% rename from assets/sif/notes/Live_s1427.json rename to assets/serverdata/notes/Live_s1427.json diff --git a/assets/sif/notes/Live_s1428.json b/assets/serverdata/notes/Live_s1428.json similarity index 100% rename from assets/sif/notes/Live_s1428.json rename to assets/serverdata/notes/Live_s1428.json diff --git a/assets/sif/notes/Live_s1429.json b/assets/serverdata/notes/Live_s1429.json similarity index 100% rename from assets/sif/notes/Live_s1429.json rename to assets/serverdata/notes/Live_s1429.json diff --git a/assets/sif/notes/Live_s1430.json b/assets/serverdata/notes/Live_s1430.json similarity index 100% rename from assets/sif/notes/Live_s1430.json rename to assets/serverdata/notes/Live_s1430.json diff --git a/assets/sif/notes/Live_s1431.json b/assets/serverdata/notes/Live_s1431.json similarity index 100% rename from assets/sif/notes/Live_s1431.json rename to assets/serverdata/notes/Live_s1431.json diff --git a/assets/sif/notes/Live_s1432.json b/assets/serverdata/notes/Live_s1432.json similarity index 100% rename from assets/sif/notes/Live_s1432.json rename to assets/serverdata/notes/Live_s1432.json diff --git a/assets/sif/notes/Live_s1433.json b/assets/serverdata/notes/Live_s1433.json similarity index 100% rename from assets/sif/notes/Live_s1433.json rename to assets/serverdata/notes/Live_s1433.json diff --git a/assets/sif/notes/Live_s1434.json b/assets/serverdata/notes/Live_s1434.json similarity index 100% rename from assets/sif/notes/Live_s1434.json rename to assets/serverdata/notes/Live_s1434.json diff --git a/assets/sif/notes/Live_s1435.json b/assets/serverdata/notes/Live_s1435.json similarity index 100% rename from assets/sif/notes/Live_s1435.json rename to assets/serverdata/notes/Live_s1435.json diff --git a/assets/sif/notes/Live_s1436.json b/assets/serverdata/notes/Live_s1436.json similarity index 100% rename from assets/sif/notes/Live_s1436.json rename to assets/serverdata/notes/Live_s1436.json diff --git a/assets/sif/notes/Live_s1437.json b/assets/serverdata/notes/Live_s1437.json similarity index 100% rename from assets/sif/notes/Live_s1437.json rename to assets/serverdata/notes/Live_s1437.json diff --git a/assets/sif/notes/Live_s1438.json b/assets/serverdata/notes/Live_s1438.json similarity index 100% rename from assets/sif/notes/Live_s1438.json rename to assets/serverdata/notes/Live_s1438.json diff --git a/assets/sif/notes/Live_s1439.json b/assets/serverdata/notes/Live_s1439.json similarity index 100% rename from assets/sif/notes/Live_s1439.json rename to assets/serverdata/notes/Live_s1439.json diff --git a/assets/sif/notes/Live_s1440.json b/assets/serverdata/notes/Live_s1440.json similarity index 100% rename from assets/sif/notes/Live_s1440.json rename to assets/serverdata/notes/Live_s1440.json diff --git a/assets/sif/notes/Live_s1441.json b/assets/serverdata/notes/Live_s1441.json similarity index 100% rename from assets/sif/notes/Live_s1441.json rename to assets/serverdata/notes/Live_s1441.json diff --git a/assets/sif/notes/Live_s1442.json b/assets/serverdata/notes/Live_s1442.json similarity index 100% rename from assets/sif/notes/Live_s1442.json rename to assets/serverdata/notes/Live_s1442.json diff --git a/assets/sif/notes/Live_s1443.json b/assets/serverdata/notes/Live_s1443.json similarity index 100% rename from assets/sif/notes/Live_s1443.json rename to assets/serverdata/notes/Live_s1443.json diff --git a/assets/sif/notes/Live_s1444.json b/assets/serverdata/notes/Live_s1444.json similarity index 100% rename from assets/sif/notes/Live_s1444.json rename to assets/serverdata/notes/Live_s1444.json diff --git a/assets/sif/notes/Live_s1445.json b/assets/serverdata/notes/Live_s1445.json similarity index 100% rename from assets/sif/notes/Live_s1445.json rename to assets/serverdata/notes/Live_s1445.json diff --git a/assets/sif/notes/Live_s1446.json b/assets/serverdata/notes/Live_s1446.json similarity index 100% rename from assets/sif/notes/Live_s1446.json rename to assets/serverdata/notes/Live_s1446.json diff --git a/assets/sif/notes/Live_s1447.json b/assets/serverdata/notes/Live_s1447.json similarity index 100% rename from assets/sif/notes/Live_s1447.json rename to assets/serverdata/notes/Live_s1447.json diff --git a/assets/sif/notes/Live_s1448.json b/assets/serverdata/notes/Live_s1448.json similarity index 100% rename from assets/sif/notes/Live_s1448.json rename to assets/serverdata/notes/Live_s1448.json diff --git a/assets/sif/notes/Live_s1449.json b/assets/serverdata/notes/Live_s1449.json similarity index 100% rename from assets/sif/notes/Live_s1449.json rename to assets/serverdata/notes/Live_s1449.json diff --git a/assets/sif/notes/Live_s1450.json b/assets/serverdata/notes/Live_s1450.json similarity index 100% rename from assets/sif/notes/Live_s1450.json rename to assets/serverdata/notes/Live_s1450.json diff --git a/assets/sif/notes/Live_s1451.json b/assets/serverdata/notes/Live_s1451.json similarity index 100% rename from assets/sif/notes/Live_s1451.json rename to assets/serverdata/notes/Live_s1451.json diff --git a/assets/sif/notes/Live_s1452.json b/assets/serverdata/notes/Live_s1452.json similarity index 100% rename from assets/sif/notes/Live_s1452.json rename to assets/serverdata/notes/Live_s1452.json diff --git a/assets/sif/notes/Live_s1453.json b/assets/serverdata/notes/Live_s1453.json similarity index 100% rename from assets/sif/notes/Live_s1453.json rename to assets/serverdata/notes/Live_s1453.json diff --git a/assets/sif/notes/Live_s1454.json b/assets/serverdata/notes/Live_s1454.json similarity index 100% rename from assets/sif/notes/Live_s1454.json rename to assets/serverdata/notes/Live_s1454.json diff --git a/assets/sif/notes/Live_s1455.json b/assets/serverdata/notes/Live_s1455.json similarity index 100% rename from assets/sif/notes/Live_s1455.json rename to assets/serverdata/notes/Live_s1455.json diff --git a/assets/sif/notes/Live_s1456.json b/assets/serverdata/notes/Live_s1456.json similarity index 100% rename from assets/sif/notes/Live_s1456.json rename to assets/serverdata/notes/Live_s1456.json diff --git a/assets/sif/notes/Live_s1457.json b/assets/serverdata/notes/Live_s1457.json similarity index 100% rename from assets/sif/notes/Live_s1457.json rename to assets/serverdata/notes/Live_s1457.json diff --git a/assets/sif/notes/Live_s1458.json b/assets/serverdata/notes/Live_s1458.json similarity index 100% rename from assets/sif/notes/Live_s1458.json rename to assets/serverdata/notes/Live_s1458.json diff --git a/assets/sif/notes/Live_s1459.json b/assets/serverdata/notes/Live_s1459.json similarity index 100% rename from assets/sif/notes/Live_s1459.json rename to assets/serverdata/notes/Live_s1459.json diff --git a/assets/sif/notes/Live_s1460.json b/assets/serverdata/notes/Live_s1460.json similarity index 100% rename from assets/sif/notes/Live_s1460.json rename to assets/serverdata/notes/Live_s1460.json diff --git a/assets/sif/notes/Live_s1461.json b/assets/serverdata/notes/Live_s1461.json similarity index 100% rename from assets/sif/notes/Live_s1461.json rename to assets/serverdata/notes/Live_s1461.json diff --git a/assets/sif/notes/Live_s1462.json b/assets/serverdata/notes/Live_s1462.json similarity index 100% rename from assets/sif/notes/Live_s1462.json rename to assets/serverdata/notes/Live_s1462.json diff --git a/assets/sif/notes/Live_s1463.json b/assets/serverdata/notes/Live_s1463.json similarity index 100% rename from assets/sif/notes/Live_s1463.json rename to assets/serverdata/notes/Live_s1463.json diff --git a/assets/sif/notes/Live_s1464.json b/assets/serverdata/notes/Live_s1464.json similarity index 100% rename from assets/sif/notes/Live_s1464.json rename to assets/serverdata/notes/Live_s1464.json diff --git a/assets/sif/notes/Live_s1465.json b/assets/serverdata/notes/Live_s1465.json similarity index 100% rename from assets/sif/notes/Live_s1465.json rename to assets/serverdata/notes/Live_s1465.json diff --git a/assets/sif/notes/Live_s1466.json b/assets/serverdata/notes/Live_s1466.json similarity index 100% rename from assets/sif/notes/Live_s1466.json rename to assets/serverdata/notes/Live_s1466.json diff --git a/assets/sif/notes/Live_s1467.json b/assets/serverdata/notes/Live_s1467.json similarity index 100% rename from assets/sif/notes/Live_s1467.json rename to assets/serverdata/notes/Live_s1467.json diff --git a/assets/sif/notes/Live_s1468.json b/assets/serverdata/notes/Live_s1468.json similarity index 100% rename from assets/sif/notes/Live_s1468.json rename to assets/serverdata/notes/Live_s1468.json diff --git a/assets/sif/notes/Live_s1469.json b/assets/serverdata/notes/Live_s1469.json similarity index 100% rename from assets/sif/notes/Live_s1469.json rename to assets/serverdata/notes/Live_s1469.json diff --git a/assets/sif/notes/Live_s1470.json b/assets/serverdata/notes/Live_s1470.json similarity index 100% rename from assets/sif/notes/Live_s1470.json rename to assets/serverdata/notes/Live_s1470.json diff --git a/assets/sif/notes/Live_s1471.json b/assets/serverdata/notes/Live_s1471.json similarity index 100% rename from assets/sif/notes/Live_s1471.json rename to assets/serverdata/notes/Live_s1471.json diff --git a/assets/sif/notes/Live_s1472.json b/assets/serverdata/notes/Live_s1472.json similarity index 100% rename from assets/sif/notes/Live_s1472.json rename to assets/serverdata/notes/Live_s1472.json diff --git a/assets/sif/notes/Live_s1473.json b/assets/serverdata/notes/Live_s1473.json similarity index 100% rename from assets/sif/notes/Live_s1473.json rename to assets/serverdata/notes/Live_s1473.json diff --git a/assets/sif/notes/Live_s1474.json b/assets/serverdata/notes/Live_s1474.json similarity index 100% rename from assets/sif/notes/Live_s1474.json rename to assets/serverdata/notes/Live_s1474.json diff --git a/assets/sif/notes/Live_s1475.json b/assets/serverdata/notes/Live_s1475.json similarity index 100% rename from assets/sif/notes/Live_s1475.json rename to assets/serverdata/notes/Live_s1475.json diff --git a/assets/sif/notes/Live_s1476.json b/assets/serverdata/notes/Live_s1476.json similarity index 100% rename from assets/sif/notes/Live_s1476.json rename to assets/serverdata/notes/Live_s1476.json diff --git a/assets/sif/notes/Live_s1477.json b/assets/serverdata/notes/Live_s1477.json similarity index 100% rename from assets/sif/notes/Live_s1477.json rename to assets/serverdata/notes/Live_s1477.json diff --git a/assets/sif/notes/Live_s1478.json b/assets/serverdata/notes/Live_s1478.json similarity index 100% rename from assets/sif/notes/Live_s1478.json rename to assets/serverdata/notes/Live_s1478.json diff --git a/assets/sif/notes/Live_s1479.json b/assets/serverdata/notes/Live_s1479.json similarity index 100% rename from assets/sif/notes/Live_s1479.json rename to assets/serverdata/notes/Live_s1479.json diff --git a/assets/sif/notes/Live_s1480.json b/assets/serverdata/notes/Live_s1480.json similarity index 100% rename from assets/sif/notes/Live_s1480.json rename to assets/serverdata/notes/Live_s1480.json diff --git a/assets/sif/notes/Live_s1481.json b/assets/serverdata/notes/Live_s1481.json similarity index 100% rename from assets/sif/notes/Live_s1481.json rename to assets/serverdata/notes/Live_s1481.json diff --git a/assets/sif/notes/Live_s1482.json b/assets/serverdata/notes/Live_s1482.json similarity index 100% rename from assets/sif/notes/Live_s1482.json rename to assets/serverdata/notes/Live_s1482.json diff --git a/assets/sif/notes/Live_s1483.json b/assets/serverdata/notes/Live_s1483.json similarity index 100% rename from assets/sif/notes/Live_s1483.json rename to assets/serverdata/notes/Live_s1483.json diff --git a/assets/sif/notes/Live_s1484.json b/assets/serverdata/notes/Live_s1484.json similarity index 100% rename from assets/sif/notes/Live_s1484.json rename to assets/serverdata/notes/Live_s1484.json diff --git a/assets/sif/notes/Live_s1485.json b/assets/serverdata/notes/Live_s1485.json similarity index 100% rename from assets/sif/notes/Live_s1485.json rename to assets/serverdata/notes/Live_s1485.json diff --git a/assets/sif/notes/Live_s1486.json b/assets/serverdata/notes/Live_s1486.json similarity index 100% rename from assets/sif/notes/Live_s1486.json rename to assets/serverdata/notes/Live_s1486.json diff --git a/assets/sif/notes/Live_s1487.json b/assets/serverdata/notes/Live_s1487.json similarity index 100% rename from assets/sif/notes/Live_s1487.json rename to assets/serverdata/notes/Live_s1487.json diff --git a/assets/sif/notes/Live_s1488.json b/assets/serverdata/notes/Live_s1488.json similarity index 100% rename from assets/sif/notes/Live_s1488.json rename to assets/serverdata/notes/Live_s1488.json diff --git a/assets/sif/notes/Live_s1489.json b/assets/serverdata/notes/Live_s1489.json similarity index 100% rename from assets/sif/notes/Live_s1489.json rename to assets/serverdata/notes/Live_s1489.json diff --git a/assets/sif/notes/Live_s1490.json b/assets/serverdata/notes/Live_s1490.json similarity index 100% rename from assets/sif/notes/Live_s1490.json rename to assets/serverdata/notes/Live_s1490.json diff --git a/assets/sif/notes/Live_s1491.json b/assets/serverdata/notes/Live_s1491.json similarity index 100% rename from assets/sif/notes/Live_s1491.json rename to assets/serverdata/notes/Live_s1491.json diff --git a/assets/sif/notes/Live_s1492.json b/assets/serverdata/notes/Live_s1492.json similarity index 100% rename from assets/sif/notes/Live_s1492.json rename to assets/serverdata/notes/Live_s1492.json diff --git a/assets/sif/notes/Live_s1493.json b/assets/serverdata/notes/Live_s1493.json similarity index 100% rename from assets/sif/notes/Live_s1493.json rename to assets/serverdata/notes/Live_s1493.json diff --git a/assets/sif/notes/Live_s1494.json b/assets/serverdata/notes/Live_s1494.json similarity index 100% rename from assets/sif/notes/Live_s1494.json rename to assets/serverdata/notes/Live_s1494.json diff --git a/assets/sif/notes/Live_s1495.json b/assets/serverdata/notes/Live_s1495.json similarity index 100% rename from assets/sif/notes/Live_s1495.json rename to assets/serverdata/notes/Live_s1495.json diff --git a/assets/sif/notes/Live_s1496.json b/assets/serverdata/notes/Live_s1496.json similarity index 100% rename from assets/sif/notes/Live_s1496.json rename to assets/serverdata/notes/Live_s1496.json diff --git a/assets/sif/notes/Live_s1497.json b/assets/serverdata/notes/Live_s1497.json similarity index 100% rename from assets/sif/notes/Live_s1497.json rename to assets/serverdata/notes/Live_s1497.json diff --git a/assets/sif/notes/Live_s1498.json b/assets/serverdata/notes/Live_s1498.json similarity index 100% rename from assets/sif/notes/Live_s1498.json rename to assets/serverdata/notes/Live_s1498.json diff --git a/assets/sif/notes/Live_s1499.json b/assets/serverdata/notes/Live_s1499.json similarity index 100% rename from assets/sif/notes/Live_s1499.json rename to assets/serverdata/notes/Live_s1499.json diff --git a/assets/sif/notes/Live_s1500.json b/assets/serverdata/notes/Live_s1500.json similarity index 100% rename from assets/sif/notes/Live_s1500.json rename to assets/serverdata/notes/Live_s1500.json diff --git a/assets/sif/notes/Live_s1501.json b/assets/serverdata/notes/Live_s1501.json similarity index 100% rename from assets/sif/notes/Live_s1501.json rename to assets/serverdata/notes/Live_s1501.json diff --git a/assets/sif/notes/Live_s1502.json b/assets/serverdata/notes/Live_s1502.json similarity index 100% rename from assets/sif/notes/Live_s1502.json rename to assets/serverdata/notes/Live_s1502.json diff --git a/assets/sif/notes/Live_s1503.json b/assets/serverdata/notes/Live_s1503.json similarity index 100% rename from assets/sif/notes/Live_s1503.json rename to assets/serverdata/notes/Live_s1503.json diff --git a/assets/sif/notes/Live_s1504.json b/assets/serverdata/notes/Live_s1504.json similarity index 100% rename from assets/sif/notes/Live_s1504.json rename to assets/serverdata/notes/Live_s1504.json diff --git a/assets/sif/notes/Live_s1505.json b/assets/serverdata/notes/Live_s1505.json similarity index 100% rename from assets/sif/notes/Live_s1505.json rename to assets/serverdata/notes/Live_s1505.json diff --git a/assets/sif/notes/Live_s1506.json b/assets/serverdata/notes/Live_s1506.json similarity index 100% rename from assets/sif/notes/Live_s1506.json rename to assets/serverdata/notes/Live_s1506.json diff --git a/assets/sif/notes/Live_s1507.json b/assets/serverdata/notes/Live_s1507.json similarity index 100% rename from assets/sif/notes/Live_s1507.json rename to assets/serverdata/notes/Live_s1507.json diff --git a/assets/sif/notes/Live_s1508.json b/assets/serverdata/notes/Live_s1508.json similarity index 100% rename from assets/sif/notes/Live_s1508.json rename to assets/serverdata/notes/Live_s1508.json diff --git a/assets/sif/notes/Live_s1509.json b/assets/serverdata/notes/Live_s1509.json similarity index 100% rename from assets/sif/notes/Live_s1509.json rename to assets/serverdata/notes/Live_s1509.json diff --git a/assets/sif/notes/Live_s1510.json b/assets/serverdata/notes/Live_s1510.json similarity index 100% rename from assets/sif/notes/Live_s1510.json rename to assets/serverdata/notes/Live_s1510.json diff --git a/assets/sif/notes/Live_s1511.json b/assets/serverdata/notes/Live_s1511.json similarity index 100% rename from assets/sif/notes/Live_s1511.json rename to assets/serverdata/notes/Live_s1511.json diff --git a/assets/sif/notes/Live_s1512.json b/assets/serverdata/notes/Live_s1512.json similarity index 100% rename from assets/sif/notes/Live_s1512.json rename to assets/serverdata/notes/Live_s1512.json diff --git a/assets/sif/notes/Live_s1513.json b/assets/serverdata/notes/Live_s1513.json similarity index 100% rename from assets/sif/notes/Live_s1513.json rename to assets/serverdata/notes/Live_s1513.json diff --git a/assets/sif/notes/Live_s1514.json b/assets/serverdata/notes/Live_s1514.json similarity index 100% rename from assets/sif/notes/Live_s1514.json rename to assets/serverdata/notes/Live_s1514.json diff --git a/assets/sif/notes/Live_s1515.json b/assets/serverdata/notes/Live_s1515.json similarity index 100% rename from assets/sif/notes/Live_s1515.json rename to assets/serverdata/notes/Live_s1515.json diff --git a/assets/sif/notes/Live_s1516.json b/assets/serverdata/notes/Live_s1516.json similarity index 100% rename from assets/sif/notes/Live_s1516.json rename to assets/serverdata/notes/Live_s1516.json diff --git a/assets/sif/notes/Live_s1517.json b/assets/serverdata/notes/Live_s1517.json similarity index 100% rename from assets/sif/notes/Live_s1517.json rename to assets/serverdata/notes/Live_s1517.json diff --git a/assets/sif/notes/Live_s1518.json b/assets/serverdata/notes/Live_s1518.json similarity index 100% rename from assets/sif/notes/Live_s1518.json rename to assets/serverdata/notes/Live_s1518.json diff --git a/assets/sif/notes/Live_s1519.json b/assets/serverdata/notes/Live_s1519.json similarity index 100% rename from assets/sif/notes/Live_s1519.json rename to assets/serverdata/notes/Live_s1519.json diff --git a/assets/sif/notes/Live_s1520.json b/assets/serverdata/notes/Live_s1520.json similarity index 100% rename from assets/sif/notes/Live_s1520.json rename to assets/serverdata/notes/Live_s1520.json diff --git a/assets/sif/notes/Live_s1521.json b/assets/serverdata/notes/Live_s1521.json similarity index 100% rename from assets/sif/notes/Live_s1521.json rename to assets/serverdata/notes/Live_s1521.json diff --git a/assets/sif/notes/Live_s1522.json b/assets/serverdata/notes/Live_s1522.json similarity index 100% rename from assets/sif/notes/Live_s1522.json rename to assets/serverdata/notes/Live_s1522.json diff --git a/assets/sif/notes/Live_s1523.json b/assets/serverdata/notes/Live_s1523.json similarity index 100% rename from assets/sif/notes/Live_s1523.json rename to assets/serverdata/notes/Live_s1523.json diff --git a/assets/sif/notes/Live_s1524.json b/assets/serverdata/notes/Live_s1524.json similarity index 100% rename from assets/sif/notes/Live_s1524.json rename to assets/serverdata/notes/Live_s1524.json diff --git a/assets/sif/notes/Live_s1525.json b/assets/serverdata/notes/Live_s1525.json similarity index 100% rename from assets/sif/notes/Live_s1525.json rename to assets/serverdata/notes/Live_s1525.json diff --git a/assets/sif/notes/Live_s1526.json b/assets/serverdata/notes/Live_s1526.json similarity index 100% rename from assets/sif/notes/Live_s1526.json rename to assets/serverdata/notes/Live_s1526.json diff --git a/assets/sif/notes/Live_s1527.json b/assets/serverdata/notes/Live_s1527.json similarity index 100% rename from assets/sif/notes/Live_s1527.json rename to assets/serverdata/notes/Live_s1527.json diff --git a/assets/sif/notes/Live_s1528.json b/assets/serverdata/notes/Live_s1528.json similarity index 100% rename from assets/sif/notes/Live_s1528.json rename to assets/serverdata/notes/Live_s1528.json diff --git a/assets/sif/notes/Live_s1529.json b/assets/serverdata/notes/Live_s1529.json similarity index 100% rename from assets/sif/notes/Live_s1529.json rename to assets/serverdata/notes/Live_s1529.json diff --git a/assets/sif/notes/Live_s1530.json b/assets/serverdata/notes/Live_s1530.json similarity index 100% rename from assets/sif/notes/Live_s1530.json rename to assets/serverdata/notes/Live_s1530.json diff --git a/assets/sif/notes/Live_s1531.json b/assets/serverdata/notes/Live_s1531.json similarity index 100% rename from assets/sif/notes/Live_s1531.json rename to assets/serverdata/notes/Live_s1531.json diff --git a/assets/sif/notes/Live_s1532.json b/assets/serverdata/notes/Live_s1532.json similarity index 100% rename from assets/sif/notes/Live_s1532.json rename to assets/serverdata/notes/Live_s1532.json diff --git a/assets/sif/notes/Live_s1533.json b/assets/serverdata/notes/Live_s1533.json similarity index 100% rename from assets/sif/notes/Live_s1533.json rename to assets/serverdata/notes/Live_s1533.json diff --git a/assets/sif/notes/Live_s1534.json b/assets/serverdata/notes/Live_s1534.json similarity index 100% rename from assets/sif/notes/Live_s1534.json rename to assets/serverdata/notes/Live_s1534.json diff --git a/assets/sif/notes/Live_s1535.json b/assets/serverdata/notes/Live_s1535.json similarity index 100% rename from assets/sif/notes/Live_s1535.json rename to assets/serverdata/notes/Live_s1535.json diff --git a/assets/sif/notes/Live_s1536.json b/assets/serverdata/notes/Live_s1536.json similarity index 100% rename from assets/sif/notes/Live_s1536.json rename to assets/serverdata/notes/Live_s1536.json diff --git a/assets/sif/notes/Live_s1537.json b/assets/serverdata/notes/Live_s1537.json similarity index 100% rename from assets/sif/notes/Live_s1537.json rename to assets/serverdata/notes/Live_s1537.json diff --git a/assets/sif/notes/Live_s1538.json b/assets/serverdata/notes/Live_s1538.json similarity index 100% rename from assets/sif/notes/Live_s1538.json rename to assets/serverdata/notes/Live_s1538.json diff --git a/assets/sif/notes/Live_s1539.json b/assets/serverdata/notes/Live_s1539.json similarity index 100% rename from assets/sif/notes/Live_s1539.json rename to assets/serverdata/notes/Live_s1539.json diff --git a/assets/sif/notes/Live_s1540.json b/assets/serverdata/notes/Live_s1540.json similarity index 100% rename from assets/sif/notes/Live_s1540.json rename to assets/serverdata/notes/Live_s1540.json diff --git a/assets/sif/notes/Live_s1541.json b/assets/serverdata/notes/Live_s1541.json similarity index 100% rename from assets/sif/notes/Live_s1541.json rename to assets/serverdata/notes/Live_s1541.json diff --git a/assets/sif/notes/Live_s1542.json b/assets/serverdata/notes/Live_s1542.json similarity index 100% rename from assets/sif/notes/Live_s1542.json rename to assets/serverdata/notes/Live_s1542.json diff --git a/assets/sif/notes/Live_s1543.json b/assets/serverdata/notes/Live_s1543.json similarity index 100% rename from assets/sif/notes/Live_s1543.json rename to assets/serverdata/notes/Live_s1543.json diff --git a/assets/sif/notes/Live_s1544.json b/assets/serverdata/notes/Live_s1544.json similarity index 100% rename from assets/sif/notes/Live_s1544.json rename to assets/serverdata/notes/Live_s1544.json diff --git a/assets/sif/notes/Live_s1545.json b/assets/serverdata/notes/Live_s1545.json similarity index 100% rename from assets/sif/notes/Live_s1545.json rename to assets/serverdata/notes/Live_s1545.json diff --git a/assets/sif/notes/Live_s1546.json b/assets/serverdata/notes/Live_s1546.json similarity index 100% rename from assets/sif/notes/Live_s1546.json rename to assets/serverdata/notes/Live_s1546.json diff --git a/assets/sif/notes/Live_s1547.json b/assets/serverdata/notes/Live_s1547.json similarity index 100% rename from assets/sif/notes/Live_s1547.json rename to assets/serverdata/notes/Live_s1547.json diff --git a/assets/sif/notes/Live_s1548.json b/assets/serverdata/notes/Live_s1548.json similarity index 100% rename from assets/sif/notes/Live_s1548.json rename to assets/serverdata/notes/Live_s1548.json diff --git a/assets/sif/notes/Live_s1549.json b/assets/serverdata/notes/Live_s1549.json similarity index 100% rename from assets/sif/notes/Live_s1549.json rename to assets/serverdata/notes/Live_s1549.json diff --git a/assets/sif/notes/Live_s1550.json b/assets/serverdata/notes/Live_s1550.json similarity index 100% rename from assets/sif/notes/Live_s1550.json rename to assets/serverdata/notes/Live_s1550.json diff --git a/assets/sif/notes/Live_s1551.json b/assets/serverdata/notes/Live_s1551.json similarity index 100% rename from assets/sif/notes/Live_s1551.json rename to assets/serverdata/notes/Live_s1551.json diff --git a/assets/sif/notes/Live_s1552.json b/assets/serverdata/notes/Live_s1552.json similarity index 100% rename from assets/sif/notes/Live_s1552.json rename to assets/serverdata/notes/Live_s1552.json diff --git a/assets/sif/notes/Live_s1553.json b/assets/serverdata/notes/Live_s1553.json similarity index 100% rename from assets/sif/notes/Live_s1553.json rename to assets/serverdata/notes/Live_s1553.json diff --git a/assets/sif/notes/Live_s1554.json b/assets/serverdata/notes/Live_s1554.json similarity index 100% rename from assets/sif/notes/Live_s1554.json rename to assets/serverdata/notes/Live_s1554.json diff --git a/assets/sif/notes/Live_s1555.json b/assets/serverdata/notes/Live_s1555.json similarity index 100% rename from assets/sif/notes/Live_s1555.json rename to assets/serverdata/notes/Live_s1555.json diff --git a/assets/sif/notes/Live_s1556.json b/assets/serverdata/notes/Live_s1556.json similarity index 100% rename from assets/sif/notes/Live_s1556.json rename to assets/serverdata/notes/Live_s1556.json diff --git a/assets/sif/notes/Live_s1557.json b/assets/serverdata/notes/Live_s1557.json similarity index 100% rename from assets/sif/notes/Live_s1557.json rename to assets/serverdata/notes/Live_s1557.json diff --git a/assets/sif/notes/Live_s1558.json b/assets/serverdata/notes/Live_s1558.json similarity index 100% rename from assets/sif/notes/Live_s1558.json rename to assets/serverdata/notes/Live_s1558.json diff --git a/assets/sif/notes/Live_s1559.json b/assets/serverdata/notes/Live_s1559.json similarity index 100% rename from assets/sif/notes/Live_s1559.json rename to assets/serverdata/notes/Live_s1559.json diff --git a/assets/sif/notes/Live_s1560.json b/assets/serverdata/notes/Live_s1560.json similarity index 100% rename from assets/sif/notes/Live_s1560.json rename to assets/serverdata/notes/Live_s1560.json diff --git a/assets/sif/notes/Live_s1561.json b/assets/serverdata/notes/Live_s1561.json similarity index 100% rename from assets/sif/notes/Live_s1561.json rename to assets/serverdata/notes/Live_s1561.json diff --git a/assets/sif/notes/Live_s1562.json b/assets/serverdata/notes/Live_s1562.json similarity index 100% rename from assets/sif/notes/Live_s1562.json rename to assets/serverdata/notes/Live_s1562.json diff --git a/assets/sif/notes/Live_s1563.json b/assets/serverdata/notes/Live_s1563.json similarity index 100% rename from assets/sif/notes/Live_s1563.json rename to assets/serverdata/notes/Live_s1563.json diff --git a/assets/sif/notes/Live_s1564.json b/assets/serverdata/notes/Live_s1564.json similarity index 100% rename from assets/sif/notes/Live_s1564.json rename to assets/serverdata/notes/Live_s1564.json diff --git a/assets/sif/notes/Live_s1565.json b/assets/serverdata/notes/Live_s1565.json similarity index 100% rename from assets/sif/notes/Live_s1565.json rename to assets/serverdata/notes/Live_s1565.json diff --git a/assets/sif/notes/Live_s1566.json b/assets/serverdata/notes/Live_s1566.json similarity index 100% rename from assets/sif/notes/Live_s1566.json rename to assets/serverdata/notes/Live_s1566.json diff --git a/assets/sif/notes/Live_s1567.json b/assets/serverdata/notes/Live_s1567.json similarity index 100% rename from assets/sif/notes/Live_s1567.json rename to assets/serverdata/notes/Live_s1567.json diff --git a/assets/sif/notes/Live_s1568.json b/assets/serverdata/notes/Live_s1568.json similarity index 100% rename from assets/sif/notes/Live_s1568.json rename to assets/serverdata/notes/Live_s1568.json diff --git a/assets/sif/notes/Live_s1569.json b/assets/serverdata/notes/Live_s1569.json similarity index 100% rename from assets/sif/notes/Live_s1569.json rename to assets/serverdata/notes/Live_s1569.json diff --git a/assets/sif/notes/Live_s1570.json b/assets/serverdata/notes/Live_s1570.json similarity index 100% rename from assets/sif/notes/Live_s1570.json rename to assets/serverdata/notes/Live_s1570.json diff --git a/assets/sif/notes/Live_s1571.json b/assets/serverdata/notes/Live_s1571.json similarity index 100% rename from assets/sif/notes/Live_s1571.json rename to assets/serverdata/notes/Live_s1571.json diff --git a/assets/sif/notes/Live_s1572.json b/assets/serverdata/notes/Live_s1572.json similarity index 100% rename from assets/sif/notes/Live_s1572.json rename to assets/serverdata/notes/Live_s1572.json diff --git a/assets/sif/notes/Live_s1573.json b/assets/serverdata/notes/Live_s1573.json similarity index 100% rename from assets/sif/notes/Live_s1573.json rename to assets/serverdata/notes/Live_s1573.json diff --git a/assets/sif/notes/Live_s1574.json b/assets/serverdata/notes/Live_s1574.json similarity index 100% rename from assets/sif/notes/Live_s1574.json rename to assets/serverdata/notes/Live_s1574.json diff --git a/assets/sif/notes/Live_s1575.json b/assets/serverdata/notes/Live_s1575.json similarity index 100% rename from assets/sif/notes/Live_s1575.json rename to assets/serverdata/notes/Live_s1575.json diff --git a/assets/sif/notes/Live_s1576.json b/assets/serverdata/notes/Live_s1576.json similarity index 100% rename from assets/sif/notes/Live_s1576.json rename to assets/serverdata/notes/Live_s1576.json diff --git a/assets/sif/notes/Live_s1577.json b/assets/serverdata/notes/Live_s1577.json similarity index 100% rename from assets/sif/notes/Live_s1577.json rename to assets/serverdata/notes/Live_s1577.json diff --git a/assets/sif/notes/Live_s1578.json b/assets/serverdata/notes/Live_s1578.json similarity index 100% rename from assets/sif/notes/Live_s1578.json rename to assets/serverdata/notes/Live_s1578.json diff --git a/assets/sif/notes/Live_s1579.json b/assets/serverdata/notes/Live_s1579.json similarity index 100% rename from assets/sif/notes/Live_s1579.json rename to assets/serverdata/notes/Live_s1579.json diff --git a/assets/sif/notes/Live_s1580.json b/assets/serverdata/notes/Live_s1580.json similarity index 100% rename from assets/sif/notes/Live_s1580.json rename to assets/serverdata/notes/Live_s1580.json diff --git a/assets/sif/notes/Live_s1581.json b/assets/serverdata/notes/Live_s1581.json similarity index 100% rename from assets/sif/notes/Live_s1581.json rename to assets/serverdata/notes/Live_s1581.json diff --git a/assets/sif/notes/Live_s1582.json b/assets/serverdata/notes/Live_s1582.json similarity index 100% rename from assets/sif/notes/Live_s1582.json rename to assets/serverdata/notes/Live_s1582.json diff --git a/assets/sif/notes/Live_s1583.json b/assets/serverdata/notes/Live_s1583.json similarity index 100% rename from assets/sif/notes/Live_s1583.json rename to assets/serverdata/notes/Live_s1583.json diff --git a/assets/sif/notes/Live_s1584.json b/assets/serverdata/notes/Live_s1584.json similarity index 100% rename from assets/sif/notes/Live_s1584.json rename to assets/serverdata/notes/Live_s1584.json diff --git a/assets/sif/notes/Live_s1585.json b/assets/serverdata/notes/Live_s1585.json similarity index 100% rename from assets/sif/notes/Live_s1585.json rename to assets/serverdata/notes/Live_s1585.json diff --git a/assets/sif/notes/Live_s1586.json b/assets/serverdata/notes/Live_s1586.json similarity index 100% rename from assets/sif/notes/Live_s1586.json rename to assets/serverdata/notes/Live_s1586.json diff --git a/assets/sif/notes/Live_s1587.json b/assets/serverdata/notes/Live_s1587.json similarity index 100% rename from assets/sif/notes/Live_s1587.json rename to assets/serverdata/notes/Live_s1587.json diff --git a/assets/sif/notes/Live_s1588.json b/assets/serverdata/notes/Live_s1588.json similarity index 100% rename from assets/sif/notes/Live_s1588.json rename to assets/serverdata/notes/Live_s1588.json diff --git a/assets/sif/notes/Live_s1589.json b/assets/serverdata/notes/Live_s1589.json similarity index 100% rename from assets/sif/notes/Live_s1589.json rename to assets/serverdata/notes/Live_s1589.json diff --git a/assets/sif/notes/Live_s1590.json b/assets/serverdata/notes/Live_s1590.json similarity index 100% rename from assets/sif/notes/Live_s1590.json rename to assets/serverdata/notes/Live_s1590.json diff --git a/assets/sif/notes/Live_s1591.json b/assets/serverdata/notes/Live_s1591.json similarity index 100% rename from assets/sif/notes/Live_s1591.json rename to assets/serverdata/notes/Live_s1591.json diff --git a/assets/sif/notes/Live_s1592.json b/assets/serverdata/notes/Live_s1592.json similarity index 100% rename from assets/sif/notes/Live_s1592.json rename to assets/serverdata/notes/Live_s1592.json diff --git a/assets/sif/notes/Live_s1593.json b/assets/serverdata/notes/Live_s1593.json similarity index 100% rename from assets/sif/notes/Live_s1593.json rename to assets/serverdata/notes/Live_s1593.json diff --git a/assets/sif/notes/Live_s1594.json b/assets/serverdata/notes/Live_s1594.json similarity index 100% rename from assets/sif/notes/Live_s1594.json rename to assets/serverdata/notes/Live_s1594.json diff --git a/assets/sif/notes/Live_s1595.json b/assets/serverdata/notes/Live_s1595.json similarity index 100% rename from assets/sif/notes/Live_s1595.json rename to assets/serverdata/notes/Live_s1595.json diff --git a/assets/sif/notes/Live_s1596.json b/assets/serverdata/notes/Live_s1596.json similarity index 100% rename from assets/sif/notes/Live_s1596.json rename to assets/serverdata/notes/Live_s1596.json diff --git a/assets/sif/notes/Live_s1597.json b/assets/serverdata/notes/Live_s1597.json similarity index 100% rename from assets/sif/notes/Live_s1597.json rename to assets/serverdata/notes/Live_s1597.json diff --git a/assets/sif/notes/Live_s1598.json b/assets/serverdata/notes/Live_s1598.json similarity index 100% rename from assets/sif/notes/Live_s1598.json rename to assets/serverdata/notes/Live_s1598.json diff --git a/assets/sif/notes/Live_s1599.json b/assets/serverdata/notes/Live_s1599.json similarity index 100% rename from assets/sif/notes/Live_s1599.json rename to assets/serverdata/notes/Live_s1599.json diff --git a/assets/sif/notes/Live_s1600.json b/assets/serverdata/notes/Live_s1600.json similarity index 100% rename from assets/sif/notes/Live_s1600.json rename to assets/serverdata/notes/Live_s1600.json diff --git a/assets/sif/notes/Live_s1601.json b/assets/serverdata/notes/Live_s1601.json similarity index 100% rename from assets/sif/notes/Live_s1601.json rename to assets/serverdata/notes/Live_s1601.json diff --git a/assets/sif/notes/Live_s1602.json b/assets/serverdata/notes/Live_s1602.json similarity index 100% rename from assets/sif/notes/Live_s1602.json rename to assets/serverdata/notes/Live_s1602.json diff --git a/assets/sif/notes/Live_s1603.json b/assets/serverdata/notes/Live_s1603.json similarity index 100% rename from assets/sif/notes/Live_s1603.json rename to assets/serverdata/notes/Live_s1603.json diff --git a/assets/sif/notes/Live_s1604.json b/assets/serverdata/notes/Live_s1604.json similarity index 100% rename from assets/sif/notes/Live_s1604.json rename to assets/serverdata/notes/Live_s1604.json diff --git a/assets/sif/notes/Live_s1605.json b/assets/serverdata/notes/Live_s1605.json similarity index 100% rename from assets/sif/notes/Live_s1605.json rename to assets/serverdata/notes/Live_s1605.json diff --git a/assets/sif/notes/Live_s1606.json b/assets/serverdata/notes/Live_s1606.json similarity index 100% rename from assets/sif/notes/Live_s1606.json rename to assets/serverdata/notes/Live_s1606.json diff --git a/assets/sif/notes/Live_s1607.json b/assets/serverdata/notes/Live_s1607.json similarity index 100% rename from assets/sif/notes/Live_s1607.json rename to assets/serverdata/notes/Live_s1607.json diff --git a/assets/sif/notes/Live_s1608.json b/assets/serverdata/notes/Live_s1608.json similarity index 100% rename from assets/sif/notes/Live_s1608.json rename to assets/serverdata/notes/Live_s1608.json diff --git a/assets/sif/notes/Live_s1609.json b/assets/serverdata/notes/Live_s1609.json similarity index 100% rename from assets/sif/notes/Live_s1609.json rename to assets/serverdata/notes/Live_s1609.json diff --git a/assets/sif/notes/Live_s1610.json b/assets/serverdata/notes/Live_s1610.json similarity index 100% rename from assets/sif/notes/Live_s1610.json rename to assets/serverdata/notes/Live_s1610.json diff --git a/assets/sif/notes/Live_s1611.json b/assets/serverdata/notes/Live_s1611.json similarity index 100% rename from assets/sif/notes/Live_s1611.json rename to assets/serverdata/notes/Live_s1611.json diff --git a/assets/sif/notes/Live_s1613.json b/assets/serverdata/notes/Live_s1613.json similarity index 100% rename from assets/sif/notes/Live_s1613.json rename to assets/serverdata/notes/Live_s1613.json diff --git a/assets/sif/notes/Live_s1614.json b/assets/serverdata/notes/Live_s1614.json similarity index 100% rename from assets/sif/notes/Live_s1614.json rename to assets/serverdata/notes/Live_s1614.json diff --git a/assets/sif/notes/Live_s1615.json b/assets/serverdata/notes/Live_s1615.json similarity index 100% rename from assets/sif/notes/Live_s1615.json rename to assets/serverdata/notes/Live_s1615.json diff --git a/assets/sif/notes/Live_s1616.json b/assets/serverdata/notes/Live_s1616.json similarity index 100% rename from assets/sif/notes/Live_s1616.json rename to assets/serverdata/notes/Live_s1616.json diff --git a/assets/sif/notes/Live_s1617.json b/assets/serverdata/notes/Live_s1617.json similarity index 100% rename from assets/sif/notes/Live_s1617.json rename to assets/serverdata/notes/Live_s1617.json diff --git a/assets/sif/notes/Live_s1618.json b/assets/serverdata/notes/Live_s1618.json similarity index 100% rename from assets/sif/notes/Live_s1618.json rename to assets/serverdata/notes/Live_s1618.json diff --git a/assets/sif/notes/Live_s1619.json b/assets/serverdata/notes/Live_s1619.json similarity index 100% rename from assets/sif/notes/Live_s1619.json rename to assets/serverdata/notes/Live_s1619.json diff --git a/assets/sif/notes/Live_s1622.json b/assets/serverdata/notes/Live_s1622.json similarity index 100% rename from assets/sif/notes/Live_s1622.json rename to assets/serverdata/notes/Live_s1622.json diff --git a/assets/sif/notes/Live_s1623.json b/assets/serverdata/notes/Live_s1623.json similarity index 100% rename from assets/sif/notes/Live_s1623.json rename to assets/serverdata/notes/Live_s1623.json diff --git a/assets/sif/notes/Live_s1625.json b/assets/serverdata/notes/Live_s1625.json similarity index 100% rename from assets/sif/notes/Live_s1625.json rename to assets/serverdata/notes/Live_s1625.json diff --git a/assets/sif/notes/Live_s1626.json b/assets/serverdata/notes/Live_s1626.json similarity index 100% rename from assets/sif/notes/Live_s1626.json rename to assets/serverdata/notes/Live_s1626.json diff --git a/assets/sif/notes/Live_s1627.json b/assets/serverdata/notes/Live_s1627.json similarity index 100% rename from assets/sif/notes/Live_s1627.json rename to assets/serverdata/notes/Live_s1627.json diff --git a/assets/sif/notes/Live_s1630.json b/assets/serverdata/notes/Live_s1630.json similarity index 100% rename from assets/sif/notes/Live_s1630.json rename to assets/serverdata/notes/Live_s1630.json diff --git a/assets/sif/notes/Live_s1631.json b/assets/serverdata/notes/Live_s1631.json similarity index 100% rename from assets/sif/notes/Live_s1631.json rename to assets/serverdata/notes/Live_s1631.json diff --git a/assets/sif/notes/Live_s1632.json b/assets/serverdata/notes/Live_s1632.json similarity index 100% rename from assets/sif/notes/Live_s1632.json rename to assets/serverdata/notes/Live_s1632.json diff --git a/assets/sif/notes/Live_s1633.json b/assets/serverdata/notes/Live_s1633.json similarity index 100% rename from assets/sif/notes/Live_s1633.json rename to assets/serverdata/notes/Live_s1633.json diff --git a/assets/sif/notes/Live_s1634.json b/assets/serverdata/notes/Live_s1634.json similarity index 100% rename from assets/sif/notes/Live_s1634.json rename to assets/serverdata/notes/Live_s1634.json diff --git a/assets/sif/notes/Live_s1635.json b/assets/serverdata/notes/Live_s1635.json similarity index 100% rename from assets/sif/notes/Live_s1635.json rename to assets/serverdata/notes/Live_s1635.json diff --git a/assets/sif/notes/Live_s1636.json b/assets/serverdata/notes/Live_s1636.json similarity index 100% rename from assets/sif/notes/Live_s1636.json rename to assets/serverdata/notes/Live_s1636.json diff --git a/assets/sif/notes/Live_s1637.json b/assets/serverdata/notes/Live_s1637.json similarity index 100% rename from assets/sif/notes/Live_s1637.json rename to assets/serverdata/notes/Live_s1637.json diff --git a/assets/sif/notes/Live_s1638.json b/assets/serverdata/notes/Live_s1638.json similarity index 100% rename from assets/sif/notes/Live_s1638.json rename to assets/serverdata/notes/Live_s1638.json diff --git a/assets/sif/notes/Live_s1639.json b/assets/serverdata/notes/Live_s1639.json similarity index 100% rename from assets/sif/notes/Live_s1639.json rename to assets/serverdata/notes/Live_s1639.json diff --git a/assets/sif/notes/Live_s1640.json b/assets/serverdata/notes/Live_s1640.json similarity index 100% rename from assets/sif/notes/Live_s1640.json rename to assets/serverdata/notes/Live_s1640.json diff --git a/assets/sif/notes/Live_s1641.json b/assets/serverdata/notes/Live_s1641.json similarity index 100% rename from assets/sif/notes/Live_s1641.json rename to assets/serverdata/notes/Live_s1641.json diff --git a/assets/sif/notes/Live_s1642.json b/assets/serverdata/notes/Live_s1642.json similarity index 100% rename from assets/sif/notes/Live_s1642.json rename to assets/serverdata/notes/Live_s1642.json diff --git a/assets/sif/notes/Live_s1643.json b/assets/serverdata/notes/Live_s1643.json similarity index 100% rename from assets/sif/notes/Live_s1643.json rename to assets/serverdata/notes/Live_s1643.json diff --git a/assets/sif/notes/Live_s1644.json b/assets/serverdata/notes/Live_s1644.json similarity index 100% rename from assets/sif/notes/Live_s1644.json rename to assets/serverdata/notes/Live_s1644.json diff --git a/assets/sif/notes/Live_s1646.json b/assets/serverdata/notes/Live_s1646.json similarity index 100% rename from assets/sif/notes/Live_s1646.json rename to assets/serverdata/notes/Live_s1646.json diff --git a/assets/sif/notes/Live_s1647.json b/assets/serverdata/notes/Live_s1647.json similarity index 100% rename from assets/sif/notes/Live_s1647.json rename to assets/serverdata/notes/Live_s1647.json diff --git a/assets/sif/notes/Live_s1648.json b/assets/serverdata/notes/Live_s1648.json similarity index 100% rename from assets/sif/notes/Live_s1648.json rename to assets/serverdata/notes/Live_s1648.json diff --git a/assets/sif/notes/Live_s1649.json b/assets/serverdata/notes/Live_s1649.json similarity index 100% rename from assets/sif/notes/Live_s1649.json rename to assets/serverdata/notes/Live_s1649.json diff --git a/assets/sif/notes/Live_s1650.json b/assets/serverdata/notes/Live_s1650.json similarity index 100% rename from assets/sif/notes/Live_s1650.json rename to assets/serverdata/notes/Live_s1650.json diff --git a/assets/sif/notes/Live_s1651.json b/assets/serverdata/notes/Live_s1651.json similarity index 100% rename from assets/sif/notes/Live_s1651.json rename to assets/serverdata/notes/Live_s1651.json diff --git a/assets/sif/notes/Live_s1652.json b/assets/serverdata/notes/Live_s1652.json similarity index 100% rename from assets/sif/notes/Live_s1652.json rename to assets/serverdata/notes/Live_s1652.json diff --git a/assets/sif/notes/Live_s1655.json b/assets/serverdata/notes/Live_s1655.json similarity index 100% rename from assets/sif/notes/Live_s1655.json rename to assets/serverdata/notes/Live_s1655.json diff --git a/assets/sif/notes/Live_s1656.json b/assets/serverdata/notes/Live_s1656.json similarity index 100% rename from assets/sif/notes/Live_s1656.json rename to assets/serverdata/notes/Live_s1656.json diff --git a/assets/sif/notes/Live_s1658.json b/assets/serverdata/notes/Live_s1658.json similarity index 100% rename from assets/sif/notes/Live_s1658.json rename to assets/serverdata/notes/Live_s1658.json diff --git a/assets/sif/notes/Live_s1659.json b/assets/serverdata/notes/Live_s1659.json similarity index 100% rename from assets/sif/notes/Live_s1659.json rename to assets/serverdata/notes/Live_s1659.json diff --git a/assets/sif/notes/Live_s1660.json b/assets/serverdata/notes/Live_s1660.json similarity index 100% rename from assets/sif/notes/Live_s1660.json rename to assets/serverdata/notes/Live_s1660.json diff --git a/assets/sif/notes/Live_s1663.json b/assets/serverdata/notes/Live_s1663.json similarity index 100% rename from assets/sif/notes/Live_s1663.json rename to assets/serverdata/notes/Live_s1663.json diff --git a/assets/sif/notes/Live_s1664.json b/assets/serverdata/notes/Live_s1664.json similarity index 100% rename from assets/sif/notes/Live_s1664.json rename to assets/serverdata/notes/Live_s1664.json diff --git a/assets/sif/notes/Live_s1665.json b/assets/serverdata/notes/Live_s1665.json similarity index 100% rename from assets/sif/notes/Live_s1665.json rename to assets/serverdata/notes/Live_s1665.json diff --git a/assets/sif/notes/Live_s1666.json b/assets/serverdata/notes/Live_s1666.json similarity index 100% rename from assets/sif/notes/Live_s1666.json rename to assets/serverdata/notes/Live_s1666.json diff --git a/assets/sif/notes/Live_s1667.json b/assets/serverdata/notes/Live_s1667.json similarity index 100% rename from assets/sif/notes/Live_s1667.json rename to assets/serverdata/notes/Live_s1667.json diff --git a/assets/sif/notes/Live_s1668.json b/assets/serverdata/notes/Live_s1668.json similarity index 100% rename from assets/sif/notes/Live_s1668.json rename to assets/serverdata/notes/Live_s1668.json diff --git a/assets/sif/notes/Live_s1670.json b/assets/serverdata/notes/Live_s1670.json similarity index 100% rename from assets/sif/notes/Live_s1670.json rename to assets/serverdata/notes/Live_s1670.json diff --git a/assets/sif/notes/Live_s1671.json b/assets/serverdata/notes/Live_s1671.json similarity index 100% rename from assets/sif/notes/Live_s1671.json rename to assets/serverdata/notes/Live_s1671.json diff --git a/assets/sif/notes/Live_s1672.json b/assets/serverdata/notes/Live_s1672.json similarity index 100% rename from assets/sif/notes/Live_s1672.json rename to assets/serverdata/notes/Live_s1672.json diff --git a/assets/sif/notes/Live_s1673.json b/assets/serverdata/notes/Live_s1673.json similarity index 100% rename from assets/sif/notes/Live_s1673.json rename to assets/serverdata/notes/Live_s1673.json diff --git a/assets/sif/notes/Live_s1674.json b/assets/serverdata/notes/Live_s1674.json similarity index 100% rename from assets/sif/notes/Live_s1674.json rename to assets/serverdata/notes/Live_s1674.json diff --git a/assets/sif/notes/Live_s1675.json b/assets/serverdata/notes/Live_s1675.json similarity index 100% rename from assets/sif/notes/Live_s1675.json rename to assets/serverdata/notes/Live_s1675.json diff --git a/assets/sif/notes/Live_s1676.json b/assets/serverdata/notes/Live_s1676.json similarity index 100% rename from assets/sif/notes/Live_s1676.json rename to assets/serverdata/notes/Live_s1676.json diff --git a/assets/sif/notes/Live_s1679.json b/assets/serverdata/notes/Live_s1679.json similarity index 100% rename from assets/sif/notes/Live_s1679.json rename to assets/serverdata/notes/Live_s1679.json diff --git a/assets/sif/notes/Live_s1680.json b/assets/serverdata/notes/Live_s1680.json similarity index 100% rename from assets/sif/notes/Live_s1680.json rename to assets/serverdata/notes/Live_s1680.json diff --git a/assets/sif/notes/Live_s1682.json b/assets/serverdata/notes/Live_s1682.json similarity index 100% rename from assets/sif/notes/Live_s1682.json rename to assets/serverdata/notes/Live_s1682.json diff --git a/assets/sif/notes/Live_s1683.json b/assets/serverdata/notes/Live_s1683.json similarity index 100% rename from assets/sif/notes/Live_s1683.json rename to assets/serverdata/notes/Live_s1683.json diff --git a/assets/sif/notes/Live_s1684.json b/assets/serverdata/notes/Live_s1684.json similarity index 100% rename from assets/sif/notes/Live_s1684.json rename to assets/serverdata/notes/Live_s1684.json diff --git a/assets/sif/notes/Live_s1687.json b/assets/serverdata/notes/Live_s1687.json similarity index 100% rename from assets/sif/notes/Live_s1687.json rename to assets/serverdata/notes/Live_s1687.json diff --git a/assets/sif/notes/Live_s1688.json b/assets/serverdata/notes/Live_s1688.json similarity index 100% rename from assets/sif/notes/Live_s1688.json rename to assets/serverdata/notes/Live_s1688.json diff --git a/assets/sif/notes/Live_s1689.json b/assets/serverdata/notes/Live_s1689.json similarity index 100% rename from assets/sif/notes/Live_s1689.json rename to assets/serverdata/notes/Live_s1689.json diff --git a/assets/sif/notes/Live_s1690.json b/assets/serverdata/notes/Live_s1690.json similarity index 100% rename from assets/sif/notes/Live_s1690.json rename to assets/serverdata/notes/Live_s1690.json diff --git a/assets/sif/notes/Live_s1691.json b/assets/serverdata/notes/Live_s1691.json similarity index 100% rename from assets/sif/notes/Live_s1691.json rename to assets/serverdata/notes/Live_s1691.json diff --git a/assets/sif/notes/Live_s1692.json b/assets/serverdata/notes/Live_s1692.json similarity index 100% rename from assets/sif/notes/Live_s1692.json rename to assets/serverdata/notes/Live_s1692.json diff --git a/assets/sif/notes/Live_s1693.json b/assets/serverdata/notes/Live_s1693.json similarity index 100% rename from assets/sif/notes/Live_s1693.json rename to assets/serverdata/notes/Live_s1693.json diff --git a/assets/sif/notes/Live_s1694.json b/assets/serverdata/notes/Live_s1694.json similarity index 100% rename from assets/sif/notes/Live_s1694.json rename to assets/serverdata/notes/Live_s1694.json diff --git a/assets/sif/notes/Live_s1695.json b/assets/serverdata/notes/Live_s1695.json similarity index 100% rename from assets/sif/notes/Live_s1695.json rename to assets/serverdata/notes/Live_s1695.json diff --git a/assets/sif/notes/Live_s1696.json b/assets/serverdata/notes/Live_s1696.json similarity index 100% rename from assets/sif/notes/Live_s1696.json rename to assets/serverdata/notes/Live_s1696.json diff --git a/assets/sif/notes/Live_s1697.json b/assets/serverdata/notes/Live_s1697.json similarity index 100% rename from assets/sif/notes/Live_s1697.json rename to assets/serverdata/notes/Live_s1697.json diff --git a/assets/sif/notes/Live_s1698.json b/assets/serverdata/notes/Live_s1698.json similarity index 100% rename from assets/sif/notes/Live_s1698.json rename to assets/serverdata/notes/Live_s1698.json diff --git a/assets/sif/notes/Live_s1699.json b/assets/serverdata/notes/Live_s1699.json similarity index 100% rename from assets/sif/notes/Live_s1699.json rename to assets/serverdata/notes/Live_s1699.json diff --git a/assets/sif/notes/Live_s1700.json b/assets/serverdata/notes/Live_s1700.json similarity index 100% rename from assets/sif/notes/Live_s1700.json rename to assets/serverdata/notes/Live_s1700.json diff --git a/assets/sif/notes/Live_s1701.json b/assets/serverdata/notes/Live_s1701.json similarity index 100% rename from assets/sif/notes/Live_s1701.json rename to assets/serverdata/notes/Live_s1701.json diff --git a/assets/sif/notes/Live_s1702.json b/assets/serverdata/notes/Live_s1702.json similarity index 100% rename from assets/sif/notes/Live_s1702.json rename to assets/serverdata/notes/Live_s1702.json diff --git a/assets/sif/notes/Live_s1703.json b/assets/serverdata/notes/Live_s1703.json similarity index 100% rename from assets/sif/notes/Live_s1703.json rename to assets/serverdata/notes/Live_s1703.json diff --git a/assets/sif/notes/Live_s1704.json b/assets/serverdata/notes/Live_s1704.json similarity index 100% rename from assets/sif/notes/Live_s1704.json rename to assets/serverdata/notes/Live_s1704.json diff --git a/assets/sif/notes/Live_s1705.json b/assets/serverdata/notes/Live_s1705.json similarity index 100% rename from assets/sif/notes/Live_s1705.json rename to assets/serverdata/notes/Live_s1705.json diff --git a/assets/sif/notes/Live_s1706.json b/assets/serverdata/notes/Live_s1706.json similarity index 100% rename from assets/sif/notes/Live_s1706.json rename to assets/serverdata/notes/Live_s1706.json diff --git a/assets/sif/notes/Live_s1708.json b/assets/serverdata/notes/Live_s1708.json similarity index 100% rename from assets/sif/notes/Live_s1708.json rename to assets/serverdata/notes/Live_s1708.json diff --git a/assets/sif/notes/Live_s1709.json b/assets/serverdata/notes/Live_s1709.json similarity index 100% rename from assets/sif/notes/Live_s1709.json rename to assets/serverdata/notes/Live_s1709.json diff --git a/assets/sif/notes/Live_s1710.json b/assets/serverdata/notes/Live_s1710.json similarity index 100% rename from assets/sif/notes/Live_s1710.json rename to assets/serverdata/notes/Live_s1710.json diff --git a/assets/sif/notes/Live_s1711.json b/assets/serverdata/notes/Live_s1711.json similarity index 100% rename from assets/sif/notes/Live_s1711.json rename to assets/serverdata/notes/Live_s1711.json diff --git a/assets/sif/notes/Live_s1712.json b/assets/serverdata/notes/Live_s1712.json similarity index 100% rename from assets/sif/notes/Live_s1712.json rename to assets/serverdata/notes/Live_s1712.json diff --git a/assets/sif/notes/Live_s1713.json b/assets/serverdata/notes/Live_s1713.json similarity index 100% rename from assets/sif/notes/Live_s1713.json rename to assets/serverdata/notes/Live_s1713.json diff --git a/assets/sif/notes/Live_s1714.json b/assets/serverdata/notes/Live_s1714.json similarity index 100% rename from assets/sif/notes/Live_s1714.json rename to assets/serverdata/notes/Live_s1714.json diff --git a/assets/sif/notes/Live_s1715.json b/assets/serverdata/notes/Live_s1715.json similarity index 100% rename from assets/sif/notes/Live_s1715.json rename to assets/serverdata/notes/Live_s1715.json diff --git a/assets/sif/notes/Live_s1716.json b/assets/serverdata/notes/Live_s1716.json similarity index 100% rename from assets/sif/notes/Live_s1716.json rename to assets/serverdata/notes/Live_s1716.json diff --git a/assets/sif/notes/Live_s1717.json b/assets/serverdata/notes/Live_s1717.json similarity index 100% rename from assets/sif/notes/Live_s1717.json rename to assets/serverdata/notes/Live_s1717.json diff --git a/assets/sif/notes/Live_s1718.json b/assets/serverdata/notes/Live_s1718.json similarity index 100% rename from assets/sif/notes/Live_s1718.json rename to assets/serverdata/notes/Live_s1718.json diff --git a/assets/sif/notes/Live_s1719.json b/assets/serverdata/notes/Live_s1719.json similarity index 100% rename from assets/sif/notes/Live_s1719.json rename to assets/serverdata/notes/Live_s1719.json diff --git a/assets/sif/notes/Live_s1720.json b/assets/serverdata/notes/Live_s1720.json similarity index 100% rename from assets/sif/notes/Live_s1720.json rename to assets/serverdata/notes/Live_s1720.json diff --git a/assets/sif/notes/Live_s1721.json b/assets/serverdata/notes/Live_s1721.json similarity index 100% rename from assets/sif/notes/Live_s1721.json rename to assets/serverdata/notes/Live_s1721.json diff --git a/assets/sif/notes/Live_s1722.json b/assets/serverdata/notes/Live_s1722.json similarity index 100% rename from assets/sif/notes/Live_s1722.json rename to assets/serverdata/notes/Live_s1722.json diff --git a/assets/sif/notes/Live_s1723.json b/assets/serverdata/notes/Live_s1723.json similarity index 100% rename from assets/sif/notes/Live_s1723.json rename to assets/serverdata/notes/Live_s1723.json diff --git a/assets/sif/notes/Live_s1724.json b/assets/serverdata/notes/Live_s1724.json similarity index 100% rename from assets/sif/notes/Live_s1724.json rename to assets/serverdata/notes/Live_s1724.json diff --git a/assets/sif/notes/Live_s1725.json b/assets/serverdata/notes/Live_s1725.json similarity index 100% rename from assets/sif/notes/Live_s1725.json rename to assets/serverdata/notes/Live_s1725.json diff --git a/assets/sif/notes/Live_s1726.json b/assets/serverdata/notes/Live_s1726.json similarity index 100% rename from assets/sif/notes/Live_s1726.json rename to assets/serverdata/notes/Live_s1726.json diff --git a/assets/sif/notes/Live_s1727.json b/assets/serverdata/notes/Live_s1727.json similarity index 100% rename from assets/sif/notes/Live_s1727.json rename to assets/serverdata/notes/Live_s1727.json diff --git a/assets/sif/notes/Live_s1728.json b/assets/serverdata/notes/Live_s1728.json similarity index 100% rename from assets/sif/notes/Live_s1728.json rename to assets/serverdata/notes/Live_s1728.json diff --git a/assets/sif/notes/Live_s1729.json b/assets/serverdata/notes/Live_s1729.json similarity index 100% rename from assets/sif/notes/Live_s1729.json rename to assets/serverdata/notes/Live_s1729.json diff --git a/assets/sif/notes/Live_s1730.json b/assets/serverdata/notes/Live_s1730.json similarity index 100% rename from assets/sif/notes/Live_s1730.json rename to assets/serverdata/notes/Live_s1730.json diff --git a/assets/sif/notes/Live_s1731.json b/assets/serverdata/notes/Live_s1731.json similarity index 100% rename from assets/sif/notes/Live_s1731.json rename to assets/serverdata/notes/Live_s1731.json diff --git a/assets/sif/notes/Live_s1732.json b/assets/serverdata/notes/Live_s1732.json similarity index 100% rename from assets/sif/notes/Live_s1732.json rename to assets/serverdata/notes/Live_s1732.json diff --git a/assets/sif/notes/Live_s1733.json b/assets/serverdata/notes/Live_s1733.json similarity index 100% rename from assets/sif/notes/Live_s1733.json rename to assets/serverdata/notes/Live_s1733.json diff --git a/assets/sif/notes/Live_s1734.json b/assets/serverdata/notes/Live_s1734.json similarity index 100% rename from assets/sif/notes/Live_s1734.json rename to assets/serverdata/notes/Live_s1734.json diff --git a/assets/sif/notes/Live_s1735.json b/assets/serverdata/notes/Live_s1735.json similarity index 100% rename from assets/sif/notes/Live_s1735.json rename to assets/serverdata/notes/Live_s1735.json diff --git a/assets/sif/notes/Live_s1736.json b/assets/serverdata/notes/Live_s1736.json similarity index 100% rename from assets/sif/notes/Live_s1736.json rename to assets/serverdata/notes/Live_s1736.json diff --git a/assets/sif/notes/Live_s1737.json b/assets/serverdata/notes/Live_s1737.json similarity index 100% rename from assets/sif/notes/Live_s1737.json rename to assets/serverdata/notes/Live_s1737.json diff --git a/assets/sif/notes/Live_s1738.json b/assets/serverdata/notes/Live_s1738.json similarity index 100% rename from assets/sif/notes/Live_s1738.json rename to assets/serverdata/notes/Live_s1738.json diff --git a/assets/sif/notes/Live_s1739.json b/assets/serverdata/notes/Live_s1739.json similarity index 100% rename from assets/sif/notes/Live_s1739.json rename to assets/serverdata/notes/Live_s1739.json diff --git a/assets/sif/notes/Live_s1740.json b/assets/serverdata/notes/Live_s1740.json similarity index 100% rename from assets/sif/notes/Live_s1740.json rename to assets/serverdata/notes/Live_s1740.json diff --git a/assets/sif/notes/Live_s1741.json b/assets/serverdata/notes/Live_s1741.json similarity index 100% rename from assets/sif/notes/Live_s1741.json rename to assets/serverdata/notes/Live_s1741.json diff --git a/assets/sif/notes/Live_s1742.json b/assets/serverdata/notes/Live_s1742.json similarity index 100% rename from assets/sif/notes/Live_s1742.json rename to assets/serverdata/notes/Live_s1742.json diff --git a/assets/sif/notes/Live_s1743.json b/assets/serverdata/notes/Live_s1743.json similarity index 100% rename from assets/sif/notes/Live_s1743.json rename to assets/serverdata/notes/Live_s1743.json diff --git a/assets/sif/notes/Live_s1744.json b/assets/serverdata/notes/Live_s1744.json similarity index 100% rename from assets/sif/notes/Live_s1744.json rename to assets/serverdata/notes/Live_s1744.json diff --git a/assets/sif/notes/Live_s1745.json b/assets/serverdata/notes/Live_s1745.json similarity index 100% rename from assets/sif/notes/Live_s1745.json rename to assets/serverdata/notes/Live_s1745.json diff --git a/assets/sif/notes/Live_s1746.json b/assets/serverdata/notes/Live_s1746.json similarity index 100% rename from assets/sif/notes/Live_s1746.json rename to assets/serverdata/notes/Live_s1746.json diff --git a/assets/sif/notes/Live_s1747.json b/assets/serverdata/notes/Live_s1747.json similarity index 100% rename from assets/sif/notes/Live_s1747.json rename to assets/serverdata/notes/Live_s1747.json diff --git a/assets/sif/notes/Live_s1748.json b/assets/serverdata/notes/Live_s1748.json similarity index 100% rename from assets/sif/notes/Live_s1748.json rename to assets/serverdata/notes/Live_s1748.json diff --git a/assets/sif/notes/Live_s1749.json b/assets/serverdata/notes/Live_s1749.json similarity index 100% rename from assets/sif/notes/Live_s1749.json rename to assets/serverdata/notes/Live_s1749.json diff --git a/assets/sif/notes/Live_s1750.json b/assets/serverdata/notes/Live_s1750.json similarity index 100% rename from assets/sif/notes/Live_s1750.json rename to assets/serverdata/notes/Live_s1750.json diff --git a/assets/sif/notes/Live_s1751.json b/assets/serverdata/notes/Live_s1751.json similarity index 100% rename from assets/sif/notes/Live_s1751.json rename to assets/serverdata/notes/Live_s1751.json diff --git a/assets/sif/notes/Live_s1752.json b/assets/serverdata/notes/Live_s1752.json similarity index 100% rename from assets/sif/notes/Live_s1752.json rename to assets/serverdata/notes/Live_s1752.json diff --git a/assets/sif/notes/Live_s1753.json b/assets/serverdata/notes/Live_s1753.json similarity index 100% rename from assets/sif/notes/Live_s1753.json rename to assets/serverdata/notes/Live_s1753.json diff --git a/assets/sif/notes/Live_s1754.json b/assets/serverdata/notes/Live_s1754.json similarity index 100% rename from assets/sif/notes/Live_s1754.json rename to assets/serverdata/notes/Live_s1754.json diff --git a/assets/sif/notes/Live_s1755.json b/assets/serverdata/notes/Live_s1755.json similarity index 100% rename from assets/sif/notes/Live_s1755.json rename to assets/serverdata/notes/Live_s1755.json diff --git a/assets/sif/notes/Live_s1756.json b/assets/serverdata/notes/Live_s1756.json similarity index 100% rename from assets/sif/notes/Live_s1756.json rename to assets/serverdata/notes/Live_s1756.json diff --git a/assets/sif/notes/Live_s1757.json b/assets/serverdata/notes/Live_s1757.json similarity index 100% rename from assets/sif/notes/Live_s1757.json rename to assets/serverdata/notes/Live_s1757.json diff --git a/assets/sif/notes/Live_s1758.json b/assets/serverdata/notes/Live_s1758.json similarity index 100% rename from assets/sif/notes/Live_s1758.json rename to assets/serverdata/notes/Live_s1758.json diff --git a/assets/sif/notes/Live_s1759.json b/assets/serverdata/notes/Live_s1759.json similarity index 100% rename from assets/sif/notes/Live_s1759.json rename to assets/serverdata/notes/Live_s1759.json diff --git a/assets/sif/notes/Live_s1760.json b/assets/serverdata/notes/Live_s1760.json similarity index 100% rename from assets/sif/notes/Live_s1760.json rename to assets/serverdata/notes/Live_s1760.json diff --git a/assets/sif/notes/Live_s1761.json b/assets/serverdata/notes/Live_s1761.json similarity index 100% rename from assets/sif/notes/Live_s1761.json rename to assets/serverdata/notes/Live_s1761.json diff --git a/assets/sif/notes/Live_s1762.json b/assets/serverdata/notes/Live_s1762.json similarity index 100% rename from assets/sif/notes/Live_s1762.json rename to assets/serverdata/notes/Live_s1762.json diff --git a/assets/sif/notes/Live_s1763.json b/assets/serverdata/notes/Live_s1763.json similarity index 100% rename from assets/sif/notes/Live_s1763.json rename to assets/serverdata/notes/Live_s1763.json diff --git a/assets/sif/notes/Live_s1764.json b/assets/serverdata/notes/Live_s1764.json similarity index 100% rename from assets/sif/notes/Live_s1764.json rename to assets/serverdata/notes/Live_s1764.json diff --git a/assets/sif/notes/Live_s1765.json b/assets/serverdata/notes/Live_s1765.json similarity index 100% rename from assets/sif/notes/Live_s1765.json rename to assets/serverdata/notes/Live_s1765.json diff --git a/assets/sif/notes/Live_s1766.json b/assets/serverdata/notes/Live_s1766.json similarity index 100% rename from assets/sif/notes/Live_s1766.json rename to assets/serverdata/notes/Live_s1766.json diff --git a/assets/sif/notes/Live_s1767.json b/assets/serverdata/notes/Live_s1767.json similarity index 100% rename from assets/sif/notes/Live_s1767.json rename to assets/serverdata/notes/Live_s1767.json diff --git a/assets/sif/notes/Live_s1768.json b/assets/serverdata/notes/Live_s1768.json similarity index 100% rename from assets/sif/notes/Live_s1768.json rename to assets/serverdata/notes/Live_s1768.json diff --git a/assets/sif/notes/Live_s1769.json b/assets/serverdata/notes/Live_s1769.json similarity index 100% rename from assets/sif/notes/Live_s1769.json rename to assets/serverdata/notes/Live_s1769.json diff --git a/assets/sif/notes/Live_s1770.json b/assets/serverdata/notes/Live_s1770.json similarity index 100% rename from assets/sif/notes/Live_s1770.json rename to assets/serverdata/notes/Live_s1770.json diff --git a/assets/sif/notes/Live_s1771.json b/assets/serverdata/notes/Live_s1771.json similarity index 100% rename from assets/sif/notes/Live_s1771.json rename to assets/serverdata/notes/Live_s1771.json diff --git a/assets/sif/notes/Live_s1772.json b/assets/serverdata/notes/Live_s1772.json similarity index 100% rename from assets/sif/notes/Live_s1772.json rename to assets/serverdata/notes/Live_s1772.json diff --git a/assets/sif/notes/Live_s1773.json b/assets/serverdata/notes/Live_s1773.json similarity index 100% rename from assets/sif/notes/Live_s1773.json rename to assets/serverdata/notes/Live_s1773.json diff --git a/assets/sif/notes/Live_s1774.json b/assets/serverdata/notes/Live_s1774.json similarity index 100% rename from assets/sif/notes/Live_s1774.json rename to assets/serverdata/notes/Live_s1774.json diff --git a/assets/sif/notes/Live_s1775.json b/assets/serverdata/notes/Live_s1775.json similarity index 100% rename from assets/sif/notes/Live_s1775.json rename to assets/serverdata/notes/Live_s1775.json diff --git a/assets/sif/notes/Live_s1776.json b/assets/serverdata/notes/Live_s1776.json similarity index 100% rename from assets/sif/notes/Live_s1776.json rename to assets/serverdata/notes/Live_s1776.json diff --git a/assets/sif/notes/Live_s1777.json b/assets/serverdata/notes/Live_s1777.json similarity index 100% rename from assets/sif/notes/Live_s1777.json rename to assets/serverdata/notes/Live_s1777.json diff --git a/assets/sif/notes/Live_s1778.json b/assets/serverdata/notes/Live_s1778.json similarity index 100% rename from assets/sif/notes/Live_s1778.json rename to assets/serverdata/notes/Live_s1778.json diff --git a/assets/sif/notes/Live_s1779.json b/assets/serverdata/notes/Live_s1779.json similarity index 100% rename from assets/sif/notes/Live_s1779.json rename to assets/serverdata/notes/Live_s1779.json diff --git a/assets/sif/notes/Live_s1780.json b/assets/serverdata/notes/Live_s1780.json similarity index 100% rename from assets/sif/notes/Live_s1780.json rename to assets/serverdata/notes/Live_s1780.json diff --git a/assets/sif/notes/Live_s1781.json b/assets/serverdata/notes/Live_s1781.json similarity index 100% rename from assets/sif/notes/Live_s1781.json rename to assets/serverdata/notes/Live_s1781.json diff --git a/assets/sif/notes/Live_s1782.json b/assets/serverdata/notes/Live_s1782.json similarity index 100% rename from assets/sif/notes/Live_s1782.json rename to assets/serverdata/notes/Live_s1782.json diff --git a/assets/sif/notes/Live_s1783.json b/assets/serverdata/notes/Live_s1783.json similarity index 100% rename from assets/sif/notes/Live_s1783.json rename to assets/serverdata/notes/Live_s1783.json diff --git a/assets/sif/notes/Live_s1784.json b/assets/serverdata/notes/Live_s1784.json similarity index 100% rename from assets/sif/notes/Live_s1784.json rename to assets/serverdata/notes/Live_s1784.json diff --git a/assets/sif/notes/Live_s1785.json b/assets/serverdata/notes/Live_s1785.json similarity index 100% rename from assets/sif/notes/Live_s1785.json rename to assets/serverdata/notes/Live_s1785.json diff --git a/assets/sif/notes/Live_s1786.json b/assets/serverdata/notes/Live_s1786.json similarity index 100% rename from assets/sif/notes/Live_s1786.json rename to assets/serverdata/notes/Live_s1786.json diff --git a/assets/sif/notes/Live_s1787.json b/assets/serverdata/notes/Live_s1787.json similarity index 100% rename from assets/sif/notes/Live_s1787.json rename to assets/serverdata/notes/Live_s1787.json diff --git a/assets/sif/notes/Live_s1788.json b/assets/serverdata/notes/Live_s1788.json similarity index 100% rename from assets/sif/notes/Live_s1788.json rename to assets/serverdata/notes/Live_s1788.json diff --git a/assets/sif/notes/Live_s1789.json b/assets/serverdata/notes/Live_s1789.json similarity index 100% rename from assets/sif/notes/Live_s1789.json rename to assets/serverdata/notes/Live_s1789.json diff --git a/assets/sif/notes/Live_s1790.json b/assets/serverdata/notes/Live_s1790.json similarity index 100% rename from assets/sif/notes/Live_s1790.json rename to assets/serverdata/notes/Live_s1790.json diff --git a/assets/sif/notes/Live_s1791.json b/assets/serverdata/notes/Live_s1791.json similarity index 100% rename from assets/sif/notes/Live_s1791.json rename to assets/serverdata/notes/Live_s1791.json diff --git a/assets/sif/notes/Live_s1792.json b/assets/serverdata/notes/Live_s1792.json similarity index 100% rename from assets/sif/notes/Live_s1792.json rename to assets/serverdata/notes/Live_s1792.json diff --git a/assets/sif/notes/Live_s1793.json b/assets/serverdata/notes/Live_s1793.json similarity index 100% rename from assets/sif/notes/Live_s1793.json rename to assets/serverdata/notes/Live_s1793.json diff --git a/assets/sif/notes/Live_s1794.json b/assets/serverdata/notes/Live_s1794.json similarity index 100% rename from assets/sif/notes/Live_s1794.json rename to assets/serverdata/notes/Live_s1794.json diff --git a/assets/sif/notes/Live_s1795.json b/assets/serverdata/notes/Live_s1795.json similarity index 100% rename from assets/sif/notes/Live_s1795.json rename to assets/serverdata/notes/Live_s1795.json diff --git a/assets/sif/notes/Live_s1796.json b/assets/serverdata/notes/Live_s1796.json similarity index 100% rename from assets/sif/notes/Live_s1796.json rename to assets/serverdata/notes/Live_s1796.json diff --git a/assets/sif/notes/Live_s1797.json b/assets/serverdata/notes/Live_s1797.json similarity index 100% rename from assets/sif/notes/Live_s1797.json rename to assets/serverdata/notes/Live_s1797.json diff --git a/assets/sif/notes/Live_s1798.json b/assets/serverdata/notes/Live_s1798.json similarity index 100% rename from assets/sif/notes/Live_s1798.json rename to assets/serverdata/notes/Live_s1798.json diff --git a/assets/sif/notes/Live_s1799.json b/assets/serverdata/notes/Live_s1799.json similarity index 100% rename from assets/sif/notes/Live_s1799.json rename to assets/serverdata/notes/Live_s1799.json diff --git a/assets/sif/notes/Live_s1800.json b/assets/serverdata/notes/Live_s1800.json similarity index 100% rename from assets/sif/notes/Live_s1800.json rename to assets/serverdata/notes/Live_s1800.json diff --git a/assets/sif/notes/Live_s1801.json b/assets/serverdata/notes/Live_s1801.json similarity index 100% rename from assets/sif/notes/Live_s1801.json rename to assets/serverdata/notes/Live_s1801.json diff --git a/assets/sif/notes/Live_s1802.json b/assets/serverdata/notes/Live_s1802.json similarity index 100% rename from assets/sif/notes/Live_s1802.json rename to assets/serverdata/notes/Live_s1802.json diff --git a/assets/sif/notes/Live_s1803.json b/assets/serverdata/notes/Live_s1803.json similarity index 100% rename from assets/sif/notes/Live_s1803.json rename to assets/serverdata/notes/Live_s1803.json diff --git a/assets/sif/notes/Live_s1804.json b/assets/serverdata/notes/Live_s1804.json similarity index 100% rename from assets/sif/notes/Live_s1804.json rename to assets/serverdata/notes/Live_s1804.json diff --git a/assets/sif/notes/Live_s1805.json b/assets/serverdata/notes/Live_s1805.json similarity index 100% rename from assets/sif/notes/Live_s1805.json rename to assets/serverdata/notes/Live_s1805.json diff --git a/assets/sif/notes/Live_s1806.json b/assets/serverdata/notes/Live_s1806.json similarity index 100% rename from assets/sif/notes/Live_s1806.json rename to assets/serverdata/notes/Live_s1806.json diff --git a/assets/sif/notes/Live_s1807.json b/assets/serverdata/notes/Live_s1807.json similarity index 100% rename from assets/sif/notes/Live_s1807.json rename to assets/serverdata/notes/Live_s1807.json diff --git a/assets/sif/notes/Live_s1808.json b/assets/serverdata/notes/Live_s1808.json similarity index 100% rename from assets/sif/notes/Live_s1808.json rename to assets/serverdata/notes/Live_s1808.json diff --git a/assets/sif/notes/Live_s1809.json b/assets/serverdata/notes/Live_s1809.json similarity index 100% rename from assets/sif/notes/Live_s1809.json rename to assets/serverdata/notes/Live_s1809.json diff --git a/assets/sif/notes/Live_s1810.json b/assets/serverdata/notes/Live_s1810.json similarity index 100% rename from assets/sif/notes/Live_s1810.json rename to assets/serverdata/notes/Live_s1810.json diff --git a/assets/sif/notes/Live_s1811.json b/assets/serverdata/notes/Live_s1811.json similarity index 100% rename from assets/sif/notes/Live_s1811.json rename to assets/serverdata/notes/Live_s1811.json diff --git a/assets/sif/notes/Live_s1812.json b/assets/serverdata/notes/Live_s1812.json similarity index 100% rename from assets/sif/notes/Live_s1812.json rename to assets/serverdata/notes/Live_s1812.json diff --git a/assets/sif/notes/Live_s1813.json b/assets/serverdata/notes/Live_s1813.json similarity index 100% rename from assets/sif/notes/Live_s1813.json rename to assets/serverdata/notes/Live_s1813.json diff --git a/assets/sif/notes/Live_s1814.json b/assets/serverdata/notes/Live_s1814.json similarity index 100% rename from assets/sif/notes/Live_s1814.json rename to assets/serverdata/notes/Live_s1814.json diff --git a/assets/sif/notes/Live_s1815.json b/assets/serverdata/notes/Live_s1815.json similarity index 100% rename from assets/sif/notes/Live_s1815.json rename to assets/serverdata/notes/Live_s1815.json diff --git a/assets/sif/notes/Live_s1816.json b/assets/serverdata/notes/Live_s1816.json similarity index 100% rename from assets/sif/notes/Live_s1816.json rename to assets/serverdata/notes/Live_s1816.json diff --git a/assets/sif/notes/Live_s1817.json b/assets/serverdata/notes/Live_s1817.json similarity index 100% rename from assets/sif/notes/Live_s1817.json rename to assets/serverdata/notes/Live_s1817.json diff --git a/assets/sif/notes/Live_s1818.json b/assets/serverdata/notes/Live_s1818.json similarity index 100% rename from assets/sif/notes/Live_s1818.json rename to assets/serverdata/notes/Live_s1818.json diff --git a/assets/sif/notes/Live_s1819.json b/assets/serverdata/notes/Live_s1819.json similarity index 100% rename from assets/sif/notes/Live_s1819.json rename to assets/serverdata/notes/Live_s1819.json diff --git a/assets/sif/notes/Live_s1820.json b/assets/serverdata/notes/Live_s1820.json similarity index 100% rename from assets/sif/notes/Live_s1820.json rename to assets/serverdata/notes/Live_s1820.json diff --git a/assets/sif/notes/Live_s1821.json b/assets/serverdata/notes/Live_s1821.json similarity index 100% rename from assets/sif/notes/Live_s1821.json rename to assets/serverdata/notes/Live_s1821.json diff --git a/assets/sif/notes/Live_s1822.json b/assets/serverdata/notes/Live_s1822.json similarity index 100% rename from assets/sif/notes/Live_s1822.json rename to assets/serverdata/notes/Live_s1822.json diff --git a/assets/sif/notes/Live_s1823.json b/assets/serverdata/notes/Live_s1823.json similarity index 100% rename from assets/sif/notes/Live_s1823.json rename to assets/serverdata/notes/Live_s1823.json diff --git a/assets/sif/notes/Live_s1824.json b/assets/serverdata/notes/Live_s1824.json similarity index 100% rename from assets/sif/notes/Live_s1824.json rename to assets/serverdata/notes/Live_s1824.json diff --git a/assets/sif/notes/Live_s1825.json b/assets/serverdata/notes/Live_s1825.json similarity index 100% rename from assets/sif/notes/Live_s1825.json rename to assets/serverdata/notes/Live_s1825.json diff --git a/assets/sif/notes/Live_s1826.json b/assets/serverdata/notes/Live_s1826.json similarity index 100% rename from assets/sif/notes/Live_s1826.json rename to assets/serverdata/notes/Live_s1826.json diff --git a/assets/sif/notes/Live_s1827.json b/assets/serverdata/notes/Live_s1827.json similarity index 100% rename from assets/sif/notes/Live_s1827.json rename to assets/serverdata/notes/Live_s1827.json diff --git a/assets/sif/notes/Live_s1828.json b/assets/serverdata/notes/Live_s1828.json similarity index 100% rename from assets/sif/notes/Live_s1828.json rename to assets/serverdata/notes/Live_s1828.json diff --git a/assets/sif/notes/Live_s1829.json b/assets/serverdata/notes/Live_s1829.json similarity index 100% rename from assets/sif/notes/Live_s1829.json rename to assets/serverdata/notes/Live_s1829.json diff --git a/assets/sif/notes/Live_s1830.json b/assets/serverdata/notes/Live_s1830.json similarity index 100% rename from assets/sif/notes/Live_s1830.json rename to assets/serverdata/notes/Live_s1830.json diff --git a/assets/sif/notes/Live_s1831.json b/assets/serverdata/notes/Live_s1831.json similarity index 100% rename from assets/sif/notes/Live_s1831.json rename to assets/serverdata/notes/Live_s1831.json diff --git a/assets/sif/notes/Live_s1832.json b/assets/serverdata/notes/Live_s1832.json similarity index 100% rename from assets/sif/notes/Live_s1832.json rename to assets/serverdata/notes/Live_s1832.json diff --git a/assets/sif/notes/Live_s1833.json b/assets/serverdata/notes/Live_s1833.json similarity index 100% rename from assets/sif/notes/Live_s1833.json rename to assets/serverdata/notes/Live_s1833.json diff --git a/assets/sif/notes/Live_s1834.json b/assets/serverdata/notes/Live_s1834.json similarity index 100% rename from assets/sif/notes/Live_s1834.json rename to assets/serverdata/notes/Live_s1834.json diff --git a/assets/sif/notes/Live_s1835.json b/assets/serverdata/notes/Live_s1835.json similarity index 100% rename from assets/sif/notes/Live_s1835.json rename to assets/serverdata/notes/Live_s1835.json diff --git a/assets/sif/notes/Live_s1836.json b/assets/serverdata/notes/Live_s1836.json similarity index 100% rename from assets/sif/notes/Live_s1836.json rename to assets/serverdata/notes/Live_s1836.json diff --git a/assets/sif/notes/Live_s1837.json b/assets/serverdata/notes/Live_s1837.json similarity index 100% rename from assets/sif/notes/Live_s1837.json rename to assets/serverdata/notes/Live_s1837.json diff --git a/assets/sif/notes/Live_s1838.json b/assets/serverdata/notes/Live_s1838.json similarity index 100% rename from assets/sif/notes/Live_s1838.json rename to assets/serverdata/notes/Live_s1838.json diff --git a/assets/sif/notes/Live_s1839.json b/assets/serverdata/notes/Live_s1839.json similarity index 100% rename from assets/sif/notes/Live_s1839.json rename to assets/serverdata/notes/Live_s1839.json diff --git a/assets/sif/notes/Live_s1840.json b/assets/serverdata/notes/Live_s1840.json similarity index 100% rename from assets/sif/notes/Live_s1840.json rename to assets/serverdata/notes/Live_s1840.json diff --git a/assets/sif/notes/Live_s1841.json b/assets/serverdata/notes/Live_s1841.json similarity index 100% rename from assets/sif/notes/Live_s1841.json rename to assets/serverdata/notes/Live_s1841.json diff --git a/assets/sif/notes/Live_s1842.json b/assets/serverdata/notes/Live_s1842.json similarity index 100% rename from assets/sif/notes/Live_s1842.json rename to assets/serverdata/notes/Live_s1842.json diff --git a/assets/sif/notes/Live_s1843.json b/assets/serverdata/notes/Live_s1843.json similarity index 100% rename from assets/sif/notes/Live_s1843.json rename to assets/serverdata/notes/Live_s1843.json diff --git a/assets/sif/notes/Live_s1844.json b/assets/serverdata/notes/Live_s1844.json similarity index 100% rename from assets/sif/notes/Live_s1844.json rename to assets/serverdata/notes/Live_s1844.json diff --git a/assets/sif/notes/Live_s1845.json b/assets/serverdata/notes/Live_s1845.json similarity index 100% rename from assets/sif/notes/Live_s1845.json rename to assets/serverdata/notes/Live_s1845.json diff --git a/assets/sif/notes/Live_s1846.json b/assets/serverdata/notes/Live_s1846.json similarity index 100% rename from assets/sif/notes/Live_s1846.json rename to assets/serverdata/notes/Live_s1846.json diff --git a/assets/sif/notes/Live_s1847.json b/assets/serverdata/notes/Live_s1847.json similarity index 100% rename from assets/sif/notes/Live_s1847.json rename to assets/serverdata/notes/Live_s1847.json diff --git a/assets/sif/notes/Live_s1848.json b/assets/serverdata/notes/Live_s1848.json similarity index 100% rename from assets/sif/notes/Live_s1848.json rename to assets/serverdata/notes/Live_s1848.json diff --git a/assets/sif/notes/Live_s1849.json b/assets/serverdata/notes/Live_s1849.json similarity index 100% rename from assets/sif/notes/Live_s1849.json rename to assets/serverdata/notes/Live_s1849.json diff --git a/assets/sif/notes/Live_s1850.json b/assets/serverdata/notes/Live_s1850.json similarity index 100% rename from assets/sif/notes/Live_s1850.json rename to assets/serverdata/notes/Live_s1850.json diff --git a/assets/sif/notes/Live_s1851.json b/assets/serverdata/notes/Live_s1851.json similarity index 100% rename from assets/sif/notes/Live_s1851.json rename to assets/serverdata/notes/Live_s1851.json diff --git a/assets/sif/notes/Live_s1852.json b/assets/serverdata/notes/Live_s1852.json similarity index 100% rename from assets/sif/notes/Live_s1852.json rename to assets/serverdata/notes/Live_s1852.json diff --git a/assets/sif/notes/Live_s1853.json b/assets/serverdata/notes/Live_s1853.json similarity index 100% rename from assets/sif/notes/Live_s1853.json rename to assets/serverdata/notes/Live_s1853.json diff --git a/assets/sif/notes/Live_s1854.json b/assets/serverdata/notes/Live_s1854.json similarity index 100% rename from assets/sif/notes/Live_s1854.json rename to assets/serverdata/notes/Live_s1854.json diff --git a/assets/sif/notes/Live_s1855.json b/assets/serverdata/notes/Live_s1855.json similarity index 100% rename from assets/sif/notes/Live_s1855.json rename to assets/serverdata/notes/Live_s1855.json diff --git a/assets/sif/notes/Live_s1856.json b/assets/serverdata/notes/Live_s1856.json similarity index 100% rename from assets/sif/notes/Live_s1856.json rename to assets/serverdata/notes/Live_s1856.json diff --git a/assets/sif/notes/Live_s1857.json b/assets/serverdata/notes/Live_s1857.json similarity index 100% rename from assets/sif/notes/Live_s1857.json rename to assets/serverdata/notes/Live_s1857.json diff --git a/assets/sif/notes/Live_s1858.json b/assets/serverdata/notes/Live_s1858.json similarity index 100% rename from assets/sif/notes/Live_s1858.json rename to assets/serverdata/notes/Live_s1858.json diff --git a/assets/sif/notes/Live_s1859.json b/assets/serverdata/notes/Live_s1859.json similarity index 100% rename from assets/sif/notes/Live_s1859.json rename to assets/serverdata/notes/Live_s1859.json diff --git a/assets/sif/notes/Live_s1860.json b/assets/serverdata/notes/Live_s1860.json similarity index 100% rename from assets/sif/notes/Live_s1860.json rename to assets/serverdata/notes/Live_s1860.json diff --git a/assets/sif/notes/Live_s1861.json b/assets/serverdata/notes/Live_s1861.json similarity index 100% rename from assets/sif/notes/Live_s1861.json rename to assets/serverdata/notes/Live_s1861.json diff --git a/assets/sif/notes/Live_s1862.json b/assets/serverdata/notes/Live_s1862.json similarity index 100% rename from assets/sif/notes/Live_s1862.json rename to assets/serverdata/notes/Live_s1862.json diff --git a/assets/sif/notes/Live_s1863.json b/assets/serverdata/notes/Live_s1863.json similarity index 100% rename from assets/sif/notes/Live_s1863.json rename to assets/serverdata/notes/Live_s1863.json diff --git a/assets/sif/notes/Live_s1864.json b/assets/serverdata/notes/Live_s1864.json similarity index 100% rename from assets/sif/notes/Live_s1864.json rename to assets/serverdata/notes/Live_s1864.json diff --git a/assets/sif/notes/Live_s1865.json b/assets/serverdata/notes/Live_s1865.json similarity index 100% rename from assets/sif/notes/Live_s1865.json rename to assets/serverdata/notes/Live_s1865.json diff --git a/assets/sif/notes/Live_s1866.json b/assets/serverdata/notes/Live_s1866.json similarity index 100% rename from assets/sif/notes/Live_s1866.json rename to assets/serverdata/notes/Live_s1866.json diff --git a/assets/sif/notes/Live_s1867.json b/assets/serverdata/notes/Live_s1867.json similarity index 100% rename from assets/sif/notes/Live_s1867.json rename to assets/serverdata/notes/Live_s1867.json diff --git a/assets/sif/notes/Live_s1868.json b/assets/serverdata/notes/Live_s1868.json similarity index 100% rename from assets/sif/notes/Live_s1868.json rename to assets/serverdata/notes/Live_s1868.json diff --git a/assets/sif/notes/Live_s1869.json b/assets/serverdata/notes/Live_s1869.json similarity index 100% rename from assets/sif/notes/Live_s1869.json rename to assets/serverdata/notes/Live_s1869.json diff --git a/assets/sif/notes/Live_s1870.json b/assets/serverdata/notes/Live_s1870.json similarity index 100% rename from assets/sif/notes/Live_s1870.json rename to assets/serverdata/notes/Live_s1870.json diff --git a/assets/sif/notes/Live_s1871.json b/assets/serverdata/notes/Live_s1871.json similarity index 100% rename from assets/sif/notes/Live_s1871.json rename to assets/serverdata/notes/Live_s1871.json diff --git a/assets/sif/notes/Live_s1872.json b/assets/serverdata/notes/Live_s1872.json similarity index 100% rename from assets/sif/notes/Live_s1872.json rename to assets/serverdata/notes/Live_s1872.json diff --git a/assets/sif/notes/Live_s1873.json b/assets/serverdata/notes/Live_s1873.json similarity index 100% rename from assets/sif/notes/Live_s1873.json rename to assets/serverdata/notes/Live_s1873.json diff --git a/assets/sif/notes/Live_s1874.json b/assets/serverdata/notes/Live_s1874.json similarity index 100% rename from assets/sif/notes/Live_s1874.json rename to assets/serverdata/notes/Live_s1874.json diff --git a/assets/sif/notes/Live_s1875.json b/assets/serverdata/notes/Live_s1875.json similarity index 100% rename from assets/sif/notes/Live_s1875.json rename to assets/serverdata/notes/Live_s1875.json diff --git a/assets/sif/notes/Live_s1876.json b/assets/serverdata/notes/Live_s1876.json similarity index 100% rename from assets/sif/notes/Live_s1876.json rename to assets/serverdata/notes/Live_s1876.json diff --git a/assets/sif/notes/Live_s1877.json b/assets/serverdata/notes/Live_s1877.json similarity index 100% rename from assets/sif/notes/Live_s1877.json rename to assets/serverdata/notes/Live_s1877.json diff --git a/assets/sif/notes/Live_s1878.json b/assets/serverdata/notes/Live_s1878.json similarity index 100% rename from assets/sif/notes/Live_s1878.json rename to assets/serverdata/notes/Live_s1878.json diff --git a/assets/sif/notes/Live_s1879.json b/assets/serverdata/notes/Live_s1879.json similarity index 100% rename from assets/sif/notes/Live_s1879.json rename to assets/serverdata/notes/Live_s1879.json diff --git a/assets/sif/notes/Live_s1880.json b/assets/serverdata/notes/Live_s1880.json similarity index 100% rename from assets/sif/notes/Live_s1880.json rename to assets/serverdata/notes/Live_s1880.json diff --git a/assets/sif/notes/Live_s1881.json b/assets/serverdata/notes/Live_s1881.json similarity index 100% rename from assets/sif/notes/Live_s1881.json rename to assets/serverdata/notes/Live_s1881.json diff --git a/assets/sif/notes/Live_s1882.json b/assets/serverdata/notes/Live_s1882.json similarity index 100% rename from assets/sif/notes/Live_s1882.json rename to assets/serverdata/notes/Live_s1882.json diff --git a/assets/sif/notes/Live_s1883.json b/assets/serverdata/notes/Live_s1883.json similarity index 100% rename from assets/sif/notes/Live_s1883.json rename to assets/serverdata/notes/Live_s1883.json diff --git a/assets/sif/notes/Live_s1884.json b/assets/serverdata/notes/Live_s1884.json similarity index 100% rename from assets/sif/notes/Live_s1884.json rename to assets/serverdata/notes/Live_s1884.json diff --git a/assets/sif/notes/Live_s1885.json b/assets/serverdata/notes/Live_s1885.json similarity index 100% rename from assets/sif/notes/Live_s1885.json rename to assets/serverdata/notes/Live_s1885.json diff --git a/assets/sif/notes/Live_s1886.json b/assets/serverdata/notes/Live_s1886.json similarity index 100% rename from assets/sif/notes/Live_s1886.json rename to assets/serverdata/notes/Live_s1886.json diff --git a/assets/sif/notes/Live_s1887.json b/assets/serverdata/notes/Live_s1887.json similarity index 100% rename from assets/sif/notes/Live_s1887.json rename to assets/serverdata/notes/Live_s1887.json diff --git a/assets/sif/notes/Live_s1888.json b/assets/serverdata/notes/Live_s1888.json similarity index 100% rename from assets/sif/notes/Live_s1888.json rename to assets/serverdata/notes/Live_s1888.json diff --git a/assets/sif/notes/Live_s1889.json b/assets/serverdata/notes/Live_s1889.json similarity index 100% rename from assets/sif/notes/Live_s1889.json rename to assets/serverdata/notes/Live_s1889.json diff --git a/assets/sif/notes/Live_s1890.json b/assets/serverdata/notes/Live_s1890.json similarity index 100% rename from assets/sif/notes/Live_s1890.json rename to assets/serverdata/notes/Live_s1890.json diff --git a/assets/sif/notes/Live_s1891.json b/assets/serverdata/notes/Live_s1891.json similarity index 100% rename from assets/sif/notes/Live_s1891.json rename to assets/serverdata/notes/Live_s1891.json diff --git a/assets/sif/notes/Live_s1892.json b/assets/serverdata/notes/Live_s1892.json similarity index 100% rename from assets/sif/notes/Live_s1892.json rename to assets/serverdata/notes/Live_s1892.json diff --git a/assets/sif/notes/Live_s1893.json b/assets/serverdata/notes/Live_s1893.json similarity index 100% rename from assets/sif/notes/Live_s1893.json rename to assets/serverdata/notes/Live_s1893.json diff --git a/assets/sif/notes/Live_s1894.json b/assets/serverdata/notes/Live_s1894.json similarity index 100% rename from assets/sif/notes/Live_s1894.json rename to assets/serverdata/notes/Live_s1894.json diff --git a/assets/sif/notes/Live_s1895.json b/assets/serverdata/notes/Live_s1895.json similarity index 100% rename from assets/sif/notes/Live_s1895.json rename to assets/serverdata/notes/Live_s1895.json diff --git a/assets/sif/notes/Live_s1896.json b/assets/serverdata/notes/Live_s1896.json similarity index 100% rename from assets/sif/notes/Live_s1896.json rename to assets/serverdata/notes/Live_s1896.json diff --git a/assets/sif/notes/Live_s1897.json b/assets/serverdata/notes/Live_s1897.json similarity index 100% rename from assets/sif/notes/Live_s1897.json rename to assets/serverdata/notes/Live_s1897.json diff --git a/assets/sif/notes/Live_s1898.json b/assets/serverdata/notes/Live_s1898.json similarity index 100% rename from assets/sif/notes/Live_s1898.json rename to assets/serverdata/notes/Live_s1898.json diff --git a/assets/sif/notes/Live_s1899.json b/assets/serverdata/notes/Live_s1899.json similarity index 100% rename from assets/sif/notes/Live_s1899.json rename to assets/serverdata/notes/Live_s1899.json diff --git a/assets/sif/notes/Live_s1900.json b/assets/serverdata/notes/Live_s1900.json similarity index 100% rename from assets/sif/notes/Live_s1900.json rename to assets/serverdata/notes/Live_s1900.json diff --git a/assets/sif/notes/Live_s1901.json b/assets/serverdata/notes/Live_s1901.json similarity index 100% rename from assets/sif/notes/Live_s1901.json rename to assets/serverdata/notes/Live_s1901.json diff --git a/assets/sif/notes/Live_s1902.json b/assets/serverdata/notes/Live_s1902.json similarity index 100% rename from assets/sif/notes/Live_s1902.json rename to assets/serverdata/notes/Live_s1902.json diff --git a/assets/sif/notes/Live_s1903.json b/assets/serverdata/notes/Live_s1903.json similarity index 100% rename from assets/sif/notes/Live_s1903.json rename to assets/serverdata/notes/Live_s1903.json diff --git a/assets/sif/notes/Live_s1904.json b/assets/serverdata/notes/Live_s1904.json similarity index 100% rename from assets/sif/notes/Live_s1904.json rename to assets/serverdata/notes/Live_s1904.json diff --git a/assets/sif/notes/Live_s1905.json b/assets/serverdata/notes/Live_s1905.json similarity index 100% rename from assets/sif/notes/Live_s1905.json rename to assets/serverdata/notes/Live_s1905.json diff --git a/assets/sif/notes/Live_s1906.json b/assets/serverdata/notes/Live_s1906.json similarity index 100% rename from assets/sif/notes/Live_s1906.json rename to assets/serverdata/notes/Live_s1906.json diff --git a/assets/sif/notes/Live_s1907.json b/assets/serverdata/notes/Live_s1907.json similarity index 100% rename from assets/sif/notes/Live_s1907.json rename to assets/serverdata/notes/Live_s1907.json diff --git a/assets/sif/notes/Live_s1908.json b/assets/serverdata/notes/Live_s1908.json similarity index 100% rename from assets/sif/notes/Live_s1908.json rename to assets/serverdata/notes/Live_s1908.json diff --git a/assets/sif/notes/Live_s1909.json b/assets/serverdata/notes/Live_s1909.json similarity index 100% rename from assets/sif/notes/Live_s1909.json rename to assets/serverdata/notes/Live_s1909.json diff --git a/assets/sif/notes/Live_s1910.json b/assets/serverdata/notes/Live_s1910.json similarity index 100% rename from assets/sif/notes/Live_s1910.json rename to assets/serverdata/notes/Live_s1910.json diff --git a/assets/sif/notes/Live_s1911.json b/assets/serverdata/notes/Live_s1911.json similarity index 100% rename from assets/sif/notes/Live_s1911.json rename to assets/serverdata/notes/Live_s1911.json diff --git a/assets/sif/notes/Live_s1912.json b/assets/serverdata/notes/Live_s1912.json similarity index 100% rename from assets/sif/notes/Live_s1912.json rename to assets/serverdata/notes/Live_s1912.json diff --git a/assets/sif/notes/Live_s1913.json b/assets/serverdata/notes/Live_s1913.json similarity index 100% rename from assets/sif/notes/Live_s1913.json rename to assets/serverdata/notes/Live_s1913.json diff --git a/assets/sif/notes/Live_s1914.json b/assets/serverdata/notes/Live_s1914.json similarity index 100% rename from assets/sif/notes/Live_s1914.json rename to assets/serverdata/notes/Live_s1914.json diff --git a/assets/sif/notes/Live_s1915.json b/assets/serverdata/notes/Live_s1915.json similarity index 100% rename from assets/sif/notes/Live_s1915.json rename to assets/serverdata/notes/Live_s1915.json diff --git a/assets/sif/notes/Live_s1916.json b/assets/serverdata/notes/Live_s1916.json similarity index 100% rename from assets/sif/notes/Live_s1916.json rename to assets/serverdata/notes/Live_s1916.json diff --git a/assets/sif/notes/Live_s1917.json b/assets/serverdata/notes/Live_s1917.json similarity index 100% rename from assets/sif/notes/Live_s1917.json rename to assets/serverdata/notes/Live_s1917.json diff --git a/assets/sif/notes/Live_s1918.json b/assets/serverdata/notes/Live_s1918.json similarity index 100% rename from assets/sif/notes/Live_s1918.json rename to assets/serverdata/notes/Live_s1918.json diff --git a/assets/sif/notes/Live_s1919.json b/assets/serverdata/notes/Live_s1919.json similarity index 100% rename from assets/sif/notes/Live_s1919.json rename to assets/serverdata/notes/Live_s1919.json diff --git a/assets/sif/notes/Live_s1920.json b/assets/serverdata/notes/Live_s1920.json similarity index 100% rename from assets/sif/notes/Live_s1920.json rename to assets/serverdata/notes/Live_s1920.json diff --git a/assets/sif/notes/Live_s1921.json b/assets/serverdata/notes/Live_s1921.json similarity index 100% rename from assets/sif/notes/Live_s1921.json rename to assets/serverdata/notes/Live_s1921.json diff --git a/assets/sif/notes/Live_s1922.json b/assets/serverdata/notes/Live_s1922.json similarity index 100% rename from assets/sif/notes/Live_s1922.json rename to assets/serverdata/notes/Live_s1922.json diff --git a/assets/sif/notes/Live_s1923.json b/assets/serverdata/notes/Live_s1923.json similarity index 100% rename from assets/sif/notes/Live_s1923.json rename to assets/serverdata/notes/Live_s1923.json diff --git a/assets/sif/notes/Live_s1924.json b/assets/serverdata/notes/Live_s1924.json similarity index 100% rename from assets/sif/notes/Live_s1924.json rename to assets/serverdata/notes/Live_s1924.json diff --git a/assets/sif/notes/Live_s1925.json b/assets/serverdata/notes/Live_s1925.json similarity index 100% rename from assets/sif/notes/Live_s1925.json rename to assets/serverdata/notes/Live_s1925.json diff --git a/assets/sif/notes/Live_s1926.json b/assets/serverdata/notes/Live_s1926.json similarity index 100% rename from assets/sif/notes/Live_s1926.json rename to assets/serverdata/notes/Live_s1926.json diff --git a/assets/sif/notes/Live_s1927.json b/assets/serverdata/notes/Live_s1927.json similarity index 100% rename from assets/sif/notes/Live_s1927.json rename to assets/serverdata/notes/Live_s1927.json diff --git a/assets/sif/notes/Live_s1928.json b/assets/serverdata/notes/Live_s1928.json similarity index 100% rename from assets/sif/notes/Live_s1928.json rename to assets/serverdata/notes/Live_s1928.json diff --git a/assets/sif/notes/Live_s1929.json b/assets/serverdata/notes/Live_s1929.json similarity index 100% rename from assets/sif/notes/Live_s1929.json rename to assets/serverdata/notes/Live_s1929.json diff --git a/assets/sif/notes/Live_s1930.json b/assets/serverdata/notes/Live_s1930.json similarity index 100% rename from assets/sif/notes/Live_s1930.json rename to assets/serverdata/notes/Live_s1930.json diff --git a/assets/sif/notes/Live_s1931.json b/assets/serverdata/notes/Live_s1931.json similarity index 100% rename from assets/sif/notes/Live_s1931.json rename to assets/serverdata/notes/Live_s1931.json diff --git a/assets/sif/notes/Live_s1932.json b/assets/serverdata/notes/Live_s1932.json similarity index 100% rename from assets/sif/notes/Live_s1932.json rename to assets/serverdata/notes/Live_s1932.json diff --git a/assets/sif/notes/Live_s1933.json b/assets/serverdata/notes/Live_s1933.json similarity index 100% rename from assets/sif/notes/Live_s1933.json rename to assets/serverdata/notes/Live_s1933.json diff --git a/assets/sif/notes/Live_s1934.json b/assets/serverdata/notes/Live_s1934.json similarity index 100% rename from assets/sif/notes/Live_s1934.json rename to assets/serverdata/notes/Live_s1934.json diff --git a/assets/sif/notes/Live_s1935.json b/assets/serverdata/notes/Live_s1935.json similarity index 100% rename from assets/sif/notes/Live_s1935.json rename to assets/serverdata/notes/Live_s1935.json diff --git a/assets/sif/notes/Live_s1936.json b/assets/serverdata/notes/Live_s1936.json similarity index 100% rename from assets/sif/notes/Live_s1936.json rename to assets/serverdata/notes/Live_s1936.json diff --git a/assets/sif/notes/Live_s1937.json b/assets/serverdata/notes/Live_s1937.json similarity index 100% rename from assets/sif/notes/Live_s1937.json rename to assets/serverdata/notes/Live_s1937.json diff --git a/assets/sif/notes/Live_s1938.json b/assets/serverdata/notes/Live_s1938.json similarity index 100% rename from assets/sif/notes/Live_s1938.json rename to assets/serverdata/notes/Live_s1938.json diff --git a/assets/sif/notes/Live_s1939.json b/assets/serverdata/notes/Live_s1939.json similarity index 100% rename from assets/sif/notes/Live_s1939.json rename to assets/serverdata/notes/Live_s1939.json diff --git a/assets/sif/notes/Live_s1940.json b/assets/serverdata/notes/Live_s1940.json similarity index 100% rename from assets/sif/notes/Live_s1940.json rename to assets/serverdata/notes/Live_s1940.json diff --git a/assets/sif/notes/Live_s1941.json b/assets/serverdata/notes/Live_s1941.json similarity index 100% rename from assets/sif/notes/Live_s1941.json rename to assets/serverdata/notes/Live_s1941.json diff --git a/assets/sif/notes/Live_s1942.json b/assets/serverdata/notes/Live_s1942.json similarity index 100% rename from assets/sif/notes/Live_s1942.json rename to assets/serverdata/notes/Live_s1942.json diff --git a/assets/sif/notes/Live_s1943.json b/assets/serverdata/notes/Live_s1943.json similarity index 100% rename from assets/sif/notes/Live_s1943.json rename to assets/serverdata/notes/Live_s1943.json diff --git a/assets/sif/notes/Live_s1944.json b/assets/serverdata/notes/Live_s1944.json similarity index 100% rename from assets/sif/notes/Live_s1944.json rename to assets/serverdata/notes/Live_s1944.json diff --git a/assets/sif/notes/Live_s1945.json b/assets/serverdata/notes/Live_s1945.json similarity index 100% rename from assets/sif/notes/Live_s1945.json rename to assets/serverdata/notes/Live_s1945.json diff --git a/assets/sif/notes/Live_s1946.json b/assets/serverdata/notes/Live_s1946.json similarity index 100% rename from assets/sif/notes/Live_s1946.json rename to assets/serverdata/notes/Live_s1946.json diff --git a/assets/sif/notes/Live_s1947.json b/assets/serverdata/notes/Live_s1947.json similarity index 100% rename from assets/sif/notes/Live_s1947.json rename to assets/serverdata/notes/Live_s1947.json diff --git a/assets/sif/notes/Live_s1948.json b/assets/serverdata/notes/Live_s1948.json similarity index 100% rename from assets/sif/notes/Live_s1948.json rename to assets/serverdata/notes/Live_s1948.json diff --git a/assets/sif/notes/Live_s1949.json b/assets/serverdata/notes/Live_s1949.json similarity index 100% rename from assets/sif/notes/Live_s1949.json rename to assets/serverdata/notes/Live_s1949.json diff --git a/assets/sif/notes/Live_s1950.json b/assets/serverdata/notes/Live_s1950.json similarity index 100% rename from assets/sif/notes/Live_s1950.json rename to assets/serverdata/notes/Live_s1950.json diff --git a/assets/sif/notes/Live_s1951.json b/assets/serverdata/notes/Live_s1951.json similarity index 100% rename from assets/sif/notes/Live_s1951.json rename to assets/serverdata/notes/Live_s1951.json diff --git a/assets/sif/notes/Live_s1952.json b/assets/serverdata/notes/Live_s1952.json similarity index 100% rename from assets/sif/notes/Live_s1952.json rename to assets/serverdata/notes/Live_s1952.json diff --git a/assets/sif/notes/Live_s1953.json b/assets/serverdata/notes/Live_s1953.json similarity index 100% rename from assets/sif/notes/Live_s1953.json rename to assets/serverdata/notes/Live_s1953.json diff --git a/assets/sif/notes/Live_s1954.json b/assets/serverdata/notes/Live_s1954.json similarity index 100% rename from assets/sif/notes/Live_s1954.json rename to assets/serverdata/notes/Live_s1954.json diff --git a/assets/sif/notes/Live_s1955.json b/assets/serverdata/notes/Live_s1955.json similarity index 100% rename from assets/sif/notes/Live_s1955.json rename to assets/serverdata/notes/Live_s1955.json diff --git a/assets/sif/notes/Live_s1956.json b/assets/serverdata/notes/Live_s1956.json similarity index 100% rename from assets/sif/notes/Live_s1956.json rename to assets/serverdata/notes/Live_s1956.json diff --git a/assets/sif/notes/Live_s1957.json b/assets/serverdata/notes/Live_s1957.json similarity index 100% rename from assets/sif/notes/Live_s1957.json rename to assets/serverdata/notes/Live_s1957.json diff --git a/assets/sif/notes/Live_s1958.json b/assets/serverdata/notes/Live_s1958.json similarity index 100% rename from assets/sif/notes/Live_s1958.json rename to assets/serverdata/notes/Live_s1958.json diff --git a/assets/sif/notes/Live_s1959.json b/assets/serverdata/notes/Live_s1959.json similarity index 100% rename from assets/sif/notes/Live_s1959.json rename to assets/serverdata/notes/Live_s1959.json diff --git a/assets/sif/notes/Live_s1960.json b/assets/serverdata/notes/Live_s1960.json similarity index 100% rename from assets/sif/notes/Live_s1960.json rename to assets/serverdata/notes/Live_s1960.json diff --git a/assets/sif/notes/Live_s1961.json b/assets/serverdata/notes/Live_s1961.json similarity index 100% rename from assets/sif/notes/Live_s1961.json rename to assets/serverdata/notes/Live_s1961.json diff --git a/assets/sif/notes/Live_s1962.json b/assets/serverdata/notes/Live_s1962.json similarity index 100% rename from assets/sif/notes/Live_s1962.json rename to assets/serverdata/notes/Live_s1962.json diff --git a/assets/sif/notes/Live_s1963.json b/assets/serverdata/notes/Live_s1963.json similarity index 100% rename from assets/sif/notes/Live_s1963.json rename to assets/serverdata/notes/Live_s1963.json diff --git a/assets/sif/notes/Live_s1964.json b/assets/serverdata/notes/Live_s1964.json similarity index 100% rename from assets/sif/notes/Live_s1964.json rename to assets/serverdata/notes/Live_s1964.json diff --git a/assets/sif/notes/Live_s1965.json b/assets/serverdata/notes/Live_s1965.json similarity index 100% rename from assets/sif/notes/Live_s1965.json rename to assets/serverdata/notes/Live_s1965.json diff --git a/assets/sif/notes/Live_s1966.json b/assets/serverdata/notes/Live_s1966.json similarity index 100% rename from assets/sif/notes/Live_s1966.json rename to assets/serverdata/notes/Live_s1966.json diff --git a/assets/sif/notes/Live_s1967.json b/assets/serverdata/notes/Live_s1967.json similarity index 100% rename from assets/sif/notes/Live_s1967.json rename to assets/serverdata/notes/Live_s1967.json diff --git a/assets/sif/notes/Live_s1968.json b/assets/serverdata/notes/Live_s1968.json similarity index 100% rename from assets/sif/notes/Live_s1968.json rename to assets/serverdata/notes/Live_s1968.json diff --git a/assets/sif/notes/Live_s1969.json b/assets/serverdata/notes/Live_s1969.json similarity index 100% rename from assets/sif/notes/Live_s1969.json rename to assets/serverdata/notes/Live_s1969.json diff --git a/assets/sif/notes/Live_s1970.json b/assets/serverdata/notes/Live_s1970.json similarity index 100% rename from assets/sif/notes/Live_s1970.json rename to assets/serverdata/notes/Live_s1970.json diff --git a/assets/sif/notes/Live_s1971.json b/assets/serverdata/notes/Live_s1971.json similarity index 100% rename from assets/sif/notes/Live_s1971.json rename to assets/serverdata/notes/Live_s1971.json diff --git a/assets/sif/notes/Live_s1972.json b/assets/serverdata/notes/Live_s1972.json similarity index 100% rename from assets/sif/notes/Live_s1972.json rename to assets/serverdata/notes/Live_s1972.json diff --git a/assets/sif/notes/Live_s1973.json b/assets/serverdata/notes/Live_s1973.json similarity index 100% rename from assets/sif/notes/Live_s1973.json rename to assets/serverdata/notes/Live_s1973.json diff --git a/assets/sif/notes/Live_s1974.json b/assets/serverdata/notes/Live_s1974.json similarity index 100% rename from assets/sif/notes/Live_s1974.json rename to assets/serverdata/notes/Live_s1974.json diff --git a/assets/sif/notes/Live_s1975.json b/assets/serverdata/notes/Live_s1975.json similarity index 100% rename from assets/sif/notes/Live_s1975.json rename to assets/serverdata/notes/Live_s1975.json diff --git a/assets/sif/notes/Live_s1976.json b/assets/serverdata/notes/Live_s1976.json similarity index 100% rename from assets/sif/notes/Live_s1976.json rename to assets/serverdata/notes/Live_s1976.json diff --git a/assets/sif/notes/Live_s1977.json b/assets/serverdata/notes/Live_s1977.json similarity index 100% rename from assets/sif/notes/Live_s1977.json rename to assets/serverdata/notes/Live_s1977.json diff --git a/assets/sif/notes/Live_s1978.json b/assets/serverdata/notes/Live_s1978.json similarity index 100% rename from assets/sif/notes/Live_s1978.json rename to assets/serverdata/notes/Live_s1978.json diff --git a/assets/sif/notes/Live_s1979.json b/assets/serverdata/notes/Live_s1979.json similarity index 100% rename from assets/sif/notes/Live_s1979.json rename to assets/serverdata/notes/Live_s1979.json diff --git a/assets/sif/notes/Live_s1980.json b/assets/serverdata/notes/Live_s1980.json similarity index 100% rename from assets/sif/notes/Live_s1980.json rename to assets/serverdata/notes/Live_s1980.json diff --git a/assets/sif/notes/Live_s1981.json b/assets/serverdata/notes/Live_s1981.json similarity index 100% rename from assets/sif/notes/Live_s1981.json rename to assets/serverdata/notes/Live_s1981.json diff --git a/assets/sif/notes/Live_s1982.json b/assets/serverdata/notes/Live_s1982.json similarity index 100% rename from assets/sif/notes/Live_s1982.json rename to assets/serverdata/notes/Live_s1982.json diff --git a/assets/sif/notes/Live_s1983.json b/assets/serverdata/notes/Live_s1983.json similarity index 100% rename from assets/sif/notes/Live_s1983.json rename to assets/serverdata/notes/Live_s1983.json diff --git a/assets/sif/notes/Live_s1984.json b/assets/serverdata/notes/Live_s1984.json similarity index 100% rename from assets/sif/notes/Live_s1984.json rename to assets/serverdata/notes/Live_s1984.json diff --git a/assets/sif/notes/Live_s1985.json b/assets/serverdata/notes/Live_s1985.json similarity index 100% rename from assets/sif/notes/Live_s1985.json rename to assets/serverdata/notes/Live_s1985.json diff --git a/assets/sif/notes/Live_s1986.json b/assets/serverdata/notes/Live_s1986.json similarity index 100% rename from assets/sif/notes/Live_s1986.json rename to assets/serverdata/notes/Live_s1986.json diff --git a/assets/sif/notes/Live_s1987.json b/assets/serverdata/notes/Live_s1987.json similarity index 100% rename from assets/sif/notes/Live_s1987.json rename to assets/serverdata/notes/Live_s1987.json diff --git a/assets/sif/notes/Live_s1988.json b/assets/serverdata/notes/Live_s1988.json similarity index 100% rename from assets/sif/notes/Live_s1988.json rename to assets/serverdata/notes/Live_s1988.json diff --git a/assets/sif/notes/Live_s1989.json b/assets/serverdata/notes/Live_s1989.json similarity index 100% rename from assets/sif/notes/Live_s1989.json rename to assets/serverdata/notes/Live_s1989.json diff --git a/assets/sif/notes/Live_s1990.json b/assets/serverdata/notes/Live_s1990.json similarity index 100% rename from assets/sif/notes/Live_s1990.json rename to assets/serverdata/notes/Live_s1990.json diff --git a/assets/sif/notes/Live_s1991.json b/assets/serverdata/notes/Live_s1991.json similarity index 100% rename from assets/sif/notes/Live_s1991.json rename to assets/serverdata/notes/Live_s1991.json diff --git a/assets/sif/notes/Live_s1992.json b/assets/serverdata/notes/Live_s1992.json similarity index 100% rename from assets/sif/notes/Live_s1992.json rename to assets/serverdata/notes/Live_s1992.json diff --git a/assets/sif/notes/Live_s1993.json b/assets/serverdata/notes/Live_s1993.json similarity index 100% rename from assets/sif/notes/Live_s1993.json rename to assets/serverdata/notes/Live_s1993.json diff --git a/assets/sif/notes/Live_s1994.json b/assets/serverdata/notes/Live_s1994.json similarity index 100% rename from assets/sif/notes/Live_s1994.json rename to assets/serverdata/notes/Live_s1994.json diff --git a/assets/sif/notes/Live_s1995.json b/assets/serverdata/notes/Live_s1995.json similarity index 100% rename from assets/sif/notes/Live_s1995.json rename to assets/serverdata/notes/Live_s1995.json diff --git a/assets/sif/notes/Live_s1996.json b/assets/serverdata/notes/Live_s1996.json similarity index 100% rename from assets/sif/notes/Live_s1996.json rename to assets/serverdata/notes/Live_s1996.json diff --git a/assets/sif/notes/Live_s1997.json b/assets/serverdata/notes/Live_s1997.json similarity index 100% rename from assets/sif/notes/Live_s1997.json rename to assets/serverdata/notes/Live_s1997.json diff --git a/assets/sif/notes/Live_s1998.json b/assets/serverdata/notes/Live_s1998.json similarity index 100% rename from assets/sif/notes/Live_s1998.json rename to assets/serverdata/notes/Live_s1998.json diff --git a/assets/sif/notes/Live_s1999.json b/assets/serverdata/notes/Live_s1999.json similarity index 100% rename from assets/sif/notes/Live_s1999.json rename to assets/serverdata/notes/Live_s1999.json diff --git a/assets/sif/notes/Live_s2000.json b/assets/serverdata/notes/Live_s2000.json similarity index 100% rename from assets/sif/notes/Live_s2000.json rename to assets/serverdata/notes/Live_s2000.json diff --git a/assets/sif/notes/Live_s20001.json b/assets/serverdata/notes/Live_s20001.json similarity index 100% rename from assets/sif/notes/Live_s20001.json rename to assets/serverdata/notes/Live_s20001.json diff --git a/assets/sif/notes/Live_s20002.json b/assets/serverdata/notes/Live_s20002.json similarity index 100% rename from assets/sif/notes/Live_s20002.json rename to assets/serverdata/notes/Live_s20002.json diff --git a/assets/sif/notes/Live_s20003.json b/assets/serverdata/notes/Live_s20003.json similarity index 100% rename from assets/sif/notes/Live_s20003.json rename to assets/serverdata/notes/Live_s20003.json diff --git a/assets/sif/notes/Live_s20004.json b/assets/serverdata/notes/Live_s20004.json similarity index 100% rename from assets/sif/notes/Live_s20004.json rename to assets/serverdata/notes/Live_s20004.json diff --git a/assets/sif/notes/Live_s20005.json b/assets/serverdata/notes/Live_s20005.json similarity index 100% rename from assets/sif/notes/Live_s20005.json rename to assets/serverdata/notes/Live_s20005.json diff --git a/assets/sif/notes/Live_s20006.json b/assets/serverdata/notes/Live_s20006.json similarity index 100% rename from assets/sif/notes/Live_s20006.json rename to assets/serverdata/notes/Live_s20006.json diff --git a/assets/sif/notes/Live_s20007.json b/assets/serverdata/notes/Live_s20007.json similarity index 100% rename from assets/sif/notes/Live_s20007.json rename to assets/serverdata/notes/Live_s20007.json diff --git a/assets/sif/notes/Live_s20008.json b/assets/serverdata/notes/Live_s20008.json similarity index 100% rename from assets/sif/notes/Live_s20008.json rename to assets/serverdata/notes/Live_s20008.json diff --git a/assets/sif/notes/Live_s20009.json b/assets/serverdata/notes/Live_s20009.json similarity index 100% rename from assets/sif/notes/Live_s20009.json rename to assets/serverdata/notes/Live_s20009.json diff --git a/assets/sif/notes/Live_s2001.json b/assets/serverdata/notes/Live_s2001.json similarity index 100% rename from assets/sif/notes/Live_s2001.json rename to assets/serverdata/notes/Live_s2001.json diff --git a/assets/sif/notes/Live_s20010.json b/assets/serverdata/notes/Live_s20010.json similarity index 100% rename from assets/sif/notes/Live_s20010.json rename to assets/serverdata/notes/Live_s20010.json diff --git a/assets/sif/notes/Live_s20011.json b/assets/serverdata/notes/Live_s20011.json similarity index 100% rename from assets/sif/notes/Live_s20011.json rename to assets/serverdata/notes/Live_s20011.json diff --git a/assets/sif/notes/Live_s20012.json b/assets/serverdata/notes/Live_s20012.json similarity index 100% rename from assets/sif/notes/Live_s20012.json rename to assets/serverdata/notes/Live_s20012.json diff --git a/assets/sif/notes/Live_s20013.json b/assets/serverdata/notes/Live_s20013.json similarity index 100% rename from assets/sif/notes/Live_s20013.json rename to assets/serverdata/notes/Live_s20013.json diff --git a/assets/sif/notes/Live_s20014.json b/assets/serverdata/notes/Live_s20014.json similarity index 100% rename from assets/sif/notes/Live_s20014.json rename to assets/serverdata/notes/Live_s20014.json diff --git a/assets/sif/notes/Live_s20015.json b/assets/serverdata/notes/Live_s20015.json similarity index 100% rename from assets/sif/notes/Live_s20015.json rename to assets/serverdata/notes/Live_s20015.json diff --git a/assets/sif/notes/Live_s2002.json b/assets/serverdata/notes/Live_s2002.json similarity index 100% rename from assets/sif/notes/Live_s2002.json rename to assets/serverdata/notes/Live_s2002.json diff --git a/assets/sif/notes/Live_s2003.json b/assets/serverdata/notes/Live_s2003.json similarity index 100% rename from assets/sif/notes/Live_s2003.json rename to assets/serverdata/notes/Live_s2003.json diff --git a/assets/sif/notes/Live_s2004.json b/assets/serverdata/notes/Live_s2004.json similarity index 100% rename from assets/sif/notes/Live_s2004.json rename to assets/serverdata/notes/Live_s2004.json diff --git a/assets/sif/notes/Live_s2005.json b/assets/serverdata/notes/Live_s2005.json similarity index 100% rename from assets/sif/notes/Live_s2005.json rename to assets/serverdata/notes/Live_s2005.json diff --git a/assets/sif/notes/Live_s2006.json b/assets/serverdata/notes/Live_s2006.json similarity index 100% rename from assets/sif/notes/Live_s2006.json rename to assets/serverdata/notes/Live_s2006.json diff --git a/assets/sif/notes/Live_s2007.json b/assets/serverdata/notes/Live_s2007.json similarity index 100% rename from assets/sif/notes/Live_s2007.json rename to assets/serverdata/notes/Live_s2007.json diff --git a/assets/sif/notes/Live_s2008.json b/assets/serverdata/notes/Live_s2008.json similarity index 100% rename from assets/sif/notes/Live_s2008.json rename to assets/serverdata/notes/Live_s2008.json diff --git a/assets/sif/notes/Live_s2009.json b/assets/serverdata/notes/Live_s2009.json similarity index 100% rename from assets/sif/notes/Live_s2009.json rename to assets/serverdata/notes/Live_s2009.json diff --git a/assets/sif/notes/Live_s2010.json b/assets/serverdata/notes/Live_s2010.json similarity index 100% rename from assets/sif/notes/Live_s2010.json rename to assets/serverdata/notes/Live_s2010.json diff --git a/assets/sif/notes/Live_s2011.json b/assets/serverdata/notes/Live_s2011.json similarity index 100% rename from assets/sif/notes/Live_s2011.json rename to assets/serverdata/notes/Live_s2011.json diff --git a/assets/sif/notes/Live_s2012.json b/assets/serverdata/notes/Live_s2012.json similarity index 100% rename from assets/sif/notes/Live_s2012.json rename to assets/serverdata/notes/Live_s2012.json diff --git a/assets/sif/notes/Live_s2013.json b/assets/serverdata/notes/Live_s2013.json similarity index 100% rename from assets/sif/notes/Live_s2013.json rename to assets/serverdata/notes/Live_s2013.json diff --git a/assets/sif/notes/Live_s2014.json b/assets/serverdata/notes/Live_s2014.json similarity index 100% rename from assets/sif/notes/Live_s2014.json rename to assets/serverdata/notes/Live_s2014.json diff --git a/assets/sif/notes/Live_s2015.json b/assets/serverdata/notes/Live_s2015.json similarity index 100% rename from assets/sif/notes/Live_s2015.json rename to assets/serverdata/notes/Live_s2015.json diff --git a/assets/sif/notes/Live_s2016.json b/assets/serverdata/notes/Live_s2016.json similarity index 100% rename from assets/sif/notes/Live_s2016.json rename to assets/serverdata/notes/Live_s2016.json diff --git a/assets/sif/notes/Live_s2017.json b/assets/serverdata/notes/Live_s2017.json similarity index 100% rename from assets/sif/notes/Live_s2017.json rename to assets/serverdata/notes/Live_s2017.json diff --git a/assets/sif/notes/Live_s2018.json b/assets/serverdata/notes/Live_s2018.json similarity index 100% rename from assets/sif/notes/Live_s2018.json rename to assets/serverdata/notes/Live_s2018.json diff --git a/assets/sif/notes/Live_s2019.json b/assets/serverdata/notes/Live_s2019.json similarity index 100% rename from assets/sif/notes/Live_s2019.json rename to assets/serverdata/notes/Live_s2019.json diff --git a/assets/sif/notes/Live_s2020.json b/assets/serverdata/notes/Live_s2020.json similarity index 100% rename from assets/sif/notes/Live_s2020.json rename to assets/serverdata/notes/Live_s2020.json diff --git a/assets/sif/notes/Live_s2021.json b/assets/serverdata/notes/Live_s2021.json similarity index 100% rename from assets/sif/notes/Live_s2021.json rename to assets/serverdata/notes/Live_s2021.json diff --git a/assets/sif/notes/Live_s2022.json b/assets/serverdata/notes/Live_s2022.json similarity index 100% rename from assets/sif/notes/Live_s2022.json rename to assets/serverdata/notes/Live_s2022.json diff --git a/assets/sif/notes/Live_s2023.json b/assets/serverdata/notes/Live_s2023.json similarity index 100% rename from assets/sif/notes/Live_s2023.json rename to assets/serverdata/notes/Live_s2023.json diff --git a/assets/sif/notes/Live_s2024.json b/assets/serverdata/notes/Live_s2024.json similarity index 100% rename from assets/sif/notes/Live_s2024.json rename to assets/serverdata/notes/Live_s2024.json diff --git a/assets/sif/notes/Live_s2025.json b/assets/serverdata/notes/Live_s2025.json similarity index 100% rename from assets/sif/notes/Live_s2025.json rename to assets/serverdata/notes/Live_s2025.json diff --git a/assets/sif/notes/Live_s2026.json b/assets/serverdata/notes/Live_s2026.json similarity index 100% rename from assets/sif/notes/Live_s2026.json rename to assets/serverdata/notes/Live_s2026.json diff --git a/assets/sif/notes/Live_s2027.json b/assets/serverdata/notes/Live_s2027.json similarity index 100% rename from assets/sif/notes/Live_s2027.json rename to assets/serverdata/notes/Live_s2027.json diff --git a/assets/sif/notes/Live_s2028.json b/assets/serverdata/notes/Live_s2028.json similarity index 100% rename from assets/sif/notes/Live_s2028.json rename to assets/serverdata/notes/Live_s2028.json diff --git a/assets/sif/notes/Live_s2029.json b/assets/serverdata/notes/Live_s2029.json similarity index 100% rename from assets/sif/notes/Live_s2029.json rename to assets/serverdata/notes/Live_s2029.json diff --git a/assets/sif/notes/Live_s2030.json b/assets/serverdata/notes/Live_s2030.json similarity index 100% rename from assets/sif/notes/Live_s2030.json rename to assets/serverdata/notes/Live_s2030.json diff --git a/assets/sif/notes/Live_s2031.json b/assets/serverdata/notes/Live_s2031.json similarity index 100% rename from assets/sif/notes/Live_s2031.json rename to assets/serverdata/notes/Live_s2031.json diff --git a/assets/sif/notes/Live_s2032.json b/assets/serverdata/notes/Live_s2032.json similarity index 100% rename from assets/sif/notes/Live_s2032.json rename to assets/serverdata/notes/Live_s2032.json diff --git a/assets/sif/notes/Live_s2033.json b/assets/serverdata/notes/Live_s2033.json similarity index 100% rename from assets/sif/notes/Live_s2033.json rename to assets/serverdata/notes/Live_s2033.json diff --git a/assets/sif/notes/Live_s2034.json b/assets/serverdata/notes/Live_s2034.json similarity index 100% rename from assets/sif/notes/Live_s2034.json rename to assets/serverdata/notes/Live_s2034.json diff --git a/assets/sif/notes/Live_s2035.json b/assets/serverdata/notes/Live_s2035.json similarity index 100% rename from assets/sif/notes/Live_s2035.json rename to assets/serverdata/notes/Live_s2035.json diff --git a/assets/sif/notes/Live_s2036.json b/assets/serverdata/notes/Live_s2036.json similarity index 100% rename from assets/sif/notes/Live_s2036.json rename to assets/serverdata/notes/Live_s2036.json diff --git a/assets/sif/notes/Live_s2037.json b/assets/serverdata/notes/Live_s2037.json similarity index 100% rename from assets/sif/notes/Live_s2037.json rename to assets/serverdata/notes/Live_s2037.json diff --git a/assets/sif/notes/Live_s2038.json b/assets/serverdata/notes/Live_s2038.json similarity index 100% rename from assets/sif/notes/Live_s2038.json rename to assets/serverdata/notes/Live_s2038.json diff --git a/assets/sif/notes/Live_s2039.json b/assets/serverdata/notes/Live_s2039.json similarity index 100% rename from assets/sif/notes/Live_s2039.json rename to assets/serverdata/notes/Live_s2039.json diff --git a/assets/sif/notes/Live_s2040.json b/assets/serverdata/notes/Live_s2040.json similarity index 100% rename from assets/sif/notes/Live_s2040.json rename to assets/serverdata/notes/Live_s2040.json diff --git a/assets/sif/notes/Live_s2041.json b/assets/serverdata/notes/Live_s2041.json similarity index 100% rename from assets/sif/notes/Live_s2041.json rename to assets/serverdata/notes/Live_s2041.json diff --git a/assets/sif/notes/Live_s2042.json b/assets/serverdata/notes/Live_s2042.json similarity index 100% rename from assets/sif/notes/Live_s2042.json rename to assets/serverdata/notes/Live_s2042.json diff --git a/assets/sif/notes/Live_s2043.json b/assets/serverdata/notes/Live_s2043.json similarity index 100% rename from assets/sif/notes/Live_s2043.json rename to assets/serverdata/notes/Live_s2043.json diff --git a/assets/sif/notes/Live_s2044.json b/assets/serverdata/notes/Live_s2044.json similarity index 100% rename from assets/sif/notes/Live_s2044.json rename to assets/serverdata/notes/Live_s2044.json diff --git a/assets/sif/partylist.json b/assets/serverdata/partylist.json similarity index 100% rename from assets/sif/partylist.json rename to assets/serverdata/partylist.json diff --git a/assets/sif/reward.json b/assets/serverdata/reward.json similarity index 100% rename from assets/sif/reward.json rename to assets/serverdata/reward.json diff --git a/assets/sif/stamp.json b/assets/serverdata/stamp.json similarity index 100% rename from assets/sif/stamp.json rename to assets/serverdata/stamp.json diff --git a/assets/sif/subreward.json b/assets/serverdata/subreward.json similarity index 100% rename from assets/sif/subreward.json rename to assets/serverdata/subreward.json diff --git a/assets/ss01.png b/assets/ss01.png deleted file mode 100644 index ab1de20..0000000 Binary files a/assets/ss01.png and /dev/null differ diff --git a/assets/ss02.png b/assets/ss02.png deleted file mode 100644 index f123960..0000000 Binary files a/assets/ss02.png and /dev/null differ diff --git a/assets/ss03.png b/assets/ss03.png deleted file mode 100644 index af0fa06..0000000 Binary files a/assets/ss03.png and /dev/null differ diff --git a/static/.gitignore b/assets/static/.gitignore similarity index 100% rename from static/.gitignore rename to assets/static/.gitignore diff --git a/static/css/base.css b/assets/static/css/base.css similarity index 100% rename from static/css/base.css rename to assets/static/css/base.css diff --git a/static/css/layui.css b/assets/static/css/layui.css similarity index 100% rename from static/css/layui.css rename to assets/static/css/layui.css diff --git a/static/css/ll-perfect-scrollbar.css b/assets/static/css/ll-perfect-scrollbar.css similarity index 100% rename from static/css/ll-perfect-scrollbar.css rename to assets/static/css/ll-perfect-scrollbar.css diff --git a/static/css/perfect-scrollbar.css b/assets/static/css/perfect-scrollbar.css similarity index 100% rename from static/css/perfect-scrollbar.css rename to assets/static/css/perfect-scrollbar.css diff --git a/static/css/style.css b/assets/static/css/style.css similarity index 100% rename from static/css/style.css rename to assets/static/css/style.css diff --git a/static/css/window.css b/assets/static/css/window.css similarity index 100% rename from static/css/window.css rename to assets/static/css/window.css diff --git a/static/font/iconfont.eot b/assets/static/font/iconfont.eot similarity index 100% rename from static/font/iconfont.eot rename to assets/static/font/iconfont.eot diff --git a/static/font/iconfont.svg b/assets/static/font/iconfont.svg similarity index 100% rename from static/font/iconfont.svg rename to assets/static/font/iconfont.svg diff --git a/static/font/iconfont.ttf b/assets/static/font/iconfont.ttf similarity index 100% rename from static/font/iconfont.ttf rename to assets/static/font/iconfont.ttf diff --git a/static/font/iconfont.woff b/assets/static/font/iconfont.woff similarity index 100% rename from static/font/iconfont.woff rename to assets/static/font/iconfont.woff diff --git a/static/font/iconfont.woff2 b/assets/static/font/iconfont.woff2 similarity index 100% rename from static/font/iconfont.woff2 rename to assets/static/font/iconfont.woff2 diff --git a/static/images/15047550942873.jpg b/assets/static/images/15047550942873.jpg similarity index 100% rename from static/images/15047550942873.jpg rename to assets/static/images/15047550942873.jpg diff --git a/static/images/15047551059201.jpg b/assets/static/images/15047551059201.jpg similarity index 100% rename from static/images/15047551059201.jpg rename to assets/static/images/15047551059201.jpg diff --git a/static/images/15047551145790.jpg b/assets/static/images/15047551145790.jpg similarity index 100% rename from static/images/15047551145790.jpg rename to assets/static/images/15047551145790.jpg diff --git a/static/images/15047551242040.jpg b/assets/static/images/15047551242040.jpg similarity index 100% rename from static/images/15047551242040.jpg rename to assets/static/images/15047551242040.jpg diff --git a/static/images/15047553374283.jpg b/assets/static/images/15047553374283.jpg similarity index 100% rename from static/images/15047553374283.jpg rename to assets/static/images/15047553374283.jpg diff --git a/static/images/15047553496606.jpg b/assets/static/images/15047553496606.jpg similarity index 100% rename from static/images/15047553496606.jpg rename to assets/static/images/15047553496606.jpg diff --git a/static/images/15047553611357.jpg b/assets/static/images/15047553611357.jpg similarity index 100% rename from static/images/15047553611357.jpg rename to assets/static/images/15047553611357.jpg diff --git a/static/images/15047553728636.jpg b/assets/static/images/15047553728636.jpg similarity index 100% rename from static/images/15047553728636.jpg rename to assets/static/images/15047553728636.jpg diff --git a/static/images/15047553849518.jpg b/assets/static/images/15047553849518.jpg similarity index 100% rename from static/images/15047553849518.jpg rename to assets/static/images/15047553849518.jpg diff --git a/static/images/15047553982300.jpg b/assets/static/images/15047553982300.jpg similarity index 100% rename from static/images/15047553982300.jpg rename to assets/static/images/15047553982300.jpg diff --git a/static/images/15047554108052.jpg b/assets/static/images/15047554108052.jpg similarity index 100% rename from static/images/15047554108052.jpg rename to assets/static/images/15047554108052.jpg diff --git a/static/images/15047554203428.jpg b/assets/static/images/15047554203428.jpg similarity index 100% rename from static/images/15047554203428.jpg rename to assets/static/images/15047554203428.jpg diff --git a/static/images/15047554315307.jpg b/assets/static/images/15047554315307.jpg similarity index 100% rename from static/images/15047554315307.jpg rename to assets/static/images/15047554315307.jpg diff --git a/static/images/15047554481319.jpg b/assets/static/images/15047554481319.jpg similarity index 100% rename from static/images/15047554481319.jpg rename to assets/static/images/15047554481319.jpg diff --git a/static/images/15047554596230.jpg b/assets/static/images/15047554596230.jpg similarity index 100% rename from static/images/15047554596230.jpg rename to assets/static/images/15047554596230.jpg diff --git a/static/images/15047554774569.jpg b/assets/static/images/15047554774569.jpg similarity index 100% rename from static/images/15047554774569.jpg rename to assets/static/images/15047554774569.jpg diff --git a/static/images/15047554922924.jpg b/assets/static/images/15047554922924.jpg similarity index 100% rename from static/images/15047554922924.jpg rename to assets/static/images/15047554922924.jpg diff --git a/static/images/15047555087747.jpg b/assets/static/images/15047555087747.jpg similarity index 100% rename from static/images/15047555087747.jpg rename to assets/static/images/15047555087747.jpg diff --git a/static/images/15047555219572.jpg b/assets/static/images/15047555219572.jpg similarity index 100% rename from static/images/15047555219572.jpg rename to assets/static/images/15047555219572.jpg diff --git a/static/images/15047555411780.jpg b/assets/static/images/15047555411780.jpg similarity index 100% rename from static/images/15047555411780.jpg rename to assets/static/images/15047555411780.jpg diff --git a/static/images/15047555499746.jpg b/assets/static/images/15047555499746.jpg similarity index 100% rename from static/images/15047555499746.jpg rename to assets/static/images/15047555499746.jpg diff --git a/static/images/15047555585712.jpg b/assets/static/images/15047555585712.jpg similarity index 100% rename from static/images/15047555585712.jpg rename to assets/static/images/15047555585712.jpg diff --git a/static/images/15047555704112.jpg b/assets/static/images/15047555704112.jpg similarity index 100% rename from static/images/15047555704112.jpg rename to assets/static/images/15047555704112.jpg diff --git a/static/images/15047555798773.jpg b/assets/static/images/15047555798773.jpg similarity index 100% rename from static/images/15047555798773.jpg rename to assets/static/images/15047555798773.jpg diff --git a/static/images/15047555888980.jpg b/assets/static/images/15047555888980.jpg similarity index 100% rename from static/images/15047555888980.jpg rename to assets/static/images/15047555888980.jpg diff --git a/static/images/15088959186072.jpg b/assets/static/images/15088959186072.jpg similarity index 100% rename from static/images/15088959186072.jpg rename to assets/static/images/15088959186072.jpg diff --git a/static/images/15107324142966.png b/assets/static/images/15107324142966.png similarity index 100% rename from static/images/15107324142966.png rename to assets/static/images/15107324142966.png diff --git a/static/images/15141856059568.jpg b/assets/static/images/15141856059568.jpg similarity index 100% rename from static/images/15141856059568.jpg rename to assets/static/images/15141856059568.jpg diff --git a/static/images/15141862776588.jpg b/assets/static/images/15141862776588.jpg similarity index 100% rename from static/images/15141862776588.jpg rename to assets/static/images/15141862776588.jpg diff --git a/static/images/15141862946556.jpg b/assets/static/images/15141862946556.jpg similarity index 100% rename from static/images/15141862946556.jpg rename to assets/static/images/15141862946556.jpg diff --git a/static/images/15141863126912.jpg b/assets/static/images/15141863126912.jpg similarity index 100% rename from static/images/15141863126912.jpg rename to assets/static/images/15141863126912.jpg diff --git a/static/images/15141863229129.jpg b/assets/static/images/15141863229129.jpg similarity index 100% rename from static/images/15141863229129.jpg rename to assets/static/images/15141863229129.jpg diff --git a/static/images/15141863365919.jpg b/assets/static/images/15141863365919.jpg similarity index 100% rename from static/images/15141863365919.jpg rename to assets/static/images/15141863365919.jpg diff --git a/static/images/15141863483422.jpg b/assets/static/images/15141863483422.jpg similarity index 100% rename from static/images/15141863483422.jpg rename to assets/static/images/15141863483422.jpg diff --git a/static/images/15141863639911.jpg b/assets/static/images/15141863639911.jpg similarity index 100% rename from static/images/15141863639911.jpg rename to assets/static/images/15141863639911.jpg diff --git a/static/images/15141863772178.jpg b/assets/static/images/15141863772178.jpg similarity index 100% rename from static/images/15141863772178.jpg rename to assets/static/images/15141863772178.jpg diff --git a/static/images/15141864261972.jpg b/assets/static/images/15141864261972.jpg similarity index 100% rename from static/images/15141864261972.jpg rename to assets/static/images/15141864261972.jpg diff --git a/static/images/15141864584520.jpg b/assets/static/images/15141864584520.jpg similarity index 100% rename from static/images/15141864584520.jpg rename to assets/static/images/15141864584520.jpg diff --git a/static/images/15141864695842.jpg b/assets/static/images/15141864695842.jpg similarity index 100% rename from static/images/15141864695842.jpg rename to assets/static/images/15141864695842.jpg diff --git a/static/images/15141864804128.jpg b/assets/static/images/15141864804128.jpg similarity index 100% rename from static/images/15141864804128.jpg rename to assets/static/images/15141864804128.jpg diff --git a/static/images/15141864889884.jpg b/assets/static/images/15141864889884.jpg similarity index 100% rename from static/images/15141864889884.jpg rename to assets/static/images/15141864889884.jpg diff --git a/static/images/15141865055652.jpg b/assets/static/images/15141865055652.jpg similarity index 100% rename from static/images/15141865055652.jpg rename to assets/static/images/15141865055652.jpg diff --git a/static/images/15141865133555.jpg b/assets/static/images/15141865133555.jpg similarity index 100% rename from static/images/15141865133555.jpg rename to assets/static/images/15141865133555.jpg diff --git a/static/images/15141865196092.jpg b/assets/static/images/15141865196092.jpg similarity index 100% rename from static/images/15141865196092.jpg rename to assets/static/images/15141865196092.jpg diff --git a/static/images/15238681581968.png b/assets/static/images/15238681581968.png similarity index 100% rename from static/images/15238681581968.png rename to assets/static/images/15238681581968.png diff --git a/static/images/15238694807202.png b/assets/static/images/15238694807202.png similarity index 100% rename from static/images/15238694807202.png rename to assets/static/images/15238694807202.png diff --git a/static/images/15238694919055.png b/assets/static/images/15238694919055.png similarity index 100% rename from static/images/15238694919055.png rename to assets/static/images/15238694919055.png diff --git a/static/images/15238695116848.png b/assets/static/images/15238695116848.png similarity index 100% rename from static/images/15238695116848.png rename to assets/static/images/15238695116848.png diff --git a/static/images/15238695303404.png b/assets/static/images/15238695303404.png similarity index 100% rename from static/images/15238695303404.png rename to assets/static/images/15238695303404.png diff --git a/static/images/15238695455400.png b/assets/static/images/15238695455400.png similarity index 100% rename from static/images/15238695455400.png rename to assets/static/images/15238695455400.png diff --git a/static/images/15238695587056.png b/assets/static/images/15238695587056.png similarity index 100% rename from static/images/15238695587056.png rename to assets/static/images/15238695587056.png diff --git a/static/images/15238695641197.png b/assets/static/images/15238695641197.png similarity index 100% rename from static/images/15238695641197.png rename to assets/static/images/15238695641197.png diff --git a/static/images/15238701747409.png b/assets/static/images/15238701747409.png similarity index 100% rename from static/images/15238701747409.png rename to assets/static/images/15238701747409.png diff --git a/static/images/15238702168776.png b/assets/static/images/15238702168776.png similarity index 100% rename from static/images/15238702168776.png rename to assets/static/images/15238702168776.png diff --git a/static/images/admin/ic_launcher.png b/assets/static/images/admin/ic_launcher.png similarity index 100% rename from static/images/admin/ic_launcher.png rename to assets/static/images/admin/ic_launcher.png diff --git a/static/images/admin/top-bg.jpg b/assets/static/images/admin/top-bg.jpg similarity index 100% rename from static/images/admin/top-bg.jpg rename to assets/static/images/admin/top-bg.jpg diff --git a/static/images/admin/top-bg_2.jpg b/assets/static/images/admin/top-bg_2.jpg similarity index 100% rename from static/images/admin/top-bg_2.jpg rename to assets/static/images/admin/top-bg_2.jpg diff --git a/static/images/bg-left.png b/assets/static/images/bg-left.png similarity index 100% rename from static/images/bg-left.png rename to assets/static/images/bg-left.png diff --git a/static/images/bg-right.png b/assets/static/images/bg-right.png similarity index 100% rename from static/images/bg-right.png rename to assets/static/images/bg-right.png diff --git a/static/images/list-content-bg-on.png b/assets/static/images/list-content-bg-on.png similarity index 100% rename from static/images/list-content-bg-on.png rename to assets/static/images/list-content-bg-on.png diff --git a/static/images/list-content-bg.png b/assets/static/images/list-content-bg.png similarity index 100% rename from static/images/list-content-bg.png rename to assets/static/images/list-content-bg.png diff --git a/static/images/title-banner.png b/assets/static/images/title-banner.png similarity index 100% rename from static/images/title-banner.png rename to assets/static/images/title-banner.png diff --git a/static/js/button.js b/assets/static/js/button.js similarity index 100% rename from static/js/button.js rename to assets/static/js/button.js diff --git a/static/js/layui.js b/assets/static/js/layui.js similarity index 100% rename from static/js/layui.js rename to assets/static/js/layui.js diff --git a/static/js/perfect-scrollbar.min.js b/assets/static/js/perfect-scrollbar.min.js similarity index 100% rename from static/js/perfect-scrollbar.min.js rename to assets/static/js/perfect-scrollbar.min.js diff --git a/static/templates/admin/card.html b/assets/static/templates/admin/card.html similarity index 100% rename from static/templates/admin/card.html rename to assets/static/templates/admin/card.html diff --git a/static/templates/admin/index.html b/assets/static/templates/admin/index.html similarity index 100% rename from static/templates/admin/index.html rename to assets/static/templates/admin/index.html diff --git a/static/templates/admin/login.html b/assets/static/templates/admin/login.html similarity index 100% rename from static/templates/admin/login.html rename to assets/static/templates/admin/login.html diff --git a/static/templates/admin/nav/css.html b/assets/static/templates/admin/nav/css.html similarity index 100% rename from static/templates/admin/nav/css.html rename to assets/static/templates/admin/nav/css.html diff --git a/static/templates/admin/nav/footer.html b/assets/static/templates/admin/nav/footer.html similarity index 100% rename from static/templates/admin/nav/footer.html rename to assets/static/templates/admin/nav/footer.html diff --git a/static/templates/admin/nav/header.html b/assets/static/templates/admin/nav/header.html similarity index 100% rename from static/templates/admin/nav/header.html rename to assets/static/templates/admin/nav/header.html diff --git a/static/templates/admin/nav/side.html b/assets/static/templates/admin/nav/side.html similarity index 100% rename from static/templates/admin/nav/side.html rename to assets/static/templates/admin/nav/side.html diff --git a/static/templates/admin/upload.html b/assets/static/templates/admin/upload.html similarity index 100% rename from static/templates/admin/upload.html rename to assets/static/templates/admin/upload.html diff --git a/static/templates/common/announce.html b/assets/static/templates/common/announce.html similarity index 100% rename from static/templates/common/announce.html rename to assets/static/templates/common/announce.html diff --git a/static/templates/common/manga.html b/assets/static/templates/common/manga.html similarity index 100% rename from static/templates/common/manga.html rename to assets/static/templates/common/manga.html diff --git a/config/config.go b/config/config.go index eae3463..9fb5f1a 100644 --- a/config/config.go +++ b/config/config.go @@ -1,57 +1,90 @@ package config import ( - "honoka-chan/utils" + "encoding/json" + "honoka-chan/pkg/utils" "os" - - _ "modernc.org/sqlite" - "xorm.io/xorm" + "strconv" + "time" ) var ( Conf = &AppConfigs{} - ExampleDb = "assets/data.example.db" - MainDb = "assets/main.db" - UserDb = "assets/data.db" - MainEng *xorm.Engine - UserEng *xorm.Engine - PackageVersion = "97.4.6" PrivateKeyPath = "assets/certs/privatekey.pem" PublicKeyPath = "assets/certs/publickey.pem" ) +type AppConfigs struct { + AppName string `json:"app_name"` + Settings Settings `json:"settings"` + UserPrefs UserPrefs `json:"user_prefs"` +} + +type Settings struct { + ListenPort string `json:"listen_port"` + SifCdnServer string `json:"sif_cdn_server"` +} + +type UserPrefs struct { + Name string `json:"name"` // 用户名 + Level int `json:"level"` // 用户等级 + ExpNumerator int `json:"exp_numerator"` // Exp 分子 + ExpDenominator int `json:"exp_denominator"` // Exp 分母 + GameCoin int `json:"game_coin"` // 游戏金币 + SnsCoin int `json:"sns_coin"` // 游戏爱心 + EnergyMax int `json:"energy_max"` // 体力上限 + OverMaxEnergy int `json:"over_max_energy"` // 实际体力,为 0 时与 EnergyMax 一致 + InviteCode string `json:"invite_code"` // 用户 ID +} + func init() { Conf = Load("./config.json") +} - _, err := os.Stat(UserDb) - if err != nil { - utils.WriteAllText(UserDb, utils.ReadAllText(ExampleDb)) +func DefaultConfigs() *AppConfigs { + return &AppConfigs{ + AppName: "honoka-chan", + Settings: Settings{ + ListenPort: "80", + SifCdnServer: "http://192.168.1.123/static", + }, + UserPrefs: UserPrefs{ + Name: "梦路 @bilibili", + Level: 1028, + ExpNumerator: 1089696, + ExpDenominator: 1207185, + GameCoin: 112124104, + SnsCoin: 0, + EnergyMax: 417, + OverMaxEnergy: 0, + InviteCode: "377385143", + }, } +} - eng, err := xorm.NewEngine("sqlite", MainDb) - if err != nil { - panic(err) +func Load(p string) *AppConfigs { + if !utils.PathExists(p) { + _ = DefaultConfigs().Save(p) } - err = eng.Ping() + c := AppConfigs{} + err := json.Unmarshal([]byte(utils.ReadAllText(p)), &c) if err != nil { - panic(err) + _ = os.Rename(p, p+".backup"+strconv.FormatInt(time.Now().Unix(), 10)) + _ = DefaultConfigs().Save(p) } - MainEng = eng - MainEng.SetMaxOpenConns(50) - MainEng.SetMaxIdleConns(10) + c = AppConfigs{} + _ = json.Unmarshal([]byte(utils.ReadAllText(p)), &c) + return &c +} - eng, err = xorm.NewEngine("sqlite", UserDb) - if err != nil { - panic(err) - } - err = eng.Ping() +func (c *AppConfigs) Save(p string) error { + data, err := json.MarshalIndent(c, "", " ") if err != nil { - panic(err) + return err } - UserEng = eng - UserEng.SetMaxOpenConns(50) - MainEng.SetMaxIdleConns(10) + utils.WriteAllText(p, string(data)) + return nil } diff --git a/config/json.go b/config/json.go deleted file mode 100644 index a65eb37..0000000 --- a/config/json.go +++ /dev/null @@ -1,77 +0,0 @@ -package config - -import ( - "encoding/json" - "honoka-chan/utils" - "os" - "strconv" - "time" -) - -type AppConfigs struct { - AppName string `json:"app_name"` - Settings Settings `json:"settings"` - UserPrefs UserPrefs `json:"user_prefs"` -} - -type Settings struct { - ListenPort string `json:"listen_port"` - SifCdnServer string `json:"sif_cdn_server"` -} - -type UserPrefs struct { - Name string `json:"name"` // 用户名 - Level int `json:"level"` // 用户等级 - ExpNumerator int `json:"exp_numerator"` // Exp 分子 - ExpDenominator int `json:"exp_denominator"` // Exp 分母 - GameCoin int `json:"game_coin"` // 游戏金币 - SnsCoin int `json:"sns_coin"` // 游戏爱心 - EnergyMax int `json:"energy_max"` // 体力上限 - OverMaxEnergy int `json:"over_max_energy"` // 实际体力,为 0 时与 EnergyMax 一致 - InviteCode string `json:"invite_code"` // 用户 ID -} - -func DefaultConfigs() *AppConfigs { - return &AppConfigs{ - AppName: "honoka-chan", - Settings: Settings{ - ListenPort: "80", - SifCdnServer: "http://192.168.1.123/static", - }, - UserPrefs: UserPrefs{ - Name: "梦路 @bilibili", - Level: 1028, - ExpNumerator: 1089696, - ExpDenominator: 1207185, - GameCoin: 112124104, - SnsCoin: 0, - EnergyMax: 417, - OverMaxEnergy: 0, - InviteCode: "377385143", - }, - } -} - -func Load(p string) *AppConfigs { - if !utils.PathExists(p) { - _ = DefaultConfigs().Save(p) - } - c := AppConfigs{} - err := json.Unmarshal([]byte(utils.ReadAllText(p)), &c) - if err != nil { - _ = os.Rename(p, p+".backup"+strconv.FormatInt(time.Now().Unix(), 10)) - _ = DefaultConfigs().Save(p) - } - c = AppConfigs{} - _ = json.Unmarshal([]byte(utils.ReadAllText(p)), &c) - return &c -} - -func (c *AppConfigs) Save(p string) error { - data, err := json.MarshalIndent(c, "", " ") - if err != nil { - return err - } - utils.WriteAllText(p, string(data)) - return nil -} diff --git a/db/db.go b/db/db.go deleted file mode 100644 index 63ba8d8..0000000 --- a/db/db.go +++ /dev/null @@ -1,21 +0,0 @@ -package db - -import "fmt" - -var ( - DB *Instance -) - -func init() { - DB = GetInstance() -} - -func MatchTokenUid(token, uid string) bool { - res, err := DB.Get([]byte(uid)) - if err != nil { - fmt.Println(err) - return false - } - - return string(res) == token -} diff --git a/handler/handler.go b/handler/handler.go deleted file mode 100644 index 07670fa..0000000 --- a/handler/handler.go +++ /dev/null @@ -1,41 +0,0 @@ -package handler - -import ( - "encoding/base64" - "honoka-chan/config" - "honoka-chan/encrypt" - - "xorm.io/xorm" -) - -var ( - SifCdnServer string - AsCdnServer string - ErrorMsg = `{"code":20001,"message":""}` - MainEng *xorm.Engine - UserEng *xorm.Engine -) - -func init() { - SifCdnServer = config.Conf.Settings.SifCdnServer - - MainEng = config.MainEng - UserEng = config.UserEng -} - -func CheckErr(err error) { - if err != nil { - panic(err) - } -} - -func IsSigned(unitId int) bool { - exists, err := MainEng.Table("unit_sign_asset_m").Where("unit_id = ?", unitId).Exist() - CheckErr(err) - - return exists -} - -func GenXMS(resp []byte) string { - return base64.StdEncoding.EncodeToString(encrypt.RSASignSHA1(resp)) -} diff --git a/handler/album.go b/internal/handler/album.go similarity index 87% rename from handler/album.go rename to internal/handler/album.go index 86375e1..cad0a2f 100644 --- a/handler/album.go +++ b/internal/handler/album.go @@ -2,7 +2,8 @@ package handler import ( "encoding/json" - "honoka-chan/model" + "honoka-chan/internal/model" + "honoka-chan/internal/utils" "net/http" "github.com/gin-gonic/gin" @@ -16,14 +17,14 @@ type AlbumRes struct { func AlbumSeriesAll(ctx *gin.Context) { var albumIds []int err := MainEng.Table("album_series_m").Select("album_series_id").Find(&albumIds) - CheckErr(err) + utils.CheckErr(err) // fmt.Println(albumIds) albumSeriesAllRes := []model.AlbumSeriesRes{} for _, albumId := range albumIds { unitList := []AlbumRes{} err = MainEng.Table("unit_m").Where("album_series_id = ?", albumId).Cols("unit_id,rarity").Find(&unitList) - CheckErr(err) + utils.CheckErr(err) albumSeriesAll := []model.AlbumResult{} for _, unit := range unitList { @@ -57,7 +58,7 @@ func AlbumSeriesAll(ctx *gin.Context) { albumSeries.HighestLovePerUnit = 1000 // IsSigned - albumSeries.SignFlag = IsSigned(unit.UnitId) + albumSeries.SignFlag = utils.IsSigned(unit.UnitId) } albumSeriesAll = append(albumSeriesAll, albumSeries) @@ -75,8 +76,8 @@ func AlbumSeriesAll(ctx *gin.Context) { StatusCode: 200, } resp, err := json.Marshal(albumResp) - CheckErr(err) + utils.CheckErr(err) - ctx.Header("X-Message-Sign", GenXMS(resp)) + ctx.Header("X-Message-Sign", utils.GenXMS(resp)) ctx.String(http.StatusOK, string(resp)) } diff --git a/handler/announce.go b/internal/handler/announce.go similarity index 88% rename from handler/announce.go rename to internal/handler/announce.go index b2c6713..069ba91 100644 --- a/handler/announce.go +++ b/internal/handler/announce.go @@ -2,7 +2,8 @@ package handler import ( "encoding/json" - "honoka-chan/model" + "honoka-chan/internal/model" + "honoka-chan/internal/utils" "html/template" "net/http" "time" @@ -29,8 +30,8 @@ func AnnounceCheckState(ctx *gin.Context) { StatusCode: 200, } resp, err := json.Marshal(announceResp) - CheckErr(err) + utils.CheckErr(err) - ctx.Header("X-Message-Sign", GenXMS(resp)) + ctx.Header("X-Message-Sign", utils.GenXMS(resp)) ctx.String(http.StatusOK, string(resp)) } diff --git a/handler/api.go b/internal/handler/api.go similarity index 94% rename from handler/api.go rename to internal/handler/api.go index b06e2cb..ba312a9 100644 --- a/handler/api.go +++ b/internal/handler/api.go @@ -5,9 +5,10 @@ import ( "errors" "fmt" "honoka-chan/config" - "honoka-chan/model" - "honoka-chan/tools" - "honoka-chan/utils" + "honoka-chan/internal/model" + "honoka-chan/internal/tools" + "honoka-chan/internal/utils" + honokautils "honoka-chan/pkg/utils" "net/http" "strconv" "strings" @@ -89,7 +90,7 @@ func Api(ctx *gin.Context) { TimeStamp: time.Now().Unix(), } res, err = json.Marshal(topInfoResp) - CheckErr(err) + utils.CheckErr(err) } else if v.Action == "topInfoOnce" { // key = "login_topinfo_once_result" topInfoOnceResp := model.TopInfoOnceResp{ @@ -121,7 +122,7 @@ func Api(ctx *gin.Context) { TimeStamp: time.Now().Unix(), } res, err = json.Marshal(topInfoOnceResp) - CheckErr(err) + utils.CheckErr(err) } case "live": if v.Action == "liveStatus" { @@ -129,7 +130,7 @@ func Api(ctx *gin.Context) { var liveDifficultyId []int normalLives := []model.NormalLiveStatusList{} err = MainEng.Table("normal_live_m").Cols("live_difficulty_id").OrderBy("live_difficulty_id ASC").Find(&liveDifficultyId) - CheckErr(err) + utils.CheckErr(err) for _, id := range liveDifficultyId { normalLive := model.NormalLiveStatusList{ LiveDifficultyID: id, @@ -144,7 +145,7 @@ func Api(ctx *gin.Context) { specialLives := []model.SpecialLiveStatusList{} err = MainEng.Table("special_live_m").Cols("live_difficulty_id").OrderBy("live_difficulty_id ASC").Find(&liveDifficultyId) - CheckErr(err) + utils.CheckErr(err) for _, id := range liveDifficultyId { specialLive := model.SpecialLiveStatusList{ LiveDifficultyID: id, @@ -171,13 +172,13 @@ func Api(ctx *gin.Context) { TimeStamp: time.Now().Unix(), } res, err = json.Marshal(LiveStatusResp) - CheckErr(err) + utils.CheckErr(err) } else if v.Action == "schedule" { // key = "live_list_result" var liveDifficultyId []int specialLives := []model.SpecialLiveStatusList{} err = MainEng.Table("special_live_m").Cols("live_difficulty_id").OrderBy("live_difficulty_id ASC").Find(&liveDifficultyId) - CheckErr(err) + utils.CheckErr(err) for _, id := range liveDifficultyId { specialLive := model.SpecialLiveStatusList{ LiveDifficultyID: id, @@ -214,7 +215,7 @@ func Api(ctx *gin.Context) { TimeStamp: time.Now().Unix(), } res, err = json.Marshal(liveListResp) - CheckErr(err) + utils.CheckErr(err) } else { fmt.Println("Invalid action: ", v.Module, v.Action) } @@ -244,18 +245,18 @@ func Api(ctx *gin.Context) { TimeStamp: time.Now().Unix(), } res, err = json.Marshal(unitListResp) - CheckErr(err) + utils.CheckErr(err) } else if v.Action == "deckInfo" { // key = "unit_deck_result" userDeck := []model.UserDeckData{} err = UserEng.Table("user_deck_m").Where("user_id = ?", ctx.GetString("userid")).Asc("deck_id").Find(&userDeck) - CheckErr(err) + utils.CheckErr(err) unitDeckInfo := []model.UnitDeckInfoRes{} for _, deck := range userDeck { deckUnit := []model.UnitDeckData{} err = UserEng.Table("deck_unit_m").Where("user_deck_id = ?", deck.ID).Asc("position").Find(&deckUnit) - CheckErr(err) + utils.CheckErr(err) oUids := []model.UnitOwningUserIds{} for _, unit := range deckUnit { @@ -283,7 +284,7 @@ func Api(ctx *gin.Context) { TimeStamp: time.Now().Unix(), } res, err = json.Marshal(unitDeckResp) - CheckErr(err) + utils.CheckErr(err) } else if v.Action == "supporterAll" { // key = "unit_support_result" unitSupportResp := model.UnitSupportResp{ @@ -295,17 +296,17 @@ func Api(ctx *gin.Context) { TimeStamp: time.Now().Unix(), } res, err = json.Marshal(unitSupportResp) - CheckErr(err) + utils.CheckErr(err) } else if v.Action == "removableSkillInfo" { // key = "owning_equip_result" var skillEquipCount []model.SkillEquipCount err := UserEng.Table("skill_equip_m").Where("user_id = ?", ctx.GetString("userid")).Select("unit_removable_skill_id,COUNT(*) AS ct"). GroupBy("unit_removable_skill_id").Find(&skillEquipCount) - CheckErr(err) + utils.CheckErr(err) var rmSkillIds []int err = MainEng.Table("unit_removable_skill_m").Where("effect_range = 1").Cols("unit_removable_skill_id").Find(&rmSkillIds) - CheckErr(err) + utils.CheckErr(err) owingInfo := []model.OwningInfo{} for _, id := range rmSkillIds { @@ -326,14 +327,14 @@ func Api(ctx *gin.Context) { var unitOwningIds []int err = UserEng.Table("skill_equip_m").Where("user_id = ?", ctx.GetString("userid")).Cols("unit_owning_user_id").GroupBy("unit_owning_user_id").Find(&unitOwningIds) - CheckErr(err) + utils.CheckErr(err) equipInfo := map[int]any{} for _, v := range unitOwningIds { detail := []model.SkillEquipDetail{} err = UserEng.Table("skill_equip_m").Where("user_id = ? AND unit_owning_user_id = ?", ctx.GetString("userid"), v). Cols("unit_removable_skill_id").Find(&detail) - CheckErr(err) + utils.CheckErr(err) equipInfo[v] = model.SkillEquipList{ UnitOwningUserID: v, @@ -351,12 +352,12 @@ func Api(ctx *gin.Context) { TimeStamp: time.Now().Unix(), } res, err = json.Marshal(rmSkillResp) - CheckErr(err) + utils.CheckErr(err) } else if v.Action == "accessoryAll" { // key = "unit_accessory_result" accessoryList := []model.AccessoryList{} err := MainEng.Table("common_accessory_m").Find(&accessoryList) - CheckErr(err) + utils.CheckErr(err) for k := range accessoryList { accessoryList[k].NextExp = 0 accessoryList[k].Level = 8 @@ -366,7 +367,7 @@ func Api(ctx *gin.Context) { } wearingInfo := []model.WearingInfo{} err = UserEng.Table("accessory_wear_m").Where("user_id = ?", ctx.GetString("userid")).Find(&wearingInfo) - CheckErr(err) + utils.CheckErr(err) unitAccResp := model.UnitAccessoryAllResp{ Result: model.UnitAccessoryAllResult{ AccessoryList: accessoryList, @@ -378,7 +379,7 @@ func Api(ctx *gin.Context) { TimeStamp: time.Now().Unix(), } res, err = json.Marshal(unitAccResp) - CheckErr(err) + utils.CheckErr(err) } else { // case "accessoryTab": // case "accessoryMaterialAll": @@ -396,7 +397,7 @@ func Api(ctx *gin.Context) { TimeStamp: time.Now().Unix(), } res, err = json.Marshal(costumeListResp) - CheckErr(err) + utils.CheckErr(err) } else { fmt.Println("Invalid action: ", v.Module, v.Action) } @@ -406,7 +407,7 @@ func Api(ctx *gin.Context) { albumLists := []model.AlbumResult{} unitList := []AlbumRes{} err = MainEng.Table("unit_m").Cols("unit_id,rarity").OrderBy("unit_id ASC").Find(&unitList) - CheckErr(err) + utils.CheckErr(err) for _, unit := range unitList { albumList := model.AlbumResult{ RankMaxFlag: true, @@ -436,7 +437,7 @@ func Api(ctx *gin.Context) { albumList.TotalLove = 1000 // IsSigned - albumList.SignFlag = IsSigned(unit.UnitId) + albumList.SignFlag = utils.IsSigned(unit.UnitId) } albumLists = append(albumLists, albumList) } @@ -448,7 +449,7 @@ func Api(ctx *gin.Context) { TimeStamp: time.Now().Unix(), } res, err = json.Marshal(albumResp) - CheckErr(err) + utils.CheckErr(err) } else { fmt.Println("Invalid action: ", v.Module, v.Action) } @@ -458,7 +459,7 @@ func Api(ctx *gin.Context) { var scenarioIds []int scenarioLists := []model.ScenarioStatusList{} err = MainEng.Table("scenario_m").Cols("scenario_id").OrderBy("scenario_id ASC").Find(&scenarioIds) - CheckErr(err) + utils.CheckErr(err) for _, id := range scenarioIds { scenarioLists = append(scenarioLists, model.ScenarioStatusList{ ScenarioID: id, @@ -474,7 +475,7 @@ func Api(ctx *gin.Context) { TimeStamp: time.Now().Unix(), } res, err = json.Marshal(scenarioResp) - CheckErr(err) + utils.CheckErr(err) } else { fmt.Println("Invalid action: ", v.Module, v.Action) } @@ -484,7 +485,7 @@ func Api(ctx *gin.Context) { var subScenarioIds []int subScenarioLists := []model.SubscenarioStatusList{} err = MainEng.Table("subscenario_m").Cols("subscenario_id").OrderBy("subscenario_id ASC").Find(&subScenarioIds) - CheckErr(err) + utils.CheckErr(err) for _, id := range subScenarioIds { subScenarioLists = append(subScenarioLists, model.SubscenarioStatusList{ SubscenarioID: id, @@ -501,7 +502,7 @@ func Api(ctx *gin.Context) { TimeStamp: time.Now().Unix(), } res, err = json.Marshal(subScenarioResp) - CheckErr(err) + utils.CheckErr(err) } else { fmt.Println("Invalid action: ", v.Module, v.Action) } @@ -511,13 +512,13 @@ func Api(ctx *gin.Context) { var eventIds []int eventsList := []model.EventScenarioList{} err = MainEng.Table("event_scenario_m").Cols("event_id").GroupBy("event_id").OrderBy("event_id DESC").Find(&eventIds) - CheckErr(err) + utils.CheckErr(err) for _, id := range eventIds { eventRes := []EventRes{} chapsList := []model.EventScenarioChapterList{} err = MainEng.Table("event_scenario_m").Where("event_id = ?", id).Cols("event_scenario_id,chapter,chapter_asset,open_date"). OrderBy("chapter DESC").Find(&eventRes) - CheckErr(err) + utils.CheckErr(err) for _, res := range eventRes { chapList := model.EventScenarioChapterList{ EventScenarioID: res.EventScenarioId, @@ -559,7 +560,7 @@ func Api(ctx *gin.Context) { TimeStamp: time.Now().Unix(), } res, err = json.Marshal(eventScenarioResp) - CheckErr(err) + utils.CheckErr(err) } else { fmt.Println("Invalid action: ", v.Module, v.Action) } @@ -569,14 +570,14 @@ func Api(ctx *gin.Context) { var multiIds []int multiUnitsList := []model.MultiUnitScenarioStatusList{} err = MainEng.Table("multi_unit_scenario_m").Cols("multi_unit_id").GroupBy("multi_unit_id").OrderBy("multi_unit_id ASC").Find(&multiIds) - CheckErr(err) + utils.CheckErr(err) for _, id := range multiIds { multiRes := MultiRes{} _, err = MainEng.Table("multi_unit_scenario_m"). Join("LEFT", "multi_unit_scenario_open_m", "multi_unit_scenario_m.multi_unit_id = multi_unit_scenario_open_m.multi_unit_id"). Cols("multi_unit_scenario_btn_asset,open_date,multi_unit_scenario_id,chapter"). Where("multi_unit_scenario_m.multi_unit_id = ?", id).Get(&multiRes) - CheckErr(err) + utils.CheckErr(err) multiUnitsList = append(multiUnitsList, model.MultiUnitScenarioStatusList{ MultiUnitID: id, @@ -602,7 +603,7 @@ func Api(ctx *gin.Context) { TimeStamp: time.Now().Unix(), } res, err = json.Marshal(unitsResp) - CheckErr(err) + utils.CheckErr(err) } else { fmt.Println("Invalid action: ", v.Module, v.Action) } @@ -630,7 +631,7 @@ func Api(ctx *gin.Context) { TimeStamp: time.Now().Unix(), } res, err = json.Marshal(productResp) - CheckErr(err) + utils.CheckErr(err) } else { fmt.Println("Invalid action: ", v.Module, v.Action) } @@ -703,7 +704,7 @@ func Api(ctx *gin.Context) { TimeStamp: time.Now().Unix(), } res, err = json.Marshal(bannerResp) - CheckErr(err) + utils.CheckErr(err) } else { fmt.Println("Invalid action: ", v.Module, v.Action) } @@ -720,7 +721,7 @@ func Api(ctx *gin.Context) { TimeStamp: time.Now().Unix(), } res, err = json.Marshal(marqueeResp) - CheckErr(err) + utils.CheckErr(err) } else { fmt.Println("Invalid action: ", v.Module, v.Action) } @@ -729,7 +730,7 @@ func Api(ctx *gin.Context) { // key = "user_intro_result" var uId, oId int _, err := UserEng.Table("user_preference_m").Where("user_id = ?", ctx.GetString("userid")).Cols("user_id,unit_owning_user_id").Get(&uId, &oId) - CheckErr(err) + utils.CheckErr(err) userIntroResp := model.UserNaviResp{ Result: model.UserNaviRes{ User: model.User{ @@ -742,14 +743,14 @@ func Api(ctx *gin.Context) { TimeStamp: time.Now().Unix(), } res, err = json.Marshal(userIntroResp) - CheckErr(err) + utils.CheckErr(err) } else if v.Action == "userInfo" { userId, err := strconv.Atoi(ctx.GetString("userid")) - CheckErr(err) + utils.CheckErr(err) pref := tools.UserPref{} exists, err := UserEng.Table("user_preference_m").Where("user_id = ?", userId).Get(&pref) - CheckErr(err) + utils.CheckErr(err) if !exists { ctx.String(http.StatusForbidden, ErrorMsg) return @@ -791,7 +792,7 @@ func Api(ctx *gin.Context) { TimeStamp: time.Now().Unix(), } res, err = json.Marshal(userInfoResp) - CheckErr(err) + utils.CheckErr(err) } else { fmt.Println("Invalid action: ", v.Module, v.Action) } @@ -807,7 +808,7 @@ func Api(ctx *gin.Context) { TimeStamp: time.Now().Unix(), } res, err = json.Marshal(cutinResp) - CheckErr(err) + utils.CheckErr(err) } else { fmt.Println("Invalid action: ", v.Module, v.Action) } @@ -816,10 +817,10 @@ func Api(ctx *gin.Context) { // key = "award_result" var aIdList []int err := MainEng.Table("award_m").Cols("award_id").Find(&aIdList) - CheckErr(err) + utils.CheckErr(err) var aId int _, err = UserEng.Table("user_preference_m").Where("user_id = ?", ctx.GetString("userid")).Cols("award_id").Get(&aId) - CheckErr(err) + utils.CheckErr(err) awardsList := []model.AwardInfo{} for _, id := range aIdList { @@ -843,7 +844,7 @@ func Api(ctx *gin.Context) { TimeStamp: time.Now().Unix(), } res, err = json.Marshal(awardResp) - CheckErr(err) + utils.CheckErr(err) } else { fmt.Println("Invalid action: ", v.Module, v.Action) } @@ -852,10 +853,10 @@ func Api(ctx *gin.Context) { // key = "background_result" var bIdList []int err := MainEng.Table("background_m").Cols("background_id").Find(&bIdList) - CheckErr(err) + utils.CheckErr(err) var bId int _, err = UserEng.Table("user_preference_m").Where("user_id = ?", ctx.GetString("userid")).Cols("background_id").Get(&bId) - CheckErr(err) + utils.CheckErr(err) backgroundsList := []model.BackgroundInfo{} for _, id := range bIdList { @@ -879,19 +880,19 @@ func Api(ctx *gin.Context) { TimeStamp: time.Now().Unix(), } res, err = json.Marshal(backgroundResp) - CheckErr(err) + utils.CheckErr(err) } else { fmt.Println("Invalid action: ", v.Module, v.Action) } case "stamp": if v.Action == "stampInfo" { // key = "stamp_result" - stampResp := utils.ReadAllText("assets/sif/stamp.json") + stampResp := honokautils.ReadAllText("assets/serverdata/stamp.json") var mStampResp any err = json.Unmarshal([]byte(stampResp), &mStampResp) - CheckErr(err) + utils.CheckErr(err) res, err = json.Marshal(mStampResp) - CheckErr(err) + utils.CheckErr(err) } else { fmt.Println("Invalid action: ", v.Module, v.Action) } @@ -901,7 +902,7 @@ func Api(ctx *gin.Context) { var exchangeIds []int exPointsList := []model.ExchangePointList{} err = MainEng.Table("exchange_point_m").Cols("exchange_point_id").OrderBy("exchange_point_id ASC").Find(&exchangeIds) - CheckErr(err) + utils.CheckErr(err) for _, id := range exchangeIds { exPointsList = append(exPointsList, model.ExchangePointList{ Rarity: id, @@ -917,7 +918,7 @@ func Api(ctx *gin.Context) { TimeStamp: time.Now().Unix(), } res, err = json.Marshal(exPointsResp) - CheckErr(err) + utils.CheckErr(err) } else { fmt.Println("Invalid action: ", v.Module, v.Action) } @@ -933,7 +934,7 @@ func Api(ctx *gin.Context) { TimeStamp: time.Now().Unix(), } res, err = json.Marshal(liveSeResp) - CheckErr(err) + utils.CheckErr(err) } else { fmt.Println("Invalid action: ", v.Module, v.Action) } @@ -949,19 +950,19 @@ func Api(ctx *gin.Context) { TimeStamp: time.Now().Unix(), } res, err = json.Marshal(liveIconResp) - CheckErr(err) + utils.CheckErr(err) } else { fmt.Println("Invalid action: ", v.Module, v.Action) } case "item": if v.Action == "list" { // key = "item_list_result" - itemResp := utils.ReadAllText("assets/sif/item.json") + itemResp := honokautils.ReadAllText("assets/serverdata/item.json") var mItemResp any err = json.Unmarshal([]byte(itemResp), &mItemResp) - CheckErr(err) + utils.CheckErr(err) res, err = json.Marshal(mItemResp) - CheckErr(err) + utils.CheckErr(err) } else { fmt.Println("Invalid action: ", v.Module, v.Action) } @@ -975,7 +976,7 @@ func Api(ctx *gin.Context) { TimeStamp: time.Now().Unix(), } res, err = json.Marshal(marathonResp) - CheckErr(err) + utils.CheckErr(err) } else { fmt.Println("Invalid action: ", v.Module, v.Action) } @@ -989,7 +990,7 @@ func Api(ctx *gin.Context) { TimeStamp: time.Now().Unix(), } res, err = json.Marshal(challengeResp) - CheckErr(err) + utils.CheckErr(err) } else { fmt.Println("Invalid action: ", v.Module, v.Action) } @@ -1001,7 +1002,7 @@ func Api(ctx *gin.Context) { var smileBuff, pureBuff, coolBuff int err = MainEng.Table("museum_contents_m").Cols("museum_contents_id,smile_buff,pure_buff,cool_buff"). OrderBy("museum_contents_id ASC").Find(&museumRes) - CheckErr(err) + utils.CheckErr(err) for _, res := range museumRes { smileBuff += res.SmileBuff pureBuff += res.PureBuff @@ -1024,7 +1025,7 @@ func Api(ctx *gin.Context) { TimeStamp: time.Now().Unix(), } res, err = json.Marshal(museumInfoResp) - CheckErr(err) + utils.CheckErr(err) } else { fmt.Println("Invalid action: ", v.Module, v.Action) } @@ -1059,13 +1060,13 @@ func Api(ctx *gin.Context) { TimeStamp: time.Now().Unix(), } res, err = json.Marshal(difficultyResp) - CheckErr(err) + utils.CheckErr(err) } else if v.Action == "cardRanking" { // key = "profile_card_ranking_result" var result []any - love := utils.ReadAllText("assets/sif/love.json") + love := honokautils.ReadAllText("assets/serverdata/love.json") err := json.Unmarshal([]byte(love), &result) - CheckErr(err) + utils.CheckErr(err) loveResp := model.LoveResp{ Result: result, Status: 200, @@ -1073,30 +1074,30 @@ func Api(ctx *gin.Context) { TimeStamp: time.Now().Unix(), } res, err = json.Marshal(loveResp) - CheckErr(err) + utils.CheckErr(err) } else if v.Action == "profileInfo" { // key = "profile_info_result" pref := tools.UserPref{} exists, err := UserEng.Table("user_preference_m").Where("user_id = ?", ctx.GetString("userid")).Get(&pref) - CheckErr(err) + utils.CheckErr(err) if !exists { ctx.String(http.StatusForbidden, ErrorMsg) return } commonUnit, err := MainEng.Table("common_unit_m").Count() - CheckErr(err) + utils.CheckErr(err) userUnit, err := UserEng.Table("user_unit_m").Where("user_id = ?", ctx.GetString("userid")).Count() - CheckErr(err) + utils.CheckErr(err) unitData := model.UnitData{} exists, err = MainEng.Table("common_unit_m").Where("unit_owning_user_id = ?", pref.UnitOwningUserID).Get(&unitData) - CheckErr(err) + utils.CheckErr(err) isCommon := true if !exists { _, err = UserEng.Table("user_unit_m"). Where("unit_owning_user_id = ? AND user_id = ?", pref.UnitOwningUserID, ctx.GetString("userid")).Get(&unitData) - CheckErr(err) + utils.CheckErr(err) isCommon = false } @@ -1106,7 +1107,7 @@ func Api(ctx *gin.Context) { // 公共卡片仅为100级属性 _, err = MainEng.Table("unit_m").Where("unit_id = ?", unitData.UnitID). Cols("attribute_id,hp_max,smile_max,pure_max,cool_max").Get(&attrId, &maxHp, &baseSmile, &basePure, &baseCool) - CheckErr(err) + utils.CheckErr(err) // 偷懒起见不计算饰品、宝石、回忆画廊等属性加成 smileMax = baseSmile @@ -1120,10 +1121,10 @@ func Api(ctx *gin.Context) { var accessoryOwningId, accessoryId, exp int _, err = UserEng.Table("accessory_wear_m").Where("unit_owning_user_id = ? AND user_id = ?", pref.UnitOwningUserID, ctx.GetString("userid")). Cols("accessory_owning_user_id").Get(&accessoryOwningId) - CheckErr(err) + utils.CheckErr(err) _, err = MainEng.Table("common_accessory_m").Where("accessory_owning_user_id = ?", accessoryOwningId). Cols("accessory_id,exp").Get(&accessoryId, &exp) - CheckErr(err) + utils.CheckErr(err) accessoryInfo := model.AccessoryInfo{ AccessoryOwningUserID: accessoryOwningId, AccessoryID: accessoryId, @@ -1138,10 +1139,10 @@ func Api(ctx *gin.Context) { removeSkillIds := []int{} err = UserEng.Table("skill_equip_m").Where("unit_owning_user_id = ? AND user_id = ?", pref.UnitOwningUserID, ctx.GetString("userid")). Cols("unit_removable_skill_id").Find(&removeSkillIds) - CheckErr(err) + utils.CheckErr(err) userId, err := strconv.Atoi(config.Conf.UserPrefs.InviteCode) - CheckErr(err) + utils.CheckErr(err) profileResp := model.ProfileResp{ Result: model.ProfileRes{ UserInfo: model.ProfileUserInfo{ @@ -1234,13 +1235,13 @@ func Api(ctx *gin.Context) { TimeStamp: time.Now().Unix(), } res, err = json.Marshal(profileResp) - CheckErr(err) + utils.CheckErr(err) } else { fmt.Println("Invalid action: ", v.Module, v.Action) } case "secretbox": if v.Action == "all" { - res = []byte(utils.ReadAllText("111.json")) + res = []byte(honokautils.ReadAllText("111.json")) // fmt.Println(apiReq) } else { fmt.Println("Invalid action: ", v.Module, v.Action) @@ -1249,26 +1250,26 @@ func Api(ctx *gin.Context) { // fmt.Println(ErrorMsg) // fmt.Println(v) err = errors.New("invalid option") - CheckErr(err) + utils.CheckErr(err) } var result any err = json.Unmarshal([]byte(res), &result) - CheckErr(err) + utils.CheckErr(err) results = append(results, result) } // fmt.Println(results) b, err := json.Marshal(results) - CheckErr(err) + utils.CheckErr(err) rp := model.ApiResp{ ResponseData: b, ReleaseInfo: []any{}, StatusCode: 200, } b, err = json.Marshal(rp) - CheckErr(err) + utils.CheckErr(err) // fmt.Println(string(b)) - ctx.Header("X-Message-Sign", GenXMS(b)) + ctx.Header("X-Message-Sign", utils.GenXMS(b)) ctx.String(http.StatusOK, string(b)) } diff --git a/handler/award.go b/internal/handler/award.go similarity index 75% rename from handler/award.go rename to internal/handler/award.go index c6dcfe5..d394e10 100644 --- a/handler/award.go +++ b/internal/handler/award.go @@ -2,8 +2,9 @@ package handler import ( "encoding/json" - "honoka-chan/model" - "honoka-chan/tools" + "honoka-chan/internal/model" + "honoka-chan/internal/tools" + "honoka-chan/internal/utils" "net/http" "github.com/gin-gonic/gin" @@ -16,15 +17,15 @@ func AwardSet(ctx *gin.Context) { AwardID: int(req.Get("award_id").Int()), } _, err := UserEng.Table("user_preference_m").Where("user_id = ?", ctx.GetString("userid")).Update(&pref) - CheckErr(err) + utils.CheckErr(err) awardResp := model.AwardSetResp{ ResponseData: []any{}, ReleaseInfo: []any{}, StatusCode: 200, } resp, err := json.Marshal(awardResp) - CheckErr(err) + utils.CheckErr(err) - ctx.Header("X-Message-Sign", GenXMS(resp)) + ctx.Header("X-Message-Sign", utils.GenXMS(resp)) ctx.String(http.StatusOK, string(resp)) } diff --git a/handler/background.go b/internal/handler/background.go similarity index 76% rename from handler/background.go rename to internal/handler/background.go index 8468081..4fc6a58 100644 --- a/handler/background.go +++ b/internal/handler/background.go @@ -2,8 +2,9 @@ package handler import ( "encoding/json" - "honoka-chan/model" - "honoka-chan/tools" + "honoka-chan/internal/model" + "honoka-chan/internal/tools" + "honoka-chan/internal/utils" "net/http" "github.com/gin-gonic/gin" @@ -16,15 +17,15 @@ func BackgroundSet(ctx *gin.Context) { BackgroundID: int(req.Get("background_id").Int()), } _, err := UserEng.Table("user_preference_m").Where("user_id = ?", ctx.GetString("userid")).Update(&pref) - CheckErr(err) + utils.CheckErr(err) backgroundResp := model.BackgroundSetResp{ ResponseData: []any{}, ReleaseInfo: []any{}, StatusCode: 200, } resp, err := json.Marshal(backgroundResp) - CheckErr(err) + utils.CheckErr(err) - ctx.Header("X-Message-Sign", GenXMS(resp)) + ctx.Header("X-Message-Sign", utils.GenXMS(resp)) ctx.String(http.StatusOK, string(resp)) } diff --git a/handler/download.go b/internal/handler/download.go similarity index 90% rename from handler/download.go rename to internal/handler/download.go index 0228beb..8f9f188 100644 --- a/handler/download.go +++ b/internal/handler/download.go @@ -4,7 +4,8 @@ import ( "encoding/json" "fmt" "honoka-chan/config" - "honoka-chan/model" + "honoka-chan/internal/model" + "honoka-chan/internal/utils" "io" "net/http" "strings" @@ -31,7 +32,7 @@ func DownloadAdditional(ctx *gin.Context) { err := MainEng.Table("download_m").Where("pkg_type = ? AND pkg_id = ? AND pkg_os = ?", pkgType, pkgId, downloadReq.TargetOs). Cols("pkg_id,pkg_order,pkg_size"). OrderBy("pkg_id ASC, pkg_order ASC").Find(&pkgInfo) - CheckErr(err) + utils.CheckErr(err) for _, pkg := range pkgInfo { pkgList = append(pkgList, model.AdditionalRes{ @@ -47,9 +48,9 @@ func DownloadAdditional(ctx *gin.Context) { StatusCode: 200, } resp, err := json.Marshal(addResp) - CheckErr(err) + utils.CheckErr(err) - ctx.Header("X-Message-Sign", GenXMS(resp)) + ctx.Header("X-Message-Sign", utils.GenXMS(resp)) ctx.String(http.StatusOK, string(resp)) } @@ -65,7 +66,7 @@ func DownloadBatch(ctx *gin.Context) { err := MainEng.Table("download_m").Where(builder.NotIn("pkg_id", downloadReq.ExcludedPackageIds)).Where("pkg_type = ? AND pkg_os = ?", pkgType, downloadReq.Os). Cols("pkg_id,pkg_order,pkg_size"). OrderBy("pkg_id ASC, pkg_order ASC").Find(&pkgInfo) - CheckErr(err) + utils.CheckErr(err) for _, pkg := range pkgInfo { pkgList = append(pkgList, model.BatchRes{ @@ -81,9 +82,9 @@ func DownloadBatch(ctx *gin.Context) { StatusCode: 200, } resp, err := json.Marshal(batchResp) - CheckErr(err) + utils.CheckErr(err) - ctx.Header("X-Message-Sign", GenXMS(resp)) + ctx.Header("X-Message-Sign", utils.GenXMS(resp)) ctx.String(http.StatusOK, string(resp)) } @@ -99,7 +100,7 @@ func DownloadUpdate(ctx *gin.Context) { err := MainEng.Table("download_m").Where("pkg_type = ? AND pkg_os = ?", pkgType, downloadReq.TargetOs). Cols("pkg_id,pkg_order,pkg_size"). OrderBy("pkg_id ASC, pkg_order ASC").Find(&pkgInfo) - CheckErr(err) + utils.CheckErr(err) for _, pkg := range pkgInfo { pkgList = append(pkgList, model.UpdateRes{ @@ -130,9 +131,9 @@ func DownloadUpdate(ctx *gin.Context) { StatusCode: 200, } resp, err := json.Marshal(updateResp) - CheckErr(err) + utils.CheckErr(err) - ctx.Header("X-Message-Sign", GenXMS(resp)) + ctx.Header("X-Message-Sign", utils.GenXMS(resp)) ctx.String(http.StatusOK, string(resp)) } @@ -155,9 +156,9 @@ func DownloadUrl(ctx *gin.Context) { StatusCode: 200, } resp, err := json.Marshal(urlResp) - CheckErr(err) + utils.CheckErr(err) - ctx.Header("X-Message-Sign", GenXMS(resp)) + ctx.Header("X-Message-Sign", utils.GenXMS(resp)) ctx.String(http.StatusOK, string(resp)) } @@ -168,8 +169,8 @@ func DownloadEvent(ctx *gin.Context) { StatusCode: 200, } resp, err := json.Marshal(eventResp) - CheckErr(err) + utils.CheckErr(err) - ctx.Header("X-Message-Sign", GenXMS(resp)) + ctx.Header("X-Message-Sign", utils.GenXMS(resp)) ctx.String(http.StatusOK, string(resp)) } diff --git a/handler/event.go b/internal/handler/event.go similarity index 81% rename from handler/event.go rename to internal/handler/event.go index 733f362..157cc5a 100644 --- a/handler/event.go +++ b/internal/handler/event.go @@ -2,7 +2,8 @@ package handler import ( "encoding/json" - "honoka-chan/model" + "honoka-chan/internal/model" + "honoka-chan/internal/utils" "net/http" "time" @@ -26,8 +27,8 @@ func EventList(ctx *gin.Context) { StatusCode: 200, } resp, err := json.Marshal(eventsResp) - CheckErr(err) + utils.CheckErr(err) - ctx.Header("X-Message-Sign", GenXMS(resp)) + ctx.Header("X-Message-Sign", utils.GenXMS(resp)) ctx.String(http.StatusOK, string(resp)) } diff --git a/handler/gdpr.go b/internal/handler/gdpr.go similarity index 75% rename from handler/gdpr.go rename to internal/handler/gdpr.go index 17853f8..0432271 100644 --- a/handler/gdpr.go +++ b/internal/handler/gdpr.go @@ -2,7 +2,8 @@ package handler import ( "encoding/json" - "honoka-chan/model" + "honoka-chan/internal/model" + "honoka-chan/internal/utils" "net/http" "time" @@ -20,8 +21,8 @@ func Gdpr(ctx *gin.Context) { StatusCode: 200, } resp, err := json.Marshal(gdprResp) - CheckErr(err) + utils.CheckErr(err) - ctx.Header("X-Message-Sign", GenXMS(resp)) + ctx.Header("X-Message-Sign", utils.GenXMS(resp)) ctx.String(http.StatusOK, string(resp)) } diff --git a/internal/handler/handler.go b/internal/handler/handler.go new file mode 100644 index 0000000..d976c55 --- /dev/null +++ b/internal/handler/handler.go @@ -0,0 +1,23 @@ +package handler + +import ( + "honoka-chan/config" + "honoka-chan/pkg/db" + + "xorm.io/xorm" +) + +var ( + SifCdnServer string + AsCdnServer string + ErrorMsg = `{"code":20001,"message":""}` + MainEng *xorm.Engine + UserEng *xorm.Engine +) + +func init() { + SifCdnServer = config.Conf.Settings.SifCdnServer + + MainEng = db.MainEng + UserEng = db.UserEng +} diff --git a/handler/lbonus.go b/internal/handler/lbonus.go similarity index 96% rename from handler/lbonus.go rename to internal/handler/lbonus.go index 1658bce..9f01b5c 100644 --- a/handler/lbonus.go +++ b/internal/handler/lbonus.go @@ -2,7 +2,8 @@ package handler import ( "encoding/json" - "honoka-chan/model" + "honoka-chan/internal/model" + "honoka-chan/internal/utils" "net/http" "time" @@ -148,8 +149,8 @@ func LBonusExecute(ctx *gin.Context) { } resp, err := json.Marshal(LbRes) - CheckErr(err) + utils.CheckErr(err) - ctx.Header("X-Message-Sign", GenXMS(resp)) + ctx.Header("X-Message-Sign", utils.GenXMS(resp)) ctx.String(http.StatusOK, string(resp)) } diff --git a/handler/live.go b/internal/handler/live.go similarity index 94% rename from handler/live.go rename to internal/handler/live.go index 89d5030..f72959e 100644 --- a/handler/live.go +++ b/internal/handler/live.go @@ -3,9 +3,10 @@ package handler import ( "encoding/json" "honoka-chan/config" - "honoka-chan/db" - "honoka-chan/model" - "honoka-chan/utils" + "honoka-chan/internal/model" + "honoka-chan/internal/utils" + "honoka-chan/pkg/db" + honokautils "honoka-chan/pkg/utils" "math" "net/http" "strconv" @@ -16,26 +17,26 @@ import ( ) func PartyList(ctx *gin.Context) { - resp := utils.ReadAllText("assets/sif/partylist.json") + resp := honokautils.ReadAllText("assets/serverdata/partylist.json") - ctx.Header("X-Message-Sign", GenXMS([]byte(resp))) + ctx.Header("X-Message-Sign", utils.GenXMS([]byte(resp))) ctx.String(http.StatusOK, resp) } func PlayLive(ctx *gin.Context) { playReq := model.PlayReq{} err := json.Unmarshal([]byte(ctx.GetString("request_data")), &playReq) - CheckErr(err) + utils.CheckErr(err) tDifficultyId := playReq.LiveDifficultyID difficultyId, err := strconv.Atoi(tDifficultyId) - CheckErr(err) + utils.CheckErr(err) deckId := playReq.UnitDeckID // Save Deck Id for /live/reward key := "live_deck_" + ctx.GetString("userid") err = db.DB.Set([]byte(key), []byte(strconv.Itoa(deckId))) - CheckErr(err) + utils.CheckErr(err) // Song type: normal / special // sqlite3 doesn't support FULL OUTER JOIN so use UNION ALL here. @@ -43,16 +44,16 @@ func PlayLive(ctx *gin.Context) { var notes_setting_asset string var c_rank_score, b_rank_score, a_rank_score, s_rank_score, ac_flag, swing_flag int err = MainEng.DB().QueryRow(sql, difficultyId, difficultyId).Scan(¬es_setting_asset, &c_rank_score, &b_rank_score, &a_rank_score, &s_rank_score, &ac_flag, &swing_flag) - CheckErr(err) + utils.CheckErr(err) // fmt.Println(notes_setting_asset) // fmt.Println(c_rank_score, b_rank_score, a_rank_score, s_rank_score) notes := []model.NotesList{} // fmt.Println("./assets/notes/" + notes_setting_asset) - notes_list := utils.ReadAllText("./assets/sif/notes/" + notes_setting_asset) + notes_list := honokautils.ReadAllText("./assets/serverdata/notes/" + notes_setting_asset) err = json.Unmarshal([]byte(notes_list), ¬es) - CheckErr(err) + utils.CheckErr(err) ranks := []model.RankInfo{} ranks = append(ranks, model.RankInfo{ @@ -83,7 +84,7 @@ func PlayLive(ctx *gin.Context) { err = UserEng.Table("deck_unit_m").Join("LEFT", "user_deck_m", "deck_unit_m.user_deck_id = user_deck_m.id"). Where("user_id = ? AND deck_id = ?", ctx.GetString("userid"), deckId).Cols("unit_owning_user_id"). OrderBy("deck_unit_m.position ASC").Find(&owningIdList) - CheckErr(err) + utils.CheckErr(err) unitList := []model.UnitList{} var totalSmile, totalPure, totalCool, maxLove float64 @@ -91,7 +92,7 @@ func PlayLive(ctx *gin.Context) { for _, owningId := range owningIdList { var uId int exists, err := MainEng.Table("common_unit_m").Where("unit_owning_user_id = ?", owningId).Cols("unit_id").Get(&uId) - CheckErr(err) + utils.CheckErr(err) var maxHp, attrId, unitTypeId int var baseSmile, basePure, baseCool, smileMax, pureMax, coolMax float64 @@ -101,11 +102,11 @@ func PlayLive(ctx *gin.Context) { Join("LEFT", "unit_rarity_m", "unit_m.rarity = unit_rarity_m.rarity"). Cols("attribute_id,hp_max,smile_max,pure_max,cool_max,after_love_max,unit_type_id"). Get(&attrId, &maxHp, &baseSmile, &basePure, &baseCool, &maxLove, &unitTypeId) - CheckErr(err) + utils.CheckErr(err) } else { // 用户卡片暂时固定为满级350级 exists, err := UserEng.Table("user_unit_m").Where("unit_owning_user_id = ?", owningId).Cols("unit_id").Get(&uId) - CheckErr(err) + utils.CheckErr(err) if exists { // 卡片100级基础属性 @@ -113,13 +114,13 @@ func PlayLive(ctx *gin.Context) { Join("LEFT", "unit_rarity_m", "unit_m.rarity = unit_rarity_m.rarity"). Cols("attribute_id,hp_max,smile_max,pure_max,cool_max,after_love_max,unit_type_id"). Get(&attrId, &maxHp, &baseSmile, &basePure, &baseCool, &maxLove, &unitTypeId) - CheckErr(err) + utils.CheckErr(err) // 增量属性 var diffSmile, diffPure, diffCool float64 _, err = MainEng.Table("unit_level_limit_pattern_m").Where("unit_level_limit_id = 1 AND unit_level = 350"). Cols("smile_diff,pure_diff,cool_diff").Get(&diffSmile, &diffPure, &diffCool) - CheckErr(err) + utils.CheckErr(err) // 更新卡片属性(注意这里是负数,要用减号) baseSmile -= diffSmile @@ -134,12 +135,12 @@ func PlayLive(ctx *gin.Context) { var accessoryOwningId int _, err = UserEng.Table("accessory_wear_m").Where("unit_owning_user_id = ?", owningId). Cols("accessory_owning_user_id").Get(&accessoryOwningId) - CheckErr(err) + utils.CheckErr(err) var smileAccessory, pureAccessory, coolAccessory float64 _, err = MainEng.Table("common_accessory_m").Join("LEFT", "accessory_m", "common_accessory_m.accessory_id = accessory_m.accessory_id"). Where("accessory_owning_user_id = ?", accessoryOwningId).Cols("smile_max,pure_max,cool_max"). Get(&smileAccessory, &pureAccessory, &coolAccessory) - CheckErr(err) + utils.CheckErr(err) // fmt.Println("基础属性:", baseSmile, basePure, baseCool) // 饰品属性加成(该加成会影响个宝等百分比宝石属性加成的计算,故先计算。) @@ -152,7 +153,7 @@ func PlayLive(ctx *gin.Context) { // 回忆画廊属性加成(该加成会影响个宝等百分比宝石属性加成的计算,故先计算。) var smileBuff, pureBuff, coolBuff float64 _, err = MainEng.Table("museum_contents_m").Select("SUM(smile_buff),SUM(pure_buff),SUM(cool_buff)").Get(&smileBuff, &pureBuff, &coolBuff) - CheckErr(err) + utils.CheckErr(err) baseSmile += smileBuff basePure += pureBuff baseCool += coolBuff @@ -180,7 +181,7 @@ func PlayLive(ctx *gin.Context) { removableSkillIds := []int{} err = UserEng.Table("skill_equip_m").Where("unit_owning_user_id = ? AND user_id = ?", owningId, ctx.GetString("userid")). Cols("unit_removable_skill_id").Find(&removableSkillIds) - CheckErr(err) + utils.CheckErr(err) for _, sk := range removableSkillIds { // 判断宝石效果类型(效果范围、效果类型、效果值、是否固定数值) @@ -189,7 +190,7 @@ func PlayLive(ctx *gin.Context) { _, err = MainEng.Table("unit_removable_skill_m").Where("unit_removable_skill_id = ?", sk). Cols("effect_range,effect_type,effect_value,fixed_value_flag,target_reference_type"). Get(&effectRange, &effectType, &effectValue, &fixedValueFlag, &refType) - CheckErr(err) + utils.CheckErr(err) if fixedValueFlag == 1 { // 吻、眼神属性加成(固定数值) @@ -243,7 +244,7 @@ func PlayLive(ctx *gin.Context) { _, err = UserEng.Table("deck_unit_m").Join("LEFT", "user_deck_m", "deck_unit_m.user_deck_id = user_deck_m.id"). Where("user_deck_m.deck_id = ? AND user_deck_m.user_id = ? AND deck_unit_m.position = 5", playReq.UnitDeckID, ctx.GetString("userid")). Cols("deck_unit_m.unit_id").Get(&myCenterUnitId) - CheckErr(err) + utils.CheckErr(err) // 主唱技能加成:主C技能(这里不使用新C技能,即以某属性的百分比提升另一属性) var myAttrId int @@ -252,7 +253,7 @@ func PlayLive(ctx *gin.Context) { Join("LEFT", "unit_leader_skill_m", "unit_m.default_leader_skill_id = unit_leader_skill_m.unit_leader_skill_id"). Where("unit_m.unit_id = ?", myCenterUnitId). Cols("unit_m.attribute_id,unit_leader_skill_m.effect_value").Get(&myAttrId, &myEffectValue) - CheckErr(err) + utils.CheckErr(err) var myCenterSmile, myCenterPure, myCenterCool float64 if myAttrId == 1 { myCenterSmile = math.Ceil(smileMax * (myEffectValue / 100)) @@ -270,11 +271,11 @@ func PlayLive(ctx *gin.Context) { Join("LEFT", "unit_leader_skill_extra_m", "unit_m.default_leader_skill_id = unit_leader_skill_extra_m.unit_leader_skill_id"). Where("unit_m.unit_id = ?", myCenterUnitId). Cols("unit_leader_skill_extra_m.effect_value,unit_leader_skill_extra_m.member_tag_id").Get(&mySubEffectValue, &myMemberTagId) - CheckErr(err) + utils.CheckErr(err) exists, err = MainEng.Table("unit_type_member_tag_m"). Where("unit_type_id = ? AND member_tag_id = ?", unitTypeId, myMemberTagId).Exist() - CheckErr(err) + utils.CheckErr(err) var mySubSmile, mySubPure, mySubCool float64 if exists { if myAttrId == 1 { @@ -290,7 +291,7 @@ func PlayLive(ctx *gin.Context) { // 好友主唱技能加成 // TODO 好友支援存入数据库 var tomoUnitId int64 - partyList := gjson.Parse(utils.ReadAllText("assets/sif/partylist.json")).Get("response_data.party_list") + partyList := gjson.Parse(honokautils.ReadAllText("assets/serverdata/partylist.json")).Get("response_data.party_list") partyList.ForEach(func(key, value gjson.Result) bool { if value.Get("user_info.user_id").Int() == playReq.PartyUserID { tomoUnitId = value.Get("center_unit_info.unit_id").Int() @@ -307,7 +308,7 @@ func PlayLive(ctx *gin.Context) { Join("LEFT", "unit_leader_skill_m", "unit_m.default_leader_skill_id = unit_leader_skill_m.unit_leader_skill_id"). Where("unit_m.unit_id = ?", tomoUnitId). Cols("unit_m.attribute_id,unit_leader_skill_m.effect_value").Get(&tomoAttrId, &tomoEffectValue) - CheckErr(err) + utils.CheckErr(err) var tomoCenterSmile, tomoCenterPure, tomoCenterCool float64 if myAttrId == 1 { tomoCenterSmile = math.Ceil(smileMax * (tomoEffectValue / 100)) @@ -325,11 +326,11 @@ func PlayLive(ctx *gin.Context) { Join("LEFT", "unit_leader_skill_extra_m", "unit_m.default_leader_skill_id = unit_leader_skill_extra_m.unit_leader_skill_id"). Where("unit_m.unit_id = ?", tomoUnitId). Cols("unit_leader_skill_extra_m.effect_value,unit_leader_skill_extra_m.member_tag_id").Get(&tomoSubEffectValue, &tomoMemberTagId) - CheckErr(err) + utils.CheckErr(err) exists, err = MainEng.Table("unit_type_member_tag_m"). Where("unit_type_id = ? AND member_tag_id = ?", unitTypeId, tomoMemberTagId).Exist() - CheckErr(err) + utils.CheckErr(err) var tomoSubSmile, tomoSubPure, tomoSubCool float64 if exists { if myAttrId == 1 { @@ -405,9 +406,9 @@ func PlayLive(ctx *gin.Context) { } resp, err := json.Marshal(playResp) - CheckErr(err) + utils.CheckErr(err) - ctx.Header("X-Message-Sign", GenXMS(resp)) + ctx.Header("X-Message-Sign", utils.GenXMS(resp)) ctx.String(http.StatusOK, string(resp)) } @@ -418,20 +419,20 @@ func GameOver(ctx *gin.Context) { StatusCode: 200, } resp, err := json.Marshal(overResp) - CheckErr(err) + utils.CheckErr(err) - ctx.Header("X-Message-Sign", GenXMS(resp)) + ctx.Header("X-Message-Sign", utils.GenXMS(resp)) ctx.String(http.StatusOK, string(resp)) } func PlayScore(ctx *gin.Context) { playScoreReq := model.PlayScoreReq{} err := json.Unmarshal([]byte(ctx.GetString("request_data")), &playScoreReq) - CheckErr(err) + utils.CheckErr(err) tDifficultyId := playScoreReq.LiveDifficultyID difficultyId, err := strconv.Atoi(tDifficultyId) - CheckErr(err) + utils.CheckErr(err) // Song type: normal / special // sqlite3 doesn't support FULL OUTER JOIN so use UNION ALL here. @@ -439,16 +440,16 @@ func PlayScore(ctx *gin.Context) { var notes_setting_asset string var c_rank_score, b_rank_score, a_rank_score, s_rank_score, ac_flag, swing_flag int err = MainEng.DB().QueryRow(sql, difficultyId, difficultyId).Scan(¬es_setting_asset, &c_rank_score, &b_rank_score, &a_rank_score, &s_rank_score, &ac_flag, &swing_flag) - CheckErr(err) + utils.CheckErr(err) // fmt.Println(notes_setting_asset) // fmt.Println(c_rank_score, b_rank_score, a_rank_score, s_rank_score) notes := []model.NotesList{} // fmt.Println("./assets/notes/" + notes_setting_asset) - notes_list := utils.ReadAllText("./assets/sif/notes/" + notes_setting_asset) + notes_list := honokautils.ReadAllText("./assets/serverdata/notes/" + notes_setting_asset) err = json.Unmarshal([]byte(notes_list), ¬es) - CheckErr(err) + utils.CheckErr(err) ranks := []model.RankInfo{} ranks = append(ranks, model.RankInfo{ @@ -504,16 +505,16 @@ func PlayScore(ctx *gin.Context) { } resp, err := json.Marshal(playResp) - CheckErr(err) + utils.CheckErr(err) - ctx.Header("X-Message-Sign", GenXMS(resp)) + ctx.Header("X-Message-Sign", utils.GenXMS(resp)) ctx.String(http.StatusOK, string(resp)) } func PlayReward(ctx *gin.Context) { playRewardReq := model.PlayRewardReq{} err := json.Unmarshal([]byte(ctx.GetString("request_data")), &playRewardReq) - CheckErr(err) + utils.CheckErr(err) difficultyId := playRewardReq.LiveDifficultyID @@ -522,15 +523,15 @@ func PlayReward(ctx *gin.Context) { sql := `SELECT c_rank_score,b_rank_score,a_rank_score,s_rank_score,c_rank_combo,b_rank_combo,a_rank_combo,s_rank_combo,ac_flag,swing_flag FROM live_setting_m WHERE live_setting_id IN (SELECT live_setting_id FROM normal_live_m WHERE live_difficulty_id = ? UNION ALL SELECT live_setting_id FROM special_live_m WHERE live_difficulty_id = ?)` var c_rank_score, b_rank_score, a_rank_score, s_rank_score, c_rank_combo, b_rank_combo, a_rank_combo, s_rank_combo, ac_flag, swing_flag int err = MainEng.DB().QueryRow(sql, difficultyId, difficultyId).Scan(&c_rank_score, &b_rank_score, &a_rank_score, &s_rank_score, &c_rank_combo, &b_rank_combo, &a_rank_combo, &s_rank_combo, &ac_flag, &swing_flag) - CheckErr(err) + utils.CheckErr(err) key := "live_deck_" + ctx.GetString("userid") deckId, err := db.DB.Get([]byte(key)) - CheckErr(err) + utils.CheckErr(err) unitsList := []model.PlayRewardUnitList{} err = UserEng.Table("deck_unit_m").Join("LEFT", "user_deck_m", "deck_unit_m.user_deck_id = user_deck_m.id"). Where("user_id = ? AND deck_id = ?", ctx.GetString("userid"), string(deckId)).Find(&unitsList) - CheckErr(err) + utils.CheckErr(err) totalScore := playRewardReq.ScoreSmile + playRewardReq.ScoreCool + playRewardReq.ScoreCute playResp := model.RewardResp{ @@ -685,8 +686,8 @@ func PlayReward(ctx *gin.Context) { } resp, err := json.Marshal(playResp) - CheckErr(err) + utils.CheckErr(err) - ctx.Header("X-Message-Sign", GenXMS(resp)) + ctx.Header("X-Message-Sign", utils.GenXMS(resp)) ctx.String(http.StatusOK, string(resp)) } diff --git a/handler/login.go b/internal/handler/login.go similarity index 80% rename from handler/login.go rename to internal/handler/login.go index 0265025..dd2617f 100644 --- a/handler/login.go +++ b/internal/handler/login.go @@ -2,8 +2,9 @@ package handler import ( "encoding/json" - "honoka-chan/db" - "honoka-chan/model" + "honoka-chan/internal/model" + "honoka-chan/internal/utils" + "honoka-chan/pkg/db" "net/http" "strconv" "time" @@ -21,9 +22,9 @@ func AuthKey(ctx *gin.Context) { StatusCode: 200, } resp, err := json.Marshal(authResp) - CheckErr(err) + utils.CheckErr(err) - ctx.Header("X-Message-Sign", GenXMS(resp)) + ctx.Header("X-Message-Sign", utils.GenXMS(resp)) ctx.JSON(http.StatusOK, authResp) } @@ -31,7 +32,7 @@ func Login(ctx *gin.Context) { loginKey := ctx.GetString("login_key") var userId int exists, err := UserEng.Table("user_key").Where("key = ?", loginKey).Cols("userid").Get(&userId) - CheckErr(err) + utils.CheckErr(err) if !exists || userId == 0 { userId = 9999999 @@ -39,7 +40,7 @@ func Login(ctx *gin.Context) { ctx.Set("userid", userId) err = db.DB.Set([]byte(strconv.Itoa(userId)), []byte(ctx.GetString("authorize_token"))) - CheckErr(err) + utils.CheckErr(err) loginResp := model.LoginResp{ ResponseData: model.LoginRes{ @@ -52,8 +53,8 @@ func Login(ctx *gin.Context) { StatusCode: 200, } resp, err := json.Marshal(loginResp) - CheckErr(err) + utils.CheckErr(err) - ctx.Header("X-Message-Sign", GenXMS(resp)) + ctx.Header("X-Message-Sign", utils.GenXMS(resp)) ctx.JSON(http.StatusOK, loginResp) } diff --git a/handler/multiunit.go b/internal/handler/multiunit.go similarity index 79% rename from handler/multiunit.go rename to internal/handler/multiunit.go index 29ce138..8857fd9 100644 --- a/handler/multiunit.go +++ b/internal/handler/multiunit.go @@ -2,7 +2,8 @@ package handler import ( "encoding/json" - "honoka-chan/model" + "honoka-chan/internal/model" + "honoka-chan/internal/utils" "net/http" "time" @@ -12,7 +13,7 @@ import ( func MultiUnitStartUp(ctx *gin.Context) { startReq := model.MultiUnitStartUpReq{} err := json.Unmarshal([]byte(ctx.PostForm("request_data")), &startReq) - CheckErr(err) + utils.CheckErr(err) startResp := model.MultiUnitStartUpResp{ ResponseData: model.MultiUnitStartUpRes{ @@ -24,8 +25,8 @@ func MultiUnitStartUp(ctx *gin.Context) { StatusCode: 200, } resp, err := json.Marshal(startResp) - CheckErr(err) + utils.CheckErr(err) - ctx.Header("X-Message-Sign", GenXMS(resp)) + ctx.Header("X-Message-Sign", utils.GenXMS(resp)) ctx.String(http.StatusOK, string(resp)) } diff --git a/handler/museum.go b/internal/handler/museum.go similarity index 88% rename from handler/museum.go rename to internal/handler/museum.go index a6b0c5d..309395b 100644 --- a/handler/museum.go +++ b/internal/handler/museum.go @@ -2,7 +2,8 @@ package handler import ( "encoding/json" - "honoka-chan/model" + "honoka-chan/internal/model" + "honoka-chan/internal/utils" "net/http" "time" @@ -19,7 +20,7 @@ type MuseumContent struct { func MuseumInfo(ctx *gin.Context) { var contents []MuseumContent err := MainEng.Table("museum_contents_m").Cols("museum_contents_id,smile_buff,pure_buff,cool_buff").Find(&contents) - CheckErr(err) + utils.CheckErr(err) var smileBuff, pureBuff, coolBuff int var contentsList []int for _, content := range contents { @@ -44,8 +45,8 @@ func MuseumInfo(ctx *gin.Context) { StatusCode: 200, } resp, err := json.Marshal(museumResp) - CheckErr(err) + utils.CheckErr(err) - ctx.Header("X-Message-Sign", GenXMS(resp)) + ctx.Header("X-Message-Sign", utils.GenXMS(resp)) ctx.String(http.StatusOK, string(resp)) } diff --git a/handler/notice.go b/internal/handler/notice.go similarity index 81% rename from handler/notice.go rename to internal/handler/notice.go index 202efb4..90f127c 100644 --- a/handler/notice.go +++ b/internal/handler/notice.go @@ -2,7 +2,8 @@ package handler import ( "encoding/json" - "honoka-chan/model" + "honoka-chan/internal/model" + "honoka-chan/internal/utils" "net/http" "time" @@ -20,9 +21,9 @@ func NoticeFriendVariety(ctx *gin.Context) { StatusCode: 200, } resp, err := json.Marshal(noticeResp) - CheckErr(err) + utils.CheckErr(err) - ctx.Header("X-Message-Sign", GenXMS(resp)) + ctx.Header("X-Message-Sign", utils.GenXMS(resp)) ctx.String(http.StatusOK, string(resp)) } @@ -37,9 +38,9 @@ func NoticeFriendGreeting(ctx *gin.Context) { StatusCode: 200, } resp, err := json.Marshal(noticeResp) - CheckErr(err) + utils.CheckErr(err) - ctx.Header("X-Message-Sign", GenXMS(resp)) + ctx.Header("X-Message-Sign", utils.GenXMS(resp)) ctx.String(http.StatusOK, string(resp)) } @@ -55,8 +56,8 @@ func NoticeUserGreeting(ctx *gin.Context) { StatusCode: 200, } resp, err := json.Marshal(noticeResp) - CheckErr(err) + utils.CheckErr(err) - ctx.Header("X-Message-Sign", GenXMS(resp)) + ctx.Header("X-Message-Sign", utils.GenXMS(resp)) ctx.String(http.StatusOK, string(resp)) } diff --git a/handler/payment.go b/internal/handler/payment.go similarity index 84% rename from handler/payment.go rename to internal/handler/payment.go index 9a09439..d25762f 100644 --- a/handler/payment.go +++ b/internal/handler/payment.go @@ -2,7 +2,8 @@ package handler import ( "encoding/json" - "honoka-chan/model" + "honoka-chan/internal/model" + "honoka-chan/internal/utils" "net/http" "time" @@ -31,8 +32,8 @@ func ProductList(ctx *gin.Context) { StatusCode: 200, } resp, err := json.Marshal(prodReesp) - CheckErr(err) + utils.CheckErr(err) - ctx.Header("X-Message-Sign", GenXMS(resp)) + ctx.Header("X-Message-Sign", utils.GenXMS(resp)) ctx.String(http.StatusOK, string(resp)) } diff --git a/handler/personalnotice.go b/internal/handler/personalnotice.go similarity index 79% rename from handler/personalnotice.go rename to internal/handler/personalnotice.go index 02f373b..f7a6d28 100644 --- a/handler/personalnotice.go +++ b/internal/handler/personalnotice.go @@ -2,7 +2,8 @@ package handler import ( "encoding/json" - "honoka-chan/model" + "honoka-chan/internal/model" + "honoka-chan/internal/utils" "net/http" "time" @@ -23,8 +24,8 @@ func PersonalNotice(ctx *gin.Context) { StatusCode: 200, } resp, err := json.Marshal(noticeResp) - CheckErr(err) + utils.CheckErr(err) - ctx.Header("X-Message-Sign", GenXMS(resp)) + ctx.Header("X-Message-Sign", utils.GenXMS(resp)) ctx.String(http.StatusOK, string(resp)) } diff --git a/handler/private.go b/internal/handler/private.go similarity index 93% rename from handler/private.go rename to internal/handler/private.go index 7536aec..fad4de7 100644 --- a/handler/private.go +++ b/internal/handler/private.go @@ -5,10 +5,11 @@ import ( "encoding/json" "fmt" "honoka-chan/config" - "honoka-chan/db" - "honoka-chan/encrypt" - "honoka-chan/tools" - "honoka-chan/utils" + "honoka-chan/internal/tools" + "honoka-chan/internal/utils" + "honoka-chan/pkg/db" + "honoka-chan/pkg/encrypt" + honokautils "honoka-chan/pkg/utils" "io" "net/http" "net/url" @@ -90,7 +91,7 @@ type InitializeResp struct { func Active(ctx *gin.Context) { // body, err := io.ReadAll(ctx.Request.Body) - // CheckErr(err) + // utils.CheckErr(err) // defer ctx.Request.Body.Close() // fmt.Println(string(body)) @@ -99,7 +100,7 @@ func Active(ctx *gin.Context) { } func PublicKey(ctx *gin.Context) { - publicKey := utils.ReadAllText(config.PublicKeyPath) + publicKey := honokautils.ReadAllText(config.PublicKeyPath) publicKey = strings.ReplaceAll(publicKey, "\n", "") publicKey = strings.ReplaceAll(publicKey, "-----BEGIN PUBLIC KEY-----", "") publicKey = strings.ReplaceAll(publicKey, "-----END PUBLIC KEY-----", "") @@ -112,30 +113,30 @@ func PublicKey(ctx *gin.Context) { func Handshake(ctx *gin.Context) { body, err := io.ReadAll(ctx.Request.Body) - CheckErr(err) + utils.CheckErr(err) defer ctx.Request.Body.Close() // fmt.Println(string(body)) body64, err := base64.StdEncoding.DecodeString(string(body)) - CheckErr(err) + utils.CheckErr(err) decryptedBody := encrypt.RSADecrypt(body64) // fmt.Println(decryptedBody) // fmt.Println(string(decryptedBody)) params, err := url.ParseQuery(string(decryptedBody)) - CheckErr(err) + utils.CheckErr(err) randKey := params.Get("randkey") deviceId := ctx.Request.Header.Get("X-DEVICEID") // fmt.Println(randKey) // fmt.Println(deviceId) err = db.DB.Set([]byte(deviceId), []byte(randKey)) - CheckErr(err) + utils.CheckErr(err) - token := strings.ToUpper(utils.RandomStr(33)) + token := strings.ToUpper(honokautils.RandomStr(33)) token = fmt.Sprintf(`{"message":"ok","result":0,"token":"%s"}`, token) encryptedToken, err := openssl.Des3ECBEncrypt([]byte(token), []byte(randKey)[0:24], openssl.PKCS7_PADDING) - CheckErr(err) + utils.CheckErr(err) encryptedToken64 := base64.StdEncoding.EncodeToString(encryptedToken) // fmt.Println(encryptedToken64) @@ -147,19 +148,19 @@ func Handshake(ctx *gin.Context) { func Initialize(ctx *gin.Context) { // body, err := io.ReadAll(ctx.Request.Body) - // CheckErr(err) + // utils.CheckErr(err) // defer ctx.Request.Body.Close() // fmt.Println(string(body)) // body64, err := base64.StdEncoding.DecodeString(string(body)) - // CheckErr(err) + // utils.CheckErr(err) // fmt.Println(string(body64)) deviceId := ctx.Request.Header.Get("X-DEVICEID") randKey, err := db.DB.Get([]byte(deviceId)) - CheckErr(err) + utils.CheckErr(err) // decryptedBody, err := openssl.Des3ECBDecrypt(body64, randKey[0:24], openssl.PKCS7_PADDING) - // CheckErr(err) + // utils.CheckErr(err) // fmt.Println(string(decryptedBody)) initResp := InitializeResp{ @@ -176,9 +177,9 @@ func Initialize(ctx *gin.Context) { VoicetipButton: 1, } data, err := json.Marshal(initResp) - CheckErr(err) + utils.CheckErr(err) encryptedData, err := openssl.Des3ECBEncrypt([]byte(data), randKey[0:24], openssl.PKCS7_PADDING) - CheckErr(err) + utils.CheckErr(err) encryptedData64 := base64.StdEncoding.EncodeToString(encryptedData) // fmt.Println(encryptedToken64) @@ -196,25 +197,25 @@ func GetCode(ctx *gin.Context) { func LoginAuto(ctx *gin.Context) { body, err := io.ReadAll(ctx.Request.Body) - CheckErr(err) + utils.CheckErr(err) defer ctx.Request.Body.Close() // fmt.Println(string(body)) body64, err := base64.StdEncoding.DecodeString(string(body)) - CheckErr(err) + utils.CheckErr(err) // fmt.Println(string(body64)) deviceId := ctx.Request.Header.Get("X-DEVICEID") randKey, err := db.DB.Get([]byte(deviceId)) - CheckErr(err) + utils.CheckErr(err) decryptedBody, err := openssl.Des3ECBDecrypt(body64, randKey[0:24], openssl.PKCS7_PADDING) - CheckErr(err) + utils.CheckErr(err) queryStr := string(decryptedBody) // fmt.Println(queryStr) params, err := url.ParseQuery(queryStr) - CheckErr(err) + utils.CheckErr(err) autoKey := params.Get("autokey") // fmt.Println(autoKey) if autoKey == "" { @@ -224,7 +225,7 @@ func LoginAuto(ctx *gin.Context) { var userId, ticket string _, err = UserEng.Table("users").Cols("userid,ticket").Where("autokey = ?", autoKey).Get(&userId, &ticket) - CheckErr(err) + utils.CheckErr(err) var resp string if userId != "" { @@ -237,9 +238,9 @@ func LoginAuto(ctx *gin.Context) { } data, err := json.Marshal(autoResp) // fmt.Println(string(data)) - CheckErr(err) + utils.CheckErr(err) encryptedData, err := openssl.Des3ECBEncrypt(data, randKey[0:24], openssl.PKCS7_PADDING) - CheckErr(err) + utils.CheckErr(err) encryptedData64 := base64.StdEncoding.EncodeToString(encryptedData) // fmt.Println(encryptedData64) @@ -247,7 +248,7 @@ func LoginAuto(ctx *gin.Context) { } else { data := `{"message":"账号不存在或者登陆状态已过期!","result":31}` encryptedData, err := openssl.Des3ECBEncrypt([]byte(data), randKey[0:24], openssl.PKCS7_PADDING) - CheckErr(err) + utils.CheckErr(err) encryptedData64 := base64.StdEncoding.EncodeToString(encryptedData) // fmt.Println(encryptedData64) @@ -270,25 +271,25 @@ func LoginArea(ctx *gin.Context) { func AccountLogin(ctx *gin.Context) { body, err := io.ReadAll(ctx.Request.Body) - CheckErr(err) + utils.CheckErr(err) defer ctx.Request.Body.Close() // fmt.Println(string(body)) body64, err := base64.StdEncoding.DecodeString(string(body)) - CheckErr(err) + utils.CheckErr(err) // fmt.Println(string(body64)) deviceId := ctx.Request.Header.Get("X-DEVICEID") randKey, err := db.DB.Get([]byte(deviceId)) - CheckErr(err) + utils.CheckErr(err) decryptedBody, err := openssl.Des3ECBDecrypt(body64, randKey[0:24], openssl.PKCS7_PADDING) - CheckErr(err) + utils.CheckErr(err) queryStr, err := url.QueryUnescape(string(decryptedBody)) - CheckErr(err) + utils.CheckErr(err) params, err := url.ParseQuery(queryStr) - CheckErr(err) + utils.CheckErr(err) phone, password := params.Get("phone"), params.Get("password") if phone == "" || password == "" { @@ -313,7 +314,7 @@ func AccountLogin(ctx *gin.Context) { var pass, autoKey, ticket, userId string _, err = UserEng.Table("users").Cols("password,autokey,ticket,userid").Where("phone = ?", phone). Get(&pass, &autoKey, &ticket, &userId) - CheckErr(err) + utils.CheckErr(err) loginResp := LoginResp{} loginCode := 0 @@ -331,7 +332,7 @@ func AccountLogin(ctx *gin.Context) { } pass = openssl.Md5ToString(password) - autoKey = "AUTO" + strings.ToUpper(utils.RandomStr(32)) + autoKey = "AUTO" + strings.ToUpper(honokautils.RandomStr(32)) userId = strconv.Itoa(int(loginTime)) ticket = "9999999" + userId + userId userStmt, err := session.DB().Prepare("INSERT INTO users(phone,password,autokey,ticket,userid,last_login_time) VALUES (?,?,?,?,?,?)") @@ -393,11 +394,11 @@ func AccountLogin(ctx *gin.Context) { // 更新信息 userStmt, err := UserEng.DB().Prepare("UPDATE users SET autokey=?,ticket=?,last_login_time=? WHERE userid=?") - CheckErr(err) + utils.CheckErr(err) defer userStmt.Close() _, err = userStmt.Exec(autoKey, ticket, loginTime, userId) - CheckErr(err) + utils.CheckErr(err) // aff, _ := res.RowsAffected() // fmt.Println("RowsAffected:", aff) } else { @@ -408,10 +409,10 @@ func AccountLogin(ctx *gin.Context) { } data, err := json.Marshal(loginResp) - CheckErr(err) + utils.CheckErr(err) // fmt.Println(string(data)) encryptedData, err := openssl.Des3ECBEncrypt(data, randKey[0:24], openssl.PKCS7_PADDING) - CheckErr(err) + utils.CheckErr(err) encryptedData64 := base64.StdEncoding.EncodeToString(encryptedData) // fmt.Println(encryptedToken64) @@ -423,30 +424,30 @@ func AccountLogin(ctx *gin.Context) { func ReportRole(ctx *gin.Context) { // body, err := io.ReadAll(ctx.Request.Body) - // CheckErr(err) + // utils.CheckErr(err) // defer ctx.Request.Body.Close() // fmt.Println(string(body)) // body64, err := base64.StdEncoding.DecodeString(string(body)) - // CheckErr(err) + // utils.CheckErr(err) // fmt.Println(string(body64)) deviceId := ctx.Request.Header.Get("X-DEVICEID") randKey, err := db.DB.Get([]byte(deviceId)) - CheckErr(err) + utils.CheckErr(err) // decryptedBody, err := openssl.Des3ECBDecrypt(body64, randKey[0:24], openssl.PKCS7_PADDING) - // CheckErr(err) + // utils.CheckErr(err) // fmt.Println(string(decryptedBody)) // decrypted, err := url.QueryUnescape(string(decryptedBody)) - // CheckErr(err) + // utils.CheckErr(err) // fmt.Println(decrypted) // Unable to decrypt server data token := `{"message":"Hello, world!"}` encryptedToken, err := openssl.Des3ECBEncrypt([]byte(token), randKey[0:24], openssl.PKCS7_PADDING) - CheckErr(err) + utils.CheckErr(err) encryptedToken64 := base64.StdEncoding.EncodeToString(encryptedToken) // fmt.Println(encryptedToken64) @@ -470,7 +471,7 @@ func GuestStatus(ctx *gin.Context) { func ReportLog(ctx *gin.Context) { // body, err := io.ReadAll(ctx.Request.Body) - // CheckErr(err) + // utils.CheckErr(err) // defer ctx.Request.Body.Close() // fmt.Println(string(body)) ctx.Header("Content-Type", "text/html;charset=utf-8") @@ -479,7 +480,7 @@ func ReportLog(ctx *gin.Context) { func ReportApp(ctx *gin.Context) { // body, err := io.ReadAll(ctx.Request.Body) - // CheckErr(err) + // utils.CheckErr(err) // defer ctx.Request.Body.Close() // fmt.Println(string(body)) resp := `{ "code": 0, "msg": "", "data": { "needReport": 0 } }` diff --git a/handler/profile.go b/internal/handler/profile.go similarity index 76% rename from handler/profile.go rename to internal/handler/profile.go index e70aecf..7447c54 100644 --- a/handler/profile.go +++ b/internal/handler/profile.go @@ -2,8 +2,9 @@ package handler import ( "encoding/json" - "honoka-chan/model" - "honoka-chan/tools" + "honoka-chan/internal/model" + "honoka-chan/internal/tools" + "honoka-chan/internal/utils" "net/http" "github.com/gin-gonic/gin" @@ -16,15 +17,15 @@ func ProfileRegister(ctx *gin.Context) { UserDesc: req.Get("introduction").String(), } _, err := UserEng.Table("user_preference_m").Where("user_id = ?", ctx.GetString("userid")).Update(&pref) - CheckErr(err) + utils.CheckErr(err) profileResp := model.ProfileRegisterResp{ ResponseData: []any{}, ReleaseInfo: []any{}, StatusCode: 200, } resp, err := json.Marshal(profileResp) - CheckErr(err) + utils.CheckErr(err) - ctx.Header("X-Message-Sign", GenXMS(resp)) + ctx.Header("X-Message-Sign", utils.GenXMS(resp)) ctx.String(http.StatusOK, string(resp)) } diff --git a/handler/scenario.go b/internal/handler/scenario.go similarity index 78% rename from handler/scenario.go rename to internal/handler/scenario.go index a47bb36..de570b5 100644 --- a/handler/scenario.go +++ b/internal/handler/scenario.go @@ -4,9 +4,10 @@ import ( "encoding/base64" "encoding/json" "fmt" - "honoka-chan/encrypt" - "honoka-chan/model" - "honoka-chan/utils" + "honoka-chan/internal/model" + "honoka-chan/internal/utils" + "honoka-chan/pkg/encrypt" + honokautils "honoka-chan/pkg/utils" "net/http" "time" @@ -16,7 +17,7 @@ import ( func ScenarioStartup(ctx *gin.Context) { startReq := model.ScenarioReq{} err := json.Unmarshal([]byte(ctx.PostForm("request_data")), &startReq) - CheckErr(err) + utils.CheckErr(err) startResp := model.ScenarioResp{ ResponseData: model.ScenarioRes{ @@ -28,7 +29,7 @@ func ScenarioStartup(ctx *gin.Context) { StatusCode: 200, } resp, err := json.Marshal(startResp) - CheckErr(err) + utils.CheckErr(err) nonce := ctx.GetInt("nonce") nonce++ @@ -41,8 +42,8 @@ func ScenarioStartup(ctx *gin.Context) { } func ScenarioReward(ctx *gin.Context) { - resp := utils.ReadAllText("assets/sif/reward.json") + resp := honokautils.ReadAllText("assets/serverdata/reward.json") - ctx.Header("X-Message-Sign", GenXMS([]byte(resp))) + ctx.Header("X-Message-Sign", utils.GenXMS([]byte(resp))) ctx.String(http.StatusOK, resp) } diff --git a/handler/subscenario.go b/internal/handler/subscenario.go similarity index 78% rename from handler/subscenario.go rename to internal/handler/subscenario.go index aa4d679..8220808 100644 --- a/handler/subscenario.go +++ b/internal/handler/subscenario.go @@ -4,9 +4,10 @@ import ( "encoding/base64" "encoding/json" "fmt" - "honoka-chan/encrypt" - "honoka-chan/model" - "honoka-chan/utils" + "honoka-chan/internal/model" + "honoka-chan/internal/utils" + "honoka-chan/pkg/encrypt" + honokautils "honoka-chan/pkg/utils" "net/http" "time" @@ -16,7 +17,7 @@ import ( func SubScenarioStartup(ctx *gin.Context) { startReq := model.SubScenarioReq{} err := json.Unmarshal([]byte(ctx.PostForm("request_data")), &startReq) - CheckErr(err) + utils.CheckErr(err) startResp := model.SubScenarioResp{ ResponseData: model.SubScenarioRes{ @@ -28,7 +29,7 @@ func SubScenarioStartup(ctx *gin.Context) { StatusCode: 200, } resp, err := json.Marshal(startResp) - CheckErr(err) + utils.CheckErr(err) nonce := ctx.GetInt("nonce") nonce++ @@ -41,8 +42,8 @@ func SubScenarioStartup(ctx *gin.Context) { } func SubScenarioReward(ctx *gin.Context) { - resp := utils.ReadAllText("assets/sif/subreward.json") + resp := honokautils.ReadAllText("assets/serverdata/subreward.json") - ctx.Header("X-Message-Sign", GenXMS([]byte(resp))) + ctx.Header("X-Message-Sign", utils.GenXMS([]byte(resp))) ctx.String(http.StatusOK, resp) } diff --git a/handler/tos.go b/internal/handler/tos.go similarity index 76% rename from handler/tos.go rename to internal/handler/tos.go index 97e1748..83f3e61 100644 --- a/handler/tos.go +++ b/internal/handler/tos.go @@ -2,7 +2,8 @@ package handler import ( "encoding/json" - "honoka-chan/model" + "honoka-chan/internal/model" + "honoka-chan/internal/utils" "net/http" "time" @@ -21,8 +22,8 @@ func TosCheck(ctx *gin.Context) { StatusCode: 200, } resp, err := json.Marshal(tosResp) - CheckErr(err) + utils.CheckErr(err) - ctx.Header("X-Message-Sign", GenXMS(resp)) + ctx.Header("X-Message-Sign", utils.GenXMS(resp)) ctx.String(http.StatusOK, string(resp)) } diff --git a/handler/unit.go b/internal/handler/unit.go similarity index 93% rename from handler/unit.go rename to internal/handler/unit.go index 1b4abb1..d6bd6e3 100644 --- a/handler/unit.go +++ b/internal/handler/unit.go @@ -3,7 +3,8 @@ package handler import ( "encoding/json" "fmt" - "honoka-chan/model" + "honoka-chan/internal/model" + "honoka-chan/internal/utils" "net/http" "strconv" "time" @@ -18,15 +19,15 @@ func SetDisplayRank(ctx *gin.Context) { StatusCode: 200, } resp, err := json.Marshal(dispResp) - CheckErr(err) + utils.CheckErr(err) - ctx.Header("X-Message-Sign", GenXMS(resp)) + ctx.Header("X-Message-Sign", utils.GenXMS(resp)) ctx.String(http.StatusOK, string(resp)) } func SetDeck(ctx *gin.Context) { userId, err := strconv.Atoi(ctx.GetString("userid")) - CheckErr(err) + utils.CheckErr(err) deckReq := model.UnitDeckReq{} if err := json.Unmarshal([]byte(ctx.PostForm("request_data")), &deckReq); err != nil { @@ -155,15 +156,15 @@ func SetDeck(ctx *gin.Context) { StatusCode: 200, } resp, err := json.Marshal(dispResp) - CheckErr(err) + utils.CheckErr(err) - ctx.Header("X-Message-Sign", GenXMS(resp)) + ctx.Header("X-Message-Sign", utils.GenXMS(resp)) ctx.String(http.StatusOK, string(resp)) } func SetDeckName(ctx *gin.Context) { userId, err := strconv.Atoi(ctx.GetString("userid")) - CheckErr(err) + utils.CheckErr(err) deckReq := model.DeckNameReq{} if err := json.Unmarshal([]byte(ctx.PostForm("request_data")), &deckReq); err != nil { @@ -171,7 +172,7 @@ func SetDeckName(ctx *gin.Context) { } exists, err := UserEng.Table("user_deck_m").Where("user_id = ? AND deck_id = ?", userId, deckReq.UnitDeckID).Exist() - CheckErr(err) + utils.CheckErr(err) if !exists { ctx.String(http.StatusForbidden, ErrorMsg) return @@ -183,7 +184,7 @@ func SetDeckName(ctx *gin.Context) { UserID: userId, DeckID: deckReq.UnitDeckID, }) - CheckErr(err) + utils.CheckErr(err) dispResp := model.SetDeckResp{ ResponseData: []any{}, @@ -191,9 +192,9 @@ func SetDeckName(ctx *gin.Context) { StatusCode: 200, } resp, err := json.Marshal(dispResp) - CheckErr(err) + utils.CheckErr(err) - ctx.Header("X-Message-Sign", GenXMS(resp)) + ctx.Header("X-Message-Sign", utils.GenXMS(resp)) ctx.String(http.StatusOK, string(resp)) } @@ -234,7 +235,7 @@ func WearAccessory(ctx *gin.Context) { UserId: ctx.GetString("userid"), } _, err := session.Table("accessory_wear_m").Insert(&data) - CheckErr(err) + utils.CheckErr(err) } // 结束事务 @@ -249,9 +250,9 @@ func WearAccessory(ctx *gin.Context) { StatusCode: 200, } resp, err := json.Marshal(wearResp) - CheckErr(err) + utils.CheckErr(err) - ctx.Header("X-Message-Sign", GenXMS(resp)) + ctx.Header("X-Message-Sign", utils.GenXMS(resp)) ctx.String(http.StatusOK, string(resp)) } @@ -292,7 +293,7 @@ func RemoveSkillEquip(ctx *gin.Context) { UserId: ctx.GetString("userid"), } _, err := session.Table("skill_equip_m").Insert(&data) - CheckErr(err) + utils.CheckErr(err) } // 结束事务 @@ -307,9 +308,9 @@ func RemoveSkillEquip(ctx *gin.Context) { StatusCode: 200, } resp, err := json.Marshal(wearResp) - CheckErr(err) + utils.CheckErr(err) fmt.Println(string(resp)) - ctx.Header("X-Message-Sign", GenXMS(resp)) + ctx.Header("X-Message-Sign", utils.GenXMS(resp)) ctx.String(http.StatusOK, string(resp)) } diff --git a/handler/user.go b/internal/handler/user.go similarity index 81% rename from handler/user.go rename to internal/handler/user.go index 485e1ad..f7963fd 100644 --- a/handler/user.go +++ b/internal/handler/user.go @@ -2,8 +2,9 @@ package handler import ( "encoding/json" - "honoka-chan/model" - "honoka-chan/tools" + "honoka-chan/internal/model" + "honoka-chan/internal/tools" + "honoka-chan/internal/utils" "net/http" "time" @@ -18,9 +19,9 @@ func SetNotificationToken(ctx *gin.Context) { StatusCode: 200, } resp, err := json.Marshal(notifResp) - CheckErr(err) + utils.CheckErr(err) - ctx.Header("X-Message-Sign", GenXMS(resp)) + ctx.Header("X-Message-Sign", utils.GenXMS(resp)) ctx.String(http.StatusOK, string(resp)) } @@ -30,16 +31,16 @@ func ChangeNavi(ctx *gin.Context) { UnitOwningUserID: int(req.Get("unit_owning_user_id").Int()), } _, err := UserEng.Table("user_preference_m").Where("user_id = ?", ctx.GetString("userid")).Update(&pref) - CheckErr(err) + utils.CheckErr(err) naviResp := model.UserNaviChangeResp{ ResponseData: []any{}, ReleaseInfo: []any{}, StatusCode: 200, } resp, err := json.Marshal(naviResp) - CheckErr(err) + utils.CheckErr(err) - ctx.Header("X-Message-Sign", GenXMS(resp)) + ctx.Header("X-Message-Sign", utils.GenXMS(resp)) ctx.String(http.StatusOK, string(resp)) } @@ -47,7 +48,7 @@ func ChangeName(ctx *gin.Context) { req := gjson.Parse(ctx.PostForm("request_data")) var oldName string exists, err := UserEng.Table("user_preference_m").Where("user_id = ?", ctx.GetString("userid")).Cols("user_name").Get(&oldName) - CheckErr(err) + utils.CheckErr(err) if !exists { ctx.String(http.StatusForbidden, ErrorMsg) return @@ -56,7 +57,7 @@ func ChangeName(ctx *gin.Context) { UserName: req.Get("name").String(), } _, err = UserEng.Table("user_preference_m").Where("user_id = ?", ctx.GetString("userid")).Update(&pref) - CheckErr(err) + utils.CheckErr(err) nameResp := model.UserNameChangeResp{ ResponseData: model.UserNameChangeRes{ BeforeName: oldName, @@ -67,8 +68,8 @@ func ChangeName(ctx *gin.Context) { StatusCode: 200, } resp, err := json.Marshal(nameResp) - CheckErr(err) + utils.CheckErr(err) - ctx.Header("X-Message-Sign", GenXMS(resp)) + ctx.Header("X-Message-Sign", utils.GenXMS(resp)) ctx.String(http.StatusOK, string(resp)) } diff --git a/handler/userinfo.go b/internal/handler/userinfo.go similarity index 91% rename from handler/userinfo.go rename to internal/handler/userinfo.go index 6e217e0..5dfe336 100644 --- a/handler/userinfo.go +++ b/internal/handler/userinfo.go @@ -3,8 +3,9 @@ package handler import ( "encoding/json" "honoka-chan/config" - "honoka-chan/model" - "honoka-chan/tools" + "honoka-chan/internal/model" + "honoka-chan/internal/tools" + "honoka-chan/internal/utils" "net/http" "strconv" "time" @@ -14,11 +15,11 @@ import ( func UserInfo(ctx *gin.Context) { userId, err := strconv.Atoi(ctx.GetString("userid")) - CheckErr(err) + utils.CheckErr(err) pref := tools.UserPref{} exists, err := UserEng.Table("user_preference_m").Where("user_id = ?", userId).Get(&pref) - CheckErr(err) + utils.CheckErr(err) if !exists { ctx.String(http.StatusForbidden, ErrorMsg) return @@ -66,8 +67,8 @@ func UserInfo(ctx *gin.Context) { StatusCode: 200, } resp, err := json.Marshal(userResp) - CheckErr(err) + utils.CheckErr(err) - ctx.Header("X-Message-Sign", GenXMS(resp)) + ctx.Header("X-Message-Sign", utils.GenXMS(resp)) ctx.String(http.StatusOK, string(resp)) } diff --git a/handler/webui.go b/internal/handler/webui.go similarity index 96% rename from handler/webui.go rename to internal/handler/webui.go index fcfc569..85ed805 100644 --- a/handler/webui.go +++ b/internal/handler/webui.go @@ -2,7 +2,8 @@ package handler import ( "encoding/csv" - "honoka-chan/model" + "honoka-chan/internal/model" + "honoka-chan/internal/utils" "net/http" "os" "path" @@ -35,7 +36,7 @@ func WebLogin(ctx *gin.Context) { userName := " " + area + "-" + user var userId int exists, err := UserEng.Table("users").Where("phone = ? AND password = ?", userName, openssl.Md5ToString(pass)).Cols("userid").Get(&userId) - CheckErr(err) + utils.CheckErr(err) if !exists { ctx.JSON(http.StatusOK, model.Msg{ Code: 1, @@ -73,11 +74,11 @@ func WebLogout(ctx *gin.Context) { func Upload(ctx *gin.Context) { file, err := ctx.FormFile("file") - CheckErr(err) + utils.CheckErr(err) tmpPath := path.Join("./temp", file.Filename) err = ctx.SaveUploadedFile(file, tmpPath) - CheckErr(err) + utils.CheckErr(err) session := UserEng.NewSession() defer session.Close() @@ -87,7 +88,7 @@ func Upload(ctx *gin.Context) { } f, err := os.Open(tmpPath) - CheckErr(err) + utils.CheckErr(err) defer f.Close() r := csv.NewReader(f) @@ -116,7 +117,7 @@ func Upload(ctx *gin.Context) { Where("unit_m.unit_number = ?", rr[0]). Cols("common_unit_m.unit_id,common_unit_m.exp,unit_m.rarity,common_unit_m.max_hp,common_unit_m.is_signed"). Get(&unitId, &unitExp, &unitRarity, &unitHp, &unitSigned) - CheckErr(err) + utils.CheckErr(err) if !exists { session.Rollback() @@ -139,7 +140,7 @@ func Upload(ctx *gin.Context) { var diffExp, diffSmile, diffPure, diffCool int _, err = MainEng.Table("unit_level_limit_pattern_m").Where("unit_level_limit_id = 1 AND unit_level = 350"). Cols("next_exp,smile_diff,pure_diff,cool_diff").Get(&diffExp, &diffSmile, &diffPure, &diffCool) - CheckErr(err) + utils.CheckErr(err) isSigned := false if unitSigned == 1 { diff --git a/middleware/authkey.go b/internal/middleware/authkey.go similarity index 76% rename from middleware/authkey.go rename to internal/middleware/authkey.go index f7e92e4..446e187 100644 --- a/middleware/authkey.go +++ b/internal/middleware/authkey.go @@ -4,9 +4,10 @@ import ( "encoding/base64" "encoding/json" "fmt" - "honoka-chan/db" - "honoka-chan/encrypt" - "honoka-chan/utils" + "honoka-chan/internal/utils" + "honoka-chan/pkg/db" + "honoka-chan/pkg/encrypt" + honokautils "honoka-chan/pkg/utils" "time" "github.com/gin-gonic/gin" @@ -16,18 +17,18 @@ import ( func AuthKey(ctx *gin.Context) { req := gjson.Parse(ctx.PostForm("request_data")) tDummyToken, err := base64.StdEncoding.DecodeString(req.Get("dummy_token").String()) - CheckErr(err) + utils.CheckErr(err) dummyToken := encrypt.RSADecrypt(tDummyToken) // aesKey := dummyToken[0:16] // tAuthData, err := base64.StdEncoding.DecodeString(req.Get("auth_data").String()) - // CheckErr(err) + // utils.CheckErr(err) // authData := utils.Sub16(encrypt.AES_CBC_Decrypt(tAuthData, aesKey)) // fmt.Println(string(authData)) clientToken := base64.StdEncoding.EncodeToString(dummyToken) - serverToken := base64.StdEncoding.EncodeToString([]byte(utils.RandomStr(32))) - authorizeToken := base64.StdEncoding.EncodeToString([]byte(utils.RandomStr(32))) + serverToken := base64.StdEncoding.EncodeToString([]byte(honokautils.RandomStr(32))) + authorizeToken := base64.StdEncoding.EncodeToString([]byte(honokautils.RandomStr(32))) ctx.Set("dummy_token", serverToken) ctx.Set("authorize_token", authorizeToken) @@ -36,9 +37,9 @@ func AuthKey(ctx *gin.Context) { "client_token": clientToken, "server_token": serverToken, }) - CheckErr(err) + utils.CheckErr(err) err = db.DB.Set([]byte(authorizeToken), authJson) - CheckErr(err) + utils.CheckErr(err) nonce := ctx.GetInt("nonce") nonce++ diff --git a/middleware/common.go b/internal/middleware/common.go similarity index 93% rename from middleware/common.go rename to internal/middleware/common.go index 0550b69..d6c1247 100644 --- a/middleware/common.go +++ b/internal/middleware/common.go @@ -2,7 +2,8 @@ package middleware import ( "fmt" - "honoka-chan/db" + "honoka-chan/internal/utils" + "honoka-chan/pkg/db" "net/http" "net/url" "strconv" @@ -32,10 +33,10 @@ func Common(ctx *gin.Context) { ctx.Set("authorize", authorize) params, err := url.ParseQuery(authorize) - CheckErr(err) + utils.CheckErr(err) nonce, err := strconv.Atoi(params.Get("nonce")) - CheckErr(err) + utils.CheckErr(err) nonce++ ctx.Set("nonce", nonce) @@ -55,7 +56,7 @@ func Common(ctx *gin.Context) { ctx.Set("userid", userId) rToken, err := db.DB.Get([]byte(userId)) - CheckErr(err) + utils.CheckErr(err) if token != string(rToken) { ctx.String(http.StatusForbidden, ErrorMsg) ctx.Abort() diff --git a/middleware/login.go b/internal/middleware/login.go similarity index 63% rename from middleware/login.go rename to internal/middleware/login.go index 9a5a265..92068e6 100644 --- a/middleware/login.go +++ b/internal/middleware/login.go @@ -2,9 +2,10 @@ package middleware import ( "encoding/base64" - "honoka-chan/db" - "honoka-chan/encrypt" - "honoka-chan/utils" + "honoka-chan/internal/utils" + "honoka-chan/pkg/db" + "honoka-chan/pkg/encrypt" + honokautils "honoka-chan/pkg/utils" "github.com/gin-gonic/gin" "github.com/tidwall/gjson" @@ -12,32 +13,32 @@ import ( func Login(ctx *gin.Context) { authData, err := db.DB.Get([]byte(ctx.GetString("token"))) - CheckErr(err) + utils.CheckErr(err) clientToken, err := base64.StdEncoding.DecodeString(gjson.Get(string(authData), "client_token").String()) - CheckErr(err) + utils.CheckErr(err) serverToken, err := base64.StdEncoding.DecodeString(gjson.Get(string(authData), "server_token").String()) - CheckErr(err) + utils.CheckErr(err) - xmcKey := utils.SliceXor(clientToken, serverToken) + xmcKey := honokautils.SliceXor(clientToken, serverToken) aesKey := xmcKey[0:16] req := gjson.Parse(ctx.GetString("request_data")) tKey, err := base64.StdEncoding.DecodeString(req.Get("login_key").String()) - CheckErr(err) - loginKey := utils.Sub16(encrypt.AESCBCDecrypt(tKey, aesKey)) + utils.CheckErr(err) + loginKey := honokautils.Sub16(encrypt.AESCBCDecrypt(tKey, aesKey)) ctx.Set("login_key", string(loginKey)) tPasswd, err := base64.StdEncoding.DecodeString(req.Get("login_passwd").String()) - CheckErr(err) - loginPasswd := utils.Sub16(encrypt.AESCBCDecrypt(tPasswd, aesKey)) + utils.CheckErr(err) + loginPasswd := honokautils.Sub16(encrypt.AESCBCDecrypt(tPasswd, aesKey)) ctx.Set("login_passwd", string(loginPasswd)) nonce := ctx.GetInt("nonce") nonce++ ctx.Set("nonce", nonce) - authorizeToken := base64.StdEncoding.EncodeToString([]byte(utils.RandomStr(32))) + authorizeToken := base64.StdEncoding.EncodeToString([]byte(honokautils.RandomStr(32))) ctx.Set("authorize_token", authorizeToken) ctx.Next() diff --git a/middleware/multipart.go b/internal/middleware/multipart.go similarity index 89% rename from middleware/multipart.go rename to internal/middleware/multipart.go index e061f9b..7327b63 100644 --- a/middleware/multipart.go +++ b/internal/middleware/multipart.go @@ -1,6 +1,7 @@ package middleware import ( + "honoka-chan/internal/utils" "io" "mime/multipart" "strings" @@ -20,10 +21,10 @@ func ParseMultipartForm(ctx *gin.Context) { if err == io.EOF { break } - CheckErr(err) + utils.CheckErr(err) data, err := io.ReadAll(part) - CheckErr(err) + utils.CheckErr(err) reqData = data } diff --git a/middleware/webui.go b/internal/middleware/webui.go similarity index 100% rename from middleware/webui.go rename to internal/middleware/webui.go diff --git a/model/album.go b/internal/model/album.go similarity index 100% rename from model/album.go rename to internal/model/album.go diff --git a/model/announce.go b/internal/model/announce.go similarity index 100% rename from model/announce.go rename to internal/model/announce.go diff --git a/model/api.go b/internal/model/api.go similarity index 100% rename from model/api.go rename to internal/model/api.go diff --git a/model/authkey.go b/internal/model/authkey.go similarity index 100% rename from model/authkey.go rename to internal/model/authkey.go diff --git a/model/award.go b/internal/model/award.go similarity index 100% rename from model/award.go rename to internal/model/award.go diff --git a/model/background.go b/internal/model/background.go similarity index 100% rename from model/background.go rename to internal/model/background.go diff --git a/model/banner.go b/internal/model/banner.go similarity index 100% rename from model/banner.go rename to internal/model/banner.go diff --git a/model/challenge.go b/internal/model/challenge.go similarity index 100% rename from model/challenge.go rename to internal/model/challenge.go diff --git a/model/costume.go b/internal/model/costume.go similarity index 100% rename from model/costume.go rename to internal/model/costume.go diff --git a/model/download.go b/internal/model/download.go similarity index 100% rename from model/download.go rename to internal/model/download.go diff --git a/model/event.go b/internal/model/event.go similarity index 100% rename from model/event.go rename to internal/model/event.go diff --git a/model/exchange.go b/internal/model/exchange.go similarity index 100% rename from model/exchange.go rename to internal/model/exchange.go diff --git a/model/gdpr.go b/internal/model/gdpr.go similarity index 100% rename from model/gdpr.go rename to internal/model/gdpr.go diff --git a/model/lbonus.go b/internal/model/lbonus.go similarity index 100% rename from model/lbonus.go rename to internal/model/lbonus.go diff --git a/model/live.go b/internal/model/live.go similarity index 100% rename from model/live.go rename to internal/model/live.go diff --git a/model/login.go b/internal/model/login.go similarity index 100% rename from model/login.go rename to internal/model/login.go diff --git a/model/marathon.go b/internal/model/marathon.go similarity index 100% rename from model/marathon.go rename to internal/model/marathon.go diff --git a/model/multiunit.go b/internal/model/multiunit.go similarity index 100% rename from model/multiunit.go rename to internal/model/multiunit.go diff --git a/model/museum.go b/internal/model/museum.go similarity index 100% rename from model/museum.go rename to internal/model/museum.go diff --git a/model/navigation.go b/internal/model/navigation.go similarity index 100% rename from model/navigation.go rename to internal/model/navigation.go diff --git a/model/notice.go b/internal/model/notice.go similarity index 100% rename from model/notice.go rename to internal/model/notice.go diff --git a/model/payment.go b/internal/model/payment.go similarity index 100% rename from model/payment.go rename to internal/model/payment.go diff --git a/model/personalnotice.go b/internal/model/personalnotice.go similarity index 100% rename from model/personalnotice.go rename to internal/model/personalnotice.go diff --git a/model/profile.go b/internal/model/profile.go similarity index 100% rename from model/profile.go rename to internal/model/profile.go diff --git a/model/scenario.go b/internal/model/scenario.go similarity index 100% rename from model/scenario.go rename to internal/model/scenario.go diff --git a/model/subscenario.go b/internal/model/subscenario.go similarity index 100% rename from model/subscenario.go rename to internal/model/subscenario.go diff --git a/model/tools.go b/internal/model/tools.go similarity index 100% rename from model/tools.go rename to internal/model/tools.go diff --git a/model/topinfo.go b/internal/model/topinfo.go similarity index 100% rename from model/topinfo.go rename to internal/model/topinfo.go diff --git a/model/tos.go b/internal/model/tos.go similarity index 100% rename from model/tos.go rename to internal/model/tos.go diff --git a/model/unit.go b/internal/model/unit.go similarity index 100% rename from model/unit.go rename to internal/model/unit.go diff --git a/model/user.go b/internal/model/user.go similarity index 100% rename from model/user.go rename to internal/model/user.go diff --git a/model/userinfo.go b/internal/model/userinfo.go similarity index 100% rename from model/userinfo.go rename to internal/model/userinfo.go diff --git a/model/webui.go b/internal/model/webui.go similarity index 100% rename from model/webui.go rename to internal/model/webui.go diff --git a/router/router.go b/internal/router/router.go similarity index 96% rename from router/router.go rename to internal/router/router.go index 3f6660e..c02ced5 100644 --- a/router/router.go +++ b/internal/router/router.go @@ -1,8 +1,8 @@ package router import ( - "honoka-chan/handler" - "honoka-chan/middleware" + "honoka-chan/internal/handler" + "honoka-chan/internal/middleware" "net/http" "os" "path/filepath" @@ -15,10 +15,10 @@ import ( func SifRouter(r *gin.Engine) { // Static - r.Static("/static", "static") + r.Static("/static", "assets/static") var files []string - _ = filepath.Walk("static/templates", func(path string, info os.FileInfo, err error) error { + _ = filepath.Walk("assets/static/templates", func(path string, info os.FileInfo, err error) error { if strings.HasSuffix(path, ".html") { files = append(files, path) } diff --git a/tools/init.go b/internal/tools/init.go similarity index 78% rename from tools/init.go rename to internal/tools/init.go index 2fabe2c..29950d0 100644 --- a/tools/init.go +++ b/internal/tools/init.go @@ -2,8 +2,9 @@ package tools import ( "fmt" - "honoka-chan/config" - "honoka-chan/model" + "honoka-chan/internal/model" + "honoka-chan/internal/utils" + "honoka-chan/pkg/db" "time" ) @@ -32,14 +33,14 @@ type UserPref struct { func InitUserData(userId int) { userList := []UserData{} if userId != 0 { - err := config.UserEng.Table("users").Where("userid = ?", userId).Find(&userList) - CheckErr(err) + err := db.UserEng.Table("users").Where("userid = ?", userId).Find(&userList) + utils.CheckErr(err) } else { - err := config.UserEng.Table("users").Asc("id").Find(&userList) - CheckErr(err) + err := db.UserEng.Table("users").Asc("id").Find(&userList) + utils.CheckErr(err) } - session := config.UserEng.NewSession() + session := db.UserEng.NewSession() defer session.Close() if err := session.Begin(); err != nil { @@ -48,14 +49,14 @@ func InitUserData(userId int) { for _, user := range userList { // 检查用户配置 - exists, err := config.UserEng.Table("user_preference_m").Where("user_id = ?", user.UserID).Exist() - CheckErr(err) + exists, err := db.UserEng.Table("user_preference_m").Where("user_id = ?", user.UserID).Exist() + utils.CheckErr(err) if !exists { // 默认中心成员() var oId int - _, err = config.MainEng.Table("common_unit_m").Cols("unit_owning_user_id").Where("unit_id = ?", 31).Get(&oId) - CheckErr(err) + _, err = db.MainEng.Table("common_unit_m").Cols("unit_owning_user_id").Where("unit_id = ?", 31).Get(&oId) + utils.CheckErr(err) fmt.Println("Center UnitOwningUserID:", oId) userPref := UserPref{ UserID: user.UserID, @@ -68,13 +69,13 @@ func InitUserData(userId int) { UpdateTime: time.Now().Unix(), } _, err = session.Table("user_preference_m").Insert(&userPref) - CheckErr(err) + utils.CheckErr(err) fmt.Println("UserPref ID", userPref.ID) } // 检查用户卡组配置 - exists, err = config.UserEng.Table("user_deck_m").Where("user_id = ?", user.UserID).Asc("deck_id").Exist() - CheckErr(err) + exists, err = db.UserEng.Table("user_deck_m").Where("user_id = ?", user.UserID).Asc("deck_id").Exist() + utils.CheckErr(err) // fmt.Println("UserDeck exists:", exists) if !exists { @@ -97,14 +98,14 @@ func InitUserData(userId int) { // 默认卡组 unitIds := []int{} - err = config.MainEng.Table("unit_m").Cols("unit_id").Where("album_series_id = ?", 615).Find(&unitIds) + err = db.MainEng.Table("unit_m").Cols("unit_id").Where("album_series_id = ?", 615).Find(&unitIds) if err != nil { session.Rollback() panic(err) } unitData := []model.UnitData{} - err = config.MainEng.Table("common_unit_m").In("unit_id", unitIds).Find(&unitData) + err = db.MainEng.Table("common_unit_m").In("unit_id", unitIds).Find(&unitData) if err != nil { session.Rollback() panic(err) diff --git a/tools/tools.go b/internal/tools/tools.go similarity index 88% rename from tools/tools.go rename to internal/tools/tools.go index e6c66d3..a0960ee 100644 --- a/tools/tools.go +++ b/internal/tools/tools.go @@ -4,13 +4,13 @@ func init() { InitUserData(0) // eng, err := xorm.NewEngine("sqlite", "assets/masterdata.db") - // CheckErr(err) + // utils.CheckErr(err) // err = eng.Ping() - // CheckErr(err) + // utils.CheckErr(err) // suitIds := []int{} // err = eng.Table("m_suit").Cols("id").OrderBy("id ASC").Find(&suitIds) - // CheckErr(err) + // utils.CheckErr(err) // jsonStr := "[" // for _, suit := range suitIds { @@ -19,7 +19,7 @@ func init() { // IsNew: false, // } // m, err := json.Marshal(suitInfo) - // CheckErr(err) + // utils.CheckErr(err) // jsonStr += fmt.Sprintf("%d,%s,", suit, string(m)) // } @@ -28,13 +28,13 @@ func init() { // fmt.Println(jsonStr) // eng, err := xorm.NewEngine("sqlite", "assets/masterdata.db") - // CheckErr(err) + // utils.CheckErr(err) // err = eng.Ping() - // CheckErr(err) + // utils.CheckErr(err) // emblemIds := []int{} // err = eng.Table("m_emblem").Cols("id").OrderBy("id ASC").Find(&emblemIds) - // CheckErr(err) + // utils.CheckErr(err) // jsonStr := "[" // for _, emblem := range emblemIds { @@ -43,7 +43,7 @@ func init() { // AcquiredAt: time.Now().Unix(), // } // m, err := json.Marshal(emblemInfo) - // CheckErr(err) + // utils.CheckErr(err) // jsonStr += fmt.Sprintf("%d,%s,", emblem, string(m)) // } @@ -52,13 +52,13 @@ func init() { // fmt.Println(jsonStr) // eng, err := xorm.NewEngine("sqlite", "assets/masterdata.db") - // CheckErr(err) + // utils.CheckErr(err) // err = eng.Ping() - // CheckErr(err) + // utils.CheckErr(err) // emblemIds := []int{} // err = eng.Table("m_emblem").Cols("id").OrderBy("id ASC").Find(&emblemIds) - // CheckErr(err) + // utils.CheckErr(err) // ids := []model.AsEmblemId{} // for _, id := range emblemIds { @@ -68,17 +68,17 @@ func init() { // }) // } // m, err := json.Marshal(ids) - // CheckErr(err) + // utils.CheckErr(err) // fmt.Println(string(m)) // eng, err := xorm.NewEngine("sqlite", "assets/masterdata.db") - // CheckErr(err) + // utils.CheckErr(err) // err = eng.Ping() - // CheckErr(err) + // utils.CheckErr(err) // difficultyIds := []int{} // err = eng.Table("m_live_difficulty").Cols("live_difficulty_id").OrderBy("live_difficulty_id ASC").Find(&difficultyIds) - // CheckErr(err) + // utils.CheckErr(err) // jsonStr := "[" // for _, id := range difficultyIds { @@ -99,7 +99,7 @@ func init() { // IsNew: false, // } // m, err := json.Marshal(difficultyInfo) - // CheckErr(err) + // utils.CheckErr(err) // jsonStr += fmt.Sprintf("%d,%s,", id, string(m)) // } @@ -108,13 +108,13 @@ func init() { // fmt.Println(jsonStr) // eng, err := xorm.NewEngine("sqlite", "assets/masterdata.db") - // CheckErr(err) + // utils.CheckErr(err) // err = eng.Ping() - // CheckErr(err) + // utils.CheckErr(err) // storyIds := []int{} // err = eng.Table("m_story_main_cell").Cols("id").OrderBy("id ASC").Find(&storyIds) - // CheckErr(err) + // utils.CheckErr(err) // jsonStr := "[" // for _, id := range storyIds { @@ -122,7 +122,7 @@ func init() { // StoryMainMasterID: id, // } // m, err := json.Marshal(storyInfo) - // CheckErr(err) + // utils.CheckErr(err) // jsonStr += fmt.Sprintf("%d,%s,", id, string(m)) // } @@ -131,13 +131,13 @@ func init() { // fmt.Println(jsonStr) // eng, err := xorm.NewEngine("sqlite", "assets/masterdata.db") - // CheckErr(err) + // utils.CheckErr(err) // err = eng.Ping() - // CheckErr(err) + // utils.CheckErr(err) // voiceIds := []int{} // err = eng.Table("m_navi_voice").Cols("id").OrderBy("id ASC").Find(&voiceIds) - // CheckErr(err) + // utils.CheckErr(err) // jsonStr := "[" // for _, id := range voiceIds { @@ -146,7 +146,7 @@ func init() { // IsNew: false, // } // m, err := json.Marshal(storyInfo) - // CheckErr(err) + // utils.CheckErr(err) // jsonStr += fmt.Sprintf("%d,%s,", id, string(m)) // } @@ -155,13 +155,13 @@ func init() { // fmt.Println(jsonStr) // eng, err := xorm.NewEngine("sqlite", "assets/masterdata.db") - // CheckErr(err) + // utils.CheckErr(err) // err = eng.Ping() - // CheckErr(err) + // utils.CheckErr(err) // backgroundIds := []int{} // err = eng.Table("m_custom_background").Cols("id").OrderBy("id ASC").Find(&backgroundIds) - // CheckErr(err) + // utils.CheckErr(err) // jsonStr := "[" // for _, id := range backgroundIds { @@ -170,7 +170,7 @@ func init() { // IsNew: false, // } // m, err := json.Marshal(storyInfo) - // CheckErr(err) + // utils.CheckErr(err) // jsonStr += fmt.Sprintf("%d,%s,", id, string(m)) // } @@ -179,13 +179,13 @@ func init() { // fmt.Println(jsonStr) // eng, err := xorm.NewEngine("sqlite", "assets/masterdata.db") - // CheckErr(err) + // utils.CheckErr(err) // err = eng.Ping() - // CheckErr(err) + // utils.CheckErr(err) // storyIds := []int{} // err = eng.Table("m_story_side").Cols("id").OrderBy("id ASC").Find(&storyIds) - // CheckErr(err) + // utils.CheckErr(err) // jsonStr := "[" // for _, id := range storyIds { @@ -195,7 +195,7 @@ func init() { // AcquiredAt: time.Now().Unix(), // } // m, err := json.Marshal(storyInfo) - // CheckErr(err) + // utils.CheckErr(err) // jsonStr += fmt.Sprintf("%d,%s,", id, string(m)) // } @@ -204,13 +204,13 @@ func init() { // fmt.Println(jsonStr) // eng, err := xorm.NewEngine("sqlite", "assets/masterdata.db") - // CheckErr(err) + // utils.CheckErr(err) // err = eng.Ping() - // CheckErr(err) + // utils.CheckErr(err) // storyIds := []int{} // err = eng.Table("m_story_member").Cols("id").OrderBy("id ASC").Find(&storyIds) - // CheckErr(err) + // utils.CheckErr(err) // jsonStr := "[" // for _, id := range storyIds { @@ -220,7 +220,7 @@ func init() { // AcquiredAt: time.Now().Unix(), // } // m, err := json.Marshal(storyInfo) - // CheckErr(err) + // utils.CheckErr(err) // jsonStr += fmt.Sprintf("%d,%s,", id, string(m)) // } @@ -229,13 +229,13 @@ func init() { // fmt.Println(jsonStr) // eng, err := xorm.NewEngine("sqlite", "assets/masterdata.db") - // CheckErr(err) + // utils.CheckErr(err) // err = eng.Ping() - // CheckErr(err) + // utils.CheckErr(err) // eventIds := []int{} // err = eng.Table("m_story_event_history_detail").Cols("story_event_id").OrderBy("story_event_id ASC").Find(&eventIds) - // CheckErr(err) + // utils.CheckErr(err) // jsonStr := "[" // for _, id := range eventIds { @@ -243,7 +243,7 @@ func init() { // StoryEventID: id, // } // m, err := json.Marshal(storyInfo) - // CheckErr(err) + // utils.CheckErr(err) // jsonStr += fmt.Sprintf("%d,%s,", id, string(m)) // } @@ -252,14 +252,14 @@ func init() { // fmt.Println(jsonStr) // eng, err := xorm.NewEngine("sqlite", "assets/masterdata.db") - // CheckErr(err) + // utils.CheckErr(err) // err = eng.Ping() - // CheckErr(err) + // utils.CheckErr(err) // missionRes := []model.AsMissionRes{} // err = eng.Table("m_mission").Cols("id,mission_clear_condition_count"). // Where("term = 3 AND (end_at > ? OR end_at IS NULL)", time.Now().Unix()).OrderBy("id ASC").Find(&missionRes) - // CheckErr(err) + // utils.CheckErr(err) // jsonStr := "[" // for _, res := range missionRes { @@ -272,7 +272,7 @@ func init() { // NewExpiredAt: time.Now().Unix(), // } // m, err := json.Marshal(storyInfo) - // CheckErr(err) + // utils.CheckErr(err) // jsonStr += fmt.Sprintf("%d,%s,", res.ID, string(m)) // } @@ -281,14 +281,14 @@ func init() { // fmt.Println(jsonStr) // eng, err := xorm.NewEngine("sqlite", "assets/masterdata.db") - // CheckErr(err) + // utils.CheckErr(err) // err = eng.Ping() - // CheckErr(err) + // utils.CheckErr(err) // missionRes := []model.AsMissionRes{} // err = eng.Table("m_mission").Cols("id,mission_clear_condition_count"). // Where("term = 1 AND (end_at > ? OR end_at IS NULL)", time.Now().Unix()).OrderBy("id ASC").Find(&missionRes) - // CheckErr(err) + // utils.CheckErr(err) // jsonStr := "[" // for _, res := range missionRes { @@ -302,7 +302,7 @@ func init() { // ClearedExpiredAt: time.Now().Unix(), // } // m, err := json.Marshal(storyInfo) - // CheckErr(err) + // utils.CheckErr(err) // jsonStr += fmt.Sprintf("%d,%s,", res.ID, string(m)) // } @@ -311,14 +311,14 @@ func init() { // fmt.Println(jsonStr) // eng, err := xorm.NewEngine("sqlite", "assets/masterdata.db") - // CheckErr(err) + // utils.CheckErr(err) // err = eng.Ping() - // CheckErr(err) + // utils.CheckErr(err) // missionRes := []model.AsMissionRes{} // err = eng.Table("m_mission").Cols("id,mission_clear_condition_count"). // Where("term = 2 AND (end_at > ? OR end_at IS NULL)", time.Now().Unix()).OrderBy("id ASC").Find(&missionRes) - // CheckErr(err) + // utils.CheckErr(err) // jsonStr := "[" // for _, res := range missionRes { @@ -333,7 +333,7 @@ func init() { // NewExpiredAt: time.Now().Unix(), // } // m, err := json.Marshal(storyInfo) - // CheckErr(err) + // utils.CheckErr(err) // jsonStr += fmt.Sprintf("%d,%s,", res.ID, string(m)) // } @@ -342,14 +342,14 @@ func init() { // fmt.Println(jsonStr) // eng, err := xorm.NewEngine("sqlite", "assets/masterdata.db") - // CheckErr(err) + // utils.CheckErr(err) // err = eng.Ping() - // CheckErr(err) + // utils.CheckErr(err) // eng.ShowSQL(true) // memberIds := []int{} // err = eng.Table("m_member").Cols("id").OrderBy("id ASC").Find(&memberIds) - // CheckErr(err) + // utils.CheckErr(err) // jsonStr := "[" // for _, memberId := range memberIds { @@ -358,7 +358,7 @@ func init() { // Join("LEFT", "m_member_love_panel", "m_member_love_panel_cell.member_love_panel_master_id = m_member_love_panel.id"). // Cols("m_member_love_panel_cell.id").Where("m_member_love_panel.member_master_id = ?", memberId). // OrderBy("m_member_love_panel_cell.id ASC").Find(&cellIds) - // CheckErr(err) + // utils.CheckErr(err) // panelInfo := model.AsMemberLovePanelInfo{ // MemberID: memberId, @@ -366,7 +366,7 @@ func init() { // } // m, err := json.Marshal(panelInfo) - // CheckErr(err) + // utils.CheckErr(err) // jsonStr += fmt.Sprintf("%s,", string(m)) // } @@ -376,20 +376,20 @@ func init() { // fmt.Println(jsonStr) // mEng, err := xorm.NewEngine("sqlite", "assets/masterdata.db") - // CheckErr(err) + // utils.CheckErr(err) // err = mEng.Ping() - // CheckErr(err) + // utils.CheckErr(err) // defer mEng.Close() // dEng, err := xorm.NewEngine("sqlite", "assets/dictionary_zh_k.db") - // CheckErr(err) + // utils.CheckErr(err) // err = dEng.Ping() - // CheckErr(err) + // utils.CheckErr(err) // defer dEng.Close() // cardRes := []model.AsCardRes{} // err = mEng.Table("m_card").Cols("id,card_rarity_type,max_passive_skill_slot").OrderBy("id ASC").Find(&cardRes) - // CheckErr(err) + // utils.CheckErr(err) // jsonStr := "[" // for _, card := range cardRes { @@ -409,21 +409,21 @@ func init() { // var apBuff, stBuff, teBuff int // _, err := mEng.Table("m_training_tree_card_param").Where("id = ? AND training_content_type = ?", card.ID, 2).Select("SUM(value)").Get(&stBuff) - // CheckErr(err) + // utils.CheckErr(err) // // fmt.Println(stBuff) // _, err = mEng.Table("m_training_tree_card_param").Where("id = ? AND training_content_type = ?", card.ID, 3).Select("SUM(value)").Get(&apBuff) - // CheckErr(err) + // utils.CheckErr(err) // // fmt.Println(apBuff) // _, err = mEng.Table("m_training_tree_card_param").Where("id = ? AND training_content_type = ?", card.ID, 4).Select("SUM(value)").Get(&teBuff) - // CheckErr(err) + // utils.CheckErr(err) // // fmt.Println(teBuff) // var skillName string // var skillId int // _, err = mEng.Table("m_card_passive_skill_original").Where("card_master_id = ? AND skill_level = 5", card.ID).Cols("name").Get(&skillName) - // CheckErr(err) + // utils.CheckErr(err) // skillName = strings.ReplaceAll(skillName, "k.", "") // // fmt.Println(skillName) @@ -432,7 +432,7 @@ func init() { // count, err := dEng.Table("m_dictionary"). // Where(condition). // Count() - // CheckErr(err) + // utils.CheckErr(err) // if count > 0 { // skillId = 30000507 // } else { @@ -442,7 +442,7 @@ func init() { // var passiveSkillLevel int // _, err = mEng.Table("m_card_passive_skill_original").Where("card_master_id = ?", card.ID). // Cols("skill_level").OrderBy("skill_level DESC").Limit(1).Get(&passiveSkillLevel) - // CheckErr(err) + // utils.CheckErr(err) // cardInfo := model.AsCardInfo{ // CardMasterID: card.ID, @@ -471,7 +471,7 @@ func init() { // IsNew: false, // } // m, err := json.Marshal(cardInfo) - // CheckErr(err) + // utils.CheckErr(err) // jsonStr += fmt.Sprintf("%d,%s,", card.ID, string(m)) // } diff --git a/internal/utils/utils.go b/internal/utils/utils.go new file mode 100644 index 0000000..b3a89b3 --- /dev/null +++ b/internal/utils/utils.go @@ -0,0 +1,24 @@ +package utils + +import ( + "encoding/base64" + "honoka-chan/pkg/db" + "honoka-chan/pkg/encrypt" +) + +func CheckErr(err error) { + if err != nil { + panic(err) + } +} + +func IsSigned(unitId int) bool { + exists, err := db.MainEng.Table("unit_sign_asset_m").Where("unit_id = ?", unitId).Exist() + CheckErr(err) + + return exists +} + +func GenXMS(resp []byte) string { + return base64.StdEncoding.EncodeToString(encrypt.RSASignSHA1(resp)) +} diff --git a/main.go b/main.go index 7586bc0..a1011ea 100644 --- a/main.go +++ b/main.go @@ -2,9 +2,9 @@ package main import ( "honoka-chan/config" - "honoka-chan/db" - "honoka-chan/router" - _ "honoka-chan/tools" + "honoka-chan/internal/router" + _ "honoka-chan/internal/tools" + "honoka-chan/pkg/db" "log" "os" "os/signal" diff --git a/pkg/db/db.go b/pkg/db/db.go new file mode 100644 index 0000000..c25a9e7 --- /dev/null +++ b/pkg/db/db.go @@ -0,0 +1,63 @@ +package db + +import ( + "fmt" + "honoka-chan/pkg/utils" + "os" + + _ "modernc.org/sqlite" + "xorm.io/xorm" +) + +var ( + DB *Instance + + ExampleDb = "assets/data.example.db" + MainDb = "assets/main.db" + UserDb = "assets/data.db" + MainEng *xorm.Engine + UserEng *xorm.Engine +) + +func init() { + DB = GetInstance() + + _, err := os.Stat(UserDb) + if err != nil { + utils.WriteAllText(UserDb, utils.ReadAllText(ExampleDb)) + } + + eng, err := xorm.NewEngine("sqlite", MainDb) + if err != nil { + panic(err) + } + err = eng.Ping() + if err != nil { + panic(err) + } + eng.SetMaxOpenConns(10) + eng.SetMaxIdleConns(5) + MainEng = eng + + eng, err = xorm.NewEngine("sqlite", UserDb) + if err != nil { + panic(err) + } + err = eng.Ping() + if err != nil { + panic(err) + } + eng.SetMaxOpenConns(10) + eng.SetMaxIdleConns(5) + UserEng = eng +} + +func MatchTokenUid(token, uid string) bool { + res, err := DB.Get([]byte(uid)) + if err != nil { + fmt.Println(err) + return false + } + + return string(res) == token +} diff --git a/db/leveldb.go b/pkg/db/leveldb.go similarity index 100% rename from db/leveldb.go rename to pkg/db/leveldb.go diff --git a/encrypt/aes.go b/pkg/encrypt/aes.go similarity index 100% rename from encrypt/aes.go rename to pkg/encrypt/aes.go diff --git a/encrypt/rsa.go b/pkg/encrypt/rsa.go similarity index 100% rename from encrypt/rsa.go rename to pkg/encrypt/rsa.go diff --git a/sifcap/sifcap.go b/pkg/sifcap/sifcap.go similarity index 100% rename from sifcap/sifcap.go rename to pkg/sifcap/sifcap.go diff --git a/utils/utils.go b/pkg/utils/utils.go similarity index 100% rename from utils/utils.go rename to pkg/utils/utils.go