Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

35 max logged in session #2451

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+15 −11
Open

35 max logged in session #2451

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cd72525
Merge pull request #1 from glitch-soc/main
BramAlkema Oct 21, 2023
0cdb429
Update status_action_bar.jsx
BramAlkema Oct 21, 2023
6aed4eb
Update detailed_status.jsx
BramAlkema Oct 21, 2023
7a5cd6b
Update session_activations.rb to 20
BramAlkema Oct 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions app/javascript/flavours/glitch/components/status_action_bar.jsx
View file
Original file line number Diff line number Diff line change
@@ -330,11 +330,14 @@ class StatusActionBar extends ImmutablePureComponent {
/>
</div>

<div className='status__action-bar-spacer' />
<a href={status.get('url')} className='status__relative-time' target='_blank' rel='noopener'>
<RelativeTimestamp timestamp={status.get('created_at')} />{status.get('edited_at') && <abbr title={intl.formatMessage(messages.edited, { date: intl.formatDate(status.get('edited_at'), { hour12: false, year: 'numeric', month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' }) })}> *</abbr>}
</a>
</div>
<div className='status__action-bar-spacer' />
<a href={status.get('url')} className='status__relative-time' target='_blank' rel='noopener'>
{new Date(status.get('created_at')).getFullYear() + 7}-{new Date(status.get('created_at')).toLocaleString('en-US', { month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit', hour12: false }).substring(5)}
{status.get('edited_at') && (
<abbr title={intl.formatMessage(messages.edited, { date: intl.formatDate(status.get('edited_at'), { hour12: false, year: 'numeric', month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' }).replace(/\d{4}/, new Date(status.get('edited_at')).getFullYear() + 7) })}> *</abbr>
)}
</a>
</div>
);
}

11 changes: 6 additions & 5 deletions app/javascript/flavours/glitch/features/status/components/detailed_status.jsx
View file
Original file line number Diff line number Diff line change
@@ -331,12 +331,13 @@ class DetailedStatus extends ImmutablePureComponent {
rewriteMentions={settings.get('rewrite_mentions')}
disabled
/>

// Set year 7 years into the future
<div className='detailed-status__meta'>
<a className='detailed-status__datetime' href={status.get('url')} target='_blank' rel='noopener noreferrer'>
<FormattedDate value={new Date(status.get('created_at'))} hour12={false} year='numeric' month='short' day='2-digit' hour='2-digit' minute='2-digit' />
</a>{edited}{visibilityLink}{applicationLink}{reblogLink} · {favouriteLink}
</div>
<a className='detailed-status__datetime' href={status.get('url')} target='_blank' rel='noopener noreferrer'>
{new Date(status.get('created_at')).getFullYear() + 7}-{new Date(status.get('created_at')).toLocaleString('en-US', { month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit', hour12: false })}
</a>
{edited}{visibilityLink}{applicationLink}{reblogLink} · {favouriteLink}
</div>
</div>
</div>
);
2 changes: 1 addition & 1 deletion config/initializers/session_activations.rb
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true

Rails.application.configure do
config.x.max_session_activations = ENV['MAX_SESSION_ACTIVATIONS'] || 10
config.x.max_session_activations = ENV['MAX_SESSION_ACTIVATIONS'] || 20
end