Skip to content

Commit

Permalink
RC24 migration
Browse files Browse the repository at this point in the history
  • Loading branch information
Difegue committed Oct 11, 2023
1 parent f65d10c commit d9cbee5
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 30 deletions.
1 change: 1 addition & 0 deletions WebContent/WEB-INF/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ <h5 class="white-text">About DoujinSoft</h5>
WarioWare DIY/Made in Ore.
<br /> We hope this archive can make people (re)discover content lost to the Nintendo WFC closure.
<br /> Thanks to the folks at <a class="orange-text text-lighten-3"
href="https://wiilink24.com/">WiiLink24</a>, <a class="orange-text text-lighten-3"
href="https://rc24.xyz/">RiiConnect24</a>, <a class="orange-text text-lighten-3"
href="https://twitter.com/andrewk1024">andrewk1024</a> for the
8-bit instrument samples, <br>and <a class="orange-text text-lighten-3"
Expand Down
17 changes: 11 additions & 6 deletions WebContent/WEB-INF/templates/cart.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<br><br>
You can upload a Wii/NDS save here, and we'll import the games/comics/records you've chosen into it.
<br>
Alternatively, if your Wii console is using <a href="http://rc24.xyz">RiiConnect24</a>, we can send stuff directly to
Alternatively, if your Wii console is using <a href="http://wiilink24.com">WiiLink24</a>, we can send stuff directly to
it. No save export/import needed! <br>
{% endblock %}

Expand All @@ -28,7 +28,7 @@ <h5 class="amber-text "> <i class="material-icons">filter_2</i> Shipping Method
<label>
<input class="with-gap" name="method" type="radio" id="wc24-radio" value="wc24" checked
onclick="updateShipping('wc24')">
<span>RiiConnect24</span>
<span>WiiLink24</span>
</label>

<label>
Expand Down Expand Up @@ -56,7 +56,7 @@ <h5 class="amber-text "> <i class="material-icons">filter_2</i> Shipping Method
<i class="material-icons prefix">contact_mail</i>
<input id="recipient" name="recipient" type="text" class="validate white-text" data-length="16">
<label for="recipient" class="">Wii Friend Code</label>
This will send the content to your Wii through RiiConnect24. <br /> Make sure you're <a href="#regmodal"
This will send the content to your Wii through WiiLink24. <br /> Make sure you're <a href="#regmodal"
class="modal-trigger">friends</a> with us before using this!
</div>

Expand All @@ -83,7 +83,7 @@ <h5 class="amber-text"> <i class="material-icons">filter_3</i> Let's get it on</
<div class="modal-content black-text">
<h4>Register your Wii with DoujinSoft</h4>
<p>
In order to use RiiConnect24 to receive games from DoujinSoft, you must first register your Wii Friend Code.
In order to use WiiLink24 to receive games from DoujinSoft, you must first register your Wii Friend Code.
<br>
Add our <b>Friend Code</b> to your Wii first:
</p>
Expand All @@ -99,7 +99,7 @@ <h2 id="wii-number">{{wiiNumber}}</h2>
<a class="waves-effect waves-light btn" onclick="registerFriendCode()">Add me!</a> <span id="regresult"
style="margin-left:10px"> </span>
<br><br><br>
If you don't want to use RiiConnect24, just close this popup and we won't ask again! 🙏
If you don't want to use WiiLink24, just close this popup and we won't ask again! 🙏

</p>
</div>
Expand All @@ -118,7 +118,12 @@ <h2 id="wii-number">{{wiiNumber}}</h2>
var record = JSON.parse(localStorage.getItem("record"));

if (games === null && manga === null && record === null)
$("#cart-content").html('<h5 class="white-text center">...But your cart seems to be empty right now.</h5> <br/> <br/> <span class="white-text" style="font-size:10vw">¯\\_(ツ)_/¯</span> ');
$("#cart-content").html(`
<h5 class="white-text center">...But your cart seems to be empty right now.</h5>
<br/> <br/>
<span class="white-text" style="font-size:10vw">¯\\_(ツ)_/¯</span>
<br/>
<span class="white-text">Need to register your Wii Friend Code? <a href="#regmodal" class="modal-trigger">Click here.</a></span>`);

