summaryrefslogtreecommitdiffstats
path: root/app/controllers/api
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2020-01-23 22:00:13 +0100
committerGitHub <noreply@github.com>2020-01-23 22:00:13 +0100
commitf52c988e12e464e7baefc2fdb48ddf4a95584664 (patch)
tree1849998c1180280751f829769c10c84986bf0953 /app/controllers/api
parent81cc86bb1ffb662843938379eeb522e3a6f11b79 (diff)
Add announcements (#12662)
* Add announcements Fix #11006 * Add reactions to announcements * Add admin UI for announcements * Add unit tests * Fix issues - Add `with_dismissed` param to announcements API - Fix end date not being formatted when time range is given - Fix announcement delete causing reactions to send streaming updates - Fix announcements container growing too wide and mascot too small - Fix `all_day` being settable when no time range is given - Change text "Update" to "Announcement" * Fix scheduler unpublishing announcements before they are due * Fix filter params not being passed to announcements filter
Diffstat (limited to 'app/controllers/api')
-rw-r--r--app/controllers/api/base_controller.rb2
-rw-r--r--app/controllers/api/v1/announcements/reactions_controller.rb29
-rw-r--r--app/controllers/api/v1/announcements_controller.rb33
3 files changed, 63 insertions, 1 deletions
diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb
index 144fdd6ac9d..68bf425f4d0 100644
--- a/app/controllers/api/base_controller.rb
+++ b/app/controllers/api/base_controller.rb
@@ -85,7 +85,7 @@ class Api::BaseController < ApplicationController
end
def require_authenticated_user!
- render json: { error: 'This API requires an authenticated user' }, status: 401 unless current_user
+ render json: { error: 'This method requires an authenticated user' }, status: 401 unless current_user
end
def require_user!
diff --git a/app/controllers/api/v1/announcements/reactions_controller.rb b/app/controllers/api/v1/announcements/reactions_controller.rb
new file mode 100644
index 00000000000..e4a72e595c8
--- /dev/null
+++ b/app/controllers/api/v1/announcements/reactions_controller.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class Api::V1::Announcements::ReactionsController < Api::BaseController
+ before_action -> { doorkeeper_authorize! :write, :'write:favourites' }
+ before_action :require_user!
+
+ before_action :set_announcement
+ before_action :set_reaction, except: :update
+
+ def update
+ @announcement.announcement_reactions.create!(account: current_account, name: params[:id])
+ render_empty
+ end
+
+ def destroy
+ @reaction.destroy!
+ render_empty
+ end
+
+ private
+
+ def set_reaction
+ @reaction = @announcement.announcement_reactions.where(account: current_account).find_by!(name: params[:id])
+ end
+
+ def set_announcement
+ @announcement = Announcement.published.find(params[:announcement_id])
+ end
+end
diff --git a/app/controllers/api/v1/announcements_controller.rb b/app/controllers/api/v1/announcements_controller.rb
new file mode 100644
index 00000000000..6724fac2ece
--- /dev/null
+++ b/app/controllers/api/v1/announcements_controller.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+class Api::V1::AnnouncementsController < Api::BaseController
+ before_action -> { doorkeeper_authorize! :write, :'write:accounts' }, only: :dismiss
+ before_action :require_user!
+ before_action :set_announcements, only: :index
+ before_action :set_announcement, except: :index
+
+ def index
+ render json: @announcements, each_serializer: REST::AnnouncementSerializer
+ end
+
+ def dismiss
+ AnnouncementMute.create!(account: current_account, announcement: @announcement)
+ render_empty
+ end
+
+ private
+
+ def set_announcements
+ @announcements = begin
+ scope = Announcement.published
+
+ scope.merge!(Announcement.without_muted(current_account)) unless truthy_param?(:with_dismissed)
+
+ scope.chronological
+ end
+ end
+
+ def set_announcement
+ @announcement = Announcement.published.find(params[:id])
+ end
+end