Add moderator list to profile

Author: cpacia

api/restapi.py

@@ -99,6 +99,7 @@ def parse_profile(profile):
                         "nsfw": profile.nsfw,
                         "vendor": profile.vendor,
                         "moderator": profile.moderator,
+                        "moderator_list": profile.moderator_list,
                         "handle": profile.handle,
                         "about": profile.about,
                         "website": profile.website,
@@ -320,6 +321,9 @@ def update_profile(self, request):
                 u.vendor = str_to_bool(request.args["vendor"][0])
             if "moderator" in request.args:
                 u.moderator = str_to_bool(request.args["moderator"][0])
+            if "moderator_list" in request.args:
+                for moderator in request.args["moderator_list"]:
+                    u.moderator_list.append(moderator)
             if "website" in request.args:
                 u.website = request.args["website"][0]
             if "email" in request.args:
@@ -358,7 +362,7 @@ def add_social_account(self, request):
             p = Profile(self.db)
             if "account_type" in request.args and "username" in request.args and "proof" in request.args:
                 p.add_social_account(request.args["account_type"][0], request.args["username"][0],
-                                     request.args["proof"][0])
+                                     request.args["proof"][0] if "proof" in request.args else None)
             else:
                 raise Exception("Missing required fields")
             request.write(json.dumps({"success": True}))

market/profile.py

@@ -35,14 +35,15 @@ def update(self, user_info):
         self.profile.MergeFrom(user_info)
         self.db.set_proto(self.profile.SerializeToString())
 
-    def add_social_account(self, account_type, username, proof):
+    def add_social_account(self, account_type, username, proof=None):
         s = self.profile.SocialAccount()
         for social_account in self.profile.social:
             if social_account.type == s.SocialType.Value(account_type.upper()):
                 self.profile.social.remove(social_account)
         s.type = s.SocialType.Value(account_type.upper())
         s.username = username
-        s.proof_url = proof
+        if proof:
+            s.proof_url = proof
         self.profile.social.extend([s])
         self.db.set_proto(self.profile.SerializeToString())
 

protos/objects.proto

@@ -35,27 +35,28 @@ message Profile {
         optional bool nsfw                = 5 [default = false];
         optional bool vendor              = 6 [default = false];
         optional bool moderator           = 7 [default = false];
-        optional string handle            = 8;
-        optional string about             = 9;
-        optional string short_description = 10;
-        optional string website           = 11;
-        optional string email             = 12;
-        repeated SocialAccount social     = 13;
-        optional uint32 primary_color     = 14 [default = 4868168];
-        optional uint32 secondary_color   = 15 [default = 5723734];
-        optional uint32 background_color  = 16 [default = 2763306];
-        optional uint32 text_color        = 17 [default = 16777215];
-        optional uint32 follower_count    = 18 [default = 0];
-        optional uint32 following_count   = 19 [default = 0];
-        optional PublicKey pgp_key        = 20; // pgp signature covers guid
-        optional bytes avatar_hash        = 21;
-        optional bytes header_hash        = 22;
+        repeated bytes moderator_list     = 8;
+        optional string handle            = 9;
+        optional string about             = 10;
+        optional string short_description = 11;
+        optional string website           = 12;
+        optional string email             = 13;
+        repeated SocialAccount social     = 14;
+        optional uint32 primary_color     = 15 [default = 4868168];
+        optional uint32 secondary_color   = 16 [default = 5723734];
+        optional uint32 background_color  = 17 [default = 2763306];
+        optional uint32 text_color        = 18 [default = 16777215];
+        optional uint32 follower_count    = 19 [default = 0];
+        optional uint32 following_count   = 20 [default = 0];
+        optional PublicKey pgp_key        = 21; // pgp signature covers guid
+        optional bytes avatar_hash        = 22;
+        optional bytes header_hash        = 23;
 
 	// Social media account for the profile
     message SocialAccount {
     	required SocialType type  = 1;
     	required string username  = 2;
-    	required string proof_url = 3;
+    	optional string proof_url = 3;
 
     	enum SocialType {
 			FACEBOOK  = 1;