chronicle-imessage 0.2.0 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e5b5b2c2b15c1a26c52871284d921960d825d24303b1d872d4d25c8d8782229
-  data.tar.gz: 5597cc2177ae72c86c2cc9a96b75f29dc5c07b0fe2053304e0e880b4d93919c5
+  metadata.gz: 2be4dbec8ee2945136d579ab8d42d8580160c6eacc839d92a55a5a462f749385
+  data.tar.gz: c9a229903ebaffcc63fd52a480237e47f119142d3036c6a0c32513f7891ba114
 SHA512:
-  metadata.gz: bbae018587ad66e2a3ed05a5d7e878058cfac6c747fc283fbc54995f07bbbfc6aacaeddfaa16ae6ceb9d9547f0b4c20d692ce6a4fc059d542ca4621dec0b819c
-  data.tar.gz: ffc6247be044ebe0cfc58f545b10e7d622ebff3c82dc230c8f412abb61f971bce981bb6edcb58fbbe507a7cb8d639e8b19063ec6b66c2e332584e2c416357ab6
+  metadata.gz: 86dd00967c9a1a689bd575d399c0869db3b42152f7043386362caf84eaccb13a5f4c865c38546c4d6f30692629e37132687266ed284d90f2ac0141d021cba330
+  data.tar.gz: f3de0abf901aa6f9a2c3484f6414bd8f9d9d566c57f2ebaf4e2e3a6c74f465a1efedf6e69d88567a903c9c090a51a0e685a6c9bbeb31ad37a0c40a677c17daba

data/README.md