if (games != null)
for (i = 0; i < games.length; i++)
Expand Down
14 changes: 8 additions & 6 deletions WebContent/WEB-INF/templates/faq.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ <h5 class="white-text"> <i class="material-icons">filter_2</i> How can I extract
can also try using <a href="https://github.com/DS-Homebrew/GodMode9i">GodMode9i.</a>

<h5 class="white-text"> <i class="material-icons">filter_3</i> How do I upload content to DoujinSoft?</h5>
You can send your DIY Games/Music/Comics either through RiiConnect24 and DIY Showcase, or through our <a
You can send your DIY Games/Music/Comics either through WiiLink24 and DIY Showcase, or through our <a
href="./upload">Web Uploader!</a><br />
Check there for more info and guidance on how to extract content from game saves.<br />
You can also use our <a href="https://github.com/Difegue/DoujinSoft">source code</a> to roll out your own DIY
Expand All @@ -50,18 +50,20 @@ <h5 class="white-text"> <i class="material-icons">filter_5</i> What's your stanc
NSFW content is blurred by default unless you explicitly agree to see it, but there still might be some games that
slipped through the cracks.<br />If you see one, please report it to us!

<h5 class="white-text"> <i class="material-icons">filter_6</i> How do I get started with RiiConnect24?</h5>
<h5 class="white-text"> <i class="material-icons">filter_6</i> How do I get started with WiiLink24?</h5>
First off, make sure your copy of DIY Showcase is <a
href="https://wii.guide/wiimmfi#wiiware-patching">patched.</a><br />
Past that, setup RiiConnect24 by checking their guide <a href="https://wii.guide/riiconnect24">here</a>, and make
Past that, setup WiiLink24 by checking their guide <a href="https://www.wiilink24.com/guide/1welcome">here</a>, and
make
sure you're using their DNS. Be sure to
register your Friend Code with us in the <a href="./cart">Cart</a> once you're set!

<h5 class="white-text"> <i class="material-icons">filter_7</i> I'm not receiving any games sent through
RiiConnect24!</h5>
Make sure you're properly hooked to RiiConnect24 first. Easiest way to check that is to see if your Weather Channel
WiiLink24!</h5>
Make sure you're properly hooked to WiiLink24 first. Easiest way to check that is to see if your Weather Channel
is working!<br />
Past that, make sure DoujinSoft's Wii Number appears as a friend in your Wii Address Book.
Past that, make sure DoujinSoft's Wii Number appears as a friend in your Wii Address Book, and that you've patched
DIY Showcase properly.

<h5 class="white-text"> <i class="material-icons">filter_8</i> Where did you source the games from?</h5>
The Nintendo WFC dump can be found <a href="https://archive.org/details/WarioWareDIYWarehouse">here.</a>
Expand Down
17 changes: 9 additions & 8 deletions WebContent/WEB-INF/templates/surveys.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@
{% block color %}orange{% endblock %}
{% block title %}Surveys{% endblock %}
{% block desc %}
Hot takes and opinions, coming directly from RiiConnect24 users!
<br/><br/>
Games/Records/Comics sent to DIY Showcase on Wii can be rated by users. <br/> This page is a simple way to display all the ratings we've received.
<br/><br/>
Hot takes and opinions, coming directly from WiiLink24 users!
<br /><br />
Games/Records/Comics sent to DIY Showcase on Wii can be rated by users. <br /> This page is a simple way to display all
the ratings we've received.
<br /><br />

<br/>
<br />
<div id="pagination-top" class="pagination-wrapper chip">
<ul class="pagination pagination-survey"></ul>
</div>
Expand All @@ -20,8 +21,8 @@

{% block content %}

{% include "./surveysDetail.html" %}
{% include "./surveysDetail.html" %}

{% endblock %}

{% block footdata %}
Expand All @@ -30,4 +31,4 @@
<ul class="pagination pagination-survey"></ul>
</div>

