Permalink
Browse files

conflicts fix.

  • Loading branch information...
2 parents b361546 + 0b95eab commit d75983b804b35290cfdb898557d3dc4b711ca6c5 @biwakonbu committed Jan 31, 2013
Showing with 2 additions and 3 deletions.
  1. +2 −3 daisan_bot.rb
View
@@ -55,15 +55,14 @@ def concat_to(table)
array[-1].concat(x)
next
end
- array << x if /[^(平日便|土曜日便|夏期ダイヤ)]/ =~ x[0]
+ array << ['']
end
array
end
def collect_table(timetable)
text = ''
tweets = []
- diagrum = ['平日便', '土曜日便', '夏期ダイヤ']
timetable.each do |wday|
time = []
@@ -102,7 +101,7 @@ def collect_table(timetable)
while true
begin
if Time.now.min % 10 == 0 and (7 <= Time.now.hour and Time.now.hour <= 23)
- tweets = "現在直近のシャトルバス運行時間 \r\n"
+ tweets = "現在直近のシャトルバス運行時間 \n"
tweets << collect_table(suminodo_table)
tweets << collect_table(daisan_table)
client.update(tweets)

0 comments on commit d75983b

Please sign in to comment.