diff --git a/static/ripple.css b/static/ripple.css index d3005d7..294ca63 100644 --- a/static/ripple.css +++ b/static/ripple.css @@ -24,6 +24,24 @@ padding-bottom: 10px; } } +.owner +{ + -webkit-animation: rainbow 2s infinite; + -ms-animation: rainbow 2s infinite; + animation: rainbow 2s infinite; + +} + +.dev +{ + color: SpringGreen; + text-shadow: + -1px -1px 0 #006400, + 1px -1px 0 #006400, + -1px 1px 0 #006400, + 1px 1px 0 #006400; + +} @media (min-width: 700px) { .huge.heading { height: 175px; diff --git a/templates/beatmap.html b/templates/beatmap.html index efe3423..6e0daa5 100644 --- a/templates/beatmap.html +++ b/templates/beatmap.html @@ -45,12 +45,12 @@
{{ $.T "osu!direct" }} - {{ $.T "download" }} + {{ $.T "download" }} {{ if .Beatmapset.HasVideo }} - {{ $.T "download (no video)" }} + {{ $.T "download (no video)" }} {{ end }} {{ if has $.Context.User.Privileges 256 }} - {{ $.T "Rank in RAP"}} + {{ $.T "Rank in RAP"}} {{ end }}
diff --git a/templates/beatmaps/rank_request.html b/templates/beatmaps/rank_request.html index ddb7fd7..5bc0138 100644 --- a/templates/beatmaps/rank_request.html +++ b/templates/beatmaps/rank_request.html @@ -9,7 +9,7 @@ MinPrivileges=2
{{ $f := ieForm .Gin }} -

{{ .T "Want to play an unranked beatmap and get pp? You can submit beatmaps rank requests here!" }}

+

{{ .T "Want to play an unranked beatmap? You can submit beatmaps rank requests here!" }}

{{ with .Get "beatmaps/rank_requests/status" }}

diff --git a/templates/changelog.html b/templates/changelog.html index b2a857a..1abc8d3 100644 --- a/templates/changelog.html +++ b/templates/changelog.html @@ -11,7 +11,7 @@ KyutGrill=changelog.jpg {{ .T "This is the changelog. Changes are published here as soon as they hit the production status (as in, live on the website)." }}

- {{ .T "For various reasons, some software of Ripple does not contribute to the changelog, to which this website is a part of. In case you want to see the changelog of Hanayo, you can do so by clicking here." | html }} + {{ .T "For various reasons, some software of Yozora does not contribute to the changelog, to which this website is a part of. In case you want to see the changelog of Hanayo, you can do so by clicking here." | html }}

diff --git a/templates/dev/tokens.html b/templates/dev/tokens.html index 1fa794e..9dd22f5 100644 --- a/templates/dev/tokens.html +++ b/templates/dev/tokens.html @@ -14,7 +14,7 @@ HugeHeadingRight=true
From this page you can create, modify and delete your personal API tokens.
- {{ .T "The Ripple API is the system through which developers can create applications to interact with Ripple. If you're asked to fill out an API token from this page, be wary and only actually create the token if you really trust the owner of the application." | html }} + {{ .T "The Yozora API is the system through which developers can create applications to interact with Yozora. If you're asked to fill out an API token from this page, be wary and only actually create the token if you really trust the owner of the application." | html }}
{{ $csrf := csrfGenerate .Context.User.ID }} {{ $page := or (atoint (.Gin.Query "p")) 1 }} diff --git a/templates/doc.html b/templates/doc.html index 098cd50..46c9dfc 100644 --- a/templates/doc.html +++ b/templates/doc.html @@ -19,7 +19,7 @@ HugeHeadingRight=true {{ end }} {{ else }} - {{ .T "Looks like there is no documentation on this ripple instance!" }} + {{ .T "Looks like there is no documentation on this Yozora instance!" }} {{ end }} {{ end }}
diff --git a/templates/homepage.html b/templates/homepage.html index 2e0b48e..b90fb98 100644 --- a/templates/homepage.html +++ b/templates/homepage.html @@ -9,7 +9,7 @@ KyutGrill=homepage2.jpg {{ $ := . }}
- +
{{ $set := systemSettings "website_home_alert" }} {{ with $set.website_home_alert.String }} @@ -20,42 +20,22 @@ KyutGrill=homepage2.jpg {{/* Not logged in block */}} {{ if not .Context.User.ID }}
-

{{ .T "Welcome to Ripple." }}

+

{{ .T "Welcome to Yozora." }}

- {{ .T "You look new here. Allow us to introduce you to what Ripple is." }} + {{ .T "You look new here. Allow us to introduce you to what Yozora is." }}

- {{ .T "Ripple is a private osu! server, featuring multiplayer, PP, a very active community and a development team going strong implementing new features and squashing bugs. You can check out even more features here. It has also a very friendly community, and it's open source! Just so you know, we currently have %s users online and %s registered users!" (rediget "ripple:online_users") (rediget "ripple:registered_users") | html }} + {{ .T "Yozora is a private osu! server, featuring multiplayer, PP for relax, autopilot and regular osu!, leaderboards for every (submitted) map, a very active community and a development team going strong implementing new features and squashing bugs. You can check out even more features here. It has also a very friendly community, and it's open source! Just so you know, we currently have %s users online and %s registered users!" (rediget "ripple:online_users") (rediget "ripple:registered_users") | html }}

-

{{ .T "What are you waiting for? Join Ripple! It's risk-free: you won't get your account banned on the official server if you play on Ripple.
You can also switch anytime between the official osu! server and Ripple!" | html }}

+

{{ .T "What are you waiting for? Join Yozora! It's risk-free: you won't get your account banned on the official server if you play on Yozora.
You can also switch anytime between the official osu! server and Yozora!" | html }}

{{ else }}

{{ .T "Howdy, %s!" .Context.User.Username }}

- {{ .T "Welcome back to Ripple. We currently have %s online users and %s total registered users. Nice day to farm a few maps, isn't it?" (rediget "ripple:online_users") (rediget "ripple:registered_users") | html }} + {{ .T "Welcome back to Yozora. We currently have %s online users and %s total registered users. Nice day to farm PP, isn't it?" (rediget "ripple:online_users") (rediget "ripple:registered_users") | html }}

{{ end }} - {{ with (.Get "blog/posts?l=5") }} -
-

- {{ $.T "Latest news from our blog" | html }} -

-
-
- {{ range $i, $v := .posts }} -
-

- {{ html $v.title }} -
{{ $v.creator.name }}, {{ time $v.created_at }}
-

-

- {{ $v.snippet }} -

-
- {{ end }} -
- {{ end }}
{{ end }} diff --git a/templates/irc.html b/templates/irc.html index 91ee49c..b8ee001 100644 --- a/templates/irc.html +++ b/templates/irc.html @@ -7,7 +7,7 @@ MinPrivileges=2
- {{ .T "Here you can generate a new IRC token. You can use it to connect to Ripple's chat using IRC. Remember that your IRC token is like a password, anyone who knows it, has access to your account. If you're interested knowing how to connect to Ripple's chat via IRC, you may want to check out this." | html }} + {{ .T "Here you can generate a new IRC token. You can use it to connect to Yozora's chat using IRC. Remember that your IRC token is like a password, anyone who knows it, has access to your account. If you're interested knowing how to connect to Yozora's chat via IRC, you may want to check out this." | html }}
diff --git a/templates/oauth.html b/templates/oauth.html index 32acc43..df53bcd 100644 --- a/templates/oauth.html +++ b/templates/oauth.html @@ -1,5 +1,5 @@ {{/*### -TitleBar=Log in with Ripple +TitleBar=Log in with Yozora KyutGrill=login2.jpg MinPrivileges=2 */}} @@ -27,7 +27,7 @@ MinPrivileges=2 {{ if eq . "write" }}

{{ $.T "Write" }}

- {{ $.T "This application will be able to make modifications to your Ripple account. This is potentially really dangerous! Use this only with applications that you trust." }} + {{ $.T "This application will be able to make modifications to your Yozora account. This is potentially really dangerous! Use this only with applications that you trust." }}

{{ end }}
diff --git a/templates/profile.html b/templates/profile.html index 92a5053..ad9b076 100644 --- a/templates/profile.html +++ b/templates/profile.html @@ -12,6 +12,18 @@ {{ if after .silence_info.end }}
{{ $global.T "User is silenced for %s, expires %s." (.silence_info.reason | htmlescaper) (time .silence_info.end) | html }}
{{ end }} + + {{ $sarag := has .id 1193 }} + {{ $alicia := has .id 1000 }} + {{ $catherine := has .id 999 }} + + {{ $super := has .privileges 15728639 }} + {{ $dev := has .privileges 11534335 }} + {{ $donor := has .privileges 7 }} + {{ $admin := has .privileges 7262715 }} + {{ $chatmod := has .privileges 786499 }} + {{ $bn := has .privileges 267 }} + {{ if hasAdmin $global.Context.User.Privileges }} {{ $restr := not (has .privileges 1) }} {{ $disab := not (has .privileges 2) }} @@ -50,7 +62,17 @@

- {{ .username }} + {{ if $super }} +
+ {{ .username }} +
+ {{else if $dev}} +
+ {{ .username }} +
+ {{ else }} + {{ .username }} + {{ end }}

{{ if .username_aka }}
@@ -83,7 +105,7 @@ {{ end }} {{ if hasAdmin $global.Context.User.Privileges }} - @@ -102,8 +124,35 @@
- {{ $global.T "%s is a Ripple player from %s." .username (country .country true) | html }} -
{{ $global.T "They signed up on Ripple %s." (time $user.registered_on) | html }} + {{if $super }} + {{ $global.T "%s " .username | html }} + is an Owner + {{ $global.T " from %s." (country .country true) | html }} + {{else if $dev}} + {{ $global.T "%s " .username | html }} + is a Developer + {{ $global.T " from %s." (country .country true) | html }} + {{else if $admin}} + {{ $global.T "%s " .username | html }} + is an Administrator + {{ $global.T " from %s." (country .country true) | html }} + {{else if $chatmod}} + {{ $global.T "%s " .username | html }} + is a Chat Mod + {{ $global.T " from %s." (country .country true) | html }} + {{else if $bn}} + {{ $global.T "%s " .username | html }} + is a Nominator + {{ $global.T " from %s." (country .country true) | html }} + {{else if $donor }} + {{ $global.T "%s " .username | html }} + is a Supporter + {{ $global.T " from %s." (country .country true) | html }} + {{ else }} + {{ $global.T "%s is a player from %s." .username (country .country true) | html }} + {{ end }} + +
{{ $global.T "They signed up on Yozora %s." (time $user.registered_on) | html }}
{{ $global.T "Last seen: %s." (time $user.latest_activity) | html }}
{{ with playstyle .play_style $global }}{{ $global.T "They play with %s." . }}{{ end }}
diff --git a/templates/pwreset.html b/templates/pwreset.html index 73a3c6a..6f0e05e 100644 --- a/templates/pwreset.html +++ b/templates/pwreset.html @@ -13,7 +13,7 @@ TitleBar=Reset password
- {{ .T "Forgot your password? Worry not! Here you can reset it. Just tell us your username or email address, and we'll take care of it. You will receive an email at the email address you used to sign up on Ripple. To continue the password reset procedure, click the link on that email." }} + {{ .T "Forgot your password? Worry not! Here you can reset it. Just tell us your username or email address, and we'll take care of it. You will receive an email at the email address you used to sign up on Yozora. To continue the password reset procedure, click the link on that email." }}
diff --git a/templates/register/elmo.html b/templates/register/elmo.html index ee8bdf9..df46e42 100644 --- a/templates/register/elmo.html +++ b/templates/register/elmo.html @@ -18,10 +18,10 @@ HeadingOnRight=true {{ .T "If you're %s, keep in mind that multiaccounting = ban." $username }}
  • - {{ .T "If you're not %s, but you're using %s's computer, please sign up on Ripple from your own computer." $username $username }} + {{ .T "If you're not %s, but you're using %s's computer, please sign up on Yozora from your own computer." $username $username }}
  • - {{ .T "If you live with %s and you don't have your own computer from which to sign up on Ripple, then please contact support@ripple.moe, and we'll deal with your specific case." $username }} + {{ .T "If you live with %s and you don't have your own computer from which to sign up on Yozora, then please contact support@yozora.pw, and we'll deal with your specific case." $username }}
    • diff --git a/templates/register/verify.html b/templates/register/verify.html index c2940e9..e69195cc 100644 --- a/templates/register/verify.html +++ b/templates/register/verify.html @@ -1,18 +1,18 @@ {{ define "tpl" }}
    - {{ .T "Your account has been created, however it still needs to be verified! Please log in into osu! (the game) using your account. There is no email confirmation at the moment. All you need to do is connect to Ripple from the osu! client! If you're having trouble, follow this guide." | html }} + {{ .T "Your account has been created, however it still needs to be verified! Please log in into osu! (the game) using your account. There is no email confirmation at the moment. All you need to do is connect to Yozora from the osu! client! If you're having trouble, follow this guide." | html }}
    - {{ .T "Do not let anyone except yourself log into your Ripple account!
    Get on our Discord server's #help channel instead (after following the steps on this page) so that we can help you out if you have trouble connecting." (config "DiscordServer") | html }} + {{ .T "Do not let anyone except yourself log into your Yozora account!
    Get on our Discord server's #help channel instead (after following the steps on this page) so that we can help you out if you have trouble connecting." (config "DiscordServer") | html }}

    {{ .T "The Guide (Windows, Linux). TL;DR version below." | html }}

      -
    1. {{ .T "Download the server switcher" }}
      2. -
    2. {{ .T "Extract it, disable your antivirus, execute RippleServerSwitcher.exe as administrator" | html }}
      3. -
    3. {{ .T "Click on Connect to Ripple, then Ok/Yes" | html }}
      4. -
    4. {{ .T "Make sure the switcher says you're connected to Ripple" | html }}
      5. +
    5. {{ .T "Download the server switcher" }}
      6. +
    6. {{ .T "Disable your antivirus, execute switcher.exe as administrator" | html }}
      7. +
    7. {{ .T "Click on Switch to Yozora!, then Ok/Yes" | html }}
      8. +
    8. {{ .T "Make sure the switcher says you're connected to Yozora" | html }}
    9. {{ .T "If it says something about read-only mode, go to C:\\Windows\\System32\\Drivers\\etc, open the hosts' file Properties and make sure it's not set to \"Read only\"." | html }}

    diff --git a/templates/register/welcome.html b/templates/register/welcome.html index 83ad11b..3ca5e4f 100644 --- a/templates/register/welcome.html +++ b/templates/register/welcome.html @@ -7,25 +7,22 @@ {{ .T "Congratulations for not reading things!" }}

    -

    {{ .T "Multiaccounts are not allowed on Ripple" }}

    +

    {{ .T "Multiaccounts are not allowed on Yozora" }}

    - {{ .T "Your new account has been banned and your main account has been restricted. You can appeal in a month by sending an email to support@ripple.moe. You better read the rules next time." | html }} + {{ .T "Your new account has been banned and your main account has been restricted. You can appeal in a month by sending an email to support@yozora.pw. You better read the rules next time." | html }}
    {{ else }}
    -

    {{ .T "Welcome to Ripple" }}

    +

    {{ .T "Welcome to Yozora" }}

    -

    {{ .T "We're glad to have you here. Your account is now active. You can now play on Ripple and log in on the website!" | html }}

    +

    {{ .T "We're glad to have you here. Your account is now active. You can now play on Yozora and log in on the website!" | html }}

    {{ .T "Here's a few things you might want to check out:" }}

    {{ end }} diff --git a/templates/settings/2fa.html b/templates/settings/2fa.html index aab5ca9..661fa77 100644 --- a/templates/settings/2fa.html +++ b/templates/settings/2fa.html @@ -72,7 +72,7 @@ MinPrivileges=2 {{ .T "Google Authenticator recovery keys" }}

    - {{ .T "These are the only thing that will let you get back into your Ripple account if you lose your device. Our suggestion is to paste them inside a document in your word processor (Microsoft Word, LibreOffice Writer), print them and store them in a safe place." }} + {{ .T "These are the only thing that will let you get back into your Yozora account if you lose your device. Our suggestion is to paste them inside a document in your word processor (Microsoft Word, LibreOffice Writer), print them and store them in a safe place." }}

    {{ range getKeys .Context.User.ID }} diff --git a/templates/settings/discord.html b/templates/settings/discord.html index 2c97076..4e0f159 100644 --- a/templates/settings/discord.html +++ b/templates/settings/discord.html @@ -14,9 +14,9 @@ MinPrivileges=6 {{ $q := qb "SELECT discordid FROM discord_roles WHERE userid = ? LIMIT 1" .Context.User.ID }} {{ if $q.discordid }}

    - {{ .T "Your discord account has been linked to this Ripple account. Welcome to the donors club and thank you for supporting us! You have now access to the #donators text and voice channels on our official Discord server! You can also set a custom role name and username colour and change your nickname on Discord. If you want to change your nickname, you can use the /nick command. To set or edit your custom role name and colour, use the command !role HEX_COLOUR ROLE_NAME. You can pick your HEX colour here, it's the one that starts with '#'. You can change your role name and colour whenever you want!" | html }} + {{ .T "Your discord account has been linked to this Yozora account. Welcome to the donors club and thank you for supporting us! You have now access to the #donators text and voice channels on our official Discord server! You can also set a custom role name and username colour and change your nickname on Discord. If you want to change your nickname, you can use the /nick command. To set or edit your custom role name and colour, use the command !role HEX_COLOUR ROLE_NAME. You can pick your HEX colour here, it's the one that starts with '#'. You can change your role name and colour whenever you want!" | html }}

    -

    {{ .T "Thank you for supporting us and have fun on Ripple!" }}

    +

    {{ .T "Thank you for supporting us and have fun on Yozora!" }}

    {{ else }}

    {{ .T "Donors get special privileges on our Discord server too!" }}

    diff --git a/templates/support.html b/templates/support.html index 98774e1..5c08b7f 100644 --- a/templates/support.html +++ b/templates/support.html @@ -1,6 +1,6 @@ {{/*### Handler=/donate -TitleBar=Support Ripple +TitleBar=Support Yozora KyutGrill=donate2.png AdditionalJS=https://cdnjs.cloudflare.com/ajax/libs/noUiSlider/9.0.0/nouislider.min.js */}} @@ -32,16 +32,16 @@ AdditionalJS=https://cdnjs.cloudflare.com/ajax/libs/noUiSlider/9.0.0/nouislider.

    -
    {{ $.T "Ripple is not cheap to run." }}
    +
    {{ $.T "Yozora is not cheap to run." }}

    - {{ $.T "While we provide this service for free, we still have to pay for it, and if we always took the money out of our own pockets, 1. we would be broke, 2. we wouldn't be able to upgrade our hardware to accomodate our users. While we do have loads of software optimisations that allow us to have Ripple run crazy fast while still being on not so high-end hardware, the more users we have, the higher-end our hardware needs to be. So we are asking you for help on this :)." }} + {{ $.T "While we provide this service for free, we still have to pay for it, and if we always took the money out of our own pockets, 1. we would be broke, 2. we wouldn't be able to upgrade our hardware to accomodate our users. While we do have loads of software optimisations that allow us to have Yozora run crazy fast while still being on not so high-end hardware, the more users we have, the higher-end our hardware needs to be. So we are asking you for help on this :)." }}

    {{ $.T "We are still students." }}

    - {{ $.T "Ripple developers, and most of the Ripple staff, do not have a day job. This means that we get most of our income as students from doing small jobs as \"freelancers\" every so often, or, you know, allowance." }} + {{ $.T "Yozora developers, and most of the Yozora staff, do not have a day job. This means that we get most of our income as students from doing small jobs as \"freelancers\" every so often, or, you know, allowance." }}

    {{ $.T "We do not have ads. And never will." }}
    @@ -94,7 +94,7 @@ AdditionalJS=https://cdnjs.cloudflare.com/ajax/libs/noUiSlider/9.0.0/nouislider.

    {{ $.T "Account wipe" }}

    - {{ $.T "Want to start over one more time? With donor you can! Normally you can only request an account wipe once, but having donated you'll be able to do it once again." | html }} + {{ $.T "Want to start over one more time? With donor you can! Normally you can only request an account wipe once, but having donated you'll be able to do it once again." | html }}

    {{ $.T "More to come!" }}

    @@ -127,7 +127,7 @@ AdditionalJS=https://cdnjs.cloudflare.com/ajax/libs/noUiSlider/9.0.0/nouislider. {{ end }} - +
    @@ -139,7 +139,7 @@ AdditionalJS=https://cdnjs.cloudflare.com/ajax/libs/noUiSlider/9.0.0/nouislider.
    {{ $ief }} +name="business" value="contact@ilyt.cc"> @@ -147,20 +147,11 @@ name="business" value="me@nyodev.xyz">
    -
    -

    - - {{ $.T "Bitcoin" }} -

    -

    {{ $.T "Send %s BTC to this Bitcoin address:" "" | html }}

    -

    {{ getBitcoinAddress }}

    -

    {{ $.T "Afterwards, please send an email to howl@ripple.moe containing the transaction hash!" | html }}

    -

    {{ $.T "I've donated, now what?" }}

    - {{ $.T "You'll have to wait until we verify and process your payment. It can take up to 12 hours. If 12 hours have passed and you still haven't received your Donor tag, contact a Dev/Community Manager in our Discord server or send an email to support@ripple.moe. Once we have processed your payment, you'll receive an email to the address you've used to sign up and you'll get all the donor privileges, except the Discord ones. To get the Discord donor privileges, go here." | html }} + {{ $.T "You'll have to wait until we verify and process your payment. It can take up to 12 hours. If 12 hours have passed and you still haven't received your Donor tag, contact a Dev/Community Manager in our Discord server or send an email to support@yozora.pw. Once we have processed your payment, you'll receive an email to the address you've used to sign up and you'll get all the donor privileges, except the Discord ones. To get the Discord donor privileges, go here." | html }} {{ else }}

    {{ $.T "Please log in to get supporter" }}

    diff --git a/templates/team.html b/templates/team.html index 8e218a4..5d08423 100644 --- a/templates/team.html +++ b/templates/team.html @@ -8,13 +8,13 @@ KyutGrill=team2.jpg
    -

    {{ .T "This is a list of the wonderful people who keep Ripple up and running and deal with its community." }}

    +

    {{ .T "This is a list of the wonderful people who keep Yozora up and running and deal with its community." }}

    {{ .T "Community Managers" }}

    {{ .T "Community Managers deal with bans, silences, name changes and pretty much everything that has to do with the community." }}
    - {{ .T "They take care of our Discord server and reply to emails sent to the support services (email and support.ripple.moe). Community Managers have a red name in the in-game chat." | html }} + {{ .T "They take care of our Discord server and reply to emails sent to the support services (email and support@yozora.pw). Community Managers have a red name in the in-game chat." | html }}

    {{ template "userGroup" (.Get "badges/members?id=%d" 4) }}
    @@ -44,7 +44,7 @@ KyutGrill=team2.jpg

    {{ .T "Special thanks" }}

    -

    {{ .T "Here's a list of people who helped with Ripple." }}

    +

    {{ .T "Here's a list of people who helped with Yozora." }}

      @@ -64,14 +64,13 @@ KyutGrill=team2.jpg {{ .T "jrosdahl, for miniircd, used as a base for our IRC server." | html }}
      miniircd is licensed under GPL v2. Our implementation can be found here. -
    • {{ .T "Avail, for having hosted Ripple on his server." | html }}
      • -
    • {{ .T "Angela Guerra, for designing the Ripple logo." | html }}
      • -
    • {{ .T "Everyone who has supported the Ripple project by donating or inviting other people." | html }}
      • +
    • {{ .T "Jacksonisiah, for designing the Yozora logo." | html }}
      • +
    • {{ .T "Everyone who has supported the Yozora project by donating or inviting other people." | html }}
    {{ $ := . }} - {{ .T "Looking for how you should contact our team? Check out this page." | html }} + {{ .T "Looking for how you should contact our team? Check out this email." | html }}

    {{ .T "They told me these are very cool people." }}

    {{ with .Get "users?sort=donor_expire,desc&l=52" }}