legion.rb in legion_mastodon_client-0.1.1

- old
+ new
@@ -1,124 +1,69 @@
-require 'mastodon'
-require 'highline/import'
-require 'dotenv'
-require 'tk'
-require_relative 'mastodon'
-
-def LegionLoop
-
-window = TkToplevel.new do   #タイトルバーの表示
-    title( "Legion" )
-end
-
-Dotenv.load
-
-tootFrame = TkFrame.new(window)
-tootFrame.pack('side' => 'left', 'fill' => 'both')
-
-home_timeline = TkFrame.new(window)
-home_timeline.pack('side' => 'left', 'fill' => 'both')
-
-htl_label = TkLabel.new(home_timeline, 'text' => 'ホームタイムライン', 'width' => 50)
-htl_label.pack('side' => 'top', 'fill' => 'both')
-
-htl_list = TkListbox.new(home_timeline, 'height' => 25, 'selectmode' => 'multiple')
-htl_list.pack('fill' => 'both')
-
-home_timeline_yscrollbar = TkScrollbar.new(htl_list) {orient "vertical"; command proc{|*args| htl_list.yview(*args);} }
-htl_list['yscrollcommand'] = proc{|*args| home_timeline_yscrollbar.set(*args);}
-home_timeline_yscrollbar.pack('side' => 'right', 'fill' => 'both', 'ipadx' => '5', 'ipady' => '170')
-
-home_timeline_xscrollbar = TkScrollbar.new(htl_list) {orient "horizontal"; command proc{|*args| htl_list.xview(*args);} }
-htl_list['xscrollcommand'] = proc{|*args| home_timeline_xscrollbar.set(*args);}
-home_timeline_xscrollbar.pack('side' => 'bottom', 'fill' => 'both')
-
-local_timeline = TkFrame.new(window)
-local_timeline.pack('side' => 'left', 'fill' => 'both')
-
-ltl_label = TkLabel.new(local_timeline, 'text' => 'ローカルタイムライン', 'width' => 50)
-ltl_label.pack('side' => 'top', 'fill' => 'both')
-
-ltl_list = TkListbox.new(local_timeline, 'height' => 25, 'selectmode' => 'multiple')
-ltl_list.pack('fill' => 'both')
-
-local_timeline_yscrollbar = TkScrollbar.new(ltl_list) {orient "vertical"; command proc{|*args| ltl_list.yview(*args);} }
-ltl_list['yscrollcommand'] = proc{|*args| local_timeline_yscrollbar.set(*args);}
-local_timeline_yscrollbar.pack('side' => 'right', 'fill' => 'both', 'ipadx' => '5', 'ipady' => '170')
-
-local_timeline_xscrollbar = TkScrollbar.new(ltl_list) {orient "horizontal"; command proc{|*args| ltl_list.xview(*args);} }
-ltl_list['xscrollcommand'] = proc{|*args| local_timeline_xscrollbar.set(*args);}
-local_timeline_xscrollbar.pack('side' => 'bottom', 'fill' => 'both')
-
-public_timeline = TkFrame.new(window)
-public_timeline.pack('side' => 'left', 'fill' => 'both')
-
-ftl_label = TkLabel.new(public_timeline, 'text' => '連合タイムライン', 'width' => 50)
-ftl_label.pack('side' => 'top', 'fill' => 'both')
-
-ftl_list = TkListbox.new(public_timeline, 'height' => 25, 'selectmode' => 'multiple')
-ftl_list.pack('fill' => 'both')
-
-public_timeline_yscrollbar = TkScrollbar.new(ftl_list) {orient "vertical"; command proc{|*args| ftl_list.yview(*args);} }
-ftl_list['yscrollcommand'] = proc{|*args| public_timeline_yscrollbar.set(*args);}
-public_timeline_yscrollbar.pack('side' => 'right', 'fill' => 'both', 'ipadx' => '5', 'ipady' => '170')
-
-public_timeline_xscrollbar = TkScrollbar.new(ftl_list) {orient "horizontal"; command proc{|*args| ftl_list.xview(*args);} }
-ftl_list['xscrollcommand'] = proc{|*args| public_timeline_xscrollbar.set(*args);}
-public_timeline_xscrollbar.pack('side' => 'bottom', 'fill' => 'both')
-
-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)
-
-visibility = TkVariable.new('public')
-sensitive = TkVariable.new('false')
-spoiler_text = TkVariable.new("")
-
-text = TkText.new(tootFrame, 'width' => '50', 'height'=> '30')
-text.pack('side' => 'top', 'fill' => 'both')
-
-button = TkButton.new(tootFrame, 'text' => 'toot', 
-		       'command' => proc{mastodon.Toot(text.value, visibility.value, sensitive.value, spoiler_text.value);text.value=""})
-button.pack('side' => 'left', 'fill' => 'both')
-
-mediabutton = TkButton.new(tootFrame, 'text' => 'media', 
-		       'command' => proc{mastodon.MediaUpload(Tk.getOpenFile)})
-mediabutton.pack('side' => 'left', 'fill' => 'both')
-
-public_button = TkButton.new(tootFrame, 'text' => 'public', 
-		       'command' => proc{visibility.value = 'public' })
-public_button.pack('side' => 'left', 'fill' => 'both')
-
-unlisted_button = TkButton.new(tootFrame, 'text' => 'unlisted', 
-		       'command' => proc{visibility.value = 'unlisted' })
-unlisted_button.pack('side' => 'left', 'fill' => 'both')
-
-private_button = TkButton.new(tootFrame, 'text' => 'private', 
-		       'command' => proc{visibility.value = 'private' })
-private_button.pack('side' => 'left', 'fill' => 'both')
-
-direct_button = TkButton.new(tootFrame, 'text' => 'direct', 
-		       'command' => proc{visibility.value = 'direct' })
-direct_button.pack('side' => 'left', 'fill' => 'both')
-
-nsfw_button = TkButton.new(tootFrame, 'text' => 'nsfw', 
-		       'command' => proc{sensitive.value == 'true' ? sensitive.value = 'false' : sensitive.value = 'true' })
-nsfw_button.pack('side' => 'left', 'fill' => 'both')
-
-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' })
-cw_button.pack('side' => 'left', 'fill' => 'both')
-
-quitbutton = TkButton.new(tootFrame, 'text' => 'quit',
-		  'command' => proc{exit})
-quitbutton.pack('side' => 'right', 'fill' => 'both')
-
-loop do
-	Parallel.each([[1, home_timeline, htl_list], [2, local_timeline, ltl_list], [3, public_timeline, ftl_list]], in_threads: 3) do |call|
-		streaming.Timeline(call)
-	end
-end
+require 'mastodon'
+require 'highline/import'
+require 'dotenv'
+require 'tk'
+require_relative 'mastodon'
+require_relative 'ui'
+
+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)
+
+tootFrame = TootFrame.new(window, mastodon)
+tootFrame.set
+
+home_timeline = Timeline.new(window, "ホームタイムライン")
+home_timeline.set
+
+home_timeline_yscrollbar = TkScrollbar.new(home_timeline.list) {orient "vertical"; command proc{|*args| home_timeline.list.yview(*args);} }
+home_timeline.list['yscrollcommand'] = proc{|*args| home_timeline_yscrollbar.set(*args);}
+home_timeline_yscrollbar.pack('side' => 'right', 'fill' => 'both', 'ipadx' => '5', 'ipady' => '170')
+
+home_timeline_xscrollbar = TkScrollbar.new(home_timeline.list) {orient "horizontal"; command proc{|*args| home_timeline.list.xview(*args);} }
+home_timeline.list['xscrollcommand'] = proc{|*args| home_timeline_xscrollbar.set(*args);}
+home_timeline_xscrollbar.pack('side' => 'bottom', 'fill' => 'both')
+
+local_timeline = Timeline.new(window, "ローカルタイムライン")
+local_timeline.set
+
+local_timeline_yscrollbar = TkScrollbar.new(local_timeline.list) {orient "vertical"; command proc{|*args| local_timeline.list.yview(*args);} }
+local_timeline.list['yscrollcommand'] = proc{|*args| local_timeline_yscrollbar.set(*args);}
+local_timeline_yscrollbar.pack('side' => 'right', 'fill' => 'both', 'ipadx' => '5', 'ipady' => '170')
+
+local_timeline_xscrollbar = TkScrollbar.new(local_timeline.list) {orient "horizontal"; command proc{|*args| local_timeline.list.xview(*args);} }
+local_timeline.list['xscrollcommand'] = proc{|*args| local_timeline_xscrollbar.set(*args);}
+local_timeline_xscrollbar.pack('side' => 'bottom', 'fill' => 'both')
+
+public_timeline = Timeline.new(window, "連合タイムライン")
+public_timeline.set
+
+public_timeline_yscrollbar = TkScrollbar.new(public_timeline.list) {orient "vertical"; command proc{|*args| public_timeline.list.yview(*args);} }
+public_timeline.list['yscrollcommand'] = proc{|*args| public_timeline_yscrollbar.set(*args);}
+public_timeline_yscrollbar.pack('side' => 'right', 'fill' => 'both', 'ipadx' => '5', 'ipady' => '170')
+
+public_timeline_xscrollbar = TkScrollbar.new(public_timeline.list) {orient "horizontal"; command proc{|*args| public_timeline.list.xview(*args);} }
+public_timeline.list['xscrollcommand'] = proc{|*args| public_timeline_xscrollbar.set(*args);}
+public_timeline_xscrollbar.pack('side' => 'bottom', 'fill' => 'both')
+
+
+t1 = Thread.start {
+	loop do
+		Parallel.each([[1, home_timeline, home_timeline.list], [2, local_timeline, local_timeline.list], [3, public_timeline, public_timeline.list]], in_threads: 3) do |call|
+			streaming.Timeline(call)
+		end
+	end
+}
+
+Tk.mainloop
+
 end
\ No newline at end of file