@@ -13,7 +13,6 @@ IMessage importer for [chronicle-etl](https://github.com/chronicle-app/chronicle
 
 ```bash
 gem install chronicle-etl
-chronicle-etl connectors:install imessage
-
-chronicle-etl --extractor imessage --since:"2022-02-07" --transformer imessage --loader table
+chronicle-etl plugins:install imessage
+chronicle-etl --extractor imessage --since "2022-02-07" --transformer imessage
 ```

data/chronicle-imessage.gemspec

@@ -35,9 +35,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "chronicle-etl", "~> 0.4"
-  spec.add_dependency "sqlite3", "~> 1.4.2"
-  spec.add_dependency "phonelib", "~> 0.6.54"
+  spec.add_dependency "chronicle-etl", "~> 0.4.2"
+  spec.add_dependency "sqlite3", "~> 1.4"
+  spec.add_dependency "phonelib", "~> 0.6"
 
   spec.add_development_dependency "bundler", "~> 2.3"
   spec.add_development_dependency "rake", "~> 13.0.6"

data/lib/chronicle/imessage/imessage_extractor.rb

@@ -1,6 +1,5 @@
 require 'chronicle/etl'
 require 'sqlite3'
-require 'pry'
 
 module Chronicle
   module Imessage 
@@ -13,6 +12,11 @@ module Chronicle
       setting :db, default: File.join(Dir.home, 'Library', 'Messages', 'chat.db'), required: true
       setting :load_attachments, default: false
       setting :only_attachments, default: false
+      setting :my_phone_number
+      setting :my_name
+      setting :icloud_account_id
+      setting :icloud_account_dsid
+      setting :icloud_account_display_name
 
       def prepare
         prepare_data
@@ -23,6 +27,8 @@ module Chronicle
           meta = {}
           meta[:participants] = @chats[message['chat_id']]
           meta[:attachments] = @attachments[message['message_id']] if @attachments
+          meta[:my_phone_contact] = @my_phone_contact
+          meta[:my_icloud_account] = @my_icloud_account
 
           yield Chronicle::ETL::Extraction.new(data: message, meta: meta)
         end
@@ -36,15 +42,35 @@ module Chronicle
 
       def prepare_data
         @db = SQLite3::Database.new(@config.db, results_as_hash: true)
+        @local_contacts = LocalContacts.new
+        @contacts = @local_contacts.contacts
+
         @messages = load_messages
-        @contacts = LocalContacts.new.contacts
         @chats = load_chats
 
+        @my_phone_contact = load_my_phone_contact(@local_contacts)
+        @my_icloud_account = load_my_icloud_account(@local_contacts)
+
         if @config.load_attachments
           @attachments = load_attachments(@messages.map{|m| m['message_id']})
         end
       end
 
+      def load_my_phone_contact(local_contacts)
+        {
+          phone_number: @config.my_phone_number || local_contacts.my_phone_contact.fetch(:phone_number),
+          name: @config.my_name || local_contacts.my_phone_contact.fetch(:full_name)
+        }
+      end
+
+      def load_my_icloud_account(local_contacts)
+        {
+          id: @config.icloud_account_id || local_contacts.my_icloud_account.fetch(:AccountID),
+          dsid: @config.icloud_account_dsid || local_contacts.my_icloud_account.fetch(:AccountDSID),
+          display_name: @config.icloud_account_display_name || @config.my_name || local_contacts.my_icloud_account.fetch(:DisplayName)
+        }
+      end
+
       def load_messages
         conditions = []
 

data/lib/chronicle/imessage/imessage_transformer.rb

@@ -8,9 +8,6 @@ module Chronicle
         r.description = 'a row from a local imessage database'
       end
 
-      setting :my_phone_slug, required: true
-      setting :my_name, required: true
-
       def transform
         @message = @extraction.data
         @participants = @extraction.meta[:participants]
@@ -118,14 +115,40 @@ module Chronicle
       end
 
       def build_identity_mine
+        case identity_provider(@message['service'])
+        when 'icloud'
+          build_identity_mine_icloud
+        when 'phone'
+          build_identity_mine_phone
+        end
+      end
+
+      def build_identity_mine_icloud
+        icloud_account = @extraction.meta[:my_icloud_account]
+        raise(UntransformableRecordError, "Missing iCloud account information") unless icloud_account
+
         record = ::Chronicle::ETL::Models::Entity.new({
-          represents: 'identity',
-          slug: @config.my_phone_slug,
-          title: @config.my_name,
-          provider: identity_provider(@message['service']),
-          provider_id: @message['account_guid']
+          represent: 'identity',
+          provider: 'icloud',
+          provider_id: icloud_account[:dsid],
+          title: icloud_account[:display_name],
+          slug: icloud_account[:id]
+        })
+        record.dedupe_on << [:provider, :represents, :slug]
+        record
+      end
+
+      def build_identity_mine_phone
+        phone_account = @extraction.meta[:my_phone_contact]
+        raise(UntransformableRecordError, "Missing own phone contact information") unless phone_account
+
+        record = ::Chronicle::ETL::Models::Entity.new({
+          represent: 'identity',
+          provider: 'phone',
+          title: phone_account[:name],
+          slug: phone_account[:phone_number]
         })
-        record.dedupe_on = [[:represents, :slug, :provider], [:represents, :provider, :provider_id]]
+        record.dedupe_on << [:provider, :represents, :slug]
         record
       end
 

data/lib/chronicle/imessage/local_contacts.rb

@@ -23,6 +23,14 @@ module Chronicle
         end
       end
 
+      def my_phone_contact
+        @my_phone_contact ||= load_my_phone_contact
+      end
+
+      def my_icloud_account
+        @my_icloud_account ||= load_my_icloud_account
+      end
+
       # The synced address book doesn't have a stable folder location so we 
       # have to search for it
       def find_local_icloud_address_book
@@ -30,6 +38,38 @@ module Chronicle
         Dir.glob(pattern).first
       end
 
+      def load_my_icloud_account
+        @my_icloud_account || begin
+          output = `defaults read MobileMeAccounts Accounts | plutil -convert json -r -o - -- -`
+          JSON.parse(output, symbolize_names: true).first
+        end
+      end
+
+      def load_my_phone_contact
+        sql = <<-SQL
+          SELECT
+            ZABCDPHONENUMBER.ZFULLNUMBER AS identifier,
+            ZABCDRECORD.ZFIRSTNAME as first_name,
+            ZABCDRECORD.ZLASTNAME as last_name
+          FROM
+            ZABCDRECORD,
+            ZABCDPHONENUMBER 
+          WHERE
+            ZABCDRECORD.Z_PK = ZABCDPHONENUMBER.ZOWNER  
+            AND ZABCDRECORD.zcontainerwherecontactisme IS NOT NULL 
+        SQL
+
+        results = @db.execute(sql)
+
+        guessed_number = results.first
+        return unless guessed_number
+
+        {
+          phone_number: Phonelib.parse(guessed_number['identifier'], "US").e164,
+          full_name: "#{guessed_number['first_name']} #{guessed_number['last_name']}"
+        }
+      end
+
       def load_phone_numbers
         sql = <<-SQL
           SELECT

data/lib/chronicle/imessage/version.rb

@@ -1,5 +1,5 @@
 module Chronicle
   module Imessage
-    VERSION = "0.2.0"
+    VERSION = "0.2.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chronicle-imessage
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.3
 platform: ruby
 authors:
 - Andrew Louis
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-25 00:00:00.000000000 Z
+date: 2022-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronicle-etl
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: phonelib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.54
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.54
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -107,7 +107,7 @@ metadata:
   homepage_uri: https://github.com/chronicle-app/chronicle-imessage
   source_code_uri: https://github.com/chronicle-app/chronicle-imessage
   changelog_uri: https://github.com/chronicle-app/chronicle-imessage
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -122,8 +122,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: iMessage importer for Chronicle
 test_files: []