{% endblock %}
{% endblock %}
8 changes: 4 additions & 4 deletions WebContent/WEB-INF/templates/upload.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

Adding your WarioWare DIY content to DoujinSoft so it can be shared with the world has never been easier!
<br>
You can either upload .mio files here directly or use <a href="http://rc24.xyz">RiiConnect24</a> with DIY Showcase to
You can either upload .mio files here directly or use <a href="http://wiilink24.com">WiiLink24</a> with DIY Showcase to
send us content.
<br>

Expand All @@ -21,19 +21,19 @@

<div class="white-text">

<h5 class="amber-text"> <i class="material-icons">store</i> I want to use RiiConnect24!</h5>
<h5 class="amber-text"> <i class="material-icons">store</i> I want to use WiiLink24!</h5>

Please make sure you've registered with us in the <a href="./cart">Cart</a> first! <br>
If you did so, all you have to do is send your content to DoujinSoft's Wii Friend through WarioWare: DIY Showcase's
<b>Distribution Center.</b> <br>
(If you can't send content to DoujinSoft on your Wii, make sure your copy of DIY Showcase is <a
href="https://wii.guide/wiimmfi#wiiware-patching">patched.</a>)
<br><br>
Files sent this way will be instantly approved and featured in the <a href="./collection?id=e_rc24_g">RC24
Files sent this way will be instantly approved and featured in the <a href="./collection?id=e_wl24_g">WL24
Collections!</a><br>
You'll also receive a nice thank-you letter as a bonus. 💌

<h5 class="amber-text"> <i class="material-icons">save</i> I don't have RiiConnect24 / I want to send you .mio
<h5 class="amber-text"> <i class="material-icons">save</i> I don't have WiiLink24 / I want to send you .mio
files!</h5>

First off, please make sure the files you want to send aren't already in the archive!
Expand Down
2 changes: 1 addition & 1 deletion WebContent/js/init.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ function truckClicked() {
r_text[5] = "Check the Upload page if you want to know how to extract .mio files from your saves.";
r_text[6] = "bazinga";
r_text[7] = "wow this is just like the news channel cat except cheaper";
r_text[8] = "Stuff sent through DIY Showcase with RiiConnect24 is automatically approved!";
r_text[8] = "Stuff sent through DIY Showcase with WiiLink24 is automatically approved!";
r_text[9] = 'The truck seems to have dropped...<a href="https://holopin.io/collect/clcv3bt7p577408l6cf44pbk6">something!</a>';
var i = Math.floor(10 * Math.random())

Expand Down
2 changes: 1 addition & 1 deletion src/com/difegue/doujinsoft/wc24/MailItem.java
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ private boolean validateFriendCode(String code) {

private static String RECAP_FOOTER =
"~~~~~ Service provided for fun ~~~~~\n" +
"~~~~~ by RiiConnect24 and ~~~~~\n" +
"~~~~~ by WiiLink24 and ~~~~~\n" +
"~~~~~ Difegue @ TVC-16 ~~~~~";

private static String[] LETTERHEAD_MIIS = {
Expand Down
8 changes: 4 additions & 4 deletions src/com/difegue/doujinsoft/wc24/MailItemParser.java
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ private MailItem analyzeMail(String mail) throws Exception {
String subdomain = "mail.";
if (wc24Server == "rc24.xyz")
subdomain = "";

// Other emails...
// Change From: and To: to the server's wii address and the backup wii address
// respectively
Expand Down Expand Up @@ -289,13 +289,13 @@ private void addToWC24Collection(String type, String hash) throws FileNotFoundEx
String collectionFile = dataDir + "/collections/";
switch (type) {
case "G":
collectionFile += "e_rc24_g";
collectionFile += "e_wl24_g";
break;
case "RR":
collectionFile += "e_rc24_r";
collectionFile += "e_wl24_r";
break;
case "MMM":
collectionFile += "e_rc24_m";
collectionFile += "e_wl24_m";
break;
}

Expand Down

0 comments on commit d9cbee5

Please sign in to comment.