Cleanup and cut a bunch of code.

Droid00000 · Nov 11, 2024 · 8b9875f · 8b9875f
1 parent bd39033
commit 8b9875f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 26 deletions.
diff --git a/src/frost/boosters/delete.rb b/src/frost/boosters/delete.rb
@@ -31,13 +31,7 @@ def delete_role(data)
     return
   end
 
-  if data.server.role(booster_records(server: server_id, user: user_id, type: :get_role)).nil?
-    booster_records(server: data.server.id, user: data.user.id, type: :delete)
-    data.edit_response(content: RESPONSE[9])
-    return
-  end
-
-  data.server.delete_role(booster_records(server: server_id, user: user_id, type: :get_role), REASON[3])
+  data.server.role(booster_records(server: server_id, user: user_id, type: :get_role))&.delete(REASON[3])
 
   booster_records(server: data.server.id, user: data.user.id, type: :delete)
 

diff --git a/src/frost/boosters/edit.rb b/src/frost/boosters/edit.rb
@@ -36,19 +36,9 @@ def edit_role(data)
     return
   end
 
-  role = booster_records(server: data.server.id, user: data.user.id, type: :get_role)
-
-  if data.server.role(role).nil?
-    booster_records(server: data.server.id, user: data.user.id, type: :delete)
-    data.edit_response(content: RESPONSE[9])
-    return
-  end
-
-  data.server.update_role(role: role,
-                          name: data.options['name'],
-                          colour: resolve_color(data.options['color']),
-                          icon: data.emojis('icon')&.file,
-                          reason: REASON[2])
+  data.server.update_role(role: booster_records(server: data.server.id, user: data.user.id, type: :get_role),
+                          name: data.options['name'], colour: resolve_color(data.options['color']),
+                          icon: data.emojis('icon')&.file, reason: REASON[2])
 
   data.edit_response(content: "#{RESPONSE[2]} #{EMOJI[2]}")
 end
diff --git a/src/frost/moderation/ban.rb b/src/frost/moderation/ban.rb
@@ -20,18 +20,16 @@ def bulk_ban(data)
     return
   end
 
-  filtered_members = data.options['members'].delete('@<>').split(',').reject do |member|
+  members = data.options['members'].delete('@<>').split(',').reject do |member|
     data.bot.member(data.server, member).highest_role.position >= data.user.highest_role.position || data.bot.profile.on(data.server).highest_role.position
   end
 
-  if filtered_members.empty?
+  if members.empty?
     data.edit_response(content: RESPONSE[71])
     return
   end
 
-  bans = data.server.bulk_ban(members: filtered_members,
-                              messages: data.options['messages'],
-                              reason: data.options['reason'])
+  bans = data.server.bulk_ban(members, data.options['messages'], data.options['reason'])
 
-  data.edit_response(content: "#{RESPONSE[70]} #{bans.users.count}")
+  data.edit_response(content: "#{RESPONSE[70]} #{bans.count}")
 end