fix merge conflicts

Author: tclaus

app/models/user.rb

@@ -1,11 +1,6 @@
 # frozen_string_literal: true
 
 class User < ApplicationRecord
-  include Connecting
-  include Querying
-  include SocialActions
-  include Profile
-
   # attr_accessor :plain_otp_secret
 
   # encrypts :otp_secret

app/models/user_services/connecting.rb

@@ -21,13 +21,12 @@ def share_with(person, aspect)
       contact.aspects << aspect
       contact.save
 
-      if needs_dispatch
-        Diaspora::Federation::Dispatcher.defer_dispatch(user, contact)
-        deliver_profile_update(subscriber_ids: [person.id]) unless person.local?
-      end
+      dispatch_contact(contact, person) if needs_dispatch
 
+      # rubocop: disable Rails::SkipsModelValidations
       Notifications::StartedSharing.where(recipient_id: user.id, target: person.id, unread: true)
                                    .update_all(unread: false)
+      # rubocop: enable Rails::SkipsModelValidations
 
       contact
     end
@@ -56,6 +55,11 @@ def disconnected_by(person)
 
     attr_reader :user
 
+    def dispatch_contact(contact, person)
+      Diaspora::Federation::Dispatcher.defer_dispatch(user, contact)
+      deliver_profile_update(subscriber_ids: [person.id]) unless person.local?
+    end
+
     def deliver_profile_update(opts)
       Profile.new(user).deliver_profile_update(opts)
     end