legion_mastodon_client 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: dd45906fe3d5c1e0efa624dc6484489188fc0bb8b5b440ce28f18e561c2c1fd6
-  data.tar.gz: ffb4371c000b14127cef76f392256515479ba0f1627676afdaf5847050bb53a7
+SHA1:
+  metadata.gz: 46cefd68e3d8830be77cc9ec41e55d537be8a9d0
+  data.tar.gz: ed7f14a8ba5639fd6f64f515152e7f8fd06a36ac
 SHA512:
-  metadata.gz: 80e4c2498d4b7d16645a633758734b0119252eee6031362fe43fc0ad1462b70d6f38f8815ed68355c6e0cb593ce852f71e65030da1956507ba7a763a0fe8b974
-  data.tar.gz: 63d6267fd3b12561a4e7b0f7a57fe91c4fbb6c56d0f4a12ca44a80cc1f4800bdf51b54e4ff9dedb6d1ae7ebd489707aff81e0f4d902650ba4306289c3acee2b7
+  metadata.gz: 3185f4810a105772036eb1d5997392eaa72738ce53a990e1a11620f70e3c55211da239663d036b07a3252a668e405803b06229d525d49a081a6e5712941d23c4
+  data.tar.gz: 1d0f730c0704cd02a331a2c9e36d963fbab3e4e1d1f10c62f5b030659fe4975aba2729af96166658bb76ae3db451a429d89ea76440e7f53a1c0071d942537501

data/.rspec

@@ -1,3 +1,3 @@
---format documentation
---color
---require spec_helper
+--format documentation
+--color
+--require spec_helper

data/.travis.yml

@@ -1,5 +1,5 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.3.3
-before_install: gem install bundler -v 1.16.2
+sudo: false
+language: ruby
+rvm:
+  - 2.3.3
+before_install: gem install bundler -v 1.16.2

data/CODE_OF_CONDUCT.md

@@ -1,74 +1,74 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at gamelinks007@gmail.com. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at gamelinks007@gmail.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

data/README.md

@@ -26,7 +26,7 @@ Gemfile
 ``` ruby:Gemfile
 source "https://rubygems.org"
 
-gem 'legion_mastodon_client', '~> 0.1.0'
+gem 'legion_mastodon_client', '~> 0.1.1'
 gem 'mastodon-api', git: 'https://github.com/tootsuite/mastodon-api.git', ref: '189deb8'
 gem 'dotenv'
 gem "highline"
@@ -42,6 +42,7 @@ bundle install
 ```
 
 後は、`.env` を作成し、必要な環境変数を記入していくだけです。
