gitea/nas
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Follow parent change

Browse source
This commit is contained in:
KMY 2023-11-15 13:07:54 +09:00
parent 24371d6b2a
commit 9ba8d8f848
3 changed files with 10 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

24
app/controllers/api/v1/timelines/antenna_controller.rb
View file

@ -1,12 +1,12 @@
# frozen_string_literal: true # frozen_string_literal: true
class Api::V1::Timelines::AntennaController < Api::BaseController class Api::V1::Timelines::AntennaController < Api::V1::Timelines::BaseController
before_action -> { doorkeeper_authorize! :read, :'read:lists' } before_action -> { doorkeeper_authorize! :read, :'read:lists' }
before_action :require_user! before_action :require_user!
before_action :set_antenna before_action :set_antenna
before_action :set_statuses before_action :set_statuses
after_action :insert_pagination_headers, unless: -> { @statuses.empty? } PERMITTED_PARAMS = %i(limit).freeze
def show def show
render json: @statuses, render json: @statuses,
@ -41,27 +41,11 @@ class Api::V1::Timelines::AntennaController < Api::BaseController
AntennaFeed.new(@antenna) AntennaFeed.new(@antenna)
end end
def insert_pagination_headers
set_pagination_headers(next_path, prev_path)
end
def pagination_params(core_params)
params.slice(:limit).permit(:limit).merge(core_params)
end
def next_path def next_path
api_v1_timelines_antenna_url params[:id], pagination_params(max_id: pagination_max_id) api_v1_timelines_antenna_url params[:id], next_path_params
end end
def prev_path def prev_path
api_v1_timelines_antenna_url params[:id], pagination_params(min_id: pagination_since_id) api_v1_timelines_antenna_url params[:id], prev_path_params
end
def pagination_max_id
@statuses.last.id
end
def pagination_since_id
@statuses.first.id
end end
end end

10
app/javascript/mastodon/features/antenna_setting/index.jsx
View file

@ -330,14 +330,14 @@ class AntennaSetting extends PureComponent {
columnSettings = ( columnSettings = (
<> <>
<div className='setting-toggle'> <div className='setting-toggle'>
<Toggle id={`antenna-${id}-mediaonly`} defaultChecked={isMediaOnly} onChange={this.onMediaOnlyToggle} /> <Toggle id={`antenna-${id}-mediaonly`} checked={isMediaOnly} onChange={this.onMediaOnlyToggle} />
<label htmlFor={`antenna-${id}-mediaonly`} className='setting-toggle__label'> <label htmlFor={`antenna-${id}-mediaonly`} className='setting-toggle__label'>
<FormattedMessage id='antennas.media_only' defaultMessage='Media only' /> <FormattedMessage id='antennas.media_only' defaultMessage='Media only' />
</label> </label>
</div> </div>
<div className='setting-toggle'> <div className='setting-toggle'>
<Toggle id={`antenna-${id}-ignorereblog`} defaultChecked={isIgnoreReblog} onChange={this.onIgnoreReblogToggle} /> <Toggle id={`antenna-${id}-ignorereblog`} checked={isIgnoreReblog} onChange={this.onIgnoreReblogToggle} />
<label htmlFor={`antenna-${id}-ignorereblog`} className='setting-toggle__label'> <label htmlFor={`antenna-${id}-ignorereblog`} className='setting-toggle__label'>
<FormattedMessage id='antennas.ignore_reblog' defaultMessage='Exclude boosts' /> <FormattedMessage id='antennas.ignore_reblog' defaultMessage='Exclude boosts' />
</label> </label>
@ -407,7 +407,7 @@ class AntennaSetting extends PureComponent {
{!isLtl && (enableLocalTimeline || isStl) && ( {!isLtl && (enableLocalTimeline || isStl) && (
<div className='setting-toggle'> <div className='setting-toggle'>
<Toggle id={`antenna-${id}-stl`} defaultChecked={isStl} onChange={this.onStlToggle} /> <Toggle id={`antenna-${id}-stl`} checked={isStl} onChange={this.onStlToggle} />
<label htmlFor={`antenna-${id}-stl`} className='setting-toggle__label'> <label htmlFor={`antenna-${id}-stl`} className='setting-toggle__label'>
<FormattedMessage id='antennas.stl' defaultMessage='STL mode' /> <FormattedMessage id='antennas.stl' defaultMessage='STL mode' />
</label> </label>
@ -416,7 +416,7 @@ class AntennaSetting extends PureComponent {
{!isStl && (enableLocalTimeline || isLtl) && ( {!isStl && (enableLocalTimeline || isLtl) && (
<div className='setting-toggle'> <div className='setting-toggle'>
<Toggle id={`antenna-${id}-ltl`} defaultChecked={isLtl} onChange={this.onLtlToggle} /> <Toggle id={`antenna-${id}-ltl`} checked={isLtl} onChange={this.onLtlToggle} />
<label htmlFor={`antenna-${id}-ltl`} className='setting-toggle__label'> <label htmlFor={`antenna-${id}-ltl`} className='setting-toggle__label'>
<FormattedMessage id='antennas.ltl' defaultMessage='LTL mode' /> <FormattedMessage id='antennas.ltl' defaultMessage='LTL mode' />
</label> </label>
@ -424,7 +424,7 @@ class AntennaSetting extends PureComponent {
)} )}
<div className='setting-toggle'> <div className='setting-toggle'>
<Toggle id={`antenna-${id}-noinsertfeeds`} defaultChecked={isInsertFeeds} onChange={this.onNoInsertFeedsToggle} /> <Toggle id={`antenna-${id}-noinsertfeeds`} checked={isInsertFeeds} onChange={this.onNoInsertFeedsToggle} />
<label htmlFor={`antenna-${id}-noinsertfeeds`} className='setting-toggle__label'> <label htmlFor={`antenna-${id}-noinsertfeeds`} className='setting-toggle__label'>
<FormattedMessage id='antennas.insert_feeds' defaultMessage='Insert to feeds' /> <FormattedMessage id='antennas.insert_feeds' defaultMessage='Insert to feeds' />
</label> </label>

2
app/javascript/mastodon/features/list_timeline/index.jsx
View file

@ -226,7 +226,7 @@ class ListTimeline extends PureComponent {
</div> </div>
<div className='setting-toggle'> <div className='setting-toggle'>
<Toggle id={`list-${id}-exclusive`} defaultChecked={isNotify} onChange={this.onNotifyToggle} /> <Toggle id={`list-${id}-exclusive`} checked={isNotify} onChange={this.onNotifyToggle} />
<label htmlFor={`list-${id}-notify`} className='setting-toggle__label'> <label htmlFor={`list-${id}-notify`} className='setting-toggle__label'>
<FormattedMessage id='lists.notify' defaultMessage='Notify these posts' /> <FormattedMessage id='lists.notify' defaultMessage='Notify these posts' />
</label> </label>