cross-post 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4910a3252598ddc59603847ba064cd2fa7e3bba8
-  data.tar.gz: 2ff550ca76b44fd3f8c718d00f4fb35f1a4ce092
+  metadata.gz: 3b4eba1daf6b5020cabfb1fe6b5439abb8f0a6cf
+  data.tar.gz: abe89c4de8fd97f43a31d462fedfadffeb9c934a
 SHA512:
-  metadata.gz: 6cf706ae52ac4f9cb4d25b2ebc8bfb2513b2318bc022cdf523b7dd9305e65513009760bb8533359394f218922d29ea74a4f28d7c3507a67d897e75ae2619d5e6
-  data.tar.gz: 385daf97bf09e15200782e449b78423533206ace6eb262d693712f83aa3da5d4bd3fd3a32b9ab348404ed0933e0af5d821dbbb9865eb95ea6e533b61a1f231de
+  metadata.gz: 15d9a991a38801246fb5290c77d5c3cd99775d9d571aa0ae43f9239a190733bb7316c41bb6737bb355a898ed8a299910826feda8fe5c5ee25d3952b1caa817e1
+  data.tar.gz: dbe761e4e3fdea90c350d0292606d47a5728a9ed5799179426274a86b0bb35bed59b4ad240e9a158e375999a8830580b24b89cc6bfe95919d9f268981bf63584

data/Gemfile

@@ -2,5 +2,7 @@ source 'https://rubygems.org'
 
 gem 'mastodon-api', '~> 1.1.0', require: 'mastodon', git: 'https://github.com/tootsuite/mastodon-api.git'
 gem 'awesome_print'
+gem 'dotenv'
+gem 'pry'
 
 gemspec

data/README.md

@@ -8,7 +8,7 @@ To use it:
 
  * Clone this repository somewhere (`git clone https://git.imirhil.fr/aeris/cross-post/`)
  * Install dependencies with Bundler (`bundler install`)
