Add api endpoint (need to test) & a lot of TODOs

core/installation/views/installer.view.php

@@ -904,6 +904,11 @@
 				'value' => 0
 			));
 
+			// TODO: verify i have all queries done.
+			// group discord id
+			// user discord id
+			// discord integration enabled
+
             $queries->create('settings', array(
                 'name' => 'avatar_type',
                 'value' => 'helmavatar'

custom/languages/EnglishUK/admin.php

@@ -645,4 +645,5 @@
 	'discord_role_id_length' => 'Discord Role ID must be 18 digits long.',
 	'discord_guild_id_updated' => 'Discord Server ID was updated successfully.',
 	'discord_guild_id_required' => 'Please enter your Discord Server ID for Discord integration to work.',
+	// TODO: All language files
 );

custom/languages/EnglishUK/user.php

@@ -237,6 +237,6 @@
 	'not_linked' => 'Not Linked',
 	'discord_id' => 'Discord User ID',
 	'discord_id_unlinked' => 'Successfully unlinked your Discord User ID.',
-	'discord_id_confirm' => 'Please send a private message containing only your username to "NamelessMC Bot#0761" to confirm your Discord User ID.',
+	'discord_id_confirm' => 'Please send a private message containing only your username to "Nameless Link#0761" to confirm your Discord User ID.',
 	'pending_link' => 'Pending'
 );

modules/Core/pages/api/v2/index.php

@@ -632,18 +632,54 @@ private function setDiscordId() {
             } catch (Exception $e) {
                 $this->throwError(23, $this->_language->get('api', 'unable_to_create_report'));
             }
-        } else $this->throwError(1, $this->_language->get('api', 'invalid_api_key'
-        ));
+        } else $this->throwError(1, $this->_language->get('api', 'invalid_api_key'));
     }
 
+    // TODO: If they turn off discord integration on website, but the bot is still active on server...
     private function setGroupFromDiscord() {
-        // Param: id = discord user id
-        // Param: role_id = discord role id
+        // Param: discord user id
+        // Param: discord role id
+        if ($this->_validated === true) {
+            if (!isset($_POST) || empty($_POST)) {
+                $this->throwError(6, $this->_language->get('api', 'invalid_post_contents'));
+            }
+
+            $discord_user_id = $_POST['discord_user_id'];
+            $discord_role_id = $_POST['discord_role_id'];
+
+            try {
+                $this->_db = DB::getInstance();
+
+                // Error
+                $user = $this->_db->get('users', array('discord_id', '=', $discord_user_id));
+                if (!$user->count()) $this->throwError(16, $this->_language->get('api', 'unable_to_find_user'));
+                $group = $this->_db->get('groups', array('discord_role_id', '=', $discord_role_id));
+                if (!$group->count()) $this->throwError(16, $this->_language->get('api', 'unable_to_find_group'));
+
+                $user = $user->first()->id;
+                $group = $group->first()->id;
+
+                try {
+                    $this->_db->update('users', $user, array(
+                        'group_id' => $group
+                    ));
+                    // TODO: If their main group was set to a group which was previously a secondary group, remove from their secondary groups
+                } catch (Exception $e) {
+                    $this->throwError(18, $this->_language->get('api', 'unable_to_update_group'));
+                }
+
+                // Success
+                $this->returnArray(array('message' => $this->_language->get('api', 'group_updated')));
+            } catch (Exception $e) {
+                $this->throwError(23, $this->_language->get('api', 'unable_to_create_report'));
+            }
+        } else $this->throwError(1, $this->_language->get('api', 'invalid_api_key'));
     }
 
     private function removeGroupFromDiscord() {
-        // Param: id = discord user id
-        // Param: role_id = discord role id
+        // Param: discord user id
+        // Param: discord role id
+        // TODO: Decide what happens when a role is removed in discord. Does their group get set to the default post-validation group
     }
 
     // Create a report

modules/Core/pages/panel/users_edit.php

@@ -214,7 +214,6 @@
 								} else if ($group_discord_id != null && $old_group_discord_id != null){
 									$full_url = $bot_url . '/roleChange?id=' . $user_query->discord_id . '&guild_id=' . $queries->getWhere('settings', array('name', '=', 'discord'))[0]->value . '&role=' . $group_discord_id. '&oldRole=' . $old_group_discord_id;
 								} else $full_url = null;
-
 								file_get_contents($full_url);
 							}
 						}

modules/Core/pages/user/settings.php

@@ -505,7 +505,8 @@
 					'discord_id' => array(
 						'min' => 18,
 						'max' => 18,
-						'numeric' => true
+						'numeric' => true,
+						'unique' => 'users'
 					)
 				));
 				if ($validation->passed()) {
@@ -534,6 +535,8 @@
 					}
 
 				} else {
+					// TODO: Finish these
+					// TODO: Default template form
 					foreach ($validation->errors() as $validation_error) {
 						if (strpos($validation_error, 'minimum') !== false || strpos($validation_error, 'maximum') !== false) {
 							$errors[] = $language->get('admin', 'discord_id_length');