diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index c2002cb796dc31469267c36e9651c8f54183c93b..db16f82e5b91c026dbaf055df34fbf9ee16433ed 100644
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -79,6 +79,7 @@ class ApiController < ApplicationController
def require_user!
current_resource_owner
+ set_user_activity
rescue ActiveRecord::RecordNotFound
render json: { error: 'This method requires an authenticated user' }, status: 422
end
diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb
index b7479bf8caa3903e1de1b80b21b8e1637489b8f6..60400e465f72e46386337b5700fec492dab5b5f2 100644
--- a/app/controllers/settings/preferences_controller.rb
+++ b/app/controllers/settings/preferences_controller.rb
@@ -14,6 +14,7 @@ class Settings::PreferencesController < ApplicationController
reblog: user_params[:notification_emails][:reblog] == '1',
favourite: user_params[:notification_emails][:favourite] == '1',
mention: user_params[:notification_emails][:mention] == '1',
+ digest: user_params[:notification_emails][:digest] == '1',
}
current_user.settings['interactions'] = {
@@ -33,6 +34,6 @@ class Settings::PreferencesController < ApplicationController
private
def user_params
- params.require(:user).permit(:locale, :setting_default_privacy, notification_emails: [:follow, :follow_request, :reblog, :favourite, :mention], interactions: [:must_be_follower, :must_be_following])
+ params.require(:user).permit(:locale, :setting_default_privacy, notification_emails: [:follow, :follow_request, :reblog, :favourite, :mention, :digest], interactions: [:must_be_follower, :must_be_following])
end
end
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb
index e353c350409e2098453d912d02b21db919498fef..b58952ae0f2681118ffc604f9e267cefbba8b231 100644
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@@ -29,6 +29,11 @@ class Formatter
sanitize(html, tags: %w(a br p span), attributes: %w(href rel class))
end
+ def plaintext(status)
+ return status.text if status.local?
+ strip_tags(status.text)
+ end
+
def simplified_format(account)
return reformat(account.note) unless account.local?
diff --git a/app/mailers/notification_mailer.rb b/app/mailers/notification_mailer.rb
index a1b084682fc9f78505749a70fb84a27b609ebd8e..bf4c16e438e04fd3c3017155997bc6742b88d7c2 100644
--- a/app/mailers/notification_mailer.rb
+++ b/app/mailers/notification_mailer.rb
@@ -49,4 +49,17 @@ class NotificationMailer < ApplicationMailer
mail to: @me.user.email, subject: I18n.t('notification_mailer.follow_request.subject', name: @account.acct)
end
end
+
+ def digest(recipient, opts = {})
+ @me = recipient
+ @since = opts[:since] || @me.user.last_emailed_at || @me.user.current_sign_in_at
+ @notifications = Notification.where(account: @me, activity_type: 'Mention').where('created_at > ?', @since)
+ @follows_since = Notification.where(account: @me, activity_type: 'Follow').where('created_at > ?', @since).count
+
+ return if @notifications.empty?
+
+ I18n.with_locale(@me.user.locale || I18n.default_locale) do
+ mail to: @me.user.email, subject: I18n.t('notification_mailer.digest.subject', count: @notifications.size)
+ end
+ end
end
diff --git a/app/models/setting.rb b/app/models/setting.rb
index 3796253d431c1d295557ab1f8a41bacc0c6cb7c6..31e1ee198ae40f0bf62dc84e05a60d8e55368bb9 100644
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -2,7 +2,6 @@
class Setting < RailsSettings::Base
source Rails.root.join('config/settings.yml')
- namespace Rails.env
def to_param
var
diff --git a/app/models/user.rb b/app/models/user.rb
index 08aac26795677637787bad712d0089a5bd1e511b..bf2916d9046bd33fbf5c6e1e0bdb7d7fb5572cc6 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -14,9 +14,10 @@ class User < ApplicationRecord
validates :locale, inclusion: I18n.available_locales.map(&:to_s), unless: 'locale.nil?'
validates :email, email: true
- scope :prolific, -> { joins('inner join statuses on statuses.account_id = users.account_id').select('users.*, count(statuses.id) as statuses_count').group('users.id').order('statuses_count desc') }
- scope :recent, -> { order('id desc') }
- scope :admins, -> { where(admin: true) }
+ scope :prolific, -> { joins('inner join statuses on statuses.account_id = users.account_id').select('users.*, count(statuses.id) as statuses_count').group('users.id').order('statuses_count desc') }
+ scope :recent, -> { order('id desc') }
+ scope :admins, -> { where(admin: true) }
+ scope :confirmed, -> { where.not(confirmed_at: nil) }
def send_devise_notification(notification, *args)
devise_mailer.send(notification, self, *args).deliver_later
diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb
index ae52173b54446ce09b09257914be304cc2e4c407..21bf444c374e8d1cbf0ecf2fa69c30febc0ae010 100644
--- a/app/views/layouts/mailer.text.erb
+++ b/app/views/layouts/mailer.text.erb
@@ -1,5 +1,5 @@
<%= yield %>
-
---
<%= t('application_mailer.signature', instance: Rails.configuration.x.local_domain) %>
+<%= t('application_mailer.settings', link: settings_preferences_url) %>
diff --git a/app/views/notification_mailer/_status.text.erb b/app/views/notification_mailer/_status.text.erb
index b089a7b739dd761255a2c514abdfe92b88666eb8..85a0136b7b190fb9c6fb53e1bb3bfe2438ce65fa 100644
--- a/app/views/notification_mailer/_status.text.erb
+++ b/app/views/notification_mailer/_status.text.erb
@@ -1,3 +1,3 @@
-<%= strip_tags(@status.content) %>
+<%= raw Formatter.instance.plaintext(status) %>
-<%= web_url("statuses/#{@status.id}") %>
+<%= raw t('application_mailer.view')%> <%= web_url("statuses/#{status.id}") %>
diff --git a/app/views/notification_mailer/digest.text.erb b/app/views/notification_mailer/digest.text.erb
new file mode 100644
index 0000000000000000000000000000000000000000..95aed6793fc5f28914bd75c277f90236ffa3b24a
--- /dev/null
+++ b/app/views/notification_mailer/digest.text.erb
@@ -0,0 +1,15 @@
+<%= display_name(@me) %>,
+
+<%= raw t('notification_mailer.digest.body', since: @since, instance: root_url) %>
+<% @notifications.each do |notification| %>
+
+* <%= raw t('notification_mailer.digest.mention', name: notification.from_account.acct) %>
+
+ <%= raw Formatter.instance.plaintext(notification.target_status) %>
+
+ <%= raw t('application_mailer.view')%> <%= web_url("statuses/#{notification.target_status.id}") %>
+<% end %>
+<% if @follows_since > 0 %>
+
+<%= raw t('notification_mailer.digest.new_followers_summary', count: @follows_since) %>
+<% end %>
diff --git a/app/views/notification_mailer/favourite.text.erb b/app/views/notification_mailer/favourite.text.erb
index b2e1e3e9e836a118876f953d2832268798ba3571..99852592f6a6d985a961c8886a340169875e3b9a 100644
--- a/app/views/notification_mailer/favourite.text.erb
+++ b/app/views/notification_mailer/favourite.text.erb
@@ -1,5 +1,5 @@
<%= display_name(@me) %>,
-<%= t('notification_mailer.favourite.body', name: @account.acct) %>
+<%= raw t('notification_mailer.favourite.body', name: @account.acct) %>
-<%= render partial: 'status' %>
+<%= render partial: 'status', locals: { status: @status } %>
diff --git a/app/views/notification_mailer/follow.text.erb b/app/views/notification_mailer/follow.text.erb
index 4b2ec142c2068de3d28ae45721a9878b2db45392..af41a3080e4a32566a43c78322ac947368b59261 100644
--- a/app/views/notification_mailer/follow.text.erb
+++ b/app/views/notification_mailer/follow.text.erb
@@ -1,5 +1,5 @@
<%= display_name(@me) %>,
-<%= t('notification_mailer.follow.body', name: @account.acct) %>
+<%= raw t('notification_mailer.follow.body', name: @account.acct) %>
-<%= web_url("accounts/#{@account.id}") %>
+<%= raw t('application_mailer.view')%> <%= web_url("accounts/#{@account.id}") %>
diff --git a/app/views/notification_mailer/follow_request.text.erb b/app/views/notification_mailer/follow_request.text.erb
index c0d38ec6721f26127a66bd71939cffecdf78f227..49087a575ef0a2c848b1a757ed6443857a4428ae 100644
--- a/app/views/notification_mailer/follow_request.text.erb
+++ b/app/views/notification_mailer/follow_request.text.erb
@@ -1,5 +1,5 @@
<%= display_name(@me) %>,
-<%= t('notification_mailer.follow_request.body', name: @account.acct) %>
+<%= raw t('notification_mailer.follow_request.body', name: @account.acct) %>
-<%= web_url("follow_requests") %>
+<%= raw t('application_mailer.view')%> <%= web_url("follow_requests") %>
diff --git a/app/views/notification_mailer/mention.text.erb b/app/views/notification_mailer/mention.text.erb
index 31a294bb948c58a72166a43da544f05802c52db0..c0d4be1d86457a8758508b83e27487cdd2abbc52 100644
--- a/app/views/notification_mailer/mention.text.erb
+++ b/app/views/notification_mailer/mention.text.erb
@@ -1,5 +1,5 @@
<%= display_name(@me) %>,
-<%= t('notification_mailer.mention.body', name: @status.account.acct) %>
+<%= raw t('notification_mailer.mention.body', name: @status.account.acct) %>
-<%= render partial: 'status' %>
+<%= render partial: 'status', locals: { status: @status } %>
diff --git a/app/views/notification_mailer/reblog.text.erb b/app/views/notification_mailer/reblog.text.erb
index 7af8052ca410d30bc9135c3e3251f1ef81f2716c..c32b4865008ba234812d1ff90f67da4102c33925 100644
--- a/app/views/notification_mailer/reblog.text.erb
+++ b/app/views/notification_mailer/reblog.text.erb
@@ -1,5 +1,5 @@
<%= display_name(@me) %>,
-<%= t('notification_mailer.reblog.body', name: @account.acct) %>
+<%= raw t('notification_mailer.reblog.body', name: @account.acct) %>
-<%= render partial: 'status' %>
+<%= render partial: 'status', locals: { status: @status } %>
diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml
index aee0540d2f97d8d60f0c085475fa38fc5f69211c..a17279b1ed7de2f08ddb1b2351e8b7c79d3ba7ec 100644
--- a/app/views/settings/preferences/show.html.haml
+++ b/app/views/settings/preferences/show.html.haml
@@ -16,6 +16,7 @@
= ff.input :reblog, as: :boolean, wrapper: :with_label
= ff.input :favourite, as: :boolean, wrapper: :with_label
= ff.input :mention, as: :boolean, wrapper: :with_label
+ = ff.input :digest, as: :boolean, wrapper: :with_label
= f.simple_fields_for :interactions, hash_to_object(current_user.settings.interactions) do |ff|
= ff.input :must_be_follower, as: :boolean, wrapper: :with_label
diff --git a/app/workers/digest_mailer_worker.rb b/app/workers/digest_mailer_worker.rb
new file mode 100644
index 0000000000000000000000000000000000000000..dedb21e4eac0de92cc0bfce967ef0e5fb5ea1ef3
--- /dev/null
+++ b/app/workers/digest_mailer_worker.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class DigestMailerWorker
+ include Sidekiq::Worker
+
+ sidekiq_options queue: 'mailers'
+
+ def perform(user_id)
+ user = User.find(user_id)
+ return unless user.settings.notification_emails['digest']
+ NotificationMailer.digest(user.account).deliver_now!
+ user.touch(:last_emailed_at)
+ end
+end
diff --git a/config/application.rb b/config/application.rb
index 8da5ade3cf34ac32b057e5e7b6b5949d436b165a..1ea65619caf3749db6e8a1ad84b1c63ca6574f49 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -49,12 +49,5 @@ module Mastodon
Doorkeeper::AuthorizedApplicationsController.layout 'admin'
Doorkeeper::Application.send :include, ApplicationExtension
end
-
- config.action_dispatch.default_headers = {
- 'Server' => 'Mastodon',
- 'X-Frame-Options' => 'DENY',
- 'X-Content-Type-Options' => 'nosniff',
- 'X-XSS-Protection' => '1; mode=block',
- }
end
end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 67ff639142da2c68ff8451c567d787d9b8ea050e..dc5dd4afd4c075b8e2ee51b42996266ff833f273 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -109,4 +109,11 @@ Rails.application.configure do
config.to_prepare do
StatsD.backend = StatsD::Instrument::Backends::NullBackend.new if ENV['STATSD_ADDR'].blank?
end
+
+ config.action_dispatch.default_headers = {
+ 'Server' => 'Mastodon',
+ 'X-Frame-Options' => 'DENY',
+ 'X-Content-Type-Options' => 'nosniff',
+ 'X-XSS-Protection' => '1; mode=block',
+ }
end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6da30acdadc069ba845d3e07a5205c40e2c4bf9a..f11a689e44bca6ebbef89f02d0afff2765543e84 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -29,6 +29,8 @@ en:
unfollow: Unfollow
application_mailer:
signature: Mastodon notifications from %{instance}
+ settings: 'Change e-mail preferences: %{link}'
+ view: 'View:'
applications:
invalid_url: The provided URL is invalid
auth:
@@ -83,6 +85,15 @@ en:
reblog:
body: 'Your status was boosted by %{name}:'
subject: "%{name} boosted your status"
+ digest:
+ subject:
+ one: "1 new notification since your last visit ðŸ˜"
+ other: "%{count} new notifications since your last visit ðŸ˜"
+ body: 'Here is a brief summary of what you missed on %{instance} since your last visit on %{since}:'
+ mention: "%{name} mentioned you in:"
+ new_followers_summary:
+ one: You have acquired one new follower! Yay!
+ other: You have gotten %{count} new followers! Amazing!
pagination:
next: Next
prev: Prev
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 4d1758f82e6e20523d6a593af647cd14ea60ecfb..170af01cfc554563cf5f01c31ffe78cda253bf03 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -34,6 +34,7 @@ en:
follow_request: Send e-mail when someone requests to follow you
mention: Send e-mail when someone mentions you
reblog: Send e-mail when someone reblogs your status
+ digest: Send digest e-mails
'no': 'No'
required:
mark: "*"
diff --git a/config/settings.yml b/config/settings.yml
index 71ce12e632eee9a73804ce935a59b3a872942465..6ae9217a4a68339ddbbd7ef7b45c6db4375feff9 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -11,6 +11,7 @@ defaults: &defaults
favourite: false
mention: false
follow_request: true
+ digest: true
interactions:
must_be_follower: false
must_be_following: false
diff --git a/db/migrate/20170303212857_add_last_emailed_at_to_users.rb b/db/migrate/20170303212857_add_last_emailed_at_to_users.rb
new file mode 100644
index 0000000000000000000000000000000000000000..9ae3da4fbb6921596b966a05bf0b1387bb0eb203
--- /dev/null
+++ b/db/migrate/20170303212857_add_last_emailed_at_to_users.rb
@@ -0,0 +1,5 @@
+class AddLastEmailedAtToUsers < ActiveRecord::Migration[5.0]
+ def change
+ add_column :users, :last_emailed_at, :datetime, null: true, default: nil
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index c2d88ac13b619880e953d8ba29a09bd50544fe84..8cc3bd8e3528d4ae51343cf967cc2eec5c902b49 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20170301222600) do
+ActiveRecord::Schema.define(version: 20170303212857) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -283,6 +283,7 @@ ActiveRecord::Schema.define(version: 20170301222600) do
t.string "encrypted_otp_secret_salt"
t.integer "consumed_timestep"
t.boolean "otp_required_for_login"
+ t.datetime "last_emailed_at"
t.index ["account_id"], name: "index_users_on_account_id", using: :btree
t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true, using: :btree
t.index ["email"], name: "index_users_on_email", unique: true, using: :btree
diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake
index 8482d41247709c5b4c8f07cc657cb058fe745d1e..bb10410b506b4b3f955cf3796ad3e6e4a3f1f1dd 100644
--- a/lib/tasks/mastodon.rake
+++ b/lib/tasks/mastodon.rake
@@ -43,7 +43,7 @@ namespace :mastodon do
namespace :feeds do
desc 'Clear timelines of inactive users'
task clear: :environment do
- User.where('current_sign_in_at < ?', 14.days.ago).find_each do |user|
+ User.confirmed.where('current_sign_in_at < ?', 14.days.ago).find_each do |user|
Redis.current.del(FeedManager.instance.key(:home, user.account_id))
end
end
@@ -53,4 +53,13 @@ namespace :mastodon do
Redis.current.keys('feed:*').each { |key| Redis.current.del(key) }
end
end
+
+ namespace :emails do
+ desc 'Send out digest e-mails'
+ task digest: :environment do
+ User.confirmed.joins(:account).where(accounts: { silenced: false, suspended: false }).where('current_sign_in_at < ?', 20.days.ago).find_each do |user|
+ DigestMailerWorker.perform_async(user.id)
+ end
+ end
+ end
end
diff --git a/spec/mailers/previews/notification_mailer_preview.rb b/spec/mailers/previews/notification_mailer_preview.rb
index 8fc8d0d3415285d7652a812861a98037f411b0c2..a08a80d175fbf2c8feb788f147e17c64d57c5eca 100644
--- a/spec/mailers/previews/notification_mailer_preview.rb
+++ b/spec/mailers/previews/notification_mailer_preview.rb
@@ -1,24 +1,31 @@
# Preview all emails at http://localhost:3000/rails/mailers/notification_mailer
class NotificationMailerPreview < ActionMailer::Preview
-
# Preview this email at http://localhost:3000/rails/mailers/notification_mailer/mention
def mention
- # NotificationMailer.mention
+ m = Mention.last
+ NotificationMailer.mention(m.account, Notification.find_by(activity: m))
end
# Preview this email at http://localhost:3000/rails/mailers/notification_mailer/follow
def follow
- # NotificationMailer.follow
+ f = Follow.last
+ NotificationMailer.follow(f.target_account, Notification.find_by(activity: f))
end
# Preview this email at http://localhost:3000/rails/mailers/notification_mailer/favourite
def favourite
- # NotificationMailer.favourite
+ f = Favourite.last
+ NotificationMailer.favourite(f.status.account, Notification.find_by(activity: f))
end
# Preview this email at http://localhost:3000/rails/mailers/notification_mailer/reblog
def reblog
- # NotificationMailer.reblog
+ r = Status.where.not(reblog_of_id: nil).first
+ NotificationMailer.reblog(r.reblog.account, Notification.find_by(activity: r))
end
+ # Preview this email at http://localhost:3000/rails/mailers/notification_mailer/digest
+ def digest
+ NotificationMailer.digest(Account.first, since: 90.days.ago)
+ end
end