Преглед на файлове

show deleted characters in admin channel

Kylie Jo Swistak преди 4 години
родител
ревизия
4f30935d63
променени са 4 файла, в които са добавени 23 реда и са изтрити 7 реда
  1. 1 1
      app/carousels/user.rb
  2. 1 1
      app/commands/member.rb
  3. 8 1
      app/embeds/character.rb
  4. 13 4
      app/models/item.rb

+ 1 - 1
app/carousels/user.rb

@@ -45,7 +45,7 @@ class UserCarousel < Carousel
     BotResponse.new(
       carousel: carousel,
       reactions: user_reactions,
-      embed: user_char_embed(all_chars, member, sfw)
+      embed: user_char_embed(all_chars, member, event, sfw)
     )
   end
 

+ 1 - 1
app/commands/member.rb

@@ -48,7 +48,7 @@ class MemberCommand < BaseCommand
 
         # Generate embed and reply
         BotResponse.new(
-          embed: user_char_embed(characters, member, sfw),
+          embed: user_char_embed(characters, member, event, sfw),
           carousel: active_chars.map(&:id),
           reactions: Emoji::NUMBERS.take(chars.count).push(Emoji::CROSS)
         )

+ 8 - 1
app/embeds/character.rb

@@ -327,11 +327,12 @@ def char_list_embed(chars, group, sort = nil)
   )
 end
 
-def user_char_embed(chars, member, nsfw=nil)
+def user_char_embed(chars, member, event, nsfw=nil)
   fields = []
   active = []
   archived = []
   npcs = []
+  deleted = []
   user_name = member&.nickname || member&.name || "Unknown User"
 
   chars.each do |char|
@@ -342,6 +343,8 @@ def user_char_embed(chars, member, nsfw=nil)
       archived.push char.name
     when 'NPC'
       npcs.push char.name
+    when 'Deleted'
+      deleted.push char.name
     end
   end
 
@@ -365,6 +368,10 @@ def user_char_embed(chars, member, nsfw=nil)
     fields.push({ name: "#{user_name}'s NPCs", value: npcs.join(", ") })
   end
 
+  unless deleted.empty? && !ENV['ADMIN_CH'].include?(event.channel.id.to_s)
+    fields.push({ name: "#{user_name}'s Deleted Characters", value: deleted.join(", ") })
+  end
+
   # Find allowed active characters
   allowed = member ? User.find(member.id.to_s).allowed_chars(member) : '???'
 

+ 13 - 4
app/models/item.rb

@@ -5,11 +5,20 @@ class Item < ActiveRecord::Base
     key_mapping = {
       "Item Name" => "name",
       "Description" => "description",
-      "Effect" => "effect",
-      "Side Effect" => "side_effect",
-      "RP Reply" => "rp_reply",
+      "Known Effects" => "effect",
+      "Potential Side Effects" => "side_effect",
+      "Limitations" => "limits",
+      "Duration" => "duration",
+      "RP Used Message" => "rp_use",
+      "RP Find Message" => "rp_find",
+      "Rating" => "rating",
+      "Image URL" => "img_url",
       "Category" => "category",
-      "Reusable" => "reusable"
+      "Rarity" => "rarity",
+      "Reusable" => "reusable",
+      "Location" => "location",
+      "Crafting Recipe" => "recipe",
+      "Status List" => "statuses"
     }
 
     hash = {}