can :update, DiaryEntry, :user => user
can [:create], DiaryComment
can [:make_friend, :remove_friend], Friendship
- can [:read, :create, :reply, :inbox, :outbox, :muted, :mark, :unmute, :destroy], Message
+ can [:read, :create, :mark, :unmute, :destroy], Message
can [:close, :reopen], Note
can [:read, :update], :preference
can :update, :profile
--- /dev/null
+module Messages
+ class RepliesController < ApplicationController
+ layout "site"
+
+ before_action :authorize_web
+ before_action :set_locale
+
+ authorize_resource :class => Message
+
+ before_action :check_database_readable
+ before_action :check_database_writable
+
+ allow_thirdparty_images
+
+ # Allow the user to reply to another message.
+ def new
+ message = Message.find(params[:message_id])
+
+ if message.recipient == current_user
+ message.update(:message_read => true)
+
+ @message = Message.new(
+ :recipient => message.sender,
+ :title => "Re: #{message.title.sub(/^Re:\s*/, '')}",
+ :body => "On #{message.sent_on} #{message.sender.display_name} wrote:\n\n#{message.body.gsub(/^/, '> ')}"
+ )
+
+ @title = @message.title
+
+ render "messages/new"
+ elsif message.sender == current_user
+ @message = Message.new(
+ :recipient => message.recipient,
+ :title => "Re: #{message.title.sub(/^Re:\s*/, '')}",
+ :body => "On #{message.sent_on} #{message.sender.display_name} wrote:\n\n#{message.body.gsub(/^/, '> ')}"
+ )
+
+ @title = @message.title
+
+ render "messages/new"
+ else
+ flash[:notice] = t ".wrong_user", :user => current_user.display_name
+ redirect_to login_path(:referer => request.fullpath)
+ end
+ rescue ActiveRecord::RecordNotFound
+ @title = t "messages.no_such_message.title"
+ render "messages/no_such_message", :status => :not_found
+ end
+ end
+end
before_action :lookup_user, :only => [:new, :create]
before_action :check_database_readable
- before_action :check_database_writable, :only => [:new, :create, :reply, :mark, :destroy]
+ before_action :check_database_writable, :only => [:new, :create, :mark, :destroy]
allow_thirdparty_images :only => [:new, :create, :show]
render :action => "no_such_message", :status => :not_found
end
- # Allow the user to reply to another message.
- def reply
- message = Message.find(params[:message_id])
-
- if message.recipient == current_user
- message.update(:message_read => true)
-
- @message = Message.new(
- :recipient => message.sender,
- :title => "Re: #{message.title.sub(/^Re:\s*/, '')}",
- :body => "On #{message.sent_on} #{message.sender.display_name} wrote:\n\n#{message.body.gsub(/^/, '> ')}"
- )
-
- @title = @message.title
-
- render :action => "new"
- elsif message.sender == current_user
- @message = Message.new(
- :recipient => message.recipient,
- :title => "Re: #{message.title.sub(/^Re:\s*/, '')}",
- :body => "On #{message.sent_on} #{message.sender.display_name} wrote:\n\n#{message.body.gsub(/^/, '> ')}"
- )
-
- @title = @message.title
-
- render :action => "new"
- else
- flash[:notice] = t ".wrong_user", :user => current_user.display_name
- redirect_to login_path(:referer => request.fullpath)
- end
- rescue ActiveRecord::RecordNotFound
- @title = t "messages.no_such_message.title"
- render :action => "no_such_message", :status => :not_found
- end
-
# Set the message as being read or unread.
def mark
@message = current_user.messages.unscope(:where => :muted).find(params[:message_id])
def block_short_status(block)
if block.active?
- if block.needs_view?
- if block.ends_at > Time.now.utc
- t("user_blocks.helper.short.active_unread")
- else
- t("user_blocks.helper.short.expired_unread")
- end
- else
+ if block.ends_at > Time.now.utc
t("user_blocks.helper.short.active")
+ else
+ t("user_blocks.helper.short.active_until_read")
end
else
if block.revoker_id.nil?
@text = message.body
@title = message.title
@readurl = message_url(message)
- @replyurl = message_reply_url(message)
+ @replyurl = new_message_reply_url(message)
@author = @from_user
attach_user_avatar(message.sender)
<fieldset class="mb-3">
<label for="user_auth_provider" class="form-label"><%= t(".external auth") %></label>
<div class="row">
- <%= f.select(:auth_provider, { t("auth.providers.none") => "" }.merge(Auth.providers), :hide_label => true, :wrapper => { :class => "col-auto mb-0" }) %>
+ <%= f.select :auth_provider,
+ Auth.providers.map { |provider| [I18n.t("auth.providers.#{provider}"), provider] },
+ :include_blank => t("auth.providers.none"),
+ :hide_label => true,
+ :wrapper => { :class => "col-auto mb-0" } %>
<%= f.text_field(:auth_uid, :hide_label => true, :wrapper => { :class => "col mb-0" }) %>
</div>
<small class="form-text text-body-secondary">(<a href="<%= t ".openid.link" %>" target="_new"><%= t ".openid.link text" %></a>)</small>
-<% prefered_auth_button_available = @preferred_auth_provider != "openid" && Auth.providers.value?(@preferred_auth_provider) %>
+<% prefered_auth_button_available = @preferred_auth_provider != "openid" && Auth.providers.include?(@preferred_auth_provider) %>
<div>
<%= tag.div :id => "login_auth_buttons",
<% end %>
<div class="col justify-content-center d-flex align-items-center flex-wrap gap-2">
- <% Auth.providers.each_value do |provider| %>
+ <% Auth.providers.each do |provider| %>
<% if provider == "openid" %>
<%= button_tag image_tag("auth_providers/openid.svg",
:alt => t(".openid.alt"),
<div class="richtext text-break"><%= @message.body.to_html %></div>
<div>
- <%= link_to t(".reply_button"), message_reply_path(@message), :class => "btn btn-primary" %>
+ <%= link_to t(".reply_button"), new_message_reply_path(@message), :class => "btn btn-primary" %>
<% if current_user == @message.recipient %>
<%= link_to t(".unread_button"), message_mark_path(@message, :mark => "unread"), :method => "post", :class => "btn btn-primary" %>
<%= link_to t(".destroy_button"), message_path(@message), :method => "delete", :class => "btn btn-danger" %>
title: "No such message"
heading: "No such message"
body: "Sorry there is no message with that id."
- reply:
- wrong_user: "You are logged in as '%{user}' but the message you have asked to reply to was not sent to that user. Please log in as the correct user in order to reply."
show:
title: "Read message"
reply_button: "Reply"
people_mapping_nearby: "people mapping nearby"
message:
destroy_button: "Delete"
+ replies:
+ new:
+ wrong_user: "You are logged in as '%{user}' but the message you have asked to reply to was not sent to that user. Please log in as the correct user in order to reply."
passwords:
new:
title: "Lost password"
ended: "ended"
revoked_html: "revoked by %{name}"
active: "active"
- active_unread: "active unread"
- expired_unread: "expired unread"
+ active_until_read: "active until read"
read_html: "read at %{time}"
time_in_future_title: "%{time_absolute}; in %{time_relative}"
time_in_past_title: "%{time_absolute}; %{time_relative}"
post :mark
patch :unmute
- match :reply, :via => [:get, :post]
+ resource :reply, :module => :messages, :path_names => { :new => "new" }, :only => :new
end
namespace :messages, :path => "/messages" do
resource :inbox, :only => :show
get "/user/:display_name/outbox", :to => redirect(:path => "/messages/outbox")
get "/message/new/:display_name", :to => redirect(:path => "/messages/new/%{display_name}")
get "/message/read/:message_id", :to => redirect(:path => "/messages/%{message_id}")
+ get "/messages/:message_id/reply", :to => redirect(:path => "/messages/%{message_id}/reply/new")
# muting users
scope "/user/:display_name" do
module Auth
- @providers = {}
+ @providers = ["openid"]
+ @providers << "google" if Settings.key?(:google_auth_id)
+ @providers << "facebook" if Settings.key?(:facebook_auth_id)
+ @providers << "microsoft" if Settings.key?(:microsoft_auth_id)
+ @providers << "github" if Settings.key?(:github_auth_id)
+ @providers << "wikipedia" if Settings.key?(:wikipedia_auth_id)
+ @providers.freeze
def self.providers
- @providers[I18n.locale] ||= {
- I18n.t("auth.providers.openid") => "openid"
- }.tap do |providers|
- providers[I18n.t("auth.providers.google")] = "google" if Settings.key?(:google_auth_id)
- providers[I18n.t("auth.providers.facebook")] = "facebook" if Settings.key?(:facebook_auth_id)
- providers[I18n.t("auth.providers.microsoft")] = "microsoft" if Settings.key?(:microsoft_auth_id)
- providers[I18n.t("auth.providers.github")] = "github" if Settings.key?(:github_auth_id)
- providers[I18n.t("auth.providers.wikipedia")] = "wikipedia" if Settings.key?(:wikipedia_auth_id)
- end.freeze
+ @providers
end
end
--- /dev/null
+require "test_helper"
+
+module Messages
+ class RepliesControllerTest < ActionDispatch::IntegrationTest
+ ##
+ # test all routes which lead to this controller
+ def test_routes
+ assert_routing(
+ { :path => "/messages/1/reply/new", :method => :get },
+ { :controller => "messages/replies", :action => "new", :message_id => "1" }
+ )
+ end
+
+ def test_new
+ user = create(:user)
+ recipient_user = create(:user)
+ other_user = create(:user)
+ message = create(:message, :unread, :sender => user, :recipient => recipient_user)
+
+ # Check that the message reply page requires us to login
+ get new_message_reply_path(message)
+ assert_redirected_to login_path(:referer => new_message_reply_path(message))
+
+ # Login as the wrong user
+ session_for(other_user)
+
+ # Check that we can't reply to somebody else's message
+ get new_message_reply_path(message)
+ assert_redirected_to login_path(:referer => new_message_reply_path(message))
+ assert_equal "You are logged in as '#{other_user.display_name}' but the message you have asked to reply to was not sent to that user. Please log in as the correct user in order to reply.", flash[:notice]
+
+ # Login as the right user
+ session_for(recipient_user)
+
+ # Check that the message reply page loads
+ get new_message_reply_path(message)
+ assert_response :success
+ assert_template "new"
+ assert_select "title", "Re: #{message.title} | OpenStreetMap"
+ assert_select "form[action='/messages']", :count => 1 do
+ assert_select "input[type='hidden'][name='display_name'][value='#{user.display_name}']"
+ assert_select "input#message_title[value='Re: #{message.title}']", :count => 1
+ assert_select "textarea#message_body", :count => 1
+ assert_select "input[type='submit'][value='Send']", :count => 1
+ end
+ assert Message.find(message.id).message_read
+
+ # Login as the sending user
+ session_for(user)
+
+ # Check that the message reply page loads
+ get new_message_reply_path(message)
+ assert_response :success
+ assert_template "new"
+ assert_select "title", "Re: #{message.title} | OpenStreetMap"
+ assert_select "form[action='/messages']", :count => 1 do
+ assert_select "input[type='hidden'][name='display_name'][value='#{recipient_user.display_name}']"
+ assert_select "input#message_title[value='Re: #{message.title}']", :count => 1
+ assert_select "textarea#message_body", :count => 1
+ assert_select "input[type='submit'][value='Send']", :count => 1
+ end
+
+ # Asking to reply to a message with a bogus ID should fail
+ get new_message_reply_path(99999)
+ assert_response :not_found
+ assert_template "no_such_message"
+ end
+ end
+end
{ :path => "/messages/1/mark", :method => :post },
{ :controller => "messages", :action => "mark", :message_id => "1" }
)
- assert_routing(
- { :path => "/messages/1/reply", :method => :get },
- { :controller => "messages", :action => "reply", :message_id => "1" }
- )
- assert_routing(
- { :path => "/messages/1/reply", :method => :post },
- { :controller => "messages", :action => "reply", :message_id => "1" }
- )
assert_routing(
{ :path => "/messages/1", :method => :delete },
{ :controller => "messages", :action => "destroy", :id => "1" }
end
end
- ##
- # test the reply action
- def test_reply
- user = create(:user)
- recipient_user = create(:user)
- other_user = create(:user)
- message = create(:message, :unread, :sender => user, :recipient => recipient_user)
-
- # Check that the message reply page requires us to login
- get message_reply_path(message)
- assert_redirected_to login_path(:referer => message_reply_path(message))
-
- # Login as the wrong user
- session_for(other_user)
-
- # Check that we can't reply to somebody else's message
- get message_reply_path(message)
- assert_redirected_to login_path(:referer => message_reply_path(message))
- assert_equal "You are logged in as '#{other_user.display_name}' but the message you have asked to reply to was not sent to that user. Please log in as the correct user in order to reply.", flash[:notice]
-
- # Login as the right user
- session_for(recipient_user)
-
- # Check that the message reply page loads
- get message_reply_path(message)
- assert_response :success
- assert_template "new"
- assert_select "title", "Re: #{message.title} | OpenStreetMap"
- assert_select "form[action='/messages']", :count => 1 do
- assert_select "input[type='hidden'][name='display_name'][value='#{user.display_name}']"
- assert_select "input#message_title[value='Re: #{message.title}']", :count => 1
- assert_select "textarea#message_body", :count => 1
- assert_select "input[type='submit'][value='Send']", :count => 1
- end
- assert Message.find(message.id).message_read
-
- # Login as the sending user
- session_for(user)
-
- # Check that the message reply page loads
- get message_reply_path(message)
- assert_response :success
- assert_template "new"
- assert_select "title", "Re: #{message.title} | OpenStreetMap"
- assert_select "form[action='/messages']", :count => 1 do
- assert_select "input[type='hidden'][name='display_name'][value='#{recipient_user.display_name}']"
- assert_select "input#message_title[value='Re: #{message.title}']", :count => 1
- assert_select "textarea#message_body", :count => 1
- assert_select "input[type='submit'][value='Send']", :count => 1
- end
-
- # Asking to reply to a message with a bogus ID should fail
- get message_reply_path(99999)
- assert_response :not_found
- assert_template "no_such_message"
- end
-
##
# test the show action
def test_show
assert_match %r{^Ends in <time title=".* datetime=".*">about 1 hour</time>\.$}, block_status(block)
end
+ def test_block_short_status
+ freeze_time do
+ future_end_block = create(:user_block, :ends_at => Time.now.utc + 48.hours)
+ unread_future_end_block = create(:user_block, :needs_view, :ends_at => Time.now.utc + 48.hours)
+ past_end_block = create(:user_block, :ends_at => Time.now.utc + 1.hour)
+ unread_past_end_block = create(:user_block, :needs_view, :ends_at => Time.now.utc + 1.hour)
+
+ travel 24.hours
+
+ assert_equal "active", block_short_status(future_end_block)
+ assert_equal "active", block_short_status(unread_future_end_block)
+ assert_equal "ended", block_short_status(past_end_block)
+ assert_equal "active until read", block_short_status(unread_past_end_block)
+ end
+ end
+
def test_block_duration_in_words
words = block_duration_in_words(364.days)
assert_equal "11 months", words
projects / rails.git / commitdiff