- * Create a `$HOME/.cross-post.yml` configuration file, based on the example available [here](https://git.imirhil.fr/aeris/cross-post/src/master/config.yml) 
+ * Create a `$HOME/.config/cross-post/config.yml` configuration file, based on the example available [here](https://git.imirhil.fr/aeris/cross-post/src/master/config.yml) 
  * Register the app on Twitter (`bundle exec bin/twitter-register`)
 	* You can reuse my Twitter app OAuth credentials, or register a new app from scratch [here](https://apps.twitter.com/)
  * Register the app on Mastodon (`bundle exec bin/mastodon-register`)
@@ -18,7 +18,3 @@ To use it:
  * Enjoy
  
 If needed, a SystemD unit example is available [here](https://git.imirhil.fr/aeris/cross-post/src/master/mastodon-twitter.service)
-
-# Todo
-
- * Publishing on [RubyGems](https://rubygems.org/)

data/bin/mastodon-register

@@ -6,18 +6,24 @@ require 'launchy'
 require 'uri'
 
 config = CrossPost::Config.new
-print 'Mastodon URL ? '
-url                    = gets.chomp
-url = "https://#{url}" if URI.parse(url).class == URI::Generic
-config['mastodon.url'] = url
+url = config['mastodon.url']
+unless url
+	print 'Mastodon URL ? '
+	url                    = gets.chomp
+	url = "https://#{url}" if URI.parse(url).class == URI::Generic
+	config['mastodon.url'] = url
+end
 
 client_id, client_secret = unless config['mastodon.consumer']
+							   puts 'Creating new app'
 							   token        = SecureRandom.hex 64
 							   redirect_url = 'urn:ietf:wg:oauth:2.0:oob'
 
 							   client = Mastodon::REST::Client.new base_url: url, bearer_token: token
 							   app    = client.create_app 'CrossPost', redirect_url,
 														  'read write', 'https://git.imirhil.fr/aeris/cross-post/'
+							   config['mastodon.consumer.key'] = app.client_id
+							   config['mastodon.consumer.secret'] = app.client_secret
 							   [app.client_id, app.client_secret]
 						   else
 							   [config['mastodon.consumer.key'], config['mastodon.consumer.secret']]

data/config.yml

@@ -4,6 +4,7 @@ twitter:
     key: 0jXQtXCpN6AGpPnqv4fzPvVY9
     secret: Be0jpY6gMt7CxhkWsPWqXBztogaNuyEJkIqWVB3U2tPY99p4YS
 mastodon:
+  consumer:
+    key: 83d0881ebeab0007a6d425db12b6a2dafdca99a18dd4e0e1816bc30f9e64f518
+    secret: 048ec7390d316aa7a5c071f5228ab259bcbc3ddb3338028d433183a1865ec135
   user: aeris
-  url: http://localhost:3000
-  token: 34b02283e2af4631040e2ac0d5654d871dac4000caa619b4516a7ffa5f11f74a

data/cross-post.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
 	spec.version = CrossPost::VERSION
 	spec.authors = ['aeris']
 	spec.email = ['aeris@imirhil.fr']
-	spec.summary = "Cross post to Mastodon and Twitter"
+	spec.summary = 'Cross post to Mastodon and Twitter'
 	spec.homepage = 'https://git.imirhil.fr/aeris/cross-post/'
 	spec.license = 'AGPL-3.0+'
 
@@ -17,6 +17,7 @@ Gem::Specification.new do |spec|
 	spec.test_files = spec.files.grep %r{^(test|spec|features)/}
 
 	spec.add_development_dependency 'bundler', '~> 1.15', '>= 1.15.4'
+	spec.add_development_dependency 'rspec', '~> 3.6.0', '>= 3.6.0'
 
 	spec.add_dependency 'twitter', '~> 6.1', '>= 6.1.0'
 	spec.add_dependency 'mastodon-api', '~> 1.1', '>= 1.1.0'

data/lib/cross-post.rb

@@ -11,7 +11,7 @@ OpenURI::Buffer.const_set 'StringMax', 0
 
 class CrossPost
 	LOGGER = Logger.new STDERR
-	LOGGER.level = Logger.const_get ENV.fetch('LOG', 'INFO')
+	LOGGER.level = Logger.const_get ENV.fetch('LOG', 'INFO').upcase
 	LOGGER.formatter = proc do |severity, time, _, msg|
 		time = time.strftime '%Y-%m-%dT%H:%M:%S.%6N'.freeze
 		"#{time} #{severity} #{msg}\n"

data/lib/cross-post/config.rb

@@ -1,40 +1,120 @@
 require 'yaml'
+require 'fileutils'
 
 class CrossPost
 	class Config
-		def initialize
-			@file = ENV.fetch 'CROSS_POST_CONFIG', File.join(Dir.home, '.cross-post.yml')
-			File.open(@file) { |f| @config = YAML.safe_load f }
-		end
+		DEFAULT_CONFIG_FOLDER = File.join Dir.home, '.config/cross-post'
+		DEFAULT_CONFIG_FILE   = 'config.yml'
 
-		def [](key)
-			current = @config
-			key.split(/\./).each do |k|
-				current = current[k]
-				return nil if current.nil?
+		class SubConfig
+			def initialize(config = {})
+				@config = config
+			end
+
+			def each(&block)
+				@config.each &block
+			end
+
+			def [](key)
+				case key
+				when String
+					current = @config
+					key.split(/\./).each do |k|
+						current = current[k]
+						return nil if current.nil?
+					end
+					current
+				else
+					@config[key]
+				end
+			end
+
+			def fetch(key, default = nil)
+				self[key] || default
 			end
-			current
-		end
 
-		def []=(key, value)
-			*key, last = key.split(/\./)
-			current    = @config
-			key.each do |k|
-				next_ = current[k]
-				case next_
-				when nil
-					next_ = current[k] = {}
-				when Hash
+			def []=(key, value)
+				case key
+				when String
+					*key, last = key.to_s.split(/\./)
+					current    = @config
+					key.each do |k|
+						next_ = current[k]
+						case next_
+						when nil
+							next_ = current[k] = {}
+						when Hash
+						else
+							raise "Invalid entry, Hash expected, had #{next_.class} (#{next_})"
+						end
+						current = next_
+					end
+					current[last] = value
 				else
-					raise "Invalid entry, Hash expected, had #{next_.class} (#{next_})"
+					@config[key] = value
 				end
-				current = next_
 			end
-			current[last] = value
 		end
 
-		def save
-			File.write @file, YAML.dump(@config)
+		class FifoSubConfig < SubConfig
+			def initialize(size = 100)
+				@size = size
+				@keys = []
+				super({})
+			end
+
+			def []=(key, value)
+				@keys.delete key
+				value = super key, value
+				@keys << key
+				while @keys.size > @size
+					key = @keys.delete_at 0
+					@config.delete key
+				end
+				value
+			end
+		end
+
+		class FileSubConfig < SubConfig
+			def initialize(file)
+				@file = file
+				super YAML.load_file @file
+			end
+
+			def put(key, value, save: false)
+				self[key] = value
+				self.save if save
+			end
+
+			def save
+				LOGGER.debug "Saving #{@file}"
+				yaml = YAML.dump @config
+				File.write @file, yaml
+			end
+		end
+
+		def initialize
+			@configs = {}
+			@dir     = ENV.fetch 'CONFIG_FOLDER', DEFAULT_CONFIG_FOLDER
+			file     = ENV.fetch 'CONFIG_FILE', DEFAULT_CONFIG_FILE
+			self.load :settings, file
+			self.load :users
+			self[:posts] = FifoSubConfig.new
+		end
+
+		def [](name)
+			@configs[name]
+		end
+
+		def []=(name, value)
+			@configs[name] = value
+		end
+
+		def load(name, file = nil)
+			file ||= "#{name}.yml"
+			file = File.join @dir, file
+			FileUtils.touch file unless File.exist? file
+			self[name] = FileSubConfig.new file
 		end
 	end
 end

data/lib/cross-post/mastodon.rb

@@ -5,12 +5,22 @@ require 'awesome_print'
 class CrossPost
 	class Mastodon
 		def initialize(config)
-			url       = config['mastodon.url']
-			token     = config['mastodon.token']
-			user      = config['mastodon.user']
-			@user_url = URI.join(url, "/@#{user}").to_s
-			@client   = ::Mastodon::REST::Client.new base_url: url, bearer_token: token
-			@stream   = ::Mastodon::Streaming::Client.new base_url: url, bearer_token: token
+			settings = config[:settings]
+			@posts   = config[:posts]
+
+			url   = settings['mastodon.url']
+			token = settings['mastodon.token']
+			user  = settings['mastodon.user']
+
+			LOGGER.debug "Mastodon base URL: #{url}"
+			@client = ::Mastodon::REST::Client.new base_url: url, bearer_token: token
+
+			stream_url = settings.fetch 'mastodon.stream_url', url
+			LOGGER.debug "Mastodon stream URL: #{stream_url}"
+			@stream = ::Mastodon::Streaming::Client.new base_url: stream_url, bearer_token: token
+
+			@user_url = URI.join(ENV.fetch('BASE_USER_URL', url), "/@#{user}").to_s
+			LOGGER.debug "Mastodon user URL: #{@user_url}"
 		end
 
 		def feed(twitter)
@@ -18,14 +28,14 @@ class CrossPost
 				begin
 					case object
 					when ::Mastodon::Status
-						next if reject? object
 						LOGGER.info { 'Receiving status' }
-						LOGGER.debug { status.ap }
+						LOGGER.debug { object.ai }
+						next if reject? object
 						twitter.post_status object
 					end
 				rescue => e
 					LOGGER.error e
-					#raise
+					raise
 				end
 			end
 		end
@@ -33,9 +43,11 @@ class CrossPost
 		private
 
 		def reject?(status)
-			status.account.url != @user_url or
-					status.visibility != 'public' or
-					status.in_reply_to_id
+			return true if status.account.url != @user_url or
+					status.visibility != 'public'
+			reply = status.in_reply_to_id
+			return true if reply and !@posts[reply]
+			false
 		end
 	end
 end

data/lib/cross-post/twitter.rb

@@ -2,43 +2,66 @@ require 'twitter'
 require 'twitter-text'
 require 'sanitize'
 require 'cgi'
+require 'ostruct'
+
+::Twitter::Validation::MAX_LENGTH = 280
 
 class CrossPost
 	class Twitter
 		def initialize(config)
+			settings = config[:settings]
+			@posts   = config[:posts]
+			@users   = config[:users]
+
 			config  = {
-					consumer_key:        config['twitter.consumer.key'],
-					consumer_secret:     config['twitter.consumer.secret'],
-					access_token:        config['twitter.access.token'],
-					access_token_secret: config['twitter.access.secret']
+					consumer_key:        settings['twitter.consumer.key'],
+					consumer_secret:     settings['twitter.consumer.secret'],
+					access_token:        settings['twitter.access.token'],
+					access_token_secret: settings['twitter.access.secret']
 			}
 			@client = ::Twitter::REST::Client.new config
 			@stream = ::Twitter::Streaming::Client.new config
 		end
 
-		def post(content, media = [])
-			media = media.collect { |f| @client.upload f }
+		def post(content, media = [], id:, reply_to:)
+			reply_to = OpenStruct.new id: reply_to unless reply_to.respond_to? :id
 
+			media = media.collect { |f| @client.upload f }
 			parts = split content
-			last  = nil
-
 			unless media.empty?
 				first, *parts = parts
-				last          = @client.update first, media_ids: media.join(',')
+				reply_to      = @client.update first, media_ids: media.join(','), in_reply_to_status: reply_to
 			end
-			parts.each { |p| last = @client.update p, in_reply_to_status: last }
+			parts.each { |p| reply_to = @client.update p, in_reply_to_status: reply_to }
+
+			reply_to = reply_to.id if reply_to.respond_to? :id
+			@posts[id] = reply_to
 		end
 
+		WHITESPACE_TAGS = {
+				'br'  => { before: "\n", after: '' },
+				'div' => { before: "\n", after: "\n" },
+				'p'   => { before: "\n", after: "\n" }
+		}.freeze
+
 		def post_status(status)
-			content = Sanitize.clean status.content
+			content = status.content
+			content = Sanitize.clean(content, whitespace_elements: WHITESPACE_TAGS).strip
 			content = CGI.unescape_html content
+
+			@users.each do |mastodon, twitter|
+				content = content.gsub /@\b#{mastodon}\b/, "@#{twitter}"
+			end
+
 			media   = status.media_attachments.collect { |f| open f.url }
 
 			LOGGER.info { 'Sending to twitter' }
 			LOGGER.debug { "  Content: #{content}" }
 			LOGGER.debug { "  Attachments: #{media.size}" }
 
-			self.post content, media
+			reply   = status.in_reply_to_id
+			reply_to = reply ? @posts[reply] : nil
+			self.post content, media, id: status.id, reply_to: reply_to
 
 			media.each do |f|
 				f.close
@@ -51,7 +74,7 @@ class CrossPost
 		def split(text)
 			parts = []
 			part  = ''
-			words = text.split ' '
+			words = text.split /\ /
 			words.each do |word|
 				old_part = part
 				part     += ' ' unless part == ''

data/lib/cross-post/version.rb

@@ -1,3 +1,3 @@
 class CrossPost
-	VERSION = '0.1.2'.freeze
+	VERSION = '0.2.0'.freeze
 end

data/spec/config_spec.rb

@@ -0,0 +1,19 @@
+require 'cross-post'
+
+RSpec.describe CrossPost::Config::FifoSubConfig do
+	it 'must remove first value in case of overflow' do
+		config = CrossPost::Config::FifoSubConfig.new 2
+		config[:foo] = :foo
+		config[:bar] = :bar
+
+		expect(config[:foo]).to be :foo
+		expect(config[:bar]).to be :bar
+		expect(config[:baz]).to be_nil
+
+		config[:baz] = :baz
+
+		expect(config[:foo]).to be_nil
+		expect(config[:bar]).to be :bar
+		expect(config[:baz]).to be :baz
+	end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cross-post
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - aeris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-01 00:00:00.000000000 Z
+date: 2018-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,6 +30,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.15.4
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.6.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.6.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: twitter
   requirement: !ruby/object:Gem::Requirement
@@ -196,6 +216,7 @@ files:
 - lib/cross-post/version.rb
 - logo.png
 - mastodon-twitter.service
+- spec/config_spec.rb
 homepage: https://git.imirhil.fr/aeris/cross-post/
 licenses:
 - AGPL-3.0+
@@ -216,8 +237,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Cross post to Mastodon and Twitter
-test_files: []
+test_files:
+- spec/config_spec.rb