Fix (Collection): fix blender receive

speckle_connector/src/convertors/to_native.rb

@@ -266,7 +266,7 @@ module SpeckleConnector
       # rubocop:enable Metrics/PerceivedComplexity
 
       def speckle_object_to_native(obj)
-        return DISPLAY_VALUE.method(:to_native) unless obj['displayValue'].nil?
+        return DISPLAY_VALUE.method(:to_native) unless obj['displayValue'].nil? && obj['@displayValue'].nil?
 
         SPECKLE_OBJECT_TO_NATIVE[obj['speckle_type']]
       end

speckle_connector/src/speckle_objects/geometry/mesh.rb

@@ -120,7 +120,7 @@ module SpeckleConnector
           mesh_layer_name = SketchupModel::Query::Layer.entity_layer_from_path(mesh['layer'])
           mesh_layer = state.sketchup_state.sketchup_model.layers.to_a.find { |l| l.display_name == mesh_layer_name }
           added_faces.each do |face|
-            face.layer = mesh_layer.nil? ? layer : mesh_layer
+            face.layer = mesh_layer unless mesh_layer.nil?
             # Smooth edges if they already soft
             # FIXME: Below line should be reconsidered. It might be a good to know here mesh comes from NURBS or not.
             face.edges.each { |edge| edge.smooth = true if edge.soft? } if has_any_non_planar_quad_mesh

speckle_connector/src/speckle_objects/other/display_value.rb

@@ -70,10 +70,12 @@ module SpeckleConnector
         end
 
         def self.collect_definition_geometries(obj)
-          obj['geometry'] = obj['displayValue']
+          obj['geometry'] = obj['displayValue'] || obj['@displayValue']
 
-          if !obj['elements'].nil? && obj['elements'].is_a?(Array)
-            obj['elements'].each do |element|
+          elements = obj['elements'] || obj['@elements']
+
+          if !elements.nil? && elements.is_a?(Array)
+            elements.each do |element|
               # Mullions is a special case here, they are extracted as base object with @displayValue from revit..
               if element['@displayValue'].nil?
                 obj['geometry'].append(element)

speckle_connector/src/speckle_objects/speckle/core/models/collection.rb

@@ -31,10 +31,8 @@ module SpeckleConnector
 
               if collection_type.include?('model')
                 ModelCollection.to_native(state, collection, layer, entities, &convert_to_native)
-              elsif ['layer', 'Revit Category'].include?(collection_type)
-                LayerCollection.to_native(state, collection, layer, entities, &convert_to_native)
               else
-                return state, []
+                LayerCollection.to_native(state, collection, layer, entities, &convert_to_native)
               end
             end
           end

ui/src/plugins/speckle-metrics.js

@@ -26,9 +26,11 @@ const SpeckleMetrics = {
           .digest('hex')
           .toUpperCase()
 
+      let serverUrl = new URL(localStorage.getItem('serverUrl'))
+
       let serverId = crypto
         .createHash('md5')
-        .update(localStorage.getItem('serverUrl').toLowerCase())
+        .update(serverUrl.hostname.toLowerCase())
         .digest('hex')
         .toUpperCase()