+なお、マルチポスト/マルチアカウント対応をされたい方は , で区切ってURLとトークンを貼り付けてください
 
 ``` :.env
 MASTODON_URL=<インスタンスのURL>

data/Rakefile

@@ -1,6 +1,6 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/bin/console

@@ -1,14 +1,14 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "legion"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "legion"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +1,8 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/legion.gemspec

@@ -1,38 +1,38 @@
-
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "legion/version"
-
-Gem::Specification.new do |spec|
-  spec.name          = "legion_mastodon_client"
-  spec.version       = Legion::VERSION
-  spec.authors       = ["S-H-GAMELINKS"]
-  spec.email         = ["gamelinks007@gmail.com"]
-
-  spec.summary       = "Mastodon Client(Ruby/Tk)"
-  spec.description   = "Mastodon Client(Ruby/Tk)"
-  spec.homepage      = "https://github.com/S-H-GAMELINKS/Legion"
-  spec.license       = "MIT"
-
-  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
-  # to allow pushing to a single host or delete this section to allow pushing to any host.
-  #if spec.respond_to?(:metadata)
-  #  spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
-  #else
-  #  raise "RubyGems 2.0 or newer is required to protect against " \
-  #    "public gem pushes."
-  #end
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-end
+
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "legion/version"
+
+Gem::Specification.new do |spec|
+  spec.name          = "legion_mastodon_client"
+  spec.version       = Legion::VERSION
+  spec.authors       = ["S-H-GAMELINKS"]
+  spec.email         = ["gamelinks007@gmail.com"]
+
+  spec.summary       = "Mastodon Client(Ruby/Tk)"
+  spec.description   = "Mastodon Client(Ruby/Tk)"
+  spec.homepage      = "https://github.com/S-H-GAMELINKS/Legion"
+  spec.license       = "MIT"
+
+  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
+  # to allow pushing to a single host or delete this section to allow pushing to any host.
+  #if spec.respond_to?(:metadata)
+  #  spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
+  #else
+  #  raise "RubyGems 2.0 or newer is required to protect against " \
+  #    "public gem pushes."
+  #end
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec", "~> 3.0"
+end

data/lib/legion.rb

@@ -1,9 +1,9 @@
-require "legion/version"
-require "legion/mastodon"
-require "legion/legion"
-
-module Legion
-  def self.exec
-    LegionLoop()
-  end
-end
+require "legion/version"
+require "legion/mastodon"
+require "legion/legion"
+
+module Legion
+  def self.exec
+    LegionLoop()
+  end
+end

data/lib/legion/legion.rb

@@ -5,22 +5,47 @@ require 'tk'
 require_relative 'mastodon'
 require_relative 'ui'
 
+def ClientInit
+	Dotenv.load
+
+	client = Array.new
+
+	url = ENV["MASTODON_URL"].split(",")
+	token = ENV["MASTODON_TOKEN"].split(",")
+
+	for i in 0...url.count	 do 
+		client[i] = Mastodon::REST::Client.new(base_url: url[i], bearer_token: token[i])
+	end
+
+	mastodon = MastodonAPI.new(client)
+end
+
+def StreamInit
+	Dotenv.load
+
+	stream = Array.new
+	
+	url = ENV["MASTODON_URL"].split(",")
+	token = ENV["MASTODON_TOKEN"].split(",")
+	
+	for i in 0...url.count do
+		stream[i] = Mastodon::Streaming::Client.new(base_url: url[i], bearer_token: token[i])
+	end
+	
+	streaming = MastodonStreaming.new(stream, url)
+end
+
 def LegionLoop
 
 window = TkRoot.new do   #タイトルバーの表示
     title( "Legion" )
 end
 
-Dotenv.load
-
-client = Mastodon::REST::Client.new(base_url: ENV["MASTODON_URL"], bearer_token: ENV["MASTODON_TOKEN"])
-mastodon = MastodonAPI.new(client)
-
-stream = Mastodon::Streaming::Client.new(base_url: ENV["MASTODON_URL"], bearer_token: ENV["MASTODON_TOKEN"])
-streaming = MastodonStreaming.new(stream)
+mastodon = ClientInit()
+streaming = StreamInit()
 
 tootFrame = TootFrame.new(window, mastodon)
-tootFrame.set
+tootFrame.set(window, streaming)
 
 home_timeline = Timeline.new(window, "ホームタイムライン")
 home_timeline.set

data/lib/legion/mastodon.rb

@@ -7,50 +7,62 @@ class MastodonAPI
     def initialize(client)
         @client = client
         @timeline = Hash.new
-        @avatar = Array.new
-        @media_id = nil
+        @media_id = Array.new
     end
 
     def MediaUpload(file_path)
 
         if file_path != nil then
-            @media_id = @client.upload_media(file_path).id
+            for i in 0...@client.count do
+                @media_id[i] = @client[i].upload_media(file_path).id
+            end
         else
-            @media_id = nil
+            @media_id.clear
         end
     end
 
-    def Toot(message, visibility, sensitive, spoiler_text)
+    def Toot(message, options)
         message += "\n #Legion"
-        response = @client.create_status(message.encode("UTF-8"), :media_ids => @media_id, :visibility => visibility, :sensitive => sensitive, :spoiler_text => spoiler_text)
+
+        for i in 0...@client.count do
+            response = @client[i].create_status(message.encode("UTF-8"), :media_ids => @media_id[i],
+                                                 :visibility => options[:visibility], :sensitive => options[:sensitive], 
+                                                 :spoiler_text => options[:spoiler_text])
+        end
+
+        @media_id.clear
     end
 end
 
 class MastodonStreaming
+    attr_accessor :stream, :num
 
-    def initialize(stream)
+    def initialize(stream, url)
         @stream = stream
+        @url    = url
+        @num    = 0
     end
 
     def HomeTimeline(window, list)
-        @stream.user() do |toot|
+        @stream[@num].user() do |toot|
             message = Nokogiri::HTML.parse(toot.content, nil, nil).search('p')
-            list.insert('0', message.text)
+            list.insert('0', "#{toot.account.display_name} さん : #{message.text}")
         end
     end
 
     def PublicTimeline(window, list)
-        @stream.firehose() do |toot|
+        @stream[@num].firehose() do |toot|
             message = Nokogiri::HTML.parse(toot.content, nil, nil).search('p')
-            list.insert('0', message.text)
+            list.insert('0', "#{toot.account.display_name} さん : #{message.text}")
         end
     end
 
     def LocalTimeline(window, list)
-        @stream.firehose() do |toot|
-            if toot.uri.to_s =~ /#{ENV['MASTODON_URL'].to_s}/ then
+        @stream[@num].firehose() do |toot|
+            puts @url[@num]
+            if toot.uri.to_s =~ /#{@url[@num]}/ then
                 message = Nokogiri::HTML.parse(toot.content, nil, nil).search('p')
-                list.insert('0', message.text)
+                list.insert('0', "#{toot.account.display_name} さん : #{message.text}")
             end
         end
     end

data/lib/legion/ui.rb

@@ -31,18 +31,13 @@ class TootFrame
 
 	def initialize(window, mastodon)
 		@tootFrame = TkFrame.new(window)
-		@visibility = TkVariable.new('public')
-		@sensitive = TkVariable.new('false')
-		@spoiler_text = TkVariable.new("")
+		@options = Hash[:visibility => "public", :sensitive => 'false', :spoiler_text => '']
+		@visibility = ['public', 'unlisted', 'private', 'direct']
 		@text = text = TkText.new(@tootFrame, 'width' => '50', 'height'=> '30')
-		@button = TkButton.new(@tootFrame, 'text' => 'toot', 'command' => proc{mastodon.Toot(@text.value, @visibility.value, @sensitive.value, @spoiler_text.value);@text.value=""})
+		@button = TkButton.new(@tootFrame, 'text' => 'toot', 'command' => proc{mastodon.Toot(@text.value, @options);@text.value=""})
 		@mediabutton = TkButton.new(@tootFrame, 'text' => 'media', 'command' => proc{mastodon.MediaUpload(Tk.getOpenFile)})
-		@public_button = TkButton.new(@tootFrame, 'text' => 'public', 'command' => proc{@visibility.value = 'public' })
-		@unlisted_button = TkButton.new(@tootFrame, 'text' => 'unlisted', 'command' => proc{@visibility.value = 'unlisted' })
-		@private_button = TkButton.new(@tootFrame, 'text' => 'private', 'command' => proc{@visibility.value = 'private' })
-		@direct_button = TkButton.new(@tootFrame, 'text' => 'direct', 'command' => proc{@visibility.value = 'direct' })
-		@nsfw_button = TkButton.new(@tootFrame, 'text' => 'nsfw', 'command' => proc{@sensitive.value == 'true' ? @sensitive.value = 'false' : @sensitive.value = 'true' })
-		@cw_button = TkButton.new(@tootFrame, 'text' => 'cw', 'command' => proc{@spoiler_text.value == "" ? @spoiler_text.value = "Contents Warning!" : @spoiler_text.value = ""; @sensitive.value == 'true' ? @sensitive.value = 'false' : @sensitive.value = 'true' })
+		@nsfw_button = TkButton.new(@tootFrame, 'text' => 'nsfw', 'command' => proc{@options[:sensitive] == 'true' ? @options[:sensitive] = 'false' : @options[:sensitive] = 'true' })
+		@cw_button = TkButton.new(@tootFrame, 'text' => 'cw', 'command' => proc{@options[:spoiler_text] == "" ? @options[:spoiler_text] = "Contents Warning!" : @options[:spoiler_text] = ""; @options[:sensitive] == 'true' ? @options[:sensitive] = 'false' : @options[:sensitive] = 'true' })
 		@quitbutton = TkButton.new(@tootFrame, 'text' => 'quit', 'command' => proc{exit})
 	end
 
@@ -62,20 +57,39 @@ class TootFrame
 		@mediabutton.pack('side' => 'left', 'fill' => 'both')
 	end
 
-	def PubilcButton_pack
-		@public_button.pack('side' => 'left', 'fill' => 'both')
-	end
+	def AccountMenu(window, streaming)
+
+		Dotenv.load
+
+		menu = TkMenu.new(window)
+		url = ENV["MASTODON_URL"].split(",")
+		procArray = Array.new
 
-	def UnlistedButton_pack
-		@unlisted_button.pack('side' => 'left', 'fill' => 'both')
+		url.each do |address|
+			menu.add('command', 'label' => "#{address}", 'command' => proc{streaming.num = url.index(address);}, 'underline' => 0)
+		end
+
+		return menu
 	end
 
-	def PrivateButton_pack
-		@private_button.pack('side' => 'left', 'fill' => 'both')
+	def VisibilityMenu(window)
+
+		menu = TkMenu.new(window)
+
+		@visibility.each do |visibility|
+			menu.add('command', 'label' => "#{visibility}", 'command' => proc{@options[:visibility] = visibility;})
+		end
+
+		return menu
 	end
 
-	def DirectButton_pack
-		@direct_button.pack('side' => 'left', 'fill' => 'both')
+	def MenuBar_pack(window, streaming)
+		menubar = TkMenu.new(window)
+
+		menubar.add('cascade', 'menu' => self.AccountMenu(window, streaming), 'label' => 'Accounts')
+		menubar.add('cascade', 'menu' => self.VisibilityMenu(window), 'label' => 'Visibility')
+
+		window.menu(menubar)
 	end
 
 	def NsfwButton_pack
@@ -90,15 +104,12 @@ class TootFrame
 		@quitbutton.pack('side' => 'right', 'fill' => 'both')
 	end
 
-	def set
+	def set(window, streaming)
 		self.TootFrame_pack
 		self.Text_pack
 		self.Button_pack
-		self.PubilcButton_pack
 		self.MediaButton_pack
-		self.UnlistedButton_pack
-		self.PrivateButton_pack
-		self.DirectButton_pack
+		self.MenuBar_pack(window, streaming)
 		self.NsfwButton_pack
 		self.CwButton_pack
 		self.Quitbutton_pack

data/lib/legion/version.rb

@@ -1,3 +1,3 @@
-module Legion
-  VERSION = "0.1.1"
-end
+module Legion
+  VERSION = "0.1.2"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: legion_mastodon_client
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - S-H-GAMELINKS
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-24 00:00:00.000000000 Z
+date: 2018-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Mastodon Client(Ruby/Tk)