forked from mastodon/mastodon
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request mastodon#1265 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
- Loading branch information
Showing
272 changed files
with
3,841 additions
and
799 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
8 | ||
12 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
# frozen_string_literal: true | ||
|
||
class Admin::AnnouncementsController < Admin::BaseController | ||
before_action :set_announcements, only: :index | ||
before_action :set_announcement, except: [:index, :new, :create] | ||
|
||
def index | ||
authorize :announcement, :index? | ||
end | ||
|
||
def new | ||
authorize :announcement, :create? | ||
|
||
@announcement = Announcement.new | ||
end | ||
|
||
def create | ||
authorize :announcement, :create? | ||
|
||
@announcement = Announcement.new(resource_params) | ||
|
||
if @announcement.save | ||
log_action :create, @announcement | ||
redirect_to admin_announcements_path | ||
else | ||
render :new | ||
end | ||
end | ||
|
||
def edit | ||
authorize :announcement, :update? | ||
end | ||
|
||
def update | ||
authorize :announcement, :update? | ||
|
||
if @announcement.update(resource_params) | ||
log_action :update, @announcement | ||
redirect_to admin_announcements_path | ||
else | ||
render :edit | ||
end | ||
end | ||
|
||
def destroy | ||
authorize :announcement, :destroy? | ||
@announcement.destroy! | ||
log_action :destroy, @announcement | ||
redirect_to admin_announcements_path | ||
end | ||
|
||
private | ||
|
||
def set_announcements | ||
@announcements = AnnouncementFilter.new(filter_params).results.page(params[:page]) | ||
end | ||
|
||
def set_announcement | ||
@announcement = Announcement.find(params[:id]) | ||
end | ||
|
||
def filter_params | ||
params.slice(*AnnouncementFilter::KEYS).permit(*AnnouncementFilter::KEYS) | ||
end | ||
|
||
def resource_params | ||
params.require(:announcement).permit(:text, :scheduled_at, :starts_at, :ends_at, :all_day) | ||
end | ||
end |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
# frozen_string_literal: true | ||
|
||
module Admin | ||
class RelationshipsController < BaseController | ||
before_action :set_account | ||
|
||
PER_PAGE = 40 | ||
|
||
def index | ||
authorize :account, :index? | ||
|
||
@accounts = RelationshipFilter.new(@account, filter_params).results.page(params[:page]).per(PER_PAGE) | ||
end | ||
|
||
private | ||
|
||
def set_account | ||
@account = Account.find(params[:account_id]) | ||
end | ||
|
||
def filter_params | ||
params.slice(*RelationshipFilter::KEYS).permit(*RelationshipFilter::KEYS) | ||
end | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 29 additions & 0 deletions
29
app/controllers/api/v1/announcements/reactions_controller.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
# frozen_string_literal: true | ||
|
||
module Admin::AnnouncementsHelper | ||
def time_range(announcement) | ||
if announcement.all_day? | ||
safe_join([l(announcement.starts_at.to_date), ' - ', l(announcement.ends_at.to_date)]) | ||
else | ||
safe_join([l(announcement.starts_at), ' - ', l(announcement.ends_at)]) | ||
end | ||
end | ||
end |
Oops, something went wrong.