From ee6cbc2337f0e0cf1ee2fb8f5a984993ca7f93a9 Mon Sep 17 00:00:00 2001
From: Matt Jensen <matt@threerings.net>
Date: Tue, 19 Feb 2013 14:58:55 -0800
Subject: [PATCH] Most of our games don't share a ooouser database anyway and
 this flag is not longer specific to yohoho, so let's not be jerks about which
 sites can set the subscription status.

---
 .../java/com/threerings/user/OOOUser.java     | 24 ++++---------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/threerings/user/OOOUser.java b/src/main/java/com/threerings/user/OOOUser.java
index ec4abd0..6a9742f 100644
--- a/src/main/java/com/threerings/user/OOOUser.java
+++ b/src/main/java/com/threerings/user/OOOUser.java
@@ -439,21 +439,10 @@ public class OOOUser extends User
      */
     public boolean setBillingStatus (int site, byte status)
     {
-        switch (site) {
-        case METASOY_SITE_ID:
-            // we maintain a separate OOOUSER installation for msoy and thus rather than adding
-            // another column to maintain our subscriber status for msoy, we just reuse yohoho's
-        case PUZZLEPIRATES_SITE_ID:
-        case YPPFAMILY_SITE_ID:
-            if (yohoho != status) {
-                yohoho = status;
-                setModified("yohoho");
-                return true;
-            }
-            break;
-        default:
-            throw new IllegalArgumentException(
-                "Tried to set billing status for unknown site [site=" + site + "].");
+        if (yohoho != status) {
+            yohoho = status;
+            setModified("yohoho");
+            return true;
         }
         return false;
     }
@@ -464,13 +453,10 @@ public class OOOUser extends User
     public byte getBillingStatus (int site)
     {
         switch (site) {
-        case METASOY_SITE_ID: // see setBillingStatus
-        case PUZZLEPIRATES_SITE_ID:
-            return yohoho;
         case YPPFAMILY_SITE_ID:
             return isFamilySubscriber() ? SUBSCRIBER_STATE : yohoho;
         default:
-            return TRIAL_STATE;
+            return yohoho;
         }
     }