Skip to content

Commit

Permalink
## 0.19.7
Browse files Browse the repository at this point in the history
### Bugfixes
- Fixed saving messaged for reminder
- Fixed duty create
  • Loading branch information
mr-exz committed Jan 9, 2025
1 parent 30791dd commit e54ad3a
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# Changelog
## 0.19.7
### Bugfixes
- Fixed saving messaged for reminder
- Fixed duty create

## 0.19.6
### Bugfixes
- Fixed reminder feature
Expand Down
10 changes: 5 additions & 5 deletions app/models/channel.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
class Channel < ApplicationRecord
self.primary_key = 'slack_channel_id'

def reminder_enabled
settings.present? && settings['reminder_enabled']
settings.present? && settings['reminder_enabled'] == 'true'
end

def reminder_enabled=(value)
Expand All @@ -11,19 +10,20 @@ def reminder_enabled=(value)
end

def tag_reporter_enabled
settings['tag_reporter_enabled']
settings.present? && settings['tag_reporter_enabled'] == 'true'
end

def tag_reporter_enabled=(value)
self.settings ||= {}
self.settings['tag_reporter_enabled'] = value
end

def tag_reporter(user_id)
tag_reporter_enabled ? "<@#{user_id}>" : ""
tag_reporter_enabled ? "<@#{user_id}>" : ''
end

def auto_answer_enabled
settings['auto_answer_enabled']
settings.present? && settings['auto_answer_enabled'] == 'true'
end

def auto_answer_enabled=(value)
Expand Down
2 changes: 1 addition & 1 deletion bot/commands/duty_create.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def self.call(client:, data:, match:)
message_processor.collectUserInfoBySlackUserId(user_name)
user = User.where(slack_user_id: user_name).first

duty = Duty.find_or_initialize_by(user_id: data.user, channel_id: data.channel)
duty = Duty.find_or_initialize_by(user_id: user.slack_user_id, channel_id: data.channel)
duty.duty_from = ActiveSupport::TimeZone.new(user.tz).local_to_utc(match['expression'][/from (\d+:\d+) /, 1].to_time)
duty.duty_to = ActiveSupport::TimeZone.new(user.tz).local_to_utc(match['expression'][/.* to (\d+:\d+)$/, 1].to_time)
duty.enabled = true
Expand Down

0 comments on commit e54ad3a

Please sign in to comment.