Merge pull request #123 from JakyeRU/remove-roles-column

Remove roles column
JakyeRU · Sep 6, 2023 · 900c481 · 900c481 · vercel · Sep 6, 2023
2 parents 7d4e4a6 + 843e920
commit 900c481
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 48 deletions.
diff --git a/docs/pages/configuration.mdx b/docs/pages/configuration.mdx
@@ -160,9 +160,6 @@ return [
     */
 
     // WARNING: This feature makes one request to the Discord API for each guild you specify. (Because you need to fetch the roles for each guild)
-    // At the moment the database is not checked for roles when the user logs in. It will always fetch the roles from the Discord API.
-    // Currently, the roles are only updated in the database when the user logs in. The roles from the database can be used in a middleware.
-    // I'm working on a better way to do this, but for now, this will work.
 
     'guild_roles' => [
         // 'guild_id' => [

diff --git a/src/Http/Controllers/DiscordController.php b/src/Http/Controllers/DiscordController.php
@@ -111,8 +111,6 @@ public function handle(StoreUserRequest $request): RedirectResponse | JsonRespon
                         DB::rollBack();
                         return $this->throwError('missing_role');
                     }
-
-                    (new DiscordService())->updateUserRoles($user, $guildMember, $guildId);
                 }
             } catch (\Exception $e) {
                 DB::rollBack();

diff --git a/src/Services/DiscordService.php b/src/Services/DiscordService.php
@@ -228,18 +228,6 @@ public function hasRoleInGuild(GuildMember $guildMember, array $roles): bool
         return !empty(array_intersect($roles, $guildMember->roles));
     }
 
-    /**
-     * Updates the user's roles in the database.
-     */
-    public function updateUserRoles(User $user, GuildMember $guildMember, int $guildId): void
-    {
-        // Updating the user's roles in the database.
-        $updatedRoles = $user->roles;
-        $updatedRoles[$guildId] = $guildMember->roles;
-        $user->roles = $updatedRoles;
-        $user->save();
-    }
-
     /**
      * Revoke the user's access token.
      *

diff --git a/src/config/config.php b/src/config/config.php
@@ -136,9 +136,6 @@
     */
 
     // WARNING: This feature makes one request to the Discord API for each guild you specify. (Because you need to fetch the roles for each guild)
-    // At the moment the database is not checked for roles when the user logs in. It will always fetch the roles from the Discord API.
-    // Currently, the roles are only updated in the database when the user logs in. The roles from the database can be used in a middleware.
-    // I'm working on a better way to do this, but for now, this will work.
 
     'guild_roles' => [
         // 'guild_id' => [

diff --git a/src/database/migrations/2023_04_06_101123_add_roles_to_users_table.php b/src/database/migrations/2023_04_06_101123_add_roles_to_users_table.php