From b8723f3fce91c0c123680a4ef46f8ea6dbaff69c Mon Sep 17 00:00:00 2001 From: Tykayn Date: Tue, 29 Mar 2022 10:37:54 +0200 Subject: [PATCH] up char limit to 7777 --- .../glitch/components/autosuggest_textarea.js | 1 + .../features/ui/components/link_footer.js | 12 +++++++++- .../flavours/glitch/util/initial_state.js | 3 ++- .../features/ui/components/link_footer.js | 1 + app/javascript/mastodon/initial_state.js | 2 +- app/validators/status_length_validator.rb | 2 +- db/schema.rb | 23 +++++++++++++++++-- 7 files changed, 38 insertions(+), 6 deletions(-) diff --git a/app/javascript/flavours/glitch/components/autosuggest_textarea.js b/app/javascript/flavours/glitch/components/autosuggest_textarea.js index 967c593af..ee2da3e06 100644 --- a/app/javascript/flavours/glitch/components/autosuggest_textarea.js +++ b/app/javascript/flavours/glitch/components/autosuggest_textarea.js @@ -208,6 +208,7 @@ export default class AutosuggestTextarea extends ImmutablePureComponent { placeholder={placeholder} autoFocus={autoFocus} value={value} + maxLength={7777} onChange={this.onChange} onKeyDown={this.onKeyDown} onKeyUp={onKeyUp} diff --git a/app/javascript/flavours/glitch/features/ui/components/link_footer.js b/app/javascript/flavours/glitch/features/ui/components/link_footer.js index d9579e9c9..c8e0fe983 100644 --- a/app/javascript/flavours/glitch/features/ui/components/link_footer.js +++ b/app/javascript/flavours/glitch/features/ui/components/link_footer.js @@ -38,13 +38,23 @@ class LinkFooter extends React.PureComponent { e.stopPropagation(); this.props.onLogout(); - + return false; } render () { return (
+ {/*custom cipherbliss links*/} + + + contactez l'admin + + + Supportez + Cipherbliss + +
    {invitesEnabled &&
  • ·
    • } {!!securityLink &&
  • ·
    • } diff --git a/app/javascript/flavours/glitch/util/initial_state.js b/app/javascript/flavours/glitch/util/initial_state.js index 7154e020b..213529b8d 100644 --- a/app/javascript/flavours/glitch/util/initial_state.js +++ b/app/javascript/flavours/glitch/util/initial_state.js @@ -21,7 +21,8 @@ export const favouriteModal = getMeta('favourite_modal'); export const deleteModal = getMeta('delete_modal'); export const me = getMeta('me'); export const searchEnabled = getMeta('search_enabled'); -export const maxChars = (initialState && initialState.max_toot_chars) || 500; +// export const maxChars = (initialState && initialState.max_toot_chars) || 7777; +export const maxChars = 7777; export const pollLimits = (initialState && initialState.poll_limits); export const invitesEnabled = getMeta('invites_enabled'); export const limitedFederationMode = getMeta('limited_federation_mode'); diff --git a/app/javascript/mastodon/features/ui/components/link_footer.js b/app/javascript/mastodon/features/ui/components/link_footer.js index edf1104c4..15b38852a 100644 --- a/app/javascript/mastodon/features/ui/components/link_footer.js +++ b/app/javascript/mastodon/features/ui/components/link_footer.js @@ -47,6 +47,7 @@ class LinkFooter extends React.PureComponent { return (
    +
      {invitesEnabled &&
    • ·
      • } {withHotkeys &&
    • ·
      • } diff --git a/app/javascript/mastodon/initial_state.js b/app/javascript/mastodon/initial_state.js index 1307bf23e..2f67136ee 100644 --- a/app/javascript/mastodon/initial_state.js +++ b/app/javascript/mastodon/initial_state.js @@ -12,7 +12,7 @@ export const boostModal = getMeta('boost_modal'); export const deleteModal = getMeta('delete_modal'); export const me = getMeta('me'); export const searchEnabled = getMeta('search_enabled'); -export const maxChars = (initialState && initialState.max_toot_chars) || 500; +export const maxChars = (initialState && initialState.max_toot_chars) || 7777; export const invitesEnabled = getMeta('invites_enabled'); export const limitedFederationMode = getMeta('limited_federation_mode'); export const repository = getMeta('repository'); diff --git a/app/validators/status_length_validator.rb b/app/validators/status_length_validator.rb index 2a3ac8862..6ed9ea572 100644 --- a/app/validators/status_length_validator.rb +++ b/app/validators/status_length_validator.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class StatusLengthValidator < ActiveModel::Validator - MAX_CHARS = (ENV['MAX_TOOT_CHARS'] || 500).to_i + MAX_CHARS = (ENV['MAX_TOOT_CHARS'] || 7777).to_i URL_PLACEHOLDER_CHARS = 23 URL_PLACEHOLDER = "\1#{'x' * URL_PLACEHOLDER_CHARS}" diff --git a/db/schema.rb b/db/schema.rb index 241bda8b8..d9cf035a6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -262,6 +262,13 @@ ActiveRecord::Schema.define(version: 2022_03_16_233212) do t.index ["rejected_by_account_id"], name: "index_appeals_on_rejected_by_account_id", where: "(rejected_by_account_id IS NOT NULL)" end + create_table "articles", force: :cascade do |t| + t.string "title" + t.text "text" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + create_table "backups", force: :cascade do |t| t.bigint "user_id" t.string "dump_file_name" @@ -891,10 +898,10 @@ ActiveRecord::Schema.define(version: 2022_03_16_233212) do t.bigint "account_id", null: false t.bigint "application_id" t.bigint "in_reply_to_account_id" - t.boolean "local_only" t.bigint "poll_id" - t.string "content_type" t.datetime "deleted_at" + t.boolean "local_only" + t.string "content_type" t.datetime "edited_at" t.boolean "trendable" t.bigint "ordered_media_attachment_ids", array: true @@ -953,6 +960,17 @@ ActiveRecord::Schema.define(version: 2022_03_16_233212) do t.index ["domain"], name: "index_unavailable_domains_on_domain", unique: true end + create_table "user_groups", force: :cascade do |t| + t.string "name", null: false + t.datetime "createdAt" + t.string "visibility" + t.integer "account_id" + t.integer "creator_id" + t.integer "statuses_count" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + create_table "user_invite_requests", force: :cascade do |t| t.bigint "user_id" t.text "text" @@ -1239,4 +1257,5 @@ ActiveRecord::Schema.define(version: 2022_03_16_233212) do ORDER BY (sum(t0.rank)) DESC; SQL add_index "follow_recommendations", ["account_id"], name: "index_follow_recommendations_on_account_id", unique: true + end